Merge branch 'master' into upstream-merge-37476

# Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit.
2018-05-20 23:11:16 -05:00
parent 1e207a7430 d421ad846a
commit ea9b3622fd
242 changed files with 3178 additions and 2201 deletions
@@ -400,7 +400,7 @@
 						SSticker.mode.make_antag_chance(humanc)

 	if(humanc && CONFIG_GET(flag/roundstart_traits))
-		SStraits.AssignTraits(humanc, humanc.client, TRUE)
+		SSquirks.AssignQuirks(humanc, humanc.client, TRUE)

 	log_manifest(character.mind.key,character.mind,character,latejoin = TRUE)

@@ -592,6 +592,8 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp

 	var/list/possessible = list()
 	for(var/mob/living/L in GLOB.alive_mob_list)
+		if(istype(L,/mob/living/carbon/human/dummy) || !get_turf(L)) //Haha no.
+			continue
 		if(!(L in GLOB.player_list) && !L.mind)
 			possessible += L

@@ -326,7 +326,10 @@
 		I.plane = initial(I.plane)
 		I.appearance_flags &= ~NO_CLIENT_COLOR
 		if(!no_move && !(I.flags_1 & DROPDEL_1))	//item may be moved/qdel'd immedietely, don't bother moving it
-			I.forceMove(newloc)
+			if (isnull(newloc))
+				I.moveToNullspace()
+			else
+				I.forceMove(newloc)
 		I.dropped(src)
 	return TRUE

@@ -193,10 +193,10 @@
 		blood_data["real_name"] = real_name
 		blood_data["features"] = dna.features
 		blood_data["factions"] = faction
-		blood_data["traits"] = list()
-		for(var/V in roundstart_traits)
-			var/datum/trait/T = V
-			blood_data["traits"] += T.type
+		blood_data["quirks"] = list()
+		for(var/V in roundstart_quirks)
+			var/datum/quirk/T = V
+			blood_data["quirks"] += T.type
 		return blood_data

 //get the id of the substance this mob use as blood.
@@ -19,6 +19,7 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy)

 //Inefficient pooling/caching way.
 GLOBAL_LIST_EMPTY(human_dummy_list)
+GLOBAL_LIST_EMPTY(dummy_mob_list)

 /proc/generate_or_wait_for_human_dummy(slotkey)
 	if(!slotkey)
@@ -31,6 +32,7 @@ GLOBAL_LIST_EMPTY(human_dummy_list)
 	if(QDELETED(D))
 		D = new
 		GLOB.human_dummy_list[slotkey] = D
+		GLOB.dummy_mob_list += D
 	D.in_use = TRUE
 	return D

@@ -733,8 +733,8 @@
 				if(0 to NUTRITION_LEVEL_STARVING)
 					to_chat(src, "<span class='danger'>You're starving!</span>")

-			if(roundstart_traits.len)
-				to_chat(src, "<span class='notice'>You have these traits: [get_trait_string()].</span>")
+			if(roundstart_quirks.len)
+				to_chat(src, "<span class='notice'>You have these quirks: [get_trait_string()].</span>")
 		else
 			if(wear_suit)
 				wear_suit.add_fingerprint(M)
@@ -13,7 +13,8 @@
 		message = T.TongueSpeech(message)
 	if(wear_mask)
 		message = wear_mask.speechModification(message)
-
+	if(head)
+		message = head.speechModification(message)
 	return message

 /mob/living/carbon/can_speak_vocal(message)
@@ -407,16 +407,14 @@
 */
 //Recursive function to find everything a mob is holding. Really shitty proc tbh.
 /mob/living/get_contents()
-	. = list()
-	. |= list(src)
-	for(var/obj/o in .)
-		var/list/newlist = list()
-		o.SendSignal(COMSIG_TRY_STORAGE_RETURN_INVENTORY, newlist)
-		. |= newlist
-	for(var/obj/item/clothing/under/U in .)
-		. |= U.contents
-	for(var/obj/item/folder/F in .)
-		. |= F.contents
+	var/list/ret = list()
+	ret |= contents						//add our contents
+	for(var/i in ret.Copy())			//iterate storage objects
+		var/atom/A = i
+		A.SendSignal(COMSIG_TRY_STORAGE_RETURN_INVENTORY, ret)
+	for(var/obj/item/folder/F in ret.Copy())		//very snowflakey-ly iterate folders
+		ret |= F.contents
+	return ret

 // Living mobs use can_inject() to make sure that the mob is not syringe-proof in general.
 /mob/living/proc/can_inject()
@@ -494,6 +492,11 @@
 	ExtinguishMob()
 	fire_stacks = 0
 	update_canmove()
+	GET_COMPONENT(mood, /datum/component/mood)
+	if (mood)
+		QDEL_LIST(mood.mood_events)
+		mood.sanity = SANITY_GREAT
+		mood.update_mood()


 //proc called by revive(), to check if we can actually ressuscitate the mob (we don't want to revive him and have him instantly die again)
@@ -317,8 +317,7 @@
 		return shock_damage

 /mob/living/emp_act(severity)
-	var/list/L = src.get_contents()
-	for(var/obj/O in L)
+	for(var/obj/O in contents)
 		O.emp_act(severity)
 	..()

@@ -34,7 +34,7 @@

 	var/list/status_traits = list()

-	var/list/roundstart_traits = list()
+	var/list/roundstart_quirks = list()

 	var/list/surgeries = list()	//a list of surgery datums. generally empty, they're added when the player wants them.

@@ -170,7 +170,8 @@

 			if(href_list["send"])
 				signaler.send_activation()
-				audible_message("[icon2html(src, world)] *beep* *beep*")
+				audible_message("[icon2html(src, hearers(src))] *beep* *beep* *beep*")
+				playsound(src, 'sound/machines/triple_beep.ogg', ASSEMBLY_BEEP_VOLUME, TRUE)

 			if(href_list["freq"])
 				var/new_frequency = (signaler.frequency + text2num(href_list["freq"]))
@@ -831,7 +831,7 @@
 	set_module = /obj/item/robot_module/janitor

 /mob/living/silicon/robot/modules/syndicate
-	icon_state = "syndie_bloodhound"
+	icon_state = "synd_sec"
 	faction = list(ROLE_SYNDICATE)
 	bubble_icon = "syndibot"
 	req_access = list(ACCESS_SYNDICATE)
@@ -859,7 +859,7 @@
 	return

 /mob/living/silicon/robot/modules/syndicate/medical
-	icon_state = "syndi-medi"
+	icon_state = "synd_medical"
 	playstyle_string = "<span class='big bold'>You are a Syndicate medical cyborg!</span><br>\
 						<b>You are armed with powerful medical tools to aid you in your mission: help the operatives secure the nuclear authentication disk. \
 						Your hypospray will produce Restorative Nanites, a wonder-drug that will heal most types of bodily damages, including clone and brain damage. It also produces morphine for offense. \
@@ -1,7 +1,7 @@
 /obj/item/robot_module
 	name = "Default"
 	icon = 'icons/obj/module.dmi'
-	icon_state = "std_module"
+	icon_state = "std_mod"
 	w_class = WEIGHT_CLASS_GIGANTIC
 	item_state = "electronic"
 	lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
@@ -164,12 +164,7 @@
 	update_controls()

 /mob/living/simple_animal/bot/floorbot/proc/empty_tiles()
-	var/atom/Tsec = drop_location()
-
-	while(specialtiles > initial(tiletype.max_amount))
-		new tiletype(Tsec,initial(tiletype.max_amount))
-		specialtiles -= initial(tiletype.max_amount)
-	new tiletype(Tsec,specialtiles)
+	new tiletype(drop_location(), specialtiles)
 	specialtiles = 0
 	tiletype = null

@@ -378,8 +373,7 @@
 	if(prob(50))
 		drop_part(robot_arm, Tsec)

-	var/obj/item/stack/tile/plasteel/T = new (Tsec)
-	T.amount = 1
+	new /obj/item/stack/tile/plasteel(Tsec, 1)

 	do_sparks(3, TRUE, src)
 	..()
@@ -2,7 +2,7 @@
 	name = "\improper honkbot"
 	desc = "A little robot. It looks happy with its bike horn."
 	icon = 'icons/mob/aibots.dmi'
-	icon_state = "honkbot"
+	icon_state = "honkbot1"
 	density = FALSE
 	anchored = FALSE
 	health = 25
@@ -27,6 +27,7 @@
 	attacktext = "pummels"
 	attack_sound = 'sound/weapons/punch1.ogg'
 	dextrous = TRUE
+	held_items = list(null, null)
 	possible_a_intents = list(INTENT_HELP, INTENT_GRAB, INTENT_DISARM, INTENT_HARM)
 	faction = list("jungle")
 	robust_searching = TRUE
@@ -9,7 +9,7 @@
 	icon_dead = "Fugu_dead"
 	icon_gib = "syndicate_gib"
 	mob_biotypes = list(MOB_ORGANIC, MOB_BEAST)
-	mouse_opacity = MOUSE_OPACITY_OPAQUE
+	mouse_opacity = MOUSE_OPACITY_ICON
 	move_to_delay = 5
 	friendly = "floats near"
 	speak_emote = list("puffs")
@@ -146,12 +146,12 @@
 	else
 		status_traits[trait] |= list(source)

-/mob/living/proc/add_trait_datum(trait, spawn_effects) //separate proc due to the way these ones are handled
-	if(has_trait(trait))
+/mob/living/proc/add_quirk(quirk, spawn_effects) //separate proc due to the way these ones are handled
+	if(has_trait(quirk))
 		return
-	if(!SStraits || !SStraits.traits[trait])
+	if(!SSquirks || !SSquirks.quirks[quirk])
 		return
-	var/datum/trait/T = SStraits.traits[trait]
+	var/datum/quirk/T = SSquirks.quirks[quirk]
 	new T (src, spawn_effects)
 	return TRUE

@@ -180,8 +180,8 @@
 	if(!LAZYLEN(status_traits[trait]))
 		status_traits -= trait

-/mob/living/proc/remove_trait_datum(trait)
-	var/datum/trait/T = roundstart_traits[trait]
+/mob/living/proc/remove_quirk(quirk)
+	var/datum/quirk/T = roundstart_quirks[quirk]
 	if(T)
 		qdel(T)
 		return TRUE
@@ -201,8 +201,8 @@
 	else if(LAZYLEN(status_traits[trait]))
 		return TRUE

-/mob/living/proc/has_trait_datum(trait)
-	return roundstart_traits[trait]
+/mob/living/proc/has_quirk(quirk)
+	return roundstart_quirks[quirk]

 /mob/living/proc/remove_all_traits()
 	status_traits = list()
@@ -70,7 +70,7 @@

 	message = src.say_quote(message, get_spans())
 	var/rendered = "<span class='game deadsay'><span class='prefix'>DEAD:</span> <span class='name'>[name]</span>[alt_name] <span class='message'>[message]</span></span>"
-
+	log_message("DEAD: [message]", INDIVIDUAL_SAY_LOG)
 	deadchat_broadcast(rendered, follow_target = src, speaker_key = K)

 /mob/proc/check_emote(message)