"
- 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..e6bf7b3f20 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
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] ", TRUE)
+ alert_drones("Drone Chat: [name] ", 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 = "
"
- 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 = "
"
+ 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] "
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/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/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/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..bc693d96bc 100644
--- a/code/modules/projectiles/ammunition/caseless/rocket.dm
+++ b/code/modules/projectiles/ammunition/caseless/rocket.dm
@@ -1,7 +1,15 @@
-/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 = "s-casing-live"
+ 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 = "84mm-hedp"
projectile_type = /obj/item/projectile/bullet/a84mm
/obj/item/ammo_casing/caseless/a75
diff --git a/code/modules/projectiles/boxes_magazines/internal/grenade.dm b/code/modules/projectiles/boxes_magazines/internal/grenade.dm
index 12325a0299..79a005ee8a 100644
--- a/code/modules/projectiles/boxes_magazines/internal/grenade.dm
+++ b/code/modules/projectiles/boxes_magazines/internal/grenade.dm
@@ -11,7 +11,7 @@
max_ammo = 1
/obj/item/ammo_box/magazine/internal/rocketlauncher
- name = "grenade launcher internal magazine"
- ammo_type = /obj/item/ammo_casing/caseless/a84mm
+ name = "rocket launcher internal magazine"
+ 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..fb3ed19f82 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -32,9 +32,10 @@
var/fire_delay = 0 //rate of fire for burst firing and semi auto
var/firing_burst = 0 //Prevent the weapon from firing again while already firing
var/semicd = 0 //cooldown handler
- var/weapon_weight = WEAPON_LIGHT
+ var/weapon_weight = WEAPON_LIGHT //currently only used for inaccuracy
var/spread = 0 //Spread induced by the gun itself.
var/randomspread = 1 //Set to 0 for shotguns. This is used for weapons that don't fire all their bullets at once.
+ var/inaccuracy_modifier = 1
lefthand_file = 'icons/mob/inhands/weapons/guns_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/guns_righthand.dmi'
@@ -170,7 +171,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 +423,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 +439,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.")
@@ -538,3 +539,13 @@
if(A == chambered)
chambered = null
update_icon()
+
+/obj/item/gun/proc/getinaccuracy(mob/living/user)
+ if(!iscarbon(user))
+ return FALSE
+ else
+ var/mob/living/carbon/holdingdude = user
+ if(istype(holdingdude) && holdingdude.combatmode)
+ return (max((holdingdude.lastdirchange + weapon_weight * 25) - world.time,0) * inaccuracy_modifier)
+ else
+ return ((weapon_weight * 25) * inaccuracy_modifier)
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..f6356dce99 100644
--- a/code/modules/projectiles/guns/ballistic/launchers.dm
+++ b/code/modules/projectiles/guns/ballistic/launchers.dm
@@ -74,25 +74,92 @@
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()
+ inaccuracy_modifier = 0.7
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/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)
+ var/obj/item/ammo_casing/AC = chambered
+ if(AC)
+ if(!user.put_in_hands(AC))
+ AC.bounce_away(FALSE, NONE)
+ to_chat(user, "You remove \the [AC] from \the [src]!")
+ playsound(src, 'sound/weapons/gun_magazine_remove_full.ogg', 70, TRUE)
+ chambered = null
+ else
+ to_chat(user, "There's no [magazine_wording] in [src].")
+ update_icon()
+
+/obj/item/gun/ballistic/rocketlauncher/attackby(obj/item/A, mob/user, params)
+ if(magazine && istype(A, /obj/item/ammo_casing))
+ if(user.temporarilyRemoveItemFromInventory(A))
+ if(!chambered)
+ to_chat(user, "You load a new [A] into \the [src].")
+ playsound(src, "gun_insert_full_magazine", 70, 1)
+ chamber_round()
+ update_icon()
+ return TRUE
+ else
+ to_chat(user, "You cannot seem to get \the [A] out of your hands!")
+
+/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..e15810c6bb 100644
--- a/code/modules/projectiles/projectile/special/rocket.dm
+++ b/code/modules/projectiles/projectile/special/rocket.dm
@@ -9,13 +9,14 @@
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
dismemberment = 100
+ ricochets_max = 0
/obj/item/projectile/bullet/a84mm/on_hit(atom/target, blocked = FALSE)
..()
@@ -29,17 +30,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/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm
index d0c08d9534..7efa13898d 100644
--- a/code/modules/reagents/chemistry/reagents/food_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm
@@ -438,6 +438,14 @@
. = 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"
diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm
index 890403691e..9c63846620 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"
@@ -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/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/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/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..85819da52a 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.")
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 d41fd6a79b..020b4b29ab 100644
--- a/code/modules/shuttle/emergency.dm
+++ b/code/modules/shuttle/emergency.dm
@@ -199,7 +199,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)
@@ -228,7 +228,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/spells/spell_types/barnyard.dm b/code/modules/spells/spell_types/barnyard.dm
index 01b24fef98..b6a7878470 100644
--- a/code/modules/spells/spell_types/barnyard.dm
+++ b/code/modules/spells/spell_types/barnyard.dm
@@ -37,14 +37,13 @@
"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/masks = list(/obj/item/clothing/mask/pig/cursed, /obj/item/clothing/mask/cowmask/cursed, /obj/item/clothing/mask/horsehead/cursed)
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/choice = masks[randM]
var/obj/item/clothing/mask/magichead = new choice
- magichead.item_flags |= NODROP
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!")
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/surgery/organs/augments_chest.dm b/code/modules/surgery/organs/augments_chest.dm
index 0302dd2cae..ea336bea19 100644
--- a/code/modules/surgery/organs/augments_chest.dm
+++ b/code/modules/surgery/organs/augments_chest.dm
@@ -46,7 +46,7 @@
/obj/item/organ/cyberimp/chest/reviver
name = "Reviver implant"
- desc = "This implant will attempt to revive you if you lose consciousness. For the faint of heart!"
+ desc = "This implant will attempt to revive and heal you if you lose consciousness. For the faint of heart!"
icon_state = "chest_implant"
implant_color = "#AD0000"
slot = ORGAN_SLOT_HEART_AID
diff --git a/code/modules/surgery/organs/lungs.dm b/code/modules/surgery/organs/lungs.dm
index 64be29c339..ef358c48da 100644
--- a/code/modules/surgery/organs/lungs.dm
+++ b/code/modules/surgery/organs/lungs.dm
@@ -288,51 +288,52 @@
gas_breathed = breath_gases[/datum/gas/stimulum]
if (gas_breathed > gas_stimulation_min)
var/existing = H.reagents.get_reagent_amount("stimulum")
- H.reagents.add_reagent("stimulum",max(0, 1 - existing))
+ H.reagents.add_reagent("stimulum", max(0, 5 - existing))
breath_gases[/datum/gas/stimulum]-=gas_breathed
// Miasma
if (breath_gases[/datum/gas/miasma])
var/miasma_pp = breath.get_breath_partial_pressure(breath_gases[/datum/gas/miasma])
+ if(miasma_pp > MINIMUM_MOLES_DELTA_TO_MOVE)
- //Miasma sickness
- if(prob(0.5 * miasma_pp))
- var/datum/disease/advance/miasma_disease = new /datum/disease/advance/random(2,3)
- miasma_disease.name = "Unknown"
- miasma_disease.try_infect(owner)
+ //Miasma sickness
+ if(prob(0.05 * miasma_pp))
+ var/datum/disease/advance/miasma_disease = new /datum/disease/advance/random(2,3)
+ miasma_disease.name = "Unknown"
+ miasma_disease.try_infect(owner)
- // Miasma side effects
- switch(miasma_pp)
- if(1 to 5)
- // At lower pp, give out a little warning
- SEND_SIGNAL(owner, COMSIG_CLEAR_MOOD_EVENT, "smell")
- if(prob(5))
- to_chat(owner, "There is an unpleasant smell in the air.")
- if(5 to 15)
- //At somewhat higher pp, warning becomes more obvious
- if(prob(15))
- to_chat(owner, "You smell something horribly decayed inside this room.")
- SEND_SIGNAL(owner, 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(owner, "The stench of rotting carcasses is unbearable!")
- SEND_SIGNAL(owner, COMSIG_ADD_MOOD_EVENT, "smell", /datum/mood_event/disgust/nauseating_stench)
- owner.vomit()
- if(30 to INFINITY)
- //Higher chance to vomit. Let the horror start
- if(prob(15))
- to_chat(owner, "The stench of rotting carcasses is unbearable!")
- SEND_SIGNAL(owner, COMSIG_ADD_MOOD_EVENT, "smell", /datum/mood_event/disgust/nauseating_stench)
- owner.vomit()
- else
- SEND_SIGNAL(owner, COMSIG_CLEAR_MOOD_EVENT, "smell")
+ // Miasma side effects
+ switch(miasma_pp)
+ if(1 to 5)
+ // At lower pp, give out a little warning
+ SEND_SIGNAL(owner, COMSIG_CLEAR_MOOD_EVENT, "smell")
+ if(prob(5))
+ to_chat(owner, "There is an unpleasant smell in the air.")
+ if(5 to 15)
+ //At somewhat higher pp, warning becomes more obvious
+ if(prob(15))
+ to_chat(owner, "You smell something horribly decayed inside this room.")
+ SEND_SIGNAL(owner, 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(owner, "The stench of rotting carcasses is unbearable!")
+ SEND_SIGNAL(owner, COMSIG_ADD_MOOD_EVENT, "smell", /datum/mood_event/disgust/nauseating_stench)
+ owner.vomit()
+ if(30 to INFINITY)
+ //Higher chance to vomit. Let the horror start
+ if(prob(15))
+ to_chat(owner, "The stench of rotting carcasses is unbearable!")
+ SEND_SIGNAL(owner, COMSIG_ADD_MOOD_EVENT, "smell", /datum/mood_event/disgust/nauseating_stench)
+ owner.vomit()
+ else
+ SEND_SIGNAL(owner, COMSIG_CLEAR_MOOD_EVENT, "smell")
- // In a full miasma atmosphere with 101.34 pKa, about 10 disgust per breath, is pretty low compared to threshholds
- // Then again, this is a purely hypothetical scenario and hardly reachable
- owner.adjust_disgust(0.1 * miasma_pp)
+ // In a full miasma atmosphere with 101.34 pKa, about 10 disgust per breath, is pretty low compared to threshholds
+ // Then again, this is a purely hypothetical scenario and hardly reachable
+ owner.adjust_disgust(0.1 * miasma_pp)
- breath_gases[/datum/gas/miasma]-=gas_breathed
+ breath_gases[/datum/gas/miasma]-=gas_breathed
// Clear out moods when no miasma at all
else
@@ -442,3 +443,14 @@
heat_level_1_threshold = 400 // better adapted for heat, obv. Lavaland standard is 300
heat_level_2_threshold = 600 // up 200 from level 1, 1000 is silly but w/e for level 3
+/obj/item/organ/lungs/slime
+ name = "vacuole"
+ desc = "A large organelle designed to store oxygen and other important gasses."
+
+ safe_toxins_max = 0 //We breathe this to gain POWER.
+
+/obj/item/organ/lungs/slime/check_breath(datum/gas_mixture/breath, mob/living/carbon/human/H)
+ . = ..()
+ if (breath.gases[/datum/gas/plasma])
+ var/plasma_pp = breath.get_breath_partial_pressure(breath.gases[/datum/gas/plasma])
+ owner.blood_volume += (0.2 * plasma_pp) // 10/s when breathing literally nothing but plasma, which will suffocate you.
diff --git a/code/modules/surgery/organs/tongue.dm b/code/modules/surgery/organs/tongue.dm
index 0e672de225..ccfc21f878 100644
--- a/code/modules/surgery/organs/tongue.dm
+++ b/code/modules/surgery/organs/tongue.dm
@@ -8,6 +8,7 @@
var/list/languages_possible
var/say_mod = null
var/taste_sensitivity = 15 // lower is more sensitive.
+ var/modifies_speech = FALSE
var/static/list/languages_possible_base = typecacheof(list(
/datum/language/common,
/datum/language/draconic,
@@ -24,24 +25,25 @@
. = ..()
languages_possible = languages_possible_base
-/obj/item/organ/tongue/get_spans()
- return list()
-
-/obj/item/organ/tongue/proc/TongueSpeech(var/message)
- return message
+/obj/item/organ/tongue/proc/handle_speech(datum/source, list/speech_args)
/obj/item/organ/tongue/Insert(mob/living/carbon/M, special = 0)
..()
if(say_mod && M.dna && M.dna.species)
M.dna.species.say_mod = say_mod
+ if (modifies_speech)
+ RegisterSignal(M, COMSIG_MOB_SAY, .proc/handle_speech)
+ M.UnregisterSignal(M, COMSIG_MOB_SAY)
/obj/item/organ/tongue/Remove(mob/living/carbon/M, special = 0)
..()
if(say_mod && M.dna && M.dna.species)
M.dna.species.say_mod = initial(M.dna.species.say_mod)
+ UnregisterSignal(M, COMSIG_MOB_SAY, .proc/handle_speech)
+ M.RegisterSignal(M, COMSIG_MOB_SAY, /mob/living/carbon/.proc/handle_tongueless_speech)
/obj/item/organ/tongue/could_speak_in_language(datum/language/dt)
- . = is_type_in_typecache(dt, languages_possible)
+ return is_type_in_typecache(dt, languages_possible)
/obj/item/organ/tongue/lizard
name = "forked tongue"
@@ -49,14 +51,16 @@
icon_state = "tonguelizard"
say_mod = "hisses"
taste_sensitivity = 10 // combined nose + tongue, extra sensitive
+ modifies_speech = TRUE
-/obj/item/organ/tongue/lizard/TongueSpeech(var/message)
- var/regex/lizard_hiss = new("s+", "g")
- var/regex/lizard_hiSS = new("S+", "g")
- if(copytext(message, 1, 2) != "*")
+/obj/item/organ/tongue/lizard/handle_speech(datum/source, list/speech_args)
+ var/static/regex/lizard_hiss = new("s+", "g")
+ var/static/regex/lizard_hiSS = new("S+", "g")
+ var/message = speech_args[SPEECH_MESSAGE]
+ if(message[1] != "*")
message = lizard_hiss.Replace(message, "sss")
message = lizard_hiSS.Replace(message, "SSS")
- return message
+ speech_args[SPEECH_MESSAGE] = message
/obj/item/organ/tongue/fly
name = "proboscis"
@@ -64,14 +68,16 @@
icon_state = "tonguefly"
say_mod = "buzzes"
taste_sensitivity = 25 // you eat vomit, this is a mercy
+ modifies_speech = TRUE
-/obj/item/organ/tongue/fly/TongueSpeech(var/message)
- var/regex/fly_buzz = new("z+", "g")
- var/regex/fly_buZZ = new("Z+", "g")
- if(copytext(message, 1, 2) != "*")
+/obj/item/organ/tongue/fly/handle_speech(datum/source, list/speech_args)
+ var/static/regex/fly_buzz = new("z+", "g")
+ var/static/regex/fly_buZZ = new("Z+", "g")
+ var/message = speech_args[SPEECH_MESSAGE]
+ if(message[1] != "*")
message = fly_buzz.Replace(message, "zzz")
message = fly_buZZ.Replace(message, "ZZZ")
- return message
+ speech_args[SPEECH_MESSAGE] = message
/obj/item/organ/tongue/abductor
name = "superlingual matrix"
@@ -79,9 +85,11 @@
icon_state = "tongueayylmao"
say_mod = "gibbers"
taste_sensitivity = 101 // ayys cannot taste anything.
+ modifies_speech = TRUE
-/obj/item/organ/tongue/abductor/TongueSpeech(var/message)
+/obj/item/organ/tongue/abductor/handle_speech(datum/source, list/speech_args)
//Hacks
+ var/message = speech_args[SPEECH_MESSAGE]
var/mob/living/carbon/human/user = usr
var/rendered = "[user.name]: [message]"
user.log_talk(message, LOG_SAY, tag="abductor")
@@ -97,7 +105,7 @@
for(var/mob/M in GLOB.dead_mob_list)
var/link = FOLLOW_LINK(M, user)
to_chat(M, "[link] [rendered]")
- return ""
+ speech_args[SPEECH_MESSAGE] = ""
/obj/item/organ/tongue/zombie
name = "rotting tongue"
@@ -105,9 +113,10 @@
icon_state = "tonguezombie"
say_mod = "moans"
taste_sensitivity = 32
+ modifies_speech = TRUE
-/obj/item/organ/tongue/zombie/TongueSpeech(var/message)
- var/list/message_list = splittext(message, " ")
+/obj/item/organ/tongue/zombie/handle_speech(datum/source, list/speech_args)
+ var/list/message_list = splittext(speech_args[SPEECH_MESSAGE], " ")
var/maxchanges = max(round(message_list.len / 1.5), 2)
for(var/i = rand(maxchanges / 2, maxchanges), i > 0, i--)
@@ -120,7 +129,7 @@
if(prob(20) && message_list.len > 3)
message_list.Insert(insertpos, "[pick("BRAINS", "Brains", "Braaaiinnnsss", "BRAAAIIINNSSS")]...")
- return jointext(message_list, " ")
+ speech_args[SPEECH_MESSAGE] = jointext(message_list, " ")
/obj/item/organ/tongue/alien
name = "alien tongue"
@@ -128,6 +137,7 @@
icon_state = "tonguexeno"
say_mod = "hisses"
taste_sensitivity = 10 // LIZARDS ARE ALIENS CONFIRMED
+ modifies_speech = TRUE // not really, they just hiss
var/static/list/languages_possible_alien = typecacheof(list(
/datum/language/xenocommon,
/datum/language/common,
@@ -139,9 +149,8 @@
. = ..()
languages_possible = languages_possible_alien
-/obj/item/organ/tongue/alien/TongueSpeech(var/message)
+/obj/item/organ/tongue/alien/handle_speech(datum/source, list/speech_args)
playsound(owner, "hiss", 25, 1, 1)
- return message
/obj/item/organ/tongue/bone
name = "bone \"tongue\""
@@ -150,7 +159,7 @@
say_mod = "rattles"
attack_verb = list("bitten", "chattered", "chomped", "enamelled", "boned")
taste_sensitivity = 101 // skeletons cannot taste anything
-
+ modifies_speech = TRUE
var/chattering = FALSE
var/phomeme_type = "sans"
var/list/phomeme_types = list("sans", "papyrus")
@@ -159,29 +168,20 @@
. = ..()
phomeme_type = pick(phomeme_types)
-/obj/item/organ/tongue/bone/TongueSpeech(var/message)
- . = message
-
- if(chattering)
- //Annoy everyone nearby with your chattering.
- chatter(message, phomeme_type, usr)
-
-/obj/item/organ/tongue/bone/get_spans()
- . = ..()
- // Feature, if the tongue talks directly, it will speak with its span
+/obj/item/organ/tongue/bone/handle_speech(datum/source, list/speech_args)
+ if (chattering)
+ chatter(speech_args[SPEECH_MESSAGE], phomeme_type, source)
switch(phomeme_type)
if("sans")
- . |= SPAN_SANS
+ speech_args[SPEECH_SPANS] |= SPAN_SANS
if("papyrus")
- . |= SPAN_PAPYRUS
+ speech_args[SPEECH_SPANS] |= SPAN_PAPYRUS
/obj/item/organ/tongue/bone/plasmaman
name = "plasma bone \"tongue\""
desc = "Like animated skeletons, Plasmamen vibrate their teeth in order to produce speech."
icon_state = "tongueplasma"
-
-/obj/item/organ/tongue/bone/plasmaman/get_spans()
- return
+ modifies_speech = FALSE
/obj/item/organ/tongue/robot
name = "robotic voicebox"
@@ -190,10 +190,18 @@
icon_state = "tonguerobot"
say_mod = "states"
attack_verb = list("beeped", "booped")
+ modifies_speech = TRUE
taste_sensitivity = 25 // not as good as an organic tongue
+ var/electronics_magic = TRUE
/obj/item/organ/tongue/robot/can_speak_in_language(datum/language/dt)
- . = TRUE // THE MAGIC OF ELECTRONICS
+ return ..() || electronics_magic
-/obj/item/organ/tongue/robot/get_spans()
- return ..() | SPAN_ROBOT
+/obj/item/organ/tongue/robot/handle_speech(datum/source, list/speech_args)
+ speech_args[SPEECH_SPANS] |= SPAN_ROBOT
+
+/obj/item/organ/tongue/robot/ipc
+ name = "positronic voicebox"
+ say_mod = "beeps"
+ desc = "A voice synthesizer used by IPCs to smoothly interface with organic lifeforms."
+ electronics_magic = FALSE
\ No newline at end of file
diff --git a/code/modules/surgery/surgery.dm b/code/modules/surgery/surgery.dm
index c9a3871511..b013e7f252 100644
--- a/code/modules/surgery/surgery.dm
+++ b/code/modules/surgery/surgery.dm
@@ -49,9 +49,14 @@
var/datum/surgery_step/S = get_surgery_step()
if(S)
- if(S.try_op(user, target, user.zone_selected, user.get_active_held_item(), src, try_to_fail))
- return 1
- return 0
+ var/obj/item/tool = user.get_active_held_item()
+ if(S.try_op(user, target, user.zone_selected, tool, src, try_to_fail))
+ return TRUE
+ if(iscyborg(user) && user.a_intent != INTENT_HARM) //to save asimov borgs a LOT of heartache
+ return TRUE
+ if(tool.item_flags & SURGICAL_TOOL) //Just because you used the wrong tool it doesn't mean you meant to whack the patient with it
+ to_chat(user, "This step requires a different tool!")
+ return TRUE
/datum/surgery/proc/get_surgery_step()
var/step_type = steps[status]
diff --git a/code/modules/surgery/tools.dm b/code/modules/surgery/tools.dm
index 517dfb412a..db7445e0b0 100644
--- a/code/modules/surgery/tools.dm
+++ b/code/modules/surgery/tools.dm
@@ -4,6 +4,7 @@
icon = 'icons/obj/surgery.dmi'
icon_state = "retractor"
materials = list(MAT_METAL=6000, MAT_GLASS=3000)
+ item_flags = SURGICAL_TOOL
flags_1 = CONDUCT_1
w_class = WEIGHT_CLASS_TINY
@@ -33,6 +34,7 @@
icon = 'icons/obj/surgery.dmi'
icon_state = "hemostat"
materials = list(MAT_METAL=5000, MAT_GLASS=2500)
+ item_flags = SURGICAL_TOOL
flags_1 = CONDUCT_1
w_class = WEIGHT_CLASS_TINY
attack_verb = list("attacked", "pinched")
@@ -66,6 +68,7 @@
icon = 'icons/obj/surgery.dmi'
icon_state = "cautery"
materials = list(MAT_METAL=2500, MAT_GLASS=750)
+ item_flags = SURGICAL_TOOL
flags_1 = CONDUCT_1
w_class = WEIGHT_CLASS_TINY
attack_verb = list("burnt")
@@ -102,6 +105,7 @@
righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
hitsound = 'sound/weapons/circsawhit.ogg'
materials = list(MAT_METAL=10000, MAT_GLASS=6000)
+ item_flags = SURGICAL_TOOL
flags_1 = CONDUCT_1
force = 15
w_class = WEIGHT_CLASS_NORMAL
@@ -151,6 +155,7 @@
throw_speed = 3
throw_range = 5
materials = list(MAT_METAL=4000, MAT_GLASS=1000)
+ item_flags = SURGICAL_TOOL
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
hitsound = 'sound/weapons/bladeslice.ogg'
sharpness = IS_SHARP_ACCURATE
@@ -209,6 +214,7 @@
righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
hitsound = 'sound/weapons/circsawhit.ogg'
throwhitsound = 'sound/weapons/pierce.ogg'
+ item_flags = SURGICAL_TOOL
flags_1 = CONDUCT_1
force = 15
w_class = WEIGHT_CLASS_NORMAL
@@ -278,6 +284,7 @@
desc = "A container for holding body parts."
icon = 'icons/obj/storage.dmi'
icon_state = "evidenceobj"
+ item_flags = SURGICAL_TOOL
/obj/item/organ_storage/afterattack(obj/item/I, mob/user, proximity)
. = ..()
diff --git a/code/modules/uplink/uplink_devices.dm b/code/modules/uplink/uplink_devices.dm
index 2e91879006..b008682745 100644
--- a/code/modules/uplink/uplink_devices.dm
+++ b/code/modules/uplink/uplink_devices.dm
@@ -57,4 +57,3 @@
/obj/item/pen/uplink/Initialize(mapload, owner, tc_amount = 20)
. = ..()
AddComponent(/datum/component/uplink, owner, TRUE, FALSE, null, tc_amount)
- traitor_unlock_degrees = 360
diff --git a/code/modules/uplink/uplink_items.dm b/code/modules/uplink/uplink_items.dm
index af1c954c5b..905c710e6a 100644
--- a/code/modules/uplink/uplink_items.dm
+++ b/code/modules/uplink/uplink_items.dm
@@ -85,18 +85,18 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
return pick(4;0.75,2;0.5,1;0.25)
/datum/uplink_item/proc/purchase(mob/user, datum/component/uplink/U)
- var/atom/A = spawn_item(item, user)
+ var/atom/A = spawn_item(item, user, U)
if(purchase_log_vis && U.purchase_log)
U.purchase_log.LogPurchase(A, src, cost)
-/datum/uplink_item/proc/spawn_item(spawn_item, mob/user)
- if(!spawn_item)
+/datum/uplink_item/proc/spawn_item(spawn_path, mob/user, datum/component/uplink/U)
+ if(!spawn_path)
return
var/atom/A
- if(ispath(spawn_item))
- A = new spawn_item(get_turf(user))
+ if(ispath(spawn_path))
+ A = new spawn_path(get_turf(user))
else
- A = spawn_item
+ A = spawn_path
if(ishuman(user) && istype(A, /obj/item))
var/mob/living/carbon/human/H = user
if(H.put_in_hands(A))
@@ -117,23 +117,23 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
/datum/uplink_item/bundles_TC/chemical
name = "Bioterror bundle"
- desc = "For the madman: Contains Bioterror spray, Bioterror grenade, chemicals, syringe gun, box of syringes,\
- Donksoft assault rifle, and some darts. Remember: Seal suit and equip internals before use."
+ desc = "For the madman: Contains a handheld Bioterror chem sprayer, a Bioterror foam grenade, a box of lethal chemicals, a dart pistol, \
+ box of syringes, Donksoft assault rifle, and some riot darts. Remember: Seal suit and equip internals before use."
item = /obj/item/storage/backpack/duffelbag/syndie/med/bioterrorbundle
cost = 30 // normally 42
include_modes = list(/datum/game_mode/nuclear)
/datum/uplink_item/bundles_TC/bulldog
name = "Bulldog bundle"
- desc = "Lean and mean: Optimised for people that want to get up close and personal. Contains the popular \
- Bulldog shotgun, two 12g drums, and a pair of Thermal imaging goggles."
+ desc = "Lean and mean: Optimized for people that want to get up close and personal. Contains the popular \
+ Bulldog shotgun, a 12g buckshot drum, a 12g taser slug drum and a pair of Thermal imaging goggles."
item = /obj/item/storage/backpack/duffelbag/syndie/bulldogbundle
cost = 13 // normally 16
include_modes = list(/datum/game_mode/nuclear)
/datum/uplink_item/bundles_TC/c20r
name = "C-20r bundle"
- desc = "Old faithful: The classic C-20r, bundled with two magazines, and a (surplus) suppressor at discount price."
+ desc = "Old Faithful: The classic C-20r, bundled with two magazines, and a (surplus) suppressor at discount price."
item = /obj/item/storage/backpack/duffelbag/syndie/c20rbundle
cost = 14 // normally 16
include_modes = list(/datum/game_mode/nuclear)
@@ -147,8 +147,8 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
/datum/uplink_item/bundles_TC/medical
name = "Medical bundle"
- desc = "The support specialist: Aid your fellow operatives with this medical bundle. Contains a Donksoft machine gun, \
- a box of ammo, and a pair of magboots to rescue your friends in no-gravity environments."
+ desc = "The support specialist: Aid your fellow operatives with this medical bundle. Contains a tactical medkit, \
+ a Donksoft LMG, a box of riot darts and a pair of magboots to rescue your friends in no-gravity environments."
item = /obj/item/storage/backpack/duffelbag/syndie/med/medicalbundle
cost = 15 // normally 20
include_modes = list(/datum/game_mode/nuclear)
@@ -170,15 +170,18 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
/datum/uplink_item/bundles_TC/sniper
name = "Sniper bundle"
- desc = "Elegant and refined: Contains a collapsed sniper rifle in an expensive carrying case, a hollow-point \
- a soporific knockout magazine, a free surplus supressor, and a worn out suit and tie."
+ desc = "Elegant and refined: Contains a collapsed sniper rifle in an expensive carrying case, \
+ two soporific knockout magazines, a free surplus supressor, and a sharp-looking tactical turtleneck suit. \
+ We'll throw in a free red tie if you order NOW."
item = /obj/item/storage/briefcase/sniperbundle
cost = 20 // normally 26
include_modes = list(/datum/game_mode/nuclear)
/datum/uplink_item/bundles_TC/firestarter
name = "Spetsnaz Pyro bundle"
- desc = "For systematic suppression of carbon lifeforms in close range: Contains a specialist Pyrotechnic equipment, foreign pistol, two magazines, a pipebomb, and a stimulant syringe."
+ desc = "For systematic suppression of carbon lifeforms in close quarters: Contains a lethal New Russian backpack spray, Elite hardsuit, \
+ Stechkin APS pistol, two magazines, a minibomb and a stimulant syringe. \
+ Order NOW and comrade Boris will throw in an extra tracksuit."
item = /obj/item/storage/backpack/duffelbag/syndie/firestarter
cost = 30
include_modes = list(/datum/game_mode/nuclear)
@@ -187,7 +190,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
name = "Syndicate Bundle"
desc = "Syndicate Bundles are specialized groups of items that arrive in a plain box. \
These items are collectively worth more than 20 telecrystals, but you do not know which specialization \
- you will receive."
+ you will receive. May contain discontinued and/or exotic items."
item = /obj/item/storage/box/syndicate
cost = 20
exclude_modes = list(/datum/game_mode/nuclear)
@@ -216,7 +219,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
var/list/uplink_items = get_uplink_items(SSticker && SSticker.mode? SSticker.mode : null, FALSE)
var/crate_value = starting_crate_value
- var/obj/structure/closet/crate/C = spawn_item(/obj/structure/closet/crate, user)
+ var/obj/structure/closet/crate/C = spawn_item(/obj/structure/closet/crate, user, U)
if(U.purchase_log)
U.purchase_log.LogPurchase(C, src, cost)
while(crate_value)
@@ -287,6 +290,15 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
/datum/uplink_item/dangerous
category = "Conspicuous and Dangerous Weapons"
+/datum/uplink_item/dangerous/rawketlawnchair
+ name = "84mm Rocket Propelled Grenade Launcher"
+ desc = "A reusable rocket propelled grenade launcher preloaded with a low-yield 84mm HE round. \
+ Guaranteed to send your target out with a bang or your money back!"
+ item = /obj/item/gun/ballistic/rocketlauncher
+ cost = 8
+ surplus = 30
+ include_modes = list(/datum/game_mode/nuclear)
+
/datum/uplink_item/dangerous/antitank
name = "Anti Tank Pistol"
desc = "Essentially amounting to a sniper rifle with no stock and barrel (or indeed, any rifling at all), \
@@ -327,7 +339,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
/datum/uplink_item/dangerous/bioterror
name = "Biohazardous Chemical Sprayer"
- desc = "A chemical sprayer that allows a wide dispersal of selected chemicals. Especially tailored by the Tiger \
+ desc = "A handheld chemical sprayer that allows a wide dispersal of selected chemicals. Especially tailored by the Tiger \
Cooperative, the deadly blend it comes stocked with will disorient, damage, and disable your foes... \
Use with extreme caution, to prevent exposure to yourself and your fellow operatives."
item = /obj/item/reagent_containers/spray/chemsprayer/bioterror
@@ -418,7 +430,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
surplus = 30
include_modes = list(/datum/game_mode/nuclear)
-/datum/uplink_item/badass/rapid
+/datum/uplink_item/dangerous/rapid
name = "Gloves of the North Star"
desc = "These gloves let the user punch people very fast. Does not improve weapon attack speed or the meaty fists of a hulk."
item = /obj/item/clothing/gloves/rapid
@@ -427,7 +439,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
/datum/uplink_item/dangerous/guardian
name = "Holoparasites"
desc = "Though capable of near sorcerous feats via use of hardlight holograms and nanomachines, they require an \
- organic host as a home base and source of fuel."
+ organic host as a home base and source of fuel. Holoparasites come in various types and share damage with their host."
item = /obj/item/storage/box/syndie_kit/guardian
cost = 15
refundable = TRUE
@@ -450,7 +462,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
/datum/uplink_item/dangerous/carbine
name = "M-90gl Carbine"
desc = "A fully-loaded, specialized three-round burst carbine that fires 5.56mm ammunition from a 30 round magazine \
- with a togglable 40mm under-barrel grenade launcher."
+ with a toggleable 40mm underbarrel grenade launcher."
item = /obj/item/gun/ballistic/automatic/m90
cost = 18
surplus = 50
@@ -490,7 +502,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
/datum/uplink_item/dangerous/revolver
name = "Syndicate Revolver"
- desc = "A brutally simple syndicate revolver that fires .357 Magnum rounds and has 7 chambers."
+ desc = "A brutally simple Syndicate revolver that fires .357 Magnum rounds and has 7 chambers."
item = /obj/item/gun/ballistic/revolver/syndie
cost = 13
surplus = 50
@@ -498,7 +510,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
/datum/uplink_item/dangerous/foamsmg
name = "Toy Submachine Gun"
- desc = "A fully-loaded Donksoft bullpup submachine gun that fires riot grade rounds with a 20-round magazine."
+ desc = "A fully-loaded Donksoft bullpup submachine gun that fires riot grade darts with a 20-round magazine."
item = /obj/item/gun/ballistic/automatic/c20r/toy
cost = 5
surplus = 0
@@ -514,7 +526,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
include_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
/datum/uplink_item/dangerous/foampistol
- name = "Toy Gun with Riot Darts"
+ name = "Toy Pistol with Riot Darts"
desc = "An innocent-looking toy pistol designed to fire foam darts. Comes loaded with riot-grade \
darts effective at incapacitating a target."
item = /obj/item/gun/ballistic/automatic/toy/pistol/riot
@@ -594,7 +606,9 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
/datum/uplink_item/stealthy_weapons/romerol_kit
name = "Romerol"
- desc = "A highly experimental bioterror agent which creates dormant nodules to be etched into the grey matter of the brain. On death, these nodules take control of the dead body, causing limited revivification, along with slurred speech, aggression, and the ability to infect others with this agent."
+ desc = "A highly experimental bioterror agent which creates dormant nodules to be etched into the grey matter of the brain. \
+ On death, these nodules take control of the dead body, causing limited revivification, \
+ along with slurred speech, aggression, and the ability to infect others with this agent."
item = /obj/item/storage/box/syndie_kit/romerol
cost = 25
cant_discount = TRUE
@@ -604,7 +618,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
name = "Sleepy Pen"
desc = "A syringe disguised as a functional pen, filled with a potent mix of drugs, including a \
strong anesthetic and a chemical that prevents the target from speaking. \
- The pen holds one dose of the mixture, and can be refilled. Note that before the target \
+ The pen holds one dose of the mixture, and can be refilled with any chemicals. Note that before the target \
falls asleep, they will be able to move and act."
item = /obj/item/pen/sleepy
cost = 4
@@ -618,9 +632,9 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes
include_modes = list(/datum/game_mode/nuclear/clown_ops)
/datum/uplink_item/stealthy_weapons/suppressor
- name = "Universal Suppressor"
- desc = "Fitted for use on any small caliber weapon with a threaded barrel, this suppressor will silence the \
- shots of the weapon for increased stealth and superior ambushing capability."
+ name = "Suppressor"
+ desc = "This suppressor will silence the shots of the weapon it is attached to for increased stealth and superior ambushing capability. \
+ It is compatible with many small ballistic guns including the Stechkin and C-20r, but not revolvers or energy guns."
item = /obj/item/suppressor
cost = 1
surplus = 10
@@ -655,21 +669,24 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes
/datum/uplink_item/ammo/pistolap
name = "10mm Armour Piercing Magazine"
- desc = "An additional 8-round 10mm magazine; compatible with the Stechkin Pistol. These rounds are less effective at injuring the target but penetrate protective gear."
+ desc = "An additional 8-round 10mm magazine; compatible with the Stechkin Pistol. \
+ These rounds are less effective at injuring the target but penetrate protective gear."
item = /obj/item/ammo_box/magazine/m10mm/ap
cost = 2
exclude_modes = list(/datum/game_mode/nuclear/clown_ops)
/datum/uplink_item/ammo/pistolhp
name = "10mm Hollow Point Magazine"
- desc = "An additional 8-round 10mm magazine; compatible with the Stechkin Pistol. These rounds are more damaging but ineffective against armour."
+ desc = "An additional 8-round 10mm magazine; compatible with the Stechkin Pistol. \
+ These rounds are more damaging but ineffective against armour."
item = /obj/item/ammo_box/magazine/m10mm/hp
cost = 3
exclude_modes = list(/datum/game_mode/nuclear/clown_ops)
/datum/uplink_item/ammo/pistolfire
name = "10mm Incendiary Magazine"
- desc = "An additional 8-round 10mm magazine; compatible with the Stechkin Pistol. Loaded with incendiary rounds which ignite the target."
+ desc = "An additional 8-round 10mm magazine; compatible with the Stechkin Pistol. \
+ Loaded with incendiary rounds which inflict little damage, but ignite the target."
item = /obj/item/ammo_box/magazine/m10mm/fire
cost = 2
exclude_modes = list(/datum/game_mode/nuclear/clown_ops)
@@ -706,7 +723,7 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes
/datum/uplink_item/ammo/shotgun/meteor
name = "12g Meteorslug Shells"
desc = "An alternative 8-round meteorslug magazine for use in the Bulldog shotgun. \
- Great for blasting airlocks off their frames."
+ Great for blasting airlocks off their frames and knocking down enemies."
item = /obj/item/ammo_box/magazine/m12g/meteor
include_modes = list(/datum/game_mode/nuclear)
@@ -750,13 +767,12 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes
name = ".45 Ammo Duffel Bag"
desc = "A duffel bag filled with enough .45 ammo to supply an entire team, at a discounted price."
item = /obj/item/storage/backpack/duffelbag/syndie/ammo/smg
- cost = 20
+ cost = 20 //instead of 27 TC
include_modes = list(/datum/game_mode/nuclear)
/datum/uplink_item/ammo/smg
name = ".45 SMG Magazine"
- desc = "An additional 24-round .45 magazine suitable for use with the C-20r submachine gun. \
- These bullets pack a lot of punch that can knock most targets down, but do limited overall damage."
+ desc = "An additional 24-round .45 magazine suitable for use with the C-20r submachine gun."
item = /obj/item/ammo_box/magazine/smgm45
cost = 3
include_modes = list(/datum/game_mode/nuclear)
@@ -786,7 +802,7 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes
/datum/uplink_item/ammo/carbine
name = "5.56mm Toploader Magazine"
desc = "An additional 30-round 5.56mm magazine; suitable for use with the M-90gl carbine. \
- These bullets pack less punch than 1.95mm rounds, but they still offer more power than .45 ammo."
+ These bullets pack less punch than 7.12x82mm rounds, but they still offer more power than .45 ammo."
item = /obj/item/ammo_box/magazine/m556
cost = 4
include_modes = list(/datum/game_mode/nuclear)
@@ -799,7 +815,7 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes
/datum/uplink_item/ammo/machinegun/basic
name = "1.95x129mm Box Magazine"
desc = "A 50-round magazine of 1.95x129mm ammunition for use with the L6 SAW. \
- By the time you need to use this, you'll already be on a pile of corpses."
+ By the time you need to use this, you'll already be standing on a pile of corpses"
item = /obj/item/ammo_box/magazine/mm195x129
/datum/uplink_item/ammo/machinegun/ap
@@ -821,9 +837,25 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes
mixture that'll ignite anyone struck by the bullet. Some men just want to watch the world burn."
item = /obj/item/ammo_box/magazine/mm195x129/incen
+/datum/uplink_item/ammo/rocket
+ include_modes = list(/datum/game_mode/nuclear)
+
+/datum/uplink_item/ammo/rocket/basic
+ name = "84mm HE Rocket"
+ desc = "A low-yield anti-personnel HE rocket. Gonna take you out in style!"
+ item = /obj/item/ammo_casing/caseless/rocket
+ cost = 4
+
+/datum/uplink_item/ammo/rocket/hedp
+ name = "84mm HEDP Rocket"
+ desc = "A high-yield HEDP rocket; extremely effective against armored targets, as well as surrounding personnel. \
+ Strike fear into the hearts of your enemies."
+ item = /obj/item/ammo_casing/caseless/rocket/hedp
+ cost = 6
+
/datum/uplink_item/ammo/pistolaps
name = "9mm Handgun Magazine"
- desc = "An additional 15-round 9mm magazine, compatible with the Stetchkin APS pistol, found in the Spetsnaz Pyro bundle."
+ desc = "An additional 15-round 9mm magazine, compatible with the Stechkin APS pistol, found in the Spetsnaz Pyro bundle."
item = /obj/item/ammo_box/magazine/pistolm9mm
cost = 2
include_modes = list(/datum/game_mode/nuclear)
@@ -847,7 +879,7 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes
/datum/uplink_item/ammo/toydarts
name = "Box of Riot Darts"
- desc = "A box of 40 Donksoft foam riot darts, for reloading any compatible foam dart gun. Don't forget to share!"
+ desc = "A box of 40 Donksoft riot darts, for reloading any compatible foam dart magazine. Don't forget to share!"
item = /obj/item/ammo_box/foambox/riot
cost = 2
surplus = 0
@@ -871,7 +903,7 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes
category = "Grenades and Explosives"
/datum/uplink_item/explosives/bioterrorfoam
- name = "Chemical Foam Grenade"
+ name = "Bioterror Foam Grenade"
desc = "A powerful chemical foam grenade which creates a deadly torrent of foam that will mute, blind, confuse, \
mutate, and irritate carbon lifeforms. Specially brewed by Tiger Cooperative chemical weapons specialists \
using additional spore toxin. Ensure suit is sealed before use."
@@ -901,7 +933,7 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes
/datum/uplink_item/explosives/c4
name = "Composition C-4"
desc = "C-4 is plastic explosive of the common variety Composition C. You can use it to breach walls, sabotage equipment, or connect \
- an assembly to it in order to alter the way it detonates. It has a modifiable timer with a \
+ an assembly to it in order to alter the way it detonates. It can be attached to almost all objects and has a modifiable timer with a \
minimum setting of 10 seconds."
item = /obj/item/grenade/plastic/c4
cost = 1
@@ -915,8 +947,9 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes
/datum/uplink_item/explosives/x4bag
name = "Bag of X-4 explosives"
- desc = "Contains 3 X-4 plastic explosives. Similar, but more powerful than C-4. X-4 can be placed on a solid surface, such as a wall or window, and it will \
- blast through the wall, injuring anything on the opposite side, while being safer to the user. For when you want a wider, deeper, hole."
+ desc = "Contains 3 X-4 shaped plastic explosives. Similar to C4, but with a stronger blast that is directional instead of circular. \
+ X-4 can be placed on a solid surface, such as a wall or window, and it will blast through the wall, injuring anything on the opposite side, while being safer to the user. \
+ For when you want a controlled explosion that leaves a wider, deeper, hole."
item = /obj/item/storage/backpack/duffelbag/syndie/x4
cost = 4 //
cant_discount = TRUE
@@ -937,16 +970,15 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes
name = "Detomatix PDA Cartridge"
desc = "When inserted into a personal digital assistant, this cartridge gives you four opportunities to \
detonate PDAs of crewmembers who have their message feature enabled. \
- The concussive effect from the explosion will knock the recipient out for a short period, and deafen \
- them for longer. Beware, it has a chance to detonate your PDA."
+ The concussive effect from the explosion will knock the recipient out for a short period, and deafen them for longer."
item = /obj/item/cartridge/virus/syndicate
cost = 5
restricted = TRUE
/datum/uplink_item/explosives/emp
name = "EMP Grenades and Implanter Kit"
- desc = "A box that contains two EMP grenades and an EMP implant. Useful to disrupt communication, \
- security's energy weapons, and silicon lifeforms when you're in a tight spot."
+ desc = "A box that contains five EMP grenades and an EMP implant with three uses. Useful to disrupt communications, \
+ security's energy weapons and silicon lifeforms when you're in a tight spot."
item = /obj/item/storage/box/syndie_kit/emp
cost = 2
@@ -963,7 +995,7 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes
/datum/uplink_item/explosives/grenadier
name = "Grenadier's belt"
- desc = "A belt of a large variety of lethally dangerous and destructive grenades."
+ desc = "A belt containing 26 lethally dangerous and destructive grenades. Comes with an extra multitool and screwdriver."
item = /obj/item/storage/belt/grenade/full
include_modes = list(/datum/game_mode/nuclear)
cost = 22
@@ -1050,7 +1082,8 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes
/datum/uplink_item/support/reinforcement/assault_borg
name = "Syndicate Assault Cyborg"
- desc = "A cyborg designed and programmed for systematic extermination of non-Syndicate personnel."
+ desc = "A cyborg designed and programmed for systematic extermination of non-Syndicate personnel. \
+ Comes equipped with a self-resupplying LMG, a grenade launcher, energy sword, emag, pinpointer, flash and crowbar."
item = /obj/item/antag_spawner/nuke_ops/borg_tele/assault
refundable = TRUE
cost = 65
@@ -1058,17 +1091,18 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes
/datum/uplink_item/support/reinforcement/medical_borg
name = "Syndicate Medical Cyborg"
- desc = "A combat medic cyborg, with potent healing reagents and a medical beam gun, but limited offensive potential."
+ desc = "A combat medical cyborg. Has limited offensive potential, but makes more than up for it with its support capabilities. \
+ It comes equipped with a nanite hypospray, a medical beamgun, combat defibrillator, full surgical kit including an energy saw, an emag, pinpointer and flash. \
+ Thanks to its organ storage bag, it can perform surgery as well as any humanoid."
item = /obj/item/antag_spawner/nuke_ops/borg_tele/medical
refundable = TRUE
cost = 35
restricted = TRUE
/datum/uplink_item/support/gygax
- name = "Gygax Exosuit"
+ name = "Dark Gygax Exosuit"
desc = "A lightweight exosuit, painted in a dark scheme. Its speed and equipment selection make it excellent \
- for hit-and-run style attacks. This model lacks a method of space propulsion, and therefore it is \
- advised to utilize the drop pod if you wish to make use of it."
+ for hit-and-run style attacks. Features an incendiary carbine, flash bang launcher, teleporter, ion thrusters and a Tesla energy array."
item = /obj/mecha/combat/gygax/dark/loaded
cost = 80
@@ -1081,8 +1115,8 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes
/datum/uplink_item/support/mauler
name = "Mauler Exosuit"
- desc = "A massive and incredibly deadly military-grade exosuit. Features long-range targeting, thrust vectoring, \
- and deployable smoke."
+ desc = "A massive and incredibly deadly military-grade exosuit. Features long-range targeting, thrust vectoring \
+ and deployable smoke. Comes equipped with an LMG, scattershot carbine, missile rack, an antiprojectile armor booster and a Tesla energy array."
item = /obj/mecha/combat/marauder/mauler/loaded
cost = 140
@@ -1111,7 +1145,8 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes
/datum/uplink_item/stealthy_tools/chameleon
name = "Chameleon Kit"
- desc = "A set of items that contain chameleon technology allowing you to disguise as pretty much anything on the station, and more!"
+ desc = "A set of items that contain chameleon technology allowing you to disguise as pretty much anything on the station, and more! \
+ Due to budget cuts, the shoes don't provide protection against slipping."
item = /obj/item/storage/box/syndie_kit/chameleon
cost = 2
exclude_modes = list(/datum/game_mode/nuclear)
@@ -1125,7 +1160,8 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes
/datum/uplink_item/stealthy_tools/codespeak_manual
name = "Codespeak Manual"
- desc = "Syndicate agents can be trained to use a series of codewords to convey complex information, which sounds like random concepts and drinks to anyone listening. This manual teaches you this Codespeak. You can also hit someone else with the manual in order to teach them. This is the deluxe edition, which has unlimited used."
+ desc = "Syndicate agents can be trained to use a series of codewords to convey complex information, which sounds like random concepts and drinks to anyone listening. \
+ This manual teaches you this Codespeak. You can also hit someone else with the manual in order to teach them. This is the deluxe edition, which has unlimited uses."
item = /obj/item/codespeak_manual/unlimited
cost = 3
@@ -1141,12 +1177,31 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes
/datum/uplink_item/stealthy_tools/emplight
name = "EMP Flashlight"
- desc = "A small, self-charging, short-ranged EMP device disguised as a flashlight. \
- Useful for disrupting headsets, cameras, and borgs during stealth operations."
+ desc = "A small, self-recharging, short-ranged EMP device disguised as a working flashlight. \
+ Useful for disrupting headsets, cameras, doors, lockers and borgs during stealth operations. \
+ Attacking a target with this flashlight will direct an EM pulse at it and consumes a charge."
item = /obj/item/flashlight/emp
cost = 2
surplus = 30
+/datum/uplink_item/stealthy_tools/failsafe
+ name = "Failsafe Uplink Code"
+ desc = "When entered the uplink will self-destruct immidiately."
+ item = /obj/effect/gibspawner/generic
+ cost = 1
+ surplus = 0
+ restricted = TRUE
+ exclude_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
+
+/datum/uplink_item/stealthy_tools/failsafe/spawn_item(spawn_path, mob/user, datum/component/uplink/U)
+ if(!U)
+ return
+ U.failsafe_code = U.generate_code()
+ to_chat(user, "The new failsafe code for this uplink is now : [U.failsafe_code].")
+ if(user.mind)
+ user.mind.store_memory("Failsafe code for [U.parent] : [U.failsafe_code]")
+ return U.parent //For log icon
+
/datum/uplink_item/stealthy_tools/mulligan
name = "Mulligan"
desc = "Screwed up and have security on your tail? This handy syringe will give you a completely new identity \
@@ -1173,7 +1228,7 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes
/datum/uplink_item/stealthy_tools/jammer
name = "Radio Jammer"
- desc = "This device will disrupt any nearby outgoing radio communication when activated."
+ desc = "This device will disrupt any nearby outgoing radio communication when activated. Does not affect binary chat."
item = /obj/item/jammer
cost = 5
@@ -1204,7 +1259,7 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes
/datum/uplink_item/suits/space_suit
name = "Syndicate Space Suit"
- desc = "This red and black syndicate space suit is less encumbering than Nanotrasen variants, \
+ desc = "This red and black Syndicate space suit is less encumbering than Nanotrasen variants, \
fits inside bags, and has a weapon slot. Nanotrasen crew members are trained to report red space suit \
sightings, however."
item = /obj/item/storage/box/syndie_kit/space
@@ -1212,7 +1267,7 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes
/datum/uplink_item/suits/hardsuit
name = "Syndicate Hardsuit"
- desc = "The feared suit of a syndicate nuclear agent. Features slightly better armoring and a built in jetpack \
+ desc = "The feared suit of a Syndicate nuclear agent. Features slightly better armoring and a built in jetpack \
that runs off standard atmospheric tanks. Toggling the suit in and out of \
combat mode will allow you all the mobility of a loose fitting uniform without sacrificing armoring. \
Additionally the suit is collapsible, making it small enough to fit within a backpack. \
@@ -1223,8 +1278,8 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes
/datum/uplink_item/suits/hardsuit/elite
name = "Elite Syndicate Hardsuit"
- desc = "An upgraded, elite version of the syndicate hardsuit. It features fireproofing, and also \
- provides the user with superior armor and mobility compared to the standard syndicate hardsuit."
+ desc = "An upgraded, elite version of the Syndicate hardsuit. It features fireproofing, and also \
+ provides the user with superior armor and mobility compared to the standard Syndicate hardsuit."
item = /obj/item/clothing/suit/space/hardsuit/syndi/elite
cost = 8
include_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
@@ -1232,7 +1287,7 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes
/datum/uplink_item/suits/hardsuit/shielded
name = "Shielded Syndicate Hardsuit"
- desc = "An upgraded version of the standard syndicate hardsuit. It features a built-in energy shielding system. \
+ desc = "An upgraded version of the standard Syndicate hardsuit. It features a built-in energy shielding system. \
The shields can handle up to three impacts within a short duration and will rapidly recharge while not under fire."
item = /obj/item/clothing/suit/space/hardsuit/shielded/syndi
cost = 30
@@ -1245,15 +1300,15 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes
/datum/uplink_item/device_tools/cutouts
name = "Adaptive Cardboard Cutouts"
- desc = "These cardboard cutouts are coated with a thin material that prevents discoloration and makes the images on them appear more lifelike. This pack contains three as well as a \
- crayon for changing their appearances."
+ desc = "These cardboard cutouts are coated with a thin material that prevents discoloration and makes the images on them appear more lifelike. \
+ This pack contains three as well as a crayon for changing their appearances."
item = /obj/item/storage/box/syndie_kit/cutouts
cost = 1
surplus = 20
/datum/uplink_item/device_tools/assault_pod
name = "Assault Pod Targeting Device"
- desc = "Use to select the landing zone of your assault pod."
+ desc = "Use this to select the landing zone of your assault pod."
item = /obj/item/assault_pod
cost = 30
surplus = 0
@@ -1298,8 +1353,8 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes
/datum/uplink_item/device_tools/camera_bug
name = "Camera Bug"
- desc = "Enables you to view all cameras on the network and track a target. Bugging cameras allows you \
- to disable them remotely."
+ desc = "Enables you to view all cameras on the main network, set up motion alerts and track a target. \
+ Bugging cameras allows you to disable them remotely."
item = /obj/item/camera_bug
cost = 1
surplus = 90
@@ -1326,7 +1381,8 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes
/datum/uplink_item/device_tools/fakenucleardisk
name = "Decoy Nuclear Authentication Disk"
- desc = "It's just a normal disk. Visually it's identical to the real deal, but it won't hold up under closer scrutiny by the Captain. Don't try to give this to us to complete your objective, we know better!"
+ desc = "It's just a normal disk. Visually it's identical to the real deal, but it won't hold up under closer scrutiny by the Captain. \
+ Don't try to give this to us to complete your objective, we know better!"
item = /obj/item/disk/nuclear/fake
cost = 1
surplus = 1
@@ -1334,7 +1390,7 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes
/datum/uplink_item/device_tools/frame
name = "F.R.A.M.E. PDA Cartridge"
desc = "When inserted into a personal digital assistant, this cartridge gives you five PDA viruses which \
- when used cause the targeted PDA to become a new uplink with zero TCs, and immediately become unlocked. \
+ when used cause the targeted PDA to become a new uplink with zero TCs, and immediately become unlocked. \
You will receive the unlock code upon activating the virus, and the new uplink may be charged with \
telecrystals normally."
item = /obj/item/cartridge/virus/frame
@@ -1343,7 +1399,7 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes
/datum/uplink_item/device_tools/toolbox
name = "Full Syndicate Toolbox"
- desc = "The syndicate toolbox is a suspicious black and red. It comes loaded with a full tool set including a \
+ desc = "The Syndicate toolbox is a suspicious black and red. It comes loaded with a full tool set including a \
multitool and combat gloves that are resistant to shocks and heat."
item = /obj/item/storage/toolbox/syndicate
cost = 1
@@ -1366,7 +1422,7 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes
/datum/uplink_item/device_tools/medgun
name = "Medbeam Gun"
desc = "A wonder of Syndicate engineering, the Medbeam gun, or Medi-Gun enables a medic to keep his fellow \
- operatives in the fight, even while under fire."
+ operatives in the fight, even while under fire. Don't cross the streams!"
item = /obj/item/gun/medbeam
cost = 15
include_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
@@ -1388,9 +1444,9 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes
/datum/uplink_item/device_tools/powersink
name = "Power Sink"
- desc = "When screwed to wiring attached to a power grid and activated, this large device places excessive \
+ desc = "When screwed to wiring attached to a power grid and activated, this large device lights up and places excessive \
load on the grid, causing a station-wide blackout. The sink is large and cannot be stored in most \
- traditional bags and boxes."
+ traditional bags and boxes. Caution: Will explode if the powernet contains sufficient amounts of energy."
item = /obj/item/powersink
cost = 6
@@ -1399,7 +1455,7 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes
desc = "A radioactive microlaser disguised as a standard Nanotrasen health analyzer. When used, it emits a \
powerful burst of radiation, which, after a short delay, can incapacitate all but the most protected \
of humanoids. It has two settings: intensity, which controls the power of the radiation, \
- and wavelength, which controls how long the radiation delay is."
+ and wavelength, which controls the delay before the effect kicks in."
item = /obj/item/healthanalyzer/rad_laser
cost = 3
@@ -1414,7 +1470,7 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes
/datum/uplink_item/device_tools/medkit
name = "Syndicate Combat Medic Kit"
desc = "This first aid kit is a suspicious brown and red. Included is a combat stimulant injector \
- for rapid healing, a medical HUD for quick identification of injured personnel, \
+ for rapid healing, a medical night vision HUD for quick identification of injured personnel, \
and other supplies helpful for a field medic."
item = /obj/item/storage/firstaid/tactical
cost = 4
@@ -1429,7 +1485,7 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes
/datum/uplink_item/device_tools/surgerybag_adv
name = "Advanced Syndicate Surgery Duffel Bag"
- desc = "The Syndicate surgery duffel bag is a toolkit containing all newest surgery tools, surgical drapes, \
+ desc = "The Syndicate surgery duffel bag is a toolkit containing all advanced surgery tools, surgical drapes, \
a Syndicate brand MMI, a straitjacket, a muzzle, and a full Syndicate Combat Medic Kit."
item = /obj/item/storage/backpack/duffelbag/syndie/surgery_adv
cost = 10
@@ -1445,7 +1501,7 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes
/datum/uplink_item/device_tools/syndietome
name = "Syndicate Tome"
- desc = "Using rare artifacts acquired at great cost, the syndicate has reverse engineered \
+ desc = "Using rare artifacts acquired at great cost, the Syndicate has reverse engineered \
the seemingly magical books of a certain cult. Though lacking the esoteric abilities \
of the originals, these inferior copies are still quite useful, being able to provide \
both weal and woe on the battlefield, even if they do occasionally bite off a finger."
@@ -1464,7 +1520,8 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes
/datum/uplink_item/device_tools/potion
name = "Syndicate Sentience Potion"
item = /obj/item/slimepotion/slime/sentience/nuclear
- desc = "A potion recovered at great risk by undercover syndicate operatives and then subsequently modified with syndicate technology. Using it will make any animal sentient, and bound to serve you, as well as implanting an internal radio for communication and an internal ID card for opening doors."
+ desc = "A potion recovered at great risk by undercover Syndicate operatives and then subsequently modified with Syndicate technology. \
+ Using it will make any animal sentient, and bound to serve you, as well as implanting an internal radio for communication and an internal ID card for opening doors."
cost = 2
include_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
restricted = TRUE
@@ -1478,7 +1535,7 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes
/datum/uplink_item/implants/adrenal
name = "Adrenal Implant"
desc = "An implant injected into the body, and later activated at the user's will. It will inject a chemical \
- cocktail which has a mild healing effect along with removing all stuns and increasing movement speed."
+ cocktail which removes all incapacitating effects, lets the user run faster and has a mild healing effect."
item = /obj/item/storage/box/syndie_kit/imp_adrenal
cost = 8
player_minimum = 25
@@ -1517,28 +1574,30 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes
/datum/uplink_item/implants/radio
name = "Internal Syndicate Radio Implant"
- desc = "An implant injected into the body, allowing the use of an internal syndicate radio. Used just like a regular headset, but can be disabled to use external headsets normally and to avoid detection."
+ desc = "An implant injected into the body, allowing the use of an internal Syndicate radio. \
+ Used just like a regular headset, but can be disabled to use external headsets normally and to avoid detection."
item = /obj/item/storage/box/syndie_kit/imp_radio
cost = 4
restricted = TRUE
/datum/uplink_item/implants/reviver
name = "Reviver Implant"
- desc = "This implant will attempt to revive you if you lose consciousness. Comes with an autosurgeon."
+ desc = "This implant will attempt to revive and heal you if you lose consciousness. Comes with an autosurgeon."
item = /obj/item/autosurgeon/reviver
cost = 8
include_modes = list(/datum/game_mode/nuclear)
/datum/uplink_item/implants/stealthimplant
name = "Stealth Implant"
- desc = "This one-of-a-kind implant will make you almost invisible if you play your cards right."
+ desc = "This one-of-a-kind implant will make you almost invisible as long as you don't don't excessively move around. \
+ On activation, it will conceal you inside a chameleon cardboard box that is only revealed once someone bumps into it."
item = /obj/item/implanter/stealth
cost = 8
/datum/uplink_item/implants/storage
name = "Storage Implant"
desc = "An implant injected into the body, and later activated at the user's will. It will open a small bluespace \
- pocket capable of storing two items."
+ pocket capable of storing two regular-sized items."
item = /obj/item/storage/box/syndie_kit/imp_storage
cost = 8
@@ -1551,7 +1610,8 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes
/datum/uplink_item/implants/uplink
name = "Uplink Implant"
- desc = "An implant injected into the body, and later activated at the user's will. Has no telecrystals, must be charged by the use of physical telecrystals. Undetectable (except via surgery), and excellent for escaping confinement."
+ desc = "An implant injected into the body, and later activated at the user's will. Has no telecrystals and must be charged by the use of physical telecrystals. \
+ Undetectable (except via surgery), and excellent for escaping confinement."
item = /obj/item/storage/box/syndie_kit/imp_uplink
cost = 4
// An empty uplink is kinda useless.
@@ -1610,7 +1670,8 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes
with a minimum of 60 seconds, and can be bolted to the floor with a wrench to prevent \
movement. The bomb is bulky and cannot be moved; upon ordering this item, a smaller beacon will be \
transported to you that will teleport the actual bomb to it upon activation. Note that this bomb can \
- be defused, and some crew may attempt to do so."
+ be defused, and some crew may attempt to do so. \
+ The bomb core can be pried out and manually detonated with other explosives."
item = /obj/item/sbeacondrop/clownbomb
cost = 15
restricted_roles = list("Clown")
@@ -1638,7 +1699,8 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes
/datum/uplink_item/role_restricted/haunted_magic_eightball
name = "Haunted Magic Eightball"
- desc = "Most magic eightballs are toys with dice inside. Although identical in appearance to the harmless toys, this occult device reaches into the spirit world to find its answers. Be warned, that spirits are often capricious or just little assholes. To use, simply speak your question aloud, then begin shaking."
+ desc = "Most magic eightballs are toys with dice inside. Although identical in appearance to the harmless toys, this occult device reaches into the spirit world to find its answers. \
+ Be warned, that spirits are often capricious or just little assholes. To use, simply speak your question aloud, then begin shaking."
item = /obj/item/toy/eightball/haunted
cost = 2
restricted_roles = list("Curator")
@@ -1657,14 +1719,16 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes
/datum/uplink_item/role_restricted/explosive_hot_potato
name = "Exploding Hot Potato"
- desc = "A potato rigged with explosives. On activation, a special mechanism is activated that prevents it from being dropped. The only way to get rid of it if you are holding it is to attack someone else with it, causing it to latch to that person instead."
+ desc = "A potato rigged with explosives. On activation, a special mechanism is activated that prevents it from being dropped. \
+ The only way to get rid of it if you are holding it is to attack someone else with it, causing it to latch to that person instead."
item = /obj/item/hot_potato/syndicate
cost = 4
restricted_roles = list("Cook", "Botanist", "Clown", "Mime")
/datum/uplink_item/role_restricted/ez_clean_bundle
name = "EZ Clean Grenade Bundle"
- desc = "A box with three cleaner grenades using the trademark Waffle Co. formula. Serves as a cleaner and causes acid damage to anyone standing nearby. The acid only affects carbon-based creatures."
+ desc = "A box with three cleaner grenades using the trademark Waffle Co. formula. Serves as a cleaner and causes acid damage to anyone standing nearby. \
+ The acid only affects carbon-based creatures."
item = /obj/item/storage/box/syndie_kit/ez_clean
cost = 6
surplus = 20
@@ -1679,7 +1743,8 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes
/datum/uplink_item/role_restricted/mimery
name = "Guide to Advanced Mimery Series"
- desc = "The classical two part series on how to further hone your mime skills. Upon studying the series, the user should be able to make 3x1 invisible walls, and shoot bullets out of their fingers. Obviously only works for Mimes."
+ desc = "The classical two part series on how to further hone your mime skills. Upon studying the series, the user should be able to make 3x1 invisible walls, and shoot bullets out of their fingers. \
+ Obviously only works for Mimes."
cost = 12
item = /obj/item/storage/box/syndie_kit/mimery
restricted_roles = list("Mime")
@@ -1694,7 +1759,8 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes
/datum/uplink_item/role_restricted/pressure_mod
name = "Kinetic Accelerator Pressure Mod"
- desc = "A modification kit which allows Kinetic Accelerators to do greatly increased damage while indoors. Occupies 35% mod capacity."
+ desc = "A modification kit which allows Kinetic Accelerators to do greatly increased damage while indoors. \
+ Occupies 35% mod capacity."
item = /obj/item/borg/upgrade/modkit/indoors
cost = 5 //you need two for full damage, so total of 10 for maximum damage
limited_stock = 2 //you can't use more than two!
@@ -1702,7 +1768,8 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes
/datum/uplink_item/role_restricted/kitchen_gun
name = "Kitchen Gun (TM)"
- desc = "A revolutionary .45 caliber cleaning solution! Say goodbye to daily stains and dirty surfaces with Kitchen Gun (TM)! Just five shots from Kitchen Gun (TM), and it'll sparkle like new! Includes two extra ammunition clips!"
+ desc = "A revolutionary .45 caliber cleaning solution! Say goodbye to daily stains and dirty surfaces with Kitchen Gun (TM)! \
+ Just five shots from Kitchen Gun (TM), and it'll sparkle like new! Includes two extra ammunition clips!"
cost = 10
surplus = 40
restricted_roles = list("Cook", "Janitor")
@@ -1717,7 +1784,8 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes
/datum/uplink_item/role_restricted/magillitis_serum
name = "Magillitis Serum Autoinjector"
- desc = "A single-use autoinjector which contains an experimental serum that causes rapid muscular growth in Hominidae. Side-affects may include hypertrichosis, violent outbursts, and an unending affinity for bananas."
+ desc = "A single-use autoinjector which contains an experimental serum that causes rapid muscular growth in Hominidae. \
+ Side-affects may include hypertrichosis, violent outbursts, and an unending affinity for bananas."
item = /obj/item/reagent_containers/hypospray/magillitis
cost = 15
restricted_roles = list("Geneticist", "Chief Medical Officer")
@@ -1767,7 +1835,8 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes
/datum/uplink_item/badass/costumes/obvious_chameleon
name = "Broken Chameleon Kit"
- desc = "A set of items that contain chameleon technology allowing you to disguise as pretty much anything on the station, and more! Please note that this kit did NOT pass quality control."
+ desc = "A set of items that contain chameleon technology allowing you to disguise as pretty much anything on the station, and more! \
+ Please note that this kit did NOT pass quality control."
item = /obj/item/storage/box/syndie_kit/chameleon/broken
/datum/uplink_item/badass/costumes
@@ -1777,7 +1846,8 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes
/datum/uplink_item/badass/costumes/centcom_official
name = "CentCom Official Costume"
- desc = "Ask the crew to \"inspect\" their nuclear disk and weapons system, and then when they decline, pull out a fully automatic rifle and gun down the Captain. Radio headset does not include key. No gun included."
+ desc = "Ask the crew to \"inspect\" their nuclear disk and weapons system, and then when they decline, pull out a fully automatic rifle and gun down the Captain. \
+ Radio headset does not include encryption key. No gun included."
item = /obj/item/storage/box/syndie_kit/centcom_costume
/datum/uplink_item/badass/costumes/clown
diff --git a/code/modules/vehicles/wheelchair.dm b/code/modules/vehicles/wheelchair.dm
index a5ba06e6fb..137242c547 100644
--- a/code/modules/vehicles/wheelchair.dm
+++ b/code/modules/vehicles/wheelchair.dm
@@ -45,7 +45,7 @@
var/datum/component/riding/D = GetComponent(/datum/component/riding)
//1.5 (movespeed as of this change) multiplied by 6.7 gets ABOUT 10 (rounded), the old constant for the wheelchair that gets divided by how many arms they have
//if that made no sense this simply makes the wheelchair speed change along with movement speed delay
- D.vehicle_move_delay = round(CONFIG_GET(number/movedelay/run_delay) * 6.7) / min(user.get_num_arms(), 2)
+ D.vehicle_move_delay = round((CONFIG_GET(number/movedelay/run_delay) * 4) / min(user.get_num_arms(), 2), world.tick_lag)
return ..()
/obj/vehicle/ridden/wheelchair/Moved()
diff --git a/code/modules/vending/megaseed.dm b/code/modules/vending/megaseed.dm
index 9aa11c7bfb..4594048256 100644
--- a/code/modules/vending/megaseed.dm
+++ b/code/modules/vending/megaseed.dm
@@ -23,6 +23,7 @@
/obj/item/seeds/lime = 3,
/obj/item/seeds/onion = 3,
/obj/item/seeds/orange = 3,
+ /obj/item/seeds/peanutseed = 3,
/obj/item/seeds/pineapple = 3,
/obj/item/seeds/potato = 3,
/obj/item/seeds/poppy = 3,
diff --git a/html/changelogs/AutoChangeLog-pr-8632.yml b/html/changelogs/AutoChangeLog-pr-8632.yml
new file mode 100644
index 0000000000..b2f74869c2
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-8632.yml
@@ -0,0 +1,4 @@
+author: "Arturlang"
+delete-after: True
+changes:
+ - rscadd: "Traitor codewords are now highlighted for traitors."
diff --git a/html/changelogs/AutoChangeLog-pr-8663.yml b/html/changelogs/AutoChangeLog-pr-8663.yml
new file mode 100644
index 0000000000..3f5aeacd3c
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-8663.yml
@@ -0,0 +1,5 @@
+author: "Ghommie"
+delete-after: True
+changes:
+ - rscadd: "Adding in peanuts, peanut butter, peanut butter toasts and sandwiches, and the PB&J sandwich.
+The peanuts contain a little bit of extractable cooking oil (similarly to soy beans) and can be microwaved or dried in a drying rack to make roasted peanuts, which can be mixed in a all-in-one-grinder for peanut butter, required to make those sandwiches."
diff --git a/html/changelogs/AutoChangeLog-pr-8709.yml b/html/changelogs/AutoChangeLog-pr-8709.yml
new file mode 100644
index 0000000000..4aa6fd9b1d
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-8709.yml
@@ -0,0 +1,4 @@
+author: "Trilbyspaceclone"
+delete-after: True
+changes:
+ - bugfix: "A bunch of minor issues with xenobiology are no more!"
diff --git a/html/changelogs/AutoChangeLog-pr-8734.yml b/html/changelogs/AutoChangeLog-pr-8734.yml
new file mode 100644
index 0000000000..4f746c4cd5
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-8734.yml
@@ -0,0 +1,5 @@
+author: "Ghommie (original PR by coiax)"
+delete-after: True
+changes:
+ - code_imp: "Randomly coloured gloves and randomly coloured glowsticks now have
+slightly different typepaths, but otherwise function the same."
diff --git a/html/changelogs/AutoChangeLog-pr-8740.yml b/html/changelogs/AutoChangeLog-pr-8740.yml
new file mode 100644
index 0000000000..1966f34331
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-8740.yml
@@ -0,0 +1,5 @@
+author: "Ghommie (original PR by Denton)"
+delete-after: True
+changes:
+ - tweak: "Nanotrasen has started shipping more types of bedsheets to its stations."
+ - rscadd: "Added in Runtime, Pirate and Gondola bedsheets. The second one can also be found in some pirate ships, while the last can be crafted from gondola hides."
diff --git a/html/changelogs/AutoChangeLog-pr-8750.yml b/html/changelogs/AutoChangeLog-pr-8750.yml
new file mode 100644
index 0000000000..a3ff5e8a91
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-8750.yml
@@ -0,0 +1,4 @@
+author: "Arturlang"
+delete-after: True
+changes:
+ - bugfix: "Fixes brain damage/trauma healing nanites so they actually work while there are only traumas."
diff --git a/html/changelogs/AutoChangeLog-pr-8761.yml b/html/changelogs/AutoChangeLog-pr-8761.yml
new file mode 100644
index 0000000000..4ee792c3a6
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-8761.yml
@@ -0,0 +1,5 @@
+author: "Trilbyspaceclone"
+delete-after: True
+changes:
+ - tweak: "melee and block harm"
+ - bugfix: "sprites*"
diff --git a/html/changelogs/AutoChangeLog-pr-8765.yml b/html/changelogs/AutoChangeLog-pr-8765.yml
new file mode 100644
index 0000000000..2cac0773ad
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-8765.yml
@@ -0,0 +1,5 @@
+author: "Ghommie"
+delete-after: True
+changes:
+ - tweak: "Merges the end-of-shift and its shuttle autocall announcements into one."
+ - bugfix: "Prevents the end-of-shift shuttle from being recalled (even if to no avail)."
diff --git a/html/changelogs/AutoChangeLog-pr-8790.yml b/html/changelogs/AutoChangeLog-pr-8790.yml
new file mode 100644
index 0000000000..0c0e6cd116
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-8790.yml
@@ -0,0 +1,6 @@
+author: "Bhijn"
+delete-after: True
+changes:
+ - rscadd: "It's now possible to forcefully eject the occupants of a dogborg's sleeper by using a crowbar on them. This action is instant."
+ - tweak: "Resist values for dogborg sleepers have been adjusted. The baseline has been decreased from 30 seconds to 15 seconds. Medihound sleepers have a resist timer of 3 seconds. Sechound sleepers retain a resist timer of 30 seconds."
+ - tweak: "It now takes 10 full seconds to insert people into your sleeper. This should hopefully give people some more room to breathe and react to a dogborg attempting to sleeper someone either for no reason or in a way that violates law 2."
diff --git a/html/changelogs/AutoChangeLog-pr-8794.yml b/html/changelogs/AutoChangeLog-pr-8794.yml
new file mode 100644
index 0000000000..612a3e655b
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-8794.yml
@@ -0,0 +1,5 @@
+author: "Ghommie"
+delete-after: True
+changes:
+ - bugfix: "Fixing the `(pointless) badassary` category appearing between the `dangerous and conspicious` and `stealthy and inconspicious` categories."
+ - bugfix: "Combat gloves plus now properly use the combat gloves sprite."
diff --git a/html/changelogs/AutoChangeLog-pr-8800.yml b/html/changelogs/AutoChangeLog-pr-8800.yml
new file mode 100644
index 0000000000..7b397ec23e
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-8800.yml
@@ -0,0 +1,4 @@
+author: "Sishen1542, original by Skoglol"
+delete-after: True
+changes:
+ - rscadd: "Heaters/freezers now support ctrl clicking to turn on and alt clicking to min/max target temperature."
diff --git a/html/changelogs/AutoChangeLog-pr-8802.yml b/html/changelogs/AutoChangeLog-pr-8802.yml
new file mode 100644
index 0000000000..b97119c32d
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-8802.yml
@@ -0,0 +1,6 @@
+author: "Ghommie (original PRs by ShizCalev, MrDoombringer, AnturK, bgobandit, 81Denton and actioninja)"
+delete-after: True
+changes:
+ - rscadd: "Failsafe codes for uplinks are now available for purchase."
+ - rscadd: "Nuke Ops now have the ability to purchase a usable RPG, the PML-9, as well as a couple different types of rockets for it. you can also suicide rocket jump with them!"
+ - spellcheck: "Improved Uplink item descriptions and formatting."
diff --git a/html/changelogs/AutoChangeLog-pr-8805.yml b/html/changelogs/AutoChangeLog-pr-8805.yml
new file mode 100644
index 0000000000..8abefd9ce2
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-8805.yml
@@ -0,0 +1,4 @@
+author: "Linzolle"
+delete-after: True
+changes:
+ - bugfix: "supply display are now properly on the wall"
diff --git a/html/changelogs/AutoChangeLog-pr-8812.yml b/html/changelogs/AutoChangeLog-pr-8812.yml
new file mode 100644
index 0000000000..0de67cfe59
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-8812.yml
@@ -0,0 +1,4 @@
+author: "Sishen1542, original by XDTM"
+delete-after: True
+changes:
+ - rscadd: "Using the wrong surgery tool during surgery no longer attacks the patient, if on help or disarm intent."
diff --git a/html/changelogs/AutoChangeLog-pr-8819.yml b/html/changelogs/AutoChangeLog-pr-8819.yml
new file mode 100644
index 0000000000..0b750fccb6
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-8819.yml
@@ -0,0 +1,4 @@
+author: "Sishen1542"
+delete-after: True
+changes:
+ - rscadd: "Added public autolathes to all maps."
diff --git a/html/changelogs/AutoChangeLog-pr-8820.yml b/html/changelogs/AutoChangeLog-pr-8820.yml
new file mode 100644
index 0000000000..3e83e29cc3
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-8820.yml
@@ -0,0 +1,4 @@
+author: "Ghommie (original PR by variableundefined)"
+delete-after: True
+changes:
+ - bugfix: "Cancel button to assault pod destination selector."
diff --git a/html/changelogs/AutoChangeLog-pr-8821.yml b/html/changelogs/AutoChangeLog-pr-8821.yml
new file mode 100644
index 0000000000..f45caba949
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-8821.yml
@@ -0,0 +1,7 @@
+author: "Ghommie (original PRs by ShizCalev)"
+delete-after: True
+changes:
+ - tweak: "Corgi collars can now be removed!"
+ - tweak: "Updated the corgi & parrot inventory panels to use the same formatting as other mobs"
+ - bugfix: "Fixed corgi inventory panels not closing properly."
+ - bugfix: "Fixed the parrot inventory panel not closing properly if you're not able to interact with it."
diff --git a/html/changelogs/AutoChangeLog-pr-8823.yml b/html/changelogs/AutoChangeLog-pr-8823.yml
new file mode 100644
index 0000000000..b334bfbd7e
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-8823.yml
@@ -0,0 +1,4 @@
+author: "Ghommie (Original PR by tralezab)"
+delete-after: True
+changes:
+ - bugfix: "Fixes an issue with spontaneous appendicitis picking incompatible mob biotypes."
diff --git a/html/changelogs/AutoChangeLog-pr-8824.yml b/html/changelogs/AutoChangeLog-pr-8824.yml
new file mode 100644
index 0000000000..6a12573112
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-8824.yml
@@ -0,0 +1,4 @@
+author: "Ghommie (original PR by Mickyan)"
+delete-after: True
+changes:
+ - bugfix: "Fixed being unable to smother people using the damp rag"
diff --git a/html/changelogs/AutoChangeLog-pr-8825.yml b/html/changelogs/AutoChangeLog-pr-8825.yml
new file mode 100644
index 0000000000..a56be4e2ab
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-8825.yml
@@ -0,0 +1,6 @@
+author: "Ghommie (original PR by MrDoomBringer, AnturK and YPOQ)"
+delete-after: True
+changes:
+ - bugfix: "Explosions will no longer damage wizards in rod form, the supermatter monitoring radio and megafauna GPS."
+ - bugfix: "Supplypods no longer detonate their contents."
+ - bugfix: "Fixed silicon items (e.g. cyborg modules) being destroyed by explosion epicenters."
diff --git a/html/changelogs/AutoChangeLog-pr-8826.yml b/html/changelogs/AutoChangeLog-pr-8826.yml
new file mode 100644
index 0000000000..3f7520b84e
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-8826.yml
@@ -0,0 +1,9 @@
+author: "Ghommie (original PR by Skoglol)"
+delete-after: True
+changes:
+ - code_imp: "New helper proc for alt-click turf listing, bypasses any interaction overrides."
+ - code_imp: "Ghosts and revenants now use the new proc."
+ - bugfix: "Ghosts can no longer toggleopen sleepers, adjust skateboard speed or close laptops"
+ - bugfix: "Revenant can now alt-click turf to list contents."
+ - tweak: "Revenant now slightly less nosy, use shift click to examine."
+ - tweak: "Alt-clicking the same turf again no longer closes the turf listing tab."
diff --git a/html/changelogs/AutoChangeLog-pr-8827.yml b/html/changelogs/AutoChangeLog-pr-8827.yml
new file mode 100644
index 0000000000..e1aaadd698
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-8827.yml
@@ -0,0 +1,4 @@
+author: "Ghommie (original PR by ninjanomnom)"
+delete-after: True
+changes:
+ - bugfix: "Gaps between sounds in some looping sound effects should no longer happen as much under heavy server lag."
diff --git a/html/changelogs/AutoChangeLog-pr-8828.yml b/html/changelogs/AutoChangeLog-pr-8828.yml
new file mode 100644
index 0000000000..4278a14ae1
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-8828.yml
@@ -0,0 +1,4 @@
+author: "Ghommie (original PR by Skoglol)"
+delete-after: True
+changes:
+ - bugfix: "Reduced ventcrawl lag greatly."
diff --git a/html/changelogs/AutoChangeLog-pr-8834.yml b/html/changelogs/AutoChangeLog-pr-8834.yml
new file mode 100644
index 0000000000..0b7a7b30c5
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-8834.yml
@@ -0,0 +1,4 @@
+author: "Ghommie"
+delete-after: True
+changes:
+ - bugfix: "Fixes the space ninja's energy netting."
diff --git a/html/changelogs/AutoChangeLog-pr-8835.yml b/html/changelogs/AutoChangeLog-pr-8835.yml
new file mode 100644
index 0000000000..cf646b879b
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-8835.yml
@@ -0,0 +1,4 @@
+author: "Linzolle"
+delete-after: True
+changes:
+ - tweak: "consistency in hop and cap berets"
diff --git a/html/changelogs/AutoChangeLog-pr-8841.yml b/html/changelogs/AutoChangeLog-pr-8841.yml
new file mode 100644
index 0000000000..8bb73dac26
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-8841.yml
@@ -0,0 +1,4 @@
+author: "Ghommie"
+delete-after: True
+changes:
+ - rscadd: "Adding one pAI to the wizard shuttle and ERT prep room"
diff --git a/html/changelogs/AutoChangeLog-pr-8842.yml b/html/changelogs/AutoChangeLog-pr-8842.yml
new file mode 100644
index 0000000000..8a8903b7e5
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-8842.yml
@@ -0,0 +1,4 @@
+author: "UristMcAstronaut"
+delete-after: True
+changes:
+ - bugfix: "allows a pai to activate its holoform while in a pai connector without getting derped."
diff --git a/html/changelogs/AutoChangeLog-pr-8843.yml b/html/changelogs/AutoChangeLog-pr-8843.yml
new file mode 100644
index 0000000000..74a3cc07e8
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-8843.yml
@@ -0,0 +1,4 @@
+author: "Coolgat3"
+delete-after: True
+changes:
+ - imageadd: "added combat boots sprite"
diff --git a/html/changelogs/AutoChangeLog-pr-8844.yml b/html/changelogs/AutoChangeLog-pr-8844.yml
new file mode 100644
index 0000000000..05f0f2fb22
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-8844.yml
@@ -0,0 +1,6 @@
+author: "Ghommie"
+delete-after: True
+changes:
+ - bugfix: "Fixes the rocket launcher being unreloadable."
+ - balance: "Buffed its accuracy a bit."
+ - tweak: "Replaced the grenade launcher emagged minesweeper loot with the rocket launcher like it was originally supposed to be."
diff --git a/html/changelogs/AutoChangeLog-pr-8846.yml b/html/changelogs/AutoChangeLog-pr-8846.yml
new file mode 100644
index 0000000000..26b1dad6d5
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-8846.yml
@@ -0,0 +1,4 @@
+author: "Ghommie"
+delete-after: True
+changes:
+ - rscadd: "Rubber Toolboxes."
diff --git a/html/changelogs/AutoChangeLog-pr-8847.yml b/html/changelogs/AutoChangeLog-pr-8847.yml
new file mode 100644
index 0000000000..678b3d433b
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-8847.yml
@@ -0,0 +1,4 @@
+author: "Ghommie"
+delete-after: True
+changes:
+ - rscadd: "Porting in two bar signs: Cyber Sylph's and Meow Mix."
diff --git a/html/changelogs/AutoChangeLog-pr-8852.yml b/html/changelogs/AutoChangeLog-pr-8852.yml
new file mode 100644
index 0000000000..4d49f26831
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-8852.yml
@@ -0,0 +1,4 @@
+author: "Tupinambis"
+delete-after: True
+changes:
+ - imagedel: "Removes a moth plush from the game."
diff --git a/html/changelogs/AutoChangeLog-pr-8853.yml b/html/changelogs/AutoChangeLog-pr-8853.yml
new file mode 100644
index 0000000000..1507e8620d
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-8853.yml
@@ -0,0 +1,6 @@
+author: "Ghommie (original PRs by Naksu and coiax, loser)"
+delete-after: True
+changes:
+ - code_imp: "Cleaned up saycode"
+ - bugfix: "Taking mutadone while having the communication disorder brain trauma will no longer spam your chat with messages."
+ - rscadd: "IPCs now come with a subtype of robotic tongue without the omnilingual ability, instead of innately having robotic voice spans."
diff --git a/html/changelogs/AutoChangeLog-pr-8854.yml b/html/changelogs/AutoChangeLog-pr-8854.yml
new file mode 100644
index 0000000000..fc45d2087e
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-8854.yml
@@ -0,0 +1,4 @@
+author: "Ghommie"
+delete-after: True
+changes:
+ - bugfix: "Fixing stamina damage melee weaponry being unusable by pacifists, and still damaging objects and triggering electrified grilles when thrown."
diff --git a/html/changelogs/AutoChangeLog-pr-8858.yml b/html/changelogs/AutoChangeLog-pr-8858.yml
new file mode 100644
index 0000000000..6fc057f88d
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-8858.yml
@@ -0,0 +1,4 @@
+author: "Trilbyspaceclone"
+delete-after: True
+changes:
+ - bugfix: "Made unholy water healtoxinlover"
diff --git a/html/changelogs/AutoChangeLog-pr-8860.yml b/html/changelogs/AutoChangeLog-pr-8860.yml
new file mode 100644
index 0000000000..95593b1dad
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-8860.yml
@@ -0,0 +1,4 @@
+author: "Trilbyspaceclone"
+delete-after: True
+changes:
+ - rscadd: "Zelus Oil, brass flasks"
diff --git a/html/changelogs/AutoChangeLog-pr-8870.yml b/html/changelogs/AutoChangeLog-pr-8870.yml
new file mode 100644
index 0000000000..08c9860a30
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-8870.yml
@@ -0,0 +1,5 @@
+author: "Ghommie"
+delete-after: True
+changes:
+ - tweak: "Toned down many species' female chest sprites to fit the smaller cups."
+ - bugfix: "Fixed some body parts sprites inconsistencies, such as the W/E female and male chest sprites being the same in some species, and jellypeople's legs being one tile off on W/E"
diff --git a/html/changelogs/AutoChangeLog-pr-8872.yml b/html/changelogs/AutoChangeLog-pr-8872.yml
new file mode 100644
index 0000000000..a79ec48298
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-8872.yml
@@ -0,0 +1,5 @@
+author: "deathride58"
+delete-after: True
+changes:
+ - balance: "Normal mops now only use 2 stamina to mop a tile, nerfed from their previous value of 5 stamina per tile mopped."
+ - balance: "Advanced mops now only use 1 stamina to mop turfs, from their former value of 2 stam."
diff --git a/icons/emoji.dmi b/icons/emoji.dmi
index 128a3b243c..089c0ff3f8 100644
Binary files a/icons/emoji.dmi and b/icons/emoji.dmi differ
diff --git a/icons/mob/human_parts.dmi b/icons/mob/human_parts.dmi
index 70aeba6a69..fc6fafb275 100644
Binary files a/icons/mob/human_parts.dmi and b/icons/mob/human_parts.dmi differ
diff --git a/icons/mob/human_parts_greyscale.dmi b/icons/mob/human_parts_greyscale.dmi
index 3bb3874d35..7f10d992bc 100644
Binary files a/icons/mob/human_parts_greyscale.dmi and b/icons/mob/human_parts_greyscale.dmi differ
diff --git a/icons/mob/inhands/equipment/shields_lefthand.dmi b/icons/mob/inhands/equipment/shields_lefthand.dmi
index e9d0dd0d2b..3f29410f98 100644
Binary files a/icons/mob/inhands/equipment/shields_lefthand.dmi and b/icons/mob/inhands/equipment/shields_lefthand.dmi differ
diff --git a/icons/mob/inhands/equipment/shields_righthand.dmi b/icons/mob/inhands/equipment/shields_righthand.dmi
index dda17156fe..2c3f291e43 100644
Binary files a/icons/mob/inhands/equipment/shields_righthand.dmi and b/icons/mob/inhands/equipment/shields_righthand.dmi differ
diff --git a/icons/mob/inhands/equipment/toolbox_lefthand.dmi b/icons/mob/inhands/equipment/toolbox_lefthand.dmi
index b2fa42ce5e..801df7abb8 100644
Binary files a/icons/mob/inhands/equipment/toolbox_lefthand.dmi and b/icons/mob/inhands/equipment/toolbox_lefthand.dmi differ
diff --git a/icons/mob/inhands/equipment/toolbox_righthand.dmi b/icons/mob/inhands/equipment/toolbox_righthand.dmi
index ccb15982dd..f38ddfc9a4 100644
Binary files a/icons/mob/inhands/equipment/toolbox_righthand.dmi and b/icons/mob/inhands/equipment/toolbox_righthand.dmi differ
diff --git a/icons/mob/neck.dmi b/icons/mob/neck.dmi
index 3463065bc7..5eb270d23f 100644
Binary files a/icons/mob/neck.dmi and b/icons/mob/neck.dmi differ
diff --git a/icons/obj/ammo.dmi b/icons/obj/ammo.dmi
index 24ede3c513..6282e555fa 100644
Binary files a/icons/obj/ammo.dmi and b/icons/obj/ammo.dmi differ
diff --git a/icons/obj/barsigns.dmi b/icons/obj/barsigns.dmi
index 50bfbace89..2c4d401088 100644
Binary files a/icons/obj/barsigns.dmi and b/icons/obj/barsigns.dmi differ
diff --git a/icons/obj/bedsheets.dmi b/icons/obj/bedsheets.dmi
index 73dcad452b..1cc99e09e9 100644
Binary files a/icons/obj/bedsheets.dmi and b/icons/obj/bedsheets.dmi differ
diff --git a/icons/obj/clothing/shoes.dmi b/icons/obj/clothing/shoes.dmi
index db0634181b..8d7bd55426 100644
Binary files a/icons/obj/clothing/shoes.dmi and b/icons/obj/clothing/shoes.dmi differ
diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi
index dc3aca6b19..7822cdb8c2 100644
Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ
diff --git a/icons/obj/food/burgerbread.dmi b/icons/obj/food/burgerbread.dmi
index c40dfaaa22..cd7fc1742b 100644
Binary files a/icons/obj/food/burgerbread.dmi and b/icons/obj/food/burgerbread.dmi differ
diff --git a/icons/obj/food/containers.dmi b/icons/obj/food/containers.dmi
index ad3073a140..f64dfd4740 100644
Binary files a/icons/obj/food/containers.dmi and b/icons/obj/food/containers.dmi differ
diff --git a/icons/obj/food/food.dmi b/icons/obj/food/food.dmi
index 6292f7e21a..92b5203f5d 100644
Binary files a/icons/obj/food/food.dmi and b/icons/obj/food/food.dmi differ
diff --git a/icons/obj/hydroponics/growing_vegetables.dmi b/icons/obj/hydroponics/growing_vegetables.dmi
index 9fc1520175..63cf069186 100644
Binary files a/icons/obj/hydroponics/growing_vegetables.dmi and b/icons/obj/hydroponics/growing_vegetables.dmi differ
diff --git a/icons/obj/hydroponics/harvest.dmi b/icons/obj/hydroponics/harvest.dmi
index 054aa47bbd..a1ab5b08e5 100644
Binary files a/icons/obj/hydroponics/harvest.dmi and b/icons/obj/hydroponics/harvest.dmi differ
diff --git a/icons/obj/hydroponics/seeds.dmi b/icons/obj/hydroponics/seeds.dmi
index 4c898aecd3..5a2088c332 100644
Binary files a/icons/obj/hydroponics/seeds.dmi and b/icons/obj/hydroponics/seeds.dmi differ
diff --git a/icons/obj/plushes.dmi b/icons/obj/plushes.dmi
index 586bca61aa..9048739e0c 100644
Binary files a/icons/obj/plushes.dmi and b/icons/obj/plushes.dmi differ
diff --git a/icons/obj/projectiles.dmi b/icons/obj/projectiles.dmi
index bff1b631c3..ad1d34836d 100644
Binary files a/icons/obj/projectiles.dmi and b/icons/obj/projectiles.dmi differ
diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi
index 9037bfc0d0..2a6ec3955a 100644
Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ
diff --git a/modular_citadel/code/controllers/subsystem/shuttle.dm b/modular_citadel/code/controllers/subsystem/shuttle.dm
index bb4592f819..ce3f062bdd 100644
--- a/modular_citadel/code/controllers/subsystem/shuttle.dm
+++ b/modular_citadel/code/controllers/subsystem/shuttle.dm
@@ -1,6 +1,7 @@
-/datum/controller/subsystem/shuttle/proc/autoEnd() //CIT CHANGE - allows shift to end after 3 hours has passed.
- if((world.realtime - SSshuttle.realtimeofstart) > auto_call && EMERGENCY_IDLE_OR_RECALLED) //3 hours
- SSshuttle.emergency.request()
- priority_announce("The shift has come to an end and the shuttle called.")
+/datum/controller/subsystem/shuttle/proc/autoEnd() //CIT CHANGE - allows shift to end after 2 hours have passed.
+ if((world.realtime - SSshuttle.realtimeofstart) > auto_call && EMERGENCY_IDLE_OR_RECALLED) //2 hours
+ SSshuttle.emergency.request(silent = TRUE)
+ priority_announce("The shift has come to an end and the shuttle called. [seclevel2num(get_security_level()) == SEC_LEVEL_RED ? "Red Alert state confirmed: Dispatching priority shuttle. " : "" ]It will arrive in [emergency.timeLeft(600)] minutes.", null, 'sound/ai/shuttlecalled.ogg', "Priority")
log_game("Round time limit reached. Shuttle has been auto-called.")
message_admins("Round time limit reached. Shuttle called.")
+ emergencyNoRecall = TRUE
diff --git a/modular_citadel/code/modules/admin/chat_commands.dm b/modular_citadel/code/modules/admin/chat_commands.dm
index deb3de589e..918b1dda5a 100644
--- a/modular_citadel/code/modules/admin/chat_commands.dm
+++ b/modular_citadel/code/modules/admin/chat_commands.dm
@@ -4,7 +4,7 @@
/datum/tgs_chat_command/wheelofsalt/Run(datum/tgs_chat_user/sender, params)
var/saltresult = "The wheel of salt [pick("clatters","screams","vibrates","clanks","resonates","groans","moans","squeaks","emits a[pick(" god-forsaken"," lewd"," creepy"," generic","n orgasmic"," demonic")] [pick("airhorn","bike horn","trumpet","clown","latex","vore","dog","laughing")] noise")] as it spins violently... And it seems the salt of the day is the "
- var/saltprimarysubject = "[pick("combat","medical","grab","furry","wall","orgasm","cat","ERP","lizard","dog","latex","vision cone","atmospherics","table","chem","vore","dogborg","Skylar Lineman","Mekhi Anderson","Peppermint","rework","cum","dick","cockvore","Medihound","sleeper","belly sleeper","door wires","flightsuit","coder privilege","Developer abuse","ban reason","github self merge","red panda","beret","male catgirl","powergame","hexacrocin","Discord server","Clitadel","Cargonia","Solarian Republic","Main and RP merger","bluespace","salt","chem dispenser theft","Botany","moth","BWOINK","anal vore","stamina","Mason Jakops","mining","noodle","milf","Lavaland","Necropolis","Ashwalker","Chase Redtail","Drew Mint","Pavel Marsk","Jecca Qua","Joker Amari","Durgit","chaplain","Antag","nanite","Syndicate","Nar-Sie","Ratvar","Cult","maint","Foam-Force","AI","cyborg","ghost","clockwork","cyberpunk","vaporwave","Clown","Leon Beech","Mime","security","research","Megafauna","Bubblegum","Ash Drake","Legion","Colossus","White Shuttle","Changeling","Cowboy","Space Ninja","Poly","Revolutionary","Skyrim","forbidden fruits","xenomorph","blob","Nuclear Operative","crossdressing")]"
+ var/saltprimarysubject = "[pick("combat","medical","grab","furry","wall","orgasm","cat","ERP","lizard","dog","latex","vision cone","atmospherics","table","chem","vore","dogborg","Skylar Lineman","Mekhi Anderson","Peppermint","rework","cum","dick","cockvore","Medihound","sleeper","belly sleeper","door wires","flightsuit","coder privilege","Developer abuse","ban reason","github self merge","red panda","beret","male catgirl","powergame","hexacrocin","Discord server","Clitadel","Cargonia","Solarian Republic","Main and RP merger","bluespace","salt","chem dispenser theft","Botany","moth","BWOINK","anal vore","stamina","Mason Jakops","mining","noodle","milf","Lavaland","Necropolis","Ashwalker","Chase Redtail","Drew Mint","Pavel Marsk","Joker Amari","Durgit","chaplain","Antag","nanite","Syndicate","Nar-Sie","Ratvar","Cult","maint","Foam-Force","AI","cyborg","ghost","clockwork","cyberpunk","vaporwave","Clown","Leon Beech","Mime","security","research","Megafauna","Bubblegum","Ash Drake","Legion","Colossus","White Shuttle","Changeling","Cowboy","Space Ninja","Poly","Revolutionary","Skyrim","forbidden fruits","xenomorph","blob","Nuclear Operative","crossdressing")]"
var/saltsecondarysubject = "[pick("rework","changes","r34","ban","removal","addition","leak","proposal","fanart","introduction","tabling","ERP","bikeshedding","crossdressing","sprites","semen keg","argument","theft","nerf","screeching","salt","creampie","lewding","murder","kissing","marriage","replacement","fucking","ship","netflix adaptation","dance","remaster","system","voyeur","decoration","pre-order","bukkake","seduction","worship","gangbang","handholding")]"
if(prob(10))
saltresult += "@here for your salt, all day every day"
diff --git a/modular_citadel/code/modules/client/loadout/__donator.dm b/modular_citadel/code/modules/client/loadout/__donator.dm
index ab03e83b44..347f1fffea 100644
--- a/modular_citadel/code/modules/client/loadout/__donator.dm
+++ b/modular_citadel/code/modules/client/loadout/__donator.dm
@@ -423,8 +423,15 @@ datum/gear/darksabresheath
path = /obj/item/clothing/under/trendy_fit
ckeywhitelist = list("midgetdragon")
+/datum/gear/singery
+ name = "Yellow Performer Outfit"
+ category = SLOT_W_UNIFORM
+ path = /obj/item/clothing/under/singery
+ ckeywhitelist = list("maxlynchy")
+
/datum/gear/csheet
name = "NT Bedsheet"
category = SLOT_NECK
path = /obj/item/bedsheet/captain
- ckeywhitelist = list("tikibomb")
\ No newline at end of file
+ ckeywhitelist = list("tikibomb")
+
diff --git a/modular_citadel/code/modules/mob/living/carbon/human/species_types/ipc.dm b/modular_citadel/code/modules/mob/living/carbon/human/species_types/ipc.dm
index bbbe863ec2..25b8daf2cb 100644
--- a/modular_citadel/code/modules/mob/living/carbon/human/species_types/ipc.dm
+++ b/modular_citadel/code/modules/mob/living/carbon/human/species_types/ipc.dm
@@ -11,6 +11,7 @@
mutant_bodyparts = list("ipc_screen", "ipc_antenna")
default_features = list("ipc_screen" = "Blank", "ipc_antenna" = "None")
meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/ipc
+ mutanttongue = /obj/item/organ/tongue/robot/ipc
exotic_blood = "oil"
@@ -27,9 +28,6 @@
screen.Remove(C)
..()
-/datum/species/ipc/get_spans()
- return SPAN_ROBOT
-
/datum/action/innate/monitor_change
name = "Screen Change"
check_flags = AB_CHECK_CONSCIOUS
diff --git a/modular_citadel/code/modules/mob/living/simple_animal/simplemob_vore_values.dm b/modular_citadel/code/modules/mob/living/simple_animal/simplemob_vore_values.dm
index 2bfd63a25d..78e18fdb5e 100644
--- a/modular_citadel/code/modules/mob/living/simple_animal/simplemob_vore_values.dm
+++ b/modular_citadel/code/modules/mob/living/simple_animal/simplemob_vore_values.dm
@@ -41,6 +41,10 @@
devourable = TRUE
digestable = TRUE
+/mob/living/simple_animal/kiwi
+ devourable = TRUE
+ digestable = TRUE
+
//STATION PETS
/mob/living/simple_animal/pet
devourable = TRUE
@@ -65,7 +69,6 @@
/mob/living/simple_animal/sloth
devourable = TRUE
digestable = TRUE
- feeding = TRUE
/mob/living/simple_animal/parrot
devourable = TRUE
@@ -84,57 +87,48 @@
/mob/living/simple_animal/hostile/lizard
devourable = TRUE
digestable = TRUE
+ feeding = TRUE
+ vore_active = TRUE
+ isPredator = TRUE
+ vore_default_mode = DM_DIGEST
/mob/living/simple_animal/hostile/alien
- devourable = TRUE
- digestable = TRUE
feeding = TRUE
vore_active = TRUE
isPredator = TRUE
vore_default_mode = DM_DIGEST
/mob/living/simple_animal/hostile/bear
- devourable = TRUE
- digestable = TRUE
feeding = TRUE
vore_active = TRUE
isPredator = TRUE
vore_default_mode = DM_DIGEST
/mob/living/simple_animal/hostile/poison/giant_spider
- devourable = TRUE
- digestable = TRUE
feeding = TRUE
vore_active = TRUE
+ isPredator = TRUE
vore_default_mode = DM_DIGEST
/mob/living/simple_animal/hostile/retaliate/poison/snake
- devourable = TRUE
- digestable = TRUE
feeding = TRUE
vore_active = TRUE
isPredator = TRUE
vore_default_mode = DM_DIGEST
/mob/living/simple_animal/hostile/gorilla
- devourable = TRUE
- digestable = TRUE
feeding = TRUE
vore_active = TRUE
isPredator = TRUE
vore_default_mode = DM_DIGEST
/mob/living/simple_animal/hostile/asteroid/goliath
- devourable = TRUE
- digestable = TRUE
- feeding = TRUE
+ feeding = TRUE //for pet Goliaths I guess or something.
vore_active = TRUE
isPredator = TRUE
vore_default_mode = DM_DIGEST
/mob/living/simple_animal/hostile/carp
- devourable = TRUE
- digestable = TRUE
feeding = TRUE
vore_active = TRUE
isPredator = TRUE
diff --git a/modular_citadel/code/modules/projectiles/gun.dm b/modular_citadel/code/modules/projectiles/gun.dm
index ea8af7c74c..317f68b4c4 100644
--- a/modular_citadel/code/modules/projectiles/gun.dm
+++ b/modular_citadel/code/modules/projectiles/gun.dm
@@ -9,13 +9,3 @@
return 0
else
return ..()
-
-/obj/item/gun/proc/getinaccuracy(mob/living/user)
- if(!iscarbon(user))
- return 0
- else
- var/mob/living/carbon/holdingdude = user
- if(istype(holdingdude) && holdingdude.combatmode)
- return max((holdingdude.lastdirchange + weapon_weight * 25) - world.time,0)
- else
- return weapon_weight * 25
diff --git a/modular_citadel/icons/mob/mutant_bodyparts.dmi b/modular_citadel/icons/mob/mutant_bodyparts.dmi
index 5f72d1013b..1e12d2bf1a 100644
Binary files a/modular_citadel/icons/mob/mutant_bodyparts.dmi and b/modular_citadel/icons/mob/mutant_bodyparts.dmi differ
diff --git a/sound/vehicles/rocketlaunch.ogg b/sound/vehicles/rocketlaunch.ogg
new file mode 100644
index 0000000000..d0ee9c7248
Binary files /dev/null and b/sound/vehicles/rocketlaunch.ogg differ
diff --git a/strings/traumas.json b/strings/traumas.json
index f83a023491..81b4fbe902 100644
--- a/strings/traumas.json
+++ b/strings/traumas.json
@@ -132,7 +132,8 @@
"ahelp help security powergaming with mindshields???",
";,g absorbing @pick(roles)",
";chemist can u @pick(create_verbs) holy @pick(mellens) for @pick(s_roles)???!!",
- "@pick(semicolon) LIZZARRD SPEAKIGN IN EVIL BULL LANGUAGE SCI!!"
+ "@pick(semicolon) LIZZARRD SPEAKIGN IN EVIL BULL LANGUAGE SCI!!",
+ "@pick(semicolon)POST REBOOT MESSAGE LOLOL FUCK FUCK FUCK YOU"
],
"mutations": [
@@ -295,4 +296,4 @@
"bluh daymon",
"wizzerd"
]
-}
\ No newline at end of file
+}
diff --git a/tgstation.dme b/tgstation.dme
index bb47c443ff..3a14a0700b 100755
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -336,6 +336,7 @@
#include "code\datums\components\_component.dm"
#include "code\datums\components\anti_magic.dm"
#include "code\datums\components\armor_plate.dm"
+#include "code\datums\components\bouncy.dm"
#include "code\datums\components\butchering.dm"
#include "code\datums\components\caltrop.dm"
#include "code\datums\components\chasm.dm"
@@ -444,8 +445,8 @@
#include "code\datums\helper_datums\icon_snapshot.dm"
#include "code\datums\helper_datums\teleport.dm"
#include "code\datums\helper_datums\topic_input.dm"
+#include "code\datums\looping_sounds\_looping_sound.dm"
#include "code\datums\looping_sounds\item_sounds.dm"
-#include "code\datums\looping_sounds\looping_sound.dm"
#include "code\datums\looping_sounds\machinery_sounds.dm"
#include "code\datums\looping_sounds\weather.dm"
#include "code\datums\martial\boxing.dm"
@@ -1719,6 +1720,7 @@
#include "code\modules\hydroponics\grown\mushrooms.dm"
#include "code\modules\hydroponics\grown\nettle.dm"
#include "code\modules\hydroponics\grown\onion.dm"
+#include "code\modules\hydroponics\grown\peanuts.dm"
#include "code\modules\hydroponics\grown\pineapple.dm"
#include "code\modules\hydroponics\grown\potato.dm"
#include "code\modules\hydroponics\grown\pumpkin.dm"