controllers, datums, game

2018-03-06 21:16:46 -06:00
parent 4d0b7133c8
commit 95cb6b23f2
26 changed files with 93 additions and 44 deletions
@@ -542,4 +542,4 @@
 	if(EMERGENCY_ESCAPED_OR_ENDGAMED)
 		SSticker.news_report = STATION_EVACUATED
 		if(SSshuttle.emergency.is_hijacked())
-			SSticker.news_report = SHUTTLE_HIJACK
+			SSticker.news_report = SHUTTLE_HIJACK
@@ -126,7 +126,7 @@
 	return examine(user)

 //Start growing a human clone in the pod!
-/obj/machinery/clonepod/proc/growclone(ckey, clonename, ui, se, mindref, datum/species/mrace, list/features, factions)
+/obj/machinery/clonepod/proc/growclone(ckey, clonename, ui, se, mindref, datum/species/mrace, list/features, factions, list/traits)
 	if(panel_open)
 		return FALSE
 	if(mess || attempting)
@@ -198,6 +198,9 @@
 	if(H)
 		H.faction |= factions

+		for(var/V in traits)
+			new V(H)
+
 		H.set_cloned_appearance()

 		H.suiciding = FALSE
@@ -316,6 +319,7 @@
 			SPEAK("An emergency ejection of [clonemind.name] has occurred. Survival not guaranteed.")
 			to_chat(user, "<span class='notice'>You force an emergency ejection. </span>")
 			go_out()
+			mob_occupant.apply_vore_prefs()
 	else
 		return ..()

@@ -398,6 +402,7 @@
 /obj/machinery/clonepod/container_resist(mob/living/user)
 	if(user.stat == CONSCIOUS)
 		go_out()
+		mob_occupant.apply_vore_prefs()

 /obj/machinery/clonepod/emp_act(severity)
 	var/mob/living/mob_occupant = occupant
@@ -405,6 +410,7 @@
 		connected_message(Gibberish("EMP-caused Accidental Ejection", 0))
 		SPEAK(Gibberish("Exposure to electromagnetic fields has caused the ejection of [mob_occupant.real_name] prematurely." ,0))
 		go_out()
+		mob_occupant.apply_vore_prefs()
 	..()

 /obj/machinery/clonepod/ex_act(severity, target)
@@ -71,7 +71,7 @@
 		if(pod.occupant)
 			continue	//how though?

-		if(pod.growclone(R.fields["ckey"], R.fields["name"], R.fields["UI"], R.fields["SE"], R.fields["mind"], R.fields["mrace"], R.fields["features"], R.fields["factions"]))
+		if(pod.growclone(R.fields["ckey"], R.fields["name"], R.fields["UI"], R.fields["SE"], R.fields["mind"], R.fields["mrace"], R.fields["features"], R.fields["factions"], R.fields["traits"]))
 			temp = "[R.fields["name"]] => <font class='good'>Cloning cycle in progress...</font>"
 			records -= R

@@ -409,7 +409,7 @@
 			else if(pod.occupant)
 				temp = "<font class='bad'>Cloning cycle already in progress.</font>"
 				playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)
-			else if(pod.growclone(C.fields["ckey"], C.fields["name"], C.fields["UI"], C.fields["SE"], C.fields["mind"], C.fields["mrace"], C.fields["features"], C.fields["factions"]))
+			else if(pod.growclone(C.fields["ckey"], C.fields["name"], C.fields["UI"], C.fields["SE"], C.fields["mind"], C.fields["mrace"], C.fields["features"], C.fields["factions"], C.fields["traits"]))
 				temp = "[C.fields["name"]] => <font class='good'>Cloning cycle in progress...</font>"
 				playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
 				records.Remove(C)
@@ -482,6 +482,10 @@
 	R.fields["blood_type"] = dna.blood_type
 	R.fields["features"] = dna.features
 	R.fields["factions"] = mob_occupant.faction
+	R.fields["traits"] = list()
+	for(var/V in mob_occupant.roundstart_traits)
+		var/datum/trait/T = V
+		R.fields["traits"] += T.type

 	if (!isnull(mob_occupant.mind)) //Save that mind so traitors can continue traitoring after cloning.
 		R.fields["mind"] = "[REF(mob_occupant.mind)]"
@@ -75,4 +75,4 @@
 		return 0
 	if(B.scrambledcodes || B.emagged)
 		return 0
-	return ..()
+	return ..()
@@ -101,8 +101,6 @@
 /obj/machinery/door/airlock/Initialize()
 	. = ..()
 	wires = new /datum/wires/airlock(src)
-	if (cyclelinkeddir)
-		cyclelinkairlock()
 	if(frequency)
 		set_frequency(frequency)

@@ -127,6 +125,8 @@

 /obj/machinery/door/airlock/LateInitialize()
 	. = ..()
+	if (cyclelinkeddir)
+		cyclelinkairlock()
 	if(abandoned)
 		var/outcome = rand(1,100)
 		switch(outcome)
@@ -178,6 +178,7 @@
 		limit--
 	while(!FoundDoor && limit)
 	if (!FoundDoor)
+		log_world("### MAP WARNING, [src] at [get_area_name(src, TRUE)] [COORD(src)] failed to find a valid airlock to cyclelink with!")
 		return
 	FoundDoor.cyclelinkedairlock = src
 	cyclelinkedairlock = FoundDoor
@@ -68,4 +68,4 @@

 /obj/machinery/door/poddoor/try_to_crowbar(obj/item/I, mob/user)
 	if(stat & NOPOWER)
-		open(1)
+		open(1)
@@ -178,3 +178,4 @@
 				priority = "Extreme"
 			else
 				priority = "Undetermined"
+
@@ -19,3 +19,4 @@
 /obj/mecha/combat/durand/RemoveActions(mob/living/user, human_occupant = 0)
 	..()
 	defense_action.Remove(user)
+
@@ -27,3 +27,4 @@
 	..()
 	switch_damtype_action.Remove(user)
 	phasing_action.Remove(user)
+
@@ -338,7 +338,7 @@ update_label("John Doe", "Clowny")

 /obj/item/card/id/mining
 	name = "mining ID"
-	access = list(ACCESS_MINERAL_STOREROOM) // CITADEL CHANGE removes golem's ability to get on the station willy nilly.
+	access = list(ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MAILSORTING, ACCESS_MINERAL_STOREROOM)

 /obj/item/card/id/away
 	name = "a perfectly generic identification card"
@@ -547,7 +547,6 @@
 /obj/item/circuitboard/machine/tesla_coil/Initialize()
 	. = ..()
 	if(build_path)
-		name = "Tesla Coil (Machine Board)"
 		build_path = PATH_POWERCOIL

 /obj/item/circuitboard/machine/tesla_coil/attackby(obj/item/I, mob/user, params)
@@ -648,4 +648,4 @@
 	item_state = "defibpaddles0"
 	req_defib = FALSE

-#undef HALFWAYCRITDEATH
+#undef HALFWAYCRITDEATH
@@ -1,4 +1,3 @@
-
 //CREATOR'S NOTE: DO NOT FUCKING GIVE THIS TO BOTANY!
 /obj/item/hot_potato
 	name = "hot potato"
@@ -192,6 +192,14 @@
 	for(var/i in 1 to 7)
 		new /obj/item/reagent_containers/glass/beaker( src )

+/obj/item/storage/box/medsprays
+	name = "box of medical sprayers"
+	desc = "A box full of medical sprayers, with unscrewable caps and precision spray heads."
+
+/obj/item/storage/box/medsprays/PopulateContents()
+	for(var/i in 1 to 7)
+		new /obj/item/reagent_containers/medspray( src )
+
 /obj/item/storage/box/injectors
 	name = "box of DNA injectors"
 	desc = "This box contains injectors, it seems."
@@ -357,5 +357,5 @@
 	if(get_fuel() < max_fuel && nextrefueltick < world.time)
 		nextrefueltick = world.time + 10
 		reagents.add_reagent("welding_fuel", 1)
-		
-#undef WELDER_FUEL_BURN_INTERVAL
+
+#undef WELDER_FUEL_BURN_INTERVAL
@@ -42,6 +42,7 @@
 	icon_state = "waterballoon-e"
 	item_state = "balloon-empty"

+
 /obj/item/toy/balloon/New()
 	create_reagents(10)
 	..()
@@ -286,6 +287,7 @@
 	w_class = WEIGHT_CLASS_SMALL
 	resistance_flags = FLAMMABLE

+
 /obj/item/toy/windupToolbox
 	name = "windup toolbox"
 	desc = "A replica toolbox that rumbles when you turn the key."
@@ -332,7 +334,7 @@

 /obj/item/toy/katana
 	name = "replica katana"
-	desc = "Woefully underpowered in D20. Almost has a sharp edge."
+	desc = "Woefully underpowered in D20."
 	icon = 'icons/obj/items_and_weapons.dmi'
 	icon_state = "katana"
 	item_state = "katana"
@@ -62,4 +62,4 @@
 		new /obj/item/gun/energy/laser/bluetag(src)
 	for(var/i in 1 to 3)
 		new /obj/item/clothing/suit/bluetag(src)
-	new /obj/item/clothing/head/helmet/bluetaghelm(src)
+	new /obj/item/clothing/head/helmet/bluetaghelm(src)
@@ -96,3 +96,5 @@
 	..()
 	new /obj/item/storage/box/pillbottles(src)
 	new /obj/item/storage/box/pillbottles(src)
+	new /obj/item/storage/box/medsprays(src)
+	new /obj/item/storage/box/medsprays(src)