Merge branch 'master' into Ghommie-cit430

2019-12-05 20:53:14 -08:00
parent 5024e900f7 f937c4d877
commit 6b2d3b116d
113 changed files with 8456 additions and 6075 deletions
@@ -18,8 +18,8 @@
 	var/item_recycle_sound = 'sound/items/welder.ogg'

 /obj/machinery/recycler/Initialize()
+	AddComponent(/datum/component/butchering/recycler, 1, amount_produced,amount_produced/5)
 	AddComponent(/datum/component/material_container, list(MAT_METAL, MAT_GLASS, MAT_PLASMA, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_URANIUM, MAT_BANANIUM, MAT_TITANIUM, MAT_BLUESPACE, MAT_PLASTIC), INFINITY, FALSE, null, null, null, TRUE)
-	AddComponent(/datum/component/butchering, 1, amount_produced,amount_produced/5)
 	. = ..()
 	update_icon()
 	req_one_access = get_all_accesses() + get_all_centcom_access()
@@ -35,7 +35,7 @@
 	var/datum/component/material_container/materials = GetComponent(/datum/component/material_container)
 	materials.max_amount = mat_mod
 	amount_produced = min(50, amt_made) + 50
-	var/datum/component/butchering/butchering = GetComponent(/datum/component/butchering)
+	var/datum/component/butchering/butchering = GetComponent(/datum/component/butchering/recycler)
 	butchering.effectiveness = amount_produced
 	butchering.bonus_modifier = amount_produced/5

@@ -83,20 +83,24 @@
 		is_powered = FALSE
 	icon_state = icon_name + "[is_powered]" + "[(blood ? "bld" : "")]" // add the blood tag at the end

-/obj/machinery/recycler/Bumped(atom/movable/AM)
-
-	if(stat & (BROKEN|NOPOWER))
-		return
+/obj/machinery/recycler/CanPass(atom/movable/AM)
+	. = ..()
 	if(!anchored)
 		return
-	if(safety_mode)
-		return

 	var/move_dir = get_dir(loc, AM.loc)
 	if(move_dir == eat_dir)
-		eat(AM)
+		return TRUE
+
+/obj/machinery/recycler/Crossed(atom/movable/AM)
+	eat(AM)
+	. = ..()

 /obj/machinery/recycler/proc/eat(atom/AM0, sound=TRUE)
+	if(stat & (BROKEN|NOPOWER))
+		return
+	if(safety_mode)
+		return
 	var/list/to_eat
 	if(isitem(AM0))
 		to_eat = AM0.GetAllContentsIgnoring(GLOB.typecache_mob)
@@ -194,9 +198,6 @@
 	// Instantly lie down, also go unconscious from the pain, before you die.
 	L.Unconscious(100)
 	L.adjustBruteLoss(crush_damage)
-	if(L.stat == DEAD && (L.butcher_results || L.guaranteed_butcher_results))
-		var/datum/component/butchering/butchering = GetComponent(/datum/component/butchering)
-		butchering.Butcher(src,L)

 /obj/machinery/recycler/deathtrap
 	name = "dangerous old crusher"
@@ -20,7 +20,7 @@

 /obj/item/mecha_parts/mecha_equipment/drill/Initialize()
 	. = ..()
-	AddComponent(/datum/component/butchering, 50, 100)
+	AddComponent(/datum/component/butchering, 50, 100, null, null, TRUE)

 /obj/item/mecha_parts/mecha_equipment/drill/action(atom/target)
 	if(!action_checks(target))
@@ -81,6 +81,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)

 	var/flags_cover = 0 //for flags such as GLASSESCOVERSEYES
 	var/heat = 0
+	///All items with sharpness of IS_SHARP or higher will automatically get the butchering component.
 	var/sharpness = IS_BLUNT

 	var/tool_behaviour = NONE
@@ -139,6 +140,9 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
 	else if (!istype(embedding, /datum/embedding_behavior))
 		stack_trace("Invalid type [embedding.type] found in .embedding during /obj/item Initialize()")

+	if(sharpness) //give sharp objects butchering functionality, for consistency
+		AddComponent(/datum/component/butchering, 80 * toolspeed)
+
 /obj/item/Destroy()
 	item_flags &= ~DROPDEL	//prevent reqdels
 	if(ismob(loc))
@@ -689,15 +689,16 @@ Code:
 				active_bot = null

 			if("summon") //Args are in the correct order, they are stated here just as an easy reminder.
-				active_bot.bot_control(command= "summon", user_turf= get_turf(usr), user_access= host_pda.GetAccess())
+				active_bot.bot_control("summon", usr, host_pda.GetAccess())

 			else //Forward all other bot commands to the bot itself!
-				active_bot.bot_control(command= href_list["op"], user= usr)
+				active_bot.bot_control(href_list["op"], usr)
 		playsound(src, 'sound/machines/terminal_select.ogg', 50, 1)

 	if(href_list["mule"]) //MULEbots are special snowflakes, and need different args due to how they work.
-
-		active_bot.bot_control(href_list["mule"], usr, TRUE)
+		var/mob/living/simple_animal/bot/mulebot/mule = active_bot
+		if (istype(mule))
+			active_bot.bot_control(href_list["mule"], usr, TRUE)

 	if(!host_pda)
 		return
@@ -205,3 +205,7 @@
 /obj/item/inducer/sci/combat/Initialize()
 	. = ..()
 	update_icon()
+
+/obj/item/inducer/sci/supply
+	opened = FALSE
+	cell_type = /obj/item/stock_parts/cell/inducer_supply
@@ -23,8 +23,8 @@
 	else
 		if(attack_verb_off.len)
 			attack_verb = attack_verb_off
-	if(get_sharpness())
-		AddComponent(/datum/component/butchering, 50, 100, 0, hitsound, !active)
+	if(sharpness)
+		AddComponent(/datum/component/butchering, 50, 100, 0, hitsound)

 /obj/item/melee/transforming/attack_self(mob/living/carbon/user)
 	if(transform_weapon(user))
@@ -65,13 +65,6 @@
 		icon_state = initial(icon_state)
 		w_class = initial(w_class)
 		total_mass = initial(total_mass)
-	if(get_sharpness())
-		var/datum/component/butchering/BT = LoadComponent(/datum/component/butchering)
-		BT.butchering_enabled = TRUE
-	else
-		var/datum/component/butchering/BT = GetComponent(/datum/component/butchering)
-		if(BT)
-			BT.butchering_enabled = FALSE
 	transform_messages(user, supress_message_text)
 	add_fingerprint(user)
 	return TRUE
@@ -82,6 +82,55 @@
 	item_state = "tile-fairygrass"
 	turf_type = /turf/open/floor/grass/fairy
 	resistance_flags = FLAMMABLE
+	color = "#33CCFF"
+
+/obj/item/stack/tile/fairygrass/white
+	name = "white fairygrass tile"
+	singular_name = "white fairygrass floor tile"
+	desc = "A patch of odd, glowing white grass."
+	turf_type = /turf/open/floor/grass/fairy/white
+	color = "#FFFFFF"
+
+/obj/item/stack/tile/fairygrass/red
+	name = "red fairygrass tile"
+	singular_name = "red fairygrass floor tile"
+	desc = "A patch of odd, glowing red grass."
+	turf_type = /turf/open/floor/grass/fairy/red
+	color = "#FF3333"
+
+/obj/item/stack/tile/fairygrass/yellow
+	name = "yellow fairygrass tile"
+	singular_name = "yellow fairygrass floor tile"
+	desc = "A patch of odd, glowing yellow grass."
+	turf_type = /turf/open/floor/grass/fairy/yellow
+	color = "#FFFF66"
+
+/obj/item/stack/tile/fairygrass/green
+	name = "green fairygrass tile"
+	singular_name = "green fairygrass floor tile"
+	desc = "A patch of odd, glowing green grass."
+	turf_type = /turf/open/floor/grass/fairy/green
+	color = "#99FF99"
+
+/obj/item/stack/tile/fairygrass/blue
+	name = "blue fairygrass tile"
+	singular_name = "blue fairygrass floor tile"
+	desc = "A patch of odd, glowing blue grass."
+	turf_type = /turf/open/floor/grass/fairy/blue
+
+/obj/item/stack/tile/fairygrass/purple
+	name = "purple fairygrass tile"
+	singular_name = "purple fairygrass floor tile"
+	desc = "A patch of odd, glowing purple grass."
+	turf_type = /turf/open/floor/grass/fairy/purple
+	color = "#D966FF"
+
+/obj/item/stack/tile/fairygrass/pink
+	name = "pink fairygrass tile"
+	singular_name = "pink fairygrass floor tile"
+	desc = "A patch of odd, glowing pink grass."
+	turf_type = /turf/open/floor/grass/fairy/pink
+	color = "#FFB3DA"

 //Wood
 /obj/item/stack/tile/wood
@@ -37,7 +37,15 @@
 		/obj/item/screwdriver,
 		/obj/item/valentine,
 		/obj/item/stamp,
-		/obj/item/key))
+		/obj/item/key,
+		/obj/item/cartridge,
+		/obj/item/camera_film,
+		/obj/item/stack/ore/bluespace_crystal,
+		/obj/item/reagent_containers/food/snacks/grown/poppy,
+		/obj/item/instrument/harmonica,
+		/obj/item/mining_voucher,
+		/obj/item/suit_voucher,
+		/obj/item/reagent_containers/pill))

 /obj/item/storage/wallet/Exited(atom/movable/AM)
 	. = ..()
@@ -122,12 +122,21 @@
 	user.put_in_active_hand(pryjaws)

 /obj/item/wirecutters/power/attack(mob/living/carbon/C, mob/user)
-	if(istype(C) && C.handcuffed)
-		user.visible_message("<span class='notice'>[user] cuts [C]'s restraints with [src]!</span>")
-		qdel(C.handcuffed)
-		return
-	else
-		..()
+	if(istype(C))
+		if(C.handcuffed)
+			user.visible_message("<span class='notice'>[user] cuts [C]'s restraints with [src]!</span>")
+			qdel(C.handcuffed)
+			return
+		else if(C.has_status_effect(STATUS_EFFECT_CHOKINGSTRAND))
+			var/man = C == user ? "your" : "[C]'\s"
+			user.visible_message("<span class='notice'>[user] attempts to remove the durathread strand from around [man] neck.</span>", \
+								"<span class='notice'>You attempt to remove the durathread strand from around [man] neck.</span>")
+			if(do_after(user, 15, null, C))
+				user.visible_message("<span class='notice'>[user] succesfuly removes the durathread strand.</span>",
+									"<span class='notice'>You succesfuly remove the durathread strand.</span>")
+				C.remove_status_effect(STATUS_EFFECT_CHOKINGSTRAND)
+			return
+	..()

 /obj/item/wirecutters/advanced
 	name = "advanced wirecutters"
@@ -498,7 +498,7 @@
 	var/mutable_appearance/armrest

 /obj/structure/chair/sofa/Initialize()
-	armrest = mutable_appearance(icon, "[icon_state]_armrest")
+	armrest = mutable_appearance(icon, "[icon_state]_armrest", ABOVE_MOB_LAYER)
 	return ..()

 /obj/structure/chair/sofa/post_buckle_mob(mob/living/M)
@@ -49,6 +49,7 @@
 	new /obj/item/storage/backpack/satchel/leather/withwallet( src )
 	new /obj/item/instrument/piano_synth(src)
 	new /obj/item/radio/headset( src )
+	new /obj/item/clothing/head/colour(src)

 /obj/structure/closet/secure_closet/personal/attackby(obj/item/W, mob/user, params)
 	var/obj/item/card/id/I = W.GetID()
@@ -151,6 +151,9 @@
 		log_admin("[key_name(new_spawn)] possessed a golem shell enslaved to [key_name(owner)].")
 	if(ishuman(new_spawn))
 		var/mob/living/carbon/human/H = new_spawn
+		if(has_owner)
+			var/datum/species/golem/G = H.dna.species
+			G.owner = owner
 		H.set_cloned_appearance()
 		if(!name)
 			if(has_owner)
@@ -321,8 +324,9 @@

 /datum/outfit/hotelstaff
 	name = "Hotel Staff"
-	uniform = /obj/item/clothing/under/assistantformal
+	uniform = /obj/item/clothing/under/telegram
 	shoes = /obj/item/clothing/shoes/laceup
+	head = /obj/item/clothing/head/hotel
 	r_pocket = /obj/item/radio/off
 	back = /obj/item/storage/backpack
 	implants = list(/obj/item/implant/mindshield)
@@ -1,5 +1,7 @@
-//Loom, turns raw cotton and durathread into their respective fabrics.
+#define FABRIC_PER_SHEET 4

+
+///This is a loom. It's usually made out of wood and used to weave fabric like durathread or cotton into their respective cloth types.
 /obj/structure/loom
 	name = "loom"
 	desc = "A simple device used to weave cloth and other thread-based fabrics together into usable material."
@@ -8,14 +10,35 @@
 	density = TRUE
 	anchored = TRUE

-/obj/structure/loom/attackby(obj/item/stack/sheet/W, mob/user)
-	if(W.is_fabric && W.amount > 1)
-		user.show_message("<span class='notice'>You start weaving the [W.name] through the loom..</span>", MSG_VISUAL)
-		if(W.use_tool(src, user, W.pull_effort))
-			new W.loom_result(drop_location())
-			user.show_message("<span class='notice'>You weave the [W.name] into a workable fabric.</span>", MSG_VISUAL)
-			W.amount = (W.amount - 2)
-			if(W.amount < 1)
-				qdel(W)
-	else
-		user.show_message("<span class='notice'>You need a valid fabric and at least 2 of said fabric before using this.</span>", MSG_VISUAL)
+/obj/structure/loom/attackby(obj/item/I, mob/user)
+	if(weave(I, user))
+		return
+	return ..()
+
+/obj/structure/loom/wrench_act(mob/living/user, obj/item/I)
+	..()
+	default_unfasten_wrench(user, I, 5)
+	return TRUE
+
+///Handles the weaving.
+/obj/structure/loom/proc/weave(obj/item/stack/sheet/S, mob/user)
+	if(!istype(S) || !S.is_fabric)
+		return FALSE
+	if(!anchored)
+		user.show_message("<span class='notice'>The loom needs to be wrenched down.</span>", MSG_VISUAL)
+		return FALSE
+	if(S.amount < FABRIC_PER_SHEET)
+		user.show_message("<span class='notice'>You need at least [FABRIC_PER_SHEET] units of fabric before using this.</span>", 1)
+		return FALSE
+	user.show_message("<span class='notice'>You start weaving \the [S.name] through the loom..</span>", MSG_VISUAL)
+	if(S.use_tool(src, user, S.pull_effort))
+		if(S.amount >= FABRIC_PER_SHEET)
+			new S.loom_result(drop_location())
+			S.use(FABRIC_PER_SHEET)
+			user.show_message("<span class='notice'>You weave \the [S.name] into a workable fabric.</span>", MSG_VISUAL)
+	return TRUE
+
+/obj/structure/loom/unanchored
+	anchored = FALSE
+
+#undef FABRIC_PER_SHEET
@@ -104,6 +104,47 @@
 	light_range = 2
 	light_power = 0.80
 	light_color = "#33CCFF"
+	color = "#33CCFF"
+
+/turf/open/floor/grass/fairy/white
+	name = "white fairygrass patch"
+	light_color = "#FFFFFF"
+	color = "#FFFFFF"
+	floor_tile = /obj/item/stack/tile/fairygrass/white
+
+/turf/open/floor/grass/fairy/red
+	name = "red fairygrass patch"
+	light_color = "#FF3333"
+	color = "#FF3333"
+	floor_tile = /obj/item/stack/tile/fairygrass/red
+
+/turf/open/floor/grass/fairy/yellow
+	name = "yellow fairygrass patch"
+	light_color = "#FFFF66"
+	color = "#FFFF66"
+	floor_tile = /obj/item/stack/tile/fairygrass/yellow
+
+/turf/open/floor/grass/fairy/green
+	name = "green fairygrass patch"
+	light_color = "#99FF99"
+	color = "#99FF99"
+	floor_tile = /obj/item/stack/tile/fairygrass/green
+
+/turf/open/floor/grass/fairy/blue
+	name = "blue fairygrass patch"
+	floor_tile = /obj/item/stack/tile/fairygrass/blue
+
+/turf/open/floor/grass/fairy/purple
+	name = "purple fairygrass patch"
+	light_color = "#D966FF"
+	color = "#D966FF"
+	floor_tile = /obj/item/stack/tile/fairygrass/purple
+
+/turf/open/floor/grass/fairy/pink
+	name = "pink fairygrass patch"
+	light_color = "#FFB3DA"
+	color = "#FFB3DA"
+	floor_tile = /obj/item/stack/tile/fairygrass/pink

 /turf/open/floor/grass/snow
 	gender = PLURAL