[M]'s [name] starts to fall apart!", "Your [name] starts to fall apart!")
+ to_chat(M, "Your [name] starts to fall apart!")
/obj/item/clothing/proc/update_clothes_damaged_state(damaging = TRUE)
var/index = "[REF(initial(icon))]-[initial(icon_state)]"
diff --git a/code/modules/clothing/glasses/_glasses.dm b/code/modules/clothing/glasses/_glasses.dm
index 6e25db1fa6..097b10cae5 100644
--- a/code/modules/clothing/glasses/_glasses.dm
+++ b/code/modules/clothing/glasses/_glasses.dm
@@ -378,10 +378,13 @@
vision_flags = SEE_TURFS|SEE_MOBS|SEE_OBJS
darkness_view = 8
scan_reagents = TRUE
- item_flags = NODROP
lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
resistance_flags = LAVA_PROOF | FIRE_PROOF
+/obj/item/clothing/glasses/godeye/Initialize()
+ . = ..()
+ ADD_TRAIT(src, TRAIT_NODROP, EYE_OF_GOD_TRAIT)
+
/obj/item/clothing/glasses/godeye/attackby(obj/item/W as obj, mob/user as mob, params)
if(istype(W, src) && W != src && W.loc == user)
if(W.icon_state == "godeye")
diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm
index 0cd96eaebc..e95a836a0d 100644
--- a/code/modules/clothing/gloves/color.dm
+++ b/code/modules/clothing/gloves/color.dm
@@ -32,7 +32,7 @@
. = ..()
siemens_coefficient = pick(0,0,0,0.5,0.5,0.5,0.75)
-/obj/item/clothing/gloves/cut
+/obj/item/clothing/gloves/cut
desc = "These gloves would protect the wearer from electric shock.. if the fingers were covered."
name = "fingerless insulated gloves"
icon_state = "yellowcut"
@@ -218,32 +218,3 @@
/obj/item/clothing/gloves/color/white/redcoat
item_color = "redcoat" //Exists for washing machines. Is not different from white gloves in any way.
-
-/obj/item/clothing/gloves/color/random
- name = "random gloves"
- desc = "These gloves are supposed to be a random color..."
- icon_state = "random_gloves"
- item_state = "wgloves"
- item_color = "mime"
-
-/obj/item/clothing/gloves/color/random/Initialize()
- ..()
- var/list/gloves = list(
- /obj/item/clothing/gloves/color/orange = 1,
- /obj/item/clothing/gloves/color/red = 1,
- /obj/item/clothing/gloves/color/blue = 1,
- /obj/item/clothing/gloves/color/purple = 1,
- /obj/item/clothing/gloves/color/green = 1,
- /obj/item/clothing/gloves/color/grey = 1,
- /obj/item/clothing/gloves/color/light_brown = 1,
- /obj/item/clothing/gloves/color/brown = 1,
- /obj/item/clothing/gloves/color/white = 1,
- /obj/item/clothing/gloves/color/rainbow = 1)
-
- var/obj/item/clothing/gloves/color/selected = pick(gloves)
- if(ishuman(loc))
- var/mob/living/carbon/human/H = loc
- H.equip_to_slot_or_del(new selected(H), SLOT_GLOVES)
- else
- new selected(loc)
- return INITIALIZE_HINT_QDEL
diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm
index 8ffcc6eea7..f4b4e4a96d 100644
--- a/code/modules/clothing/head/helmet.dm
+++ b/code/modules/clothing/head/helmet.dm
@@ -54,6 +54,8 @@
tint = 2
/obj/item/clothing/head/helmet/blueshirt
+ name = "blue helmet"
+ desc = "A reliable, blue tinted helmet reminding you that you still owe that engineer a beer."
icon_state = "blueshift"
item_state = "blueshift"
diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm
index 07817ec4e4..23e1825c3d 100644
--- a/code/modules/clothing/head/jobs.dm
+++ b/code/modules/clothing/head/jobs.dm
@@ -47,6 +47,7 @@
name = "captain's beret"
desc = "A beret fit for a leader."
icon_state = "capberet"
+ dynamic_hair_suffix = ""
dog_fashion = null
@@ -62,6 +63,7 @@
name = "head of personnel's beret"
desc = "The symbol of true bureaucratic micromanagement, although in a fancy form."
icon_state = "hopberet"
+ dynamic_hair_suffix = ""
dog_fashion = null
@@ -119,9 +121,12 @@
/obj/item/clothing/head/beret/highlander
desc = "That was white fabric. Was."
- item_flags = NODROP
dog_fashion = null //THIS IS FOR SLAUGHTER, NOT PUPPIES
+/obj/item/clothing/head/beret/highlander/Initialize()
+ . = ..()
+ ADD_TRAIT(src, TRAIT_NODROP, HIGHLANDER)
+
//Security
/obj/item/clothing/head/HoS
@@ -184,33 +189,41 @@
mode = DRILL_CANADIAN
return TRUE
-/obj/item/clothing/head/warden/drill/speechModification(M)
- if(copytext(M, 1, 2) != "*")
- if(mode == DRILL_DEFAULT)
- M = " [M]"
- return trim(M)
- if(mode == DRILL_SHOUTING)
- M = " [M]!"
- return trim(M)
- if(mode == DRILL_YELLING)
- M = " [M]!!"
- return trim(M)
- if(mode == DRILL_CANADIAN)
- M = " [M]"
- var/list/canadian_words = strings("canadian_replacement.json", "canadian")
+/obj/item/clothing/head/warden/drill/equipped(mob/M, slot)
+ . = ..()
+ if (slot == SLOT_HEAD)
+ RegisterSignal(M, COMSIG_MOB_SAY, .proc/handle_speech)
+ else
+ UnregisterSignal(M, COMSIG_MOB_SAY)
- for(var/key in canadian_words)
- var/value = canadian_words[key]
- if(islist(value))
- value = pick(value)
+/obj/item/clothing/head/warden/drill/dropped(mob/M)
+ . = ..()
+ UnregisterSignal(M, COMSIG_MOB_SAY)
- M = replacetextEx(M, " [uppertext(key)]", " [uppertext(value)]")
- M = replacetextEx(M, " [capitalize(key)]", " [capitalize(value)]")
- M = replacetextEx(M, " [key]", " [value]")
+/obj/item/clothing/head/warden/drill/proc/handle_speech(datum/source, mob/speech_args)
+ var/message = speech_args[SPEECH_MESSAGE]
+ if(message[1] != "*")
+ switch (mode)
+ if(DRILL_SHOUTING)
+ message += "!"
+ if(DRILL_YELLING)
+ message += "!!"
+ if(DRILL_CANADIAN)
+ message = " [message]"
+ var/list/canadian_words = strings("canadian_replacement.json", "canadian")
- if(prob(30))
- M += pick(", eh?", ", EH?")
- return trim(M)
+ for(var/key in canadian_words)
+ var/value = canadian_words[key]
+ if(islist(value))
+ value = pick(value)
+
+ message = replacetextEx(message, " [uppertext(key)]", " [uppertext(value)]")
+ message = replacetextEx(message, " [capitalize(key)]", " [capitalize(value)]")
+ message = replacetextEx(message, " [key]", " [value]")
+
+ if(prob(30))
+ message += pick(", eh?", ", EH?")
+ speech_args[SPEECH_MESSAGE] = message
/obj/item/clothing/head/beret/sec
name = "security beret"
diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm
index d9c151a47b..73fde5d50f 100644
--- a/code/modules/clothing/head/misc.dm
+++ b/code/modules/clothing/head/misc.dm
@@ -221,9 +221,12 @@
icon_state = "shamebrero"
item_state = "shamebrero"
desc = "Once it's on, it never comes off."
- item_flags = NODROP
dog_fashion = null
+/obj/item/clothing/head/sombrero/shamebrero/Initialize()
+ . = ..()
+ ADD_TRAIT(src, TRAIT_NODROP, SHAMEBRERO_TRAIT)
+
/obj/item/clothing/head/cone
desc = "This cone is trying to warn you of something!"
name = "warning cone"
@@ -330,9 +333,21 @@
icon_state = "beretblack"
dynamic_hair_suffix = ""
-/obj/item/clothing/head/frenchberet/speechModification(M)
- if(copytext(M, 1, 2) != "*")
- M = " [M]"
+/obj/item/clothing/head/frenchberet/equipped(mob/M, slot)
+ . = ..()
+ if (slot == SLOT_HEAD)
+ RegisterSignal(M, COMSIG_MOB_SAY, .proc/handle_speech)
+ else
+ UnregisterSignal(M, COMSIG_MOB_SAY)
+
+/obj/item/clothing/head/frenchberet/dropped(mob/M)
+ . = ..()
+ UnregisterSignal(M, COMSIG_MOB_SAY)
+
+/obj/item/clothing/head/frenchberet/proc/handle_speech(datum/source, mob/speech_args)
+ var/message = speech_args[SPEECH_MESSAGE]
+ if(message[1] != "*")
+ message = " [message]"
var/list/french_words = strings("french_replacement.json", "french")
for(var/key in french_words)
@@ -340,10 +355,10 @@
if(islist(value))
value = pick(value)
- M = replacetextEx(M, " [uppertext(key)]", " [uppertext(value)]")
- M = replacetextEx(M, " [capitalize(key)]", " [capitalize(value)]")
- M = replacetextEx(M, " [key]", " [value]")
+ message = replacetextEx(message, " [uppertext(key)]", " [uppertext(value)]")
+ message = replacetextEx(message, " [capitalize(key)]", " [capitalize(value)]")
+ message = replacetextEx(message, " [key]", " [value]")
if(prob(3))
- M += pick(" Honh honh honh!"," Honh!"," Zut Alors!")
- return trim(M)
+ message += pick(" Honh honh honh!"," Honh!"," Zut Alors!")
+ speech_args[SPEECH_MESSAGE] = trim(message)
diff --git a/code/modules/clothing/masks/_masks.dm b/code/modules/clothing/masks/_masks.dm
index 8f10184f86..9ee2ebcd54 100644
--- a/code/modules/clothing/masks/_masks.dm
+++ b/code/modules/clothing/masks/_masks.dm
@@ -5,12 +5,54 @@
slot_flags = ITEM_SLOT_MASK
strip_delay = 40
equip_delay_other = 40
+ var/modifies_speech = FALSE
var/mask_adjusted = 0
var/adjusted_flags = null
var/muzzle_var = NORMAL_STYLE
mutantrace_variation = NO_MUTANTRACE_VARIATION //most masks have overrides, but not all probably.
+/obj/item/clothing/mask/attack_self(mob/user)
+ if(CHECK_BITFIELD(clothing_flags, VOICEBOX_TOGGLABLE))
+ TOGGLE_BITFIELD(clothing_flags, VOICEBOX_DISABLED)
+ var/status = !CHECK_BITFIELD(clothing_flags, VOICEBOX_DISABLED)
+ to_chat(user, "You turn the voice box in [src] [status ? "on" : "off"].")
+
+/obj/item/clothing/mask/equipped(mob/M, slot)
+ . = ..()
+ if (slot == SLOT_WEAR_MASK && modifies_speech)
+ RegisterSignal(M, COMSIG_MOB_SAY, .proc/handle_speech)
+ else
+ UnregisterSignal(M, COMSIG_MOB_SAY)
+ if(!ishuman(M))
+ return
+ var/mob/living/carbon/human/H = M
+ var/datum/species/pref_species = H.dna.species
+
+ if(mutantrace_variation)
+ if("mam_snouts" in pref_species.default_features)
+ if(H.dna.features["mam_snouts"] != "None")
+ muzzle_var = ALT_STYLE
+ else
+ muzzle_var = NORMAL_STYLE
+
+ else if("snout" in pref_species.default_features)
+ if(H.dna.features["snout"] != "None")
+ muzzle_var = ALT_STYLE
+ else
+ muzzle_var = NORMAL_STYLE
+
+ else
+ muzzle_var = NORMAL_STYLE
+
+ H.update_inv_wear_mask()
+
+/obj/item/clothing/mask/dropped(mob/M)
+ . = ..()
+ UnregisterSignal(M, COMSIG_MOB_SAY)
+
+/obj/item/clothing/mask/proc/handle_speech()
+
/obj/item/clothing/mask/worn_overlays(isinhands = FALSE)
. = list()
if(!isinhands)
@@ -20,31 +62,6 @@
IF_HAS_BLOOD_DNA(src)
. += mutable_appearance('icons/effects/blood.dmi', "maskblood")
-/obj/item/clothing/mask/equipped(mob/user, slot)
- ..()
- if(ishuman(user))
- var/mob/living/carbon/human/H = user
- var/datum/species/pref_species = H.dna.species
-
- if(mutantrace_variation)
- if("mam_snouts" in pref_species.default_features)
- if(H.dna.features["mam_snouts"] != "None")
- muzzle_var = ALT_STYLE
- else
- muzzle_var = NORMAL_STYLE
-
- else if("snout" in pref_species.default_features)
- if(H.dna.features["snout"] != "None")
- muzzle_var = ALT_STYLE
- else
- muzzle_var = NORMAL_STYLE
-
- else
- muzzle_var = NORMAL_STYLE
-
- H.update_inv_wear_mask()
-
-
/obj/item/clothing/mask/update_clothes_damaged_state(damaging = TRUE)
..()
if(ismob(loc))
diff --git a/code/modules/clothing/masks/boxing.dm b/code/modules/clothing/masks/boxing.dm
index c0752d9799..3960bdadeb 100644
--- a/code/modules/clothing/masks/boxing.dm
+++ b/code/modules/clothing/masks/boxing.dm
@@ -20,9 +20,11 @@
flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
w_class = WEIGHT_CLASS_SMALL
mutantrace_variation = MUTANTRACE_VARIATION
+ modifies_speech = TRUE
-/obj/item/clothing/mask/luchador/speechModification(message)
- if(copytext(message, 1, 2) != "*")
+/obj/item/clothing/mask/luchador/handle_speech(datum/source, list/speech_args)
+ var/message = speech_args[SPEECH_MESSAGE]
+ if(message[1] != "*")
message = replacetext(message, "captain", "CAPITÁN")
message = replacetext(message, "station", "ESTACIÓN")
message = replacetext(message, "sir", "SEÑOR")
@@ -42,7 +44,7 @@
message = uppertext(message) //Things end up looking better this way (no mixed cases), and it fits the macho wrestler image.
if(prob(25))
message += " OLE!"
- return message
+ speech_args[SPEECH_MESSAGE] = message
/obj/item/clothing/mask/luchador/tecnicos
name = "Tecnicos Mask"
diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm
index 9476c50603..5dfa7d6047 100644
--- a/code/modules/clothing/masks/miscellaneous.dm
+++ b/code/modules/clothing/masks/miscellaneous.dm
@@ -46,10 +46,12 @@
/obj/item/clothing/mask/fakemoustache/italian
name = "italian moustache"
desc = "Made from authentic Italian moustache hairs. Gives the wearer an irresistable urge to gesticulate wildly."
+ modifies_speech = TRUE
-/obj/item/clothing/mask/fakemoustache/italian/speechModification(M)
- if(copytext(M, 1, 2) != "*")
- M = " [M]"
+/obj/item/clothing/mask/fakemoustache/italian/handle_speech(datum/source, list/speech_args)
+ var/message = speech_args[SPEECH_MESSAGE]
+ if(message[1] != "*")
+ message = " [message]"
var/list/italian_words = strings("italian_replacement.json", "italian")
for(var/key in italian_words)
@@ -57,13 +59,13 @@
if(islist(value))
value = pick(value)
- M = replacetextEx(M, " [uppertext(key)]", " [uppertext(value)]")
- M = replacetextEx(M, " [capitalize(key)]", " [capitalize(value)]")
- M = replacetextEx(M, " [key]", " [value]")
+ message = replacetextEx(message, " [uppertext(key)]", " [uppertext(value)]")
+ message = replacetextEx(message, " [capitalize(key)]", " [capitalize(value)]")
+ message = replacetextEx(message, " [key]", " [value]")
if(prob(3))
- M += pick(" Ravioli, ravioli, give me the formuoli!"," Mamma-mia!"," Mamma-mia! That's a spicy meat-ball!", " La la la la la funiculi funicula!")
- return trim(M)
+ message += pick(" Ravioli, ravioli, give me the formuoli!"," Mamma-mia!"," Mamma-mia! That's a spicy meat-ball!", " La la la la la funiculi funicula!")
+ speech_args[SPEECH_MESSAGE] = trim(message)
/obj/item/clothing/mask/joy
name = "joy mask"
@@ -73,36 +75,28 @@
/obj/item/clothing/mask/pig
name = "pig mask"
- desc = "A rubber pig mask."
+ desc = "A rubber pig mask with a builtin voice modulator."
icon_state = "pig"
item_state = "pig"
flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
+ clothing_flags = VOICEBOX_TOGGLABLE
w_class = WEIGHT_CLASS_SMALL
- actions_types = list(/datum/action/item_action/toggle_voice_box)
- var/voicechange = 0
+ modifies_speech = TRUE
-/obj/item/clothing/mask/pig/attack_self(mob/user)
- voicechange = !voicechange
- to_chat(user, "You turn the voice box [voicechange ? "on" : "off"]!")
+/obj/item/clothing/mask/pig/handle_speech(datum/source, list/speech_args)
+ if(!CHECK_BITFIELD(clothing_flags, VOICEBOX_DISABLED))
+ speech_args[SPEECH_MESSAGE] = pick("Oink!","Squeeeeeeee!","Oink Oink!")
-/obj/item/clothing/mask/pig/speechModification(message)
- if(voicechange)
- message = pick("Oink!","Squeeeeeeee!","Oink Oink!")
- return message
-
-/obj/item/clothing/mask/spig //needs to be different otherwise you could turn the speedmodification off and on
+/obj/item/clothing/mask/pig/cursed //needs to be different otherwise you could turn the speedmodification off and on
name = "Pig face"
desc = "It looks like a mask, but closer inspection reveals it's melded onto this persons face!" //It's only ever going to be attached to your face.
- icon_state = "pig"
- item_state = "pig"
- flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
- w_class = WEIGHT_CLASS_SMALL
- var/voicechange = 1
+ flags_inv = HIDEFACIALHAIR
+ clothing_flags = NONE
-/obj/item/clothing/mask/spig/speechModification(message)
- if(voicechange)
- message = pick("Oink!","Squeeeeeeee!","Oink Oink!")
- return message
+/obj/item/clothing/mask/pig/cursed/Initialize()
+ . = ..()
+ ADD_TRAIT(src, TRAIT_NODROP, CURSED_MASK_TRAIT)
+ playsound(get_turf(src), 'sound/magic/pighead_curse.ogg', 50, 1)
///frog mask - reeee!!
/obj/item/clothing/mask/frog
@@ -112,47 +106,55 @@
item_state = "frog"
flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
w_class = WEIGHT_CLASS_SMALL
- var/voicechange = TRUE
+ clothing_flags = VOICEBOX_TOGGLABLE
+ modifies_speech = TRUE
-/obj/item/clothing/mask/frog/attack_self(mob/user)
- voicechange = !voicechange
- to_chat(user, "You turn the voice box [voicechange ? "on" : "off"]!")
-
-/obj/item/clothing/mask/frog/speechModification(message) //whenever you speak
- if(voicechange)
+/obj/item/clothing/mask/frog/handle_speech(datum/source, list/speech_args) //whenever you speak
+ if(!CHECK_BITFIELD(clothing_flags, VOICEBOX_DISABLED))
if(prob(5)) //sometimes, the angry spirit finds others words to speak.
- message = pick("HUUUUU!!","SMOOOOOKIN'!!","Hello my baby, hello my honey, hello my rag-time gal.", "Feels bad, man.", "GIT DIS GUY OFF ME!!" ,"SOMEBODY STOP ME!!", "NORMIES, GET OUT!!")
+ speech_args[SPEECH_MESSAGE] = pick("HUUUUU!!","SMOOOOOKIN'!!","Hello my baby, hello my honey, hello my rag-time gal.", "Feels bad, man.", "GIT DIS GUY OFF ME!!" ,"SOMEBODY STOP ME!!", "NORMIES, GET OUT!!")
else
- message = pick("Ree!!", "Reee!!","REEE!!","REEEEE!!") //but its usually just angry gibberish,
- return message
+ speech_args[SPEECH_MESSAGE] = pick("Ree!!", "Reee!!","REEE!!","REEEEE!!") //but its usually just angry gibberish,
/obj/item/clothing/mask/frog/cursed
- item_flags = NODROP //reee!!
+ clothing_flags = NONE
-/obj/item/clothing/mask/frog/cursed/attack_self(mob/user)
- return //no voicebox to alter.
+/obj/item/clothing/mask/frog/cursed/Initialize()
+ . = ..()
+ ADD_TRAIT(src, TRAIT_NODROP, CURSED_MASK_TRAIT)
/obj/item/clothing/mask/frog/cursed/equipped(mob/user, slot)
var/mob/living/carbon/C = user
- if(C.wear_mask == src)
- to_chat(user, "[src] was cursed! Ree!!")
+ if(C.wear_mask == src && HAS_TRAIT_FROM(src, TRAIT_NODROP, CURSED_ITEM_TRAIT))
+ to_chat(user, "[src] was cursed! Ree!!")
return ..()
-
/obj/item/clothing/mask/cowmask
- name = "Cowface"
- desc = "It looks like a mask, but closer inspection reveals it's melded onto this persons face!"
+ name = "Cow mask with a builtin voice modulator."
+ desc = "A rubber cow mask,"
icon = 'icons/mob/mask.dmi'
icon_state = "cowmask"
item_state = "cowmask"
+ clothing_flags = VOICEBOX_TOGGLABLE
flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
w_class = WEIGHT_CLASS_SMALL
- var/voicechange = 1
+ modifies_speech = TRUE
-/obj/item/clothing/mask/cowmask/speechModification(message)
- if(voicechange)
- message = pick("Moooooooo!","Moo!","Moooo!")
- return message
+/obj/item/clothing/mask/cowmask/handle_speech(datum/source, list/speech_args)
+ if(!CHECK_BITFIELD(clothing_flags, VOICEBOX_DISABLED))
+ speech_args[SPEECH_MESSAGE] = pick("Moooooooo!","Moo!","Moooo!")
+
+
+/obj/item/clothing/mask/cowmask/cursed
+ name = "cow face"
+ desc = "It looks like a cow mask, but closer inspection reveals it's melded onto this persons face!"
+ flags_inv = HIDEFACIALHAIR
+ clothing_flags = NONE
+
+/obj/item/clothing/mask/cowmask/cursed/Initialize()
+ . = ..()
+ ADD_TRAIT(src, TRAIT_NODROP, CURSED_MASK_TRAIT)
+ playsound(get_turf(src), 'sound/magic/cowhead_curse.ogg', 50, 1)
/obj/item/clothing/mask/horsehead
name = "horse head mask"
@@ -161,12 +163,23 @@
item_state = "horsehead"
flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDEEYES|HIDEEARS
w_class = WEIGHT_CLASS_SMALL
- var/voicechange = 1
+ clothing_flags = VOICEBOX_TOGGLABLE
-/obj/item/clothing/mask/horsehead/speechModification(message)
- if(voicechange)
- message = pick("NEEIIGGGHHHH!", "NEEEIIIIGHH!", "NEIIIGGHH!", "HAAWWWWW!", "HAAAWWW!")
- return message
+/obj/item/clothing/mask/horsehead/handle_speech(datum/source, list/speech_args)
+ if(!CHECK_BITFIELD(clothing_flags, VOICEBOX_DISABLED))
+ speech_args[SPEECH_MESSAGE] = pick("NEEIIGGGHHHH!", "NEEEIIIIGHH!", "NEIIIGGHH!", "HAAWWWWW!", "HAAAWWW!")
+
+
+/obj/item/clothing/mask/horsehead/cursed
+ name = "horse face"
+ desc = "It initially looks like a mask, but it's melded into the poor person's face."
+ clothing_flags = NONE
+ flags_inv = HIDEFACIALHAIR
+
+/obj/item/clothing/mask/horsehead/cursed/Initialize()
+ . = ..()
+ ADD_TRAIT(src, TRAIT_NODROP, CURSED_MASK_TRAIT)
+ playsound(get_turf(src), 'sound/magic/horsehead_curse.ogg', 50, 1)
/obj/item/clothing/mask/rat
name = "rat mask"
@@ -285,16 +298,18 @@
item_state = "gondola"
flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
w_class = WEIGHT_CLASS_SMALL
+ modifies_speech = TRUE
-/obj/item/clothing/mask/gondola/speechModification(M)
- if(copytext(M, 1, 2) != "*")
- M = " [M]"
+/obj/item/clothing/mask/gondola/handle_speech(datum/source, list/speech_args)
+ var/message = speech_args[SPEECH_MESSAGE]
+ if(message[1] != "*")
+ message = " [message]"
var/list/spurdo_words = strings("spurdo_replacement.json", "spurdo")
for(var/key in spurdo_words)
var/value = spurdo_words[key]
if(islist(value))
value = pick(value)
- M = replacetextEx(M,regex(uppertext(key),"g"), "[uppertext(value)]")
- M = replacetextEx(M,regex(capitalize(key),"g"), "[capitalize(value)]")
- M = replacetextEx(M,regex(key,"g"), "[value]")
- return trim(M)
+ message = replacetextEx(message,regex(uppertext(key),"g"), "[uppertext(value)]")
+ message = replacetextEx(message,regex(capitalize(key),"g"), "[capitalize(value)]")
+ message = replacetextEx(message,regex(key,"g"), "[value]")
+ speech_args[SPEECH_MESSAGE] = trim(message)
diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm
index a6bcf23a2d..e6554f6125 100644
--- a/code/modules/clothing/shoes/miscellaneous.dm
+++ b/code/modules/clothing/shoes/miscellaneous.dm
@@ -9,7 +9,7 @@
/obj/item/clothing/shoes/combat //basic syndicate combat boots for nuke ops and mob corpses
name = "combat boots"
desc = "High speed, low drag combat boots."
- icon_state = "jackboots"
+ icon_state = "combat"
item_state = "jackboots"
lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi'
@@ -157,7 +157,11 @@
icon_state = "cultalt"
/obj/item/clothing/shoes/cult/alt/ghost
- item_flags = NODROP | DROPDEL
+ item_flags = DROPDEL
+
+/obj/item/clothing/shoes/cult/alt/ghost/Initialize()
+ . = ..()
+ ADD_TRAIT(src, TRAIT_NODROP, CULT_TRAIT)
/obj/item/clothing/shoes/cyborg
name = "cyborg boots"
diff --git a/code/modules/clothing/spacesuits/chronosuit.dm b/code/modules/clothing/spacesuits/chronosuit.dm
index d0820304fe..5a53e2776a 100644
--- a/code/modules/clothing/spacesuits/chronosuit.dm
+++ b/code/modules/clothing/spacesuits/chronosuit.dm
@@ -27,7 +27,6 @@
armor = list("melee" = 60, "bullet" = 60, "laser" = 60, "energy" = 60, "bomb" = 30, "bio" = 90, "rad" = 90, "fire" = 100, "acid" = 1000)
resistance_flags = FIRE_PROOF | ACID_PROOF
var/list/chronosafe_items = list(/obj/item/chrono_eraser, /obj/item/gun/energy/chrono_gun)
- var/list/hands_nodrop = list()
var/obj/item/clothing/head/helmet/space/chronos/helmet = null
var/obj/effect/chronos_cam/camera = null
var/datum/action/innate/chrono_teleport/teleport_now = new
@@ -97,8 +96,7 @@
user.anchored = FALSE
teleporting = 0
for(var/obj/item/I in user.held_items)
- if(I in hands_nodrop)
- I.item_flags &= ~NODROP
+ REMOVE_TRAIT(I, TRAIT_NODROP, CHRONOSUIT_TRAIT)
if(camera)
camera.remove_target_ui()
camera.forceMove(user)
@@ -131,11 +129,8 @@
user.ExtinguishMob()
- hands_nodrop = list()
for(var/obj/item/I in user.held_items)
- if(!(I.item_flags & NODROP))
- hands_nodrop += I
- I.item_flags |= NODROP
+ ADD_TRAIT(I, TRAIT_NODROP, CHRONOSUIT_TRAIT)
user.animate_movement = NO_STEPS
user.changeNext_move(8 + phase_in_ds)
user.notransform = 1
@@ -194,9 +189,9 @@
if(user.head && istype(user.head, /obj/item/clothing/head/helmet/space/chronos))
to_chat(user, "\[ ok \] Mounting /dev/helm")
helmet = user.head
- helmet.item_flags |= NODROP
+ ADD_TRAIT(helmet, TRAIT_NODROP, CHRONOSUIT_TRAIT)
helmet.suit = src
- src.item_flags |= NODROP
+ ADD_TRAIT(src, TRAIT_NODROP, CHRONOSUIT_TRAIT)
to_chat(user, "\[ ok \] Starting brainwave scanner")
to_chat(user, "\[ ok \] Starting ui display driver")
to_chat(user, "\[ ok \] Initializing chronowalk4-view")
@@ -215,7 +210,7 @@
activating = 1
var/mob/living/carbon/human/user = src.loc
var/hard_landing = teleporting && force
- item_flags &= ~NODROP
+ REMOVE_TRAIT(src, TRAIT_NODROP, CHRONOSUIT_TRAIT)
cooldown = world.time + cooldowntime * 1.5
activated = 0
activating = 0
@@ -236,7 +231,7 @@
to_chat(user, "\[ ok \] Unmounting /dev/helmet")
to_chat(user, "logout")
if(helmet)
- helmet.item_flags &= ~NODROP
+ REMOVE_TRAIT(helmet, TRAIT_NODROP, CHRONOSUIT_TRAIT)
helmet.suit = null
helmet = null
if(camera)
diff --git a/code/modules/clothing/spacesuits/flightsuit.dm b/code/modules/clothing/spacesuits/flightsuit.dm
index 176bc81665..b105b72234 100644
--- a/code/modules/clothing/spacesuits/flightsuit.dm
+++ b/code/modules/clothing/spacesuits/flightsuit.dm
@@ -897,7 +897,7 @@
usermessage("You're already wearing something on your back!", "boldwarning")
return FALSE
user.equip_to_slot_if_possible(pack,SLOT_BACK,0,0,1)
- pack.item_flags |= NODROP
+ ADD_TRAIT(pack, TRAIT_NODROP, FLIGHTSUIT_TRAIT)
resync()
user.visible_message("A [pack.name] extends from [user]'s [name] and clamps to [user.p_their()] back!")
user.update_inv_wear_suit()
@@ -911,7 +911,7 @@
return FALSE
if(pack.flight && forced)
pack.disable_flight(1)
- pack.item_flags &= ~NODROP
+ REMOVE_TRAIT_FROM(pack, TRAIT_NODROP, FLIGHTSUIT_TRAIT)
resync()
if(user)
user.transferItemToLoc(pack, src, TRUE)
@@ -935,14 +935,14 @@
usermessage("You're already wearing something on your feet!", "boldwarning")
return FALSE
user.equip_to_slot_if_possible(shoes,SLOT_SHOES,0,0,1)
- shoes.item_flags |= NODROP
+ ADD_TRAIT(shoes, TRAIT_NODROP, FLIGHTSUIT_TRAIT)
user.visible_message("[user]'s [name] extends a pair of [shoes.name] over [user.p_their()] feet!")
user.update_inv_wear_suit()
playsound(src.loc, 'sound/mecha/mechmove03.ogg', 50, 1)
deployedshoes = TRUE
/obj/item/clothing/suit/space/hardsuit/flightsuit/proc/retract_flightshoes(forced = FALSE)
- shoes.item_flags &= ~NODROP
+ REMOVE_TRAIT_FROM(shoes, TRAIT_NODROP, FLIGHTSUIT_TRAIT)
playsound(src, 'sound/mecha/mechmove03.ogg', 50, 1)
if(user)
user.transferItemToLoc(shoes, src, TRUE)
diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm
index 22eac9f5aa..85503c720a 100644
--- a/code/modules/clothing/spacesuits/hardsuit.dm
+++ b/code/modules/clothing/spacesuits/hardsuit.dm
@@ -766,12 +766,15 @@
icon_state = "ert_medical"
item_state = "ert_medical"
item_color = "ert_medical"
- item_flags = NODROP //Dont want people changing into the other teams gear
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/shielded/ctf
armor = list("melee" = 0, "bullet" = 30, "laser" = 30, "energy" = 30, "bomb" = 50, "bio" = 100, "rad" = 100, "fire" = 95, "acid" = 95)
slowdown = 0
max_charges = 5
+/obj/item/clothing/suit/space/hardsuit/shielded/ctf/Initialize()
+ . = ..()
+ ADD_TRAIT(src, TRAIT_NODROP, CAPTURE_THE_FLAG_TRAIT)
+
/obj/item/clothing/suit/space/hardsuit/shielded/ctf/red
name = "red shielded hardsuit"
icon_state = "ert_security"
diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm
index 6d7c1036be..5d718a8173 100644
--- a/code/modules/clothing/spacesuits/miscellaneous.dm
+++ b/code/modules/clothing/spacesuits/miscellaneous.dm
@@ -171,10 +171,13 @@ Contains:
item_color = "ert_commander"
armor = list("melee" = 65, "bullet" = 50, "laser" = 50, "energy" = 50, "bomb" = 50, "bio" = 100, "rad" = 100, "fire" = 80, "acid" = 80)
strip_delay = 130
- item_flags = NODROP
brightness_on = 7
resistance_flags = ACID_PROOF
+/obj/item/clothing/head/helmet/space/hardsuit/ert/Initialize()
+ . = ..()
+ ADD_TRAIT(src, TRAIT_NODROP, LOCKED_HELMET_TRAIT)
+
/obj/item/clothing/suit/space/hardsuit/ert
name = "emergency response team suit"
desc = "Standard issue command suit for the ERT."
@@ -237,8 +240,6 @@ Contains:
item_state = "hardsuit0-ert_commander-alert"
item_color = "ert_commander-alert"
armor = list("melee" = 70, "bullet" = 55, "laser" = 50, "energy" = 50, "bomb" = 65, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 100)
- strip_delay = 130
- item_flags = NODROP
brightness_on = 8
resistance_flags = FIRE_PROOF | ACID_PROOF
@@ -248,11 +249,8 @@ Contains:
icon_state = "ert_command-alert"
item_state = "ert_command-alert"
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ert/alert
- allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/tank/internals)
armor = list("melee" = 70, "bullet" = 55, "laser" = 50, "energy" = 50, "bomb" = 65, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 100)
- strip_delay = 130
resistance_flags = FIRE_PROOF | ACID_PROOF
- tauric = TRUE //Citadel Add for tauric hardsuits
//ERT Security
/obj/item/clothing/head/helmet/space/hardsuit/ert/alert/sec
@@ -342,9 +340,13 @@ Contains:
armor = list("melee" = -20, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 75, "fire" = 60, "acid" = 75) //As whimpy as a space carp
brightness_on = 0 //luminosity when on
actions_types = list()
- item_flags = NODROP
mutantrace_variation = NO_MUTANTRACE_VARIATION
+/obj/item/clothing/head/helmet/space/hardsuit/carp/Initialize()
+ . = ..()
+ ADD_TRAIT(src, TRAIT_NODROP, LOCKED_HELMET_TRAIT)
+
+
/obj/item/clothing/suit/space/hardsuit/carp
name = "carp space suit"
desc = "A slimming piece of dubious space carp technology, you suspect it won't stand up to hand-to-hand blows."
diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm
index eb30488999..5eec159462 100644
--- a/code/modules/clothing/suits/armor.dm
+++ b/code/modules/clothing/suits/armor.dm
@@ -37,6 +37,8 @@
slowdown = 1
/obj/item/clothing/suit/armor/vest/blueshirt
+ name = "large armor vest"
+ desc = "A large, yet comfortable piece of armor, protecting you from some threats."
icon_state = "blueshift"
item_state = "blueshift"
@@ -59,7 +61,7 @@
flags_inv = 0
strip_delay = 80
unique_reskin = list("Coat" = "hostrench", "Cloak" = "trenchcloak")
-
+
/obj/item/clothing/suit/armor/vest/warden
name = "warden's jacket"
desc = "A navy-blue armored jacket with blue shoulder designations and '/Warden/' stitched into one of the chest pockets."
diff --git a/code/modules/clothing/suits/cloaks.dm b/code/modules/clothing/suits/cloaks.dm
index 173d50ba64..c3276213e1 100644
--- a/code/modules/clothing/suits/cloaks.dm
+++ b/code/modules/clothing/suits/cloaks.dm
@@ -15,7 +15,6 @@
icon_state = "golhood"
desc = "A hood for a cloak."
body_parts_covered = HEAD
- item_flags = NODROP
flags_inv = HIDEHAIR|HIDEEARS
/obj/item/clothing/neck/cloak/suicide_act(mob/user)
diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm
index 9d039e0cb6..dc1b2b6dc3 100644
--- a/code/modules/clothing/suits/miscellaneous.dm
+++ b/code/modules/clothing/suits/miscellaneous.dm
@@ -237,7 +237,10 @@
desc = "Forced to live on your shameful acting as a fake Mexican, you and your poncho have grown inseparable. Literally."
icon_state = "ponchoshame"
item_state = "ponchoshame"
- item_flags = NODROP
+
+/obj/item/clothing/suit/poncho/ponchoshame/Initialize()
+ . = ..()
+ ADD_TRAIT(src, TRAIT_NODROP, SHAMEBRERO_TRAIT)
/obj/item/clothing/suit/whitedress
name = "white dress"
diff --git a/code/modules/clothing/under/color.dm b/code/modules/clothing/under/color.dm
index 324c16fec7..c239f48b05 100644
--- a/code/modules/clothing/under/color.dm
+++ b/code/modules/clothing/under/color.dm
@@ -22,7 +22,11 @@
resistance_flags = NONE
/obj/item/clothing/under/color/black/ghost
- item_flags = NODROP | DROPDEL
+ item_flags = DROPDEL
+
+/obj/item/clothing/under/color/black/ghost/Initialize()
+ . = ..()
+ ADD_TRAIT(src, TRAIT_NODROP, CULT_TRAIT)
/obj/item/clothing/under/color/grey
name = "grey jumpsuit"
diff --git a/code/modules/clothing/under/jobs/security.dm b/code/modules/clothing/under/jobs/security.dm
index b8858fdf1a..6f9e77b09f 100644
--- a/code/modules/clothing/under/jobs/security.dm
+++ b/code/modules/clothing/under/jobs/security.dm
@@ -142,6 +142,7 @@
*/
/obj/item/clothing/under/rank/security/blueshirt
+ name = "blue shirt and tie"
desc = "I'm a little busy right now, Calhoun."
icon_state = "blueshift"
item_state = "blueshift"
diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm
index 91fde0dbd0..16848e393a 100644
--- a/code/modules/clothing/under/miscellaneous.dm
+++ b/code/modules/clothing/under/miscellaneous.dm
@@ -388,7 +388,10 @@
/obj/item/clothing/under/kilt/highlander
desc = "You're the only one worthy of this kilt."
- item_flags = NODROP
+
+/obj/item/clothing/under/kilt/highlander/Initialize()
+ . = ..()
+ ADD_TRAIT(src, TRAIT_NODROP, HIGHLANDER)
/obj/item/clothing/under/sexymime
name = "sexy mime outfit"
diff --git a/code/modules/crafting/recipes.dm b/code/modules/crafting/recipes.dm
index a76be1ff45..ca51fec347 100644
--- a/code/modules/crafting/recipes.dm
+++ b/code/modules/crafting/recipes.dm
@@ -791,6 +791,56 @@
time = 40
category = CAT_MISC
+/datum/crafting_recipe/bronze_driver
+ name = "Bronze Plated Screwdriver"
+ result = /obj/item/screwdriver/bronze
+ reqs = list(/obj/item/screwdriver = 1,
+ /obj/item/stack/cable_coil = 10,
+ /obj/item/stack/tile/bronze = 1,
+ /datum/reagent/water = 15)
+ time = 40
+ category = CAT_MISC
+
+/datum/crafting_recipe/bronze_welder
+ name = "Bronze Plated Welding Tool"
+ result = /obj/item/weldingtool/bronze
+ reqs = list(/obj/item/weldingtool = 1,
+ /obj/item/stack/cable_coil = 10,
+ /obj/item/stack/tile/bronze = 1,
+ /datum/reagent/water = 15)
+ time = 40
+ category = CAT_MISC
+
+/datum/crafting_recipe/bronze_wirecutters
+ name = "Bronze Plated Wirecutters"
+ result = /obj/item/wirecutters/bronze
+ reqs = list(/obj/item/wirecutters = 1,
+ /obj/item/stack/cable_coil = 10,
+ /obj/item/stack/tile/bronze = 1,
+ /datum/reagent/water = 15)
+ time = 40
+ category = CAT_MISC
+
+/datum/crafting_recipe/bronze_crowbar
+ name = "Bronze Plated Crowbar"
+ result = /obj/item/crowbar/bronze
+ reqs = list(/obj/item/crowbar = 1,
+ /obj/item/stack/cable_coil = 10,
+ /obj/item/stack/tile/bronze = 1,
+ /datum/reagent/water = 15)
+ time = 40
+ category = CAT_MISC
+
+/datum/crafting_recipe/bronze_wrench
+ name = "Bronze Plated Wrench"
+ result = /obj/item/wrench/bronze
+ reqs = list(/obj/item/wrench = 1,
+ /obj/item/stack/cable_coil = 10,
+ /obj/item/stack/tile/bronze = 1,
+ /datum/reagent/water = 15)
+ time = 40
+ category = CAT_MISC
+
/datum/crafting_recipe/smartdart
name = "Medical smartdart"
result = /obj/item/reagent_containers/syringe/dart
diff --git a/code/modules/events/immovable_rod.dm b/code/modules/events/immovable_rod.dm
index d9654b395d..e041d566e9 100644
--- a/code/modules/events/immovable_rod.dm
+++ b/code/modules/events/immovable_rod.dm
@@ -100,6 +100,9 @@ In my current plan for it, 'solid' will be defined as anything with density == 1
/obj/effect/immovablerod/ex_act(severity, target)
return 0
+/obj/structure/closet/supplypod/prevent_content_explosion()
+ return TRUE
+
/obj/effect/immovablerod/singularity_act()
return
diff --git a/code/modules/events/mice_migration.dm b/code/modules/events/mice_migration.dm
index b01ff4237e..48a9f00423 100644
--- a/code/modules/events/mice_migration.dm
+++ b/code/modules/events/mice_migration.dm
@@ -32,4 +32,4 @@
P.update_icon()
/datum/round_event/mice_migration/start()
- SSsqueak.trigger_migration(rand(minimum_mice, maximum_mice))
+ SSminor_mapping.trigger_migration(rand(minimum_mice, maximum_mice))
diff --git a/code/modules/events/spontaneous_appendicitis.dm b/code/modules/events/spontaneous_appendicitis.dm
index 1407a98518..901337cd52 100644
--- a/code/modules/events/spontaneous_appendicitis.dm
+++ b/code/modules/events/spontaneous_appendicitis.dm
@@ -17,6 +17,8 @@
continue
if(!H.getorgan(/obj/item/organ/appendix)) //Don't give the disease to some who lacks it, only for it to be auto-cured
continue
+ if(!(MOB_ORGANIC in H.mob_biotypes)) //biotype sleeper bugs strike again, once again making appendicitis pick a target that can't take it
+ continue
var/foundAlready = FALSE //don't infect someone that already has appendicitis
for(var/datum/disease/appendicitis/A in H.diseases)
foundAlready = TRUE
diff --git a/code/modules/events/wizard/curseditems.dm b/code/modules/events/wizard/curseditems.dm
index a6e08fbd8c..41ee4246b1 100644
--- a/code/modules/events/wizard/curseditems.dm
+++ b/code/modules/events/wizard/curseditems.dm
@@ -50,7 +50,8 @@
var/obj/item/I = new J //dumb but required because of byond throwing a fit anytime new gets too close to a list
H.dropItemToGround(H.get_item_by_slot(i), TRUE)
H.equip_to_slot_or_del(I, i)
- I.item_flags |= NODROP | DROPDEL
+ ADD_TRAIT(I, TRAIT_NODROP, CURSED_ITEM_TRAIT)
+ I.item_flags |= DROPDEL
I.name = "cursed " + I.name
for(var/mob/living/carbon/human/H in GLOB.alive_mob_list)
diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm
index 5cd5d2c5c6..88f72d27c3 100644
--- a/code/modules/flufftext/Hallucination.dm
+++ b/code/modules/flufftext/Hallucination.dm
@@ -689,7 +689,7 @@ GLOBAL_LIST_INIT(hallucination_list, list(
chosen = capitalize(pick(speak_messages))
chosen = replacetext(chosen, "%TARGETNAME%", target_name)
var/image/speech_overlay = image('icons/mob/talk.dmi', person, "default0", layer = ABOVE_MOB_LAYER)
- var/message = target.compose_message(person,understood_language,chosen,null,person.get_spans(),face_name = TRUE)
+ var/message = target.compose_message(person,understood_language,chosen,null,list(person.speech_span),face_name = TRUE)
feedback_details += "Type: Talk, Source: [person.real_name], Message: [message]"
to_chat(target, message)
if(target.client)
@@ -705,7 +705,7 @@ GLOBAL_LIST_INIT(hallucination_list, list(
for(var/mob/living/carbon/human/H in GLOB.alive_mob_list)
humans += H
person = pick(humans)
- var/message = target.compose_message(person,understood_language,chosen,"[FREQ_COMMON]",person.get_spans(),face_name = TRUE)
+ var/message = target.compose_message(person,understood_language,chosen,"[FREQ_COMMON]",list(person.speech_span),face_name = TRUE)
feedback_details += "Type: Radio, Source: [person.real_name], Message: [message]"
to_chat(target, message)
qdel(src)
diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm
index 64edd69e17..7b1d8be85e 100644
--- a/code/modules/food_and_drinks/drinks/drinks.dm
+++ b/code/modules/food_and_drinks/drinks/drinks.dm
@@ -515,6 +515,13 @@
list_reagents = list("shamblers" = 30)
foodtype = SUGAR | JUNKFOOD
+/obj/item/reagent_containers/food/drinks/soda_cans/grey_bull
+ name = "Grey Bull"
+ desc = "Grey Bull, it gives you gloves!"
+ icon_state = "energy_drink"
+ list_reagents = list("grey_bull" = 20)
+ foodtype = SUGAR | JUNKFOOD
+
/obj/item/reagent_containers/food/drinks/soda_cans/air
name = "canned air"
desc = "There is no air shortage. Do not drink."
diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm
index dab933ca4e..f85668d2b8 100644
--- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm
+++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm
@@ -202,6 +202,19 @@
desc = "A flask of holy water...it's been sitting in the Necropolis a while though."
list_reagents = list("hell_water" = 100)
+/obj/item/reagent_containers/food/drinks/holyoil
+ name = "flask of zelus oil"
+ desc = "A brass flask of Zelus oil, a viscous fluid with a scenting of brass - this flask may be sipped or thrown."
+ icon_state = "zelusflask"
+ list_reagents = list("holyoil" = 30) //Powerfull
+ volume = 30
+ foodtype = NONE
+ force = 12 //Same as a toolbox
+ throwforce = 18
+
+/obj/item/reagent_containers/food/drinks/holyoil/null
+ list_reagents = list("holyoil" = 0)
+
/obj/item/reagent_containers/food/drinks/bottle/vermouth
name = "Goldeneye vermouth"
desc = "Sweet, sweet dryness~"
@@ -330,6 +343,33 @@
icon_state = "fernetbottle"
list_reagents = list("fernet" = 100)
+/obj/item/reagent_containers/food/drinks/bottle/applejack
+ name = "Buckin' Bronco's Applejack"
+ desc = "Kicks like a horse, tastes like an apple!"
+ icon_state = "applejack_bottle"
+ list_reagents = list("applejack" = 100)
+ foodtype = FRUIT
+
+/obj/item/reagent_containers/food/drinks/bottle/champagne
+ name = "Eau d' Dandy Brut Champagne"
+ desc = "Finely sourced from only the most pretentious French vineyards."
+ icon_state = "champagne_bottle"
+ list_reagents = list("champagne" = 100)
+
+/obj/item/reagent_containers/food/drinks/bottle/blazaam
+ name = "Ginbad's Blazaam"
+ desc = "You feel like you should give the bottle a good rub before opening."
+ icon_state = "blazaambottle"
+ list_reagents = list("blazaam" = 100)
+
+/obj/item/reagent_containers/food/drinks/bottle/trappist
+ name = "Mont de Requin Trappistes Bleu"
+ desc = "Brewed in space-Belgium. Fancy!"
+ icon_state = "trappistbottle"
+ volume = 50
+ list_reagents = list("trappist" = 50)
+
+
//////////////////////////JUICES AND STUFF ///////////////////////
/obj/item/reagent_containers/food/drinks/bottle/orangejuice
diff --git a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm b/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm
index 9d173a34a5..1e5c2eaf60 100644
--- a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm
+++ b/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm
@@ -23,6 +23,7 @@
icon_state = R.glass_icon_state
else
var/mutable_appearance/reagent_overlay = mutable_appearance(icon, "glassoverlay")
+ icon_state = "glass_empty"
reagent_overlay.color = mix_color_from_reagents(reagents.reagent_list)
add_overlay(reagent_overlay)
else
diff --git a/code/modules/food_and_drinks/food.dm b/code/modules/food_and_drinks/food.dm
index 51433da841..132e000893 100644
--- a/code/modules/food_and_drinks/food.dm
+++ b/code/modules/food_and_drinks/food.dm
@@ -1,6 +1,10 @@
////////////////////////////////////////////////////////////////////////////////
/// Food.
////////////////////////////////////////////////////////////////////////////////
+/// Note: When adding food items with dummy parents, make sure to add
+/// the parent to the exclusion list in code/__HELPERS/unsorted.dm's
+/// get_random_food proc.
+////////////////////////////////////////////////////////////////////////////////
/obj/item/reagent_containers/food
possible_transfer_amounts = list()
volume = 50 //Sets the default container amount for all food items.
diff --git a/code/modules/food_and_drinks/food/condiment.dm b/code/modules/food_and_drinks/food/condiment.dm
index 0aef697883..31e99535d1 100644
--- a/code/modules/food_and_drinks/food/condiment.dm
+++ b/code/modules/food_and_drinks/food/condiment.dm
@@ -24,7 +24,8 @@
"blackpepper" = list("peppermillsmall", "pepper mill", "Often used to flavor food or make people sneeze"),
"cornoil" = list("oliveoil", "corn oil bottle", "A delicious oil used in cooking. Made from corn"),
"sugar" = list("emptycondiment", "sugar bottle", "Tasty spacey sugar!"),
- "mayonnaise" = list("mayonnaise", "mayonnaise jar", "An oily condiment made from egg yolks."))
+ "mayonnaise" = list("mayonnaise", "mayonnaise jar", "An oily condiment made from egg yolks."),
+ "peanut_butter" = list("peanutbutter", "peanut butter jar", "A deliciously and sticky spread made from peanuts."))
var/originalname = "condiment" //Can't use initial(name) for this. This stores the name set by condimasters.
/obj/item/reagent_containers/food/condiment/suicide_act(mob/living/carbon/user)
@@ -236,7 +237,7 @@
volume = 10
amount_per_transfer_from_this = 10
possible_transfer_amounts = list()
- possible_states = list("ketchup" = list("condi_ketchup", "Ketchup", "You feel more American already."), "capsaicin" = list("condi_hotsauce", "Hotsauce", "You can almost TASTE the stomach ulcers now!"), "soysauce" = list("condi_soysauce", "Soy Sauce", "A salty soy-based flavoring"), "frostoil" = list("condi_frostoil", "Coldsauce", "Leaves the tongue numb in it's passage"), "sodiumchloride" = list("condi_salt", "Salt Shaker", "Salt. From space oceans, presumably"), "blackpepper" = list("condi_pepper", "Pepper Mill", "Often used to flavor food or make people sneeze"), "cornoil" = list("condi_cornoil", "Corn Oil", "A delicious oil used in cooking. Made from corn"), "sugar" = list("condi_sugar", "Sugar", "Tasty spacey sugar!"))
+ possible_states = list("ketchup" = list("condi_ketchup", "Ketchup", "You feel more American already."), "capsaicin" = list("condi_hotsauce", "Hotsauce", "You can almost TASTE the stomach ulcers now!"), "soysauce" = list("condi_soysauce", "Soy Sauce", "A salty soy-based flavoring"), "frostoil" = list("condi_frostoil", "Coldsauce", "Leaves the tongue numb in it's passage"), "sodiumchloride" = list("condi_salt", "Salt Shaker", "Salt. From space oceans, presumably"), "blackpepper" = list("condi_pepper", "Pepper Mill", "Often used to flavor food or make people sneeze"), "cornoil" = list("condi_cornoil", "Corn Oil", "A delicious oil used in cooking. Made from corn"), "sugar" = list("condi_sugar", "Sugar", "Tasty spacey sugar!"), "astrotame" = list("condi_astrotame", "Astrotame", "The sweetness of a thousand sugars but none of the calories."))
/obj/item/reagent_containers/food/condiment/pack/attack(mob/M, mob/user, def_zone) //Can't feed these to people directly.
return
@@ -286,3 +287,8 @@
name = "hotsauce pack"
originalname = "hotsauce"
list_reagents = list("capsaicin" = 10)
+
+/obj/item/reagent_containers/food/condiment/pack/astrotame
+ name = "astrotame pack"
+ originalname = "astrotame"
+ list_reagents = list("astrotame" = 5)
diff --git a/code/modules/food_and_drinks/food/snacks_other.dm b/code/modules/food_and_drinks/food/snacks_other.dm
index c1abec86c1..e36efe750b 100644
--- a/code/modules/food_and_drinks/food/snacks_other.dm
+++ b/code/modules/food_and_drinks/food/snacks_other.dm
@@ -558,3 +558,19 @@
list_reagents = list("nutriment" = 6, "sodiumchloride" = 2)
tastes = list("rice" = 3, "salt" = 1)
foodtype = GRAIN
+
+/obj/item/reagent_containers/food/snacks/cannedpeaches
+ name = "Canned Peaches"
+ desc = "Just a nice can of ripe peaches swimming in their own juices."
+ icon_state = "peachcan"
+ list_reagents = list("peachjuice" = 20, "sugar" = 8, "nutriment" = 2)
+ filling_color = "#ffdf26"
+ w_class = WEIGHT_CLASS_NORMAL
+ tastes = list("peaches" = 7, "tin" = 1)
+ foodtype = FRUIT | SUGAR
+
+/obj/item/reagent_containers/food/snacks/cannedpeaches/maint
+ name = "Maintenance Peaches"
+ desc = "I have a mouth and I must eat."
+ icon_state = "peachcanmaint"
+ tastes = list("peaches" = 1, "tin" = 7)
\ No newline at end of file
diff --git a/code/modules/food_and_drinks/food/snacks_pastry.dm b/code/modules/food_and_drinks/food/snacks_pastry.dm
index 927a7d2697..238bb4f86a 100644
--- a/code/modules/food_and_drinks/food/snacks_pastry.dm
+++ b/code/modules/food_and_drinks/food/snacks_pastry.dm
@@ -8,27 +8,34 @@
icon_state = "donut1"
bitesize = 5
bonus_reagents = list("sugar" = 1)
- list_reagents = list("nutriment" = 3, "sugar" = 2)
- var/extra_reagent = null
+ list_reagents = list("nutriment" = 3, "sprinkles" = 1, "sugar" = 2)
filling_color = "#D2691E"
tastes = list("donut" = 1)
foodtype = JUNKFOOD | GRAIN | FRIED | SUGAR
+ var/frosted_icon = "donut2"
+ var/is_frosted = FALSE
+ var/extra_reagent = null
/obj/item/reagent_containers/food/snacks/donut/Initialize()
. = ..()
if(prob(30))
- icon_state = "donut2"
- name = "frosted donut"
- reagents.add_reagent("sprinkles", 2)
- bonus_reagents = list("sprinkles" = 2, "sugar" = 1)
- filling_color = "#FF69B4"
+ frost_donut()
+/obj/item/reagent_containers/food/snacks/donut/proc/frost_donut()
+ if(is_frosted || !frosted_icon)
+ return
+ is_frosted = TRUE
+ name = "frosted [name]"
+ icon_state = frosted_icon //delish~!
+ reagents.add_reagent("sprinkles", 1)
+ filling_color = "#FF69B4"
+ return TRUE
/obj/item/reagent_containers/food/snacks/donut/checkLiked(fraction, mob/M) //Sec officers always love donuts
if(last_check_time + 50 < world.time)
if(ishuman(M))
var/mob/living/carbon/human/H = M
- if(H.mind && H.mind.assigned_role == "Security Officer" || H.mind.assigned_role == "Detective" || H.mind.assigned_role == "Warden" || H.mind.assigned_role == "Head of Security" && !HAS_TRAIT(H, TRAIT_AGEUSIA))
+ if(M.mind && HAS_TRAIT(M.mind, TRAIT_LAW_ENFORCEMENT_METABOLISM) && !HAS_TRAIT(H, TRAIT_AGEUSIA))
to_chat(H,"I love this taste!")
H.adjust_disgust(-5 + -2.5 * fraction)
GET_COMPONENT_FROM(mood, /datum/component/mood, H)
@@ -48,18 +55,12 @@
. = ..()
extra_reagent = pick("nutriment", "capsaicin", "frostoil", "krokodil", "plasma", "cocoa", "slimejelly", "banana", "berryjuice", "omnizine")
reagents.add_reagent("[extra_reagent]", 3)
- bonus_reagents = list("[extra_reagent]" = 3, "sugar" = 1)
- if(prob(30))
- icon_state = "donut2"
- name = "frosted chaos donut"
- reagents.add_reagent("sprinkles", 2)
- bonus_reagents = list("sprinkles" = 2, "[extra_reagent]" = 3, "sugar" = 1)
- filling_color = "#FF69B4"
/obj/item/reagent_containers/food/snacks/donut/jelly
name = "jelly donut"
desc = "You jelly?"
icon_state = "jdonut1"
+ frosted_icon = "jdonut2"
bonus_reagents = list("sugar" = 1, "vitamin" = 1)
extra_reagent = "berryjuice"
tastes = list("jelly" = 1, "donut" = 3)
@@ -69,12 +70,6 @@
. = ..()
if(extra_reagent)
reagents.add_reagent("[extra_reagent]", 3)
- if(prob(30))
- icon_state = "jdonut2"
- name = "frosted jelly Donut"
- reagents.add_reagent("sprinkles", 2)
- bonus_reagents = list("sprinkles" = 2, "sugar" = 1)
- filling_color = "#FF69B4"
/obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly
name = "jelly donut"
diff --git a/code/modules/food_and_drinks/food/snacks_pie.dm b/code/modules/food_and_drinks/food/snacks_pie.dm
index 9d63d48f34..0b12ee4fcf 100644
--- a/code/modules/food_and_drinks/food/snacks_pie.dm
+++ b/code/modules/food_and_drinks/food/snacks_pie.dm
@@ -53,7 +53,7 @@
H.adjust_blurriness(1)
H.visible_message("[H] is creamed by [src]!", "You've been creamed by [src]!")
playsound(H, "desceration", 50, TRUE)
- reagents.trans_to(H,15) //Transfers the cream pies total volume of reagents to target on it
+ reagents.trans_to(H,15) //Cream pie combat
if(!H.creamed) // one layer at a time
H.add_overlay(creamoverlay)
H.creamed = TRUE
@@ -61,6 +61,7 @@
qdel(src)
/obj/item/reagent_containers/food/snacks/pie/cream/nostun
+ list_reagents = list("laughter" = 15)
stunning = FALSE
/obj/item/reagent_containers/food/snacks/pie/cream/body
diff --git a/code/modules/food_and_drinks/food/snacks_sandwichtoast.dm b/code/modules/food_and_drinks/food/snacks_sandwichtoast.dm
index 1b602b6759..17a710ada2 100644
--- a/code/modules/food_and_drinks/food/snacks_sandwichtoast.dm
+++ b/code/modules/food_and_drinks/food/snacks_sandwichtoast.dm
@@ -52,6 +52,33 @@
list_reagents = list("nutriment" = 2, "cherryjelly" = 5, "vitamin" = 2)
foodtype = GRAIN | FRUIT
+/obj/item/reagent_containers/food/snacks/jellysandwich/pbj
+ name = "\improper PB & J sandwich"
+ desc = "A grand creation of peanut butter, jelly and bread! An all-american classic."
+ icon_state = "pbjsandwich"
+ tastes = list("bread" = 1, "jelly" = 1, "peanuts" = 1)
+
+/obj/item/reagent_containers/food/snacks/jellysandwich/pbj/cherry
+ bonus_reagents = list("cherryjelly" = 5, "peanut_butter" = 5, "vitamin" = 2)
+ list_reagents = list("nutriment" = 2, "cherryjelly" = 5, "peanut_butter" = 5, "vitamin" = 2)
+ foodtype = GRAIN | FRUIT
+
+/obj/item/reagent_containers/food/snacks/jellysandwich/pbj/slime
+ bonus_reagents = list("slimejelly" = 5, "peanut_butter" = 5, "vitamin" = 2)
+ list_reagents = list("nutriment" = 2, "slimejelly" = 5, "peanut_butter" = 5, "vitamin" = 2)
+ foodtype = GRAIN | TOXIC
+
+/obj/item/reagent_containers/food/snacks/peanutbutter_sandwich
+ name = "peanut butter sandwich"
+ desc = "You wish you had some jelly to go with this..."
+ icon = 'icons/obj/food/burgerbread.dmi'
+ icon_state = "peanutbuttersandwich"
+ trash = /obj/item/trash/plate
+ bitesize = 3
+ bonus_reagents = list("peanut_butter" = 5, "vitamin" = 2)
+ list_reagents = list("nutriment" = 2, "peanut_butter" = 5, "vitamin" = 2)
+ foodtype = GRAIN
+
/obj/item/reagent_containers/food/snacks/notasandwich
name = "not-a-sandwich"
desc = "Something seems to be wrong with this, you can't quite figure what. Maybe it's his moustache."
@@ -83,6 +110,19 @@
list_reagents = list("nutriment" = 1, "slimejelly" = 5, "vitamin" = 2)
foodtype = GRAIN | TOXIC | SUGAR
+/obj/item/reagent_containers/food/snacks/peanut_buttertoast
+ name = "peanut butter toast"
+ desc = "A slice of toast covered with delicious peanut butter."
+ icon = 'icons/obj/food/burgerbread.dmi'
+ icon_state = "peanutbuttertoast"
+ trash = /obj/item/trash/plate
+ bitesize = 3
+ bonus_reagents = list("peanut_butter" = 5, "vitamin" = 2)
+ list_reagents = list("nutriment" = 1, "peanut_butter" = 5, "vitamin" = 2)
+ tastes = list("toast" = 1, "peanuts" = 1)
+ foodtype = GRAIN
+
+
/obj/item/reagent_containers/food/snacks/twobread
name = "two bread"
desc = "This seems awfully bitter."
diff --git a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm
index 23172841e4..dd33f696c9 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm
@@ -94,7 +94,7 @@ God bless America.
else if(default_deconstruction_screwdriver(user, "fryer_off", "fryer_off" ,I)) //where's the open maint panel icon?!
return
else
- if(is_type_in_typecache(I, deepfry_blacklisted_items) || (I.item_flags & (ABSTRACT | NODROP | DROPDEL)))
+ if(is_type_in_typecache(I, deepfry_blacklisted_items) || HAS_TRAIT(I, TRAIT_NODROP) || (I.item_flags & (ABSTRACT | DROPDEL)))
return ..()
else if(!frying && user.transferItemToLoc(I, src))
to_chat(user, "You put [I] into [src].")
diff --git a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm
index d8d4e843dc..e02c3c1334 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm
@@ -78,7 +78,7 @@
if(!ignore_clothing)
for(var/obj/item/I in C.held_items + C.get_equipped_items())
- if(!(I.item_flags & NODROP))
+ if(!HAS_TRAIT(I, TRAIT_NODROP))
to_chat(user, "Subject may not have abiotic items on.")
return
diff --git a/code/modules/food_and_drinks/kitchen_machinery/processor.dm b/code/modules/food_and_drinks/kitchen_machinery/processor.dm
index 3f917273b4..35ce25bbaf 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/processor.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/processor.dm
@@ -138,6 +138,10 @@
for (var/mob/M in src)
M.forceMove(drop_location())
+/obj/machinery/processor/container_resist(mob/living/user)
+ user.forceMove(drop_location())
+ user.visible_message("[user] crawls free of the processor!")
+
/obj/machinery/processor/slime
name = "slime processor"
desc = "An industrial grinder with a sticker saying appropriated for science department. Keep hands clear of intake area while operating."
diff --git a/code/modules/food_and_drinks/recipes/drinks_recipes.dm b/code/modules/food_and_drinks/recipes/drinks_recipes.dm
index f41f6cce80..7c44857b1d 100644
--- a/code/modules/food_and_drinks/recipes/drinks_recipes.dm
+++ b/code/modules/food_and_drinks/recipes/drinks_recipes.dm
@@ -152,8 +152,8 @@
/datum/chemical_reaction/beepsky_smash
name = "Beepksy Smash"
id = "beepksysmash"
- results = list("beepskysmash" = 4)
- required_reagents = list("limejuice" = 2, "whiskey" = 2, "iron" = 1)
+ results = list("beepskysmash" = 5)
+ required_reagents = list("limejuice" = 2, "quadruple_sec" = 2, "iron" = 1)
/datum/chemical_reaction/doctor_delight
name = "The Doctor's Delight"
@@ -532,11 +532,18 @@
required_reagents = list("hooch" = 1, "absinthe" = 1, "manlydorf" = 1, "syndicatebomb" = 1)
mix_message = "The mixture turns to a sickening froth."
+/datum/chemical_reaction/lemonade
+ name = "Lemonade"
+ id = "lemonade"
+ results = list("lemonade" = 5)
+ required_reagents = list("lemonjuice" = 2, "water" = 2, "sugar" = 1, "ice" = 1)
+ mix_message = "You're suddenly reminded of home."
+
/datum/chemical_reaction/arnold_palmer
name = "Arnold Palmer"
id = "arnold_palmer"
results = list("arnold_palmer" = 2)
- required_reagents = list("tea" = 1, "lemonjuice" = 1)
+ required_reagents = list("tea" = 1, "lemonade" = 1)
mix_message = "The smells of fresh green grass and sand traps waft through the air as the mixture turns a friendly yellow-orange."
/datum/chemical_reaction/chocolate_milk
@@ -704,3 +711,87 @@
id = "pinktea"
results = list("pinktea" = 5)
required_reagents = list("aphro" = 1, "arnold_palmer" = 1, "sugar" = 1)
+
+/datum/chemical_reaction/blank_paper
+ name = "Blank Paper"
+ id = "blank_paper"
+ results = list("blank_paper" = 3)
+ required_reagents = list("silencer" = 1, "nothing" = 1, "nuka_cola" = 1)
+
+/datum/chemical_reaction/wizz_fizz
+ name = "Wizz Fizz"
+ id = "wizz_fizz"
+ results = list("wizz_fizz" = 3)
+ required_reagents = list("triple_sec" = 1, "sodawater" = 1, "champagne" = 1)
+ mix_message = "The beverage starts to froth with an almost mystical zeal!"
+ mix_sound = 'sound/effects/bubbles2.ogg'
+
+/datum/chemical_reaction/bug_spray
+ name = "Bug Spray"
+ id = "bug_spray"
+ results = list("bug_spray" = 5)
+ required_reagents = list("triple_sec" = 2, "lemon_lime" = 1, "rum" = 2, "vodka" = 1)
+ mix_message = "The faint aroma of summer camping trips wafts through the air; but what's that buzzing noise?"
+ mix_sound = 'sound/creatures/bee.ogg'
+
+/datum/chemical_reaction/jack_rose
+ name = "Jack Rose"
+ id = "jack_rose"
+ results = list("jack_rose" = 4)
+ required_reagents = list("grenadine" = 1, "applejack" = 2, "limejuice" = 1)
+ mix_message = "As the grenadine incorporates, the beverage takes on a mellow, red-orange glow."
+
+/datum/chemical_reaction/turbo
+ name = "Turbo"
+ id = "turbo"
+ results = list("turbo" = 5)
+ required_reagents = list("moonshine" = 2, "nitrous_oxide" = 1, "sugar_rush" = 1, "pwr_game" = 1)
+
+/datum/chemical_reaction/old_timer
+ name = "Old Timer"
+ id = "old_timer"
+ results = list("old_timer" = 6)
+ required_reagents = list("whiskeysoda" = 3, "parsnipjuice" = 2, "alexander" = 1)
+
+/datum/chemical_reaction/rubberneck
+ name = "Rubberneck"
+ id = "rubberneck"
+ results = list("rubberneck" = 10)
+ required_reagents = list("ethanol" = 4, "grey_bull" = 5, "astrotame" = 1)
+
+/datum/chemical_reaction/duplex
+ name = "Duplex"
+ id = "duplex"
+ results = list("duplex" = 4)
+ required_reagents = list("hcider" = 2, "applejuice" = 1, "berryjuice" = 1)
+
+/datum/chemical_reaction/trappist
+ name = "Trappist"
+ id = "trappist"
+ results = list("trappist" = 5)
+ required_reagents = list("ale" = 2, "holywater" = 2, "sugar" = 1)
+
+/datum/chemical_reaction/cream_soda
+ name = "Cream Soda"
+ id = "cream_soda"
+ results = list("cream_soda" = 4)
+ required_reagents = list("sugar" = 2, "sodawater" = 2, "vanilla" = 1)
+
+/datum/chemical_reaction/blazaam
+ name = "Blazaam"
+ id = "blazaam"
+ results = list("blazaam" = 3)
+ required_reagents = list("gin" = 2, "peachjuice" = 1, "bluespace" = 1)
+
+/datum/chemical_reaction/planet_cracker
+ name = "Planet Cracker"
+ id = "planet_cracker"
+ results = list("planet_cracker" = 4)
+ required_reagents = list("champagne" = 2, "lizardwine" = 2, "eggyolk" = 1, "gold" = 1)
+ mix_message = "The liquid's color starts shifting as the nanogold is alternately corroded and redeposited."
+
+/datum/chemical_reaction/red_queen
+ name = "Red Queen"
+ id = "red_queen"
+ results = list("red_queen" = 10)
+ required_reagents = list("tea" = 6, "mercury" = 2, "blackpepper" = 1, "growthserum" = 1)
\ No newline at end of file
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm
index 0c4e2c2e30..a6240e5b48 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm
@@ -116,7 +116,7 @@
result = /obj/item/reagent_containers/food/snacks/jelliedtoast/slime
subcategory = CAT_MISCFOOD
-/datum/crafting_recipe/food/jelliedyoast
+/datum/crafting_recipe/food/jelliedtoast
name = "Jellied toast"
reqs = list(
/datum/reagent/consumable/cherryjelly = 5,
@@ -125,6 +125,15 @@
result = /obj/item/reagent_containers/food/snacks/jelliedtoast/cherry
subcategory = CAT_MISCFOOD
+/datum/crafting_recipe/food/peanutbuttertoast
+ name = "Peanut butter toast"
+ reqs = list(
+ /datum/reagent/consumable/peanut_butter = 5,
+ /obj/item/reagent_containers/food/snacks/breadslice/plain = 1
+ )
+ result = /obj/item/reagent_containers/food/snacks/peanut_buttertoast
+ subcategory = CAT_MISCFOOD
+
/datum/crafting_recipe/food/twobread
name = "Two bread"
reqs = list(
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm
index 133713ac75..127b2cc238 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm
@@ -43,6 +43,48 @@
result = /obj/item/reagent_containers/food/snacks/jellysandwich/cherry
subcategory = CAT_SANDWICH
+/datum/crafting_recipe/food/pbj_slimesandwich
+ name = "PB&J sandwich"
+ reqs = list(
+ /datum/reagent/toxin/slimejelly = 5,
+ /datum/reagent/consumable/peanut_butter = 5,
+ /obj/item/reagent_containers/food/snacks/breadslice/plain = 2,
+ )
+ result = /obj/item/reagent_containers/food/snacks/jellysandwich/pbj/slime
+ subcategory = CAT_SANDWICH
+
+/datum/crafting_recipe/food/pbj_slimesandwich/alt
+ reqs = list(
+ /obj/item/reagent_containers/food/snacks/jelliedtoast/slime = 1,
+ /obj/item/reagent_containers/food/snacks/peanut_buttertoast = 1,
+ )
+
+/datum/crafting_recipe/food/pbj_sandwich
+ name = "PB&J sandwich"
+ reqs = list(
+ /datum/reagent/consumable/cherryjelly = 5,
+ /datum/reagent/consumable/peanut_butter = 5,
+ /obj/item/reagent_containers/food/snacks/breadslice/plain = 2,
+ )
+ result = /obj/item/reagent_containers/food/snacks/jellysandwich/pbj/cherry
+ subcategory = CAT_SANDWICH
+
+/datum/crafting_recipe/food/pbj_sandwich/alt
+ reqs = list(
+ /obj/item/reagent_containers/food/snacks/jelliedtoast/cherry = 1,
+ /obj/item/reagent_containers/food/snacks/peanut_buttertoast = 1,
+ )
+
+/datum/crafting_recipe/peanutbutter_sandwich
+ name = "Peanut butter sandwich"
+ reqs = list(
+ /datum/reagent/consumable/peanut_butter = 5,
+ /obj/item/reagent_containers/food/snacks/breadslice/plain = 2,
+ )
+ result = /obj/item/reagent_containers/food/snacks/peanutbutter_sandwich
+ subcategory = CAT_SANDWICH
+
+
/datum/crafting_recipe/food/notasandwich
name = "Not a sandwich"
reqs = list(
diff --git a/code/modules/goonchat/browserassets/css/browserOutput.css b/code/modules/goonchat/browserassets/css/browserOutput.css
index 33884f8ef0..cf11b77879 100644
--- a/code/modules/goonchat/browserassets/css/browserOutput.css
+++ b/code/modules/goonchat/browserassets/css/browserOutput.css
@@ -303,6 +303,7 @@ h1.alert, h2.alert {color: #000000;}
.userdanger {color: #ff0000; font-weight: bold; font-size: 24px;}
.danger {color: #ff0000;}
.warning {color: #ff0000; font-style: italic;}
+.alertwarning {color: #FF0000; font-weight: bold}
.boldwarning {color: #ff0000; font-style: italic; font-weight: bold}
.announce {color: #228b22; font-weight: bold;}
.boldannounce {color: #ff0000; font-weight: bold;}
@@ -316,6 +317,8 @@ h1.alert, h2.alert {color: #000000;}
.unconscious {color: #0000ff; font-weight: bold;}
.suicide {color: #ff5050; font-style: italic;}
.green {color: #03ff39;}
+.red {color: #FF0000}
+.blue {color: #215cff}
.nicegreen {color: #14a833;}
.userlove {color: #FF1493; font-style: italic; font-weight: bold; text-shadow: 0 0 6px #ff6dbc;}
.love {color: #ff006a; font-style: italic; text-shadow: 0 0 6px #ff6d6d;}
diff --git a/code/modules/hydroponics/grown/peanuts.dm b/code/modules/hydroponics/grown/peanuts.dm
new file mode 100644
index 0000000000..2423300cc4
--- /dev/null
+++ b/code/modules/hydroponics/grown/peanuts.dm
@@ -0,0 +1,30 @@
+/obj/item/seeds/peanutseed
+ name = "pack of peanut seeds"
+ desc = "These seeds grow to produce fruits botanically classified as legumes, but mundanely referred as nuts."
+ icon_state = "seed-peanut"
+ species = "peanut"
+ plantname = "Peanut Vines"
+ product = /obj/item/reagent_containers/food/snacks/grown/peanut
+ yield = 6
+ growthstages = 4
+ growing_icon = 'icons/obj/hydroponics/growing_vegetables.dmi'
+ reagents_add = list("vitamin" = 0.02, "nutriment" = 0.15, "cooking_oil" = 0.03)
+
+/obj/item/reagent_containers/food/snacks/grown/peanut
+ seed = /obj/item/seeds/peanutseed
+ name = "peanut"
+ desc = "Peanuts for the peanut gallery!" //get me a better description, boys.
+ icon_state = "peanut"
+ filling_color = "#C4AE7A"
+ bitesize = 100
+ foodtype = VEGETABLES
+ dried_type = /obj/item/reagent_containers/food/snacks/roasted_peanuts
+ cooked_type = /obj/item/reagent_containers/food/snacks/roasted_peanuts
+
+/obj/item/reagent_containers/food/snacks/roasted_peanuts
+ name = "roasted peanuts"
+ desc = "A handful of roasted peanuts, with or without salt."
+ icon_state = "roasted_peanuts"
+ foodtype = VEGETABLES
+ list_reagents = list("nutriment" = 6, "vitamin" = 1)
+ juice_results = list("peanut_butter" = 3)
\ No newline at end of file
diff --git a/code/modules/hydroponics/grown/root.dm b/code/modules/hydroponics/grown/root.dm
index be0a209c9f..090809ca88 100644
--- a/code/modules/hydroponics/grown/root.dm
+++ b/code/modules/hydroponics/grown/root.dm
@@ -54,6 +54,7 @@
icon_state = "parsnip"
bitesize_mod = 2
foodtype = VEGETABLES
+ juice_results = list("parsnipjuice" = 0)
wine_power = 35
diff --git a/code/modules/integrated_electronics/subtypes/output.dm b/code/modules/integrated_electronics/subtypes/output.dm
index 86efc4c74a..3975da18b6 100644
--- a/code/modules/integrated_electronics/subtypes/output.dm
+++ b/code/modules/integrated_electronics/subtypes/output.dm
@@ -112,7 +112,7 @@
var/brightness = get_pin_data(IC_INPUT, 2)
if(new_color && isnum(brightness))
- brightness = CLAMP(brightness, 0, 4)
+ brightness = CLAMP(brightness, 0, 10)
light_rgb = new_color
light_brightness = brightness
@@ -411,4 +411,4 @@
if(assembly)
assembly.investigate_log("displayed \"[html_encode(stuff_to_display)]\" with [type].", INVESTIGATE_CIRCUIT)
else
- investigate_log("displayed \"[html_encode(stuff_to_display)]\" as [type].", INVESTIGATE_CIRCUIT)
\ No newline at end of file
+ investigate_log("displayed \"[html_encode(stuff_to_display)]\" as [type].", INVESTIGATE_CIRCUIT)
diff --git a/code/modules/jobs/job_types/civilian.dm b/code/modules/jobs/job_types/civilian.dm
index 944499470a..f21ff69e8e 100644
--- a/code/modules/jobs/job_types/civilian.dm
+++ b/code/modules/jobs/job_types/civilian.dm
@@ -18,6 +18,7 @@ Clown
minimal_access = list(ACCESS_THEATRE)
/datum/job/clown/after_spawn(mob/living/carbon/human/H, mob/M)
+ . = ..()
H.apply_pref_name("clown", M.client)
/datum/outfit/job/clown
@@ -60,6 +61,7 @@ Clown
return
H.dna.add_mutation(CLOWNMUT)
+ H.dna.add_mutation(SMILE)
/*
Mime
@@ -174,6 +176,8 @@ Lawyer
access = list(ACCESS_LAWYER, ACCESS_COURT, ACCESS_SEC_DOORS)
minimal_access = list(ACCESS_LAWYER, ACCESS_COURT, ACCESS_SEC_DOORS)
+ mind_traits = list(TRAIT_LAW_ENFORCEMENT_METABOLISM)
+
/datum/outfit/job/lawyer
name = "Lawyer"
jobtype = /datum/job/lawyer
diff --git a/code/modules/jobs/job_types/civilian_chaplain.dm b/code/modules/jobs/job_types/civilian_chaplain.dm
index 776727a5f8..2d190cfe60 100644
--- a/code/modules/jobs/job_types/civilian_chaplain.dm
+++ b/code/modules/jobs/job_types/civilian_chaplain.dm
@@ -19,6 +19,7 @@ Chaplain
minimal_access = list(ACCESS_MORGUE, ACCESS_CHAPEL_OFFICE, ACCESS_CREMATORIUM, ACCESS_THEATRE)
/datum/job/chaplain/after_spawn(mob/living/H, mob/M)
+ . = ..()
if(H.mind)
H.mind.isholy = TRUE
diff --git a/code/modules/jobs/job_types/job.dm b/code/modules/jobs/job_types/job.dm
index e441b3e889..f678700735 100644
--- a/code/modules/jobs/job_types/job.dm
+++ b/code/modules/jobs/job_types/job.dm
@@ -54,10 +54,15 @@
//can be overridden by antag_rep.txt config
var/antag_rep = 10
+ var/list/mind_traits // Traits added to the mind of the mob assigned this job
+
//Only override this proc
//H is usually a human unless an /equip override transformed it
/datum/job/proc/after_spawn(mob/living/H, mob/M, latejoin = FALSE)
//do actions on H but send messages to M as the key may not have been transferred_yet
+ if(mind_traits)
+ for(var/t in mind_traits)
+ ADD_TRAIT(H.mind, t, JOB_TRAIT)
/datum/job/proc/announce(mob/living/carbon/human/H)
if(head_announce)
diff --git a/code/modules/jobs/job_types/security.dm b/code/modules/jobs/job_types/security.dm
index e7e0922f62..8d2b9e8681 100644
--- a/code/modules/jobs/job_types/security.dm
+++ b/code/modules/jobs/job_types/security.dm
@@ -35,6 +35,8 @@ Head of Security
ACCESS_RESEARCH, ACCESS_ENGINE, ACCESS_MINING, ACCESS_MEDICAL, ACCESS_CONSTRUCTION, ACCESS_MAILSORTING,
ACCESS_HEADS, ACCESS_HOS, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_MAINT_TUNNELS, ACCESS_MINERAL_STOREROOM)
+ mind_traits = list(TRAIT_LAW_ENFORCEMENT_METABOLISM)
+
/datum/outfit/job/hos
name = "Head of Security"
jobtype = /datum/job/hos
@@ -92,6 +94,8 @@ Warden
access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_COURT, ACCESS_MAINT_TUNNELS, ACCESS_MORGUE, ACCESS_WEAPONS, ACCESS_FORENSICS_LOCKERS, ACCESS_MINERAL_STOREROOM)
minimal_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_COURT, ACCESS_WEAPONS, ACCESS_MINERAL_STOREROOM) //SEE /DATUM/JOB/WARDEN/GET_ACCESS()
+ mind_traits = list(TRAIT_LAW_ENFORCEMENT_METABOLISM)
+
/datum/job/warden/get_access()
var/list/L = list()
L = ..() | check_config_for_sec_maint()
@@ -145,6 +149,8 @@ Detective
access = list(ACCESS_SEC_DOORS, ACCESS_FORENSICS_LOCKERS, ACCESS_MORGUE, ACCESS_MAINT_TUNNELS, ACCESS_COURT, ACCESS_BRIG, ACCESS_WEAPONS, ACCESS_MINERAL_STOREROOM)
minimal_access = list(ACCESS_SEC_DOORS, ACCESS_FORENSICS_LOCKERS, ACCESS_MORGUE, ACCESS_MAINT_TUNNELS, ACCESS_COURT, ACCESS_BRIG, ACCESS_WEAPONS, ACCESS_MINERAL_STOREROOM)
+ mind_traits = list(TRAIT_LAW_ENFORCEMENT_METABOLISM)
+
/datum/outfit/job/detective
name = "Detective"
jobtype = /datum/job/detective
@@ -198,6 +204,7 @@ Security Officer
access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_MAINT_TUNNELS, ACCESS_MORGUE, ACCESS_WEAPONS, ACCESS_FORENSICS_LOCKERS, ACCESS_MINERAL_STOREROOM)
minimal_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_WEAPONS, ACCESS_MINERAL_STOREROOM) //BUT SEE /DATUM/JOB/WARDEN/GET_ACCESS()
+ mind_traits = list(TRAIT_LAW_ENFORCEMENT_METABOLISM)
/datum/job/officer/get_access()
var/list/L = list()
diff --git a/code/modules/mining/equipment/mining_tools.dm b/code/modules/mining/equipment/mining_tools.dm
index 0d6c337444..e02f38b7e3 100644
--- a/code/modules/mining/equipment/mining_tools.dm
+++ b/code/modules/mining/equipment/mining_tools.dm
@@ -65,9 +65,12 @@
/obj/item/pickaxe/drill/cyborg
name = "cyborg mining drill"
desc = "An integrated electric mining drill."
- item_flags = NODROP
flags_1 = NONE
+/obj/item/pickaxe/drill/cyborg/Initialize()
+ . = ..()
+ ADD_TRAIT(src, TRAIT_NODROP, CYBORG_ITEM_TRAIT)
+
/obj/item/pickaxe/drill/diamonddrill
name = "diamond-tipped mining drill"
icon_state = "diamonddrill"
diff --git a/code/modules/mining/laborcamp/laborstacker.dm b/code/modules/mining/laborcamp/laborstacker.dm
index 8a8aa09c51..953da6cbb0 100644
--- a/code/modules/mining/laborcamp/laborstacker.dm
+++ b/code/modules/mining/laborcamp/laborstacker.dm
@@ -112,7 +112,7 @@ GLOBAL_LIST(labor_sheet_values)
else
if(!(obj_flags & EMAGGED))
Radio.set_frequency(FREQ_SECURITY)
- Radio.talk_into(src, "[inserted_id.registered_name] has returned to the station. Minerals and Prisoner ID card ready for retrieval.", FREQ_SECURITY, get_spans(), get_default_language())
+ Radio.talk_into(src, "[inserted_id.registered_name] has returned to the station. Minerals and Prisoner ID card ready for retrieval.", FREQ_SECURITY)
to_chat(usr, "Shuttle received message and will be sent shortly.")
/obj/machinery/mineral/labor_claim_console/proc/check_auth()
@@ -152,7 +152,7 @@ GLOBAL_LIST(labor_sheet_values)
var/obj/item/stack/sheet/inp = I
points += inp.point_value * inp.amount
return ..()
-
+
/**********************Point Lookup Console**************************/
/obj/machinery/mineral/labor_points_checker
name = "points checking console"
diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm
index eaac1984e3..abcb6d5911 100644
--- a/code/modules/mining/lavaland/necropolis_chests.dm
+++ b/code/modules/mining/lavaland/necropolis_chests.dm
@@ -143,7 +143,7 @@
//Rod of Asclepius
/obj/item/rod_of_asclepius
- name = "Rod of Asclepius"
+ name = "\improper Rod of Asclepius"
desc = "A wooden rod about the size of your forearm with a snake carved around it, winding it's way up the sides of the rod. Something about it seems to inspire in you the responsibilty and duty to help others."
icon = 'icons/obj/lavaland/artefacts.dmi'
icon_state = "asclepius_dormant"
@@ -189,7 +189,8 @@
activated()
/obj/item/rod_of_asclepius/proc/activated()
- item_flags = NODROP | DROPDEL
+ item_flags = DROPDEL
+ ADD_TRAIT(src, TRAIT_NODROP, CURSED_ITEM_TRAIT)
desc = "A short wooden rod with a mystical snake inseparably gripping itself and the rod to your forearm. It flows with a healing energy that disperses amongst yourself and those around you. "
icon_state = "asclepius_active"
activated = TRUE
diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm
index 686a028b47..4ccac5f9d7 100644
--- a/code/modules/mob/dead/new_player/new_player.dm
+++ b/code/modules/mob/dead/new_player/new_player.dm
@@ -164,7 +164,7 @@
return
var/obj/effect/mob_spawn/MS = pick(GLOB.mob_spawners[href_list["JoinAsGhostRole"]])
- if(MS?.attack_ghost(src, latejoinercalling = TRUE))
+ if(MS.attack_ghost(src, latejoinercalling = TRUE))
SSticker.queued_players -= src
SSticker.queue_delay = 4
qdel(src)
@@ -443,10 +443,14 @@
for(var/datum/job/job in SSjob.occupations)
if(job && IsJobUnavailable(job.title, TRUE) == JOB_AVAILABLE)
available_job_count++
- for(var/obj/effect/mob_spawn/spawner in GLOB.mob_spawners)
- if(spawner.can_latejoin())
- available_job_count++
- break
+ for(var/spawner in GLOB.mob_spawners)
+ if(!LAZYLEN(spawner))
+ continue
+ var/obj/effect/mob_spawn/S = pick(GLOB.mob_spawners[spawner])
+ if(!istype(S) || !S.can_latejoin())
+ continue
+ available_job_count++
+ break
if(!available_job_count)
dat += "There are currently no open positions!
"
@@ -465,9 +469,13 @@
"Science" = list(jobs = list(), titles = GLOB.science_positions, color = "#e6b3e6"),
"Security" = list(jobs = list(), titles = GLOB.security_positions, color = "#ff9999"),
)
- for(var/obj/effect/mob_spawn/spawner in GLOB.mob_spawners)
- if(spawner.can_latejoin())
- categorizedJobs["Ghost Role"]["jobs"] += spawner
+ for(var/spawner in GLOB.mob_spawners)
+ if(!LAZYLEN(spawner))
+ continue
+ var/obj/effect/mob_spawn/S = pick(GLOB.mob_spawners[spawner])
+ if(!istype(S) || !S.can_latejoin())
+ continue
+ categorizedJobs["Ghost Role"]["jobs"] += spawner
for(var/datum/job/job in SSjob.occupations)
if(job && IsJobUnavailable(job.title, TRUE) == JOB_AVAILABLE)
diff --git a/code/modules/mob/dead/new_player/preferences_setup.dm b/code/modules/mob/dead/new_player/preferences_setup.dm
index 353df3aa66..ffe9a800a1 100644
--- a/code/modules/mob/dead/new_player/preferences_setup.dm
+++ b/code/modules/mob/dead/new_player/preferences_setup.dm
@@ -6,8 +6,11 @@
else
gender = pick(MALE,FEMALE)
underwear = random_underwear(gender)
+ undie_color = random_color()
undershirt = random_undershirt(gender)
+ shirt_color = random_color()
socks = random_socks()
+ socks_color = random_color()
skin_tone = random_skin_tone()
hair_style = random_hair_style(gender)
facial_hair_style = random_facial_hair_style(gender)
diff --git a/code/modules/mob/dead/new_player/sprite_accessories/_sprite_accessories.dm b/code/modules/mob/dead/new_player/sprite_accessories/_sprite_accessories.dm
index 699c3c97e4..5e24d0630b 100644
--- a/code/modules/mob/dead/new_player/sprite_accessories/_sprite_accessories.dm
+++ b/code/modules/mob/dead/new_player/sprite_accessories/_sprite_accessories.dm
@@ -59,4 +59,8 @@
var/locked = FALSE //Is this part locked from roundstart selection? Used for parts that apply effects
var/dimension_x = 32
var/dimension_y = 32
- var/center = FALSE //Should we center the sprite?
\ No newline at end of file
+ var/center = FALSE //Should we center the sprite?
+
+/datum/sprite_accessory/underwear
+ icon = 'icons/mob/underwear.dmi'
+ var/has_color = FALSE
\ No newline at end of file
diff --git a/code/modules/mob/dead/new_player/sprite_accessories/socks.dm b/code/modules/mob/dead/new_player/sprite_accessories/socks.dm
index 3384f3754b..524c1f0f13 100644
--- a/code/modules/mob/dead/new_player/sprite_accessories/socks.dm
+++ b/code/modules/mob/dead/new_player/sprite_accessories/socks.dm
@@ -2,135 +2,132 @@
// Socks Definitions //
///////////////////////
-/datum/sprite_accessory/socks
- icon = 'icons/mob/underwear.dmi'
-
-/datum/sprite_accessory/socks/nude
+/datum/sprite_accessory/underwear/socks/nude
name = "Nude"
icon_state = null
// please make sure they're sorted alphabetically and categorized
-/datum/sprite_accessory/socks/bee_knee
- name = "Knee-high (Bee)"
+/datum/sprite_accessory/underwear/socks/socks_knee
+ name = "Knee-high"
+ icon_state = "socks_knee"
+ has_color = TRUE
+
+/datum/sprite_accessory/underwear/socks/bee_knee
+ name = "Knee-high - Bee"
icon_state = "bee_knee"
-/datum/sprite_accessory/socks/black_knee
- name = "Knee-high (Black)"
- icon_state = "black_knee"
-
-/datum/sprite_accessory/socks/commie_knee
- name = "Knee-High (Commie)"
+/datum/sprite_accessory/underwear/socks/commie_knee
+ name = "Knee-High - Commie"
icon_state = "commie_knee"
-/datum/sprite_accessory/socks/usa_knee
- name = "Knee-High (Freedom)"
+/datum/sprite_accessory/underwear/socks/usa_knee
+ name = "Knee-High - Freedom"
icon_state = "assblastusa_knee"
-/datum/sprite_accessory/socks/rainbow_knee
- name = "Knee-high (Rainbow)"
+/datum/sprite_accessory/underwear/socks/rainbow_knee
+ name = "Knee-high - Rainbow"
icon_state = "rainbow_knee"
-/datum/sprite_accessory/socks/striped_knee
- name = "Knee-high (Striped)"
+/datum/sprite_accessory/underwear/socks/striped_knee
+ name = "Knee-high - Striped"
icon_state = "striped_knee"
+ has_color = TRUE
-/datum/sprite_accessory/socks/thin_knee
- name = "Knee-high (Thin)"
+/datum/sprite_accessory/underwear/socks/thin_knee
+ name = "Knee-high - Thin"
icon_state = "thin_knee"
+ has_color = TRUE
-/datum/sprite_accessory/socks/uk_knee
- name = "Knee-High (UK)"
+/datum/sprite_accessory/underwear/socks/uk_knee
+ name = "Knee-High - UK"
icon_state = "uk_knee"
-/datum/sprite_accessory/socks/white_knee
- name = "Knee-high (White)"
- icon_state = "white_knee"
+/datum/sprite_accessory/underwear/socks/socks_norm
+ name = "Normal"
+ icon_state = "socks_norm"
+ has_color = TRUE
-/datum/sprite_accessory/socks/black_norm
- name = "Normal (Black)"
- icon_state = "black_norm"
+/datum/sprite_accessory/underwear/socks/bee_norm
+ name = "Normal - Bee"
+ icon_state = "bee_norm"
-/datum/sprite_accessory/socks/white_norm
- name = "Normal (White)"
- icon_state = "white_norm"
-
-/datum/sprite_accessory/socks/pantyhose
+/datum/sprite_accessory/underwear/socks/pantyhose
name = "Pantyhose"
icon_state = "pantyhose"
-/datum/sprite_accessory/socks/black_short
- name = "Short (Black)"
- icon_state = "black_short"
+/datum/sprite_accessory/underwear/socks/socks_short
+ name = "Short"
+ icon_state = "socks_short"
+ has_color = TRUE
-/datum/sprite_accessory/socks/white_short
- name = "Short (White)"
- icon_state = "white_short"
-
-/datum/sprite_accessory/socks/stockings_blue
- name = "Stockings (Blue)"
+/datum/sprite_accessory/underwear/socks/stockings_blue
+ name = "Stockings - Blue"
icon_state = "stockings_blue"
-/datum/sprite_accessory/socks/stockings_cyan
- name = "Stockings (Cyan)"
+/datum/sprite_accessory/underwear/socks/stockings_cyan
+ name = "Stockings - Cyan"
icon_state = "stockings_cyan"
-/datum/sprite_accessory/socks/stockings_dpink
- name = "Stockings (Dark Pink)"
+/datum/sprite_accessory/underwear/socks/stockings_dpink
+ name = "Stockings - Dark Pink"
icon_state = "stockings_dpink"
-/datum/sprite_accessory/socks/stockings_green
- name = "Stockings (Green)"
+/datum/sprite_accessory/underwear/socks/stockings_green
+ name = "Stockings - Green"
icon_state = "stockings_black"
-/datum/sprite_accessory/socks/stockings_orange
- name = "Stockings (Orange)"
+/datum/sprite_accessory/underwear/socks/stockings_orange
+ name = "Stockings - Orange"
icon_state = "stockings_orange"
-/datum/sprite_accessory/socks/stockings_programmer
- name = "Stockings (Programmer)"
+/datum/sprite_accessory/underwear/socks/stockings_programmer
+ name = "Stockings - Programmer"
icon_state = "stockings_lpink"
-/datum/sprite_accessory/socks/stockings_purple
- name = "Stockings (Purple)"
+/datum/sprite_accessory/underwear/socks/stockings_purple
+ name = "Stockings - Purple"
icon_state = "stockings_purple"
-/datum/sprite_accessory/socks/stockings_yellow
- name = "Stockings (Yellow)"
+/datum/sprite_accessory/underwear/socks/stockings_yellow
+ name = "Stockings - Yellow"
icon_state = "stockings_yellow"
-/datum/sprite_accessory/socks/bee_thigh
- name = "Thigh-high (Bee)"
+/datum/sprite_accessory/underwear/socks/socks_thigh
+ name = "Thigh-high"
+ icon_state = "socks_thigh"
+ has_color = TRUE
+
+/datum/sprite_accessory/underwear/socks/bee_thigh
+ name = "Thigh-high - Bee"
icon_state = "bee_thigh"
-/datum/sprite_accessory/socks/black_thigh
- name = "Thigh-high (Black)"
- icon_state = "black_thigh"
-
-/datum/sprite_accessory/socks/commie_thigh
- name = "Thigh-high (Commie)"
+/datum/sprite_accessory/underwear/socks/commie_thigh
+ name = "Thigh-high - Commie"
icon_state = "commie_thigh"
-/datum/sprite_accessory/socks/usa_thigh
- name = "Thigh-high (Freedom)"
+/datum/sprite_accessory/underwear/socks/usa_thigh
+ name = "Thigh-high - Freedom"
icon_state = "assblastusa_thigh"
-/datum/sprite_accessory/socks/rainbow_thigh
- name = "Thigh-high (Rainbow)"
+/datum/sprite_accessory/underwear/socks/fishnet
+ name = "Thigh-high - Fishnet"
+ icon_state = "fishnet"
+
+/datum/sprite_accessory/underwear/socks/rainbow_thigh
+ name = "Thigh-high - Rainbow"
icon_state = "rainbow_thigh"
-/datum/sprite_accessory/socks/striped_thigh
- name = "Thigh-high (Striped)"
+/datum/sprite_accessory/underwear/socks/striped_thigh
+ name = "Thigh-high - Striped"
icon_state = "striped_thigh"
+ has_color = TRUE
-/datum/sprite_accessory/socks/thin_thigh
- name = "Thigh-high (Thin)"
+/datum/sprite_accessory/underwear/socks/thin_thigh
+ name = "Thigh-high - Thin"
icon_state = "thin_thigh"
+ has_color = TRUE
-/datum/sprite_accessory/socks/uk_thigh
- name = "Thigh-high (UK)"
+/datum/sprite_accessory/underwear/socks/uk_thigh
+ name = "Thigh-high - UK"
icon_state = "uk_thigh"
-
-/datum/sprite_accessory/socks/white_thigh
- name = "Thigh-high (White)"
- icon_state = "white_thigh"
diff --git a/code/modules/mob/dead/new_player/sprite_accessories/undershirt.dm b/code/modules/mob/dead/new_player/sprite_accessories/undershirt.dm
index f5af9a3849..bf63ea09d7 100644
--- a/code/modules/mob/dead/new_player/sprite_accessories/undershirt.dm
+++ b/code/modules/mob/dead/new_player/sprite_accessories/undershirt.dm
@@ -2,311 +2,288 @@
// Undershirt Definitions //
////////////////////////////
-/datum/sprite_accessory/undershirt
- icon = 'icons/mob/underwear.dmi'
- gender = NEUTER
-
-/datum/sprite_accessory/undershirt/nude
+/datum/sprite_accessory/underwear/top/nude
name = "Nude"
icon_state = null
// please make sure they're sorted alphabetically and categorized
-/datum/sprite_accessory/undershirt/bluejersey
+/datum/sprite_accessory/underwear/top/longjon
+ name = "Long John Shirt"
+ icon_state = "ljont"
+ has_color = TRUE
+
+/datum/sprite_accessory/underwear/top/longstripe_black
+ name = "Longsleeve Striped Shirt - Black"
+ icon_state = "longstripe"
+
+/datum/sprite_accessory/underwear/top/longstripe_blue
+ name = "Longsleeve Striped Shirt - Blue"
+ icon_state = "longstripe_blue"
+
+/datum/sprite_accessory/underwear/top/shirt
+ name = "Shirt"
+ icon_state = "undershirt"
+ has_color = TRUE
+
+/datum/sprite_accessory/underwear/top/bowlingw
+ name = "Shirt - Bowling"
+ icon_state = "bowlingw"
+ has_color = TRUE
+
+/datum/sprite_accessory/underwear/top/bowling
+ name = "Shirt, Bowling - Red"
+ icon_state = "bowling"
+
+/datum/sprite_accessory/underwear/top/bowlingp
+ name = "Shirt, Bowling - Pink"
+ icon_state = "bowlingp"
+
+/datum/sprite_accessory/underwear/top/bowlinga
+ name = "Shirt, Bowling - Aqua"
+ icon_state = "bowlinga"
+
+/datum/sprite_accessory/underwear/top/bluejersey
name = "Shirt, Jersey - Blue"
icon_state = "shirt_bluejersey"
-/datum/sprite_accessory/undershirt/redjersey
+/datum/sprite_accessory/underwear/top/redjersey
name = "Shirt, Jersey - Red"
icon_state = "shirt_redjersey"
-/datum/sprite_accessory/undershirt/bluepolo
- name = "Shirt, Polo - Blue"
- icon_state = "bluepolo"
+/datum/sprite_accessory/underwear/top/polo
+ name = "Shirt - Polo"
+ icon_state = "polo"
+ has_color = TRUE
-/datum/sprite_accessory/undershirt/grayyellowpolo
- name = "Shirt, Polo - Gray, Yellow"
- icon_state = "grayyellowpolo"
-
-/datum/sprite_accessory/undershirt/redpolo
- name = "Shirt, Polo - Red"
- icon_state = "redpolo"
-
-/datum/sprite_accessory/undershirt/whitepolo
- name = "Shirt, Polo - White"
- icon_state = "whitepolo"
-
-/datum/sprite_accessory/undershirt/alienshirt
+/datum/sprite_accessory/underwear/top/alienshirt
name = "Shirt - Alien"
icon_state = "shirt_alien"
-/datum/sprite_accessory/undershirt/mondmondjaja
+/datum/sprite_accessory/underwear/top/mondmondjaja
name = "Shirt - Band"
icon_state = "band"
-/datum/sprite_accessory/undershirt/shirt_black
- name = "Shirt - Black"
- icon_state = "shirt_black"
+/datum/sprite_accessory/underwear/top/shirt_bee
+ name = "Shirt - Bee"
+ icon_state = "bee_shirt"
-/datum/sprite_accessory/undershirt/blueshirt
- name = "Shirt - Blue"
- icon_state = "shirt_blue"
-
-/datum/sprite_accessory/undershirt/clownshirt
+/datum/sprite_accessory/underwear/top/clownshirt
name = "Shirt - Clown"
icon_state = "shirt_clown"
-/datum/sprite_accessory/undershirt/commie
+/datum/sprite_accessory/underwear/top/commie
name = "Shirt - Commie"
icon_state = "shirt_commie"
-/datum/sprite_accessory/undershirt/greenshirt
- name = "Shirt - Green"
- icon_state = "shirt_green"
-
-/datum/sprite_accessory/undershirt/shirt_grey
- name = "Shirt - Grey"
- icon_state = "shirt_grey"
-
-/datum/sprite_accessory/undershirt/ian
+/datum/sprite_accessory/underwear/top/ian
name = "Shirt - Ian"
icon_state = "ian"
-/datum/sprite_accessory/undershirt/ilovent
+/datum/sprite_accessory/underwear/top/ilovent
name = "Shirt - I Love NT"
icon_state = "ilovent"
-/datum/sprite_accessory/undershirt/lover
+/datum/sprite_accessory/underwear/top/lover
name = "Shirt - Lover"
icon_state = "lover"
-/datum/sprite_accessory/undershirt/matroska
+/datum/sprite_accessory/underwear/top/matroska
name = "Shirt - Matroska"
icon_state = "matroska"
-/datum/sprite_accessory/undershirt/meat
+/datum/sprite_accessory/underwear/top/meat
name = "Shirt - Meat"
icon_state = "shirt_meat"
-/datum/sprite_accessory/undershirt/nano
+/datum/sprite_accessory/underwear/top/nano
name = "Shirt - Nanotrasen"
icon_state = "shirt_nano"
-/datum/sprite_accessory/undershirt/peace
+/datum/sprite_accessory/underwear/top/peace
name = "Shirt - Peace"
icon_state = "peace"
-/datum/sprite_accessory/undershirt/pacman
+/datum/sprite_accessory/underwear/top/pacman
name = "Shirt - Pogoman"
icon_state = "pogoman"
-/datum/sprite_accessory/undershirt/question
+/datum/sprite_accessory/underwear/top/question
name = "Shirt - Question"
icon_state = "shirt_question"
-/datum/sprite_accessory/undershirt/redshirt
- name = "Shirt - Red"
- icon_state = "shirt_red"
-
-/datum/sprite_accessory/undershirt/skull
+/datum/sprite_accessory/underwear/top/skull
name = "Shirt - Skull"
icon_state = "shirt_skull"
-/datum/sprite_accessory/undershirt/ss13
+/datum/sprite_accessory/underwear/top/ss13
name = "Shirt - SS13"
icon_state = "shirt_ss13"
+ has_color = TRUE
-/datum/sprite_accessory/undershirt/stripe
+/datum/sprite_accessory/underwear/top/stripe
name = "Shirt - Striped"
icon_state = "shirt_stripes"
-/datum/sprite_accessory/undershirt/tiedye
+/datum/sprite_accessory/underwear/top/tiedye
name = "Shirt - Tie-dye"
icon_state = "shirt_tiedye"
-/datum/sprite_accessory/undershirt/uk
+/datum/sprite_accessory/underwear/top/uk
name = "Shirt - UK"
icon_state = "uk"
-/datum/sprite_accessory/undershirt/usa
+/datum/sprite_accessory/underwear/top/usa
name = "Shirt - USA"
icon_state = "shirt_assblastusa"
-/datum/sprite_accessory/undershirt/shirt_white
- name = "Shirt - White"
- icon_state = "shirt_white"
+/datum/sprite_accessory/underwear/top/shortsleeve
+ name = "Shirt - Short Sleeved"
+ icon_state = "shortsleeve"
+ has_color = TRUE
-/datum/sprite_accessory/undershirt/blackshortsleeve
- name = "Shirt, Short Sleeved - Black"
- icon_state = "blackshortsleeve"
-
-/datum/sprite_accessory/undershirt/blueshortsleeve
- name = "Shirt, Short Sleeved - Blue"
- icon_state = "blueshortsleeve"
-
-/datum/sprite_accessory/undershirt/greenshortsleeve
- name = "Shirt, Short Sleeved - Green"
- icon_state = "greenshortsleeve"
-
-/datum/sprite_accessory/undershirt/purpleshortsleeve
- name = "Shirt, Short Sleeved - Purple"
- icon_state = "purpleshortsleeve"
-
-/datum/sprite_accessory/undershirt/whiteshortsleeve
- name = "Shirt, Short Sleeved - White"
- icon_state = "whiteshortsleeve"
-
-/datum/sprite_accessory/undershirt/blueshirtsport
+/datum/sprite_accessory/underwear/top/blueshirtsport
name = "Shirt, Sports - Blue"
icon_state = "blueshirtsport"
- gender = NEUTER
-/datum/sprite_accessory/undershirt/greenshirtsport
+/datum/sprite_accessory/underwear/top/greenshirtsport
name = "Shirt, Sports - Green"
icon_state = "greenshirtsport"
- gender = NEUTER
-/datum/sprite_accessory/undershirt/redshirtsport
+/datum/sprite_accessory/underwear/top/redshirtsport
name = "Shirt, Sports - Red"
icon_state = "redshirtsport"
- gender = NEUTER
-/datum/sprite_accessory/undershirt/redtop
- name = "Shirt, Short - Red"
- icon_state = "redtop"
-
-/datum/sprite_accessory/undershirt/whitetop
- name = "Shirt, Short - White"
- icon_state = "whitetop"
-
-/datum/sprite_accessory/undershirt/tshirt_blue
- name = "T-Shirt - Blue"
- icon_state = "blueshirt"
-
-/datum/sprite_accessory/undershirt/tshirt_green
- name = "T-Shirt - Green"
- icon_state = "greenshirt"
-
-/datum/sprite_accessory/undershirt/tshirt_red
- name = "T-Shirt - Red"
- icon_state = "redshirt"
-
-/datum/sprite_accessory/undershirt/yellowshirt
- name = "T-Shirt - Yellow"
- icon_state = "yellowshirt"
-
-/datum/sprite_accessory/undershirt/tank_black
- name = "Tank Top - Black"
- icon_state = "tank_black"
-
-/datum/sprite_accessory/undershirt/tankfire
+/datum/sprite_accessory/underwear/top/tankfire
name = "Tank Top - Fire"
icon_state = "tank_fire"
-/datum/sprite_accessory/undershirt/tank_grey
- name = "Tank Top - Grey"
- icon_state = "tank_grey"
+/datum/sprite_accessory/underwear/top/tanktop
+ name = "Tank Top"
+ icon_state = "tanktop"
+ has_color = TRUE
-/datum/sprite_accessory/undershirt/female_midriff
+/datum/sprite_accessory/underwear/top/tanktop_alt
+ name = "Tank Top - Alt"
+ icon_state = "tanktop_alt"
+ has_color = TRUE
+
+/datum/sprite_accessory/underwear/top/tanktop_midriff
name = "Tank Top - Midriff"
icon_state = "tank_midriff"
+ has_color = TRUE
-/datum/sprite_accessory/undershirt/tank_red
- name = "Tank Top - Red"
- icon_state = "tank_red"
+/datum/sprite_accessory/underwear/top/tanktop_midriff_alt
+ name = "Tank Top - Midriff Halterneck"
+ icon_state = "tank_midriff_alt"
+ has_color = TRUE
-/datum/sprite_accessory/undershirt/tankstripe
+/datum/sprite_accessory/underwear/top/tankstripe
name = "Tank Top - Striped"
icon_state = "tank_stripes"
-/datum/sprite_accessory/undershirt/tank_white
- name = "Tank Top - White"
- icon_state = "tank_white"
+/datum/sprite_accessory/underwear/top/tank_top_sun
+ name = "Tank top - Sun"
+ icon_state = "tank_sun"
-/datum/sprite_accessory/undershirt/female_red
- name = "Bra - Red"
- icon_state = "bra_red"
+/datum/sprite_accessory/underwear/top/babydoll
+ name = "Baby-Doll"
+ icon_state = "babydoll"
+ has_color = TRUE
-/datum/sprite_accessory/undershirt/female_pink
- name = "Bra - Pink"
- icon_state = "bra_pink"
+/datum/sprite_accessory/underwear/top/bra
+ name = "Bra"
+ icon_state = "bra"
+ has_color = TRUE
-/datum/sprite_accessory/undershirt/female_kinky
+/datum/sprite_accessory/underwear/top/bra_alt
+ name = "Bra - Alt"
+ icon_state = "bra_alt"
+ has_color = TRUE
+
+/datum/sprite_accessory/underwear/top/bra_thin
+ name = "Bra - Thin"
+ icon_state = "bra_thin"
+ has_color = TRUE
+
+/datum/sprite_accessory/underwear/top/bra_kinky
name = "Bra - Kinky Black"
icon_state = "bra_kinky"
-/datum/sprite_accessory/undershirt/female_green
- name = "Bra - Green"
- icon_state = "bra_green"
-
-/datum/sprite_accessory/undershirt/female_commie
+/datum/sprite_accessory/underwear/top/bra_freedom
name = "Bra - Freedom"
icon_state = "bra_assblastusa"
-/datum/sprite_accessory/undershirt/female_commie
+/datum/sprite_accessory/underwear/top/bra_commie
name = "Bra - Commie"
icon_state = "bra_commie"
-/datum/sprite_accessory/undershirt/female_babyblue
- name = "Bra - Baby Blue"
- icon_state = "bra_babyblue"
-
-/datum/sprite_accessory/undershirt/female_beekini
+/datum/sprite_accessory/underwear/top/bra_beekini
name = "Bra - Bee-kini"
icon_state = "bra_bee-kini"
-/datum/sprite_accessory/undershirt/female_black
- name = "Bra - Black"
- icon_state = "bra_black"
-
-/datum/sprite_accessory/undershirt/female_uk
+/datum/sprite_accessory/underwear/top/bra_uk
name = "Bra - UK"
icon_state = "bra_uk"
-/datum/sprite_accessory/undershirt/female_white
- name = "Bra - White"
- icon_state = "bra_white"
+/datum/sprite_accessory/underwear/top/bra_neko
+ name = "Bra - Neko"
+ icon_state = "bra_neko"
+ has_color = TRUE
-/datum/sprite_accessory/undershirt/female_white_neko
- name = "Bra, Neko - white"
- icon_state = "bra_neko_white"
+/datum/sprite_accessory/underwear/top/halterneck_bra
+ name = "Bra - Halterneck"
+ icon_state = "halterneck_bra"
+ has_color = TRUE
-/datum/sprite_accessory/undershirt/female_black_neko
- name = "Bra, Neko - Black"
- icon_state = "bra_neko_black"
-
-/datum/sprite_accessory/undershirt/female_blackalt
- name = "Bra, Sports - Black"
- icon_state = "bra_sports_black"
-
-/datum/sprite_accessory/undershirt/sports_bra
- name = "Bra, Sports 1 - White"
+/datum/sprite_accessory/underwear/top/sports_bra
+ name = "Bra, Sports"
icon_state = "sports_bra"
+ has_color = TRUE
-/datum/sprite_accessory/undershirt/female_whitealt
- name = "Bra, Sports 2 - White"
- icon_state = "bra_sports_white"
-
-/datum/sprite_accessory/undershirt/sports_bra2
- name = "Bra, Sports 3 - White"
+/datum/sprite_accessory/underwear/top/sports_bra_alt
+ name = "Bra, Sports - Alt"
icon_state = "sports_bra_alt"
+ has_color = TRUE
-/datum/sprite_accessory/undershirt/female_yellow
- name = "Bra - Yellow"
- icon_state = "bra_yellow"
+/datum/sprite_accessory/underwear/top/bra_strapless
+ name = "Bra, Strapless"
+ icon_state = "bra_strapless"
+ has_color = TRUE
-/datum/sprite_accessory/undershirt/female_thong
- name = "Bra, Strapless - Pink"
- icon_state = "bra_strapless_pink"
-
-/datum/sprite_accessory/undershirt/female_blue
- name = "Bra, Strapless - Blue"
+/datum/sprite_accessory/underwear/top/bra_strapless_alt
+ name = "Bra, Strapless - Alt"
icon_state = "bra_blue"
+ has_color = TRUE
-/datum/sprite_accessory/undershirt/swimsuit_green
- name = "Swimsuit, Top - Green"
- icon_state = "bra_swimming_green"
+/datum/sprite_accessory/underwear/top/striped_bra
+ name = "Bra - Striped"
+ icon_state = "striped_bra"
+ has_color = TRUE
-/datum/sprite_accessory/undershirt/swimsuit_purple
- name = "Swimsuit, Top - Purple"
- icon_state = "bra_swimming_purple"
\ No newline at end of file
+/datum/sprite_accessory/underwear/top/fishnet_sleeves
+ name = "Fishnet - sleeves"
+ icon_state = "fishnet_sleeves"
+
+/datum/sprite_accessory/underwear/top/fishnet_gloves
+ name = "Fishnet - gloves"
+ icon_state = "fishnet_gloves"
+
+/datum/sprite_accessory/underwear/top/fishnet_base
+ name = "Fishnet - top"
+ icon_state = "fishnet_body"
+
+/datum/sprite_accessory/underwear/top/swimsuit
+ name = "Swimsuit Top"
+ icon_state = "bra_swimming"
+ has_color = TRUE
+
+/datum/sprite_accessory/underwear/top/swimsuit_alt
+ name = "Swimsuit Top - Strapless"
+ icon_state = "bra_swimming_alt"
+ has_color = TRUE
+
+/datum/sprite_accessory/underwear/top/tubetop
+ name = "Tube Top"
+ icon_state = "tubetop"
+ has_color = TRUE
\ No newline at end of file
diff --git a/code/modules/mob/dead/new_player/sprite_accessories/underwear.dm b/code/modules/mob/dead/new_player/sprite_accessories/underwear.dm
index e7179eeb87..611547ad4e 100644
--- a/code/modules/mob/dead/new_player/sprite_accessories/underwear.dm
+++ b/code/modules/mob/dead/new_player/sprite_accessories/underwear.dm
@@ -1,174 +1,144 @@
///////////////////////////
// Underwear Definitions //
///////////////////////////
-/datum/sprite_accessory/underwear
- icon = 'icons/mob/underwear.dmi'
- gender = NEUTER
-/datum/sprite_accessory/underwear/nude
+/datum/sprite_accessory/underwear/bottom/nude
name = "Nude"
icon_state = null
-/datum/sprite_accessory/underwear/mankini
- name = "Mankini - Green"
- icon_state = "mankini_green"
+/datum/sprite_accessory/underwear/bottom/mankini
+ name = "Mankini"
+ icon_state = "mankini"
+ has_color = TRUE
-/datum/sprite_accessory/underwear/male_kinky
- name = "Jockstrap - White"
- icon_state = "jockstrap_white"
+/datum/sprite_accessory/underwear/bottom/male_kinky
+ name = "Jockstrap"
+ icon_state = "jockstrap"
+ has_color = TRUE
-/datum/sprite_accessory/underwear/male_white
- name = "Briefs - White"
- icon_state = "briefs_white"
+/datum/sprite_accessory/underwear/bottom/briefs
+ name = "Briefs"
+ icon_state = "briefs"
+ has_color = TRUE
-/datum/sprite_accessory/underwear/male_black
- name = "Briefs - Black"
- icon_state = "briefs_black"
+/datum/sprite_accessory/underwear/bottom/boxers
+ name = "Boxers"
+ icon_state = "boxers"
+ has_color = TRUE
-/datum/sprite_accessory/underwear/male_grey
- name = "Briefs - Grey"
- icon_state = "briefs_grey"
+/datum/sprite_accessory/underwear/bottom/male_bee
+ name = "Boxers - Bee"
+ icon_state = "bee_shorts"
-/datum/sprite_accessory/underwear/male_red
- name = "Briefs - Red"
- icon_state = "briefs_red"
-
-/datum/sprite_accessory/underwear/male_green
- name = "Briefs - Green"
- icon_state = "briefs_green"
-
-/datum/sprite_accessory/underwear/male_blue
- name = "Briefs - Blue"
- icon_state = "briefs_blue"
-
-/datum/sprite_accessory/underwear/male_blackalt
- name = "Boxers - Black"
- icon_state = "boxers_black"
-
-/datum/sprite_accessory/underwear/male_greyalt
- name = "Boxers - Grey"
- icon_state = "boxers_grey"
-
-/datum/sprite_accessory/underwear/male_hearts
+/datum/sprite_accessory/underwear/bottom/male_hearts
name = "Boxers - Heart"
icon_state = "boxers_heart"
-/datum/sprite_accessory/underwear/male_stripe
+/datum/sprite_accessory/underwear/bottom/male_stripe
name = "Boxers - Striped"
icon_state = "boxers_striped"
-/datum/sprite_accessory/underwear/male_commie
+/datum/sprite_accessory/underwear/bottom/male_commie
name = "Boxers - Striped Communist"
icon_state = "boxers_commie"
-/datum/sprite_accessory/underwear/male_usastripe
+/datum/sprite_accessory/underwear/bottom/male_usastripe
name = "Boxers - Striped Freedom"
icon_state = "boxers_assblastusa"
-/datum/sprite_accessory/underwear/male_uk
+/datum/sprite_accessory/underwear/bottom/male_uk
name = "Boxers - Striped UK"
icon_state = "boxers_uk"
+/datum/sprite_accessory/underwear/bottom/boxer_briefs
+ name = "Boxer Briefs"
+ icon_state = "boxer_briefs"
+ has_color = TRUE
-/datum/sprite_accessory/underwear/female_whitealt
- name = "Boxer Briefs - White"
- icon_state = "boxer_briefs_white"
+/datum/sprite_accessory/underwear/bottom/panties
+ name = "Panties"
+ icon_state = "panties"
+ has_color = TRUE
-/datum/sprite_accessory/underwear/female_blackalt
- name = "Boxer Briefs - Black"
- icon_state = "boxer_briefs_black"
+/datum/sprite_accessory/underwear/bottom/panties_alt
+ name = "Panties - Alt"
+ icon_state = "panties_alt"
+ has_color = TRUE
-/datum/sprite_accessory/underwear/female_pink
- name = "Boxer Briefs - Pink"
- icon_state = "boxer_briefs_pink"
+/datum/sprite_accessory/underwear/bottom/fishnet_lower
+ name = "Panties - Fishnet"
+ icon_state = "fishnet_lower"
-/datum/sprite_accessory/underwear/female_babyblue
- name = "Boxer Briefs - Baby Blue"
- icon_state = "boxer_briefs_babyblue"
-
-/datum/sprite_accessory/underwear/female_yellow
- name = "Boxer Briefs - Yellow"
- icon_state = "boxer_briefs_yellow"
-
-/datum/sprite_accessory/underwear/female_beekini
+/datum/sprite_accessory/underwear/bottom/female_beekini
name = "Panties - Bee-kini"
icon_state = "panties_bee-kini"
-/datum/sprite_accessory/underwear/female_black
- name = "Panties - Black"
- icon_state = "panties_black"
-
-/datum/sprite_accessory/underwear/female_blue
- name = "Panties - Blue"
- icon_state = "panties_blue"
-
-/datum/sprite_accessory/underwear/female_commie
+/datum/sprite_accessory/underwear/bottom/female_commie
name = "Panties - Commie"
icon_state = "panties_commie"
-/datum/sprite_accessory/underwear/female_usastripe
+/datum/sprite_accessory/underwear/bottom/female_usastripe
name = "Panties - Freedom"
icon_state = "panties_assblastusa"
-/datum/sprite_accessory/underwear/female_green
- name = "Panties - Green"
- icon_state = "panties_green"
-
-/datum/sprite_accessory/underwear/female_kinky
+/datum/sprite_accessory/underwear/bottom/female_kinky
name = "Panties - Kinky Black"
icon_state = "panties_kinky"
-/datum/sprite_accessory/underwear/female_red
- name = "Panties - Red"
- icon_state = "panties_red"
-
-/datum/sprite_accessory/underwear/female_uk
+/datum/sprite_accessory/underwear/bottom/panties_uk
name = "Panties - UK"
icon_state = "panties_uk"
-/datum/sprite_accessory/underwear/female_white
- name = "Panties - White"
- icon_state = "panties_white"
+/datum/sprite_accessory/underwear/bottom/panties_neko
+ name = "Panties - Neko"
+ icon_state = "panties_neko"
+ has_color = TRUE
-/datum/sprite_accessory/underwear/female_white_neko
- name = "Panties, Neko - White"
- icon_state = "panties_neko_white"
+/datum/sprite_accessory/underwear/bottom/panties_slim
+ name = "Panties - Slim"
+ icon_state = "panties_slim"
+ has_color = TRUE
-/datum/sprite_accessory/underwear/female_black_neko
- name = "Panties, Neko - Black"
- icon_state = "panties_neko_black"
+/datum/sprite_accessory/underwear/bottom/striped_panties
+ name = "Panties - Striped"
+ icon_state = "striped_panties"
+ has_color = TRUE
+/datum/sprite_accessory/underwear/bottom/panties_swimsuit
+ name = "Panties - Swimsuit"
+ icon_state = "panties_swimming"
+ has_color = TRUE
-/datum/sprite_accessory/underwear/swimsuit_red
+/datum/sprite_accessory/underwear/bottom/panties_thin
+ name = "Panties - Thin"
+ icon_state = "panties_thin"
+ has_color = TRUE
+
+/datum/sprite_accessory/underwear/bottom/longjon
+ name = "Long John Bottoms"
+ icon_state = "ljonb"
+ has_color = TRUE
+
+/datum/sprite_accessory/underwear/bottom/swimsuit_red
name = "Swimsuit, One Piece - Red"
icon_state = "swimming_red"
-/datum/sprite_accessory/underwear/swimsuit
+/datum/sprite_accessory/underwear/bottom/swimsuit
name = "Swimsuit, One Piece - Black"
icon_state = "swimming_black"
-/datum/sprite_accessory/underwear/swimsuit_blue
+/datum/sprite_accessory/underwear/bottom/swimsuit_blue
name = "Swimsuit, One Piece - Striped Blue"
icon_state = "swimming_blue"
-/datum/sprite_accessory/underwear/swimsuit_green
- name = "Swimsuit, Bottom - Green"
- icon_state = "panties_swimming_green"
+/datum/sprite_accessory/underwear/bottom/thong
+ name = "Thong"
+ icon_state = "thong"
+ has_color = TRUE
-/datum/sprite_accessory/underwear/swimsuit_purple
- name = "Swimsuit, Bottom - Purple"
- icon_state = "panties_swimming_purple"
-
-/datum/sprite_accessory/underwear/female_thong_black
- name = "Thong - Black"
- icon_state = "thong_black"
-
-/datum/sprite_accessory/underwear/female_thong
- name = "Thong - Pink"
- icon_state = "thong_pink"
-
-/datum/sprite_accessory/underwear/female_babydoll
- name = "Babydoll - Black"
- icon_state = "babydoll"
+/datum/sprite_accessory/underwear/bottom/thong_babydoll
+ name = "Thong - Alt"
+ icon_state = "thong_babydoll"
+ has_color = TRUE
diff --git a/code/modules/mob/inventory.dm b/code/modules/mob/inventory.dm
index c2518bfc9b..9569d4826c 100644
--- a/code/modules/mob/inventory.dm
+++ b/code/modules/mob/inventory.dm
@@ -275,7 +275,7 @@
/mob/proc/canUnEquip(obj/item/I, force)
if(!I)
return TRUE
- if((I.item_flags & NODROP) && !force)
+ if(HAS_TRAIT(I, TRAIT_NODROP) && !force)
return FALSE
return TRUE
@@ -309,13 +309,13 @@
//DO NOT CALL THIS PROC
//use one of the above 3 helper procs
//you may override it, but do not modify the args
-/mob/proc/doUnEquip(obj/item/I, force, newloc, no_move, invdrop = TRUE) //Force overrides NODROP_1 for things like wizarditis and admin undress.
+/mob/proc/doUnEquip(obj/item/I, force, newloc, no_move, invdrop = TRUE) //Force overrides TRAIT_NODROP for things like wizarditis and admin undress.
//Use no_move if the item is just gonna be immediately moved afterward
//Invdrop is used to prevent stuff in pockets dropping. only set to false if it's going to immediately be replaced
- if(!I) //If there's nothing to drop, the drop is automatically succesfull. If(unEquip) should generally be used to check for NODROP_1.
+ if(!I) //If there's nothing to drop, the drop is automatically succesfull. If(unEquip) should generally be used to check for TRAIT_NODROP.
return TRUE
- if((I.item_flags & NODROP) && !force)
+ if(HAS_TRAIT(I, TRAIT_NODROP) && !force)
return FALSE
var/hand_index = get_held_index_of_item(I)
diff --git a/code/modules/mob/living/bloodcrawl.dm b/code/modules/mob/living/bloodcrawl.dm
index 2a5fdeaa33..cc11c0e8bb 100644
--- a/code/modules/mob/living/bloodcrawl.dm
+++ b/code/modules/mob/living/bloodcrawl.dm
@@ -138,7 +138,11 @@
name = "blood crawl"
desc = "You are unable to hold anything while in this form."
icon = 'icons/effects/blood.dmi'
- item_flags = NODROP | ABSTRACT
+ item_flags = ABSTRACT
+
+/obj/item/bloodcrawl/Initialize()
+ . = ..()
+ ADD_TRAIT(src, TRAIT_NODROP, ABSTRACT_ITEM_TRAIT)
/mob/living/proc/exit_blood_effect(obj/effect/decal/cleanable/B)
playsound(get_turf(src), 'sound/magic/exit_blood.ogg', 100, 1, -1)
diff --git a/code/modules/mob/living/brain/brain.dm b/code/modules/mob/living/brain/brain.dm
index 76b416772e..97b29ca4e1 100644
--- a/code/modules/mob/living/brain/brain.dm
+++ b/code/modules/mob/living/brain/brain.dm
@@ -5,6 +5,7 @@
var/datum/dna/stored/stored_dna // dna var for brain. Used to store dna, brain dna is not considered like actual dna, brain.has_dna() returns FALSE.
stat = DEAD //we start dead by default
see_invisible = SEE_INVISIBLE_LIVING
+ speech_span = SPAN_ROBOT
/mob/living/brain/Initialize()
. = ..()
diff --git a/code/modules/mob/living/brain/brain_item.dm b/code/modules/mob/living/brain/brain_item.dm
index 2ced3054c4..dafc6cf5e0 100644
--- a/code/modules/mob/living/brain/brain_item.dm
+++ b/code/modules/mob/living/brain/brain_item.dm
@@ -265,7 +265,7 @@
var/list/datum/brain_trauma/possible_traumas = list()
for(var/T in subtypesof(brain_trauma_type))
var/datum/brain_trauma/BT = T
- if(can_gain_trauma(BT, resilience))
+ if(can_gain_trauma(BT, resilience) && initial(BT.random_gain))
possible_traumas += BT
if(!LAZYLEN(possible_traumas))
diff --git a/code/modules/mob/living/brain/say.dm b/code/modules/mob/living/brain/say.dm
index ce0a09c27f..b7d7e1d7fc 100644
--- a/code/modules/mob/living/brain/say.dm
+++ b/code/modules/mob/living/brain/say.dm
@@ -10,14 +10,11 @@
..()
-/mob/living/brain/get_spans()
- return ..() | SPAN_ROBOT
-
/mob/living/brain/radio(message, message_mode, list/spans, language)
if(message_mode == MODE_HEADSET && istype(container, /obj/item/mmi))
var/obj/item/mmi/R = container
if(R.radio)
- R.radio.talk_into(src, message, , get_spans(), language)
+ R.radio.talk_into(src, message, language = language)
return ITALICS | REDUCE_RANGE
else
return ..()
diff --git a/code/modules/mob/living/carbon/alien/humanoid/queen.dm b/code/modules/mob/living/carbon/alien/humanoid/queen.dm
index 79eed6b82b..76ede9276c 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/queen.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/queen.dm
@@ -103,9 +103,13 @@
name = "\improper royal parasite"
desc = "Inject this into one of your grown children to promote her to a Praetorian!"
icon_state = "alien_medal"
- item_flags = ABSTRACT | NODROP | DROPDEL
+ item_flags = ABSTRACT | DROPDEL
icon = 'icons/mob/alien.dmi'
+/obj/item/queenpromote/Initialize()
+ . = ..()
+ ADD_TRAIT(src, TRAIT_NODROP, ABSTRACT_ITEM_TRAIT)
+
/obj/item/queenpromote/attack(mob/living/M, mob/living/carbon/alien/humanoid/user)
if(!isalienadult(M) || isalienroyal(M))
to_chat(user, "You may only use this with your adult, non-royal children!")
diff --git a/code/modules/mob/living/carbon/alien/say.dm b/code/modules/mob/living/carbon/alien/say.dm
index b921aea67e..5f1e1a2830 100644
--- a/code/modules/mob/living/carbon/alien/say.dm
+++ b/code/modules/mob/living/carbon/alien/say.dm
@@ -4,7 +4,7 @@
if(!message)
return
- var/message_a = say_quote(message, get_spans())
+ var/message_a = say_quote(message)
var/rendered = "Hivemind, [shown_name] [message_a]"
for(var/mob/S in GLOB.player_list)
if(!S.stat && S.hivecheck())
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 51ee5b372b..db7257f0f0 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -175,7 +175,7 @@
if(start_T && end_T)
log_combat(src, throwable_mob, "thrown", addition="grab from tile in [AREACOORD(start_T)] towards tile at [AREACOORD(end_T)]")
- else if(!(I.item_flags & (NODROP | ABSTRACT)))
+ else if(!CHECK_BITFIELD(I.item_flags, ABSTRACT) && !HAS_TRAIT(I, TRAIT_NODROP))
thrown_thing = I
dropItemToGround(I)
@@ -409,7 +409,7 @@
return initial(pixel_y)
/mob/living/carbon/proc/accident(obj/item/I)
- if(!I || (I.item_flags & (NODROP | ABSTRACT)))
+ if(!I || (I.item_flags & ABSTRACT) || HAS_TRAIT(I, TRAIT_NODROP))
return
//dropItemToGround(I) CIT CHANGE - makes it so the item doesn't drop if the modifier rolls above 100
@@ -496,9 +496,12 @@
add_splatter_floor(T)
if(stun)
adjustBruteLoss(3)
+ else if(src.reagents.has_reagent("blazaam"))
+ if(T)
+ T.add_vomit_floor(src, VOMIT_PURPLE)
else
if(T)
- T.add_vomit_floor(src, toxic)//toxic barf looks different
+ T.add_vomit_floor(src, VOMIT_TOXIC)//toxic barf looks different
T = get_step(T, dir)
if (is_blocked_turf(T))
break
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index a4fca9dd78..57dd1af749 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -252,7 +252,7 @@
var/delay_denominator = 1
if(pocket_item && !(pocket_item.item_flags & ABSTRACT))
- if(pocket_item.item_flags & NODROP)
+ if(HAS_TRAIT(pocket_item, TRAIT_NODROP))
to_chat(usr, "You try to empty [src]'s [pocket_side] pocket, it seems to be stuck!")
to_chat(usr, "You try to empty [src]'s [pocket_side] pocket.")
else if(place_item && place_item.mob_can_equip(src, usr, pocket_id, 1) && !(place_item.item_flags & ABSTRACT))
diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm
index d1ec7f3e4b..c9d59b84f2 100644
--- a/code/modules/mob/living/carbon/human/human_defines.dm
+++ b/code/modules/mob/living/carbon/human/human_defines.dm
@@ -22,11 +22,14 @@
var/lip_style = null //no lipstick by default- arguably misleading, as it could be used for general makeup
var/lip_color = "white"
- var/age = 30 //Player's age (pure fluff)
+ var/age = 30 //Player's age
var/underwear = "Nude" //Which underwear the player wants
+ var/undie_color = "#FFFFFF"
var/undershirt = "Nude" //Which undershirt the player wants
+ var/shirt_color = "#FFFFFF"
var/socks = "Nude" //Which socks the player wants
+ var/socks_color = "#FFFFFF"
var/backbag = DBACKPACK //Which backpack type the player has chosen.
//Equipment slots
diff --git a/code/modules/mob/living/carbon/human/say.dm b/code/modules/mob/living/carbon/human/say.dm
index 673249b186..56be62c75e 100644
--- a/code/modules/mob/living/carbon/human/say.dm
+++ b/code/modules/mob/living/carbon/human/say.dm
@@ -10,29 +10,6 @@
else
. = ..()
-/mob/living/carbon/human/treat_message(message)
- message = dna.species.handle_speech(message,src)
- if(diseases.len)
- for(var/datum/disease/pierrot_throat/D in diseases)
- var/list/temp_message = splittext(message, " ") //List each word in the message
- var/list/pick_list = list()
- for(var/i = 1, i <= temp_message.len, i++) //Create a second list for excluding words down the line
- pick_list += i
- for(var/i=1, ((i <= D.stage) && (i <= temp_message.len)), i++) //Loop for each stage of the disease or until we run out of words
- if(prob(3 * D.stage)) //Stage 1: 3% Stage 2: 6% Stage 3: 9% Stage 4: 12%
- var/H = pick(pick_list)
- if(findtext(temp_message[H], "*") || findtext(temp_message[H], ";") || findtext(temp_message[H], ":"))
- continue
- temp_message[H] = "HONK"
- pick_list -= H //Make sure that you dont HONK the same word twice
- message = jointext(temp_message, " ")
- message = ..(message)
- message = dna.mutations_say_mods(message)
- return message
-
-/mob/living/carbon/human/get_spans()
- return ..() | dna.mutations_get_spans() | dna.species_get_spans()
-
/mob/living/carbon/human/GetVoice()
if(istype(wear_mask, /obj/item/clothing/mask/chameleon))
var/obj/item/clothing/mask/chameleon/V = wear_mask
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index 3324b07217..76d8a10474 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -279,7 +279,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
if(mutanthands)
// Drop items in hands
- // If you're lucky enough to have a NODROP_1 item, then it stays.
+ // If you're lucky enough to have a TRAIT_NODROP item, then it stays.
for(var/V in C.held_items)
var/obj/item/I = V
if(istype(I))
@@ -495,34 +495,42 @@ GLOBAL_LIST_EMPTY(roundstart_races)
if(H.hidden_underwear)
H.underwear = "Nude"
else
- H.underwear = H.saved_underwear
- var/datum/sprite_accessory/underwear/underwear = GLOB.underwear_list[H.underwear]
- if(underwear)
- standing += mutable_appearance(underwear.icon, underwear.icon_state, -BODY_LAYER)
+ H.saved_underwear = H.underwear
+ var/datum/sprite_accessory/underwear/bottom/B = GLOB.underwear_list[H.underwear]
+ if(B)
+ var/mutable_appearance/MA = mutable_appearance(B.icon, B.icon_state, -BODY_LAYER)
+ if(UNDIE_COLORABLE(B))
+ MA.color = H.undie_color
+ standing += MA
if(H.undershirt)
if(H.hidden_undershirt)
H.undershirt = "Nude"
else
- H.undershirt = H.saved_undershirt
- var/datum/sprite_accessory/undershirt/undershirt = GLOB.undershirt_list[H.undershirt]
- if(undershirt)
- if(H.dna.species.sexes && H.gender == FEMALE)
- standing += wear_female_version(undershirt.icon_state, undershirt.icon, BODY_LAYER)
- else
- standing += mutable_appearance(undershirt.icon, undershirt.icon_state, -BODY_LAYER)
+ H.saved_undershirt = H.undershirt
+ var/datum/sprite_accessory/underwear/top/T = GLOB.undershirt_list[H.undershirt]
+ if(T)
+ var/mutable_appearance/MA
+ if(H.dna.species.sexes && H.gender == FEMALE)
+ MA = wear_female_version(T.icon_state, T.icon, BODY_LAYER)
+ else
+ MA = mutable_appearance(T.icon, T.icon_state, -BODY_LAYER)
+ if(UNDIE_COLORABLE(T))
+ MA.color = H.shirt_color
+ standing += MA
if(H.socks && H.get_num_legs(FALSE) >= 2)
if(H.hidden_socks)
H.socks = "Nude"
else
- H.socks = H.saved_socks
- var/datum/sprite_accessory/socks/socks = GLOB.socks_list[H.socks]
- if(socks)
- if(DIGITIGRADE in species_traits)
- standing += mutable_appearance(socks.icon, socks.icon_state + "_d", -BODY_LAYER)
- else
- standing += mutable_appearance(socks.icon, socks.icon_state, -BODY_LAYER)
+ H.saved_socks = H.socks
+ var/datum/sprite_accessory/underwear/socks/S = GLOB.socks_list[H.socks]
+ if(S)
+ var/digilegs = (DIGITIGRADE in species_traits) ? "_d" : ""
+ var/mutable_appearance/MA = mutable_appearance(S.icon, "[S.icon_state][digilegs]", -BODY_LAYER)
+ if(UNDIE_COLORABLE(S))
+ MA.color = H.socks_color
+ standing += MA
if(standing.len)
H.overlays_standing[BODY_LAYER] = standing
@@ -1064,7 +1072,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
return FALSE
return equip_delay_self_check(I, H, bypass_equip_delay_self)
if(SLOT_L_STORE)
- if(I.item_flags & NODROP) //Pockets aren't visible, so you can't move NODROP_1 items into them.
+ if(HAS_TRAIT(I, TRAIT_NODROP)) //Pockets aren't visible, so you can't move TRAIT_NODROP items into them.
return FALSE
if(H.l_store)
return FALSE
@@ -1080,7 +1088,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
if( I.w_class <= WEIGHT_CLASS_SMALL || (I.slot_flags & ITEM_SLOT_POCKET) )
return TRUE
if(SLOT_R_STORE)
- if(I.item_flags & NODROP)
+ if(HAS_TRAIT(I, TRAIT_NODROP))
return FALSE
if(H.r_store)
return FALSE
@@ -1097,7 +1105,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
return TRUE
return FALSE
if(SLOT_S_STORE)
- if(I.item_flags & NODROP)
+ if(HAS_TRAIT(I, TRAIT_NODROP))
return FALSE
if(H.s_store)
return FALSE
@@ -1158,13 +1166,6 @@ GLOBAL_LIST_EMPTY(roundstart_races)
return 1
return FALSE
-/datum/species/proc/handle_speech(message, mob/living/carbon/human/H)
- return message
-
-//return a list of spans or an empty list
-/datum/species/proc/get_spans()
- return list()
-
/datum/species/proc/check_weakness(obj/item, mob/living/attacker)
return FALSE
diff --git a/code/modules/mob/living/carbon/human/species_types/dullahan.dm b/code/modules/mob/living/carbon/human/species_types/dullahan.dm
index da7de39a03..4a7580e978 100644
--- a/code/modules/mob/living/carbon/human/species_types/dullahan.dm
+++ b/code/modules/mob/living/carbon/human/species_types/dullahan.dm
@@ -68,17 +68,17 @@
/obj/item/organ/tongue/dullahan
zone = "abstract"
+ modifies_speech = TRUE
-/obj/item/organ/tongue/dullahan/TongueSpeech(var/message)
+/obj/item/organ/tongue/dullahan/handle_speech(datum/source, list/speech_args)
if(ishuman(owner))
var/mob/living/carbon/human/H = owner
if(H.dna.species.id == "dullahan")
var/datum/species/dullahan/D = H.dna.species
if(isobj(D.myhead.loc))
var/obj/O = D.myhead.loc
- O.say(message)
- message = ""
- return message
+ O.say(speech_args[SPEECH_MESSAGE])
+ speech_args[SPEECH_MESSAGE] = ""
/obj/item/organ/ears/dullahan
zone = "abstract"
diff --git a/code/modules/mob/living/carbon/human/species_types/golems.dm b/code/modules/mob/living/carbon/human/species_types/golems.dm
index 2907caff13..2c663b4094 100644
--- a/code/modules/mob/living/carbon/human/species_types/golems.dm
+++ b/code/modules/mob/living/carbon/human/species_types/golems.dm
@@ -519,6 +519,11 @@
..()
last_banana = world.time
last_honk = world.time
+ RegisterSignal(C, COMSIG_MOB_SAY, .proc/handle_speech)
+
+/datum/species/golem/bananium/on_species_loss(mob/living/carbon/C)
+ . = ..()
+ UnregisterSignal(C, COMSIG_MOB_SAY)
/datum/species/golem/bananium/random_name(gender,unique,lastname)
var/clown_name = pick(GLOB.clown_names)
@@ -567,9 +572,8 @@
/datum/species/golem/bananium/spec_death(gibbed, mob/living/carbon/human/H)
playsound(get_turf(H), 'sound/misc/sadtrombone.ogg', 70, 0)
-/datum/species/golem/bananium/get_spans()
- return list(SPAN_CLOWN)
-
+/datum/species/golem/bananium/proc/handle_speech(datum/source, list/speech_args)
+ speech_args[SPEECH_SPANS] |= SPAN_CLOWN
/datum/species/golem/runic
name = "Runic Golem"
@@ -646,14 +650,16 @@
/datum/species/golem/clockwork/on_species_gain(mob/living/carbon/human/H)
. = ..()
H.faction |= "ratvar"
+ RegisterSignal(H, COMSIG_MOB_SAY, .proc/handle_speech)
/datum/species/golem/clockwork/on_species_loss(mob/living/carbon/human/H)
if(!is_servant_of_ratvar(H))
H.faction -= "ratvar"
+ UnregisterSignal(H, COMSIG_MOB_SAY)
. = ..()
-/datum/species/golem/clockwork/get_spans()
- return SPAN_ROBOT //beep
+/datum/species/golem/clockwork/proc/handle_speech(datum/source, list/speech_args)
+ speech_args[SPEECH_SPANS] |= SPAN_ROBOT //beep
/datum/species/golem/clockwork/spec_death(gibbed, mob/living/carbon/human/H)
gibbed = !has_corpse ? FALSE : gibbed
@@ -951,7 +957,7 @@
sexes = FALSE
fixed_mut_color = "ffffff"
attack_verb = "rattl"
- species_traits = list(NOBLOOD,NO_UNDERWEAR,NOGENITALS,NOAROUSAL,MUTCOLORS)
+ species_traits = list(NOBLOOD,NO_UNDERWEAR,NOGENITALS,NOAROUSAL,MUTCOLORS)
inherent_traits = list(TRAIT_RESISTHEAT,TRAIT_NOBREATH,TRAIT_RESISTCOLD,TRAIT_RESISTHIGHPRESSURE,TRAIT_RESISTLOWPRESSURE,TRAIT_NOFIRE,TRAIT_NOGUNS,TRAIT_RADIMMUNE,TRAIT_PIERCEIMMUNE,TRAIT_NODISMEMBER,TRAIT_FAKEDEATH,TRAIT_CALCIUM_HEALER)
info_text = "As a Bone Golem, You have a powerful spell that lets you chill your enemies with fear, and milk heals you! Just make sure to watch our for bone-hurting juice."
var/datum/action/innate/bonechill/bonechill
diff --git a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm
index b218b2cefc..2b487d4349 100644
--- a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm
@@ -5,6 +5,7 @@
default_color = "00FF90"
say_mod = "chirps"
species_traits = list(MUTCOLORS,EYECOLOR,HAIR,FACEHAIR,NOBLOOD)
+ mutantlungs = /obj/item/organ/lungs/slime
mutant_bodyparts = list("mam_tail", "mam_ears", "mam_snouts", "taur") //CIT CHANGE
default_features = list("mcolor" = "FFF", "mam_tail" = "None", "mam_ears" = "None", "mam_snouts" = "None", "taur" = "None") //CIT CHANGE
inherent_traits = list(TRAIT_TOXINLOVER)
diff --git a/code/modules/mob/living/carbon/human/species_types/podpeople.dm b/code/modules/mob/living/carbon/human/species_types/podpeople.dm
index c3d1e1aedb..0da4073f1d 100644
--- a/code/modules/mob/living/carbon/human/species_types/podpeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/podpeople.dm
@@ -73,6 +73,9 @@
/datum/species/pod/pseudo_weak
id = "podweak"
limbs_id = "pod"
+ species_traits = list(EYECOLOR,HAIR,FACEHAIR,LIPS,MUTCOLORS)
+ mutant_bodyparts = list("mam_tail", "mam_ears", "mam_body_markings", "mam_snouts", "taur", "legs")
+ default_features = list("mcolor" = "FFF","mcolor2" = "FFF","mcolor3" = "FFF", "mam_snouts" = "Husky", "mam_tail" = "Husky", "mam_ears" = "Husky", "mam_body_markings" = "Husky", "taur" = "None", "legs" = "Normal Legs")
light_nutrition_gain_factor = 7.5
light_bruteheal = 0.2
light_burnheal = 0.2
diff --git a/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm b/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm
index b574df7d79..11a25cea6c 100644
--- a/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm
@@ -171,12 +171,13 @@
armour_penetration = 35
lefthand_file = 'icons/mob/inhands/antag/changeling_lefthand.dmi'
righthand_file = 'icons/mob/inhands/antag/changeling_righthand.dmi'
- item_flags = ABSTRACT | NODROP | DROPDEL
+ item_flags = ABSTRACT | DROPDEL
w_class = WEIGHT_CLASS_HUGE
sharpness = IS_SHARP
/obj/item/light_eater/Initialize()
. = ..()
+ ADD_TRAIT(src, TRAIT_NODROP, HAND_REPLACEMENT_TRAIT)
AddComponent(/datum/component/butchering, 80, 70)
/obj/item/light_eater/afterattack(atom/movable/AM, mob/user, proximity)
diff --git a/code/modules/mob/living/carbon/human/species_types/synths.dm b/code/modules/mob/living/carbon/human/species_types/synths.dm
index 7e838c857f..0ebd6e795b 100644
--- a/code/modules/mob/living/carbon/human/species_types/synths.dm
+++ b/code/modules/mob/living/carbon/human/species_types/synths.dm
@@ -28,6 +28,11 @@
/datum/species/synth/on_species_gain(mob/living/carbon/human/H, datum/species/old_species)
..()
assume_disguise(old_species, H)
+ RegisterSignal(H, COMSIG_MOB_SAY, .proc/handle_speech)
+
+/datum/species/synth/on_species_loss(mob/living/carbon/human/H)
+ . = ..()
+ UnregisterSignal(H, COMSIG_MOB_SAY)
/datum/species/synth/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H)
if(chem.id == "synthflesh")
@@ -110,18 +115,12 @@
else
return ..()
-
-/datum/species/synth/get_spans()
- if(fake_species)
- return fake_species.get_spans()
- return list()
-
-
-/datum/species/synth/handle_speech(message, mob/living/carbon/human/H)
- if(H.health > disguise_fail_health)
- if(fake_species)
- return fake_species.handle_speech(message,H)
- else
- return ..()
- else
- return ..()
\ No newline at end of file
+/datum/species/synth/proc/handle_speech(datum/source, list/speech_args)
+ if (isliving(source)) // yeah it's gonna be living but just to be clean
+ var/mob/living/L = source
+ if(fake_species && L.health > disguise_fail_health)
+ switch (fake_species.type)
+ if (/datum/species/golem/bananium)
+ speech_args[SPEECH_SPANS] |= SPAN_CLOWN
+ if (/datum/species/golem/clockwork)
+ speech_args[SPEECH_SPANS] |= SPAN_ROBOT
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm
index b2eb83d668..9dd55c361e 100644
--- a/code/modules/mob/living/carbon/life.dm
+++ b/code/modules/mob/living/carbon/life.dm
@@ -250,38 +250,39 @@
//MIASMA
if(breath_gases[/datum/gas/miasma])
var/miasma_partialpressure = (breath_gases[/datum/gas/miasma]/breath.total_moles())*breath_pressure
+ if(miasma_partialpressure > MINIMUM_MOLES_DELTA_TO_MOVE)
- if(prob(1 * miasma_partialpressure))
- var/datum/disease/advance/miasma_disease = new /datum/disease/advance/random(2,3)
- miasma_disease.name = "Unknown"
- ForceContractDisease(miasma_disease, TRUE, TRUE)
+ if(prob(0.05 * miasma_partialpressure))
+ var/datum/disease/advance/miasma_disease = new /datum/disease/advance/random(2,3)
+ miasma_disease.name = "Unknown"
+ ForceContractDisease(miasma_disease, TRUE, TRUE)
- //Miasma side effects
- switch(miasma_partialpressure)
- if(1 to 5)
- // At lower pp, give out a little warning
- SEND_SIGNAL(src, COMSIG_CLEAR_MOOD_EVENT, "smell")
- if(prob(5))
- to_chat(src, "There is an unpleasant smell in the air.")
- if(5 to 20)
- //At somewhat higher pp, warning becomes more obvious
- if(prob(15))
- to_chat(src, "You smell something horribly decayed inside this room.")
- SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "smell", /datum/mood_event/disgust/bad_smell)
- if(15 to 30)
- //Small chance to vomit. By now, people have internals on anyway
- if(prob(5))
- to_chat(src, "The stench of rotting carcasses is unbearable!")
- SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "smell", /datum/mood_event/disgust/nauseating_stench)
- vomit()
- if(30 to INFINITY)
- //Higher chance to vomit. Let the horror start
- if(prob(25))
- to_chat(src, "The stench of rotting carcasses is unbearable!")
- SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "smell", /datum/mood_event/disgust/nauseating_stench)
- vomit()
- else
- SEND_SIGNAL(src, COMSIG_CLEAR_MOOD_EVENT, "smell")
+ //Miasma side effects
+ switch(miasma_partialpressure)
+ if(1 to 5)
+ // At lower pp, give out a little warning
+ SEND_SIGNAL(src, COMSIG_CLEAR_MOOD_EVENT, "smell")
+ if(prob(5))
+ to_chat(src, "There is an unpleasant smell in the air.")
+ if(5 to 20)
+ //At somewhat higher pp, warning becomes more obvious
+ if(prob(15))
+ to_chat(src, "You smell something horribly decayed inside this room.")
+ SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "smell", /datum/mood_event/disgust/bad_smell)
+ if(15 to 30)
+ //Small chance to vomit. By now, people have internals on anyway
+ if(prob(5))
+ to_chat(src, "The stench of rotting carcasses is unbearable!")
+ SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "smell", /datum/mood_event/disgust/nauseating_stench)
+ vomit()
+ if(30 to INFINITY)
+ //Higher chance to vomit. Let the horror start
+ if(prob(25))
+ to_chat(src, "The stench of rotting carcasses is unbearable!")
+ SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "smell", /datum/mood_event/disgust/nauseating_stench)
+ vomit()
+ else
+ SEND_SIGNAL(src, COMSIG_CLEAR_MOOD_EVENT, "smell")
//Clear all moods if no miasma at all
@@ -344,7 +345,7 @@
var/list/cached_gases = miasma_turf.air.gases
- cached_gases[/datum/gas/miasma] += 0.02
+ cached_gases[/datum/gas/miasma] += 0.1
/mob/living/carbon/proc/handle_blood()
return
diff --git a/code/modules/mob/living/carbon/monkey/combat.dm b/code/modules/mob/living/carbon/monkey/combat.dm
index 85436178fe..25bc243f07 100644
--- a/code/modules/mob/living/carbon/monkey/combat.dm
+++ b/code/modules/mob/living/carbon/monkey/combat.dm
@@ -115,7 +115,7 @@
/mob/living/carbon/monkey/proc/handle_combat()
if(pickupTarget)
- if(restrained() || blacklistItems[pickupTarget] || (pickupTarget.item_flags & NODROP))
+ if(restrained() || blacklistItems[pickupTarget] || HAS_TRAIT(pickupTarget, TRAIT_NODROP))
pickupTarget = null
else
pickupTimer++
diff --git a/code/modules/mob/living/carbon/say.dm b/code/modules/mob/living/carbon/say.dm
index f6e43f487f..452c8f8b78 100644
--- a/code/modules/mob/living/carbon/say.dm
+++ b/code/modules/mob/living/carbon/say.dm
@@ -1,37 +1,17 @@
-/mob/living/carbon/treat_message(message)
- for(var/datum/brain_trauma/trauma in get_traumas())
- message = trauma.on_say(message)
- message = ..(message)
- var/obj/item/organ/tongue/T = getorganslot(ORGAN_SLOT_TONGUE)
- if(!T) //hoooooouaah!
- var/regex/tongueless_lower = new("\[gdntke]+", "g")
- var/regex/tongueless_upper = new("\[GDNTKE]+", "g")
- if(copytext(message, 1, 2) != "*")
- message = tongueless_lower.Replace(message, pick("aa","oo","'"))
- message = tongueless_upper.Replace(message, pick("AA","OO","'"))
- else
- message = T.TongueSpeech(message)
- if(wear_mask)
- message = wear_mask.speechModification(message)
- if(head)
- message = head.speechModification(message)
- return message
+/mob/living/carbon/proc/handle_tongueless_speech(mob/living/carbon/speaker, list/speech_args)
+ var/message = speech_args[SPEECH_MESSAGE]
+ var/static/regex/tongueless_lower = new("\[gdntke]+", "g")
+ var/static/regex/tongueless_upper = new("\[GDNTKE]+", "g")
+ if(message[1] != "*")
+ message = tongueless_lower.Replace(message, pick("aa","oo","'"))
+ message = tongueless_upper.Replace(message, pick("AA","OO","'"))
+ speech_args[SPEECH_MESSAGE] = message
/mob/living/carbon/can_speak_vocal(message)
if(silent)
return 0
return ..()
-/mob/living/carbon/get_spans()
- . = ..()
- var/obj/item/organ/tongue/T = getorganslot(ORGAN_SLOT_TONGUE)
- if(T)
- . |= T.get_spans()
-
- var/obj/item/I = get_active_held_item()
- if(I)
- . |= I.get_held_item_speechspans(src)
-
/mob/living/carbon/could_speak_in_language(datum/language/dt)
var/obj/item/organ/tongue/T = getorganslot(ORGAN_SLOT_TONGUE)
if(T)
@@ -39,10 +19,16 @@
else
. = initial(dt.flags) & TONGUELESS_SPEECH
-/mob/living/carbon/Hear(message, atom/movable/speaker, datum/language/message_language, raw_message, radio_freq, list/spans, message_mode)
+/mob/living/carbon/hear_intercept(message, atom/movable/speaker, datum/language/message_language, raw_message, radio_freq, list/spans, message_mode)
. = ..()
if(!client)
return
for(var/T in get_traumas())
var/datum/brain_trauma/trauma = T
- message = trauma.on_hear(message, speaker, message_language, raw_message, radio_freq)
\ No newline at end of file
+ message = trauma.on_hear(message, speaker, message_language, raw_message, radio_freq)
+
+ if (src.mind.has_antag_datum(/datum/antagonist/traitor))
+ message = GLOB.syndicate_code_phrase_regex.Replace(message, "$1")
+ message = GLOB.syndicate_code_response_regex.Replace(message, "$1")
+
+ return message
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index b844a294be..ea0f7ae388 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -281,7 +281,7 @@
var/datum/disease/D = thing
if(D.spread_flags & DISEASE_SPREAD_CONTACT_SKIN)
ContactContractDisease(D)
-
+
if(iscarbon(L))
var/mob/living/carbon/C = L
if(HAS_TRAIT(src, TRAIT_STRONG_GRABBER))
@@ -699,7 +699,7 @@
// The src mob is trying to strip an item from someone
// Override if a certain type of mob should be behave differently when stripping items (can't, for example)
/mob/living/stripPanelUnequip(obj/item/what, mob/who, where)
- if(what.item_flags & NODROP)
+ if(HAS_TRAIT(what, TRAIT_NODROP))
to_chat(src, "You can't remove \the [what.name], it appears to be stuck!")
return
who.visible_message("[src] tries to remove [who]'s [what.name].", \
@@ -724,7 +724,7 @@
// Override if a certain mob should be behave differently when placing items (can't, for example)
/mob/living/stripPanelEquip(obj/item/what, mob/who, where)
what = src.get_active_held_item()
- if(what && (what.item_flags & NODROP))
+ if(what && HAS_TRAIT(what, TRAIT_NODROP))
to_chat(src, "You can't put \the [what.name] on [who], it's stuck to your hand!")
return
if(what)
diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm
index e2f62b054c..155ff15d5b 100644
--- a/code/modules/mob/living/say.dm
+++ b/code/modules/mob/living/say.dm
@@ -175,13 +175,16 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
else
src.log_talk(message, LOG_SAY, forced_by=forced)
- message = treat_message(message)
+ message = treat_message(message) // unfortunately we still need this
+ var/sigreturn = SEND_SIGNAL(src, COMSIG_MOB_SAY, args)
+ if (sigreturn & COMPONENT_UPPERCASE_SPEECH)
+ message = uppertext(message)
if(!message)
return
last_words = message
- spans |= get_spans()
+ spans |= speech_span
if(language)
var/datum/language/L = GLOB.language_datum_instances[language]
@@ -229,9 +232,14 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
// Recompose message for AI hrefs, language incomprehension.
message = compose_message(speaker, message_language, raw_message, radio_freq, spans, message_mode)
+ message = hear_intercept(message, speaker, message_language, raw_message, radio_freq, spans, message_mode)
+
show_message(message, 2, deaf_message, deaf_type)
return message
+/mob/living/proc/hear_intercept(message, atom/movable/speaker, datum/language/message_language, raw_message, radio_freq, list/spans, message_mode)
+ return message
+
/mob/living/send_speech(message, message_range = 6, obj/source = src, bubble_type = bubble_icon, list/spans, datum/language/message_language=null, message_mode)
var/static/list/eavesdropping_modes = list(MODE_WHISPER = TRUE, MODE_WHISPER_CRIT = TRUE)
var/eavesdrop_range = 0
@@ -327,6 +335,10 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
return null
/mob/living/proc/treat_message(message)
+
+ if(HAS_TRAIT(src, TRAIT_UNINTELLIGIBLE_SPEECH))
+ message = unintelligize(message)
+
if(derpspeech)
message = derpspeech(message, stuttering)
@@ -389,8 +401,8 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
else
. = ..()
-/mob/living/whisper(message, bubble_type, var/list/spans = list(), sanitize = TRUE, datum/language/language = null)
- say("#[message]", bubble_type, spans, sanitize, language)
+/mob/living/whisper(message, bubble_type, list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null)
+ say("#[message]", bubble_type, spans, sanitize, language, ignore_spam, forced)
/mob/living/get_language_holder(shadow=TRUE)
if(mind && shadow)
diff --git a/code/modules/mob/living/silicon/ai/say.dm b/code/modules/mob/living/silicon/ai/say.dm
index 928bd63dd1..4ac5c1f0bb 100644
--- a/code/modules/mob/living/silicon/ai/say.dm
+++ b/code/modules/mob/living/silicon/ai/say.dm
@@ -49,7 +49,7 @@
else
padloc = "(UNKNOWN)"
src.log_talk(message, LOG_SAY, tag="HOLOPAD in [padloc]")
- send_speech(message, 7, T, "robot", get_spans(), language)
+ send_speech(message, 7, T, "robot", language = language)
to_chat(src, "Holopad transmitted, [real_name] \"[message]\"")
else
to_chat(src, "No holopad connected.")
diff --git a/code/modules/mob/living/silicon/pai/pai_shell.dm b/code/modules/mob/living/silicon/pai/pai_shell.dm
index 99484f395e..164a3e7389 100644
--- a/code/modules/mob/living/silicon/pai/pai_shell.dm
+++ b/code/modules/mob/living/silicon/pai/pai_shell.dm
@@ -29,6 +29,13 @@
if(!L.temporarilyRemoveItemFromInventory(card))
to_chat(src, "Error: Unable to expand to mobile form. Chassis is restrained by some device or person.")
return FALSE
+ if(istype(card.loc, /obj/item/integrated_circuit/input/pAI_connector))
+ var/obj/item/integrated_circuit/input/pAI_connector/C = card.loc
+ C.RemovepAI()
+ C.visible_message("[src] ejects itself from [C]!")
+ playsound(src, 'sound/items/Crowbar.ogg', 50, 1)
+ C.installed_pai = null
+ C.push_data()
forceMove(get_turf(card))
card.forceMove(src)
if(client)
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index e71e269222..29fbd39e2c 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -580,6 +580,19 @@
else
return ..()
+/mob/living/silicon/robot/crowbar_act(mob/living/user, obj/item/I) //TODO: make fucking everything up there in that attackby() proc use the proper tool_act() procs. But honestly, who has time for that? 'cause I know for sure that you, the person reading this, sure as hell doesn't.
+ var/validbreakout = FALSE
+ for(var/obj/item/dogborg/sleeper/S in held_items)
+ if(!LAZYLEN(S.contents))
+ continue
+ if(!validbreakout)
+ visible_message("[user] wedges [I] into the crevice separating [S] from [src]'s chassis, and begins to pry...", "You wedge [I] into the crevice separating [S] from [src]'s chassis, and begin to pry...")
+ validbreakout = TRUE
+ S.go_out()
+ if(validbreakout)
+ return TRUE
+ return ..()
+
/mob/living/silicon/robot/verb/unlock_own_cover()
set category = "Robot Commands"
set name = "Unlock Cover"
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index 38ad3b8e5a..7b95ced63f 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -119,7 +119,7 @@
if(I.loc != src)
I.forceMove(src)
modules += I
- I.item_flags |= NODROP
+ ADD_TRAIT(I, TRAIT_NODROP, CYBORG_ITEM_TRAIT)
I.mouse_opacity = MOUSE_OPACITY_OPAQUE
if(nonstandard)
added_modules += I
diff --git a/code/modules/mob/living/silicon/say.dm b/code/modules/mob/living/silicon/say.dm
index aca35762de..1d38a3c5a6 100644
--- a/code/modules/mob/living/silicon/say.dm
+++ b/code/modules/mob/living/silicon/say.dm
@@ -1,14 +1,10 @@
-
-/mob/living/silicon/get_spans()
- return ..() | SPAN_ROBOT
-
/mob/living/proc/robot_talk(message)
log_talk(message, LOG_SAY)
var/desig = "Default Cyborg" //ezmode for taters
if(issilicon(src))
var/mob/living/silicon/S = src
desig = trim_left(S.designation + " " + S.job)
- var/message_a = say_quote(message, get_spans())
+ var/message_a = say_quote(message)
var/rendered = "Robotic Talk, [name] [message_a]"
for(var/mob/M in GLOB.player_list)
if(M.binarycheck())
diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm
index d0e3fc8b1c..13520774c5 100644
--- a/code/modules/mob/living/silicon/silicon.dm
+++ b/code/modules/mob/living/silicon/silicon.dm
@@ -12,6 +12,7 @@
possible_a_intents = list(INTENT_HELP, INTENT_HARM)
mob_biotypes = list(MOB_ROBOTIC)
rad_flags = RAD_PROTECT_CONTENTS | RAD_NO_CONTAMINATE
+ speech_span = SPAN_ROBOT
var/datum/ai_laws/laws = null//Now... THEY ALL CAN ALL HAVE LAWS
var/last_lawchange_announce = 0
@@ -69,6 +70,9 @@
/mob/living/silicon/contents_explosion(severity, target)
return
+/mob/living/silicon/prevent_content_explosion()
+ return TRUE
+
/mob/living/silicon/proc/cancelAlarm()
return
diff --git a/code/modules/mob/living/simple_animal/bot/bot.dm b/code/modules/mob/living/simple_animal/bot/bot.dm
index 641e4170e5..a46fae83a1 100644
--- a/code/modules/mob/living/simple_animal/bot/bot.dm
+++ b/code/modules/mob/living/simple_animal/bot/bot.dm
@@ -23,6 +23,7 @@
verb_yell = "alarms"
initial_language_holder = /datum/language_holder/synthetic
bubble_icon = "machine"
+ speech_span = SPAN_ROBOT
faction = list("neutral", "silicon" , "turret")
@@ -349,13 +350,10 @@
if((!on) || (!message))
return
if(channel && Radio.channels[channel])// Use radio if we have channel key
- Radio.talk_into(src, message, channel, get_spans(), get_default_language())
+ Radio.talk_into(src, message, channel)
else
say(message)
-/mob/living/simple_animal/bot/get_spans()
- return ..() | SPAN_ROBOT
-
/mob/living/simple_animal/bot/radio(message, message_mode, list/spans, language)
. = ..()
if(. != 0)
diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm
index 9a08276999..5e5b486435 100644
--- a/code/modules/mob/living/simple_animal/friendly/cat.dm
+++ b/code/modules/mob/living/simple_animal/friendly/cat.dm
@@ -284,12 +284,8 @@
if(health < maxHealth)
adjustBruteLoss(-8) //Fast life regen
for(var/obj/item/reagent_containers/food/snacks/donut/D in range(1, src)) //Frosts nearby donuts!
- if(D.icon_state != "donut2")
- D.name = "frosted donut"
- D.icon_state = "donut2"
- D.reagents.add_reagent("sprinkles", 2)
- D.bonus_reagents = list("sprinkles" = 2, "sugar" = 1)
- D.filling_color = "#FF69B4"
+ if(!D.is_frosted)
+ D.frost_donut()
/mob/living/simple_animal/pet/cat/cak/attack_hand(mob/living/L)
..()
diff --git a/code/modules/mob/living/simple_animal/friendly/dog.dm b/code/modules/mob/living/simple_animal/friendly/dog.dm
index 3a5d02315b..c194233c42 100644
--- a/code/modules/mob/living/simple_animal/friendly/dog.dm
+++ b/code/modules/mob/living/simple_animal/friendly/dog.dm
@@ -28,13 +28,29 @@
butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab/corgi = 3, /obj/item/stack/sheet/animalhide/corgi = 1)
childtype = list(/mob/living/simple_animal/pet/dog/corgi/puppy = 95, /mob/living/simple_animal/pet/dog/corgi/puppy/void = 5)
animal_species = /mob/living/simple_animal/pet/dog
- var/shaved = 0
- var/obj/item/inventory_head
- var/obj/item/inventory_back
- var/nofur = 0 //Corgis that have risen past the material plane of existence.
gold_core_spawnable = FRIENDLY_SPAWN
can_be_held = TRUE
collar_type = "corgi"
+ var/obj/item/inventory_head
+ var/obj/item/inventory_back
+ var/shaved = FALSE
+ var/nofur = FALSE //Corgis that have risen past the material plane of existence.
+
+/mob/living/simple_animal/pet/dog/corgi/Destroy()
+ QDEL_NULL(inventory_head)
+ QDEL_NULL(inventory_back)
+ return ..()
+
+/mob/living/simple_animal/pet/dog/corgi/handle_atom_del(atom/A)
+ if(A == inventory_head)
+ inventory_head = null
+ update_corgi_fluff()
+ regenerate_icons()
+ if(A == inventory_back)
+ inventory_back = null
+ update_corgi_fluff()
+ regenerate_icons()
+ return ..()
/mob/living/simple_animal/pet/dog/pug
name = "\improper pug"
@@ -80,23 +96,17 @@
regenerate_icons()
/mob/living/simple_animal/pet/dog/corgi/show_inv(mob/user)
- user.set_machine(src)
- if(user.stat)
+ if(!user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
return
+ user.set_machine(src)
var/dat = "Inventory of [name]
"
- if(inventory_head)
- dat += "
Head: [inventory_head] (Remove)"
- else
- dat += "
Head: Nothing"
- if(inventory_back)
- dat += "
Back: [inventory_back] (Remove)"
- else
- dat += "
Back: Nothing"
+ dat += "
Head: [inventory_head]" : "add_inv=head'>Nothing"]"
+ dat += "
Back: [inventory_back]" : "add_inv=back'>Nothing"]"
+ dat += "
Collar: [pcollar]" : "add_inv=collar'>Nothing"]"
- user << browse(dat, text("window=mob[];size=325x500", real_name))
- onclose(user, "mob[real_name]")
- return
+ user << browse(dat, "window=mob[REF(src)];size=325x500")
+ onclose(user, "mob[REF(src)]")
/mob/living/simple_animal/pet/dog/corgi/getarmor(def_zone, type)
var/armorval = 0
@@ -128,7 +138,7 @@
if(do_after(user, 50, target = src))
user.visible_message("[user] shaves [src]'s hair using \the [O].")
playsound(loc, 'sound/items/welder2.ogg', 20, 1)
- shaved = 1
+ shaved = TRUE
icon_living = "[initial(icon_living)]_shaved"
icon_dead = "[initial(icon_living)]_shaved_dead"
if(stat == CONSCIOUS)
@@ -147,18 +157,18 @@
L.visible_message("[L] scoops up [src]!")
/mob/living/simple_animal/pet/dog/corgi/Topic(href, href_list)
- if(usr.stat)
+ if(!(iscarbon(usr) || iscyborg(usr)) || !usr.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
+ usr << browse(null, "window=mob[REF(src)]")
+ usr.unset_machine()
return
//Removing from inventory
if(href_list["remove_inv"])
- if(!Adjacent(usr) || !(ishuman(usr) || ismonkey(usr) || iscyborg(usr) || isalienadult(usr)))
- return
var/remove_from = href_list["remove_inv"]
switch(remove_from)
if(BODY_ZONE_HEAD)
if(inventory_head)
- inventory_head.forceMove(drop_location())
+ usr.put_in_hands(inventory_head)
inventory_head = null
update_corgi_fluff()
regenerate_icons()
@@ -167,24 +177,32 @@
return
if("back")
if(inventory_back)
- inventory_back.forceMove(drop_location())
+ usr.put_in_hands(inventory_back)
inventory_back = null
update_corgi_fluff()
regenerate_icons()
else
to_chat(usr, "There is nothing to remove from its [remove_from].")
return
+ if("collar")
+ if(pcollar)
+ usr.put_in_hands(pcollar)
+ pcollar = null
+ update_corgi_fluff()
+ regenerate_icons()
show_inv(usr)
//Adding things to inventory
else if(href_list["add_inv"])
- if(!Adjacent(usr) || !(ishuman(usr) || ismonkey(usr) || iscyborg(usr) || isalienadult(usr)))
- return
var/add_to = href_list["add_inv"]
switch(add_to)
+ if("collar")
+ add_collar(usr.get_active_held_item(), usr)
+ update_corgi_fluff()
+
if(BODY_ZONE_HEAD)
place_on_head(usr.get_active_held_item(),usr)
@@ -229,7 +247,7 @@
show_inv(usr)
else
- ..()
+ return ..()
//Corgis are supposed to be simpler, so only a select few objects can actually be put
//to be compatible with them. The objects are below.
@@ -560,7 +578,7 @@
icon_state = "void_puppy"
icon_living = "void_puppy"
icon_dead = "void_puppy_dead"
- nofur = 1
+ nofur = TRUE
unsuitable_atmos_damage = 0
minbodytemp = TCMB
maxbodytemp = T0C + 40
diff --git a/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm b/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm
index cf3742fcc5..6d3121474c 100644
--- a/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm
+++ b/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm
@@ -37,6 +37,7 @@
gender = NEUTER
mob_biotypes = list(MOB_ROBOTIC)
speak_emote = list("chirps")
+ speech_span = SPAN_ROBOT
bubble_icon = "machine"
initial_language_holder = /datum/language_holder/drone
mob_size = MOB_SIZE_SMALL
@@ -92,7 +93,7 @@
var/obj/item/I = new default_hatmask(src)
equip_to_slot_or_del(I, SLOT_HEAD)
- access_card.item_flags |= NODROP
+ ADD_TRAIT(access_card, TRAIT_NODROP, ABSTRACT_ITEM_TRAIT)
alert_drones(DRONE_NET_CONNECT)
diff --git a/code/modules/mob/living/simple_animal/friendly/drone/say.dm b/code/modules/mob/living/simple_animal/friendly/drone/say.dm
index 16bf370f02..7a5967948f 100644
--- a/code/modules/mob/living/simple_animal/friendly/drone/say.dm
+++ b/code/modules/mob/living/simple_animal/friendly/drone/say.dm
@@ -1,13 +1,3 @@
-/////////////
-//DRONE SAY//
-/////////////
-//Drone speach
-
-/mob/living/simple_animal/drone/get_spans()
- return ..() | SPAN_ROBOT
-
-
-
//Base proc for anything to call
/proc/_alert_drones(msg, dead_can_hear = 0, atom/source, mob/living/faction_checked_mob, exact_faction_match)
if (dead_can_hear && source)
@@ -31,7 +21,7 @@
/mob/living/simple_animal/drone/proc/drone_chat(msg)
- alert_drones("Drone Chat: [name] [say_quote(msg, get_spans())]", TRUE)
+ alert_drones("Drone Chat: [name] [say_quote(msg)]", TRUE)
/mob/living/simple_animal/drone/binarycheck()
return TRUE
diff --git a/code/modules/mob/living/simple_animal/friendly/pet.dm b/code/modules/mob/living/simple_animal/friendly/pet.dm
index 8df0ee83fe..c24dc6857a 100644
--- a/code/modules/mob/living/simple_animal/friendly/pet.dm
+++ b/code/modules/mob/living/simple_animal/friendly/pet.dm
@@ -2,21 +2,30 @@
icon = 'icons/mob/pets.dmi'
mob_size = MOB_SIZE_SMALL
mob_biotypes = list(MOB_ORGANIC, MOB_BEAST)
- var/obj/item/clothing/neck/petcollar/pcollar
- var/collar_type
- var/unique_pet = FALSE
blood_volume = BLOOD_VOLUME_NORMAL
+ var/unique_pet = FALSE // if the mob can be renamed
+ var/obj/item/clothing/neck/petcollar/pcollar
+ var/collar_type //if the mob has collar sprites, define them.
+
+/mob/living/simple_animal/pet/handle_atom_del(atom/A)
+ if(A == pcollar)
+ pcollar = null
+ return ..()
+
+/mob/living/simple_animal/pet/proc/add_collar(obj/item/clothing/neck/petcollar/P, mob/user)
+ if(QDELETED(P) || pcollar)
+ return
+ if(!user.transferItemToLoc(P, src))
+ return
+ pcollar = P
+ regenerate_icons()
+ to_chat(user, "You put the [P] around [src]'s neck.")
+ if(P.tagname && !unique_pet)
+ fully_replace_character_name(null, "\proper [P.tagname]")
/mob/living/simple_animal/pet/attackby(obj/item/O, mob/user, params)
if(istype(O, /obj/item/clothing/neck/petcollar) && !pcollar && collar_type)
- var/obj/item/clothing/neck/petcollar/P = O
- pcollar = P.type
- regenerate_icons()
- to_chat(user, "You put the [P] around [src]'s neck.")
- if(P.tagname && !unique_pet)
- real_name = "\proper [P.tagname]"
- name = real_name
- qdel(P)
+ add_collar(O, user)
return
if(istype(O, /obj/item/newspaper))
@@ -35,12 +44,16 @@
pcollar = new(src)
regenerate_icons()
+/mob/living/simple_animal/pet/Destroy()
+ QDEL_NULL(pcollar)
+ return ..()
+
/mob/living/simple_animal/pet/revive(full_heal = 0, admin_revive = 0)
- if(..())
+ . = ..()
+ if(.)
if(collar_type)
collar_type = "[initial(collar_type)]"
regenerate_icons()
- . = TRUE
/mob/living/simple_animal/pet/death(gibbed)
..(gibbed)
@@ -50,7 +63,8 @@
/mob/living/simple_animal/pet/gib()
if(pcollar)
- new pcollar(drop_location())
+ pcollar.forceMove(drop_location())
+ pcollar = null
..()
/mob/living/simple_animal/pet/regenerate_icons()
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm
index a07e46a289..301b270e36 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm
@@ -41,6 +41,9 @@
QDEL_NULL(internal)
. = ..()
+/mob/living/simple_animal/hostile/megafauna/prevent_content_explosion()
+ return TRUE
+
/mob/living/simple_animal/hostile/megafauna/death(gibbed)
if(health > 0)
return
diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm
index 4fdf431fa0..fc53483eda 100644
--- a/code/modules/mob/living/simple_animal/parrot.dm
+++ b/code/modules/mob/living/simple_animal/parrot.dm
@@ -181,94 +181,85 @@
*/
/mob/living/simple_animal/parrot/show_inv(mob/user)
user.set_machine(src)
- var/dat = "
Inventory of [name]
"
- if(ears)
- dat += "
Headset: [ears] (Remove)"
- else
- dat += "
Headset: Nothing"
- user << browse(dat, "window=mob[real_name];size=325x500")
- onclose(user, "mob[real_name]")
+ var/dat = "
Inventory of [name]
"
+ dat += "
Headset: [ears]" : "add_inv=ears'>Nothing"]"
+
+ user << browse(dat, "window=mob[REF(src)];size=325x500")
+ onclose(user, "window=mob[REF(src)]")
/mob/living/simple_animal/parrot/Topic(href, href_list)
-
- //Can the usr physically do this?
- if(usr.incapacitated() || !usr.Adjacent(loc))
+ if(!(iscarbon(usr) || iscyborg(usr)) || !usr.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
+ usr << browse(null, "window=mob[REF(src)]")
+ usr.unset_machine()
return
- //Is the usr's mob type able to do this? (lolaliens)
- if(ishuman(usr) || ismonkey(usr) || iscyborg(usr) || isalienadult(usr))
+ //Removing from inventory
+ if(href_list["remove_inv"])
+ var/remove_from = href_list["remove_inv"]
+ switch(remove_from)
+ if("ears")
+ if(!ears)
+ to_chat(usr, "There is nothing to remove from its [remove_from]!")
+ return
+ if(!stat)
+ say("[available_channels.len ? "[pick(available_channels)] " : null]BAWWWWWK LEAVE THE HEADSET BAWKKKKK!")
+ ears.forceMove(drop_location())
+ ears = null
+ for(var/possible_phrase in speak)
+ if(copytext(possible_phrase,1,3) in GLOB.department_radio_keys)
+ possible_phrase = copytext(possible_phrase,3)
- //Removing from inventory
- if(href_list["remove_inv"])
- var/remove_from = href_list["remove_inv"]
- switch(remove_from)
- if("ears")
- if(ears)
- if(!stat)
- if(available_channels.len)
- src.say("[pick(available_channels)] BAWWWWWK LEAVE THE HEADSET BAWKKKKK!")
- else
- src.say("BAWWWWWK LEAVE THE HEADSET BAWKKKKK!")
- ears.forceMove(src.loc)
- ears = null
- for(var/possible_phrase in speak)
- if(copytext(possible_phrase,1,3) in GLOB.department_radio_keys)
- possible_phrase = copytext(possible_phrase,3)
- else
- to_chat(usr, "There is nothing to remove from its [remove_from]!")
+ //Adding things to inventory
+ else if(href_list["add_inv"])
+ var/add_to = href_list["add_inv"]
+ if(!usr.get_active_held_item())
+ to_chat(usr, "You have nothing in your hand to put on its [add_to]!")
+ return
+ switch(add_to)
+ if("ears")
+ if(ears)
+ to_chat(usr, "It's already wearing something!")
+ return
+ else
+ var/obj/item/item_to_add = usr.get_active_held_item()
+ if(!item_to_add)
return
- //Adding things to inventory
- else if(href_list["add_inv"])
- var/add_to = href_list["add_inv"]
- if(!usr.get_active_held_item())
- to_chat(usr, "You have nothing in your hand to put on its [add_to]!")
- return
- switch(add_to)
- if("ears")
- if(ears)
- to_chat(usr, "It's already wearing something!")
+ if( !istype(item_to_add, /obj/item/radio/headset) )
+ to_chat(usr, "This object won't fit!")
return
- else
- var/obj/item/item_to_add = usr.get_active_held_item()
- if(!item_to_add)
- return
- if( !istype(item_to_add, /obj/item/radio/headset) )
- to_chat(usr, "This object won't fit!")
- return
+ var/obj/item/radio/headset/headset_to_add = item_to_add
- var/obj/item/radio/headset/headset_to_add = item_to_add
+ if(!usr.transferItemToLoc(headset_to_add, src))
+ return
+ ears = headset_to_add
+ to_chat(usr, "You fit the headset onto [src].")
- if(!usr.transferItemToLoc(headset_to_add, src))
- return
- src.ears = headset_to_add
- to_chat(usr, "You fit the headset onto [src].")
+ clearlist(available_channels)
+ for(var/ch in headset_to_add.channels)
+ switch(ch)
+ if("Engineering")
+ available_channels.Add(":e")
+ if("Command")
+ available_channels.Add(":c")
+ if("Security")
+ available_channels.Add(":s")
+ if("Science")
+ available_channels.Add(":n")
+ if("Medical")
+ available_channels.Add(":m")
+ if("Supply")
+ available_channels.Add(":u")
+ if("Service")
+ available_channels.Add(":v")
- clearlist(available_channels)
- for(var/ch in headset_to_add.channels)
- switch(ch)
- if("Engineering")
- available_channels.Add(":e")
- if("Command")
- available_channels.Add(":c")
- if("Security")
- available_channels.Add(":s")
- if("Science")
- available_channels.Add(":n")
- if("Medical")
- available_channels.Add(":m")
- if("Supply")
- available_channels.Add(":u")
- if("Service")
- available_channels.Add(":v")
-
- if(headset_to_add.translate_binary)
- available_channels.Add(":b")
- else
- ..()
+ if(headset_to_add.translate_binary)
+ available_channels.Add(":b")
+ else
+ return ..()
/*
diff --git a/code/modules/mob/living/simple_animal/slime/life.dm b/code/modules/mob/living/simple_animal/slime/life.dm
index ebb34fe77a..07985215d8 100644
--- a/code/modules/mob/living/simple_animal/slime/life.dm
+++ b/code/modules/mob/living/simple_animal/slime/life.dm
@@ -61,7 +61,7 @@
break
if(Target in view(1,src))
- if(issilicon(Target))
+ if(!CanFeedon(Target)) //If they're not able to be fed upon, ignore them.
if(!Atkcool)
Atkcool = 1
spawn(45)
@@ -600,7 +600,8 @@
phrases += "[M]... friend..."
if (nutrition < get_hunger_nutrition())
phrases += "[M]... feed me..."
- say (pick(phrases))
+ if(!stat)
+ say (pick(phrases))
/mob/living/simple_animal/slime/proc/get_max_nutrition() // Can't go above it
if (is_adult)
diff --git a/code/modules/mob/living/simple_animal/slime/powers.dm b/code/modules/mob/living/simple_animal/slime/powers.dm
index 96e84a1754..a3e2f48b75 100644
--- a/code/modules/mob/living/simple_animal/slime/powers.dm
+++ b/code/modules/mob/living/simple_animal/slime/powers.dm
@@ -48,34 +48,58 @@
var/mob/living/simple_animal/slime/S = owner
S.Feed()
-/mob/living/simple_animal/slime/proc/CanFeedon(mob/living/M)
+/mob/living/simple_animal/slime/proc/CanFeedon(mob/living/M, silent = FALSE)
if(!Adjacent(M))
- return 0
+ return FALSE
if(buckled)
Feedstop()
- return 0
+ return FALSE
+
+ if(issilicon(M))
+ return FALSE
+
+ if(isanimal(M))
+ var/mob/living/simple_animal/S = M
+ if(S.damage_coeff[TOX] <= 0 && S.damage_coeff[CLONE] <= 0) //The creature wouldn't take any damage, it must be too weird even for us.
+ if(silent)
+ return FALSE
+ to_chat(src, "[pick("This subject is incompatible", \
+ "This subject does not have life energy", "This subject is empty", \
+ "I am not satisified", "I can not feed from this subject", \
+ "I do not feel nourished", "This subject is not food")]!")
+ return FALSE
if(isslime(M))
+ if(silent)
+ return FALSE
to_chat(src, "I can't latch onto another slime...")
- return 0
+ return FALSE
if(docile)
+ if(silent)
+ return FALSE
to_chat(src, "I'm not hungry anymore...")
- return 0
+ return FALSE
if(stat)
+ if(silent)
+ return FALSE
to_chat(src, "I must be conscious to do this...")
- return 0
+ return FALSE
if(M.stat == DEAD)
+ if(silent)
+ return FALSE
to_chat(src, "This subject does not have a strong enough life energy...")
- return 0
+ return FALSE
if(locate(/mob/living/simple_animal/slime) in M.buckled_mobs)
+ if(silent)
+ return FALSE
to_chat(src, "Another slime is already feeding on this subject...")
- return 0
- return 1
+ return FALSE
+ return TRUE
/mob/living/simple_animal/slime/proc/Feedon(mob/living/M)
M.unbuckle_all_mobs(force=1) //Slimes rip other mobs (eg: shoulder parrots) off (Slimes Vs Slimes is already handled in CanFeedon())
diff --git a/code/modules/mob/living/ventcrawling.dm b/code/modules/mob/living/ventcrawling.dm
index 251739c935..930656228d 100644
--- a/code/modules/mob/living/ventcrawling.dm
+++ b/code/modules/mob/living/ventcrawling.dm
@@ -91,14 +91,15 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, typecacheof(list(
if(!totalMembers.len)
return
- for(var/X in totalMembers)
- var/obj/machinery/atmospherics/A = X //all elements in totalMembers are necessarily of this type.
- if(!A.pipe_vision_img)
- A.pipe_vision_img = image(A, A.loc, layer = ABOVE_HUD_LAYER, dir = A.dir)
- A.pipe_vision_img.plane = ABOVE_HUD_PLANE
- pipes_shown += A.pipe_vision_img
- if(client)
- client.images += A.pipe_vision_img
+ if(client)
+ for(var/X in totalMembers)
+ var/obj/machinery/atmospherics/A = X //all elements in totalMembers are necessarily of this type.
+ if(in_view_range(client.mob, A))
+ if(!A.pipe_vision_img)
+ A.pipe_vision_img = image(A, A.loc, layer = ABOVE_HUD_LAYER, dir = A.dir)
+ A.pipe_vision_img.plane = ABOVE_HUD_PLANE
+ client.images += A.pipe_vision_img
+ pipes_shown += A.pipe_vision_img
movement_type |= VENTCRAWLING
diff --git a/code/modules/mob/say.dm b/code/modules/mob/say.dm
index 9e127d4746..ecb869790c 100644
--- a/code/modules/mob/say.dm
+++ b/code/modules/mob/say.dm
@@ -69,16 +69,11 @@
if(name != real_name)
alt_name = " (died as [real_name])"
- var/K
-
- if(key)
- K = src.key
-
- var/spanned = src.say_quote(message, get_spans())
+ var/spanned = say_quote(message)
message = emoji_parse(message)
var/rendered = "DEAD: [name][alt_name] [emoji_parse(spanned)]"
log_talk(message, LOG_SAY, tag="DEAD")
- deadchat_broadcast(rendered, follow_target = src, speaker_key = K)
+ deadchat_broadcast(rendered, follow_target = src, speaker_key = key)
/mob/proc/check_emote(message)
if(copytext(message, 1, 2) == "*")
diff --git a/code/modules/mob/say_readme.dm b/code/modules/mob/say_readme.dm
index 00e0f66246..0e76d9b6ed 100644
--- a/code/modules/mob/say_readme.dm
+++ b/code/modules/mob/say_readme.dm
@@ -78,10 +78,6 @@ global procs
say_quote(input, spans, message_mode)
Adds a verb and quotes to a message. Also attaches span classes to a message. Verbs are determined by verb_say/verb_ask/verb_yell variables. Called on the speaker.
- get_spans(input, spans)
- Returns the list of spans that are always applied to messages of this atom.
- Always return ..() | + youroutput when overriding this proc!
-
/mob
say_dead(message)
Sends a message to all dead people. Does not use Hear().
diff --git a/code/modules/ninja/suit/gloves.dm b/code/modules/ninja/suit/gloves.dm
index a01b354ca1..276de652bc 100644
--- a/code/modules/ninja/suit/gloves.dm
+++ b/code/modules/ninja/suit/gloves.dm
@@ -79,5 +79,5 @@
/obj/item/clothing/gloves/space_ninja/examine(mob/user)
..()
- if(item_flags & NODROP)
+ if(HAS_TRAIT_FROM(src, TRAIT_NODROP, NINJA_SUIT_TRAIT))
to_chat(user, "The energy drain mechanism is [candrain?"active":"inactive"].")
diff --git a/code/modules/ninja/suit/mask.dm b/code/modules/ninja/suit/mask.dm
index 2200af7cab..e97e39643a 100644
--- a/code/modules/ninja/suit/mask.dm
+++ b/code/modules/ninja/suit/mask.dm
@@ -17,16 +17,19 @@ Contents:
item_state = "s-ninja_mask"
strip_delay = 120
resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
+ modifies_speech = TRUE
-/obj/item/clothing/mask/gas/space_ninja/speechModification(message)
- if(copytext(message, 1, 2) != "*")
+/obj/item/clothing/mask/gas/space_ninja/handle_speech(datum/source, list/speech_args)
+ var/message = speech_args[SPEECH_MESSAGE]
+ if(message[1] != "*")
var/list/temp_message = text2list(message, " ")
var/list/pick_list = list()
- for(var/i = 1, i <= temp_message.len, i++)
+ for(var/i in 1 to temp_message.len)
pick_list += i
- for(var/i=1, i <= abs(temp_message.len/3), i++)
+ for(var/i in 1 to abs(temp_message.len/3))
var/H = pick(pick_list)
- if(findtext(temp_message[H], "*") || findtext(temp_message[H], ";") || findtext(temp_message[H], ":")) continue
+ if(findtext(temp_message[H], "*") || findtext(temp_message[H], ";") || findtext(temp_message[H], ":"))
+ continue
temp_message[H] = ninjaspeak(temp_message[H])
pick_list -= H
message = list2text(temp_message, " ")
@@ -56,5 +59,4 @@ Contents:
message = replacetext(message, "than", "sen")
message = replacetext(message, ".", "")
message = lowertext(message)
-
- return message
+ speech_args[SPEECH_MESSAGE] = message
diff --git a/code/modules/ninja/suit/n_suit_verbs/energy_net_nets.dm b/code/modules/ninja/suit/n_suit_verbs/energy_net_nets.dm
index c98a0440e3..334136cc33 100644
--- a/code/modules/ninja/suit/n_suit_verbs/energy_net_nets.dm
+++ b/code/modules/ninja/suit/n_suit_verbs/energy_net_nets.dm
@@ -18,8 +18,8 @@ It is possible to destroy the net by the occupant or someone else.
can_buckle = 1
buckle_lying = 0
buckle_prevents_pull = TRUE
- var/mob/living/carbon/affecting//Who it is currently affecting, if anyone.
- var/mob/living/carbon/master//Who shot web. Will let this person know if the net was successful or failed.
+ var/mob/living/carbon/affecting //Who it is currently affecting, if anyone.
+ var/mob/living/carbon/master //Who shot web. Will let this person know if the net was successful or failed.
var/check = 15//30 seconds before teleportation. Could be extended I guess.
var/success = FALSE
diff --git a/code/modules/ninja/suit/n_suit_verbs/ninja_net.dm b/code/modules/ninja/suit/n_suit_verbs/ninja_net.dm
index 41f7b8af83..61355ca89b 100644
--- a/code/modules/ninja/suit/n_suit_verbs/ninja_net.dm
+++ b/code/modules/ninja/suit/n_suit_verbs/ninja_net.dm
@@ -7,28 +7,26 @@
//If there's only one valid target, let's actually try to capture it, rather than forcing
//the user to fiddle with the dialog displaying a list of one
//Also, let's make this smarter and not list mobs you can't currently net.
- var/Candidates[]
- for(var/mob/mob in oview(H))
- if(!mob.client)//Monkeys without a client can still step_to() and bypass the net. Also, netting inactive people is lame.
- //to_chat(H, "[C.p_they(TRUE)] will bring no honor to your Clan!")
+ var/list/candidates
+ for(var/mob/M in oview(H))
+ if(!M.client)//Monkeys without a client can still step_to() and bypass the net. Also, netting inactive people is lame.
continue
- if(locate(/obj/structure/energy_net) in get_turf(mob))//Check if they are already being affected by an energy net.
- //to_chat(H, "[C.p_they(TRUE)] are already trapped inside an energy net!")
- continue
- for(var/turf/T in getline(get_turf(H), get_turf(mob)))
- if(T.density)//Don't want them shooting nets through walls. It's kind of cheesy.
- //to_chat(H, "You may not use an energy net through solid obstacles!")
+ for(var/obj/structure/energy_net/E in get_turf(M))//Check if they are already being affected by an energy net.
+ if(E.affecting == M)
continue
- Candidates+=mob
+ LAZYADD(candidates, M)
- if(Candidates.len == 1)
- C = Candidates[1]
+ if(!LAZYLEN(candidates))
+ return FALSE
+
+ if(candidates.len == 1)
+ C = candidates[1]
else
- C = input("Select who to capture:","Capture who?",null) as null|mob in Candidates
+ C = input("Select who to capture:","Capture who?",null) as null|mob in candidates
if(QDELETED(C)||!(C in oview(H)))
- return 0
+ return FALSE
if(!ninjacost(200,N_STEALTH_CANCEL))
H.Beam(C,"n_beam",time=15)
diff --git a/code/modules/ninja/suit/suit.dm b/code/modules/ninja/suit/suit.dm
index 6110f2b0c0..b98ef764c0 100644
--- a/code/modules/ninja/suit/suit.dm
+++ b/code/modules/ninja/suit/suit.dm
@@ -111,15 +111,15 @@ Contents:
to_chat(H, "ERROR: 110223 UNABLE TO LOCATE HAND GEAR\nABORTING...")
return FALSE
affecting = H
- item_flags |= NODROP //colons make me go all |=
+ ADD_TRAIT(src, TRAIT_NODROP, NINJA_SUIT_TRAIT) //colons make me go all |=
slowdown = 0
n_hood = H.head
- n_hood.item_flags |= NODROP
+ ADD_TRAIT(n_hood, TRAIT_NODROP, NINJA_SUIT_TRAIT)
n_shoes = H.shoes
- n_shoes.item_flags |= NODROP
+ ADD_TRAIT(n_shoes, TRAIT_NODROP, NINJA_SUIT_TRAIT)
n_shoes.slowdown--
n_gloves = H.gloves
- n_gloves.item_flags |= NODROP
+ ADD_TRAIT(n_gloves, TRAIT_NODROP, NINJA_SUIT_TRAIT)
return TRUE
/obj/item/clothing/suit/space/space_ninja/proc/lockIcons(mob/living/carbon/human/H)
@@ -131,18 +131,18 @@ Contents:
//This proc allows the suit to be taken off.
/obj/item/clothing/suit/space/space_ninja/proc/unlock_suit()
affecting = null
- item_flags &= ~NODROP
+ REMOVE_TRAIT(src, TRAIT_NODROP, NINJA_SUIT_TRAIT)
slowdown = 1
icon_state = "s-ninja"
if(n_hood)//Should be attached, might not be attached.
- n_hood.item_flags &= ~NODROP
+ REMOVE_TRAIT(n_hood, TRAIT_NODROP, NINJA_SUIT_TRAIT)
if(n_shoes)
- n_shoes.item_flags &= ~NODROP
+ REMOVE_TRAIT(n_shoes, TRAIT_NODROP, NINJA_SUIT_TRAIT)
n_shoes.slowdown++
if(n_gloves)
n_gloves.icon_state = "s-ninja"
n_gloves.item_state = "s-ninja"
- n_gloves.item_flags &= ~NODROP
+ REMOVE_TRAIT(n_gloves, TRAIT_NODROP, NINJA_SUIT_TRAIT)
n_gloves.candrain=0
n_gloves.draining=0
diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm
index 6125ac9b82..a5900aa196 100644
--- a/code/modules/paperwork/pen.dm
+++ b/code/modules/paperwork/pen.dm
@@ -25,7 +25,6 @@
pressure_resistance = 2
grind_results = list("iron" = 2, "iodine" = 1)
var/colour = "black" //what colour the ink is!
- var/traitor_unlock_degrees = 0
var/degrees = 0
var/font = PEN_FONT
diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm
index b77ea9d13a..f82f0ee8e6 100644
--- a/code/modules/power/lighting.dm
+++ b/code/modules/power/lighting.dm
@@ -89,7 +89,7 @@
if(!cell_connectors)
to_chat(user, "This [name] can't support a power cell!")
return
- if(W.item_flags & NODROP)
+ if(HAS_TRAIT(W, TRAIT_NODROP))
to_chat(user, "[W] is stuck to your hand!")
return
user.dropItemToGround(W)
diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm
index 04707f52d7..4d6ede69d1 100644
--- a/code/modules/power/singularity/emitter.dm
+++ b/code/modules/power/singularity/emitter.dm
@@ -90,7 +90,7 @@
/obj/machinery/power/emitter/ComponentInitialize()
. = ..()
- AddComponent(/datum/component/simple_rotation,ROTATION_ALTCLICK | ROTATION_FLIP ,null,CALLBACK(src, .proc/can_be_rotated))
+ AddComponent(/datum/component/simple_rotation, ROTATION_ALTCLICK | ROTATION_CLOCKWISE | ROTATION_COUNTERCLOCKWISE | ROTATION_VERBS, null, CALLBACK(src, .proc/can_be_rotated))
/obj/machinery/power/emitter/proc/can_be_rotated(mob/user,rotation_type)
if (anchored)
@@ -441,10 +441,14 @@
name = "turret controls"
icon_state = "offhand"
w_class = WEIGHT_CLASS_HUGE
- item_flags = ABSTRACT | NODROP | NOBLUDGEON
+ item_flags = ABSTRACT | NOBLUDGEON
resistance_flags = FIRE_PROOF | UNACIDABLE | ACID_PROOF
var/delay = 0
+/obj/item/turret_control/Initialize()
+ . = ..()
+ ADD_TRAIT(src, TRAIT_NODROP, ABSTRACT_ITEM_TRAIT)
+
/obj/item/turret_control/afterattack(atom/targeted_atom, mob/user, proxflag, clickparams)
. = ..()
var/obj/machinery/power/emitter/E = user.buckled
@@ -496,4 +500,4 @@
#undef EMITTER_UNWRENCHED
#undef EMITTER_WRENCHED
-#undef EMITTER_WELDED
\ No newline at end of file
+#undef EMITTER_WELDED
diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm
index d87f9821ef..026c39c6cf 100644
--- a/code/modules/power/supermatter/supermatter.dm
+++ b/code/modules/power/supermatter/supermatter.dm
@@ -184,9 +184,6 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal)
to_chat(H, "You get headaches just from looking at it.")
return
-/obj/machinery/power/supermatter_crystal/get_spans()
- return list(SPAN_ROBOT)
-
#define CRITICAL_TEMPERATURE 10000
/obj/machinery/power/supermatter_crystal/proc/get_status()
@@ -244,10 +241,10 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal)
add_overlay(causality_field, TRUE)
var/speaking = "[emergency_alert] The supermatter has reached critical integrity failure. Emergency causality destabilization field has been activated."
- radio.talk_into(src, speaking, common_channel, get_spans(), get_default_language())
+ radio.talk_into(src, speaking, common_channel, language = get_default_language())
for(var/i in SUPERMATTER_COUNTDOWN_TIME to 0 step -10)
if(damage < explosion_point) // Cutting it a bit close there engineers
- radio.talk_into(src, "[safe_alert] Failsafe has been disengaged.", common_channel, get_spans(), get_default_language())
+ radio.talk_into(src, "[safe_alert] Failsafe has been disengaged.", common_channel)
cut_overlay(causality_field, TRUE)
final_countdown = FALSE
return
@@ -258,7 +255,7 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal)
speaking = "[DisplayTimeText(i, TRUE)] remain before causality stabilization."
else
speaking = "[i*0.1]..."
- radio.talk_into(src, speaking, common_channel, get_spans(), get_default_language())
+ radio.talk_into(src, speaking, common_channel)
sleep(10)
explode()
@@ -459,27 +456,27 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal)
alarm()
if(damage > emergency_point)
- radio.talk_into(src, "[emergency_alert] Integrity: [get_integrity()]%", common_channel, get_spans(), get_default_language())
+ radio.talk_into(src, "[emergency_alert] Integrity: [get_integrity()]%", common_channel)
lastwarning = REALTIMEOFDAY
if(!has_reached_emergency)
investigate_log("has reached the emergency point for the first time.", INVESTIGATE_SUPERMATTER)
message_admins("[src] has reached the emergency point [ADMIN_JMP(src)].")
has_reached_emergency = TRUE
else if(damage >= damage_archived) // The damage is still going up
- radio.talk_into(src, "[warning_alert] Integrity: [get_integrity()]%", engineering_channel, get_spans(), get_default_language())
+ radio.talk_into(src, "[warning_alert] Integrity: [get_integrity()]%", engineering_channel)
lastwarning = REALTIMEOFDAY - (WARNING_DELAY * 5)
else // Phew, we're safe
- radio.talk_into(src, "[safe_alert] Integrity: [get_integrity()]%", engineering_channel, get_spans(), get_default_language())
+ radio.talk_into(src, "[safe_alert] Integrity: [get_integrity()]%", engineering_channel)
lastwarning = REALTIMEOFDAY
if(power > POWER_PENALTY_THRESHOLD)
- radio.talk_into(src, "Warning: Hyperstructure has reached dangerous power level.", engineering_channel, get_spans(), get_default_language())
+ radio.talk_into(src, "Warning: Hyperstructure has reached dangerous power level.", engineering_channel)
if(powerloss_inhibitor < 0.5)
- radio.talk_into(src, "DANGER: CHARGE INERTIA CHAIN REACTION IN PROGRESS.", engineering_channel, get_spans(), get_default_language())
+ radio.talk_into(src, "DANGER: CHARGE INERTIA CHAIN REACTION IN PROGRESS.", engineering_channel)
if(combined_gas > MOLE_PENALTY_THRESHOLD)
- radio.talk_into(src, "Warning: Critical coolant mass reached.", engineering_channel, get_spans(), get_default_language())
+ radio.talk_into(src, "Warning: Critical coolant mass reached.", engineering_channel)
if(damage > explosion_point)
countdown()
@@ -653,6 +650,13 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal)
else
L.show_message("You hear an unearthly ringing and notice your skin is covered in fresh radiation burns.", 2)
+//Do not blow up our internal radio
+/obj/machinery/power/supermatter_crystal/contents_explosion(severity, target)
+ return
+
+/obj/machinery/power/supermatter_crystal/prevent_content_explosion()
+ return TRUE
+
/obj/machinery/power/supermatter_crystal/engine
is_main_engine = TRUE
diff --git a/code/modules/projectiles/ammunition/caseless/_caseless.dm b/code/modules/projectiles/ammunition/caseless/_caseless.dm
index 154d269cd9..a6b65f79e3 100644
--- a/code/modules/projectiles/ammunition/caseless/_caseless.dm
+++ b/code/modules/projectiles/ammunition/caseless/_caseless.dm
@@ -6,9 +6,10 @@
/obj/item/ammo_casing/caseless/fire_casing(atom/target, mob/living/user, params, distro, quiet, zone_override, spread)
if (..()) //successfully firing
moveToNullspace()
- return 1
+ QDEL_NULL(src)
+ return TRUE
else
- return 0
+ return FALSE
/obj/item/ammo_casing/caseless/update_icon()
..()
diff --git a/code/modules/projectiles/ammunition/caseless/rocket.dm b/code/modules/projectiles/ammunition/caseless/rocket.dm
index 0b74f6ff8c..9d6befce53 100644
--- a/code/modules/projectiles/ammunition/caseless/rocket.dm
+++ b/code/modules/projectiles/ammunition/caseless/rocket.dm
@@ -1,5 +1,13 @@
-/obj/item/ammo_casing/caseless/a84mm
- desc = "An 84mm anti-armour rocket."
+/obj/item/ammo_casing/caseless/rocket
+ name = "\improper PM-9HE"
+ desc = "An 84mm High Explosive rocket. Fire at people and pray."
+ caliber = "84mm"
+ icon_state = "srm-8"
+ projectile_type = /obj/item/projectile/bullet/a84mm_he
+
+/obj/item/ammo_casing/caseless/rocket/hedp
+ name = "\improper PM-9HEDP"
+ desc = "An 84mm High Explosive Dual Purpose rocket. Pointy end toward mechs."
caliber = "84mm"
icon_state = "s-casing-live"
projectile_type = /obj/item/projectile/bullet/a84mm
diff --git a/code/modules/projectiles/boxes_magazines/internal/grenade.dm b/code/modules/projectiles/boxes_magazines/internal/grenade.dm
index 12325a0299..352d1eb951 100644
--- a/code/modules/projectiles/boxes_magazines/internal/grenade.dm
+++ b/code/modules/projectiles/boxes_magazines/internal/grenade.dm
@@ -12,6 +12,6 @@
/obj/item/ammo_box/magazine/internal/rocketlauncher
name = "grenade launcher internal magazine"
- ammo_type = /obj/item/ammo_casing/caseless/a84mm
+ ammo_type = /obj/item/ammo_casing/caseless/rocket
caliber = "84mm"
max_ammo = 1
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index 542e4ecffa..98fd774d63 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -170,7 +170,7 @@
return
if(weapon_weight == WEAPON_HEAVY && user.get_inactive_held_item())
- to_chat(user, "You need both hands free to fire [src]!")
+ to_chat(user, "You need both hands free to fire \the [src]!")
return
//DUAL (or more!) WIELDING
@@ -422,7 +422,7 @@
if(alight)
alight.Remove(user)
-/obj/item/gun/proc/handle_suicide(mob/living/carbon/human/user, mob/living/carbon/human/target, params)
+/obj/item/gun/proc/handle_suicide(mob/living/carbon/human/user, mob/living/carbon/human/target, params, bypass_timer)
if(!ishuman(user) || !ishuman(target))
return
@@ -438,7 +438,7 @@
semicd = TRUE
- if(!do_mob(user, target, 120) || user.zone_selected != BODY_ZONE_PRECISE_MOUTH)
+ if(!bypass_timer && (!do_mob(user, target, 120) || user.zone_selected != BODY_ZONE_PRECISE_MOUTH))
if(user)
if(user == target)
user.visible_message("[user] decided not to shoot.")
diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm
index 157cf1f03f..1117bc1000 100644
--- a/code/modules/projectiles/guns/ballistic.dm
+++ b/code/modules/projectiles/guns/ballistic.dm
@@ -7,6 +7,7 @@
var/mag_type = /obj/item/ammo_box/magazine/m10mm //Removes the need for max_ammo and caliber info
var/obj/item/ammo_box/magazine/magazine
var/casing_ejector = TRUE //whether the gun ejects the chambered casing
+ var/magazine_wording = "magazine"
/obj/item/gun/ballistic/Initialize()
. = ..()
@@ -57,7 +58,7 @@
if (!magazine && istype(AM, mag_type))
if(user.transferItemToLoc(AM, src))
magazine = AM
- to_chat(user, "You load a new magazine into \the [src].")
+ to_chat(user, "You load a new [magazine_wording] into \the [src].")
if(magazine.ammo_count())
playsound(src, "gun_insert_full_magazine", 70, 1)
if(!chambered)
@@ -72,7 +73,7 @@
to_chat(user, "You cannot seem to get \the [src] out of your hands!")
return
else if (magazine)
- to_chat(user, "There's already a magazine in \the [src].")
+ to_chat(user, "There's already a [magazine_wording] in \the [src].")
if(istype(A, /obj/item/suppressor))
var/obj/item/suppressor/S = A
if(!can_suppress)
@@ -222,7 +223,7 @@
/obj/item/suppressor
name = "suppressor"
- desc = "A universal syndicate small-arms suppressor for maximum espionage."
+ desc = "A syndicate small-arms suppressor for maximum espionage."
icon = 'icons/obj/guns/projectile.dmi'
icon_state = "suppressor"
w_class = WEIGHT_CLASS_TINY
@@ -231,6 +232,4 @@
/obj/item/suppressor/specialoffer
name = "cheap suppressor"
- desc = "A foreign knock-off suppressor, it feels flimsy, cheap, and brittle. Still fits all weapons."
- icon = 'icons/obj/guns/projectile.dmi'
- icon_state = "suppressor"
+ desc = "A foreign knock-off suppressor, it feels flimsy, cheap, and brittle. Still fits some weapons."
diff --git a/code/modules/projectiles/guns/ballistic/launchers.dm b/code/modules/projectiles/guns/ballistic/launchers.dm
index aacdd46059..eea4e1bc0b 100644
--- a/code/modules/projectiles/guns/ballistic/launchers.dm
+++ b/code/modules/projectiles/guns/ballistic/launchers.dm
@@ -74,25 +74,91 @@
update_icon()
chamber_round()
-/obj/item/gun/ballistic/automatic/atlauncher
- desc = "A pre-loaded, single shot anti-armour launcher."
- name = "anti-armour grenade launcher"
+/obj/item/gun/ballistic/rocketlauncher
+ name = "\improper PML-9"
+ desc = "A reusable rocket propelled grenade launcher. The words \"NT this way\" and an arrow have been written near the barrel."
icon_state = "rocketlauncher"
item_state = "rocketlauncher"
mag_type = /obj/item/ammo_box/magazine/internal/rocketlauncher
fire_sound = 'sound/weapons/rocketlaunch.ogg'
w_class = WEIGHT_CLASS_BULKY
can_suppress = FALSE
+ pin = /obj/item/firing_pin/implant/pindicate
burst_size = 1
fire_delay = 0
- select = 0
- actions_types = list()
casing_ejector = FALSE
weapon_weight = WEAPON_HEAVY
+ magazine_wording = "rocket"
-/obj/item/gun/ballistic/automatic/atlauncher/attack_self()
- return
+/obj/item/gun/ballistic/rocketlauncher/unrestricted
+ pin = /obj/item/firing_pin
-/obj/item/gun/ballistic/automatic/atlauncher/update_icon()
- ..()
- icon_state = "rocketlauncher[magazine ? "-[get_ammo(1)]" : ""]"
\ No newline at end of file
+/obj/item/gun/ballistic/rocketlauncher/handle_atom_del(atom/A)
+ if(A == chambered)
+ chambered = null
+ if(!QDELETED(magazine))
+ QDEL_NULL(magazine)
+ if(A == magazine)
+ magazine = null
+ if(!QDELETED(chambered))
+ QDEL_NULL(chambered)
+ update_icon()
+ return ..()
+
+/obj/item/gun/ballistic/rocketlauncher/can_shoot()
+ return chambered?.BB
+
+/obj/item/gun/ballistic/rocketlauncher/process_chamber()
+ if(chambered)
+ chambered = null
+ if(magazine)
+ QDEL_NULL(magazine)
+ update_icon()
+
+/obj/item/gun/ballistic/rocketlauncher/attack_self_tk(mob/user)
+ return //too difficult to remove the rocket with TK
+
+/obj/item/gun/ballistic/rocketlauncher/attack_self(mob/living/user)
+ if(magazine)
+ if(chambered)
+ chambered.forceMove(magazine)
+ magazine.stored_ammo.Insert(1, chambered)
+ chambered = null
+ else
+ stack_trace("Removed [magazine] from [src] without a chambered round")
+ magazine.forceMove(drop_location())
+ if(user.is_holding(src))
+ user.put_in_hands(magazine)
+ playsound(src, 'sound/weapons/gun_magazine_remove_full.ogg', 70, TRUE)
+ to_chat(user, "You work the [magazine] out from [src].")
+ magazine = null
+ else
+ to_chat(user, "There's no rocket in [src].")
+ update_icon()
+
+/obj/item/gun/ballistic/rocketlauncher/update_icon()
+ icon_state = "[initial(icon_state)]-[chambered ? "1" : "0"]"
+
+/obj/item/gun/ballistic/rocketlauncher/suicide_act(mob/living/user)
+ user.visible_message("[user] aims [src] at the ground! It looks like [user.p_theyre()] performing a sick rocket jump!", \
+ "You aim [src] at the ground to perform a bisnasty rocket jump...")
+ if(can_shoot())
+ user.notransform = TRUE
+ playsound(src, 'sound/vehicles/rocketlaunch.ogg', 80, 1, 5)
+ animate(user, pixel_z = 300, time = 30, easing = LINEAR_EASING)
+ sleep(70)
+ animate(user, pixel_z = 0, time = 5, easing = LINEAR_EASING)
+ sleep(5)
+ user.notransform = FALSE
+ process_fire(user, user, TRUE)
+ if(!QDELETED(user)) //if they weren't gibbed by the explosion, take care of them for good.
+ user.gib()
+ return MANUAL_SUICIDE
+ else
+ sleep(5)
+ shoot_with_empty_chamber(user)
+ sleep(20)
+ user.visible_message("[user] looks about the room realizing [user.p_theyre()] still there. [user.p_they(TRUE)] proceed to shove [src] down their throat and choke [user.p_them()]self with it!", \
+ "You look around after realizing you're still here, then proceed to choke yourself to death with [src]!")
+ sleep(20)
+ return OXYLOSS
diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm
index c6f0956880..6e2c9dc62a 100644
--- a/code/modules/projectiles/guns/energy/special.dm
+++ b/code/modules/projectiles/guns/energy/special.dm
@@ -243,7 +243,7 @@
/obj/item/gun/energy/printer
name = "cyborg lmg"
- desc = "A machinegun that fires 3d-printed flechettes slowly regenerated using a cyborg's internal power source."
+ desc = "A LMG that fires 3D-printed flechettes. They are slowly resupplied using the cyborg's internal power source."
icon_state = "l6closed0"
icon = 'icons/obj/guns/projectile.dmi'
cell_type = "/obj/item/stock_parts/cell/secborg"
diff --git a/code/modules/projectiles/projectile/special/rocket.dm b/code/modules/projectiles/projectile/special/rocket.dm
index 6518b2a4d5..a62fa25f7d 100644
--- a/code/modules/projectiles/projectile/special/rocket.dm
+++ b/code/modules/projectiles/projectile/special/rocket.dm
@@ -9,9 +9,9 @@
return TRUE
/obj/item/projectile/bullet/a84mm
- name ="anti-armour rocket"
+ name ="\improper HEDP rocket"
desc = "USE A WEEL GUN"
- icon_state= "atrocket"
+ icon_state= "84mm-hedp"
damage = 80
var/anti_armour_damage = 200
armour_penetration = 100
@@ -29,17 +29,17 @@
S.take_overall_damage(anti_armour_damage*0.75, anti_armour_damage*0.25)
return TRUE
-/obj/item/projectile/bullet/srmrocket
- name ="SRM-8 Rocket"
+/obj/item/projectile/bullet/a84mm_he
+ name ="\improper HE missile"
desc = "Boom."
icon_state = "missile"
damage = 30
ricochets_max = 0 //it's a MISSILE
-/obj/item/projectile/bullet/srmrocket/on_hit(atom/target, blocked=0)
+/obj/item/projectile/bullet/a84mm_he/on_hit(atom/target, blocked=0)
..()
if(!isliving(target)) //if the target isn't alive, so is a wall or something
explosion(target, 0, 1, 2, 4)
else
explosion(target, 0, 0, 2, 4)
- return TRUE
+ return TRUE
\ No newline at end of file
diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
index e279d06133..1cfacc31f6 100644
--- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
@@ -551,7 +551,8 @@
"creme_de_menthe",
"creme_de_cacao",
"triple_sec",
- "sake"
+ "sake",
+ "applejack"
)
upgrade_reagents = list(
"ethanol",
diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm
index aeed5ffc37..6401a78141 100644
--- a/code/modules/reagents/chemistry/machinery/chem_master.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_master.dm
@@ -1,3 +1,6 @@
+#define PILL_STYLE_COUNT 22 //Update this if you add more pill icons or you die
+#define RANDOM_PILL_STYLE 22 //Dont change this one though
+
/obj/machinery/chem_master
name = "ChemMaster 3000"
desc = "Used to separate chemicals and distribute them in a variety of forms."
@@ -13,12 +16,24 @@
var/obj/item/storage/pill_bottle/bottle = null
var/mode = 1
var/condi = FALSE
+ var/chosenPillStyle = 1
var/screen = "home"
var/analyzeVars[0]
var/useramount = 30 // Last used amount
+ var/list/pillStyles
/obj/machinery/chem_master/Initialize()
create_reagents(100)
+
+ //Calculate the span tags and ids fo all the available pill icons
+ var/datum/asset/spritesheet/simple/assets = get_asset_datum(/datum/asset/spritesheet/simple/pills)
+ pillStyles = list()
+ for (var/x in 1 to PILL_STYLE_COUNT)
+ var/list/SL = list()
+ SL["id"] = x
+ SL["htmltag"] = assets.icon_tag("pill[x]")
+ pillStyles += list(SL)
+
. = ..()
/obj/machinery/chem_master/Destroy()
@@ -128,9 +143,15 @@
datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
+ var/datum/asset/assets = get_asset_datum(/datum/asset/spritesheet/simple/pills)
+ assets.send(user)
ui = new(user, src, ui_key, "chem_master", name, 500, 550, master_ui, state)
ui.open()
+//Insert our custom spritesheet css link into the html
+/obj/machinery/chem_master/ui_base_html(html)
+ var/datum/asset/spritesheet/simple/assets = get_asset_datum(/datum/asset/spritesheet/simple/pills)
+ . = replacetext(html, "", assets.css_tag())
/obj/machinery/chem_master/ui_data(mob/user)
var/list/data = list()
@@ -141,7 +162,7 @@
data["condi"] = condi
data["screen"] = screen
data["analyzeVars"] = analyzeVars
-
+ data["chosenPillStyle"] = chosenPillStyle
data["isPillBottleLoaded"] = bottle ? 1 : 0
if(bottle)
GET_COMPONENT_FROM(STRB, /datum/component/storage, bottle)
@@ -160,6 +181,9 @@
bufferContents.Add(list(list("name" = N.name, "id" = N.id, "volume" = N.volume))) // ^
data["bufferContents"] = bufferContents
+ //Calculated at init time as it never changes
+ data["pillStyles"] = pillStyles
+
return data
/obj/machinery/chem_master/ui_act(action, params)
@@ -234,6 +258,12 @@
else
P = new(drop_location())
P.name = trim("[name] pill")
+ if(chosenPillStyle == RANDOM_PILL_STYLE)
+ P.icon_state ="pill[rand(1,21)]"
+ else
+ P.icon_state = "pill[chosenPillStyle]"
+ if(P.icon_state == "pill4")
+ P.desc = "A tablet or capsule, but not just any, a red one, one taken by the ones not scared of knowledge, freedom, uncertainty and the brutal truths of reality."
adjust_item_drop_location(P)
reagents.trans_to(P,vol_each)
else
@@ -248,6 +278,10 @@
reagents.trans_to(P,10)
. = TRUE
+ if("pillStyle")
+ var/id = text2num(params["id"])
+ chosenPillStyle = id
+
if("createPatch")
var/many = params["many"]
if(reagents.total_volume == 0)
@@ -396,3 +430,6 @@
name = "CondiMaster 3000"
desc = "Used to create condiments and other cooking supplies."
condi = TRUE
+
+#undef PILL_STYLE_COUNT
+#undef RANDOM_PILL_STYLE
\ No newline at end of file
diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
index 80e195d5ac..211fddca26 100644
--- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
@@ -333,7 +333,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
id = "grappa"
description = "A fine Italian brandy, for when regular wine just isn't alcoholic enough for you."
color = "#F8EBF1"
- boozepwr = 45
+ boozepwr = 60
taste_description = "classy bitter sweetness"
glass_icon_state = "grappa"
glass_name = "glass of grappa"
@@ -379,6 +379,11 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_name = "Hooch"
glass_desc = "You've really hit rock bottom now... your liver packed its bags and left last night."
+/datum/reagent/consumable/ethanol/hooch/on_mob_life(mob/living/carbon/M)
+ if(M.mind && M.mind.assigned_role == "Assistant")
+ M.heal_bodypart_damage(1,1)
+ . = TRUE
+ return ..() || .
/datum/reagent/consumable/ethanol/ale
name = "Ale"
@@ -633,25 +638,48 @@ All effects don't start immediately, but rather get worse over time; the rate is
color = "#664300" // rgb: 102, 67, 0
boozepwr = 90 //THE FIST OF THE LAW IS STRONG AND HARD
quality = DRINK_GOOD
- metabolization_rate = 0.8
+ metabolization_rate = 0.5
taste_description = "JUSTICE"
glass_icon_state = "beepskysmashglass"
glass_name = "Beepsky Smash"
glass_desc = "Heavy, hot and strong. Just like the Iron fist of the LAW."
+ overdose_threshold = 40
+ var/datum/brain_trauma/special/beepsky/B
+
+/datum/reagent/consumable/ethanol/beepsky_smash/on_mob_metabolize(mob/living/carbon/M)
+ if(HAS_TRAIT(M, TRAIT_ALCOHOL_TOLERANCE))
+ metabolization_rate = 0.8
+ if(!HAS_TRAIT(M, TRAIT_LAW_ENFORCEMENT_METABOLISM))
+ B = new()
+ M.gain_trauma(B, TRAUMA_RESILIENCE_ABSOLUTE)
+ ..()
/datum/reagent/consumable/ethanol/beepsky_smash/on_mob_life(mob/living/carbon/M)
- if(HAS_TRAIT(M, TRAIT_ALCOHOL_TOLERANCE))
- M.Stun(30, 0) //this realistically does nothing to prevent chainstunning but will cause them to recover faster once it's out of their system
- else
- M.Stun(40, 0)
+ M.Jitter(2)
+ if(HAS_TRAIT(M, TRAIT_LAW_ENFORCEMENT_METABOLISM))
+ M.adjustStaminaLoss(-10, 0)
+ if(prob(20))
+ new /datum/hallucination/items_other(M)
+ if(prob(10))
+ new /datum/hallucination/stray_bullet(M)
+ ..()
+ . = TRUE
+
+/datum/reagent/consumable/ethanol/beepsky_smash/on_mob_end_metabolize(mob/living/carbon/M)
+ if(B)
+ QDEL_NULL(B)
return ..()
+/datum/reagent/consumable/ethanol/beepsky_smash/overdose_start(mob/living/carbon/M)
+ if(!HAS_TRAIT(M, TRAIT_LAW_ENFORCEMENT_METABOLISM))
+ M.gain_trauma(/datum/brain_trauma/mild/phobia/security, TRAUMA_RESILIENCE_BASIC)
+
/datum/reagent/consumable/ethanol/irish_cream
name = "Irish Cream"
id = "irishcream"
description = "Whiskey-imbued cream, what else would you expect from the Irish?"
color = "#664300" // rgb: 102, 67, 0
- boozepwr = 70
+ boozepwr = 50
quality = DRINK_NICE
taste_description = "creamy alcohol"
glass_icon_state = "irishcreamglass"
@@ -947,7 +975,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
id = "red_mead"
description = "The true Viking drink! Even though it has a strange red color."
color = "#C73C00" // rgb: 199, 60, 0
- boozepwr = 51 //Red drinks are stronger
+ boozepwr = 31 //Red drinks are stronger
quality = DRINK_GOOD
taste_description = "sweet and salty alcohol"
glass_icon_state = "red_meadglass"
@@ -960,7 +988,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
description = "A Viking drink, though a cheap one."
color = "#664300" // rgb: 102, 67, 0
nutriment_factor = 1 * REAGENTS_METABOLISM
- boozepwr = 50
+ boozepwr = 30
quality = DRINK_NICE
taste_description = "sweet, sweet alcohol"
glass_icon_state = "meadglass"
@@ -1319,32 +1347,49 @@ All effects don't start immediately, but rather get worse over time; the rate is
/datum/reagent/consumable/ethanol/neurotoxin
name = "Neurotoxin"
- id = "neurotoxin"
description = "A strong neurotoxin that puts the subject into a death-like state."
color = "#2E2E61" // rgb: 46, 46, 97
- boozepwr = 0 //custom drunk effect
+ boozepwr = 50
quality = DRINK_VERYGOOD
taste_description = "a numbing sensation"
+ metabolization_rate = 1 * REAGENTS_METABOLISM
glass_icon_state = "neurotoxinglass"
glass_name = "Neurotoxin"
glass_desc = "A drink that is guaranteed to knock you silly."
+/datum/reagent/consumable/ethanol/neurotoxin/proc/pickt()
+ return (pick(TRAIT_PARALYSIS_L_ARM,TRAIT_PARALYSIS_R_ARM,TRAIT_PARALYSIS_R_LEG,TRAIT_PARALYSIS_L_LEG))
+
/datum/reagent/consumable/ethanol/neurotoxin/on_mob_life(mob/living/carbon/M)
- M.Knockdown(60, 1, 0)
+ M.set_drugginess(50)
M.dizziness +=2
- switch(current_cycle)
- if(15 to 45)
- M.slurring = max(M.slurring,50)
- M.slurring += 3
- if(45 to 55)
- if(prob(50))
- M.confused = max(M.confused+3,0)
- if(55 to 200)
- M.set_drugginess(55)
- if(200 to INFINITY)
- M.adjustToxLoss(2, 0)
+ M.adjustBrainLoss(1*REM, 150)
+ if(prob(20))
+ M.adjustStaminaLoss(10)
+ M.drop_all_held_items()
+ to_chat(M, "You cant feel your hands!")
+ if(current_cycle > 5)
+ if(prob(20))
+ var/t = pickt()
+ ADD_TRAIT(M, t, type)
+ M.adjustStaminaLoss(10)
+ if(current_cycle > 30)
+ M.adjustBrainLoss(2*REM)
+ if(current_cycle > 50 && prob(15))
+ if(!M.undergoing_cardiac_arrest() && M.can_heartattack())
+ M.set_heartattack(TRUE)
+ if(M.stat == CONSCIOUS)
+ M.visible_message("[M] clutches at [M.p_their()] chest as if [M.p_their()] heart stopped!")
+ . = TRUE
+ ..()
+
+/datum/reagent/consumable/ethanol/neurotoxin/on_mob_end_metabolize(mob/living/carbon/M)
+ REMOVE_TRAIT(M, TRAIT_PARALYSIS_L_ARM, type)
+ REMOVE_TRAIT(M, TRAIT_PARALYSIS_R_ARM, type)
+ REMOVE_TRAIT(M, TRAIT_PARALYSIS_R_LEG, type)
+ REMOVE_TRAIT(M, TRAIT_PARALYSIS_L_LEG, type)
+ M.adjustStaminaLoss(10)
..()
- . = 1
/datum/reagent/consumable/ethanol/hippies_delight
name = "Hippie's Delight"
@@ -1468,7 +1513,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_desc = "An intimidating and lawful beverage dares you to violate the law and make its day. Still can't drink it on duty, though."
/datum/reagent/consumable/ethanol/quadruple_sec/on_mob_life(mob/living/carbon/M)
- if(M.mind && M.mind.assigned_role in list("Security Officer", "Detective", "Head of Security", "Warden", "Lawyer")) //Securidrink in line with the screwderiver for engineers or nothing for mimes.
+ if(M.mind && HAS_TRAIT(M.mind, TRAIT_LAW_ENFORCEMENT_METABOLISM)) //Securidrink in line with the screwderiver for engineers or nothing for mimes.
M.heal_bodypart_damage(1, 1)
M.adjustBruteLoss(-2,0)
. = 1
@@ -1487,7 +1532,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
glass_desc = "Now you are become law, destroyer of clowns."
/datum/reagent/consumable/ethanol/quintuple_sec/on_mob_life(mob/living/carbon/M)
- if(M.mind && M.mind.assigned_role in list("Security Officer", "Detective", "Head of Security", "Warden", "Lawyer")) //Securidrink in line with the screwderiver for engineers or nothing for mimes but STRONG..
+ if(M.mind && HAS_TRAIT(M.mind, TRAIT_LAW_ENFORCEMENT_METABOLISM)) //Securidrink in line with the screwderiver for engineers or nothing for mimes but STRONG..
M.heal_bodypart_damage(2,2,2)
M.adjustBruteLoss(-5,0)
M.adjustOxyLoss(-5,0)
@@ -1826,6 +1871,230 @@ All effects don't start immediately, but rather get worse over time; the rate is
. = TRUE
..()
+/datum/reagent/consumable/ethanol/blank_paper
+ name = "Blank Paper"
+ id = "blank_paper"
+ description = "A bubbling glass of blank paper. Just looking at it makes you feel fresh."
+ nutriment_factor = 1 * REAGENTS_METABOLISM
+ color = "#DCDCDC" // rgb: 220, 220, 220
+ boozepwr = 20
+ quality = DRINK_GOOD
+ taste_description = "bubbling possibility"
+ glass_icon_state = "blank_paper"
+ glass_name = "glass of blank paper"
+ glass_desc = "A fizzy cocktail for those looking to start fresh."
+
+/datum/reagent/consumable/ethanol/blank_paper/on_mob_life(mob/living/carbon/M)
+ if(ishuman(M) && M.job == "Mime")
+ M.heal_bodypart_damage(1,1)
+ . = 1
+ return ..()
+
+/datum/reagent/consumable/ethanol/champagne //How the hell did we not have champagne already!?
+ name = "Champagne"
+ id = "champagne"
+ description = "A sparkling wine known for its ability to strike fast and hard."
+ color = "#ffffc1"
+ boozepwr = 40
+ taste_description = "auspicious occasions and bad decisions"
+ glass_icon_state = "champagne_glass"
+ glass_name = "Champagne"
+ glass_desc = "The flute clearly displays the slowly rising bubbles."
+
+/datum/reagent/consumable/ethanol/wizz_fizz
+ name = "Wizz Fizz"
+ id = "wizz_fizz"
+ description = "A magical potion, fizzy and wild! However the taste, you will find, is quite mild."
+ color = "#4235d0" //Just pretend that the triple-sec was blue curacao.
+ boozepwr = 50
+ quality = DRINK_GOOD
+ taste_description = "friendship! It is magic, after all"
+ glass_icon_state = "wizz_fizz"
+ glass_name = "Wizz Fizz"
+ glass_desc = "The glass bubbles and froths with an almost magical intensity."
+
+/datum/reagent/consumable/ethanol/wizz_fizz/on_mob_life(mob/living/carbon/M)
+ //A healing drink similar to Quadruple Sec, Ling Stings, and Screwdrivers for the Wizznerds; the check is consistent with the changeling sting
+ if(M?.mind?.has_antag_datum(/datum/antagonist/wizard))
+ M.heal_bodypart_damage(1,1,1)
+ M.adjustOxyLoss(-1,0)
+ M.adjustToxLoss(-1,0)
+ return ..()
+
+/datum/reagent/consumable/ethanol/bug_spray
+ name = "Bug Spray"
+ id = "bug_spray"
+ description = "A harsh, acrid, bitter drink, for those who need something to brace themselves."
+ color = "#33ff33"
+ boozepwr = 50
+ quality = DRINK_GOOD
+ taste_description = "the pain of ten thousand slain mosquitos"
+ glass_icon_state = "bug_spray"
+ glass_name = "Bug Spray"
+ glass_desc = "Your eyes begin to water as the sting of alcohol reaches them."
+
+/datum/reagent/consumable/ethanol/bug_spray/on_mob_life(mob/living/carbon/M)
+//Bugs should not drink Bug spray.
+ if(ismoth(M) || isflyperson(M))
+ M.adjustToxLoss(1,0)
+ return ..()
+
+/datum/reagent/consumable/ethanol/bug_spray/on_mob_add(mob/living/carbon/M)
+ if(ismoth(M) || isflyperson(M))
+ M.emote("scream")
+ return ..()
+
+/datum/reagent/consumable/ethanol/applejack
+ name = "Applejack"
+ id = "applejack"
+ description = "The perfect beverage for when you feel the need to horse around."
+ color = "#ff6633"
+ boozepwr = 20
+ taste_description = "an honest day's work at the orchard"
+ glass_icon_state = "applejack_glass"
+ glass_name = "Applejack"
+ glass_desc = "You feel like you could drink this all neight."
+
+/datum/reagent/consumable/ethanol/jack_rose
+ name = "Jack Rose"
+ id = "jack_rose"
+ description = "A light cocktail perfect for sipping with a slice of pie."
+ color = "#ff6633"
+ boozepwr = 15
+ quality = DRINK_NICE
+ taste_description = "a sweet and sour slice of apple"
+ glass_icon_state = "jack_rose"
+ glass_name = "Jack Rose"
+ glass_desc = "Enough of these, and you really will start to suppose your toeses are roses."
+
+/datum/reagent/consumable/ethanol/turbo
+ name = "Turbo"
+ id = "turbo"
+ description = "A turbulent cocktail associated with outlaw hoverbike racing. Not for the faint of heart."
+ color = "#e94c3a"
+ boozepwr = 85
+ quality = DRINK_VERYGOOD
+ taste_description = "the outlaw spirit"
+ glass_icon_state = "turbo"
+ glass_name = "Turbo"
+ glass_desc = "A turbulent cocktail for outlaw hoverbikers."
+
+/datum/reagent/consumable/ethanol/turbo/on_mob_life(mob/living/carbon/M)
+ if(prob(4))
+ to_chat(M, "[pick("You feel disregard for the rule of law.", "You feel pumped!", "Your head is pounding.", "Your thoughts are racing..")]")
+ M.adjustStaminaLoss(-M.drunkenness * 0.25)
+ return ..()
+
+/datum/reagent/consumable/ethanol/old_timer
+ name = "Old Timer"
+ id = "old_timer"
+ description = "An archaic potation enjoyed by old coots of all ages."
+ color = "#996835"
+ boozepwr = 35
+ quality = DRINK_NICE
+ taste_description = "simpler times"
+ glass_icon_state = "old_timer"
+ glass_name = "Old Timer"
+ glass_desc = "WARNING! May cause premature aging!"
+
+/datum/reagent/consumable/ethanol/old_timer/on_mob_life(mob/living/carbon/M)
+ if(prob(20))
+ if(ishuman(M))
+ var/mob/living/carbon/human/N = M
+ N.age += 1
+ if(N.age > 70)
+ N.facial_hair_color = "ccc"
+ N.hair_color = "ccc"
+ N.update_hair()
+ if(N.age > 100)
+ N.become_nearsighted(id)
+ if(N.gender == MALE)
+ N.facial_hair_style = "Beard (Very Long)"
+ N.update_hair()
+
+ if(N.age > 969) //Best not let people get older than this or i might incur G-ds wrath
+ M.visible_message("[M] becomes older than any man should be.. and crumbles into dust!")
+ M.dust(0,1,0)
+
+ return ..()
+
+/datum/reagent/consumable/ethanol/rubberneck
+ name = "Rubberneck"
+ id = "rubberneck"
+ description = "A quality rubberneck should not contain any gross natural ingredients."
+ color = "#ffe65b"
+ boozepwr = 60
+ quality = DRINK_GOOD
+ taste_description = "artifical fruityness"
+ glass_icon_state = "rubberneck"
+ glass_name = "Rubberneck"
+ glass_desc = "A popular drink amongst those adhering to an all synthetic diet."
+
+/datum/reagent/consumable/ethanol/duplex
+ name = "Duplex"
+ id = "duplex"
+ description = "An inseparable combination of two fruity drinks."
+ color = "#50e5cf"
+ boozepwr = 25
+ quality = DRINK_NICE
+ taste_description = "green apples and blue raspberries"
+ glass_icon_state = "duplex"
+ glass_name = "Duplex"
+ glass_desc = "To imbibe one component separately from the other is consider a great faux pas."
+
+/datum/reagent/consumable/ethanol/trappist
+ name = "Trappist Beer"
+ id = "trappist"
+ description = "A strong dark ale brewed by space-monks."
+ color = "#390c00"
+ boozepwr = 40
+ quality = DRINK_VERYGOOD
+ taste_description = "dried plums and malt"
+ glass_icon_state = "trappistglass"
+ glass_name = "Trappist Beer"
+ glass_desc = "boozy Catholicism in a glass."
+
+/datum/reagent/consumable/ethanol/trappist/on_mob_life(mob/living/carbon/M)
+ if(M.mind.isholy)
+ M.adjustFireLoss(-2.5, 0)
+ M.jitteriness = max(0, M.jitteriness-1)
+ M.stuttering = max(0, M.stuttering-1)
+ return ..()
+
+/datum/reagent/consumable/ethanol/blazaam
+ name = "Blazaam"
+ id = "blazaam"
+ description = "A strange drink that few people seem to remember existing. Doubles as a Berenstain remover."
+ boozepwr = 70
+ quality = DRINK_FANTASTIC
+ taste_description = "alternate realities"
+ glass_icon_state = "blazaamglass"
+ glass_name = "Blazaam"
+ glass_desc = "The glass seems to be sliding between realities. Doubles as a Berenstain remover."
+ var/stored_teleports = 0
+
+/datum/reagent/consumable/ethanol/blazaam/on_mob_life(mob/living/carbon/M)
+ if(M.drunkenness > 40)
+ if(stored_teleports)
+ do_teleport(M, get_turf(M), rand(1,3))
+ stored_teleports--
+ if(prob(10))
+ stored_teleports += rand(2,6)
+ if(prob(70))
+ M.vomit()
+ return ..()
+
+/datum/reagent/consumable/ethanol/planet_cracker
+ name = "Planet Cracker"
+ id = "planet_cracker"
+ description = "This jubilant drink celebrates humanity's triumph over the alien menace. May be offensive to non-human crewmembers."
+ boozepwr = 50
+ quality = DRINK_FANTASTIC
+ taste_description = "triumph with a hint of bitterness"
+ glass_icon_state = "planet_cracker"
+ glass_name = "Planet Cracker"
+ glass_desc = "Although historians believe the drink was originally created to commemorate the end of an important conflict in man's past, its origins have largely been forgotten and it is today seen more as a general symbol of human supremacy."
+
/datum/reagent/consumable/ethanol/fruit_wine
name = "Fruit Wine"
id = "fruit_wine"
diff --git a/code/modules/reagents/chemistry/reagents/blob_reagents.dm b/code/modules/reagents/chemistry/reagents/blob_reagents.dm
index af85b6b35f..ada4cd8d8e 100644
--- a/code/modules/reagents/chemistry/reagents/blob_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/blob_reagents.dm
@@ -187,7 +187,7 @@
description = "will do toxin damage and cause targets to believe they are fully healed."
analyzerdescdamage = "Does toxin damage and injects a toxin that causes the target to believe they are fully healed."
taste_description = "heaven"
- color = "#C8A5DC"
+ color = "#5e7842"
complementary_color = "#CD7794"
message_living = ", and you feel alive"
diff --git a/code/modules/reagents/chemistry/reagents/drink_reagents.dm b/code/modules/reagents/chemistry/reagents/drink_reagents.dm
index d2ca7d0c87..8aa555944a 100644
--- a/code/modules/reagents/chemistry/reagents/drink_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/drink_reagents.dm
@@ -305,6 +305,16 @@
..()
. = 1
+/datum/reagent/consumable/lemonade
+ name = "Lemonade"
+ id = "lemonade"
+ description = "Sweet, tangy lemonade. Good for the soul."
+ quality = DRINK_NICE
+ taste_description = "sunshine and summertime"
+ glass_icon_state = "lemonpitcher"
+ glass_name = "pitcher of lemonade"
+ glass_desc = "This drink leaves you feeling nostalgic for some reason."
+
/datum/reagent/consumable/tea/arnold_palmer
name = "Arnold Palmer"
id = "arnold_palmer"
@@ -498,6 +508,34 @@
/datum/reagent/consumable/shamblers/on_mob_life(mob/living/carbon/M)
M.adjust_bodytemperature(-8 * TEMPERATURE_DAMAGE_COEFFICIENT, BODYTEMP_NORMAL)
..()
+
+/datum/reagent/consumable/grey_bull
+ name = "Grey Bull"
+ id = "grey_bull"
+ description = "Grey Bull, it gives you gloves!"
+ color = "#EEFF00" // rgb: 238, 255, 0
+ quality = DRINK_VERYGOOD
+ taste_description = "carbonated oil"
+ glass_icon_state = "grey_bull_glass"
+ glass_name = "glass of Grey Bull"
+ glass_desc = "Surprisingly it isnt grey."
+
+/datum/reagent/consumable/grey_bull/on_mob_metabolize(mob/living/L)
+ ..()
+ ADD_TRAIT(L, TRAIT_SHOCKIMMUNE, id)
+
+/datum/reagent/consumable/grey_bull/on_mob_end_metabolize(mob/living/L)
+ REMOVE_TRAIT(L, TRAIT_SHOCKIMMUNE, id)
+ ..()
+
+/datum/reagent/consumable/grey_bull/on_mob_life(mob/living/carbon/M)
+ M.Jitter(20)
+ M.dizziness +=1
+ M.drowsyness = 0
+ M.AdjustSleeping(-40, FALSE)
+ M.adjust_bodytemperature(-5 * TEMPERATURE_DAMAGE_COEFFICIENT, BODYTEMP_NORMAL)
+ ..()
+
/datum/reagent/consumable/sodawater
name = "Soda Water"
id = "sodawater"
@@ -703,7 +741,7 @@
name = "Triple Citrus"
id = "triple_citrus"
description = "A solution."
- color = "#C8A5DC"
+ color = "#fff12b"
quality = DRINK_NICE
taste_description = "extreme bitterness"
glass_icon_state = "triplecitrus" //needs own sprite mine are trash
@@ -719,6 +757,11 @@
glass_name = "glass of grape juice"
glass_desc = "It's grape (soda)!"
+/datum/reagent/consumable/grape_soda/on_mob_life(mob/living/carbon/M)
+ M.adjust_bodytemperature(-5 * TEMPERATURE_DAMAGE_COEFFICIENT, BODYTEMP_NORMAL)
+ ..()
+
+
/datum/reagent/consumable/milk/chocolate_milk
name = "Chocolate Milk"
id = "chocolate_milk"
@@ -746,6 +789,65 @@
glass_name = "glass of grenadine"
glass_desc = "Delicious flavored syrup."
+/datum/reagent/consumable/parsnipjuice
+ name = "Parsnip Juice"
+ id = "parsnipjuice"
+ description = "Why..."
+ color = "#FFA500"
+ taste_description = "parsnip"
+ glass_name = "glass of parsnip juice"
+
+/datum/reagent/consumable/peachjuice //Intended to be extremely rare due to being the limiting ingredients in the blazaam drink
+ name = "Peach Juice"
+ id = "peachjuice"
+ description = "Just peachy."
+ color = "#E78108"
+ taste_description = "peaches"
+ glass_name = "glass of peach juice"
+
+/datum/reagent/consumable/cream_soda
+ name = "Cream Soda"
+ id = "cream_soda"
+ description = "A classic space-American vanilla flavored soft drink."
+ color = "#dcb137"
+ quality = DRINK_VERYGOOD
+ taste_description = "fizzy vanilla"
+ glass_icon_state = "cream_soda"
+ glass_name = "Cream Soda"
+ glass_desc = "A classic space-American vanilla flavored soft drink."
+
+/datum/reagent/consumable/cream_soda/on_mob_life(mob/living/carbon/M)
+ M.adjust_bodytemperature(-5 * TEMPERATURE_DAMAGE_COEFFICIENT, BODYTEMP_NORMAL)
+ ..()
+
+/datum/reagent/consumable/red_queen
+ name = "Red Queen"
+ id = "red_queen"
+ description = "DRINK ME."
+ color = "#e6ddc3"
+ quality = DRINK_GOOD
+ taste_description = "wonder"
+ glass_icon_state = "red_queen"
+ glass_name = "Red Queen"
+ glass_desc = "DRINK ME."
+ var/current_size = 1
+
+/datum/reagent/consumable/red_queen/on_mob_life(mob/living/carbon/H)
+ if(prob(75))
+ return ..()
+ var/newsize = pick(0.5, 0.75, 1, 1.50, 2)
+ H.resize = newsize/current_size
+ current_size = newsize
+ H.update_transform()
+ if(prob(40))
+ H.emote("sneeze")
+ ..()
+
+/datum/reagent/consumable/red_queen/on_mob_end_metabolize(mob/living/M)
+ M.resize = 1/current_size
+ M.update_transform()
+ ..()
+
/datum/reagent/consumable/pinkmilk
name = "Strawberry Milk"
id = "pinkmilk"
diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm
index 38db62fd2a..7d0cea0c8f 100644
--- a/code/modules/reagents/chemistry/reagents/food_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm
@@ -433,11 +433,19 @@
taste_description = "childhood whimsy"
/datum/reagent/consumable/sprinkles/on_mob_life(mob/living/carbon/M)
- if(ishuman(M) && M.job in list("Security Officer", "Head of Security", "Detective", "Warden"))
+ if(M.mind && HAS_TRAIT(M.mind, TRAIT_LAW_ENFORCEMENT_METABOLISM))
M.heal_bodypart_damage(1,1, 0)
. = 1
..()
+/datum/reagent/consumable/peanut_butter
+ name = "Peanut Butter"
+ id = "peanut_butter"
+ description = "A popular food paste made from ground dry-roasted peanuts."
+ color = "#C29261"
+ nutriment_factor = 15 * REAGENTS_METABOLISM
+ taste_description = "peanuts"
+
/datum/reagent/consumable/cornoil
name = "Corn Oil"
id = "cornoil"
@@ -556,14 +564,14 @@
name = "Corn Starch"
id = "corn_starch"
description = "A slippery solution."
- color = "#C8A5DC"
+ color = "#f7f6e4"
taste_description = "slime"
/datum/reagent/consumable/corn_syrup
name = "Corn Syrup"
id = "corn_syrup"
description = "Decays into sugar."
- color = "#C8A5DC"
+ color = "#fff882"
metabolization_rate = 3 * REAGENTS_METABOLISM
taste_description = "sweet slime"
@@ -714,6 +722,24 @@
color = "#eef442" // rgb: 238, 244, 66
taste_description = "mournful honking"
+/datum/reagent/consumable/astrotame
+ name = "Astrotame"
+ id = "astrotame"
+ description = "A space age artifical sweetener."
+ nutriment_factor = 0
+ metabolization_rate = 2 * REAGENTS_METABOLISM
+ reagent_state = SOLID
+ color = "#FFFFFF" // rgb: 255, 255, 255
+ taste_mult = 8
+ taste_description = "sweetness"
+ overdose_threshold = 17
+
+/datum/reagent/consumable/astrotame/overdose_process(mob/living/carbon/M)
+ if(M.disgust < 80)
+ M.adjust_disgust(10)
+ ..()
+ . = TRUE
+
/datum/reagent/consumable/secretsauce
name = "secret sauce"
id = "secret_sauce"
diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
index ed441504a5..fe70db250d 100644
--- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
@@ -18,7 +18,7 @@
name = "Leporazine"
id = "leporazine"
description = "Leporazine will effectively regulate a patient's body temperature, ensuring it never leaves safe levels."
- color = "#C8A5DC" // rgb: 200, 165, 220
+ color = "#82b8aa"
/datum/reagent/medicine/leporazine/on_mob_life(mob/living/carbon/M)
if(M.bodytemperature > BODYTEMP_NORMAL)
@@ -31,7 +31,7 @@
name = "Adminordrazine"
id = "adminordrazine"
description = "It's magic. We don't have to explain it."
- color = "#C8A5DC" // rgb: 200, 165, 220
+ color = "#ffffff"
can_synth = FALSE
taste_description = "badmins"
@@ -213,7 +213,7 @@
name = "Spaceacillin"
id = "spaceacillin"
description = "Spaceacillin will prevent a patient from conventionally spreading any diseases they are currently infected with."
- color = "#C8A5DC" // rgb: 200, 165, 220
+ color = "#f2f2f2"
metabolization_rate = 0.1 * REAGENTS_METABOLISM
//Goon Chems. Ported mainly from Goonstation. Easily mixable (or not so easily) and provide a variety of effects.
@@ -222,7 +222,7 @@
id = "silver_sulfadiazine"
description = "If used in touch-based applications, immediately restores burn wounds as well as restoring more over time. If ingested through other means, deals minor toxin damage."
reagent_state = LIQUID
- color = "#C8A5DC"
+ color = "#ffeac9"
/datum/reagent/medicine/silver_sulfadiazine/reaction_mob(mob/living/M, method=TOUCH, reac_volume, show_message = 1)
if(iscarbon(M) && M.stat != DEAD)
@@ -932,7 +932,7 @@
id = "bicaridine"
description = "Restores bruising. Overdose causes it instead."
reagent_state = LIQUID
- color = "#C8A5DC"
+ color = "#fc2626"
overdose_threshold = 30
/datum/reagent/medicine/bicaridine/on_mob_life(mob/living/carbon/M)
@@ -950,7 +950,7 @@
id = "dexalin"
description = "Restores oxygen loss. Overdose causes it instead."
reagent_state = LIQUID
- color = "#C8A5DC"
+ color = "#13d2f0"
overdose_threshold = 30
/datum/reagent/medicine/dexalin/on_mob_life(mob/living/carbon/M)
@@ -968,7 +968,7 @@
id = "kelotane"
description = "Restores fire damage. Overdose causes it instead."
reagent_state = LIQUID
- color = "#C8A5DC"
+ color = "#ffc400"
overdose_threshold = 30
/datum/reagent/medicine/kelotane/on_mob_life(mob/living/carbon/M)
@@ -986,7 +986,7 @@
id = "antitoxin"
description = "Heals toxin damage and removes toxins in the bloodstream. Overdose causes toxin damage."
reagent_state = LIQUID
- color = "#C8A5DC"
+ color = "#6aff00"
overdose_threshold = 30
taste_description = "a roll of gauze"
@@ -1007,7 +1007,7 @@
id = "inaprovaline"
description = "Stabilizes the breathing of patients. Good for those in critical condition."
reagent_state = LIQUID
- color = "#C8A5DC"
+ color = "#5dc1f0"
/datum/reagent/medicine/inaprovaline/on_mob_life(mob/living/carbon/M)
if(M.losebreath >= 5)
@@ -1019,7 +1019,7 @@
id = "tricordrazine"
description = "Has a high chance to heal all types of damage. Overdose instead causes it."
reagent_state = LIQUID
- color = "#C8A5DC"
+ color = "#e650c0"
overdose_threshold = 30
taste_description = "grossness"
@@ -1151,7 +1151,7 @@
name = "Lavaland Extract"
id = "lavaland_extract"
description = "An extract of lavaland atmospheric and mineral elements. Heals the user in small doses, but is extremely toxic otherwise."
- color = "#C8A5DC" // rgb: 200, 165, 220
+ color = "#a1a1a1"
overdose_threshold = 3 //To prevent people stacking massive amounts of a very strong healing reagent
can_synth = FALSE
@@ -1172,7 +1172,7 @@
name = "Changeling Adrenaline"
id = "changelingadrenaline"
description = "Reduces the duration of unconciousness, knockdown and stuns. Restores stamina, but deals toxin damage when overdosed."
- color = "#C8A5DC"
+ color = "#918e53"
overdose_threshold = 30
/datum/reagent/medicine/changelingadrenaline/on_mob_life(mob/living/carbon/M as mob)
@@ -1193,7 +1193,7 @@
name = "Changeling Haste"
id = "changelinghaste"
description = "Drastically increases movement speed, but deals toxin damage."
- color = "#C8A5DC"
+ color = "#669153"
metabolization_rate = 1
/datum/reagent/medicine/changelinghaste/on_mob_metabolize(mob/living/L)
diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm
index 890403691e..42b012d52f 100644
--- a/code/modules/reagents/chemistry/reagents/other_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm
@@ -206,7 +206,12 @@
/datum/reagent/water/holywater/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
if(is_servant_of_ratvar(M))
- to_chat(M, "A darkness begins to spread its unholy tendrils through your mind, purging the Justiciar's influence!")
+ to_chat(M, "A fog spreads through your mind, purging the Justiciar's influence!")
+ ..()
+
+/datum/reagent/water/holywater/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
+ if(iscultist(M))
+ to_chat(M, "A fog spreads through your mind, weakening your connection to the veil and purging Nar-sie's influence")
..()
/datum/reagent/water/holywater/on_mob_life(mob/living/carbon/M)
@@ -261,7 +266,7 @@
qdel(R)
T.Bless()
-/datum/reagent/fuel/unholywater //if you somehow managed to extract this from someone, dont splash it on yourself and have a smoke
+/datum/reagent/fuel/unholywater //if you somehow managed to extract this from someone, dont splash it on yourself and have a smoke
name = "Unholy Water"
id = "unholywater"
description = "Something that shouldn't exist on this plane of existence."
@@ -280,7 +285,7 @@
M.AdjustStun(-40, 0)
M.AdjustKnockdown(-40, 0)
M.adjustStaminaLoss(-10, 0)
- M.adjustToxLoss(-2, 0)
+ M.adjustToxLoss(-2, 0, TRUE)
M.adjustOxyLoss(-2, 0)
M.adjustBruteLoss(-2, 0)
M.adjustFireLoss(-2, 0)
@@ -309,6 +314,45 @@
M.adjustBrainLoss(5, 150)
holder.remove_reagent(id, 1)
+/datum/reagent/fuel/holyoil //Its oil
+ name = "Zelus Oil"
+ id = "holyoil"
+ description = "Oil blessed by a greater being."
+ taste_description = "metallic oil"
+
+/datum/reagent/fuel/holyoil/on_mob_life(mob/living/carbon/M)
+ if(is_servant_of_ratvar(M))
+ M.drowsyness = max(M.drowsyness-5, 0)
+ M.AdjustUnconscious(-60, 0)
+ M.AdjustStun(-30, 0)
+ M.AdjustKnockdown(-70, 0)
+ M.adjustStaminaLoss(-15, 0)
+ M.adjustToxLoss(-5, 0, TRUE)
+ M.adjustOxyLoss(-3, 0)
+ M.adjustBruteLoss(-3, 0)
+ M.adjustFireLoss(-5, 0)
+ if(iscultist(M))
+ M.AdjustUnconscious(1, 0)
+ M.AdjustStun(10, 0)
+ M.AdjustKnockdown(20, 0)
+ M.adjustStaminaLoss(15, 0)
+ else
+ M.adjustToxLoss(3, 0)
+ M.adjustOxyLoss(2, 0)
+ M.adjustStaminaLoss(10, 0)
+ holder.remove_reagent(id, 1)
+ return TRUE
+
+//We only get 30u to start with...
+
+/datum/reagent/fuel/holyoil/reaction_obj(obj/O, reac_volume)
+ . = ..()
+ if(istype(O, /obj/item/stack/sheet/metal))
+ var/obj/item/stack/sheet/metal/M = O
+ reac_volume = min(reac_volume, M.amount)
+ new/obj/item/stack/tile/brass(get_turf(M), reac_volume)
+ M.use(reac_volume)
+
/datum/reagent/medicine/omnizine/godblood
name = "Godblood"
id = "godblood"
@@ -863,7 +907,7 @@
name = "Sterilizine"
id = "sterilizine"
description = "Sterilizes wounds in preparation for surgery."
- color = "#C8A5DC" // rgb: 200, 165, 220
+ color = "#e6f1f5" // rgb: 200, 165, 220
taste_description = "bitterness"
/datum/reagent/space_cleaner/sterilizine/reaction_mob(mob/living/carbon/C, method=TOUCH, reac_volume)
@@ -881,7 +925,7 @@
reagent_state = SOLID
taste_description = "iron"
- color = "#C8A5DC" // rgb: 200, 165, 220
+ color = "#c2391d"
/datum/reagent/iron/on_mob_life(mob/living/carbon/C)
if(C.blood_volume < BLOOD_VOLUME_NORMAL)
@@ -1076,7 +1120,7 @@
name = "Cryptobiolin"
id = "cryptobiolin"
description = "Cryptobiolin causes confusion and dizziness."
- color = "#C8A5DC" // rgb: 200, 165, 220
+ color = "#7529b3" // rgb: 200, 165, 220
metabolization_rate = 1.5 * REAGENTS_METABOLISM
taste_description = "sourness"
@@ -1091,7 +1135,7 @@
name = "Impedrezene"
id = "impedrezene"
description = "Impedrezene is a narcotic that impedes one's ability by slowing down the higher brain cell functions."
- color = "#C8A5DC" // rgb: 200, 165, 220A
+ color = "#587a31" // rgb: 200, 165, 220A
taste_description = "numbness"
/datum/reagent/impedrezene/on_mob_life(mob/living/carbon/M)
@@ -1410,7 +1454,7 @@
id = "oil"
description = "Burns in a small smoky fire, mostly used to get Ash."
reagent_state = LIQUID
- color = "#C8A5DC"
+ color = "#292929"
taste_description = "oil"
/datum/reagent/stable_plasma
@@ -1418,7 +1462,7 @@
id = "stable_plasma"
description = "Non-flammable plasma locked into a liquid form that cannot ignite or become gaseous/solid."
reagent_state = LIQUID
- color = "#C8A5DC"
+ color = "#6b008f"
taste_description = "bitterness"
taste_mult = 1.5
@@ -1431,7 +1475,7 @@
id = "iodine"
description = "Commonly added to table salt as a nutrient. On its own it tastes far less pleasing."
reagent_state = LIQUID
- color = "#C8A5DC"
+ color = "#694600"
taste_description = "metal"
/datum/reagent/carpet
@@ -1439,7 +1483,7 @@
id = "carpet"
description = "For those that need a more creative way to roll out a red carpet."
reagent_state = LIQUID
- color = "#C8A5DC"
+ color = "#b51d05"
taste_description = "carpet" // Your tounge feels furry.
/datum/reagent/carpet/reaction_turf(turf/T, reac_volume)
@@ -1453,7 +1497,7 @@
id = "bromine"
description = "A brownish liquid that's highly reactive. Useful for stopping free radicals, but not intended for human consumption."
reagent_state = LIQUID
- color = "#C8A5DC"
+ color = "#b37740"
taste_description = "chemicals"
/datum/reagent/phenol
@@ -1461,7 +1505,7 @@
id = "phenol"
description = "An aromatic ring of carbon with a hydroxyl group. A useful precursor to some medicines, but has no healing properties on its own."
reagent_state = LIQUID
- color = "#C8A5DC"
+ color = "#e6e8ff"
taste_description = "acid"
/datum/reagent/ash
@@ -1469,7 +1513,7 @@
id = "ash"
description = "Supposedly phoenixes rise from these, but you've never seen it."
reagent_state = LIQUID
- color = "#C8A5DC"
+ color = "#665c56"
taste_description = "ash"
/datum/reagent/acetone
@@ -1477,7 +1521,7 @@
id = "acetone"
description = "A slick, slightly carcinogenic liquid. Has a multitude of mundane uses in everyday life."
reagent_state = LIQUID
- color = "#C8A5DC"
+ color = "#e6e6e6"
taste_description = "acid"
/datum/reagent/colorful_reagent
@@ -1485,7 +1529,7 @@
id = "colorful_reagent"
description = "Thoroughly sample the rainbow."
reagent_state = LIQUID
- color = "#C8A5DC"
+ color = "#FFFF00"
var/list/random_color_list = list("#00aedb","#a200ff","#f47835","#d41243","#d11141","#00b159","#00aedb","#f37735","#ffc425","#008744","#0057e7","#d62d20","#ffa700")
taste_description = "rainbows"
var/no_mob_color = FALSE
@@ -1515,7 +1559,7 @@
id = "hair_dye"
description = "Has a high chance of making you look like a mad scientist."
reagent_state = LIQUID
- color = "#C8A5DC"
+ color = "#ff00dd"
var/list/potential_colors = list("0ad","a0f","f73","d14","d14","0b5","0ad","f73","fc2","084","05e","d22","fa0") // fucking hair code
taste_description = "sourness"
@@ -1532,7 +1576,7 @@
id = "barbers_aid"
description = "A solution to hair loss across the world."
reagent_state = LIQUID
- color = "#C8A5DC"
+ color = "#fac34b"
taste_description = "sourness"
/datum/reagent/barbers_aid/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
@@ -1550,7 +1594,7 @@
id = "concentrated_barbers_aid"
description = "A concentrated solution to hair loss across the world."
reagent_state = LIQUID
- color = "#C8A5DC"
+ color = "#ffaf00"
taste_description = "sourness"
/datum/reagent/concentrated_barbers_aid/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
@@ -1879,4 +1923,4 @@
if(added_length >= 0.20) //Only add the length if it's greater than or equal to 0.2. This is to prevent people from smoking the reagents and causing the penis to update constantly.
P.length += added_length
P.update()
- ..()
\ No newline at end of file
+ ..()
diff --git a/code/modules/reagents/chemistry/recipes/slime_extracts.dm b/code/modules/reagents/chemistry/recipes/slime_extracts.dm
index db5f7b198c..8edca91a91 100644
--- a/code/modules/reagents/chemistry/recipes/slime_extracts.dm
+++ b/code/modules/reagents/chemistry/recipes/slime_extracts.dm
@@ -216,7 +216,7 @@
/datum/chemical_reaction/slime/slimefreeze/on_reaction(datum/reagents/holder)
var/turf/T = get_turf(holder.my_atom)
- T.visible_message("The slime extract begins to vibrate adorably!")
+ T.visible_message("The slime extract starts to feel extremely cold!")
addtimer(CALLBACK(src, .proc/freeze, holder), 50)
var/obj/item/slime_extract/M = holder.my_atom
deltimer(M.qdel_timer)
@@ -227,7 +227,8 @@
if(holder && holder.my_atom)
var/turf/open/T = get_turf(holder.my_atom)
if(istype(T))
- T.atmos_spawn_air("nitrogen=50;TEMP=2.7")
+ var/datum/gas/gastype = /datum/gas/nitrogen
+ T.atmos_spawn_air("[initial(gastype.id)]=50;TEMP=2.7")
/datum/chemical_reaction/slime/slimefireproof
name = "Slime Fireproof"
@@ -370,6 +371,11 @@
/datum/chemical_reaction/slime/slimebloodlust/on_reaction(datum/reagents/holder)
for(var/mob/living/simple_animal/slime/slime in viewers(get_turf(holder.my_atom), null))
+ if(slime.docile) //Undoes docility, but doesn't make rabid.
+ slime.visible_message("[slime] forgets its training, becoming wild once again!")
+ slime.docile = FALSE
+ slime.update_name()
+ continue
slime.rabid = 1
slime.visible_message("The [slime] is driven into a frenzy!")
..()
diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm
index 9bc6bef8a5..9d10b9356a 100644
--- a/code/modules/reagents/reagent_containers/glass.dm
+++ b/code/modules/reagents/reagent_containers/glass.dm
@@ -53,7 +53,7 @@
/obj/item/reagent_containers/glass/afterattack(obj/target, mob/user, proximity)
. = ..()
- if((!proximity) || !check_allowed_items(target,target_self=1))
+ if((!proximity) || !spillable || !check_allowed_items(target,target_self=1))
return
if(target.is_refillable()) //Something like a glass. Player probably wants to transfer TO it.
diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm
index ed2ca66aae..280337e686 100644
--- a/code/modules/reagents/reagent_containers/pill.dm
+++ b/code/modules/reagents/reagent_containers/pill.dm
@@ -46,6 +46,9 @@
M.visible_message("[user] forces [M] to [apply_method] [src].", \
"[user] forces [M] to [apply_method] [src].")
+ var/makes_me_think = pick(strings("redpill.json", "redpill_questions"))
+ if(icon_state == "pill4" && prob(5)) //you take the red pill - you stay in Wonderland, and I show you how deep the rabbit hole goes
+ addtimer(CALLBACK(GLOBAL_PROC, /proc/to_chat, M, "[makes_me_think]"), 50)
log_combat(user, M, "fed", reagents.log_list())
if(reagents.total_volume)
diff --git a/code/modules/research/designs/autolathe_desings/autolathe_designs_tools.dm b/code/modules/research/designs/autolathe_desings/autolathe_designs_tools.dm
index 435af80aea..0300658a84 100644
--- a/code/modules/research/designs/autolathe_desings/autolathe_designs_tools.dm
+++ b/code/modules/research/designs/autolathe_desings/autolathe_designs_tools.dm
@@ -147,4 +147,4 @@
build_type = AUTOLATHE
materials = list(MAT_METAL = 150, MAT_GLASS = 150)
build_path = /obj/item/geiger_counter
- category = list("initial", "Tools")
\ No newline at end of file
+ category = list("initial", "Tools")
diff --git a/code/modules/research/designs/mecha_designs.dm b/code/modules/research/designs/mecha_designs.dm
index 3ee7d344dc..7ccc41c232 100644
--- a/code/modules/research/designs/mecha_designs.dm
+++ b/code/modules/research/designs/mecha_designs.dm
@@ -219,7 +219,7 @@
/datum/design/mech_missile_rack
name = "Exosuit Weapon (SRM-8 Missile Rack)"
- desc = "Allows for the construction of SRM-8 Missile Rack."
+ desc = "Allows for the construction of an SRM-8 Missile Rack."
id = "mech_missile_rack"
build_type = MECHFAB
build_path = /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack
diff --git a/code/modules/research/designs/smelting_designs.dm b/code/modules/research/designs/smelting_designs.dm
index 8ddf975c54..c2cbb5685e 100644
--- a/code/modules/research/designs/smelting_designs.dm
+++ b/code/modules/research/designs/smelting_designs.dm
@@ -7,7 +7,7 @@
materials = list(MAT_METAL = MINERAL_MATERIAL_AMOUNT, MAT_PLASMA = MINERAL_MATERIAL_AMOUNT)
build_path = /obj/item/stack/sheet/plasteel
category = list("initial", "Stock Parts")
- departmental_flags = DEPARTMENTAL_FLAG_CARGO | DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING
+ departmental_flags = DEPARTMENTAL_FLAG_CARGO | DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SECURITY
maxstack = 50
/datum/design/plastitanium_alloy
diff --git a/code/modules/research/designs/weapon_designs.dm b/code/modules/research/designs/weapon_designs.dm
index 03c0582245..214ef36afe 100644
--- a/code/modules/research/designs/weapon_designs.dm
+++ b/code/modules/research/designs/weapon_designs.dm
@@ -330,8 +330,8 @@
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
/datum/design/suppressor
- name = "Universal Suppressor"
- desc = "A reverse-engineered universal suppressor that fits on most small arms with threaded barrels."
+ name = "Suppressor"
+ desc = "A reverse-engineered suppressor that fits on most small arms with threaded barrels."
id = "suppressor"
build_type = PROTOLATHE
materials = list(MAT_METAL = 2000, MAT_SILVER = 500)
diff --git a/code/modules/research/nanites/nanite_programs/healing.dm b/code/modules/research/nanites/nanite_programs/healing.dm
index ab314cb33c..d3a268047e 100644
--- a/code/modules/research/nanites/nanite_programs/healing.dm
+++ b/code/modules/research/nanites/nanite_programs/healing.dm
@@ -70,9 +70,13 @@
rogue_types = list(/datum/nanite_program/brain_decay)
/datum/nanite_program/brain_heal/check_conditions()
- if(!host_mob.getBrainLoss())
- return FALSE
- return ..()
+ if(iscarbon(host_mob))
+ var/mob/living/carbon/C = host_mob
+ if(length(C.get_traumas()))
+ return ..()
+ if(host_mob.getBrainLoss())
+ return ..()
+ return FALSE
/datum/nanite_program/brain_heal/active_effect()
host_mob.adjustBrainLoss(-1, TRUE)
@@ -187,10 +191,14 @@
rogue_types = list(/datum/nanite_program/brain_decay, /datum/nanite_program/brain_misfire)
/datum/nanite_program/brain_heal_advanced/check_conditions()
- if(!host_mob.getBrainLoss())
- return FALSE
- return ..()
-
+ if(iscarbon(host_mob))
+ var/mob/living/carbon/C = host_mob
+ if(length(C.get_traumas()))
+ return ..()
+ if(host_mob.getBrainLoss())
+ return ..()
+ return FALSE
+
/datum/nanite_program/brain_heal_advanced/active_effect()
host_mob.adjustBrainLoss(-2, TRUE)
if(iscarbon(host_mob) && prob(10))
diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm
index 4331d8858b..c6487c92f0 100644
--- a/code/modules/research/techweb/all_nodes.dm
+++ b/code/modules/research/techweb/all_nodes.dm
@@ -231,23 +231,22 @@
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
export_price = 5000
-/datum/techweb_node/adv_bluespace
- id = "adv_bluespace"
- display_name = "Advanced Bluespace Research"
- description = "Deeper understanding of how the Bluespace dimension works"
- prereq_ids = list("practical_bluespace", "high_efficiency")
- design_ids = list("bluespace_matter_bin", "femto_mani", "triphasic_scanning", "tele_station", "tele_hub", "quantumpad", "launchpad", "launchpad_console",
- "teleconsole", "bluespace_crystal", "wormholeprojector")
- research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 15000)
- export_price = 5000
-
/datum/techweb_node/practical_bluespace
id = "practical_bluespace"
display_name = "Applied Bluespace Research"
description = "Using bluespace to make things faster and better."
prereq_ids = list("bluespace_basic", "engineering")
- design_ids = list("bs_rped","biobag_holding","minerbag_holding", "bluespacebeaker", "bluespacesyringe", "phasic_scanning", "roastingstick", "ore_silo", "bluespacesmartdart")
- research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 7500)
+ design_ids = list("bs_rped","biobag_holding","minerbag_holding", "bluespacebeaker", "bluespacesyringe", "phasic_scanning", "bluespacesmartdart")
+ research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 5000)
+ export_price = 5000
+
+/datum/techweb_node/adv_bluespace
+ id = "adv_bluespace"
+ display_name = "Advanced Bluespace Research"
+ description = "Deeper understanding of how the Bluespace dimension works"
+ prereq_ids = list("practical_bluespace", "high_efficiency")
+ design_ids = list("bluespace_matter_bin", "femto_mani", "triphasic_scanning", "bluespace_crystal")
+ research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 10000)
export_price = 5000
/datum/techweb_node/bluespace_power
@@ -259,7 +258,7 @@
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
export_price = 5000
-/datum/techweb_node/bluespace_holding //Bluespace-memery
+/datum/techweb_node/bluespace_holding
id = "bluespace_holding"
display_name = "Bluespace Pockets"
description = "Studies into the mysterious alternate dimension known as bluespace and how to place items in the threads of reality."
@@ -267,6 +266,25 @@
design_ids = list( "bluespacebodybag","bag_holding", "bluespace_pod", "borg_upgrade_trashofholding", "blutrash", "satchel_holding")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 5500)
export_price = 5000
+
+/datum/techweb_node/bluespace_portal
+ id = "bluespace_portal"
+ display_name = "Bluespace Portals"
+ description = "Allows for Bluespace Tech to be used tandem with Wormhole tech."
+ prereq_ids = list("adv_weaponry", "adv_bluespace")
+ design_ids = list("wormholeprojector")
+ research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
+ export_price = 5000
+
+/datum/techweb_node/bluespace_warping
+ id = "bluespace_warping"
+ display_name = "Bluespace Teleportation tech"
+ description = "Traversing through space at an instant with Bluespace."
+ prereq_ids = list("adv_power", "adv_bluespace")
+ design_ids = list( "tele_station", "tele_hub", "quantumpad", "launchpad", "launchpad_console", "teleconsole", "roastingstick")
+ research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
+ export_price = 5000
+
/////////////////////////plasma tech/////////////////////////
/datum/techweb_node/basic_plasma
id = "basic_plasma"
@@ -545,7 +563,7 @@
display_name = "Advanced Mining Technology"
description = "Efficiency Level 127" //dumb mc references
prereq_ids = list("basic_mining", "adv_engi", "adv_power", "adv_plasma")
- design_ids = list("drill_diamond", "jackhammer", "hypermod", "plasmacutter_adv")
+ design_ids = list("drill_diamond", "jackhammer", "hypermod", "plasmacutter_adv", "ore_silo")
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
export_price = 5000
diff --git a/code/modules/research/xenobiology/crossbreeding/_weapons.dm b/code/modules/research/xenobiology/crossbreeding/_weapons.dm
index 1138f65105..141e6b1fe1 100644
--- a/code/modules/research/xenobiology/crossbreeding/_weapons.dm
+++ b/code/modules/research/xenobiology/crossbreeding/_weapons.dm
@@ -7,7 +7,7 @@
item_state = "bloodgun"
lefthand_file = 'icons/mob/inhands/weapons/guns_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/guns_righthand.dmi'
- item_flags = ABSTRACT | DROPDEL | NODROP
+ item_flags = ABSTRACT | DROPDEL
w_class = WEIGHT_CLASS_HUGE
force = 5
max_charges = 1 //Recharging costs blood.
@@ -15,6 +15,10 @@
ammo_type = /obj/item/ammo_casing/magic/bloodchill
fire_sound = 'sound/effects/attackblob.ogg'
+/obj/item/gun/magic/bloodchill/Initialize()
+ . = ..()
+ ADD_TRAIT(src, TRAIT_NODROP, HAND_REPLACEMENT_TRAIT)
+
/obj/item/gun/magic/bloodchill/process()
charge_tick++
if(charge_tick < recharge_rate || charges >= max_charges)
diff --git a/code/modules/research/xenobiology/crossbreeding/chilling.dm b/code/modules/research/xenobiology/crossbreeding/chilling.dm
index 881c830e5e..ff55a87dfa 100644
--- a/code/modules/research/xenobiology/crossbreeding/chilling.dm
+++ b/code/modules/research/xenobiology/crossbreeding/chilling.dm
@@ -186,6 +186,7 @@ Chilling extracts:
/obj/item/slimecross/chilling/sepia/do_effect(mob/user)
user.visible_message("[src] shatters, freezing time itself!")
+ allies -= user //support class
new /obj/effect/timestop(get_turf(user), 2, 300, allies)
..()
@@ -267,7 +268,7 @@ Chilling extracts:
addtimer(CALLBACK(src, .proc/boom), 50)
/obj/item/slimecross/chilling/oil/proc/boom()
- explosion(get_turf(src), -1, -1, 3, 10) //Large radius, but mostly light damage.
+ explosion(get_turf(src), -1, -1, 10, 0) //Large radius, but mostly light damage, and no flash.
qdel(src)
/obj/item/slimecross/chilling/black
@@ -307,4 +308,4 @@ Chilling extracts:
user.visible_message("[src] reflects an array of dazzling colors and light, energy rushing to nearby doors!")
for(var/obj/machinery/door/airlock/door in area)
new /obj/effect/forcefield/slimewall/rainbow(door.loc)
- return ..()
+ return ..()
\ No newline at end of file
diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm
index 76d444da18..ce36be8e42 100644
--- a/code/modules/research/xenobiology/xenobiology.dm
+++ b/code/modules/research/xenobiology/xenobiology.dm
@@ -633,6 +633,12 @@
to_chat(user, "The slime is dead!")
return
+ if(M.rabid) //Stops being rabid, but doesn't become truly docile.
+ to_chat(M, "You absorb the potion, and your rabid hunger finally settles to a normal desire to feed.")
+ to_chat(user, "You feed the slime the potion, calming its rabid rage.")
+ M.rabid = FALSE
+ qdel(src)
+ return
M.docile = 1
M.nutrition = 700
to_chat(M, "You absorb the potion and feel your intense desire to feed melt away.")
@@ -702,7 +708,7 @@
imp.implant(SM, user)
SM.access_card = new /obj/item/card/id/syndicate(SM)
- SM.access_card.item_flags |= NODROP
+ ADD_TRAIT(SM.access_card, TRAIT_NODROP, ABSTRACT_ITEM_TRAIT)
/obj/item/slimepotion/transference
name = "consciousness transference potion"
diff --git a/code/modules/shuttle/assault_pod.dm b/code/modules/shuttle/assault_pod.dm
index 86132cf834..1258b9f4b8 100644
--- a/code/modules/shuttle/assault_pod.dm
+++ b/code/modules/shuttle/assault_pod.dm
@@ -35,7 +35,9 @@
/obj/item/assault_pod/attack_self(mob/living/user)
var/target_area
- target_area = input("Area to land", "Select a Landing Zone", target_area) in GLOB.teleportlocs
+ target_area = input("Area to land", "Select a Landing Zone", target_area) as null|anything in GLOB.teleportlocs
+ if(!target_area)
+ return
var/area/picked_area = GLOB.teleportlocs[target_area]
if(!src || QDELETED(src))
return
diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm
index e1a3308ff6..119023d465 100644
--- a/code/modules/shuttle/emergency.dm
+++ b/code/modules/shuttle/emergency.dm
@@ -202,7 +202,7 @@
. = ..()
-/obj/docking_port/mobile/emergency/request(obj/docking_port/stationary/S, area/signalOrigin, reason, redAlert, set_coefficient=null)
+/obj/docking_port/mobile/emergency/request(obj/docking_port/stationary/S, area/signalOrigin, reason, redAlert, set_coefficient=null, silent = FALSE)
if(!isnum(set_coefficient))
var/security_num = seclevel2num(get_security_level())
switch(security_num)
@@ -231,7 +231,8 @@
else
SSshuttle.emergencyLastCallLoc = null
- priority_announce("The emergency shuttle has been called. [redAlert ? "Red Alert state confirmed: Dispatching priority shuttle. " : "" ]It will arrive in [timeLeft(600)] minutes.[reason][SSshuttle.emergencyLastCallLoc ? "\n\nCall signal traced. Results can be viewed on any communications console." : "" ]", null, 'sound/ai/shuttlecalled.ogg', "Priority")
+ if(!silent)
+ priority_announce("The emergency shuttle has been called. [redAlert ? "Red Alert state confirmed: Dispatching priority shuttle. " : "" ]It will arrive in [timeLeft(600)] minutes.[reason][SSshuttle.emergencyLastCallLoc ? "\n\nCall signal traced. Results can be viewed on any communications console." : "" ]", null, 'sound/ai/shuttlecalled.ogg', "Priority")
/obj/docking_port/mobile/emergency/cancel(area/signalOrigin)
if(mode != SHUTTLE_CALL)
diff --git a/code/modules/shuttle/special.dm b/code/modules/shuttle/special.dm
index b94cd0b9b7..9bea790957 100644
--- a/code/modules/shuttle/special.dm
+++ b/code/modules/shuttle/special.dm
@@ -165,7 +165,7 @@
var/datum/job/captain/C = new /datum/job/captain
access_card.access = C.get_access()
access_card.access |= ACCESS_CENT_BAR
- access_card.item_flags |= NODROP
+ ADD_TRAIT(access_card, TRAIT_NODROP, ABSTRACT_ITEM_TRAIT)
/mob/living/simple_animal/hostile/alien/maid/barmaid/Destroy()
qdel(access_card)
diff --git a/code/modules/spells/spell_types/barnyard.dm b/code/modules/spells/spell_types/barnyard.dm
index 01b24fef98..ccb0280779 100644
--- a/code/modules/spells/spell_types/barnyard.dm
+++ b/code/modules/spells/spell_types/barnyard.dm
@@ -37,20 +37,15 @@
"Your face starts burning up, but the flames are repulsed by your anti-magic protection!")
return
- var/list/masks = list(/obj/item/clothing/mask/spig, /obj/item/clothing/mask/cowmask, /obj/item/clothing/mask/horsehead)
- var/list/mSounds = list('sound/magic/pighead_curse.ogg', 'sound/magic/cowhead_curse.ogg', 'sound/magic/horsehead_curse.ogg')
- var/randM = rand(1,3)
+ var/list/masks = list(/obj/item/clothing/mask/pig/cursed, /obj/item/clothing/mask/cowmask/cursed, /obj/item/clothing/mask/horsehead/cursed)
-
- var/choice = masks[randM]
- var/obj/item/clothing/mask/magichead = new choice
- magichead.item_flags |= NODROP
+ var/choice = pick(masks)
+ var/obj/item/clothing/mask/magichead = new choice(get_turf(target))
magichead.flags_inv = null
target.visible_message("[target]'s face bursts into flames, and a barnyard animal's head takes its place!", \
"Your face burns up, and shortly after the fire you realise you have the face of a barnyard animal!")
if(!target.dropItemToGround(target.wear_mask))
qdel(target.wear_mask)
target.equip_to_slot_if_possible(magichead, SLOT_WEAR_MASK, 1, 1)
- playsound(get_turf(target), mSounds[randM], 50, 1)
target.flash_act()
diff --git a/code/modules/spells/spell_types/godhand.dm b/code/modules/spells/spell_types/godhand.dm
index 06d1fc3dc5..a5f371ffc2 100644
--- a/code/modules/spells/spell_types/godhand.dm
+++ b/code/modules/spells/spell_types/godhand.dm
@@ -7,7 +7,7 @@
icon = 'icons/obj/items_and_weapons.dmi'
icon_state = "syndballoon"
item_state = null
- item_flags = NEEDS_PERMIT | ABSTRACT | NODROP | DROPDEL
+ item_flags = NEEDS_PERMIT | ABSTRACT | DROPDEL
w_class = WEIGHT_CLASS_HUGE
force = 0
throwforce = 0
@@ -15,6 +15,10 @@
throw_speed = 0
var/charges = 1
+/obj/item/melee/touch_attack/Initialize()
+ . = ..()
+ ADD_TRAIT(src, TRAIT_NODROP, ABSTRACT_ITEM_TRAIT)
+
/obj/item/melee/touch_attack/attack(mob/target, mob/living/carbon/user)
if(!iscarbon(user)) //Look ma, no hands
return
diff --git a/code/modules/spells/spell_types/lichdom.dm b/code/modules/spells/spell_types/lichdom.dm
index d88ee7fb22..efc80101f6 100644
--- a/code/modules/spells/spell_types/lichdom.dm
+++ b/code/modules/spells/spell_types/lichdom.dm
@@ -34,7 +34,7 @@
for(var/obj/item/item in hand_items)
// I ensouled the nuke disk once. But it's probably a really
// mean tactic, so probably should discourage it.
- if((item.item_flags & ABSTRACT) || (item.item_flags & NODROP) || SEND_SIGNAL(item, COMSIG_ITEM_IMBUE_SOUL, user))
+ if((item.item_flags & ABSTRACT) || HAS_TRAIT(item, TRAIT_NODROP) || SEND_SIGNAL(item, COMSIG_ITEM_IMBUE_SOUL, user))
continue
marked_item = item
to_chat(M, "You begin to focus your very being into [item]...")
diff --git a/code/modules/spells/spell_types/rightandwrong.dm b/code/modules/spells/spell_types/rightandwrong.dm
index bc1fc980bb..13686e2069 100644
--- a/code/modules/spells/spell_types/rightandwrong.dm
+++ b/code/modules/spells/spell_types/rightandwrong.dm
@@ -42,6 +42,7 @@ GLOBAL_LIST_INIT(summoned_guns, list(
/obj/item/gun/ballistic/revolver/grenadelauncher,
/obj/item/gun/ballistic/revolver/golden,
/obj/item/gun/ballistic/automatic/sniper_rifle,
+ /obj/item/gun/ballistic/rocketlauncher,
/obj/item/gun/medbeam,
/obj/item/gun/energy/laser/scatter,
/obj/item/gun/energy/gravity_gun))
diff --git a/code/modules/spells/spell_types/summonitem.dm b/code/modules/spells/spell_types/summonitem.dm
index 2bc347b185..6d46c53a9d 100644
--- a/code/modules/spells/spell_types/summonitem.dm
+++ b/code/modules/spells/spell_types/summonitem.dm
@@ -25,7 +25,7 @@
for(var/obj/item/item in hand_items)
if(item.item_flags & ABSTRACT)
continue
- if(item.item_flags & NODROP)
+ if(HAS_TRAIT(item, TRAIT_NODROP))
message += "Though it feels redundant, "
marked_item = item
message += "You mark [item] for recall.
"
diff --git a/code/modules/surgery/cavity_implant.dm b/code/modules/surgery/cavity_implant.dm
index e57f8f686b..72874e0308 100644
--- a/code/modules/surgery/cavity_implant.dm
+++ b/code/modules/surgery/cavity_implant.dm
@@ -29,7 +29,7 @@
/datum/surgery_step/handle_cavity/success(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery)
var/obj/item/bodypart/chest/CH = target.get_bodypart(BODY_ZONE_CHEST)
if(tool)
- if(IC || tool.w_class > WEIGHT_CLASS_NORMAL || (tool.item_flags & NODROP) || istype(tool, /obj/item/organ))
+ if(IC || tool.w_class > WEIGHT_CLASS_NORMAL || HAS_TRAIT(tool, TRAIT_NODROP) || istype(tool, /obj/item/organ))
to_chat(user, "