Merge pull request #166 from Animusin/update24

Update24

code/controllers/subsystem/rogue/role_class_handler/class_select_handler/class_select_handler.dm

@@ -213,6 +213,8 @@
 		for(var/datum/advclass/datums in rolled_classes)
 			if(!(CTAG_ADVENTURER in datums.category_tags))
 				continue
+			if((CTAG_BANDIT in datums.category_tags) && HAS_TRAIT(H, TRAIT_VILLAIN)) //so VLs and stuff cant pick bandit
+				continue
 			var/plus_str = ""
 /*			if(rolled_classes[datums] > 0)
 				var/plus_factor = rolled_classes[datums]

code/datums/skills/misc.dm

@@ -34,6 +34,3 @@
 
 /datum/skill/misc/sewing
 	name = "Sewing"
-
-/datum/skill/misc/weaving
-	name = "Weaving"

code/game/objects/items/rogueitems/keys.dm

@@ -67,6 +67,11 @@
 	icon_state = "mazekey"
 	lockid = "manor"
 
+/obj/item/roguekey/bandit // use the old key name for various old keys for dungeons etc, less dumb than bandit keys having a label on it saying bandit key
+	name = "old key"
+	icon_state = "mazekey"
+	lockid = "banditcamp"
+
 /obj/item/roguekey/queen
 	name = "lady key"
 	desc = "The Lady's key."

code/game/objects/items/rogueweapons/melee/knives.dm

@@ -73,7 +73,7 @@
 	if(tag)
 		switch(tag)
 			if("gen")
-				return list("shrink" = 0.4,"sx" = -10,"sy" = 0,"nx" = 11,"ny" = 0,"wx" = -4,"wy" = 0,"ex" = 2,"ey" = 0,"northabove" = 0,"southabove" = 1,"eastabove" = 1,"westabove" = 0,"nturn" = 0,"sturn" = 0,"wturn" = 0,"eturn" = 0,"nflip" = 0,"sflip" = 8,"wflip" = 8,"eflip" = 0)
+				return list("shrink" = 0.4,"sx" = -8,"sy" = 0,"nx" = 9,"ny" = 0,"wx" = -4,"wy" = 0,"ex" = 2,"ey" = 0,"northabove" = 0,"southabove" = 1,"eastabove" = 1,"westabove" = 0,"nturn" = 0,"sturn" = 0,"wturn" = 0,"eturn" = 0,"nflip" = 0,"sflip" = 8,"wflip" = 8,"eflip" = 0)
 			if("onbelt")
 				return list("shrink" = 0.3,"sx" = -2,"sy" = -5,"nx" = 4,"ny" = -5,"wx" = 0,"wy" = -5,"ex" = 2,"ey" = -5,"nturn" = 0,"sturn" = 0,"wturn" = 0,"eturn" = 0,"nflip" = 0,"sflip" = 0,"wflip" = 0,"eflip" = 0,"northabove" = 0,"southabove" = 1,"eastabove" = 1,"westabove" = 0)
 

code/game/objects/structures/well.dm

@@ -4,7 +4,7 @@
 	name = "well"
 	desc = "A well of stone. Has a hook which a bucket can be attached to, to draw water from beneath."
 	icon = 'icons/roguetown/misc/structure.dmi'
-	icon_state = "well"
+	icon_state = "welly"
 	anchored = TRUE
 	density = TRUE
 	opacity = 0

code/modules/clothing/rogueclothes/armor.dm

@@ -189,6 +189,21 @@
 	armor_class = ARMOR_CLASS_MEDIUM
 	sellprice = 35
 
+//full iron armor for robbers/warriors
+/obj/item/clothing/suit/roguetown/armor/plate/scale/iron
+	slot_flags = ITEM_SLOT_ARMOR
+	name = "iron plate armor"
+	desc = "A rough set of iron armor, complete with chainmail joints and pauldrons. A simple and cheap design to protect vital zones, but not the arms."
+	body_parts_covered = CHEST|VITALS|GROIN|LEGS
+	allowed_sex = list(MALE, FEMALE)
+	icon_state = "ironplate"
+	max_integrity = 350 // Three iron bars, extra durability
+	armor = list("melee" = 60, "bullet" = 60, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
+	smeltresult = /obj/item/ingot/iron
+	equip_delay_self = 40
+	armor_class = ARMOR_CLASS_MEDIUM
+	sellprice = 45
+
 // Rare Heartfelt equipment
 /obj/item/clothing/suit/roguetown/armor/heartfelt/lord
 	slot_flags = ITEM_SLOT_ARMOR

code/modules/clothing/rogueclothes/hats.dm

@@ -366,6 +366,7 @@
 	desc = "Habits worn by nuns of the pantheon's faith."
 	icon_state = "nun"
 	sellprice = 5
+	allowed_race = list("human", "tiefling", "elf", "dwarf", "aasimar")
 
 /obj/item/clothing/head/roguetown/hennin
 	name = "hennin"
@@ -991,3 +992,33 @@
 	allowed_race = list("aasimar")
 	bloody_icon = 'icons/effects/blood64x64.dmi'
 	bloody_icon_state = "helmetblood_big"
+
+/obj/item/clothing/head/roguetown/helmet/ironplate
+	icon = 'icons/roguetown/clothing/head.dmi'
+	mob_overlay_icon = 'icons/roguetown/clothing/onmob/head.dmi'
+	slot_flags = ITEM_SLOT_HEAD|ITEM_SLOT_HIP
+	name = "iron plate helmet"
+	max_integrity = 350//isn't the same as a steel helmet but is better than a skullcap, costs 2 bars and protects the mouth
+	prevent_crits = list(BCLASS_CUT, BCLASS_CHOP, BCLASS_BLUNT, BCLASS_TWIST, BCLASS_STAB) // Stab protection out of having faceplate
+	block2add = FOV_RIGHT|FOV_LEFT // Unremovable visor.
+	armor = list("melee" = 60, "bullet" = 60, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
+	icon_state = "ironplate"
+	item_state = "ironplate"
+	desc = "An iron masked helmet usually worn by armed men, it is a solid design yet antiquated and cheap."
+	will_cover = HEAD|HAIR|NOSE|MOUTH|EARS
+	flags_inv = HIDEEARS
+	smeltresult = /obj/item/ingot/iron
+
+/obj/item/clothing/head/roguetown/helmet/ironpot
+	icon = 'icons/roguetown/clothing/head.dmi'
+	mob_overlay_icon = 'icons/roguetown/clothing/onmob/head.dmi'
+	slot_flags = ITEM_SLOT_HEAD|ITEM_SLOT_HIP
+	name = "iron plate helmet"
+	max_integrity = 250//isn't the same as a steel helmet but is better than a skullcap
+	armor = list("melee" = 50, "bullet" = 30, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
+	icon_state = "ironpot"
+	item_state = "ironpot"
+	desc = "A iron pot style helmet designed to protect the skull and the nose, designs like those are outdated but they are simple to make in big numbers."
+	will_cover = HEAD|HAIR|NOSE|EARS
+	flags_inv = HIDEEARS
+	smeltresult = /obj/item/ingot/iron

code/modules/clothing/rogueclothes/shirts.dm

@@ -366,6 +366,7 @@
 	icon_state = "nun"
 	item_state = "nun"
 	allowed_sex = list(FEMALE)
+	allowed_race = list("human", "tiefling", "elf", "dwarf", "aasimar")
 
 /obj/item/clothing/suit/roguetown/shirt/robe/wizard
 	name = "wizard's robe"

code/modules/hydroponics/roguebarrels.dm

@@ -5,6 +5,9 @@
 	. = ..()
 	reagents.add_reagent(/datum/reagent/water, rand(0,300))
 
+
+/obj/structure/fermenting_barrel/random/beer
+	icon_state = "barrel_alt"
 /obj/structure/fermenting_barrel/random/beer/Initialize()
 	. = ..()
 	reagents.add_reagent(/datum/reagent/consumable/ethanol/beer, rand(0,300))

code/modules/jobs/job_types/roguetown/adventurer/types/antag/bandit.dm

@@ -15,15 +15,18 @@
 		"Aasimar"
 	)
 	outfit = /datum/outfit/job/roguetown/adventurer/bandit
-	maximum_possible_slots = 2
-	category_tags = list(CTAG_ADVENTURER)
+	maximum_possible_slots = 5
+	category_tags = list(CTAG_ADVENTURER, CTAG_BANDIT)
 	pickprob = 100
 
 /datum/outfit/job/roguetown/adventurer/bandit/pre_equip(mob/living/carbon/human/H)
 	..()
 
 /datum/outfit/job/roguetown/adventurer/bandit/post_equip(mob/living/carbon/human/H, visualsOnly)
 	. = ..()
-	var/datum/antagonist/new_antag = new /datum/antagonist/bandit()
-	H.mind.add_antag_datum(new_antag)
+	if(!HAS_TRAIT(H, TRAIT_VILLAIN)) //just incase a vampirelord gets this...
+		var/datum/antagonist/new_antag = new /datum/antagonist/bandit()
+		H.mind.add_antag_datum(new_antag)
+	else
+		H.equipOutfit(/datum/outfit/job/roguetown/adventurer/sfighter)
 

code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/merchant.dm

@@ -24,7 +24,6 @@
 	H.mind.adjust_skillrank(/datum/skill/misc/sewing, 2, TRUE)
 	H.mind.adjust_skillrank(/datum/skill/craft/alchemy, 1, TRUE)
 	H.mind.adjust_skillrank(/datum/skill/craft/tailor, 1, TRUE)
-	H.mind.adjust_skillrank(/datum/skill/misc/weaving, 1, TRUE)
 	H.change_stat("intelligence", 2)
 	H.change_stat("speed", 1)
 	shoes = /obj/item/clothing/shoes/roguetown/boots
@@ -55,7 +54,7 @@
 			H.mind.adjust_skillrank(/datum/skill/craft/alchemy, 2, TRUE)
 		if("SILK")		// Travelling silk trader
 			backpack_contents = list(/obj/item/natural/bundle/silk = 2, /obj/item/natural/fur = 1, /obj/item/natural/bundle/fibers = 2, /obj/item/clothing/suit/roguetown/shirt/dress/silkdress, /obj/item/clothing/suit/roguetown/shirt/undershirt/puritan)
-			H.mind.adjust_skillrank(/datum/skill/misc/weaving, 2, TRUE)
+			H.mind.adjust_skillrank(/datum/skill/misc/sewing, 2, TRUE)
 		if("GEMS")		// Travelling high-end merchant
 			backpack_contents = list(/obj/item/roguegem/yellow, /obj/item/roguegem/yellow, /obj/item/roguegem/green, /obj/item/roguegem/green, /obj/item/roguegem/violet)
 			H.mind.adjust_skillrank(/datum/skill/craft/blacksmithing, 1, TRUE)

code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/weaver.dm

@@ -13,8 +13,7 @@
 
 /datum/outfit/job/roguetown/adventurer/seamstress/pre_equip(mob/living/carbon/human/H)
 	..()
-	H.mind.adjust_skillrank(/datum/skill/misc/sewing, 3, TRUE)
-	H.mind.adjust_skillrank(/datum/skill/misc/weaving, 4, TRUE)
+	H.mind.adjust_skillrank(/datum/skill/misc/sewing, 4, TRUE)
 	H.mind.adjust_skillrank(/datum/skill/craft/crafting, 3, TRUE)
 	H.mind.adjust_skillrank(/datum/skill/combat/knives, 1, TRUE)
 	H.mind.adjust_skillrank(/datum/skill/misc/medicine, 2, TRUE)

code/modules/jobs/job_types/roguetown/serfs/tailor.dm

@@ -28,7 +28,6 @@
 
 	if(H.mind)
 		H.mind.adjust_skillrank(/datum/skill/misc/sewing, pick(3,4), TRUE)
-		H.mind.adjust_skillrank(/datum/skill/misc/weaving, pick(3,4), TRUE)
 		H.mind.adjust_skillrank(/datum/skill/craft/tanning, pick(3,4), TRUE)
 		H.mind.adjust_skillrank(/datum/skill/misc/medicine, 2, TRUE)
 		H.mind.adjust_skillrank(/datum/skill/combat/knives, 1, TRUE)

code/modules/mob/dead/new_player/sprite_accessories.dm

@@ -181,7 +181,7 @@
 	name = "Nomadic"
 	icon_state = "nomadic"
 	gender = MALE
-	specuse = list("human", "dwarf", "elf", "aasimar", "tiefling")
+	specuse = list("human", "dwarf", "tiefling")
 
 /datum/sprite_accessory/hair/pirate
 	name = "Pirate"
@@ -322,7 +322,7 @@
 	name = "Fancy"
 	icon_state = "felfhair_fancy"
 	gender = NEUTER
-	specuse = list("human", "dwarf", "elf", "aasimar", "tiefling")
+	specuse = list("elf")
 
 /datum/sprite_accessory/hair/fhomely
 	name = "Homely"

code/modules/reagents/reagent_containers/glass.dm

@@ -314,7 +314,7 @@
 	w_class = WEIGHT_CLASS_BULKY
 	amount_per_transfer_from_this = 9
 	possible_transfer_amounts = list(9)
-	volume = 70
+	volume = 99
 	flags_inv = HIDEHAIR
 	reagent_flags = OPENCONTAINER
 	obj_flags = CAN_BE_HIT
@@ -332,44 +332,46 @@
 		SLOT_GENERC_DEXTROUS_STORAGE
 	)
 
+/obj/item/reagent_containers/glass/bucket/equipped(mob/user, slot)
+	..()
+	if (slot == SLOT_HEAD)
+		if(reagents.total_volume)
+			to_chat(user, "<span class='danger'>[src]'s contents spill all over you!</span>")
+			reagents.reaction(user, TOUCH)
+			reagents.clear_reagents()
+		reagents.flags = NONE
+
+/obj/item/reagent_containers/glass/bucket/dropped(mob/user)
+	. = ..()
+	reagents.flags = initial(reagent_flags)
+
+/obj/item/reagent_containers/glass/bucket/equip_to_best_slot(mob/M)
+	if(reagents.total_volume) //If there is water in a bucket, don't quick equip it to the head
+		var/index = slot_equipment_priority.Find(SLOT_HEAD)
+		slot_equipment_priority.Remove(SLOT_HEAD)
+		. = ..()
+		slot_equipment_priority.Insert(index, SLOT_HEAD)
+		return
+	return ..()
+
 /obj/item/reagent_containers/glass/bucket/wooden
 	name = "bucket"
 	icon_state = "woodbucket"
 	item_state = "woodbucket"
 	icon = 'icons/roguetown/items/misc.dmi'
+
 	custom_materials = null
 	force = 5
 	throwforce = 10
-	amount_per_transfer_from_this = 9
-	volume = 99
 	armor = list("melee" = 10, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 50)
 	resistance_flags = FLAMMABLE
-	drop_sound = 'sound/foley/dropsound/wooden_drop.ogg'
 	dropshrink = 0.8
 	slot_flags = null
+	drop_sound = 'sound/foley/dropsound/wooden_drop.ogg'
 
-/obj/item/reagent_containers/glass/bucket/wooden/alter
+/obj/item/reagent_containers/glass/bucket/wooden/alter // just new look, trying it on for size
 	icon = 'modular/Neu_Food/icons/cooking.dmi'
 
-/* using the version in Neu_Food instead
-/obj/item/reagent_containers/glass/bucket/wooden/attackby(obj/item/I, mob/user, params)
-	if(istype(I, /obj/item/natural/cloth))
-		var/obj/item/natural/cloth/T = I
-		if(T.wet && !T.return_blood_DNA())
-			return
-		var/removereg = /datum/reagent/water
-		if(!reagents.has_reagent(/datum/reagent/water, 5))
-			removereg = /datum/reagent/water/gross
-			if(!reagents.has_reagent(/datum/reagent/water/gross, 5))
-				to_chat(user, "<span class='warning'>No water to soak in.</span>")
-				return
-		wash_atom(T)
-		playsound(src, pick('sound/foley/waterwash (1).ogg','sound/foley/waterwash (2).ogg'), 100, FALSE)
-		reagents.remove_reagent(removereg, 5)
-		user.visible_message("<span class='info'>[user] soaks [T] in [src].</span>")
-		return
-	..()
-*/
 /obj/item/reagent_containers/glass/bucket/wooden/getonmobprop(tag)
 	. = ..()
 	if(tag)
@@ -398,27 +400,7 @@
 			add_overlay(filling)
 
 
-/obj/item/reagent_containers/glass/bucket/equipped(mob/user, slot)
-	..()
-	if (slot == SLOT_HEAD)
-		if(reagents.total_volume)
-			to_chat(user, "<span class='danger'>[src]'s contents spill all over you!</span>")
-			reagents.reaction(user, TOUCH)
-			reagents.clear_reagents()
-		reagents.flags = NONE
-
-/obj/item/reagent_containers/glass/bucket/dropped(mob/user)
-	. = ..()
-	reagents.flags = initial(reagent_flags)
 
-/obj/item/reagent_containers/glass/bucket/equip_to_best_slot(mob/M)
-	if(reagents.total_volume) //If there is water in a bucket, don't quick equip it to the head
-		var/index = slot_equipment_priority.Find(SLOT_HEAD)
-		slot_equipment_priority.Remove(SLOT_HEAD)
-		. = ..()
-		slot_equipment_priority.Insert(index, SLOT_HEAD)
-		return
-	return ..()
 
 /obj/item/reagent_containers/glass/waterbottle
 	name = "bottle of water"

code/modules/roguetown/roguecrafting/items.dm

@@ -158,6 +158,13 @@
 	result = /obj/item/reagent_containers/glass/bucket/wooden
 	reqs = list(/obj/item/grown/log/tree/small = 1)
 
+/datum/crafting_recipe/roguetown/woodbowl
+	name = "wooden bowl"
+	result = list(/obj/item/reagent_containers/glass/bowl,
+				/obj/item/reagent_containers/glass/bowl)
+	reqs = list(/obj/item/grown/log/tree/small = 1)
+
+
 /datum/crafting_recipe/roguetown/woodcup
 	name = "wooden cups"
 	result = list(/obj/item/reagent_containers/glass/cup/wooden/crafted,

code/modules/roguetown/roguecrafting/weaving.dm

@@ -1,6 +1,6 @@
 /datum/crafting_recipe/roguetown/weaving
 	structurecraft = /obj/machinery/loom
-	skillcraft = /datum/skill/misc/weaving
+	skillcraft = /datum/skill/misc/sewing
 
 /datum/crafting_recipe/roguetown/weaving/rags
 	name = "webbed shirt"

code/modules/roguetown/roguejobs/blacksmith/anvil_recipes/armor.dm

@@ -38,6 +38,30 @@
 	req_bar = /obj/item/ingot/iron
 	created_item = /obj/item/clothing/suit/roguetown/armor/chainmail/iron
 
+
+/datum/anvil_recipe/armor/iplate
+	name = "Plate armor (3)"
+	recipe_name = "a heavy plate armor"
+	req_bar = /obj/item/ingot/iron
+	additional_items = list(/obj/item/ingot/iron,/obj/item/ingot/iron)
+	created_item = /obj/item/clothing/suit/roguetown/armor/plate/scale/iron 
+	craftdiff = 1
+
+/datum/anvil_recipe/armor/iplatehelmet
+	name = "Plate helmet (2)"
+	recipe_name = "a face guarded iron helmet"
+	req_bar = /obj/item/ingot/iron
+	additional_items = list(/obj/item/ingot/iron)
+	created_item = /obj/item/clothing/head/roguetown/helmet/ironplate
+	craftdiff = 1
+
+/datum/anvil_recipe/armor/ipothelmet
+	name = "Pot helmet"
+	recipe_name = "a heavy iron helmet"
+	req_bar = /obj/item/ingot/iron
+	created_item = /obj/item/clothing/head/roguetown/helmet/ironpot
+	craftdiff = 1
+
 /datum/anvil_recipe/armor/platemask
 	name = "Face mask x2"
 	recipe_name = "a pair of Face Masks"

code/modules/roguetown/roguejobs/cook/tools/pot.dm

@@ -1,22 +1,20 @@
 /obj/item/reagent_containers/glass/bucket/pot
 	force = 10
 	name = "pot"
-	desc = ""
+	desc = "The peasants friend, when filled with boiling water it will turn the driest oats to filling oatmeal."
 
 	icon = 'modular/Neu_Food/icons/cooking.dmi'
 	lefthand_file = 'modular/Neu_Food/icons/food_lefthand.dmi'
 	righthand_file = 'modular/Neu_Food/icons/food_righthand.dmi'
 	experimental_inhand = FALSE
-
 	icon_state = "pote"
+	item_state = "pot"
+
 	sharpness = IS_BLUNT
 	slot_flags = null
-	item_state = "pot"
-	drop_sound = 'sound/foley/dropsound/shovel_drop.ogg'
 	w_class = WEIGHT_CLASS_BULKY
-	reagent_flags = OPENCONTAINER
-	throwforce = 10
-	volume = 99
+	drop_sound = 'sound/foley/dropsound/shovel_drop.ogg'
+
 
 /obj/item/reagent_containers/glass/bucket/pot/update_icon()
 	cut_overlays()