"
- src << browse(output,"window=playerpoll;size=500x500")
+ if(inline)
+ return output
+ else
+ src << browse(output,"window=playerpoll;size=500x500")
if(POLLTYPE_MULTI)
- var/DBQuery/voted_query = dbcon.NewQuery("SELECT optionid FROM [format_table_name("poll_vote")] WHERE pollid = [pollid] AND ckey = '[usr.ckey]'")
+ var/DBQuery/voted_query = dbcon.NewQuery("SELECT optionid FROM [format_table_name("poll_vote")] WHERE pollid = [pollid] AND ckey = '[ckey]'")
voted_query.Execute()
var/list/votedfor = list()
@@ -258,14 +433,15 @@
if(select_query.item[5])
multiplechoiceoptions = text2num(select_query.item[5])
- var/output = "
Player poll"
- output +="
"
+ var/output
+ if(!inline)
+ output += "
Player poll"
+ output +="
"
output += "
Question: [pollquestion]You can select up to [multiplechoiceoptions] options. If you select more, the first [multiplechoiceoptions] will be saved.
"
output += "
Poll runs from [pollstarttime] until [pollendtime]"
- if(!voted) //Only make this a form if we have not voted yet
- output += "
"
output += "
"
- src << browse(output,"window=playerpoll;size=600x250")
+ if(inline)
+ return output
+ else
+ src << browse(output,"window=playerpoll;size=600x250")
return
-/mob/new_player/proc/vote_on_poll(var/pollid = -1, var/optionid = -1, var/multichoice = 0)
+/client/proc/vote_on_poll(var/pollid = -1, var/optionid = -1, var/multichoice = 0)
if(pollid == -1 || optionid == -1)
return
@@ -301,7 +480,7 @@
establish_db_connection()
if(dbcon.IsConnected())
- var/DBQuery/select_query = dbcon.NewQuery("SELECT starttime, endtime, question, polltype, multiplechoiceoptions FROM [format_table_name("poll_question")] WHERE id = [pollid] AND Now() BETWEEN starttime AND endtime")
+ var/DBQuery/select_query = dbcon.NewQuery("SELECT starttime, endtime, question, polltype, multiplechoiceoptions FROM [format_table_name("poll_question")] WHERE id = [pollid] AND Now() BETWEEN starttime AND endtime [holder ? "AND adminonly = 0" : ""]")
select_query.Execute()
var/validpoll = 0
@@ -316,7 +495,7 @@
break
if(!validpoll)
- to_chat(usr, "\red Poll is not valid.")
+ to_chat(usr, "
Poll is not valid.")
return
var/DBQuery/select_query2 = dbcon.NewQuery("SELECT id FROM [format_table_name("poll_option")] WHERE id = [optionid] AND pollid = [pollid]")
@@ -329,12 +508,12 @@
break
if(!validoption)
- to_chat(usr, "\red Poll option is not valid.")
+ to_chat(usr, "
Poll option is not valid.")
return
var/alreadyvoted = 0
- var/DBQuery/voted_query = dbcon.NewQuery("SELECT id FROM [format_table_name("poll_vote")] WHERE pollid = [pollid] AND ckey = '[usr.ckey]'")
+ var/DBQuery/voted_query = dbcon.NewQuery("SELECT id FROM [format_table_name("poll_vote")] WHERE pollid = [pollid] AND ckey = '[ckey]'")
voted_query.Execute()
while(voted_query.NextRow())
@@ -343,11 +522,11 @@
break
if(!multichoice && alreadyvoted)
- to_chat(usr, "\red You already voted in this poll.")
+ to_chat(usr, "
You already voted in this poll.")
return
if(multichoice && (alreadyvoted >= multiplechoiceoptions))
- to_chat(usr, "\red You already have more than [multiplechoiceoptions] logged votes on this poll. Enough is enough. Contact the database admin if this is an error.")
+ to_chat(usr, "
You already have more than [multiplechoiceoptions] logged votes on this poll. Enough is enough. Contact the database admin if this is an error.")
return
var/adminrank = "Player"
@@ -355,14 +534,14 @@
adminrank = usr.client.holder.rank
- var/DBQuery/insert_query = dbcon.NewQuery("INSERT INTO [format_table_name("poll_vote")] (id ,datetime ,pollid ,optionid ,ckey ,ip ,adminrank) VALUES (null, Now(), [pollid], [optionid], '[usr.ckey]', '[usr.client.address]', '[adminrank]')")
+ var/DBQuery/insert_query = dbcon.NewQuery("INSERT INTO [format_table_name("poll_vote")] (id ,datetime ,pollid ,optionid ,ckey ,ip ,adminrank) VALUES (null, Now(), [pollid], [optionid], '[ckey]', '[usr.client.address]', '[adminrank]')")
insert_query.Execute()
- to_chat(usr, "\blue Vote successful.")
+ to_chat(usr, "
Vote successful.")
usr << browse(null,"window=playerpoll")
-/mob/new_player/proc/log_text_poll_reply(var/pollid = -1, var/replytext = "")
+/client/proc/log_text_poll_reply(var/pollid = -1, var/replytext = "")
if(pollid == -1 || replytext == "")
return
@@ -371,7 +550,7 @@
establish_db_connection()
if(dbcon.IsConnected())
- var/DBQuery/select_query = dbcon.NewQuery("SELECT starttime, endtime, question, polltype FROM [format_table_name("poll_question")] WHERE id = [pollid] AND Now() BETWEEN starttime AND endtime")
+ var/DBQuery/select_query = dbcon.NewQuery("SELECT starttime, endtime, question, polltype FROM [format_table_name("poll_question")] WHERE id = [pollid] AND Now() BETWEEN starttime AND endtime [holder ? "AND adminonly = 0" : ""]")
select_query.Execute()
var/validpoll = 0
@@ -383,12 +562,12 @@
break
if(!validpoll)
- to_chat(usr, "\red Poll is not valid.")
+ to_chat(usr, "
Poll is not valid.")
return
var/alreadyvoted = 0
- var/DBQuery/voted_query = dbcon.NewQuery("SELECT id FROM [format_table_name("poll_textreply")] WHERE pollid = [pollid] AND ckey = '[usr.ckey]'")
+ var/DBQuery/voted_query = dbcon.NewQuery("SELECT id FROM [format_table_name("poll_textreply")] WHERE pollid = [pollid] AND ckey = '[ckey]'")
voted_query.Execute()
while(voted_query.NextRow())
@@ -396,7 +575,7 @@
break
if(alreadyvoted)
- to_chat(usr, "\red You already sent your feedback for this poll.")
+ to_chat(usr, "
You already sent your feedback for this poll.")
return
var/adminrank = "Player"
@@ -413,14 +592,14 @@
to_chat(usr, "The text you entered was blank, contained illegal characters or was too long. Please correct the text and submit again.")
return
- var/DBQuery/insert_query = dbcon.NewQuery("INSERT INTO [format_table_name("poll_textreply")] (id ,datetime ,pollid ,ckey ,ip ,replytext ,adminrank) VALUES (null, Now(), [pollid], '[usr.ckey]', '[usr.client.address]', '[replytext]', '[adminrank]')")
+ var/DBQuery/insert_query = dbcon.NewQuery("INSERT INTO [format_table_name("poll_textreply")] (id ,datetime ,pollid ,ckey ,ip ,replytext ,adminrank) VALUES (null, Now(), [pollid], '[ckey]', '[usr.client.address]', '[replytext]', '[adminrank]')")
insert_query.Execute()
- to_chat(usr, "\blue Feedback logging successful.")
+ to_chat(usr, "
Feedback logging successful.")
usr << browse(null,"window=playerpoll")
-/mob/new_player/proc/vote_on_numval_poll(var/pollid = -1, var/optionid = -1, var/rating = null)
+/client/proc/vote_on_numval_poll(var/pollid = -1, var/optionid = -1, var/rating = null)
if(pollid == -1 || optionid == -1)
return
@@ -429,7 +608,7 @@
establish_db_connection()
if(dbcon.IsConnected())
- var/DBQuery/select_query = dbcon.NewQuery("SELECT starttime, endtime, question, polltype FROM [format_table_name("poll_question")] WHERE id = [pollid] AND Now() BETWEEN starttime AND endtime")
+ var/DBQuery/select_query = dbcon.NewQuery("SELECT starttime, endtime, question, polltype FROM [format_table_name("poll_question")] WHERE id = [pollid] AND Now() BETWEEN starttime AND endtime [holder ? "AND adminonly = 0" : ""]")
select_query.Execute()
var/validpoll = 0
@@ -441,7 +620,7 @@
break
if(!validpoll)
- to_chat(usr, "\red Poll is not valid.")
+ to_chat(usr, "
Poll is not valid.")
return
var/DBQuery/select_query2 = dbcon.NewQuery("SELECT id FROM [format_table_name("poll_option")] WHERE id = [optionid] AND pollid = [pollid]")
@@ -454,12 +633,12 @@
break
if(!validoption)
- to_chat(usr, "\red Poll option is not valid.")
+ to_chat(usr, "
Poll option is not valid.")
return
var/alreadyvoted = 0
- var/DBQuery/voted_query = dbcon.NewQuery("SELECT id FROM [format_table_name("poll_vote")] WHERE optionid = [optionid] AND ckey = '[usr.ckey]'")
+ var/DBQuery/voted_query = dbcon.NewQuery("SELECT id FROM [format_table_name("poll_vote")] WHERE optionid = [optionid] AND ckey = '[ckey]'")
voted_query.Execute()
while(voted_query.NextRow())
@@ -467,7 +646,7 @@
break
if(alreadyvoted)
- to_chat(usr, "\red You already voted in this poll.")
+ to_chat(usr, "
You already voted in this poll.")
return
var/adminrank = "Player"
@@ -475,8 +654,8 @@
adminrank = usr.client.holder.rank
- var/DBQuery/insert_query = dbcon.NewQuery("INSERT INTO [format_table_name("poll_vote")] (id ,datetime ,pollid ,optionid ,ckey ,ip ,adminrank, rating) VALUES (null, Now(), [pollid], [optionid], '[usr.ckey]', '[usr.client.address]', '[adminrank]', [(isnull(rating)) ? "null" : rating])")
+ var/DBQuery/insert_query = dbcon.NewQuery("INSERT INTO [format_table_name("poll_vote")] (id ,datetime ,pollid ,optionid ,ckey ,ip ,adminrank, rating) VALUES (null, Now(), [pollid], [optionid], '[ckey]', '[usr.client.address]', '[adminrank]', [(isnull(rating)) ? "null" : rating])")
insert_query.Execute()
- to_chat(usr, "\blue Vote successful.")
+ to_chat(usr, "
Vote successful.")
usr << browse(null,"window=playerpoll")
\ No newline at end of file
diff --git a/code/modules/mob/new_player/sprite_accessories.dm b/code/modules/mob/new_player/sprite_accessories.dm
index c5f2b1b4f86..ea80c4def16 100644
--- a/code/modules/mob/new_player/sprite_accessories.dm
+++ b/code/modules/mob/new_player/sprite_accessories.dm
@@ -431,106 +431,87 @@
/datum/sprite_accessory/hair/ipc
species_allowed = list("Machine")
glasses_over = 1
+ models_allowed = list("Bishop Cybernetics mtr.", "Hesphiastos Industries mtr.", "Morpheus Cyberkinetics", "Ward-Takahashi mtr.", "Xion Manufacturing Group mtr.", "Shellguard Munitions Monitor Series")
/datum/sprite_accessory/hair/ipc/ipc_screen_pink
name = "Pink IPC Screen"
icon_state = "ipc_pink"
- models_allowed = list("Bishop Cybernetics mtr.", "Hesphiastos Industries mtr.", "Morpheus Cyberkinetics", "Ward-Takahashi mtr.", "Xion Manufacturing Group mtr.")
/datum/sprite_accessory/hair/ipc/ipc_screen_red
name = "Red IPC Screen"
icon_state = "ipc_red"
- models_allowed = list("Bishop Cybernetics mtr.", "Hesphiastos Industries mtr.", "Morpheus Cyberkinetics", "Ward-Takahashi mtr.", "Xion Manufacturing Group mtr.")
/datum/sprite_accessory/hair/ipc/ipc_screen_green
name = "Green IPC Screen"
icon_state = "ipc_green"
- models_allowed = list("Bishop Cybernetics mtr.", "Hesphiastos Industries mtr.", "Morpheus Cyberkinetics", "Ward-Takahashi mtr.", "Xion Manufacturing Group mtr.")
/datum/sprite_accessory/hair/ipc/ipc_screen_blue
name = "Blue IPC Screen"
icon_state = "ipc_blue"
- models_allowed = list("Bishop Cybernetics mtr.", "Hesphiastos Industries mtr.", "Morpheus Cyberkinetics", "Ward-Takahashi mtr.", "Xion Manufacturing Group mtr.")
/datum/sprite_accessory/hair/ipc/ipc_screen_breakout
name = "Breakout IPC Screen"
icon_state = "ipc_breakout"
- models_allowed = list("Bishop Cybernetics mtr.", "Hesphiastos Industries mtr.", "Morpheus Cyberkinetics", "Ward-Takahashi mtr.", "Xion Manufacturing Group mtr.")
/datum/sprite_accessory/hair/ipc/ipc_screen_eight
name = "Eight IPC Screen"
icon_state = "ipc_eight"
- models_allowed = list("Bishop Cybernetics mtr.", "Hesphiastos Industries mtr.", "Morpheus Cyberkinetics", "Ward-Takahashi mtr.", "Xion Manufacturing Group mtr.")
/datum/sprite_accessory/hair/ipc/ipc_screen_rainbow
name = "Rainbow IPC Screen"
icon_state = "ipc_rainbow"
- models_allowed = list("Bishop Cybernetics mtr.", "Hesphiastos Industries mtr.", "Morpheus Cyberkinetics", "Ward-Takahashi mtr.", "Xion Manufacturing Group mtr.")
/datum/sprite_accessory/hair/ipc/ipc_screen_goggles
name = "Goggles IPC Screen"
icon_state = "ipc_goggles"
- models_allowed = list("Bishop Cybernetics mtr.", "Hesphiastos Industries mtr.", "Morpheus Cyberkinetics", "Ward-Takahashi mtr.", "Xion Manufacturing Group mtr.")
/datum/sprite_accessory/hair/ipc/ipc_screen_heart
name = "Heart IPC Screen"
icon_state = "ipc_heart"
- models_allowed = list("Bishop Cybernetics mtr.", "Hesphiastos Industries mtr.", "Morpheus Cyberkinetics", "Ward-Takahashi mtr.", "Xion Manufacturing Group mtr.")
/datum/sprite_accessory/hair/ipc/ipc_screen_monoeye
name = "Monoeye IPC Screen"
icon_state = "ipc_monoeye"
- models_allowed = list("Bishop Cybernetics mtr.", "Hesphiastos Industries mtr.", "Morpheus Cyberkinetics", "Ward-Takahashi mtr.", "Xion Manufacturing Group mtr.")
/datum/sprite_accessory/hair/ipc/ipc_screen_nature
name = "Nature IPC Screen"
icon_state = "ipc_nature"
- models_allowed = list("Bishop Cybernetics mtr.", "Hesphiastos Industries mtr.", "Morpheus Cyberkinetics", "Ward-Takahashi mtr.", "Xion Manufacturing Group mtr.")
/datum/sprite_accessory/hair/ipc/ipc_screen_orange
name = "Orange IPC Screen"
icon_state = "ipc_orange"
- models_allowed = list("Bishop Cybernetics mtr.", "Hesphiastos Industries mtr.", "Morpheus Cyberkinetics", "Ward-Takahashi mtr.", "Xion Manufacturing Group mtr.")
/datum/sprite_accessory/hair/ipc/ipc_screen_purple
name = "Purple IPC Screen"
icon_state = "ipc_purple"
- models_allowed = list("Bishop Cybernetics mtr.", "Hesphiastos Industries mtr.", "Morpheus Cyberkinetics", "Ward-Takahashi mtr.", "Xion Manufacturing Group mtr.")
/datum/sprite_accessory/hair/ipc/ipc_screen_shower
name = "Shower IPC Screen"
icon_state = "ipc_shower"
- models_allowed = list("Bishop Cybernetics mtr.", "Hesphiastos Industries mtr.", "Morpheus Cyberkinetics", "Ward-Takahashi mtr.", "Xion Manufacturing Group mtr.")
/datum/sprite_accessory/hair/ipc/ipc_screen_static
name = "Static IPC Screen"
icon_state = "ipc_static"
- models_allowed = list("Bishop Cybernetics mtr.", "Hesphiastos Industries mtr.", "Morpheus Cyberkinetics", "Ward-Takahashi mtr.", "Xion Manufacturing Group mtr.")
/datum/sprite_accessory/hair/ipc/ipc_screen_yellow
name = "Yellow IPC Screen"
icon_state = "ipc_yellow"
- models_allowed = list("Bishop Cybernetics mtr.", "Hesphiastos Industries mtr.", "Morpheus Cyberkinetics", "Ward-Takahashi mtr.", "Xion Manufacturing Group mtr.")
/datum/sprite_accessory/hair/ipc/ipc_screen_scrolling
name = "Scanline IPC Screen"
icon_state = "ipc_scroll"
- models_allowed = list("Bishop Cybernetics mtr.", "Hesphiastos Industries mtr.", "Morpheus Cyberkinetics", "Ward-Takahashi mtr.", "Xion Manufacturing Group mtr.")
/datum/sprite_accessory/hair/ipc/ipc_screen_console
name = "Console IPC Screen"
icon_state = "ipc_console"
- models_allowed = list("Bishop Cybernetics mtr.", "Hesphiastos Industries mtr.", "Morpheus Cyberkinetics", "Ward-Takahashi mtr.", "Xion Manufacturing Group mtr.")
/datum/sprite_accessory/hair/ipc/ipc_screen_rgb
name = "RGB IPC Screen"
icon_state = "ipc_rgb"
- models_allowed = list("Bishop Cybernetics mtr.", "Hesphiastos Industries mtr.", "Morpheus Cyberkinetics", "Ward-Takahashi mtr.", "Xion Manufacturing Group mtr.")
/datum/sprite_accessory/hair/ipc/ipc_screen_glider
name = "Glider IPC Screen"
icon_state = "ipc_gol_glider"
- models_allowed = list("Bishop Cybernetics mtr.", "Hesphiastos Industries mtr.", "Morpheus Cyberkinetics", "Ward-Takahashi mtr.", "Xion Manufacturing Group mtr.")
/datum/sprite_accessory/hair/ipc/hesphiastos_alt_off
name = "Dark Hesphiastos Screen"
@@ -578,10 +559,67 @@
/datum/sprite_accessory/hair/unathi
species_allowed = list("Unathi")
glasses_over = 1
+ icon = 'icons/mob/body_accessory.dmi'
-/datum/sprite_accessory/hair/unathi/una_horns
- name = "Unathi Horns"
- icon_state = "soghun_horns"
+/datum/sprite_accessory/hair/unathi/una_side_frills
+ icon = 'icons/mob/human_face.dmi'
+ name = "Unathi Side Frills"
+ icon_state = "unathi_sidefrills"
+ secondary_theme = "webbing"
+
+/datum/sprite_accessory/hair/unathi/una_frills_dorsal
+ icon = 'icons/mob/human_face.dmi'
+ name = "Dorsal Frills"
+ icon_state = "unathi_dorsalfrills"
+ secondary_theme = "webbing"
+
+/datum/sprite_accessory/hair/unathi/simple
+ name = "Simple Horns"
+ icon_state = "horns_simple"
+
+/datum/sprite_accessory/hair/unathi/short
+ name = "Short Horns"
+ icon_state = "horns_short"
+
+/datum/sprite_accessory/hairy/unathi/curled
+ name = "Curled Horns"
+ icon_state = "horns_curled"
+
+/datum/sprite_accessory/hair/unathi/ram
+ name = "Ram Horns"
+ icon_state = "horns_ram"
+
+/datum/sprite_accessory/hair/unathi/double
+ name = "Double Horns"
+ icon_state = "horns_drac"
+
+/datum/sprite_accessory/hair/unathi/lower
+ name = "Lower Horns"
+ icon_state = "horns_lower"
+
+/datum/sprite_accessory/hair/unathi/big
+ name = "Big"
+ icon_state = "horns_big"
+
+/datum/sprite_accessory/hair/unathi/ram2
+ name = "Ram alt."
+ icon_state = "horns_ram2"
+
+/datum/sprite_accessory/hair/unathi/small
+ name = "Small"
+ icon_state = "horns_small"
+
+/datum/sprite_accessory/hair/unathi/chin
+ name = "Chin"
+ icon_state = "horns_chin"
+
+/datum/sprite_accessory/hair/unathi/adorns
+ name = "Adorns"
+ icon_state = "horns_adorns"
+
+/datum/sprite_accessory/hair/unathi/spikes
+ name = "Spikes"
+ icon_state = "horns_spikes"
/datum/sprite_accessory/hair/skrell
species_allowed = list("Skrell")
@@ -766,6 +804,20 @@
icon_state = "braided"
secondary_theme = "beads"
+/datum/sprite_accessory/hair/vulpkanin/vulp_hair_punkbraided
+ name = "Punk Braided"
+ icon_state = "punkbraided"
+ secondary_theme = "flare"
+
+/datum/sprite_accessory/hair/vulpkanin/vulp_hair_short2
+ name = "Short Alt."
+ icon_state = "short2"
+ glasses_over = 1
+
+/datum/sprite_accessory/hair/vulpkanin/vulp_hair_rough
+ name = "Rough-Cropped Mane"
+ icon_state = "rough"
+
/datum/sprite_accessory/hair/vox
species_allowed = list("Vox")
glasses_over = 1
@@ -1003,6 +1055,10 @@
name = "Tajara Goatee"
icon_state = "facial_goatee"
+/datum/sprite_accessory/facial_hair/tajara/taj_goatee_faded
+ name = "Tajara Faded Goatee"
+ icon_state = "facial_goatee_faded"
+
/datum/sprite_accessory/facial_hair/tajara/taj_smallstache
name = "Tajara Smallstache"
icon_state = "facial_smallstache"
@@ -1067,6 +1123,15 @@
name = "Swift"
icon_state = "vulp_facial_swift"
+/datum/sprite_accessory/facial_hair/vulpkanin/vulp_elder
+ name = "Elder"
+ icon_state = "vulp_facial_elder"
+ secondary_theme = "chin"
+
+/datum/sprite_accessory/facial_hair/vulpkanin/vulp_slash
+ name = "Slash"
+ icon_state = "vulp_facial_slash"
+
/datum/sprite_accessory/facial_hair/unathi
species_allowed = list("Unathi")
gender = NEUTER
@@ -1074,39 +1139,74 @@
/datum/sprite_accessory/facial_hair/unathi/una_spines_long
name = "Long Spines"
- icon_state = "soghun_longspines"
+ icon_state = "unathi_longspines"
/datum/sprite_accessory/facial_hair/unathi/una_spines_short
name = "Short Spines"
- icon_state = "soghun_shortspines"
+ icon_state = "unathi_shortspines"
+
+/datum/sprite_accessory/facial_hair/unathi/una_frills_aquaspine
+ name = "Spiny Aquatic Frills"
+ icon_state = "unathi_dracfrills"
/datum/sprite_accessory/facial_hair/unathi/una_frills_aquatic
name = "Aquatic Frills"
- icon_state = "soghun_aquaticfrills"
+ icon_state = "unathi_aquaticfrills"
/datum/sprite_accessory/facial_hair/unathi/una_frills_long
name = "Long Frills"
- icon_state = "soghun_longfrills"
+ icon_state = "unathi_longfrills"
/datum/sprite_accessory/facial_hair/unathi/una_frills_short
name = "Short Frills"
- icon_state = "soghun_shortfrills"
+ icon_state = "unathi_shortfrills"
+
+/datum/sprite_accessory/facial_hair/unathi/una_frills_webbed_aquaspine
+ name = "Spiny Aquatic Webbed Frills"
+ icon_state = "unathi_dracfrills"
+ secondary_theme = "webbing"
/datum/sprite_accessory/facial_hair/unathi/una_frills_webbed_aquatic
name = "Aquatic Webbed Frills"
- icon_state = "soghun_aquaticfrills"
+ icon_state = "unathi_aquaticfrills"
secondary_theme = "webbing"
/datum/sprite_accessory/facial_hair/unathi/una_frills_webbed_long
name = "Long Webbed Frills"
- icon_state = "soghun_longfrills"
+ icon_state = "unathi_longfrills"
secondary_theme = "webbing"
/datum/sprite_accessory/facial_hair/unathi/una_frills_webbed_short
name = "Short Webbed Frills"
- icon_state = "soghun_shortfrills"
+ icon_state = "unathi_shortfrills"
secondary_theme = "webbing"
+/datum/sprite_accessory/facial_hair/unathi/una_side_frills
+ name = "Side Frills"
+ icon_state = "unathi_sidefrills"
+ secondary_theme = "webbing"
+
+/datum/sprite_accessory/facial_hair/unathi/una_frills_dorsal
+ over_hair = null
+ name = "Dorsal Frills"
+ icon_state = "unathi_dorsalfrills"
+ secondary_theme = "webbing"
+
+/datum/sprite_accessory/facial_hair/unathi/una_chin_horns
+ name = "Chin Horns"
+ icon = 'icons/mob/body_accessory.dmi'
+ icon_state = "horns_chin"
+
+/datum/sprite_accessory/facial_hair/unathi/una_horn_adorns
+ name = "Horn Adorns"
+ icon = 'icons/mob/body_accessory.dmi'
+ icon_state = "horns_adorns"
+
+/datum/sprite_accessory/facial_hair/unathi/una_spikes
+ name = "Spikes"
+ icon = 'icons/mob/body_accessory.dmi'
+ icon_state = "horns_spikes"
+
//skin styles - WIP
//going to have to re-integrate this with surgery
//let the icon_state hold an icon preview for now
@@ -1151,13 +1251,13 @@
///////////////////////////
/datum/sprite_accessory/underwear
icon = 'icons/mob/underwear.dmi'
- species_allowed = list("Human", "Unathi", "Diona", "Vulpkanin", "Tajaran", "Kidan", "Grey", "Plasmaman", "Machine", "Slime People", "Skeleton", "Drask")
+ species_allowed = list("Human", "Unathi", "Diona", "Vulpkanin", "Tajaran", "Kidan", "Grey", "Plasmaman", "Machine", "Skrell", "Slime People", "Skeleton", "Drask")
gender = NEUTER
/datum/sprite_accessory/underwear/nude
name = "Nude"
icon_state = null
- species_allowed = list("Human", "Unathi", "Diona", "Vulpkanin", "Tajaran", "Kidan", "Grey", "Plasmaman", "Machine", "Slime People", "Skeleton", "Drask", "Vox")
+ species_allowed = list("Human", "Unathi", "Diona", "Vulpkanin", "Tajaran", "Kidan", "Grey", "Plasmaman", "Machine", "Skrell", "Slime People", "Skeleton", "Drask", "Vox")
/datum/sprite_accessory/underwear/male
gender = MALE
@@ -1277,13 +1377,13 @@
////////////////////////////
/datum/sprite_accessory/undershirt
icon = 'icons/mob/underwear.dmi'
- species_allowed = list("Human", "Unathi", "Diona", "Vulpkanin", "Tajaran", "Kidan", "Grey", "Plasmaman", "Machine", "Slime People", "Skeleton", "Drask")
+ species_allowed = list("Human", "Unathi", "Diona", "Vulpkanin", "Tajaran", "Kidan", "Grey", "Plasmaman", "Machine", "Skrell", "Slime People", "Skeleton", "Drask")
gender = NEUTER
/datum/sprite_accessory/undershirt/nude
name = "Nude"
icon_state = null
- species_allowed = list("Human", "Unathi", "Diona", "Vulpkanin", "Tajaran", "Kidan", "Grey", "Plasmaman", "Machine", "Slime People", "Skeleton", "Drask", "Vox")
+ species_allowed = list("Human", "Unathi", "Diona", "Vulpkanin", "Tajaran", "Kidan", "Grey", "Plasmaman", "Machine", "Skrell", "Slime People", "Skeleton", "Drask", "Vox")
//plain color shirts
/datum/sprite_accessory/undershirt/shirt_white
@@ -1513,13 +1613,13 @@
///////////////////////
/datum/sprite_accessory/socks
icon = 'icons/mob/underwear.dmi'
- species_allowed = list("Human", "Unathi", "Diona", "Vulpkanin", "Tajaran", "Kidan", "Grey", "Plasmaman", "Machine", "Slime People", "Skeleton", "Drask")
+ species_allowed = list("Human", "Unathi", "Diona", "Vulpkanin", "Tajaran", "Kidan", "Grey", "Plasmaman", "Machine", "Skrell", "Slime People", "Skeleton", "Drask")
gender = NEUTER
/datum/sprite_accessory/socks/nude
name = "Nude"
icon_state = null
- species_allowed = list("Human", "Unathi", "Diona", "Vulpkanin", "Tajaran", "Kidan", "Grey", "Plasmaman", "Machine", "Slime People", "Skeleton", "Drask", "Vox")
+ species_allowed = list("Human", "Unathi", "Diona", "Vulpkanin", "Tajaran", "Kidan", "Grey", "Plasmaman", "Machine", "Skrell", "Slime People", "Skeleton", "Drask", "Vox")
/datum/sprite_accessory/socks/white_norm
name = "Normal White"
@@ -1645,7 +1745,7 @@
/datum/sprite_accessory/head_accessory/none
name = "None"
- species_allowed = list("Human", "Unathi", "Diona", "Grey", "Machine", "Tajaran", "Vulpkanin", "Slime People", "Skeleton", "Vox")
+ species_allowed = list("Human", "Unathi", "Diona", "Grey", "Kidan", "Machine", "Tajaran", "Vulpkanin", "Skrell", "Slime People", "Skeleton", "Vox")
icon_state = "accessory_none"
/datum/sprite_accessory/head_accessory/unathi
@@ -1668,6 +1768,38 @@
name = "Ram"
icon_state = "horns_ram"
+/datum/sprite_accessory/head_accessory/unathi/double
+ name = "Double"
+ icon_state = "horns_drac"
+
+/datum/sprite_accessory/head_accessory/unathi/lower
+ name = "Lower"
+ icon_state = "horns_lower"
+
+/datum/sprite_accessory/head_accessory/unathi/big
+ name = "Big"
+ icon_state = "horns_big"
+
+/datum/sprite_accessory/head_accessory/unathi/ram2
+ name = "Ram alt."
+ icon_state = "horns_ram2"
+
+/datum/sprite_accessory/head_accessory/unathi/small
+ name = "Small"
+ icon_state = "horns_small"
+
+/datum/sprite_accessory/head_accessory/unathi/chin
+ name = "Chin"
+ icon_state = "horns_chin"
+
+/datum/sprite_accessory/head_accessory/unathi/adorns
+ name = "Adorns"
+ icon_state = "horns_adorns"
+
+/datum/sprite_accessory/head_accessory/unathi/spikes
+ name = "Spikes"
+ icon_state = "horns_spikes"
+
/datum/sprite_accessory/head_accessory/tajara
species_allowed = list("Tajaran")
@@ -1748,6 +1880,20 @@
name = "Vulpkanin Nose"
icon_state = "markings_face_nose_vulp"
+/datum/sprite_accessory/head_accessory/vulpkanin/vulp_nose2
+ name = "Vulpkanin Nose Alt."
+ icon_state = "markings_face_nose2_vulp"
+
+/datum/sprite_accessory/head_accessory/vulpkanin/vulp_elder
+ icon = 'icons/mob/human_face.dmi'
+ name = "Elder"
+ icon_state = "vulp_facial_elder"
+
+/datum/sprite_accessory/head_accessory/vulpkanin/vulp_slash
+ icon = 'icons/mob/human_face.dmi'
+ name = "Slash"
+ icon_state = "vulp_facial_slash"
+
/datum/sprite_accessory/head_accessory/ipc
species_allowed = list("Machine")
over_hair = 1
@@ -1768,6 +1914,68 @@
name = "Head Light"
icon_state = "light"
+/datum/sprite_accessory/head_accessory/ipc/ipc_side_lights
+ name = "Side Lights"
+ icon_state = "sidelights"
+
+/datum/sprite_accessory/head_accessory/ipc/ipc_side_cyber_head
+ name = "Cyber Pipes"
+ icon_state = "cyberhead"
+
+/datum/sprite_accessory/head_accessory/ipc/ipc_side_antlers
+ name = "Antlers"
+ icon_state = "antlers"
+
+/datum/sprite_accessory/head_accessory/ipc/ipc_side_drone_eyes
+ name = "Drone Eyes"
+ icon_state = "droneeyes"
+
+/datum/sprite_accessory/head_accessory/ipc/ipc_crowned
+ name = "Crowned"
+ icon_state = "crowned"
+
+/datum/sprite_accessory/head_accessory/kidan
+ icon = 'icons/mob/human_face.dmi'
+ species_allowed = list("Kidan")
+ over_hair = 1
+ do_colouration = 1
+
+/datum/sprite_accessory/head_accessory/kidan/perked_antennae
+ name = "Perked-up Antennae"
+ icon_state = "kidan_perky"
+
+/datum/sprite_accessory/head_accessory/kidan/mopey_antennae
+ name = "Mopey Antennae"
+ icon_state = "kidan_mopey"
+
+/datum/sprite_accessory/head_accessory/kidan/curious_antennae
+ name = "Curious Antennae"
+ icon_state = "kidan_curious"
+
+/datum/sprite_accessory/head_accessory/kidan/mopey_antennae
+ name = "Mopey Antennae"
+ icon_state = "kidan_mopey"
+
+/datum/sprite_accessory/head_accessory/kidan/crescent_antennae
+ name = "Crescent Antennae"
+ icon_state = "kidan_crescent"
+
+/datum/sprite_accessory/head_accessory/kidan/alert_antennae
+ name = "Alert Antennae"
+ icon_state = "kidan_alert"
+
+/datum/sprite_accessory/head_accessory/kidan/normal_antennae
+ name = "Normal Antennae"
+ icon_state = "kidan_normal"
+
+/datum/sprite_accessory/head_accessory/kidan/long_antennae
+ name = "Long Antennae"
+ icon_state = "kidan_long"
+
+/datum/sprite_accessory/head_accessory/kidan/moth_antennae
+ name = "Moth Antennae"
+ icon_state = "kidan_moth"
+
/* BODY MARKINGS */
@@ -1779,7 +1987,7 @@
/datum/sprite_accessory/body_markings/none
name = "None"
- species_allowed = list("Human", "Unathi", "Diona", "Grey", "Machine", "Tajaran", "Vulpkanin", "Slime People", "Skeleton", "Vox")
+ species_allowed = list("Human", "Unathi", "Diona", "Grey", "Machine", "Tajaran", "Vulpkanin", "Skrell", "Slime People", "Skeleton", "Vox")
icon_state = "accessory_none"
/datum/sprite_accessory/body_markings/tiger
@@ -1933,6 +2141,10 @@
name = "Vulpkanin Nose"
icon_state = "markings_face_nose_vulp"
+/datum/sprite_accessory/body_markings/head/vulpkanin/nose2_default_vulp
+ name = "Vulpkanin Nose Alt."
+ icon_state = "markings_face_nose2_vulp"
+
/datum/sprite_accessory/body_markings/head/vulpkanin/muzzle_vulp //Companion marking for Vulpkanin Belly Alt..
name = "Vulpkanin Muzzle"
icon_state = "markings_face_full_vulp"
@@ -1968,6 +2180,7 @@
/datum/sprite_accessory/body_markings/head/unathi/snout_lower_una_round
name = "Unathi Lower Round Snout"
icon_state = "markings_face_snout_lower_una"
+ heads_allowed = list("All")
/datum/sprite_accessory/body_markings/head/unathi/banded_una //Companion marking for Unathi Banded.
name = "Unathi Banded Head"
diff --git a/code/modules/modular_computers/computers/machinery/modular_computer.dm b/code/modules/modular_computers/computers/machinery/modular_computer.dm
index a28184fed7a..9e07fc19ddb 100644
--- a/code/modules/modular_computers/computers/machinery/modular_computer.dm
+++ b/code/modules/modular_computers/computers/machinery/modular_computer.dm
@@ -41,9 +41,7 @@ var/list/global_modular_computers = list()
global_modular_computers.Add(src)
/obj/machinery/modular_computer/Destroy()
- if(cpu)
- qdel(cpu)
- cpu = null
+ QDEL_NULL(cpu)
return ..()
/obj/machinery/modular_computer/attack_ghost(mob/dead/observer/user)
diff --git a/code/modules/modular_computers/file_system/computer_file.dm b/code/modules/modular_computers/file_system/computer_file.dm
index 15ae12a2859..40860cb58e0 100644
--- a/code/modules/modular_computers/file_system/computer_file.dm
+++ b/code/modules/modular_computers/file_system/computer_file.dm
@@ -23,7 +23,7 @@ var/global/file_uid = 0
if(holder.holder && holder.holder.active_program == src)
holder.holder.kill_program(forced = TRUE)
holder = null
- ..()
+ return ..()
// Returns independent copy of this file.
/datum/computer_file/proc/clone(rename = 0)
diff --git a/code/modules/modular_computers/file_system/programs/engineering/alarm.dm b/code/modules/modular_computers/file_system/programs/engineering/alarm.dm
index db5966314da..254559c2580 100644
--- a/code/modules/modular_computers/file_system/programs/engineering/alarm.dm
+++ b/code/modules/modular_computers/file_system/programs/engineering/alarm.dm
@@ -16,11 +16,10 @@
AH.register(src, /datum/computer_file/program/alarm_monitor/proc/update_icon)
/datum/computer_file/program/alarm_monitor/Destroy()
- ..()
for(var/datum/alarm_handler/AH in alarm_handlers)
AH.unregister(src)
- qdel(alarm_handlers)
- alarm_handlers = null
+ QDEL_NULL(alarm_handlers)
+ return ..()
/datum/computer_file/program/alarm_monitor/proc/update_icon()
for(var/datum/alarm_handler/AH in alarm_handlers)
diff --git a/code/modules/modular_computers/hardware/ai_slot.dm b/code/modules/modular_computers/hardware/ai_slot.dm
index 5fd3ca1fc6b..4de202ba8b5 100644
--- a/code/modules/modular_computers/hardware/ai_slot.dm
+++ b/code/modules/modular_computers/hardware/ai_slot.dm
@@ -11,9 +11,7 @@
var/locked = FALSE
/obj/item/weapon/computer_hardware/ai_slot/Destroy()
- if(stored_card)
- qdel(stored_card)
- stored_card = null
+ QDEL_NULL(stored_card)
return ..()
diff --git a/code/modules/modular_computers/hardware/battery_module.dm b/code/modules/modular_computers/hardware/battery_module.dm
index 5ef74b74f4b..06ecff641c3 100644
--- a/code/modules/modular_computers/hardware/battery_module.dm
+++ b/code/modules/modular_computers/hardware/battery_module.dm
@@ -14,9 +14,7 @@
..()
/obj/item/weapon/computer_hardware/battery/Destroy()
- if(battery)
- qdel(battery)
- battery = null
+ QDEL_NULL(battery)
return ..()
/obj/item/weapon/computer_hardware/battery/on_remove(obj/item/device/modular_computer/M, mob/living/user = null)
diff --git a/code/modules/modular_computers/hardware/card_slot.dm b/code/modules/modular_computers/hardware/card_slot.dm
index 6d323bb7fca..ff02b69bace 100644
--- a/code/modules/modular_computers/hardware/card_slot.dm
+++ b/code/modules/modular_computers/hardware/card_slot.dm
@@ -11,12 +11,8 @@
var/obj/item/weapon/card/id/stored_card2 = null
/obj/item/weapon/computer_hardware/card_slot/Destroy()
- if(stored_card)
- qdel(stored_card)
- stored_card = null
- if(stored_card2)
- qdel(stored_card2)
- stored_card2 = null
+ QDEL_NULL(stored_card)
+ QDEL_NULL(stored_card2)
return ..()
/obj/item/weapon/computer_hardware/card_slot/GetAccess()
diff --git a/code/modules/ninja/energy_katana.dm b/code/modules/ninja/energy_katana.dm
index 701c4e7080b..0865536bc36 100644
--- a/code/modules/ninja/energy_katana.dm
+++ b/code/modules/ninja/energy_katana.dm
@@ -74,6 +74,5 @@
spark_system.attach(src)
/obj/item/weapon/katana/energy/Destroy()
- qdel(spark_system)
- spark_system = null
+ QDEL_NULL(spark_system)
return ..()
\ No newline at end of file
diff --git a/code/modules/paperwork/frames.dm b/code/modules/paperwork/frames.dm
index 6a2e7d2d8b9..1e16049f4b8 100644
--- a/code/modules/paperwork/frames.dm
+++ b/code/modules/paperwork/frames.dm
@@ -4,7 +4,7 @@
icon = 'icons/obj/bureaucracy.dmi'
usesound = 'sound/items/Deconstruct.ogg'
-
+
var/icon_base
var/obj/displayed
@@ -198,9 +198,7 @@
verbs |= /obj/structure/sign/picture_frame/proc/tilt
/obj/structure/sign/picture_frame/Destroy()
- if(frame)
- qdel(frame)
- frame = null
+ QDEL_NULL(frame)
return ..()
/obj/structure/sign/picture_frame/update_icon()
diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm
index 35de8bd3ed6..60a501f1ecf 100644
--- a/code/modules/paperwork/paper.dm
+++ b/code/modules/paperwork/paper.dm
@@ -267,7 +267,7 @@
// check for exploits
for(var/bad in paper_blacklist)
if(findtext(t,bad))
- to_chat(usr, "\blue You think to yourself, \"Hm.. this is only paper...\"")
+ to_chat(usr, "
You think to yourself, \"Hm.. this is only paper...\"")
log_admin("PAPER: [key_name(usr)] tried to use forbidden word in [src]: [bad].")
message_admins("PAPER: [key_name_admin(usr)] tried to use forbidden word in [src]: [bad].")
return
diff --git a/code/modules/paperwork/paper_bundle.dm b/code/modules/paperwork/paper_bundle.dm
index 1710ae1d485..da20ed65dde 100644
--- a/code/modules/paperwork/paper_bundle.dm
+++ b/code/modules/paperwork/paper_bundle.dm
@@ -94,7 +94,7 @@
qdel(src)
else
- to_chat(user, "\red You must hold \the [P] steady to burn \the [src].")
+ to_chat(user, "
You must hold \the [P] steady to burn \the [src].")
/obj/item/weapon/paper_bundle/examine(mob/user)
if(..(user, 1))
diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm
index afca7fcd953..a9e232560fc 100644
--- a/code/modules/paperwork/photography.dm
+++ b/code/modules/paperwork/photography.dm
@@ -30,6 +30,7 @@
w_class = 2
burn_state = FLAMMABLE
burntime = 5
+ var/blueprints = 0 // Does this have the blueprints?
var/icon/img //Big photo image
var/scribble //Scribble on the back.
var/icon/tiny
@@ -70,7 +71,7 @@
qdel(src)
else
- to_chat(user, "\red You must hold \the [P] steady to burn \the [src].")
+ to_chat(user, "
You must hold \the [P] steady to burn \the [src].")
/obj/item/weapon/photo/examine(mob/user)
if(..(user, 1) || isobserver(user))
@@ -151,6 +152,7 @@
var/pictures_max = 10
var/pictures_left = 10
var/on = 1
+ var/blueprints = 0
var/icon_on = "camera"
var/icon_off = "camera_off"
var/size = 3
@@ -253,6 +255,8 @@ var/list/SpookyGhosts = list("ghost","shade","shade2","ghost-narsie","horror","s
var/atom/A = sorted[i]
if(A)
var/icon/img = getFlatIcon(A)//build_composite_icon(A)
+ if(istype(A, /obj/item/areaeditor/blueprints))
+ blueprints = 1
// If what we got back is actually a picture, draw it.
if(istype(img, /icon))
@@ -351,7 +355,7 @@ var/list/SpookyGhosts = list("ghost","shade","shade2","ghost-narsie","horror","s
y_c--
x_c = x_c - size
- var/datum/picture/P = createpicture(target, user, turfs, mobs, flag)
+ var/datum/picture/P = createpicture(target, user, turfs, mobs, flag, blueprints)
printpicture(user, P)
/obj/item/device/camera/proc/createpicture(atom/target, mob/user, list/turfs, mobs, flag)
@@ -388,6 +392,10 @@ var/list/SpookyGhosts = list("ghost","shade","shade2","ghost-narsie","horror","s
Photo.loc = user.loc
if(!user.get_inactive_hand())
user.put_in_inactive_hand(Photo)
+
+ if(blueprints)
+ Photo.blueprints = 1
+ blueprints = 0
Photo.construct(P)
/obj/item/weapon/photo/proc/construct(var/datum/picture/P)
@@ -409,6 +417,7 @@ var/list/SpookyGhosts = list("ghost","shade","shade2","ghost-narsie","horror","s
p.name = name
p.desc = desc
p.scribble = scribble
+ p.blueprints = blueprints
return p
diff --git a/code/modules/pda/PDA.dm b/code/modules/pda/PDA.dm
index d8b959e6225..966a418e5ad 100755
--- a/code/modules/pda/PDA.dm
+++ b/code/modules/pda/PDA.dm
@@ -440,7 +440,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
scanmode.scan_atom(A, user)
/obj/item/device/pda/proc/explode() //This needs tuning.
- if(!detonate)
+ if(!detonate)
return
var/turf/T = get_turf(src.loc)
@@ -467,9 +467,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
for(var/A in programs)
qdel(A)
programs.Cut()
- if(cartridge)
- qdel(cartridge)
- cartridge = null
+ QDEL_NULL(cartridge)
return ..()
// Pass along the pulse to atoms in contents, largely added so pAIs are vulnerable to EMP
diff --git a/code/modules/pda/cart.dm b/code/modules/pda/cart.dm
index 30d26607113..0fa2c10c88e 100644
--- a/code/modules/pda/cart.dm
+++ b/code/modules/pda/cart.dm
@@ -24,9 +24,7 @@
..()
/obj/item/weapon/cartridge/Destroy()
- if(radio)
- qdel(radio)
- radio = null
+ QDEL_NULL(radio)
for(var/A in programs)
qdel(A)
programs.Cut()
diff --git a/code/modules/pda/chatroom.dm b/code/modules/pda/chatroom.dm
index af03356f01f..de6f434a7dd 100644
--- a/code/modules/pda/chatroom.dm
+++ b/code/modules/pda/chatroom.dm
@@ -78,6 +78,7 @@ var/list/chatrooms = list(new /datum/chatroom("General Discussion"))
ch.users -= src
if(src in ch.invites)
ch.invites -= src
+ return ..()
/datum/data/pda/app/chatroom/start()
. = ..()
diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm
index 9e1618aa280..03a84d161e5 100644
--- a/code/modules/power/apc.dm
+++ b/code/modules/power/apc.dm
@@ -90,7 +90,6 @@
var/update_overlay = -1
var/global/status_overlays = 0
var/updating_icon = 0
- var/standard_max_charge
var/datum/wires/apc/wires = null
//var/debug = 0
var/global/list/status_overlays_lock
@@ -142,9 +141,6 @@
apcs += src
apcs = sortAtom(apcs)
wires = new(src)
- var/tmp/obj/item/weapon/stock_parts/cell/tmp_cell = new
- standard_max_charge = tmp_cell.maxcharge
- qdel(tmp_cell)
// offset 24 pixels in direction of dir
// this allows the APC to be embedded in a wall, yet still inside an area
@@ -178,11 +174,8 @@
area.power_change()
if(occupier)
malfvacate(1)
- qdel(wires)
- wires = null
- if(cell)
- qdel(cell) // qdel
- cell = null
+ QDEL_NULL(wires)
+ QDEL_NULL(cell)
if(terminal)
disconnect_terminal()
area.apc -= src
@@ -201,7 +194,7 @@
if(cell_type)
src.cell = new/obj/item/weapon/stock_parts/cell(src)
cell.maxcharge = cell_type // cell_type is maximum charge (old default was 1000 or 2500 (values one and two respectively)
- cell.charge = start_charge * cell.maxcharge / 100.0 // (convert percentage to actual value)
+ cell.charge = start_charge * cell.maxcharge / 100 // (convert percentage to actual value)
var/area/A = get_area(src)
@@ -234,7 +227,7 @@
if(has_electronics && terminal)
to_chat(user, "The cover is [opened==2?"removed":"open"] and the power cell is [ cell ? "installed" : "missing"].")
else if(!has_electronics && terminal)
- to_chat(user, "There are some wires but no any electronics.")
+ to_chat(user, "There are some wires but no electronics.")
else if(has_electronics && !terminal)
to_chat(user, "Electronics installed but not wired.")
else /* if(!has_electronics && !terminal) */
@@ -502,7 +495,7 @@
to_chat(user, "The interface is broken.")
else
wiresexposed = !wiresexposed
- to_chat(user, "The wires have been [wiresexposed ? "exposed" : "unexposed"]")
+ to_chat(user, "The wires have been [wiresexposed ? "exposed" : "unexposed"].")
update_icon()
else if(istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda)) // trying to unlock the interface with an ID card
@@ -511,7 +504,7 @@
else if(opened)
to_chat(user, "You must close the cover to swipe an ID card.")
else if(wiresexposed)
- to_chat(user, "You must close the panel")
+ to_chat(user, "You must close the panel.")
else if(stat & (BROKEN|MAINT))
to_chat(user, "Nothing happens.")
else
@@ -568,6 +561,7 @@
if(do_after(user, 10 * W.toolspeed, target = src))
if(has_electronics==0)
has_electronics = 1
+ locked = 0
to_chat(user, "
You place the power control board inside the frame.")
qdel(W) // qdel
else if(istype(W, /obj/item/weapon/apc_electronics) && opened && has_electronics==0 && ((stat & BROKEN) || malfhack))
@@ -634,7 +628,7 @@
opened = 2
user.visible_message("
The APC cover was knocked down with the [W.name] by [user.name]!", \
"
You knock down the APC cover with your [W.name]!", \
- "You hear bang")
+ "You hear a bang.")
update_icon()
else
if(istype(user, /mob/living/silicon))
@@ -649,14 +643,14 @@
user.do_attack_animation(src)
user.visible_message("
The [src.name] has been hit with the [W.name] by [user.name]!", \
"
You hit the [src.name] with your [W.name]!", \
- "You hear bang")
+ "You hear a bang.")
/obj/machinery/power/apc/emag_act(user as mob)
if(!(emagged || malfhack)) // trying to unlock with an emag card
if(opened)
to_chat(user, "You must close the cover to swipe an ID card.")
else if(wiresexposed)
- to_chat(user, "You must close the panel first")
+ to_chat(user, "You must close the panel first.")
else if(stat & (BROKEN|MAINT))
to_chat(user, "Nothing happens.")
else
@@ -722,7 +716,7 @@
return
/obj/machinery/power/apc/attack_ghost(mob/user)
- if(wiresexposed)
+ if(wiresexposed)
wires.Interact(user)
return ui_interact(user)
@@ -810,7 +804,7 @@
data["powerChannels"] = powerChannels
- return data
+ return data
/obj/machinery/power/apc/proc/report()
return "[area.name] : [equipment]/[lighting]/[environ] ([lastused_equip+lastused_light+lastused_environ]) : [cell? cell.percent() : "N/C"] ([charging])"
diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm
index 176ce72f005..775c53fee72 100644
--- a/code/modules/power/cable.dm
+++ b/code/modules/power/cable.dm
@@ -74,6 +74,12 @@ By design, d1 is the smallest direction and d2 is the highest
if(level==1) hide(T.intact)
cable_list += src //add it to the global cable list
+ // Catches the interim-zone of worldstart and roundstart
+ // I want both the ticker to exist (so mapped-in cables don't trip this)
+ // but also not have started yet (since the zlevel system would handle this on its own otherwise)
+ if((ticker && ticker.current_state < GAME_STATE_PLAYING))
+ attempt_init()
+
/obj/structure/cable/Destroy() // called when a cable is deleted
if(powernet)
@@ -125,7 +131,7 @@ By design, d1 is the smallest direction and d2 is the highest
return */
///// Z-Level Stuff
/* if(breaker_box)
- to_chat(user, "\red This cable is connected to nearby breaker box. Use breaker box to interact with it.")
+ to_chat(user, "
This cable is connected to nearby breaker box. Use breaker box to interact with it.")
return */
if(shock(user, 50))
@@ -475,6 +481,7 @@ var/global/list/datum/stack_recipe/cable_coil_recipes = list(
item_state = "coil_red"
amount = MAXCOIL
max_amount = MAXCOIL
+ merge_type = /obj/item/stack/cable_coil // This is here to let its children merge between themselves
color = COLOR_RED
desc = "A coil of power cable."
throwforce = 10
@@ -807,4 +814,4 @@ var/global/list/datum/stack_recipe/cable_coil_recipes = list(
/obj/item/stack/cable_coil/cyborg/attack_self(mob/user)
var/cablecolor = input(user,"Pick a cable color.","Cable Color") in list("red","yellow","green","blue","pink","orange","cyan","white")
color = cablecolor
- update_icon()
\ No newline at end of file
+ update_icon()
diff --git a/code/modules/power/cable_heavyduty.dm b/code/modules/power/cable_heavyduty.dm
index 87a25032eb7..e0992d1b79e 100644
--- a/code/modules/power/cable_heavyduty.dm
+++ b/code/modules/power/cable_heavyduty.dm
@@ -16,10 +16,10 @@
return
if(istype(W, /obj/item/weapon/wirecutters))
- to_chat(usr, "\blue These cables are too tough to be cut with those [W.name].")
+ to_chat(usr, "
These cables are too tough to be cut with those [W.name].")
return
else if(istype(W, /obj/item/stack/cable_coil))
- to_chat(usr, "\blue You will need heavier cables to connect to these.")
+ to_chat(usr, "
You will need heavier cables to connect to these.")
return
else
..()
diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm
index f88dce25b51..942ed2ac98a 100644
--- a/code/modules/power/cell.dm
+++ b/code/modules/power/cell.dm
@@ -5,24 +5,25 @@
return 100.0*charge/maxcharge
// use power from a cell
-/obj/item/weapon/stock_parts/cell/proc/use(var/amount)
+/obj/item/weapon/stock_parts/cell/proc/use(amount)
if(rigged && amount > 0)
explode()
return 0
-
- if(charge < amount) return 0
+ if(charge < amount)
+ return 0
charge = (charge - amount)
return 1
// recharge the cell
-/obj/item/weapon/stock_parts/cell/proc/give(var/amount)
+/obj/item/weapon/stock_parts/cell/proc/give(amount)
if(rigged && amount > 0)
explode()
return 0
-
- if(maxcharge < amount) return 0
+ if(maxcharge < amount)
+ return 0
var/power_used = min(maxcharge-charge,amount)
- if(crit_fail) return 0
+ if(crit_fail)
+ return 0
if(!prob(reliability))
minor_fault++
if(prob(minor_fault))
@@ -31,7 +32,6 @@
charge += power_used
return power_used
-
/obj/item/weapon/stock_parts/cell/examine(mob/user)
if(..(user, 1))
if(maxcharge <= 2500)
@@ -39,7 +39,7 @@
else
to_chat(user, "This power cell has an exciting chrome finish, as it is an uber-capacity cell type! It has a power rating of [maxcharge]!\nThe charge meter reads [round(src.percent() )]%.")
if(crit_fail)
- to_chat(user, "\red This power cell seems to be faulty.")
+ to_chat(user, "
This power cell seems to be faulty.")
/obj/item/weapon/stock_parts/cell/attack_self(mob/user as mob)
src.add_fingerprint(user)
diff --git a/code/modules/power/gravitygenerator.dm b/code/modules/power/gravitygenerator.dm
index 5b015fcf58d..a9893d690c8 100644
--- a/code/modules/power/gravitygenerator.dm
+++ b/code/modules/power/gravitygenerator.dm
@@ -32,6 +32,11 @@ var/const/GRAV_NEEDS_WRENCH = 3
if(severity == 1) // Very sturdy.
set_broken()
+/obj/machinery/gravity_generator/tesla_act(power, explosive)
+ ..()
+ if(explosive)
+ qdel(src)//like the singulo, tesla deletes it. stops it from exploding over and over
+
/obj/machinery/gravity_generator/update_icon()
..()
icon_state = "[get_status()]_[sprite_number]"
@@ -52,8 +57,7 @@ var/const/GRAV_NEEDS_WRENCH = 3
/obj/machinery/gravity_generator/part/Destroy()
set_broken()
- if(main_part)
- qdel(main_part)
+ QDEL_NULL(main_part)
return ..()
//
diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm
index b8d6d214464..a1e97bf58d2 100644
--- a/code/modules/power/lighting.dm
+++ b/code/modules/power/lighting.dm
@@ -403,7 +403,7 @@
// Aliens smash the bulb but do not get electrocuted./N
/obj/machinery/light/attack_alien(mob/living/carbon/alien/humanoid/user)//So larva don't go breaking light bulbs.
if(status == LIGHT_EMPTY||status == LIGHT_BROKEN)
- to_chat(user, "\green That object is useless to you.")
+ to_chat(user, "
That object is useless to you.")
return
else if(status == LIGHT_OK||status == LIGHT_BURNED)
user.do_attack_animation(src)
@@ -414,7 +414,7 @@
/obj/machinery/light/attack_animal(mob/living/simple_animal/M)
if(M.melee_damage_upper == 0) return
if(status == LIGHT_EMPTY||status == LIGHT_BROKEN)
- to_chat(M, "\red That object is useless to you.")
+ to_chat(M, "
That object is useless to you.")
return
else if(status == LIGHT_OK||status == LIGHT_BURNED)
M.do_attack_animation(src)
@@ -533,6 +533,11 @@
on = 1
update()
+/obj/machinery/light/tesla_act(power, explosive = FALSE)
+ if(explosive)
+ explosion(loc,0,0,0,flame_range = 5, adminlog = 0)
+ qdel(src)
+
// explosion effect
// destroy the whole light fixture or just shatter it
@@ -696,7 +701,7 @@
/obj/item/weapon/light/proc/shatter()
if(status == LIGHT_OK || status == LIGHT_BURNED)
- src.visible_message("\red [name] shatters.","\red You hear a small glass object shatter.")
+ src.visible_message("
[name] shatters.","
You hear a small glass object shatter.")
status = LIGHT_BROKEN
force = 5
sharp = 1
diff --git a/code/modules/power/singularity/collector.dm b/code/modules/power/singularity/collector.dm
index c4b44be0524..11c83313737 100644
--- a/code/modules/power/singularity/collector.dm
+++ b/code/modules/power/singularity/collector.dm
@@ -44,7 +44,7 @@ var/global/list/rad_collectors = list()
investigate_log("turned [active?"
on":"
off"] by [user.key]. [P?"Fuel: [round(P.air_contents.toxins/0.29)]%":"
It is empty"].","singulo")
return
else
- to_chat(user, "\red The controls are locked!")
+ to_chat(user, "
The controls are locked!")
return
..()
@@ -57,10 +57,10 @@ var/global/list/rad_collectors = list()
atmosanalyzer_scan(P.air_contents, user)
else if(istype(W, /obj/item/weapon/tank/plasma))
if(!src.anchored)
- to_chat(user, "\red The [src] needs to be secured to the floor first.")
+ to_chat(user, "
The [src] needs to be secured to the floor first.")
return 1
if(src.P)
- to_chat(user, "\red There's already a plasma tank loaded.")
+ to_chat(user, "
There's already a plasma tank loaded.")
return 1
user.drop_item()
src.P = W
@@ -72,7 +72,7 @@ var/global/list/rad_collectors = list()
return 1
else if(istype(W, /obj/item/weapon/wrench))
if(P)
- to_chat(user, "\blue Remove the plasma tank first.")
+ to_chat(user, "
Remove the plasma tank first.")
return 1
playsound(src.loc, W.usesound, 75, 1)
src.anchored = !src.anchored
@@ -90,9 +90,9 @@ var/global/list/rad_collectors = list()
to_chat(user, "The controls are now [src.locked ? "locked." : "unlocked."]")
else
src.locked = 0 //just in case it somehow gets locked
- to_chat(user, "\red The controls can only be locked when the [src] is active")
+ to_chat(user, "
The controls can only be locked when the [src] is active")
else
- to_chat(user, "\red Access denied!")
+ to_chat(user, "
Access denied!")
return 1
else
..()
diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm
index 76472ab0321..7ee9ea5edf1 100644
--- a/code/modules/power/singularity/emitter.dm
+++ b/code/modules/power/singularity/emitter.dm
@@ -154,9 +154,9 @@
investigate_log("turned
on by [key_name(usr)]","singulo")
update_icon()
else
- to_chat(user, "\red The controls are locked!")
+ to_chat(user, "
The controls are locked!")
else
- to_chat(user, "\red The [src] needs to be firmly secured to the floor first.")
+ to_chat(user, "
The [src] needs to be firmly secured to the floor first.")
return 1
@@ -249,7 +249,7 @@
"You hear a ratchet")
src.anchored = 0
if(2)
- to_chat(user, "\red The [src.name] needs to be unwelded from the floor.")
+ to_chat(user, "
The [src.name] needs to be unwelded from the floor.")
return
if(istype(W, /obj/item/weapon/weldingtool))
@@ -259,7 +259,7 @@
return
switch(state)
if(0)
- to_chat(user, "\red The [src.name] needs to be wrenched to the floor.")
+ to_chat(user, "
The [src.name] needs to be wrenched to the floor.")
if(1)
if(WT.remove_fuel(0,user))
playsound(src.loc, WT.usesound, 50, 1)
@@ -272,7 +272,7 @@
to_chat(user, "You weld the [src] to the floor.")
connect_to_network()
else
- to_chat(user, "\red You need more welding fuel to complete this task.")
+ to_chat(user, "
You need more welding fuel to complete this task.")
if(2)
if(WT.remove_fuel(0,user))
playsound(src.loc, WT.usesound, 50, 1)
@@ -285,12 +285,12 @@
to_chat(user, "You cut the [src] free from the floor.")
disconnect_from_network()
else
- to_chat(user, "\red You need more welding fuel to complete this task.")
+ to_chat(user, "
You need more welding fuel to complete this task.")
return
if(istype(W, /obj/item/weapon/card/id) || istype(W, /obj/item/device/pda))
if(emagged)
- to_chat(user, "\red The lock seems to be broken")
+ to_chat(user, "
The lock seems to be broken")
return
if(src.allowed(user))
if(active)
@@ -298,9 +298,9 @@
to_chat(user, "The controls are now [src.locked ? "locked." : "unlocked."]")
else
src.locked = 0 //just in case it somehow gets locked
- to_chat(user, "\red The controls can only be locked when the [src] is online")
+ to_chat(user, "
The controls can only be locked when the [src] is online")
else
- to_chat(user, "\red Access denied.")
+ to_chat(user, "
Access denied.")
return
if(default_deconstruction_screwdriver(user, "emitter_open", "emitter", W))
@@ -319,4 +319,4 @@
locked = 0
emagged = 1
if(user)
- user.visible_message("[user.name] emags the [src.name].","\red You short out the lock.")
+ user.visible_message("[user.name] emags the [src.name].","
You short out the lock.")
diff --git a/code/modules/power/singularity/generator.dm b/code/modules/power/singularity/generator.dm
index 276d3fe80b8..7746128b251 100644
--- a/code/modules/power/singularity/generator.dm
+++ b/code/modules/power/singularity/generator.dm
@@ -1,7 +1,7 @@
/////SINGULARITY SPAWNER
/obj/machinery/the_singularitygen/
name = "Gravitational Singularity Generator"
- desc = "An Odd Device which produces a Gravitational Singularity when set up."
+ desc = "An odd device which produces a Gravitational Singularity when set up."
icon = 'icons/obj/singularity.dmi'
icon_state = "TheSingGen"
anchored = 0
diff --git a/code/modules/power/singularity/particle_accelerator/particle_control.dm b/code/modules/power/singularity/particle_accelerator/particle_control.dm
index 4593ed69072..d0bdc9c6490 100644
--- a/code/modules/power/singularity/particle_accelerator/particle_control.dm
+++ b/code/modules/power/singularity/particle_accelerator/particle_control.dm
@@ -30,8 +30,7 @@
/obj/machinery/particle_accelerator/control_box/Destroy()
if(active)
toggle_power()
- qdel(wires)
- wires = null
+ QDEL_NULL(wires)
return ..()
/obj/machinery/particle_accelerator/control_box/attack_ghost(user as mob)
diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm
index c0e61cc8236..8754051b8e3 100644
--- a/code/modules/power/singularity/singularity.dm
+++ b/code/modules/power/singularity/singularity.dm
@@ -7,8 +7,9 @@
icon_state = "singularity_s1"
anchored = 1
density = 1
- layer = 6
+ layer = MASSIVE_OBJ_LAYER
light_range = 6
+ appearance_flags = 0
unacidable = 1 //Don't comment this out.
var/current_size = 1
var/allowed_size = 1
@@ -31,13 +32,13 @@
/obj/singularity/New(loc, var/starting_energy = 50, var/temp = 0)
//CARN: admin-alert for chuckle-fuckery.
- singularities += src
admin_investigate_setup()
src.energy = starting_energy
..()
processing_objects.Add(src)
poi_list |= src
+ singularities += src
for(var/obj/machinery/power/singularity_beacon/singubeacon in world)
if(singubeacon.active)
target = singubeacon
@@ -60,7 +61,17 @@
return 0
-/obj/singularity/attack_hand(mob/user as mob)
+/obj/singularity/attack_hand(mob/user)
+ consume(user)
+ return 1
+
+/obj/singularity/attack_alien(mob/user)
+ consume(user)
+
+/obj/singularity/attack_animal(mob/user)
+ consume(user)
+
+/obj/singularity/attackby(obj/item/weapon/W, mob/user, params)
consume(user)
return 1
@@ -72,16 +83,16 @@
/obj/singularity/ex_act(severity)
switch(severity)
- if(1.0)
+ if(1)
if(current_size <= STAGE_TWO)
investigate_log("has been destroyed by a heavy explosion.","singulo")
qdel(src)
return
else
energy -= round(((energy+1)/2),1)
- if(2.0)
+ if(2)
energy -= round(((energy+1)/3),1)
- if(3.0)
+ if(3)
energy -= round(((energy+1)/4),1)
return
@@ -119,8 +130,9 @@
/obj/singularity/proc/admin_investigate_setup()
last_warning = world.time
- var/count = locate(/obj/machinery/field/containment) in orange(30, src)
- if(!count) message_admins("A singularity has been created without containment fields active at [x], [y], [z] (
JMP)")
+ var/count = locate(/obj/machinery/field/containment) in urange(30, src, 1)
+ if(!count)
+ message_admins("A singularity has been created without containment fields active at [x], [y], [z] (
JMP)")
investigate_log("was created. [count?"":"
No containment fields were active"]","singulo")
/obj/singularity/proc/dissipate()
@@ -133,7 +145,7 @@
dissipate_track++
-/obj/singularity/proc/expand(var/force_size = 0)
+/obj/singularity/proc/expand(force_size = 0)
var/temp_allowed_size = src.allowed_size
if(force_size)
temp_allowed_size = force_size
@@ -219,8 +231,6 @@
investigate_log("collapsed.","singulo")
qdel(src)
return 0
- if(energy > 2999 && !consumedSupermatter)
- energy = 2000
switch(energy)//Some of these numbers might need to be changed up later -Mport
if(1 to 199)
allowed_size = STAGE_ONE
@@ -230,10 +240,11 @@
allowed_size = STAGE_THREE
if(1000 to 1999)
allowed_size = STAGE_FOUR
- if(2000 to 2999)
- allowed_size = STAGE_FIVE
- if(3000 to INFINITY)
- allowed_size = STAGE_SIX
+ if(2000 to INFINITY)
+ if(energy >= 3000 && consumedSupermatter)
+ allowed_size = STAGE_SIX
+ else
+ allowed_size = STAGE_FIVE
if(current_size != allowed_size)
expand()
return 1
@@ -258,7 +269,8 @@
consume(X)
CHECK_TICK
-/obj/singularity/proc/consume(var/atom/A)
+
+/obj/singularity/proc/consume(atom/A)
var/gain = A.singularity_act(current_size)
src.energy += gain
if(istype(A, /obj/machinery/power/supermatter_shard) && !consumedSupermatter)
@@ -269,7 +281,7 @@
return
-/obj/singularity/proc/move(var/force_move = 0)
+/obj/singularity/proc/move(force_move = 0)
if(!move_self)
return 0
@@ -284,7 +296,7 @@
step(src, movement_dir)
-/obj/singularity/proc/check_turfs_in(var/direction = 0, var/step = 0)
+/obj/singularity/proc/check_turfs_in(direction = 0, step = 0)
if(!direction)
return 0
var/steps = 0
@@ -352,6 +364,7 @@
return 0
return 1
+
/obj/singularity/proc/event()
var/numb = pick(1,2,3,4,5,6)
switch(numb)
@@ -382,9 +395,9 @@
/obj/singularity/proc/combust_mobs()
- for(var/mob/living/carbon/C in orange(20, src))
+ for(var/mob/living/carbon/C in urange(20, src, 1))
C.visible_message("
[C]'s skin bursts into flame!", \
- "
You feel an inner fire as your skin is suddenly covered in fire!")
+ "
You feel an inner fire as your skin bursts into flames!")
C.adjust_fire_stacks(5)
C.IgniteMob()
return
@@ -396,7 +409,7 @@
continue
if(M.stat == CONSCIOUS)
- if(istype(M,/mob/living/carbon/human))
+ if(ishuman(M))
var/mob/living/carbon/human/H = M
if(istype(H.glasses, /obj/item/clothing/glasses/meson))
var/obj/item/clothing/glasses/meson/MS = H.glasses
@@ -416,11 +429,9 @@
/obj/singularity/proc/pulse()
-
for(var/obj/machinery/power/rad_collector/R in rad_collectors)
- if(get_dist(R, src) <= 15) // Better than using orange() every process
+ if(R.z == z && get_dist(R, src) <= 15) // Better than using orange() every process
R.receive_pulse(energy)
- return
/obj/singularity/singularity_act()
var/gain = (energy/2)
diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm
index b8c0133d8f3..f73d306d15b 100644
--- a/code/modules/power/smes.dm
+++ b/code/modules/power/smes.dm
@@ -438,7 +438,7 @@
if(is_station_level(src.z))
if(prob(1)) //explosion
for(var/mob/M in viewers(src))
- M.show_message("\red The [src.name] is making strange noises!", 3, "\red You hear sizzling electronics.", 2)
+ M.show_message("
The [src.name] is making strange noises!", 3, "
You hear sizzling electronics.", 2)
sleep(10*pick(4,5,6,7,10,14))
var/datum/effect/system/harmless_smoke_spread/smoke = new /datum/effect/system/harmless_smoke_spread()
smoke.set_up(3, 0, src.loc)
diff --git a/code/modules/power/supermatter/sm_shard.dm b/code/modules/power/supermatter/sm_shard.dm
index 690aeac6fce..2ffd5b040ec 100644
--- a/code/modules/power/supermatter/sm_shard.dm
+++ b/code/modules/power/supermatter/sm_shard.dm
@@ -66,13 +66,13 @@
/obj/item/weapon/shard/supermatter/attack_hand(var/mob/user)
if(!istype(user,/mob/living/carbon/human/nucleation))
- to_chat(user, pick( "\red You think twice before touching that without protection.",)
- "\red You don't want to touch that without some protection.",
- "\red You probably should get something else to pick that up.",
- "\red You aren't sure that's a good idea.",
- "\red You aren't in the mood to get vaporized today.",
- "\red You really don't feel like frying your hand off.",
- "\red You assume that's a bad idea." )
+ to_chat(user, pick( "
You think twice before touching that without protection.",)
+ "
You don't want to touch that without some protection.",
+ "
You probably should get something else to pick that up.",
+ "
You aren't sure that's a good idea.",
+ "
You aren't in the mood to get vaporized today.",
+ "
You really don't feel like frying your hand off.",
+ "
You assume that's a bad idea." )
return
..()
diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm
index c1a202fa134..344971d42a2 100644
--- a/code/modules/power/supermatter/supermatter.dm
+++ b/code/modules/power/supermatter/supermatter.dm
@@ -72,9 +72,7 @@
/obj/machinery/power/supermatter_shard/Destroy()
investigate_log("has been destroyed.", "supermatter")
- if(radio)
- qdel(radio)
- radio = null
+ QDEL_NULL(radio)
poi_list.Remove(src)
return ..()
diff --git a/code/modules/power/switch.dm b/code/modules/power/switch.dm
index cba253be5f0..34e867005e1 100644
--- a/code/modules/power/switch.dm
+++ b/code/modules/power/switch.dm
@@ -29,25 +29,25 @@
to_chat(user, "The switch is in the off position")
/obj/structure/powerswitch/attack_ai(mob/user)
- to_chat(user, "\red You're an AI. This is a manual switch. It's not going to work.")
+ to_chat(user, "
You're an AI. This is a manual switch. It's not going to work.")
return
/obj/structure/powerswitch/attack_hand(mob/user)
if(busy)
- to_chat(user, "\red This switch is already being toggled.")
+ to_chat(user, "
This switch is already being toggled.")
return
..()
busy = 1
for(var/mob/O in viewers(user))
- O.show_message(text("\red [user] starts pulling the [src]."), 1)
+ O.show_message(text("
[user] starts pulling the [src]."), 1)
if(do_after(user, 50, target = src))
set_state(!on)
for(var/mob/O in viewers(user))
- O.show_message(text("\red [user] flips the [src] into the [on ? "on": "off"] position."), 1)
+ O.show_message(text("
[user] flips the [src] into the [on ? "on": "off"] position."), 1)
busy = 0
/obj/structure/powerswitch/proc/set_state(var/state)
diff --git a/code/modules/power/tesla/coil.dm b/code/modules/power/tesla/coil.dm
index 2bee73f7a97..715318f0992 100644
--- a/code/modules/power/tesla/coil.dm
+++ b/code/modules/power/tesla/coil.dm
@@ -2,27 +2,40 @@
name = "tesla coil"
desc = "For the union!"
icon = 'icons/obj/tesla_engine/tesla_coil.dmi'
- icon_state = "coil"
+ icon_state = "coil0"
anchored = 0
density = 1
+
var/power_loss = 2
var/input_power_multiplier = 1
+ var/zap_cooldown = 100
+ var/last_zap = 0
+ var/datum/wires/tesla_coil/wires = null
/obj/machinery/power/tesla_coil/New()
..()
component_parts = list()
component_parts += new /obj/item/weapon/circuitboard/tesla_coil(null)
component_parts += new /obj/item/weapon/stock_parts/capacitor(null)
+ wires = new(src)
RefreshParts()
+/obj/machinery/power/tesla_coil/Destroy()
+ if(wires)
+ qdel(wires)
+ wires = null
+ return ..()
+
/obj/machinery/power/tesla_coil/RefreshParts()
var/power_multiplier = 0
+ zap_cooldown = 100
for(var/obj/item/weapon/stock_parts/capacitor/C in component_parts)
power_multiplier += C.rating
+ zap_cooldown -= (C.rating * 20)
input_power_multiplier = power_multiplier
/obj/machinery/power/tesla_coil/attackby(obj/item/W, mob/user, params)
- if(default_deconstruction_screwdriver(user, "coil", "coil", W))
+ if(default_deconstruction_screwdriver(user, "coil_open[anchored]", "coil[anchored]", W))
return
if(exchange_parts(user, W))
@@ -38,22 +51,43 @@
if(default_deconstruction_crowbar(W))
return
- return ..()
+ else if(iswirecutter(W) || ismultitool(W) || istype(W, /obj/item/device/assembly/signaler))
+ if(panel_open)
+ wires.Interact(user)
+
+ else
+ ..()
/obj/machinery/power/tesla_coil/tesla_act(var/power)
- being_shocked = 1
- var/power_produced = power / power_loss
- add_avail(power_produced*input_power_multiplier)
- flick("coilhit", src)
+ if(anchored && !panel_open)
+ being_shocked = 1
+ //don't lose arc power when it's not connected to anything
+ //please place tesla coils all around the station to maximize effectiveness
+ var/power_produced = powernet ? power / power_loss : power
+ add_avail(power_produced*input_power_multiplier)
+ flick("coilhit", src)
+ playsound(src.loc, 'sound/magic/LightningShock.ogg', 100, 1, extrarange = 5)
+ tesla_zap(src, 5, power_produced)
+ addtimer(src, "reset_shocked", 10)
+ else
+ ..()
+
+/obj/machinery/power/tesla_coil/proc/zap()
+ if((last_zap + zap_cooldown) > world.time || !powernet)
+ return FALSE
+ last_zap = world.time
+ var/coeff = (20 - ((input_power_multiplier - 1) * 3))
+ coeff = max(coeff, 10)
+ var/power = (powernet.avail/2)
+ draw_power(power)
playsound(src.loc, 'sound/magic/LightningShock.ogg', 100, 1, extrarange = 5)
- tesla_zap(src, 5, power_produced)
- addtimer(src, "reset_shocked", 10)
+ tesla_zap(src, 10, power/(coeff/2))
/obj/machinery/power/grounding_rod
- name = "Grounding Rod"
+ name = "grounding rod"
desc = "Keep an area from being fried from Edison's Bane."
icon = 'icons/obj/tesla_engine/tesla_coil.dmi'
- icon_state = "grounding_rod"
+ icon_state = "grounding_rod0"
anchored = 0
density = 1
@@ -65,7 +99,7 @@
RefreshParts()
/obj/machinery/power/grounding_rod/attackby(obj/item/W, mob/user, params)
- if(default_deconstruction_screwdriver(user, "grounding_rod", "grounding_rod", W))
+ if(default_deconstruction_screwdriver(user, "grounding_rod_open[anchored]", "grounding_rod[anchored]", W))
return
if(exchange_parts(user, W))
@@ -80,4 +114,7 @@
return ..()
/obj/machinery/power/grounding_rod/tesla_act(var/power)
- flick("coil_shock_1", src)
+ if(anchored && !panel_open)
+ flick("grounding_rodhit", src)
+ else
+ ..()
\ No newline at end of file
diff --git a/code/modules/power/tesla/energy_ball.dm b/code/modules/power/tesla/energy_ball.dm
index 67bad46f4b2..6182f105a5c 100644
--- a/code/modules/power/tesla/energy_ball.dm
+++ b/code/modules/power/tesla/energy_ball.dm
@@ -15,7 +15,9 @@ var/list/blacklisted_tesla_types = typecacheof(list(/obj/machinery/atmospherics,
/obj/machinery/field/containment,
/obj/structure/disposalpipe,
/obj/structure/sign,
- /obj/machinery/gateway))
+ /obj/machinery/gateway,
+ /obj/structure/grille,
+ /obj/machinery/the_singularitygen/tesla))
/obj/singularity/energy_ball
name = "energy ball"
@@ -30,12 +32,16 @@ var/list/blacklisted_tesla_types = typecacheof(list(/obj/machinery/atmospherics,
contained = 0
density = 1
energy = 0
+ dissipate = 1
+ dissipate_delay = 5
+ dissipate_strength = 1
var/list/orbiting_balls = list()
var/produced_power
var/energy_to_raise = 32
var/energy_to_lower = -20
-
-
+
+/obj/singularity/energy_ball/ex_act(severity)
+ return
/obj/singularity/energy_ball/Destroy()
if(orbiting && istype(orbiting, /obj/singularity/energy_ball))
@@ -46,8 +52,6 @@ var/list/blacklisted_tesla_types = typecacheof(list(/obj/machinery/atmospherics,
for(var/ball in orbiting_balls)
var/obj/singularity/energy_ball/EB = ball
qdel(EB)
-
- poi_list.Remove(src)
return ..()
@@ -55,24 +59,23 @@ var/list/blacklisted_tesla_types = typecacheof(list(/obj/machinery/atmospherics,
if(!orbiting)
handle_energy()
- move_the_basket_ball(4 + orbiting_balls.len * 2)
+ move_the_basket_ball(4 + orbiting_balls.len * 1.5)
playsound(src.loc, 'sound/magic/lightningbolt.ogg', 100, 1, extrarange = 30)
pixel_x = 0
pixel_y = 0
- dir = tesla_zap(src, 7, TESLA_DEFAULT_POWER)
+ setDir(tesla_zap(src, 7, TESLA_DEFAULT_POWER, TRUE))
pixel_x = -32
pixel_y = -32
for(var/ball in orbiting_balls)
- tesla_zap(ball, rand(1, Clamp(orbiting_balls.len, 3, 7)), TESLA_MINI_POWER)
+ var/range = rand(1, Clamp(orbiting_balls.len, 3, 7))
+ tesla_zap(ball, range, TESLA_MINI_POWER/7*range, TRUE)
else
energy = 0 // ensure we dont have miniballs of miniballs
- return
-
/obj/singularity/energy_ball/examine(mob/user)
..()
if(orbiting_balls.len)
@@ -88,37 +91,43 @@ var/list/blacklisted_tesla_types = typecacheof(list(/obj/machinery/atmospherics,
move_dir = get_dir(src,target)
var/turf/T = get_step(src, move_dir)
if(can_move(T))
- loc = T
+ forceMove(T)
+ setDir(move_dir)
+ for(var/mob/living/carbon/C in loc)
+ dust_mobs(C)
/obj/singularity/energy_ball/proc/handle_energy()
if(energy >= energy_to_raise)
energy_to_lower = energy_to_raise - 20
- energy_to_raise = energy_to_raise * 1.5
+ energy_to_raise = energy_to_raise * 1.25
playsound(src.loc, 'sound/magic/lightning_chargeup.ogg', 100, 1, extrarange = 30)
- spawn(100)
- if(!loc)
- return
- var/obj/singularity/energy_ball/EB = new(loc)
-
- EB.transform *= pick(0.3, 0.4, 0.5, 0.6, 0.7)
- var/icon/I = icon(icon,icon_state,dir)
-
- var/orbitsize = (I.Width() + I.Height()) * pick(0.4, 0.5, 0.6, 0.7, 0.8)
- orbitsize -= (orbitsize / world.icon_size) * (world.icon_size * 0.25)
-
- EB.orbit(src, orbitsize, pick(FALSE, TRUE), rand(10, 25), pick(3, 4, 5, 6, 36))
+ addtimer(src, "new_mini_ball", 100)
else if(energy < energy_to_lower && orbiting_balls.len)
- energy_to_raise = energy_to_raise / 1.5
- energy_to_lower = (energy_to_raise / 1.5) - 20
+ energy_to_raise = energy_to_raise / 1.25
+ energy_to_lower = (energy_to_raise / 1.25) - 20
var/Orchiectomy_target = pick(orbiting_balls)
qdel(Orchiectomy_target)
else if(orbiting_balls.len)
- energy -= orbiting_balls.len * 0.5
+ dissipate() //sing code has a much better system.
+
+/obj/singularity/energy_ball/proc/new_mini_ball()
+ if(!loc)
+ return
+ var/obj/singularity/energy_ball/EB = new(loc)
+
+ EB.transform *= pick(0.3, 0.4, 0.5, 0.6, 0.7)
+ var/icon/I = icon(icon,icon_state,dir)
+
+ var/orbitsize = (I.Width() + I.Height()) * pick(0.4, 0.5, 0.6, 0.7, 0.8)
+ orbitsize -= (orbitsize / world.icon_size) * (world.icon_size * 0.25)
+
+ EB.orbit(src, orbitsize, pick(FALSE, TRUE), rand(10, 25), pick(3, 4, 5, 6, 36))
+
/obj/singularity/energy_ball/Bump(atom/A)
dust_mobs(A)
@@ -129,22 +138,27 @@ var/list/blacklisted_tesla_types = typecacheof(list(/obj/machinery/atmospherics,
/obj/singularity/energy_ball/orbit(obj/singularity/energy_ball/target)
if(istype(target))
target.orbiting_balls += src
- poi_list.Remove(src)
+ poi_list -= src
+ target.dissipate_strength = target.orbiting_balls.len
. = ..()
if(istype(target))
target.orbiting_balls -= src
+ target.dissipate_strength = target.orbiting_balls.len
if(!loc)
qdel(src)
/obj/singularity/energy_ball/proc/dust_mobs(atom/A)
- if(istype(A, /mob/living/carbon))
- var/mob/living/carbon/C = A
- C.dust()
- return
+ if(!iscarbon(A))
+ return
+ for(var/obj/machinery/power/grounding_rod/GR in orange(src, 2))
+ if(GR.anchored)
+ return
+ var/mob/living/carbon/C = A
+ C.dust()
-/proc/tesla_zap(var/atom/source, zap_range = 3, power)
+/proc/tesla_zap(atom/source, zap_range = 3, power, explosive = FALSE, stun_mobs = TRUE)
. = source.dir
if(power < 1000)
return
@@ -156,12 +170,13 @@ var/list/blacklisted_tesla_types = typecacheof(list(/obj/machinery/atmospherics,
var/mob/living/closest_mob
var/obj/machinery/closest_machine
var/obj/structure/closest_structure
+ var/obj/structure/blob/closest_blob
- for(var/A in oview(source, zap_range))
+ for(var/A in oview(source, zap_range+2))
if(istype(A, /obj/machinery/power/tesla_coil))
var/dist = get_dist(source, A)
var/obj/machinery/power/tesla_coil/C = A
- if((dist < closest_dist || !closest_tesla_coil) && !C.being_shocked)
+ if(dist <= zap_range && (dist < closest_dist || !closest_tesla_coil) && !C.being_shocked)
closest_dist = dist
//we use both of these to save on istype and typecasting overhead later on
@@ -174,8 +189,8 @@ var/list/blacklisted_tesla_types = typecacheof(list(/obj/machinery/atmospherics,
continue //no need checking these other things
else if(istype(A, /obj/machinery/power/grounding_rod))
- var/dist = get_dist(source, A)
- if(dist < closest_dist || !closest_grounding_rod)
+ var/dist = get_dist(source, A)-2
+ if(dist <= zap_range && (dist < closest_dist || !closest_grounding_rod))
closest_grounding_rod = A
closest_atom = A
closest_dist = dist
@@ -183,10 +198,10 @@ var/list/blacklisted_tesla_types = typecacheof(list(/obj/machinery/atmospherics,
else if(closest_grounding_rod || is_type_in_typecache(A, blacklisted_tesla_types))
continue
- else if(istype(A, /mob/living))
+ else if(isliving(A))
var/dist = get_dist(source, A)
var/mob/living/L = A
- if((dist < closest_dist || !closest_mob) && L.stat != DEAD)
+ if(dist <= zap_range && (dist < closest_dist || !closest_mob) && L.stat != DEAD && !L.tesla_ignore)
closest_mob = L
closest_atom = A
closest_dist = dist
@@ -197,7 +212,7 @@ var/list/blacklisted_tesla_types = typecacheof(list(/obj/machinery/atmospherics,
else if(istype(A, /obj/machinery))
var/obj/machinery/M = A
var/dist = get_dist(source, A)
- if((dist < closest_dist || !closest_machine) && !M.being_shocked)
+ if(dist <= zap_range && (dist < closest_dist || !closest_machine) && !M.being_shocked)
closest_machine = M
closest_atom = A
closest_dist = dist
@@ -205,10 +220,21 @@ var/list/blacklisted_tesla_types = typecacheof(list(/obj/machinery/atmospherics,
else if(closest_mob)
continue
+ else if(istype(A, /obj/structure/blob))
+ var/obj/structure/blob/B = A
+ var/dist = get_dist(source, A)
+ if(dist <= zap_range && (dist < closest_dist || !closest_tesla_coil) && !B.being_shocked)
+ closest_blob = B
+ closest_atom = A
+ closest_dist = dist
+
+ else if(closest_blob)
+ continue
+
else if(istype(A, /obj/structure))
var/obj/structure/S = A
var/dist = get_dist(source, A)
- if((dist < closest_dist || !closest_tesla_coil) && !S.being_shocked)
+ if(dist <= zap_range && (dist < closest_dist || !closest_tesla_coil) && !S.being_shocked)
closest_structure = S
closest_atom = A
closest_dist = dist
@@ -223,23 +249,27 @@ var/list/blacklisted_tesla_types = typecacheof(list(/obj/machinery/atmospherics,
//per type stuff:
if(closest_tesla_coil)
- closest_tesla_coil.tesla_act(power)
+ closest_tesla_coil.tesla_act(power, explosive)
else if(closest_grounding_rod)
- closest_grounding_rod.tesla_act(power)
+ closest_grounding_rod.tesla_act(power, explosive)
else if(closest_mob)
var/shock_damage = Clamp(round(power/400), 10, 90) + rand(-5, 5)
closest_mob.electrocute_act(shock_damage, source, 1, tesla_shock = 1)
- if(istype(closest_mob, /mob/living/silicon))
+ if(issilicon(closest_mob))
var/mob/living/silicon/S = closest_mob
- S.emp_act(2)
- tesla_zap(S, 7, power / 1.5) // metallic folks bounce it further
+ if(stun_mobs)
+ S.emp_act(2)
+ tesla_zap(S, 7, power / 1.5, explosive, stun_mobs) // metallic folks bounce it further
else
- tesla_zap(closest_mob, 5, power / 1.5)
+ tesla_zap(closest_mob, 5, power / 1.5, explosive, stun_mobs)
else if(closest_machine)
- closest_machine.tesla_act(power)
+ closest_machine.tesla_act(power, explosive)
+
+ else if(closest_blob)
+ closest_blob.tesla_act(power, explosive)
else if(closest_structure)
- closest_structure.tesla_act(power)
\ No newline at end of file
+ closest_structure.tesla_act(power, explosive)
\ No newline at end of file
diff --git a/code/modules/power/tesla/generator.dm b/code/modules/power/tesla/generator.dm
index f511c650c8c..53eea847ad9 100644
--- a/code/modules/power/tesla/generator.dm
+++ b/code/modules/power/tesla/generator.dm
@@ -3,4 +3,8 @@
desc = "Makes the wardenclyffe look like a child's plaything when shot with a particle accelerator."
icon = 'icons/obj/tesla_engine/tesla_generator.dmi'
icon_state = "TheSingGen"
- creation_type = /obj/singularity/energy_ball
\ No newline at end of file
+ creation_type = /obj/singularity/energy_ball
+
+/obj/machinery/the_singularitygen/tesla/tesla_act(power, explosive = FALSE)
+ if(explosive)
+ energy += power
\ No newline at end of file
diff --git a/code/modules/projectiles/ammunition/boxes.dm b/code/modules/projectiles/ammunition/boxes.dm
index 865ddc9641b..6eba670e906 100644
--- a/code/modules/projectiles/ammunition/boxes.dm
+++ b/code/modules/projectiles/ammunition/boxes.dm
@@ -64,42 +64,53 @@
max_ammo = 14
/obj/item/ammo_box/shotgun
- name = "Ammunition Box (slug)"
- icon_state = "slugbox"
+ name = "Shotgun Speedloader (slug)"
+ icon_state = "slugloader"
origin_tech = "combat=2"
ammo_type = /obj/item/ammo_casing/shotgun
max_ammo = 7
materials = list(MAT_METAL=28000)
+ multiple_sprites = 1
/obj/item/ammo_box/shotgun/buck
- name = "Ammunition Box (buckshot)"
- icon_state = "buckshotbox"
+ name = "Shotgun Speedloader (buckshot)"
+ icon_state = "buckloader"
ammo_type = /obj/item/ammo_casing/shotgun/buckshot
+
+/obj/item/ammo_box/shotgun/dragonsbreath
+ name = "Shotgun Speedloader (dragonsbreath)"
+ icon_state = "dragonsbreathloader"
+ ammo_type = /obj/item/ammo_casing/shotgun/incendiary/dragonsbreath
+
+
/obj/item/ammo_box/shotgun/stun
- name = "Ammunition Box (stun shells)"
- icon_state = "stunbox"
+ name = "Shotgun Speedloader (stun shells)"
+ icon_state = "stunloader"
ammo_type = /obj/item/ammo_casing/shotgun/stunslug
- materials = list(MAT_METAL=1750)
+
/obj/item/ammo_box/shotgun/beanbag
- name = "Ammunition Box (beanbag shells)"
- icon_state = "beanbagbox"
+ name = "Shotgun Speedloader (beanbag shells)"
+ icon_state = "beanbagloader"
ammo_type = /obj/item/ammo_casing/shotgun/beanbag
materials = list(MAT_METAL=1750)
+
/obj/item/ammo_box/shotgun/rubbershot
- name = "Ammunition Box (rubbershot shells)"
- icon_state = "rubbershotbox"
+ name = "Shotgun Speedloader (rubbershot shells)"
+ icon_state = "rubbershotloader"
ammo_type = /obj/item/ammo_casing/shotgun/rubbershot
- materials = list(MAT_METAL=28000)
+ materials = list(MAT_METAL=1750)
+
/obj/item/ammo_box/shotgun/tranquilizer
- name = "Ammunition Box (tranquilizer darts)"
- icon_state = "tranqbox"
+ name = "Shotgun Speedloader (tranquilizer darts)"
+ icon_state = "tranqloader"
ammo_type = /obj/item/ammo_casing/shotgun/tranquilizer
materials = list(MAT_METAL=1750)
+
//FOAM DARTS
/obj/item/ammo_box/foambox
name = "ammo box (Foam Darts)"
diff --git a/code/modules/projectiles/ammunition/energy.dm b/code/modules/projectiles/ammunition/energy.dm
index d0b4488d557..cdb0e063184 100644
--- a/code/modules/projectiles/ammunition/energy.dm
+++ b/code/modules/projectiles/ammunition/energy.dm
@@ -3,7 +3,7 @@
desc = "The part of the gun that makes the laser go pew"
caliber = "energy"
projectile_type = /obj/item/projectile/energy
- var/e_cost = 1000 //The amount of energy a cell needs to expend to create this shot.
+ var/e_cost = 100 //The amount of energy a cell needs to expend to create this shot.
var/select_name = "energy"
fire_sound = 'sound/weapons/Laser.ogg'
@@ -13,10 +13,11 @@
/obj/item/ammo_casing/energy/lasergun
projectile_type = /obj/item/projectile/beam/laser
- e_cost = 830
+ e_cost = 83
select_name = "kill"
/obj/item/ammo_casing/energy/laser/hos //allows balancing of HoS and blueshit guns seperately from other energy weapons
+ e_cost = 100
/obj/item/ammo_casing/energy/laser/practice
projectile_type = /obj/item/projectile/beam/practice
@@ -35,13 +36,13 @@
/obj/item/ammo_casing/energy/laser/pulse
projectile_type = /obj/item/projectile/beam/pulse
- e_cost = 2000
+ e_cost = 200
select_name = "DESTROY"
fire_sound = 'sound/weapons/pulse.ogg'
/obj/item/ammo_casing/energy/laser/scatter/pulse
projectile_type = /obj/item/projectile/beam/pulse
- e_cost = 2000
+ e_cost = 200
select_name = "ANNIHILATE"
fire_sound = 'sound/weapons/pulse.ogg'
@@ -55,26 +56,27 @@
/obj/item/ammo_casing/energy/xray
projectile_type = /obj/item/projectile/beam/xray
- e_cost = 500
+ e_cost = 50
fire_sound = 'sound/weapons/laser3.ogg'
/obj/item/ammo_casing/energy/immolator
projectile_type = /obj/item/projectile/beam/immolator
fire_sound = 'sound/weapons/laser3.ogg'
- e_cost = 1250
+ e_cost = 125
/obj/item/ammo_casing/energy/electrode
projectile_type = /obj/item/projectile/energy/electrode
select_name = "stun"
fire_sound = 'sound/weapons/taser.ogg'
- e_cost = 2000
+ e_cost = 200
delay = 15
/obj/item/ammo_casing/energy/electrode/gun
fire_sound = 'sound/weapons/gunshot.ogg'
- e_cost = 1000
+ e_cost = 100
/obj/item/ammo_casing/energy/electrode/hos //allows balancing of HoS and blueshit guns seperately from other energy weapons
+ e_cost = 200
/obj/item/ammo_casing/energy/ion
projectile_type = /obj/item/projectile/ion
@@ -121,7 +123,7 @@
/obj/item/ammo_casing/energy/disabler
projectile_type = /obj/item/projectile/beam/disabler
select_name = "disable"
- e_cost = 500
+ e_cost = 50
fire_sound = 'sound/weapons/taser2.ogg'
/obj/item/ammo_casing/energy/plasma
@@ -129,12 +131,12 @@
select_name = "plasma burst"
fire_sound = 'sound/weapons/plasma_cutter.ogg'
delay = 15
- e_cost = 250
+ e_cost = 25
/obj/item/ammo_casing/energy/plasma/adv
projectile_type = /obj/item/projectile/plasma/adv
delay = 10
- e_cost = 100
+ e_cost = 10
/obj/item/ammo_casing/energy/wormhole
projectile_type = /obj/item/projectile/beam/wormhole
@@ -153,7 +155,7 @@
/obj/item/ammo_casing/energy/bolt
projectile_type = /obj/item/projectile/energy/bolt
select_name = "bolt"
- e_cost = 5000
+ e_cost = 500
fire_sound = 'sound/weapons/Genhit.ogg'
/obj/item/ammo_casing/energy/bolt/large
@@ -163,7 +165,7 @@
/obj/item/ammo_casing/energy/dart
projectile_type = /obj/item/projectile/energy/dart
fire_sound = 'sound/weapons/Genhit.ogg'
- e_cost = 5000
+ e_cost = 500
select_name = "toxic dart"
/obj/item/ammo_casing/energy/instakill
@@ -187,7 +189,7 @@
/obj/item/ammo_casing/energy/shock_revolver
fire_sound = 'sound/magic/lightningbolt.ogg'
- e_cost = 2000
+ e_cost = 200
select_name = "lightning beam"
projectile_type = /obj/item/projectile/energy/shock_revolver
@@ -210,7 +212,7 @@
/obj/item/ammo_casing/energy/teleport
projectile_type = /obj/item/projectile/energy/teleport
fire_sound = 'sound/weapons/wave.ogg'
- e_cost = 1250
+ e_cost = 250
select_name = "teleport beam"
var/teleport_target
diff --git a/code/modules/projectiles/ammunition/magazines.dm b/code/modules/projectiles/ammunition/magazines.dm
index 2de2ae1f8f8..d3cf7702c00 100644
--- a/code/modules/projectiles/ammunition/magazines.dm
+++ b/code/modules/projectiles/ammunition/magazines.dm
@@ -258,7 +258,7 @@
ammo_type = /obj/item/ammo_casing/c46x30mmtox
/obj/item/ammo_box/magazine/wt550m9/wtic
- name = "wt550 magazine (Incindiary 4.6x30mm)"
+ name = "wt550 magazine (Incendiary 4.6x30mm)"
ammo_type = /obj/item/ammo_casing/c46x30mminc
/obj/item/ammo_box/magazine/uzim9mm
diff --git a/code/modules/projectiles/ammunition/special.dm b/code/modules/projectiles/ammunition/special.dm
index d5c7df48200..1af728100f8 100644
--- a/code/modules/projectiles/ammunition/special.dm
+++ b/code/modules/projectiles/ammunition/special.dm
@@ -26,7 +26,7 @@
/obj/item/ammo_casing/magic/chaos
projectile_type = /obj/item/projectile/magic
-
+
/obj/item/ammo_casing/magic/spellblade
projectile_type = /obj/item/projectile/magic/spellblade
@@ -49,4 +49,4 @@
projectile_type = /obj/item/projectile/bullet/midbullet3
select_name = "spraydown"
fire_sound = 'sound/weapons/gunshot_smg.ogg'
- e_cost = 200
+ e_cost = 20
diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm
index 4e5bbce386c..7b848dca5c7 100644
--- a/code/modules/projectiles/guns/energy.dm
+++ b/code/modules/projectiles/guns/energy.dm
@@ -34,7 +34,7 @@
if(selfcharge)
processing_objects.Add(src)
update_icon()
-
+
/obj/item/weapon/gun/energy/proc/update_ammo_types()
var/obj/item/ammo_casing/energy/shot
for(var/i = 1, i <= ammo_type.len, i++)
@@ -61,9 +61,9 @@
var/obj/item/ammo_casing/energy/E = ammo_type[select]
if(use_external_power)
var/obj/item/weapon/stock_parts/cell/external = get_external_power_supply()
- if(!external || !external.use((E.e_cost)/10)) //Take power from the borg...
+ if(!external || !external.use(E.e_cost)) //Take power from the borg...
return //Note, uses /10 because of shitty mods to the cell system
- power_supply.give(1000) //... to recharge the shot
+ power_supply.give(100) //... to recharge the shot
update_icon()
/obj/item/weapon/gun/energy/attack_self(mob/living/user as mob)
@@ -176,7 +176,7 @@
var/mob/living/silicon/robot/R = loc
if(R && R.cell)
var/obj/item/ammo_casing/energy/shot = ammo_type[select] //Necessary to find cost of shot
- if(R.cell.use(shot.e_cost/10)) //Take power from the borg... //Divided by 10 because cells and charge costs are fucked.
+ if(R.cell.use(shot.e_cost)) //Take power from the borg...
power_supply.give(shot.e_cost) //... to recharge the shot
/obj/item/weapon/gun/energy/proc/get_external_power_supply()
diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
index fb811c19d78..bdc4126a25c 100644
--- a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
+++ b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
@@ -94,7 +94,7 @@
empty()
/obj/item/weapon/gun/energy/kinetic_accelerator/proc/empty()
- power_supply.use(5000)
+ power_supply.use(500)
update_icon()
/obj/item/weapon/gun/energy/kinetic_accelerator/proc/attempt_reload()
@@ -120,7 +120,7 @@
return
/obj/item/weapon/gun/energy/kinetic_accelerator/proc/reload()
- power_supply.give(5000)
+ power_supply.give(500)
if(!suppressed)
playsound(loc, 'sound/weapons/kenetic_reload.ogg', 60, 1)
else if(isliving(loc))
@@ -144,7 +144,7 @@
/obj/item/ammo_casing/energy/kinetic
projectile_type = /obj/item/projectile/kinetic
select_name = "kinetic"
- e_cost = 5000
+ e_cost = 500
fire_sound = 'sound/weapons/Kenetic_accel.ogg' // fine spelling there chap
/obj/item/ammo_casing/energy/kinetic/ready_proj(atom/target, mob/living/user, quiet, zone_override = "")
@@ -181,7 +181,7 @@
/obj/item/projectile/kinetic/pod
range = 4
-
+
/obj/item/projectile/kinetic/pod/regular
damage = 50
pressure_decrease = 0.5
diff --git a/code/modules/projectiles/guns/energy/nuclear.dm b/code/modules/projectiles/guns/energy/nuclear.dm
index ef184bd8d5b..727ebdd7082 100644
--- a/code/modules/projectiles/guns/energy/nuclear.dm
+++ b/code/modules/projectiles/guns/energy/nuclear.dm
@@ -39,8 +39,8 @@
/obj/item/weapon/gun/energy/gun/mini/New()
gun_light = new /obj/item/device/flashlight/seclite(src)
..()
- power_supply.maxcharge = 6000
- power_supply.charge = 6000
+ power_supply.maxcharge = 600
+ power_supply.charge = 600
/obj/item/weapon/gun/energy/gun/mini/update_icon()
..()
diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm
index 3131e49c4f2..3595b9c7ea8 100644
--- a/code/modules/projectiles/guns/energy/special.dm
+++ b/code/modules/projectiles/guns/energy/special.dm
@@ -157,11 +157,11 @@
if(istype(A, /obj/item/stack/sheet/mineral/plasma))
var/obj/item/stack/sheet/S = A
S.use(1)
- power_supply.give(10000)
+ power_supply.give(1000)
to_chat(user, "
You insert [A] in [src], recharging it.")
else if(istype(A, /obj/item/weapon/ore/plasma))
qdel(A)
- power_supply.give(5000)
+ power_supply.give(500)
to_chat(user, "
You insert [A] in [src], recharging it.")
else
..()
@@ -308,12 +308,10 @@
desc = "A gun that changes the body temperature of its targets."
var/temperature = 300
var/target_temperature = 300
- var/e_cost = 1000
origin_tech = "combat=3;materials=4;powerstorage=3;magnets=2"
ammo_type = list(/obj/item/ammo_casing/energy/temp)
selfcharge = 1
- cell_type = /obj/item/weapon/stock_parts/cell
var/powercost = ""
var/powercostcolor = ""
@@ -369,19 +367,19 @@
T.temp = temperature
switch(temperature)
if(0 to 100)
- T.e_cost = 3000
+ T.e_cost = 300
powercost = "High"
if(100 to 250)
- T.e_cost = 2000
+ T.e_cost = 200
powercost = "Medium"
if(251 to 300)
- T.e_cost = 1000
+ T.e_cost = 100
powercost = "Low"
if(301 to 400)
- T.e_cost = 2000
+ T.e_cost = 200
powercost = "Medium"
if(401 to 1000)
- T.e_cost = 3000
+ T.e_cost = 300
powercost = "High"
switch(powercost)
if("High")
@@ -471,16 +469,16 @@
/obj/item/weapon/gun/energy/temperature/proc/update_charge()
var/charge = power_supply.charge
switch(charge)
- if(9000 to INFINITY) overlays += "900"
- if(8000 to 9000) overlays += "800"
- if(7000 to 8000) overlays += "700"
- if(6000 to 7000) overlays += "600"
- if(5000 to 6000) overlays += "500"
- if(4000 to 5000) overlays += "400"
- if(3000 to 4000) overlays += "300"
- if(2000 to 3000) overlays += "200"
- if(1000 to 2002) overlays += "100"
- if(-INFINITY to 1000) overlays += "0"
+ if(900 to INFINITY) overlays += "900"
+ if(800 to 900) overlays += "800"
+ if(700 to 800) overlays += "700"
+ if(600 to 700) overlays += "600"
+ if(500 to 600) overlays += "500"
+ if(400 to 500) overlays += "400"
+ if(300 to 400) overlays += "300"
+ if(200 to 300) overlays += "200"
+ if(100 to 202) overlays += "100"
+ if(-INFINITY to 100) overlays += "0"
/obj/item/weapon/gun/energy/mimicgun
name = "mimic gun"
diff --git a/code/modules/projectiles/guns/energy/stun.dm b/code/modules/projectiles/guns/energy/stun.dm
index 9728a9442e1..ea92cb06449 100644
--- a/code/modules/projectiles/guns/energy/stun.dm
+++ b/code/modules/projectiles/guns/energy/stun.dm
@@ -5,23 +5,12 @@
item_state = null //so the human update icon uses the icon_state instead.
ammo_type = list(/obj/item/ammo_casing/energy/electrode)
ammo_x_offset = 3
- cell_type = /obj/item/weapon/stock_parts/cell/crap
/obj/item/weapon/gun/energy/taser/mounted
name = "mounted taser gun"
selfcharge = 1
use_external_power = 1
-/obj/item/weapon/gun/energy/taser/cyborg
- name = "taser gun"
- desc = "A small, low capacity gun used for non-lethal takedowns."
- icon_state = "taser"
- cell_type = /obj/item/weapon/stock_parts/cell/secborg
-
-/obj/item/weapon/gun/energy/disabler/cyborg/newshot()
- ..()
- robocharge()
-
/obj/item/weapon/gun/energy/shock_revolver
name = "tesla revolver"
desc = "A high-tech revolver that fires internal, reusable shock cartridges in a revolving cylinder. The cartridges can be recharged using conventional rechargers."
diff --git a/code/modules/projectiles/guns/energy/telegun.dm b/code/modules/projectiles/guns/energy/telegun.dm
index 7b94698f0e9..2e66b00643f 100644
--- a/code/modules/projectiles/guns/energy/telegun.dm
+++ b/code/modules/projectiles/guns/energy/telegun.dm
@@ -6,7 +6,6 @@
icon_state = "telegun"
item_state = "ionrifle"
origin_tech = "combat=6;materials=7;powerstorage=5;bluespace=5;syndicate=4"
- cell_type = /obj/item/weapon/stock_parts/cell/crap
ammo_type = list(/obj/item/ammo_casing/energy/teleport)
shaded_charge = 1
var/teleport_target = null
diff --git a/code/modules/projectiles/guns/projectile/saw.dm b/code/modules/projectiles/guns/projectile/saw.dm
index 72e4bacebab..cfe8ffbb0a5 100644
--- a/code/modules/projectiles/guns/projectile/saw.dm
+++ b/code/modules/projectiles/guns/projectile/saw.dm
@@ -1,6 +1,6 @@
/obj/item/weapon/gun/projectile/automatic/l6_saw
name = "\improper L6 SAW"
- desc = "A heavily modified 5.56 light machine gun, designated 'L6 SAW'. Has 'Aussec Armoury - 2531' engraved on the reciever below the designation."
+ desc = "A heavily modified 5.56 light machine gun, designated 'L6 SAW'. Has 'Aussec Armoury - 2531' engraved on the receiver below the designation."
icon_state = "l6closed100"
item_state = "l6closedmag"
w_class = 5
diff --git a/code/modules/projectiles/guns/throw.dm b/code/modules/projectiles/guns/throw.dm
index d1bcda59067..7b1fa350fc7 100644
--- a/code/modules/projectiles/guns/throw.dm
+++ b/code/modules/projectiles/guns/throw.dm
@@ -36,8 +36,7 @@
notify_ammo_count(user)
/obj/item/weapon/gun/throw/Destroy()
- qdel(to_launch)
- to_launch = null
+ QDEL_NULL(to_launch)
for(var/atom/A in loaded_projectiles)
qdel(A)
loaded_projectiles = null
diff --git a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
index 0e8fee1926c..2714b8d1b16 100644
--- a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
+++ b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
@@ -93,9 +93,7 @@
return
/obj/machinery/reagentgrinder/Destroy()
- if(beaker)
- qdel(beaker)
- beaker = null
+ QDEL_NULL(beaker)
return ..()
/obj/machinery/reagentgrinder/ex_act(severity)
diff --git a/code/modules/reagents/chemistry/reagents.dm b/code/modules/reagents/chemistry/reagents.dm
index db77f30e76b..cdc214c3089 100644
--- a/code/modules/reagents/chemistry/reagents.dm
+++ b/code/modules/reagents/chemistry/reagents.dm
@@ -26,7 +26,7 @@
var/last_addiction_dose = 0
var/overdosed = 0 // You fucked up and this is now triggering it's overdose effects, purge that shit quick.
var/current_cycle = 1
- var/drink_icon = "glass_brown" // what icon state/name/description a drinking glass will use if this is the master reagent.
+ var/drink_icon = null
var/drink_name = "Glass of ..what?"
var/drink_desc = "You can't really tell what this is."
diff --git a/code/modules/reagents/chemistry/reagents/medicine.dm b/code/modules/reagents/chemistry/reagents/medicine.dm
index fa6a0ddc885..f3c1cf2e96c 100644
--- a/code/modules/reagents/chemistry/reagents/medicine.dm
+++ b/code/modules/reagents/chemistry/reagents/medicine.dm
@@ -635,7 +635,6 @@
M.visible_message("
[M]'s body starts convulsing!")
M.gib()
return
- M.adjustCloneLoss(50)
var/mob/dead/observer/ghost = M.get_ghost()
if(ghost)
to_chat(ghost, "
You are attempting to be revived with Strange Reagent. Return to your body if you want to be revived! (Verbs -> Ghost -> Re-enter corpse)")
@@ -645,6 +644,7 @@
if(!M.suiciding && !ghost && !(NOCLONE in M.mutations))
var/time_dead = world.time - M.timeofdeath
M.visible_message("
[M] seems to rise from the dead!")
+ M.adjustCloneLoss(50)
M.setOxyLoss(0)
M.adjustBruteLoss(rand(0,15))
M.adjustToxLoss(rand(0,15))
diff --git a/code/modules/reagents/chemistry/reagents/pyrotechnic.dm b/code/modules/reagents/chemistry/reagents/pyrotechnic.dm
index 9fc96c714a8..43e81db402f 100644
--- a/code/modules/reagents/chemistry/reagents/pyrotechnic.dm
+++ b/code/modules/reagents/chemistry/reagents/pyrotechnic.dm
@@ -287,15 +287,6 @@
C.adjustPlasma(20)
..()
-/datum/reagent/plasma_dust/reaction_obj(obj/O, volume)
- if((!O) || (!volume))
- return 0
- O.atmos_spawn_air(SPAWN_TOXINS|SPAWN_20C, volume)
-
-/datum/reagent/plasma_dust/reaction_turf(turf/simulated/T, volume)
- if(istype(T))
- T.atmos_spawn_air(SPAWN_TOXINS|SPAWN_20C, volume)
-
/datum/reagent/plasma_dust/reaction_mob(mob/living/M, method=TOUCH, volume)//Splashing people with plasma dust is stronger than fuel!
if(method == TOUCH)
M.adjust_fire_stacks(volume / 5)
diff --git a/code/modules/reagents/chemistry/reagents/toxins.dm b/code/modules/reagents/chemistry/reagents/toxins.dm
index 73109f0f7e5..8fabc46db00 100644
--- a/code/modules/reagents/chemistry/reagents/toxins.dm
+++ b/code/modules/reagents/chemistry/reagents/toxins.dm
@@ -73,7 +73,7 @@
if(human.species.name != "Shadow")
to_chat(M, "
Your flesh rapidly mutates!")
to_chat(M, "
You are now a Shadow Person, a mutant race of darkness-dwelling humanoids.")
- to_chat(M, "
Your body reacts violently to light. \green However, it naturally heals in darkness.")
+ to_chat(M, "
Your body reacts violently to light. However, it naturally heals in darkness.")
to_chat(M, "
Aside from your new traits, you are mentally unchanged and retain your prior obligations.")
human.set_species("Shadow")
..()
@@ -269,7 +269,7 @@
M.take_organ_damage(0,20)
/datum/reagent/sacid/reaction_obj(obj/O, volume)
- if((istype(O,/obj/item) || istype(O,/obj/effect/glowshroom)) && prob(40))
+ if((istype(O,/obj/item) || istype(O,/obj/structure/glowshroom)) && prob(40))
if(!O.unacidable)
var/obj/effect/decal/cleanable/molten_object/I = new/obj/effect/decal/cleanable/molten_object(O.loc)
I.desc = "Looks like this was \an [O] some time ago."
@@ -615,7 +615,7 @@
H.status_flags |= DISFIGURED
/datum/reagent/facid/reaction_obj(obj/O, volume)
- if((istype(O, /obj/item) || istype(O, /obj/effect/glowshroom)))
+ if((istype(O, /obj/item) || istype(O, /obj/structure/glowshroom)))
if(!O.unacidable)
var/obj/effect/decal/cleanable/molten_object/I = new/obj/effect/decal/cleanable/molten_object(O.loc)
I.desc = "Looks like this was \an [O] some time ago."
@@ -924,10 +924,10 @@
var/obj/structure/alien/weeds/alien_weeds = O
alien_weeds.health -= rand(15,35) // Kills alien weeds pretty fast
alien_weeds.healthcheck()
- else if(istype(O, /obj/effect/glowshroom)) //even a small amount is enough to kill it
+ else if(istype(O, /obj/structure/glowshroom)) //even a small amount is enough to kill it
qdel(O)
- else if(istype(O,/obj/effect/spacevine))
- var/obj/effect/spacevine/SV = O
+ else if(istype(O,/obj/structure/spacevine))
+ var/obj/structure/spacevine/SV = O
SV.on_chem_effect(src)
/datum/reagent/glyphosate/reaction_mob(mob/living/M, method=TOUCH, volume)
diff --git a/code/modules/reagents/chemistry/reagents/water.dm b/code/modules/reagents/chemistry/reagents/water.dm
index 286af5d4863..70d2a9f76c0 100644
--- a/code/modules/reagents/chemistry/reagents/water.dm
+++ b/code/modules/reagents/chemistry/reagents/water.dm
@@ -48,8 +48,7 @@
if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/monkeycube))
var/obj/item/weapon/reagent_containers/food/snacks/monkeycube/cube = O
- if(!cube.wrapped)
- cube.Expand()
+ cube.Expand()
// Dehydrated carp
if(istype(O, /obj/item/toy/carpplushie/dehy_carp))
var/obj/item/toy/carpplushie/dehy_carp/dehy = O
diff --git a/code/modules/reagents/reagent_containers/dropper.dm b/code/modules/reagents/reagent_containers/dropper.dm
index 60b4cefefc1..336e0080ee7 100644
--- a/code/modules/reagents/reagent_containers/dropper.dm
+++ b/code/modules/reagents/reagent_containers/dropper.dm
@@ -9,13 +9,18 @@
amount_per_transfer_from_this = 5
possible_transfer_amounts = list(1,2,3,4,5)
volume = 5
- var/filled = 0
+
+/obj/item/weapon/reagent_containers/dropper/on_reagent_change()
+ if(reagents.total_volume <= 0)
+ icon_state = "[initial(icon_state)]"
+ else
+ icon_state = "[initial(icon_state)]1"
/obj/item/weapon/reagent_containers/dropper/afterattack(obj/target, mob/user , flag)
if(!target.reagents)
return
- if(filled)
+ if(reagents.total_volume)
if(target.reagents.total_volume >= target.reagents.maximum_volume)
to_chat(user, "
[target] is full.")
@@ -51,12 +56,7 @@
spawn(5)
reagents.reaction(safe_thing, TOUCH)
-
-
to_chat(user, "
You transfer [trans] units of the solution.")
- if(reagents.total_volume<=0)
- filled = 0
- icon_state = "[initial(icon_state)]"
return
@@ -80,9 +80,6 @@
trans = reagents.trans_to(target, amount_per_transfer_from_this)
to_chat(user, "
You transfer [trans] units of the solution.")
- if(reagents.total_volume<=0)
- filled = 0
- icon_state = "[initial(icon_state)]"
else
@@ -98,9 +95,6 @@
to_chat(user, "
You fill [src] with [trans] units of the solution.")
- filled = 1
- icon_state = "[initial(icon_state)][filled]"
-
/obj/item/weapon/reagent_containers/dropper/cyborg
name = "Industrial Dropper"
desc = "A larger dropper. Transfers 10 units."
diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm
index 6bd1ee79cbf..0f2b766bb3c 100644
--- a/code/modules/reagents/reagent_containers/syringes.dm
+++ b/code/modules/reagents/reagent_containers/syringes.dm
@@ -68,22 +68,22 @@
return
if(mode == SYRINGE_BROKEN)
- to_chat(user, "\red This syringe is broken!")
+ to_chat(user, "
This syringe is broken!")
return
switch(mode)
if(SYRINGE_DRAW)
if(reagents.total_volume >= reagents.maximum_volume)
- to_chat(user, "\red The syringe is full.")
+ to_chat(user, "
The syringe is full.")
return
if(ismob(target))//Blood!
if(istype(target, /mob/living/carbon/slime))
- to_chat(user, "\red You are unable to locate any blood.")
+ to_chat(user, "
You are unable to locate any blood.")
return
if(reagents.has_reagent("blood"))
- to_chat(user, "\red There is already a blood sample in this syringe")
+ to_chat(user, "
There is already a blood sample in this syringe")
return
if(istype(target, /mob/living/carbon))//maybe just add a blood reagent to all mobs. Then you can suck them dry...With hundreds of syringes. Jolly good idea.
var/mob/living/carbon/T = target
@@ -91,7 +91,7 @@
to_chat(usr, "You are unable to locate any blood. (To be specific, your target seems to be missing their DNA datum)")
return
if(NOCLONE in T.mutations) //target done been et, no more blood in him
- to_chat(user, "\red You are unable to locate any blood.")
+ to_chat(user, "
You are unable to locate any blood.")
return
@@ -130,45 +130,45 @@
on_reagent_change()
reagents.handle_reactions()
- to_chat(user, "\blue You take a blood sample from [target]")
+ to_chat(user, "
You take a blood sample from [target]")
for(var/mob/O in viewers(4, user))
- O.show_message("\red [user] takes a blood sample from [target].", 1)
+ O.show_message("
[user] takes a blood sample from [target].", 1)
else
user.visible_message("
[user] takes a sample from [target].", "
You take a sample from [target].")
else //if not mob
if(!target.reagents.total_volume)
- to_chat(user, "\red [target] is empty.")
+ to_chat(user, "
[target] is empty.")
return
if(!target.is_open_container() && !istype(target,/obj/structure/reagent_dispensers) && !istype(target,/obj/item/slime_extract))
- to_chat(user, "\red You cannot directly remove reagents from this object.")
+ to_chat(user, "
You cannot directly remove reagents from this object.")
return
var/trans = target.reagents.trans_to(src, amount_per_transfer_from_this) // transfer from, transfer to - who cares?
- to_chat(user, "\blue You fill the syringe with [trans] units of the solution.")
+ to_chat(user, "
You fill the syringe with [trans] units of the solution.")
if(reagents.total_volume >= reagents.maximum_volume)
mode=!mode
update_icon()
if(SYRINGE_INJECT)
if(!reagents.total_volume)
- to_chat(user, "\red The Syringe is empty.")
+ to_chat(user, "
The Syringe is empty.")
return
if(istype(target, /obj/item/weapon/implantcase/chem))
return
if(!target.is_open_container() && !ismob(target) && !istype(target, /obj/item/weapon/reagent_containers/food) && !istype(target, /obj/item/slime_extract) && !istype(target, /obj/item/clothing/mask/cigarette) && !istype(target, /obj/item/weapon/storage/fancy/cigarettes))
- to_chat(user, "\red You cannot directly fill this object.")
+ to_chat(user, "
You cannot directly fill this object.")
return
if(istype(target, /obj/item/clothing/mask/cigarette))
var/obj/item/clothing/mask/cigarette/C = target
if(istype(C.loc, /obj/item/weapon/storage/fancy/cigarettes))
- to_chat(user, "\red You cannot inject a cigarette while it's still in the pack.")
+ to_chat(user, "
You cannot inject a cigarette while it's still in the pack.")
return
if(target.reagents.total_volume >= target.reagents.maximum_volume)
- to_chat(user, "\red [target] is full.")
+ to_chat(user, "
[target] is full.")
return
var/mob/living/carbon/human/H = target
@@ -188,7 +188,7 @@
if(!do_mob(user, target, 30)) return
for(var/mob/O in viewers(world.view, user))
- O.show_message(text("\red [] injects [] with the syringe!", user, target), 1)
+ O.show_message(text("
[] injects [] with the syringe!", user, target), 1)
if(istype(target,/mob/living))
var/mob/living/M = target
@@ -220,7 +220,7 @@
C.inject_blood(src, 5)
else
trans = reagents.trans_to(target, amount_per_transfer_from_this)
- to_chat(user, "\blue You inject [trans] units of the solution. The syringe now contains [reagents.total_volume] units.")
+ to_chat(user, "
You inject [trans] units of the solution. The syringe now contains [reagents.total_volume] units.")
if(istype(target, /obj/item/weapon/reagent_containers/food/pill/patch))
var/obj/item/weapon/reagent_containers/food/pill/patch/P = target
if(P.instant_application)
@@ -300,7 +300,7 @@
if(SYRINGE_DRAW)
if(reagents.total_volume >= reagents.maximum_volume)
- to_chat(user, "\red The syringe is full.")
+ to_chat(user, "
The syringe is full.")
return
if(ismob(target))
@@ -309,31 +309,31 @@
return
else //if not mob
if(!target.reagents.total_volume)
- to_chat(user, "\red [target] is empty.")
+ to_chat(user, "
[target] is empty.")
return
if(!target.is_open_container() && !istype(target,/obj/structure/reagent_dispensers))
- to_chat(user, "\red You cannot directly remove reagents from this object.")
+ to_chat(user, "
You cannot directly remove reagents from this object.")
return
var/trans = target.reagents.trans_to(src, amount_per_transfer_from_this) // transfer from, transfer to - who cares?
- to_chat(user, "\blue You fill the syringe with [trans] units of the solution.")
+ to_chat(user, "
You fill the syringe with [trans] units of the solution.")
if(reagents.total_volume >= reagents.maximum_volume)
mode=!mode
update_icon()
if(SYRINGE_INJECT)
if(!reagents.total_volume)
- to_chat(user, "\red The Syringe is empty.")
+ to_chat(user, "
The Syringe is empty.")
return
if(istype(target, /obj/item/weapon/implantcase/chem))
return
if(!target.is_open_container() && !ismob(target) && !istype(target, /obj/item/weapon/reagent_containers/food))
- to_chat(user, "\red You cannot directly fill this object.")
+ to_chat(user, "
You cannot directly fill this object.")
return
if(target.reagents.total_volume >= target.reagents.maximum_volume)
- to_chat(user, "\red [target] is full.")
+ to_chat(user, "
[target] is full.")
return
if(ismob(target) && target != user)
@@ -341,13 +341,13 @@
O.show_message(text("
[] is trying to inject [] with a giant syringe!", user, target), 1)
if(!do_mob(user, target, 300)) return
for(var/mob/O in viewers(world.view, user))
- O.show_message(text("\red [] injects [] with a giant syringe!", user, target), 1)
+ O.show_message(text("
[] injects [] with a giant syringe!", user, target), 1)
reagents.reaction(target, INGEST)
if(ismob(target) && target == user)
reagents.reaction(target, INGEST)
spawn(5)
var/trans = reagents.trans_to(target, amount_per_transfer_from_this)
- to_chat(user, "\blue You inject [trans] units of the solution. The syringe now contains [reagents.total_volume] units.")
+ to_chat(user, "
You inject [trans] units of the solution. The syringe now contains [reagents.total_volume] units.")
if(reagents.total_volume >= reagents.maximum_volume && mode==SYRINGE_INJECT)
mode = SYRINGE_DRAW
update_icon()
diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm
index f050f6708e7..11abc89a343 100644
--- a/code/modules/reagents/reagent_dispenser.dm
+++ b/code/modules/reagents/reagent_dispenser.dm
@@ -78,9 +78,7 @@
var/accepts_rig = 1
/obj/structure/reagent_dispensers/fueltank/Destroy()
- if(rig)
- qdel(rig)
- rig = null
+ QDEL_NULL(rig)
return ..()
/obj/structure/reagent_dispensers/fueltank/bullet_act(obj/item/projectile/P)
diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm
index 9d49cb03291..961edb70450 100644
--- a/code/modules/recycling/disposal.dm
+++ b/code/modules/recycling/disposal.dm
@@ -130,7 +130,7 @@
if(do_after(usr, 20, target = GM))
GM.forceMove(src)
for(var/mob/C in viewers(src))
- C.show_message("\red [GM.name] has been placed in the [src] by [user].", 3)
+ C.show_message("
[GM.name] has been placed in the [src] by [user].", 3)
qdel(G)
usr.create_attack_log("
Has placed [key_name(GM)] in disposals.")
GM.create_attack_log("
Has been placed in disposals by [key_name(user)]")
@@ -231,7 +231,7 @@
return
if(user && user.loc == src)
- to_chat(usr, "\red You cannot reach the controls from inside.")
+ to_chat(usr, "
You cannot reach the controls from inside.")
return
// Clumsy folks can only flush it.
@@ -272,11 +272,11 @@
/obj/machinery/disposal/Topic(href, href_list)
if(usr.loc == src)
- to_chat(usr, "\red You cannot reach the controls from inside.")
+ to_chat(usr, "
You cannot reach the controls from inside.")
return
if(mode==-1 && !href_list["eject"]) // only allow ejecting if mode is -1
- to_chat(usr, "\red The disposal units power is disabled.")
+ to_chat(usr, "
The disposal units power is disabled.")
return
if(..())
@@ -500,7 +500,7 @@
var/hasmob = 0 //If it contains a mob
Destroy()
- qdel(gas)
+ QDEL_NULL(gas)
active = 0
return ..()
@@ -1027,7 +1027,7 @@
sortType = O.currTag
playsound(src.loc, 'sound/machines/twobeep.ogg', 100, 1)
var/tag = uppertext(TAGGERLOCATIONS[O.currTag])
- to_chat(user, "\blue Changed filter to [tag]")
+ to_chat(user, "
Changed filter to [tag]")
updatedesc()
@@ -1146,11 +1146,11 @@
update()
return
-
+
/obj/structure/disposalpipe/trunk/Destroy()
if(istype(linked, /obj/structure/disposaloutlet))
var/obj/structure/disposaloutlet/O = linked
- O.expel()
+ O.expel(animation = 0)
else if(istype(linked, /obj/machinery/disposal))
var/obj/machinery/disposal/D = linked
if(D.trunk == src)
@@ -1207,7 +1207,7 @@
playsound(loc, W.usesound, 100, 1)
to_chat(user, "
Slicing the disposal pipe.")
if(do_after(user, 30 * W.toolspeed, target = src))
- if(!W.isOn())
+ if(!W.isOn())
return
welded()
else
@@ -1290,12 +1290,13 @@
// expel the contents of the holder object, then delete it
// called when the holder exits the outlet
- proc/expel(var/obj/structure/disposalholder/H)
+ proc/expel(var/obj/structure/disposalholder/H, animation = 1)
- flick("outlet-open", src)
- playsound(src, 'sound/machines/warning-buzzer.ogg', 50, 0, 0)
- sleep(20) //wait until correct animation frame
- playsound(src, 'sound/machines/hiss.ogg', 50, 0, 0)
+ if(animation)
+ flick("outlet-open", src)
+ playsound(src, 'sound/machines/warning-buzzer.ogg', 50, 0, 0)
+ sleep(20) //wait until correct animation frame
+ playsound(src, 'sound/machines/hiss.ogg', 50, 0, 0)
if(H)
for(var/atom/movable/AM in H)
@@ -1308,7 +1309,6 @@
H.vent_gas(src.loc)
qdel(H)
- return
attackby(var/obj/item/I, var/mob/user, params)
if(!I || !user)
diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm
index 104036d5c0a..a8d3902e6f3 100755
--- a/code/modules/recycling/sortingmachinery.dm
+++ b/code/modules/recycling/sortingmachinery.dm
@@ -429,7 +429,5 @@
desc += " The package is not sealed."
/obj/item/shippingPackage/Destroy()
- if(wrapped)
- qdel(wrapped)
- wrapped = null
+ QDEL_NULL(wrapped)
return ..()
\ No newline at end of file
diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm
index 7431e44737c..29370cbc04b 100644
--- a/code/modules/research/designs/autolathe_designs.dm
+++ b/code/modules/research/designs/autolathe_designs.dm
@@ -608,6 +608,14 @@
build_path = /obj/item/weapon/rcd
category = list("hacked", "Construction")
+/datum/design/rcl
+ name = "Rapid Cable Layer"
+ id = "rcl"
+ build_type = AUTOLATHE
+ materials = list(MAT_METAL = 5000)
+ build_path = /obj/item/weapon/twohanded/rcl
+ category = list("hacked", "Construction")
+
/datum/design/electropack
name = "Electropack"
id = "electropack"
@@ -632,6 +640,14 @@
build_path = /obj/item/weapon/restraints/handcuffs
category = list("hacked", "Security")
+/datum/design/receiver
+ name = "Modular Receiver"
+ id = "receiver"
+ build_type = AUTOLATHE
+ materials = list(MAT_METAL = 15000)
+ build_path = /obj/item/weaponcrafting/receiver
+ category = list("hacked", "Security")
+
/datum/design/shotgun_slug
name = "Shotgun Slug"
id = "shotgun_slug"
diff --git a/code/modules/research/designs/equipment_designs.dm b/code/modules/research/designs/equipment_designs.dm
index e63211dc35b..9792f007c55 100644
--- a/code/modules/research/designs/equipment_designs.dm
+++ b/code/modules/research/designs/equipment_designs.dm
@@ -190,7 +190,7 @@
materials = list("$metal" = 200, "$glass" = 200, "$uranium" = 1000, "$plasma" = 200)
build_path = /obj/item/clothing/glasses/hud/hydroponic/night
category = list("Equipment")
-
+
/datum/design/handdrill
name = "Hand Drill"
desc = "A small electric hand drill with an interchangable screwdriver and bolt bit"
@@ -210,7 +210,7 @@
build_type = PROTOLATHE
materials = list(MAT_METAL = 4500, MAT_SILVER = 2500, MAT_DIAMOND = 1000)
category = list("Equipment")
-
+
/datum/design/alienwrench
name = "Alien Wrench"
desc = "An advanced wrench obtained through Abductor technology."
diff --git a/code/modules/research/designs/mecha_designs.dm b/code/modules/research/designs/mecha_designs.dm
index 15e2fb66056..4b00be0b932 100644
--- a/code/modules/research/designs/mecha_designs.dm
+++ b/code/modules/research/designs/mecha_designs.dm
@@ -167,32 +167,32 @@
build_path = /obj/item/weapon/circuitboard/mecha/honker/targeting
category = list("Exosuit Modules")
-/datum/design/recitence_main
- name = "Exosuit Module (\"Recitence\" Central Control module)"
- desc = "Allows for the construction of a \"Recitence\" Central Control module."
- id = "recitence_main"
+/datum/design/reticence_main
+ name = "Exosuit Module (\"Reticence\" Central Control module)"
+ desc = "Allows for the construction of a \"Reticence\" Central Control module."
+ id = "reticence_main"
req_tech = list("programming" = 3)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20)
- build_path = /obj/item/weapon/circuitboard/mecha/recitence/main
+ build_path = /obj/item/weapon/circuitboard/mecha/reticence/main
category = list("Exosuit Modules")
-/datum/design/recitence_peri
- name = "Exosuit Module (\"Recitence\" Peripherals Control module)"
- desc = "Allows for the construction of a \"Recitence\" Peripheral Control module."
- id = "recitence_peri"
+/datum/design/reticence_peri
+ name = "Exosuit Module (\"Reticence\" Peripherals Control module)"
+ desc = "Allows for the construction of a \"Reticence\" Peripheral Control module."
+ id = "reticence_peri"
req_tech = list("programming" = 3)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20)
- build_path = /obj/item/weapon/circuitboard/mecha/recitence/peripherals
+ build_path = /obj/item/weapon/circuitboard/mecha/reticence/peripherals
category = list("Exosuit Modules")
-/datum/design/recitence_targ
- name = "Exosuit Module (\"Recitence\" Weapons & Targeting Control module)"
- desc = "Allows for the construction of a \"Recitence\" Weapons & Targeting Control module."
- id = "recitence_targ"
+/datum/design/reticence_targ
+ name = "Exosuit Module (\"Reticence\" Weapons & Targeting Control module)"
+ desc = "Allows for the construction of a \"Reticence\" Weapons & Targeting Control module."
+ id = "reticence_targ"
req_tech = list("programming" = 3)
build_type = IMPRINTER
materials = list(MAT_GLASS = 1000, "sacid" = 20)
- build_path = /obj/item/weapon/circuitboard/mecha/recitence/targeting
+ build_path = /obj/item/weapon/circuitboard/mecha/reticence/targeting
category = list("Exosuit Modules")
\ No newline at end of file
diff --git a/code/modules/research/designs/mechfabricator_designs.dm b/code/modules/research/designs/mechfabricator_designs.dm
index 779a0809577..876a4352fe9 100644
--- a/code/modules/research/designs/mechfabricator_designs.dm
+++ b/code/modules/research/designs/mechfabricator_designs.dm
@@ -459,69 +459,69 @@
construction_time = 200
category = list("H.O.N.K")
-//Recitence
-/datum/design/recitence_chassis
- name = "Exosuit Chassis (\"Recitence\")"
- id = "recitence_chassis"
+//Reticence
+/datum/design/reticence_chassis
+ name = "Exosuit Chassis (\"Reticence\")"
+ id = "reticence_chassis"
build_type = MECHFAB
- build_path = /obj/item/mecha_parts/chassis/recitence
+ build_path = /obj/item/mecha_parts/chassis/reticence
materials = list(MAT_METAL=20000)
construction_time = 100
- category = list("Recitence")
+ category = list("Reticence")
-/datum/design/recitence_torso
- name = "Exosuit Torso (\"Recitence\")"
- id = "recitence_torso"
+/datum/design/reticence_torso
+ name = "Exosuit Torso (\"Reticence\")"
+ id = "reticence_torso"
build_type = MECHFAB
- build_path = /obj/item/mecha_parts/part/recitence_torso
+ build_path = /obj/item/mecha_parts/part/reticence_torso
materials = list(MAT_METAL=20000,MAT_GLASS=10000,MAT_TRANQUILLITE=10000)
construction_time = 300
- category = list("Recitence")
+ category = list("Reticence")
-/datum/design/recitence_head
- name = "Exosuit Head (\"Recitence\")"
- id = "recitence_head"
+/datum/design/reticence_head
+ name = "Exosuit Head (\"Reticence\")"
+ id = "reticence_head"
build_type = MECHFAB
- build_path = /obj/item/mecha_parts/part/recitence_head
+ build_path = /obj/item/mecha_parts/part/reticence_head
materials = list(MAT_METAL=10000,MAT_GLASS=5000,MAT_TRANQUILLITE=5000)
construction_time = 200
- category = list("Recitence")
+ category = list("Reticence")
-/datum/design/recitence_left_arm
- name = "Exosuit Left Arm (\"Recitence\")"
- id = "recitence_left_arm"
+/datum/design/reticence_left_arm
+ name = "Exosuit Left Arm (\"Reticence\")"
+ id = "reticence_left_arm"
build_type = MECHFAB
- build_path = /obj/item/mecha_parts/part/recitence_left_arm
+ build_path = /obj/item/mecha_parts/part/reticence_left_arm
materials = list(MAT_METAL=15000,MAT_TRANQUILLITE=5000)
construction_time = 200
- category = list("Recitence")
+ category = list("Reticence")
-/datum/design/recitence_right_arm
- name = "Exosuit Right Arm (\"Recitence\")"
- id = "recitence_right_arm"
+/datum/design/reticence_right_arm
+ name = "Exosuit Right Arm (\"Reticence\")"
+ id = "reticence_right_arm"
build_type = MECHFAB
- build_path = /obj/item/mecha_parts/part/recitence_right_arm
+ build_path = /obj/item/mecha_parts/part/reticence_right_arm
materials = list(MAT_METAL=15000,MAT_TRANQUILLITE=5000)
construction_time = 200
- category = list("Recitence")
+ category = list("Reticence")
-/datum/design/recitence_left_leg
- name = "Exosuit Left Leg (\"Recitence\")"
- id = "recitence_left_leg"
+/datum/design/reticence_left_leg
+ name = "Exosuit Left Leg (\"Reticence\")"
+ id = "reticence_left_leg"
build_type = MECHFAB
- build_path =/obj/item/mecha_parts/part/recitence_left_leg
+ build_path =/obj/item/mecha_parts/part/reticence_left_leg
materials = list(MAT_METAL=20000,MAT_TRANQUILLITE=5000)
construction_time = 200
- category = list("Recitence")
+ category = list("Reticence")
-/datum/design/recitence_right_leg
- name = "Exosuit Right Leg (\"Recitence\")"
- id = "recitence_right_leg"
+/datum/design/reticence_right_leg
+ name = "Exosuit Right Leg (\"Reticence\")"
+ id = "reticence_right_leg"
build_type = MECHFAB
- build_path = /obj/item/mecha_parts/part/recitence_right_leg
+ build_path = /obj/item/mecha_parts/part/reticence_right_leg
materials = list(MAT_METAL=20000,MAT_TRANQUILLITE=5000)
construction_time = 200
- category = list("Recitence")
+ category = list("Reticence")
//Phazon
/datum/design/phazon_chassis
diff --git a/code/modules/research/designs/weapon_designs.dm b/code/modules/research/designs/weapon_designs.dm
index 0ad25eb32ed..e282e42fa3f 100644
--- a/code/modules/research/designs/weapon_designs.dm
+++ b/code/modules/research/designs/weapon_designs.dm
@@ -104,16 +104,6 @@
locked = 1
category = list("Weapons")
-/datum/design/receiver
- name = "Modular Receiver"
- desc = "A prototype modular receiver and trigger assembly for a variety of firearms."
- id = "receiver"
- req_tech = list("combat" = 5, "materials" = 4)
- build_type = PROTOLATHE
- materials = list(MAT_METAL = 6500, MAT_SILVER = 500)
- build_path = /obj/item/weaponcrafting/receiver
- category = list("Weapons")
-
/datum/design/plasmapistol
name = "Plasma Pistol"
desc = "A specialized firearm designed to fire lethal bolts of toxins."
diff --git a/code/modules/research/message_server.dm b/code/modules/research/message_server.dm
index 23dc9d8ea36..52fa9596d92 100644
--- a/code/modules/research/message_server.dm
+++ b/code/modules/research/message_server.dm
@@ -113,7 +113,7 @@ var/global/list/obj/machinery/message_server/message_servers = list()
Console.set_light(2)
/obj/machinery/message_server/attack_hand(user as mob)
-// to_chat(user, "\blue There seem to be some parts missing from this server. They should arrive on the station in a few days, give or take a few CentComm delays.")
+// to_chat(user, "
There seem to be some parts missing from this server. They should arrive on the station in a few days, give or take a few CentComm delays.")
to_chat(user, "You toggle PDA message passing from [active ? "On" : "Off"] to [active ? "Off" : "On"]")
active = !active
update_icon()
diff --git a/code/modules/research/protolathe.dm b/code/modules/research/protolathe.dm
index 2084e2a93c4..20093e7771b 100644
--- a/code/modules/research/protolathe.dm
+++ b/code/modules/research/protolathe.dm
@@ -62,8 +62,7 @@ Note: Must be placed west/left of and R&D console to function.
reagents.my_atom = src
/obj/machinery/r_n_d/protolathe/Destroy()
- qdel(materials)
- materials = null
+ QDEL_NULL(materials)
return ..()
/obj/machinery/r_n_d/protolathe/RefreshParts()
diff --git a/code/modules/research/server.dm b/code/modules/research/server.dm
index 5b842c90e08..0fa680faf6a 100644
--- a/code/modules/research/server.dm
+++ b/code/modules/research/server.dm
@@ -208,7 +208,7 @@
add_fingerprint(usr)
usr.set_machine(src)
if(!src.allowed(usr) && !emagged)
- to_chat(usr, "\red You do not have the required access level")
+ to_chat(usr, "
You do not have the required access level")
return
if(href_list["main"])
@@ -338,7 +338,7 @@
if(!emagged)
playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1)
emagged = 1
- to_chat(user, "\blue You you disable the security protocols")
+ to_chat(user, "
You you disable the security protocols")
src.updateUsrDialog()
/obj/machinery/r_n_d/server/core
diff --git a/code/modules/research/xenoarchaeology/artifact/artifact.dm b/code/modules/research/xenoarchaeology/artifact/artifact.dm
index fc4cda15541..366ce13107b 100644
--- a/code/modules/research/xenoarchaeology/artifact/artifact.dm
+++ b/code/modules/research/xenoarchaeology/artifact/artifact.dm
@@ -79,26 +79,26 @@
if(istype(W, /obj/item/device/measuring_tape))
var/obj/item/device/measuring_tape/P = W
- user.visible_message("\blue[user] extends [P] towards [src].","\blue You extend [P] towards [src].")
+ user.visible_message("
[user] extends [P] towards [src].","
You extend [P] towards [src].")
if(do_after(user, 40, target = src))
- to_chat(user, "\blue [bicon(P)] [src] has been excavated to a depth of [2*src.excavation_level]cm.")
+ to_chat(user, "
[bicon(P)] [src] has been excavated to a depth of [2*src.excavation_level]cm.")
return
if(istype(W, /obj/item/weapon/pickaxe))
var/obj/item/weapon/pickaxe/P = W
- to_chat(user, "\red You start [P.drill_verb] [src].")
+ to_chat(user, "
You start [P.drill_verb] [src].")
if(!do_after(user, P.digspeed, target = src))
return
- to_chat(user, "\blue You finish [P.drill_verb] [src].")
+ to_chat(user, "
You finish [P.drill_verb] [src].")
excavation_level += P.excavation_amount
if(excavation_level > 100)
//failure
user.visible_message("
[src] suddenly crumbles away.",\
- "\red [src] has disintegrated under your onslaught, any secrets it was holding are long gone.")
+ "
[src] has disintegrated under your onslaught, any secrets it was holding are long gone.")
qdel(src)
return
@@ -114,5 +114,5 @@
src.visible_message("
[src] suddenly crumbles away.")
else
user.visible_message("
[src] suddenly crumbles away.",\
- "\blue [src] has been whittled away under your careful excavation, but there was nothing of interest inside.")
+ "
[src] has been whittled away under your careful excavation, but there was nothing of interest inside.")
qdel(src)
diff --git a/code/modules/research/xenoarchaeology/artifact/artifact_autocloner.dm b/code/modules/research/xenoarchaeology/artifact/artifact_autocloner.dm
index 95489be4775..410f05a925c 100644
--- a/code/modules/research/xenoarchaeology/artifact/artifact_autocloner.dm
+++ b/code/modules/research/xenoarchaeology/artifact/artifact_autocloner.dm
@@ -50,17 +50,17 @@
if(!previous_power_state)
previous_power_state = 1
icon_state = "cellold1"
- src.visible_message("\blue [bicon(src)] [src] suddenly comes to life!")
+ src.visible_message("
[bicon(src)] [src] suddenly comes to life!")
//slowly grow a mob
if(prob(5))
- src.visible_message("\blue [bicon(src)] [src] [pick("gloops","glugs","whirrs","whooshes","hisses","purrs","hums","gushes")].")
+ src.visible_message("
[bicon(src)] [src] [pick("gloops","glugs","whirrs","whooshes","hisses","purrs","hums","gushes")].")
//if we've finished growing...
if(time_spent_spawning >= time_per_spawn)
time_spent_spawning = 0
use_power = 1
- src.visible_message("\blue [bicon(src)] [src] pings!")
+ src.visible_message("
[bicon(src)] [src] pings!")
icon_state = "cellold1"
desc = "It's full of a bubbling viscous liquid, and is lit by a mysterious glow."
if(spawn_type)
@@ -81,7 +81,7 @@
if(previous_power_state)
previous_power_state = 0
icon_state = "cellold0"
- src.visible_message("\blue [bicon(src)] [src] suddenly shuts down.")
+ src.visible_message("
[bicon(src)] [src] suddenly shuts down.")
//cloned mob slowly breaks down
time_spent_spawning = max(time_spent_spawning + last_process - world.time, 0)
diff --git a/code/modules/research/xenoarchaeology/artifact/artifact_gigadrill.dm b/code/modules/research/xenoarchaeology/artifact/artifact_gigadrill.dm
index 4073b0bd74c..96b9f2e2fb4 100644
--- a/code/modules/research/xenoarchaeology/artifact/artifact_gigadrill.dm
+++ b/code/modules/research/xenoarchaeology/artifact/artifact_gigadrill.dm
@@ -14,11 +14,11 @@
if(active)
active = 0
icon_state = "gigadrill"
- to_chat(user, "\blue You press a button and [src] slowly spins down.")
+ to_chat(user, "
You press a button and [src] slowly spins down.")
else
active = 1
icon_state = "gigadrill_mov"
- to_chat(user, "\blue You press a button and [src] shudders to life.")
+ to_chat(user, "
You press a button and [src] shudders to life.")
/obj/machinery/giga_drill/Bump(atom/A)
if(active && !drilling_turf)
diff --git a/code/modules/research/xenoarchaeology/artifact/artifact_replicator.dm b/code/modules/research/xenoarchaeology/artifact/artifact_replicator.dm
index 5ca29dc6d43..d87c71dbc72 100644
--- a/code/modules/research/xenoarchaeology/artifact/artifact_replicator.dm
+++ b/code/modules/research/xenoarchaeology/artifact/artifact_replicator.dm
@@ -78,19 +78,19 @@
viables.Remove(type)
construction[button_desc] = type
- fail_message = "\blue [bicon(src)] a [pick("loud","soft","sinister","eery","triumphant","depressing","cheerful","angry")] \
+ fail_message = "
[bicon(src)] a [pick("loud","soft","sinister","eery","triumphant","depressing","cheerful","angry")] \
[pick("horn","beep","bing","bleep","blat","honk","hrumph","ding")] sounds and a \
[pick("yellow","purple","green","blue","red","orange","white")] \
[pick("light","dial","meter","window","protrusion","knob","antenna","swirly thing")] \
[pick("swirls","flashes","whirrs","goes schwing","blinks","flickers","strobes","lights up")] on the \
[pick("front","side","top","bottom","rear","inside")] of [src]. A [pick("slot","funnel","chute","tube")] opens up in the \
- [pick("front","side","top","bottom","rear","inside")]."
+ [pick("front","side","top","bottom","rear","inside")]."
/obj/machinery/replicator/process()
if(spawning_types.len && powered())
spawn_progress_time += world.time - last_process_time
if(spawn_progress_time > max_spawn_time)
- src.visible_message("\blue [bicon(src)] [src] pings!")
+ src.visible_message("
[bicon(src)] [src] pings!")
var/obj/source_material = pop(stored_materials)
var/spawn_type = pop(spawning_types)
@@ -113,7 +113,7 @@
icon_state = "borgcharger0(old)"
else if(prob(5))
- src.visible_message("\blue [bicon(src)] [src] [pick("clicks","whizzes","whirrs","whooshes","clanks","clongs","clonks","bangs")].")
+ src.visible_message("
[bicon(src)] [src] [pick("clicks","whizzes","whirrs","whooshes","clanks","clongs","clonks","bangs")].")
last_process_time = world.time
@@ -132,7 +132,7 @@
user.drop_item()
W.loc = src
stored_materials.Add(W)
- src.visible_message("\blue [user] inserts [W] into [src].")
+ src.visible_message("
[user] inserts [W] into [src].")
/obj/machinery/replicator/Topic(href, href_list)
@@ -141,9 +141,9 @@
if(index > 0 && index <= construction.len)
if(stored_materials.len > spawning_types.len)
if(spawning_types.len)
- src.visible_message("\blue [bicon(src)] a [pick("light","dial","display","meter","pad")] on [src]'s front [pick("blinks","flashes")] [pick("red","yellow","blue","orange","purple","green","white")].")
+ src.visible_message("
[bicon(src)] a [pick("light","dial","display","meter","pad")] on [src]'s front [pick("blinks","flashes")] [pick("red","yellow","blue","orange","purple","green","white")].")
else
- src.visible_message("\blue [bicon(src)] [src]'s front compartment slides shut.")
+ src.visible_message("
[bicon(src)] [src]'s front compartment slides shut.")
spawning_types.Add(construction[construction[index]])
spawn_progress_time = 0
diff --git a/code/modules/research/xenoarchaeology/artifact/artifact_unknown.dm b/code/modules/research/xenoarchaeology/artifact/artifact_unknown.dm
index 7a4b36707f9..894f54dc3bc 100644
--- a/code/modules/research/xenoarchaeology/artifact/artifact_unknown.dm
+++ b/code/modules/research/xenoarchaeology/artifact/artifact_unknown.dm
@@ -221,7 +221,7 @@ var/list/valid_secondary_effect_types = list(\
/obj/machinery/artifact/attack_hand(var/mob/user as mob)
if(get_dist(user, src) > 1)
- to_chat(user, "\red You can't reach [src] from here.")
+ to_chat(user, "
You can't reach [src] from here.")
return
if(ishuman(user) && user:gloves)
to_chat(user, "
You touch [src] with your gloved hands, [pick("but nothing of note happens","but nothing happens","but nothing interesting happens","but you notice nothing different","but nothing seems to have happened")].")
diff --git a/code/modules/research/xenoarchaeology/artifact/effect.dm b/code/modules/research/xenoarchaeology/artifact/effect.dm
index 727c016849b..981cea4156d 100644
--- a/code/modules/research/xenoarchaeology/artifact/effect.dm
+++ b/code/modules/research/xenoarchaeology/artifact/effect.dm
@@ -64,7 +64,7 @@
var/atom/toplevelholder = holder
while(!istype(toplevelholder.loc, /turf))
toplevelholder = toplevelholder.loc
- toplevelholder.visible_message("\red [bicon(toplevelholder)] [toplevelholder] [display_msg]")
+ toplevelholder.visible_message("
[bicon(toplevelholder)] [toplevelholder] [display_msg]")
/datum/artifact_effect/proc/DoEffectTouch(var/mob/user)
/datum/artifact_effect/proc/DoEffectAura(var/atom/holder)
diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_affect_cold.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_affect_cold.dm
index 89c74776f55..16862948644 100644
--- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_affect_cold.dm
+++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_affect_cold.dm
@@ -12,7 +12,7 @@
/datum/artifact_effect/cold/DoEffectTouch(var/mob/user)
if(holder)
- to_chat(user, "\blue A chill passes up your spine!")
+ to_chat(user, "
A chill passes up your spine!")
var/datum/gas_mixture/env = holder.loc.return_air()
if(env)
env.temperature = max(env.temperature - rand(5,50), 0)
diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_cellcharge.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_cellcharge.dm
index d67c33d1e4e..8d6735e3a31 100644
--- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_cellcharge.dm
+++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_cellcharge.dm
@@ -10,7 +10,7 @@
var/mob/living/silicon/robot/R = user
for(var/obj/item/weapon/stock_parts/cell/D in R.contents)
D.charge += rand() * 100 + 50
- to_chat(R, "\blue SYSTEM ALERT: Large energy boost detected!")
+ to_chat(R, "
SYSTEM ALERT: Large energy boost detected!")
return 1
/datum/artifact_effect/cellcharge/DoEffectAura()
@@ -24,7 +24,7 @@
for(var/mob/living/silicon/robot/M in mob_list)
for(var/obj/item/weapon/stock_parts/cell/D in M.contents)
D.charge += 25
- to_chat(M, "\blue SYSTEM ALERT: Energy boost detected!")
+ to_chat(M, "
SYSTEM ALERT: Energy boost detected!")
return 1
/datum/artifact_effect/cellcharge/DoEffectPulse()
@@ -38,5 +38,5 @@
for(var/mob/living/silicon/robot/M in mob_list)
for(var/obj/item/weapon/stock_parts/cell/D in M.contents)
D.charge += rand() * 100
- to_chat(M, "\blue SYSTEM ALERT: Energy boost detected!")
+ to_chat(M, "
SYSTEM ALERT: Energy boost detected!")
return 1
diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_celldrain.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_celldrain.dm
index fcba3be4dec..44be592e7fa 100644
--- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_celldrain.dm
+++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_celldrain.dm
@@ -10,7 +10,7 @@
var/mob/living/silicon/robot/R = user
for(var/obj/item/weapon/stock_parts/cell/D in R.contents)
D.charge = max(D.charge - rand() * 100, 0)
- to_chat(R, "\blue SYSTEM ALERT: Energy drain detected!")
+ to_chat(R, "
SYSTEM ALERT: Energy drain detected!")
return 1
return 1
@@ -26,7 +26,7 @@
for(var/mob/living/silicon/robot/M in mob_list)
for(var/obj/item/weapon/stock_parts/cell/D in M.contents)
D.charge = max(D.charge - 50,0)
- to_chat(M, "\red SYSTEM ALERT: Energy drain detected!")
+ to_chat(M, "
SYSTEM ALERT: Energy drain detected!")
return 1
/datum/artifact_effect/celldrain/DoEffectPulse()
@@ -40,5 +40,5 @@
for(var/mob/living/silicon/robot/M in mob_list)
for(var/obj/item/weapon/stock_parts/cell/D in M.contents)
D.charge = max(D.charge - rand() * 150,0)
- to_chat(M, "\red SYSTEM ALERT: Energy drain detected!")
+ to_chat(M, "
SYSTEM ALERT: Energy drain detected!")
return 1
diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_dnaswitch.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_dnaswitch.dm
index d005fb9e64c..f31788602ad 100644
--- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_dnaswitch.dm
+++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_dnaswitch.dm
@@ -15,13 +15,13 @@
/datum/artifact_effect/dnaswitch/DoEffectTouch(var/mob/toucher)
var/weakness = GetAnomalySusceptibility(toucher)
if(ishuman(toucher) && prob(weakness * 100))
- to_chat(toucher, pick("\green You feel a little different.",
- "\green You feel very strange.",
- "\green Your stomach churns.",
- "\green Your skin feels loose.",
- "\green You feel a stabbing pain in your head.",
- "\green You feel a tingling sensation in your chest.",
- "\green Your entire body vibrates."))
+ to_chat(toucher, pick("
You feel a little different.",
+ "
You feel very strange.",
+ "
Your stomach churns.",
+ "
Your skin feels loose.",
+ "
You feel a stabbing pain in your head.",
+ "
You feel a tingling sensation in your chest.",
+ "
Your entire body vibrates."))
if(prob(75))
scramble(1, toucher, weakness * severity)
else
@@ -35,13 +35,13 @@
var/weakness = GetAnomalySusceptibility(H)
if(prob(weakness * 100))
if(prob(30))
- to_chat(H, pick("\green You feel a little different.",
- "\green You feel very strange.",
- "\green Your stomach churns.",
- "\green Your skin feels loose.",
- "\green You feel a stabbing pain in your head.",
- "\green You feel a tingling sensation in your chest.",
- "\green Your entire body vibrates."))
+ to_chat(H, pick("
You feel a little different.",
+ "
You feel very strange.",
+ "
Your stomach churns.",
+ "
Your skin feels loose.",
+ "
You feel a stabbing pain in your head.",
+ "
You feel a tingling sensation in your chest.",
+ "
Your entire body vibrates."))
if(prob(50))
scramble(1, H, weakness * severity)
else
@@ -54,13 +54,13 @@
var/weakness = GetAnomalySusceptibility(H)
if(prob(weakness * 100))
if(prob(75))
- to_chat(H, pick("\green You feel a little different.",
- "\green You feel very strange.",
- "\green Your stomach churns.",
- "\green Your skin feels loose.",
- "\green You feel a stabbing pain in your head.",
- "\green You feel a tingling sensation in your chest.",
- "\green Your entire body vibrates."))
+ to_chat(H, pick("
You feel a little different.",
+ "
You feel very strange.",
+ "
Your stomach churns.",
+ "
Your skin feels loose.",
+ "
You feel a stabbing pain in your head.",
+ "
You feel a tingling sensation in your chest.",
+ "
Your entire body vibrates."))
if(prob(25))
if(prob(75))
scramble(1, H, weakness * severity)
diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_heal.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_heal.dm
index cde5632eaa5..3f823315078 100644
--- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_heal.dm
+++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_heal.dm
@@ -9,7 +9,7 @@
var/weakness = GetAnomalySusceptibility(toucher)
if(prob(weakness * 100))
var/mob/living/carbon/C = toucher
- to_chat(C, "\blue You feel a soothing energy invigorate you.")
+ to_chat(C, "
You feel a soothing energy invigorate you.")
if(ishuman(toucher))
var/mob/living/carbon/human/H = toucher
@@ -42,7 +42,7 @@
var/weakness = GetAnomalySusceptibility(C)
if(prob(weakness * 100))
if(prob(10))
- to_chat(C, "\blue You feel a soothing energy radiating from something nearby.")
+ to_chat(C, "
You feel a soothing energy radiating from something nearby.")
C.adjustBruteLoss(-1 * weakness)
C.adjustFireLoss(-1 * weakness)
C.adjustToxLoss(-1 * weakness)
@@ -57,7 +57,7 @@
for(var/mob/living/carbon/C in range(src.effectrange,T))
var/weakness = GetAnomalySusceptibility(C)
if(prob(weakness * 100))
- to_chat(C, "\blue A wave of energy invigorates you.")
+ to_chat(C, "
A wave of energy invigorates you.")
C.adjustBruteLoss(-5 * weakness)
C.adjustFireLoss(-5 * weakness)
C.adjustToxLoss(-5 * weakness)
diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_heat.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_heat.dm
index 86828f7ef39..fb1f9645735 100644
--- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_heat.dm
+++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_heat.dm
@@ -15,7 +15,7 @@
/datum/artifact_effect/heat/DoEffectTouch(var/mob/user)
if(holder)
- to_chat(user, "\red You feel a wave of heat travel up your spine!")
+ to_chat(user, "
You feel a wave of heat travel up your spine!")
var/datum/gas_mixture/env = holder.loc.return_air()
if(env)
env.temperature += rand(5,50)
diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_hurt.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_hurt.dm
index 399b7252d20..f9e3803ff9f 100644
--- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_hurt.dm
+++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_hurt.dm
@@ -8,7 +8,7 @@
var/weakness = GetAnomalySusceptibility(toucher)
if(iscarbon(toucher) && prob(weakness * 100))
var/mob/living/carbon/C = toucher
- to_chat(C, "\red A painful discharge of energy strikes you!")
+ to_chat(C, "
A painful discharge of energy strikes you!")
C.adjustOxyLoss(rand(5,25) * weakness)
C.adjustToxLoss(rand(5,25) * weakness)
C.adjustBruteLoss(rand(5,25) * weakness)
@@ -26,7 +26,7 @@
var/weakness = GetAnomalySusceptibility(C)
if(prob(weakness * 100))
if(prob(10))
- to_chat(C, "\red You feel a painful force radiating from something nearby.")
+ to_chat(C, "
You feel a painful force radiating from something nearby.")
C.adjustBruteLoss(1 * weakness)
C.adjustFireLoss(1 * weakness)
C.adjustToxLoss(1 * weakness)
@@ -40,7 +40,7 @@
for(var/mob/living/carbon/C in range(effectrange, T))
var/weakness = GetAnomalySusceptibility(C)
if(prob(weakness * 100))
- to_chat(C, "\red A wave of painful energy strikes you!")
+ to_chat(C, "
A wave of painful energy strikes you!")
C.adjustBruteLoss(3 * weakness)
C.adjustFireLoss(3 * weakness)
C.adjustToxLoss(3 * weakness)
diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_roboheal.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_roboheal.dm
index 30316fc3342..191c0beb3fe 100644
--- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_roboheal.dm
+++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_roboheal.dm
@@ -10,7 +10,7 @@
if(user)
if(istype(user, /mob/living/silicon/robot))
var/mob/living/silicon/robot/R = user
- to_chat(R, "\blue Your systems report damaged components mending by themselves!")
+ to_chat(R, "
Your systems report damaged components mending by themselves!")
R.adjustBruteLoss(rand(-10,-30))
R.adjustFireLoss(rand(-10,-30))
return 1
@@ -20,7 +20,7 @@
var/turf/T = get_turf(holder)
for(var/mob/living/silicon/robot/M in range(src.effectrange,T))
if(prob(10))
- to_chat(M, "\blue SYSTEM ALERT: Beneficial energy field detected!")
+ to_chat(M, "
SYSTEM ALERT: Beneficial energy field detected!")
M.adjustBruteLoss(-1)
M.adjustFireLoss(-1)
M.updatehealth()
@@ -30,7 +30,7 @@
if(holder)
var/turf/T = get_turf(holder)
for(var/mob/living/silicon/robot/M in range(src.effectrange,T))
- to_chat(M, "\blue SYSTEM ALERT: Structural damage has been repaired by energy pulse!")
+ to_chat(M, "
SYSTEM ALERT: Structural damage has been repaired by energy pulse!")
M.adjustBruteLoss(-10)
M.adjustFireLoss(-10)
M.updatehealth()
diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_robohurt.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_robohurt.dm
index da22a45b32b..43f49a6ee36 100644
--- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_robohurt.dm
+++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_robohurt.dm
@@ -10,7 +10,7 @@
if(user)
if(istype(user, /mob/living/silicon/robot))
var/mob/living/silicon/robot/R = user
- to_chat(R, "\red Your systems report severe damage has been inflicted!")
+ to_chat(R, "
Your systems report severe damage has been inflicted!")
R.adjustBruteLoss(rand(10,50))
R.adjustFireLoss(rand(10,50))
return 1
@@ -20,7 +20,7 @@
var/turf/T = get_turf(holder)
for(var/mob/living/silicon/robot/M in range(src.effectrange,T))
if(prob(10))
- to_chat(M, "\red SYSTEM ALERT: Harmful energy field detected!")
+ to_chat(M, "
SYSTEM ALERT: Harmful energy field detected!")
M.adjustBruteLoss(1)
M.adjustFireLoss(1)
M.updatehealth()
@@ -30,7 +30,7 @@
if(holder)
var/turf/T = get_turf(holder)
for(var/mob/living/silicon/robot/M in range(src.effectrange,T))
- to_chat(M, "\red SYSTEM ALERT: Structural damage inflicted by energy pulse!")
+ to_chat(M, "
SYSTEM ALERT: Structural damage inflicted by energy pulse!")
M.adjustBruteLoss(10)
M.adjustFireLoss(10)
M.updatehealth()
diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_sleepy.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_sleepy.dm
index 1f098ddfa6b..ec3c5ced009 100644
--- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_sleepy.dm
+++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_sleepy.dm
@@ -12,12 +12,12 @@
var/weakness = GetAnomalySusceptibility(toucher)
if(ishuman(toucher) && prob(weakness * 100))
var/mob/living/carbon/human/H = toucher
- to_chat(H, pick("\blue You feel like taking a nap.","\blue You feel a yawn coming on.","\blue You feel a little tired."))
+ to_chat(H, pick("
You feel like taking a nap.","
You feel a yawn coming on.","
You feel a little tired."))
H.AdjustDrowsy(rand(5,25) * weakness, bound_lower = 0, bound_upper = 50 * weakness)
H.AdjustEyeBlurry(rand(1,3) * weakness, bound_lower = 0, bound_upper = 50 * weakness)
return 1
else if(isrobot(toucher))
- to_chat(toucher, "\red SYSTEM ALERT: CPU cycles slowing down.")
+ to_chat(toucher, "
SYSTEM ALERT: CPU cycles slowing down.")
return 1
/datum/artifact_effect/sleepy/DoEffectAura()
@@ -27,11 +27,11 @@
var/weakness = GetAnomalySusceptibility(H)
if(prob(weakness * 100))
if(prob(10))
- to_chat(H, pick("\blue You feel like taking a nap.","\blue You feel a yawn coming on.","\blue You feel a little tired."))
+ to_chat(H, pick("
You feel like taking a nap.","
You feel a yawn coming on.","
You feel a little tired."))
H.AdjustDrowsy(1 * weakness, bound_lower = 0, bound_upper = 25 * weakness)
H.AdjustEyeBlurry(1 * weakness, bound_lower = 0, bound_upper = 25 * weakness)
for(var/mob/living/silicon/robot/R in range(src.effectrange,holder))
- to_chat(R, "\red SYSTEM ALERT: CPU cycles slowing down.")
+ to_chat(R, "
SYSTEM ALERT: CPU cycles slowing down.")
return 1
/datum/artifact_effect/sleepy/DoEffectPulse()
@@ -40,9 +40,9 @@
for(var/mob/living/carbon/human/H in range(src.effectrange, T))
var/weakness = GetAnomalySusceptibility(H)
if(prob(weakness * 100))
- to_chat(H, pick("\blue You feel like taking a nap.","\blue You feel a yawn coming on.","\blue You feel a little tired."))
+ to_chat(H, pick("
You feel like taking a nap.","
You feel a yawn coming on.","
You feel a little tired."))
H.AdjustDrowsy(rand(5,15) * weakness, bound_lower = 0, bound_upper = 50 * weakness)
H.AdjustEyeBlurry(rand(5,15) * weakness, bound_lower = 0, bound_upper = 50 * weakness)
for(var/mob/living/silicon/robot/R in range(src.effectrange,holder))
- to_chat(R, "\red SYSTEM ALERT: CPU cycles slowing down.")
+ to_chat(R, "
SYSTEM ALERT: CPU cycles slowing down.")
return 1
diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_stun.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_stun.dm
index 327e732fa12..bc2aa655e34 100644
--- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_stun.dm
+++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_stun.dm
@@ -11,7 +11,7 @@
var/mob/living/carbon/C = toucher
var/susceptibility = GetAnomalySusceptibility(C)
if(prob(susceptibility * 100))
- to_chat(C, "\red A powerful force overwhelms your consciousness.")
+ to_chat(C, "
A powerful force overwhelms your consciousness.")
C.Weaken(rand(1,10) * susceptibility)
C.stuttering += 30 * susceptibility
C.Stun(rand(1,10) * susceptibility)
@@ -22,13 +22,13 @@
for(var/mob/living/carbon/C in range(src.effectrange,T))
var/susceptibility = GetAnomalySusceptibility(C)
if(prob(10 * susceptibility))
- to_chat(C, "\red Your body goes numb for a moment.")
+ to_chat(C, "
Your body goes numb for a moment.")
C.Weaken(2)
C.stuttering += 2
if(prob(10))
C.Stun(1)
else if(prob(10))
- to_chat(C, "\red You feel numb.")
+ to_chat(C, "
You feel numb.")
/datum/artifact_effect/stun/DoEffectPulse()
if(holder)
@@ -36,7 +36,7 @@
for(var/mob/living/carbon/C in range(src.effectrange,T))
var/susceptibility = GetAnomalySusceptibility(C)
if(prob(100 * susceptibility))
- to_chat(C, "\red A wave of energy overwhelms your senses!")
+ to_chat(C, "
A wave of energy overwhelms your senses!")
C.SetWeakened(4 * susceptibility)
C.stuttering = 4 * susceptibility
if(prob(10))
diff --git a/code/modules/research/xenoarchaeology/chemistry.dm b/code/modules/research/xenoarchaeology/chemistry.dm
index ea91ef76b35..b198bd02459 100644
--- a/code/modules/research/xenoarchaeology/chemistry.dm
+++ b/code/modules/research/xenoarchaeology/chemistry.dm
@@ -15,7 +15,7 @@ obj/item/weapon/reagent_containers/glass/solution_tray/attackby(obj/item/weapon/
var/new_label = input("What should the new label be?","Label solution tray")
if(new_label)
name = "solution tray ([new_label])"
- to_chat(user, "\blue You write on the label of the solution tray.")
+ to_chat(user, "
You write on the label of the solution tray.")
else
..(W, user)
diff --git a/code/modules/research/xenoarchaeology/finds/finds_special.dm b/code/modules/research/xenoarchaeology/finds/finds_special.dm
index 8ddcf27593b..5fd432a7a6f 100644
--- a/code/modules/research/xenoarchaeology/finds/finds_special.dm
+++ b/code/modules/research/xenoarchaeology/finds/finds_special.dm
@@ -82,7 +82,7 @@
//use up stored charges
if(charges >= 10)
charges -= 10
- new /obj/effect/spider/eggcluster(pick(view(1,src)))
+ new /obj/structure/spider/eggcluster(pick(view(1,src)))
if(charges >= 3)
if(prob(5))
@@ -99,7 +99,7 @@
if(charges >= 0.1)
if(prob(5))
- src.visible_message("\red [bicon(src)] [src]'s eyes glow ruby red for a moment!")
+ src.visible_message("
[bicon(src)] [src]'s eyes glow ruby red for a moment!")
charges -= 0.1
//check on our shadow wights
@@ -129,7 +129,7 @@
var/target = pick("chest","groin","head","l_arm","r_arm","r_leg","l_leg","l_hand","r_hand","l_foot","r_foot")
M.apply_damage(rand(5, 10), BRUTE, target)
- to_chat(M, "\red The skin on your [parse_zone(target)] feels like it's ripping apart, and a stream of blood flies out.")
+ to_chat(M, "
The skin on your [parse_zone(target)] feels like it's ripping apart, and a stream of blood flies out.")
var/obj/effect/decal/cleanable/blood/splatter/animated/B = new(M.loc)
B.target_turf = pick(range(1, src))
B.blood_DNA = list()
@@ -200,4 +200,4 @@
processing_objects.Remove(src)
/obj/effect/shadow_wight/Bump(var/atom/obstacle)
- to_chat(obstacle, "\red You feel a chill run down your spine!")
+ to_chat(obstacle, "
You feel a chill run down your spine!")
diff --git a/code/modules/research/xenoarchaeology/finds/finds_talkingitem.dm b/code/modules/research/xenoarchaeology/finds/finds_talkingitem.dm
index 031e23c260d..178e0600ff7 100644
--- a/code/modules/research/xenoarchaeology/finds/finds_talkingitem.dm
+++ b/code/modules/research/xenoarchaeology/finds/finds_talkingitem.dm
@@ -57,7 +57,7 @@
var/list/options = list("[holder_atom] seems to be listening intently to [source]...",\
"[holder_atom] seems to be focussing on [source]...",\
"[holder_atom] seems to turn it's attention to [source]...")
- holder_atom.loc.visible_message("\blue [bicon(holder_atom)] [pick(options)]")
+ holder_atom.loc.visible_message("
[bicon(holder_atom)] [pick(options)]")
if(prob(20))
spawn(2)
@@ -121,5 +121,5 @@
listening|=M
for(var/mob/M in listening)
- to_chat(M, "[bicon(holder_atom)]
[holder_atom] reverberates, \blue\"[msg]\"")
+ to_chat(M, "[bicon(holder_atom)]
[holder_atom] reverberates,
\"[msg]\"")
last_talk_time = world.time
diff --git a/code/modules/research/xenoarchaeology/genetics/reconstitutor.dm b/code/modules/research/xenoarchaeology/genetics/reconstitutor.dm
index 1da7e900767..2cacdc4801e 100644
--- a/code/modules/research/xenoarchaeology/genetics/reconstitutor.dm
+++ b/code/modules/research/xenoarchaeology/genetics/reconstitutor.dm
@@ -54,11 +54,11 @@ datum/genesequence
W.loc = src.loc
switch(scan_fossil(W))
if(1)
- src.visible_message("\red [bicon(src)] [src] scans the fossil and rejects it.")
+ src.visible_message("
[bicon(src)] [src] scans the fossil and rejects it.")
if(2)
- visible_message("\red [bicon(src)] [src] can not extract any more genetic data from new fossils.")
+ visible_message("
[bicon(src)] [src] can not extract any more genetic data from new fossils.")
if(4)
- src.visible_message("\blue [bicon(src)] [user] inserts [W] into [src], the fossil is consumed as [src] extracts genetic data from it.")
+ src.visible_message("
[bicon(src)] [user] inserts [W] into [src], the fossil is consumed as [src] extracts genetic data from it.")
qdel(W)
updateDialog()
else if(istype(W, /obj/item/weapon/storage))
@@ -78,13 +78,13 @@ datum/genesequence
S.remove_from_storage(F, src) //This will move the item to this item's contents
qdel(F)
updateDialog()
- var/outmsg = "\blue You empty all the fossils from [S] into [src]."
+ var/outmsg = "
You empty all the fossils from [S] into [src]."
if(numaccepted)
- outmsg += " \blue[numaccepted] fossils were accepted and consumed as [src] extracts genetic data from them."
+ outmsg += "
[numaccepted] fossils were accepted and consumed as [src] extracts genetic data from them."
if(numrejected)
- outmsg += " \red[numrejected] fossils were rejected."
+ outmsg += "
[numrejected] fossils were rejected."
if(full)
- outmsg += " \red[src] can not extract any more genetic data from new fossils."
+ outmsg += "
[src] can not extract any more genetic data from new fossils."
visible_message(outmsg)
else
@@ -182,13 +182,13 @@ datum/genesequence
var/datum/genesequence/cloned_genesequence = completed_genesequences[sequence_num]
if(pod1)
if(pod1.occupant)
- visible_message("\red [bicon(src)] The cloning pod is currently occupied.")
+ visible_message("
[bicon(src)] The cloning pod is currently occupied.")
else if(pod1.biomass < CLONE_BIOMASS)
- visible_message("\red [bicon(src)] Not enough biomass in the cloning pod.")
+ visible_message("
[bicon(src)] Not enough biomass in the cloning pod.")
else if(pod1.mess)
- visible_message("\red [bicon(src)] Error: clonepod malfunction.")
+ visible_message("
[bicon(src)] Error: clonepod malfunction.")
else
- visible_message("\blue [bicon(src)] [src] clones something from a reconstituted gene sequence!")
+ visible_message("
[bicon(src)] [src] clones something from a reconstituted gene sequence!")
playsound(src.loc, 'sound/effects/screech.ogg', 50, 1, -3)
pod1.occupant = new cloned_genesequence.spawned_type(pod1)
pod1.locked = 1
@@ -196,7 +196,7 @@ datum/genesequence
//pod1.occupant.name = "[pod1.occupant.name] ([rand(0,999)])"
pod1.biomass -= CLONE_BIOMASS
else
- to_chat(usr, "\red [bicon(src)] Unable to locate cloning pod!")
+ to_chat(usr, "
[bicon(src)] Unable to locate cloning pod!")
else
..()
@@ -240,7 +240,7 @@ datum/genesequence
else if(href_list["clone"])
var/sequence_num = text2num(href_list["sequence_num"])
var/datum/genesequence/cloned_genesequence = completed_genesequences[sequence_num]
- visible_message("\blue [bicon(src)] [src] clones a packet of seeds from a reconstituted gene sequence!")
+ visible_message("
[bicon(src)] [src] clones a packet of seeds from a reconstituted gene sequence!")
playsound(src.loc, 'sound/effects/screech.ogg', 50, 1, -3)
new cloned_genesequence.spawned_type(src.loc)
diff --git a/code/modules/research/xenoarchaeology/machinery/artifact_harvester.dm b/code/modules/research/xenoarchaeology/machinery/artifact_harvester.dm
index 4bc8f88e618..38eaa00c6a2 100644
--- a/code/modules/research/xenoarchaeology/machinery/artifact_harvester.dm
+++ b/code/modules/research/xenoarchaeology/machinery/artifact_harvester.dm
@@ -24,13 +24,13 @@
/obj/machinery/artifact_harvester/attackby(var/obj/I as obj, var/mob/user as mob, params)
if(istype(I,/obj/item/weapon/anobattery))
if(!inserted_battery)
- to_chat(user, "\blue You insert [I] into [src].")
+ to_chat(user, "
You insert [I] into [src].")
user.drop_item()
I.loc = src
src.inserted_battery = I
updateDialog()
else
- to_chat(user, "\red There is already a battery in [src].")
+ to_chat(user, "
There is already a battery in [src].")
else
return..()
diff --git a/code/modules/research/xenoarchaeology/machinery/geosample_scanner.dm b/code/modules/research/xenoarchaeology/machinery/geosample_scanner.dm
index 4b0cb78116a..7bbd7408173 100644
--- a/code/modules/research/xenoarchaeology/machinery/geosample_scanner.dm
+++ b/code/modules/research/xenoarchaeology/machinery/geosample_scanner.dm
@@ -226,16 +226,16 @@
//emergency stop if seal integrity reaches 0
if(scanner_seal_integrity <= 0 || (scanner_temperature >= 1273 && !rad_shield))
stop_scanning()
- src.visible_message("\blue [bicon(src)] buzzes unhappily. It has failed mid-scan!", 2)
+ src.visible_message("
[bicon(src)] buzzes unhappily. It has failed mid-scan!", 2)
if(prob(5))
- src.visible_message("\blue [bicon(src)] [pick("whirrs","chuffs","clicks")][pick(" excitedly"," energetically"," busily")].", 2)
+ src.visible_message("
[bicon(src)] [pick("whirrs","chuffs","clicks")][pick(" excitedly"," energetically"," busily")].", 2)
else
//gradually cool down over time
if(scanner_temperature > 0)
scanner_temperature = max(scanner_temperature - 5 - 10 * rand(), 0)
if(prob(0.75))
- src.visible_message("\blue [bicon(src)] [pick("plinks","hisses")][pick(" quietly"," softly"," sadly"," plaintively")].", 2)
+ src.visible_message("
[bicon(src)] [pick("plinks","hisses")][pick(" quietly"," softly"," sadly"," plaintively")].", 2)
last_process_worldtime = world.time
/obj/machinery/radiocarbon_spectrometer/proc/stop_scanning()
@@ -253,7 +253,7 @@
used_coolant = 0
/obj/machinery/radiocarbon_spectrometer/proc/complete_scan()
- src.visible_message("\blue [bicon(src)] makes an insistent chime.", 2)
+ src.visible_message("
[bicon(src)] makes an insistent chime.", 2)
if(scanned_item)
//create report
diff --git a/code/modules/research/xenoarchaeology/tools/ano_device_battery.dm b/code/modules/research/xenoarchaeology/tools/ano_device_battery.dm
index 1f530c832e7..23ba3eb39a8 100644
--- a/code/modules/research/xenoarchaeology/tools/ano_device_battery.dm
+++ b/code/modules/research/xenoarchaeology/tools/ano_device_battery.dm
@@ -40,7 +40,7 @@
/obj/item/weapon/anodevice/attackby(var/obj/I as obj, var/mob/user as mob, params)
if(istype(I, /obj/item/weapon/anobattery))
if(!inserted_battery)
- to_chat(user, "\blue You insert the battery.")
+ to_chat(user, "
You insert the battery.")
user.drop_item()
I.loc = src
inserted_battery = I
@@ -131,13 +131,13 @@
//work out if we need to shutdown
if(inserted_battery.stored_charge <= 0)
- src.loc.visible_message("\blue [bicon(src)] [src] buzzes.", "\blue [bicon(src)] You hear something buzz.")
+ src.loc.visible_message("
[bicon(src)] [src] buzzes.", "
[bicon(src)] You hear something buzz.")
shutdown_emission()
else if(world.time > time_end)
- src.loc.visible_message("\blue [bicon(src)] [src] chimes.", "\blue [bicon(src)] You hear something chime.")
+ src.loc.visible_message("
[bicon(src)] [src] chimes.", "
[bicon(src)] You hear something chime.")
shutdown_emission()
else
- src.visible_message("\blue [bicon(src)] [src] buzzes.", "\blue [bicon(src)] You hear something buzz.")
+ src.visible_message("
[bicon(src)] [src] buzzes.", "
[bicon(src)] You hear something buzz.")
shutdown_emission()
last_process = world.time
@@ -164,7 +164,7 @@
if(href_list["startup"])
if(inserted_battery && inserted_battery.battery_effect && (inserted_battery.stored_charge > 0) )
activated = 1
- src.visible_message("\blue [bicon(src)] [src] whirrs.", "[bicon(src)]\blue You hear something whirr.")
+ src.visible_message("
[bicon(src)] [src] whirrs.", "
[bicon(src)] You hear something whirr.")
if(!inserted_battery.battery_effect.activated)
inserted_battery.battery_effect.ToggleActivate(1)
time_end = world.time + duration
@@ -201,9 +201,9 @@
if(activated && inserted_battery.battery_effect.effect == EFFECT_TOUCH && !isnull(inserted_battery))
inserted_battery.battery_effect.DoEffectTouch(M)
inserted_battery.use_power(energy_consumed_on_touch)
- user.visible_message("\blue [user] taps [M] with [src], and it shudders on contact.")
+ user.visible_message("
[user] taps [M] with [src], and it shudders on contact.")
else
- user.visible_message("\blue [user] taps [M] with [src], but nothing happens.")
+ user.visible_message("
[user] taps [M] with [src], but nothing happens.")
//admin logging
user.lastattacked = M
diff --git a/code/modules/research/xenoarchaeology/tools/bunsen_burner.dm b/code/modules/research/xenoarchaeology/tools/bunsen_burner.dm
index 3e7b4a05c12..a75378b0a26 100644
--- a/code/modules/research/xenoarchaeology/tools/bunsen_burner.dm
+++ b/code/modules/research/xenoarchaeology/tools/bunsen_burner.dm
@@ -12,32 +12,32 @@
/obj/machinery/bunsen_burner/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
if(istype(W, /obj/item/weapon/reagent_containers))
if(held_container)
- to_chat(user, "\red You must remove the [held_container] first.")
+ to_chat(user, "
You must remove the [held_container] first.")
else
user.drop_item(src)
held_container = W
held_container.loc = src
- to_chat(user, "\blue You put the [held_container] onto the [src].")
+ to_chat(user, "
You put the [held_container] onto the [src].")
var/image/I = image("icon"=W, "layer"=FLOAT_LAYER)
underlays += I
if(heating)
spawn(heat_time)
try_heating()
else
- to_chat(user, "\red You can't put the [W] onto the [src].")
+ to_chat(user, "
You can't put the [W] onto the [src].")
/obj/machinery/bunsen_burner/attack_hand(mob/user as mob)
if(held_container)
underlays = null
- to_chat(user, "\blue You remove the [held_container] from the [src].")
+ to_chat(user, "
You remove the [held_container] from the [src].")
held_container.loc = src.loc
held_container.attack_hand(user)
held_container = null
else
- to_chat(user, "\red There is nothing on the [src].")
+ to_chat(user, "
There is nothing on the [src].")
/obj/machinery/bunsen_burner/proc/try_heating()
- src.visible_message("\blue [bicon(src)] [src] hisses.")
+ src.visible_message("
[bicon(src)] [src] hisses.")
if(held_container && heating)
heated = 1
held_container.reagents.handle_reactions()
diff --git a/code/modules/research/xenoarchaeology/tools/suspension_generator.dm b/code/modules/research/xenoarchaeology/tools/suspension_generator.dm
index 37ecc240cf2..775a4e25c98 100644
--- a/code/modules/research/xenoarchaeology/tools/suspension_generator.dm
+++ b/code/modules/research/xenoarchaeology/tools/suspension_generator.dm
@@ -31,14 +31,14 @@
M.Weaken(3)
cell.charge -= power_use
if(prob(5))
- to_chat(M, "\blue [pick("You feel tingly.","You feel like floating.","It is hard to speak.","You can barely move.")]")
+ to_chat(M, "
[pick("You feel tingly.","You feel like floating.","It is hard to speak.","You can barely move.")]")
if(field_type == "iron")
for(var/mob/living/silicon/M in T)
M.Weaken(3)
cell.charge -= power_use
if(prob(5))
- to_chat(M, "\blue [pick("You feel tingly.","You feel like floating.","It is hard to speak.","You can barely move.")]")
+ to_chat(M, "
[pick("You feel tingly.","You feel like floating.","It is hard to speak.","You can barely move.")]")
for(var/obj/item/I in T)
if(!suspension_field.contents.len)
@@ -50,7 +50,7 @@
M.Weaken(3)
cell.charge -= power_use
if(prob(5))
- to_chat(M, "\blue [pick("You feel tingly.","You feel like floating.","It is hard to speak.","You can barely move.")]")
+ to_chat(M, "
[pick("You feel tingly.","You feel like floating.","It is hard to speak.","You can barely move.")]")
if(cell.charge <= 0)
deactivate()
@@ -248,7 +248,7 @@
success = 1
for(var/mob/living/carbon/C in T)
C.AdjustWeakened(5)
- C.visible_message("\blue [bicon(C)] [C] begins to float in the air!","You feel tingly and light, but it is difficult to move.")
+ C.visible_message("
[bicon(C)] [C] begins to float in the air!","You feel tingly and light, but it is difficult to move.")
if("nitrogen")
success = 1
//
@@ -271,19 +271,19 @@
success = 1
for(var/mob/living/silicon/R in T)
R.AdjustWeakened(5)
- R.visible_message("\blue [bicon(R)] [R] begins to float in the air!","You feel tingly and light, but it is difficult to move.")
+ R.visible_message("
[bicon(R)] [R] begins to float in the air!","You feel tingly and light, but it is difficult to move.")
//
//in case we have a bad field type
if(!success)
return
for(var/mob/living/simple_animal/C in T)
- C.visible_message("\blue [bicon(C)] [C] begins to float in the air!","You feel tingly and light, but it is difficult to move.")
+ C.visible_message("
[bicon(C)] [C] begins to float in the air!","You feel tingly and light, but it is difficult to move.")
C.AdjustWeakened(5)
suspension_field = new(T)
suspension_field.field_type = field_type
- src.visible_message("\blue [bicon(src)] [src] activates with a low hum.")
+ src.visible_message("
[bicon(src)] [src] activates with a low hum.")
icon_state = "suspension3"
for(var/obj/item/I in T)
@@ -293,7 +293,7 @@
if(collected)
suspension_field.icon_state = "energynet"
suspension_field.overlays += "shield2"
- src.visible_message("\blue [bicon(suspension_field)] [suspension_field] gently absconds [collected > 1 ? "something" : "several things"].")
+ src.visible_message("
[bicon(suspension_field)] [suspension_field] gently absconds [collected > 1 ? "something" : "several things"].")
else
if(istype(T,/turf/simulated/mineral) || istype(T,/turf/simulated/wall))
suspension_field.icon_state = "shieldsparkles"
@@ -308,7 +308,7 @@
to_chat(M, "
You no longer feel like floating.")
M.SetWeakened(min(M.weakened, 3))
- src.visible_message("\blue [bicon(src)] [src] deactivates with a gentle shudder.")
+ src.visible_message("
[bicon(src)] [src] deactivates with a gentle shudder.")
qdel(suspension_field)
icon_state = "suspension2"
@@ -323,7 +323,7 @@
set category = "Object"
if(anchored)
- to_chat(usr, "\red You cannot rotate [src], it has been firmly fixed to the floor.")
+ to_chat(usr, "
You cannot rotate [src], it has been firmly fixed to the floor.")
else
dir = turn(dir, 90)
@@ -333,7 +333,7 @@
set category = "Object"
if(anchored)
- to_chat(usr, "\red You cannot rotate [src], it has been firmly fixed to the floor.")
+ to_chat(usr, "
You cannot rotate [src], it has been firmly fixed to the floor.")
else
dir = turn(dir, -90)
diff --git a/code/modules/research/xenoarchaeology/tools/tools_coresampler.dm b/code/modules/research/xenoarchaeology/tools/tools_coresampler.dm
index e8daea89b74..72f85146df1 100644
--- a/code/modules/research/xenoarchaeology/tools/tools_coresampler.dm
+++ b/code/modules/research/xenoarchaeology/tools/tools_coresampler.dm
@@ -27,16 +27,16 @@
/obj/item/device/core_sampler/examine(mob/user)
if(..(user, 2))
- to_chat(user, "\blue Used to extract geological core samples - this one is [sampled_turf ? "full" : "empty"], and has [num_stored_bags] bag[num_stored_bags != 1 ? "s" : ""] remaining.")
+ to_chat(user, "
Used to extract geological core samples - this one is [sampled_turf ? "full" : "empty"], and has [num_stored_bags] bag[num_stored_bags != 1 ? "s" : ""] remaining.")
/obj/item/device/core_sampler/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
if(istype(W,/obj/item/weapon/evidencebag))
if(num_stored_bags < 10)
qdel(W)
num_stored_bags += 1
- to_chat(user, "\blue You insert the [W] into the core sampler.")
+ to_chat(user, "
You insert the [W] into the core sampler.")
else
- to_chat(user, "\red The core sampler can not fit any more bags!")
+ to_chat(user, "
The core sampler can not fit any more bags!")
else
return ..()
@@ -52,9 +52,9 @@
if(geo_data)
if(filled_bag)
- to_chat(user, "\red The core sampler is full!")
+ to_chat(user, "
The core sampler is full!")
else if(num_stored_bags < 1)
- to_chat(user, "\red The core sampler is out of sample bags!")
+ to_chat(user, "
The core sampler is out of sample bags!")
else
//create a new sample bag which we'll fill with rock samples
filled_bag = new /obj/item/weapon/evidencebag(src)
@@ -75,13 +75,13 @@
filled_bag.underlays += I
filled_bag.w_class = 1
- to_chat(user, "\blue You take a core sample of the [item_to_sample].")
+ to_chat(user, "
You take a core sample of the [item_to_sample].")
else
- to_chat(user, "\red You are unable to take a sample of [item_to_sample].")
+ to_chat(user, "
You are unable to take a sample of [item_to_sample].")
/obj/item/device/core_sampler/attack_self()
if(filled_bag)
- to_chat(usr, "\blue You eject the full sample bag.")
+ to_chat(usr, "
You eject the full sample bag.")
var/success = 0
if(istype(src.loc, /mob))
var/mob/M = src.loc
@@ -91,4 +91,4 @@
filled_bag = null
icon_state = "sampler0"
else
- to_chat(usr, "\red The core sampler is empty.")
+ to_chat(usr, "
The core sampler is empty.")
diff --git a/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm b/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm
index eca8c423273..83429d509bc 100644
--- a/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm
+++ b/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm
@@ -24,7 +24,7 @@
var/material = "unknown"
/obj/item/device/depth_scanner/proc/scan_atom(var/mob/user, var/atom/A)
- user.visible_message("\blue [user] scans [A], the air around them humming gently.")
+ user.visible_message("
[user] scans [A], the air around them humming gently.")
if(istype(A,/turf/simulated/mineral))
var/turf/simulated/mineral/M = A
if((M.finds && M.finds.len) || M.artifact_find)
@@ -46,7 +46,7 @@
positive_locations.Add(D)
for(var/mob/L in range(src, 1))
- to_chat(L, "\blue [bicon(src)] [src] pings.")
+ to_chat(L, "
[bicon(src)] [src] pings.")
else if(istype(A,/obj/structure/boulder))
var/obj/structure/boulder/B = A
@@ -65,7 +65,7 @@
positive_locations.Add(D)
for(var/mob/L in range(src, 1))
- to_chat(L, "\blue [bicon(src)] [src] pings [pick("madly","wildly","excitedly","crazily")]!.")
+ to_chat(L, "
[bicon(src)] [src] pings [pick("madly","wildly","excitedly","crazily")]!.")
/obj/item/device/depth_scanner/attack_self(var/mob/user as mob)
return src.interact(user)
diff --git a/code/modules/research/xenobiology/xenobio_camera.dm b/code/modules/research/xenobiology/xenobio_camera.dm
index 9e0e26a0252..40f20ea4dde 100644
--- a/code/modules/research/xenobiology/xenobio_camera.dm
+++ b/code/modules/research/xenobiology/xenobio_camera.dm
@@ -77,11 +77,11 @@
else if(istype(O, /obj/item/weapon/storage/bag))
var/obj/item/weapon/storage/P = O
var/loaded = 0
- for(var/obj/G in P.contents)
- if(istype(G, /obj/item/weapon/reagent_containers/food/snacks/monkeycube))
- loaded = 1
- monkeys++
- qdel(G)
+ for(var/obj/item/weapon/reagent_containers/food/snacks/monkeycube/MC in P.contents)
+ loaded = 1
+ monkeys++
+ P.remove_from_storage(MC)
+ qdel(MC)
if(loaded)
to_chat(user, "
You fill [src] with the monkey cubes stored in [O]. [src] now has [monkeys] monkey cubes stored.")
return
diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm
index c3072758331..c42b6e8286c 100644
--- a/code/modules/research/xenobiology/xenobiology.dm
+++ b/code/modules/research/xenobiology/xenobiology.dm
@@ -422,7 +422,7 @@
var/mob/dead/observer/ghost
for(var/mob/dead/observer/O in loc)
if(!check_observer(O))
- to_chat(O, "\red You are not eligible to become a golem.")
+ to_chat(O, "
You are not eligible to become a golem.")
continue
ghost = O
break
@@ -463,13 +463,13 @@
/obj/effect/golemrune/proc/volunteer(var/mob/dead/observer/O)
if(O in ghosts)
ghosts.Remove(O)
- to_chat(O, "\red You are no longer signed up to be a golem.")
+ to_chat(O, "
You are no longer signed up to be a golem.")
else
if(!check_observer(O))
- to_chat(O, "\red You are not eligible to become a golem.")
+ to_chat(O, "
You are not eligible to become a golem.")
return
ghosts.Add(O)
- to_chat(O, "\blue You are signed up to be a golem.")
+ to_chat(O, "
You are signed up to be a golem.")
diff --git a/code/modules/security_levels/keycard authentication.dm b/code/modules/security_levels/keycard authentication.dm
index 8435d8cf992..1fea8864498 100644
--- a/code/modules/security_levels/keycard authentication.dm
+++ b/code/modules/security_levels/keycard authentication.dm
@@ -156,7 +156,7 @@
feedback_inc("alert_keycard_auth_maintRevoke",1)
if("Emergency Response Team")
if(is_ert_blocked())
- to_chat(usr, "\red All Emergency Response Teams are dispatched and can not be called at this time.")
+ to_chat(usr, "
All Emergency Response Teams are dispatched and can not be called at this time.")
return
to_chat(usr, "
ERT request transmitted.")
@@ -186,7 +186,7 @@ var/global/maint_all_access = 0
for(var/obj/machinery/door/airlock/D in A)
D.emergency = 1
D.update_icon(0)
- minor_announcement.Announce("The maintenance access requirement has been revoked on all airlocks.")
+ minor_announcement.Announce("Access restrictions on maintenance and external airlocks have been removed.")
maint_all_access = 1
/proc/revoke_maint_all_access()
@@ -194,5 +194,5 @@ var/global/maint_all_access = 0
for(var/obj/machinery/door/airlock/D in A)
D.emergency = 0
D.update_icon(0)
- minor_announcement.Announce("The maintenance access requirement has been readded on all maintenance airlocks.")
- maint_all_access = 0
\ No newline at end of file
+ minor_announcement.Announce("Access restrictions on maintenance and external airlocks have been re-added.")
+ maint_all_access = 0
diff --git a/code/modules/shuttle/supply.dm b/code/modules/shuttle/supply.dm
index 6fc4cae582e..24d76267b13 100644
--- a/code/modules/shuttle/supply.dm
+++ b/code/modules/shuttle/supply.dm
@@ -236,8 +236,8 @@
/proc/forbidden_atoms_check(atom/A)
var/list/blacklist = list(
/mob/living,
- /obj/effect/blob,
- /obj/effect/spider/spiderling,
+ /obj/structure/blob,
+ /obj/structure/spider/spiderling,
/obj/item/weapon/disk/nuclear,
/obj/machinery/nuclearbomb,
/obj/item/device/radio/beacon,
diff --git a/code/modules/space_management/space_chunk.dm b/code/modules/space_management/space_chunk.dm
index 8b6e5b6974e..e139394e963 100644
--- a/code/modules/space_management/space_chunk.dm
+++ b/code/modules/space_management/space_chunk.dm
@@ -96,6 +96,13 @@
/datum/space_chunk/proc/return_turfs()
return
+/datum/space_chunk/proc/search_chunk(object_list)
+ var/list/located = list()
+ for(var/atom/object in object_list)
+ if(((object.x >= x) && (object.x <= (x + width))) && ((object.y >= y) && (object.y <= (y + height))) && (object.z == zpos))
+ located.Add(object)
+ return located
+
#undef BOTTOM_LEFT_CHUNK
#undef BOTTOM_RIGHT_CHUNK
#undef TOP_LEFT_CHUNK
diff --git a/code/modules/spacepods/construction.dm b/code/modules/spacepods/construction.dm
index 0426b940d0b..a997a23f585 100644
--- a/code/modules/spacepods/construction.dm
+++ b/code/modules/spacepods/construction.dm
@@ -19,6 +19,10 @@
dir = EAST
+/obj/structure/spacepod_frame/Destroy()
+ QDEL_NULL(construct)
+ return ..()
+
/obj/structure/spacepod_frame/attackby(obj/item/W as obj, mob/user as mob, params)
if(!construct || !construct.action(W, user))
..()
diff --git a/code/modules/spacepods/spacepod.dm b/code/modules/spacepods/spacepod.dm
index 1d883771b25..2a111433948 100644
--- a/code/modules/spacepods/spacepod.dm
+++ b/code/modules/spacepods/spacepod.dm
@@ -124,22 +124,14 @@
/obj/spacepod/Destroy()
if(equipment_system.cargo_system)
equipment_system.cargo_system.removed(null)
- qdel(equipment_system)
- equipment_system = null
- qdel(cargo_hold)
- cargo_hold = null
- qdel(battery)
- battery = null
- qdel(cabin_air)
- cabin_air = null
- qdel(internal_tank)
- internal_tank = null
- qdel(pr_int_temp_processor)
- pr_int_temp_processor = null
- qdel(pr_give_air)
- pr_give_air = null
- qdel(ion_trail)
- ion_trail = null
+ QDEL_NULL(equipment_system)
+ QDEL_NULL(cargo_hold)
+ QDEL_NULL(battery)
+ QDEL_NULL(cabin_air)
+ QDEL_NULL(internal_tank)
+ QDEL_NULL(pr_int_temp_processor)
+ QDEL_NULL(pr_give_air)
+ QDEL_NULL(ion_trail)
occupant_sanity_check()
if(pilot)
pilot.forceMove(get_turf(src))
@@ -220,8 +212,8 @@
user.changeNext_move(CLICK_CD_MELEE)
deal_damage(15)
playsound(src.loc, 'sound/weapons/slash.ogg', 50, 1, -1)
- to_chat(user, "\red You slash at \the [src]!")
- visible_message("\red The [user] slashes at [src.name]'s armor!")
+ to_chat(user, "
You slash at [src]!")
+ visible_message("
The [user] slashes at [src.name]'s armor!")
return
/obj/spacepod/proc/deal_damage(var/damage)
@@ -261,7 +253,7 @@
if(H)
H.forceMove(get_turf(src))
H.ex_act(severity + 1)
- to_chat(H, "
You are forcefully thrown from \the [src]!")
+ to_chat(H, "
You are forcefully thrown from [src]!")
qdel(ion_trail)
qdel(src)
if(2)
@@ -275,7 +267,7 @@
cargo_hold.emp_act(severity)
if(battery && battery.charge > 0)
- battery.use((battery.charge / 2) / severity)
+ battery.use((battery.charge/3)/(severity*2))
deal_damage(80 / severity)
if(empcounter < (40 / severity))
empcounter = 40 / severity
@@ -318,18 +310,19 @@
return
if(istype(W, /obj/item/weapon/stock_parts/cell))
if(!hatch_open)
- to_chat(user, "\red The maintenance hatch is closed!")
+ to_chat(user, "
The maintenance hatch is closed!")
return
if(battery)
to_chat(user, "
The pod already has a battery.")
return
+ to_chat(user, "
You insert [W] into the pod.")
user.drop_item(W)
battery = W
W.forceMove(src)
return
if(istype(W, /obj/item/device/spacepod_equipment))
if(!hatch_open)
- to_chat(user, "\red The maintenance hatch is closed!")
+ to_chat(user, "
The maintenance hatch is closed!")
return
if(!equipment_system)
to_chat(user, "
The pod has no equipment datum, yell at the coders")
@@ -361,21 +354,21 @@
if(istype(W, /obj/item/weapon/weldingtool))
if(!hatch_open)
- to_chat(user, "\red You must open the maintenance hatch before attempting repairs.")
+ to_chat(user, "
You must open the maintenance hatch before attempting repairs.")
return
var/obj/item/weapon/weldingtool/WT = W
if(!WT.isOn())
- to_chat(user, "\red The welder must be on for this task.")
+ to_chat(user, "
The welder must be on for this task.")
return
if(health < initial(health))
- to_chat(user, "\blue You start welding the spacepod...")
+ to_chat(user, "
You start welding the spacepod...")
playsound(loc, W.usesound, 50, 1)
if(do_after(user, 20 * W.toolspeed, target = src))
if(!src || !WT.remove_fuel(3, user)) return
repair_damage(10)
- to_chat(user, "\blue You mend some [pick("dents","bumps","damage")] with \the [WT]")
+ to_chat(user, "
You mend some [pick("dents","bumps","damage")] with [WT]")
return
- to_chat(user, "
\The [src] is fully repaired!")
+ to_chat(user, "
[src] is fully repaired!")
return
if(istype(W, /obj/item/device/lock_buster))
@@ -403,7 +396,7 @@ obj/spacepod/proc/add_equipment(mob/user, var/obj/item/device/spacepod_equipment
to_chat(user, "
The pod already has a [slot], remove it first.")
return
else
- to_chat(user, "
You insert \the [SPE] into the pod.")
+ to_chat(user, "
You insert [SPE] into the pod.")
user.drop_item(SPE)
SPE.forceMove(src)
equipment_system.vars[slot] = SPE
@@ -464,7 +457,7 @@ obj/spacepod/proc/add_equipment(mob/user, var/obj/item/device/spacepod_equipment
switch(input(user, "Remove which equipment?", null, null) as null|anything in possible)
if("Energy Cell")
if(user.put_in_any_hand_if_possible(battery))
- to_chat(user, "
You remove \the [battery] from the space pod")
+ to_chat(user, "
You remove [battery] from the space pod")
battery = null
else
to_chat(user, "
You need an open hand to do that.")
@@ -487,18 +480,18 @@ obj/spacepod/proc/add_equipment(mob/user, var/obj/item/device/spacepod_equipment
/obj/spacepod/proc/remove_equipment(mob/user, var/obj/item/device/spacepod_equipment/SPE, var/slot)
if(passengers.len > max_passengers - SPE.occupant_mod)
- to_chat(user, "
Someone is sitting in \the [SPE]!")
+ to_chat(user, "
Someone is sitting in [SPE]!")
return
var/sum_w_class = 0
for(var/obj/item/I in cargo_hold.contents)
sum_w_class += I.w_class
if(cargo_hold.contents.len > cargo_hold.storage_slots - SPE.storage_mod["slots"] || sum_w_class > cargo_hold.max_combined_w_class - SPE.storage_mod["w_class"])
- to_chat(user, "
Empty \the [SPE] first!")
+ to_chat(user, "
Empty [SPE] first!")
return
if(user.put_in_any_hand_if_possible(SPE))
- to_chat(user, "
You remove \the [SPE] from the equipment system.")
+ to_chat(user, "
You remove [SPE] from the equipment system.")
equipment_system.installed_modules -= SPE
max_passengers -= SPE.occupant_mod
cargo_hold.storage_slots -= SPE.storage_mod["slots"]
@@ -602,6 +595,10 @@ obj/spacepod/proc/add_equipment(mob/user, var/obj/item/device/spacepod_equipment
set category = "Spacepod"
set src = usr.loc
set popup_menu = 0
+
+ if(usr.incapacitated())
+ return
+
if(usr != src.pilot)
to_chat(usr, "
You can't reach the controls from your chair")
return
@@ -701,22 +698,22 @@ obj/spacepod/proc/add_equipment(mob/user, var/obj/item/device/spacepod_equipment
/obj/spacepod/proc/load_cargo(mob/user, var/obj/O)
var/obj/item/device/spacepod_equipment/cargo/ore/C = equipment_system.cargo_system
if(!C.storage)
- to_chat(user, "You begin loading \the [O] into \the [src]'s [equipment_system.cargo_system]")
+ to_chat(user, "You begin loading [O] into [src]'s [equipment_system.cargo_system]")
if(do_after(user, 40, target = src))
C.storage = O
O.forceMove(C)
- to_chat(user, "You load \the [O] into \the [src]'s [equipment_system.cargo_system]!")
+ to_chat(user, "You load [O] into [src]'s [equipment_system.cargo_system]!")
else
- to_chat(user, "You fail to load \the [O] into \the [src]'s [equipment_system.cargo_system]")
+ to_chat(user, "You fail to load [O] into [src]'s [equipment_system.cargo_system]")
else
- to_chat(user, "\The [src] already has \an [C.storage]")
+ to_chat(user, "[src] already has \an [C.storage]")
/obj/spacepod/proc/enter_pod(mob/user)
if(usr.stat != CONSCIOUS)
return 0
if(equipment_system.lock_system && !unlocked)
- to_chat(user, "\The [src]'s doors are locked!")
+ to_chat(user, "[src]'s doors are locked!")
return 0
if(get_dist(src, user) > 2 || get_dist(usr, user) > 1)
@@ -751,7 +748,7 @@ obj/spacepod/proc/add_equipment(mob/user, var/obj/item/device/spacepod_equipment
occupant_sanity_check()
if(passengers.len <= max_passengers)
- visible_message("[user] starts to climb into \the [src].")
+ visible_message("[user] starts to climb into [src].")
if(do_after(user, 40, target = src))
if(!pilot || pilot == null)
user.stop_pulling()
@@ -769,9 +766,9 @@ obj/spacepod/proc/add_equipment(mob/user, var/obj/item/device/spacepod_equipment
else
to_chat(user, "You were too slow. Try better next time, loser.")
else
- to_chat(user, "You stop entering \the [src].")
+ to_chat(user, "You stop entering [src].")
else
- to_chat(user, "You can't fit in \the [src], it's full!")
+ to_chat(user, "You can't fit in [src], it's full!")
/obj/spacepod/proc/occupant_sanity_check() // going to have to adjust this later for cargo refactor
if(passengers)
@@ -799,7 +796,7 @@ obj/spacepod/proc/add_equipment(mob/user, var/obj/item/device/spacepod_equipment
if(!istype(user))
return
- if(user.stat != CONSCIOUS || user.incapacitated()) // unconscious and restrained people can't let themselves out
+ if(usr.incapacitated()) // unconscious and restrained people can't let themselves out
return
occupant_sanity_check()
@@ -807,17 +804,20 @@ obj/spacepod/proc/add_equipment(mob/user, var/obj/item/device/spacepod_equipment
if(user == pilot)
user.forceMove(get_turf(src))
pilot = null
- to_chat(user, "You climb out of \the [src].")
+ to_chat(user, "You climb out of [src].")
if(user in passengers)
user.forceMove(get_turf(src))
passengers -= user
- to_chat(user, "You climb out of \the [src].")
+ to_chat(user, "You climb out of [src].")
/obj/spacepod/verb/lock_pod()
set name = "Lock Doors"
set category = "Spacepod"
set src = usr.loc
+ if(usr.incapacitated())
+ return
+
if(usr in passengers && usr != src.pilot)
to_chat(usr, "You can't reach the controls from your chair")
return
@@ -831,6 +831,9 @@ obj/spacepod/proc/add_equipment(mob/user, var/obj/item/device/spacepod_equipment
set category = "Spacepod"
set src = usr.loc
+ if(usr.incapacitated())
+ return
+
if(usr != src.pilot)
to_chat(usr, "You can't reach the controls from your chair")
return
@@ -862,11 +865,15 @@ obj/spacepod/proc/add_equipment(mob/user, var/obj/item/device/spacepod_equipment
set desc = "Fire the weapons."
set category = "Spacepod"
set src = usr.loc
+
+ if(usr.incapacitated())
+ return
+
if(usr != src.pilot)
to_chat(usr, "You can't reach the controls from your chair")
return
if(!equipment_system.weapon_system)
- to_chat(usr, "\The [src] has no weapons!")
+ to_chat(usr, "[src] has no weapons!")
return
equipment_system.weapon_system.fire_weapons()
@@ -875,11 +882,15 @@ obj/spacepod/proc/add_equipment(mob/user, var/obj/item/device/spacepod_equipment
set desc = "Unloads the cargo"
set category = "Spacepod"
set src = usr.loc
+
+ if(usr.incapacitated())
+ return
+
if(usr != src.pilot)
to_chat(usr, "You can't reach the controls from your chair")
return
if(!equipment_system.cargo_system)
- to_chat(usr, "\The [src] has no cargo system!")
+ to_chat(usr, "[src] has no cargo system!")
return
equipment_system.cargo_system.unload()
@@ -887,6 +898,10 @@ obj/spacepod/proc/add_equipment(mob/user, var/obj/item/device/spacepod_equipment
set name = "Toggle Lights"
set category = "Spacepod"
set src = usr.loc
+
+ if(usr.incapacitated())
+ return
+
if(usr != src.pilot)
to_chat(usr, "You can't reach the controls from your chair")
return
@@ -907,6 +922,10 @@ obj/spacepod/proc/add_equipment(mob/user, var/obj/item/device/spacepod_equipment
set category = "Spacepod"
set src = usr.loc
var/mob/user = usr
+
+ if(usr.incapacitated())
+ return
+
to_chat(user, "You start rooting around under the seat for lost items")
if(do_after(user, 40, target = src))
var/obj/badlist = list(internal_tank, cargo_hold, pilot, battery) + passengers + equipment_system.installed_modules
diff --git a/code/modules/surgery/generic.dm b/code/modules/surgery/generic.dm
index 3ff6020af26..300f6a88918 100644
--- a/code/modules/surgery/generic.dm
+++ b/code/modules/surgery/generic.dm
@@ -82,7 +82,7 @@
user.visible_message(" [user] clamps bleeders in [target]'s [affected.name] with \the [tool].", \
" You clamp bleeders in [target]'s [affected.name] with \the [tool].")
affected.clamp()
- spread_germs_to_organ(affected, user)
+ spread_germs_to_organ(affected, user, tool)
return 1
/datum/surgery_step/generic/clamp_bleeders/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
diff --git a/code/modules/surgery/organs/organ_external.dm b/code/modules/surgery/organs/organ_external.dm
index 242b6e48217..009f2a929ec 100644
--- a/code/modules/surgery/organs/organ_external.dm
+++ b/code/modules/surgery/organs/organ_external.dm
@@ -50,7 +50,7 @@
// Internal organs of this body part
var/list/internal_organs = list()
- var/damage_msg = "\red You feel an intense pain"
+ var/damage_msg = "You feel an intense pain"
var/broken_description
var/open = 0
@@ -108,26 +108,26 @@
switch(open)
if(0)
if(istype(W,/obj/item/weapon/scalpel))
- spread_germs_to_organ(src,user)
+ spread_germs_to_organ(src,user, W)
user.visible_message("[user] cuts [src] open with [W]!")
open++
return
if(1)
if(istype(W,/obj/item/weapon/retractor))
- spread_germs_to_organ(src,user)
+ spread_germs_to_organ(src,user, W)
user.visible_message("[user] cracks [src] open like an egg with [W]!")
open++
return
if(2)
if(istype(W,/obj/item/weapon/hemostat))
- spread_germs_to_organ(src,user)
+ spread_germs_to_organ(src,user, W)
if(contents.len)
var/obj/item/removing = pick(contents)
var/obj/item/organ/internal/O = removing
if(istype(O))
O.status |= ORGAN_CUT_AWAY
if(!O.sterile)
- spread_germs_to_organ(O,user) // This wouldn't be any cleaner than the actual surgery
+ spread_germs_to_organ(O,user, W) // This wouldn't be any cleaner than the actual surgery
user.put_in_hands(removing)
user.visible_message("[user] extracts [removing] from [src] with [W]!")
else
@@ -818,7 +818,7 @@ Note that amputating the affected organ does in fact remove the infection from t
return
if(owner)
owner.visible_message(\
- "\red You hear a loud cracking sound coming from \the [owner].",\
+ "You hear a loud cracking sound coming from \the [owner].",\
"Something feels like it shattered in your [name]!",\
"You hear a sickening crack.")
if(owner.species && !(owner.species.flags & NO_PAIN))
@@ -970,13 +970,13 @@ Note that amputating the affected organ does in fact remove the infection from t
return
if(owner)
if(type == "brute")
- owner.visible_message("\red You hear a sickening cracking sound coming from \the [owner]'s [name].", \
+ owner.visible_message("You hear a sickening cracking sound coming from \the [owner]'s [name].", \
"Your [name] becomes a mangled mess!", \
- "\red You hear a sickening crack.")
+ "You hear a sickening crack.")
else
- owner.visible_message("\red \The [owner]'s [name] melts away, turning into mangled mess!", \
+ owner.visible_message("\The [owner]'s [name] melts away, turning into mangled mess!", \
"Your [name] melts away!", \
- "\red You hear a sickening sizzle.")
+ "You hear a sickening sizzle.")
disfigured = 1
/obj/item/organ/external/is_primary_organ(var/mob/living/carbon/human/O = null)
diff --git a/code/modules/surgery/organs/pain.dm b/code/modules/surgery/organs/pain.dm
index f0b4b912eaf..7852ac05a5b 100644
--- a/code/modules/surgery/organs/pain.dm
+++ b/code/modules/surgery/organs/pain.dm
@@ -55,7 +55,7 @@ mob/living/carbon/human/proc/custom_pain(var/message, var/flash_strength)
return
var/msg = "[message]"
if(flash_strength >= 1)
- msg = "\red [message]"
+ msg = "[message]"
// Anti message spam checks
if(msg && ((msg != last_pain_message) || (world.time >= next_pain_time)))
diff --git a/code/modules/surgery/organs/parasites.dm b/code/modules/surgery/organs/parasites.dm
index 71ecdc41139..0adca48bfd0 100644
--- a/code/modules/surgery/organs/parasites.dm
+++ b/code/modules/surgery/organs/parasites.dm
@@ -28,7 +28,7 @@
owner.emote("scream")
var/spiders = rand(3,5)
for(var/i in 1 to spiders)
- new/obj/effect/spider/spiderling(get_turf(owner))
+ new/obj/structure/spider/spiderling(get_turf(owner))
owner.visible_message("[owner] bursts open! Holy fuck!")
owner.gib()
@@ -60,8 +60,8 @@
// the spider eggs secrete stimulants to keep their host alive until they hatch
switch(current_cycle)
if(1) // immediately
- to_chat(owner,"Your spider bite wound hurts horribly! ")
- if(istype(get_area(owner), /area/awaycontent) || istype(get_area(owner), /area/awaymission))
+ to_chat(owner,"Your wound hurts horribly! ")
+ if(is_away_level(owner.z))
awaymission_infection = 1
if(15) // 30s... enough time for the nerve agent to kick in, the pain to be blocked, and healing to begin
to_chat(owner,"The pain has faded, and stopped bleeding, though the skin around it has turned black.")
@@ -76,7 +76,7 @@
if(110) // 3m40s...
to_chat(owner,"The black flesh splits open completely, revealing a cluster of small black oval shapes inside you, shapes that seem to be moving!")
if(120) // 4m...
- if(awaymission_infection && is_away_level(owner.z))
+ if(awaymission_infection && !is_away_level(owner.z))
// we started in the awaymission, we ended on the station.
// To prevent someone bringing an infection back, we're going to trigger an alternate, equally-bad result here.
// Actually, let's make it slightly worse... just to discourage people from bringing back infections.
@@ -86,17 +86,17 @@
owner.Stun(20)
owner.Weaken(20)
// yes, this is a long stun - that's intentional. Gotta give the spiderlings time to escape.
- var/obj/effect/spider/spiderling/terror_spiderling/S1 = new(get_turf(owner))
+ var/obj/structure/spider/spiderling/terror_spiderling/S1 = new(get_turf(owner))
S1.grow_as = /mob/living/simple_animal/hostile/poison/terror_spider/red
S1.name = "red spiderling"
if(prob(50))
S1.stillborn = 1
- var/obj/effect/spider/spiderling/terror_spiderling/S2 = new(get_turf(owner))
+ var/obj/structure/spider/spiderling/terror_spiderling/S2 = new(get_turf(owner))
S2.grow_as = /mob/living/simple_animal/hostile/poison/terror_spider/gray
S2.name = "gray spiderling"
if(prob(50))
S2.stillborn = 1
- var/obj/effect/spider/spiderling/terror_spiderling/S3 = new(get_turf(owner))
+ var/obj/structure/spider/spiderling/terror_spiderling/S3 = new(get_turf(owner))
S3.grow_as = /mob/living/simple_animal/hostile/poison/terror_spider/green
S3.name = "green spiderling"
if(prob(50))
@@ -108,7 +108,7 @@
owner.gib()
else
owner.adjustToxLoss(rand(100,180)) // normal case, range: 100-180, average 140, almost crit (150).
- if(190) // 6m 30s
+ if(130) // 4m 20s
to_chat(owner,"The spiderlings are gone. Your wound, though, looks worse than ever. Remnants of tiny spider eggs, and dead spiders, inside your flesh. Disgusting.")
qdel(src)
diff --git a/code/modules/surgery/organs/robolimbs.dm b/code/modules/surgery/organs/robolimbs.dm
index c3d7f1c3828..2d31942059c 100644
--- a/code/modules/surgery/organs/robolimbs.dm
+++ b/code/modules/surgery/organs/robolimbs.dm
@@ -119,4 +119,23 @@ var/global/datum/robolimb/basic_robolimb
company = "Zeng-Hu Pharmaceuticals"
desc = "This limb has a rubbery fleshtone covering with visible seams."
icon = 'icons/mob/human_races/cyberlimbs/zenghu/zenghu_main.dmi'
- has_subtypes = 2
\ No newline at end of file
+ has_subtypes = 2
+
+/datum/robolimb/shellguard
+ company = "Shellguard Munitions Standard Series"
+ desc = "This limb features exposed robust steel and paint to match Shellguards motifs"
+ icon = 'icons/mob/human_races/cyberlimbs/shellguard/shellguard_main.dmi'
+ has_subtypes = 1
+
+/datum/robolimb/shellguard/alt1
+ company = "Shellguard Munitions Elite Series"
+ icon = 'icons/mob/human_races/cyberlimbs/shellguard/shellguard_alt1.dmi'
+ parts = list("head")
+ has_subtypes = null
+
+/datum/robolimb/shellguard/monitor
+ company = "Shellguard Munitions Monitor Series"
+ icon = 'icons/mob/human_races/cyberlimbs/shellguard/shellguard_monitor.dmi'
+ parts = list("head")
+ is_monitor = 1
+ has_subtypes = null
\ No newline at end of file
diff --git a/code/modules/surgery/organs/subtypes/machine.dm b/code/modules/surgery/organs/subtypes/machine.dm
index b3bb3f61e07..44d7a7f1315 100644
--- a/code/modules/surgery/organs/subtypes/machine.dm
+++ b/code/modules/surgery/organs/subtypes/machine.dm
@@ -150,8 +150,7 @@
var/obj/item/device/mmi/stored_mmi
/obj/item/organ/internal/brain/mmi_holder/Destroy()
- if(stored_mmi)
- qdel(stored_mmi)
+ QDEL_NULL(stored_mmi)
return ..()
/obj/item/organ/internal/brain/mmi_holder/insert(var/mob/living/target,special = 0)
diff --git a/code/modules/surgery/organs_internal.dm b/code/modules/surgery/organs_internal.dm
index df9ab4dde20..420d56de43d 100644
--- a/code/modules/surgery/organs_internal.dm
+++ b/code/modules/surgery/organs_internal.dm
@@ -1,3 +1,5 @@
+#define GHETTO_DISINFECT_AMOUNT 5 //Amount of units to transfer from the container to the organs during ghetto surgery disinfection step
+
/datum/surgery/organ_manipulation
name = "Organ Manipulation"
steps = list(/datum/surgery_step/generic/cut_open,/datum/surgery_step/generic/clamp_bleeders, /datum/surgery_step/generic/retract_skin, /datum/surgery_step/open_encased/saw,
@@ -68,6 +70,13 @@
allowed_tools = list(/obj/item/organ/internal = 100, /obj/item/weapon/reagent_containers/food/snacks/organ = 0)
var/implements_extract = list(/obj/item/weapon/hemostat = 100, /obj/item/weapon/kitchen/utensil/fork = 55)
var/implements_mend = list(/obj/item/stack/medical/bruise_pack = 20,/obj/item/stack/medical/bruise_pack/advanced = 100,/obj/item/stack/nanopaste = 100)
+ var/implements_clean = list(/obj/item/weapon/reagent_containers/dropper = 100,
+ /obj/item/weapon/reagent_containers/glass/bottle = 75,
+ /obj/item/weapon/reagent_containers/food/drinks/drinkingglass = 70,
+ /obj/item/weapon/reagent_containers/food/drinks/bottle = 65,
+ /obj/item/weapon/reagent_containers/glass/beaker = 60,
+ /obj/item/weapon/reagent_containers/spray = 50,
+ /obj/item/weapon/reagent_containers/glass/bucket = 40)
//Finish is just so you can close up after you do other things.
var/implements_finsh = list(/obj/item/weapon/scalpel/laser/manager = 100,/obj/item/weapon/retractor = 100 ,/obj/item/weapon/crowbar = 75)
var/current_type
@@ -77,7 +86,7 @@
/datum/surgery_step/internal/manipulate_organs/New()
..()
- allowed_tools = allowed_tools + implements_extract + implements_mend + implements_finsh
+ allowed_tools = allowed_tools + implements_extract + implements_mend + implements_clean + implements_finsh
/datum/surgery_step/internal/manipulate_organs/begin_step(mob/living/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
@@ -95,32 +104,53 @@
return -1
if(I.damage > (I.max_damage * 0.75))
- to_chat(user, " \The [I] is in no state to be transplanted.")
+ to_chat(user, " [I] is in no state to be transplanted.")
return -1
if(target.get_int_organ(I))
- to_chat(user, " \The [target] already has [I].")
+ to_chat(user, " [target] already has [I].")
return -1
if(affected)
- user.visible_message("[user] starts transplanting \the [tool] into [target]'s [affected.name].", \
- "You start transplanting \the [tool] into [target]'s [affected.name].")
+ user.visible_message("[user] starts transplanting [tool] into [target]'s [affected.name].", \
+ "You start transplanting [tool] into [target]'s [affected.name].")
H.custom_pain("Someone's rooting around in your [affected.name]!",1)
else
- user.visible_message("[user] starts transplanting \the [tool] into [target]'s [parse_zone(target_zone)].", \
- "You start transplanting \the [tool] into [target]'s [parse_zone(target_zone)].")
+ user.visible_message("[user] starts transplanting [tool] into [target]'s [parse_zone(target_zone)].", \
+ "You start transplanting [tool] into [target]'s [parse_zone(target_zone)].")
+
+ else if(implement_type in implements_clean)
+ current_type = "clean"
+
+ if(!istype(tool, /obj/item/weapon/reagent_containers))
+ return
+
+ var/obj/item/weapon/reagent_containers/C = tool
+
+ for(var/obj/item/organ/internal/I in affected.internal_organs)
+ if(I)
+ if(C.reagents.total_volume < GHETTO_DISINFECT_AMOUNT)
+ user.visible_message("[user] notices [tool] is empty.", \
+ "You notice [tool] is empty")
+ return 0
+
+ var/msg = "[user] starts pouring some of [tool] over [target]'s [I.name]."
+ var/self_msg = "You start pouring some of [tool] over [target]'s [I.name]."
+ user.visible_message(msg, self_msg)
+ if(H && affected)
+ H.custom_pain("Something burns horribly in your [affected.name]!",1)
else if(implement_type in implements_finsh)
//same as surgery step /datum/surgery_step/open_encased/close/
current_type = "finish"
if(affected && affected.encased)
- var/msg = "[user] starts bending [target]'s [affected.encased] back into place with \the [tool]."
- var/self_msg = "You start bending [target]'s [affected.encased] back into place with \the [tool]."
+ var/msg = "[user] starts bending [target]'s [affected.encased] back into place with [tool]."
+ var/self_msg = "You start bending [target]'s [affected.encased] back into place with [tool]."
user.visible_message(msg, self_msg)
else
- var/msg = "[user] starts pulling [target]'s skin back into place with \the [tool]."
- var/self_msg = "You start pulling [target]'s skin back into place with \the [tool]."
+ var/msg = "[user] starts pulling [target]'s skin back into place with [tool]."
+ var/self_msg = "You start pulling [target]'s skin back into place with [tool]."
user.visible_message(msg, self_msg)
if(H && affected)
@@ -143,8 +173,8 @@
I = organs[I]
if(!I)
return -1
- user.visible_message("[user] starts to separate [target]'s [I] with \the [tool].", \
- "You start to separate [target]'s [I] with \the [tool] for removal." )
+ user.visible_message("[user] starts to separate [target]'s [I] with [tool].", \
+ "You start to separate [target]'s [I] with [tool] for removal." )
if(H && affected)
H.custom_pain("The pain in your [affected.name] is living hell!",1)
else
@@ -152,13 +182,13 @@
else if(implement_type in implements_mend)
current_type = "mend"
- var/tool_name = "\the [tool]"
+ var/tool_name = "[tool]"
if(istype(tool, /obj/item/stack/medical/bruise_pack))
tool_name = "the bandaid"
if(istype(tool, /obj/item/stack/medical/bruise_pack/advanced))
tool_name = "regenerative membrane"
else if(istype(tool, /obj/item/stack/nanopaste))
- tool_name = "\the [tool]" //what else do you call nanopaste medically?
+ tool_name = "[tool]" //what else do you call nanopaste medically?
if(!hasorgans(target))
to_chat(user, "They do not have organs to mend!")
@@ -168,7 +198,7 @@
if(I && I.damage > 0)
if(I.robotic < 2 && !istype (tool, /obj/item/stack/nanopaste))
if(!(I.sterile))
- spread_germs_to_organ(I, user)
+ spread_germs_to_organ(I, user, tool)
user.visible_message("[user] starts treating damage to [target]'s [I.name] with [tool_name].", \
"You start treating damage to [target]'s [I.name] with [tool_name]." )
else if(I.robotic >= 2 && istype(tool, /obj/item/stack/nanopaste))
@@ -189,13 +219,13 @@
/datum/surgery_step/internal/manipulate_organs/end_step(mob/living/user, mob/living/carbon/target, target_zone, obj/item/tool,datum/surgery/surgery)
if(current_type == "mend")
- var/tool_name = "\the [tool]"
+ var/tool_name = "[tool]"
if(istype(tool, /obj/item/stack/medical/bruise_pack/advanced))
tool_name = "regenerative membrane"
if(istype(tool, /obj/item/stack/medical/bruise_pack))
tool_name = "the bandaid"
if(istype(tool, /obj/item/stack/nanopaste))
- tool_name = "\the [tool]" //what else do you call nanopaste medically?
+ tool_name = "[tool]" //what else do you call nanopaste medically?
if(!hasorgans(target))
return
@@ -217,27 +247,27 @@
I = tool
user.drop_item()
I.insert(target)
- spread_germs_to_organ(I, user)
+ spread_germs_to_organ(I, user, tool)
if(!user.canUnEquip(I, 0))
to_chat(user, "[I] is stuck to your hand, you can't put it in [target]!")
return 0
if(affected)
- user.visible_message(" [user] has transplanted \the [tool] into [target]'s [affected.name].",
- " You have transplanted \the [tool] into [target]'s [affected.name].")
+ user.visible_message(" [user] has transplanted [tool] into [target]'s [affected.name].",
+ " You have transplanted [tool] into [target]'s [affected.name].")
else
- user.visible_message(" [user] has transplanted \the [tool] into [target]'s [parse_zone(target_zone)].",
- " You have transplanted \the [tool] into [target]'s [parse_zone(target_zone)].")
+ user.visible_message(" [user] has transplanted [tool] into [target]'s [parse_zone(target_zone)].",
+ " You have transplanted [tool] into [target]'s [parse_zone(target_zone)].")
I.status &= ~ORGAN_CUT_AWAY
else if(current_type == "extract")
if(I && I.owner == target)
- user.visible_message(" [user] has separated and extracts [target]'s [I] with \the [tool].",
- " You have separated and extracted [target]'s [I] with \the [tool].")
+ user.visible_message(" [user] has separated and extracts [target]'s [I] with [tool].",
+ " You have separated and extracted [target]'s [I] with [tool].")
add_logs(user, target, "surgically removed [I.name] from", addition="INTENT: [uppertext(user.a_intent)]")
- spread_germs_to_organ(I, user)
+ spread_germs_to_organ(I, user, tool)
I.status |= ORGAN_CUT_AWAY
var/obj/item/thing = I.remove(target)
if(!istype(thing))
@@ -250,20 +280,49 @@
user.visible_message("[user] can't seem to extract anything from [target]'s [parse_zone(target_zone)]!",
"You can't extract anything from [target]'s [parse_zone(target_zone)]!")
+ else if(current_type == "clean")
+ if(!hasorgans(target))
+ return
+ if(!istype(tool,/obj/item/weapon/reagent_containers))
+ return
+
+ var/obj/item/weapon/reagent_containers/C = tool
+ var/datum/reagents/R = C.reagents
+ var/ethanol = 0 //how much alcohol is in the thing
+
+ if(R.reagent_list.len)
+ for(var/datum/reagent/consumable/ethanol/alcohol in R.reagent_list)
+ ethanol += alcohol.alcohol_perc * 300
+ ethanol /= R.reagent_list.len
+
+ for(var/obj/item/organ/internal/I in affected.internal_organs)
+ if(I)
+ if(R.total_volume < GHETTO_DISINFECT_AMOUNT)
+ user.visible_message("[user] notices there is not enough of [tool].", \
+ "You notice there is not enough of [tool].")
+ return 0
+ if(I.germ_level < INFECTION_LEVEL_ONE / 2)
+ to_chat(user, "[I] does not appear to be infected.")
+ if(I.germ_level >= INFECTION_LEVEL_ONE / 2)
+ I.germ_level = max(I.germ_level-ethanol, 0)
+ user.visible_message(" [user] has poured some of [tool] over [target]'s [I.name].",
+ " You have poured some of [tool] over [target]'s [I.name].")
+ R.trans_to(target, GHETTO_DISINFECT_AMOUNT)
+ R.reaction(target, INGEST)
+
else if(current_type == "finish")
if(affected && affected.encased)
- var/msg = " [user] bends [target]'s [affected.encased] back into place with \the [tool]."
- var/self_msg = " You bend [target]'s [affected.encased] back into place with \the [tool]."
+ var/msg = " [user] bends [target]'s [affected.encased] back into place with [tool]."
+ var/self_msg = " You bend [target]'s [affected.encased] back into place with [tool]."
user.visible_message(msg, self_msg)
affected.open = 2.5
else
- var/msg = "[user] pulls [target]'s flesh back into place with \the [tool]."
- var/self_msg = "You pull [target]'s flesh back into place with \the [tool]."
+ var/msg = "[user] pulls [target]'s flesh back into place with [tool]."
+ var/self_msg = "You pull [target]'s flesh back into place with [tool]."
user.visible_message(msg, self_msg)
return 1
-
return 0
/datum/surgery_step/internal/manipulate_organs/fail_step(mob/living/user, mob/living/carbon/target, target_zone, obj/item/tool,datum/surgery/surgery)
@@ -271,8 +330,8 @@
if(!hasorgans(target))
return
- user.visible_message(" [user]'s hand slips, getting mess and tearing the inside of [target]'s [affected.name] with \the [tool]!", \
- " Your hand slips, getting mess and tearing the inside of [target]'s [affected.name] with \the [tool]!")
+ user.visible_message(" [user]'s hand slips, getting mess and tearing the inside of [target]'s [affected.name] with [tool]!", \
+ " Your hand slips, getting mess and tearing the inside of [target]'s [affected.name] with [tool]!")
var/dam_amt = 2
@@ -291,24 +350,49 @@
return 0
else if(current_type == "insert")
- user.visible_message(" [user]'s hand slips, damaging \the [tool]!", \
- " Your hand slips, damaging \the [tool]!")
+ user.visible_message(" [user]'s hand slips, damaging [tool]!", \
+ " Your hand slips, damaging [tool]!")
var/obj/item/organ/internal/I = tool
if(istype(I) && !I.tough)
I.take_damage(rand(3,5),0)
return 0
+ else if(current_type == "clean")
+ if(!hasorgans(target))
+ return
+ if(!istype(tool,/obj/item/weapon/reagent_containers))
+ return
+
+ var/obj/item/weapon/reagent_containers/C = tool
+ var/datum/reagents/R = C.reagents
+ var/ethanol = 0 //how much alcohol is in the thing
+
+ if(R.reagent_list.len)
+ for(var/datum/reagent/consumable/ethanol/alcohol in R.reagent_list)
+ ethanol += alcohol.alcohol_perc * 300
+ ethanol /= C.reagents.reagent_list.len
+
+ for(var/obj/item/organ/internal/I in affected.internal_organs)
+ I.germ_level = max(I.germ_level-ethanol, 0)
+ I.take_damage(rand(4,8),0)
+
+ R.trans_to(target, GHETTO_DISINFECT_AMOUNT * 10)
+ R.reaction(target, INGEST)
+
+ user.visible_message(" [user]'s hand slips, splashing the contents of [tool] all over [target]'s [affected.name] incision!", \
+ " Your hand slips, splashing the contents of [tool] all over [target]'s [affected.name] incision!")
+ return 0
else if(current_type == "extract")
if(I && I.owner == target)
if(affected)
- user.visible_message(" [user]'s hand slips, damaging [target]'s [affected.name] with \the [tool]!", \
- " Your hand slips, damaging [target]'s [affected.name] with \the [tool]!")
+ user.visible_message(" [user]'s hand slips, damaging [target]'s [affected.name] with [tool]!", \
+ " Your hand slips, damaging [target]'s [affected.name] with [tool]!")
affected.createwound(BRUISE, 20)
else
- user.visible_message(" [user]'s hand slips, damaging [target]'s [parse_zone(target_zone)] with \the [tool]!", \
- " Your hand slips, damaging [target]'s [parse_zone(target_zone)] with \the [tool]!")
+ user.visible_message(" [user]'s hand slips, damaging [target]'s [parse_zone(target_zone)] with [tool]!", \
+ " Your hand slips, damaging [target]'s [parse_zone(target_zone)] with [tool]!")
else
user.visible_message("[user] can't seem to extract anything from [target]'s [parse_zone(target_zone)]!",
"You can't extract anything from [target]'s [parse_zone(target_zone)]!")
@@ -349,20 +433,20 @@
/datum/surgery_step/saw_carapace/begin_step(mob/living/user, mob/living/carbon/target, target_zone, obj/item/tool,datum/surgery/surgery)
- user.visible_message("[user] begins to cut through [target]'s [target_zone] with \the [tool].", \
- "You begin to cut through [target]'s [target_zone] with \the [tool].")
+ user.visible_message("[user] begins to cut through [target]'s [target_zone] with [tool].", \
+ "You begin to cut through [target]'s [target_zone] with [tool].")
..()
/datum/surgery_step/saw_carapace/end_step(mob/living/user, mob/living/carbon/target, target_zone, obj/item/tool,datum/surgery/surgery)
- user.visible_message(" [user] has cut [target]'s [target_zone] open with \the [tool].", \
- " You have cut [target]'s [target_zone] open with \the [tool].")
+ user.visible_message(" [user] has cut [target]'s [target_zone] open with [tool].", \
+ " You have cut [target]'s [target_zone] open with [tool].")
return 1
/datum/surgery_step/saw_carapace/fail_step(mob/living/user, mob/living/carbon/target, target_zone, obj/item/tool,datum/surgery/surgery)
- user.visible_message(" [user]'s hand slips, cracking [target]'s [target_zone] with \the [tool]!" , \
- " Your hand slips, cracking [target]'s [target_zone] with \the [tool]!" )
+ user.visible_message(" [user]'s hand slips, cracking [target]'s [target_zone] with [tool]!" , \
+ " Your hand slips, cracking [target]'s [target_zone] with [tool]!" )
return 0
/datum/surgery_step/cut_carapace
@@ -375,27 +459,27 @@
/obj/item/weapon/twohanded/chainsaw = 1, \
/obj/item/weapon/claymore = 5, \
/obj/item/weapon/melee/energy/ = 5, \
- /obj/item/weapon/pen/edagger = 5, \
+ /obj/item/weapon/pen/edagger = 5, \
)
time = 16
/datum/surgery_step/cut_carapace/begin_step(mob/living/user, mob/living/carbon/target, target_zone, obj/item/tool,datum/surgery/surgery)
- user.visible_message("[user] starts the incision on [target]'s [target_zone] with \the [tool].", \
- "You start the incision on [target]'s [target_zone] with \the [tool].")
+ user.visible_message("[user] starts the incision on [target]'s [target_zone] with [tool].", \
+ "You start the incision on [target]'s [target_zone] with [tool].")
..()
/datum/surgery_step/cut_carapace/end_step(mob/living/user, mob/living/carbon/target, target_zone, obj/item/tool,datum/surgery/surgery)
- user.visible_message(" [user] has made an incision on [target]'s [target_zone] with \the [tool].", \
- " You have made an incision on [target]'s [target_zone] with \the [tool].",)
+ user.visible_message(" [user] has made an incision on [target]'s [target_zone] with [tool].", \
+ " You have made an incision on [target]'s [target_zone] with [tool].",)
return 1
/datum/surgery_step/cut_carapace/fail_step(mob/living/user, mob/living/carbon/target, target_zone, obj/item/tool,datum/surgery/surgery)
- user.visible_message(" [user]'s hand slips, slicing open [target]'s [target_zone] in a wrong spot with \the [tool]!", \
- " Your hand slips, slicing open [target]'s [target_zone] in a wrong spot with \the [tool]!")
+ user.visible_message(" [user]'s hand slips, slicing open [target]'s [target_zone] in a wrong spot with [tool]!", \
+ " Your hand slips, slicing open [target]'s [target_zone] in a wrong spot with [tool]!")
return 0
/datum/surgery_step/retract_carapace
@@ -411,37 +495,37 @@
time = 24
/datum/surgery_step/retract_carapace/begin_step(mob/living/user, mob/living/carbon/target, target_zone, obj/item/tool,datum/surgery/surgery)
- var/msg = "[user] starts to pry open the incision on [target]'s [target_zone] with \the [tool]."
- var/self_msg = "You start to pry open the incision on [target]'s [target_zone] with \the [tool]."
+ var/msg = "[user] starts to pry open the incision on [target]'s [target_zone] with [tool]."
+ var/self_msg = "You start to pry open the incision on [target]'s [target_zone] with [tool]."
if(target_zone == "chest")
- msg = "[user] starts to separate the ribcage and rearrange the organs in [target]'s torso with \the [tool]."
- self_msg = "You start to separate the ribcage and rearrange the organs in [target]'s torso with \the [tool]."
+ msg = "[user] starts to separate the ribcage and rearrange the organs in [target]'s torso with [tool]."
+ self_msg = "You start to separate the ribcage and rearrange the organs in [target]'s torso with [tool]."
if(target_zone == "groin")
- msg = "[user] starts to pry open the incision and rearrange the organs in [target]'s lower abdomen with \the [tool]."
- self_msg = "You start to pry open the incision and rearrange the organs in [target]'s lower abdomen with \the [tool]."
+ msg = "[user] starts to pry open the incision and rearrange the organs in [target]'s lower abdomen with [tool]."
+ self_msg = "You start to pry open the incision and rearrange the organs in [target]'s lower abdomen with [tool]."
user.visible_message(msg, self_msg)
..()
/datum/surgery_step/retract_carapace/end_step(mob/living/user, mob/living/carbon/target, target_zone, obj/item/tool,datum/surgery/surgery)
- var/msg = " [user] keeps the incision open on [target]'s [target_zone] with \the [tool]."
- var/self_msg = " You keep the incision open on [target]'s [target_zone] with \the [tool]."
+ var/msg = " [user] keeps the incision open on [target]'s [target_zone] with [tool]."
+ var/self_msg = " You keep the incision open on [target]'s [target_zone] with [tool]."
if(target_zone == "chest")
- msg = " [user] keeps the ribcage open on [target]'s torso with \the [tool]."
- self_msg = " You keep the ribcage open on [target]'s torso with \the [tool]."
+ msg = " [user] keeps the ribcage open on [target]'s torso with [tool]."
+ self_msg = " You keep the ribcage open on [target]'s torso with [tool]."
if(target_zone == "groin")
- msg = " [user] keeps the incision open on [target]'s lower abdomen with \the [tool]."
- self_msg = " You keep the incision open on [target]'s lower abdomen with \the [tool]."
+ msg = " [user] keeps the incision open on [target]'s lower abdomen with [tool]."
+ self_msg = " You keep the incision open on [target]'s lower abdomen with [tool]."
user.visible_message(msg, self_msg)
return 1
/datum/surgery_step/generic/retract_carapace/fail_step(mob/living/user, mob/living/carbon/target, target_zone, obj/item/tool,datum/surgery/surgery)
- var/msg = " [user]'s hand slips, tearing the edges of incision on [target]'s [target_zone] with \the [tool]!"
- var/self_msg = " Your hand slips, tearing the edges of incision on [target]'s [target_zone] with \the [tool]!"
+ var/msg = " [user]'s hand slips, tearing the edges of incision on [target]'s [target_zone] with [tool]!"
+ var/self_msg = " Your hand slips, tearing the edges of incision on [target]'s [target_zone] with [tool]!"
if(target_zone == "chest")
- msg = " [user]'s hand slips, damaging several organs [target]'s torso with \the [tool]!"
- self_msg = " Your hand slips, damaging several organs [target]'s torso with \the [tool]!"
+ msg = " [user]'s hand slips, damaging several organs [target]'s torso with [tool]!"
+ self_msg = " Your hand slips, damaging several organs [target]'s torso with [tool]!"
if(target_zone == "groin")
- msg = " [user]'s hand slips, damaging several organs [target]'s lower abdomen with \the [tool]"
- self_msg = " Your hand slips, damaging several organs [target]'s lower abdomen with \the [tool]!"
+ msg = " [user]'s hand slips, damaging several organs [target]'s lower abdomen with [tool]"
+ self_msg = " Your hand slips, damaging several organs [target]'s lower abdomen with [tool]!"
user.visible_message(msg, self_msg)
return 0
diff --git a/code/modules/surgery/other.dm b/code/modules/surgery/other.dm
index 8caac8e70eb..cfd6b8e632e 100644
--- a/code/modules/surgery/other.dm
+++ b/code/modules/surgery/other.dm
@@ -4,7 +4,7 @@
//////////////////////////////////////////////////////////////////
/datum/surgery/infection
- name = "External Infection Treatment/Autopsy"
+ name = "External Infection Treatment"
steps = list(/datum/surgery_step/generic/cut_open, /datum/surgery_step/generic/cauterize)
possible_locs = list("chest","head","groin", "l_arm", "r_arm", "l_leg", "r_leg", "r_hand", "l_hand", "r_foot", "l_foot")
@@ -13,6 +13,11 @@
steps = list(/datum/surgery_step/generic/cut_open,/datum/surgery_step/generic/clamp_bleeders,/datum/surgery_step/generic/retract_skin,/datum/surgery_step/fix_vein,/datum/surgery_step/generic/cauterize)
possible_locs = list("chest","head","groin", "l_arm", "r_arm", "l_leg", "r_leg", "r_hand", "l_hand", "r_foot", "l_foot")
+/datum/surgery/debridement
+ name = "Debridement"
+ steps = list(/datum/surgery_step/generic/cut_open,/datum/surgery_step/generic/clamp_bleeders,/datum/surgery_step/generic/retract_skin,/datum/surgery_step/fix_dead_tissue,/datum/surgery_step/treat_necrosis,/datum/surgery_step/generic/cauterize)
+ possible_locs = list("chest","head","groin", "l_arm", "r_arm", "l_leg", "r_leg", "r_hand", "l_hand", "r_foot", "l_foot")
+
/datum/surgery/infection/can_start(mob/user, mob/living/carbon/target)
if(ishuman(target))
var/mob/living/carbon/human/H = target
@@ -39,6 +44,24 @@
return 1
return 0
+/datum/surgery/debridement/can_start(mob/user, mob/living/carbon/target)
+ if(ishuman(target))
+ var/mob/living/carbon/human/H = target
+ var/obj/item/organ/external/affected = H.get_organ(user.zone_sel.selecting)
+
+ if(!hasorgans(target))
+ return 0
+
+ if(!affected)
+ return 0
+
+ if(!(affected.status & ORGAN_DEAD))
+ return 0
+
+ return 1
+
+ return 0
+
/datum/surgery_step/fix_vein
name = "mend internal bleeding"
allowed_tools = list(
@@ -115,7 +138,6 @@
if(!(affected.status & ORGAN_DEAD))
return 0
-
return 1
/datum/surgery_step/fix_dead_tissue/begin_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
@@ -146,9 +168,11 @@
allowed_tools = list(
/obj/item/weapon/reagent_containers/dropper = 100,
/obj/item/weapon/reagent_containers/glass/bottle = 75,
- /obj/item/weapon/reagent_containers/glass/beaker = 75,
+ /obj/item/weapon/reagent_containers/food/drinks/drinkingglass = 70,
+ /obj/item/weapon/reagent_containers/food/drinks/bottle = 65,
+ /obj/item/weapon/reagent_containers/glass/beaker = 60,
/obj/item/weapon/reagent_containers/spray = 50,
- /obj/item/weapon/reagent_containers/glass/bucket = 50,
+ /obj/item/weapon/reagent_containers/glass/bucket = 40
)
can_infect = 0
@@ -156,12 +180,14 @@
time = 24
-/datum/surgery_step/fix_dead_tissue/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
+/datum/surgery_step/treat_necrosis/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
if(!istype(tool, /obj/item/weapon/reagent_containers))
return 0
var/obj/item/weapon/reagent_containers/container = tool
if(!container.reagents.has_reagent("mitocholide"))
+ user.visible_message("[user] looks at \the [tool] and ponders." , \
+ "You are not sure if \the [tool] contains mitocholide to treat the necrosis.")
return 0
if(!hasorgans(target))
@@ -172,34 +198,39 @@
return 0
return 1
-/datum/surgery_step/fix_dead_tissue/begin_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
+/datum/surgery_step/treat_necrosis/begin_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
var/obj/item/organ/external/affected = target.get_organ(target_zone)
user.visible_message("[user] starts applying medication to the affected tissue in [target]'s [affected.name] with \the [tool]." , \
"You start applying medication to the affected tissue in [target]'s [affected.name] with \the [tool].")
target.custom_pain("Something in your [affected.name] is causing you a lot of pain!",1)
..()
-/datum/surgery_step/fix_dead_tissue/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
+/datum/surgery_step/treat_necrosis/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
var/obj/item/organ/external/affected = target.get_organ(target_zone)
if(!istype(tool, /obj/item/weapon/reagent_containers))
return 0
var/obj/item/weapon/reagent_containers/container = tool
+ var/mitocholide = 0
+
+ if(container.reagents.has_reagent("mitocholide"))
+ mitocholide = 1
var/trans = container.reagents.trans_to(target, container.amount_per_transfer_from_this)
if(trans > 0)
container.reagents.reaction(target, INGEST) //technically it's contact, but the reagents are being applied to internal tissue
- if(container.reagents.has_reagent("mitocholide"))
+ if(mitocholide)
affected.status &= ~ORGAN_DEAD
+ target.update_body()
user.visible_message(" [user] applies [trans] units of the solution to affected tissue in [target]'s [affected.name]", \
" You apply [trans] units of the solution to affected tissue in [target]'s [affected.name] with \the [tool].")
return 1
-/datum/surgery_step/fix_dead_tissue/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
+/datum/surgery_step/treat_necrosis/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
var/obj/item/organ/external/affected = target.get_organ(target_zone)
if(!istype(tool, /obj/item/weapon/reagent_containers))
diff --git a/code/modules/surgery/surgery.dm b/code/modules/surgery/surgery.dm
index de3d84796f4..127077a621d 100644
--- a/code/modules/surgery/surgery.dm
+++ b/code/modules/surgery/surgery.dm
@@ -163,7 +163,7 @@
if(ishuman(target))
var/obj/item/organ/external/affected = target.get_organ(target_zone)
if(can_infect && affected)
- spread_germs_to_organ(affected, user)
+ spread_germs_to_organ(affected, user, tool)
if(ishuman(user) && !(istype(target,/mob/living/carbon/alien)) && prob(60))
var/mob/living/carbon/human/H = user
if(blood_level)
@@ -180,16 +180,45 @@
/datum/surgery_step/proc/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery)
return null
+/proc/spread_germs_to_organ(obj/item/organ/E, mob/living/carbon/human/user, obj/item/tool)
+ if(!istype(user) || !istype(E))
+ return
-/proc/spread_germs_to_organ(obj/item/organ/E, mob/living/carbon/human/user)
- if(!istype(user) || !istype(E)) return
-// to_chat(world, "Germ spread: [E] : [E.owner]")
var/germ_level = user.germ_level
+
+ //germ spread from surgeon touching the patient
if(user.gloves)
germ_level = user.gloves.germ_level
if(!(E.status & ORGAN_ROBOT)) //Germs on robotic limbs bad
E.germ_level = max(germ_level,E.germ_level) //as funny as scrubbing microbes out with clean gloves is - no.
+ spread_germs_by_incision(E,tool)//germ spread from environement to patient
+/proc/spread_germs_by_incision(obj/item/organ/external/E,obj/item/tool)
+ if(!istype(E,/obj/item/organ/external))
+ return
+
+ var/germs = 0
+
+ for(var/mob/living/carbon/human/H in view(2, E.loc))//germs from people
+ if(AStar(E.loc, H.loc, /turf/proc/Distance, 2, simulated_only = 0))
+ if((!(NO_BREATH in H.mutations) || !(H.species.flags & NO_BREATH)) && !H.wear_mask) //wearing a mask helps preventing people from breathing cooties into open incisions
+ germs+=H.germ_level/4
+
+ for(var/obj/effect/decal/cleanable/M in view(2, E.loc))//germs from messes
+ if(AStar(E.loc, M.loc, /turf/proc/Distance, 2, simulated_only = 0))
+ if(!istype(M,/obj/effect/decal/cleanable/dirt))//dirt is too common
+ germs++
+
+ if(tool.blood_DNA && tool.blood_DNA.len) //germs from blood-stained tools
+ germs += 30
+
+ if(E.internal_organs.len)
+ germs = germs / E.internal_organs.len
+ for(var/obj/item/organ/internal/O in E.internal_organs)
+ if(!(O.status & ORGAN_ROBOT))
+ O.germ_level += germs
+
+ E.germ_level += germs
/proc/sort_surgeries()
var/gap = surgery_steps.len
diff --git a/code/modules/telesci/telepad.dm b/code/modules/telesci/telepad.dm
index ed330821f06..f8a177e413d 100644
--- a/code/modules/telesci/telepad.dm
+++ b/code/modules/telesci/telepad.dm
@@ -128,7 +128,7 @@
var/rand_y = 0
var/emagged = 0
var/teleporting = 0
- var/chargecost = 1500
+ var/chargecost = 1000
/obj/item/weapon/rcs/New()
..()
@@ -140,9 +140,7 @@
to_chat(user, "There are [round(rcell.charge/chargecost)] charge\s left.")
/obj/item/weapon/rcs/Destroy()
- if(rcell)
- qdel(rcell)
- rcell = null
+ QDEL_NULL(rcell)
return ..()
/obj/item/weapon/rcs/attack_self(mob/user)
diff --git a/code/modules/telesci/telesci_computer.dm b/code/modules/telesci/telesci_computer.dm
index b35968625e5..aa65b6337d5 100644
--- a/code/modules/telesci/telesci_computer.dm
+++ b/code/modules/telesci/telesci_computer.dm
@@ -80,10 +80,10 @@
/obj/machinery/computer/telescience/emag_act(user as mob)
if(!emagged)
- to_chat(user, "\blue You scramble the Telescience authentication key to an unknown signal. You should be able to teleport to more places now!")
+ to_chat(user, "You scramble the Telescience authentication key to an unknown signal. You should be able to teleport to more places now!")
emagged = 1
else
- to_chat(user, "\red The machine seems unaffected by the card swipe...")
+ to_chat(user, "The machine seems unaffected by the card swipe...")
/obj/machinery/computer/telescience/attack_ai(mob/user)
src.attack_hand(user)
diff --git a/code/modules/vr/vr_avatar.dm b/code/modules/vr/vr_avatar.dm
new file mode 100644
index 00000000000..510871fb40a
--- /dev/null
+++ b/code/modules/vr/vr_avatar.dm
@@ -0,0 +1,87 @@
+
+
+/mob/living/carbon/human/virtual_reality
+ var/mob/living/carbon/human/real_me //The human controlling us, can be any human (including virtual ones... inception...)
+ var/datum/action/quit_vr/quit_action
+ var/datum/action/back_to_lobby/back_to_lobby
+ var/datum/action/detach_from_avatar/detach_from_avatar
+
+/mob/living/carbon/human/virtual_reality/New()
+ quit_action = new()
+ quit_action.Grant(src)
+ back_to_lobby = new()
+ back_to_lobby.Grant(src)
+ detach_from_avatar = new()
+ detach_from_avatar.Grant(src)
+ ..()
+
+/mob/living/carbon/human/virtual_reality/death()
+ return_to_lobby()
+ return ..()
+
+/mob/living/carbon/human/virtual_reality/Destroy()
+ return_to_lobby()
+ return ..()
+
+/mob/living/carbon/human/virtual_reality/ghost()
+ set category = "OOC"
+ set name = "Ghost"
+ set desc = "Relinquish your life and enter the land of the dead."
+ var/mob/living/carbon/human/H = real_me
+ revert_to_reality(FALSE)
+ if(H)
+ H.ghost()
+ qdel(src)
+
+/mob/living/carbon/human/virtual_reality/proc/revert_to_reality(remove = 0)
+ if(real_me && mind)
+ mind.transfer_to(real_me)
+ real_me.EyeBlind(2)
+ real_me.Confused(2)
+ if(remove)
+ qdel(src)
+ else
+ return src
+
+/mob/living/carbon/human/virtual_reality/proc/return_to_lobby()
+ if(real_me && mind)
+ var/mob/living/carbon/human/virtual_reality/new_vr
+ new_vr = spawn_vr_avatar(src, "Lobby")
+ var/obj/item/clothing/glasses/vr_goggles/g = new_vr.real_me.glasses
+ g.vr_human = new_vr
+ qdel(src)
+
+/datum/action/quit_vr
+ name = "Quit Virtual Reality"
+
+/datum/action/quit_vr/Trigger()
+ if(..())
+ if(istype(owner, /mob/living/carbon/human/virtual_reality))
+ var/mob/living/carbon/human/virtual_reality/vr = owner
+ vr.revert_to_reality(1)
+ else
+ Remove(owner)
+
+/datum/action/back_to_lobby
+ name = "Return To Lobby"
+
+/datum/action/back_to_lobby/Trigger()
+ if(..())
+ if(istype(owner, /mob/living/carbon/human/virtual_reality))
+ var/mob/living/carbon/human/virtual_reality/vr = owner
+ vr.return_to_lobby()
+ else
+ Remove(owner)
+
+/datum/action/detach_from_avatar
+ name = "Detach From Avatar"
+
+/datum/action/detach_from_avatar/Trigger()
+ if(..())
+ if(istype(owner, /mob/living/carbon/human/virtual_reality))
+ var/mob/living/carbon/human/virtual_reality/vr = owner
+ var/obj/item/clothing/glasses/vr_goggles/g = vr.real_me.glasses
+ g.vr_human = vr
+ vr.revert_to_reality(0)
+ else
+ Remove(owner)
diff --git a/code/modules/vr/vr_controller.dm b/code/modules/vr/vr_controller.dm
new file mode 100644
index 00000000000..45bf2a6cc74
--- /dev/null
+++ b/code/modules/vr/vr_controller.dm
@@ -0,0 +1,63 @@
+//Control file with the backbone for the vr rooms and avatars
+
+var/datum/vr_rooms = list()
+var/roomcap = 20
+
+/datum/vr_room
+ var/name = null
+ var/datum/map_template/vr/template = null
+ var/datum/space_chunk/chunk = null
+ var/list/spawn_points = list()
+ var/expires = 1
+
+proc/make_vr_room(name, template, expires)
+ var/datum/vr_room/R = new
+ R.name = name
+ R.template = template
+ R.template = vr_templates[R.template]
+ R.chunk = space_manager.allocate_space(R.template.width, R.template.height)
+ R.expires = expires
+ vr_rooms[R.name] = R
+ R.template.load(locate(R.chunk.x,R.chunk.y,R.chunk.zpos), centered = FALSE)
+
+ for(var/atom/landmark in R.chunk.search_chunk(landmarks_list))
+ if(landmark.name == "avatarspawn")
+ R.spawn_points.Add(landmark)
+
+//Control code for the avatars
+proc/build_virtual_avatar(mob/living/carbon/human/H, location, datum/map_template/vr/level/template)
+ if(!location)
+ return
+ var/mob/living/carbon/human/virtual_reality/vr_avatar
+ location = get_turf(location)
+ vr_avatar = new /mob/living/carbon/human/virtual_reality(location)
+ vr_avatar.set_species(H.species.name)
+ if(istype(H, /mob/living/carbon/human/virtual_reality))
+ var/mob/living/carbon/human/virtual_reality/V = H
+ vr_avatar.real_me = V.real_me
+ else
+ vr_avatar.real_me = H
+ vr_avatar.dna = H.dna.Clone()
+ vr_avatar.name = H.name
+ vr_avatar.real_name = H.real_name
+ vr_avatar.undershirt = H.undershirt
+ vr_avatar.underwear = H.underwear
+ vr_avatar.UpdateAppearance()
+ vr_avatar.equipOutfit(template.outfit)
+ return vr_avatar
+
+proc/control_remote(mob/living/carbon/human/H, mob/living/carbon/human/virtual_reality/vr_avatar)
+ if(H.mind)
+ H.mind.transfer_to(vr_avatar)
+
+proc/spawn_vr_avatar(mob/living/carbon/human/H, datum/vr_room/room)
+ room = vr_rooms[room]
+ var/mob/living/carbon/human/virtual_reality/vr_human
+ vr_human = build_virtual_avatar(H, pick(room.spawn_points), room.template)
+ control_remote(H, vr_human)
+ return vr_human
+
+//Preloaded rooms
+/hook/roundstart/proc/starting_levels()
+ make_vr_room("Lobby", "lobby", 0)
+ return 1
\ No newline at end of file
diff --git a/code/modules/vr/vr_goggles.dm b/code/modules/vr/vr_goggles.dm
new file mode 100644
index 00000000000..c2a185b0ffa
--- /dev/null
+++ b/code/modules/vr/vr_goggles.dm
@@ -0,0 +1,41 @@
+//Glorified teleporter that puts you in a new human body.
+// it's """VR"""
+
+/obj/item/clothing/glasses/vr_goggles
+ desc = "A long time ago, people used these glasses to makes images from screens threedimensional."
+ name = "3D glasses"
+ icon_state = "3d"
+ item_state = "3d"
+ prescription_upgradable = 0
+ species_fit = list("Vox")
+ sprite_sheets = list(
+ "Vox" = 'icons/mob/species/vox/eyes.dmi'
+ )
+
+ var/you_die_in_the_game_you_die_for_real = FALSE
+ var/mob/living/carbon/human/virtual_reality/vr_human
+
+
+/obj/item/clothing/glasses/vr_goggles/Destroy()
+ ..()
+ vr_human.revert_to_reality(1)
+ cleanup_vr_avatar()
+
+/obj/item/clothing/glasses/vr_goggles/dropped()
+ ..()
+ if(vr_human)
+ vr_human.revert_to_reality(0)
+
+/obj/item/clothing/glasses/vr_goggles/proc/cleanup_vr_avatar()
+ if(vr_human)
+ vr_human = null
+
+/obj/item/clothing/glasses/vr_goggles/equipped()
+ ..()
+ var/mob/living/carbon/human/H = loc
+ spawn(1)
+ if(H.glasses == src)
+ if(vr_human == null)
+ vr_human = spawn_vr_avatar(H, "Lobby")
+ else
+ control_remote(H, vr_human)
\ No newline at end of file
diff --git a/code/modules/vr/vr_outfits.dm b/code/modules/vr/vr_outfits.dm
new file mode 100644
index 00000000000..4f673fd4e8c
--- /dev/null
+++ b/code/modules/vr/vr_outfits.dm
@@ -0,0 +1,15 @@
+//place all the outfits for your levels in here.
+
+/datum/outfit/vr/vr_basic
+ name = "basic vr"
+ uniform = /obj/item/clothing/under/psysuit
+ shoes = /obj/item/clothing/shoes/black
+
+/datum/outfit/vr/roman
+ name = "roman"
+ uniform = /obj/item/clothing/under/roman
+ shoes = /obj/item/clothing/shoes/roman
+ l_hand = /obj/item/weapon/shield/riot/roman
+ r_hand = /obj/item/weapon/twohanded/spear
+ head = /obj/item/clothing/head/helmet/roman
+ back = /obj/item/weapon/twohanded/spear
\ No newline at end of file
diff --git a/code/world.dm b/code/world.dm
index f37fd273e86..ebf4865a1a8 100644
--- a/code/world.dm
+++ b/code/world.dm
@@ -327,7 +327,7 @@ var/world_topic_spam_protect_time = world.timeofday
if(C.is_afk(INACTIVITY_KICK))
if(!istype(C.mob, /mob/dead))
log_access("AFK: [key_name(C)]")
- to_chat(C, "\red You have been inactive for more than 10 minutes and have been disconnected.")
+ to_chat(C, "You have been inactive for more than 10 minutes and have been disconnected.")
del(C)
if( ((world.timeofday - sleep_check) > work_length) || ((world.timeofday - sleep_check) < 0) )
sleep(sleep_length)
diff --git a/config/example/away_mission_config.txt b/config/example/away_mission_config.txt
index 1fc8b0ce3b6..d06e581e04b 100644
--- a/config/example/away_mission_config.txt
+++ b/config/example/away_mission_config.txt
@@ -20,7 +20,6 @@
#===================================#
_maps/map_files/RandomZLevels/beach.dmm
-_maps/map_files/RandomZLevels/listeningpost.dmm
_maps/map_files/RandomZLevels/moonoutpost19.dmm
_maps/map_files/RandomZLevels/undergroundoutpost45.dmm
_maps/map_files/RandomZLevels/academy.dmm
diff --git a/config/example/config.txt b/config/example/config.txt
index b1810dea483..60702180691 100644
--- a/config/example/config.txt
+++ b/config/example/config.txt
@@ -328,7 +328,7 @@ DISABLE_SPACE_RUINS
## Hub address for tracking stats
## example: Hubmakerckey.Hubname
-#MEDAL_HUB_ADDRESS
+#MEDAL_HUB_ADDRESS
## Password for the hub page
#MEDAL_HUB_PASSWORD
@@ -340,4 +340,7 @@ DISABLE_SPACE_RUINS
#SHUTDOWN_ON_REBOOT
## A command to run prior to the world shutting down, only used if the above option is enabled
## This default value will kill Dream Daemon on Windows machines
-#SHUTDOWN_SHELL_COMMAND taskkill /f /im dreamdaemon.exe
\ No newline at end of file
+#SHUTDOWN_SHELL_COMMAND taskkill /f /im dreamdaemon.exe
+
+## Uncomment this to disable karma and unlock all karma purchases for players by default
+#DISABLE_KARMA
\ No newline at end of file
diff --git a/config/example/custom_sprites.txt b/config/example/custom_sprites.txt
index db3930a4ae2..471764270d4 100644
--- a/config/example/custom_sprites.txt
+++ b/config/example/custom_sprites.txt
@@ -1 +1,5 @@
-ckey-state
\ No newline at end of file
+Each entry should be composed of 2 parts, divided by a colon (:) with no spaces, in order to work. Failure to do so will result in that entry being disregarded by the code.
+- The first part should be either "cyborg", "ai", "hologram", "pai", or "drone". This tells the code what type of custom sprite this entry is for. The "ai" option is for AI core displays, while "hologram" is for AI hologram projections.
+- The second part should be the ckey of the player this entry is for. This tells the code who it works for and also is used to retrieve the proper sprite for them to use.
+
+example:example
\ No newline at end of file
diff --git a/config/names/death_commando.txt b/config/names/death_commando.txt
index e3d1f34f327..fbb7a17e6f6 100644
--- a/config/names/death_commando.txt
+++ b/config/names/death_commando.txt
@@ -67,4 +67,4 @@ AMERICA
Toolboxl Rose
Zombie Gandhi
A whole bunch of spiders in a SWAT suit
-THAT DAMN FAGGOT TRAITOR GEORGE MELONS
\ No newline at end of file
+THAT DAMN TRAITOR GEORGE MELONS
\ No newline at end of file
diff --git a/html/changelog.html b/html/changelog.html
index 220ef619ffb..fa972380f14 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,418 @@
-->
+
29 April 2017
+
FalseIncarnate updated:
+
+ - Popcorn jellybeans require jellybeans to make.
+ - Gum is no longer invisible, but is still very chewy.
+
+
Phantasmic Dream Art, Fethas PR updated:
+
+ - Updates the shadowling sprite. Sprite by Dreamy
+
+
uraniummeltdown updated:
+
+ - Examine a girder for (de)construction hints
+ - Projectiles have a chance to pass through some girders
+ - You can construct rough iron (false) walls with rods, wood (false) walls with wooden planks on a girder
+ - Screwdriver a displaced girder to deconstruct it
+ - Increased displaced girder health, decreased reinforced and cult girder health
+ - False wall construction is no longer instant
+ - Girder (de)construction messages should read better
+
+
+
28 April 2017
+
Alffd updated:
+
+ - Adds Paperwork the sloth to cargo.
+
+
+
27 April 2017
+
Kyep updated:
+
+ - Changed "suggested client version" from 510 to 511.
+
+
+
26 April 2017
+
FalseIncarnate updated:
+
+ - Glowshrooms (and their subtypes) can be mass-cleared by scythes just like vines.
+
+
pinatacolada updated:
+
+ - dirty surgery environments get you nasty infections
+ - ghetto surgery internal organ disinfection with alcohol
+ - dead limb revival surgery step
+
+
+
25 April 2017
+
Flattest updated:
+
+ - Animated progress bars!
+
+
uraniummeltdown updated:
+
+ - Runed girders have a clearer and bigger icon
+ - Girder subtypes are properly named, "reinforced girder" and not "reinforced"
+ - Summoned cult walls do not drop a girder or runed metal to prevent runed metal farming
+ - Cult walls no longer have blood or human remains in them
+ - Harvesters can smash more things and can summon cult walls and floors
+ - Fixed not being able to make a cult wall with runed metal + runed girder
+ - Runed girders will need to be deconstructed with a welder (or plasma cutter or jackhammer) instead of a wrench. Cultists can hit them with their tomes to instantly demolish them.
+
+
+
24 April 2017
+
Flattest updated:
+
+ - Sleepers spit out their victims when deconstructed now.
+
+
+
23 April 2017
+
Citinited updated:
+
+ - You can now fully insulate reinforced floors using a sheet of plasteel.
+ - Certain floors in the turbine, incinerator, and toxins are now thermally insulated.
+
+
Crazylemon64 updated:
+
+ - Reverts Norgad's east maintenance overhaul
+
+
IK3I updated:
+
+ - flipping aliums now have a cooldown
+ - Aliums have some more sounds to play with
+
+
Tayyyyyyy updated:
+
+ - You can no longer use space pod verbs when restrained, dead, or otherwise incapacitated.
+
+
+
21 April 2017
+
Anticept updated:
+
+ - Alternate Job Preference now defaults to "Return to Lobby if Preferences Unavailable". Only affects new players.
+
+
Fox McCloud updated:
+
+ - Tesla can now damage blobs
+ - Tesla causes machinery to overload and explode when zapping it
+ - Tesla dissipates energy more slowly and is easier to charge up (making it more deadly when released)
+ - Tesla will now dust mobs it bumps into
+ - Tesla coils now have wires that can be pulsed to generate a tesla zap
+
+
Lady-Luck updated:
+
+ - Makes several balance adjustments to existing syndicate bundles, generally making them more worthwhile.
+ - Adds an Allies Cocktail object for the Bond bundle.
+ - Adds the 'gadgets' syndicate bundle.
+ - Removes the 'lordsingulo' and 'murder' syndicate bundles.
+
+
Spacemanspark updated:
+
+ - Permits hoodies to carry flashlights.
+
+
Twinmold93 updated:
+
+ - Adds attack options for deep fryers, grills, and ovens. Those breaking into the kitchen beware.
+
+
alexkar598 updated:
+
+ - you can now click on things underwater
+
+
monster860 updated:
+
+ - Adds an in-game way of viewing poll results
+ - The player poll window automatically pops up if there is an active poll you haven't voted on.
+ - Adds an browser popup for creating new polls
+ - Your account needs to be at least 30 days old in order to vote on polls
+
+
+
19 April 2017
+
IK3I updated:
+
+ - Chaplain now spawns with his bible
+
+
Xantholne updated:
+
+ - You now correctly spawn with the CMO Skirt if selected in loadout menu
+
+
+
17 April 2017
+
KasparoVy updated:
+
+ - The God-emperor of Mankind diskette's UI works again.
+ - DNA UI injectors will now immediately update a person's eye colour.
+
+
Krausus updated:
+
+ - You can no longer squeeze non-match objects into matchboxes.
+
+
+
16 April 2017
+
FalseIncarnate updated:
+
+ - Potential collaborators for traitors now are informed they are potentially a collaborator for a potential increase in them potentially helping the traitors potentially do potentially bad things. Potentially.
+ - Potential collaborators are given a single code word and response set so they can discretely find out that their best friend is a filthy traitor.
+
+
KasparoVy updated:
+
+ - Adds secondary (facial) hair colours to the genome (UI). There are 6 new blocks.
+ - Characters with secondary (facial) hair colours won't find they've turned black after cloning anymore.
+
+
Kyep updated:
+
+ - Plasma dust no longer creates plasma gas on objects or turfs during reactions.
+
+
Twinmold93 updated:
+
+ - Missing sprite for pod pilot Drask now added.
+
+
Xantholne updated:
+
+ - Adds Medical Beret available via loadout menu
+
+
ZomgPonies updated:
+
+ - Fixes Superhero ID cards
+ - Fixes Griffin missing his Freedom Implant
+ - Fixes ElectroNegmatic's Ability not working at all.
+ - Changes LightnIan's ability into a non-damaging stun lasting 2 ticks, with the amount of people affected depending on how long you hold the power in for.
+
+
uraniummeltdown updated:
+
+ - You can now create heat-proof glass airlocks by using a sheet of reinforced glass on the assembly during construction. Regular glass airlocks just require a sheet of glass.
+
+
+
11 April 2017
+
FalseIncarnate updated:
+
+ - Damage done to the shuttle engines by a shadowling's "Extend Shuttle" ability now prevent the shuttle from being recalled to CentComm.
+
+
+
09 April 2017
+
Fox McCloud updated:
+
+ - abductor glands now act as actual hearts; removing them induces heart failure
+ - plasma gland no longer gibs you, but makes you vomit plasma instead
+ - bodysnatcher gland no longer gibs you, but will deal brute damage instead
+ - bloody gland will now drain blood instead of dealing brute damage
+ - species change gland will now change your species until the gland is removed
+ - adjusted the origin tech on a few gland
+ - heart attacks will once again paralyse you and do slightly more brute damage
+ - body snatch clones look more like their originator
+ - Abductors can no longer use guns (minus their own alien energy gun)
+ - Sending someone with an abductor teleport via the console will stun them for 3 cycles (doesn't apply with the advanced camera console)
+ - Abductors can now purchase additional abductor vests
+ - Abductors can lock/unlock vests
+ - Purchasing supplies from the abductor console will no longer increase the amount of experiments you must do
+ - Wonderprods will not induce sleep in those who are stunned OR sleeping
+ - altered the origin tech of abductor tools
+ - Can make abductor surgery tables from regular tables by adding silver sheets to an abductor table frame
+ - Added a bunch more abductee objectives
+ - abductors no long scream like girls
+ - High capacity cells have 10,000 charge instead of 15,000
+ - Mech equipment power costs minorly adjusted
+ - APCs charge a bit faster
+ - EMPs less effective against pods and mechs
+ - Fixes not being able to recharge modular laptops/tablets
+
+
Purpose2 updated:
+
+ - Welders must now been fueled and active to cut lattices.
+
+
+
06 April 2017
+
Fox McCloud updated:
+
+ - Fixes autopsy report printing; print reports by clicking the device itself
+
+
davipatury updated:
+
+ - Rapid Cable Layer now have an autolathe design.
+
+
+
05 April 2017
+
KasparoVy updated:
+
+ - Adds a Tajaran facial hair style.
+ - Adds a few new frill styles for Unathi.
+ - Adds some new horn styles for Unathi.
+ - Adds a couple new facial hair styles for Vulpkanin.
+ - Adds a few new hair styles for Vulpkanin.
+ - Updates Vulpkanin Adhara & Kajam hairstyles.
+
+
Purpose2 updated:
+
+ - Can now take photos of the Blueprints to count as a completed objective.
+ - Cryostorage console now stores the Null Rod & all variations.
+ - Mime mech is now 'Reticence' as it should be
+ - Fixes missing cult's Berserker Robe sprite.
+ - Cryostorage console no longer stores hundreds of bomber jackets, and now stores hardsuits
+ - Cryostorage console now catches and stores most unique objective items.
+ - Corrects some typos and grammar.
+ - You can now light cigarettes with Wands of Fireball, at the cost of your eyebrows.
+
+
Twinmold93 updated:
+
+ - Buying poison pen will actually give you the poison pen now.
+
+
+
04 April 2017
+
FalseIncarnate updated:
+
+ - Adds FullofSkittles's custom pAI sprites. Thanks FoS!
+ - Custom sprites for cyborgs, AI, AI holograms, and pAI units no longer are restricted to a single name. Get your money's worth by using that borg sprite regardless of your version number!
+
+
+
03 April 2017
+
Kyep updated:
+
+ - Ghosts manifested by cultists are no longer invincible, and an exploit allowing them to be made permanent has been fixed.
+
+
+
02 April 2017
+
KasparoVy updated:
+
+ - Nuclear Operatives/ERT Members/Abductors will no longer spawn in with genetic quirks.
+ - Thrown objects that cross a tile with non-full windows will no longer hit the window even if it isn't visually obstructing the path.
+ - Shooting guns (i.e. tasers) in the above circumstances means that the taser shots won't be blocked by windows that aren't visually obstructing the path.
+
+
Kyep updated:
+
+ - Adjusted Black Market Packers away mission. It now has some danger to it (carp), some more interesting stuff to find (syndi lab) and a challenge (fix the ship powergrid).
+ - Slight adjustment to word lists based on our rules.
+ - Removed thunderdome armor from centcom away mission.
+ - Cultists now get a new sacrifice target when the current one cryos.
+
+
+
31 March 2017
+
Krausus updated:
+
+ - Blobs are no longer nearly guaranteed to immediately tear themselves apart upon spawning.
+
+
Kyep updated:
+
+ - Access to jobs is now based solely on Playtime, NOT days since BYOND account was registered.
+
+
+
30 March 2017
+
Crazylemon64 updated:
+
+ - Cult shifter should work now
+
+
FlattestGuitar updated:
+
+ - Strange Reagent only deals clone damage on a successful revival.
+
+
Fox McCloud updated:
+
+ - Non-designated drinks now mix their colors from the reagents within them
+ - Autopsies can now be performed without needing to cut someone open
+ - Adds modular receiver to the maintenance loot system
+ - Receivers can now be produced in hacked autolathes; no longer available in R&D protolathes.
+ - removes the random "scary" sounds that play when walking about
+
+
KasparoVy updated:
+
+ - You can now slam drinks/bottles/flasks by click-dragging them onto yourself while it's in your active hand.
+
+
Kyep updated:
+
+ - The moonoutpost19 away mission should now be finishable, and more enjoyable to attempt.
+
+
uraniummeltdown updated:
+
+ - Emagging a closed firelock does not permanently break it anymore, only opens it.
+ - Emagged windoors should be able to be screwdriver+crowbar'd again.
+ - Powered grilles now have a chance to zap you when you throw an object at them.
+
+
+
29 March 2017
+
Purpose2 updated:
+
+ - 'Roundstart malfunctioning' cameras now appropriately have their wires cut.
+ - AI core camera can no longer be a 'roundstart malfunctioning' camera on both Box & Meta Stations.
+
+
+
28 March 2017
+
KasparoVy updated:
+
+ - Skrell can now choose undergarments (undershirts, underpants, socks) at character creation and dressers.
+ - Vox are now 20% less resilient to brute damage due to their light, porous and flexible skeletons.
+
+
uraniummeltdown updated:
+
+ - Quick-replacing non-wooden tiles will only work with a crowbar in inactive hand instead of any item
+
+
+
27 March 2017
+
Crazylemon64 updated:
+
+ - Away mission power works now.
+
+
Fox McCloud updated:
+
+ - Fixes some stacks not wanting to stack with similar stacks (such as space cash)
+
+
KasparoVy updated:
+
+ - Skrell have been greyscaled and darkened. You can now colour your Skrell characters as you please.
+ - Kidan can now select from multiple different antennae head-accessory styles.
+ - Kidan male/female bodies now have differences, namely mandible/torso structure.
+ - Skrell flesh is now blue (like their blood), though you'll only ever see this under certain circumstances if they're dismembered.
+
+
Kyep updated:
+
+ - The invisible floors in the engineering area of the UO45 away mission are no longer invisible. Previously, you had to crowbar up a seemingly invisible floor to make a wire appear.
+ - Fixed several Terror Spider bugs. Including the notorious 'spiders can get stuck in vents' bug, the 'spiders ignore mechs' bug, and the 'prince is cheesable' bug.
+ - Adjusted White & Empress spider abilities - webs spun by white spiders are now infectious.
+
+
Purpose2 updated:
+
+ - Adds the Psychiatrist's bed/sofa for 5 metal.
+ - Wooden chairs broken by animals no longer drop metal.
+ - Abductors no longer have Syndicate ties.
+ - Fixes material loss on some chair/bed/stool deconstruction types.
+ - IPCs can no longer be DNA Scrambled.
+ - Health analysers clunk again when upgraded
+ - Resolves further grammatical/typo issues.
+
+
+
26 March 2017
+
FalseIncarnate updated:
+
+ - Re-adds the telescopic scythe, the pinnacle of covert reaping technologies. Currently admin-spawn only, for use in the most dire of harvest times.
+ - Scythes (normal and telescopic) should once again clear swathes through all but the hardiest of vines when in proper reaping configurations, and heavily damage those they don't outright destroy.
+ - Ankle-high piles of dirt will no longer prevent you from stepping over them.
+
+
KasparoVy updated:
+
+ - You can no longer climb through interdimensional rifts into cryopods.
+ - Revenants can see properly in the dark again.
+
+
Kyep updated:
+
+ - Adjusted Beach awaymission so it now includes deadly (but rewarding) pirate area.
+ - Adjusted the centcom away mission to make it viable.
+ - Deleted 'listening post' away mission.
+
+
Purpose2 updated:
+
+ - QoL: Newly built APCs come unlocked.
+ - QoL: Chief Engineer's locker has more building permits.
+ - Assorted grammatical fixes.
+
+
Ty-Omaha updated:
+
+ - Splints will display the proper sentence when applying them
+
+
uraniummeltdown updated:
+
+ - Metastation: Fixed Gateway airlock access and Command Hallway vendor areas, virology smartfridge is correctly stocked, mass drivers now have tiny fans, Sec spacepod keys work on the Sec pod, Airlocks should have the correct icon, Firelocks/Windoors/Shutters should be layered correctly, Shutters should be facing the right direction
+ - Drone fabricator consoles search for a fabricator in the same area instead of 3x3 range.
+
+
25 March 2017
Crazylemon64 updated:
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index ed5e1922099..9d32f411c39 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -4266,3 +4266,325 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
Kyep:
- bugfix: Pipes in the Wizard Academy have been banished back under the carpet,
where they belong.
+2017-03-26:
+ FalseIncarnate:
+ - rscadd: Re-adds the telescopic scythe, the pinnacle of covert reaping technologies.
+ Currently admin-spawn only, for use in the most dire of harvest times.
+ - bugfix: Scythes (normal and telescopic) should once again clear swathes through
+ all but the hardiest of vines when in proper reaping configurations, and heavily
+ damage those they don't outright destroy.
+ - bugfix: Ankle-high piles of dirt will no longer prevent you from stepping over
+ them.
+ KasparoVy:
+ - bugfix: You can no longer climb through interdimensional rifts into cryopods.
+ - bugfix: Revenants can see properly in the dark again.
+ Kyep:
+ - tweak: Adjusted Beach awaymission so it now includes deadly (but rewarding) pirate
+ area.
+ - tweak: Adjusted the centcom away mission to make it viable.
+ - rscdel: Deleted 'listening post' away mission.
+ Purpose2:
+ - tweak: 'QoL: Newly built APCs come unlocked.'
+ - tweak: 'QoL: Chief Engineer''s locker has more building permits.'
+ - bugfix: Assorted grammatical fixes.
+ Ty-Omaha:
+ - bugfix: Splints will display the proper sentence when applying them
+ uraniummeltdown:
+ - bugfix: 'Metastation: Fixed Gateway airlock access and Command Hallway vendor
+ areas, virology smartfridge is correctly stocked, mass drivers now have tiny
+ fans, Sec spacepod keys work on the Sec pod, Airlocks should have the correct
+ icon, Firelocks/Windoors/Shutters should be layered correctly, Shutters should
+ be facing the right direction'
+ - tweak: Drone fabricator consoles search for a fabricator in the same area instead
+ of 3x3 range.
+2017-03-27:
+ Crazylemon64:
+ - bugfix: Away mission power works now.
+ Fox McCloud:
+ - bugfix: Fixes some stacks not wanting to stack with similar stacks (such as space
+ cash)
+ KasparoVy:
+ - rscadd: Skrell have been greyscaled and darkened. You can now colour your Skrell
+ characters as you please.
+ - rscadd: Kidan can now select from multiple different antennae head-accessory styles.
+ - tweak: Kidan male/female bodies now have differences, namely mandible/torso structure.
+ - tweak: Skrell flesh is now blue (like their blood), though you'll only ever see
+ this under certain circumstances if they're dismembered.
+ Kyep:
+ - bugfix: The invisible floors in the engineering area of the UO45 away mission
+ are no longer invisible. Previously, you had to crowbar up a seemingly invisible
+ floor to make a wire appear.
+ - bugfix: Fixed several Terror Spider bugs. Including the notorious 'spiders can
+ get stuck in vents' bug, the 'spiders ignore mechs' bug, and the 'prince is
+ cheesable' bug.
+ - tweak: Adjusted White & Empress spider abilities - webs spun by white spiders
+ are now infectious.
+ Purpose2:
+ - rscadd: Adds the Psychiatrist's bed/sofa for 5 metal.
+ - bugfix: Wooden chairs broken by animals no longer drop metal.
+ - bugfix: Abductors no longer have Syndicate ties.
+ - bugfix: Fixes material loss on some chair/bed/stool deconstruction types.
+ - bugfix: IPCs can no longer be DNA Scrambled.
+ - bugfix: Health analysers clunk again when upgraded
+ - bugfix: Resolves further grammatical/typo issues.
+2017-03-28:
+ KasparoVy:
+ - bugfix: Skrell can now choose undergarments (undershirts, underpants, socks) at
+ character creation and dressers.
+ - tweak: Vox are now 20% less resilient to brute damage due to their light, porous
+ and flexible skeletons.
+ uraniummeltdown:
+ - bugfix: Quick-replacing non-wooden tiles will only work with a crowbar in inactive
+ hand instead of any item
+2017-03-29:
+ Purpose2:
+ - bugfix: '''Roundstart malfunctioning'' cameras now appropriately have their wires
+ cut.'
+ - bugfix: AI core camera can no longer be a 'roundstart malfunctioning' camera on
+ both Box & Meta Stations.
+2017-03-30:
+ Crazylemon64:
+ - bugfix: Cult shifter should work now
+ FlattestGuitar:
+ - tweak: Strange Reagent only deals clone damage on a successful revival.
+ Fox McCloud:
+ - rscadd: Non-designated drinks now mix their colors from the reagents within them
+ - tweak: Autopsies can now be performed without needing to cut someone open
+ - rscadd: Adds modular receiver to the maintenance loot system
+ - rscadd: Receivers can now be produced in hacked autolathes; no longer available
+ in R&D protolathes.
+ - tweak: removes the random "scary" sounds that play when walking about
+ KasparoVy:
+ - rscadd: You can now slam drinks/bottles/flasks by click-dragging them onto yourself
+ while it's in your active hand.
+ Kyep:
+ - tweak: The moonoutpost19 away mission should now be finishable, and more enjoyable
+ to attempt.
+ uraniummeltdown:
+ - bugfix: Emagging a closed firelock does not permanently break it anymore, only
+ opens it.
+ - bugfix: Emagged windoors should be able to be screwdriver+crowbar'd again.
+ - rscadd: Powered grilles now have a chance to zap you when you throw an object
+ at them.
+2017-03-31:
+ Krausus:
+ - bugfix: Blobs are no longer nearly guaranteed to immediately tear themselves apart
+ upon spawning.
+ Kyep:
+ - rscadd: Access to jobs is now based solely on Playtime, NOT days since BYOND account
+ was registered.
+2017-04-02:
+ KasparoVy:
+ - bugfix: Nuclear Operatives/ERT Members/Abductors will no longer spawn in with
+ genetic quirks.
+ - bugfix: Thrown objects that cross a tile with non-full windows will no longer
+ hit the window even if it isn't visually obstructing the path.
+ - bugfix: Shooting guns (i.e. tasers) in the above circumstances means that the
+ taser shots won't be blocked by windows that aren't visually obstructing the
+ path.
+ Kyep:
+ - tweak: Adjusted Black Market Packers away mission. It now has some danger to it
+ (carp), some more interesting stuff to find (syndi lab) and a challenge (fix
+ the ship powergrid).
+ - tweak: Slight adjustment to word lists based on our rules.
+ - tweak: Removed thunderdome armor from centcom away mission.
+ - bugfix: Cultists now get a new sacrifice target when the current one cryos.
+2017-04-03:
+ Kyep:
+ - bugfix: Ghosts manifested by cultists are no longer invincible, and an exploit
+ allowing them to be made permanent has been fixed.
+2017-04-04:
+ FalseIncarnate:
+ - rscadd: Adds FullofSkittles's custom pAI sprites. Thanks FoS!
+ - tweak: Custom sprites for cyborgs, AI, AI holograms, and pAI units no longer are
+ restricted to a single name. Get your money's worth by using that borg sprite
+ regardless of your version number!
+2017-04-05:
+ KasparoVy:
+ - rscadd: Adds a Tajaran facial hair style.
+ - rscadd: Adds a few new frill styles for Unathi.
+ - rscadd: Adds some new horn styles for Unathi.
+ - rscadd: Adds a couple new facial hair styles for Vulpkanin.
+ - rscadd: Adds a few new hair styles for Vulpkanin.
+ - tweak: Updates Vulpkanin Adhara & Kajam hairstyles.
+ Purpose2:
+ - rscadd: Can now take photos of the Blueprints to count as a completed objective.
+ - rscadd: Cryostorage console now stores the Null Rod & all variations.
+ - bugfix: Mime mech is now 'Reticence' as it should be
+ - bugfix: Fixes missing cult's Berserker Robe sprite.
+ - tweak: Cryostorage console no longer stores hundreds of bomber jackets, and now
+ stores hardsuits
+ - tweak: Cryostorage console now catches and stores most unique objective items.
+ - tweak: Corrects some typos and grammar.
+ - rscadd: You can now light cigarettes with Wands of Fireball, at the cost of your
+ eyebrows.
+ Twinmold93:
+ - bugfix: Buying poison pen will actually give you the poison pen now.
+2017-04-06:
+ Fox McCloud:
+ - bugfix: Fixes autopsy report printing; print reports by clicking the device itself
+ davipatury:
+ - rscadd: Rapid Cable Layer now have an autolathe design.
+2017-04-09:
+ Fox McCloud:
+ - tweak: abductor glands now act as actual hearts; removing them induces heart failure
+ - tweak: plasma gland no longer gibs you, but makes you vomit plasma instead
+ - tweak: bodysnatcher gland no longer gibs you, but will deal brute damage instead
+ - tweak: bloody gland will now drain blood instead of dealing brute damage
+ - tweak: species change gland will now change your species until the gland is removed
+ - tweak: adjusted the origin tech on a few gland
+ - tweak: heart attacks will once again paralyse you and do slightly more brute damage
+ - bugfix: body snatch clones look more like their originator
+ - tweak: Abductors can no longer use guns (minus their own alien energy gun)
+ - tweak: Sending someone with an abductor teleport via the console will stun them
+ for 3 cycles (doesn't apply with the advanced camera console)
+ - rscadd: Abductors can now purchase additional abductor vests
+ - rscadd: Abductors can lock/unlock vests
+ - tweak: Purchasing supplies from the abductor console will no longer increase the
+ amount of experiments you must do
+ - tweak: Wonderprods will not induce sleep in those who are stunned OR sleeping
+ - tweak: altered the origin tech of abductor tools
+ - rscadd: Can make abductor surgery tables from regular tables by adding silver
+ sheets to an abductor table frame
+ - rscadd: Added a bunch more abductee objectives
+ - tweak: abductors no long scream like girls
+ - tweak: High capacity cells have 10,000 charge instead of 15,000
+ - tweak: Mech equipment power costs minorly adjusted
+ - tweak: APCs charge a bit faster
+ - tweak: EMPs less effective against pods and mechs
+ - bugfix: Fixes not being able to recharge modular laptops/tablets
+ Purpose2:
+ - bugfix: Welders must now been fueled and active to cut lattices.
+2017-04-11:
+ FalseIncarnate:
+ - tweak: Damage done to the shuttle engines by a shadowling's "Extend Shuttle" ability
+ now prevent the shuttle from being recalled to CentComm.
+2017-04-16:
+ FalseIncarnate:
+ - tweak: Potential collaborators for traitors now are informed they are potentially
+ a collaborator for a potential increase in them potentially helping the traitors
+ potentially do potentially bad things. Potentially.
+ - rscadd: Potential collaborators are given a single code word and response set
+ so they can discretely find out that their best friend is a filthy traitor.
+ KasparoVy:
+ - rscadd: Adds secondary (facial) hair colours to the genome (UI). There are 6 new
+ blocks.
+ - bugfix: Characters with secondary (facial) hair colours won't find they've turned
+ black after cloning anymore.
+ Kyep:
+ - rscdel: Plasma dust no longer creates plasma gas on objects or turfs during reactions.
+ Twinmold93:
+ - bugfix: Missing sprite for pod pilot Drask now added.
+ Xantholne:
+ - rscadd: Adds Medical Beret available via loadout menu
+ ZomgPonies:
+ - bugfix: Fixes Superhero ID cards
+ - bugfix: Fixes Griffin missing his Freedom Implant
+ - bugfix: Fixes ElectroNegmatic's Ability not working at all.
+ - tweak: Changes LightnIan's ability into a non-damaging stun lasting 2 ticks, with
+ the amount of people affected depending on how long you hold the power in for.
+ uraniummeltdown:
+ - rscadd: You can now create heat-proof glass airlocks by using a sheet of reinforced
+ glass on the assembly during construction. Regular glass airlocks just require
+ a sheet of glass.
+2017-04-17:
+ KasparoVy:
+ - bugfix: The God-emperor of Mankind diskette's UI works again.
+ - bugfix: DNA UI injectors will now immediately update a person's eye colour.
+ Krausus:
+ - bugfix: You can no longer squeeze non-match objects into matchboxes.
+2017-04-19:
+ IK3I:
+ - bugfix: Chaplain now spawns with his bible
+ Xantholne:
+ - bugfix: You now correctly spawn with the CMO Skirt if selected in loadout menu
+2017-04-21:
+ Anticept:
+ - tweak: Alternate Job Preference now defaults to "Return to Lobby if Preferences
+ Unavailable". Only affects new players.
+ Fox McCloud:
+ - tweak: Tesla can now damage blobs
+ - tweak: Tesla causes machinery to overload and explode when zapping it
+ - tweak: Tesla dissipates energy more slowly and is easier to charge up (making
+ it more deadly when released)
+ - tweak: Tesla will now dust mobs it bumps into
+ - rscadd: Tesla coils now have wires that can be pulsed to generate a tesla zap
+ Lady-Luck:
+ - tweak: Makes several balance adjustments to existing syndicate bundles, generally
+ making them more worthwhile.
+ - rscadd: Adds an Allies Cocktail object for the Bond bundle.
+ - rscadd: Adds the 'gadgets' syndicate bundle.
+ - rscdel: Removes the 'lordsingulo' and 'murder' syndicate bundles.
+ Spacemanspark:
+ - rscadd: Permits hoodies to carry flashlights.
+ Twinmold93:
+ - rscadd: Adds attack options for deep fryers, grills, and ovens. Those breaking
+ into the kitchen beware.
+ alexkar598:
+ - bugfix: you can now click on things underwater
+ monster860:
+ - rscadd: Adds an in-game way of viewing poll results
+ - tweak: The player poll window automatically pops up if there is an active poll
+ you haven't voted on.
+ - rscadd: Adds an browser popup for creating new polls
+ - tweak: Your account needs to be at least 30 days old in order to vote on polls
+2017-04-23:
+ Citinited:
+ - rscadd: You can now fully insulate reinforced floors using a sheet of plasteel.
+ - tweak: Certain floors in the turbine, incinerator, and toxins are now thermally
+ insulated.
+ Crazylemon64:
+ - rscdel: Reverts Norgad's east maintenance overhaul
+ IK3I:
+ - bugfix: flipping aliums now have a cooldown
+ - rscadd: Aliums have some more sounds to play with
+ Tayyyyyyy:
+ - bugfix: You can no longer use space pod verbs when restrained, dead, or otherwise
+ incapacitated.
+2017-04-24:
+ Flattest:
+ - bugfix: Sleepers spit out their victims when deconstructed now.
+2017-04-25:
+ Flattest:
+ - rscadd: Animated progress bars!
+ uraniummeltdown:
+ - tweak: Runed girders have a clearer and bigger icon
+ - bugfix: Girder subtypes are properly named, "reinforced girder" and not "reinforced"
+ - tweak: Summoned cult walls do not drop a girder or runed metal to prevent runed
+ metal farming
+ - tweak: Cult walls no longer have blood or human remains in them
+ - rscadd: Harvesters can smash more things and can summon cult walls and floors
+ - bugfix: Fixed not being able to make a cult wall with runed metal + runed girder
+ - tweak: Runed girders will need to be deconstructed with a welder (or plasma cutter
+ or jackhammer) instead of a wrench. Cultists can hit them with their tomes to
+ instantly demolish them.
+2017-04-26:
+ FalseIncarnate:
+ - bugfix: Glowshrooms (and their subtypes) can be mass-cleared by scythes just like
+ vines.
+ pinatacolada:
+ - rscadd: dirty surgery environments get you nasty infections
+ - rscadd: ghetto surgery internal organ disinfection with alcohol
+ - rscadd: dead limb revival surgery step
+2017-04-27:
+ Kyep:
+ - tweak: Changed "suggested client version" from 510 to 511.
+2017-04-28:
+ Alffd:
+ - rscadd: Adds Paperwork the sloth to cargo.
+2017-04-29:
+ FalseIncarnate:
+ - bugfix: Popcorn jellybeans require jellybeans to make.
+ - bugfix: Gum is no longer invisible, but is still very chewy.
+ Phantasmic Dream Art, Fethas PR:
+ - rscadd: Updates the shadowling sprite. Sprite by Dreamy
+ uraniummeltdown:
+ - rscadd: Examine a girder for (de)construction hints
+ - rscadd: Projectiles have a chance to pass through some girders
+ - rscadd: You can construct rough iron (false) walls with rods, wood (false) walls
+ with wooden planks on a girder
+ - rscadd: Screwdriver a displaced girder to deconstruct it
+ - tweak: Increased displaced girder health, decreased reinforced and cult girder
+ health
+ - tweak: False wall construction is no longer instant
+ - tweak: Girder (de)construction messages should read better
diff --git a/icons/mecha/mech_construct.dmi b/icons/mecha/mech_construct.dmi
index 8d97261c9bb..10a6d9b86fd 100644
Binary files a/icons/mecha/mech_construct.dmi and b/icons/mecha/mech_construct.dmi differ
diff --git a/icons/mob/back.dmi b/icons/mob/back.dmi
index 7764cd6d0c5..1c4472d5299 100644
Binary files a/icons/mob/back.dmi and b/icons/mob/back.dmi differ
diff --git a/icons/mob/body_accessory.dmi b/icons/mob/body_accessory.dmi
index 8d635c2c2df..5400c933c7f 100644
Binary files a/icons/mob/body_accessory.dmi and b/icons/mob/body_accessory.dmi differ
diff --git a/icons/mob/custom-synthetic.dmi b/icons/mob/custom-synthetic.dmi
deleted file mode 100644
index 0434efd900f..00000000000
Binary files a/icons/mob/custom-synthetic.dmi and /dev/null differ
diff --git a/icons/mob/custom_synthetic/custom-synthetic.dmi b/icons/mob/custom_synthetic/custom-synthetic.dmi
new file mode 100644
index 00000000000..29917049c85
Binary files /dev/null and b/icons/mob/custom_synthetic/custom-synthetic.dmi differ
diff --git a/icons/mob/custom-synthetic64.dmi b/icons/mob/custom_synthetic/custom-synthetic64.dmi
similarity index 100%
rename from icons/mob/custom-synthetic64.dmi
rename to icons/mob/custom_synthetic/custom-synthetic64.dmi
diff --git a/icons/mob/custom_synthetic/custom_head.dmi b/icons/mob/custom_synthetic/custom_head.dmi
new file mode 100644
index 00000000000..76ffcedcc82
Binary files /dev/null and b/icons/mob/custom_synthetic/custom_head.dmi differ
diff --git a/icons/mob/custom_synthetic/custom_lefthand.dmi b/icons/mob/custom_synthetic/custom_lefthand.dmi
new file mode 100644
index 00000000000..8d469195434
Binary files /dev/null and b/icons/mob/custom_synthetic/custom_lefthand.dmi differ
diff --git a/icons/mob/custom_synthetic/custom_righthand.dmi b/icons/mob/custom_synthetic/custom_righthand.dmi
new file mode 100644
index 00000000000..8d469195434
Binary files /dev/null and b/icons/mob/custom_synthetic/custom_righthand.dmi differ
diff --git a/icons/mob/eyes.dmi b/icons/mob/eyes.dmi
index 97966c61dac..fdf13394f20 100644
Binary files a/icons/mob/eyes.dmi and b/icons/mob/eyes.dmi differ
diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi
index 3495ebe372c..acfaf83a92c 100644
Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ
diff --git a/icons/mob/human_face.dmi b/icons/mob/human_face.dmi
index ad33819eea4..4959f0ebb53 100644
Binary files a/icons/mob/human_face.dmi and b/icons/mob/human_face.dmi differ
diff --git a/icons/mob/human_races/cyberlimbs/shellguard/shellguard_alt1.dmi b/icons/mob/human_races/cyberlimbs/shellguard/shellguard_alt1.dmi
new file mode 100644
index 00000000000..1b52131cfde
Binary files /dev/null and b/icons/mob/human_races/cyberlimbs/shellguard/shellguard_alt1.dmi differ
diff --git a/icons/mob/human_races/cyberlimbs/shellguard/shellguard_main.dmi b/icons/mob/human_races/cyberlimbs/shellguard/shellguard_main.dmi
new file mode 100644
index 00000000000..d0db48eb310
Binary files /dev/null and b/icons/mob/human_races/cyberlimbs/shellguard/shellguard_main.dmi differ
diff --git a/icons/mob/human_races/cyberlimbs/shellguard/shellguard_monitor.dmi b/icons/mob/human_races/cyberlimbs/shellguard/shellguard_monitor.dmi
new file mode 100644
index 00000000000..6bd25bee030
Binary files /dev/null and b/icons/mob/human_races/cyberlimbs/shellguard/shellguard_monitor.dmi differ
diff --git a/icons/mob/human_races/r_def_kidan.dmi b/icons/mob/human_races/r_def_kidan.dmi
index 9cef8f9597c..0f84cde5dec 100644
Binary files a/icons/mob/human_races/r_def_kidan.dmi and b/icons/mob/human_races/r_def_kidan.dmi differ
diff --git a/icons/mob/human_races/r_def_skrell.dmi b/icons/mob/human_races/r_def_skrell.dmi
index 601534919eb..61ed4415ceb 100644
Binary files a/icons/mob/human_races/r_def_skrell.dmi and b/icons/mob/human_races/r_def_skrell.dmi differ
diff --git a/icons/mob/human_races/r_kidan.dmi b/icons/mob/human_races/r_kidan.dmi
index 9cef8f9597c..0f84cde5dec 100644
Binary files a/icons/mob/human_races/r_kidan.dmi and b/icons/mob/human_races/r_kidan.dmi differ
diff --git a/icons/mob/human_races/r_skrell.dmi b/icons/mob/human_races/r_skrell.dmi
index 586714c7da8..148c8d42d27 100644
Binary files a/icons/mob/human_races/r_skrell.dmi and b/icons/mob/human_races/r_skrell.dmi differ
diff --git a/icons/mob/inhands/clothing_lefthand.dmi b/icons/mob/inhands/clothing_lefthand.dmi
index 5f799ea0643..29ebf19be94 100644
Binary files a/icons/mob/inhands/clothing_lefthand.dmi and b/icons/mob/inhands/clothing_lefthand.dmi differ
diff --git a/icons/mob/inhands/clothing_righthand.dmi b/icons/mob/inhands/clothing_righthand.dmi
index c7046c1051d..0d43b6216f7 100644
Binary files a/icons/mob/inhands/clothing_righthand.dmi and b/icons/mob/inhands/clothing_righthand.dmi differ
diff --git a/icons/mob/inhands/fluff_lefthand.dmi b/icons/mob/inhands/fluff_lefthand.dmi
new file mode 100644
index 00000000000..84380f038ed
Binary files /dev/null and b/icons/mob/inhands/fluff_lefthand.dmi differ
diff --git a/icons/mob/inhands/fluff_righthand.dmi b/icons/mob/inhands/fluff_righthand.dmi
new file mode 100644
index 00000000000..d93ab0ffc68
Binary files /dev/null and b/icons/mob/inhands/fluff_righthand.dmi differ
diff --git a/icons/mob/mob.dmi b/icons/mob/mob.dmi
index 636e78a7a43..5171dfdaced 100644
Binary files a/icons/mob/mob.dmi and b/icons/mob/mob.dmi differ
diff --git a/icons/mob/pets.dmi b/icons/mob/pets.dmi
index fee5f3ec69f..c47ca000f0c 100644
Binary files a/icons/mob/pets.dmi and b/icons/mob/pets.dmi differ
diff --git a/icons/mob/screen_midnight.dmi b/icons/mob/screen_midnight.dmi
index 2dab86ef7f9..a5f9caa6a90 100644
Binary files a/icons/mob/screen_midnight.dmi and b/icons/mob/screen_midnight.dmi differ
diff --git a/icons/mob/screen_operative.dmi b/icons/mob/screen_operative.dmi
index 8d90aa7c3b3..0bb1a0b9d44 100644
Binary files a/icons/mob/screen_operative.dmi and b/icons/mob/screen_operative.dmi differ
diff --git a/icons/mob/screen_plasmafire.dmi b/icons/mob/screen_plasmafire.dmi
index cca826d272c..81453caddef 100644
Binary files a/icons/mob/screen_plasmafire.dmi and b/icons/mob/screen_plasmafire.dmi differ
diff --git a/icons/mob/screen_retro.dmi b/icons/mob/screen_retro.dmi
index 77aefd6a16b..1568e701222 100644
Binary files a/icons/mob/screen_retro.dmi and b/icons/mob/screen_retro.dmi differ
diff --git a/icons/mob/screen_slimecore.dmi b/icons/mob/screen_slimecore.dmi
index 3af866db6bd..3b2392cb8fc 100644
Binary files a/icons/mob/screen_slimecore.dmi and b/icons/mob/screen_slimecore.dmi differ
diff --git a/icons/mob/screen_white.dmi b/icons/mob/screen_white.dmi
index 8288217dcd0..361611cf4e0 100644
Binary files a/icons/mob/screen_white.dmi and b/icons/mob/screen_white.dmi differ
diff --git a/icons/mob/species/drask/uniform.dmi b/icons/mob/species/drask/uniform.dmi
index 6610948f641..9dd5a22618c 100644
Binary files a/icons/mob/species/drask/uniform.dmi and b/icons/mob/species/drask/uniform.dmi differ
diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi
index 7c532ab179f..03c1180b1dc 100644
Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ
diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi
index a89680531a6..7742bdcc755 100644
Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ
diff --git a/icons/obj/ammo.dmi b/icons/obj/ammo.dmi
index 0977e02fb0e..f6364adea0f 100644
Binary files a/icons/obj/ammo.dmi and b/icons/obj/ammo.dmi differ
diff --git a/icons/obj/clothing/glasses.dmi b/icons/obj/clothing/glasses.dmi
index fd2947d7d69..227ec28b742 100644
Binary files a/icons/obj/clothing/glasses.dmi and b/icons/obj/clothing/glasses.dmi differ
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index eda858cea16..0aece3ac8ac 100644
Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ
diff --git a/icons/obj/clothing/masks.dmi b/icons/obj/clothing/masks.dmi
index 8faec500e7b..974efa8a088 100644
Binary files a/icons/obj/clothing/masks.dmi and b/icons/obj/clothing/masks.dmi differ
diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi
index a131fc14f04..669e8dff821 100644
Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ
diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi
index 1a099e23d23..1db72be54fa 100644
Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ
diff --git a/icons/obj/cult.dmi b/icons/obj/cult.dmi
index 6901e1c25a2..40eb2deda62 100644
Binary files a/icons/obj/cult.dmi and b/icons/obj/cult.dmi differ
diff --git a/icons/obj/custom_items.dmi b/icons/obj/custom_items.dmi
index 65ac87259b1..9623f991e2f 100644
Binary files a/icons/obj/custom_items.dmi and b/icons/obj/custom_items.dmi differ
diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi
index 730c5d5632c..52eb53ac436 100644
Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ
diff --git a/icons/obj/food/candy.dmi b/icons/obj/food/candy.dmi
index 4bf2f9b9862..89714f5b5b3 100644
Binary files a/icons/obj/food/candy.dmi and b/icons/obj/food/candy.dmi differ
diff --git a/icons/obj/objects.dmi b/icons/obj/objects.dmi
index e2b617812a8..e95b9ce041f 100644
Binary files a/icons/obj/objects.dmi and b/icons/obj/objects.dmi differ
diff --git a/icons/obj/power.dmi b/icons/obj/power.dmi
index 5977cd3cb66..e9de23533ed 100644
Binary files a/icons/obj/power.dmi and b/icons/obj/power.dmi differ
diff --git a/icons/obj/stationobjs.dmi b/icons/obj/stationobjs.dmi
index 72084b5675b..fd89b23d19d 100755
Binary files a/icons/obj/stationobjs.dmi and b/icons/obj/stationobjs.dmi differ
diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi
index d021f5d02b1..5dc147bc25e 100644
Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ
diff --git a/icons/obj/tesla_engine/tesla_coil.dmi b/icons/obj/tesla_engine/tesla_coil.dmi
index 5c3646dde80..96a6c636d83 100644
Binary files a/icons/obj/tesla_engine/tesla_coil.dmi and b/icons/obj/tesla_engine/tesla_coil.dmi differ
diff --git a/icons/turf/areas.dmi b/icons/turf/areas.dmi
index 238e2ec5421..cd8a26cea98 100755
Binary files a/icons/turf/areas.dmi and b/icons/turf/areas.dmi differ
diff --git a/icons/vehicles/motorcycle.dmi b/icons/vehicles/motorcycle.dmi
index 2f3c2d5517f..5b1a910b7b0 100644
Binary files a/icons/vehicles/motorcycle.dmi and b/icons/vehicles/motorcycle.dmi differ
diff --git a/paradise.dme b/paradise.dme
index b87c0b16ab0..143543c836a 100644
--- a/paradise.dme
+++ b/paradise.dme
@@ -66,6 +66,7 @@
#include "code\__HELPERS\matrices.dm"
#include "code\__HELPERS\mobs.dm"
#include "code\__HELPERS\names.dm"
+#include "code\__HELPERS\qdel.dm"
#include "code\__HELPERS\sanitize_values.dm"
#include "code\__HELPERS\text.dm"
#include "code\__HELPERS\time.dm"
@@ -218,6 +219,7 @@
#include "code\datums\supplypacks.dm"
#include "code\datums\uplink_item.dm"
#include "code\datums\vision_override.dm"
+#include "code\datums\vr.dm"
#include "code\datums\cache\air_alarm.dm"
#include "code\datums\cache\apc.dm"
#include "code\datums\cache\cache.dm"
@@ -316,6 +318,7 @@
#include "code\datums\spells\trigger.dm"
#include "code\datums\spells\turf_teleport.dm"
#include "code\datums\spells\wizard.dm"
+#include "code\datums\vr\level.dm"
#include "code\datums\weather\weather.dm"
#include "code\datums\weather\weather_types.dm"
#include "code\datums\wires\airlock.dm"
@@ -331,6 +334,7 @@
#include "code\datums\wires\robot.dm"
#include "code\datums\wires\smartfridge.dm"
#include "code\datums\wires\syndicatebomb.dm"
+#include "code\datums\wires\tesla_coil.dm"
#include "code\datums\wires\vending.dm"
#include "code\datums\wires\wires.dm"
#include "code\defines\vox_sounds.dm"
@@ -600,6 +604,7 @@
#include "code\game\machinery\computer\store.dm"
#include "code\game\machinery\computer\syndicate_specops_shuttle.dm"
#include "code\game\machinery\computer\telecrystalconsoles.dm"
+#include "code\game\machinery\computer\vr_control.dm"
#include "code\game\machinery\doors\airlock.dm"
#include "code\game\machinery\doors\airlock_control.dm"
#include "code\game\machinery\doors\airlock_electronics.dm"
@@ -643,7 +648,7 @@
#include "code\game\mecha\combat\honker.dm"
#include "code\game\mecha\combat\marauder.dm"
#include "code\game\mecha\combat\phazon.dm"
-#include "code\game\mecha\combat\recitence.dm"
+#include "code\game\mecha\combat\reticence.dm"
#include "code\game\mecha\equipment\mecha_equipment.dm"
#include "code\game\mecha\equipment\tools\medical_tools.dm"
#include "code\game\mecha\equipment\tools\mining_tools.dm"
@@ -693,6 +698,7 @@
#include "code\game\objects\effects\spawners\gibspawner.dm"
#include "code\game\objects\effects\spawners\lootdrop.dm"
#include "code\game\objects\effects\spawners\random_barrier.dm"
+#include "code\game\objects\effects\spawners\random_spawners.dm"
#include "code\game\objects\effects\spawners\vaultspawner.dm"
#include "code\game\objects\effects\spawners\windowspawner.dm"
#include "code\game\objects\items\ashtray.dm"
@@ -724,7 +730,6 @@
#include "code\game\objects\items\devices\laserpointer.dm"
#include "code\game\objects\items\devices\lightreplacer.dm"
#include "code\game\objects\items\devices\megaphone.dm"
-#include "code\game\objects\items\devices\modkit.dm"
#include "code\game\objects\items\devices\multitool.dm"
#include "code\game\objects\items\devices\paicard.dm"
#include "code\game\objects\items\devices\pipe_painter.dm"
@@ -846,6 +851,7 @@
#include "code\game\objects\items\weapons\grenades\spawnergrenade.dm"
#include "code\game\objects\items\weapons\grenades\syndieminibomb.dm"
#include "code\game\objects\items\weapons\implants\implant.dm"
+#include "code\game\objects\items\weapons\implants\implant_abductor.dm"
#include "code\game\objects\items\weapons\implants\implant_chem.dm"
#include "code\game\objects\items\weapons\implants\implant_death_alarm.dm"
#include "code\game\objects\items\weapons\implants\implant_explosive.dm"
@@ -1696,6 +1702,7 @@
#include "code\modules\mob\living\simple_animal\friendly\pet.dm"
#include "code\modules\mob\living\simple_animal\friendly\pug.dm"
#include "code\modules\mob\living\simple_animal\friendly\slime.dm"
+#include "code\modules\mob\living\simple_animal\friendly\sloth.dm"
#include "code\modules\mob\living\simple_animal\friendly\spiderbot.dm"
#include "code\modules\mob\living\simple_animal\hostile\alien.dm"
#include "code\modules\mob\living\simple_animal\hostile\bat.dm"
@@ -2208,6 +2215,10 @@
#include "code\modules\vehicle\speedbike.dm"
#include "code\modules\vehicle\sportscar.dm"
#include "code\modules\vehicle\vehicle.dm"
+#include "code\modules\vr\vr_avatar.dm"
+#include "code\modules\vr\vr_controller.dm"
+#include "code\modules\vr\vr_goggles.dm"
+#include "code\modules\vr\vr_outfits.dm"
#include "goon\code\datums\browserOutput.dm"
#include "interface\interface.dm"
#include "interface\skin.dmf"
diff --git a/sound/effects/Kidanclack.ogg b/sound/effects/Kidanclack.ogg
new file mode 100644
index 00000000000..a25cf3efab7
Binary files /dev/null and b/sound/effects/Kidanclack.ogg differ
diff --git a/sound/effects/kidanclack2.ogg b/sound/effects/kidanclack2.ogg
new file mode 100644
index 00000000000..de2d625bc13
Binary files /dev/null and b/sound/effects/kidanclack2.ogg differ
diff --git a/strings/ion_laws.json b/strings/ion_laws.json
index 446b1e980e9..ecb4660ded5 100644
--- a/strings/ion_laws.json
+++ b/strings/ion_laws.json
@@ -408,7 +408,7 @@
"THIRTEEN SEQUELS",
"THREE WISHES",
"A SITCOM",
- "THAT GRIEFING FAGGOT GEORGE MELONS",
+ "THAT GRIEFING ASSHOLE GEORGE MELONS",
"FAT GIRLS ON BICYCLES",
"SOMEBODY TO PUT YOU OUT OF YOUR MISERY",
"HEROES IN A HALF SHELL",
"
message_text += "