| Blob | | |
"
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index 1821f3d7f71..7dbb6838046 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -12,40 +12,56 @@
return
switch(href_list["makeAntag"])
if("1")
- message_admins("[key_name_admin(usr)] created traitors.")
- log_admin("[key_name(usr)] created traitors.")
- if(!src.makeTraitors())
- usr << "Unfortunatly there were no candidates available."
+ if(src.makeTraitors())
+ message_admins("[key_name_admin(usr)] created traitors.")
+ log_admin("[key_name(usr)] created traitors.")
+ else
+ message_admins("[key_name_admin(usr)] tried to create traitors. Unfortunately, there were no candidates available.")
+ log_admin("[key_name(usr)] failed to create traitors.")
if("2")
- message_admins("[key_name(usr)] created changelings.")
- log_admin("[key_name(usr)] created changelings.")
- if(!src.makeChanglings())
- usr << "Unfortunatly there were no candidates available."
+ if(src.makeChanglings())
+ message_admins("[key_name(usr)] created changelings.")
+ log_admin("[key_name(usr)] created changelings.")
+ else
+ message_admins("[key_name_admin(usr)] tried to create changelings. Unfortunately, there were no candidates available.")
+ log_admin("[key_name(usr)] failed to create changelings.")
if("3")
- message_admins("[key_name(usr)] started a revolution.")
- log_admin("[key_name(usr)] started a revolution.")
if(!src.makeRevs())
- usr << "Unfortunatly there were no candidates available."
+ message_admins("[key_name(usr)] started a revolution.")
+ log_admin("[key_name(usr)] started a revolution.")
+ else
+ message_admins("[key_name_admin(usr)] tried to start a revolution. Unfortunately, there were no candidates available.")
+ log_admin("[key_name(usr)] failed to start a revolution.")
if("4")
- message_admins("[key_name(usr)] created cultists.")
- log_admin("[key_name(usr)] created cultists.")
- if(!src.makeCult())
- usr << "Unfortunatly there were no candidates available."
+ if(src.makeCult())
+ message_admins("[key_name(usr)] started a cult.")
+ log_admin("[key_name(usr)] started a cult.")
+ else
+ message_admins("[key_name_admin(usr)] tried to start a cult. Unfortunately, there were no candidates available.")
+ log_admin("[key_name(usr)] failed to start a cult.")
if("5")
- message_admins("[key_name(usr)] caused an AI to malfunction.")
- log_admin("[key_name(usr)] caused an AI to malfunction.")
- if(!src.makeMalfAImode())
- usr << "Unfortunatly there were no candidates available."
+ if(src.makeMalfAImode())
+ message_admins("[key_name(usr)] caused an AI to malfunction.")
+ log_admin("[key_name(usr)] caused an AI to malfunction.")
+ else
+ message_admins("[key_name_admin(usr)] tried to cause an AI to malfunction. Unfortunately, there were no candidates available.")
+ log_admin("[key_name(usr)] failed to cause an AI to malfunction.")
if("6")
- message_admins("[key_name(usr)] created a wizard.")
- log_admin("[key_name(usr)] created a wizard.")
- if(!src.makeWizard())
- usr << "Unfortunatly there were no candidates available."
+ message_admins("[key_name(usr)] is creating a wizard...")
+ if(src.makeWizard())
+ message_admins("[key_name(usr)] created a wizard.")
+ log_admin("[key_name(usr)] created a wizard.")
+ else
+ message_admins("[key_name_admin(usr)] tried to create a wizard. Unfortunately, there were no candidates available.")
+ log_admin("[key_name(usr)] failed to create a wizard.")
if("7")
- message_admins("[key_name(usr)] created a nuke team.")
- log_admin("[key_name(usr)] created a nuke team.")
- if(!src.makeNukeTeam())
- usr << "Unfortunatly there were not enough candidates available."
+ message_admins("[key_name(usr)] is creating a nuke team...")
+ if(src.makeNukeTeam())
+ message_admins("[key_name(usr)] created a nuke team.")
+ log_admin("[key_name(usr)] created a nuke team.")
+ else
+ message_admins("[key_name_admin(usr)] tried to create a nuke team. Unfortunately, there were not enough candidates available.")
+ log_admin("[key_name(usr)] failed to create a nuke team.")
if("8")
message_admins("[key_name(usr)] spawned a ninja.")
log_admin("[key_name(usr)] spawned a ninja.")
@@ -55,27 +71,52 @@
log_admin("[key_name(usr)] started an alien infestation.")
src.makeAliens()
if("10")
- message_admins("[key_name(usr)] created a death squad.")
- log_admin("[key_name(usr)] created a death squad.")
- if(!src.makeDeathsquad())
- usr << "Unfortunatly there were not enough candidates available."
+ message_admins("[key_name(usr)] is creating a death squad...")
+ if(src.makeDeathsquad())
+ message_admins("[key_name(usr)] created a death squad.")
+ log_admin("[key_name(usr)] created a death squad.")
+ else
+ message_admins("[key_name_admin(usr)] tried to create a death squad. Unfortunately, there were not enough candidates available.")
+ log_admin("[key_name(usr)] failed to create a death squad.")
if("11")
var/strength = input("Set Blob Strength (1=Weak, 2=Strong, 3=Full)","Set Strength",1) as num
message_admins("[key_name(usr)] spawned a blob with strength [strength].")
log_admin("[key_name(usr)] spawned a blob with strength [strength].")
new/datum/round_event/blob(strength)
if("12")
- message_admins("[key_name(usr)] started a gang war.")
- log_admin("[key_name(usr)] started a gang war.")
- if(!src.makeGangsters())
- usr << "Unfortunatly there were not enough candidates available."
+ if(src.makeGangsters())
+ message_admins("[key_name(usr)] started a gang war.")
+ log_admin("[key_name(usr)] started a gang war.")
+ else
+ message_admins("[key_name(usr)] tried to start a gang war. Unfortunately, there were not enough candidates available.")
+ log_admin("[key_name(usr)] failed to start a gang war.")
if("13")
- message_admins("[key_name(usr)] created a emergency response team.")
- log_admin("[key_name(usr)] created a emergency response team.")
- if(!src.makeEmergencyresponseteam())
- usr << "Unfortunatly there were not enough candidates available."
+ message_admins("[key_name(usr)] is creating an emergency response team...")
+ if(src.makeEmergencyresponseteam())
+ message_admins("[key_name(usr)] created an emergency response team.")
+ log_admin("[key_name(usr)] created an emergency response team.")
+ else
+ message_admins("[key_name_admin(usr)] tried to create an emergency response team. Unfortunately, there were not enough candidates available.")
+ log_admin("[key_name(usr)] failed to create an emergency response team.")
+ if("14")
+ message_admins("[key_name(usr)] is creating an abductor team...")
+ if(src.makeAbductorTeam())
+ message_admins("[key_name(usr)] created an abductor team.")
+ log_admin("[key_name(usr)] created an abductor team.")
+ else
+ message_admins("[key_name_admin(usr)] tried to create an abductor team. Unfortunatly there were not enough candidates available.")
+ log_admin("[key_name(usr)] failed to create an abductor team.")
+ if("15")
+ message_admins("[key_name(usr)] is creating a revenant...")
+ if(src.makeRevenant())
+ message_admins("[key_name(usr)] created a revenant.")
+ log_admin("[key_name(usr)] created a revenant.")
+ else
+ message_admins("[key_name_admin(usr)] tried to create a revenant. Unfortunately, there were no candidates available.")
+ log_admin("[key_name(usr)] failed to create a revenant.")
else if(href_list["forceevent"])
+ if(!check_rights(R_FUN)) return
var/datum/round_event_control/E = locate(href_list["forceevent"]) in SSevent.control
if(E)
var/datum/round_event/event = E.runEvent()
@@ -221,6 +262,28 @@
message_admins("[key_name_admin(usr)] edited the Emergency Shuttle's timeleft to [timer] seconds")
href_list["secretsadmin"] = "check_antagonist"
+ else if(href_list["toggle_continuous"])
+ if(!check_rights(R_ADMIN)) return
+
+ if(!config.continuous[ticker.mode.config_tag])
+ config.continuous[ticker.mode.config_tag] = 1
+ else
+ config.continuous[ticker.mode.config_tag] = 0
+
+ message_admins("[key_name_admin(usr)] toggled the round to [config.continuous[ticker.mode.config_tag] ? "continue if all antagonists die" : "end with the antagonists"].")
+ check_antagonists()
+
+ else if(href_list["toggle_midround_antag"])
+ if(!check_rights(R_ADMIN)) return
+
+ if(!config.midround_antag[ticker.mode.config_tag])
+ config.midround_antag[ticker.mode.config_tag] = 1
+ else
+ config.midround_antag[ticker.mode.config_tag] = 0
+
+ message_admins("[key_name_admin(usr)] toggled the round to [config.midround_antag[ticker.mode.config_tag] ? "use" : "skip"] the midround antag system.")
+ check_antagonists()
+
else if(href_list["delay_round_end"])
if(!check_rights(R_SERVER)) return
@@ -644,6 +707,18 @@
else
jobs += "[replacetext("Wizard", " ", " ")] | "
+ //Abductor
+ if(jobban_isbanned(M, "abductor") || isbanned_dept)
+ jobs += "[replacetext("Abductor", " ", " ")] | "
+ else
+ jobs += "[replacetext("Abductor", " ", " ")] | "
+
+ //Deathsquad
+ if(jobban_isbanned(M, "deathsquad") || isbanned_dept)
+ jobs += "[replacetext("Deathsquad", " ", " ")] | "
+ else
+ jobs += "[replacetext("Deathsquad", " ", " ")] | "
+
/* //Malfunctioning AI //Removed Malf-bans because they're a pain to impliment
if(jobban_isbanned(M, "malf AI") || isbanned_dept)
jobs += "[replacetext("Malf AI", " ", " ")] | "
diff --git a/code/modules/admin/verbs/bluespacearty.dm b/code/modules/admin/verbs/bluespacearty.dm
index c3c0c0d90b7..486c0003129 100644
--- a/code/modules/admin/verbs/bluespacearty.dm
+++ b/code/modules/admin/verbs/bluespacearty.dm
@@ -29,6 +29,6 @@
target.Weaken(20)
target.stuttering = 20
- target << "You've been hit by bluespace artillery!"
+ target << "You're hit by bluespace artillery!"
log_admin("[target.name] has been hit by Bluespace Artillery fired by [usr]")
message_admins("[target.name] has been hit by Bluespace Artillery fired by [usr]")
diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm
index 22f84bea4d8..af5e35c3ff7 100644
--- a/code/modules/admin/verbs/debug.dm
+++ b/code/modules/admin/verbs/debug.dm
@@ -856,14 +856,14 @@ var/global/list/g_fancy_list_of_types = null
equip_deathsquad(M)
if("emergency response officer")
- switch(input("Which class?") in list("Commander","Security","Engineer","Medical"))
+ switch(input("Which class?") in list("Commander","Security","Engineer","Medic"))
if("Commander")
equip_emergencyresponsesquad(M, "commander")
if("Security")
equip_emergencyresponsesquad(M, "sec")
if("Engineer")
equip_emergencyresponsesquad(M, "eng")
- if("Medical")
+ if("Medic")
equip_emergencyresponsesquad(M, "med")
if("centcom official")
@@ -919,16 +919,17 @@ var/global/list/g_fancy_list_of_types = null
if("special ops officer")
var/obj/item/device/radio/headset/R = new /obj/item/device/radio/headset/headset_cent/commander(M)
- R.set_frequency(1441)
+ R.set_frequency(CENTCOM_FREQ)
+ R.freqlock = 1
M.equip_to_slot_or_del(R, slot_ears)
M.equip_to_slot_or_del(new /obj/item/clothing/under/syndicate(M), slot_w_uniform)
- M.equip_to_slot_or_del(new /obj/item/clothing/suit/space/deathsquad/officer(M), slot_wear_suit)
+ M.equip_to_slot_or_del(new /obj/item/clothing/suit/space/officer(M), slot_wear_suit)
M.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat/swat(M), slot_shoes)
M.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(M), slot_gloves)
M.equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal/eyepatch(M), slot_glasses)
M.equip_to_slot_or_del(new /obj/item/clothing/mask/cigarette/cigar/havana(M), slot_wear_mask)
- M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/deathsquad/beret(M), slot_head)
+ M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/beret(M), slot_head)
M.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/pulse/pistol/m1911(M), slot_belt)
M.equip_to_slot_or_del(new /obj/item/weapon/lighter/zippo(M), slot_r_store)
M.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(M), slot_back)
@@ -1106,26 +1107,27 @@ var/global/list/g_fancy_list_of_types = null
//Deathsquad
/proc/equip_deathsquad(var/mob/living/carbon/human/M, var/officer)
var/obj/item/device/radio/R = new /obj/item/device/radio/headset/headset_cent/alt(M)
- R.set_frequency(1441)
+ R.set_frequency(CENTCOM_FREQ)
+ R.freqlock = 1
M.equip_to_slot_or_del(R, slot_ears)
if(officer)
- M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/deathsquad/beret(M), slot_head)
- else
- M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/deathsquad(M), slot_head)
+ M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/beret(M), slot_head)
+ //else
+ // M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/deathsquad(M), slot_head)
- M.equip_to_slot_or_del(new /obj/item/clothing/suit/space/deathsquad(M), slot_wear_suit)
+ M.equip_to_slot_or_del(new /obj/item/clothing/suit/space/hardsuit/deathsquad(M), slot_wear_suit)
M.equip_to_slot_or_del(new /obj/item/clothing/under/color/green(M), slot_w_uniform)
M.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat/swat(M), slot_shoes)
M.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(M), slot_gloves)
M.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/sechailer/swat(M), slot_wear_mask)
- M.equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal(M), slot_glasses)
+ M.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/toggle/thermal(M), slot_glasses)
M.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/security(M), slot_back)
M.equip_to_slot_or_del(new /obj/item/weapon/storage/box(M), slot_in_backpack)
M.equip_to_slot_or_del(new /obj/item/ammo_box/a357(M), slot_in_backpack)
- M.equip_to_slot_or_del(new /obj/item/weapon/storage/firstaid/regular(M), slot_in_backpack)
+ M.equip_to_slot_or_del(new /obj/item/weapon/reagent_containers/hypospray/combat/nanites(M), slot_in_backpack)
M.equip_to_slot_or_del(new /obj/item/weapon/storage/box/flashbangs(M), slot_in_backpack)
M.equip_to_slot_or_del(new /obj/item/device/flashlight(M), slot_in_backpack)
@@ -1157,7 +1159,8 @@ var/global/list/g_fancy_list_of_types = null
/proc/equip_emergencyresponsesquad(var/mob/living/carbon/human/M, var/ertrole)
var/obj/item/weapon/card/id/W = null
var/obj/item/device/radio/R = new /obj/item/device/radio/headset/headset_cent/alt(M)
- R.set_frequency(1441)
+ R.set_frequency(CENTCOM_FREQ)
+ R.freqlock = 1
M.equip_to_slot_or_del(R, slot_ears)
switch(ertrole)
diff --git a/code/modules/admin/verbs/one_click_antag.dm b/code/modules/admin/verbs/one_click_antag.dm
index b8041bc269e..d4cd11aad0d 100644
--- a/code/modules/admin/verbs/one_click_antag.dm
+++ b/code/modules/admin/verbs/one_click_antag.dm
@@ -22,6 +22,8 @@ client/proc/one_click_antag()
Make Nuke Team (Requires Ghosts)
Make Deathsquad (Requires Ghosts)
Make Emergency Response Team (Requires Ghosts)
+ Make Abductor Team (Requires Ghosts)
+ Make Revenant (Requires Ghost)
"}
/* These dont work just yet
Ninja, aliens and deathsquad I have not looked into yet
@@ -238,26 +240,9 @@ client/proc/one_click_antag()
/datum/admins/proc/makeNukeTeam()
var/datum/game_mode/nuclear/temp = new
- var/list/mob/dead/observer/candidates = list()
+ var/list/mob/dead/observer/candidates = getCandidates("Do you wish to be considered for a nuke team being sent in?", "operative", temp)
var/list/mob/dead/observer/chosen = list()
var/mob/dead/observer/theghost = null
- var/time_passed = world.time
-
- for(var/mob/dead/observer/G in player_list)
- if(!jobban_isbanned(G, "operative") && !jobban_isbanned(G, "Syndicate"))
- if(temp.age_check(G.client))
- spawn(0)
- switch(alert(G,"Do you wish to be considered for a nuke team being sent in?","Please answer in 30 seconds!","Yes","No"))
- if("Yes")
- if((world.time-time_passed)>300)//If more than 30 game seconds passed.
- return
- candidates += G
- if("No")
- return
- else
- return
-
- sleep(300)
if(candidates.len)
var/numagents = 5
@@ -310,8 +295,9 @@ client/proc/one_click_antag()
else
new_character.mind.make_Nuke(synd_spawn[spawnpos],nuke_code)
spawnpos++
-
- return 1
+ return 1
+ else
+ return 0
@@ -327,34 +313,17 @@ client/proc/one_click_antag()
// DEATH SQUADS
/datum/admins/proc/makeDeathsquad()
- var/list/mob/dead/observer/candidates = list()
- var/time_passed = world.time
var/mission = input("Assign a mission to the deathsquad", "Assign Mission", "Leave no witnesses.")
+ var/list/mob/dead/observer/candidates = getCandidates("Do you wish to be considered for an elite Nanotrasen Strike Team?", "deathsquad", null)
+ var/squadSpawned = 0
- //Generates a list of commandos from active ghosts. Then the user picks which characters to respawn as the commandos.
- for(var/mob/dead/observer/G in player_list)
- spawn(0)
- switch(alert(G,"Do you wish to be considered for an elite Nanotrasen strike team being sent in?","Please answer in 30 seconds!","Yes","No"))
- if("Yes")
- if((world.time-time_passed)>300)//If more than 30 game seconds passed.
- return
- candidates += G
- if("No")
- return
- else
- return
- sleep(300)
-
- for(var/mob/dead/observer/G in candidates)
- if(!G.key)
- candidates.Remove(G)
-
- if(candidates.len >= 3) //Minimum 3 to be considered a squad
+ if(candidates.len >= 2) //Minimum 2 to be considered a squad
//Pick the lucky players
var/numagents = min(5,candidates.len) //How many commandos to spawn
var/list/spawnpoints = deathsquadspawn
while(numagents && candidates.len)
if (numagents > spawnpoints.len)
+ numagents--
continue // This guy's unlucky, not enough spawn points, we skip him.
var/spawnloc = spawnpoints[numagents]
var/mob/dead/observer/chosen_candidate = pick(candidates)
@@ -399,11 +368,12 @@ client/proc/one_click_antag()
message_admins("The deathsquad has spawned with the mission: [mission].")
log_game("[key_name(Commando)] has been selected as a Death Commando")
numagents--
+ squadSpawned++
- if (numagents == candidates.len)
- return 0 // No one got spawned!
- else
+ if (squadSpawned)
return 1
+ else
+ return 0
return
@@ -442,34 +412,17 @@ client/proc/one_click_antag()
// EMERGENCY RESPONSE TEAM
/datum/admins/proc/makeEmergencyresponseteam()
- var/list/mob/dead/observer/candidates = list()
- var/time_passed = world.time
var/mission = input("Assign a mission to the Emergency Response Team", "Assign Mission", "Assist the station.")
-
- //Generates a list of officers from active ghosts. Then the user picks which characters to respawn as the officers.
- for(var/mob/dead/observer/G in player_list)
- spawn(0)
- switch(alert(G,"Do you wish to be considered for an elite Nanotrasen Emergency Response Team being sent in?","Please answer in 30 seconds!","Yes","No"))
- if("Yes")
- if((world.time-time_passed)>300)//If more than 30 game seconds passed.
- return
- candidates += G
- if("No")
- return
- else
- return
- sleep(300)
-
- for(var/mob/dead/observer/G in candidates)
- if(!G.key)
- candidates.Remove(G)
+ var/list/mob/dead/observer/candidates = getCandidates("Do you wish to be considered for an elite Nanotrasen Emergency Response Team?", "deathsquad", null)
+ var/teamSpawned = 0
if(candidates.len >= 4) //Minimum 4 to be considered a squad
//Pick the (un)lucky players
var/numagents = min(7,candidates.len) //How many officers to spawn
var/list/spawnpoints = emergencyresponseteamspawn
while(numagents && candidates.len)
- if (candidates.len > spawnpoints.len)
+ if (numagents > spawnpoints.len)
+ numagents--
continue // This guy's unlucky, not enough spawn points, we skip him.
var/spawnloc = spawnpoints[numagents]
var/mob/dead/observer/chosen_candidate = pick(candidates)
@@ -531,14 +484,120 @@ client/proc/one_click_antag()
message_admins("The emergency response team has spawned with the mission: [mission].")
log_game("[key_name(ERTOperative)] has been selected as an Emergency Response Officer")
numagents--
+ teamSpawned++
- if (numagents == candidates.len)
- return 0 // No one got spawned!
- else
+ if (teamSpawned)
return 1
+ else
+ return 0
return
+//Abductors
+/datum/admins/proc/makeAbductorTeam()
+ var/list/mob/dead/observer/candidates = getCandidates("Do you wish to be considered for an Abductor Team?", "abductor", null)
+
+ if(candidates.len >= 2)
+ //Oh god why we can't have static functions
+ var/teams_finished = 0
+ if(ticker.mode.config_tag == "abductor")
+ var/datum/game_mode/abduction/A = ticker.mode
+ teams_finished = A.teams
+ else
+ teams_finished = round(ticker.mode.abductors.len / 2)
+ var/number = teams_finished + 1
+
+ var/datum/game_mode/abduction/temp
+ if(ticker.mode.config_tag == "abductor")
+ temp = ticker.mode
+ else
+ temp = new
+
+ var/agent_mind = pick(candidates)
+ candidates -= agent_mind
+ var/scientist_mind = pick(candidates)
+
+ var/mob/living/carbon/human/agent=makeBody(agent_mind)
+ var/mob/living/carbon/human/scientist=makeBody(scientist_mind)
+
+ agent_mind = agent.mind
+ scientist_mind = scientist.mind
+
+ temp.scientists.len = number
+ temp.agents.len = number
+ temp.abductors.len = 2*number
+ temp.team_objectives.len = number
+ temp.team_names.len = number
+ temp.scientists[number] = scientist_mind
+ temp.agents[number] = agent_mind
+ temp.abductors |= list(agent_mind,scientist_mind)
+ temp.make_abductor_team(number,preset_scientist=scientist_mind,preset_agent=agent_mind)
+ temp.post_setup_team(number)
+ if(ticker.mode.config_tag == "abductor")
+ var/datum/game_mode/abduction/A = ticker.mode
+ A.teams += 1
+ else
+ ticker.mode.abductors |= temp.abductors
+
+ return 1
+ else
+ return
+
+/datum/admins/proc/makeRevenant()
+ var/list/mob/dead/observer/candidates = getCandidates("Do you wish to be considered for becoming a revenant?", "revenant", null)
+ if(candidates.len >= 1)
+ var/spook_op = pick(candidates)
+ var/mob/dead/observer/O = spook_op
+ candidates -= spook_op
+ var/mob/living/simple_animal/revenant/revvie = new /mob/living/simple_animal/revenant(get_turf(O))
+ revvie.key = O.key
+ revvie.mind.assigned_role = "revenant"
+ revvie.mind.special_role = "Revenant"
+ return 1
+ else
+ return
+
+/datum/admins/proc/getCandidates(var/Question, var/jobbanType, var/datum/game_mode/gametypeCheck)
+ var/list/mob/dead/observer/candidates = list()
+ var/time_passed = world.time
+ if (!Question)
+ Question = "Would you like to be a special role?"
+
+ for(var/mob/dead/observer/G in player_list)
+ if(!G.key || !G.client)
+ continue
+ if (gametypeCheck)
+ if(!gametypeCheck.age_check(G.client))
+ continue
+ if (jobbanType)
+ if(jobban_isbanned(G, jobbanType) || jobban_isbanned(G, "Syndicate"))
+ continue
+ spawn(0)
+ G << 'sound/misc/notice2.ogg' //Alerting them to their consideration
+ switch(alert(G,Question,"Please answer in 30 seconds!","Yes","No"))
+ if("Yes")
+ G << 'sound/machines/ping.ogg'
+ G << "Choice registered: Yes."
+ if((world.time-time_passed)>300)//If more than 30 game seconds passed.
+ G << "Sorry, you were too late for the consideration!"
+ G << 'sound/machines/buzz-sigh.ogg'
+ return
+ candidates += G
+ if("No")
+ G << "Choice registered: No."
+ G << 'sound/machines/buzz-sigh.ogg'
+ return
+ else
+ return
+ sleep(300)
+
+ //Check all our candidates, to make sure they didn't log off during the 30 second wait period.
+ for(var/mob/dead/observer/G in candidates)
+ if(!G.key || !G.client)
+ candidates.Remove(G)
+
+ return candidates
+
/datum/admins/proc/makeBody(var/mob/dead/observer/G_found) // Uses stripped down and bastardized code from respawn character
if(!G_found || !G_found.key) return
diff --git a/code/modules/admin/verbs/playsound.dm b/code/modules/admin/verbs/playsound.dm
index 22f77f0e643..82e183bf91f 100644
--- a/code/modules/admin/verbs/playsound.dm
+++ b/code/modules/admin/verbs/playsound.dm
@@ -36,6 +36,20 @@ var/sound/admin_sound
playsound(get_turf(src.mob), S, 50, 0, 0)
feedback_add_details("admin_verb","PLS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+/client/proc/set_round_end_sound(S as sound)
+ set category = "Fun"
+ set name = "Set Round End Sound"
+ if(!check_rights(R_SOUNDS)) return
+
+ if(ticker)
+ ticker.round_end_sound = S
+ else
+ return
+
+ log_admin("[key_name(src)] set the round end sound to [S]")
+ message_admins("[key_name_admin(src)] set the round end sound to [S]")
+ feedback_add_details("admin_verb","SRES") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+
/client/proc/stop_sounds()
set category = "Debug"
set name = "Stop Sounds"
diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm
index 7755e882965..b738becff50 100644
--- a/code/modules/admin/verbs/randomverbs.dm
+++ b/code/modules/admin/verbs/randomverbs.dm
@@ -33,7 +33,7 @@
if(usr)
if (usr.client)
if(usr.client.holder)
- M << "You hear [ticker.Bible_deity_name ? "the voice of " + ticker.Bible_deity_name : "a voice"] in your head... [msg]"
+ M << "You hear [ticker.Bible_deity_name ? "the voice of " + ticker.Bible_deity_name : "a voice"] in your head... [msg]"
log_admin("SubtlePM: [key_name(usr)] -> [key_name(M)] : [msg]")
message_admins(" SubtleMessage: [key_name_admin(usr)] -> [key_name_admin(M)] : [msg]")
diff --git a/code/modules/assembly/mousetrap.dm b/code/modules/assembly/mousetrap.dm
index 38bdb41d43b..94b5790af58 100644
--- a/code/modules/assembly/mousetrap.dm
+++ b/code/modules/assembly/mousetrap.dm
@@ -19,7 +19,7 @@
if(ishuman(usr))
var/mob/living/carbon/human/user = usr
if((user.getBrainLoss() >= 60) || user.disabilities & CLUMSY && prob(50))
- user << "Your hand slips, setting off the trigger."
+ user << "Your hand slips, setting off the trigger!"
pulse(0)
update_icon()
if(usr)
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index 62aaa5e8b7b..201dde00b62 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -16,7 +16,9 @@ var/global/list/special_roles = list( //keep synced with the defines BE_* in set
"blob" = /datum/game_mode/blob, //9
"ninja", //10
"monkey" = /datum/game_mode/monkey, //11
- "gangster" = /datum/game_mode/gang //12
+ "gangster" = /datum/game_mode/gang, //12
+ "shadowling" = /datum/game_mode/shadowling, //13
+ "abductor" = /datum/game_mode/abduction //14
)
@@ -735,13 +737,10 @@ datum/preferences
if(result)
var/newtype = roundstart_species[result]
pref_species = new newtype()
- if(!config.mutant_colors || mutant_color == "#000")
+ if(mutant_color == "#000")
mutant_color = pref_species.default_color
if("mutant_color")
- if(!config.mutant_colors)
- user << "Alien colors are disabled."
- return
var/new_mutantcolor = input(user, "Choose your character's alien skin color:", "Character Preference") as color|null
if(new_mutantcolor)
var/temp_hsv = RGBtoHSV(new_mutantcolor)
@@ -947,4 +946,4 @@ datum/preferences
character.backbag = backbag
character.update_body()
- character.update_hair()
\ No newline at end of file
+ character.update_hair()
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index 65205405358..c64c25d5302 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -92,7 +92,6 @@ BLIND // can't see anything
icon = 'icons/obj/clothing/masks.dmi'
body_parts_covered = HEAD
slot_flags = SLOT_MASK
- var/alloweat = 0
strip_delay = 40
put_on_delay = 40
var/mask_adjusted = 0
@@ -106,7 +105,7 @@ BLIND // can't see anything
//Proc that moves gas/breath masks out of the way, disabling them and allowing pill/food consumption
/obj/item/clothing/mask/proc/adjustmask(var/mob/user)
if(!ignore_maskadjust)
- if(!user.canmove || user.stat || user.restrained())
+ if(user.incapacitated())
return
if(src.mask_adjusted == 1)
src.icon_state = initial(icon_state)
@@ -114,12 +113,12 @@ BLIND // can't see anything
permeability_coefficient = initial(permeability_coefficient)
flags |= visor_flags
flags_inv |= visor_flags_inv
- user << "You push \the [src] back into place."
+ user << "You push \the [src] back into place."
src.mask_adjusted = 0
slot_flags = initial(slot_flags)
else
src.icon_state += "_up"
- user << "You push \the [src] out of the way."
+ user << "You push \the [src] out of the way."
gas_transfer_coefficient = null
permeability_coefficient = null
flags &= ~visor_flags
@@ -131,6 +130,7 @@ BLIND // can't see anything
+
//Shoes
/obj/item/clothing/shoes
name = "shoes"
@@ -293,20 +293,20 @@ atom/proc/generate_female_clothing(index,t_color,icon,type)
var/list/modes = list("Off", "Binary vitals", "Exact vitals", "Tracking beacon")
var/switchMode = input("Select a sensor mode:", "Suit Sensor Mode", modes[sensor_mode + 1]) in modes
if(get_dist(usr, src) > 1)
- usr << "You have moved too far away."
+ usr << "You have moved too far away!"
return
sensor_mode = modes.Find(switchMode) - 1
if (src.loc == usr)
switch(sensor_mode)
if(0)
- usr << "You disable your suit's remote sensing equipment."
+ usr << "You disable your suit's remote sensing equipment."
if(1)
- usr << "Your suit will now only report whether you are alive or dead."
+ usr << "Your suit will now only report whether you are alive or dead."
if(2)
- usr << "Your suit will now only report your exact vital lifesigns."
+ usr << "Your suit will now only report your exact vital lifesigns."
if(3)
- usr << "Your suit will now report your exact vital lifesigns as well as your coordinate position."
+ usr << "Your suit will now report your exact vital lifesigns as well as your coordinate position."
if(istype(loc,/mob/living/carbon/human))
var/mob/living/carbon/human/H = loc
@@ -329,19 +329,19 @@ atom/proc/generate_female_clothing(index,t_color,icon,type)
if(!can_use(usr))
return
if(!can_adjust)
- usr << "You cannot wear this suit any differently."
+ usr << "You cannot wear this suit any differently!"
return
if(src.adjusted == 1)
src.fitted = initial(fitted)
src.item_color = initial(item_color)
src.item_color = src.suit_color //colored jumpsuits are shit and break without this
- usr << "You adjust the suit back to normal."
+ usr << "You adjust the suit back to normal."
src.adjusted = 0
else
if(src.fitted != FEMALE_UNIFORM_TOP)
src.fitted = NO_FEMALE_UNIFORM
src.item_color += "_d"
- usr << "You adjust the suit to wear it more casually."
+ usr << "You adjust the suit to wear it more casually."
src.adjusted = 1
usr.update_inv_w_uniform()
..()
@@ -388,7 +388,7 @@ atom/proc/generate_female_clothing(index,t_color,icon,type)
flags |= (visor_flags)
flags_inv |= (visor_flags_inv)
icon_state = initial(icon_state)
- usr << "You pull \the [src] down."
+ usr << "You pull \the [src] down."
flash_protect = initial(flash_protect)
tint = initial(tint)
else
@@ -396,7 +396,7 @@ atom/proc/generate_female_clothing(index,t_color,icon,type)
flags &= ~(visor_flags)
flags_inv &= ~(visor_flags_inv)
icon_state = "[initial(icon_state)]up"
- usr << "You push \the [src] up."
+ usr << "You push \the [src] up."
flash_protect = 0
tint = 0
@@ -409,7 +409,7 @@ atom/proc/generate_female_clothing(index,t_color,icon,type)
/obj/item/clothing/proc/can_use(mob/user)
if(user && ismob(user))
- if(!user.stat && user.canmove && !user.restrained())
+ if(!user.incapacitated())
return 1
return 0
diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm
index 3367901fc15..51f560c29f9 100644
--- a/code/modules/clothing/glasses/glasses.dm
+++ b/code/modules/clothing/glasses/glasses.dm
@@ -178,8 +178,8 @@
emp_act(severity)
if(istype(src.loc, /mob/living/carbon/human))
var/mob/living/carbon/human/M = src.loc
- M << "The Optical Thermal Scanner overloads and blinds you!"
if(M.glasses == src)
+ M << "The Optical Thermal Scanner overloads and blinds you!"
M.eye_blind = 3
M.eye_blurry = 5
M.disabilities |= NEARSIGHT
diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm
index 709f923534c..6cbd4620382 100644
--- a/code/modules/clothing/glasses/hud.dm
+++ b/code/modules/clothing/glasses/hud.dm
@@ -6,12 +6,12 @@
var/hud_type = null
/obj/item/clothing/glasses/hud/equipped(mob/living/carbon/human/user, slot)
- if(slot == slot_glasses)
+ if(hud_type && slot == slot_glasses)
var/datum/atom_hud/H = huds[hud_type]
H.add_hud_to(user)
/obj/item/clothing/glasses/hud/dropped(mob/living/carbon/human/user)
- if(istype(user) && user.glasses == src)
+ if(hud_type && istype(user) && user.glasses == src)
var/datum/atom_hud/H = huds[hud_type]
H.remove_hud_from(user)
@@ -82,4 +82,62 @@
icon_state = "supergars"
item_state = "garb"
force = 12
- throwforce = 12
\ No newline at end of file
+ throwforce = 12
+
+/obj/item/clothing/glasses/hud/toggle
+ name = "Toggle Hud"
+ desc = "A hud with multiple functions."
+ action_button_name = "Switch HUD"
+
+/obj/item/clothing/glasses/hud/toggle/attack_self(mob/user)
+ if(!ishuman(user))
+ return
+ var/mob/living/carbon/human/wearer = user
+ if (wearer.glasses != src)
+ return
+
+ if (hud_type)
+ var/datum/atom_hud/H = huds[hud_type]
+ H.remove_hud_from(user)
+
+ if (hud_type == DATA_HUD_MEDICAL_ADVANCED)
+ hud_type = null
+ else if (hud_type == DATA_HUD_SECURITY_ADVANCED)
+ hud_type = DATA_HUD_MEDICAL_ADVANCED
+ else
+ hud_type = DATA_HUD_SECURITY_ADVANCED
+
+ if (hud_type)
+ var/datum/atom_hud/H = huds[hud_type]
+ H.add_hud_to(user)
+
+/obj/item/clothing/glasses/hud/toggle/thermal
+ name = "Thermal HUD Scanner"
+ desc = "Thermal imaging HUD in the shape of glasses."
+ icon_state = "thermal"
+ hud_type = DATA_HUD_SECURITY_ADVANCED
+ vision_flags = SEE_MOBS
+ invis_view = 2
+
+/obj/item/clothing/glasses/hud/toggle/thermal/attack_self(mob/user)
+ ..()
+ switch (hud_type)
+ if (DATA_HUD_MEDICAL_ADVANCED)
+ icon_state = "meson"
+ if (DATA_HUD_SECURITY_ADVANCED)
+ icon_state = "thermal"
+ else
+ icon_state = "purple"
+ user.update_inv_glasses()
+
+/obj/item/clothing/glasses/hud/toggle/thermal/emp_act(severity)
+ if(istype(src.loc, /mob/living/carbon/human))
+ var/mob/living/carbon/human/M = src.loc
+ if(M.glasses == src)
+ M << "The [src] overloads and blinds you!"
+ M.eye_blind = 3
+ M.eye_blurry = 5
+ M.disabilities |= NEARSIGHT
+ spawn(100)
+ M.disabilities &= ~NEARSIGHT
+ ..()
\ No newline at end of file
diff --git a/code/modules/clothing/head/hardhat.dm b/code/modules/clothing/head/hardhat.dm
index e712565dc77..e1d1e53e8b8 100644
--- a/code/modules/clothing/head/hardhat.dm
+++ b/code/modules/clothing/head/hardhat.dm
@@ -12,7 +12,7 @@
attack_self(mob/user)
if(!isturf(user.loc))
- user << "You cannot turn the light on while in this [user.loc]" //To prevent some lighting anomalities.
+ user << "You cannot turn the light on while in this [user.loc]!" //To prevent some lighting anomalities.
return
on = !on
icon_state = "hardhat[on]_[item_color]"
diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm
index 4fbd2b6b832..cc4c13cfa43 100644
--- a/code/modules/clothing/head/helmet.dm
+++ b/code/modules/clothing/head/helmet.dm
@@ -235,14 +235,14 @@ obj/item/clothing/head/helmet/bluetaghelm
helmetCam.c_tag = "Helmet-Mounted Camera (No User)([rand(1,999)])"
helmetCam.network = list("SS13")
update_icon()
- user.visible_message("[user] attaches [A] to [src]","You attach [A] to [src]")
+ user.visible_message("[user] attaches [A] to [src].","You attach [A] to [src].")
return
if(istype(A, /obj/item/weapon/crowbar))
if(!helmetCam)
..()
return
- user.visible_message("[user] removes [helmetCam] from [src]","You remove [helmetCam] from [src]")
+ user.visible_message("[user] removes [helmetCam] from [src].","You remove [helmetCam] from [src].")
helmetCam.assembly.loc = get_turf(src)
helmetCam.assembly = null
qdel(helmetCam)
@@ -263,7 +263,7 @@ obj/item/clothing/head/helmet/bluetaghelm
var/mob/living/carbon/human/user = usr
if(!isturf(user.loc))
- user << "You cannot turn the light on while in this [user.loc]."
+ user << "You cannot turn the light on while in this [user.loc]!"
F.on = !F.on
user << "You toggle the helmetlight [F.on ? "on":"off"]."
diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm
index f5a8ac28885..6eee2eaf8a0 100644
--- a/code/modules/clothing/head/misc_special.dm
+++ b/code/modules/clothing/head/misc_special.dm
@@ -100,12 +100,12 @@
src.icon_state = "ushankaup"
src.item_state = "ushankaup"
earflaps = 0
- user << "You raise the ear flaps on the ushanka."
+ user << "You raise the ear flaps on the ushanka."
else
src.icon_state = "ushankadown"
src.item_state = "ushankadown"
earflaps = 1
- user << "You lower the ear flaps on the ushanka."
+ user << "You lower the ear flaps on the ushanka."
/*
* Pumpkin head
diff --git a/code/modules/clothing/head/soft_caps.dm b/code/modules/clothing/head/soft_caps.dm
index 02fc5c460f7..96c5f55cedd 100644
--- a/code/modules/clothing/head/soft_caps.dm
+++ b/code/modules/clothing/head/soft_caps.dm
@@ -27,10 +27,10 @@
src.flipped = !src.flipped
if(src.flipped)
icon_state = "[item_color]soft_flipped"
- user << "You flip the hat backwards."
+ user << "You flip the hat backwards."
else
icon_state = "[item_color]soft"
- user << "You flip the hat back in normal position."
+ user << "You flip the hat back in normal position."
usr.update_inv_head(0) //so our mob-overlays update
/obj/item/clothing/head/soft/examine(mob/user)
diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm
index 6828d17dad4..f70bffdf3d7 100644
--- a/code/modules/clothing/masks/gasmask.dm
+++ b/code/modules/clothing/masks/gasmask.dm
@@ -222,7 +222,7 @@
/obj/item/clothing/mask/gas/clown_hat
name = "clown wig and mask"
desc = "A true prankster's facial attire. A clown is incomplete without his wig and mask."
- alloweat = 1
+ flags = MASKCOVERSEYES | BLOCK_GAS_SMOKE_EFFECT | MASKINTERNALS
icon_state = "clown"
item_state = "clown_hat"
@@ -245,28 +245,28 @@ obj/item/clothing/mask/gas/clown_hat/attack_self(mob/user)
/obj/item/clothing/mask/gas/sexyclown
name = "sexy-clown wig and mask"
desc = "A feminine clown mask for the dabbling crossdressers or female entertainers."
- alloweat = 1
+ flags = MASKCOVERSEYES | BLOCK_GAS_SMOKE_EFFECT | MASKINTERNALS
icon_state = "sexyclown"
item_state = "sexyclown"
/obj/item/clothing/mask/gas/mime
name = "mime mask"
desc = "The traditional mime's mask. It has an eerie facial posture."
- alloweat = 1
+ flags = MASKCOVERSEYES | BLOCK_GAS_SMOKE_EFFECT | MASKINTERNALS
icon_state = "mime"
item_state = "mime"
/obj/item/clothing/mask/gas/monkeymask
name = "monkey mask"
desc = "A mask used when acting as a monkey."
- alloweat = 1
+ flags = MASKCOVERSEYES | BLOCK_GAS_SMOKE_EFFECT | MASKINTERNALS
icon_state = "monkeymask"
item_state = "monkeymask"
/obj/item/clothing/mask/gas/sexymime
name = "sexy mime mask"
desc = "A traditional female mime's mask."
- alloweat = 1
+ flags = MASKCOVERSEYES | BLOCK_GAS_SMOKE_EFFECT | MASKINTERNALS
icon_state = "sexymime"
item_state = "sexymime"
@@ -283,5 +283,5 @@ obj/item/clothing/mask/gas/clown_hat/attack_self(mob/user)
/obj/item/clothing/mask/gas/owl_mask
name = "owl mask"
desc = "Twoooo!"
- alloweat = 1
+ flags = MASKCOVERSEYES | BLOCK_GAS_SMOKE_EFFECT | MASKINTERNALS
icon_state = "owl"
\ No newline at end of file
diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm
index 4ce903e2bf8..dc9c31861c7 100644
--- a/code/modules/clothing/masks/miscellaneous.dm
+++ b/code/modules/clothing/masks/miscellaneous.dm
@@ -12,7 +12,7 @@
if(iscarbon(user))
var/mob/living/carbon/C = user
if(src == C.wear_mask)
- user << "You need help taking this off!"
+ user << "You need help taking this off!"
return
..()
diff --git a/code/modules/clothing/shoes/bananashoes.dm b/code/modules/clothing/shoes/bananashoes.dm
index ee256e42595..f1da928afff 100644
--- a/code/modules/clothing/shoes/bananashoes.dm
+++ b/code/modules/clothing/shoes/bananashoes.dm
@@ -21,7 +21,7 @@
if(bananium < 100)
on = !on
update_icon()
- usr << "You ran out of bananium!"
+ usr << "You ran out of bananium!"
else
..()
@@ -49,9 +49,9 @@
if(bananium > 0)
on = !on
update_icon()
- usr << "You [on ? "activate" : "deactivate"] the prototype shoes."
+ usr << "You [on ? "activate" : "deactivate"] the prototype shoes."
else
- usr << "You need bananium to turn the prototype shoes on."
+ usr << "You need bananium to turn the prototype shoes on!"
/obj/item/clothing/shoes/clown_shoes/banana_shoes/update_icon()
if(on)
diff --git a/code/modules/clothing/shoes/colour.dm b/code/modules/clothing/shoes/colour.dm
index e463f77fb68..1074159da7f 100644
--- a/code/modules/clothing/shoes/colour.dm
+++ b/code/modules/clothing/shoes/colour.dm
@@ -106,6 +106,6 @@
if(ishuman(user))
var/mob/living/carbon/human/C = user
if(C.shoes == src && src.chained == 1)
- user << "You need help taking these off!"
+ user << "You need help taking these off!"
return
..()
diff --git a/code/modules/clothing/shoes/magboots.dm b/code/modules/clothing/shoes/magboots.dm
index d7d2414ff68..8d742f983db 100644
--- a/code/modules/clothing/shoes/magboots.dm
+++ b/code/modules/clothing/shoes/magboots.dm
@@ -28,7 +28,7 @@
src.slowdown = slowdown_active
magpulse = !magpulse
icon_state = "[magboot_state][magpulse]"
- user << "You [magpulse ? "enable" : "disable"] the mag-pulse traction system."
+ user << "You [magpulse ? "enable" : "disable"] the mag-pulse traction system."
user.update_inv_shoes(0) //so our mob-overlays update
user.update_gravity(user.mob_has_gravity())
diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm
index 5e019d89409..f178515a89b 100644
--- a/code/modules/clothing/spacesuits/hardsuit.dm
+++ b/code/modules/clothing/spacesuits/hardsuit.dm
@@ -14,7 +14,7 @@
/obj/item/clothing/head/helmet/space/hardsuit/attack_self(mob/user)
if(!isturf(user.loc))
- user << "You cannot turn the light on while in this [user.loc]" //To prevent some lighting anomalities.
+ user << "You cannot turn the light on while in this [user.loc]!" //To prevent some lighting anomalities.
return
on = !on
icon_state = "hardsuit[on]-[item_color]"
@@ -171,7 +171,7 @@
/obj/item/clothing/head/helmet/space/hardsuit/syndi/attack_self(mob/user) //Toggle Helmet
if(!isturf(user.loc))
- user << "You cannot toggle your helmet while in this [user.loc]" //To prevent some lighting anomalities.
+ user << "You cannot toggle your helmet while in this [user.loc]!" //To prevent some lighting anomalities.
return
on = !on
if(on || force)
diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm
index 09f52337f14..cf8a9d9e5a6 100644
--- a/code/modules/clothing/spacesuits/miscellaneous.dm
+++ b/code/modules/clothing/spacesuits/miscellaneous.dm
@@ -20,7 +20,7 @@
//Death squad armored space suits, not hardsuits!
-/obj/item/clothing/head/helmet/space/deathsquad
+/obj/item/clothing/head/helmet/space/hardsuit/deathsquad
name = "deathsquad helmet"
desc = "That's not red paint. That's real blood."
icon_state = "deathsquad"
@@ -29,8 +29,12 @@
strip_delay = 130
max_heat_protection_temperature = FIRE_IMMUNITY_HELM_MAX_TEMP_PROTECT
unacidable = 1
+ action_button_name = null
-/obj/item/clothing/suit/space/deathsquad
+/obj/item/clothing/head/helmet/space/hardsuit/deathsquad/attack_self(mob/user)
+ return
+
+/obj/item/clothing/suit/space/hardsuit/deathsquad
name = "deathsquad suit"
desc = "A heavily armored, advanced space suit that protects against most forms of damage."
icon_state = "deathsquad"
@@ -41,15 +45,20 @@
strip_delay = 130
max_heat_protection_temperature = FIRE_IMMUNITY_HELM_MAX_TEMP_PROTECT
unacidable = 1
+ helmettype = /obj/item/clothing/head/helmet/space/hardsuit/deathsquad
-/obj/item/clothing/head/helmet/space/deathsquad/beret
+/obj/item/clothing/head/helmet/space/beret
name = "officer's beret"
desc = "An armored beret commonly used by special operations officers. Uses advanced force field technology to protect the head from space."
icon_state = "beret_badge"
flags = STOPSPRESSUREDMAGE
flags_inv = 0
+ armor = list(melee = 80, bullet = 80, laser = 50, energy = 50, bomb = 100, bio = 100, rad = 100)
+ strip_delay = 130
+ max_heat_protection_temperature = FIRE_IMMUNITY_HELM_MAX_TEMP_PROTECT
+ unacidable = 1
-/obj/item/clothing/suit/space/deathsquad/officer
+/obj/item/clothing/suit/space/officer
name = "officer's jacket"
desc = "An armored, space-proof jacket used in special operations."
icon_state = "detective"
@@ -58,6 +67,12 @@
slowdown = 0
flags_inv = 0
w_class = 3
+ allowed = list(/obj/item/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/tank/internals)
+ armor = list(melee = 80, bullet = 80, laser = 50,energy = 50, bomb = 100, bio = 100, rad = 100)
+ slowdown = 1
+ strip_delay = 130
+ max_heat_protection_temperature = FIRE_IMMUNITY_HELM_MAX_TEMP_PROTECT
+ unacidable = 1
//NASA Voidsuit
@@ -110,6 +125,7 @@
icon_state = "pirate"
item_state = "pirate"
w_class = 3
+ flags_inv = 0
allowed = list(/obj/item/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/tank/internals)
slowdown = 0
armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30)
diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm
index b8683c10cc7..b9ecf892582 100644
--- a/code/modules/clothing/suits/jobs.dm
+++ b/code/modules/clothing/suits/jobs.dm
@@ -61,7 +61,6 @@
permeability_coefficient = 0.50
body_parts_covered = CHEST|GROIN|ARMS
allowed = list(/obj/item/weapon/kitchenknife)
- action_button_name = "Toggle Jacket Sleeves"
togglename = "sleeves"
//Cook
diff --git a/code/modules/clothing/suits/toggles.dm b/code/modules/clothing/suits/toggles.dm
index 380e0262597..470b6f6ebd4 100644
--- a/code/modules/clothing/suits/toggles.dm
+++ b/code/modules/clothing/suits/toggles.dm
@@ -38,10 +38,10 @@
if(ishuman(src.loc))
var/mob/living/carbon/human/H = src.loc
if(H.wear_suit != src)
- H << "You must be wearing [src] to put up the hood."
+ H << "You must be wearing [src] to put up the hood!"
return
if(H.head)
- H << "You're already wearing something on your head."
+ H << "You're already wearing something on your head!"
return
else
H.equip_to_slot_if_possible(hood,slot_head,0,0,1)
@@ -57,13 +57,16 @@
..()
suit_toggle()
+/obj/item/clothing/suit/toggle/ui_action_click()
+ suit_toggle()
+
/obj/item/clothing/suit/toggle/proc/suit_toggle()
set src in usr
if(!can_use(usr))
return 0
- usr << "You toggle [src]'s [togglename]."
+ usr << "You toggle [src]'s [togglename]."
if(src.suittoggled)
src.icon_state = "[initial(icon_state)]"
src.suittoggled = 0
@@ -125,18 +128,18 @@
if(!suittoggled)
if(ishuman(src.loc))
if(H.wear_suit != src)
- H << "You must be wearing [src] to engage the helmet."
+ H << "You must be wearing [src] to engage the helmet!"
return
if(H.head)
- H << "You're already wearing something on your head."
+ H << "You're already wearing something on your head!"
return
else
- H << "You engage the helmet on the hardsuit."
+ H << "You engage the helmet on the hardsuit."
H.equip_to_slot_if_possible(helmet,slot_head,0,0,1)
suittoggled = 1
H.update_inv_wear_suit()
playsound(src.loc, 'sound/mecha/mechmove03.ogg', 50, 1)
else
- H << "You disengage the helmet on the hardsuit."
+ H << "You disengage the helmet on the hardsuit."
playsound(src.loc, 'sound/mecha/mechmove03.ogg', 50, 1)
RemoveHelmet()
diff --git a/code/modules/clothing/under/chameleon.dm b/code/modules/clothing/under/chameleon.dm
index a92c45a0ab6..20acefb09d6 100644
--- a/code/modules/clothing/under/chameleon.dm
+++ b/code/modules/clothing/under/chameleon.dm
@@ -80,6 +80,7 @@
icon_state = A.icon_state
item_state = A.item_state
item_color = A.item_color
+ suit_color = A.suit_color
usr.update_inv_w_uniform() //so our overlays update.
diff --git a/code/modules/clothing/under/ties.dm b/code/modules/clothing/under/ties.dm
index 92fe8b9272c..1dda5f2ebd2 100644
--- a/code/modules/clothing/under/ties.dm
+++ b/code/modules/clothing/under/ties.dm
@@ -100,10 +100,10 @@
if(user == M)
user << "You attach [src] to [U]."
else
- user.visible_message("[user] pins \the [src] on [M]'s chest.", \
+ user.visible_message("[user] pins \the [src] on [M]'s chest.", \
"You pin \the [src] on [M]'s chest.")
- else user << "Medals can only be pinned on jumpsuits."
+ else user << "Medals can only be pinned on jumpsuits!"
else ..()
/obj/item/clothing/tie/medal/conduct
@@ -280,6 +280,7 @@
/obj/item/clothing/tie/petcollar //don't really wear this though please c'mon seriously guys
name = "pet collar"
+ desc = "It's for pets. Though you probably could wear it yourself, you'd doubtless be the subject of ridicule."
icon_state = "petcollar"
item_color = "petcollar"
var/tagname = null
diff --git a/code/modules/crafting/guncrafting.dm b/code/modules/crafting/guncrafting.dm
index 45d4d340ecd..ae95ef86a03 100644
--- a/code/modules/crafting/guncrafting.dm
+++ b/code/modules/crafting/guncrafting.dm
@@ -20,7 +20,7 @@
/obj/item/weaponcrafting/reciever/attackby(obj/item/W as obj, mob/user as mob, params)
if(istype(W,/obj/item/pipe))
- user << "You attach the shotgun barrel to the receiver. The pins seem loose."
+ user << "You attach the shotgun barrel to the receiver. The pins seem loose."
var/obj/item/weaponcrafting/ishotgunconstruction/I = new /obj/item/weaponcrafting/ishotgunconstruction
user.unEquip(src)
user.put_in_hands(I)
@@ -53,7 +53,7 @@
/obj/item/weaponcrafting/ishotgunconstruction2/attackby(obj/item/W as obj, mob/user as mob, params)
if(istype(W,/obj/item/weaponcrafting/stock))
- user << "You attach the stock to the receiver-barrel assembly."
+ user << "You attach the stock to the receiver-barrel assembly."
var/obj/item/weaponcrafting/ishotgunconstruction3/I = new /obj/item/weaponcrafting/ishotgunconstruction3
user.unEquip(src)
user.put_in_hands(I)
@@ -78,6 +78,6 @@
user << "You tie the wrapping paper around the stock and the barrel to secure it."
qdel(src)
else
- user << "You need at least five feet of wrapping paper to secure the stock."
+ user << "You need at least five feet of wrapping paper to secure the stock!"
return
diff --git a/code/modules/crafting/table.dm b/code/modules/crafting/table.dm
index 684f3ec5eb2..75847c323f4 100644
--- a/code/modules/crafting/table.dm
+++ b/code/modules/crafting/table.dm
@@ -91,6 +91,8 @@
if(istype(A, /obj/item))
var/atom/movable/B = A
B.loc = I
+ B.pixel_x = initial(B.pixel_x)
+ B.pixel_y = initial(B.pixel_y)
else
if(!I.reagents)
I.reagents = new /datum/reagents()
@@ -176,7 +178,7 @@
return Deletion
/obj/structure/table/interact(mob/user)
- if(user.stat || user.lying || !Adjacent(user))
+ if(user.incapacitated() || user.lying || !Adjacent(user))
return
check_table()
if(!table_contents.len)
diff --git a/code/modules/detectivework/evidence.dm b/code/modules/detectivework/evidence.dm
index d8f8b6aad65..b43f7077d9f 100644
--- a/code/modules/detectivework/evidence.dm
+++ b/code/modules/detectivework/evidence.dm
@@ -45,8 +45,8 @@
else
return
- user.visible_message("[user] puts [I] into [src].", "You put [I] inside [src].",\
- "You hear a rustle as someone puts something into a plastic bag.")
+ user.visible_message("[user] puts [I] into [src].", "You put [I] inside [src].",\
+ "You hear a rustle as someone puts something into a plastic bag.")
icon_state = "evidence"
@@ -68,8 +68,8 @@
/obj/item/weapon/evidencebag/attack_self(mob/user as mob)
if(contents.len)
var/obj/item/I = contents[1]
- user.visible_message("[user] takes [I] out of [src].", "You take [I] out of [src].",\
- "You hear someone rustle around in a plastic bag, and remove something.")
+ user.visible_message("[user] takes [I] out of [src].", "You take [I] out of [src].",\
+ "You hear someone rustle around in a plastic bag, and remove something.")
overlays.Cut() //remove the overlays
user.put_in_hands(I)
w_class = 1
diff --git a/code/modules/detectivework/footprints_and_rag.dm b/code/modules/detectivework/footprints_and_rag.dm
index a2d323e81d8..2e09166ae6e 100644
--- a/code/modules/detectivework/footprints_and_rag.dm
+++ b/code/modules/detectivework/footprints_and_rag.dm
@@ -21,7 +21,7 @@
/obj/item/weapon/reagent_containers/glass/rag/attack(atom/target as obj|turf|area, mob/user as mob , flag)
if(ismob(target) && target.reagents && reagents.total_volume)
- user.visible_message("[user] has smothered \the [target] with \the [src]!", "You smother \the [target] with \the [src]!", "You hear some struggling and muffled cries of surprise")
+ user.visible_message("[user] has smothered \the [target] with \the [src]!", "You smother \the [target] with \the [src]!", "You hear some struggling and muffled cries of surprise.")
src.reagents.reaction(target, TOUCH)
src.reagents.clear_reagents()
return
@@ -31,8 +31,8 @@
/obj/item/weapon/reagent_containers/glass/rag/afterattack(atom/A as obj|turf|area, mob/user as mob,proximity)
if(!proximity) return
if(istype(A) && src in user)
- user.visible_message("[user] starts to wipe down [A] with [src]!")
+ user.visible_message("[user] starts to wipe down [A] with [src]!", "You start to wipe down [A] with [src]...You finish wiping off the [A].")
A.clean_blood()
return
diff --git a/code/modules/detectivework/scanner.dm b/code/modules/detectivework/scanner.dm
index affb72d1381..5fbe0263949 100644
--- a/code/modules/detectivework/scanner.dm
+++ b/code/modules/detectivework/scanner.dm
@@ -151,7 +151,7 @@
if(!found_something)
add_log("# No forensic traces found #", 0) // Don't display this to the holder user
if(holder)
- holder << "Unable to locate any fingerprints, materials, fibers, or blood on \the [target_name]!"
+ holder << "Unable to locate any fingerprints, materials, fibers, or blood on \the [target_name]!"
else
if(holder)
holder << "You finish scanning \the [target_name]."
diff --git a/code/modules/events/holiday/xmas.dm b/code/modules/events/holiday/xmas.dm
index eacc8eacaba..03f8ea5051a 100644
--- a/code/modules/events/holiday/xmas.dm
+++ b/code/modules/events/holiday/xmas.dm
@@ -47,7 +47,7 @@
/obj/item/weapon/toy/xmas_cracker/attack(mob/target, mob/user)
if( !cracked && istype(target,/mob/living/carbon/human) && (target.stat == CONSCIOUS) && !target.get_active_hand() )
- target.visible_message("[user] and [target] pop \an [src]! *pop*", "You pull \an [src] with [target]! *pop*", "You hear a *pop*.")
+ target.visible_message("[user] and [target] pop \an [src]! *pop*", "You pull \an [src] with [target]! *pop*", "You hear a pop.")
var/obj/item/weapon/paper/Joke = new /obj/item/weapon/paper(user.loc)
Joke.name = "[pick("awful","terrible","unfunny")] joke"
Joke.info = pick("What did one snowman say to the other?\n\n'Is it me or can you smell carrots?'",
@@ -143,9 +143,9 @@
santa_objective.completed = 1 //lets cut our santas some slack.
santa_objective.owner = santa.mind
santa.mind.objectives += santa_objective
- santa.mind.spell_list += new /obj/effect/proc_holder/spell/aoe_turf/conjure/presents
+ santa.mind.AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/conjure/presents)
var/obj/effect/proc_holder/spell/targeted/area_teleport/teleport/telespell = new(santa)
telespell.clothes_req = 0 //santa robes aren't actually magical.
- santa.mind.spell_list += telespell //does the station have chimneys? WHO KNOWS!
+ santa.mind.AddSpell(telespell) //does the station have chimneys? WHO KNOWS!
santa << "You are Santa! Your objective is to bring joy to the people on this station. You can conjure more presents using a spell, and there are several presents in your bag."
diff --git a/code/modules/events/radiation_storm.dm b/code/modules/events/radiation_storm.dm
index 55b30f45011..f86ecdb5c42 100644
--- a/code/modules/events/radiation_storm.dm
+++ b/code/modules/events/radiation_storm.dm
@@ -36,9 +36,10 @@
if(istype(C, /mob/living/carbon/human))
var/mob/living/carbon/human/H = C
- H.apply_effect((rand(15, 75)), IRRADIATE, 0)
if(prob(5))
- H.apply_effect((rand(90, 150)), IRRADIATE, 0)
+ H.irradiate(rand(100, 160))
+ else
+ H.irradiate(rand(15, 75))
if(prob(25))
if(prob(75))
randmutb(H)
@@ -49,7 +50,7 @@
else if(istype(C, /mob/living/carbon/monkey))
var/mob/living/carbon/monkey/M = C
- M.apply_effect((rand(15, 75)), IRRADIATE, 0)
+ M.irradiate(rand(15, 75))
/datum/round_event/radiation_storm/end()
diff --git a/code/modules/events/spacevine.dm b/code/modules/events/spacevine.dm
index 75f860eb5f0..e4ec5e8fd5a 100644
--- a/code/modules/events/spacevine.dm
+++ b/code/modules/events/spacevine.dm
@@ -137,7 +137,7 @@
/datum/spacevine_mutation/light/on_grow(obj/effect/spacevine/holder)
if(prob(10*severity))
- holder.luminosity = 4
+ holder.SetLuminosity(4)
/datum/spacevine_mutation/toxicity
name = "toxic"
diff --git a/code/modules/events/wizard/imposter.dm b/code/modules/events/wizard/imposter.dm
index e3b4c5d1fb6..5d3567a9d47 100644
--- a/code/modules/events/wizard/imposter.dm
+++ b/code/modules/events/wizard/imposter.dm
@@ -33,9 +33,9 @@
I.key = C.key
//Operation: Fuck off and scare people
- I.mind.spell_list += new /obj/effect/proc_holder/spell/targeted/area_teleport/teleport(null)
- I.mind.spell_list += new /obj/effect/proc_holder/spell/targeted/turf_teleport/blink(null)
- I.mind.spell_list += new /obj/effect/proc_holder/spell/targeted/ethereal_jaunt(null)
+ I.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/area_teleport/teleport(null))
+ I.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/turf_teleport/blink(null))
+ I.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/ethereal_jaunt(null))
ticker.mode.traitors += I.mind
I.mind.special_role = "imposter"
diff --git a/code/modules/food&drinks/drinks/drinks.dm b/code/modules/food&drinks/drinks/drinks.dm
index 6888a4a9a04..6986e52d26a 100644
--- a/code/modules/food&drinks/drinks/drinks.dm
+++ b/code/modules/food&drinks/drinks/drinks.dm
@@ -224,7 +224,7 @@
/obj/item/weapon/reagent_containers/food/drinks/soda_cans/attack(mob/M, mob/user)
if(M == user && !src.reagents.total_volume && user.a_intent == "harm" && user.zone_sel.selecting == "head")
- user.visible_message("[user] crushes the can of [src] on \his forehead!", "You crush the can of [src] on your forehead!")
+ user.visible_message("[user] crushes the can of [src] on \his forehead!", "You crush the can of [src] on your forehead.")
playsound(user.loc,'sound/weapons/pierce.ogg', rand(10,50), 1)
var/obj/item/trash/can/crushed_can = new /obj/item/trash/can(user.loc)
crushed_can.icon_state = icon_state
diff --git a/code/modules/food&drinks/drinks/drinks/drinkingglass.dm b/code/modules/food&drinks/drinks/drinks/drinkingglass.dm
index 816c4d7f651..116f3b42480 100644
--- a/code/modules/food&drinks/drinks/drinks/drinkingglass.dm
+++ b/code/modules/food&drinks/drinks/drinks/drinkingglass.dm
@@ -8,6 +8,7 @@
volume = 50
/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/on_reagent_change()
+ overlays.Cut()
if (reagents.reagent_list.len > 0)
switch(reagents.get_master_reagent_id())
if("beer")
@@ -442,8 +443,39 @@
icon_state = "toxinsspecialglass"
name = "Toxins Special"
desc = "Whoah, this thing is on FIRE"
+ if("chocolatepudding")
+ icon_state = "chocolatepudding"
+ name = "Chocolate Pudding"
+ desc = ""
+ if("vanillapudding")
+ icon_state = "vanillapudding"
+ name = "Vanilla Pudding"
+ desc = "Whoah, this thing is on FIRE"
+ if("cherryshake")
+ icon_state = "cherryshake"
+ name = "Cherry Shake"
+ desc = "A cherry flavored milkshake."
+ if("bluecherryshake")
+ icon_state = "bluecherryshake"
+ name = "Blue Cherry Shake"
+ desc = "An exotic blue milkshake."
+ if("drunkenblumpkin")
+ icon_state = "drunkenblumpkin"
+ name = "Drunken Blumpkin"
+ desc = "A drink for the drunks."
+ if("pumpkin_latte")
+ icon_state = "pumpkin_latte"
+ name = "Pumpkin Latte"
+ desc = "A mix of coffee and pumpkin juice."
+ if("gibbfloats")
+ icon_state = "gibbfloats"
+ name = "Gibbfloat"
+ desc = "Dr. Gibb with ice cream on top."
else
icon_state ="glass_brown"
+ var/image/I = image(icon, "glassoverlay")
+ I.color = mix_color_from_reagents(reagents.reagent_list)
+ overlays += I
name = "Glass of ..what?"
desc = "You can't really tell what this is."
else
@@ -546,3 +578,16 @@
/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/filled/cola
list_reagents = list("cola" = 50)
+/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/attackby(var/obj/item/I, mob/user as mob, params)
+ if(istype(I,/obj/item/weapon/reagent_containers/food/snacks/egg)) //breaking eggs
+ var/obj/item/weapon/reagent_containers/food/snacks/egg/E = I
+ if(reagents)
+ if(reagents.total_volume >= reagents.maximum_volume)
+ user << "[src] is full."
+ else
+ user << "You break [E] in [src]."
+ reagents.add_reagent("eggyolk", 5)
+ qdel(E)
+ return
+ else
+ ..()
diff --git a/code/modules/food&drinks/food/condiment.dm b/code/modules/food&drinks/food/condiment.dm
index 02419159876..bff39b0e262 100644
--- a/code/modules/food&drinks/food/condiment.dm
+++ b/code/modules/food&drinks/food/condiment.dm
@@ -8,7 +8,7 @@
/obj/item/weapon/reagent_containers/food/condiment
name = "condiment container"
desc = "Just your average condiment container."
- icon = 'icons/obj/food.dmi'
+ icon = 'icons/obj/food/containers.dmi'
icon_state = "emptycondiment"
flags = OPENCONTAINER
possible_transfer_amounts = list(1,5,10)
@@ -69,11 +69,11 @@
if(istype(target, /obj/structure/reagent_dispensers)) //A dispenser. Transfer FROM it TO us.
if(!target.reagents.total_volume)
- user << "[target] is empty."
+ user << "[target] is empty!"
return
if(reagents.total_volume >= reagents.maximum_volume)
- user << "[src] is full."
+ user << "[src] is full!"
return
var/trans = target.reagents.trans_to(src, target:amount_per_transfer_from_this)
@@ -82,10 +82,10 @@
//Something like a glass or a food item. Player probably wants to transfer TO it.
else if(target.is_open_container() || istype(target, /obj/item/weapon/reagent_containers/food/snacks))
if(!reagents.total_volume)
- user << "[src] is empty."
+ user << "[src] is empty!"
return
if(target.reagents.total_volume >= target.reagents.maximum_volume)
- user << "you can't add anymore to [target]."
+ user << "you can't add anymore to [target]!"
return
var/trans = src.reagents.trans_to(target, amount_per_transfer_from_this)
user << "You transfer [trans] units of the condiment to [target]."
@@ -157,7 +157,6 @@
/obj/item/weapon/reagent_containers/food/condiment/flour
name = "flour sack"
desc = "A big bag of flour. Good for baking!"
- icon = 'icons/obj/food.dmi'
icon_state = "flour"
item_state = "flour"
list_reagents = list("flour" = 30)
@@ -171,6 +170,13 @@
list_reagents = list("soymilk" = 50)
possible_states = list()
+/obj/item/weapon/reagent_containers/food/condiment/rice
+ name = "rice sack"
+ desc = "A big bag of rice. Good for cooking!"
+ icon_state = "rice"
+ item_state = "flour"
+ list_reagents = list("rice" = 30)
+ possible_states = list()
diff --git a/code/modules/food&drinks/food/customizables.dm b/code/modules/food&drinks/food/customizables.dm
index 627a3b58b80..3f6b7aba90f 100644
--- a/code/modules/food&drinks/food/customizables.dm
+++ b/code/modules/food&drinks/food/customizables.dm
@@ -15,7 +15,7 @@
/obj/item/weapon/reagent_containers/food/snacks/customizable
bitesize = 4
w_class = 3
- volume = 60
+ volume = 80
var/ingMax = 12
var/list/ingredients = list()
@@ -40,9 +40,9 @@
if(istype(I,/obj/item/weapon/reagent_containers/food/snacks))
var/obj/item/weapon/reagent_containers/food/snacks/S = I
if(I.w_class > 2)
- user << "The ingredient is too big for [src]."
+ user << "The ingredient is too big for [src]!"
else if((ingredients.len >= ingMax) || (reagents.total_volume >= volume))
- user << "You can't add more ingredients to [src]."
+ user << "You can't add more ingredients to [src]!"
else
user.drop_item()
if(S.trash)
@@ -50,7 +50,7 @@
S.trash = null //we remove the plate before adding the ingredient
ingredients += S
S.loc = src
- filling_color = S.filling_color
+ mix_filling_color(S)
S.reagents.trans_to(src,min(S.reagents.total_volume, 15)) //limit of 15, we don't want our custom food to be completely filled by just one ingredient with large reagent volume.
update_overlays(S)
user << "You add the [I.name] to the [name]."
@@ -77,24 +77,43 @@
customname = "custom"
break
if(ingredients.len == 1) //first ingredient
- if(istype(S, /obj/item/weapon/reagent_containers/food/snacks/meat/human))
- var/obj/item/weapon/reagent_containers/food/snacks/meat/human/H = S
- if(H.subjectname)
- customname = "[H.subjectname]"
- else if(H.subjectjob)
- customname = "[H.subjectjob]"
+ if(istype(S, /obj/item/weapon/reagent_containers/food/snacks/meat))
+ var/obj/item/weapon/reagent_containers/food/snacks/meat/M = S
+ if(M.subjectname)
+ customname = "[M.subjectname]"
+ else if(M.subjectjob)
+ customname = "[M.subjectjob]"
+ else
+ customname = S.name
else
- customname = "[initial(S.name)]"
+ customname = S.name
name = "[customname] [initial(name)]"
/obj/item/weapon/reagent_containers/food/snacks/customizable/proc/initialize_custom_food(obj/item/BASE, obj/item/I, mob/user)
if(istype(BASE,/obj/item/weapon/reagent_containers))
var/obj/item/weapon/reagent_containers/RC = BASE
RC.reagents.trans_to(src,RC.reagents.total_volume)
+ for(var/obj/O in BASE.contents)
+ contents += O
if(I && user)
attackby(I, user)
+ user.unEquip(BASE)
qdel(BASE)
+/obj/item/weapon/reagent_containers/food/snacks/customizable/proc/mix_filling_color(obj/item/weapon/reagent_containers/food/snacks/S)
+
+ if(ingredients.len == 1)
+ filling_color = S.filling_color
+ else
+ var/list/rgbcolor = list(0,0,0,0)
+ var/customcolor = GetColors(filling_color)
+ var/ingcolor = GetColors(S.filling_color)
+ rgbcolor[1] = (customcolor[1]+ingcolor[1])/2
+ rgbcolor[2] = (customcolor[2]+ingcolor[2])/2
+ rgbcolor[3] = (customcolor[3]+ingcolor[3])/2
+ rgbcolor[4] = (customcolor[4]+ingcolor[4])/2
+ filling_color = rgb(rgbcolor[1], rgbcolor[2], rgbcolor[3], rgbcolor[4])
+
/obj/item/weapon/reagent_containers/food/snacks/customizable/update_overlays(obj/item/weapon/reagent_containers/food/snacks/S)
var/image/I = new(icon, "[initial(icon_state)]_filling")
@@ -122,6 +141,7 @@
return
if(INGREDIENTS_FILL)
overlays.Cut()
+ I.color = filling_color
if(INGREDIENTS_LINE)
I.pixel_y = rand(-8,3)
I.pixel_x = I.pixel_y
@@ -153,6 +173,7 @@
name = "burger"
desc = "A timeless classic."
Ingredientsplacement = INGREDIENTS_STACKPLUSTOP
+ icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "bun"
@@ -161,6 +182,7 @@
ingMax = 6
slice_path = /obj/item/weapon/reagent_containers/food/snacks/breadslice/custom
slices_num = 5
+ icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "tofubread"
@@ -169,6 +191,7 @@
ingMax = 6
slice_path = /obj/item/weapon/reagent_containers/food/snacks/cakeslice/custom
slices_num = 5
+ icon = 'icons/obj/food/piecake.dmi'
icon_state = "plaincake"
@@ -187,12 +210,14 @@
desc = "Noodles. With stuff. Delicious."
Ingredientsplacement = INGREDIENTS_SCATTER
ingMax = 6
+ icon = 'icons/obj/food/pizzaspaghetti.dmi'
icon_state = "spaghettiboiled"
/obj/item/weapon/reagent_containers/food/snacks/customizable/pie
name = "pie"
ingMax = 6
+ icon = 'icons/obj/food/piecake.dmi'
icon_state = "pie"
@@ -203,6 +228,7 @@
ingMax = 8
slice_path = /obj/item/weapon/reagent_containers/food/snacks/pizzaslice/custom
slices_num = 6
+ icon = 'icons/obj/food/pizzaspaghetti.dmi'
icon_state = "pizzamargherita"
@@ -211,6 +237,7 @@
desc = "Very tasty."
trash = /obj/item/weapon/reagent_containers/glass/bowl
ingMax = 6
+ icon = 'icons/obj/food/soupsalad.dmi'
icon_state = "bowl"
@@ -218,6 +245,7 @@
name = "toast"
desc = "A timeless classic."
Ingredientsplacement = INGREDIENTS_STACK
+ icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "breadslice"
var/finished = 0
@@ -254,9 +282,12 @@
desc = "A bowl with liquid and... stuff in it."
trash = /obj/item/weapon/reagent_containers/glass/bowl
ingMax = 8
+ icon = 'icons/obj/food/soupsalad.dmi'
icon_state = "wishsoup"
-
+/obj/item/weapon/reagent_containers/food/snacks/customizable/soup/New()
+ ..()
+ eatverb = pick("slurp","sip","suck","inhale","drink")
@@ -269,7 +300,7 @@
icon_state = "snack_bowl"
name = "bowl"
desc = "A simple bowl, used for soups and salads."
- icon = 'icons/obj/food.dmi'
+ icon = 'icons/obj/food/soupsalad.dmi'
icon_state = "bowl"
flags = OPENCONTAINER
w_class = 3
@@ -278,9 +309,9 @@
if(istype(I,/obj/item/weapon/reagent_containers/food/snacks))
var/obj/item/weapon/reagent_containers/food/snacks/S = I
if(I.w_class > 2)
- user << "The ingredient is too big for [src]."
+ user << "The ingredient is too big for [src]!"
else if(contents.len >= 20)
- user << "You can't add more ingredients to [src]."
+ user << "You can't add more ingredients to [src]!"
else
if(reagents.has_reagent("water", 10)) //are we starting a soup or a salad?
var/obj/item/weapon/reagent_containers/food/snacks/customizable/A = new/obj/item/weapon/reagent_containers/food/snacks/customizable/soup(get_turf(src))
@@ -298,7 +329,9 @@
/obj/item/weapon/reagent_containers/glass/bowl/update_icon()
overlays.Cut()
if(reagents.total_volume)
- icon_state = "wishsoup"
+ var/image/filling = image('icons/obj/food/soupsalad.dmi', "fullbowl")
+ filling.color = mix_color_from_reagents(reagents.reagent_list)
+ overlays += filling
else
icon_state = "bowl"
diff --git a/code/modules/food&drinks/food/snacks.dm b/code/modules/food&drinks/food/snacks.dm
index 3199cde393a..f34b33fb441 100644
--- a/code/modules/food&drinks/food/snacks.dm
+++ b/code/modules/food&drinks/food/snacks.dm
@@ -1,7 +1,7 @@
/obj/item/weapon/reagent_containers/food/snacks
name = "snack"
desc = "yummy"
- icon = 'icons/obj/food.dmi'
+ icon = 'icons/obj/food/food.dmi'
icon_state = null
var/bitesize = 2
var/bitecount = 0
@@ -18,7 +18,7 @@
var/custom_food_type = null //for food customizing. path of the custom food to create
var/junkiness = 0 //for junk food. used to lower human satiety.
var/list/bonus_reagents = list() //the amount of reagents (usually nutriment and vitamin) added to crafted/cooked snacks, on top of the ingredients reagents.
-
+ var/customfoodfilling = 1 // whether it can be used as filling in custom food
//Placeholder for effect that trigger on eating that aren't tied to reagents.
/obj/item/weapon/reagent_containers/food/snacks/proc/On_Consume()
@@ -65,7 +65,7 @@
return 0
if(wrapped)
- M << "You can't eat wrapped food!"
+ M << "You can't eat wrapped food!"
return 0
else if(fullness <= 50)
M << "You hungrily [eatverb] some of \the [src] and gobble it down!"
@@ -76,7 +76,7 @@
else if(fullness > 500 && fullness < 600)
M << "You unwillingly [eatverb] a bit of \the [src]."
else if(fullness > (600 * (1 + M.overeatduration / 2000))) // The more you eat - the more you can eat
- M << "You cannot force any more of \the [src] to go down your throat."
+ M << "You cannot force any more of \the [src] to go down your throat!"
return 0
else
if(!isbrain(M)) //If you're feeding it to someone else.
@@ -86,8 +86,8 @@
M.visible_message("[user] attempts to feed [M] [src].", \
"[user] attempts to feed [M] [src].")
else
- M.visible_message("[user] cannot force anymore of [src] down [M]'s throat!", \
- "[user] cannot force anymore of [src] down [M]'s throat!")
+ M.visible_message("[user] cannot force anymore of [src] down [M]'s throat!", \
+ "[user] cannot force anymore of [src] down [M]'s throat!")
return 0
if(!do_mob(user, M))
@@ -97,7 +97,7 @@
"[user] feeds [M] to eat [src].")
else
- user << "[M] doesn't seem to have a mouth!"
+ user << "[M] doesn't seem to have a mouth!"
return
if(reagents) //Handle ingestion of the reagent.
@@ -142,10 +142,13 @@
var/obj/item/weapon/reagent_containers/food/snacks/S = W
if(custom_food_type && ispath(custom_food_type))
if(S.w_class > 2)
- user << "The ingredient is too big for [src]."
+ user << "[S] is too big for [src]!"
+ return 0
+ if(!S.customfoodfilling)
+ user << "[src] can't be filled with [S]!"
return 0
if(contents.len >= 20)
- user << "You can't add more ingredients to [src]."
+ user << "You can't add more ingredients to [src]!"
return 0
var/obj/item/weapon/reagent_containers/food/snacks/customizable/C = new custom_food_type(get_turf(src))
C.initialize_custom_food(src, S, user)
@@ -172,24 +175,22 @@
!(locate(/obj/structure/optable) in src.loc) && \
!(locate(/obj/item/weapon/storage/bag/tray) in src.loc) \
)
- user << "You cannot slice [src] here! You need a table or at least a tray."
+ user << "You cannot slice [src] here! You need a table or at least a tray."
return 1
var/slices_lost = 0
if (accuracy > 1)
user.visible_message( \
- "[user] slices [src].", \
+ "[user] slices [src].", \
"You slice [src]." \
)
else
user.visible_message( \
- "[user] inaccurately slices [src] with [W]!", \
+ "[user] inaccurately slices [src] with [W]!", \
"You inaccurately slice [src] with your [W]!" \
)
slices_lost = rand(1,min(1,round(slices_num/2)))
- if(!slice_path && !slices_num)
- return
var/reagents_per_slice = reagents.total_volume/slices_num
for(var/i=1 to (slices_num-slices_lost))
var/obj/item/weapon/reagent_containers/food/snacks/slice = new slice_path (loc)
@@ -275,17 +276,31 @@
/obj/item/weapon/reagent_containers/food/snacks/store
w_class = 3
+ var/stored_item = 0
/obj/item/weapon/reagent_containers/food/snacks/store/attackby(obj/item/weapon/W, mob/user, params)
- if(W.w_class > 2 || custom_food_type) //can't store objects inside food needed to start a customizable snack.
- ..()
- else
- if(contents.len)
+ ..()
+ if(W.w_class <= 2 & !istype(W, /obj/item/weapon/reagent_containers/food/snacks)) //can't slip snacks inside, they're used for custom foods.
+ if(is_sharp(W))
+ return 0
+ if(stored_item)
return 0
if(!iscarbon(user))
return 0
+ if(contents.len >= 20)
+ user << "[src] is full."
+ return 0
user << "You slip [W] inside [src]."
user.unEquip(W)
add_fingerprint(user)
contents += W
+ stored_item = 1
return 1 // no afterattack here
+
+/obj/item/weapon/reagent_containers/food/snacks/MouseDrop(atom/over)
+ var/turf/T = get_turf(src)
+ var/obj/structure/table/TB = locate(/obj/structure/table) in T
+ if(TB)
+ TB.MouseDrop(over)
+ else
+ ..()
diff --git a/code/modules/food&drinks/food/snacks/dough.dm b/code/modules/food&drinks/food/snacks/dough.dm
index d03339809cd..866a3d6fa12 100644
--- a/code/modules/food&drinks/food/snacks/dough.dm
+++ b/code/modules/food&drinks/food/snacks/dough.dm
@@ -5,7 +5,7 @@
/obj/item/weapon/reagent_containers/food/snacks/dough
name = "dough"
desc = "A piece of dough."
- icon = 'icons/obj/food_ingredients.dmi'
+ icon = 'icons/obj/food/food_ingredients.dmi'
icon_state = "dough"
cooked_type = /obj/item/weapon/reagent_containers/food/snacks/store/bread/plain
list_reagents = list("nutriment" = 6)
@@ -20,7 +20,7 @@
user << "You flatten [src]."
qdel(src)
else
- user << "You need to put [src] on a surface to roll it out!"
+ user << "You need to put [src] on a surface to roll it out!"
else
..()
@@ -29,7 +29,7 @@
/obj/item/weapon/reagent_containers/food/snacks/flatdough
name = "flat dough"
desc = "A flattened dough."
- icon = 'icons/obj/food_ingredients.dmi'
+ icon = 'icons/obj/food/food_ingredients.dmi'
icon_state = "flat dough"
slice_path = /obj/item/weapon/reagent_containers/food/snacks/doughslice
slices_num = 3
@@ -40,7 +40,7 @@
/obj/item/weapon/reagent_containers/food/snacks/pizzabread
name = "pizza bread"
desc = "Add ingredients to make a pizza"
- icon = 'icons/obj/food_ingredients.dmi'
+ icon = 'icons/obj/food/food_ingredients.dmi'
icon_state = "pizzabread"
custom_food_type = /obj/item/weapon/reagent_containers/food/snacks/customizable/pizza
list_reagents = list("nutriment" = 7)
@@ -50,7 +50,7 @@
/obj/item/weapon/reagent_containers/food/snacks/doughslice
name = "dough slice"
desc = "A slice of dough. Can be cooked into a bun."
- icon = 'icons/obj/food_ingredients.dmi'
+ icon = 'icons/obj/food/food_ingredients.dmi'
icon_state = "doughslice"
cooked_type = /obj/item/weapon/reagent_containers/food/snacks/bun
filling_color = "#CD853F"
@@ -59,7 +59,7 @@
/obj/item/weapon/reagent_containers/food/snacks/bun
name = "bun"
desc = "A base for any self-respecting burger."
- icon = 'icons/obj/food.dmi'
+ icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "bun"
list_reagents = list("nutriment" = 1)
custom_food_type = /obj/item/weapon/reagent_containers/food/snacks/customizable/burger
@@ -68,7 +68,7 @@
/obj/item/weapon/reagent_containers/food/snacks/cakebatter
name = "cake batter"
desc = "Cook it to get a cake."
- icon = 'icons/obj/food_ingredients.dmi'
+ icon = 'icons/obj/food/food_ingredients.dmi'
icon_state = "cakebatter"
cooked_type = /obj/item/weapon/reagent_containers/food/snacks/store/cake/plain
list_reagents = list("nutriment" = 9)
@@ -82,14 +82,14 @@
user << "You flatten [src]."
qdel(src)
else
- user << "You need to put [src] on a surface to roll it out!"
+ user << "You need to put [src] on a surface to roll it out!"
else
..()
/obj/item/weapon/reagent_containers/food/snacks/piedough
name = "pie dough"
desc = "Cook it to get a pie."
- icon = 'icons/obj/food_ingredients.dmi'
+ icon = 'icons/obj/food/food_ingredients.dmi'
icon_state = "piedough"
slice_path = /obj/item/weapon/reagent_containers/food/snacks/rawpastrybase
slices_num = 3
@@ -100,7 +100,7 @@
/obj/item/weapon/reagent_containers/food/snacks/rawpastrybase
name = "raw pastry base"
desc = "Must be cooked before use."
- icon = 'icons/obj/food_ingredients.dmi'
+ icon = 'icons/obj/food/food_ingredients.dmi'
icon_state = "rawpastrybase"
cooked_type = /obj/item/weapon/reagent_containers/food/snacks/pastrybase
filling_color = "#CD853F"
@@ -109,7 +109,7 @@
/obj/item/weapon/reagent_containers/food/snacks/pastrybase
name = "pastry base"
desc = "A base for any self-respecting pastry"
- icon = 'icons/obj/food_ingredients.dmi'
+ icon = 'icons/obj/food/food_ingredients.dmi'
icon_state = "pastrybase"
list_reagents = list("nutriment" = 1)
filling_color = "#CD853F"
diff --git a/code/modules/food&drinks/food/snacks/meat.dm b/code/modules/food&drinks/food/snacks/meat.dm
index 7fe20242799..1fbb0e409a3 100644
--- a/code/modules/food&drinks/food/snacks/meat.dm
+++ b/code/modules/food&drinks/food/snacks/meat.dm
@@ -1,16 +1,20 @@
/obj/item/weapon/reagent_containers/food/snacks/meat
+ var/subjectname = ""
+ var/subjectjob = null
+
+/obj/item/weapon/reagent_containers/food/snacks/meat/slab
name = "meat"
desc = "A slab of meat"
icon_state = "meat"
dried_type = /obj/item/weapon/reagent_containers/food/snacks/sosjerky
bitesize = 3
list_reagents = list("nutriment" = 3)
- cooked_type = /obj/item/weapon/reagent_containers/food/snacks/meatsteak/plain
- slice_path = /obj/item/weapon/reagent_containers/food/snacks/rawcutlet/plain
+ cooked_type = /obj/item/weapon/reagent_containers/food/snacks/meat/steak/plain
+ slice_path = /obj/item/weapon/reagent_containers/food/snacks/meat/rawcutlet/plain
slices_num = 3
filling_color = "#FF0000"
-/obj/item/weapon/reagent_containers/food/snacks/meat/initialize_slice(obj/item/weapon/reagent_containers/food/snacks/rawcutlet/slice, reagents_per_slice)
+/obj/item/weapon/reagent_containers/food/snacks/meat/slab/initialize_slice(obj/item/weapon/reagent_containers/food/snacks/meat/rawcutlet/slice, reagents_per_slice)
..()
var/image/I = new(icon, "rawcutlet_coloration")
I.color = filling_color
@@ -19,21 +23,19 @@
slice.name = "raw [name] cutlet"
slice.meat_type = name
-/obj/item/weapon/reagent_containers/food/snacks/meat/initialize_cooked_food(obj/item/weapon/reagent_containers/food/snacks/S, cooking_efficiency)
+/obj/item/weapon/reagent_containers/food/snacks/meat/slab/initialize_cooked_food(obj/item/weapon/reagent_containers/food/snacks/S, cooking_efficiency)
..()
S.name = "[name] steak"
///////////////////////////////////// HUMAN MEATS //////////////////////////////////////////////////////
-/obj/item/weapon/reagent_containers/food/snacks/meat/human
+/obj/item/weapon/reagent_containers/food/snacks/meat/slab/human
name = "-meat"
- var/subjectname = ""
- var/subjectjob = null
- cooked_type = /obj/item/weapon/reagent_containers/food/snacks/meatsteak/plain/human
- slice_path = /obj/item/weapon/reagent_containers/food/snacks/rawcutlet/plain/human
+ cooked_type = /obj/item/weapon/reagent_containers/food/snacks/meat/steak/plain/human
+ slice_path = /obj/item/weapon/reagent_containers/food/snacks/meat/rawcutlet/plain/human
-/obj/item/weapon/reagent_containers/food/snacks/meat/human/initialize_slice(obj/item/weapon/reagent_containers/food/snacks/rawcutlet/plain/human/slice, reagents_per_slice)
+/obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/initialize_slice(obj/item/weapon/reagent_containers/food/snacks/meat/rawcutlet/plain/human/slice, reagents_per_slice)
..()
if(subjectname)
slice.subjectname = subjectname
@@ -42,7 +44,7 @@
slice.subjectjob = subjectjob
slice.name = "raw [subjectjob] cutlet"
-/obj/item/weapon/reagent_containers/food/snacks/meat/human/initialize_cooked_food(obj/item/weapon/reagent_containers/food/snacks/S, cooking_efficiency)
+/obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/initialize_cooked_food(obj/item/weapon/reagent_containers/food/snacks/S, cooking_efficiency)
..()
if(subjectname)
S.name = "[subjectname] meatsteak"
@@ -50,51 +52,51 @@
S.name = "[subjectjob] meatsteak"
-/obj/item/weapon/reagent_containers/food/snacks/meat/human/mutant/slime
+/obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/slime
icon_state = "slimemeat"
desc = "Because jello wasn't offensive enough to vegans"
list_reagents = list("nutriment" = 3, "slimejelly" = 3)
filling_color = "#00FFFF"
-/obj/item/weapon/reagent_containers/food/snacks/meat/human/mutant/golem
+/obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/golem
icon_state = "golemmeat"
desc = "Edible rocks, welcome to the future"
list_reagents = list("nutriment" = 3, "iron" = 3)
filling_color = "#A9A9A9"
-/obj/item/weapon/reagent_containers/food/snacks/meat/human/mutant/golem/adamantine
+/obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/golem/adamantine
icon_state = "agolemmeat"
desc = "From the slime pen to the rune to the kitchen, science"
filling_color = "#66CDAA"
-/obj/item/weapon/reagent_containers/food/snacks/meat/human/mutant/lizard
+/obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/lizard
icon_state = "lizardmeat"
desc = "Delicious dino damage"
filling_color = "#6B8E23"
-/obj/item/weapon/reagent_containers/food/snacks/meat/human/mutant/plant
+/obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/plant
icon_state = "plantmeat"
desc = "All the joys of healthy eating with all the fun of cannibalism"
filling_color = "#E9967A"
-/obj/item/weapon/reagent_containers/food/snacks/meat/human/mutant/shadow
+/obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/shadow
icon_state = "shadowmeat"
desc = "Ow, the edge"
filling_color = "#202020"
-/obj/item/weapon/reagent_containers/food/snacks/meat/human/mutant/fly
+/obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/fly
icon_state = "flymeat"
desc = "Nothing says tasty like maggot filled radioactive mutant flesh"
list_reagents = list("nutriment" = 3, "uranium" = 3)
-/obj/item/weapon/reagent_containers/food/snacks/meat/human/mutant/skeleton
+/obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/skeleton
name = "-bone"
icon_state = "skeletonmeat"
desc = "There's a point where this needs to stop and clearly we have passed it"
filling_color = "#F0F0F0"
slice_path = null //can't slice a bone into cutlets
-/obj/item/weapon/reagent_containers/food/snacks/meat/human/mutant/zombie
+/obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/zombie
name = "-meat (rotten)"
icon_state = "lizardmeat" //Close enough.
desc = "Halfway to becoming fertilizer for your garden."
@@ -108,58 +110,58 @@
////////////////////////////////////// OTHER MEATS ////////////////////////////////////////////////////////
-/obj/item/weapon/reagent_containers/food/snacks/meat/synthmeat
+/obj/item/weapon/reagent_containers/food/snacks/meat/slab/synthmeat
name = "synthmeat"
desc = "A synthetic slab of meat."
-/obj/item/weapon/reagent_containers/food/snacks/meat/monkey
+/obj/item/weapon/reagent_containers/food/snacks/meat/slab/monkey
name = "monkey meat"
-/obj/item/weapon/reagent_containers/food/snacks/meat/corgi
+/obj/item/weapon/reagent_containers/food/snacks/meat/slab/corgi
name = "corgi meat"
desc = "Tastes like... well you know..."
-/obj/item/weapon/reagent_containers/food/snacks/meat/pug
+/obj/item/weapon/reagent_containers/food/snacks/meat/slab/pug
name = "pug meat"
desc = "Tastes like... well you know..."
-/obj/item/weapon/reagent_containers/food/snacks/meat/killertomato
+/obj/item/weapon/reagent_containers/food/snacks/meat/slab/killertomato
name = "killer tomato meat"
desc = "A slice from a huge tomato."
icon_state = "tomatomeat"
list_reagents = list("nutriment" = 2)
filling_color = "#FF0000"
- cooked_type = /obj/item/weapon/reagent_containers/food/snacks/meatsteak/killertomato
- slice_path = /obj/item/weapon/reagent_containers/food/snacks/rawcutlet/killertomato
+ cooked_type = /obj/item/weapon/reagent_containers/food/snacks/meat/steak/killertomato
+ slice_path = /obj/item/weapon/reagent_containers/food/snacks/meat/rawcutlet/killertomato
-/obj/item/weapon/reagent_containers/food/snacks/meat/bear
+/obj/item/weapon/reagent_containers/food/snacks/meat/slab/bear
name = "bear meat"
desc = "A very manly slab of meat."
icon_state = "bearmeat"
list_reagents = list("nutriment" = 12, "morphine" = 5, "vitamin" = 2)
filling_color = "#FFB6C1"
- cooked_type = /obj/item/weapon/reagent_containers/food/snacks/meatsteak/bear
- slice_path = /obj/item/weapon/reagent_containers/food/snacks/rawcutlet/bear
+ cooked_type = /obj/item/weapon/reagent_containers/food/snacks/meat/steak/bear
+ slice_path = /obj/item/weapon/reagent_containers/food/snacks/meat/rawcutlet/bear
-/obj/item/weapon/reagent_containers/food/snacks/meat/xeno
+/obj/item/weapon/reagent_containers/food/snacks/meat/slab/xeno
name = "xeno meat"
desc = "A slab of meat"
icon_state = "xenomeat"
list_reagents = list("nutriment" = 3, "vitamin" = 1)
bitesize = 4
filling_color = "#32CD32"
- cooked_type = /obj/item/weapon/reagent_containers/food/snacks/meatsteak/xeno
- slice_path = /obj/item/weapon/reagent_containers/food/snacks/rawcutlet/xeno
+ cooked_type = /obj/item/weapon/reagent_containers/food/snacks/meat/steak/xeno
+ slice_path = /obj/item/weapon/reagent_containers/food/snacks/meat/rawcutlet/xeno
-/obj/item/weapon/reagent_containers/food/snacks/meat/spider
+/obj/item/weapon/reagent_containers/food/snacks/meat/slab/spider
name = "spider meat"
desc = "A slab of spider meat."
icon_state = "spidermeat"
list_reagents = list("nutriment" = 3, "toxin" = 3, "vitamin" = 1)
filling_color = "#7CFC00"
- cooked_type = /obj/item/weapon/reagent_containers/food/snacks/meatsteak/spider
- slice_path = /obj/item/weapon/reagent_containers/food/snacks/rawcutlet/spider
+ cooked_type = /obj/item/weapon/reagent_containers/food/snacks/meat/steak/spider
+ slice_path = /obj/item/weapon/reagent_containers/food/snacks/meat/rawcutlet/spider
@@ -167,7 +169,7 @@
////////////////////////////////////// MEAT STEAKS ///////////////////////////////////////////////////////////
-/obj/item/weapon/reagent_containers/food/snacks/meatsteak
+/obj/item/weapon/reagent_containers/food/snacks/meat/steak
name = "steak"
desc = "A piece of hot spicy meat."
icon_state = "meatsteak"
@@ -176,17 +178,21 @@
trash = /obj/item/trash/plate
filling_color = "#B22222"
-/obj/item/weapon/reagent_containers/food/snacks/meatsteak/plain
+/obj/item/weapon/reagent_containers/food/snacks/meat/steak/plain
-/obj/item/weapon/reagent_containers/food/snacks/meatsteak/plain/human
+/obj/item/weapon/reagent_containers/food/snacks/meat/steak/plain/human
-/obj/item/weapon/reagent_containers/food/snacks/meatsteak/killertomato
+/obj/item/weapon/reagent_containers/food/snacks/meat/steak/killertomato
+ name = "killer tomato steak"
-/obj/item/weapon/reagent_containers/food/snacks/meatsteak/bear
+/obj/item/weapon/reagent_containers/food/snacks/meat/steak/bear
+ name = "bear steak"
-/obj/item/weapon/reagent_containers/food/snacks/meatsteak/xeno
+/obj/item/weapon/reagent_containers/food/snacks/meat/steak/xeno
+ name = "xeno steak"
-/obj/item/weapon/reagent_containers/food/snacks/meatsteak/spider
+/obj/item/weapon/reagent_containers/food/snacks/meat/steak/spider
+ name = "spider steak"
@@ -194,47 +200,53 @@
//Raw cutlets
-/obj/item/weapon/reagent_containers/food/snacks/rawcutlet
+/obj/item/weapon/reagent_containers/food/snacks/meat/rawcutlet
name = "raw cutlet"
desc = "A raw meat cutlet."
icon_state = "rawcutlet"
- cooked_type = /obj/item/weapon/reagent_containers/food/snacks/cutlet/plain
+ cooked_type = /obj/item/weapon/reagent_containers/food/snacks/meat/cutlet/plain
bitesize = 2
list_reagents = list("nutriment" = 1)
filling_color = "#B22222"
var/meat_type = "meat"
-/obj/item/weapon/reagent_containers/food/snacks/rawcutlet/initialize_cooked_food(obj/item/weapon/reagent_containers/food/snacks/S, cooking_efficiency)
+/obj/item/weapon/reagent_containers/food/snacks/meat/rawcutlet/initialize_cooked_food(obj/item/weapon/reagent_containers/food/snacks/S, cooking_efficiency)
..()
S.name = "[meat_type] cutlet"
-/obj/item/weapon/reagent_containers/food/snacks/rawcutlet/plain
+/obj/item/weapon/reagent_containers/food/snacks/meat/rawcutlet/plain
-/obj/item/weapon/reagent_containers/food/snacks/rawcutlet/plain/human
- cooked_type = /obj/item/weapon/reagent_containers/food/snacks/cutlet/plain/human
- var/subjectname = ""
- var/subjectjob = null
+/obj/item/weapon/reagent_containers/food/snacks/meat/rawcutlet/plain/human
+ cooked_type = /obj/item/weapon/reagent_containers/food/snacks/meat/cutlet/plain/human
-/obj/item/weapon/reagent_containers/food/snacks/rawcutlet/plain/human/initialize_cooked_food(obj/item/weapon/reagent_containers/food/snacks/S, cooking_efficiency)
+/obj/item/weapon/reagent_containers/food/snacks/meat/rawcutlet/plain/human/initialize_cooked_food(obj/item/weapon/reagent_containers/food/snacks/S, cooking_efficiency)
..()
if(subjectname)
S.name = "[subjectname] [initial(S.name)]"
else if(subjectjob)
S.name = "[subjectjob] [initial(S.name)]"
-/obj/item/weapon/reagent_containers/food/snacks/rawcutlet/killertomato
+/obj/item/weapon/reagent_containers/food/snacks/meat/rawcutlet/killertomato
+ name = "raw killer tomato cutlet"
+ cooked_type = /obj/item/weapon/reagent_containers/food/snacks/meat/cutlet/killertomato
-/obj/item/weapon/reagent_containers/food/snacks/rawcutlet/bear
+/obj/item/weapon/reagent_containers/food/snacks/meat/rawcutlet/bear
+ name = "raw bear cutlet"
+ cooked_type = /obj/item/weapon/reagent_containers/food/snacks/meat/cutlet/bear
-/obj/item/weapon/reagent_containers/food/snacks/rawcutlet/xeno
+/obj/item/weapon/reagent_containers/food/snacks/meat/rawcutlet/xeno
+ name = "raw xeno cutlet"
+ cooked_type = /obj/item/weapon/reagent_containers/food/snacks/meat/cutlet/xeno
-/obj/item/weapon/reagent_containers/food/snacks/rawcutlet/spider
+/obj/item/weapon/reagent_containers/food/snacks/meat/rawcutlet/spider
+ name = "raw spider cutlet"
+ cooked_type = /obj/item/weapon/reagent_containers/food/snacks/meat/cutlet/spider
//Cooked cutlets
-/obj/item/weapon/reagent_containers/food/snacks/cutlet
+/obj/item/weapon/reagent_containers/food/snacks/meat/cutlet
name = "cutlet"
desc = "A cooked meat cutlet."
icon_state = "cutlet"
@@ -243,14 +255,19 @@
bonus_reagents = list("nutriment" = 1, "vitamin" = 1)
filling_color = "#B22222"
-/obj/item/weapon/reagent_containers/food/snacks/cutlet/plain
+/obj/item/weapon/reagent_containers/food/snacks/meat/cutlet/plain
-/obj/item/weapon/reagent_containers/food/snacks/cutlet/plain/human
+/obj/item/weapon/reagent_containers/food/snacks/meat/cutlet/plain/human
-/obj/item/weapon/reagent_containers/food/snacks/cutlet/killertomato
+/obj/item/weapon/reagent_containers/food/snacks/meat/cutlet/killertomato
+ name = "killer tomato cutlet"
-/obj/item/weapon/reagent_containers/food/snacks/cutlet/bear
+/obj/item/weapon/reagent_containers/food/snacks/meat/cutlet/bear
+ name = "bear cutlet"
-/obj/item/weapon/reagent_containers/food/snacks/cutlet/xeno
+/obj/item/weapon/reagent_containers/food/snacks/meat/cutlet/xeno
+ name = "xeno cutlet"
+
+/obj/item/weapon/reagent_containers/food/snacks/meat/cutlet/spider
+ name = "spider cutlet"
-/obj/item/weapon/reagent_containers/food/snacks/cutlet/spider
\ No newline at end of file
diff --git a/code/modules/food&drinks/food/snacks_bread.dm b/code/modules/food&drinks/food/snacks_bread.dm
index 694ed000946..8ff5e2681a3 100644
--- a/code/modules/food&drinks/food/snacks_bread.dm
+++ b/code/modules/food&drinks/food/snacks_bread.dm
@@ -1,13 +1,18 @@
/obj/item/weapon/reagent_containers/food/snacks/store/bread
+ icon = 'icons/obj/food/burgerbread.dmi'
+ volume = 80
slices_num = 5
/obj/item/weapon/reagent_containers/food/snacks/breadslice
+ icon = 'icons/obj/food/burgerbread.dmi'
bitesize = 2
custom_food_type = /obj/item/weapon/reagent_containers/food/snacks/customizable/sandwich
filling_color = "#FFA500"
- slot_flags = SLOT_HEAD // i'm going to kill myself. i'm going to murder my own self.
+ list_reagents = list("nutriment" = 2)
+ slot_flags = SLOT_HEAD
+ customfoodfilling = 0 //to avoid infinite bread-ception
/obj/item/weapon/reagent_containers/food/snacks/store/bread/plain
name = "bread"
@@ -22,6 +27,7 @@
name = "bread slice"
desc = "A slice of home."
icon_state = "breadslice"
+ customfoodfilling = 1
/obj/item/weapon/reagent_containers/food/snacks/store/bread/meat
name = "meatbread loaf"
@@ -112,6 +118,21 @@
filling_color = "#FF8C00"
list_reagents = list("nutriment" = 4, "vitamin" = 1)
+/obj/item/weapon/reagent_containers/food/snacks/store/bread/mimana
+ name = "mimana bread"
+ desc = "Best eaten in silence."
+ icon_state = "mimanabread"
+ slice_path = /obj/item/weapon/reagent_containers/food/snacks/breadslice/mimana
+ bonus_reagents = list("nutriment" = 5, "vitamin" = 5)
+ list_reagents = list("nutriment" = 20, "mutetoxin" = 5, "nothing" = 5, "vitamin" = 5)
+
+/obj/item/weapon/reagent_containers/food/snacks/breadslice/mimana
+ name = "mimana bread slice"
+ desc = "A slice of silence!"
+ icon_state = "mimanabreadslice"
+ filling_color = "#C0C0C0"
+ list_reagents = list("nutriment" = 2, "mutetoxin" = 1, "nothing" = 1, "vitamin" = 1)
+
/obj/item/weapon/reagent_containers/food/snacks/breadslice/custom
name = "bread slice"
icon_state = "tofubreadslice"
@@ -120,8 +141,9 @@
/obj/item/weapon/reagent_containers/food/snacks/baguette
name = "baguette"
desc = "Bon appetit!"
+ icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "baguette"
bonus_reagents = list("nutriment" = 2, "vitamin" = 2)
list_reagents = list("nutriment" = 6, "vitamin" = 1)
bitesize = 3
- w_class = 3
\ No newline at end of file
+ w_class = 3
diff --git a/code/modules/food&drinks/food/snacks_burgers.dm b/code/modules/food&drinks/food/snacks_burgers.dm
index 9f77bfce846..27f0b2b2bb2 100644
--- a/code/modules/food&drinks/food/snacks_burgers.dm
+++ b/code/modules/food&drinks/food/snacks_burgers.dm
@@ -1,6 +1,7 @@
/obj/item/weapon/reagent_containers/food/snacks/burger
filling_color = "#CD853F"
+ icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "hburger"
bitesize = 3
list_reagents = list("nutriment" = 6, "vitamin" = 1)
@@ -13,7 +14,7 @@
/obj/item/weapon/reagent_containers/food/snacks/burger/human
var/hname = ""
var/job = null
- name = "-burger"
+ name = "human burger"
desc = "A bloody burger."
bonus_reagents = list("vitamin" = 4)
@@ -163,4 +164,18 @@
bonus_reagents = list("vitamin" = 10)
list_reagents = list("nutriment" = 40, "vitamin" = 5)
w_class = 3
- volume = 80
+ bitesize = 7
+ volume = 100
+
+/obj/item/weapon/reagent_containers/food/snacks/burger/fivealarm
+ name = "five alarm burger"
+ desc = "HOT! HOT!"
+ icon_state = "fivealarmburger"
+ bonus_reagents = list("nutriment" = 2, "vitamin" = 5)
+ list_reagents = list("nutriment" = 6, "capsaicin" = 5, "condensedcapsaicin" = 5, "vitamin" = 1)
+
+/obj/item/weapon/reagent_containers/food/snacks/burger/rat
+ name = "rat burger"
+ desc = "Pretty much what you'd expect..."
+ icon_state = "ratburger"
+ bonus_reagents = list("nutriment" = 1, "vitamin" = 1)
\ No newline at end of file
diff --git a/code/modules/food&drinks/food/snacks_cake.dm b/code/modules/food&drinks/food/snacks_cake.dm
index f1ccae6255e..0d287060996 100644
--- a/code/modules/food&drinks/food/snacks_cake.dm
+++ b/code/modules/food&drinks/food/snacks_cake.dm
@@ -1,13 +1,17 @@
/obj/item/weapon/reagent_containers/food/snacks/store/cake
+ icon = 'icons/obj/food/piecake.dmi'
slice_path = /obj/item/weapon/reagent_containers/food/snacks/cakeslice/plain
slices_num = 5
bitesize = 3
+ volume = 80
list_reagents = list("nutriment" = 20, "vitamin" = 5)
/obj/item/weapon/reagent_containers/food/snacks/cakeslice
+ icon = 'icons/obj/food/piecake.dmi'
trash = /obj/item/trash/plate
list_reagents = list("nutriment" = 4, "vitamin" = 1)
+ customfoodfilling = 0 //to avoid infinite cake-ception
/obj/item/weapon/reagent_containers/food/snacks/store/cake/plain
name = "vanilla cake"
@@ -21,6 +25,7 @@
desc = "Just a slice of cake, it is enough for everyone."
icon_state = "plaincake_slice"
filling_color = "#FFD700"
+ customfoodfilling = 1
/obj/item/weapon/reagent_containers/food/snacks/store/cake/carrot
name = "carrot cake"
@@ -174,10 +179,23 @@
desc = "A cake made of slimes. Probably not electrified."
icon_state = "slimecake"
slice_path = /obj/item/weapon/reagent_containers/food/snacks/cakeslice/slimecake
- slices_num = 5
bonus_reagents = list("nutriment" = 1, "vitamin" = 3)
/obj/item/weapon/reagent_containers/food/snacks/cakeslice/slimecake
- name = "Slime cake slice"
+ name = "slime cake slice"
+ desc = "A slice of slime cake."
icon_state = "slimecake_slice"
filling_color = "#00FFFF"
+
+/obj/item/weapon/reagent_containers/food/snacks/store/cake/pumpkinspice
+ name = "pumpkin spice cake"
+ desc = "A hollow cake with real pumpkin."
+ icon_state = "pumpkinspicecake"
+ slice_path = /obj/item/weapon/reagent_containers/food/snacks/cakeslice/pumpkinspice
+ bonus_reagents = list("nutriment" = 3, "vitamin" = 5)
+
+/obj/item/weapon/reagent_containers/food/snacks/cakeslice/pumpkinspice
+ name = "pumpkin spice cake slice"
+ desc = "A spicy slice of pumpkin goodness."
+ icon_state = "pumpkinspicecakeslice"
+ filling_color = "#FFD700"
\ No newline at end of file
diff --git a/code/modules/food&drinks/food/snacks_egg.dm b/code/modules/food&drinks/food/snacks_egg.dm
index 23c80a6bf4b..608064ed01b 100644
--- a/code/modules/food&drinks/food/snacks_egg.dm
+++ b/code/modules/food&drinks/food/snacks_egg.dm
@@ -100,12 +100,12 @@
/obj/item/weapon/reagent_containers/food/snacks/omelette/attackby(obj/item/weapon/W, mob/user, params)
if(istype(W,/obj/item/weapon/kitchen/utensil/fork))
if(W.icon_state == "forkloaded")
- user << "You already have omelette on your fork."
+ user << "You already have omelette on your fork!"
return
W.icon_state = "forkloaded"
user.visible_message( \
- "[user] takes a piece of omelette with their fork!", \
- "You take a piece of omelette with your fork!" \
+ "[user] takes a piece of omelette with their fork!", \
+ "You take a piece of omelette with your fork." \
)
reagents.remove_reagent("nutriment", 1)
if(reagents.total_volume <= 0)
diff --git a/code/modules/food&drinks/food/snacks_meat.dm b/code/modules/food&drinks/food/snacks_meat.dm
index 62cf5fcc05b..30a12799e00 100644
--- a/code/modules/food&drinks/food/snacks_meat.dm
+++ b/code/modules/food&drinks/food/snacks_meat.dm
@@ -98,14 +98,6 @@
..()
eatverb = pick("bite","chew","nibble","deep throat","gobble","chomp")
-/obj/item/weapon/reagent_containers/food/snacks/wingfangchu
- name = "wing fang chu"
- desc = "A savory dish of alien wing wang in soy."
- icon_state = "wingfangchu"
- trash = /obj/item/weapon/reagent_containers/glass/bowl
- bonus_reagents = list("nutriment" = 1, "vitamin" = 2)
- list_reagents = list("nutriment" = 6, "vitamin" = 2)
-
/obj/item/weapon/reagent_containers/food/snacks/kebab
trash = /obj/item/stack/rods
icon_state = "kebab"
diff --git a/code/modules/food&drinks/food/snacks_other.dm b/code/modules/food&drinks/food/snacks_other.dm
index 735b65f5048..f11f863aad2 100644
--- a/code/modules/food&drinks/food/snacks_other.dm
+++ b/code/modules/food&drinks/food/snacks_other.dm
@@ -1,7 +1,7 @@
////////////////////////////////////////////OTHER////////////////////////////////////////////
-/obj/item/weapon/reagent_containers/food/snacks/cheesewheel
+/obj/item/weapon/reagent_containers/food/snacks/store/cheesewheel
name = "cheese wheel"
desc = "A big wheel of delcious Cheddar."
icon_state = "cheesewheel"
@@ -141,10 +141,10 @@
list_reagents = list("minttoxin" = 1)
filling_color = "#800000"
-/obj/item/weapon/reagent_containers/food/snacks/wrap
+/obj/item/weapon/reagent_containers/food/snacks/eggwrap
name = "egg wrap"
desc = "The precursor to Pigs in a Blanket."
- icon_state = "wrap"
+ icon_state = "eggwrap"
bonus_reagents = list("nutriment" = 1, "vitamin" = 3)
list_reagents = list("nutriment" = 5)
filling_color = "#F0E68C"
@@ -187,4 +187,127 @@
trash = /obj/item/trash/plate
bonus_reagents = list("nutriment" = 1, "vitamin" = 3)
list_reagents = list("nutriment" = 6, "vitamin" = 2)
- filling_color = "#BA55D3"
\ No newline at end of file
+ filling_color = "#BA55D3"
+
+/obj/item/weapon/reagent_containers/food/snacks/tortilla
+ name = "tortilla"
+ desc = "The base for all your burritos."
+ icon = 'icons/obj/food/food_ingredients.dmi'
+ icon_state = "tortilla"
+ list_reagents = list("nutriment" = 3, "vitamin" = 1)
+ filling_color = "#FFEFD5"
+
+/obj/item/weapon/reagent_containers/food/snacks/burrito
+ name = "burrito"
+ desc = "Tortilla wrapped goodness."
+ icon_state = "burrito"
+ bonus_reagents = list("nutriment" = 2, "vitamin" = 2)
+ list_reagents = list("nutriment" = 4, "vitamin" = 1)
+ filling_color = "#FFEFD5"
+
+/obj/item/weapon/reagent_containers/food/snacks/cheesyburrito
+ name = "cheesy burrito"
+ desc = "It's a burrito filled with cheese."
+ icon_state = "cheesyburrito"
+ bonus_reagents = list("nutriment" = 1, "vitamin" = 2)
+ list_reagents = list("nutriment" = 4, "vitamin" = 2)
+ filling_color = "#FFD800"
+
+/obj/item/weapon/reagent_containers/food/snacks/carneburrito
+ name = "carne asada burrito"
+ desc = "The best burrito for meat lovers."
+ icon_state = "carneburrito"
+ bonus_reagents = list("nutriment" = 2, "vitamin" = 1)
+ list_reagents = list("nutriment" = 5, "vitamin" = 1)
+ filling_color = "#A0522D"
+
+/obj/item/weapon/reagent_containers/food/snacks/fuegoburrito
+ name = "fuego plasma burrito"
+ desc = "A super spicy burrito."
+ icon_state = "fuegoburrito"
+ bonus_reagents = list("nutriment" = 2, "vitamin" = 3)
+ list_reagents = list("nutriment" = 4, "capsaicin" = 5, "vitamin" = 3)
+ filling_color = "#FF2000"
+
+/obj/item/weapon/reagent_containers/food/snacks/yakiimo
+ name = "yaki imo"
+ desc = "Made with roasted sweet potatoes!"
+ icon_state = "yakiimo"
+ trash = /obj/item/trash/plate
+ list_reagents = list("nutriment" = 5, "vitamin" = 4)
+ filling_color = "#8B1105"
+
+/obj/item/weapon/reagent_containers/food/snacks/roastparsnip
+ name = "roast parsnip"
+ desc = "Sweet and crunchy."
+ icon_state = "roastparsnip"
+ trash = /obj/item/trash/plate
+ list_reagents = list("nutriment" = 3, "vitamin" = 4)
+ filling_color = "#FF5500"
+
+/obj/item/weapon/reagent_containers/food/snacks/melonfruitbowl
+ name = "melon fruit bowl"
+ desc = "For people who wants edible fruit bowls."
+ icon_state = "melonfruitbowl"
+ bonus_reagents = list("nutriment" = 2, "vitamin" = 2)
+ list_reagents = list("nutriment" = 6, "vitamin" = 4)
+ filling_color = "#FF5500"
+ w_class = 3
+
+/obj/item/weapon/reagent_containers/food/snacks/spacefreezy
+ name = "space freezy"
+ desc = "The best icecream in space."
+ icon_state = "spacefreezy"
+ bonus_reagents = list("nutriment" = 2, "vitamin" = 2)
+ list_reagents = list("nutriment" = 6, "bluecherryjelly" = 5, "vitamin" = 4)
+ filling_color = "#87CEFA"
+
+/obj/item/weapon/reagent_containers/food/snacks/sundae
+ name = "sundae"
+ desc = "A classic dessert."
+ icon_state = "sundae"
+ bonus_reagents = list("nutriment" = 2, "vitamin" = 1)
+ list_reagents = list("nutriment" = 6, "banana" = 5, "vitamin" = 2)
+ filling_color = "#FFFACD"
+
+/obj/item/weapon/reagent_containers/food/snacks/honkdae
+ name = "honkdae"
+ desc = "The clown's favorite dessert."
+ icon_state = "honkdae"
+ bonus_reagents = list("nutriment" = 2, "vitamin" = 2)
+ list_reagents = list("nutriment" = 6, "banana" = 10, "vitamin" = 4)
+ filling_color = "#FFFACD"
+
+/obj/item/weapon/reagent_containers/food/snacks/nachos
+ name = "nachos"
+ desc = "Chips from Space Mexico."
+ icon_state = "nachos"
+ bonus_reagents = list("nutriment" = 1, "vitamin" = 1)
+ list_reagents = list("nutriment" = 6, "vitamin" = 2)
+ filling_color = "#F4A460"
+
+/obj/item/weapon/reagent_containers/food/snacks/cheesynachos
+ name = "cheesy nachos"
+ desc = "The delicious combination of nachos and melting cheese."
+ icon_state = "cheesynachos"
+ bonus_reagents = list("nutriment" = 1, "vitamin" = 2)
+ list_reagents = list("nutriment" = 6, "vitamin" = 3)
+ filling_color = "#FFD700"
+
+/obj/item/weapon/reagent_containers/food/snacks/cubannachos
+ name = "cuban nachos"
+ desc = "That's some dangerously spicy nachos."
+ icon_state = "cubannachos"
+ bonus_reagents = list("nutriment" = 2, "vitamin" = 3)
+ list_reagents = list("nutriment" = 7, "capsaicin" = 8, "vitamin" = 4)
+ filling_color = "#DC143C"
+
+/obj/item/weapon/reagent_containers/food/snacks/melonkeg
+ name = "melon keg"
+ desc = "Who knew vodka was a fruit?"
+ icon_state = "melonkeg"
+ bonus_reagents = list("nutriment" = 3, "vitamin" = 3)
+ list_reagents = list("nutriment" = 9, "vodka" = 15, "vitamin" = 4)
+ filling_color = "#FFD700"
+ volume = 80
+ bitesize = 5
\ No newline at end of file
diff --git a/code/modules/food&drinks/food/snacks_pastry.dm b/code/modules/food&drinks/food/snacks_pastry.dm
index ffd7f5dc9fc..1af2b47ad8a 100644
--- a/code/modules/food&drinks/food/snacks_pastry.dm
+++ b/code/modules/food&drinks/food/snacks_pastry.dm
@@ -93,7 +93,6 @@
name = "chawanmushi"
desc = "A legendary egg custard that makes friends out of enemies. Probably too hot for a cat to eat."
icon_state = "chawanmushi"
- trash = /obj/item/weapon/reagent_containers/glass/bowl
bonus_reagents = list("vitamin" = 1)
list_reagents = list("nutriment" = 5)
filling_color = "#FFE4E1"
@@ -156,7 +155,7 @@
filling_color = "#CD853F"
/obj/item/weapon/reagent_containers/food/snacks/donkpocket/warm
- name = "\improper Warm Donk-pocket"
+ name = "warm Donk-pocket"
desc = "The heated food of choice for the seasoned traitor."
bonus_reagents = list("omnizine" = 3)
list_reagents = list("nutriment" = 4, "omnizine" = 3)
@@ -234,3 +233,35 @@
bonus_reagents = list("nutriment" = 1, "vitamin" = 1)
list_reagents = list("nutriment" = 5, "vitamin" = 1)
filling_color = "#FFE4C4"
+
+/obj/item/weapon/reagent_containers/food/snacks/oatmealcookie
+ name = "oatmeal cookie"
+ desc = "The best of both cookie and oat"
+ icon_state = "oatmealcookie"
+ bonus_reagents = list("nutriment" = 1, "vitamin" = 1)
+ list_reagents = list("nutriment" = 5, "vitamin" = 1)
+ filling_color = "#D2691E"
+
+/obj/item/weapon/reagent_containers/food/snacks/raisincookie
+ name = "raisin cookie"
+ desc = "Why would you put raisins on a cookie?"
+ icon_state = "raisincookie"
+ bonus_reagents = list("nutriment" = 1, "vitamin" = 1)
+ list_reagents = list("nutriment" = 5, "vitamin" = 1)
+ filling_color = "#F0E68C"
+
+/obj/item/weapon/reagent_containers/food/snacks/cherrycupcake
+ name = "cherry cupcake"
+ desc = "A sweet cupcake with cherry bits."
+ icon_state = "cherrycupcake"
+ bonus_reagents = list("nutriment" = 1, "vitamin" = 1)
+ list_reagents = list("nutriment" = 5, "vitamin" = 1)
+ filling_color = "#F0E68C"
+
+/obj/item/weapon/reagent_containers/food/snacks/bluecherrycupcake
+ name = "blue cherry cupcake"
+ desc = "Blue cherries inside a delicious cupcake"
+ icon_state = "bluecherrycupcake"
+ bonus_reagents = list("nutriment" = 1, "vitamin" = 3)
+ list_reagents = list("nutriment" = 5, "vitamin" = 1)
+ filling_color = "#F0E68C"
diff --git a/code/modules/food&drinks/food/snacks_pie.dm b/code/modules/food&drinks/food/snacks_pie.dm
index 1a69a62b334..e4fe6700f67 100644
--- a/code/modules/food&drinks/food/snacks_pie.dm
+++ b/code/modules/food&drinks/food/snacks_pie.dm
@@ -1,8 +1,10 @@
/obj/item/weapon/reagent_containers/food/snacks/pie
+ icon = 'icons/obj/food/piecake.dmi'
trash = /obj/item/trash/plate
bitesize = 3
w_class = 3
+ volume = 80
list_reagents = list("nutriment" = 10, "vitamin" = 2)
/obj/item/weapon/reagent_containers/food/snacks/pie/plain
@@ -102,7 +104,7 @@
bonus_reagents = list("nutriment" = 1, "vitamin" = 2)
-/obj/item/weapon/reagent_containers/food/snacks/pumpkinpie
+/obj/item/weapon/reagent_containers/food/snacks/pie/pumpkinpie
name = "pumpkin pie"
desc = "A delicious treat for the autumn months."
icon_state = "pumpkinpie"
@@ -113,8 +115,10 @@
/obj/item/weapon/reagent_containers/food/snacks/pumpkinpieslice
name = "pumpkin pie slice"
desc = "A slice of pumpkin pie, with whipped cream on top. Perfection."
+ icon = 'icons/obj/food/piecake.dmi'
icon_state = "pumpkinpieslice"
trash = /obj/item/trash/plate
+ filling_color = "#FFA500"
list_reagents = list("nutriment" = 2)
/obj/item/weapon/reagent_containers/food/snacks/pie/appletart
@@ -123,3 +127,43 @@
icon_state = "gappletart"
bonus_reagents = list("nutriment" = 1, "vitamin" = 4)
list_reagents = list("nutriment" = 8, "gold" = 5, "vitamin" = 4)
+
+/obj/item/weapon/reagent_containers/food/snacks/pie/blumpkinpie
+ name = "blumpkin pie"
+ desc = "An odd blue pie made with toxic blumpkin."
+ icon_state = "blumpkinpie"
+ slice_path = /obj/item/weapon/reagent_containers/food/snacks/blumpkinpieslice
+ slices_num = 5
+ bonus_reagents = list("nutriment" = 3, "vitamin" = 6)
+
+/obj/item/weapon/reagent_containers/food/snacks/blumpkinpieslice
+ name = "blumpkin pie slice"
+ desc = "A slice of blumpkin pie, with whipped cream on top. Is this edible?"
+ icon = 'icons/obj/food/piecake.dmi'
+ icon_state = "blumpkinpieslice"
+ trash = /obj/item/trash/plate
+ filling_color = "#1E90FF"
+ list_reagents = list("nutriment" = 2)
+
+/obj/item/weapon/reagent_containers/food/snacks/pie/dulcedebatata
+ name = "dulce de batata"
+ desc = "A delicious jelly made with sweet potatoes."
+ icon_state = "dulcedebatata"
+ slice_path = /obj/item/weapon/reagent_containers/food/snacks/dulcedebatataslice
+ slices_num = 5
+ bonus_reagents = list("nutriment" = 4, "vitamin" = 8)
+
+/obj/item/weapon/reagent_containers/food/snacks/dulcedebatataslice
+ name = "dulce de batata slice"
+ desc = "A slice of sweet dulce de batata jelly."
+ icon = 'icons/obj/food/piecake.dmi'
+ icon_state = "dulcedebatataslice"
+ trash = /obj/item/trash/plate
+ filling_color = "#8B4513"
+ list_reagents = list("nutriment" = 2)
+
+/obj/item/weapon/reagent_containers/food/snacks/pie/frostypie
+ name = "frosty pie"
+ desc = "Tastes like blue and cold."
+ icon_state = "frostypie"
+ bonus_reagents = list("nutriment" = 4, "vitamin" = 6)
diff --git a/code/modules/food&drinks/food/snacks_pizza.dm b/code/modules/food&drinks/food/snacks_pizza.dm
index 6237ce52192..c9f993c17f7 100644
--- a/code/modules/food&drinks/food/snacks_pizza.dm
+++ b/code/modules/food&drinks/food/snacks_pizza.dm
@@ -2,10 +2,14 @@
/////////////////////////////////////////////////PIZZA////////////////////////////////////////
/obj/item/weapon/reagent_containers/food/snacks/pizza
+ icon = 'icons/obj/food/pizzaspaghetti.dmi'
w_class = 3
slices_num = 6
+ volume = 80
+ list_reagents = list("nutriment" = 30, "tomatojuice" = 6, "vitamin" = 5)
/obj/item/weapon/reagent_containers/food/snacks/pizzaslice
+ icon = 'icons/obj/food/pizzaspaghetti.dmi'
list_reagents = list("nutriment" = 5)
/obj/item/weapon/reagent_containers/food/snacks/pizza/margherita
@@ -13,9 +17,7 @@
desc = "The most cheezy pizza in galaxy."
icon_state = "pizzamargherita"
slice_path = /obj/item/weapon/reagent_containers/food/snacks/pizzaslice/margherita
- slices_num = 6
bonus_reagents = list("nutriment" = 5, "vitamin" = 5)
- list_reagents = list("nutriment" = 30, "tomatojuice" = 6, "vitamin" = 5)
/obj/item/weapon/reagent_containers/food/snacks/pizzaslice/margherita
name = "margherita slice"
@@ -23,51 +25,89 @@
icon_state = "pizzamargheritaslice"
filling_color = "#FFA500"
-/obj/item/weapon/reagent_containers/food/snacks/pizza/meatpizza
+/obj/item/weapon/reagent_containers/food/snacks/pizza/meat
name = "meatpizza"
desc = "Greasy pizza with delicious meat."
icon_state = "meatpizza"
- slice_path = /obj/item/weapon/reagent_containers/food/snacks/pizzaslice/meatpizza
- slices_num = 6
+ slice_path = /obj/item/weapon/reagent_containers/food/snacks/pizzaslice/meat
bonus_reagents = list("nutriment" = 5, "vitamin" = 8)
list_reagents = list("nutriment" = 30, "tomatojuice" = 6, "vitamin" = 8)
-/obj/item/weapon/reagent_containers/food/snacks/pizzaslice/meatpizza
+/obj/item/weapon/reagent_containers/food/snacks/pizzaslice/meat
name = "meatpizza slice"
desc = "A nutritious slice of meatpizza."
icon_state = "meatpizzaslice"
filling_color = "#A52A2A"
-/obj/item/weapon/reagent_containers/food/snacks/pizza/mushroompizza
+/obj/item/weapon/reagent_containers/food/snacks/pizza/mushroom
name = "mushroom pizza"
desc = "Very special pizza."
icon_state = "mushroompizza"
- slice_path = /obj/item/weapon/reagent_containers/food/snacks/pizzaslice/mushroompizza
- slices_num = 6
+ slice_path = /obj/item/weapon/reagent_containers/food/snacks/pizzaslice/mushroom
bonus_reagents = list("nutriment" = 5, "vitamin" = 5)
list_reagents = list("nutriment" = 30, "vitamin" = 5)
-/obj/item/weapon/reagent_containers/food/snacks/pizzaslice/mushroompizza
+/obj/item/weapon/reagent_containers/food/snacks/pizzaslice/mushroom
name = "mushroom pizza slice"
desc = "Maybe it is the last slice of pizza in your life."
icon_state = "mushroompizzaslice"
filling_color = "#FFE4C4"
-/obj/item/weapon/reagent_containers/food/snacks/pizza/vegetablepizza
+/obj/item/weapon/reagent_containers/food/snacks/pizza/vegetable
name = "vegetable pizza"
desc = "No one of Tomatos Sapiens were harmed during making this pizza."
icon_state = "vegetablepizza"
- slice_path = /obj/item/weapon/reagent_containers/food/snacks/pizzaslice/vegetablepizza
- slices_num = 6
+ slice_path = /obj/item/weapon/reagent_containers/food/snacks/pizzaslice/vegetable
bonus_reagents = list("nutriment" = 5, "vitamin" = 5)
list_reagents = list("nutriment" = 25, "tomatojuice" = 6, "oculine" = 12, "vitamin" = 5)
-/obj/item/weapon/reagent_containers/food/snacks/pizzaslice/vegetablepizza
+/obj/item/weapon/reagent_containers/food/snacks/pizzaslice/vegetable
name = "vegetable pizza slice"
desc = "A slice of the most green pizza of all pizzas not containing green ingredients."
icon_state = "vegetablepizzaslice"
filling_color = "#FFA500"
+/obj/item/weapon/reagent_containers/food/snacks/pizza/donkpocket
+ name = "donkpocket pizza"
+ desc = "Who thought this would be a good idea?"
+ icon_state = "donkpocketpizza"
+ slice_path = /obj/item/weapon/reagent_containers/food/snacks/pizzaslice/donkpocket
+ bonus_reagents = list("nutriment" = 5, "vitamin" = 5)
+ list_reagents = list("nutriment" = 25, "tomatojuice" = 6, "omnizine" = 10, "vitamin" = 5)
+
+/obj/item/weapon/reagent_containers/food/snacks/pizzaslice/donkpocket
+ name = "donkpocket pizza slice"
+ desc = "Smells like donkpocket."
+ icon_state = "donkpocketpizzaslice"
+ filling_color = "#FFA500"
+
+/obj/item/weapon/reagent_containers/food/snacks/pizza/dank
+ name = "dank pizza"
+ desc = "The hippie's pizza of choice."
+ icon_state = "dankpizza"
+ slice_path = /obj/item/weapon/reagent_containers/food/snacks/pizzaslice/dank
+ bonus_reagents = list("nutriment" = 2, "vitamin" = 6)
+ list_reagents = list("nutriment" = 25, "doctorsdelight" = 5, "tomatojuice" = 6, "vitamin" = 5)
+
+/obj/item/weapon/reagent_containers/food/snacks/pizzaslice/dank
+ name = "dank pizza slice"
+ desc = "So good, man..."
+ icon_state = "dankpizzaslice"
+ filling_color = "#2E8B57"
+
+/obj/item/weapon/reagent_containers/food/snacks/pizza/sassysage
+ name = "sassysage pizza"
+ desc = "You can really smell the sassiness."
+ icon_state = "sassysagepizza"
+ slice_path = /obj/item/weapon/reagent_containers/food/snacks/pizzaslice/sassysage
+ bonus_reagents = list("nutriment" = 6, "vitamin" = 6)
+
+/obj/item/weapon/reagent_containers/food/snacks/pizzaslice/sassysage
+ name = "sassysage pizza slice"
+ desc = "Deliciously sassy."
+ icon_state = "sassysagepizzaslice"
+ filling_color = "#FF4500"
+
/obj/item/weapon/reagent_containers/food/snacks/pizzaslice/custom
name = "pizza slice"
icon_state = "pizzamargheritaslice"
@@ -76,7 +116,7 @@
/obj/item/pizzabox
name = "pizza box"
desc = "A box suited for pizzas."
- icon = 'icons/obj/food.dmi'
+ icon = 'icons/obj/food/containers.dmi'
icon_state = "pizzabox1"
var/open = 0 // Is the box open?
var/ismessy = 0 // Fancy mess on the lid
@@ -111,7 +151,7 @@
icon_state = "pizzabox_open"
if(pizza)
- var/image/pizzaimg = image("food.dmi", icon_state = pizza.icon_state)
+ var/image/pizzaimg = image('icons/obj/food/pizzaspaghetti.dmi', icon_state = pizza.icon_state)
pizzaimg.pixel_y = -3
overlays += pizzaimg
@@ -128,7 +168,7 @@
doimgtag = 1
if(doimgtag)
- var/image/tagimg = image("food.dmi", icon_state = "pizzabox_tag")
+ var/image/tagimg = image('icons/obj/food/containers.dmi', icon_state = "pizzabox_tag")
tagimg.pixel_y = boxes.len * 3
overlays += tagimg
@@ -235,16 +275,16 @@
update_icon()
/obj/item/pizzabox/vegetable/New()
- pizza = new /obj/item/weapon/reagent_containers/food/snacks/pizza/vegetablepizza(src)
+ pizza = new /obj/item/weapon/reagent_containers/food/snacks/pizza/vegetable(src)
boxtag = "Gourmet Vegatable"
update_icon()
/obj/item/pizzabox/mushroom/New()
- pizza = new /obj/item/weapon/reagent_containers/food/snacks/pizza/mushroompizza(src)
+ pizza = new /obj/item/weapon/reagent_containers/food/snacks/pizza/mushroom(src)
boxtag = "Mushroom Special"
update_icon()
/obj/item/pizzabox/meat/New()
- pizza = new /obj/item/weapon/reagent_containers/food/snacks/pizza/meatpizza(src)
+ pizza = new /obj/item/weapon/reagent_containers/food/snacks/pizza/meat(src)
boxtag = "Meatlover's Supreme"
update_icon()
\ No newline at end of file
diff --git a/code/modules/food&drinks/food/snacks_salad.dm b/code/modules/food&drinks/food/snacks_salad.dm
index 0e9cb68f107..d98273c4fb3 100644
--- a/code/modules/food&drinks/food/snacks_salad.dm
+++ b/code/modules/food&drinks/food/snacks_salad.dm
@@ -1,9 +1,11 @@
//this category is very little but I think that it has great potential to grow
////////////////////////////////////////////SALAD////////////////////////////////////////////
/obj/item/weapon/reagent_containers/food/snacks/salad
+ icon = 'icons/obj/food/soupsalad.dmi'
trash = /obj/item/weapon/reagent_containers/glass/bowl
bitesize = 3
w_class = 3
+ list_reagents = list("nutriment" = 7, "vitamin" = 2)
/obj/item/weapon/reagent_containers/food/snacks/salad/New()
..()
@@ -29,3 +31,62 @@
icon_state = "validsalad"
bonus_reagents = list("doctorsdelight" = 5, "vitamin" = 4)
list_reagents = list("nutriment" = 8, "doctorsdelight" = 5, "vitamin" = 2)
+
+/obj/item/weapon/reagent_containers/food/snacks/salad/oatmeal
+ name = "oatmeal"
+ desc = "A nice bowl of oatmeal."
+ icon_state = "oatmeal"
+ bonus_reagents = list("nutriment" = 4, "vitamin" = 4)
+ list_reagents = list("nutriment" = 7, "milk" = 10, "vitamin" = 2)
+
+/obj/item/weapon/reagent_containers/food/snacks/salad/fruit
+ name = "fruit salad"
+ desc = "Your standard fruit salad."
+ icon_state = "fruitsalad"
+ bonus_reagents = list("nutriment" = 2, "vitamin" = 4)
+
+/obj/item/weapon/reagent_containers/food/snacks/salad/jungle
+ name = "jungle salad"
+ desc = "Exotic fruits in a bowl."
+ icon_state = "junglesalad"
+ bonus_reagents = list("nutriment" = 4, "vitamin" = 4)
+ list_reagents = list("nutriment" = 7, "banana" = 5, "vitamin" = 4)
+
+/obj/item/weapon/reagent_containers/food/snacks/salad/citrusdelight
+ name = "citrus delight"
+ desc = "Citrus overload!"
+ icon_state = "citrusdelight"
+ bonus_reagents = list("nutriment" = 4, "vitamin" = 4)
+ list_reagents = list("nutriment" = 7, "vitamin" = 5)
+
+/obj/item/weapon/reagent_containers/food/snacks/salad/ricebowl
+ name = "ricebowl"
+ desc = "A bowl of raw rice."
+ icon_state = "ricebowl"
+ cooked_type = /obj/item/weapon/reagent_containers/food/snacks/salad/boiledrice
+ list_reagents = list("nutriment" = 4)
+
+/obj/item/weapon/reagent_containers/food/snacks/salad/boiledrice
+ name = "boiled rice"
+ desc = "A warm bowl of rice."
+ icon_state = "boiledrice"
+ bonus_reagents = list("nutriment" = 1, "vitamin" = 1)
+ list_reagents = list("nutriment" = 5, "vitamin" = 1)
+
+/obj/item/weapon/reagent_containers/food/snacks/salad/ricepudding
+ name = "rice pudding"
+ desc = "Everybody loves rice pudding!"
+ icon_state = "ricepudding"
+ bonus_reagents = list("nutriment" = 4, "vitamin" = 2)
+
+/obj/item/weapon/reagent_containers/food/snacks/salad/ricepork
+ name = "rice and pork"
+ desc = "Well, it looks like pork..."
+ icon_state = "riceporkbowl"
+ bonus_reagents = list("nutriment" = 4, "vitamin" = 4)
+
+/obj/item/weapon/reagent_containers/food/snacks/salad/eggbowl
+ name = "egg bowl"
+ desc = "A bowl of rice with a fried egg."
+ icon_state = "eggbowl"
+ bonus_reagents = list("nutriment" = 4, "vitamin" = 4)
diff --git a/code/modules/food&drinks/food/snacks_sandwichtoast.dm b/code/modules/food&drinks/food/snacks_sandwichtoast.dm
index b1196ce7ff5..cef39b6836b 100644
--- a/code/modules/food&drinks/food/snacks_sandwichtoast.dm
+++ b/code/modules/food&drinks/food/snacks_sandwichtoast.dm
@@ -2,6 +2,7 @@
/obj/item/weapon/reagent_containers/food/snacks/sandwich
name = "sandwich"
desc = "A grand creation of meat, cheese, bread, and several leaves of lettuce! Arthur Dent would be proud."
+ icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "sandwich"
trash = /obj/item/trash/plate
bonus_reagents = list("nutriment" = 1, "vitamin" = 1)
@@ -11,6 +12,7 @@
/obj/item/weapon/reagent_containers/food/snacks/toastedsandwich
name = "toasted sandwich"
desc = "Now if you only had a pepper bar."
+ icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "toastedsandwich"
trash = /obj/item/trash/plate
bonus_reagents = list("nutriment" = 1, "carbon" = 2)
@@ -19,6 +21,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grilledcheese
name = "grilled cheese sandwich"
desc = "Goes great with Tomato soup!"
+ icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "toastedsandwich"
trash = /obj/item/trash/plate
bonus_reagents = list("nutriment" = 1, "vitamin" = 1)
@@ -27,6 +30,7 @@
/obj/item/weapon/reagent_containers/food/snacks/jellysandwich
name = "jelly sandwich"
desc = "You wish you had some peanut butter to go with this..."
+ icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "jellysandwich"
trash = /obj/item/trash/plate
bitesize = 3
@@ -42,6 +46,7 @@
/obj/item/weapon/reagent_containers/food/snacks/icecreamsandwich
name = "icecream sandwich"
desc = "Portable Ice-cream in it's own packaging."
+ icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "icecreamsandwich"
bonus_reagents = list("nutriment" = 1, "ice" = 2)
list_reagents = list("nutriment" = 2, "ice" = 2)
@@ -49,6 +54,7 @@
/obj/item/weapon/reagent_containers/food/snacks/notasandwich
name = "not-a-sandwich"
desc = "Something seems to be wrong with this, you can't quite figure what. Maybe it's his moustache."
+ icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "notasandwich"
trash = /obj/item/trash/plate
bonus_reagents = list("vitamin" = 6)
@@ -57,6 +63,7 @@
/obj/item/weapon/reagent_containers/food/snacks/jelliedtoast
name = "jellied toast"
desc = "A slice of bread covered with delicious jam."
+ icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "jellytoast"
trash = /obj/item/trash/plate
bitesize = 3
@@ -72,6 +79,7 @@
/obj/item/weapon/reagent_containers/food/snacks/twobread
name = "two bread"
desc = "This seems awfully bitter."
+ icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "twobread"
bonus_reagents = list("nutriment" = 1, "vitamin" = 2)
list_reagents = list("nutriment" = 2, "vitamin" = 2)
diff --git a/code/modules/food&drinks/food/snacks_soup.dm b/code/modules/food&drinks/food/snacks_soup.dm
index 3df14169642..8248ab27aeb 100644
--- a/code/modules/food&drinks/food/snacks_soup.dm
+++ b/code/modules/food&drinks/food/snacks_soup.dm
@@ -1,7 +1,9 @@
/obj/item/weapon/reagent_containers/food/snacks/soup
w_class = 3
+ icon = 'icons/obj/food/soupsalad.dmi'
trash = /obj/item/weapon/reagent_containers/glass/bowl
bitesize = 5
+ volume = 80
list_reagents = list("nutriment" = 8, "water" = 5, "vitamin" = 4)
/obj/item/weapon/reagent_containers/food/snacks/soup/New()
@@ -42,6 +44,14 @@
bonus_reagents = list("nutriment" = 1, "vitamin" = 6)
list_reagents = list("nutriment" = 2, "blood" = 10, "water" = 5, "vitamin" = 4)
+/obj/item/weapon/reagent_containers/food/snacks/soup/wingfangchu
+ name = "wing fang chu"
+ desc = "A savory dish of alien wing wang in soy."
+ icon_state = "wingfangchu"
+ trash = /obj/item/weapon/reagent_containers/glass/bowl
+ bonus_reagents = list("nutriment" = 1, "vitamin" = 2)
+ list_reagents = list("nutriment" = 6, "soysauce" = 5, "vitamin" = 2)
+
/obj/item/weapon/reagent_containers/food/snacks/soup/clownstears
name = "clown's tears"
desc = "Not very funny."
@@ -120,7 +130,6 @@
desc = "Wait, how do you spell it again..?"
icon_state = "beetsoup"
bonus_reagents = list("nutriment" = 1, "vitamin" = 5)
- list_reagents = list("nutriment" = 8, "vitamin" = 4)
/obj/item/weapon/reagent_containers/food/snacks/soup/beet/New()
..()
@@ -150,3 +159,18 @@
bonus_reagents = list("nutriment" = 1, "tomatojuice" = 5, "vitamin" = 5)
list_reagents = list("nutriment" = 10, "oculine" = 5, "tomatojuice" = 5, "vitamin" = 5)
bitesize = 7
+ volume = 100
+
+/obj/item/weapon/reagent_containers/food/snacks/soup/sweetpotato
+ name = "sweet potato soup"
+ desc = "Delicious sweet potato in soup form."
+ icon_state = "sweetpotatosoup"
+ bonus_reagents = list("nutriment" = 4, "vitamin" = 5)
+
+/obj/item/weapon/reagent_containers/food/snacks/soup/beet/red
+ name = "red beet soup"
+ desc = "Quite a delicacy."
+ icon_state = "redbeetsoup"
+ bonus_reagents = list("nutriment" = 4, "vitamin" = 6)
+
+
diff --git a/code/modules/food&drinks/food/snacks_spaghetti.dm b/code/modules/food&drinks/food/snacks_spaghetti.dm
index 1545ae518fc..251217a54ed 100644
--- a/code/modules/food&drinks/food/snacks_spaghetti.dm
+++ b/code/modules/food&drinks/food/snacks_spaghetti.dm
@@ -2,6 +2,7 @@
/obj/item/weapon/reagent_containers/food/snacks/spaghetti
name = "spaghetti"
desc = "Now that's a nic'e pasta!"
+ icon = 'icons/obj/food/pizzaspaghetti.dmi'
icon_state = "spaghetti"
list_reagents = list("nutriment" = 1, "vitamin" = 1)
cooked_type = /obj/item/weapon/reagent_containers/food/snacks/boiledspaghetti
@@ -10,6 +11,7 @@
/obj/item/weapon/reagent_containers/food/snacks/boiledspaghetti
name = "boiled spaghetti"
desc = "A plain dish of noodles, this needs more ingredients."
+ icon = 'icons/obj/food/pizzaspaghetti.dmi'
icon_state = "spaghettiboiled"
trash = /obj/item/trash/plate
bonus_reagents = list("nutriment" = 2)
@@ -20,6 +22,7 @@
/obj/item/weapon/reagent_containers/food/snacks/pastatomato
name = "spaghetti"
desc = "Spaghetti and crushed tomatoes. Just like your abusive father used to make!"
+ icon = 'icons/obj/food/pizzaspaghetti.dmi'
icon_state = "pastatomato"
trash = /obj/item/trash/plate
bitesize = 4
@@ -30,6 +33,7 @@
/obj/item/weapon/reagent_containers/food/snacks/copypasta
name = "copypasta"
desc = "You probably shouldn't try this, you always hear people talking about how bad it is..."
+ icon = 'icons/obj/food/pizzaspaghetti.dmi'
icon_state = "copypasta"
trash = /obj/item/trash/plate
bitesize = 4
@@ -40,6 +44,7 @@
/obj/item/weapon/reagent_containers/food/snacks/meatballspaghetti
name = "spaghetti and meatballs"
desc = "Now that's a nic'e meatball!"
+ icon = 'icons/obj/food/pizzaspaghetti.dmi'
icon_state = "meatballspaghetti"
trash = /obj/item/trash/plate
bonus_reagents = list("nutriment" = 1, "vitamin" = 4)
@@ -49,8 +54,26 @@
/obj/item/weapon/reagent_containers/food/snacks/spesslaw
name = "spesslaw"
desc = "A lawyers favourite."
+ icon = 'icons/obj/food/pizzaspaghetti.dmi'
icon_state = "spesslaw"
trash = /obj/item/trash/plate
bonus_reagents = list("nutriment" = 1, "vitamin" = 6)
list_reagents = list("nutriment" = 8, "vitamin" = 6)
filling_color = "#F0E68C"
+
+/obj/item/weapon/reagent_containers/food/snacks/chowmein
+ name = "chow mein"
+ desc = "A nice mix of noodles and fried vegetables."
+ icon = 'icons/obj/food/pizzaspaghetti.dmi'
+ icon_state = "chowmein"
+ trash = /obj/item/trash/plate
+ bonus_reagents = list("nutriment" = 3, "vitamin" = 4)
+ list_reagents = list("nutriment" = 7, "vitamin" = 6)
+
+/obj/item/weapon/reagent_containers/food/snacks/beefnoodle
+ name = "beef noodle"
+ desc = "Nutritious, beefy and noodly."
+ icon = 'icons/obj/food/pizzaspaghetti.dmi'
+ icon_state = "beefnoodle"
+ trash = /obj/item/weapon/reagent_containers/glass/bowl
+ bonus_reagents = list("nutriment" = 5, "vitamin" = 6)
\ No newline at end of file
diff --git a/code/modules/food&drinks/kitchen machinery/gibber.dm b/code/modules/food&drinks/kitchen machinery/gibber.dm
index 640e9d9024a..064e0aeb379 100644
--- a/code/modules/food&drinks/kitchen machinery/gibber.dm
+++ b/code/modules/food&drinks/kitchen machinery/gibber.dm
@@ -124,10 +124,10 @@
if(src.operating)
return
if(!src.occupant)
- visible_message("You hear a loud metallic grinding sound.")
+ visible_message("You hear a loud metallic grinding sound.")
return
use_power(1000)
- visible_message("You hear a loud squelchy grinding sound.")
+ visible_message("You hear a loud squelchy grinding sound.")
src.operating = 1
update_icon()
var/sourcename = src.occupant.real_name
@@ -136,16 +136,16 @@
var/sourcetotalreagents = src.occupant.reagents.total_volume
var/totalslabs = 3
- var/obj/item/weapon/reagent_containers/food/snacks/meat/human/allmeat[totalslabs]
+ var/obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/allmeat[totalslabs]
if(ishuman(occupant))
var/mob/living/carbon/human/gibee = occupant
if(gibee.dna && gibee.dna.species)
typeofmeat = gibee.dna.species.meat
else
- typeofmeat = /obj/item/weapon/reagent_containers/food/snacks/meat/human
+ typeofmeat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human
for (var/i=1 to totalslabs)
- var/obj/item/weapon/reagent_containers/food/snacks/meat/human/newmeat = new typeofmeat
+ var/obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/newmeat = new typeofmeat
newmeat.name = sourcename + newmeat.name
newmeat.subjectname = sourcename
newmeat.subjectjob = sourcejob
diff --git a/code/modules/food&drinks/kitchen machinery/icecream_vat.dm b/code/modules/food&drinks/kitchen machinery/icecream_vat.dm
index 1965f4cdde4..a42158fca57 100644
--- a/code/modules/food&drinks/kitchen machinery/icecream_vat.dm
+++ b/code/modules/food&drinks/kitchen machinery/icecream_vat.dm
@@ -126,7 +126,7 @@
else
src.visible_message("[user] whips up some [flavour] icecream.")
else
- user << "You don't have the ingredients to make this."
+ user << "You don't have the ingredients to make this!"
/obj/machinery/icecream_vat/Topic(href, href_list)
if(..())
diff --git a/code/modules/food&drinks/kitchen machinery/juicer.dm b/code/modules/food&drinks/kitchen machinery/juicer.dm
index 3cf4bc60a2a..4894af742f3 100644
--- a/code/modules/food&drinks/kitchen machinery/juicer.dm
+++ b/code/modules/food&drinks/kitchen machinery/juicer.dm
@@ -23,6 +23,8 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/watermelon = "watermelonjuice",
/obj/item/weapon/reagent_containers/food/snacks/watermelonslice = "watermelonjuice",
/obj/item/weapon/reagent_containers/food/snacks/grown/berries/poison = "poisonberryjuice",
+ /obj/item/weapon/reagent_containers/food/snacks/grown/pumpkin = "pumpkinjuice",
+ /obj/item/weapon/reagent_containers/food/snacks/grown/blumpkin = "blumpkinjuice",
)
/obj/machinery/juicer/New()
@@ -42,7 +44,7 @@
return 1
else
if(!user.unEquip(O))
- user << "\the [O] is stuck to your hand, you cannot put it in \the [src]"
+ user << "\the [O] is stuck to your hand, you cannot put it in \the [src]!"
return 0
O.loc = src
beaker = O
@@ -54,7 +56,7 @@
user << "It looks as not containing any juice."
return 1
if(!user.unEquip(O))
- user << "\the [O] is stuck to your hand, you cannot put it in \the [src]"
+ user << "\the [O] is stuck to your hand, you cannot put it in \the [src]!"
return 0
O.loc = src
src.updateUsrDialog()
diff --git a/code/modules/food&drinks/kitchen machinery/microwave.dm b/code/modules/food&drinks/kitchen machinery/microwave.dm
index 48b0cff7ad5..4db5f5ea817 100644
--- a/code/modules/food&drinks/kitchen machinery/microwave.dm
+++ b/code/modules/food&drinks/kitchen machinery/microwave.dm
@@ -59,24 +59,24 @@
if(src.broken > 0)
if(src.broken == 2 && istype(O, /obj/item/weapon/wirecutters)) // If it's broken and they're using a screwdriver
user.visible_message( \
- "[user] starts to fix part of the microwave.", \
- "You start to fix part of the microwave." \
+ "[user] starts to fix part of the microwave.", \
+ "You start to fix part of the microwave..." \
)
if (do_after(user,20))
user.visible_message( \
- "[user] fixes part of the microwave.", \
- "You have fixed part of the microwave." \
+ "[user] fixes part of the microwave.", \
+ "You fix part of the microwave." \
)
src.broken = 1 // Fix it a bit
else if(src.broken == 1 && istype(O, /obj/item/weapon/weldingtool)) // If it's broken and they're doing the wrench
user.visible_message( \
- "[user] starts to fix part of the microwave.", \
- "You start to fix part of the microwave." \
+ "[user] starts to fix part of the microwave.", \
+ "You start to fix part of the microwave..." \
)
if (do_after(user,20))
user.visible_message( \
- "[user] fixes the microwave.", \
- "You have fixed the microwave." \
+ "[user] fixes the microwave.", \
+ "You fix the microwave." \
)
src.icon_state = "mw"
src.broken = 0 // Fix it!
@@ -84,7 +84,7 @@
src.flags = OPENCONTAINER
return 0 //to use some fuel
else
- user << "It's broken!"
+ user << "It's broken!"
return 1
else if(istype(O, /obj/item/weapon/reagent_containers/spray/))
var/obj/item/weapon/reagent_containers/spray/clean_spray = O
@@ -92,8 +92,8 @@
clean_spray.reagents.remove_reagent("cleaner",clean_spray.amount_per_transfer_from_this,1)
playsound(loc, 'sound/effects/spray3.ogg', 50, 1, -6)
user.visible_message( \
- "[user] has cleaned the microwave.", \
- "You have cleaned the microwave." \
+ "[user] has cleaned the microwave.", \
+ "You clean the microwave." \
)
src.dirty = 0 // It's clean!
src.broken = 0 // just to be sure
@@ -102,19 +102,19 @@
src.updateUsrDialog()
return 1 // Disables the after-attack so we don't spray the floor/user.
else
- user << "You need more space cleaner!"
+ user << "You need more space cleaner!"
return 1
else if(istype(O, /obj/item/weapon/soap/)) // If they're trying to clean it then let them
var/obj/item/weapon/soap/P = O
user.visible_message( \
- "[user] starts to clean the microwave.", \
- "You start to clean the microwave." \
+ "[user] starts to clean the microwave.S", \
+ "You start to clean the microwave..." \
)
if (do_after(user, P.cleanspeed))
user.visible_message( \
- "[user] has cleaned the microwave.", \
- "You have cleaned the microwave." \
+ "[user] has cleaned the microwave.", \
+ "You clean the microwave." \
)
src.dirty = 0 // It's clean!
src.broken = 0 // just to be sure
@@ -122,7 +122,7 @@
src.flags = OPENCONTAINER
else if(src.dirty==100) // The microwave is all dirty so can't be used!
- user << "It's dirty!"
+ user << "It's dirty!"
return 1
else if(istype(O, /obj/item/weapon/storage/bag/tray))
@@ -130,7 +130,7 @@
var/loaded = 0
for(var/obj/item/weapon/reagent_containers/food/snacks/S in T.contents)
if (contents.len>=max_n_of_items)
- user << "[src] is full, you cannot put more."
+ user << "[src] is full, you cannot put more!"
return 1
T.remove_from_storage(S, src)
loaded++
@@ -141,16 +141,16 @@
else if(istype(O,/obj/item/weapon/reagent_containers/food/snacks))
if (contents.len>=max_n_of_items)
- user << "[src] is full, you cannot put more."
+ user << "[src] is full, you cannot put more!"
return 1
else
// user.unEquip(O) //This just causes problems so far as I can tell. -Pete
if(!user.drop_item())
- user << "\the [O] is stuck to your hand, you cannot put it in \the [src]"
+ user << "\the [O] is stuck to your hand, you cannot put it in \the [src]!"
return 0
O.loc = src
user.visible_message( \
- "[user] has added \the [O] to \the [src].", \
+ "[user] has added \the [O] to \the [src].", \
"You add \the [O] to \the [src].")
else
@@ -272,7 +272,7 @@
return 0
/obj/machinery/microwave/proc/start()
- visible_message("The microwave turns on.", "You hear a microwave.")
+ visible_message("The microwave turns on.", "You hear a microwave humming.")
operating = 1
icon_state = "mw1"
updateUsrDialog()
@@ -298,7 +298,7 @@
/obj/machinery/microwave/proc/muck_finish()
playsound(src.loc, 'sound/machines/ding.ogg', 50, 1)
- visible_message("The microwave gets covered in muck!")
+ visible_message("The microwave gets covered in muck!")
dirty = 100 // Make it dirty so it can't be used util cleaned
icon_state = "mwbloody" // Make it look dirty too
operating = 0 // Turn it off again aferwards
@@ -313,7 +313,7 @@
s.set_up(2, 1, src)
s.start()
icon_state = "mwb" // Make it look all busted up and shit
- visible_message("The microwave breaks!") //Let them know they're stupid
+ visible_message("The microwave breaks!") //Let them know they're stupid
broken = 2 // Make it broken so it can't be used util fixed
flags = null //So you can't add condiments
operating = 0 // Turn it off again aferwards
diff --git a/code/modules/food&drinks/kitchen machinery/processor.dm b/code/modules/food&drinks/kitchen machinery/processor.dm
index 470c09315ae..cd87e36e038 100644
--- a/code/modules/food&drinks/kitchen machinery/processor.dm
+++ b/code/modules/food&drinks/kitchen machinery/processor.dm
@@ -27,7 +27,7 @@
/* objs */
/datum/food_processor_process/meat
- input = /obj/item/weapon/reagent_containers/food/snacks/meat
+ input = /obj/item/weapon/reagent_containers/food/snacks/meat/slab
output = /obj/item/weapon/reagent_containers/food/snacks/faggot
/datum/food_processor_process/potato
@@ -46,13 +46,25 @@
input = /obj/item/weapon/reagent_containers/food/snacks/doughslice
output = /obj/item/weapon/reagent_containers/food/snacks/spaghetti
+/datum/food_processor_process/corn
+ input = /obj/item/weapon/reagent_containers/food/snacks/grown/corn
+ output = /obj/item/weapon/reagent_containers/food/snacks/tortilla
+
+/datum/food_processor_process/parsnip
+ input = /obj/item/weapon/reagent_containers/food/snacks/grown/parsnip
+ output = /obj/item/weapon/reagent_containers/food/snacks/roastparsnip
+
+/datum/food_processor_process/sweetpotato
+ input = /obj/item/weapon/reagent_containers/food/snacks/grown/sweetpotato
+ output = /obj/item/weapon/reagent_containers/food/snacks/yakiimo
+
/* mobs */
-/datum/food_processor_process/mob/process(loc, what)
+/datum/food_processor_process/mob/process_food(loc, what)
..()
-/datum/food_processor_process/mob/slime/process(loc, what)
+/datum/food_processor_process/mob/slime/process_food(loc, what)
var/mob/living/simple_animal/slime/S = what
var/C = S.cores
if(S.stat != DEAD)
@@ -67,13 +79,13 @@
/datum/food_processor_process/mob/slime/input = /mob/living/simple_animal/slime
/datum/food_processor_process/mob/slime/output = null
-/datum/food_processor_process/mob/monkey/process(loc, what)
+/datum/food_processor_process/mob/monkey/process_food(loc, what)
var/mob/living/carbon/monkey/O = what
if (O.client) //grief-proof
O.loc = loc
O.visible_message("Suddenly [O] jumps out from the processor!", \
- "You jump out from the processor", \
- "You hear chimpering")
+ "You jump out from the processor!", \
+ "You hear chimpering.")
return
var/obj/item/weapon/reagent_containers/glass/bucket/bucket_of_blood = new(loc)
var/datum/reagent/blood/B = new()
@@ -109,10 +121,10 @@
/obj/machinery/processor/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
if(src.processing)
- user << "The processor is in the process of processing."
+ user << "The processor is in the process of processing!"
return 1
if(src.contents.len > 0) //TODO: several items at once? several different items?
- user << "Something is already in the processing chamber."
+ user << "Something is already in the processing chamber!"
return 1
if(default_unfasten_wrench(user, O))
return
@@ -125,7 +137,7 @@
var/datum/food_processor_process/P = select_recipe(what)
if (!P)
- user << "That probably won't blend."
+ user << "That probably won't blend!"
return 1
user.visible_message("[user] put [what] into [src].", \
"You put the [what] into [src].")
@@ -137,10 +149,10 @@
if (src.stat != 0) //NOPOWER etc
return
if(src.processing)
- user << "The processor is in the process of processing."
+ user << "The processor is in the process of processing!"
return 1
if(src.contents.len == 0)
- user << "The processor is empty."
+ user << "The processor is empty!"
return 1
for(var/O in src.contents)
var/datum/food_processor_process/P = select_recipe(O)
@@ -148,15 +160,15 @@
log_admin("DEBUG: [O] in processor havent suitable recipe. How do you put it in?") //-rastaf0
continue
src.processing = 1
- user.visible_message("[user] turns on \a [src].", \
- "You turn on \a [src].", \
- "You hear a food processor")
+ user.visible_message("[user] turns on \a [src].", \
+ "You turn on \a [src].", \
+ "You hear a food processor.")
playsound(src.loc, 'sound/machines/blender.ogg', 50, 1)
use_power(500)
sleep(P.time)
- P.process(src.loc, O)
+ P.process_food(src.loc, O)
src.processing = 0
- src.visible_message("\the [src] finished processing.")
+ src.visible_message("\the [src] finishes processing.")
/obj/machinery/processor/verb/eject()
set category = "Object"
diff --git a/code/modules/food&drinks/kitchen machinery/smartfridge.dm b/code/modules/food&drinks/kitchen machinery/smartfridge.dm
index f9c5bdb002e..35c84a26620 100644
--- a/code/modules/food&drinks/kitchen machinery/smartfridge.dm
+++ b/code/modules/food&drinks/kitchen machinery/smartfridge.dm
@@ -42,12 +42,12 @@
return 0
if(contents.len >= max_n_of_items)
- user << "\The [src] is full."
+ user << "\The [src] is full!"
return 0
if(accept_check(O))
load(O)
- user.visible_message("[user] has added \the [O] to \the [src].", "You add \the [O] to \the [src].")
+ user.visible_message("[user] has added \the [O] to \the [src].", "You add \the [O] to \the [src].")
updateUsrDialog()
return 1
@@ -62,7 +62,7 @@
load(G)
loaded++
else
- user << "\The [src] smartly refuses [O]."
+ user << "\The [src] smartly refuses [O]."
updateUsrDialog()
return 0
@@ -70,15 +70,15 @@
// this code follows storage items and trays only.
if(loaded)
if(contents.len >= max_n_of_items)
- user.visible_message("[user] loads \the [src] with \the [O].", \
+ user.visible_message("[user] loads \the [src] with \the [O].", \
"You fill \the [src] with \the [O].")
else
- user.visible_message("[user] loads \the [src] with \the [O].", \
+ user.visible_message("[user] loads \the [src] with \the [O].", \
"You load \the [src] with \the [O].")
if(O.contents.len > 0)
- user << "Some items are refused."
+ user << "Some items are refused."
else
- user << "There is nothing in [O] to put in [src]."
+ user << "There is nothing in [O] to put in [src]!"
return 0
updateUsrDialog()
@@ -95,7 +95,7 @@
if(istype(O.loc,/mob))
var/mob/M = O.loc
if(!M.unEquip(O))
- usr << "\the [O] is stuck to your hand, you cannot put it in \the [src]"
+ usr << "\the [O] is stuck to your hand, you cannot put it in \the [src]!"
return
else if(istype(O.loc,/obj/item/weapon/storage))
var/obj/item/weapon/storage/S = O.loc
diff --git a/code/modules/food&drinks/recipes/drinks_recipes.dm b/code/modules/food&drinks/recipes/drinks_recipes.dm
index 2f23ceee03f..6af179bf2f1 100644
--- a/code/modules/food&drinks/recipes/drinks_recipes.dm
+++ b/code/modules/food&drinks/recipes/drinks_recipes.dm
@@ -506,3 +506,59 @@
result = "thirteenloko"
required_reagents = list("vodka" = 1, "coffee" = 1, "limejuice" = 1)
result_amount = 3
+
+/datum/chemical_reaction/chocolatepudding
+ name = "Chocolate Pudding"
+ id = "chocolatepudding"
+ result = "chocolatepudding"
+ required_reagents = list("cocoa" = 5, "milk" = 5, "eggyolk" = 5)
+ result_amount = 20
+
+/datum/chemical_reaction/vanillapudding
+ name = "Vanilla Pudding"
+ id = "vanillapudding"
+ result = "vanillapudding"
+ required_reagents = list("vanilla" = 5, "milk" = 5, "eggyolk" = 5)
+ result_amount = 20
+
+/datum/chemical_reaction/cherryshake
+ name = "Cherry Shake"
+ id = "cherryshake"
+ result = "cherryshake"
+ required_reagents = list("cherryjelly" = 1, "ice" = 1, "cream" = 1)
+ result_amount = 3
+
+/datum/chemical_reaction/bluecherryshake
+ name = "Blue Cherry Shake"
+ id = "bluecherryshake"
+ result = "bluecherryshake"
+ required_reagents = list("bluecherryjelly" = 1, "ice" = 1, "cream" = 1)
+ result_amount = 3
+
+/datum/chemical_reaction/drunkenblumpkin
+ name = "Drunken Blumpkin"
+ id = "drunkenblumpkin"
+ result = "drunkenblumpkin"
+ required_reagents = list("blumpkinjuice" = 1, "irishcream" = 2, "ice" = 1)
+ result_amount = 4
+
+/datum/chemical_reaction/pumpkin_latte
+ name = "Pumpkin latte"
+ id = "pumpkin_latte"
+ result = "pumpkin_latte"
+ required_reagents = list("pumpkinjuice" = 5, "coffee" = 5, "cream" = 5)
+ result_amount = 15
+
+/datum/chemical_reaction/gibbfloats
+ name = "Gibb Floats"
+ id = "gibbfloats"
+ result = "gibbfloats"
+ required_reagents = list("dr_gibb" = 5, "ice" = 5, "cream" = 5)
+ result_amount = 15
+
+/datum/chemical_reaction/triple_citrus
+ name = "triple_citrus"
+ id = "triple_citrus"
+ result = "triple_citrus"
+ required_reagents = list("lemonjuice" = 1, "limejuice" = 1, "orangejuice" = 1)
+ result_amount = 5
\ No newline at end of file
diff --git a/code/modules/food&drinks/recipes/food_mixtures.dm b/code/modules/food&drinks/recipes/food_mixtures.dm
index 593dce5b8db..f6d4bf2145f 100644
--- a/code/modules/food&drinks/recipes/food_mixtures.dm
+++ b/code/modules/food&drinks/recipes/food_mixtures.dm
@@ -71,6 +71,14 @@
required_reagents = list("soymilk" = 4, "sacid" = 1)
result_amount = 5
+/datum/chemical_reaction/corn_syrup
+ name = "corn_syrup"
+ id = "corn_syrup"
+ result = "corn_syrup"
+ required_reagents = list("corn_starch" = 1, "sacid" = 1)
+ result_amount = 5
+ required_temp = 374
+
/datum/chemical_reaction/cheesewheel
name = "Cheesewheel"
id = "cheesewheel"
@@ -81,7 +89,7 @@
/datum/chemical_reaction/cheesewheel/on_reaction(var/datum/reagents/holder, var/created_volume)
var/location = get_turf(holder.my_atom)
- new /obj/item/weapon/reagent_containers/food/snacks/cheesewheel(location)
+ new /obj/item/weapon/reagent_containers/food/snacks/store/cheesewheel(location)
return
/datum/chemical_reaction/synthmeat
@@ -94,7 +102,7 @@
/datum/chemical_reaction/synthmeat/on_reaction(var/datum/reagents/holder, var/created_volume)
var/location = get_turf(holder.my_atom)
- new /obj/item/weapon/reagent_containers/food/snacks/meat/synthmeat(location)
+ new /obj/item/weapon/reagent_containers/food/snacks/meat/slab/synthmeat(location)
return
/datum/chemical_reaction/hot_ramen
@@ -157,3 +165,17 @@
id = "vegancakebatter"
required_reagents = list("soymilk" = 15, "flour" = 15, "sugar" = 5)
+/datum/chemical_reaction/ricebowl
+ name = "Rice Bowl"
+ id = "ricebowl"
+ result = null
+ required_reagents = list("rice" = 10, "water" = 10)
+ result_amount = 1
+ required_container = /obj/item/weapon/reagent_containers/glass/bowl
+ mix_message = "The rice absorbs the water."
+
+/datum/chemical_reaction/ricebowl/on_reaction(var/datum/reagents/holder)
+ var/obj/item/weapon/reagent_containers/food/snacks/S = new /obj/item/weapon/reagent_containers/food/snacks/salad/ricebowl
+ S.loc = get_turf(holder.my_atom)
+ if(holder && holder.my_atom)
+ qdel(holder.my_atom)
diff --git a/code/modules/food&drinks/recipes/tablecraft/recipes_bread.dm b/code/modules/food&drinks/recipes/tablecraft/recipes_bread.dm
index 9e820b3791c..8dd5494537d 100644
--- a/code/modules/food&drinks/recipes/tablecraft/recipes_bread.dm
+++ b/code/modules/food&drinks/recipes/tablecraft/recipes_bread.dm
@@ -7,7 +7,7 @@
name = "Meat bread"
reqs = list(
/obj/item/weapon/reagent_containers/food/snacks/store/bread/plain = 1,
- /obj/item/weapon/reagent_containers/food/snacks/cutlet/plain = 3,
+ /obj/item/weapon/reagent_containers/food/snacks/meat/cutlet/plain = 3,
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge = 3
)
result = /obj/item/weapon/reagent_containers/food/snacks/store/bread/meat
@@ -16,7 +16,7 @@
name = "Xenomeat bread"
reqs = list(
/obj/item/weapon/reagent_containers/food/snacks/store/bread/plain = 1,
- /obj/item/weapon/reagent_containers/food/snacks/cutlet/xeno = 3,
+ /obj/item/weapon/reagent_containers/food/snacks/meat/cutlet/xeno = 3,
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge = 3
)
result = /obj/item/weapon/reagent_containers/food/snacks/store/bread/xenomeat
@@ -25,7 +25,7 @@
name = "Spidermeat bread"
reqs = list(
/obj/item/weapon/reagent_containers/food/snacks/store/bread/plain = 1,
- /obj/item/weapon/reagent_containers/food/snacks/cutlet/spider = 3,
+ /obj/item/weapon/reagent_containers/food/snacks/meat/cutlet/spider = 3,
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge = 3
)
result = /obj/item/weapon/reagent_containers/food/snacks/store/bread/spidermeat
@@ -58,3 +58,12 @@
)
result = /obj/item/weapon/reagent_containers/food/snacks/store/bread/creamcheese
+/datum/table_recipe/mimanabread
+ name = "Mimana bread"
+ reqs = list(
+ /datum/reagent/consumable/soymilk = 5,
+ /obj/item/weapon/reagent_containers/food/snacks/store/bread/plain = 1,
+ /obj/item/weapon/reagent_containers/food/snacks/tofu = 3,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/mimana = 1
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/store/bread/mimana
diff --git a/code/modules/food&drinks/recipes/tablecraft/recipes_burger.dm b/code/modules/food&drinks/recipes/tablecraft/recipes_burger.dm
index 53fea3217ec..feafb78594e 100644
--- a/code/modules/food&drinks/recipes/tablecraft/recipes_burger.dm
+++ b/code/modules/food&drinks/recipes/tablecraft/recipes_burger.dm
@@ -8,14 +8,14 @@
name = "Human burger"
reqs = list(
/obj/item/weapon/reagent_containers/food/snacks/bun = 1,
- /obj/item/weapon/reagent_containers/food/snacks/meatsteak/plain/human = 1
+ /obj/item/weapon/reagent_containers/food/snacks/meat/steak/plain/human = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/burger/human
/datum/table_recipe/burger
name = "Burger"
reqs = list(
- /obj/item/weapon/reagent_containers/food/snacks/meatsteak/plain = 1,
+ /obj/item/weapon/reagent_containers/food/snacks/meat/steak/plain = 1,
/obj/item/weapon/reagent_containers/food/snacks/bun = 1
)
@@ -40,7 +40,7 @@
/datum/table_recipe/xenoburger
name = "Xeno burger"
reqs = list(
- /obj/item/weapon/reagent_containers/food/snacks/meatsteak/xeno = 1,
+ /obj/item/weapon/reagent_containers/food/snacks/meat/steak/xeno = 1,
/obj/item/weapon/reagent_containers/food/snacks/bun = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/burger/xeno
@@ -48,7 +48,7 @@
datum/table_recipe/bearger
name = "Bearger"
reqs = list(
- /obj/item/weapon/reagent_containers/food/snacks/meatsteak/bear = 1,
+ /obj/item/weapon/reagent_containers/food/snacks/meat/steak/bear = 1,
/obj/item/weapon/reagent_containers/food/snacks/bun = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/burger/bearger
@@ -96,7 +96,7 @@ datum/table_recipe/bearger
/datum/table_recipe/redburger
name = "Red burger"
reqs = list(
- /obj/item/weapon/reagent_containers/food/snacks/meatsteak/plain = 1,
+ /obj/item/weapon/reagent_containers/food/snacks/meat/steak/plain = 1,
/obj/item/toy/crayon/red = 1,
/obj/item/weapon/reagent_containers/food/snacks/bun = 1
)
@@ -105,7 +105,7 @@ datum/table_recipe/bearger
/datum/table_recipe/orangeburger
name = "Orange burger"
reqs = list(
- /obj/item/weapon/reagent_containers/food/snacks/meatsteak/plain = 1,
+ /obj/item/weapon/reagent_containers/food/snacks/meat/steak/plain = 1,
/obj/item/toy/crayon/orange = 1,
/obj/item/weapon/reagent_containers/food/snacks/bun = 1
)
@@ -114,7 +114,7 @@ datum/table_recipe/bearger
/datum/table_recipe/yellowburger
name = "Yellow burger"
reqs = list(
- /obj/item/weapon/reagent_containers/food/snacks/meatsteak/plain = 1,
+ /obj/item/weapon/reagent_containers/food/snacks/meat/steak/plain = 1,
/obj/item/toy/crayon/yellow = 1,
/obj/item/weapon/reagent_containers/food/snacks/bun = 1
)
@@ -123,7 +123,7 @@ datum/table_recipe/bearger
/datum/table_recipe/greenburger
name = "Green burger"
reqs = list(
- /obj/item/weapon/reagent_containers/food/snacks/meatsteak/plain = 1,
+ /obj/item/weapon/reagent_containers/food/snacks/meat/steak/plain = 1,
/obj/item/toy/crayon/green = 1,
/obj/item/weapon/reagent_containers/food/snacks/bun = 1
)
@@ -132,7 +132,7 @@ datum/table_recipe/bearger
/datum/table_recipe/blueburger
name = "Blue burger"
reqs = list(
- /obj/item/weapon/reagent_containers/food/snacks/meatsteak/plain = 1,
+ /obj/item/weapon/reagent_containers/food/snacks/meat/steak/plain = 1,
/obj/item/toy/crayon/blue = 1,
/obj/item/weapon/reagent_containers/food/snacks/bun = 1
)
@@ -141,7 +141,7 @@ datum/table_recipe/bearger
/datum/table_recipe/purpleburger
name = "Purple burger"
reqs = list(
- /obj/item/weapon/reagent_containers/food/snacks/meatsteak/plain = 1,
+ /obj/item/weapon/reagent_containers/food/snacks/meat/steak/plain = 1,
/obj/item/toy/crayon/purple = 1,
/obj/item/weapon/reagent_containers/food/snacks/bun = 1
)
@@ -165,7 +165,7 @@ datum/table_recipe/bearger
/datum/table_recipe/bigbiteburger
name = "Big bite burger"
reqs = list(
- /obj/item/weapon/reagent_containers/food/snacks/meatsteak/plain = 3,
+ /obj/item/weapon/reagent_containers/food/snacks/meat/steak/plain = 3,
/obj/item/weapon/reagent_containers/food/snacks/bun = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/burger/bigbite
@@ -175,7 +175,7 @@ datum/table_recipe/bearger
reqs = list(
/datum/reagent/consumable/sodiumchloride = 5,
/datum/reagent/consumable/blackpepper = 5,
- /obj/item/weapon/reagent_containers/food/snacks/meatsteak/plain = 5,
+ /obj/item/weapon/reagent_containers/food/snacks/meat/steak/plain = 5,
/obj/item/weapon/reagent_containers/food/snacks/grown/tomato = 4,
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge = 3,
/obj/item/weapon/reagent_containers/food/snacks/boiledegg = 2,
@@ -198,4 +198,20 @@ datum/table_recipe/bearger
/datum/reagent/consumable/cherryjelly = 5,
/obj/item/weapon/reagent_containers/food/snacks/bun = 1
)
- result = /obj/item/weapon/reagent_containers/food/snacks/burger/jelly/cherry
\ No newline at end of file
+ result = /obj/item/weapon/reagent_containers/food/snacks/burger/jelly/cherry
+
+/datum/table_recipe/fivealarmburger
+ name = "Five alarm burger"
+ reqs = list(
+ /obj/item/weapon/reagent_containers/food/snacks/grown/ghost_chili = 2,
+ /obj/item/weapon/reagent_containers/food/snacks/bun = 1
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/burger/fivealarm
+
+/datum/table_recipe/ratburger
+ name = "Rat burger"
+ reqs = list(
+ /obj/item/trash/deadmouse = 1,
+ /obj/item/weapon/reagent_containers/food/snacks/bun = 1
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/burger/rat
\ No newline at end of file
diff --git a/code/modules/food&drinks/recipes/tablecraft/recipes_cake.dm b/code/modules/food&drinks/recipes/tablecraft/recipes_cake.dm
index e9fbbdacc7a..c5615809633 100644
--- a/code/modules/food&drinks/recipes/tablecraft/recipes_cake.dm
+++ b/code/modules/food&drinks/recipes/tablecraft/recipes_cake.dm
@@ -81,4 +81,12 @@
/obj/item/slime_extract = 1,
/obj/item/weapon/reagent_containers/food/snacks/store/cake/plain = 1
)
- result = /obj/item/weapon/reagent_containers/food/snacks/store/cake/slimecake
\ No newline at end of file
+ result = /obj/item/weapon/reagent_containers/food/snacks/store/cake/slimecake
+
+/datum/table_recipe/pumpkinspicecake
+ name = "Pumpkin spice cake"
+ reqs = list(
+ /obj/item/weapon/reagent_containers/food/snacks/store/cake/plain = 1,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/pumpkin = 2
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/store/cake/pumpkinspice
\ No newline at end of file
diff --git a/code/modules/food&drinks/recipes/tablecraft/recipes_egg.dm b/code/modules/food&drinks/recipes/tablecraft/recipes_egg.dm
index 98dee93aed5..4a0dbc40a07 100644
--- a/code/modules/food&drinks/recipes/tablecraft/recipes_egg.dm
+++ b/code/modules/food&drinks/recipes/tablecraft/recipes_egg.dm
@@ -32,7 +32,7 @@
name = "Eggs benedict"
reqs = list(
/obj/item/weapon/reagent_containers/food/snacks/friedegg = 1,
- /obj/item/weapon/reagent_containers/food/snacks/meatsteak = 1,
+ /obj/item/weapon/reagent_containers/food/snacks/meat/steak = 1,
/obj/item/weapon/reagent_containers/food/snacks/breadslice/plain = 1,
)
result = /obj/item/weapon/reagent_containers/food/snacks/benedict
diff --git a/code/modules/food&drinks/recipes/tablecraft/recipes_meat.dm b/code/modules/food&drinks/recipes/tablecraft/recipes_meat.dm
index d0855fabe69..9681bea3478 100644
--- a/code/modules/food&drinks/recipes/tablecraft/recipes_meat.dm
+++ b/code/modules/food&drinks/recipes/tablecraft/recipes_meat.dm
@@ -6,7 +6,7 @@
name = "Human kebab"
reqs = list(
/obj/item/stack/rods = 1,
- /obj/item/weapon/reagent_containers/food/snacks/meatsteak/plain/human = 2
+ /obj/item/weapon/reagent_containers/food/snacks/meat/steak/plain/human = 2
)
result = /obj/item/weapon/reagent_containers/food/snacks/kebab/human
@@ -14,7 +14,7 @@
name = "Kebab"
reqs = list(
/obj/item/stack/rods = 1,
- /obj/item/weapon/reagent_containers/food/snacks/meatsteak = 2
+ /obj/item/weapon/reagent_containers/food/snacks/meat/steak = 2
)
result = /obj/item/weapon/reagent_containers/food/snacks/kebab/monkey
@@ -72,7 +72,7 @@
reqs = list(
/datum/reagent/consumable/sodiumchloride = 1,
/obj/item/weapon/reagent_containers/food/snacks/spidereggs = 1,
- /obj/item/weapon/reagent_containers/food/snacks/cutlet/spider = 2
+ /obj/item/weapon/reagent_containers/food/snacks/meat/cutlet/spider = 2
)
result = /obj/item/weapon/reagent_containers/food/snacks/spidereggsham
@@ -82,7 +82,7 @@
name = "Corned beef"
reqs = list(
/datum/reagent/consumable/sodiumchloride = 5,
- /obj/item/weapon/reagent_containers/food/snacks/meatsteak = 1,
+ /obj/item/weapon/reagent_containers/food/snacks/meat/steak = 1,
/obj/item/weapon/reagent_containers/food/snacks/grown/cabbage = 2
)
result = /obj/item/weapon/reagent_containers/food/snacks/cornedbeef
@@ -91,25 +91,17 @@
name = "Filet migrawr"
reqs = list(
/datum/reagent/consumable/ethanol/manly_dorf = 5,
- /obj/item/weapon/reagent_containers/food/snacks/meatsteak/bear = 1,
- /obj/item/weapon/lighter/grayscale
+ /obj/item/weapon/reagent_containers/food/snacks/meat/steak/bear = 1,
)
+ tools = list(/obj/item/weapon/lighter)
result = /obj/item/weapon/reagent_containers/food/snacks/bearsteak
-/datum/table_recipe/wingfangchu
- name = "Wingfangchu"
- reqs = list(
- /datum/reagent/consumable/soysauce = 5,
- /obj/item/weapon/reagent_containers/food/snacks/cutlet/xeno = 2
- )
- result = /obj/item/weapon/reagent_containers/food/snacks/wingfangchu
-
/datum/table_recipe/enchiladas
name = "Enchiladas"
reqs = list(
- /obj/item/weapon/reagent_containers/food/snacks/cutlet = 2,
+ /obj/item/weapon/reagent_containers/food/snacks/meat/cutlet = 2,
/obj/item/weapon/reagent_containers/food/snacks/grown/chili = 2,
- /obj/item/weapon/reagent_containers/food/snacks/grown/corn = 1
+ /obj/item/weapon/reagent_containers/food/snacks/tortilla = 2
)
result = /obj/item/weapon/reagent_containers/food/snacks/enchiladas
@@ -126,6 +118,6 @@
name = "Sausage"
reqs = list(
/obj/item/weapon/reagent_containers/food/snacks/faggot = 1,
- /obj/item/weapon/reagent_containers/food/snacks/cutlet = 2
+ /obj/item/weapon/reagent_containers/food/snacks/meat/cutlet = 2
)
result = /obj/item/weapon/reagent_containers/food/snacks/sausage
diff --git a/code/modules/food&drinks/recipes/tablecraft/recipes_misc.dm b/code/modules/food&drinks/recipes/tablecraft/recipes_misc.dm
index f185b8e5cba..77389e00239 100644
--- a/code/modules/food&drinks/recipes/tablecraft/recipes_misc.dm
+++ b/code/modules/food&drinks/recipes/tablecraft/recipes_misc.dm
@@ -50,7 +50,7 @@
/obj/item/weapon/reagent_containers/food/snacks/friedegg = 1,
/obj/item/weapon/reagent_containers/food/snacks/grown/cabbage = 1,
)
- result = /obj/item/weapon/reagent_containers/food/snacks/wrap
+ result = /obj/item/weapon/reagent_containers/food/snacks/eggwrap
/datum/table_recipe/beans
name = "Beans"
@@ -103,3 +103,115 @@
)
result = /obj/item/weapon/reagent_containers/food/snacks/twobread
+/datum/table_recipe/burrito
+ name ="Burrito"
+ reqs = list(
+ /obj/item/weapon/reagent_containers/food/snacks/tortilla = 1,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/soybeans = 2
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/burrito
+
+/datum/table_recipe/cheesyburrito
+ name ="Cheesy burrito"
+ reqs = list(
+ /obj/item/weapon/reagent_containers/food/snacks/tortilla = 1,
+ /obj/item/weapon/reagent_containers/food/snacks/cheesewedge = 2,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/soybeans = 1
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/cheesyburrito
+
+/datum/table_recipe/carneburrito
+ name ="Carne de asada burrito"
+ reqs = list(
+ /obj/item/weapon/reagent_containers/food/snacks/tortilla = 1,
+ /obj/item/weapon/reagent_containers/food/snacks/meat/cutlet = 2,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/soybeans = 1
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/carneburrito
+
+/datum/table_recipe/fuegoburrito
+ name ="Fuego plasma burrito"
+ reqs = list(
+ /obj/item/weapon/reagent_containers/food/snacks/tortilla = 1,,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/ghost_chili = 2,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/soybeans = 1
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/fuegoburrito
+
+/datum/table_recipe/melonfruitbowl
+ name ="Melon fruit bowl"
+ reqs = list(
+ /obj/item/weapon/reagent_containers/food/snacks/grown/watermelon = 1,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/apple = 1,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/citrus/orange = 1,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/citrus/lemon = 1,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/banana = 1,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia = 1
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/melonfruitbowl
+
+/datum/table_recipe/spacefreezy
+ name ="Space freezy"
+ reqs = list(
+ /datum/reagent/consumable/bluecherryjelly = 5,
+ /datum/reagent/consumable/spacemountainwind = 15,
+ /obj/item/weapon/reagent_containers/food/snacks/icecream = 1
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/spacefreezy
+
+/datum/table_recipe/sundae
+ name ="Sundae"
+ reqs = list(
+ /datum/reagent/consumable/cream = 5,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/cherries = 1,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/banana = 1,
+ /obj/item/weapon/reagent_containers/food/snacks/icecream = 1
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/sundae
+
+/datum/table_recipe/honkdae
+ name ="Honkdae"
+ reqs = list(
+ /datum/reagent/consumable/cream = 5,
+ /obj/item/clothing/mask/gas/clown_hat = 1,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/cherries = 1,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/banana = 2,
+ /obj/item/weapon/reagent_containers/food/snacks/icecream = 1
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/honkdae
+
+/datum/table_recipe/nachos
+ name ="Nachos"
+ reqs = list(
+ /datum/reagent/consumable/sodiumchloride = 1,
+ /obj/item/weapon/reagent_containers/food/snacks/tortilla = 1
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/nachos
+
+/datum/table_recipe/cheesynachos
+ name ="Cheesy nachos"
+ reqs = list(
+ /datum/reagent/consumable/sodiumchloride = 1,
+ /obj/item/weapon/reagent_containers/food/snacks/cheesewedge = 1,
+ /obj/item/weapon/reagent_containers/food/snacks/tortilla = 1
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/cheesynachos
+
+/datum/table_recipe/cubannachos
+ name ="Cuban nachos"
+ reqs = list(
+ /datum/reagent/consumable/ketchup = 5,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/chili = 2,
+ /obj/item/weapon/reagent_containers/food/snacks/tortilla = 1
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/cubannachos
+
+/datum/table_recipe/melonkeg
+ name ="Melon keg"
+ reqs = list(
+ /datum/reagent/consumable/ethanol/vodka = 25,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/holymelon = 1,
+ /obj/item/weapon/reagent_containers/food/drinks/bottle/vodka = 1
+ )
+ parts = list(/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka = 1)
+ result = /obj/item/weapon/reagent_containers/food/snacks/melonkeg
\ No newline at end of file
diff --git a/code/modules/food&drinks/recipes/tablecraft/recipes_pastry.dm b/code/modules/food&drinks/recipes/tablecraft/recipes_pastry.dm
index aba37404d2f..7742687f49c 100644
--- a/code/modules/food&drinks/recipes/tablecraft/recipes_pastry.dm
+++ b/code/modules/food&drinks/recipes/tablecraft/recipes_pastry.dm
@@ -68,7 +68,7 @@
name = "Soylent green"
reqs = list(
/obj/item/weapon/reagent_containers/food/snacks/pastrybase = 2,
- /obj/item/weapon/reagent_containers/food/snacks/meat/human = 2
+ /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human = 2
)
result = /obj/item/weapon/reagent_containers/food/snacks/soylentgreen
@@ -210,3 +210,36 @@
/obj/item/weapon/reagent_containers/food/snacks/chocolatebar = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/chococornet
+
+/datum/table_recipe/oatmealcookie
+ name = "Oatmeal cookie"
+ reqs = list(
+ /obj/item/weapon/reagent_containers/food/snacks/pastrybase = 1,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/oat = 1
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/oatmealcookie
+
+/datum/table_recipe/raisincookie
+ name = "Raisin cookie"
+ reqs = list(
+ /obj/item/weapon/reagent_containers/food/snacks/no_raisin = 1,
+ /obj/item/weapon/reagent_containers/food/snacks/pastrybase = 1,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/oat = 1
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/raisincookie
+
+/datum/table_recipe/cherrycupcake
+ name = "Cherry cupcake"
+ reqs = list(
+ /obj/item/weapon/reagent_containers/food/snacks/pastrybase = 1,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/cherries = 1
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/cherrycupcake
+
+/datum/table_recipe/bluecherrycupcake
+ name = "Blue cherry cupcake"
+ reqs = list(
+ /obj/item/weapon/reagent_containers/food/snacks/pastrybase = 1,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/bluecherries = 1
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/bluecherrycupcake
\ No newline at end of file
diff --git a/code/modules/food&drinks/recipes/tablecraft/recipes_pie.dm b/code/modules/food&drinks/recipes/tablecraft/recipes_pie.dm
index 56bd20f6b4b..ea19ac642bc 100644
--- a/code/modules/food&drinks/recipes/tablecraft/recipes_pie.dm
+++ b/code/modules/food&drinks/recipes/tablecraft/recipes_pie.dm
@@ -18,7 +18,7 @@
/datum/reagent/consumable/blackpepper = 1,
/datum/reagent/consumable/sodiumchloride = 1,
/obj/item/weapon/reagent_containers/food/snacks/pie/plain = 1,
- /obj/item/weapon/reagent_containers/food/snacks/meatsteak/plain = 1
+ /obj/item/weapon/reagent_containers/food/snacks/meat/steak/plain = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/pie/meatpie
@@ -34,7 +34,7 @@
name = "Xeno pie"
reqs = list(
/obj/item/weapon/reagent_containers/food/snacks/pie/plain = 1,
- /obj/item/weapon/reagent_containers/food/snacks/cutlet/xeno = 1
+ /obj/item/weapon/reagent_containers/food/snacks/meat/cutlet/xeno = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/pie/xemeatpie
@@ -59,7 +59,7 @@
reqs = list(
/obj/item/weapon/reagent_containers/food/snacks/pie/plain = 1,
/obj/item/weapon/reagent_containers/food/snacks/grown/berries = 1,
- /obj/item/weapon/reagent_containers/food/snacks/meatsteak/bear = 1
+ /obj/item/weapon/reagent_containers/food/snacks/meat/steak/bear = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/pie/bearypie
@@ -95,7 +95,7 @@
/obj/item/weapon/reagent_containers/food/snacks/pie/plain = 1,
/obj/item/weapon/reagent_containers/food/snacks/grown/pumpkin = 1
)
- result = /obj/item/weapon/reagent_containers/food/snacks/pumpkinpie
+ result = /obj/item/weapon/reagent_containers/food/snacks/pie/pumpkinpie
/datum/table_recipe/goldenappletart
name = "Golden apple tart"
@@ -107,3 +107,29 @@
)
result = /obj/item/weapon/reagent_containers/food/snacks/pie/appletart
+/datum/table_recipe/blumpkinpie
+ name = "Blumpkin pie"
+ reqs = list(
+ /datum/reagent/consumable/milk = 5,
+ /datum/reagent/consumable/sugar = 5,
+ /obj/item/weapon/reagent_containers/food/snacks/pie/plain = 1,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/blumpkin = 1
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/pie/blumpkinpie
+
+/datum/table_recipe/dulcedebatata
+ name = "Dulce de batata"
+ reqs = list(
+ /datum/reagent/consumable/vanilla = 5,
+ /datum/reagent/water = 5,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/sweetpotato = 2
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/pie/dulcedebatata
+
+/datum/table_recipe/frostypie
+ name = "Frosty pie"
+ reqs = list(
+ /obj/item/weapon/reagent_containers/food/snacks/pie/plain = 1,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/bluecherries = 1
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/pie/frostypie
\ No newline at end of file
diff --git a/code/modules/food&drinks/recipes/tablecraft/recipes_pizza.dm b/code/modules/food&drinks/recipes/tablecraft/recipes_pizza.dm
index ea7273b4514..66702272f7b 100644
--- a/code/modules/food&drinks/recipes/tablecraft/recipes_pizza.dm
+++ b/code/modules/food&drinks/recipes/tablecraft/recipes_pizza.dm
@@ -16,11 +16,11 @@
name = "Meat pizza"
reqs = list(
/obj/item/weapon/reagent_containers/food/snacks/pizzabread = 1,
- /obj/item/weapon/reagent_containers/food/snacks/cutlet = 4,
+ /obj/item/weapon/reagent_containers/food/snacks/meat/cutlet = 4,
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge = 1,
/obj/item/weapon/reagent_containers/food/snacks/grown/tomato = 1
)
- result = /obj/item/weapon/reagent_containers/food/snacks/pizza/meatpizza
+ result = /obj/item/weapon/reagent_containers/food/snacks/pizza/meat
/datum/table_recipe/mushroompizza
name = "Mushroom pizza"
@@ -28,7 +28,7 @@
/obj/item/weapon/reagent_containers/food/snacks/pizzabread = 1,
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom = 5
)
- result = /obj/item/weapon/reagent_containers/food/snacks/pizza/mushroompizza
+ result = /obj/item/weapon/reagent_containers/food/snacks/pizza/mushroom
/datum/table_recipe/vegetablepizza
name = "Vegetable pizza"
@@ -39,6 +39,34 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/corn = 1,
/obj/item/weapon/reagent_containers/food/snacks/grown/tomato = 1
)
- result = /obj/item/weapon/reagent_containers/food/snacks/pizza/vegetablepizza
+ result = /obj/item/weapon/reagent_containers/food/snacks/pizza/vegetable
+/datum/table_recipe/donpocketpizza
+ name = "Donkpocket pizza"
+ reqs = list(
+ /obj/item/weapon/reagent_containers/food/snacks/pizzabread = 1,
+ /obj/item/weapon/reagent_containers/food/snacks/donkpocket/warm = 3,
+ /obj/item/weapon/reagent_containers/food/snacks/cheesewedge = 1,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/tomato = 1
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/pizza/donkpocket
+/datum/table_recipe/dankpizza
+ name = "Dank pizza"
+ reqs = list(
+ /obj/item/weapon/reagent_containers/food/snacks/pizzabread = 1,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia/vulgaris = 3,
+ /obj/item/weapon/reagent_containers/food/snacks/cheesewedge = 1,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/tomato = 1
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/pizza/dank
+
+/datum/table_recipe/sassysagepizza
+ name = "Sassysage pizza"
+ reqs = list(
+ /obj/item/weapon/reagent_containers/food/snacks/pizzabread = 1,
+ /obj/item/weapon/reagent_containers/food/snacks/faggot = 3,
+ /obj/item/weapon/reagent_containers/food/snacks/cheesewedge = 1,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/tomato = 1
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/pizza/sassysage
\ No newline at end of file
diff --git a/code/modules/food&drinks/recipes/tablecraft/recipes_salad.dm b/code/modules/food&drinks/recipes/tablecraft/recipes_salad.dm
index 3121f865b81..900b636be07 100644
--- a/code/modules/food&drinks/recipes/tablecraft/recipes_salad.dm
+++ b/code/modules/food&drinks/recipes/tablecraft/recipes_salad.dm
@@ -42,3 +42,74 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/banana = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/soup/monkeysdelight
+
+/datum/table_recipe/oatmeal
+ name = "Oatmeal"
+ reqs = list(
+ /datum/reagent/consumable/milk = 10,
+ /obj/item/weapon/reagent_containers/glass/bowl = 1,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/oat = 1
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/salad/oatmeal
+
+/datum/table_recipe/fruitsalad
+ name = "Fruit salad"
+ reqs = list(
+ /obj/item/weapon/reagent_containers/glass/bowl = 1,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/citrus/orange = 1,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/apple = 1,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/grapes = 1,
+ /obj/item/weapon/reagent_containers/food/snacks/watermelonslice = 2
+
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/salad/fruit
+
+/datum/table_recipe/junglesalad
+ name = "Jungle salad"
+ reqs = list(
+ /obj/item/weapon/reagent_containers/glass/bowl = 1,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/apple = 1,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/grapes = 1,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/banana = 2,
+ /obj/item/weapon/reagent_containers/food/snacks/watermelonslice = 2
+
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/salad/jungle
+
+/datum/table_recipe/citrusdelight
+ name = "Citrus delight"
+ reqs = list(
+ /obj/item/weapon/reagent_containers/glass/bowl = 1,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/citrus/lime = 1,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/citrus/lemon = 1,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/citrus/orange = 1
+
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/salad/citrusdelight
+
+/datum/table_recipe/ricepork
+ name = "Rice and pork"
+ reqs = list(
+ /obj/item/weapon/reagent_containers/food/snacks/salad/boiledrice = 1,
+ /obj/item/weapon/reagent_containers/food/snacks/meat/cutlet = 2
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/salad/ricepork
+
+/datum/table_recipe/eggbowl
+ name = "Egg bowl"
+ reqs = list(
+ /obj/item/weapon/reagent_containers/food/snacks/salad/boiledrice = 1,
+ /obj/item/weapon/reagent_containers/food/snacks/boiledegg = 1,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/carrot = 1,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/corn = 1
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/salad/eggbowl
+
+/datum/table_recipe/ricepudding
+ name = "Rice pudding"
+ reqs = list(
+ /datum/reagent/consumable/milk = 5,
+ /datum/reagent/consumable/sugar = 5,
+ /obj/item/weapon/reagent_containers/food/snacks/salad/boiledrice = 1
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/salad/ricepudding
diff --git a/code/modules/food&drinks/recipes/tablecraft/recipes_sandwich.dm b/code/modules/food&drinks/recipes/tablecraft/recipes_sandwich.dm
index 57e1a1f6614..e95748af722 100644
--- a/code/modules/food&drinks/recipes/tablecraft/recipes_sandwich.dm
+++ b/code/modules/food&drinks/recipes/tablecraft/recipes_sandwich.dm
@@ -10,7 +10,7 @@
name = "Sandwich"
reqs = list(
/obj/item/weapon/reagent_containers/food/snacks/breadslice/plain = 2,
- /obj/item/weapon/reagent_containers/food/snacks/meatsteak = 1,
+ /obj/item/weapon/reagent_containers/food/snacks/meat/steak = 1,
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/sandwich
diff --git a/code/modules/food&drinks/recipes/tablecraft/recipes_soup.dm b/code/modules/food&drinks/recipes/tablecraft/recipes_soup.dm
index dbbb2233035..b6e16173562 100644
--- a/code/modules/food&drinks/recipes/tablecraft/recipes_soup.dm
+++ b/code/modules/food&drinks/recipes/tablecraft/recipes_soup.dm
@@ -37,6 +37,15 @@
)
result = /obj/item/weapon/reagent_containers/food/snacks/soup/nettle
+/datum/table_recipe/wingfangchu
+ name = "Wingfangchu"
+ reqs = list(
+ /obj/item/weapon/reagent_containers/glass/bowl = 1,
+ /datum/reagent/consumable/soysauce = 5,
+ /obj/item/weapon/reagent_containers/food/snacks/meat/cutlet/xeno = 2
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/soup/wingfangchu
+
/datum/table_recipe/wishsoup
name = "Wish soup"
reqs = list(
@@ -49,7 +58,7 @@
name = "Hot chili"
reqs = list(
/obj/item/weapon/reagent_containers/glass/bowl = 1,
- /obj/item/weapon/reagent_containers/food/snacks/cutlet = 2,
+ /obj/item/weapon/reagent_containers/food/snacks/meat/cutlet = 2,
/obj/item/weapon/reagent_containers/food/snacks/grown/chili = 1,
/obj/item/weapon/reagent_containers/food/snacks/grown/tomato = 1
)
@@ -59,7 +68,7 @@
name = "Cold chili"
reqs = list(
/obj/item/weapon/reagent_containers/glass/bowl = 1,
- /obj/item/weapon/reagent_containers/food/snacks/cutlet = 2,
+ /obj/item/weapon/reagent_containers/food/snacks/meat/cutlet = 2,
/obj/item/weapon/reagent_containers/food/snacks/grown/icepepper = 1,
/obj/item/weapon/reagent_containers/food/snacks/grown/tomato = 1
)
@@ -150,7 +159,7 @@
/datum/reagent/water = 10,
/obj/item/weapon/reagent_containers/glass/bowl = 1,
/obj/item/weapon/reagent_containers/food/snacks/grown/tomato = 1,
- /obj/item/weapon/reagent_containers/food/snacks/cutlet = 3,
+ /obj/item/weapon/reagent_containers/food/snacks/meat/cutlet = 3,
/obj/item/weapon/reagent_containers/food/snacks/grown/potato = 1,
/obj/item/weapon/reagent_containers/food/snacks/grown/carrot = 1,
/obj/item/weapon/reagent_containers/food/snacks/grown/eggplant = 1,
@@ -176,5 +185,22 @@
)
result = /obj/item/weapon/reagent_containers/food/snacks/soup/amanitajelly
+/datum/table_recipe/sweetpotatosoup
+ name = "Sweet potato soup"
+ reqs = list(
+ /datum/reagent/water = 10,
+ /datum/reagent/consumable/sugar = 5,
+ /obj/item/weapon/reagent_containers/glass/bowl = 1,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/sweetpotato = 2
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/soup/sweetpotato
-
+/datum/table_recipe/redbeetsoup
+ name = "Red beet soup"
+ reqs = list(
+ /datum/reagent/water = 10,
+ /obj/item/weapon/reagent_containers/glass/bowl = 1,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/redbeet = 1,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/cabbage = 1
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/soup/beet/red
diff --git a/code/modules/food&drinks/recipes/tablecraft/recipes_spaghetti.dm b/code/modules/food&drinks/recipes/tablecraft/recipes_spaghetti.dm
index c33b2cd7a5b..a23c2b09c2d 100644
--- a/code/modules/food&drinks/recipes/tablecraft/recipes_spaghetti.dm
+++ b/code/modules/food&drinks/recipes/tablecraft/recipes_spaghetti.dm
@@ -34,4 +34,22 @@
)
result = /obj/item/weapon/reagent_containers/food/snacks/spesslaw
+/datum/table_recipe/beefnoodle
+ name = "Beef noodle"
+ reqs = list(
+ /obj/item/weapon/reagent_containers/glass/bowl = 1,
+ /obj/item/weapon/reagent_containers/food/snacks/boiledspaghetti = 1,
+ /obj/item/weapon/reagent_containers/food/snacks/meat/cutlet = 2,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/cabbage = 1
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/beefnoodle
+/datum/table_recipe/chowmein
+ name = "Chowmein"
+ reqs = list(
+ /obj/item/weapon/reagent_containers/food/snacks/boiledspaghetti = 1,
+ /obj/item/weapon/reagent_containers/food/snacks/meat/cutlet = 1,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/cabbage = 2,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/carrot = 1
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/chowmein
\ No newline at end of file
diff --git a/code/modules/holiday/easter.dm b/code/modules/holiday/easter.dm
index d6cfdca9759..36c20650400 100644
--- a/code/modules/holiday/easter.dm
+++ b/code/modules/holiday/easter.dm
@@ -44,7 +44,7 @@
speak_emote = list("sniffles","twitches")
emote_hear = list("hops.")
emote_see = list("hops around","bounces up and down")
- meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
+ meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/slab
egg_type = /obj/item/weapon/reagent_containers/food/snacks/egg/loaded
food_type = /obj/item/weapon/reagent_containers/food/snacks/grown/carrot
meat_amount = 1
diff --git a/code/modules/holiday/halloween.dm b/code/modules/holiday/halloween.dm
index 1f74c911de0..5f83a701ac6 100644
--- a/code/modules/holiday/halloween.dm
+++ b/code/modules/holiday/halloween.dm
@@ -279,11 +279,11 @@
/mob/living/simple_animal/hostile/retaliate/clown/insane/attackby(var/obj/item/O as obj, var/mob/user as mob)
if(istype(O,/obj/item/weapon/nullrod))
if(prob(5))
- visible_message("[src] finally found the peace it deserves. You hear honks echoing off into the distance.")
+ visible_message("[src] finally found the peace it deserves. You hear honks echoing off into the distance.")
playsound(loc, 'sound/spookoween/insane_low_laugh.ogg', 300, 1)
qdel(src)
else
- visible_message("[src] seems to be resisting the effect!")
+ visible_message("[src] seems to be resisting the effect!")
else
..()
diff --git a/code/modules/holiday/holidays.dm b/code/modules/holiday/holidays.dm
index 50190ce4e67..4aa5c710d8f 100644
--- a/code/modules/holiday/holidays.dm
+++ b/code/modules/holiday/holidays.dm
@@ -71,6 +71,15 @@
begin_month = FEBRUARY
end_day = 15 //1 day extra
+
+/datum/holiday/birthday
+ name = "Birthday of Space Station 13"
+ begin_day = 16
+ begin_month = FEBRUARY
+
+/datum/holiday/birthday/greet()
+ return "Say 'Happy Birthday' to Space Station 13, first publicly playable on February 16th, 2003!"
+
/datum/holiday/random_kindness
name = "Random Acts of Kindness Day"
begin_day = 17
@@ -93,7 +102,7 @@
name = APRIL_FOOLS
begin_day = 1
begin_month = APRIL
- end_day = 8 //7 days extra so everyone can enjoy the festivities
+ end_day = 2 //1 day extra only because this shit just gets annoying fast
/datum/holiday/fourtwenty
name = "Four-Twenty"
diff --git a/code/modules/hydroponics/biogenerator.dm b/code/modules/hydroponics/biogenerator.dm
index 3c4002b026b..41d7dedaaa5 100644
--- a/code/modules/hydroponics/biogenerator.dm
+++ b/code/modules/hydroponics/biogenerator.dm
@@ -82,7 +82,7 @@
else if(!istype(O, /obj/item/weapon/reagent_containers/food/snacks/grown))
- user << "You cannot put this in [src.name]"
+ user << "You cannot put this in [src.name]!"
else
var/i = 0
for(var/obj/item/weapon/reagent_containers/food/snacks/grown/G in contents)
diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm
index 51a9e433c6f..75e14801e91 100644
--- a/code/modules/hydroponics/grown.dm
+++ b/code/modules/hydroponics/grown.dm
@@ -204,7 +204,7 @@
qdel(src)
return
else
- user << "You need five lengths of cable to make a potato battery."
+ user << "You need five lengths of cable to make a potato battery!"
return
@@ -466,6 +466,8 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/holymelon/add_juice()
if(..())
+ reagents.add_reagent("nutriment", 1 + round((potency / 15), 1))
+ reagents.add_reagent("vitamin", 1 + round((potency / 25), 1))
reagents.add_reagent("holywater", 1 + round((potency / 6), 1))
bitesize = 1 + round(reagents.total_volume / 2, 1)
@@ -493,7 +495,7 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/blumpkin
seed = /obj/item/seeds/blumpkinseed
name = "blumpkin"
- desc = "When you're making a mess this blumpkin's there to clean you up."
+ desc = "The pumpkin's toxic sibling."
icon_state = "blumpkin"
filling_color = "#87CEFA"
@@ -804,7 +806,7 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice()
/obj/item/weapon/reagent_containers/food/snacks/grown/tomato/proc/squish(atom/target)
new splat(src.loc)
- src.visible_message("The [src.name] has been squashed.","You hear a smack.")
+ src.visible_message("The [src.name] has been squashed.","You hear a smack.")
for(var/atom/A in get_turf(target))
src.reagents.reaction(A)
@@ -832,7 +834,7 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice()
/obj/item/weapon/reagent_containers/food/snacks/grown/tomato/killer/attack_self(mob/user as mob)
if(awakening || istype(user.loc,/turf/space))
return
- user << "You begin to awaken the Killer Tomato."
+ user << "You begin to awaken the Killer Tomato..."
awakening = 1
spawn(30)
@@ -896,7 +898,7 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice()
/obj/item/weapon/reagent_containers/food/snacks/grown/tomato/blue/bluespace/attack_self(var/mob/user)
squish(user)
user.drop_item()
- src.visible_message("[user] squashes the [src.name].","You hear a smack.")
+ src.visible_message("[user] squashes the [src.name].","You hear a smack.")
qdel(src)
/obj/item/weapon/reagent_containers/food/snacks/grown/tomato/blue/bluespace/squish(atom/squishee)
diff --git a/code/modules/hydroponics/growninedible.dm b/code/modules/hydroponics/growninedible.dm
index f3993846124..0de365ecdfc 100644
--- a/code/modules/hydroponics/growninedible.dm
+++ b/code/modules/hydroponics/growninedible.dm
@@ -75,7 +75,7 @@
if(ST != plank && istype(ST, plank_type) && ST.amount < ST.max_amount)
ST.attackby(plank, user) //we try to transfer all old unfinished stacks to the new stack we created.
if(plank.amount > old_plank_amount)
- user << "You add the newly-formed [plank_name] to the stack. It now contains [plank.amount] [plank_name]."
+ user << "You add the newly-formed [plank_name] to the stack. It now contains [plank.amount] [plank_name]."
qdel(src)
if(is_type_in_list(W,accepted))
@@ -89,7 +89,7 @@
qdel(src)
return
else
- usr << " You must dry this first."
+ usr << " You must dry this first!"
/obj/item/weapon/grown/log/steel
seed = /obj/item/seeds/steelmycelium
@@ -152,7 +152,7 @@
if(endurance > 0)
endurance -= rand(1, (endurance / 3) + 1)
else
- usr << "All the petals have fallen off the [name] from violent whacking."
+ usr << "All the petals have fallen off the [name] from violent whacking!"
usr.unEquip(src)
qdel(src)
diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm
index d3a74ed88be..361fe6843b0 100644
--- a/code/modules/hydroponics/hydroponics.dm
+++ b/code/modules/hydroponics/hydroponics.dm
@@ -586,7 +586,7 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob, p
if(istype(reagent_source, /obj/item/weapon/reagent_containers/syringe))
var/obj/item/weapon/reagent_containers/syringe/syr = reagent_source
if(syr.mode != 1)
- user << "You can't get any extract out of this plant." //That. Gives me an idea...
+ user << "You can't get any extract out of this plant." //That. Gives me an idea...
return
if(!reagent_source.reagents.total_volume)
@@ -650,7 +650,7 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob, p
else if(istype(O, /obj/item/seeds/))
if(!planted)
user.unEquip(O)
- user << "You plant [O]."
+ user << "You plant [O]."
dead = 0
myseed = O
planted = 1
@@ -692,11 +692,11 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob, p
else if(istype(O, /obj/item/weapon/minihoe))
if(weedlevel > 0)
- user.visible_message("[user] uproots the weeds.", "You remove the weeds from [src].")
+ user.visible_message("[user] uproots the weeds.", "You remove the weeds from [src].")
weedlevel = 0
update_icon()
else
- user << "This plot is completely devoid of weeds. It doesn't need uprooting."
+ user << "This plot is completely devoid of weeds! It doesn't need uprooting."
else if(istype(O, /obj/item/weapon/storage/bag/plants))
attack_hand(user)
@@ -708,28 +708,28 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob, p
else if(istype(O, /obj/item/weapon/wrench) && unwrenchable)
if(anchored == 2)
- user << "Unscrew the hoses first!"
+ user << "Unscrew the hoses first!"
return
if(!anchored && !isinspace())
- user.visible_message("[user] begins to wrench [src] into place.", \
- "You begin to wrench [src] in place.")
+ user.visible_message("[user] begins to wrench [src] into place.", \
+ "You begin to wrench [src] in place...")
playsound(loc, 'sound/items/Ratchet.ogg', 50, 1)
if (do_after(user, 20))
if(anchored)
return
anchored = 1
- user.visible_message("[user] wrenches [src] into place.", \
+ user.visible_message("[user] wrenches [src] into place.", \
"You wrench [src] in place.")
else if(anchored)
- user.visible_message("[user] begins to unwrench [src].", \
- "You begin to unwrench [src].")
+ user.visible_message("[user] begins to unwrench [src].", \
+ "You begin to unwrench [src]...")
playsound(loc, 'sound/items/Ratchet.ogg', 50, 1)
if (do_after(user, 20))
if(!anchored)
return
anchored = 0
- user.visible_message("[user] unwrenches [src].", \
+ user.visible_message("[user] unwrenches [src].", \
"You unwrench [src].")
else if(istype(O, /obj/item/weapon/screwdriver) && unwrenchable) //THIS NEED TO BE DONE DIFFERENTLY, SOMEONE REFACTOR THE TRAY CODE ALREADY
@@ -737,12 +737,12 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob, p
if(anchored == 2)
playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
anchored = 1
- user << "You unscrew \the [src]'s hoses."
+ user << "You unscrew \the [src]'s hoses."
else if(anchored == 1)
playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
anchored = 2
- user << "You screw in \the [src]'s hoses."
+ user << "You screw in \the [src]'s hoses."
for(var/obj/machinery/hydroponics/h in range(1,src))
spawn()
@@ -758,7 +758,7 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob, p
else if(dead)
planted = 0
dead = 0
- user << "You remove the dead plant from [src]."
+ user << "You remove the dead plant from [src]."
qdel(myseed)
update_icon()
else
@@ -870,11 +870,11 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob, p
harvest = 0
lastproduce = age
if(istype(myseed,/obj/item/seeds/replicapod/))
- user << "You harvest from the [myseed.plantname]."
+ user << "You harvest from the [myseed.plantname]."
else if(myseed.getYield() <= 0)
- user << "You fail to harvest anything useful."
+ user << "You fail to harvest anything useful!"
else
- user << "You harvest [myseed.getYield()] items from the [myseed.plantname]."
+ user << "You harvest [myseed.getYield()] items from the [myseed.plantname]."
if(myseed.oneharvest)
qdel(myseed)
planted = 0
@@ -986,5 +986,5 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob, p
/obj/machinery/hydroponics/soil/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
..()
if(istype(O, /obj/item/weapon/shovel))
- user << "You clear up [src]!"
+ user << "You clear up [src]!"
qdel(src)
diff --git a/code/modules/hydroponics/seed_extractor.dm b/code/modules/hydroponics/seed_extractor.dm
index 24c611329c0..d3b7b030ea4 100644
--- a/code/modules/hydroponics/seed_extractor.dm
+++ b/code/modules/hydroponics/seed_extractor.dm
@@ -71,7 +71,7 @@ obj/machinery/seed_extractor/attackby(var/obj/item/O as obj, var/mob/user as mob
return
if(!user.drop_item()) //couldn't drop the item
- user << "\The [O] is stuck to your hand, you cannot put it in the seed extractor!"
+ user << "\The [O] is stuck to your hand, you cannot put it in the seed extractor!"
return
if(O && O.loc)
@@ -86,7 +86,7 @@ obj/machinery/seed_extractor/attackby(var/obj/item/O as obj, var/mob/user as mob
updateUsrDialog()
return
else
- user << "You can't extract any seeds from \the [O.name]."
+ user << "You can't extract any seeds from \the [O.name]!"
datum/seed_pile
var/name = ""
@@ -171,7 +171,7 @@ obj/machinery/seed_extractor/proc/add(var/obj/item/seeds/O as obj)
if(istype(O.loc,/mob))
var/mob/M = O.loc
if(!M.unEquip(O))
- usr << "\the [O] is stuck to your hand, you cannot put it in \the [src]"
+ usr << "\the [O] is stuck to your hand, you cannot put it in \the [src]!"
return
else if(istype(O.loc,/obj/item/weapon/storage))
var/obj/item/weapon/storage/S = O.loc
diff --git a/code/modules/hydroponics/seeds.dm b/code/modules/hydroponics/seeds.dm
index 56c309a95fc..3d63316edaa 100644
--- a/code/modules/hydroponics/seeds.dm
+++ b/code/modules/hydroponics/seeds.dm
@@ -107,12 +107,12 @@
mutant_color = bloodSample.data["mutant_color"]
factions = bloodSample.data["factions"]
W.reagents.clear_reagents()
- user << "You inject the contents of the syringe into the seeds."
+ user << "You inject the contents of the syringe into the seeds."
contains_sample = 1
else
- user << "The seeds reject the sample!"
+ user << "The seeds reject the sample!"
else
- user << "The seeds already contain a genetic sample."
+ user << "The seeds already contain a genetic sample!"
..()
diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm
index 1e5aa530242..1b0fc3f450d 100644
--- a/code/modules/library/lib_items.dm
+++ b/code/modules/library/lib_items.dm
@@ -81,7 +81,7 @@
name = ("bookcase ([sanitize(newname)])")
else if(istype(I, /obj/item/weapon/crowbar))
if(contents.len)
- user << "You need to remove the books first."
+ user << "You need to remove the books first!"
else
playsound(loc, 'sound/items/Crowbar.ogg', 100, 1)
user << "You pry the shelf out."
@@ -191,7 +191,7 @@
if(is_blind(user))
return
if(unique)
- user << "These pages don't seem to take the ink well. Looks like you can't modify it."
+ user << "These pages don't seem to take the ink well! Looks like you can't modify it."
return
var/choice = input("What would you like to change?") in list("Title", "Contents", "Author", "Cancel")
switch(choice)
@@ -251,7 +251,7 @@
user << "[I]'s screen flashes: 'Book stored in buffer. Title added to general inventory.'"
else if(istype(I, /obj/item/weapon/kitchenknife) || istype(I, /obj/item/weapon/wirecutters))
- user << "You begin to carve out [title]."
+ user << "You begin to carve out [title]..."
if(do_after(user, 30))
user << "You carve out the pages from [title]! You didn't want to read it anyway."
var/obj/item/weapon/storage/book/B = new
diff --git a/code/modules/lighting/lighting_system.dm b/code/modules/lighting/lighting_system.dm
new file mode 100644
index 00000000000..7c7eb7264a5
--- /dev/null
+++ b/code/modules/lighting/lighting_system.dm
@@ -0,0 +1,382 @@
+/*
+ This is /tg/'s 'newer' lighting system. It's basically a combination of Forum_Account's and ShadowDarke's
+ respective lighting libraries heavily modified by Carnwennan for /tg/station with further edits by
+ MrPerson. Credits, where due, to them.
+
+ Originally, like all other lighting libraries on BYOND, we used areas to render different hard-coded light levels.
+ The idea was that this was cheaper than using objects. Well as it turns out, the cost of the system is primarily from the
+ massive loops the system has to run, not from the areas or objects actually doing any work. Thus the newer system uses objects
+ so we can have more lighting states and smooth transitions between them.
+
+ This is a queueing system. Everytime we call a change to opacity or luminosity throwgh SetOpacity() or SetLuminosity(),
+ we are simply updating variables and scheduling certain lights/turfs for an update. Actual updates are handled
+ periodically by the SSlighting subsystem. Specifically, it runs check() on every light datum that ran changed().
+ Then it runs redraw_lighting() on every turf that ran update_lumcount().
+
+ Unlike our older system, there are hardcoded maximum luminosities (different for certain atoms).
+ This is to cap the cost of creating lighting effects.
+ (without this, an atom with luminosity of 20 would have to update 41^2 turfs!) :s
+
+ Each light remembers the effect it casts on each turf. It reduces cost of removing lighting effects by a lot!
+
+ Known Issues/TODO:
+ Shuttles still do not have support for dynamic lighting (I hope to fix this at some point) -probably trivial now
+ No directional lighting support. (prototype looked ugly)
+ Allow lights to be weaker than 'cap' radius
+ Colored lights
+*/
+
+#define LIGHTING_CIRCULAR 1 //comment this out to use old square lighting effects.
+#define LIGHTING_LAYER 15 //Drawing layer for lighting
+#define LIGHTING_CAP 10 //The lumcount level at which alpha is 0 and we're fully lit.
+#define LIGHTING_CAP_FRAC (255/LIGHTING_CAP) //A precal'd variable we'll use in turf/redraw_lighting()
+#define LIGHTING_ICON 'icons/effects/alphacolors.dmi'
+#define LIGHTING_ICON_STATE "white"
+#define LIGHTING_TIME 1.2 //Time to do any lighting change. Actual number pulled out of my ass
+#define LIGHTING_DARKEST_VISIBLE_ALPHA 230 //Anything darker than this is so dark, we'll just consider the whole tile unlit
+
+/datum/light_source
+ var/atom/owner
+ var/radius = 0
+ var/changed = 1
+ var/list/effect = list()
+ var/__x = 0 //x coordinate at last update
+ var/__y = 0 //y coordinate at last update
+
+/datum/light_source/New(atom/A)
+ if(!istype(A))
+ CRASH("The first argument to the light object's constructor must be the atom that is the light source. Expected atom, received '[A]' instead.")
+ ..()
+ owner = A
+ radius = A.luminosity
+ __x = owner.x
+ __y = owner.y
+ SSlighting.changed_lights |= src
+
+/datum/light_source/Destroy()
+ if(owner && owner.light == src)
+ remove_effect()
+ owner.light = null
+ owner = null
+ return ..()
+
+//Check a light to see if its effect needs reprocessing. If it does, remove any old effect and create a new one
+/datum/light_source/proc/check()
+ if(!owner)
+ remove_effect()
+ return 0
+
+ if(changed)
+ changed = 0
+ remove_effect()
+ return add_effect()
+
+ return 1
+
+//Tell the lighting subsystem to check() next fire
+/datum/light_source/proc/changed()
+ if(owner)
+ __x = owner.x
+ __y = owner.y
+ if(!changed)
+ changed = 1
+ SSlighting.changed_lights |= src
+
+//Remove current effect
+/datum/light_source/proc/remove_effect().
+ for(var/turf/T in effect)
+ T.update_lumcount(-effect[T])
+
+ if(T.affecting_lights && T.affecting_lights.len)
+ T.affecting_lights -= src
+
+ effect.Cut()
+
+//Apply a new effect
+/datum/light_source/proc/add_effect()
+ // only do this if the light is turned on and is on the map
+ if(owner && owner.loc && radius > 0)
+ effect = list()
+ var/turf/To = get_turf(owner)
+ var/range = owner.get_light_range(radius)
+ for(var/atom/movable/AM in To)
+ if(AM == owner)
+ continue
+ if(AM.opacity)
+ range = 0
+ break
+
+ for(var/turf/T in view(range, To))
+ var/delta_lumcount = T.lumen(src)
+ if(delta_lumcount > 0)
+ effect[T] = delta_lumcount
+ T.update_lumcount(delta_lumcount)
+
+ if(!T.affecting_lights)
+ T.affecting_lights = list()
+ T.affecting_lights |= src
+
+ return 1
+ else
+ return 0
+
+//How much light light_source L should apply to src
+/turf/proc/lumen(datum/light_source/L)
+ var/distance = 0
+#ifdef LIGHTING_CIRCULAR
+ distance = cheap_hypotenuse(x, y, L.__x, L.__y)
+#else
+ distance = max(abs(x - L.__x), abs(y - L.__y))
+#endif
+ return LIGHTING_CAP * (L.radius - distance) / L.radius
+//LIGHTING_CAP == strength for now
+
+
+/atom
+ var/datum/light_source/light
+
+
+//Turfs with opacity when they are constructed will trigger nearby lights to update
+//Turfs and atoms with luminosity when they are constructed will create a light_source automatically
+/turf/New()
+ ..()
+ if(luminosity)
+ light = new(src)
+// luminosity = 0
+
+//Movable atoms with opacity when they are constructed will trigger nearby lights to update
+//Movable atoms with luminosity when they are constructed will create a light_source automatically
+/atom/movable/New()
+ ..()
+ if(opacity)
+ UpdateAffectingLights()
+ if(luminosity)
+ light = new(src)
+// luminosity = 0
+
+//Objects with opacity will trigger nearby lights to update at next SSlighting fire
+/atom/movable/Destroy()
+ qdel(light)
+ if(opacity)
+ UpdateAffectingLights()
+ return ..()
+
+//Objects with opacity will trigger nearby lights of the old location to update at next SSlighting fire
+/atom/movable/Moved(atom/OldLoc, Dir)
+ if(isturf(loc))
+ if(opacity)
+ OldLoc.UpdateAffectingLights()
+ else
+ if(light)
+ light.changed()
+ return ..()
+
+//Sets our luminosity.
+//If we have no light it will create one.
+//If we are setting luminosity to 0 the light will be cleaned up by the controller and garbage collected once all its
+//queues are complete.
+//if we have a light already it is merely updated, rather than making a new one.
+/atom/proc/SetLuminosity(new_luminosity)
+ if(new_luminosity < 0)
+ new_luminosity = 0
+
+ if(!light)
+ if(!new_luminosity)
+ return
+ light = new(src)
+ else
+ if(light.radius == new_luminosity)
+ return
+ light.radius = new_luminosity
+ luminosity = new_luminosity
+ light.changed()
+
+/atom/proc/AddLuminosity(delta_luminosity)
+ if(light)
+ SetLuminosity(light.radius + delta_luminosity)
+ else
+ SetLuminosity(delta_luminosity)
+
+/area/SetLuminosity(new_luminosity) //we don't want dynamic lighting for areas
+ luminosity = !!new_luminosity
+
+
+//change our opacity (defaults to toggle), and then update all lights that affect us.
+/atom/proc/SetOpacity(new_opacity)
+ if(new_opacity == null)
+ new_opacity = !opacity //default = toggle opacity
+ else if(opacity == new_opacity)
+ return 0 //opacity hasn't changed! don't bother doing anything
+ opacity = new_opacity //update opacity, the below procs now call light updates.
+ UpdateAffectingLights()
+ return 1
+
+/atom/movable/light
+ icon = LIGHTING_ICON
+ icon_state = LIGHTING_ICON_STATE
+ layer = LIGHTING_LAYER
+ mouse_opacity = 0
+ blend_mode = BLEND_OVERLAY
+ invisibility = INVISIBILITY_LIGHTING
+ color = "#000"
+ luminosity = 0
+ infra_luminosity = 1
+ anchored = 1
+
+/atom/movable/light/Destroy()
+ return 1
+
+/atom/movable/light/Move()
+ return 0
+
+/turf
+ var/lighting_lumcount = 0
+ var/lighting_changed = 0
+ var/atom/movable/light/lighting_object //Will be null for space turfs and anything in a static lighting area
+ var/list/affecting_lights //not initialised until used (even empty lists reserve a fair bit of memory)
+
+/turf/ChangeTurf(var/path)
+ if(!path || path == type) //Sucks this is here but it would cause problems otherwise.
+ return ..()
+
+ for(var/obj/effect/decal/cleanable/decal in src.contents)
+ qdel(decal)
+
+ if(light)
+ qdel(light)
+
+ var/old_lumcount = lighting_lumcount - initial(lighting_lumcount)
+
+ var/list/our_lights //reset affecting_lights if needed
+ if(opacity != initial(path:opacity) && old_lumcount)
+ UpdateAffectingLights()
+
+ if(affecting_lights)
+ our_lights = affecting_lights.Copy()
+
+ . = ..() //At this point the turf has changed
+
+ affecting_lights = our_lights
+
+ lighting_changed = 1 //Don't add ourself to SSlighting.changed_turfs
+ update_lumcount(old_lumcount)
+ lighting_object = locate() in src
+ init_lighting()
+
+ for(var/turf/space/S in orange(src,1))
+ S.update_starlight()
+
+/turf/proc/update_lumcount(amount)
+ lighting_lumcount += amount
+ if(!lighting_changed)
+ SSlighting.changed_turfs += src
+ lighting_changed = 1
+
+/turf/space/update_lumcount(amount) //Keep track in case the turf becomes a floor at some point, but don't process.
+ lighting_lumcount += amount
+
+/turf/proc/init_lighting()
+ var/area/A = loc
+ if(!A.lighting_use_dynamic || istype(src, /turf/space))
+ lighting_changed = 0
+ if(lighting_object)
+ lighting_object.alpha = 0
+ lighting_object = null
+ else
+ if(!lighting_object)
+ lighting_object = new (src)
+ redraw_lighting(1)
+
+/turf/space/init_lighting()
+ . = ..()
+ if(config.starlight)
+ update_starlight()
+
+/turf/proc/redraw_lighting(var/instantly = 0)
+ if(lighting_object)
+ var/newalpha
+ if(lighting_lumcount <= 0)
+ newalpha = 255
+ else
+ lighting_object.luminosity = 1
+ if(lighting_lumcount < LIGHTING_CAP)
+ var/num = Clamp(lighting_lumcount * LIGHTING_CAP_FRAC, 0, 255)
+ newalpha = 255-num
+ else //if(lighting_lumcount >= LIGHTING_CAP)
+ newalpha = 0
+
+ if(lighting_object.alpha != newalpha)
+ var/change_time = LIGHTING_TIME
+ if(instantly)
+ change_time = 0
+ animate(lighting_object, alpha = newalpha, time = change_time)
+ if(newalpha >= LIGHTING_DARKEST_VISIBLE_ALPHA) //Doesn't actually make it darker or anything, just tells byond you can't see the tile
+ animate(luminosity = 0, time = 0)
+
+ lighting_changed = 0
+
+/area
+ var/lighting_use_dynamic = 1 //Turn this flag off to make the area fullbright
+
+/area/New()
+ . = ..()
+ if(!lighting_use_dynamic)
+ luminosity = 1
+
+/area/proc/SetDynamicLighting()
+ lighting_use_dynamic = 1
+ luminosity = 0
+ for(var/turf/T in src.contents)
+ T.init_lighting()
+ T.update_lumcount(0)
+
+#undef LIGHTING_LAYER
+#undef LIGHTING_CIRCULAR
+#undef LIGHTING_ICON
+#undef LIGHTING_ICON_STATE
+#undef LIGHTING_TIME
+#undef LIGHTING_CAP
+#undef LIGHTING_CAP_FRAC
+#undef LIGHTING_DARKEST_VISIBLE_ALPHA
+
+
+//set the changed status of all lights which could have possibly lit this atom.
+//We don't need to worry about lights which lit us but moved away, since they will have change status set already
+//This proc can cause lots of lights to be updated. :(
+/atom/proc/UpdateAffectingLights()
+
+/atom/movable/UpdateAffectingLights()
+ if(isturf(loc))
+ loc.UpdateAffectingLights()
+
+/turf/UpdateAffectingLights()
+ if(affecting_lights)
+ for(var/datum/light_source/thing in affecting_lights)
+ thing.changed() //force it to update at next process()
+
+
+#define LIGHTING_MAX_LUMINOSITY_STATIC 8 //Maximum luminosity to reduce lag.
+#define LIGHTING_MAX_LUMINOSITY_MOBILE 5 //Moving objects have a lower max luminosity since these update more often. (lag reduction)
+#define LIGHTING_MAX_LUMINOSITY_MOB 5
+#define LIGHTING_MAX_LUMINOSITY_TURF 8 //turfs are static too, why was this 1?!
+
+//caps luminosity effects max-range based on what type the light's owner is.
+/atom/proc/get_light_range(radius)
+ return min(radius, LIGHTING_MAX_LUMINOSITY_STATIC)
+
+/atom/movable/get_light_range(radius)
+ return min(radius, LIGHTING_MAX_LUMINOSITY_MOBILE)
+
+/mob/get_light_range(radius)
+ return min(radius, LIGHTING_MAX_LUMINOSITY_MOB)
+
+/obj/machinery/light/get_light_range(radius)
+ return min(radius, LIGHTING_MAX_LUMINOSITY_STATIC)
+
+/turf/get_light_range(radius)
+ return min(radius, LIGHTING_MAX_LUMINOSITY_TURF)
+
+#undef LIGHTING_MAX_LUMINOSITY_STATIC
+#undef LIGHTING_MAX_LUMINOSITY_MOBILE
+#undef LIGHTING_MAX_LUMINOSITY_MOB
+#undef LIGHTING_MAX_LUMINOSITY_TURF
diff --git a/code/modules/mining/equipment_locker.dm b/code/modules/mining/equipment_locker.dm
index 283110de387..13bc4ca5951 100644
--- a/code/modules/mining/equipment_locker.dm
+++ b/code/modules/mining/equipment_locker.dm
@@ -244,7 +244,6 @@
new /datum/data/mining_equipment("GAR mesons", /obj/item/clothing/glasses/meson/gar, 500),
new /datum/data/mining_equipment("Kinetic Accelerator", /obj/item/weapon/gun/energy/kinetic_accelerator, 750),
new /datum/data/mining_equipment("Resonator", /obj/item/weapon/resonator, 800),
- new /datum/data/mining_equipment("Plasma Cutter", /obj/item/weapon/gun/energy/plasmacutter/charged, 950),
new /datum/data/mining_equipment("Lazarus Injector", /obj/item/weapon/lazarus_injector, 1000),
new /datum/data/mining_equipment("Diamond Pickaxe", /obj/item/weapon/pickaxe/diamond, 1200),
new /datum/data/mining_equipment("Jetpack", /obj/item/weapon/tank/jetpack/carbondioxide/mining, 1500),
@@ -345,7 +344,7 @@
..()
/obj/machinery/mineral/equipment_vendor/proc/RedeemVoucher(obj/item/weapon/mining_voucher/voucher, mob/redeemer)
- var/selection = input(redeemer, "Pick your equipment", "Mining Voucher Redemption") as null|anything in list("Mining Drill", "Kinetic Accelerator", "Plasma Cutter", "Resonator", "Mining Drone", "Advanced Scanner")
+ var/selection = input(redeemer, "Pick your equipment", "Mining Voucher Redemption") as null|anything in list("Mining Drill", "Kinetic Accelerator", "Resonator", "Mining Drone", "Advanced Scanner")
if(!selection || !Adjacent(redeemer) || voucher.gc_destroyed || voucher.loc != redeemer)
return
switch(selection)
@@ -354,12 +353,8 @@
new /obj/item/weapon/stock_parts/cell/high(src.loc)
if("Kinetic Accelerator")
new /obj/item/weapon/gun/energy/kinetic_accelerator(src.loc)
- new /obj/item/weapon/screwdriver(src.loc)
- if("Plasma Cutter")
- new /obj/item/weapon/gun/energy/plasmacutter/charged(src.loc)
if("Resonator")
new /obj/item/weapon/resonator(src.loc)
- new /obj/item/weapon/screwdriver(src.loc)
if("Mining Drone")
new /mob/living/simple_animal/hostile/mining_drone(src.loc)
new /obj/item/weapon/weldingtool/hugetank(src.loc)
@@ -486,36 +481,23 @@
var/fieldlimit = 3
/obj/item/weapon/resonator/proc/CreateResonance(var/target, var/creator)
+ var/turf/T = get_turf(target)
+ if(locate(/obj/effect/resonance) in T)
+ return
if(fieldsactive < fieldlimit)
playsound(src,'sound/weapons/resonator_fire.ogg',50,1)
- new /obj/effect/resonance(get_turf(target), creator, burst_time)
+ new /obj/effect/resonance(T, creator, burst_time)
fieldsactive++
- spawn(50)
+ spawn(burst_time)
fieldsactive--
/obj/item/weapon/resonator/attack_self(mob/user as mob)
- CreateResonance(src, user)
- ..()
-
-/obj/item/weapon/resonator/attackby(obj/item/weapon/W as obj, mob/user as mob)
- if(istype(W, /obj/item/weapon/screwdriver))
- if(burst_time == 50)
- burst_time = 30
- user << "You set the resonator's fields to detonate after 3 seconds."
- else
- burst_time = 50
- user << "You set the resonator's fields to detonate after 5 seconds."
-
- else if(istype(W, /obj/item/stack))
- var/obj/item/stack/S = W
-
- if(istype(S, /obj/item/stack/sheet/mineral/diamond))
- if(fieldlimit < 8)
- fieldlimit++
- user << "You upgrade [src]'s field generator with diamonds."
- S.use(1)
- else
- user << "The [src.name]'s field generator is at the limit."
+ if(burst_time == 50)
+ burst_time = 30
+ user << "You set the resonator's fields to detonate after 3 seconds."
+ else
+ burst_time = 50
+ user << "You set the resonator's fields to detonate after 5 seconds."
/obj/item/weapon/resonator/afterattack(atom/target, mob/user, proximity_flag)
if(proximity_flag)
@@ -574,7 +556,7 @@
/**********************Mining drone**********************/
-/mob/living/simple_animal/hostile/mining_drone/
+/mob/living/simple_animal/hostile/mining_drone
name = "nanotrasen minebot"
desc = "The instructions printed on the side read: This is a small robot used to support miners, can be set to search and collect loose ore, or to help fend off wildlife. A mining scanner can instruct it to drop loose ore. Field repairs can be done with a welder."
icon = 'icons/obj/aibots.dmi'
@@ -604,6 +586,7 @@
ranged_cooldown_cap = 3
projectiletype = /obj/item/projectile/kinetic
projectilesound = 'sound/weapons/Gunshot4.ogg'
+ speak_emote = list("states")
wanted_objects = list(/obj/item/weapon/ore/diamond, /obj/item/weapon/ore/gold, /obj/item/weapon/ore/silver,
/obj/item/weapon/ore/plasma, /obj/item/weapon/ore/uranium, /obj/item/weapon/ore/iron,
/obj/item/weapon/ore/bananium)
@@ -774,23 +757,10 @@
cooldown = 1
spawn(40)
cooldown = 0
- var/client/C = user.client
- var/list/L = list()
- var/turf/simulated/mineral/M
- for(M in range(7, user))
- if(M.scan_state)
- L += M
- if(!L.len)
- user << "[src] reports that nothing was detected nearby."
- return
- else
- for(M in L)
- var/turf/T = get_turf(M)
- var/image/I = image('icons/turf/mining.dmi', loc = T, icon_state = M.scan_state, layer = 18)
- C.images += I
- spawn(30)
- if(C)
- C.images -= I
+ var/list/mobs = list()
+ mobs |= user
+ mineral_scan_pulse(mobs, get_turf(user))
+
//Debug item to identify all ore spread quickly
/obj/item/device/mining_scanner/admin
@@ -820,22 +790,24 @@
var/list/mobs = recursive_mob_check(t, 1,0,0)
if(!mobs.len)
return
- var/list/L = list()
- var/turf/simulated/mineral/M
- for(M in range(7, t))
- if(M.scan_state)
- L += M
- if(L.len)
- for(var/mob/user in mobs)
- if(user.client)
- var/client/C = user.client
- for(M in L)
- var/turf/T = get_turf(M)
- var/image/I = image('icons/turf/mining.dmi', loc = T, icon_state = M.scan_state, layer = 18)
- C.images += I
- spawn(30)
- if(C)
- C.images -= I
+ mineral_scan_pulse(mobs, t)
+
+/proc/mineral_scan_pulse(list/mobs, turf/T, range = world.view)
+ var/list/minerals = list()
+ for(var/turf/simulated/mineral/M in range(range, T))
+ if(M.scan_state)
+ minerals += M
+ if(minerals.len)
+ for(var/mob/user in mobs)
+ if(user.client)
+ var/client/C = user.client
+ for(var/turf/simulated/mineral/M in minerals)
+ var/turf/F = get_turf(M)
+ var/image/I = image('icons/turf/mining.dmi', loc = F, icon_state = M.scan_state, layer = 18)
+ C.images += I
+ spawn(30)
+ if(C)
+ C.images -= I
/**********************Xeno Warning Sign**********************/
/obj/structure/sign/xeno_warning_mining
diff --git a/code/modules/mining/laborcamp/laborshuttle.dm b/code/modules/mining/laborcamp/laborshuttle.dm
index 5588b29e662..7f0992a502f 100644
--- a/code/modules/mining/laborcamp/laborshuttle.dm
+++ b/code/modules/mining/laborcamp/laborshuttle.dm
@@ -20,10 +20,10 @@
if(href_list["move"])
var/obj/docking_port/mobile/M = SSshuttle.getShuttle("laborcamp")
if(!M)
- usr << "Cannot locate shuttle."
+ usr << "Cannot locate shuttle!"
return 0
var/obj/docking_port/stationary/S = M.get_docked()
if(S && S.name == "laborcamp_away")
- usr << "Shuttle is already at the outpost."
+ usr << "Shuttle is already at the outpost!"
return 0
..()
\ No newline at end of file
diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm
index 550e282b0ce..e420be8f389 100644
--- a/code/modules/mining/mine_items.dm
+++ b/code/modules/mining/mine_items.dm
@@ -79,7 +79,7 @@
hitsound = 'sound/weapons/drill.ogg'
origin_tech = "materials=2;powerstorage=3;engineering=2"
desc = "An electric mining drill for the especially scrawny."
- var/drillcost = 50 //80 mineral walls by default
+ var/drillcost = 15 //666 mineral walls by default
var/obj/item/weapon/stock_parts/cell/high/bcell = null
/obj/item/weapon/pickaxe/drill/New() //this one starts with a cell pre-installed.
@@ -105,16 +105,18 @@
bcell = W
user << "You install a cell in [src]."
update_icon()
- else if(istype(W, /obj/item/weapon/screwdriver))
- if(bcell)
- bcell.updateicon()
- bcell.loc = get_turf(src.loc)
- bcell = null
- user << "You remove the cell from [src]."
- update_icon()
- return
+ else
..()
- return
+
+/obj/item/weapon/pickaxe/drill/attack_self(mob/user)
+ if(bcell)
+ bcell.updateicon()
+ bcell.loc = get_turf(src.loc)
+ bcell = null
+ user << "You remove the cell from [src]."
+ update_icon()
+ else
+ user << "There is no cell in [src]."
/obj/item/weapon/pickaxe/drill/examine(mob/user)
..()
@@ -128,6 +130,9 @@
desc = "An integrated electric mining drill."
var/warned = 0
+/obj/item/weapon/pickaxe/drill/cyborg/attack_self(mob/user)
+ return //can't remove the drill's cell
+
/obj/item/weapon/pickaxe/drill/cyborg/proc/use_robot_power(var/mob/living/silicon/robot/R)
if(!bcell.use(drillcost))
if(!warned)
@@ -135,28 +140,28 @@
playsound(src, 'sound/weapons/smg_empty_alarm.ogg',50,1)
warned = 1
if(!R.cell.use(drillcost))
- R << "You don't have enough charge to drill."
+ R << "You don't have enough charge to drill!"
return 0
return 1
/obj/item/weapon/pickaxe/drill/diamonddrill
name = "diamond-tipped mining drill"
icon_state = "diamonddrill"
- digspeed = 8 //it's a fast drill with a relatively low power cost. what more could you ask for?
+ digspeed = 10 //it's a fast drill with a relatively low power cost. what more could you ask for?
origin_tech = "materials=6;powerstorage=4;engineering=5"
desc = "Yours is the drill that will pierce the heavens!"
- drillcost = 75 //66 mineral walls by default, but very quickly
+ drillcost = 25 //400 mineral walls by default, but very quickly
/obj/item/weapon/pickaxe/drill/jackhammer
name = "sonic jackhammer"
icon_state = "jackhammer"
item_state = "jackhammer"
- digspeed = 4 //the epitome of powertools. high power consumption, extremely fast mining, laughs at puny walls
+ digspeed = 5 //the epitome of powertools. high power consumption, extremely fast mining, laughs at puny walls
origin_tech = "materials=3;powerstorage=2;engineering=2"
digsound = list('sound/weapons/sonic_jackhammer.ogg')
hitsound = 'sound/weapons/sonic_jackhammer.ogg'
desc = "Cracks rocks with sonic blasts, and doubles as a demolition power tool for smashing walls."
- drillcost = 100
+ drillcost = 30 //333 mineral walls by default, but very quickly
/*****************************Shovel********************************/
@@ -190,4 +195,5 @@
/obj/structure/closet/crate/miningcar
desc = "A mining car. This one doesn't work on rails, but has to be dragged."
name = "Mining car (not for rails)"
- icon_crate = "miningcar"
\ No newline at end of file
+ icon_crate = "miningcar"
+ icon_state = "miningcar"
diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm
index cdde315c9c5..c8469966af4 100644
--- a/code/modules/mining/mine_turfs.dm
+++ b/code/modules/mining/mine_turfs.dm
@@ -238,7 +238,7 @@
name = "gibtonite deposit"
desc = "An active gibtonite reserve. Run!"
stage = 1
- visible_message("There was gibtonite inside! It's going to explode!")
+ visible_message("There was gibtonite inside! It's going to explode!")
var/turf/bombturf = get_turf(src)
var/area/A = get_area(bombturf)
@@ -406,7 +406,7 @@
/turf/simulated/mineral/attackby(var/obj/item/weapon/pickaxe/P as obj, mob/user as mob, params)
if (!user.IsAdvancedToolUser())
- usr << "You don't have the dexterity to do this!"
+ usr << "You don't have the dexterity to do this!"
return
if (istype(P, /obj/item/weapon/pickaxe))
@@ -421,13 +421,13 @@
if(!RD.use_robot_power(user))
return
else if(!D.bcell.use(D.drillcost))
- user << "Your [D.name] doesn't have enough charge."
+ user << "Your [D.name] doesn't have enough charge!"
return
if(last_act+P.digspeed > world.time)//prevents message spam
return
last_act = world.time
- user << "You start picking."
+ user << "You start picking..."
P.playDigSound()
if(do_after(user,P.digspeed))
@@ -544,15 +544,15 @@
return
if (dug)
- user << "This area has already been dug."
+ user << "This area has already been dug!"
return
- user << "You start digging."
+ user << "You start digging..."
playsound(src, 'sound/effects/shovel_dig.ogg', 50, 1) //FUCK YO RUSTLE I GOT'S THE DIGS SOUND HERE
sleep(20)
if ((user.loc == T && user.get_active_hand() == W))
- user << "You dug a hole."
+ user << "You dig a hole."
gets_dug()
return
@@ -563,15 +563,15 @@
return
if (dug)
- user << "This area has already been dug."
+ user << "This area has already been dug!"
return
- user << "You start digging."
+ user << "You start digging..."
playsound(src, 'sound/effects/shovel_dig.ogg', 50, 1) //FUCK YO RUSTLE I GOT'S THE DIGS SOUND HERE
sleep(P.digspeed)
if ((user.loc == T && user.get_active_hand() == W))
- user << "You dug a hole."
+ user << "You dig a hole."
gets_dug()
return
diff --git a/code/modules/mining/ores_coins.dm b/code/modules/mining/ores_coins.dm
index eeed29889c6..bf394e7ac21 100644
--- a/code/modules/mining/ores_coins.dm
+++ b/code/modules/mining/ores_coins.dm
@@ -68,7 +68,7 @@
if(istype(I, /obj/item/weapon/weldingtool))
var/obj/item/weapon/weldingtool/W = I
if(W.welding)
- user << "You can't hit a high enough temperature to smelt [src] properly."
+ user << "You can't hit a high enough temperature to smelt [src] properly!"
else
..()
@@ -123,7 +123,7 @@
/obj/item/weapon/twohanded/required/gibtonite/attackby(obj/item/I, mob/user, params)
if(!wires && istype(I, /obj/item/device/assembly/igniter))
- user.visible_message("[user] attaches [I] to [src]!")
+ user.visible_message("[user] attaches [I] to [src].", "You attach [I] to [src].")
wires = new(src)
attacher = key_name(user)
qdel(I)
@@ -141,7 +141,7 @@
if(primed)
if(istype(I, /obj/item/device/mining_scanner) || istype(I, /obj/item/device/t_scanner/adv_mining_scanner) || istype(I, /obj/item/device/multitool))
primed = 0
- user.visible_message("The chain reaction was stopped! ...The ore's quality went down.")
+ user.visible_message("The chain reaction was stopped! ...The ore's quality looks diminished.", "You stopped the chain reaction. ...The ore's quality looks diminished.")
icon_state = "Gibtonite ore"
quality = 1
return
@@ -185,7 +185,7 @@
else if(triggered_by == 2)
log_game("A signal has primed a [name] for detonation at [A.name]([bombturf.x],[bombturf.y],[bombturf.z]). Igniter attacher: [attacher].")
else
- user.visible_message("[user] strikes \the [src], causing a chain reaction!")
+ user.visible_message("[user] strikes \the [src], causing a chain reaction!", "You strike \the [src], causing a chain reaction.")
log_game("[key_name(user)] has primed a [name] for detonation at [A.name]([bombturf.x],[bombturf.y],[bombturf.z])")
spawn(det_time)
if(primed)
@@ -280,12 +280,22 @@
sideslist = list("heads")
value = 20
+/obj/item/weapon/coin/antagtoken
+ name = "antag token"
+ icon_state = "coin_valid_valid"
+ cmineral = "valid"
+ desc = "A novelty coin that helps the heart know what hard evidence cannot prove."
+ sideslist = list("valid", "salad")
+ value = 20
+
+/obj/item/weapon/coin/antagtoken/New()
+ return
/obj/item/weapon/coin/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
if(istype(W, /obj/item/stack/cable_coil))
var/obj/item/stack/cable_coil/CC = W
if(string_attached)
- user << "There already is a string attached to this coin."
+ user << "There already is a string attached to this coin!"
return
if (CC.use(1))
@@ -293,7 +303,7 @@
string_attached = 1
user << "You attach a string to the coin."
else
- user << "You need one length of cable to attach a string to the coin."
+ user << "You need one length of cable to attach a string to the coin!"
return
else if(istype(W,/obj/item/weapon/wirecutters))
@@ -317,6 +327,6 @@
icon_state = "coin_[cmineral]_[coinflip]"
playsound(user.loc, 'sound/items/coinflip.ogg', 50, 1)
if(do_after(user, 15))
- user.visible_message("[user] has flipped [src]. It lands on [coinflip].", \
+ user.visible_message("[user] has flipped [src]. It lands on [coinflip].", \
"You flip [src]. It lands on [coinflip].", \
- "You hear the clattering of loose change.")
\ No newline at end of file
+ "You hear the clattering of loose change.")
\ No newline at end of file
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index 850f4d63cf7..56bcf7503cb 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -61,9 +61,8 @@ var/list/image/ghost_darkness_images = list() //this is a list of images for thi
verbs -= /mob/dead/observer/verb/possess
animate(src, pixel_y = 2, time = 10, loop = -1)
-
-
..()
+
/mob/dead/observer/Destroy()
if (ghostimage)
ghost_darkness_images -= ghostimage
@@ -102,7 +101,6 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
else
var/response = alert(src, "Are you -sure- you want to ghost?\n(You are alive. If you ghost whilst still alive you may not play again this round! You can't change your mind so choose wisely!!)","Are you sure you want to ghost?","Ghost","Stay in body")
if(response != "Ghost") return //didn't want to ghost after-all
- resting = 1
ghostize(0) //0 parameter is so we can never re-enter our body, "Charlie, you can never come baaaack~" :3
return
@@ -205,7 +203,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
if(following && following == target)
return
following = target
- src << "Now following [target]"
+ src << "Now following [target]."
spawn(0)
var/turf/pos = get_turf(src)
while(loc == pos && target && following == target && client)
@@ -338,7 +336,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
/mob/dead/observer/pointed(atom/A as mob|obj|turf in view())
if(!..())
return 0
- usr.visible_message("[src] points to [A]")
+ usr.visible_message("[src] points to [A].")
return 1
/mob/dead/observer/verb/view_manfiest()
@@ -351,6 +349,15 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
src << browse(dat, "window=manifest;size=387x420;can_close=1")
+//this is called when a ghost is drag clicked to something.
+/mob/dead/observer/MouseDrop(atom/over)
+ if(!usr || !over) return
+ if (isobserver(usr) && usr.client.holder && isliving(over))
+ if (usr.client.holder.cmd_ghost_drag(src,over))
+ return
+
+ return ..()
+
/mob/dead/observer/Topic(href, href_list)
if(href_list["follow"])
var/atom/movable/target = locate(href_list["follow"])
diff --git a/code/modules/mob/interactive.dm b/code/modules/mob/interactive.dm
index 00194761fb7..b23a2d439ec 100644
--- a/code/modules/mob/interactive.dm
+++ b/code/modules/mob/interactive.dm
@@ -286,6 +286,9 @@
else
unEquip(I,TRUE)
update_hands = 1
+
+/mob/living/carbon/human/interactive/proc/targetRange(var/towhere)
+ return get_dist(get_turf(towhere), get_turf(src))
/mob/living/carbon/human/interactive/Life()
..()
@@ -579,7 +582,7 @@
if((TARGET && (doing & FIGHTING)) || graytide) // this is a redundancy check
var/mob/living/M = TARGET
if(istype(M,/mob/living))
- if(M in range(FUZZY_CHANCE_LOW,src))
+ if(targetRange(M) <= FUZZY_CHANCE_LOW)
if(M.health > 1)
if(main_hand)
if(main_hand.force != 0)
@@ -609,14 +612,14 @@
W.attack(TARGET,src)
sleep(1)
else
- if(get_dist(src,TARGET) > 2)
+ if(targetRange(TARGET) > 2)
tryWalk(TARGET)
else
if(Adjacent(TARGET))
M.attack_hand(src)
sleep(1)
timeout++
- else if(timeout >= 10 || M.health <= 1 || !(M in range(14,src)))
+ else if(timeout >= 10 || M.health <= 1 || !(targetRange(M) > 14))
doing = doing & ~FIGHTING
timeout = 0
TARGET = null
@@ -665,4 +668,4 @@
TRAITS |= TRAIT_DUMB
faction = list("bot_grey")
graytide = 1
- ..()
\ No newline at end of file
+ ..()
diff --git a/code/modules/mob/living/carbon/alien/alien.dm b/code/modules/mob/living/carbon/alien/alien.dm
index 0936e3978f4..0b33449b5ef 100644
--- a/code/modules/mob/living/carbon/alien/alien.dm
+++ b/code/modules/mob/living/carbon/alien/alien.dm
@@ -12,7 +12,6 @@
ventcrawler = 2
languages = ALIEN
verb_say = "hisses"
- lying_pixel_offset = 0
var/nightvision = 1
var/storedPlasma = 250
var/max_plasma = 500
@@ -28,12 +27,13 @@
var/heat_protection = 0.5
var/leaping = 0
+ var/list/obj/effect/proc_holder/alien/abilities = list()
/mob/living/carbon/alien/New()
verbs += /mob/living/proc/mob_sleep
verbs += /mob/living/proc/lay_down
internal_organs += new /obj/item/organ/brain/alien
-
+ AddAbility(new/obj/effect/proc_holder/alien/nightvisiontoggle(null))
..()
/mob/living/carbon/alien/adjustToxLoss(amount)
@@ -73,22 +73,18 @@
var/loc_temp = get_temperature(environment)
- //world << "Loc temp: [loc_temp] - Body temp: [bodytemperature] - Fireloss: [getFireLoss()] - Fire protection: [heat_protection] - Location: [loc] - src: [src]"
-
// Aliens are now weak to fire.
//After then, it reacts to the surrounding atmosphere based on your thermal protection
if(!on_fire) // If you're on fire, ignore local air temperature
if(loc_temp > bodytemperature)
//Place is hotter than we are
- var/thermal_protection = heat_protection //This returns a 0 - 1 value, which corresponds to the percentage of protection based on what you're wearing and what you're exposed to.
+ var/thermal_protection = heat_protection //This returns a 0 - 1 value, which corresponds to the percentage of heat protection.
if(thermal_protection < 1)
bodytemperature += (1-thermal_protection) * ((loc_temp - bodytemperature) / BODYTEMP_HEAT_DIVISOR)
else
bodytemperature += 1 * ((loc_temp - bodytemperature) / BODYTEMP_HEAT_DIVISOR)
- // bodytemperature -= max((loc_temp - bodytemperature / BODYTEMP_AUTORECOVERY_DIVISOR), BODYTEMP_AUTORECOVERY_MINIMUM)
- // +/- 50 degrees from 310.15K is the 'safe' zone, where no damage is dealt.
if(bodytemperature > 360.15)
//Body temperature is too hot.
throw_alert("alien_fire")
@@ -134,12 +130,12 @@
bodytemperature += BODYTEMP_HEATING_MAX //If you're on fire, you heat up!
return
+/mob/living/carbon/alien/reagent_check(var/datum/reagent/R) //can metabolize all reagents
+ return 0
+
/mob/living/carbon/alien/IsAdvancedToolUser()
return has_fine_manipulation
-/mob/living/carbon/alien/SpeciesCanConsume()
- return 1 // Aliens can eat, and they can be fed food/drink
-
/mob/living/carbon/alien/Stat()
..()
@@ -148,6 +144,26 @@
stat(null, "Move Mode: [m_intent]")
stat(null, "Plasma Stored: [getPlasma()]/[max_plasma]")
+ add_abilities_to_panel()
+
+/mob/living/carbon/alien/proc/AddAbility(var/obj/effect/proc_holder/alien/A)
+ abilities.Add(A)
+ A.on_gain(src)
+ if(A.has_action)
+ if(!A.action)
+ A.action = new/datum/action/spell_action/alien
+ A.action.target = A
+ A.action.name = A.name
+ A.action.button_icon = A.action_icon
+ A.action.button_icon_state = A.action_icon_state
+ A.action.background_icon_state = A.action_background_icon_state
+ A.action.Grant(src)
+
+
+/mob/living/carbon/alien/proc/add_abilities_to_panel()
+ for(var/obj/effect/proc_holder/alien/A in abilities)
+ statpanel("[A.panel]",A.plasma_cost > 0?"([A.plasma_cost])":"",A)
+
/mob/living/carbon/alien/Stun(amount)
if(status_flags & CANSTUN)
stunned = max(max(stunned,amount),0) //can't go below 0, getting a low amount of stun doesn't lower your current stun
@@ -159,21 +175,6 @@
/mob/living/carbon/alien/getTrail()
return "xltrails"
-/mob/living/carbon/alien/verb/nightvisiontoggle()
- set name = "Toggle Night Vision"
- set category = "Alien"
-
- if(!nightvision)
- see_in_dark = 8
- see_invisible = SEE_INVISIBLE_MINIMUM
- nightvision = 1
- hud_used.nightvisionicon.icon_state = "nightvision1"
- else if(nightvision == 1)
- see_in_dark = 4
- see_invisible = 45
- nightvision = 0
- hud_used.nightvisionicon.icon_state = "nightvision0"
-
/*----------------------------------------
Proc: AddInfectionImages()
Des: Gives the client of the alien an image on each infected mob.
@@ -202,6 +203,10 @@ Des: Removes all infected images from the alien.
/mob/living/carbon/alien/canBeHandcuffed()
return 1
+/mob/living/carbon/alien/get_standard_pixel_y_offset(lying = 0)
+ return initial(pixel_y)
+
+
#undef HEAT_DAMAGE_LEVEL_1
#undef HEAT_DAMAGE_LEVEL_2
#undef HEAT_DAMAGE_LEVEL_3
diff --git a/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm b/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm
index c758e3e4f7a..8b27de42f94 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm
@@ -5,171 +5,281 @@ These are general powers. Specific powers are stored under the appropriate alien
/*Alien spit now works like a taser shot. It won't home in on the target but will act the same once it does hit.
Doesn't work on other aliens/AI.*/
+/datum/action/spell_action/alien
-/mob/living/carbon/alien/proc/powerc(X, Y)//Y is optional, checks for weed planting. X can be null.
- if(stat)
- src << "You must be conscious to do this."
- return 0
- else if(X && getPlasma() < X)
- src << "Not enough plasma stored."
- return 0
- else if(Y && (!isturf(src.loc) || istype(src.loc, /turf/space)))
- src << "Bad place for a garden!"
- return 0
- else return 1
+/datum/action/spell_action/alien/UpdateName()
+ var/obj/effect/proc_holder/alien/ab = target
+ return ab.name
-/mob/living/carbon/alien/humanoid/verb/plant()
- set name = "Plant Weeds (50)"
- set desc = "Plants some alien weeds"
- set category = "Alien"
+/datum/action/spell_action/alien/IsAvailable()
+ if(!target)
+ return 0
+ var/obj/effect/proc_holder/alien/ab = target
- if(locate(/obj/structure/alien/weeds/node) in get_turf(src))
+ if(usr)
+ return ab.cost_check(ab.check_turf,usr,1)
+ else
+ if(owner)
+ return ab.cost_check(ab.check_turf,owner,1)
+ return 1
+
+/datum/action/spell_action/alien/CheckRemoval()
+ return !isalien(owner)
+
+
+/obj/effect/proc_holder/alien
+ name = "Alien Power"
+ panel = "Alien"
+ var/plasma_cost = 0
+ var/check_turf = 0
+
+ var/has_action = 1
+ var/datum/action/spell_action/alien/action = null
+ var/action_icon = 'icons/mob/actions.dmi'
+ var/action_icon_state = "spell_default"
+ var/action_background_icon_state = "bg_alien"
+
+/obj/effect/proc_holder/alien/Click()
+ if(!istype(usr,/mob/living/carbon/alien))
+ return 1
+ var/mob/living/carbon/alien/user = usr
+ if(cost_check(check_turf,user))
+ if(fire(user) && user) // Second check to prevent runtimes when evolving
+ user.adjustToxLoss(-plasma_cost)
+ return 1
+
+/obj/effect/proc_holder/alien/proc/on_gain(var/mob/living/carbon/alien/user)
+ return
+
+/obj/effect/proc_holder/alien/proc/fire(var/mob/living/carbon/alien/user)
+ return 1
+
+/obj/effect/proc_holder/alien/proc/cost_check(check_turf=0,var/mob/living/carbon/alien/user,var/silent = 0)
+ if(user.stat)
+ if(!silent)
+ user << "You must be conscious to do this."
+ return 0
+ if(user.getPlasma() < plasma_cost)
+ if(!silent)
+ user << "Not enough plasma stored."
+ return 0
+ if(check_turf && (!isturf(user.loc) || istype(user.loc, /turf/space)))
+ if(!silent)
+ user << "Bad place for a garden!"
+ return 0
+ return 1
+
+/obj/effect/proc_holder/alien/plant
+ name = "Plant Weeds"
+ desc = "Plants some alien weeds"
+ plasma_cost = 50
+ check_turf = 1
+
+ action_icon_state = "alien_plant"
+
+/obj/effect/proc_holder/alien/plant/fire(var/mob/living/carbon/alien/user)
+ if(locate(/obj/structure/alien/weeds/node) in get_turf(user))
src << "There's already a weed node here."
- return
+ return 0
+ for(var/mob/O in viewers(user, null))
+ O.show_message(text("[user] has planted some alien weeds!"), 1)
+ new/obj/structure/alien/weeds/node(user.loc)
+ return 1
- if(powerc(50,1))
- adjustToxLoss(-50)
- for(var/mob/O in viewers(src, null))
- O.show_message(text("[src] has planted some alien weeds!"), 1)
- new /obj/structure/alien/weeds/node(loc)
- return
+/obj/effect/proc_holder/alien/whisper
+ name = "Whisper"
+ desc = "Whisper to someone"
+ plasma_cost = 10
-/*
-/mob/living/carbon/alien/humanoid/verb/ActivateHuggers()
- set name = "Activate facehuggers (5)"
- set desc = "Makes all nearby facehuggers activate"
- set category = "Alien"
+ action_icon_state = "alien_whisper"
- if(powerc(5))
- adjustToxLoss(-5)
- for(var/obj/item/clothing/mask/facehugger/F in range(8,src))
- F.GoActive()
- emote("roar")
- return
-*/
-/mob/living/carbon/alien/humanoid/verb/whisp(mob/M as mob in oview())
- set name = "Whisper (10)"
- set desc = "Whisper to someone"
- set category = "Alien"
+/obj/effect/proc_holder/alien/whisper/fire(var/mob/living/carbon/alien/user)
+ var/mob/M = input("Select who to whisper to:","Whisper to?",null) as mob in oview(user)
+ if(!M)
+ return 0
+ var/msg = sanitize(input("Message:", "Alien Whisper") as text|null)
+ if(msg)
+ log_say("AlienWhisper: [key_name(user)]->[M.key] : [msg]")
+ M << "You hear a strange, alien voice in your head...[msg]"
+ user << {"You said: "[msg]" to [M]"}
+ else
+ return 0
+ return 1
- if(powerc(10))
- adjustToxLoss(-10)
- var/msg = sanitize(input("Message:", "Alien Whisper") as text|null)
- if(msg)
- log_say("AlienWhisper: [key_name(src)]->[M.key] : [msg]")
- M << "You hear a strange, alien voice in your head...[msg]"
- src << {"You said: "[msg]" to [M]"}
- return
+/obj/effect/proc_holder/alien/transfer
+ name = "Transfer Plasma"
+ desc = "Transfer Plasma to another alien"
+ plasma_cost = 0
-/mob/living/carbon/alien/humanoid/verb/transfer_plasma(mob/living/carbon/alien/M as mob in oview())
- set name = "Transfer Plasma"
- set desc = "Transfer Plasma to another alien"
- set category = "Alien"
+ action_icon_state = "alien_transfer"
+/obj/effect/proc_holder/alien/transfer/fire(var/mob/living/carbon/alien/user)
+ var/list/mob/living/carbon/alien/aliens_around = list()
+ for(var/mob/living/carbon/alien/A in oview(user))
+ aliens_around.Add(A)
+ var/mob/living/carbon/alien/M = input("Select who to transfer to:","Transfer plasma to?",null) as mob in aliens_around
+ if(!M)
+ return 0
if(isalien(M))
var/amount = input("Amount:", "Transfer Plasma to [M]") as num
if (amount)
amount = abs(round(amount))
- if(powerc(amount))
- if (get_dist(src,M) <= 1)
+ if(user.getPlasma() > amount)
+ if (get_dist(user,M) <= 1)
M.adjustToxLoss(amount)
- adjustToxLoss(-amount)
- M << "[src] has transfered [amount] plasma to you."
- src << {"You have trasferred [amount] plasma to [M]"}
+ user.adjustToxLoss(-amount)
+ M << "[user] has transfered [amount] plasma to you."
+ user << {"You trasfer [amount] plasma to [M]"}
else
- src << "You need to be closer."
+ user << "You need to be closer!"
return
+/obj/effect/proc_holder/alien/acid
+ name = "Corrossive Acid"
+ desc = "Drench an object in acid, destroying it over time."
+ plasma_cost = 200
-/mob/living/carbon/alien/humanoid/proc/corrosive_acid(O as obj|turf in oview(1)) //If they right click to corrode, an error will flash if its an invalid target./N
- set name = "Corrossive Acid (200)"
- set desc = "Drench an object in acid, destroying it over time."
- set category = "Alien"
+ action_icon_state = "alien_acid"
- if(powerc(200))
- if(O in oview(1))
- // OBJ CHECK
- if(isobj(O))
- var/obj/I = O
- if(I.unacidable) //So the aliens don't destroy energy fields/singularies/other aliens/etc with their acid.
- src << "You cannot dissolve this object."
- return
- // TURF CHECK
- else if(istype(O, /turf/simulated))
- var/turf/T = O
- // R WALL
- if(istype(T, /turf/simulated/wall/r_wall))
- src << "You cannot dissolve this object."
- return
- // R FLOOR
- if(istype(T, /turf/simulated/floor/engine))
- src << "You cannot dissolve this object."
- return
- else// Not a type we can acid.
- return
+/obj/effect/proc_holder/alien/acid/on_gain(var/mob/living/carbon/alien/user)
+ user.verbs.Add(/mob/living/carbon/alien/humanoid/proc/corrosive_acid)
- adjustToxLoss(-200)
- new /obj/effect/acid(get_turf(O), O)
- visible_message("[src] vomits globs of vile stuff all over [O]. It begins to sizzle and melt under the bubbling mess of acid!")
- else
- src << "Target is too far away."
+/obj/effect/proc_holder/alien/acid/proc/corrode(var/target,var/mob/living/carbon/alien/user = usr)
+ if(target in oview(1,user))
+ // OBJ CHECK
+ if(isobj(target))
+ var/obj/I = target
+ if(I.unacidable) //So the aliens don't destroy energy fields/singularies/other aliens/etc with their acid.
+ user << "You cannot dissolve this object."
+ return 0
+ // TURF CHECK
+ else if(istype(target, /turf/simulated))
+ var/turf/T = target
+ // R WALL
+ if(istype(T, /turf/simulated/wall/r_wall))
+ user << "You cannot dissolve this object."
+ return 0
+ // R FLOOR
+ if(istype(T, /turf/simulated/floor/engine))
+ user << "You cannot dissolve this object."
+ return 0
+ else// Not a type we can acid.
+ return 0
+ new /obj/effect/acid(get_turf(target), target)
+ user.visible_message("[user] vomits globs of vile stuff all over [target]. It begins to sizzle and melt under the bubbling mess of acid!")
+ return 1
+ else
+ src << "Target is too far away."
+ return 0
+
+
+/obj/effect/proc_holder/alien/acid/fire(var/mob/living/carbon/alien/user)
+ var/O = input("Select what to dissolve:","Dissolve",null) as obj|turf in oview(1,user)
+ if(!O)
+ return 0
+ return corrode(O,user)
+
+/mob/living/carbon/alien/humanoid/proc/corrosive_acid(O as obj|turf in oview(1)) // right click menu verb ugh
+ set name = "Corrossive Acid"
+
+ if(!isalien(usr))
+ return
+ var/mob/living/carbon/alien/humanoid/user = usr
+ var/obj/effect/proc_holder/alien/acid/A = locate() in user.abilities
+ if(!A)
+ return
+ if(user.getPlasma() > A.plasma_cost && A.corrode(O))
+ user.adjustToxLoss(-A.plasma_cost)
+
+
+/obj/effect/proc_holder/alien/neurotoxin
+ name = "Spit Neurotoxin"
+ desc = "Spits neurotoxin at someone, paralyzing them for a short time."
+ plasma_cost = 50
+
+ action_icon_state = "alien_neurotoxin"
+
+/obj/effect/proc_holder/alien/neurotoxin/fire(var/mob/living/carbon/alien/user)
+ user.visible_message("[user] spits neurotoxin!", "You spit neurotoxin.")
+
+ var/turf/T = user.loc
+ var/turf/U = get_step(user, user.dir) // Get the tile infront of the move, based on their direction
+ if(!isturf(U) || !isturf(T))
+ return 0
+
+ var/obj/item/projectile/bullet/neurotoxin/A = new /obj/item/projectile/bullet/neurotoxin(user.loc)
+ A.current = U
+ A.yo = U.y - T.y
+ A.xo = U.x - T.x
+ A.fire()
+
+ return 1
+
+
+/obj/effect/proc_holder/alien/resin
+ name = "Secrete Resin"
+ desc = "Secrete tough malleable resin."
+ plasma_cost = 55
+ check_turf = 1
+
+ action_icon_state = "alien_resin"
+
+/obj/effect/proc_holder/alien/resin/fire(var/mob/living/carbon/alien/user)
+ if(locate(/obj/structure/alien/resin) in user.loc.contents)
+ user << "There is already a resin structure there."
+ return 0
+ var/choice = input("Choose what you wish to shape.","Resin building") as null|anything in list("resin wall","resin membrane","resin nest") //would do it through typesof but then the player choice would have the type path and we don't want the internal workings to be exposed ICly - Urist
+
+ if(!choice)
+ return 0
+
+ user << "You shape a [choice]."
+ user.visible_message("[user] vomits up a thick purple substance and begins to shape it.")
+
+ switch(choice)
+ if("resin wall")
+ new /obj/structure/alien/resin/wall(user.loc)
+ if("resin membrane")
+ new /obj/structure/alien/resin/membrane(user.loc)
+ if("resin nest")
+ new /obj/structure/stool/bed/nest(user.loc)
+ return 1
+
+/obj/effect/proc_holder/alien/regurgitate
+ name = "Regurgitate"
+ desc = "Empties the contents of your stomach"
+ plasma_cost = 0
+
+ action_icon_state = "alien_barf"
+
+/obj/effect/proc_holder/alien/regurgitate/fire(var/mob/living/carbon/alien/user)
+ if(user.stomach_contents.len)
+ for(var/atom/movable/A in user.stomach_contents)
+ user.stomach_contents.Remove(A)
+ A.loc = user.loc
+ A.update_pipe_vision()
+ user.visible_message("[user] hurls out the contents of their stomach!")
return
+/obj/effect/proc_holder/alien/nightvisiontoggle
+ name = "Toggle Night Vision"
+ desc = "Toggles Night Vision"
+ plasma_cost = 0
-/mob/living/carbon/alien/humanoid/proc/neurotoxin() // ok
- set name = "Spit Neurotoxin (50)"
- set desc = "Spits neurotoxin at someone, paralyzing them for a short time."
- set category = "Alien"
+ has_action = 0 // Has dedicated GUI button already
- if(powerc(50))
- adjustToxLoss(-50)
- src.visible_message("[src] spits neurotoxin!", "You spit neurotoxin.")
+/obj/effect/proc_holder/alien/nightvisiontoggle/fire(var/mob/living/carbon/alien/user)
- var/turf/T = loc
- var/turf/U = get_step(src, dir) // Get the tile infront of the move, based on their direction
- if(!isturf(U) || !isturf(T))
- return
+ if(!user.nightvision)
+ user.see_in_dark = 8
+ user.see_invisible = SEE_INVISIBLE_MINIMUM
+ user.nightvision = 1
+ user.hud_used.nightvisionicon.icon_state = "nightvision1"
+ else if(user.nightvision == 1)
+ user.see_in_dark = 4
+ user.see_invisible = 45
+ user.nightvision = 0
+ user.hud_used.nightvisionicon.icon_state = "nightvision0"
- var/obj/item/projectile/bullet/neurotoxin/A = new /obj/item/projectile/bullet/neurotoxin(usr.loc)
- A.current = U
- A.yo = U.y - T.y
- A.xo = U.x - T.x
- A.fire()
- return
+ return 1
-/mob/living/carbon/alien/humanoid/proc/resin()
- set name = "Secrete Resin (55)"
- set desc = "Secrete tough malleable resin."
- set category = "Alien"
-
- if(powerc(55,1))
- if(locate(/obj/structure/alien/resin) in loc.contents)
- src << "There is already a resin structure there."
- return
- var/choice = input("Choose what you wish to shape.","Resin building") as null|anything in list("resin wall","resin membrane","resin nest") //would do it through typesof but then the player choice would have the type path and we don't want the internal workings to be exposed ICly - Urist
- if(!choice || !powerc(55)) return
- adjustToxLoss(-55)
- src << "You shape a [choice]."
- visible_message("[src] vomits up a thick purple substance and begins to shape it.")
- switch(choice)
- if("resin wall")
- new /obj/structure/alien/resin/wall(loc)
- if("resin membrane")
- new /obj/structure/alien/resin/membrane(loc)
- if("resin nest")
- new /obj/structure/stool/bed/nest(loc)
- return
-
-/mob/living/carbon/alien/humanoid/verb/regurgitate()
- set name = "Regurgitate"
- set desc = "Empties the contents of your stomach"
- set category = "Alien"
-
- if(powerc() && stomach_contents.len)
- for(var/atom/movable/A in stomach_contents)
- if(A in stomach_contents)
- stomach_contents.Remove(A)
- A.loc = loc
- //Paralyse(10)
- src.visible_message("[src] hurls out the contents of their stomach!")
- return
diff --git a/code/modules/mob/living/carbon/alien/humanoid/caste/drone.dm b/code/modules/mob/living/carbon/alien/humanoid/caste/drone.dm
index bae52d99d01..a18f4b2ee00 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/caste/drone.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/caste/drone.dm
@@ -12,7 +12,11 @@
if(src.name == "alien drone")
src.name = text("alien drone ([rand(1, 1000)])")
src.real_name = src.name
- verbs.Add(/mob/living/carbon/alien/humanoid/proc/resin,/mob/living/carbon/alien/humanoid/proc/corrosive_acid)
+
+ AddAbility(new/obj/effect/proc_holder/alien/resin(null))
+ AddAbility(new/obj/effect/proc_holder/alien/acid(null))
+ AddAbility(new/obj/effect/proc_holder/alien/evolve(null))
+
..()
//Drones use the same base as generic humanoids.
@@ -20,29 +24,26 @@
. = ..()
. += 1
+/obj/effect/proc_holder/alien/evolve
+ name = "Evolve"
+ desc = "Produce an interal egg sac capable of spawning children. Only one queen can exist at a time."
+ plasma_cost = 500
-//Drone verbs
-/mob/living/carbon/alien/humanoid/drone/verb/evolve()
- set name = "Evolve (500)"
- set desc = "Produce an interal egg sac capable of spawning children. Only one queen can exist at a time."
- set category = "Alien"
+ action_icon_state = "alien_evolve_drone"
- if(powerc(500))
- // Queen check
- var/no_queen = 1
- for(var/mob/living/carbon/alien/humanoid/queen/Q in living_mob_list)
- if(!Q.key || !Q.getorgan(/obj/item/organ/brain))
- continue
- no_queen = 0
-
- if(no_queen)
- adjustToxLoss(-500)
- src << "You begin to evolve!"
- for(var/mob/O in viewers(src, null))
- O.show_message(text("[src] begins to twist and contort!"), 1)
- var/mob/living/carbon/alien/humanoid/queen/new_xeno = new (loc)
- mind.transfer_to(new_xeno)
- qdel(src)
- else
- src << "We already have an alive queen."
- return
\ No newline at end of file
+/obj/effect/proc_holder/alien/evolve/fire(var/mob/living/carbon/alien/user)
+ var/no_queen = 1
+ for(var/mob/living/carbon/alien/humanoid/queen/Q in living_mob_list)
+ if(!Q.key || !Q.getorgan(/obj/item/organ/brain))
+ continue
+ no_queen = 0
+ if(no_queen)
+ user << "You begin to evolve!"
+ user.visible_message("[user] begins to twist and contort!")
+ var/mob/living/carbon/alien/humanoid/queen/new_xeno = new (user.loc)
+ user.mind.transfer_to(new_xeno)
+ qdel(user)
+ return 1
+ else
+ user << "We already have an alive queen."
+ return 0
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm b/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm
index 4ace45627ab..a34c6337786 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm
@@ -36,13 +36,6 @@
else
healths.icon_state = "health7"
-
-/mob/living/carbon/alien/humanoid/hunter/handle_environment()
- if(m_intent == "run" || resting)
- ..()
- else
- adjustToxLoss(-heal_rate)
-
/mob/living/carbon/alien/humanoid/hunter/movement_delay()
. = -1 //hunters are sanic
. += ..() //but they still need to slow down on stun
diff --git a/code/modules/mob/living/carbon/alien/humanoid/caste/sentinel.dm b/code/modules/mob/living/carbon/alien/humanoid/caste/sentinel.dm
index c277695df7c..ecd8a193a33 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/caste/sentinel.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/caste/sentinel.dm
@@ -14,7 +14,10 @@
if(name == "alien sentinel")
name = text("alien sentinel ([rand(1, 1000)])")
real_name = name
- verbs.Add(/mob/living/carbon/alien/humanoid/proc/corrosive_acid,/mob/living/carbon/alien/humanoid/proc/neurotoxin)
+
+ AddAbility(new/obj/effect/proc_holder/alien/acid(null))
+ AddAbility(new/obj/effect/proc_holder/alien/neurotoxin(null))
+
..()
/mob/living/carbon/alien/humanoid/sentinel/handle_hud_icons_health()
diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
index 3a6f10f3780..02b856d2356 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
@@ -8,6 +8,8 @@
var/leap_on_click = 0
var/pounce_cooldown = 0
var/pounce_cooldown_time = 30
+ var/custom_pixel_x_offset = 0 //for admin fuckery.
+ var/custom_pixel_y_offset = 0
//This is fine right now, if we're adding organ specific damage this needs to be updated
/mob/living/carbon/alien/humanoid/New()
@@ -15,6 +17,12 @@
if(name == "alien")
name = text("alien ([rand(1, 1000)])")
real_name = name
+
+ AddAbility(new/obj/effect/proc_holder/alien/plant(null))
+ AddAbility(new/obj/effect/proc_holder/alien/whisper(null))
+ AddAbility(new/obj/effect/proc_holder/alien/transfer(null))
+ AddAbility(new/obj/effect/proc_holder/alien/regurgitate(null))
+
..()
/mob/living/carbon/alien/humanoid/movement_delay()
@@ -116,9 +124,25 @@
unEquip(r_store)
unEquip(l_store)
-/mob/living/carbon/alien/humanoid/reagent_check(var/datum/reagent/R)
- return 0
-
/mob/living/carbon/alien/humanoid/cuff_resist(obj/item/I)
playsound(src, 'sound/voice/hiss5.ogg', 40, 1, 1) //Alien roars when starting to break free
- ..(I, cuff_break = 1)
+ ..(I, cuff_break = 1)
+
+/mob/living/carbon/alien/humanoid/get_standard_pixel_y_offset(lying = 0)
+ if(leaping)
+ return -32
+ else if(custom_pixel_y_offset)
+ return custom_pixel_y_offset
+ else
+ return initial(pixel_y)
+
+/mob/living/carbon/alien/humanoid/get_standard_pixel_x_offset(lying = 0)
+ if(leaping)
+ return -32
+ else if(custom_pixel_x_offset)
+ return custom_pixel_x_offset
+ else
+ return initial(pixel_x)
+
+/mob/living/carbon/alien/humanoid/check_ear_prot()
+ return 1
diff --git a/code/modules/mob/living/carbon/alien/humanoid/queen.dm b/code/modules/mob/living/carbon/alien/humanoid/queen.dm
index e1aae3cc6e2..9670240e4aa 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/queen.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/queen.dm
@@ -22,7 +22,12 @@
break
real_name = src.name
- verbs.Add(/mob/living/carbon/alien/humanoid/proc/corrosive_acid,/mob/living/carbon/alien/humanoid/proc/neurotoxin,/mob/living/carbon/alien/humanoid/proc/resin)
+
+ AddAbility(new/obj/effect/proc_holder/alien/acid(null))
+ AddAbility(new/obj/effect/proc_holder/alien/neurotoxin(null))
+ AddAbility(new/obj/effect/proc_holder/alien/resin(null))
+ AddAbility(new/obj/effect/proc_holder/alien/lay_egg(null))
+
..()
/mob/living/carbon/alien/humanoid/queen/handle_hud_icons_health()
@@ -52,23 +57,21 @@
//Queen verbs
-/mob/living/carbon/alien/humanoid/queen/verb/lay_egg()
+/obj/effect/proc_holder/alien/lay_egg
+ name = "Lay Egg"
+ desc = "Lay an egg to produce huggers to impregnate prey with."
+ plasma_cost = 75
+ check_turf = 1
- set name = "Lay Egg (75)"
- set desc = "Lay an egg to produce huggers to impregnate prey with."
- set category = "Alien"
-
- if(locate(/obj/structure/alien/egg) in get_turf(src))
- src << "There's already an egg here."
- return
-
- if(powerc(75,1))//Can't plant eggs on spess tiles. That's silly.
- adjustToxLoss(-75)
- for(var/mob/O in viewers(src, null))
- O.show_message(text("[src] has laid an egg!"), 1)
- new /obj/structure/alien/egg(loc)
- return
+ action_icon_state = "alien_egg"
+/obj/effect/proc_holder/alien/lay_egg/fire(var/mob/living/carbon/alien/user)
+ if(locate(/obj/structure/alien/egg) in get_turf(user))
+ user << "There's already an egg here."
+ return 0
+ user.visible_message("[user] has laid an egg!")
+ new /obj/structure/alien/egg(user.loc)
+ return 1
/mob/living/carbon/alien/humanoid/queen/large
icon = 'icons/mob/alienqueen.dmi'
diff --git a/code/modules/mob/living/carbon/alien/humanoid/update_icons.dm b/code/modules/mob/living/carbon/alien/humanoid/update_icons.dm
index 2ccc95f56cf..85a63338919 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/update_icons.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/update_icons.dm
@@ -14,7 +14,6 @@
for(var/image/I in overlays_standing)
overlays += I
-
if(stat == DEAD)
//If we mostly took damage from fire
if(fireloss > 125)
@@ -35,9 +34,10 @@
icon_state = "alien[caste]_s"
if(leaping)
- var/old_icon = icon
- icon = alt_icon
- alt_icon = old_icon
+ if(alt_icon == initial(alt_icon))
+ var/old_icon = icon
+ icon = alt_icon
+ alt_icon = old_icon
icon_state = "alien[caste]_leap"
pixel_x = -32
pixel_y = -32
@@ -46,9 +46,8 @@
var/old_icon = icon
icon = alt_icon
alt_icon = old_icon
- pixel_x = initial(pixel_x)
- pixel_y = initial(pixel_y)
-
+ pixel_x = get_standard_pixel_x_offset(lying)
+ pixel_y = get_standard_pixel_y_offset(lying)
/mob/living/carbon/alien/humanoid/regenerate_icons()
..()
diff --git a/code/modules/mob/living/carbon/alien/larva/larva.dm b/code/modules/mob/living/carbon/alien/larva/larva.dm
index c560c3d7f3e..096f1e353a8 100644
--- a/code/modules/mob/living/carbon/alien/larva/larva.dm
+++ b/code/modules/mob/living/carbon/alien/larva/larva.dm
@@ -4,6 +4,7 @@
icon_state = "larva0"
pass_flags = PASSTABLE | PASSMOB
mob_size = MOB_SIZE_SMALL
+ density = 0
maxHealth = 25
health = 25
@@ -21,6 +22,8 @@
name = "alien larva ([rand(1, 1000)])"
real_name = name
regenerate_icons()
+ AddAbility(new/obj/effect/proc_holder/alien/hide(null))
+ AddAbility(new/obj/effect/proc_holder/alien/larva_evolve(null))
..()
//This needs to be fixed
diff --git a/code/modules/mob/living/carbon/alien/larva/powers.dm b/code/modules/mob/living/carbon/alien/larva/powers.dm
index efbdcdafe9b..469e4023946 100644
--- a/code/modules/mob/living/carbon/alien/larva/powers.dm
+++ b/code/modules/mob/living/carbon/alien/larva/powers.dm
@@ -1,51 +1,61 @@
+/obj/effect/proc_holder/alien/hide
+ name = "Hide"
+ desc = "Allows to hide beneath tables or certain items. Toggled on or off."
+ plasma_cost = 0
-/mob/living/carbon/alien/larva/verb/hide()
- set name = "Hide"
- set desc = "Allows to hide beneath tables or certain items. Toggled on or off."
- set category = "Alien"
+ action_icon_state = "alien_hide"
- if(stat != CONSCIOUS)
+/obj/effect/proc_holder/alien/hide/fire(var/mob/living/carbon/alien/user)
+ if(user.stat != CONSCIOUS)
return
- if (layer != TURF_LAYER+0.2)
- layer = TURF_LAYER+0.2
- visible_message("[src] scurries to the ground!", \
+ if (user.layer != TURF_LAYER+0.2)
+ user.layer = TURF_LAYER+0.2
+ user.visible_message("[user] scurries to the ground!", \
"You are now hiding.")
else
- layer = MOB_LAYER
- visible_message("[src] slowly peaks up from the ground...", \
- "You have stopped hiding.")
+ user.layer = MOB_LAYER
+ user.visible_message("[user.] slowly peaks up from the ground...", \
+ "You stop hiding.")
+ return 1
-/mob/living/carbon/alien/larva/verb/evolve()
- set name = "Evolve"
- set desc = "Evolve into a fully grown Alien."
- set category = "Alien"
- if(stat != CONSCIOUS)
+/obj/effect/proc_holder/alien/larva_evolve
+ name = "Evolve"
+ desc = "Evolve into a fully grown Alien."
+ plasma_cost = 0
+
+ action_icon_state = "alien_evolve_larva"
+
+/obj/effect/proc_holder/alien/larva_evolve/fire(var/mob/living/carbon/alien/user)
+ if(!islarva(user))
return
+ var/mob/living/carbon/alien/larva/L = user
- if(handcuffed || legcuffed)
- src << "You cannot evolve when you are cuffed."
+ if(L.stat != CONSCIOUS)
+ return
+ if(L.handcuffed || L.legcuffed) // Cuffing larvas ? Eh ?
+ user << "You cannot evolve when you are cuffed."
- if(amount_grown >= max_grown) //TODO ~Carn
- src << "You are growing into a beautiful alien! It is time to choose a caste."
- src << "There are three to choose from:"
- src << "Hunters are strong and agile, able to hunt away from the hive and rapidly move through ventilation shafts. Hunters generate plasma slowly and have low reserves."
- src << "Sentinels are tasked with protecting the hive and are deadly up close and at a range. They are not as physically imposing nor fast as the hunters."
- src << "Drones are the working class, offering the largest plasma storage and generation. They are the only caste which may evolve again, turning into the dreaded alien queen."
- var/alien_caste = alert(src, "Please choose which alien caste you shall belong to.",,"Hunter","Sentinel","Drone")
+ if(L.amount_grown >= L.max_grown) //TODO ~Carn
+ L << "You are growing into a beautiful alien! It is time to choose a caste."
+ L << "There are three to choose from:"
+ L << "Hunters are strong and agile, able to hunt away from the hive and rapidly move through ventilation shafts. Hunters generate plasma slowly and have low reserves."
+ L << "Sentinels are tasked with protecting the hive and are deadly up close and at a range. They are not as physically imposing nor fast as the hunters."
+ L << "Drones are the working class, offering the largest plasma storage and generation. They are the only caste which may evolve again, turning into the dreaded alien queen."
+ var/alien_caste = alert(L, "Please choose which alien caste you shall belong to.",,"Hunter","Sentinel","Drone")
var/mob/living/carbon/alien/humanoid/new_xeno
switch(alien_caste)
if("Hunter")
- new_xeno = new /mob/living/carbon/alien/humanoid/hunter(loc)
+ new_xeno = new /mob/living/carbon/alien/humanoid/hunter(L.loc)
if("Sentinel")
- new_xeno = new /mob/living/carbon/alien/humanoid/sentinel(loc)
+ new_xeno = new /mob/living/carbon/alien/humanoid/sentinel(L.loc)
if("Drone")
- new_xeno = new /mob/living/carbon/alien/humanoid/drone(loc)
- if(mind) mind.transfer_to(new_xeno)
- qdel(src)
- return
+ new_xeno = new /mob/living/carbon/alien/humanoid/drone(L.loc)
+ if(L.mind) L.mind.transfer_to(new_xeno)
+ qdel(L)
+ return 0
else
- src << "You are not fully grown."
- return
+ user << "You are not fully grown."
+ return 0
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/alien/life.dm b/code/modules/mob/living/carbon/alien/life.dm
index 4df5469296f..858d3ec155b 100644
--- a/code/modules/mob/living/carbon/alien/life.dm
+++ b/code/modules/mob/living/carbon/alien/life.dm
@@ -30,7 +30,6 @@
//BREATH TEMPERATURE
handle_breath_temperature(breath)
-
/mob/living/carbon/alien/handle_status_effects()
..()
//natural reduction of movement delay due to stun.
@@ -62,4 +61,4 @@
handle_hud_icons_health()
- return 1
+ return 1
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/alien/special/facehugger.dm b/code/modules/mob/living/carbon/alien/special/facehugger.dm
index a4c27b35cf4..f24f47f8f65 100644
--- a/code/modules/mob/living/carbon/alien/special/facehugger.dm
+++ b/code/modules/mob/living/carbon/alien/special/facehugger.dm
@@ -123,7 +123,7 @@ var/const/MAX_ACTIVE_TIME = 400
if(ishuman(L))
var/mob/living/carbon/human/H = L
- if(H.head && H.head.flags & HEADCOVERSMOUTH)
+ if(H.is_mouth_covered(head_only = 1))
H.visible_message("[src] smashes against [H]'s [H.head]!", \
"[src] smashes against [H]'s [H.head]!")
Die()
@@ -239,7 +239,7 @@ var/const/MAX_ACTIVE_TIME = 400
var/mob/living/carbon/C = M
if(ishuman(C))
var/mob/living/carbon/human/H = C
- if(H.head && H.head.flags & HEADCOVERSMOUTH)
+ if(H.is_mouth_covered(head_only = 1))
return 0
return 1
return 0
diff --git a/code/modules/mob/living/carbon/brain/MMI.dm b/code/modules/mob/living/carbon/brain/MMI.dm
index 49a3bc558d3..0b649aec99d 100644
--- a/code/modules/mob/living/carbon/brain/MMI.dm
+++ b/code/modules/mob/living/carbon/brain/MMI.dm
@@ -22,12 +22,12 @@
if(istype(O,/obj/item/organ/brain)) //Time to stick a brain in it --NEO
var/obj/item/organ/brain/newbrain = O
if(brain)
- user << "There's already a brain in the MMI!"
+ user << "There's already a brain in the MMI!"
return
if(!newbrain.brainmob)
- user << "You aren't sure where this brain came from, but you're pretty sure it's a useless brain."
+ user << "You aren't sure where this brain came from, but you're pretty sure it's a useless brain!"
return
- visible_message("[user] sticks \a [newbrain] into \the [src]")
+ visible_message("[user] sticks \a [newbrain] into \the [src].")
brainmob = newbrain.brainmob
newbrain.brainmob = null
@@ -67,9 +67,9 @@
/obj/item/device/mmi/attack_self(mob/user as mob)
if(!brain)
- user << "You upend the MMI, but there's nothing in it."
+ user << "You upend the MMI, but there's nothing in it!"
else if(locked)
- user << "You upend the MMI, but the brain is clamped into place."
+ user << "You upend the MMI, but the brain is clamped into place!"
else
user << "You upend the MMI, spilling the brain onto the floor."
@@ -123,7 +123,7 @@
set popup_menu = 0
if(brainmob.stat)
- brainmob << "Can't do that while incapacitated or dead."
+ brainmob << "Can't do that while incapacitated or dead!"
radio.listening = radio.listening==1 ? 0 : 1
brainmob << "Radio is [radio.listening==1 ? "now" : "no longer"] receiving broadcast."
diff --git a/code/modules/mob/living/carbon/brain/brain.dm b/code/modules/mob/living/carbon/brain/brain.dm
index 3600cdc4de9..2197876bc1c 100644
--- a/code/modules/mob/living/carbon/brain/brain.dm
+++ b/code/modules/mob/living/carbon/brain/brain.dm
@@ -6,6 +6,7 @@
var/timeofhostdeath = 0
var/emp_damage = 0//Handles a type of MMI damage
var/alert = null
+ has_limbs = 0
/mob/living/carbon/brain/New()
create_reagents(1000)
@@ -28,11 +29,11 @@
/mob/living/carbon/brain/ex_act() //you cant blow up brainmobs because it makes transfer_to() freak out when borgs blow up.
return
-
+
/mob/living/carbon/brain/blob_act()
return
-
-/mob/living/carbon/brain/on_forcemove(var/atom/newloc)
+
+/mob/living/carbon/brain/on_forcemove(var/atom/newloc)
if(container)
container.loc = newloc
else //something went very wrong.
diff --git a/code/modules/mob/living/carbon/brain/brain_item.dm b/code/modules/mob/living/carbon/brain/brain_item.dm
index 4bd461376ed..ed151132066 100644
--- a/code/modules/mob/living/carbon/brain/brain_item.dm
+++ b/code/modules/mob/living/carbon/brain/brain_item.dm
@@ -52,7 +52,7 @@
var/mob/living/carbon/human/H = M
if(istype(M, /mob/living/carbon/human) && ((H.head && H.head.flags & HEADCOVERSEYES) || (H.wear_mask && H.wear_mask.flags & MASKCOVERSEYES) || (H.glasses && H.glasses.flags & GLASSESCOVERSEYES)))
- user << "You're going to need to remove their head cover first."
+ user << "You're going to need to remove their head cover first!"
return
//since these people will be dead M != usr
@@ -63,15 +63,15 @@
if(O == (user || M))
continue
if(M == user)
- O << "[user] inserts [src] into \his head!"
+ O << "[user] inserts [src] into \his head!"
else
- O << "[M] has [src] inserted into \his head by [user]."
+ O << "[M] has [src] inserted into \his head by [user]."
if(M != user)
- M << "[user] inserts [src] into your head!"
- user << "You insert [src] into [M]'s head!"
+ M << "[user] inserts [src] into your head."
+ user << "You insert [src] into [M]'s head."
else
- user << "You insert [src] into your head!" //LOL
+ user << "You insert [src] into your head." //LOL
//this might actually be outdated since barring badminnery, a debrain'd body will have any client sucked out to the brain's internal mob. Leaving it anyway to be safe. --NEO
if(M.key)
diff --git a/code/modules/mob/living/carbon/brain/death.dm b/code/modules/mob/living/carbon/brain/death.dm
index 05cc69ba948..5490d786297 100644
--- a/code/modules/mob/living/carbon/brain/death.dm
+++ b/code/modules/mob/living/carbon/brain/death.dm
@@ -1,8 +1,8 @@
/mob/living/carbon/brain/death(gibbed)
if(stat == DEAD) return
if(!gibbed && container && istype(container, /obj/item/device/mmi))//If not gibbed but in a container.
- container.visible_message("[src]'s MMI flatlines!", \
- "You hear something flatline.")
+ container.visible_message("[src]'s MMI flatlines!", \
+ "You hear something flatline.")
if(istype(src,/obj/item/organ/brain/alien))
container.icon_state = "mmi_alien_dead"
else
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index a673cb37fec..bae07c42c8d 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -38,9 +38,9 @@
/mob/living/carbon/relaymove(var/mob/user, direction)
if(user in src.stomach_contents)
if(prob(40))
- audible_message("You hear something rumbling inside [src]'s stomach...", \
- "You hear something rumbling.", 4,\
- "Something is rumbling inside your stomach!")
+ audible_message("You hear something rumbling inside [src]'s stomach...", \
+ "You hear something rumbling.", 4,\
+ "Something is rumbling inside your stomach!")
var/obj/item/I = user.get_active_hand()
if(I && I.force)
var/d = rand(round(I.force / 4), I.force)
@@ -84,7 +84,7 @@
src.visible_message(
"[src] was shocked by \the [source]!", \
"You feel a powerful shock coursing through your body!", \
- "You hear a heavy electrical crack." \
+ "You hear a heavy electrical crack." \
)
if(prob(25) && heart_attack)
heart_attack = 0
@@ -170,7 +170,7 @@
eye_stat += rand(2, 4)
else
- src << "Your eyes itch and burn severely!"
+ src << "Your eyes itch and burn severely!"
eye_stat += rand(12, 16)
if(eye_stat > 10)
@@ -406,8 +406,8 @@ var/const/GALOSHES_DONT_HELP = 8
changeNext_move(CLICK_CD_BREAKOUT)
last_special = world.time + CLICK_CD_BREAKOUT
visible_message("[src] attempts to unbuckle themself!", \
- "You attempt to unbuckle yourself. (This will take around one minute and you need to stay still.)")
- if(do_after(src, 600))
+ "You attempt to unbuckle yourself... (This will take around one minute and you need to stay still.)")
+ if(do_after(src, 600, needhand = 0))
if(!buckled)
return
buckled.user_unbuckle_mob(src,src)
@@ -449,8 +449,8 @@ var/const/GALOSHES_DONT_HELP = 8
var/displaytime = breakouttime / 600
if(!cuff_break)
visible_message("[src] attempts to remove [I]!")
- src << "You attempt to remove [I]. (This will take around [displaytime] minutes and you need to stand still.)"
- if(do_after(src, breakouttime, 10))
+ src << "You attempt to remove [I]... (This will take around [displaytime] minutes and you need to stand still.)"
+ if(do_after(src, breakouttime, 10, 0))
if(I.loc != src || buckled)
return
visible_message("[src] manages to remove [I]!")
@@ -458,6 +458,7 @@ var/const/GALOSHES_DONT_HELP = 8
if(handcuffed)
handcuffed.loc = loc
+ handcuffed.dropped(src)
handcuffed = null
if(buckled && buckled.buckle_requires_restraints)
buckled.unbuckle_mob()
@@ -473,8 +474,8 @@ var/const/GALOSHES_DONT_HELP = 8
else
breakouttime = 50
visible_message("[src] is trying to break [I]!")
- src << "You attempt to break [I]. (This will take around 5 seconds and you need to stand still.)"
- if(do_after(src, breakouttime))
+ src << "You attempt to break [I]... (This will take around 5 seconds and you need to stand still.)"
+ if(do_after(src, breakouttime, needhand = 0))
if(!I.loc || buckled)
return
visible_message("[src] manages to break [I]!")
@@ -489,4 +490,18 @@ var/const/GALOSHES_DONT_HELP = 8
legcuffed = null
update_inv_legcuffed(0)
else
- src << "You fail to break [I]!"
\ No newline at end of file
+ src << "You fail to break [I]!"
+
+/mob/living/carbon/proc/is_mouth_covered(head_only = 0, mask_only = 0)
+ if( (!mask_only && head && (head.flags & HEADCOVERSMOUTH)) || (!head_only && wear_mask && (wear_mask.flags & MASKCOVERSMOUTH)) )
+ return 1
+
+/mob/living/carbon/get_standard_pixel_y_offset(lying = 0)
+ if(lying)
+ return -6
+ else
+ return initial(pixel_y)
+
+/mob/living/carbon/check_ear_prot()
+ if(head && (head.flags & HEADBANGPROTECT))
+ return 1
diff --git a/code/modules/mob/living/carbon/carbon_defines.dm b/code/modules/mob/living/carbon/carbon_defines.dm
index 2afddf617fa..41a04d1273f 100644
--- a/code/modules/mob/living/carbon/carbon_defines.dm
+++ b/code/modules/mob/living/carbon/carbon_defines.dm
@@ -22,5 +22,6 @@
var/co2overloadtime = null
var/temperature_resistance = T0C+75
+ has_limbs = 1
- lying_pixel_offset = -6 //offset for pixel_y when lying down.
+ var/remote_view = 0
diff --git a/code/modules/mob/living/carbon/human/blood.dm b/code/modules/mob/living/carbon/human/blood.dm
index 48da639f97e..ac4e518258b 100644
--- a/code/modules/mob/living/carbon/human/blood.dm
+++ b/code/modules/mob/living/carbon/human/blood.dm
@@ -153,7 +153,7 @@ var/const/BLOOD_VOLUME_SURVIVE = 122
*/
for(var/datum/disease/D in src.viruses)
- B.data["viruses"] += new D.type(0, D, 1)
+ B.data["viruses"] += D.Copy()
B.data["blood_DNA"] = copytext(src.dna.unique_enzymes,1,0)
if(src.resistances&&src.resistances.len)
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index a8683a1f49c..c1a0e21b364 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -282,20 +282,20 @@
if(!I || !L || I.loc != src) //no item, no limb, or item is not in limb (the person atleast) anymore
return
var/time_taken = I.embedded_unsafe_removal_time*I.w_class
- usr.visible_message("[usr] attempts to remove [I] from their [L.getDisplayName()]!","You attempt to remove [I] from your [L.getDisplayName()], it will take [time_taken/10] seconds.")
+ usr.visible_message("[usr] attempts to remove [I] from their [L.getDisplayName()].","You attempt to remove [I] from your [L.getDisplayName()]... (It will take [time_taken/10] seconds.)")
if(do_after(usr, time_taken, needhand = 1))
L.embedded_objects -= I
L.take_damage(I.embedded_unsafe_removal_pain_multiplier*I.w_class)//It hurts to rip it out, get surgery you dingus.
I.loc = get_turf(src)
usr.put_in_hands(I)
usr.emote("scream")
- usr.visible_message("[usr] successfully rips [I] out of their [L.getDisplayName()]!","You successfully remove [I] from your [L.getDisplayName()]!")
+ usr.visible_message("[usr] successfully rips [I] out of their [L.getDisplayName()]!","You successfully remove [I] from your [L.getDisplayName()].")
return
if(href_list["item"])
var/slot = text2num(href_list["item"])
if(slot in check_obscured_slots())
- usr << "You can't reach that. Something is covering it."
+ usr << "You can't reach that! Something is covering it."
return
if(href_list["pockets"])
@@ -309,7 +309,7 @@
var/delay_denominator = 1
if(pocket_item && !(pocket_item.flags&ABSTRACT))
if(pocket_item.flags & NODROP)
- usr << "You try to empty [src]'s [pocket_side] pocket, it seems to be stuck!"
+ usr << "You try to empty [src]'s [pocket_side] pocket, it seems to be stuck!"
usr << "You try to empty [src]'s [pocket_side] pocket."
else if(place_item && place_item.mob_can_equip(src, pocket_id, 1) && !(place_item.flags&ABSTRACT))
usr << "You try to place [place_item] into [src]'s [pocket_side] pocket."
@@ -665,13 +665,12 @@
if(prob(current_size * 5) && hand.w_class >= ((11-current_size)/2) && unEquip(hand))
step_towards(hand, src)
src << "\The [S] pulls \the [hand] from your grip!"
- apply_effect(current_size * 3, IRRADIATE)
+ irradiate(current_size * 3)
if(mob_negates_gravity())
return
..()
-
/mob/living/carbon/human/help_shake_act(mob/living/carbon/M)
if(!istype(M))
return
@@ -679,7 +678,7 @@
if(health >= 0)
if(src == M)
visible_message( \
- "[src] examines \himself.", \
+ "[src] examines \himself.", \
"You check yourself for injuries.")
for(var/obj/item/organ/limb/org in organs)
@@ -730,6 +729,34 @@
..()
+/mob/living/carbon/human/proc/do_cpr(mob/living/carbon/C)
+ if(C.stat == DEAD)
+ src << "[C.name] is dead!"
+ return
+ if(is_mouth_covered())
+ src << "Remove your mask first!"
+ return 0
+ if(C.is_mouth_covered())
+ src << "Remove their mask first!"
+ return 0
+
+ if(C.cpr_time < world.time + 30)
+ add_logs(src, C, "CPRed")
+ visible_message("[src] is trying to perform CPR on [C.name]!", \
+ "You try to perform CPR on [C.name]... Hold still!")
+ if(!do_mob(src, C))
+ src << "You fail to perform CPR on [C]!"
+ return 0
+
+ if(C.health <= config.health_threshold_crit)
+ C.cpr_time = world.time
+ var/suff = min(C.getOxyLoss(), 7)
+ C.adjustOxyLoss(-suff)
+ C.updatehealth()
+ src.visible_message("[src] performs CPR on [C.name]!", "You perform CPR on [C.name].")
+ C << "You feel a breath of fresh air enter your lungs... It feels good..."
+
+
/mob/living/carbon/human/generateStaticOverlay()
var/image/staticOverlay = image(icon('icons/effects/effects.dmi', "static"), loc = src)
staticOverlay.override = 1
diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm
index 3a34e1f3acb..844f2399a19 100644
--- a/code/modules/mob/living/carbon/human/human_damage.dm
+++ b/code/modules/mob/living/carbon/human/human_damage.dm
@@ -124,12 +124,14 @@ mob/living/carbon/human/proc/hat_fall_prob()
var/update = 0
while(parts.len && (brute>0 || burn>0) )
var/obj/item/organ/limb/picked = pick(parts)
+ var/brute_per_part = brute/parts.len
+ var/burn_per_part = burn/parts.len
var/brute_was = picked.brute_dam
var/burn_was = picked.burn_dam
- update |= picked.take_damage(brute,burn)
+ update |= picked.take_damage(brute_per_part,burn_per_part)
brute -= (picked.brute_dam - brute_was)
burn -= (picked.burn_dam - burn_was)
diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index fd919216a09..980ba2ce475 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -146,7 +146,7 @@ emp_act
else
return 0
- var/armor = run_armor_check(affecting, "melee", "Your armor has protected your [hit_area].", "Your armor has softened a hit to your [hit_area].")
+ var/armor = run_armor_check(affecting, "melee", "Your armor has protected your [hit_area].", "Your armor has softened a hit to your [hit_area].")
if(armor >= 100) return 0
var/Iforce = I.force //to avoid runtimes on the forcesay checks at the bottom. Some items might delete themselves if you drop them. (stunning yourself, ninja swords)
@@ -220,7 +220,7 @@ emp_act
for(var/obj/item/organ/limb/L in src.organs)
if(L.status == ORGAN_ROBOTIC)
if(!informed)
- src << "You feel a sharp pain as your robotic limbs overload."
+ src << "You feel a sharp pain as your robotic limbs overload."
informed = 1
switch(severity)
if(1)
@@ -250,7 +250,7 @@ emp_act
update_inv_wear_mask()
update_inv_head()
else
- src << "Your [head_clothes.name] protects your head and face from the acid!"
+ src << "Your [head_clothes.name] protects your head and face from the acid!"
else
. = get_organ("head")
if(.)
@@ -270,7 +270,7 @@ emp_act
update_inv_w_uniform()
update_inv_wear_suit()
else
- src << "Your [chest_clothes.name] protects your body from the acid!"
+ src << "Your [chest_clothes.name] protects your body from the acid!"
else
. = get_organ("chest")
if(.)
@@ -300,7 +300,7 @@ emp_act
update_inv_w_uniform()
update_inv_wear_suit()
else
- src << "Your [arm_clothes.name] protects your arms and hands from the acid!"
+ src << "Your [arm_clothes.name] protects your arms and hands from the acid!"
else
. = get_organ("r_arm")
if(.)
@@ -325,7 +325,7 @@ emp_act
update_inv_w_uniform()
update_inv_wear_suit()
else
- src << "Your [leg_clothes.name] protects your legs and feet from the acid!"
+ src << "Your [leg_clothes.name] protects your legs and feet from the acid!"
else
. = get_organ("r_leg")
if(.)
diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm
index df617e2c68e..9b373ba72f4 100644
--- a/code/modules/mob/living/carbon/human/human_defines.dm
+++ b/code/modules/mob/living/carbon/human/human_defines.dm
@@ -15,6 +15,7 @@
var/skin_tone = "caucasian1" //Skin tone
var/lip_style = null //no lipstick by default- arguably misleading, as it could be used for general makeup
+ var/lip_color = "white"
var/age = 30 //Player's age (pure fluff)
var/blood_type = "A+" //Player's bloodtype
@@ -39,11 +40,15 @@
var/icon/base_icon_state = "caucasian1_m"
- var/list/organs = list() //Gets filled up in the constructor (human.dm, New() proc, line 24. I'm sick and tired of missing comments. -Agouri
-
var/special_voice = "" // For changing our voice. Used by a symptom.
var/gender_ambiguous = 0 //if something goes wrong during gender reassignment this generates a line in examine
var/blood_max = 0 //how much are we bleeding
- var/bleedsuppress = 0 //for stopping bloodloss, eventually this will be limb-based like bleeding
\ No newline at end of file
+ var/bleedsuppress = 0 //for stopping bloodloss, eventually this will be limb-based like bleeding
+
+ var/list/organs = list() //Gets filled up in the constructor (human.dm, New() proc.
+
+ var/datum/martial_art/martial_art = null
+
+ var/name_override //For temporary visible name changes
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/human/human_helpers.dm b/code/modules/mob/living/carbon/human/human_helpers.dm
index 902cce6896a..ecc7c49649e 100644
--- a/code/modules/mob/living/carbon/human/human_helpers.dm
+++ b/code/modules/mob/living/carbon/human/human_helpers.dm
@@ -39,6 +39,8 @@
/mob/living/carbon/human/get_visible_name()
var/face_name = get_face_name("")
var/id_name = get_id_name("")
+ if(name_override)
+ return name_override
if(face_name)
if(id_name && (id_name != face_name))
return "[face_name] (as [id_name])"
@@ -125,9 +127,6 @@
/mob/living/carbon/human/IsAdvancedToolUser()
return 1//Humans can use guns and such
-/mob/living/carbon/human/SpeciesCanConsume()
- return 1 // Humans can eat, drink, and be forced to do so
-
/mob/living/carbon/human/InCritical()
return (health <= config.health_threshold_crit && stat == UNCONSCIOUS)
diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm
index 5e914e68242..58189d56b4b 100644
--- a/code/modules/mob/living/carbon/human/human_movement.dm
+++ b/code/modules/mob/living/carbon/human/human_movement.dm
@@ -15,10 +15,11 @@
var/obj/item/weapon/tank/jetpack/J = back
if((movement_dir || J.stabilization_on) && J.allow_thrust(0.01, src))
return 1
- if(istype(wear_suit, /obj/item/clothing/suit/space/hardsuit/engine) && isturf(loc)) //Second check is so you can't use a jetpack in a mech
- var/obj/item/clothing/suit/space/hardsuit/engine/C = wear_suit
- if((movement_dir || C.jetpack.stabilization_on) && C.jetpack.allow_thrust(0.01, src))
- return 1
+ if(istype(wear_suit, /obj/item/clothing/suit/space/hardsuit) && isturf(loc)) //Second check is so you can't use a jetpack in a mech
+ var/obj/item/clothing/suit/space/hardsuit/C = wear_suit
+ if(C.jetpack)
+ if((movement_dir || C.jetpack.stabilization_on) && C.jetpack.allow_thrust(0.01, src))
+ return 1
return 0
diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm
index c1e89721f8a..c7db2dc90c6 100644
--- a/code/modules/mob/living/carbon/human/inventory.dm
+++ b/code/modules/mob/living/carbon/human/inventory.dm
@@ -46,7 +46,7 @@
return 0
if(!w_uniform)
if(!disable_warning)
- src << "You need a jumpsuit before you can attach this [I.name]."
+ src << "You need a jumpsuit before you can attach this [I.name]!"
return 0
if( !(I.slot_flags & SLOT_BELT) )
return
@@ -80,7 +80,7 @@
return 0
if(!w_uniform)
if(!disable_warning)
- src << "You need a jumpsuit before you can attach this [I.name]."
+ src << "You need a jumpsuit before you can attach this [I.name]!"
return 0
if( !(I.slot_flags & SLOT_ID) )
return 0
@@ -92,7 +92,7 @@
return 0
if(!w_uniform)
if(!disable_warning)
- src << "You need a jumpsuit before you can attach this [I.name]."
+ src << "You need a jumpsuit before you can attach this [I.name]!"
return 0
if(I.slot_flags & SLOT_DENYPOCKET)
return
@@ -105,7 +105,7 @@
return 0
if(!w_uniform)
if(!disable_warning)
- src << "You need a jumpsuit before you can attach this [I.name]."
+ src << "You need a jumpsuit before you can attach this [I.name]!"
return 0
if(I.slot_flags & SLOT_DENYPOCKET)
return 0
@@ -119,15 +119,15 @@
return 0
if(!wear_suit)
if(!disable_warning)
- src << "You need a suit before you can attach this [I.name]."
+ src << "You need a suit before you can attach this [I.name]!"
return 0
if(!wear_suit.allowed)
if(!disable_warning)
- usr << "You somehow have a suit with no defined allowed items for suit storage, stop that." //should be src?
+ usr << "You somehow have a suit with no defined allowed items for suit storage, stop that!" //should be src?
return 0
if(I.w_class > 4)
if(!disable_warning)
- usr << "The [I.name] is too big to attach." //should be src?
+ usr << "The [I.name] is too big to attach!" //should be src?
return 0
if( istype(I, /obj/item/device/pda) || istype(I, /obj/item/weapon/pen) || is_type_in_list(I, wear_suit.allowed) ) //ugly and un-polymorphic.
return 1
@@ -163,7 +163,7 @@
var/obj/item/I = H.get_active_hand()
var/obj/item/weapon/storage/S = H.get_inactive_hand()
if(!I)
- H << "You are not holding anything to equip."
+ H << "You are not holding anything to equip!"
return
if(H.equip_to_appropriate_slot(I))
if(hand)
@@ -183,7 +183,7 @@
if(istype(S, /obj/item/weapon/storage) && S.can_be_inserted(I,1))
S.handle_item_insertion(I)
else
- H << "You are unable to equip that."
+ H << "You are unable to equip that!"
/mob/living/carbon/human/proc/equip_in_one_of_slots(obj/item/I, list/slots, qdel_on_fail = 1)
@@ -301,9 +301,6 @@
s_store = null
update_inv_s_store(0)
- update_action_buttons()
-
-
//This is an UNSAFE proc. Use mob_can_equip() before calling this one! Or rather use equip_to_slot_if_possible() or advanced_equip_to_slot_if_possible()
//set redraw_mob to 0 if you don't wish the hud to be updated - if you're doing it manually in your own proc.
/mob/living/carbon/human/equip_to_slot(obj/item/I, slot, redraw_mob = 1)
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index d14b746171c..d3aa47771a2 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -52,20 +52,10 @@
/mob/living/carbon/human/calculate_affecting_pressure(var/pressure)
- ..()
- var/pressure_difference = abs( pressure - ONE_ATMOSPHERE )
-
- var/pressure_adjustment_coefficient = 1 //Determins how much the clothing you are wearing protects you in percent.
- if(wear_suit && (wear_suit.flags & STOPSPRESSUREDMAGE))
- pressure_adjustment_coefficient -= PRESSURE_SUIT_REDUCTION_COEFFICIENT
- if(head && (head.flags & STOPSPRESSUREDMAGE))
- pressure_adjustment_coefficient -= PRESSURE_HEAD_REDUCTION_COEFFICIENT
- pressure_adjustment_coefficient = max(pressure_adjustment_coefficient,0) //So it isn't less than 0
- pressure_difference = pressure_difference * pressure_adjustment_coefficient
- if(pressure > ONE_ATMOSPHERE)
- return ONE_ATMOSPHERE + pressure_difference
+ if((wear_suit && (wear_suit.flags & STOPSPRESSUREDMAGE)) && (head && (head.flags & STOPSPRESSUREDMAGE)))
+ return ONE_ATMOSPHERE
else
- return ONE_ATMOSPHERE - pressure_difference
+ return pressure
/mob/living/carbon/human/handle_disabilities()
@@ -146,21 +136,6 @@
//END FIRE CODE
-/mob/living/carbon/human/proc/stabilize_temperature_from_calories()
- switch(bodytemperature)
- if(-INFINITY to 260.15) //260.15 is 310.15 - 50, the temperature where you start to feel effects.
- if(nutrition >= 2) //If we are very, very cold we'll use up quite a bit of nutriment to heat us up.
- nutrition -= 2
- var/body_temperature_difference = 310.15 - bodytemperature
- bodytemperature += max((body_temperature_difference * metabolism_efficiency / BODYTEMP_AUTORECOVERY_DIVISOR), BODYTEMP_AUTORECOVERY_MINIMUM)
- if(260.15 to 360.15)
- var/body_temperature_difference = 310.15 - bodytemperature
- bodytemperature += body_temperature_difference * metabolism_efficiency / BODYTEMP_AUTORECOVERY_DIVISOR
- if(360.15 to INFINITY) //360.15 is 310.15 + 50, the temperature where you start to feel effects.
- //We totally need a sweat system cause it totally makes sense...~
- var/body_temperature_difference = 310.15 - bodytemperature
- bodytemperature += min((body_temperature_difference / BODYTEMP_AUTORECOVERY_DIVISOR), -BODYTEMP_AUTORECOVERY_MINIMUM) //We're dealing with negative numbers
-
//This proc returns a number made up of the flags for body parts which you are protected on. (such as HEAD, CHEST, GROIN, etc. See setup.dm for the full list)
/mob/living/carbon/human/proc/get_heat_protection_flags(temperature) //Temperature is the temperature you're being exposed to.
var/thermal_protection_flags = 0
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index d66d73d0e1c..090bc46f055 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -1,12 +1,5 @@
// This code handles different species in the game.
-#define SPECIES_LAYER 26
-#define BODY_BEHIND_LAYER 25
-#define BODY_LAYER 24
-#define BODY_ADJ_LAYER 23
-#define HAIR_LAYER 9
-#define BODY_FRONT_LAYER 2
-
#define TINT_IMPAIR 2
#define TINT_BLIND 3
@@ -41,7 +34,7 @@
var/hair_alpha = 255 // the alpha used by the hair. 255 is completely solid, 0 is transparent.
var/use_skintones = 0 // does it use skintones or not? (spoiler alert this is only used by humans)
var/exotic_blood = null // If your race wants to bleed something other than bog standard blood, change this.
- var/meat = /obj/item/weapon/reagent_containers/food/snacks/meat/human //What the species drops on gibbing
+ var/meat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human //What the species drops on gibbing
var/list/no_equip = list() // slots the race can't equip stuff to
var/nojumpsuit = 0 // this is sorta... weird. it basically lets you equip stuff that usually needs jumpsuits without one, like belts and pockets and ids
@@ -92,9 +85,6 @@
var/g = (H.gender == FEMALE) ? "f" : "m"
- if(!config.mutant_colors)
- H.dna.mutant_color = default_color
-
if(MUTCOLORS in specflags)
var/image/spec_base
var/icon_state_string = "[id]_"
@@ -128,10 +118,7 @@
if(hair_color)
if(hair_color == "mutcolor")
- if(!config.mutant_colors)
- img_facial_s.color = "#" + default_color
- else
- img_facial_s.color = "#" + H.dna.mutant_color
+ img_facial_s.color = "#" + H.dna.mutant_color
else
img_facial_s.color = "#" + hair_color
else
@@ -159,10 +146,7 @@
if(hair_color)
if(hair_color == "mutcolor")
- if(!config.mutant_colors)
- img_hair_s.color = "#" + default_color
- else
- img_hair_s.color = "#" + H.dna.mutant_color
+ img_hair_s.color = "#" + H.dna.mutant_color
else
img_hair_s.color = "#" + hair_color
else
@@ -186,7 +170,9 @@
// lipstick
if(H.lip_style && LIPS in specflags)
- standing += image("icon"='icons/mob/human_face.dmi', "icon_state"="lips_[H.lip_style]_s", "layer" = -BODY_LAYER)
+ var/image/lips = image("icon"='icons/mob/human_face.dmi', "icon_state"="lips_[H.lip_style]_s", "layer" = -BODY_LAYER)
+ lips.color = H.lip_color
+ standing += lips
// eyes
if(EYECOLOR in specflags)
@@ -252,13 +238,11 @@
else
icon_state_string += "_s"
- if(!config.mutant_colors)
- H.dna.mutant_color = default_color
-
for(var/layer in relevent_layers)
for(var/bodypart in bodyparts_to_add)
I = image("icon" = 'icons/mob/mutant_bodyparts.dmi', "icon_state" = "[icon_state_string]_[bodypart]_[layer]", "layer" =- layer)
- I.color = "#[H.dna.mutant_color]"
+ if(!(H.disabilities & HUSK))
+ I.color = "#[H.dna.mutant_color]"
standing += I
H.overlays_standing[layer] = standing.Copy()
standing = list()
@@ -326,7 +310,7 @@
return 0
if(!H.w_uniform && !nojumpsuit)
if(!disable_warning)
- H << "You need a jumpsuit before you can attach this [I.name]."
+ H << "You need a jumpsuit before you can attach this [I.name]!"
return 0
if( !(I.slot_flags & SLOT_BELT) )
return
@@ -360,7 +344,7 @@
return 0
if(!H.w_uniform && !nojumpsuit)
if(!disable_warning)
- H << "You need a jumpsuit before you can attach this [I.name]."
+ H << "You need a jumpsuit before you can attach this [I.name]!"
return 0
if( !(I.slot_flags & SLOT_ID) )
return 0
@@ -372,7 +356,7 @@
return 0
if(!H.w_uniform && !nojumpsuit)
if(!disable_warning)
- H << "You need a jumpsuit before you can attach this [I.name]."
+ H << "You need a jumpsuit before you can attach this [I.name]!"
return 0
if(I.slot_flags & SLOT_DENYPOCKET)
return
@@ -385,7 +369,7 @@
return 0
if(!H.w_uniform && !nojumpsuit)
if(!disable_warning)
- H << "You need a jumpsuit before you can attach this [I.name]."
+ H << "You need a jumpsuit before you can attach this [I.name]!"
return 0
if(I.slot_flags & SLOT_DENYPOCKET)
return 0
@@ -399,7 +383,7 @@
return 0
if(!H.wear_suit)
if(!disable_warning)
- H << "You need a suit before you can attach this [I.name]."
+ H << "You need a suit before you can attach this [I.name]!"
return 0
if(!H.wear_suit.allowed)
if(!disable_warning)
@@ -517,6 +501,11 @@
if(!(SEE_OBJS & H.permanent_sight_flags))
H.sight &= ~SEE_OBJS
+ if(H.remote_view)
+ H.sight |= SEE_TURFS
+ H.sight |= SEE_MOBS
+ H.sight |= SEE_OBJS
+
H.see_in_dark = (H.sight == SEE_TURFS|SEE_MOBS|SEE_OBJS) ? 8 : darksight
var/see_temp = H.see_invisible
H.see_invisible = invis_sight
@@ -666,7 +655,7 @@
if(istype(H.back, /obj/item/weapon/tank/jetpack))
J = H.back
if(istype(H.wear_suit,/obj/item/clothing/suit/space/hardsuit)) //copypasta but faster implementation currently
- var/obj/item/clothing/suit/space/hardsuit/engine/C = H.wear_suit
+ var/obj/item/clothing/suit/space/hardsuit/C = H.wear_suit
P = C.jetpack
if(J)
if(J.allow_thrust(0.01, H))
@@ -695,8 +684,8 @@
if((H.disabilities & FAT))
mspeed += 1.5
- if(H.bodytemperature < 283.222)
- mspeed += (283.222 - H.bodytemperature) / 10 * (grav+0.5)
+ if(H.bodytemperature < BODYTEMP_COLD_DAMAGE_LIMIT)
+ mspeed += (BODYTEMP_COLD_DAMAGE_LIMIT - H.bodytemperature) / COLD_SLOWDOWN_FACTOR
mspeed += speedmod
@@ -713,11 +702,15 @@
//////////////////
/datum/species/proc/spec_attack_hand(var/mob/living/carbon/human/M, var/mob/living/carbon/human/H)
+ if(!istype(M)) //sanity check for drones.
+ return
if((M != H) && H.check_shields(0, M.name))
add_logs(M, H, "attempted to touch")
H.visible_message("[M] attempted to touch [H]!")
return 0
+ var/datum/martial_art/attacker_style = M.martial_art
+
switch(M.a_intent)
if("help")
if(H.health >= 0)
@@ -725,132 +718,119 @@
if(H != M)
add_logs(M, H, "shaked")
return 1
-
- //CPR
- if((M.head && (M.head.flags & HEADCOVERSMOUTH)) || (M.wear_mask && (M.wear_mask.flags & MASKCOVERSMOUTH)))
- M << "Remove your mask!"
- return 0
- if((H.head && (H.head.flags & HEADCOVERSMOUTH)) || (H.wear_mask && (H.wear_mask.flags & MASKCOVERSMOUTH)))
- M << "Remove their mask!"
- return 0
-
- if(H.cpr_time < world.time + 30)
- add_logs(M, H, "CPRed")
- M.visible_message("[M] is trying to perform CPR on [H]!", \
- "You try to perform CPR on [H]. Hold still!")
- if(!do_mob(M, H))
- M << "You fail to perform CPR on [H]!"
- return 0
- if((H.health >= -99 && H.health <= 0))
- H.cpr_time = world.time
- var/suff = min(H.getOxyLoss(), 7)
- H.adjustOxyLoss(-suff)
- H.updatehealth()
- M.visible_message("[M] performs CPR on [H]!")
- H << "You feel a breath of fresh air enter your lungs. It feels good."
+ else
+ M.do_cpr(H)
if("grab")
- H.grabbedby(M)
- return 1
+ if(attacker_style && attacker_style.grab_act(M,H))
+ return 1
+ else
+ H.grabbedby(M)
+ return 1
if("harm")
- add_logs(M, H, "punched")
- M.do_attack_animation(H)
-
- var/atk_verb = "punch"
- if(H.lying)
- atk_verb = "kick"
- else if(M.dna)
- atk_verb = M.dna.species.attack_verb
-
- var/damage = rand(0, 9)
- if(M.dna)
- damage += M.dna.species.punchmod
-
- if(!damage)
- if(M.dna)
- playsound(H.loc, M.dna.species.miss_sound, 25, 1, -1)
- else
- playsound(H.loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
-
- H.visible_message("[M] has attempted to [atk_verb] [H]!")
- return 0
-
-
- var/obj/item/organ/limb/affecting = H.get_organ(ran_zone(M.zone_sel.selecting))
- var/armor_block = H.run_armor_check(affecting, "melee")
-
- if(M.dna)
- playsound(H.loc, M.dna.species.attack_sound, 25, 1, -1)
+ if(attacker_style && attacker_style.harm_act(M,H))
+ return 1
else
- playsound(H.loc, 'sound/weapons/punch1.ogg', 25, 1, -1)
+ add_logs(M, H, "punched")
+ M.do_attack_animation(H)
+
+ var/atk_verb = "punch"
+ if(H.lying)
+ atk_verb = "kick"
+ else if(M.dna)
+ atk_verb = M.dna.species.attack_verb
+
+ var/damage = rand(0, 9)
+ if(M.dna)
+ damage += M.dna.species.punchmod
+
+ if(!damage)
+ if(M.dna)
+ playsound(H.loc, M.dna.species.miss_sound, 25, 1, -1)
+ else
+ playsound(H.loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
+
+ H.visible_message("[M] has attempted to [atk_verb] [H]!")
+ return 0
- H.visible_message("[M] has [atk_verb]ed [H]!", \
- "[M] has [atk_verb]ed [H]!")
+ var/obj/item/organ/limb/affecting = H.get_organ(ran_zone(M.zone_sel.selecting))
+ var/armor_block = H.run_armor_check(affecting, "melee")
- H.apply_damage(damage, BRUTE, affecting, armor_block)
- if((H.stat != DEAD) && damage >= 9)
- H.visible_message("[M] has weakened [H]!", \
- "[M] has weakened [H]!")
- H.apply_effect(4, WEAKEN, armor_block)
- H.forcesay(hit_appends)
- else if(H.lying)
- H.forcesay(hit_appends)
+ if(M.dna)
+ playsound(H.loc, M.dna.species.attack_sound, 25, 1, -1)
+ else
+ playsound(H.loc, 'sound/weapons/punch1.ogg', 25, 1, -1)
+
+ H.visible_message("[M] has [atk_verb]ed [H]!", \
+ "[M] has [atk_verb]ed [H]!")
+
+ H.apply_damage(damage, BRUTE, affecting, armor_block)
+ if((H.stat != DEAD) && damage >= 9)
+ H.visible_message("[M] has weakened [H]!", \
+ "[M] has weakened [H]!")
+ H.apply_effect(4, WEAKEN, armor_block)
+ H.forcesay(hit_appends)
+ else if(H.lying)
+ H.forcesay(hit_appends)
if("disarm")
- M.do_attack_animation(H)
- add_logs(M, H, "disarmed")
+ if(attacker_style && attacker_style.disarm_act(M,H))
+ return 1
+ else
+ M.do_attack_animation(H)
+ add_logs(M, H, "disarmed")
- if(H.w_uniform)
- H.w_uniform.add_fingerprint(M)
- var/obj/item/organ/limb/affecting = H.get_organ(ran_zone(M.zone_sel.selecting))
- var/randn = rand(1, 100)
- if(randn <= 25)
- H.apply_effect(2, WEAKEN, H.run_armor_check(affecting, "melee"))
- playsound(H, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
- H.visible_message("[M] has pushed [H]!",
- "[M] has pushed [H]!")
- H.forcesay(hit_appends)
- return
+ if(H.w_uniform)
+ H.w_uniform.add_fingerprint(M)
+ var/obj/item/organ/limb/affecting = H.get_organ(ran_zone(M.zone_sel.selecting))
+ var/randn = rand(1, 100)
+ if(randn <= 25)
+ playsound(H, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
+ H.visible_message("[M] has pushed [H]!",
+ "[M] has pushed [H]!")
+ H.apply_effect(2, WEAKEN, H.run_armor_check(affecting, "melee", "Your armor prevents your fall!", "Your armor softens your fall!"))
+ H.forcesay(hit_appends)
+ return
- var/talked = 0 // BubbleWrap
+ var/talked = 0 // BubbleWrap
- if(randn <= 60)
- //BubbleWrap: Disarming breaks a pull
- if(H.pulling)
- H.visible_message("[M] has broken [H]'s grip on [H.pulling]!")
- talked = 1
- H.stop_pulling()
-
- //BubbleWrap: Disarming also breaks a grab - this will also stop someone being choked, won't it?
- if(istype(H.l_hand, /obj/item/weapon/grab))
- var/obj/item/weapon/grab/lgrab = H.l_hand
- if(lgrab.affecting)
- H.visible_message("[M] has broken [H]'s grip on [lgrab.affecting]!")
+ if(randn <= 60)
+ //BubbleWrap: Disarming breaks a pull
+ if(H.pulling)
+ H.visible_message("[M] has broken [H]'s grip on [H.pulling]!")
talked = 1
- spawn(1)
- qdel(lgrab)
- if(istype(H.r_hand, /obj/item/weapon/grab))
- var/obj/item/weapon/grab/rgrab = H.r_hand
- if(rgrab.affecting)
- H.visible_message("[M] has broken [H]'s grip on [rgrab.affecting]!")
- talked = 1
- spawn(1)
- qdel(rgrab)
- //End BubbleWrap
+ H.stop_pulling()
- if(!talked) //BubbleWrap
- if(H.drop_item())
- H.visible_message("[M] has disarmed [H]!", \
- "[M] has disarmed [H]!")
- playsound(H, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
- return
+ //BubbleWrap: Disarming also breaks a grab - this will also stop someone being choked, won't it?
+ if(istype(H.l_hand, /obj/item/weapon/grab))
+ var/obj/item/weapon/grab/lgrab = H.l_hand
+ if(lgrab.affecting)
+ H.visible_message("[M] has broken [H]'s grip on [lgrab.affecting]!")
+ talked = 1
+ spawn(1)
+ qdel(lgrab)
+ if(istype(H.r_hand, /obj/item/weapon/grab))
+ var/obj/item/weapon/grab/rgrab = H.r_hand
+ if(rgrab.affecting)
+ H.visible_message("[M] has broken [H]'s grip on [rgrab.affecting]!")
+ talked = 1
+ spawn(1)
+ qdel(rgrab)
+ //End BubbleWrap
+
+ if(!talked) //BubbleWrap
+ if(H.drop_item())
+ H.visible_message("[M] has disarmed [H]!", \
+ "[M] has disarmed [H]!")
+ playsound(H, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
+ return
- playsound(H, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
- H.visible_message("[M] attempted to disarm [H]!", \
- "[M] attemped to disarm [H]!")
+ playsound(H, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
+ H.visible_message("[M] attempted to disarm [H]!", \
+ "[M] attemped to disarm [H]!")
return
/datum/species/proc/spec_attacked_by(var/obj/item/I, var/mob/living/user, var/def_zone, var/obj/item/organ/limb/affecting, var/hit_area, var/intent, var/obj/item/organ/limb/target_limb, target_area, var/mob/living/carbon/human/H)
@@ -869,7 +849,7 @@
else
return 0
- var/armor = H.run_armor_check(affecting, "melee", "Your armor has protected your [hit_area].", "Your armor has softened a hit to your [hit_area].")
+ var/armor = H.run_armor_check(affecting, "melee", "Your armor has protected your [hit_area].", "Your armor has softened a hit to your [hit_area].")
if(armor >= 100) return 0
var/Iforce = I.force //to avoid runtimes on the forcesay checks at the bottom. Some items might delete themselves if you drop them. (stunning yourself, ninja swords)
@@ -1163,7 +1143,7 @@
return 1
/datum/species/proc/handle_breath_temperature(datum/gas_mixture/breath, var/mob/living/carbon/human/H) // called by human/life, handles temperatures
- if( (abs(310.15 - breath.temperature) > 50) && !(mutations_list[COLDRES] in H.dna.mutations) && !(COLDRES in specflags)) // Hot air hurts :(
+ if(abs(310.15 - breath.temperature) > 50)
if(!(mutations_list[COLDRES] in H.dna.mutations)) // COLD DAMAGE
switch(breath.temperature)
@@ -1182,18 +1162,18 @@
H.apply_damage(HEAT_GAS_DAMAGE_LEVEL_2, BURN, "head")
if(1000 to INFINITY)
H.apply_damage(HEAT_GAS_DAMAGE_LEVEL_3, BURN, "head")
+
/datum/species/proc/handle_environment(datum/gas_mixture/environment, var/mob/living/carbon/human/H)
if(!environment)
return
var/loc_temp = H.get_temperature(environment)
- //world << "Loc temp: [loc_temp] - Body temp: [bodytemperature] - Fireloss: [getFireLoss()] - Thermal protection: [get_thermal_protection()] - Fire protection: [thermal_protection + add_fire_protection(loc_temp)] - Heat capacity: [environment_heat_capacity] - Location: [loc] - src: [src]"
- //Body temperature is adjusted in two steps. Firstly your body tries to stabilize itself a bit.
- if(H.stat != 2)
- H.stabilize_temperature_from_calories()
+ //Body temperature is adjusted in two steps. First, your body tries to stabilize itself a bit.
+ if(H.stat != DEAD)
+ H.natural_bodytemperature_stabilization()
- //After then, it reacts to the surrounding atmosphere based on your thermal protection
+ //Then, it reacts to the surrounding atmosphere based on your thermal protection
if(!H.on_fire) //If you're on fire, you do not heat up or cool down based on surrounding gases
if(loc_temp < H.bodytemperature)
//Place is colder than we are
@@ -1298,13 +1278,6 @@
H.AddLuminosity(-3)
H.update_fire()
-#undef SPECIES_LAYER
-#undef BODY_BEHIND_LAYER
-#undef BODY_LAYER
-#undef BODY_ADJ_LAYER
-#undef HAIR_LAYER
-#undef BODY_FRONT_LAYER
-
#undef HUMAN_MAX_OXYLOSS
#undef HUMAN_CRIT_MAX_OXYLOSS
diff --git a/code/modules/mob/living/carbon/human/species_types.dm b/code/modules/mob/living/carbon/human/species_types.dm
index 74248154ddf..f87374ee822 100644
--- a/code/modules/mob/living/carbon/human/species_types.dm
+++ b/code/modules/mob/living/carbon/human/species_types.dm
@@ -34,7 +34,7 @@
attack_verb = "slash"
attack_sound = 'sound/weapons/slash.ogg'
miss_sound = 'sound/weapons/slashmiss.ogg'
- meat = /obj/item/weapon/reagent_containers/food/snacks/meat/human/mutant/lizard
+ meat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/lizard
/datum/species/lizard/handle_speech(message)
// jesus christ why
@@ -58,7 +58,7 @@
miss_sound = 'sound/weapons/slashmiss.ogg'
burnmod = 1.25
heatmod = 1.5
- meat = /obj/item/weapon/reagent_containers/food/snacks/meat/human/mutant/plant
+ meat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/plant
/datum/species/plant/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H)
if(chem.id == "plantbgone")
@@ -70,10 +70,9 @@
switch(proj_type)
if(/obj/item/projectile/energy/floramut)
if(prob(15))
- H.apply_effect((rand(30,80)),IRRADIATE)
+ H.irradiate(rand(30,80))
H.Weaken(5)
- for (var/mob/V in viewers(H))
- V.show_message("[H] writhes in pain as \his vacuoles boil.", 3, "You hear the crunching of leaves.", 2)
+ H.visible_message("[H] writhes in pain as \his vacuoles boil.", "You writhe in pain as your vacuoles boil!", "You hear the crunching of leaves.")
if(prob(80))
randmutb(H)
domutcheck(H,null)
@@ -82,7 +81,7 @@
domutcheck(H,null)
else
H.adjustFireLoss(rand(5,15))
- H.show_message("The radiation beam singes you!")
+ H.show_message("The radiation beam singes you!")
if(/obj/item/projectile/energy/florayield)
H.nutrition = min(H.nutrition+30, NUTRITION_LEVEL_FULL)
return
@@ -127,7 +126,7 @@
darksight = 8
sexes = 0
ignored_by = list(/mob/living/simple_animal/hostile/faithless)
- meat = /obj/item/weapon/reagent_containers/food/snacks/meat/human/mutant/shadow
+ meat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/shadow
specflags = list(NOBREATH,NOBLOOD,RADIMMUNE)
/datum/species/shadow/spec_life(mob/living/carbon/human/H)
@@ -158,7 +157,7 @@
hair_color = "mutcolor"
hair_alpha = 150
ignored_by = list(/mob/living/simple_animal/slime)
- meat = /obj/item/weapon/reagent_containers/food/snacks/meat/human/mutant/slime
+ meat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/slime
exotic_blood = /datum/reagent/toxin/slimejelly
var/recently_changed = 1
@@ -198,7 +197,7 @@
say_mod = "chirps"
eyes = "jelleyes"
specflags = list(MUTCOLORS,EYECOLOR,NOBLOOD)
- meat = /obj/item/weapon/reagent_containers/food/snacks/meat/human/mutant/slime
+ meat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/slime
exotic_blood = /datum/reagent/toxin/slimejelly
var/recently_changed = 1
@@ -233,13 +232,13 @@
// Animated beings of stone. They have increased defenses, and do not need to breathe. They're also slow as fuuuck.
name = "Golem"
id = "golem"
- specflags = list(NOBREATH,HEATRES,COLDRES,NOGUNS,NOBLOOD,RADIMMUNE)
+ specflags = list(NOBREATH,HEATRES,COLDRES,NOGUNS,NOBLOOD,RADIMMUNE,VIRUSIMMUNE)
speedmod = 3
armor = 55
punchmod = 5
no_equip = list(slot_wear_mask, slot_wear_suit, slot_gloves, slot_shoes, slot_head, slot_w_uniform)
nojumpsuit = 1
- meat = /obj/item/weapon/reagent_containers/food/snacks/meat/human/mutant/golem
+ meat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/golem
/*
@@ -249,7 +248,7 @@
/datum/species/golem/adamantine
name = "Adamantine Golem"
id = "adamantine"
- meat = /obj/item/weapon/reagent_containers/food/snacks/meat/human/mutant/golem/adamantine
+ meat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/golem/adamantine
/*
FLIES
@@ -260,7 +259,7 @@
name = "Human?"
id = "fly"
say_mod = "buzzes"
- meat = /obj/item/weapon/reagent_containers/food/snacks/meat/human/mutant/fly
+ meat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/fly
/datum/species/fly/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H)
if(chem.id == "pestkiller")
@@ -281,8 +280,8 @@
id = "skeleton"
say_mod = "rattles"
sexes = 0
- meat = /obj/item/weapon/reagent_containers/food/snacks/meat/human/mutant/skeleton
- specflags = list(NOBREATH,HEATRES,COLDRES,NOBLOOD,RADIMMUNE)
+ meat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/skeleton
+ specflags = list(NOBREATH,HEATRES,COLDRES,NOBLOOD,RADIMMUNE,VIRUSIMMUNE)
/*
ZOMBIES
*/
@@ -293,7 +292,7 @@
id = "zombie"
say_mod = "moans"
sexes = 0
- meat = /obj/item/weapon/reagent_containers/food/snacks/meat/human/mutant/zombie
+ meat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/zombie
specflags = list(NOBREATH,HEATRES,COLDRES,NOBLOOD,RADIMMUNE)
/datum/species/zombie/handle_speech(message)
@@ -316,4 +315,32 @@
name = "Human"
id = "zombie"
sexes = 0
- meat = /obj/item/weapon/reagent_containers/food/snacks/meat/human/mutant/zombie
+ meat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/zombie
+
+
+/datum/species/abductor
+ name = "Abductor"
+ id = "abductor"
+ darksight = 3
+ say_mod = "gibbers"
+ sexes = 0
+ invis_sight = SEE_INVISIBLE_LEVEL_ONE
+ specflags = list(NOBLOOD,NOBREATH,VIRUSIMMUNE)
+ var/scientist = 0 // vars to not pollute spieces list with castes
+ var/agent = 0
+ var/team = 1
+
+/datum/species/abductor/handle_speech(message)
+ //Hacks
+ var/mob/living/carbon/human/user = usr
+ for(var/mob/living/carbon/human/H in mob_list)
+ if(H.dna.species.id != "abductor")
+ continue
+ else
+ var/datum/species/abductor/target_spec = H.dna.species
+ if(target_spec.team == team)
+ H << "[user.name]: [message]"
+ //return - technically you can add more aliens to a team
+ for(var/mob/M in dead_mob_list)
+ M << "[user.name]: [message]"
+ return ""
diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm
index 8d1c801472a..c33e23bbf8e 100644
--- a/code/modules/mob/living/carbon/human/update_icons.dm
+++ b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -260,17 +260,22 @@ Please contact me on #coderbus IRC. ~Carnie x
if(!t_color) t_color = icon_state
var/image/standing
+
+ var/iconfile2use //Which icon file to use to generate the overlay and any female alterations.
+
if(U.alternate_worn_icon)
- standing = image("icon"=U.alternate_worn_icon, "icon_state"="[t_color]_s", "layer"=-UNIFORM_LAYER)
- if(!standing)
- standing = image("icon"='icons/mob/uniform.dmi', "icon_state"="[t_color]_s", "layer"=-UNIFORM_LAYER)
+ iconfile2use = U.alternate_worn_icon
+ if(!iconfile2use)
+ iconfile2use = 'icons/mob/uniform.dmi'
+
+ standing = image("icon"=iconfile2use, "icon_state"="[t_color]_s", "layer"=-UNIFORM_LAYER)
overlays_standing[UNIFORM_LAYER] = standing
if(dna && dna.species.sexes)
var/G = (gender == FEMALE) ? "f" : "m"
if(G == "f" && U.fitted != NO_FEMALE_UNIFORM)
- standing = wear_female_version(t_color, 'icons/mob/uniform.dmi', UNIFORM_LAYER, U.fitted)
+ standing = wear_female_version(t_color, iconfile2use, UNIFORM_LAYER, U.fitted)
overlays_standing[UNIFORM_LAYER] = standing
if(w_uniform.blood_DNA)
@@ -626,6 +631,14 @@ Please contact me on #coderbus IRC. ~Carnie x
var/standing = image("icon"=female_clothing_icons["[t_color]_s"], "layer"=-layer)
return(standing)
+/mob/living/carbon/human/proc/get_overlays_copy(var/list/unwantedLayers)
+ var/list/out = new
+ for(var/i=1;i<=TOTAL_LAYERS;i++)
+ if(overlays_standing[i])
+ if(i in unwantedLayers)
+ continue
+ out += overlays_standing[i]
+ return out
//Human Overlays Indexes/////////
#undef SPECIES_LAYER
diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm
index daebf276b12..997387dd784 100644
--- a/code/modules/mob/living/carbon/life.dm
+++ b/code/modules/mob/living/carbon/life.dm
@@ -238,15 +238,8 @@
if(reagents)
reagents.metabolize(src)
-/mob/living/carbon/handle_blood()
- return
-
-/mob/living/carbon/handle_random_events()
- return
-
/mob/living/carbon/proc/handle_heart()
return
-/mob/living/carbon/handle_environment(var/datum/gas_mixture/environment) return
/mob/living/carbon/handle_stomach()
spawn(0)
@@ -375,8 +368,6 @@
/mob/living/carbon/handle_regular_hud_updates()
if(!client) return 0
- update_action_buttons()
-
if(damageoverlay)
if(damageoverlay.overlays)
damageoverlay.overlays = list()
@@ -472,7 +463,10 @@
sight &= ~SEE_MOBS
if(!(SEE_OBJS & permanent_sight_flags))
sight &= ~SEE_OBJS
-
+ if(remote_view)
+ sight |= SEE_TURFS
+ sight |= SEE_MOBS
+ sight |= SEE_OBJS
see_in_dark = (sight == SEE_TURFS|SEE_MOBS|SEE_OBJS) ? 8 : 2 //Xray flag combo
see_invisible = SEE_INVISIBLE_LIVING
if(see_override)
@@ -502,3 +496,20 @@
healths.icon_state = "health6"
else
healths.icon_state = "health7"
+
+
+//used in human and monkey handle_environment()
+/mob/living/carbon/proc/natural_bodytemperature_stabilization()
+ var/body_temperature_difference = 310.15 - bodytemperature
+ switch(bodytemperature)
+ if(-INFINITY to 260.15) //260.15 is 310.15 - 50, the temperature where you start to feel effects.
+ if(nutrition >= 2) //If we are very, very cold we'll use up quite a bit of nutriment to heat us up.
+ nutrition -= 2
+ bodytemperature += max((body_temperature_difference * metabolism_efficiency / BODYTEMP_AUTORECOVERY_DIVISOR), BODYTEMP_AUTORECOVERY_MINIMUM)
+ if(260.15 to 310.15)
+ bodytemperature += max(body_temperature_difference * metabolism_efficiency / BODYTEMP_AUTORECOVERY_DIVISOR, min(body_temperature_difference, BODYTEMP_AUTORECOVERY_MINIMUM/4))
+ if(310.15 to 360.15)
+ bodytemperature += min(body_temperature_difference * metabolism_efficiency / BODYTEMP_AUTORECOVERY_DIVISOR, max(body_temperature_difference, -BODYTEMP_AUTORECOVERY_MINIMUM/4))
+ if(360.15 to INFINITY) //360.15 is 310.15 + 50, the temperature where you start to feel effects.
+ //We totally need a sweat system cause it totally makes sense...~
+ bodytemperature += min((body_temperature_difference / BODYTEMP_AUTORECOVERY_DIVISOR), -BODYTEMP_AUTORECOVERY_MINIMUM) //We're dealing with negative numbers
diff --git a/code/modules/mob/living/carbon/monkey/life.dm b/code/modules/mob/living/carbon/monkey/life.dm
index 12cac68350c..1a11316bb04 100644
--- a/code/modules/mob/living/carbon/monkey/life.dm
+++ b/code/modules/mob/living/carbon/monkey/life.dm
@@ -18,10 +18,6 @@
if(prob(1))
emote(pick("scratch","jump","roll","tail"))
-/mob/living/carbon/monkey/calculate_affecting_pressure(var/pressure)
- ..()
- return pressure
-
/mob/living/carbon/monkey/handle_mutations_and_radiation()
if (radiation)
@@ -46,23 +42,69 @@
emote("gasp")
..()
+/mob/living/carbon/monkey/handle_breath_temperature(datum/gas_mixture/breath)
+ if(abs(310.15 - breath.temperature) > 50)
+ switch(breath.temperature)
+ if(-INFINITY to 120)
+ adjustFireLoss(3)
+ if(120 to 200)
+ adjustFireLoss(1.5)
+ if(200 to 260)
+ adjustFireLoss(0.5)
+ if(360 to 400)
+ adjustFireLoss(2)
+ if(400 to 1000)
+ adjustFireLoss(3)
+ if(1000 to INFINITY)
+ adjustFireLoss(8)
/mob/living/carbon/monkey/handle_environment(datum/gas_mixture/environment)
if(!environment)
return
- var/environment_heat_capacity = environment.heat_capacity()
- if(istype(get_turf(src), /turf/space))
- var/turf/heat_turf = get_turf(src)
- environment_heat_capacity = heat_turf.heat_capacity
- if(!on_fire)
- if((environment.temperature > (T0C + 50)) || (environment.temperature < (T0C + 10)))
- var/transfer_coefficient = 1
+ var/loc_temp = get_temperature(environment)
- handle_temperature_damage(HEAD, environment.temperature, environment_heat_capacity*transfer_coefficient)
+ if(stat != DEAD)
+ natural_bodytemperature_stabilization()
- if(stat != 2)
- bodytemperature += 0.1*(environment.temperature - bodytemperature)*environment_heat_capacity/(environment_heat_capacity + 270000)
+ if(!on_fire) //If you're on fire, you do not heat up or cool down based on surrounding gases
+ if(loc_temp < bodytemperature)
+ bodytemperature += min(((loc_temp - bodytemperature) / BODYTEMP_COLD_DIVISOR), BODYTEMP_COOLING_MAX)
+ else
+ bodytemperature += min(((loc_temp - bodytemperature) / BODYTEMP_HEAT_DIVISOR), BODYTEMP_HEATING_MAX)
+
+ if(bodytemperature > BODYTEMP_HEAT_DAMAGE_LIMIT)
+ switch(bodytemperature)
+ if(360 to 400)
+ throw_alert("temp","hot",1)
+ adjustFireLoss(2)
+ if(400 to 460)
+ throw_alert("temp","hot",2)
+ adjustFireLoss(3)
+ if(460 to INFINITY)
+ throw_alert("temp","hot",3)
+ if(on_fire)
+ adjustFireLoss(8)
+ else
+ adjustFireLoss(3)
+
+ else if(bodytemperature < BODYTEMP_COLD_DAMAGE_LIMIT)
+ if(!istype(loc, /obj/machinery/atmospherics/unary/cryo_cell))
+ switch(bodytemperature)
+ if(200 to 260)
+ throw_alert("temp","cold",1)
+ adjustFireLoss(0.5)
+ if(120 to 200)
+ throw_alert("temp","cold",2)
+ adjustFireLoss(1.5)
+ if(-INFINITY to 120)
+ throw_alert("temp","cold",3)
+ adjustFireLoss(3)
+ else
+ clear_alert("temp")
+
+ else
+ clear_alert("temp")
//Account for massive pressure differences
@@ -84,14 +126,6 @@
return
-/mob/living/carbon/monkey/proc/handle_temperature_damage(body_part, exposed_temperature, exposed_intensity)
- if(status_flags & GODMODE) return
- var/discomfort = min( abs(exposed_temperature - bodytemperature)*(exposed_intensity)/2000000, 1.0)
-
- if(exposed_temperature > bodytemperature)
- adjustFireLoss(20.0*discomfort)
- else
- adjustFireLoss(5.0*discomfort)
/mob/living/carbon/monkey/handle_hud_icons()
@@ -107,7 +141,7 @@
/mob/living/carbon/monkey/handle_changeling()
- if(mind)
+ if(mind && hud_used)
if(mind.changeling)
mind.changeling.regenerate()
hud_used.lingchemdisplay.invisibility = 0
@@ -120,10 +154,8 @@
if(wear_mask.flags & BLOCK_GAS_SMOKE_EFFECT)
return 1
-///FIRE CODE
/mob/living/carbon/monkey/handle_fire()
if(..())
return
- adjustFireLoss(6)
+ bodytemperature += BODYTEMP_HEATING_MAX
return
-//END FIRE CODE
diff --git a/code/modules/mob/living/carbon/monkey/monkey.dm b/code/modules/mob/living/carbon/monkey/monkey.dm
index d275d0744ba..51b73cc9a7a 100644
--- a/code/modules/mob/living/carbon/monkey/monkey.dm
+++ b/code/modules/mob/living/carbon/monkey/monkey.dm
@@ -204,6 +204,9 @@
/mob/living/carbon/monkey/IsAdvancedToolUser()//Unless its monkey mode monkeys cant use advanced tools
return 0
+/mob/living/carbon/monkey/reagent_check(var/datum/reagent/R) //can metabolize all reagents
+ return 0
+
/mob/living/carbon/monkey/canBeHandcuffed()
return 1
@@ -241,10 +244,6 @@
return threatcount
-/mob/living/carbon/monkey/SpeciesCanConsume()
- return 1 // Monkeys can eat, drink, and be forced to do so
-
-
/mob/living/carbon/monkey/acid_act(var/acidpwr, var/toxpwr, var/acid_volume)
if(wear_mask)
if(!wear_mask.unacidable)
@@ -255,3 +254,10 @@
return
take_organ_damage(min(6*toxpwr, acid_volume * toxpwr))
+
+/mob/living/carbon/monkey/help_shake_act(mob/living/carbon/M)
+ if(health < 0 && ishuman(M))
+ var/mob/living/carbon/human/H = M
+ H.do_cpr(src)
+ else
+ ..()
diff --git a/code/modules/mob/living/carbon/update_icons.dm b/code/modules/mob/living/carbon/update_icons.dm
index 1136f3533bb..40c8b4f11e2 100644
--- a/code/modules/mob/living/carbon/update_icons.dm
+++ b/code/modules/mob/living/carbon/update_icons.dm
@@ -11,11 +11,11 @@
changed++
ntransform.TurnTo(lying_prev,lying)
if(lying == 0) //Lying to standing
- final_pixel_y = initial(pixel_y)
+ final_pixel_y = get_standard_pixel_y_offset()
else //if(lying != 0)
if(lying_prev == 0) //Standing to lying
- pixel_y = initial(pixel_y)
- final_pixel_y = lying_pixel_offset
+ pixel_y = get_standard_pixel_y_offset()
+ final_pixel_y = get_standard_pixel_y_offset(lying)
if(dir & (EAST|WEST)) //Facing east or west
final_dir = pick(NORTH, SOUTH) //So you fall on your side rather than your face or ass
diff --git a/code/modules/mob/living/damage_procs.dm b/code/modules/mob/living/damage_procs.dm
index d420721feef..89a35a4e605 100644
--- a/code/modules/mob/living/damage_procs.dm
+++ b/code/modules/mob/living/damage_procs.dm
@@ -51,7 +51,7 @@
if(PARALYZE)
Paralyse(effect * blocked)
if(IRRADIATE)
- radiation += max(effect * ((100-run_armor_check(null, "rad", "Your clothes feel warm.", "Your clothes feel warm."))/100),0)//Rads auto check armor
+ radiation += max(effect * blocked, 0)
if(SLUR)
slurring = max(slurring,(effect * blocked))
if(STUTTER)
diff --git a/code/modules/mob/living/life.dm b/code/modules/mob/living/life.dm
index e2f440bcfb5..af02c55f543 100644
--- a/code/modules/mob/living/life.dm
+++ b/code/modules/mob/living/life.dm
@@ -47,6 +47,8 @@
handle_disabilities() // eye, ear, brain damages
handle_status_effects() //all special effects, stunned, weakened, jitteryness, hallucination, sleeping, etc
+ handle_actions()
+
update_canmove()
if(client)
@@ -131,6 +133,22 @@
if(ear_damage < 100)
adjustEarDamage(-0.05,-1)
+/mob/living/proc/handle_actions()
+ //Pretty bad, i'd use picked/dropped instead but the parent calls in these are nonexistent
+ for(var/datum/action/A in actions)
+ if(A.CheckRemoval(src))
+ A.Remove(src)
+ for(var/obj/item/I in src)
+ if(I.action_button_name)
+ if(!I.action)
+ if(I.action_button_is_hands_free)
+ I.action = new/datum/action/item_action/hands_free
+ else
+ I.action = new/datum/action/item_action
+ I.action.name = I.action_button_name
+ I.action.target = I
+ I.action.Grant(src)
+ return
//this handles hud updates. Calls update_vision() and handle_hud_icons()
/mob/living/proc/handle_regular_hud_updates()
@@ -138,6 +156,7 @@
handle_vision()
handle_hud_icons()
+ update_action_buttons()
return 1
@@ -185,3 +204,56 @@
/mob/living/proc/handle_hud_icons_health()
return
+
+/mob/living/update_action_buttons()
+ if(!hud_used) return
+ if(!client) return
+
+ if(hud_used.hud_shown != 1) //Hud toggled to minimal
+ return
+
+ client.screen -= hud_used.hide_actions_toggle
+ for(var/datum/action/A in actions)
+ if(A.button)
+ client.screen -= A.button
+
+ if(hud_used.action_buttons_hidden)
+ if(!hud_used.hide_actions_toggle)
+ hud_used.hide_actions_toggle = new(hud_used)
+ hud_used.hide_actions_toggle.UpdateIcon()
+
+ if(!hud_used.hide_actions_toggle.moved)
+ hud_used.hide_actions_toggle.screen_loc = hud_used.ButtonNumberToScreenCoords(1)
+ //hud_used.SetButtonCoords(hud_used.hide_actions_toggle,1)
+
+ client.screen += hud_used.hide_actions_toggle
+ return
+
+ var/button_number = 0
+ for(var/datum/action/A in actions)
+ button_number++
+ if(A.button == null)
+ var/obj/screen/movable/action_button/N = new(hud_used)
+ N.owner = A
+ A.button = N
+
+ var/obj/screen/movable/action_button/B = A.button
+
+ B.UpdateIcon()
+
+ B.name = A.UpdateName()
+
+ client.screen += B
+
+ if(!B.moved)
+ B.screen_loc = hud_used.ButtonNumberToScreenCoords(button_number)
+ //hud_used.SetButtonCoords(B,button_number)
+
+ if(button_number > 0)
+ if(!hud_used.hide_actions_toggle)
+ hud_used.hide_actions_toggle = new(hud_used)
+ hud_used.hide_actions_toggle.InitialiseIcon(src)
+ if(!hud_used.hide_actions_toggle.moved)
+ hud_used.hide_actions_toggle.screen_loc = hud_used.ButtonNumberToScreenCoords(button_number+1)
+ //hud_used.SetButtonCoords(hud_used.hide_actions_toggle,button_number+1)
+ client.screen += hud_used.hide_actions_toggle
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index eed82116b44..8c64cbf773e 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -193,7 +193,7 @@ Sorry Giacom. Please don't be mad :(
//This proc is used for mobs which are affected by pressure to calculate the amount of pressure that actually
//affects them once clothing is factored in. ~Errorage
/mob/living/proc/calculate_affecting_pressure(var/pressure)
- return 0
+ return pressure
//sort of a legacy burn method for /electrocute, /shock, and the e_chair
@@ -551,9 +551,8 @@ Sorry Giacom. Please don't be mad :(
if ((s_active && !( s_active in contents ) ))
s_active.close(src)
- if(update_slimes)
- for(var/mob/living/simple_animal/slime/M in view(1,src))
- M.UpdateFeed(src)
+ for(var/mob/living/simple_animal/slime/M in oview(1,src))
+ M.UpdateFeed(src)
/mob/living/proc/makeTrail(var/turf/T, var/mob/living/M)
if(ishuman(M))
@@ -667,13 +666,13 @@ Sorry Giacom. Please don't be mad :(
float(!has_gravity)
/mob/living/proc/float(on)
+ if(throwing)
+ return
if(on && !floating)
animate(src, pixel_y = pixel_y + 2, time = 10, loop = -1)
floating = 1
else if(!on && floating)
- var/final_pixel_y = initial(pixel_y)
- if(lying && !buckled)
- final_pixel_y = lying_pixel_offset
+ var/final_pixel_y = get_standard_pixel_y_offset(lying)
animate(src, pixel_y = final_pixel_y, time = 10)
floating = 0
@@ -695,7 +694,7 @@ Sorry Giacom. Please don't be mad :(
// Override if a certain type of mob should be behave differently when stripping items (can't, for example)
/mob/living/stripPanelUnequip(obj/item/what, mob/who, where)
if(what.flags & NODROP)
- src << "You can't remove \the [what.name], it appears to be stuck!"
+ src << "You can't remove \the [what.name], it appears to be stuck!"
return
who.visible_message("[src] tries to remove [who]'s [what.name].", \
"[src] tries to remove [who]'s [what.name].")
@@ -710,7 +709,7 @@ Sorry Giacom. Please don't be mad :(
/mob/living/stripPanelEquip(obj/item/what, mob/who, where)
what = src.get_active_hand()
if(what && (what.flags & NODROP))
- src << "You can't put \the [what.name] on [who], it's stuck to your hand!"
+ src << "You can't put \the [what.name] on [who], it's stuck to your hand!"
return
if(what && what.mob_can_equip(who, where, 1))
visible_message("[src] tries to put [what] on [who].")
@@ -771,9 +770,7 @@ Sorry Giacom. Please don't be mad :(
/mob/living/do_attack_animation(atom/A)
- var/final_pixel_y = initial(pixel_y)
- if(lying && !buckled)
- final_pixel_y = lying_pixel_offset
+ var/final_pixel_y = get_standard_pixel_y_offset(lying)
..(A, final_pixel_y)
floating = 0 // If we were without gravity, the bouncing animation got stopped, so we make sure to restart it in next life().
@@ -781,11 +778,10 @@ Sorry Giacom. Please don't be mad :(
var/amplitude = min(4, (jitteriness/100) + 1)
var/pixel_x_diff = rand(-amplitude, amplitude)
var/pixel_y_diff = rand(-amplitude/3, amplitude/3)
- var/final_pixel_y = initial(pixel_y)
- if(lying && !buckled)
- final_pixel_y = lying_pixel_offset
+ var/final_pixel_x = get_standard_pixel_x_offset(lying)
+ var/final_pixel_y = get_standard_pixel_y_offset(lying)
animate(src, pixel_x = pixel_x + pixel_x_diff, pixel_y = pixel_y + pixel_y_diff , time = 2, loop = 6)
- animate(pixel_x = initial(pixel_x) , pixel_y = final_pixel_y , time = 2)
+ animate(pixel_x = final_pixel_x , pixel_y = final_pixel_y , time = 2)
floating = 0 // If we were without gravity, the bouncing animation got stopped, so we make sure to restart it in next life().
/mob/living/proc/get_temperature(var/datum/gas_mixture/environment)
@@ -813,3 +809,9 @@ Sorry Giacom. Please don't be mad :(
loc_temp = environment.temperature
return loc_temp
+
+/mob/living/proc/get_standard_pixel_x_offset(lying = 0)
+ return initial(pixel_x)
+
+/mob/living/proc/get_standard_pixel_y_offset(lying = 0)
+ return initial(pixel_y)
diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index cbacdc681cd..6aa9bda4d25 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -158,7 +158,7 @@ proc/vol_by_throwforce_and_or_w_class(var/obj/item/I)
/mob/living/acid_act(var/acidpwr, var/toxpwr, var/acid_volume)
take_organ_damage(min(10*toxpwr, acid_volume * toxpwr))
-/mob/living/proc/grabbedby(mob/living/carbon/user)
+/mob/living/proc/grabbedby(mob/living/carbon/user,var/supress_message = 0)
if(user == src || anchored)
return 0
if(!(status_flags & CANPUSH))
@@ -168,7 +168,7 @@ proc/vol_by_throwforce_and_or_w_class(var/obj/item/I)
var/obj/item/weapon/grab/G = new /obj/item/weapon/grab(user, src)
if(buckled)
- user << "You cannot grab [src], \he is buckled in!"
+ user << "You cannot grab [src], \he is buckled in!"
if(!G) //the grab will delete itself in New if src is anchored
return 0
user.put_in_active_hand(G)
@@ -176,7 +176,8 @@ proc/vol_by_throwforce_and_or_w_class(var/obj/item/I)
LAssailant = user
playsound(src.loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
- visible_message("[user] has grabbed [src] passively!")
+ if(!supress_message)
+ visible_message("[user] has grabbed [src] passively!")
/mob/living/attack_slime(mob/living/simple_animal/slime/M as mob)
@@ -277,3 +278,8 @@ proc/vol_by_throwforce_and_or_w_class(var/obj/item/I)
/mob/living/incapacitated()
if(stat || paralysis || stunned || weakened || restrained())
return 1
+
+/mob/living/proc/irradiate(amount)
+ if(amount)
+ var/blocked = run_armor_check(null, "rad", "Your clothes feel warm", "Your clothes feel warm")
+ apply_effect(amount, IRRADIATE, blocked)
diff --git a/code/modules/mob/living/living_defines.dm b/code/modules/mob/living/living_defines.dm
index a9e6d1863c4..59436c1028b 100644
--- a/code/modules/mob/living/living_defines.dm
+++ b/code/modules/mob/living/living_defines.dm
@@ -32,7 +32,6 @@
var/cameraFollow = null
var/tod = null // Time of death
- var/update_slimes = 1
var/on_fire = 0 //The "Are we on fire?" var
var/fire_stacks = 0 //Tracks how many stacks of fire we have on, max is usually 20
@@ -41,7 +40,9 @@
var/floating = 0
var/mob_size = MOB_SIZE_HUMAN
var/metabolism_efficiency = 1 //more or less efficiency to metabolize helpful/harmful reagents and regulate body temperature..
-
var/list/image/staticOverlays = list()
+ var/has_limbs = 0 //does the mob have distinct limbs?(arms,legs, chest,head)
+ var/list/datum/action/actions = list()
- var/lying_pixel_offset = 0 //offset for pixel_y when the mob is lying down.
\ No newline at end of file
+ var/list/pipes_shown = list()
+ var/last_played_vent
\ No newline at end of file
diff --git a/code/modules/mob/living/login.dm b/code/modules/mob/living/login.dm
index eb582bbcfa1..0b46914c42b 100644
--- a/code/modules/mob/living/login.dm
+++ b/code/modules/mob/living/login.dm
@@ -10,7 +10,11 @@
if("sandbox")
CanBuild()
+ //Vents
if(ventcrawler)
src << "You can ventcrawl! Use alt+click on vents to quickly travel about the station."
+ //Should update regardless of if we can ventcrawl, since we can end up in pipes in other ways.
+ update_pipe_vision()
+
update_interface()
return .
diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm
index c7a13f69e26..e5986aa8589 100644
--- a/code/modules/mob/living/say.dm
+++ b/code/modules/mob/living/say.dm
@@ -16,6 +16,7 @@ var/list/department_radio_keys = list(
":v" = "Service", "#v" = "Service", ".v" = "Service",
":o" = "AI Private", "#o" = "AI Private", ".o" = "AI Private",
":g" = "changeling", "#g" = "changeling", ".g" = "changeling",
+ ":y" = "Centcom", "#y" = "Centcom", ".y" = "Centcom",
":R" = "right hand", "#R" = "right hand", ".R" = "right hand",
":L" = "left hand", "#L" = "left hand", ".L" = "left hand",
@@ -34,6 +35,7 @@ var/list/department_radio_keys = list(
":V" = "Service", "#V" = "Service", ".V" = "Service",
":O" = "AI Private", "#O" = "AI Private", ".O" = "AI Private",
":G" = "changeling", "#G" = "changeling", ".G" = "changeling",
+ ":Y" = "Centcom", "#Y" = "Centcom", ".Y" = "Centcom",
//kinda localization -- rastaf0
//same keys as above, but on russian keyboard layout. This file uses cp1251 as encoding.
diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
index a25993a8161..2c7083a8206 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -224,6 +224,11 @@ var/list/ai_list = list()
else
stat(null, text("Systems nonfunctional"))
+/mob/living/silicon/ai/canUseTopic()
+ if(stat)
+ return
+ return 1
+
/mob/living/silicon/ai/proc/ai_alerts()
var/dat = "Current Station Alerts\n"
dat += "Close
"
diff --git a/code/modules/mob/living/silicon/ai/freelook/chunk.dm b/code/modules/mob/living/silicon/ai/freelook/chunk.dm
index faab21b72d3..48adee0e407 100644
--- a/code/modules/mob/living/silicon/ai/freelook/chunk.dm
+++ b/code/modules/mob/living/silicon/ai/freelook/chunk.dm
@@ -21,26 +21,24 @@
// Add an AI eye to the chunk, then update if changed.
-/datum/camerachunk/proc/add(mob/camera/aiEye/ai)
- if(!ai.ai)
- return
- ai.visibleCameraChunks += src
- if(ai.ai.client)
- ai.ai.client.images += obscured
+/datum/camerachunk/proc/add(mob/camera/aiEye/eye)
+ var/client/client = eye.GetViewerClient()
+ if(client)
+ client.images += obscured
+ eye.visibleCameraChunks += src
visible++
- seenby += ai
+ seenby += eye
if(changed && !updating)
update()
// Remove an AI eye from the chunk, then update if changed.
-/datum/camerachunk/proc/remove(mob/camera/aiEye/ai)
- if(!ai.ai)
- return
- ai.visibleCameraChunks -= src
- if(ai.ai.client)
- ai.ai.client.images -= obscured
- seenby -= ai
+/datum/camerachunk/proc/remove(mob/camera/aiEye/eye)
+ var/client/client = eye.GetViewerClient()
+ if(client)
+ client.images -= obscured
+ eye.visibleCameraChunks -= src
+ seenby -= eye
if(visible > 0)
visible--
@@ -106,10 +104,11 @@
obscured -= t.obscured
for(var/eye in seenby)
var/mob/camera/aiEye/m = eye
- if(!m || !m.ai)
+ if(!m)
continue
- if(m.ai.client)
- m.ai.client.images -= t.obscured
+ var/client/client = m.GetViewerClient()
+ if(client)
+ client.images -= t.obscured
for(var/turf in visRemoved)
var/turf/t = turf
@@ -120,11 +119,12 @@
obscured += t.obscured
for(var/eye in seenby)
var/mob/camera/aiEye/m = eye
- if(!m || !m.ai)
+ if(!m)
seenby -= m
continue
- if(m.ai.client)
- m.ai.client.images += t.obscured
+ var/client/client = m.GetViewerClient()
+ if(client)
+ client.images += t.obscured
changed = 0
diff --git a/code/modules/mob/living/silicon/ai/freelook/eye.dm b/code/modules/mob/living/silicon/ai/freelook/eye.dm
index b5e313bb050..d24c734f219 100644
--- a/code/modules/mob/living/silicon/ai/freelook/eye.dm
+++ b/code/modules/mob/living/silicon/ai/freelook/eye.dm
@@ -31,6 +31,11 @@
/mob/camera/aiEye/Move()
return 0
+/mob/camera/aiEye/proc/GetViewerClient()
+ if(ai)
+ return ai.client
+ return null
+
// AI MOVEMENT
@@ -120,3 +125,6 @@
acceleration = !acceleration
usr << "Camera acceleration has been toggled [acceleration ? "on" : "off"]."
+
+
+
diff --git a/code/modules/mob/living/silicon/pai/life.dm b/code/modules/mob/living/silicon/pai/life.dm
index c0017863de6..bc665bd4ec5 100644
--- a/code/modules/mob/living/silicon/pai/life.dm
+++ b/code/modules/mob/living/silicon/pai/life.dm
@@ -4,7 +4,7 @@
if(src.cable)
if(get_dist(src, src.cable) > 1)
var/turf/T = get_turf(src.loc)
- T.visible_message("[src.cable] rapidly retracts back into its spool.", "You hear a click and the sound of wire spooling rapidly.")
+ T.visible_message("[src.cable] rapidly retracts back into its spool.", "You hear a click and the sound of wire spooling rapidly.")
qdel(src.cable)
cable = null
if(silence_time)
diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm
index c2062b46546..a324cdbbfe7 100644
--- a/code/modules/mob/living/silicon/pai/pai.dm
+++ b/code/modules/mob/living/silicon/pai/pai.dm
@@ -108,7 +108,7 @@
// 33% chance of no additional effect
if(prob(20))
- visible_message("A shower of sparks spray from [src]'s inner workings.", 3, "You hear and smell the ozone hiss of electrical sparks being expelled violently.", 2)
+ visible_message("A shower of sparks spray from [src]'s inner workings.", 3, "You hear and smell the ozone hiss of electrical sparks being expelled violently.", 2)
return src.death(0)
silence_time = world.timeofday + 120 * 10 // Silence for 2 minutes
diff --git a/code/modules/mob/living/silicon/pai/software.dm b/code/modules/mob/living/silicon/pai/software.dm
index c7e6135380f..4144a3a3ef2 100644
--- a/code/modules/mob/living/silicon/pai/software.dm
+++ b/code/modules/mob/living/silicon/pai/software.dm
@@ -264,7 +264,7 @@
var/turf/T = get_turf(src.loc)
src.cable = new /obj/item/weapon/pai_cable(T)
for (var/mob/M in viewers(T))
- M.show_message("A port on [src] opens to reveal [src.cable], which promptly falls to the floor.", 3, "You hear the soft click of something light and hard falling to the ground.", 2)
+ M.show_message("A port on [src] opens to reveal [src.cable], which promptly falls to the floor.", 3, "You hear the soft click of something light and hard falling to the ground.", 2)
//src.updateUsrDialog() We only need to account for the single mob this is intended for, and he will *always* be able to call this window
src.paiInterface() // So we'll just call the update directly rather than doing some default checks
return
diff --git a/code/modules/mob/living/silicon/robot/inventory.dm b/code/modules/mob/living/silicon/robot/inventory.dm
index 4934daa8060..fe91e38e37d 100644
--- a/code/modules/mob/living/silicon/robot/inventory.dm
+++ b/code/modules/mob/living/silicon/robot/inventory.dm
@@ -74,7 +74,7 @@
if(istype(module_state_3,/obj/item/borg/sight))
sight_mode |= module_state_3:sight_mode
else
- src << "You need to disable a module first!"
+ src << "You need to disable a module first!"
/mob/living/silicon/robot/proc/uneq_active()
uneq_module(module_active)
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 6fcf7c2c9d1..df8ebcfd28d 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -8,6 +8,7 @@
var/sight_mode = 0
var/custom_name = ""
designation = "Default" //used for displaying the prefix & getting the current module of cyborg
+ has_limbs = 1
//Hud stuff
@@ -399,19 +400,19 @@
user.changeNext_move(CLICK_CD_MELEE)
var/obj/item/weapon/weldingtool/WT = W
if (src == user)
- user << "You lack the reach to be able to repair yourself."
+ user << "You lack the reach to be able to repair yourself!"
return 1
if (src.health >= src.maxHealth)
- user << "[src] is already in good condition."
+ user << "[src] is already in good condition!"
return 1
if (WT.remove_fuel(0, user))
adjustBruteLoss(-30)
updatehealth()
add_fingerprint(user)
- visible_message("[user] has fixed some of the dents on [src].")
+ visible_message("[user] has fixed some of the dents on [src].")
return 0
else
- user << "The welder must be on for this task."
+ user << "The welder must be on for this task!"
return 1
else if(istype(W, /obj/item/stack/cable_coil) && wiresexposed)
@@ -419,33 +420,33 @@
if (coil.use(1))
adjustFireLoss(-30)
updatehealth()
- visible_message("[user] has fixed some of the burnt wires on [src].")
+ user.visible_message("[user] has fixed some of the burnt wires on [src].", "You fix some of the burnt wires on [src].")
else
- user << "You need one length of cable to repair [src]."
+ user << "You need one length of cable to repair [src]!"
else if (istype(W, /obj/item/weapon/crowbar)) // crowbar means open or close the cover
if(opened)
- user << "You close the cover."
+ user << "You close the cover."
opened = 0
update_icons()
else
if(locked)
- user << "The cover is locked and cannot be opened."
+ user << "The cover is locked and cannot be opened!"
else
- user << "You open the cover."
+ user << "You open the cover."
opened = 1
update_icons()
else if (istype(W, /obj/item/weapon/stock_parts/cell) && opened) // trying to put a cell inside
if(wiresexposed)
- user << "Close the cover first."
+ user << "Close the cover first!"
else if(cell)
- user << "There is a power cell already installed."
+ user << "There is a power cell already installed!"
else
user.drop_item()
W.loc = src
cell = W
- user << "You insert the power cell."
+ user << "You insert the power cell."
// chargecount = 0
update_icons()
@@ -453,7 +454,7 @@
if (wiresexposed)
wires.Interact(user)
else
- user << "You can't reach the wiring."
+ user << "You can't reach the wiring!"
else if(istype(W, /obj/item/weapon/screwdriver) && opened && !cell) // haxing
wiresexposed = !wiresexposed
@@ -464,7 +465,7 @@
if(radio)
radio.attackby(W,user)//Push it to the radio to let it handle everything
else
- user << "Unable to locate a radio."
+ user << "Unable to locate a radio!"
update_icons()
else if(istype(W, /obj/item/weapon/wrench) && opened && !cell) //Deconstruction. The flashes break from the fall, to prevent this from being a ghetto reset module.
@@ -474,20 +475,21 @@
return
else
playsound(src, 'sound/items/Ratchet.ogg', 50, 1)
+ user << "You start to unfasten [src]'s securing bolts..."
if(do_after(user, 50) && !cell)
- user.visible_message("[user] deconstructs [src]!", "You unfasten the securing bolts, and [src] falls to pieces!")
+ user.visible_message("[user] deconstructs [src]!", "You unfasten the securing bolts, and [src] falls to pieces!")
deconstruct()
else if(istype(W, /obj/item/weapon/aiModule))
var/obj/item/weapon/aiModule/MOD = W
if(!opened)
- user << "You need access to the robot's insides to do that."
+ user << "You need access to the robot's insides to do that!"
return
if(wiresexposed)
- user << "You need to close the wire panel to do that."
+ user << "You need to close the wire panel to do that!"
return
if(!cell)
- user << "You need to install a power cell to do that."
+ user << "You need to install a power cell to do that!"
return
if(emagged || (connected_ai && lawupdate)) //Can't be sure which, metagamers
emote("buzz-[user.name]")
@@ -499,17 +501,17 @@
if(radio)//sanityyyyyy
radio.attackby(W,user)//GTFO, you have your own procs
else
- user << "Unable to locate a radio."
+ user << "Unable to locate a radio!"
else if (istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda)) // trying to unlock the interface with an ID card
if(emagged)//still allow them to open the cover
- user << "The interface seems slightly damaged"
+ user << "The interface seems slightly damaged."
if(opened)
- user << "You must close the cover to swipe an ID card."
+ user << "You must close the cover to swipe an ID card!"
else
if(allowed(usr))
locked = !locked
- user << "You [ locked ? "lock" : "unlock"] [src]'s cover."
+ user << "You [ locked ? "lock" : "unlock"] [src]'s cover."
update_icons()
else
user << "Access denied."
@@ -517,27 +519,27 @@
else if(istype(W, /obj/item/borg/upgrade/))
var/obj/item/borg/upgrade/U = W
if(!opened)
- usr << "You must access the borgs internals!"
+ usr << "You must access the borgs internals!"
else if(!src.module && U.require_module)
- usr << "The borg must choose a module before it can be upgraded!"
+ usr << "The borg must choose a module before it can be upgraded!"
else if(U.locked)
- usr << "The upgrade is locked and cannot be used yet!"
+ usr << "The upgrade is locked and cannot be used yet!"
else
if(U.action(src))
- usr << "You apply the upgrade to [src]!"
+ usr << "You apply the upgrade to [src]."
usr.drop_item()
U.loc = src
else
- usr << "Upgrade error!"
+ usr << "Upgrade error."
else if(istype(W, /obj/item/device/toner))
if(toner >= tonermax)
- usr << "The toner level of [src] is at it's highest level possible"
+ usr << "The toner level of [src] is at it's highest level possible!"
else
toner = 40
usr.drop_item()
qdel(W)
- usr << "You fill the toner level of [src] to it's max capacity"
+ usr << "You fill the toner level of [src] to its max capacity."
else
if(W.force && W.damtype != STAMINA) //only sparks if real damage is dealt.
@@ -549,19 +551,19 @@
if(!opened)//Cover is closed
if(locked)
if(prob(90))
- user << "You emag the cover lock."
+ user << "You emag the cover lock."
locked = 0
else
- user << "You fail to emag the cover lock."
+ user << "You fail to emag the cover lock!"
if(prob(25))
- src << "Hack attempt detected."
+ src << "Hack attempt detected."
else
- user << "The cover is already unlocked."
+ user << "The cover is already unlocked!"
return
if(opened)//Cover is open
if(emagged) return//Prevents the X has hit Y with Z message also you cant emag them twice
if(wiresexposed)
- user << "You must close the cover first"
+ user << "You must close the cover first!"
return
else
sleep(6)
@@ -570,7 +572,7 @@
SetLockdown(1) //Borgs were getting into trouble because they would attack the emagger before the new laws were shown
lawupdate = 0
connected_ai = null
- user << "You emag [src]'s interface."
+ user << "You emag [src]'s interface."
message_admins("[key_name_admin(user)] emagged cyborg [key_name_admin(src)]. Laws overridden.")
log_game("[key_name(user)] emagged cyborg [key_name(src)]. Laws overridden.")
clear_supplied_laws()
@@ -598,9 +600,9 @@
SetLockdown(0)
update_icons()
else
- user << "You fail to [ locked ? "unlock" : "lock"] [src]'s interface."
+ user << "You fail to [ locked ? "unlock" : "lock"] [src]'s interface!"
if(prob(25))
- src << "Hack attempt detected."
+ src << "ALERT: Hack attempt detected."
/mob/living/silicon/robot/verb/unlock_own_cover()
set category = "Robot Commands"
@@ -611,7 +613,7 @@
if("Yes")
locked = 0
update_icons()
- usr << "You unlock your cover."
+ usr << "You unlock your cover."
/mob/living/silicon/robot/attack_alien(mob/living/carbon/alien/humanoid/M as mob)
if (M.a_intent =="disarm")
@@ -665,7 +667,7 @@
cell.updateicon()
cell.add_fingerprint(user)
user.put_in_active_hand(cell)
- user << "You remove \the [cell]."
+ user << "You remove \the [cell]."
cell = null
update_icons()
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index 374bfa98088..0dd8e573b71 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -212,7 +212,8 @@
modules += new /obj/item/weapon/reagent_containers/food/condiment/enzyme(src)
modules += new /obj/item/weapon/pen(src)
modules += new /obj/item/weapon/razor(src)
- modules += new /obj/item/device/violin(src)
+ modules += new /obj/item/device/instrument/violin(src)
+ modules += new /obj/item/device/instrument/guitar(src)
var/obj/item/weapon/rsf/M = new /obj/item/weapon/rsf(src)
M.matter = 30
diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm
index 24bb007c3d2..82a7a0be1e9 100644
--- a/code/modules/mob/living/silicon/silicon.dm
+++ b/code/modules/mob/living/silicon/silicon.dm
@@ -389,7 +389,7 @@
/mob/living/silicon/attack_larva(mob/living/carbon/alien/larva/L)
if(L.a_intent == "help")
- visible_message("[L.name] rubs its head against [src].")
+ visible_message("[L.name] rubs its head against [src].")
return
/mob/living/silicon/attack_hulk(mob/living/carbon/human/user)
@@ -405,15 +405,15 @@
/mob/living/silicon/attack_hand(mob/living/carbon/human/M)
switch(M.a_intent)
if ("help")
- M.visible_message("[M] pets [src]!", \
- "You pet [src]!")
+ M.visible_message("[M] pets [src].", \
+ "You pet [src].")
if("grab")
grabbedby(M)
else
M.do_attack_animation(src)
playsound(src.loc, 'sound/effects/bang.ogg', 10, 1)
- visible_message("[M] punches [src], but doesn't leave a dent.", \
- "[M] punches [src], but doesn't leave a dent.!")
+ visible_message("[M] punches [src], but doesn't leave a dent.", \
+ "[M] punches [src], but doesn't leave a dent.")
return 0
/mob/living/silicon/adjustEarDamage()
diff --git a/code/modules/mob/living/simple_animal/ascendant_shadowling.dm b/code/modules/mob/living/simple_animal/ascendant_shadowling.dm
new file mode 100644
index 00000000000..9445db7592c
--- /dev/null
+++ b/code/modules/mob/living/simple_animal/ascendant_shadowling.dm
@@ -0,0 +1,33 @@
+/mob/living/simple_animal/ascendant_shadowling
+ name = "Ascendant Shadowling"
+ desc = "A large, floating eldritch horror. It has pulsing markings all about its body and large horns. It seems to be floating without any form of support."
+ icon = 'icons/mob/mob.dmi'
+ icon_state = "shadowling_ascended"
+ icon_living = "shadowling_ascended"
+ speak_emote = list("telepathically thunders", "telepathically booms")
+ force_threshold = INFINITY //Can't die by normal means
+ health = 100000
+ maxHealth = 100000
+ speed = 0
+ var/phasing = 0
+ see_in_dark = 8
+ see_invisible = SEE_INVISIBLE_MINIMUM
+
+ response_help = "stares at"
+ response_disarm = "flails at"
+ response_harm = "flails at"
+
+ harm_intent_damage = 0
+ melee_damage_lower = 35
+ melee_damage_upper = 35
+ attacktext = "claws at"
+ attack_sound = 'sound/weapons/slash.ogg'
+
+ minbodytemp = 0
+ maxbodytemp = INFINITY
+ environment_smash = 2
+
+ faction = list("faithless")
+
+/mob/living/simple_animal/ascendant_shadowling/Process_Spacemove(var/movement_dir = 0)
+ return 1 //copypasta from carp code
diff --git a/code/modules/mob/living/simple_animal/friendly/butterfly.dm b/code/modules/mob/living/simple_animal/friendly/butterfly.dm
index d361cfb978c..91595c5c13e 100644
--- a/code/modules/mob/living/simple_animal/friendly/butterfly.dm
+++ b/code/modules/mob/living/simple_animal/friendly/butterfly.dm
@@ -14,7 +14,8 @@
health = 2
harm_intent_damage = 1
friendly = "nudges"
- pass_flags = PASSTABLE
+ density = 0
+ pass_flags = PASSTABLE | PASSGRILLE | PASSMOB
ventcrawler = 2
mob_size = MOB_SIZE_TINY
diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm
index 8308bf698f8..4af47db2a9f 100644
--- a/code/modules/mob/living/simple_animal/friendly/cat.dm
+++ b/code/modules/mob/living/simple_animal/friendly/cat.dm
@@ -16,7 +16,7 @@
see_in_dark = 6
species = /mob/living/simple_animal/pet/cat
childtype = /mob/living/simple_animal/pet/cat/kitten
- meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
+ meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/slab
meat_amount = 3
response_help = "pets"
response_disarm = "gently pushes aside"
@@ -79,3 +79,6 @@
icon_living = "kitten"
icon_dead = "kitten_dead"
gender = NEUTER
+ density = 0
+ pass_flags = PASSMOB
+ mob_size = MOB_SIZE_SMALL
diff --git a/code/modules/mob/living/simple_animal/friendly/corgi.dm b/code/modules/mob/living/simple_animal/friendly/corgi.dm
index 4733bf988bb..29fbf497b7d 100644
--- a/code/modules/mob/living/simple_animal/friendly/corgi.dm
+++ b/code/modules/mob/living/simple_animal/friendly/corgi.dm
@@ -54,7 +54,7 @@
emote_see = list("shakes its head.", "shivers.")
speak_chance = 1
turns_per_move = 10
- meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/corgi
+ meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/corgi
meat_amount = 3
response_help = "pets"
response_disarm = "bops"
@@ -109,18 +109,18 @@
//helmet and armor = 100% protection
if( istype(inventory_head,/obj/item/clothing/head/helmet) && istype(inventory_back,/obj/item/clothing/suit/armor) )
if( O.force )
- user << "[src] is wearing too much armor. You can't cause \him any damage."
+ user << "[src] is wearing too much armor! You can't cause \him any damage."
visible_message(" [user] hits [src] with [O], however [src] is too armored.")
else
- user << "[src] is wearing too much armor. You can't reach \his skin."
- visible_message("[user] gently taps [src] with [O].")
+ user << "[src] is wearing too much armor! You can't reach \his skin."
+ visible_message("[user] gently taps [src] with [O].")
if(health>0 && prob(15))
emote("me", 1, "looks at [user] with [pick("an amused","an annoyed","a confused","a resentful", "a happy", "an excited")] expression.")
return
if(istype(O, /obj/item/weapon/newspaper))
if(!stat)
- user.visible_message("[user] baps [name] on the nose with the rolled up [O]")
+ user.visible_message("[user] baps [name] on the nose with the rolled up [O].")
spawn(0)
for(var/i in list(1,2,4,8,4,2,1,2))
dir = i
@@ -128,16 +128,19 @@
if (istype(O, /obj/item/weapon/razor))
if (shaved)
- user << "You can't shave this corgi, it's already been shaved."
+ user << "You can't shave this corgi, it's already been shaved!"
return
- user.visible_message("[user] starts to shave [src] using \the [O].")
+ user.visible_message("[user] starts to shave [src] using \the [O].", "You start to shave [src] using \the [O]...")
if(do_after(user, 50))
- user.visible_message("[user] shaves [src]'s hair using \the [O]. ")
+ user.visible_message("[user] shaves [src]'s hair using \the [O].")
playsound(loc, 'sound/items/Welder2.ogg', 20, 1)
shaved = 1
- icon_state = "[initial(icon_living)]_shaved"
icon_living = "[initial(icon_living)]_shaved"
icon_dead = "[initial(icon_living)]_shaved_dead"
+ if(stat == CONSCIOUS)
+ icon_state = icon_living
+ else
+ icon_state = icon_dead
return
..()
@@ -191,13 +194,13 @@
if("back")
if(inventory_back)
- usr << "It's already wearing something."
+ usr << "It's already wearing something!"
return
else
var/obj/item/item_to_add = usr.get_active_hand()
if(!item_to_add)
- usr.visible_message("[usr] pets [src]","You rest your hand on [src]'s back for a moment.")
+ usr.visible_message("[usr] pets [src].","You rest your hand on [src]'s back for a moment.")
return
if(istype(item_to_add,/obj/item/weapon/c4)) // last thing he ever wears, I guess
item_to_add.afterattack(src,usr,1)
@@ -206,7 +209,7 @@
//The objects that corgis can wear on their backs.
var/list/allowed_types = list(
/obj/item/clothing/suit/armor/vest,
- /obj/item/clothing/suit/space/deathsquad,
+ /obj/item/clothing/suit/space/hardsuit/deathsquad,
/obj/item/device/radio,
/obj/item/device/radio/off,
/obj/item/clothing/suit/cardborg,
@@ -216,9 +219,9 @@
)
if( ! ( item_to_add.type in allowed_types ) )
- usr << "You set [item_to_add] on [src]'s back, but \he shakes it off!"
+ usr << "You set [item_to_add] on [src]'s back, but \he shakes it off!"
if(!usr.drop_item())
- usr << "\The [item_to_add] is stuck to your hand, you cannot put it on [src]'s back!"
+ usr << "\The [item_to_add] is stuck to your hand, you cannot put it on [src]'s back!"
return
item_to_add.loc = loc
if(prob(25))
@@ -247,10 +250,10 @@
return
if(inventory_head)
- if(user) user << "You can't put more than one hat on [src]!"
+ if(user) user << "You can't put more than one hat on [src]!"
return
if(!item_to_add)
- user.visible_message("[user] pets [src]","You rest your hand on [src]'s head for a moment.")
+ user.visible_message("[user] pets [src].","You rest your hand on [src]'s head for a moment.")
return
@@ -382,30 +385,30 @@
desc = "Can actually be trusted to not run off on his own."
valid = 1
- if(/obj/item/clothing/head/helmet/space/deathsquad)
+ if(/obj/item/clothing/head/helmet/space/hardsuit/deathsquad)
name = "Trooper [real_name]"
desc = "That's not red paint. That's real corgi blood."
valid = 1
if(valid)
if(user && !user.drop_item())
- user << "\The [item_to_add] is stuck to your hand, you cannot put it on [src]'s head!"
+ user << "\The [item_to_add] is stuck to your hand, you cannot put it on [src]'s head!"
return 0
if(health <= 0)
user << "There is merely a dull, lifeless look in [real_name]'s eyes as you put the [item_to_add] on \him."
else if(user)
user.visible_message("[user] puts [item_to_add] on [real_name]'s head. [src] looks at [user] and barks once.",
- "You put [item_to_add] on [real_name]'s head. [src] gives you a peculiar look, then wags \his tail once and barks.",
- "You hear a friendly-sounding bark.")
+ "You put [item_to_add] on [real_name]'s head. [src] gives you a peculiar look, then wags \his tail once and barks.",
+ "You hear a friendly-sounding bark.")
item_to_add.loc = src
src.inventory_head = item_to_add
regenerate_icons()
else
if(user && !user.drop_item())
- user << "\The [item_to_add] is stuck to your hand, you cannot put it on [src]'s head!"
+ user << "\The [item_to_add] is stuck to your hand, you cannot put it on [src]'s head!"
return 0
- user << "You set [item_to_add] on [src]'s head, but \he shakes it off!"
+ user << "You set [item_to_add] on [src]'s head, but \he shakes it off!"
item_to_add.loc = loc
if(prob(25))
step_rand(item_to_add)
@@ -525,11 +528,14 @@
icon_living = "puppy"
icon_dead = "puppy_dead"
shaved = 0
+ density = 0
+ pass_flags = PASSMOB
+ mob_size = MOB_SIZE_SMALL
//puppies cannot wear anything.
/mob/living/simple_animal/pet/corgi/puppy/Topic(href, href_list)
if(href_list["remove_inv"] || href_list["add_inv"])
- usr << "You can't fit this on [src]"
+ usr << "You can't fit this on [src]!"
return
..()
diff --git a/code/modules/mob/living/simple_animal/friendly/crab.dm b/code/modules/mob/living/simple_animal/friendly/crab.dm
index e4a1f52301c..752b939055a 100644
--- a/code/modules/mob/living/simple_animal/friendly/crab.dm
+++ b/code/modules/mob/living/simple_animal/friendly/crab.dm
@@ -10,7 +10,7 @@
emote_see = list("clacks")
speak_chance = 1
turns_per_move = 5
- meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
+ meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/slab
meat_amount = 2
response_help = "pets"
response_disarm = "gently pushes aside"
diff --git a/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm b/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm
index 6b7f731e675..713710173f4 100644
--- a/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm
+++ b/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm
@@ -23,6 +23,7 @@
wander = 0
speed = 0
ventcrawler = 2
+ density = 0
pass_flags = PASSTABLE | PASSMOB
sight = (SEE_TURFS | SEE_OBJS)
status_flags = (CANPUSH | CANSTUN | CANWEAKEN)
diff --git a/code/modules/mob/living/simple_animal/friendly/drone/interaction.dm b/code/modules/mob/living/simple_animal/friendly/drone/interaction.dm
index d5d8cf19f5c..61ffbe0eecf 100644
--- a/code/modules/mob/living/simple_animal/friendly/drone/interaction.dm
+++ b/code/modules/mob/living/simple_animal/friendly/drone/interaction.dm
@@ -30,34 +30,34 @@
"can't tell if their ethernet detour is moving or not", "won't be able to reseed enough"+\
" kernels to function properly","can't start their neurotube console")
- D << "You can't seem to find the [pick(faux_gadgets)]. Without it, [src] [pick(faux_problems)]."
+ D << "You can't seem to find the [pick(faux_gadgets)]! Without it, [src] [pick(faux_problems)]."
return
- D.visible_message("[D] begins to reactivate [src].")
+ D.visible_message("[D] begins to reactivate [src].", "You begin to reactivate [src]...")
if(do_after(user,30,needhand = 1))
health = health_repair_max
stat = CONSCIOUS
icon_state = icon_living
dead_mob_list -= src
living_mob_list += src
- D.visible_message("[D] reactivates [src]!")
+ D.visible_message("[D] reactivates [src]!", "You reactivate [src].")
alert_drones(DRONE_NET_CONNECT)
if(G)
G << "DRONE NETWORK: You were reactivated by [D]!"
else
- D << "You need to remain still to reactivate [src]."
+ D << "You need to remain still to reactivate [src]!"
if("Cannibalize")
if(D.health < D.maxHealth)
- D.visible_message("[D] begins to cannibalize parts from [src].")
+ D.visible_message("[D] begins to cannibalize parts from [src].", "You begin to cannibalize parts from [src]...")
if(do_after(D, 60,5,0))
- D.visible_message("[D] repairs itself using [src]'s remains!")
+ D.visible_message("[D] repairs itself using [src]'s remains!", "You repair yourself using [src]'s remains.")
D.adjustBruteLoss(-src.maxHealth)
new /obj/effect/decal/cleanable/oil/streak(get_turf(src))
qdel(src)
else
- D << "You need to remain still to cannibalize [src]."
+ D << "You need to remain still to cannibalize [src]!"
else
- D << "You're already in perfect condition!"
+ D << "You're already in perfect condition!"
if("Nothing")
return
@@ -69,9 +69,9 @@
..()
return
if(user.get_active_hand())
- user << "Your hands are full."
+ user << "Your hands are full!"
return
- src << "[user] is trying to pick you up!"
+ src << "[user] is trying to pick you up!"
if(buckled)
user << "[src] is buckled to the [buckled.name] and cannot be picked up!"
return
@@ -92,15 +92,15 @@
/mob/living/simple_animal/drone/attackby(obj/item/I, mob/user)
if(istype(I, /obj/item/weapon/screwdriver) && stat != DEAD)
if(health < health_repair_max)
- user << "You start to tighten loose screws on [src]."
+ user << "You start to tighten loose screws on [src]..."
if(do_after(user,80))
var/repair = health_repair_max - health
adjustBruteLoss(-repair)
- visible_message("[user] tightens [src == user ? "their" : "[src]'s"] loose screws!")
+ visible_message("[user] tightens [src == user ? "their" : "[src]'s"] loose screws!", "You tighten [src == user ? "their" : "[src]'s"] loose screws.")
else
- user << "You need to remain still to tighten [src]'s screws."
+ user << "You need to remain still to tighten [src]'s screws!"
else
- user << "[src]'s screws can't get any tighter!"
+ user << "[src]'s screws can't get any tighter!"
else
..()
diff --git a/code/modules/mob/living/simple_animal/friendly/drone/verbs.dm b/code/modules/mob/living/simple_animal/friendly/drone/verbs.dm
index cd5f65f9274..754f75632f2 100644
--- a/code/modules/mob/living/simple_animal/friendly/drone/verbs.dm
+++ b/code/modules/mob/living/simple_animal/friendly/drone/verbs.dm
@@ -22,7 +22,7 @@
light_on = !light_on
- src << "Your light is now [light_on ? "on" : "off"]"
+ src << "Your light is now [light_on ? "on" : "off"]."
/mob/living/simple_animal/drone/verb/drone_ping()
set category = "Drone"
@@ -43,7 +43,7 @@
set category = "Drone"
if(!seeStatic)
- src << "You have no vision filter to change!"
+ src << "You have no vision filter to change!"
return
var/selectedStatic = input("Select a vision filter", "Vision Filter") as null|anything in staticChoices
diff --git a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
index 6fd0862b09d..22a7e584ac6 100644
--- a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
+++ b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
@@ -12,7 +12,7 @@
speak_chance = 1
turns_per_move = 5
see_in_dark = 6
- meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
+ meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/slab
meat_amount = 4
response_help = "pets"
response_disarm = "gently pushes aside"
@@ -74,13 +74,13 @@
/mob/living/simple_animal/hostile/retaliate/goat/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
if(stat == CONSCIOUS && istype(O, /obj/item/weapon/reagent_containers/glass))
- user.visible_message("[user] milks [src] using \the [O].")
+ user.visible_message("[user] milks [src] using \the [O].", "You milk [src] using \the [O].")
var/obj/item/weapon/reagent_containers/glass/G = O
var/transfered = udder.trans_id_to(G, "milk", rand(5,10))
if(G.reagents.total_volume >= G.volume)
- user << "[O] is full."
+ user << "[O] is full!"
if(!transfered)
- user << "The udder is dry. Wait a bit longer..."
+ user << "The udder is dry! Wait a bit longer..."
else
..()
//cow
@@ -98,7 +98,7 @@
speak_chance = 1
turns_per_move = 5
see_in_dark = 6
- meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
+ meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/slab
meat_amount = 6
response_help = "pets"
response_disarm = "gently pushes aside"
@@ -115,7 +115,7 @@
/mob/living/simple_animal/cow/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
if(stat == CONSCIOUS && istype(O, /obj/item/weapon/reagent_containers/glass))
- user.visible_message("[user] milks [src] using \the [O].")
+ user.visible_message("[user] milks [src] using \the [O].", "You milk [src] using \the [O].")
var/obj/item/weapon/reagent_containers/glass/G = O
var/transfered = udder.trans_id_to(G, "milk", rand(5,10))
if(G.reagents.total_volume >= G.volume)
@@ -158,9 +158,10 @@
speak_emote = list("cheeps")
emote_hear = list("cheeps")
emote_see = list("pecks at the ground","flaps its tiny wings")
+ density = 0
speak_chance = 2
turns_per_move = 2
- meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
+ meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/slab
meat_amount = 1
response_help = "pets"
response_disarm = "gently pushes aside"
@@ -169,7 +170,7 @@
health = 1
ventcrawler = 2
var/amount_grown = 0
- pass_flags = PASSTABLE | PASSGRILLE
+ pass_flags = PASSTABLE | PASSGRILLE | PASSMOB
mob_size = MOB_SIZE_TINY
/mob/living/simple_animal/chick/New()
@@ -200,9 +201,10 @@ var/global/chicken_count = 0
speak_emote = list("clucks","croons")
emote_hear = list("clucks")
emote_see = list("pecks at the ground","flaps its wings viciously")
+ density = 0
speak_chance = 2
turns_per_move = 3
- meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
+ meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/slab
var/egg_type = /obj/item/weapon/reagent_containers/food/snacks/egg
var/food_type = /obj/item/weapon/reagent_containers/food/snacks/grown/wheat
meat_amount = 2
@@ -216,7 +218,8 @@ var/global/chicken_count = 0
var/eggsFertile = TRUE
var/body_color
var/icon_prefix = "chicken"
- pass_flags = PASSTABLE
+ pass_flags = PASSTABLE | PASSMOB
+ mob_size = MOB_SIZE_SMALL
var/list/feedMessages = list("It clucks happily.","It clucks happily.")
var/list/layMessage = list("lays an egg.","squats down and croons.","begins making a huge racket.","begins clucking raucously.")
var/list/validColors = list("brown","black","white")
@@ -239,14 +242,14 @@ var/global/chicken_count = 0
/mob/living/simple_animal/chicken/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
if(istype(O, food_type)) //feedin' dem chickens
if(!stat && eggsleft < 8)
- var/feedmsg = "[user] feeds [O] to [name]! [pick(feedMessages)]"
+ var/feedmsg = "[user] feeds [O] to [name]! [pick(feedMessages)]"
user.visible_message(feedmsg)
user.drop_item()
qdel(O)
eggsleft += rand(1, 4)
//world << eggsleft
else
- user << "[name] doesn't seem hungry!"
+ user << "[name] doesn't seem hungry!"
else
..()
diff --git a/code/modules/mob/living/simple_animal/friendly/fox.dm b/code/modules/mob/living/simple_animal/friendly/fox.dm
index d9322aa283d..b02ff8415f5 100644
--- a/code/modules/mob/living/simple_animal/friendly/fox.dm
+++ b/code/modules/mob/living/simple_animal/friendly/fox.dm
@@ -13,7 +13,7 @@
speak_chance = 1
turns_per_move = 5
see_in_dark = 6
- meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
+ meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/slab
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "kicks"
diff --git a/code/modules/mob/living/simple_animal/friendly/lizard.dm b/code/modules/mob/living/simple_animal/friendly/lizard.dm
index 68b8702a403..b03101df7f1 100644
--- a/code/modules/mob/living/simple_animal/friendly/lizard.dm
+++ b/code/modules/mob/living/simple_animal/friendly/lizard.dm
@@ -15,4 +15,6 @@
response_disarm = "shoos"
response_harm = "stomps on"
ventcrawler = 2
- mob_size = MOB_SIZE_TINY
\ No newline at end of file
+ density = 0
+ pass_flags = PASSTABLE | PASSMOB
+ mob_size = MOB_SIZE_SMALL
diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm
index ad493cebe4c..d2de3523fdd 100644
--- a/code/modules/mob/living/simple_animal/friendly/mouse.dm
+++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm
@@ -13,14 +13,14 @@
see_in_dark = 6
maxHealth = 5
health = 5
- meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
+ meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/slab
meat_amount = 1
response_help = "pets"
response_disarm = "gently pushes aside"
response_harm = "splats"
density = 0
ventcrawler = 2
- pass_flags = PASSTABLE | PASSGRILLE
+ pass_flags = PASSTABLE | PASSGRILLE | PASSMOB
mob_size = MOB_SIZE_TINY
var/body_color //brown, gray and white, leave blank for random
diff --git a/code/modules/mob/living/simple_animal/friendly/pug.dm b/code/modules/mob/living/simple_animal/friendly/pug.dm
index 5d0359f7478..1086486142d 100644
--- a/code/modules/mob/living/simple_animal/friendly/pug.dm
+++ b/code/modules/mob/living/simple_animal/friendly/pug.dm
@@ -12,7 +12,7 @@
emote_see = list("shakes its head.", "chases its tail.","shivers.")
speak_chance = 1
turns_per_move = 10
- meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/pug
+ meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/pug
meat_amount = 3
response_help = "pets"
response_disarm = "bops"
@@ -33,7 +33,7 @@
/mob/living/simple_animal/pet/pug/attackby(var/obj/item/O as obj, var/mob/user as mob, params) //Marker -Agouri
if(istype(O, /obj/item/weapon/newspaper))
if(!stat)
- user.visible_message("[user] baps [name] on the nose with the rolled up [O]")
+ user.visible_message("[user] baps [name] on the nose with the rolled up [O].")
spawn(0)
for(var/i in list(1,2,4,8,4,2,1,2))
dir = i
diff --git a/code/modules/mob/living/simple_animal/hostile/alien.dm b/code/modules/mob/living/simple_animal/hostile/alien.dm
index 0af9b62a638..49ac9d74de1 100644
--- a/code/modules/mob/living/simple_animal/hostile/alien.dm
+++ b/code/modules/mob/living/simple_animal/hostile/alien.dm
@@ -10,7 +10,7 @@
response_disarm = "shoves"
response_harm = "hits"
speed = 0
- meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/xeno
+ meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/xeno
skin_type = /obj/item/stack/sheet/animalhide/xeno
meat_amount = 3
maxHealth = 100
@@ -19,6 +19,7 @@
melee_damage_lower = 25
melee_damage_upper = 25
attacktext = "slashes"
+ speak_emote = list("hisses")
a_intent = "harm"
attack_sound = 'sound/weapons/bladeslice.ogg'
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
diff --git a/code/modules/mob/living/simple_animal/hostile/bear.dm b/code/modules/mob/living/simple_animal/hostile/bear.dm
index 37b2624f63b..47e4f317b8d 100644
--- a/code/modules/mob/living/simple_animal/hostile/bear.dm
+++ b/code/modules/mob/living/simple_animal/hostile/bear.dm
@@ -13,7 +13,7 @@
speak_chance = 1
turns_per_move = 5
see_in_dark = 6
- meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/bear
+ meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/bear
meat_amount = 3
response_help = "pets"
response_disarm = "gently pushes aside"
diff --git a/code/modules/mob/living/simple_animal/hostile/bees.dm b/code/modules/mob/living/simple_animal/hostile/bees.dm
index a59a31517af..a1a0cd68c9f 100644
--- a/code/modules/mob/living/simple_animal/hostile/bees.dm
+++ b/code/modules/mob/living/simple_animal/hostile/bees.dm
@@ -18,7 +18,8 @@
move_to_delay = 0
environment_smash = 0
mouse_opacity = 2
- pass_flags = PASSTABLE
+ pass_flags = PASSTABLE | PASSGRILLE | PASSMOB
+ mob_size = MOB_SIZE_SMALL
flying = 1
//Spaceborn beings don't get hurt by space
diff --git a/code/modules/mob/living/simple_animal/hostile/carp.dm b/code/modules/mob/living/simple_animal/hostile/carp.dm
index 27a71e7d037..243159ff767 100644
--- a/code/modules/mob/living/simple_animal/hostile/carp.dm
+++ b/code/modules/mob/living/simple_animal/hostile/carp.dm
@@ -21,6 +21,7 @@
melee_damage_upper = 15
attacktext = "bites"
attack_sound = 'sound/weapons/bite.ogg'
+ speak_emote = list("gnashes")
//Space carp aren't affected by cold.
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
diff --git a/code/modules/mob/living/simple_animal/hostile/creature.dm b/code/modules/mob/living/simple_animal/hostile/creature.dm
index f9477069a5a..173d8ff913f 100644
--- a/code/modules/mob/living/simple_animal/hostile/creature.dm
+++ b/code/modules/mob/living/simple_animal/hostile/creature.dm
@@ -12,4 +12,5 @@
attacktext = "chomps"
attack_sound = 'sound/weapons/bite.ogg'
faction = list("creature")
+ speak_emote = list("screams")
diff --git a/code/modules/mob/living/simple_animal/hostile/eyeballs.dm b/code/modules/mob/living/simple_animal/hostile/eyeballs.dm
index 84886c63dae..3ca8816a3b1 100644
--- a/code/modules/mob/living/simple_animal/hostile/eyeballs.dm
+++ b/code/modules/mob/living/simple_animal/hostile/eyeballs.dm
@@ -13,6 +13,7 @@
response_harm = "hits"
maxHealth = 45
health = 45
+ speak_emote = list("telepathically cries")
harm_intent_damage = 15
melee_damage_lower = 20
diff --git a/code/modules/mob/living/simple_animal/hostile/faithless.dm b/code/modules/mob/living/simple_animal/hostile/faithless.dm
index aa8912cb618..e80f1899294 100644
--- a/code/modules/mob/living/simple_animal/hostile/faithless.dm
+++ b/code/modules/mob/living/simple_animal/hostile/faithless.dm
@@ -18,6 +18,7 @@
melee_damage_upper = 15
attacktext = "grips"
attack_sound = 'sound/hallucinations/growl1.ogg'
+ speak_emote = list("growls")
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
diff --git a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
index 649059d093b..750e20450f8 100644
--- a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
+++ b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
@@ -33,7 +33,7 @@
speak_chance = 5
turns_per_move = 5
see_in_dark = 10
- meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/spider
+ meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/spider
meat_amount = 2
response_help = "pets"
response_disarm = "gently pushes aside"
@@ -97,7 +97,7 @@
// Chops off each leg with a 50/50 chance of harvesting one, until finally calling
// default harvest action
-/mob/living/simple_animal/hostile/poison/giant_spider/harvest()
+/mob/living/simple_animal/hostile/poison/giant_spider/harvest(mob/living/user, sharpness = 1)
if(butcher_state > 0)
butcher_state--
icon_state = icon_dead + "[butcher_state]"
@@ -245,7 +245,7 @@
var/obj/effect/spider/eggcluster/E = locate() in get_turf(src)
if(E)
- src << "There is already a cluster of eggs here!"
+ src << "There is already a cluster of eggs here!"
else if(!fed)
src << "You are too hungry to do this!"
else if(busy != LAYING_EGGS)
diff --git a/code/modules/mob/living/simple_animal/hostile/headcrab.dm b/code/modules/mob/living/simple_animal/hostile/headcrab.dm
index 4065fcfe198..8df6b5460fc 100644
--- a/code/modules/mob/living/simple_animal/hostile/headcrab.dm
+++ b/code/modules/mob/living/simple_animal/hostile/headcrab.dm
@@ -16,20 +16,32 @@
robust_searching = 1
stat_attack = 2
environment_smash = 0
+ speak_emote = list("squeaks")
+ ventcrawler = 2
var/datum/mind/origin
+ var/egg_lain = 0
/mob/living/simple_animal/hostile/headcrab/proc/Infect(var/mob/living/carbon/human/victim)
var/obj/item/body_egg/changeling_egg/egg = new(victim)
- egg.owner = origin
+ if(origin)
+ egg.owner = origin
+ else if(mind) // Let's make this a feature
+ egg.owner = mind
victim.internal_organs += egg
- visible_message("[src] lays an egg in a [victim]!")
+ visible_message("[src] lays an egg in a [victim].")
+ egg_lain = 1
/mob/living/simple_animal/hostile/headcrab/AttackingTarget()
+ if(egg_lain)
+ target.attack_animal(src)
+ return
if(ishuman(target))
var/mob/living/carbon/human/H = target
if(H.stat == DEAD)
Infect(target)
- death()
+ src << "With your egg laid you feel your death rapidly approaching, time to die..."
+ spawn(100)
+ death()
return
target.attack_animal(src)
@@ -41,6 +53,7 @@
desc = "Twitching and disgusting"
var/datum/mind/owner
var/time
+ var/used
/obj/item/body_egg/changeling_egg/egg_process()
//Changeling eggs grow in dead people
@@ -49,11 +62,17 @@
Pop()
obj/item/body_egg/changeling_egg/proc/Pop()
- var/mob/living/carbon/monkey/M = new(affected_mob.loc)
- owner.transfer_to(M)
- owner.changeling.purchasedpowers += new /obj/effect/proc_holder/changeling/humanform(null)
- M.key = owner.key
- affected_mob.gib()
+ if(!used)
+ var/mob/living/carbon/monkey/M = new(affected_mob.loc)
+ if(owner)
+ owner.transfer_to(M)
+ owner.changeling.purchasedpowers += new /obj/effect/proc_holder/changeling/humanform(null)
+ M.key = owner.key
+ if(ishuman(affected_mob))
+ var/mob/living/carbon/human/H = affected_mob
+ H.internal_organs.Remove(src)
+ affected_mob.gib()
+ used = 1
qdel(src)
#undef EGG_INCUBATION_TIME
diff --git a/code/modules/mob/living/simple_animal/hostile/hivebot.dm b/code/modules/mob/living/simple_animal/hostile/hivebot.dm
index 1d19f738c5e..eebd7efb44a 100644
--- a/code/modules/mob/living/simple_animal/hostile/hivebot.dm
+++ b/code/modules/mob/living/simple_animal/hostile/hivebot.dm
@@ -20,6 +20,7 @@
faction = list("hivebot")
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
+ speak_emote = list("states")
/mob/living/simple_animal/hostile/hivebot/range
name = "hivebot"
diff --git a/code/modules/mob/living/simple_animal/hostile/killertomato.dm b/code/modules/mob/living/simple_animal/hostile/killertomato.dm
index 94dd5acea78..cea4a9d31bd 100644
--- a/code/modules/mob/living/simple_animal/hostile/killertomato.dm
+++ b/code/modules/mob/living/simple_animal/hostile/killertomato.dm
@@ -9,7 +9,7 @@
maxHealth = 30
health = 30
see_in_dark = 3
- meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/killertomato
+ meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/killertomato
meat_amount = 1
response_help = "prods"
response_disarm = "pushes aside"
diff --git a/code/modules/mob/living/simple_animal/hostile/mimic.dm b/code/modules/mob/living/simple_animal/hostile/mimic.dm
index d9759e6c39d..869100f6e94 100644
--- a/code/modules/mob/living/simple_animal/hostile/mimic.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mimic.dm
@@ -5,7 +5,7 @@
/mob/living/simple_animal/hostile/mimic
name = "crate"
desc = "A rectangular steel crate."
- icon = 'icons/obj/storage.dmi'
+ icon = 'icons/obj/crates.dmi'
icon_state = "crate"
icon_living = "crate"
@@ -22,6 +22,7 @@
attacktext = "attacks"
attack_sound = 'sound/weapons/punch1.ogg'
var/Attackemote = "growls at"
+ speak_emote = list("creaks")
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
@@ -36,7 +37,7 @@
/mob/living/simple_animal/hostile/mimic/death()
..(1)
- visible_message("[src] stops moving!")
+ visible_message("[src] stops moving!")
ghostize()
qdel(src)
@@ -51,6 +52,7 @@
/mob/living/simple_animal/hostile/mimic/crate
attacktext = "bites"
+ speak_emote = list("clatters")
stop_automated_movement = 1
wander = 0
@@ -172,6 +174,7 @@ var/global/list/protected_objects = list(/obj/structure/table, /obj/structure/ca
icon = O.icon
icon_state = O.icon_state
icon_living = icon_state
+ overlays = O.overlays
if(istype(O, /obj/structure) || istype(O, /obj/machinery))
health = (anchored * 50) + 50
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
index cfc5730e7b7..de377488aeb 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
@@ -66,6 +66,7 @@
melee_damage_upper = 12
attacktext = "bites into"
a_intent = "harm"
+ speak_emote = list("chitters")
attack_sound = 'sound/weapons/bladeslice.ogg'
ranged_cooldown_cap = 4
aggro_vision_range = 9
@@ -131,6 +132,7 @@
attacktext = "barrels into"
attack_sound = 'sound/weapons/punch1.ogg'
a_intent = "help"
+ speak_emote = list("screeches")
throw_message = "sinks in slowly, before being pushed out of "
status_flags = CANPUSH
search_objects = 1
@@ -230,6 +232,7 @@
melee_damage_lower = 0
melee_damage_upper = 0
attacktext = "lashes out at"
+ speak_emote = list("telepathically cries")
attack_sound = 'sound/weapons/pierce.ogg'
throw_message = "falls right through the strange body of the"
ranged_cooldown = 0
@@ -257,7 +260,7 @@
/obj/item/asteroid/hivelord_core
name = "hivelord remains"
desc = "All that remains of a hivelord, it seems to be what allows it to break pieces of itself off without being hurt... its healing properties will soon become inert if not used quickly. Try not to think about what you're eating."
- icon = 'icons/obj/food.dmi'
+ icon = 'icons/obj/food/food.dmi'
icon_state = "boiledrorocore"
var/inert = 0
@@ -277,7 +280,7 @@
user << "[src] are useless on the dead."
return
if(H != user)
- H.visible_message("[user] forces [H] to eat [src]... they quickly regenerate all injuries!")
+ H.visible_message("[user] forces [H] to eat [src]... they quickly regenerate all injuries!")
else
user << "You chomp into [src], barely managing to hold it down, but feel amazingly refreshed in mere moments."
playsound(src.loc,'sound/items/eatfood.ogg', rand(10,50), 1)
@@ -305,6 +308,7 @@
melee_damage_lower = 2
melee_damage_upper = 2
attacktext = "slashes"
+ speak_emote = list("telepathically cries")
attack_sound = 'sound/weapons/pierce.ogg'
throw_message = "falls right through the strange body of the"
environment_smash = 0
@@ -334,6 +338,7 @@
ranged_cooldown = 2 //By default, start the Goliath with his cooldown off so that people can run away quickly on first sight
ranged_cooldown_cap = 8
friendly = "wails at"
+ speak_emote = list("bellows")
vision_range = 4
speed = 3
maxHealth = 300
@@ -456,7 +461,7 @@
user << "You strengthen [target], improving its resistance against melee attacks."
qdel(src)
else
- user << "You can't improve [C] any further."
+ user << "You can't improve [C] any further!"
return
if(istype(target, /obj/mecha/working/ripley))
var/obj/mecha/D = target
@@ -478,9 +483,9 @@
D.overlays += image("icon"="mecha.dmi", "icon_state"="ripley-g-full-open")
D.desc = "Autonomous Power Loader Unit. It's wearing a fearsome carapace entirely composed of goliath hide plates - the pilot must be an experienced monster hunter."
else
- user << "You can't add armour onto the mech while someone is inside!"
+ user << "You can't add armour onto the mech while someone is inside!"
else
- user << "You can't improve [D] any further."
+ user << "You can't improve [D] any further!"
return
/mob/living/simple_animal/hostile/asteroid/handle_temperature_damage()
diff --git a/code/modules/mob/living/simple_animal/hostile/mushroom.dm b/code/modules/mob/living/simple_animal/hostile/mushroom.dm
index fcfb32ecf65..f75f91096a1 100644
--- a/code/modules/mob/living/simple_animal/hostile/mushroom.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mushroom.dm
@@ -26,6 +26,7 @@
speed = 1
ventcrawler = 2
robust_searching = 1
+ speak_emote = list("squeaks")
var/powerlevel = 0 //Tracks our general strength level gained from eating other shrooms
var/bruised = 0 //If someone tries to cheat the system by attacking a shroom to lower its health, punish them so that it wont award levels to shrooms that eat it
var/recovery_cooldown = 0 //So you can't repeatedly revive it during a fight
@@ -70,10 +71,10 @@
if(istype(L, /mob/living/simple_animal/hostile/mushroom) && stat == DEAD)
var/mob/living/simple_animal/hostile/mushroom/M = L
if(faint_ticker < 2)
- M.visible_message("[M] chews a bit on [src].")
+ M.visible_message("[M] chews a bit on [src].")
faint_ticker++
return
- M.visible_message("[M] devours [src]!")
+ M.visible_message("[M] devours [src]!")
var/level_gain = (powerlevel - M.powerlevel)
if(level_gain >= -1 && !bruised && !M.ckey)//Player shrooms can't level up to become robust gods.
if(level_gain < 1)//So we still gain a level if two mushrooms were the same level
@@ -90,7 +91,7 @@
/mob/living/simple_animal/hostile/mushroom/death(gibbed)
if(!gibbed)
- visible_message("[src] fainted.")
+ visible_message("[src] fainted.")
..(gibbed)
UpdateMushroomCap()
@@ -102,7 +103,7 @@
overlays += cap_living
/mob/living/simple_animal/hostile/mushroom/proc/Recover()
- visible_message("[src] slowly begins to recover.")
+ visible_message("[src] slowly begins to recover.")
faint_ticker = 0
revive()
UpdateMushroomCap()
@@ -122,7 +123,7 @@
/mob/living/simple_animal/hostile/mushroom/proc/Bruise()
if(!bruised && !stat)
- src.visible_message("The [src.name] was bruised!")
+ src.visible_message("The [src.name] was bruised!")
bruised = 1
/mob/living/simple_animal/hostile/mushroom/attackby(obj/item/I as obj, mob/user as mob, params)
@@ -131,7 +132,7 @@
Recover()
qdel(I)
else
- user << "[src] won't eat it!"
+ user << "[src] won't eat it!"
return
if(I.force)
Bruise()
diff --git a/code/modules/mob/living/simple_animal/hostile/pirate.dm b/code/modules/mob/living/simple_animal/hostile/pirate.dm
index f707265c255..fa9a2164d9b 100644
--- a/code/modules/mob/living/simple_animal/hostile/pirate.dm
+++ b/code/modules/mob/living/simple_animal/hostile/pirate.dm
@@ -21,6 +21,7 @@
atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0)
unsuitable_atmos_damage = 15
+ speak_emote = list("yarrs")
var/corpse = /obj/effect/landmark/mobcorpse/pirate
var/weapon1 = /obj/item/weapon/melee/energy/sword/pirate
@@ -43,7 +44,7 @@
/mob/living/simple_animal/hostile/pirate/death()
..(1)
- visible_message("[src] stops moving.")
+ visible_message("[src] stops moving.")
if(corpse)
new corpse (src.loc)
if(weapon1)
diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/bat.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/bat.dm
index ab47c8992bc..2e45befbe40 100644
--- a/code/modules/mob/living/simple_animal/hostile/retaliate/bat.dm
+++ b/code/modules/mob/living/simple_animal/hostile/retaliate/bat.dm
@@ -24,6 +24,7 @@
ventcrawler = 2
mob_size = MOB_SIZE_TINY
flying = 1
+ speak_emote = list("squeaks")
var/max_co2 = 0 //to be removed once metastation map no longer use those for Sgt Araneus
var/min_oxy = 0
var/max_tox = 0
diff --git a/code/modules/mob/living/simple_animal/hostile/russian.dm b/code/modules/mob/living/simple_animal/hostile/russian.dm
index c9ef9685534..64796ad7e99 100644
--- a/code/modules/mob/living/simple_animal/hostile/russian.dm
+++ b/code/modules/mob/living/simple_animal/hostile/russian.dm
@@ -46,7 +46,7 @@
/mob/living/simple_animal/hostile/russian/death(gibbed)
..(1)
- visible_message("[src] stops moving.")
+ visible_message("[src] stops moving.")
if(corpse)
new corpse (src.loc)
if(weapon1)
diff --git a/code/modules/mob/living/simple_animal/hostile/syndicate.dm b/code/modules/mob/living/simple_animal/hostile/syndicate.dm
index 66fc43acd76..d01462502f6 100644
--- a/code/modules/mob/living/simple_animal/hostile/syndicate.dm
+++ b/code/modules/mob/living/simple_animal/hostile/syndicate.dm
@@ -63,8 +63,8 @@
visible_message("[src] blocks [O] with its shield!")
playsound(loc, O.hitsound, 25, 1, -1)
else
- usr << "This weapon is ineffective, it does no damage."
- visible_message("[user] gently taps [src] with [O].")
+ usr << "This weapon is ineffective, it does no damage!"
+ visible_message("[user] gently taps [src] with [O].")
/mob/living/simple_animal/hostile/syndicate/melee/bullet_act(var/obj/item/projectile/Proj)
@@ -133,6 +133,7 @@
minbodytemp = 0
mob_size = MOB_SIZE_TINY
flying
+ speak_emote = list("states")
/mob/living/simple_animal/hostile/viscerator/death(gibbed)
..(gibbed)
diff --git a/code/modules/mob/living/simple_animal/hostile/tree.dm b/code/modules/mob/living/simple_animal/hostile/tree.dm
index 79edd57a33f..2643fcc9964 100644
--- a/code/modules/mob/living/simple_animal/hostile/tree.dm
+++ b/code/modules/mob/living/simple_animal/hostile/tree.dm
@@ -23,6 +23,7 @@
melee_damage_upper = 12
attacktext = "bites"
attack_sound = 'sound/weapons/bite.ogg'
+ speak_emote = list("pines")
//Space carp aren't affected by atmos.
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
@@ -59,4 +60,5 @@
icon_dead = "festivus_pole"
icon_gib = "festivus_pole"
drop_type = /obj/item/stack/rods
+ speak_emote = list("polls")
diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm
index 83590e4bc90..939a4a2e942 100644
--- a/code/modules/mob/living/simple_animal/parrot.dm
+++ b/code/modules/mob/living/simple_animal/parrot.dm
@@ -33,7 +33,8 @@
icon_state = "parrot_fly"
icon_living = "parrot_fly"
icon_dead = "parrot_dead"
- pass_flags = PASSTABLE
+ density = 0
+ pass_flags = PASSTABLE | PASSMOB
speak = list("Hi!","Hello!","Cracker?","BAWWWWK george mellons griffing me!")
speak_emote = list("squawks","says","yells")
@@ -203,19 +204,19 @@
if(copytext(possible_phrase,1,3) in department_radio_keys)
possible_phrase = copytext(possible_phrase,3)
else
- usr << "There is nothing to remove from its [remove_from]."
+ usr << "There is nothing to remove from its [remove_from]!"
return
//Adding things to inventory
else if(href_list["add_inv"])
var/add_to = href_list["add_inv"]
if(!usr.get_active_hand())
- usr << "You have nothing in your hand to put on its [add_to]."
+ usr << "You have nothing in your hand to put on its [add_to]!"
return
switch(add_to)
if("ears")
if(ears)
- usr << "It's already wearing something."
+ usr << "It's already wearing something!"
return
else
var/obj/item/item_to_add = usr.get_active_hand()
@@ -223,7 +224,7 @@
return
if( !istype(item_to_add, /obj/item/device/radio/headset) )
- usr << "This object won't fit."
+ usr << "This object won't fit!"
return
var/obj/item/device/radio/headset/headset_to_add = item_to_add
@@ -231,7 +232,7 @@
usr.drop_item()
headset_to_add.loc = src
src.ears = headset_to_add
- usr << "You fit the headset onto [src]."
+ usr << "You fit the headset onto [src]."
clearlist(available_channels)
for(var/ch in headset_to_add.channels)
@@ -488,7 +489,7 @@
if(!parrot_perch || parrot_interest.loc != parrot_perch.loc)
held_item = parrot_interest
parrot_interest.loc = src
- visible_message("[src] grabs [held_item]!", "You grab [held_item]!", "You hear the sounds of wings flapping furiously.")
+ visible_message("[src] grabs [held_item]!", "You grab [held_item]!", "You hear the sounds of wings flapping furiously.")
parrot_interest = null
parrot_state = PARROT_SWOOP | PARROT_RETURN
@@ -662,7 +663,7 @@
return -1
if(held_item)
- src << "You are already holding [held_item]"
+ src << "You are already holding [held_item]!"
return 1
for(var/obj/item/I in view(1,src))
@@ -675,10 +676,10 @@
held_item = I
I.loc = src
- visible_message("[src] grabs [held_item]!", "You grab [held_item]!", "You hear the sounds of wings flapping furiously.")
+ visible_message("[src] grabs [held_item]!", "You grab [held_item]!", "You hear the sounds of wings flapping furiously.")
return held_item
- src << "There is nothing of interest to take."
+ src << "There is nothing of interest to take!"
return 0
/mob/living/simple_animal/parrot/proc/steal_from_mob()
@@ -690,7 +691,7 @@
return -1
if(held_item)
- src << "You are already holding [held_item]"
+ src << "You are already holding [held_item]!"
return 1
var/obj/item/stolen_item = null
@@ -706,10 +707,10 @@
C.unEquip(stolen_item)
held_item = stolen_item
stolen_item.loc = src
- visible_message("[src] grabs [held_item] out of [C]'s hand!", "You snag [held_item] out of [C]'s hand!", "You hear the sounds of wings flapping furiously.")
+ visible_message("[src] grabs [held_item] out of [C]'s hand!", "You snag [held_item] out of [C]'s hand!", "You hear the sounds of wings flapping furiously.")
return held_item
- src << "There is nothing of interest to take."
+ src << "There is nothing of interest to take!"
return 0
/mob/living/simple_animal/parrot/verb/drop_held_item_player()
@@ -778,7 +779,7 @@
src.loc = AM.loc
icon_state = "parrot_sit"
return
- src << "There is no perch nearby to sit on."
+ src << "There is no perch nearby to sit on!"
return
/mob/living/simple_animal/parrot/proc/toggle_mode()
diff --git a/code/modules/mob/living/simple_animal/revenant/revenant.dm b/code/modules/mob/living/simple_animal/revenant/revenant.dm
new file mode 100644
index 00000000000..e14a9902ee9
--- /dev/null
+++ b/code/modules/mob/living/simple_animal/revenant/revenant.dm
@@ -0,0 +1,172 @@
+//Revenants: based off of wraiths from Goon
+//"Ghosts" that are invisible and move like ghosts, cannot take damage while invsible
+//Don't hear deadchat and are NOT normal ghosts
+//Admin-spawn or random event
+
+/mob/living/simple_animal/revenant
+ name = "revenant"
+ desc = "A malevolent spirit."
+ icon = 'icons/mob/mob.dmi'
+ icon_state = "revenant_idle"
+ incorporeal_move = 1
+ invisibility = INVISIBILITY_OBSERVER
+ health = 25
+ maxHealth = 25
+ see_in_dark = 255
+ see_invisible = SEE_INVISIBLE_OBSERVER
+ languages = ALL
+ response_help = "passes through"
+ response_disarm = "swings at"
+ response_harm = "punches"
+ minbodytemp = 0
+ maxbodytemp = INFINITY
+ harm_intent_damage = 5
+ speak_emote = list("hisses", "spits", "growls")
+ friendly = "touches"
+ status_flags = 0
+ wander = 0
+ density = 0
+
+ var/essence = 25 //The resource of revenants. Max health is equal to twice this amount
+ var/essence_regen_cap = 25 //The regeneration cap of essence (go figure); regenerates every Life() tick up to this amount.
+ var/essence_regen = 1 //If the revenant regenerates essence or not; 1 for yes, 0 for no
+ var/essence_min = 1 //The minimum amount of essence a revenant can have; by default, it never drops below one
+ var/strikes = 3 //How many times a revenant can die before dying for good
+ var/revealed = 0 //If the revenant can take damage from normal sources.
+ var/inhibited = 0 //If the revenant's abilities are blocked by a chaplain's power.
+
+/mob/living/simple_animal/revenant/Life()
+ ..()
+ if(essence < essence_min)
+ essence = essence_min
+ if(strikes > 0)
+ strikes--
+ src << "Your essence has dropped below critical levels. You barely manage to save yourself - [strikes ? "you can't keep this up!" : "next time, it's death."]"
+ else if(strikes <= 0)
+ src << "NO! No... it's too late, you can feel yourself fading..."
+ src.notransform = 1
+ src.revealed = 1
+ src.invisibility = 0
+ playsound(src, 'sound/effects/screech.ogg', 100, 1)
+ src.visible_message("The revenant lets out a waning screech as violet mist swirls around its dissolving body!")
+ src.icon_state = "revenant_draining"
+ sleep(30)
+ src.death()
+ maxHealth = essence * 2
+ if(!revealed)
+ health = maxHealth //Heals to full when not revealed
+ if(essence_regen && !inhibited && essence < essence_regen_cap) //While inhibited, essence will not regenerate
+ essence++
+
+/mob/living/simple_animal/revenant/Process_Spacemove(var/movement_dir = 0)
+ return 1 //Mainly to prevent the no-grav effect
+
+/mob/living/simple_animal/revenant/ex_act(severity, target)
+ return 1 //Immune to the effects of explosions.
+
+/mob/living/simple_animal/revenant/ClickOn(var/atom/A, var/params) //Copypaste from ghost code - revenants can't interact with the world directly.
+ if(client.buildmode)
+ build_click(src, client.buildmode, params, A)
+ return
+
+ var/list/modifiers = params2list(params)
+ if(modifiers["middle"])
+ MiddleClickOn(A)
+ return
+ if(modifiers["shift"])
+ ShiftClickOn(A)
+ return
+ if(modifiers["alt"])
+ AltClickOn(A)
+ return
+ if(modifiers["ctrl"])
+ CtrlClickOn(A)
+ return
+
+ if(world.time <= next_move)
+ return
+ A.attack_ghost(src)
+
+/mob/living/simple_animal/revenant/say(message)
+ return 0 //Revenants cannot speak out loud.
+
+/mob/living/simple_animal/revenant/Stat()
+ ..()
+ if(statpanel("Status"))
+ stat(null, "Current essence: [essence]E")
+
+/mob/living/simple_animal/revenant/New()
+ ..()
+ spawn(5)
+ if(src.mind)
+ src << 'sound/effects/ghost.ogg'
+ src.store_memory("I am a revenant. My spectral form has been empowered. My only goal is to gather essence from the humans of [world.name].")
+ src << "
"
+ src << "You are a revenant!"
+ src << "Your formerly mundane spirit has been infused with alien energies and empowered into a revenant."
+ src << "You are not dead, not alive, but somewhere in between. You are capable of very limited interaction with both worlds."
+ src << "You are invincible and invisible to everyone but other ghosts. Some abilities may change this."
+ src << "Your goal is to gather essence from humans. Your essence passively regenerates up to 25E over time. You can use the Harvest abilities to gather more from corpses."
+ src << "Be sure to read the wiki page at https://tgstation13.org/wiki/Revenant !"
+ src << "
"
+ if(!src.giveSpells())
+ message_admins("Revenant was created but has no mind. Trying again in five seconds.")
+ spawn(50)
+ if(!src.giveSpells())
+ message_admins("Revenant still has no mind. Deleting...")
+ qdel(src)
+
+/mob/living/simple_animal/revenant/proc/giveSpells()
+ if(src.mind)
+ src.mind.spell_list += new /obj/effect/proc_holder/spell/targeted/revenant_harvest
+ src.mind.spell_list += new /obj/effect/proc_holder/spell/targeted/revenant_transmit
+ src.mind.spell_list += new /obj/effect/proc_holder/spell/aoe_turf/revenant_light
+ src.mind.spell_list += new /obj/effect/proc_holder/spell/targeted/revenant_life_tap
+ src.mind.spell_list += new /obj/effect/proc_holder/spell/targeted/revenant_seed_drain
+ src.mind.spell_list += new /obj/effect/proc_holder/spell/targeted/revenant_mindspike
+ return 1
+ return 0
+
+/mob/living/simple_animal/revenant/death()
+ if(!src.strikes)
+ return 0 //Impossible to die with strikes still active
+ ..(1)
+ src.invisibility = 0
+ visible_message("[src] pulses with an eldritch purple light as its form unwinds into smoke.")
+ ghostize()
+ qdel(src)
+ return
+
+/mob/living/simple_animal/revenant/attackby(obj/item/W, mob/living/user, params)
+ ..()
+ if(istype(W, /obj/item/weapon/nullrod))
+ src.visible_message("The revenant screeches and flails!", \
+ "The null rod invokes agony in you! You feel your essence draining away!")
+ src.essence -= 25 //hella effective
+ src.inhibited = 1
+ spawn(30)
+ src.inhibited = 0
+
+
+
+/obj/effect/proc_holder/spell/proc/essence_check(var/essence_cost, var/silent = 0)
+ var/mob/living/simple_animal/revenant/W = usr
+ if(W.essence < essence_cost)
+ if(!silent)
+ W << "You need [essence_cost]E to use [name] but you only have [W.essence]E available. Harvest some more things."
+ return 0
+ W.essence -= essence_cost
+ return 1
+
+
+
+/mob/living/simple_animal/revenant/proc/change_essence_amount(var/essence_amt, var/silent = 0, var/source = null, var/mob/living/simple_animal/revenant/user = usr)
+ if(!essence_amt)
+ return
+ user.essence += essence_amt
+ if(!silent)
+ if(essence_amt >= 0)
+ user << "Gained [essence_amt]E from [source]."
+ else
+ user << "Lost [essence_amt]E."
+ return 1
diff --git a/code/modules/mob/living/simple_animal/revenant/revenant_abilities.dm b/code/modules/mob/living/simple_animal/revenant/revenant_abilities.dm
new file mode 100644
index 00000000000..0abb8ac46ee
--- /dev/null
+++ b/code/modules/mob/living/simple_animal/revenant/revenant_abilities.dm
@@ -0,0 +1,346 @@
+//Harvest Essence: The bread and butter of the revenant. The basic way of harvesting additional essence.
+/obj/effect/proc_holder/spell/targeted/revenant_harvest
+ name = "Harvest (0E)"
+ desc = "Siphons the lingering spectral essence from a human, empowering yourself."
+ panel = "Revenant Abilities"
+ charge_max = 100 //Short cooldown
+ clothes_req = 0
+ range = 5
+ var/essence_drained = 0
+ var/draining
+ var/list/drained_mobs = list() //Cannot harvest the same mob twice
+
+/obj/effect/proc_holder/spell/targeted/revenant_harvest/cast(list/targets, var/mob/living/simple_animal/revenant/user = usr)
+ if(user.inhibited)
+ user << "Something is blocking the use of [src]!"
+ charge_counter = charge_max
+ return
+ for(var/mob/living/carbon/human/target in targets)
+ spawn(0)
+ if(draining)
+ user << "You are already siphoning the essence of a soul!"
+ return
+ if(target in drained_mobs)
+ user << "[target]'s soul is dead and empty."
+ return
+ if(!target.stat)
+ user << "This being's soul is too strong to harvest."
+ if(prob(10))
+ target << "You feel as if you are being watched."
+ return
+ draining = 1
+ essence_drained = 1
+ user << "You search for the still-living soul of [target]."
+ sleep(10)
+ if(target.ckey)
+ user << "Their soul burns with intelligence."
+ essence_drained += 3
+ if(target.stat == UNCONSCIOUS)
+ user << "They still cling to life, but are not powerful enough to resist. A large amount of essence lies unguarded."
+ essence_drained += 5
+ else if(target.stat == DEAD)
+ user << "They have passed on."
+ essence_drained += 1
+ sleep(20)
+ switch(essence_drained)
+ if(1 to 2)
+ user << "[target] will not yield much essence. Still, every bit counts."
+ if(3 to 4)
+ user << "[target] will yield an average amount of essence."
+ if(5 to INFINITY)
+ user << "Such a feast! [target] will yield much essence to you."
+ sleep(30)
+ if(!in_range(user, target))
+ user << "You are not close enough to siphon [target]'s soul. The link has been broken."
+ draining = 0
+ return
+ if(!target.stat)
+ user << "They are now powerful enough to fight off your draining."
+ target << "You feel something tugging across your body before subsiding."
+ user << "You begin siphoning essence from [target]'s soul. You can not move while this is happening."
+ if(target.stat != DEAD)
+ target << "You feel a horribly unpleasant draining sensation as your grip on life weakens..."
+ user.icon_state = "revenant_draining"
+ user.notransform = 1
+ user.revealed = 1
+ user.invisibility = 0
+ target.visible_message("[target] suddenly rises slightly into the air, their skin turning an ashy gray.")
+ target.Beam(user,icon_state="drain_life",icon='icons/effects/effects.dmi',time=80)
+ target.death(0)
+ target.visible_message("[target] gently slumps back onto the ground.")
+ user.icon_state = "revenant_idle"
+ user.change_essence_amount(essence_drained * 5, 0, target)
+ user << "[target]'s soul has been considerably weakened and will yield no more essence for the time being."
+ user.revealed = 0
+ user.notransform = 0
+ user.invisibility = INVISIBILITY_OBSERVER
+ drained_mobs.Add(target)
+ draining = 0
+
+
+//Transmit: the revemant's only direct way to communicate. Sends a single message silently to a single mob for 5E.
+/obj/effect/proc_holder/spell/targeted/revenant_transmit
+ name = "Unlock: Transmit (5E)"
+ desc = "Telepathically transmits a message to the target."
+ panel = "Revenant Abilities (Locked)"
+ charge_max = 50
+ clothes_req = 0
+ range = -1
+ include_user = 1
+ var/locked = 1
+
+/obj/effect/proc_holder/spell/targeted/revenant_transmit/cast(list/targets, var/mob/living/simple_animal/revenant/user = usr)
+ if(user.inhibited)
+ user << "Something is blocking the use of [src]!"
+ charge_counter = charge_max
+ return
+ if(locked && essence_check(5, 1))
+ usr << "You have unlocked Transmit!"
+ name = "Transmit (5E)"
+ locked = 0
+ charge_counter = charge_max
+ panel = "Revenant Abilities"
+ range = 7
+ include_user = 0
+ return
+ if(locked)
+ charge_counter = charge_max
+ return
+ if(!essence_check(5))
+ charge_counter = charge_max
+ return
+ for(var/mob/living/M in targets)
+ spawn(0)
+ var/msg = stripped_input(usr, "What do you wish to tell [M]?", null, "")
+ usr << "You transmit to [M]: [msg]"
+ M << "Suddenly a strange voice resonates in your head... [msg]"
+
+
+//Overload Light: Breaks a light that's online and sends out lightning bolts to all nearby people.
+/obj/effect/proc_holder/spell/aoe_turf/revenant_light
+ name = "Unlock: Overload Light (25E)"
+ desc = "Directs a large amount of essence into an electrical light, causing an impressive light show."
+ panel = "Revenant Abilities (Locked)"
+ charge_max = 300
+ clothes_req = 0
+ range = -1
+ var/locked = 1
+
+/obj/effect/proc_holder/spell/aoe_turf/revenant_light/cast(list/targets, var/mob/living/simple_animal/revenant/user = usr)
+ if(user.inhibited)
+ user << "Something is blocking the use of [src]!"
+ charge_counter = charge_max
+ return
+ if(locked && essence_check(25, 1))
+ user << "You have unlocked Overload Light!"
+ name = "Overload Light (25E)"
+ panel = "Revenant Abilities"
+ locked = 0
+ range = 5
+ charge_counter = charge_max
+ return
+ if(locked)
+ charge_counter = charge_max
+ return
+ if(!essence_check(25))
+ charge_counter = charge_max
+ return
+ for(var/turf/T in targets)
+ spawn(0)
+ for(var/obj/machinery/light/L in T.contents)
+ spawn(0)
+ if(!L.on)
+ return
+ L.visible_message("\The [L] suddenly flares brightly and begins to spark!")
+ sleep(20)
+ for(var/mob/living/M in orange(4, L))
+ if(M == user)
+ return
+ M.Beam(L,icon_state="lightning",icon='icons/effects/effects.dmi',time=5)
+ M.electrocute_act(25, "[L.name]")
+ playsound(M, 'sound/machines/defib_zap.ogg', 50, 1, -1)
+ user.revealed = 1
+ user.invisibility = 0
+ spawn(30)
+ user.revealed = 0
+ user.invisibility = INVISIBILITY_OBSERVER
+
+
+//Life Tap: Drains one 'strike' to gain 50E
+/obj/effect/proc_holder/spell/targeted/revenant_life_tap
+ name = "Unlock: Life Tap (25E)"
+ desc = "Draws from your own life pool to gain more essence. Can only be cast three times."
+ panel = "Revenant Abilities (Locked)"
+ charge_max = 600
+ clothes_req = 0
+ range = -1
+ include_user = 1
+ var/locked = 1
+
+/obj/effect/proc_holder/spell/targeted/revenant_life_tap/cast(list/targets, var/mob/living/simple_animal/revenant/user = usr)
+ if(user.inhibited)
+ user << "Something is blocking the use of [src]!"
+ charge_counter = charge_max
+ return
+ if(locked && essence_check(25, 1))
+ user << "You have unlocked Life Tap!"
+ name = "Life Tap (0E)"
+ panel = "Revenant Abilities"
+ locked = 0
+ charge_counter = charge_max
+ return
+ if(locked)
+ charge_counter = charge_max
+ return
+ for(var/mob/living/simple_animal/revenant/target in targets)
+ if(!target.strikes)
+ target << "Your life force has grown too weak to life tap again."
+ target.strikes--
+ target << "You convert your own life into energy.[target.strikes ? "" : " This is the last time you can do this."]"
+ target.change_essence_amount(50, 0, "your life pool")
+
+
+//Seed of Draining: Plants a 'seed' in the target that will slowly siphon essence silently from them.
+/obj/effect/proc_holder/spell/targeted/revenant_seed_drain
+ name = "Unlock: Seed of Draining (20E)"
+ desc = "Corrupts a target with dark energies. Their essence will slowly drain for some time."
+ panel = "Revenant Abilities (Locked)"
+ charge_max = 1200
+ clothes_req = 0
+ range = -1
+ include_user = 1
+ var/locked = 1
+ var/planted = 0
+
+/obj/effect/proc_holder/spell/targeted/revenant_seed_drain/cast(list/targets, var/mob/living/simple_animal/revenant/user = usr)
+ if(user.inhibited)
+ user << "Something is blocking the use of [src]!"
+ charge_counter = charge_max
+ return
+ if(locked && essence_check(20, 1))
+ user << "You have unlocked Seed of Draining!"
+ charge_counter = charge_max
+ name = "Seed of Draining (20E)"
+ locked = 0
+ panel = "Revenant Abilities"
+ range = 1
+ include_user = 0
+ return
+ if(locked)
+ charge_counter = charge_max
+ return
+ if(!essence_check(20))
+ charge_counter = charge_max
+ return
+ if(planted)
+ user << "You are already passively draining essence."
+ charge_counter = charge_max
+ return
+ for(var/mob/living/carbon/human/target in targets)
+ if(target.stat == DEAD)
+ user << "[target] is dead and will not yield essence."
+ charge_counter = charge_max
+ user << "You plant a draining seed on [target]."
+ planted = 1
+ for(var/i = 0, i < 120, i++)
+ sleep(10)
+ var/mob/living/carbon/human/M = target
+ user.essence += rand(0.3, 0.5) //Not a huge amount of essence; at the least it's 36 and at the most it's 60
+ M.adjustStaminaLoss(1)
+ if(prob(3))
+ target << "You feel sapped." //Letting the target know that they're not bugged and losing stamina 4nr
+ planted = 0
+ user << "The energies siphoning [target] have fallen dormant. You will need to plant a new seed."
+
+
+//Mind Spike: The typical straight damage ability. Does a decent amount of brute damage and small brain damage.
+/obj/effect/proc_holder/spell/targeted/revenant_mindspike
+ name = "Unlock: Mind Spike (5E)"
+ desc = "Drives a spike of dark energy into the target's mind. Cheap but effective and doesn't take long to cool down."
+ panel = "Revenant Abilities (Locked)"
+ charge_max = 40
+ clothes_req = 0
+ range = -1
+ include_user = 1
+ var/locked = 1
+
+/obj/effect/proc_holder/spell/targeted/revenant_mindspike/cast(list/targets, var/mob/living/simple_animal/revenant/user = usr)
+ if(user.inhibited)
+ user << "Something is blocking the use of [src]!"
+ charge_counter = charge_max
+ return
+ if(locked && essence_check(5, 1))
+ user << "You have unlocked Mind Spike!"
+ charge_counter = charge_max
+ name = "Mind Spike (5E)"
+ locked = 0
+ panel = "Revenant Abilities"
+ range = 3
+ include_user = 0
+ return
+ if(locked)
+ charge_counter = charge_max
+ return
+ if(!essence_check(5))
+ charge_counter = charge_max
+ return
+ for(var/mob/living/carbon/human/M in targets)
+ user << "You drive a spike of energy into [M]'s mind!"
+ M << "You feel a spike of pain in your head!"
+ M.apply_damage(12, BRUTE, "head")
+ M.adjustBrainLoss(3)
+ //M << 'sound/effects/mind_blast.ogg'
+ if(prob(20) && !M.stat)
+ M.Weaken(2)
+ M.visible_message("[M] clutches at their head!")
+ user.revealed = 1
+ user.invisibility = 0
+ spawn(10)
+ user.revealed = 0
+ user.invisibility = INVISIBILITY_OBSERVER
+
+//Hypnotize: Makes the target fall asleep, make them vulnerable to draining.
+/obj/effect/proc_holder/spell/targeted/revenant_hypnotize
+ name = "Unlock: Hypnotize (15E)"
+ desc = "Causes a target to fall asleep."
+ panel = "Revenant Abilities (Locked)"
+ charge_max = 900
+ clothes_req = 0
+ range = -1
+ include_user = 1
+ var/locked = 1
+
+/obj/effect/proc_holder/spell/targeted/revenant_hypnotize/cast(list/targets, var/mob/living/simple_animal/revenant/user = usr)
+ if(user.inhibited)
+ user << "Something is blocking the use of [src]!"
+ charge_counter = charge_max
+ return
+ if(locked && essence_check(15, 1))
+ user << "You have unlocked Hypnotize!"
+ charge_counter = charge_max
+ name = "Hypnotize (15E)"
+ locked = 0
+ range = 3
+ panel = "Revenant Abilities"
+ include_user = 0
+ return
+ if(locked)
+ charge_counter = charge_max
+ return
+ if(!essence_check(15))
+ charge_counter = charge_max
+ return
+ for(var/mob/living/carbon/human/M in targets)
+ user << "You gently influence [M]'s mind toward deep sleep."
+ M << "Tired... so tired..."
+ M.drowsyness += 7
+ spawn(70)
+ M.sleeping += 30
+
+
+/* (WIP)
+Strangulate: Chokes the target with crushing force.
+/obj/effect/proc_holder/spell/targeted/revenant_strangulate
+ name = "Unlock: Strangulate (30E)"
+ desc = "Strangles a target with an asphyxiating hand, dealing decent oxygen damage to them."
+*/
diff --git a/code/modules/mob/living/simple_animal/revenant/revenant_spawn_event.dm b/code/modules/mob/living/simple_animal/revenant/revenant_spawn_event.dm
new file mode 100644
index 00000000000..fd897699a43
--- /dev/null
+++ b/code/modules/mob/living/simple_animal/revenant/revenant_spawn_event.dm
@@ -0,0 +1,63 @@
+/datum/round_event_control/revenant
+ name = "Spawn Revenant"
+ typepath = /datum/round_event/revenant
+ weight = 15
+ max_occurrences = 3
+ earliest_start = 0 //Meant to mix things up early-game.
+
+
+
+/datum/round_event/revenant
+ var/key_of_revenant
+
+
+
+/datum/round_event/revenant/proc/get_revenant(var/end_if_fail = 0)
+ key_of_revenant = null
+ if(!key_of_revenant)
+ var/list/candidates = get_candidates(BE_REVENANT)
+ if(!candidates.len)
+ if(end_if_fail)
+ return 0
+ return find_revenant()
+ var/client/C = pick(candidates)
+ key_of_revenant = C.key
+ if(!key_of_revenant)
+ if(end_if_fail)
+ return 0
+ return find_revenant()
+ var/datum/mind/player_mind = new /datum/mind(key_of_revenant)
+ player_mind.active = 1
+ var/list/spawn_locs = list()
+ for(var/obj/effect/landmark/L in landmarks_list)
+ if(isturf(L.loc))
+ switch(L.name)
+ if("carpspawn")
+ spawn_locs += L.loc
+ if(!spawn_locs)
+ return find_revenant()
+ var/mob/living/simple_animal/revenant/revvie = new /mob/living/simple_animal/revenant/(pick(spawn_locs))
+ player_mind.transfer_to(revvie)
+ player_mind.assigned_role = "revenant"
+ player_mind.special_role = "Revenant"
+ ticker.mode.traitors |= player_mind
+ message_admins("[key_of_revenant] has been made into a Revenant by an event.")
+ log_game("[key_of_revenant] was spawned as a Revenant by an event.")
+ return 1
+
+
+
+/datum/round_event/revenant/start()
+ get_revenant()
+
+
+
+/datum/round_event/revenant/proc/find_revenant()
+ message_admins("Attempted to spawn a Revenant but there was no players available. Will try again momentarily, bear with me...")
+ spawn(50)
+ if(get_revenant(1))
+ message_admins("Hooray! Situation has been resolved, [key_of_revenant] has been spawned as a Revenant.")
+ log_game("[key_of_revenant] was spawned as a Revenant by an event.")
+ return 0
+ message_admins("Unfortunately, no candidates were available for becoming a Revenant. Shutting down. :(")
+ return kill()
diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index 1864c0d1f84..0bdc709d15f 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -462,7 +462,7 @@
// Harvest an animal's delicious byproducts
/mob/living/simple_animal/proc/harvest(mob/living/user, sharpness = 1)
- user << "You begin to butcher [src]."
+ user << "You begin to butcher [src]..."
playsound(loc, 'sound/weapons/slice.ogg', 50, 1, -1)
if(do_mob(user, src, 80/sharpness))
visible_message("[user] butchers [src].")
@@ -490,4 +490,4 @@
canmove = 0
else
canmove = 1
- return canmove
+ return canmove
diff --git a/code/modules/mob/living/simple_animal/slime/powers.dm b/code/modules/mob/living/simple_animal/slime/powers.dm
index e8b647e5e8d..b6f4ed34b86 100644
--- a/code/modules/mob/living/simple_animal/slime/powers.dm
+++ b/code/modules/mob/living/simple_animal/slime/powers.dm
@@ -71,7 +71,7 @@
Victim.adjustToxLoss(rand(2,4))
if(prob(15) && Victim.client)
- Victim << "[pick("You can feel your body becoming weak!", \
+ Victim << "[pick("You can feel your body becoming weak!", \
"You feel like you're about to die!", \
"You feel every part of your body screaming in agony!", \
"A low, rolling pain passes through your body!", \
@@ -89,7 +89,7 @@
src << "[pick("This subject is incompatible", \
"This subject does not have a life energy", "This subject is empty", \
"I am not satisified", "I can not feed from this subject", \
- "I do not feel nourished", "This subject is not food")]..."
+ "I do not feel nourished", "This subject is not food")]!"
if(fed_succesfully)
add_nutrition(rand(15,30), lastnut)
diff --git a/code/modules/mob/living/simple_animal/slime/slime.dm b/code/modules/mob/living/simple_animal/slime/slime.dm
index d9a0b893187..7dd50a1008d 100644
--- a/code/modules/mob/living/simple_animal/slime/slime.dm
+++ b/code/modules/mob/living/simple_animal/slime/slime.dm
@@ -29,7 +29,6 @@
nutrition = 700
see_in_dark = 8
- update_slimes = 0
verb_say = "telepathically chirps"
verb_ask = "telepathically asks"
@@ -285,7 +284,7 @@
++Friends[user]
else
Friends[user] = 1
- user << "You feed the slime the plasma. It chirps happily."
+ user << "You feed the slime the plasma. It chirps happily."
var/obj/item/stack/sheet/mineral/plasma/S = W
S.use(1)
return
diff --git a/code/modules/mob/living/ventcrawling.dm b/code/modules/mob/living/ventcrawling.dm
new file mode 100644
index 00000000000..78ccc103d0a
--- /dev/null
+++ b/code/modules/mob/living/ventcrawling.dm
@@ -0,0 +1,96 @@
+
+var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/unary/vent_pump, /obj/machinery/atmospherics/unary/vent_scrubber)
+
+//VENTCRAWLING
+
+/mob/living/proc/handle_ventcrawl(var/atom/A)
+ if(!ventcrawler || !Adjacent(A))
+ return
+ if(stat)
+ src << "You must be conscious to do this!"
+ return
+ if(lying)
+ src << "You can't vent crawl while you're stunned!"
+ return
+
+ var/obj/machinery/atmospherics/unary/vent_found
+
+
+ if(A)
+ vent_found = A
+ if(!istype(vent_found) || !vent_found.can_crawl_through())
+ vent_found = null
+
+ if(!vent_found)
+ for(var/obj/machinery/atmospherics/machine in range(1,src))
+ if(is_type_in_list(machine, ventcrawl_machinery))
+ vent_found = machine
+
+ if(!vent_found.can_crawl_through())
+ vent_found = null
+
+ if(vent_found)
+ break
+
+
+ if(vent_found)
+ if(vent_found.parent && (vent_found.parent.members.len || vent_found.parent.other_atmosmch))
+ visible_message("[src] begins climbing into the ventilation system..." ,"You begin climbing into the ventilation system...")
+
+ if(!do_after(src, 25))
+ return
+
+ if(!client)
+ return
+
+ if(iscarbon(src) && contents.len && ventcrawler < 2)//It must have atleast been 1 to get this far
+ for(var/obj/item/I in contents)
+ var/failed = 0
+ if(istype(I, /obj/item/weapon/implant))
+ continue
+ else
+ failed++
+
+ if(failed)
+ src << "You can't crawl around in the ventilation ducts with items!"
+ return
+
+ visible_message("[src] scrambles into the ventilation ducts!","You climb into the ventilation ducts.")
+ loc = vent_found
+ add_ventcrawl(vent_found)
+ else
+ src << "This ventilation duct is not connected to anything!"
+
+
+/mob/living/proc/add_ventcrawl(obj/machinery/atmospherics/unary/starting_machine)
+ if(!starting_machine)
+ return
+ var/list/totalMembers = starting_machine.parent.members + starting_machine.parent.other_atmosmch
+ for(var/atom/A in totalMembers)
+ var/image/new_image = image(A, A.loc, dir = A.dir)
+ pipes_shown += new_image
+ if(client)
+ client.images += new_image
+
+
+/mob/living/proc/remove_ventcrawl()
+ if(client)
+ for(var/image/current_image in pipes_shown)
+ client.images -= current_image
+ client.eye = src
+ pipes_shown.len = 0
+
+
+
+
+//OOP
+/atom/proc/update_pipe_vision()
+ return
+
+/mob/living/update_pipe_vision()
+ if(pipes_shown.len)
+ if(!istype(loc, /obj/machinery/atmospherics))
+ remove_ventcrawl()
+ else
+ if(istype(loc, /obj/machinery/atmospherics))
+ add_ventcrawl(loc)
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 3a4af5d847c..c5d468e9ae9 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -266,7 +266,7 @@ var/next_mob_id = 0
qdel(W)
else
if(!disable_warning)
- src << "You are unable to equip that." //Only print if qdel_on_fail is false
+ src << "You are unable to equip that!" //Only print if qdel_on_fail is false
return 0
equip_to_slot(W, slot, redraw_mob) //This proc should not ever fail.
return 1
@@ -731,6 +731,8 @@ var/list/slot_equipment_priority = list( \
else
statpanel(listed_turf.name, null, listed_turf)
for(var/atom/A in listed_turf)
+ if(!A.mouse_opacity)
+ continue
if(A.invisibility > see_invisible)
continue
statpanel(listed_turf.name, null, A)
@@ -788,6 +790,12 @@ var/list/slot_equipment_priority = list( \
fall(ko)
canmove = !(ko || resting || stunned || buckled)
density = !lying
+ if(lying)
+ if(layer == initial(layer)) //to avoid special cases like hiding larvas.
+ layer = MOB_LAYER - 0.2 //so mob lying always appear behind standing mobs
+ else
+ if(layer == MOB_LAYER - 0.2)
+ layer = initial(layer)
update_transform()
lying_prev = lying
return canmove
@@ -838,9 +846,6 @@ var/list/slot_equipment_priority = list( \
/mob/proc/activate_hand(var/selhand)
return
-/mob/proc/SpeciesCanConsume()
- return 0
-
/mob/proc/Jitter(amount)
jitteriness = max(jitteriness,amount,0)
@@ -946,4 +951,17 @@ var/list/slot_equipment_priority = list( \
return
/mob/proc/setEarDamage()
+ return
+
+/mob/proc/AddSpell(var/obj/effect/proc_holder/spell/spell)
+ mob_spell_list += spell
+ if(!spell.action)
+ spell.action = new/datum/action/spell_action
+ spell.action.target = spell
+ spell.action.name = spell.name
+ spell.action.button_icon = spell.action_icon
+ spell.action.button_icon_state = spell.action_icon_state
+ spell.action.background_icon_state = spell.action_background_icon_state
+ if(isliving(src))
+ spell.action.Grant(src)
return
\ No newline at end of file
diff --git a/code/modules/mob/mob_grab.dm b/code/modules/mob/mob_grab.dm
index c2a4fa9a1fe..233fcd4f485 100644
--- a/code/modules/mob/mob_grab.dm
+++ b/code/modules/mob/mob_grab.dm
@@ -115,6 +115,8 @@
affecting.Weaken(5) //Should keep you down unless you get help.
affecting.losebreath = min(affecting.losebreath + 2, 3)
+/obj/item/weapon/grab/attack_self(mob/user)
+ s_click(hud)
/obj/item/weapon/grab/proc/s_click(obj/screen/S)
if(!affecting)
diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm
index 5b9be5c61c9..dd575cd6adf 100644
--- a/code/modules/mob/mob_helpers.dm
+++ b/code/modules/mob/mob_helpers.dm
@@ -442,6 +442,9 @@ proc/is_special_character(mob/M) // returns 1 for special characters and 2 for h
if("monkey")
if(M.viruses && (locate(/datum/disease/transformation/jungle_fever) in M.viruses))
return 2
+ if("abductor")
+ if(M.mind in ticker.mode.abductors)
+ return 2
return 1
return 0
@@ -477,10 +480,10 @@ proc/is_special_character(mob/M) // returns 1 for special characters and 2 for h
affecting.heal_damage(brute,burn,1)
H.update_damage_overlays(0)
H.updatehealth()
- user.visible_message("[user] has fixed some of the [dam ? "dents on" : "burnt wires in"] [H]'s [affecting.getDisplayName()]!")
+ user.visible_message("[user] has fixed some of the [dam ? "dents on" : "burnt wires in"] [H]'s [affecting.getDisplayName()].", "You fix some of the [dam ? "dents on" : "burnt wires in"] [H]'s [affecting.getDisplayName()].")
return
else
- user << "[H]'s [affecting.getDisplayName()] is already in good condition"
+ user << "[H]'s [affecting.getDisplayName()] is already in good condition!"
return
else
return
diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm
index 1d34da24490..f2e81516823 100644
--- a/code/modules/mob/mob_movement.dm
+++ b/code/modules/mob/mob_movement.dm
@@ -3,6 +3,8 @@
if(istype(mover) && mover.checkpass(PASSMOB))
return 1
+ if(istype(mover, /obj/item/projectile))
+ return (!density || lying)
if(ismob(mover))
var/mob/moving_mob = mover
if ((other_mobs && moving_mob.other_mobs))
@@ -141,7 +143,7 @@
for(var/mob/M in range(mob, 1))
if(M.pulling == mob)
if(!M.incapacitated() && mob.Adjacent(M))
- src << "You're restrained! You can't move!"
+ src << "You're restrained! You can't move!"
move_delay += 10
return 0
else
diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm
index 1d362e4a498..3b8a4401cbd 100644
--- a/code/modules/mob/transform_procs.dm
+++ b/code/modules/mob/transform_procs.dm
@@ -78,6 +78,8 @@
if (tr_flags & TR_DEFAULTMSG)
O << "You are now a monkey."
+ O.update_pipe_vision()
+
for(var/A in loc.vars)
if(loc.vars[A] == src)
loc.vars[A] = O
@@ -191,6 +193,8 @@
if (tr_flags & TR_DEFAULTMSG)
O << "You are now a human."
+ O.update_pipe_vision()
+
updateappearance(O)
. = O
@@ -238,6 +242,8 @@
else
O.key = key
+ O.update_pipe_vision()
+
var/obj/loc_landmark
for(var/obj/effect/landmark/start/sloc in landmarks_list)
if (sloc.name != "AI")
@@ -319,6 +325,8 @@
else
O.key = key
+ O.update_pipe_vision()
+
if (config.rename_cyborg)
O.rename_self("cyborg", 1)
@@ -357,6 +365,7 @@
new_xeno.key = key
new_xeno << "You are now an alien."
+ new_xeno.update_pipe_vision()
. = new_xeno
qdel(src)
@@ -389,6 +398,7 @@
new_slime.key = key
new_slime << "You are now a slime. Skreee!"
+ new_slime.update_pipe_vision()
. = new_slime
qdel(src)
@@ -425,6 +435,7 @@
new_corgi.key = key
new_corgi << "You are now a Corgi. Yap Yap!"
+ new_corgi.update_pipe_vision()
. = new_corgi
qdel(src)
@@ -458,6 +469,7 @@
new_mob << "You suddenly feel more... animalistic."
+ new_mob.update_pipe_vision()
. = new_mob
qdel(src)
@@ -475,6 +487,7 @@
new_mob.key = key
new_mob.a_intent = "harm"
new_mob << "You feel more... animalistic"
+ new_mob.update_pipe_vision()
. = new_mob
qdel(src)
diff --git a/code/modules/ninja/suit/n_suit_verbs/energy_net_nets.dm b/code/modules/ninja/suit/n_suit_verbs/energy_net_nets.dm
index ed6c7236267..f664c87a8b9 100644
--- a/code/modules/ninja/suit/n_suit_verbs/energy_net_nets.dm
+++ b/code/modules/ninja/suit/n_suit_verbs/energy_net_nets.dm
@@ -27,7 +27,7 @@ It is possible to destroy the net by the occupant or someone else.
var/mob/living/carbon/M = affecting
M.anchored = 0
for(var/mob/O in viewers(src, 3))
- O.show_message("[M.name] was recovered from the energy net!", 1, "You hear a grunt.", 2)
+ O.show_message("[M.name] was recovered from the energy net!", 1, "You hear a grunt.", 2)
if(!isnull(master))//As long as they still exist.
master << "ERROR: unable to initiate transport protocol. Procedure terminated."
qdel(src)
@@ -82,7 +82,7 @@ It is possible to destroy the net by the occupant or someone else.
qdel(src)//Wait for everything to finish, delete the net. Else it will stop everything once net is deleted, including the spawn(0).
for(var/mob/O in viewers(src, 3))
- O.show_message("[M] vanished!", 1, "You hear sparks flying!", 2)
+ O.show_message("[M] vanishes!", 1, "You hear sparks flying!", 2)
if(!isnull(master))//As long as they still exist.
master << "SUCCESS: transport procedure of \the [affecting] complete."
diff --git a/code/modules/ninja/suit/n_suit_verbs/ninja_net.dm b/code/modules/ninja/suit/n_suit_verbs/ninja_net.dm
index 428f417ca44..b31d49c1d82 100644
--- a/code/modules/ninja/suit/n_suit_verbs/ninja_net.dm
+++ b/code/modules/ninja/suit/n_suit_verbs/ninja_net.dm
@@ -12,7 +12,7 @@
if(!locate(/obj/effect/energy_net) in C.loc)//Check if they are already being affected by an energy net.
for(var/turf/T in getline(H.loc, C.loc))
if(T.density)//Don't want them shooting nets through walls. It's kind of cheesy.
- H << "You may not use an energy net through solid obstacles!"
+ H << "You may not use an energy net through solid obstacles!"
return
spawn(0)
H.Beam(C,"n_beam",,15)
@@ -25,7 +25,7 @@
spawn(0)//Parallel processing.
E.process(C)
else
- H << "They are already trapped inside an energy net."
+ H << "They are already trapped inside an energy net!"
else
- H << "They will bring no honor to your Clan!"
+ H << "They will bring no honor to your Clan!"
return
\ No newline at end of file
diff --git a/code/modules/ninja/suit/n_suit_verbs/ninja_smoke.dm b/code/modules/ninja/suit/n_suit_verbs/ninja_smoke.dm
index 8d2ff7c3cfe..aef3d012dd8 100644
--- a/code/modules/ninja/suit/n_suit_verbs/ninja_smoke.dm
+++ b/code/modules/ninja/suit/n_suit_verbs/ninja_smoke.dm
@@ -9,11 +9,11 @@
if(!ninjacost(0,N_SMOKE_BOMB))
var/mob/living/carbon/human/H = affecting
- H << "There are [s_bombs] smoke bombs remaining."
var/datum/effect/effect/system/bad_smoke_spread/smoke = new /datum/effect/effect/system/bad_smoke_spread()
smoke.set_up(10, 0, H.loc)
smoke.start()
playsound(H.loc, 'sound/effects/bamf.ogg', 50, 2)
s_bombs--
+ H << "There are [s_bombs] smoke bombs remaining."
s_coold = 1
return
\ No newline at end of file
diff --git a/code/modules/paperwork/filingcabinet.dm b/code/modules/paperwork/filingcabinet.dm
index 92077b14d4a..351443ec5bb 100644
--- a/code/modules/paperwork/filingcabinet.dm
+++ b/code/modules/paperwork/filingcabinet.dm
@@ -55,7 +55,7 @@
anchored = !anchored
user << "You [anchored ? "wrench" : "unwrench"] [src]."
else
- user << "You can't put [P] in [src]!"
+ user << "You can't put [P] in [src]!"
/obj/structure/filingcabinet/attack_hand(mob/user)
diff --git a/code/modules/paperwork/handlabeler.dm b/code/modules/paperwork/handlabeler.dm
index d9a6b9527d4..96c8f83e2b0 100644
--- a/code/modules/paperwork/handlabeler.dm
+++ b/code/modules/paperwork/handlabeler.dm
@@ -16,22 +16,22 @@
return // don't set a label
if(!labels_left)
- user << "No labels left."
+ user << "No labels left!"
return
if(!label || !length(label))
- user << "No text set."
+ user << "No text set!"
return
if(length(A.name) + length(label) > 64)
- user << "Label too big."
+ user << "Label too big!"
return
if(ishuman(A))
- user << "You can't label humans."
+ user << "You can't label humans!"
return
if(issilicon(A))
- user << "You can't label cyborgs."
+ user << "You can't label cyborgs!"
return
- user.visible_message("[user] labels [A] as [label].", \
+ user.visible_message("[user] labels [A] as [label].", \
"You label [A] as [label].")
A.name = "[A.name] ([label])"
labels_left--
@@ -45,7 +45,7 @@
//Now let them chose the text.
var/str = copytext(reject_bad_text(input(user,"Label text?","Set label","")),1,MAX_NAME_LEN)
if(!str || !length(str))
- user << "Invalid text."
+ user << "Invalid text!"
return
label = str
user << "You set the text to '[str]'."
diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm
index cf006b775cc..564411de900 100644
--- a/code/modules/paperwork/paper.dm
+++ b/code/modules/paperwork/paper.dm
@@ -336,12 +336,12 @@
/obj/item/weapon/paper/proc/burn(var/showmsg, var/burntime)
if(showmsg)
- src.visible_message("[src] catches on fire!")
+ src.visible_message("[src] catches on fire.")
burning = 1
icon_state = "paper_onfire"
info = "[stars(info)]"
sleep(burntime) //7 seconds
- src.visible_message("[src] burns away, leaving behind a pile of ashes.")
+ src.visible_message("[src] burns away, leaving behind a pile of ashes.")
new /obj/effect/decal/cleanable/ash(src.loc)
qdel(src)
diff --git a/code/modules/paperwork/paperbin.dm b/code/modules/paperwork/paperbin.dm
index a26c0497223..8493cfb876a 100644
--- a/code/modules/paperwork/paperbin.dm
+++ b/code/modules/paperwork/paperbin.dm
@@ -57,7 +57,7 @@
user.put_in_hands(P)
user << "You take [P] out of \the [src]."
else
- user << "[src] is empty!"
+ user << "[src] is empty!"
add_fingerprint(user)
diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm
index 2be061856d3..01ea0ee5d35 100644
--- a/code/modules/paperwork/pen.dm
+++ b/code/modules/paperwork/pen.dm
@@ -74,3 +74,48 @@
reagents.add_reagent("mutetoxin", 15)
reagents.add_reagent("tirizene", 10)
..()
+
+/*
+ * Gang Boss Pens
+ */
+/obj/item/weapon/pen/gang
+ origin_tech = "materials=2;syndicate=5"
+ var/cooldown
+
+/obj/item/weapon/pen/gang/attack(mob/living/M, mob/user)
+ if(!istype(M)) return
+ if(..())
+ if(ishuman(M) && ishuman(user) && M.stat != DEAD)
+ if(user.mind && ((user.mind in ticker.mode.A_bosses) || (user.mind in ticker.mode.B_bosses)))
+ if(cooldown)
+ user << "[src] needs more time to recharge before it can be used."
+ return
+ if(M.client)
+ M.mind_initialize() //give them a mind datum if they don't have one.
+ if(user.mind in ticker.mode.A_bosses)
+ if(ticker.mode.add_gangster(M.mind,"A"))
+ M.Paralyse(5)
+ cooldown(ticker.mode.A_gang.len, )
+ else
+ user << "This mind is resistant to recruitment!"
+ else if(user.mind in ticker.mode.B_bosses)
+ if(ticker.mode.add_gangster(M.mind,"B"))
+ M.Paralyse(5)
+ cooldown(ticker.mode.B_gang.len)
+ else
+ user << "This mind is resistant to recruitment!"
+ else
+ user << "This mind is so vacant that it is not susceptible to influence!"
+
+/obj/item/weapon/pen/gang/proc/cooldown(modifier)
+ if(!modifier)
+ return
+ cooldown = 1
+ icon_state = "pen_blink"
+ //The more gang members there are the longer the cooldown will be
+ var/time = 450 + (150 * modifier) //45 seconds + 15 seconds for every member in the gang
+ spawn(time)
+ cooldown = 0
+ icon_state = "pen"
+ var/mob/M = get(src, /mob)
+ M << "\icon[src] [src][(src.loc == M)?(""):(" in your [src.loc]")] vibrates softly."
diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm
index 95220c1e344..92f82705db9 100644
--- a/code/modules/paperwork/photocopier.dm
+++ b/code/modules/paperwork/photocopier.dm
@@ -230,7 +230,7 @@
flick("bigscanner1", src)
updateUsrDialog()
else
- user << "There is already something in [src]."
+ user << "There is already something in [src]!"
else if(istype(O, /obj/item/weapon/photo))
if(copier_empty())
@@ -241,7 +241,7 @@
flick("bigscanner1", src)
updateUsrDialog()
else
- user << "There is already something in [src]."
+ user << "There is already something in [src]!"
else if(istype(O, /obj/item/device/toner))
if(toner <= 0)
@@ -251,14 +251,14 @@
user << "You insert [O] into [src]."
updateUsrDialog()
else
- user << "This cartridge is not yet ready for replacement! Use up the rest of the toner."
+ user << "This cartridge is not yet ready for replacement! Use up the rest of the toner."
else if(istype(O, /obj/item/weapon/wrench))
if(isinspace())
user << "There's nothing to fasten [src] to!"
return
playsound(loc, 'sound/items/Ratchet.ogg', 50, 1)
- user << "You start [anchored ? "unwrenching" : "wrenching"] [src]"
+ user << "You start [anchored ? "unwrenching" : "wrenching"] [src]..."
if(do_after(user, 20))
if(gc_destroyed)
return
@@ -302,30 +302,30 @@
return
src.add_fingerprint(user)
if(target == user)
- visible_message("[user] starts climbing onto the photocopier!")
+ user.visible_message("[user] starts climbing onto the photocopier!", "You start climbing onto the photocopier...")
else
- visible_message("[user] starts putting [target] onto the photocopier!")
+ user.visible_message("[user] starts putting [target] onto the photocopier!", "You start putting [target] onto the photocopier...")
if(do_after(user, 20))
if(!target || target.gc_destroyed || gc_destroyed || !Adjacent(target)) //check if the photocopier/target still exists.
return
if(target == user)
- visible_message("[user] climbs onto the photocopier!")
+ user.visible_message("[user] climbs onto the photocopier!", "You climb onto the photocopier.")
else
- visible_message("[user] puts [target] onto the photocopier!")
+ user.visible_message("[user] puts [target] onto the photocopier!", "You put [target] onto the photocopier.")
target.loc = get_turf(src)
ass = target
if(photocopy)
photocopy.loc = src.loc
- visible_message("[photocopy] is shoved out of the way by [ass]!")
+ visible_message("[photocopy] is shoved out of the way by [ass]!")
photocopy = null
else if(copy)
copy.loc = src.loc
- visible_message("[copy] is shoved out of the way by [ass]!")
+ visible_message("[copy] is shoved out of the way by [ass]!")
copy = null
updateUsrDialog()
diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm
index a759a817464..bfb76afccc0 100644
--- a/code/modules/paperwork/photography.dm
+++ b/code/modules/paperwork/photography.dm
@@ -53,7 +53,7 @@
if(in_range(user, src))
show(user)
else
- user << "You need to get closer to get a good look at this photo."
+ user << "You need to get closer to get a good look at this photo!"
/obj/item/weapon/photo/proc/show(mob/user)
@@ -427,4 +427,4 @@ obj/item/device/camera/siliconcam/robot_camera/proc/borgprint()
p.pixel_y = rand(-10, 10)
C.toner -= 20 //Cyborgs are very ineffeicient at printing an image
visible_message("[C.name] spits out a photograph from a narrow slot on it's chassis.")
- usr << "You print a photograph."
+ usr << "You print a photograph."
diff --git a/code/modules/power/antimatter/control.dm b/code/modules/power/antimatter/control.dm
index 57e815508f7..e8270dafd52 100644
--- a/code/modules/power/antimatter/control.dm
+++ b/code/modules/power/antimatter/control.dm
@@ -143,24 +143,24 @@
if(!anchored)
playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1)
user.visible_message("[user.name] secures the [src.name] to the floor.", \
- "You secure the anchor bolts to the floor.", \
- "You hear a ratchet")
+ "You secure the anchor bolts to the floor.", \
+ "You hear a ratchet.")
src.anchored = 1
connect_to_network()
else if(!linked_shielding.len > 0)
playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1)
user.visible_message("[user.name] unsecures the [src.name].", \
- "You remove the anchor bolts.", \
- "You hear a ratchet")
+ "YYou remove the anchor bolts.", \
+ "You hear a ratchet.")
src.anchored = 0
disconnect_from_network()
else
- user << "Once bolted and linked to a shielding unit it the [src.name] is unable to be moved!"
+ user << "Once bolted and linked to a shielding unit it the [src.name] is unable to be moved!"
return
if(istype(W, /obj/item/weapon/am_containment))
if(fueljar)
- user << "There is already a [fueljar] inside!"
+ user << "There is already a [fueljar] inside!"
return
fueljar = W
W.loc = src
@@ -169,8 +169,8 @@
user.unEquip(W)
user.update_icons()
user.visible_message("[user.name] loads an [W.name] into the [src.name].", \
- "You load an [W.name].", \
- "You hear a thunk.")
+ "You load an [W.name].", \
+ "You hear a thunk.")
return
if(W.force >= 20)
diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm
index 042d4731b63..44da3f238a0 100644
--- a/code/modules/power/apc.dm
+++ b/code/modules/power/apc.dm
@@ -377,22 +377,22 @@
if (istype(W, /obj/item/weapon/crowbar) && opened)
if (has_electronics==1)
if (terminal)
- user << "Disconnect wires first."
+ user << "Disconnect the wires first!"
return
playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1)
- user << "You are trying to remove the power control board..." //lpeters - fixed grammar issues
+ user << "You are trying to remove the power control board..." //lpeters - fixed grammar issues
if(do_after(user, 50))
if (has_electronics==1)
has_electronics = 0
if ((stat & BROKEN) || malfhack)
user.visible_message(\
- "[user.name] has broken the power control board inside [src.name]!",\
- "You broke the charred power control board and remove the remains.",
- "You hear a crack!")
+ "[user.name] has broken the power control board inside [src.name]!",\
+ "You break the charred power control board and remove the remains.",
+ "You hear a crack.")
//ticker.mode:apcs-- //XSI said no and I agreed. -rastaf0
else
user.visible_message(\
- "[user.name] has removed the power control board from [src.name]!",\
+ "[user.name] has removed the power control board from [src.name]!",\
"You remove the power control board.")
new /obj/item/weapon/module/power_control(loc)
else if (opened!=2) //cover isn't removed
@@ -400,49 +400,49 @@
update_icon()
else if (istype(W, /obj/item/weapon/crowbar) && !((stat & BROKEN) || malfhack) )
if(coverlocked && !(stat & MAINT))
- user << "The cover is locked and cannot be opened."
+ user << "The cover is locked and cannot be opened!"
return
else
opened = 1
update_icon()
else if (istype(W, /obj/item/weapon/stock_parts/cell) && opened) // trying to put a cell inside
if(cell)
- user << "There is a power cell already installed."
+ user << "There is a power cell already installed!"
return
else
if (stat & MAINT)
- user << "There is no connector for your power cell."
+ user << "There is no connector for your power cell!"
return
user.drop_item()
W.loc = src
cell = W
user.visible_message(\
- "[user.name] has inserted the power cell to [src.name]!",\
+ "[user.name] has inserted the power cell to [src.name]!",\
"You insert the power cell.")
chargecount = 0
update_icon()
else if (istype(W, /obj/item/weapon/screwdriver)) // haxing
if(opened)
if (cell)
- user << "Close the APC first." //Less hints more mystery!
+ user << "Close the APC first!" //Less hints more mystery!
return
else
if (has_electronics==1 && terminal)
has_electronics = 2
stat &= ~MAINT
playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
- user << "You screw the circuit electronics into place."
+ user << "You screw the circuit electronics into place."
else if (has_electronics==2)
has_electronics = 1
stat |= MAINT
playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
- user << "You unfasten the electronics."
+ user << "You unfasten the electronics."
else /* has_electronics==0 */
- user << "There is nothing to secure."
+ user << "There is nothing to secure!"
return
update_icon()
else if(emagged)
- user << "The interface is broken."
+ user << "The interface is broken!"
else
wiresexposed = !wiresexposed
user << "The wires have been [wiresexposed ? "exposed" : "unexposed"]"
@@ -450,30 +450,30 @@
else if (istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda)) // trying to unlock the interface with an ID card
if(emagged)
- user << "The interface is broken."
+ user << "The interface is broken!"
else if(opened)
- user << "You must close the cover to swipe an ID card."
+ user << "You must close the cover to swipe an ID card!"
else if(wiresexposed)
- user << "You must close the panel"
+ user << "You must close the panel!"
else if(stat & (BROKEN|MAINT))
- user << "Nothing happens."
+ user << "Nothing happens!"
else
if(src.allowed(usr) && !isWireCut(APC_WIRE_IDSCAN))
locked = !locked
- user << "You [ locked ? "lock" : "unlock"] the APC interface."
+ user << "You [ locked ? "lock" : "unlock"] the APC interface."
update_icon()
else
user << "Access denied."
else if (istype(W, /obj/item/stack/cable_coil) && !terminal && opened && has_electronics!=2)
if (src.loc:intact)
- user << "You must remove the floor plating in front of the APC first."
+ user << "You must remove the floor plating in front of the APC first!"
return
var/obj/item/stack/cable_coil/C = W
if(C.get_amount() < 10)
- user << "You need ten lengths of cable for APC."
+ user << "You need ten lengths of cable for APC!"
return
- user.visible_message("[user.name] adds cables to the APC frame.", \
- "You start adding cables to the APC frame...")
+ user.visible_message("[user.name] adds cables to the APC frame.", \
+ "You start adding cables to the APC frame...")
playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
if(do_after(user, 20))
if (C.amount >= 10 && !terminal && opened && has_electronics != 2)
@@ -492,8 +492,8 @@
terminal.dismantle(user)
else if (istype(W, /obj/item/weapon/module/power_control) && opened && has_electronics==0 && !((stat & BROKEN) || malfhack))
- user.visible_message("[user.name] inserts the power control board into [src].", \
- "You start to insert the power control board into the frame...")
+ user.visible_message("[user.name] inserts the power control board into [src].", \
+ "You start to insert the power control board into the frame...")
playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
if(do_after(user, 10))
if(has_electronics==0)
@@ -501,28 +501,28 @@
user << "You place the power control board inside the frame."
qdel(W)
else if (istype(W, /obj/item/weapon/module/power_control) && opened && has_electronics==0 && ((stat & BROKEN) || malfhack))
- user << "You cannot put the board inside, the frame is damaged."
+ user << "You cannot put the board inside, the frame is damaged!"
return
else if (istype(W, /obj/item/weapon/weldingtool) && opened && has_electronics==0 && !terminal)
var/obj/item/weapon/weldingtool/WT = W
if (WT.get_fuel() < 3)
- user << "You need more welding fuel to complete this task."
+ user << "You need more welding fuel to complete this task!"
return
- user.visible_message("[user.name] welds [src].", \
- "You start welding the APC frame...", \
- "You hear welding.")
+ user.visible_message("[user.name] welds [src].", \
+ "You start welding the APC frame...", \
+ "You hear welding.")
playsound(src.loc, 'sound/items/Welder.ogg', 50, 1)
if(do_after(user, 50))
if(!src || !WT.remove_fuel(3, user)) return
if (emagged || malfhack || (stat & BROKEN) || opened==2)
new /obj/item/stack/sheet/metal(loc)
user.visible_message(\
- "[user.name] has cut [src] apart with [W].",\
+ "[user.name] has cut [src] apart with [W].",\
"You disassembled the broken APC frame.")
else
new /obj/item/apc_frame(loc)
user.visible_message(\
- "[user.name] has cut [src] from the wall with [W].",\
+ "[user.name] has cut [src] from the wall with [W].",\
"You cut the APC frame from the wall.")
qdel(src)
return
@@ -531,18 +531,18 @@
if (opened==2)
opened = 1
user.visible_message(\
- "[user.name] has replaced the damaged APC frontal panel with a new one.",\
+ "[user.name] has replaced the damaged APC frontal panel with a new one.",\
"You replace the damaged APC frontal panel with a new one.")
qdel(W)
update_icon()
else if (istype(W, /obj/item/apc_frame) && opened && ((stat & BROKEN) || malfhack))
if (has_electronics)
- user << "You cannot repair this APC until you remove the electronics still inside."
+ user << "You cannot repair this APC until you remove the electronics still inside!"
return
- user.visible_message("[user.name] replaces the damaged APC frame with a new one.",\
- "You begin to replace the damaged APC frame...")
+ user.visible_message("[user.name] replaces the damaged APC frame with a new one.",\
+ "You begin to replace the damaged APC frame...")
if(do_after(user, 50))
- user << "You've replaced the damaged APC frame with a new one."
+ user << "You replace the damaged APC frame with a new one."
qdel(W)
stat &= ~BROKEN
malfai = null
@@ -557,9 +557,9 @@
&& W.w_class >= 3.0 \
&& prob(20) )
opened = 2
- user.visible_message("[user.name] has knocked down the APC cover with the [W.name]!", \
+ user.visible_message("[user.name] has knocked down the APC cover with the [W.name].", \
"You knock down the APC cover with your [W.name]!", \
- "You hear bang")
+ "You hear bang.")
update_icon()
else
if (istype(user, /mob/living/silicon))
@@ -573,11 +573,11 @@
/obj/machinery/power/apc/emag_act(mob/user as mob)
if(!emagged && !malfhack)
if(opened)
- user << "You must close the cover to swipe an ID card."
+ user << "You must close the cover to swipe an ID card!"
else if(wiresexposed)
- user << "You must close the panel first"
+ user << "You must close the panel first!"
else if(stat & (BROKEN|MAINT))
- user << "Nothing happens."
+ user << "Nothing happens!"
else
flick("apc-spark", src)
if (do_after(user,6))
@@ -587,7 +587,7 @@
user << "You emag the APC interface."
update_icon()
else
- user << "You fail to [ locked ? "unlock" : "lock"] the APC interface."
+ user << "You fail to [ locked ? "unlock" : "lock"] the APC interface!"
// attack with hand - remove cell (if cover open) or interact with the APC
@@ -604,7 +604,7 @@
cell.updateicon()
src.cell = null
- user.visible_message("[user.name] removes the power cell from [src.name]!",\
+ user.visible_message("[user.name] removes the power cell from [src.name]!",\
"You remove the power cell.")
//user << "You remove the power cell."
charging = 0
@@ -785,7 +785,7 @@
var/mob/living/carbon/human/H = user
if (istype(H))
if(H.getBrainLoss() >= 60)
- H.visible_message("[H] stares cluelessly at [src] and drools.")
+ H.visible_message("[H] stares cluelessly at [src] and drools.")
return 0
else if(prob(H.getBrainLoss()))
user << "You momentarily forget how to use [src]."
@@ -886,10 +886,10 @@
if(!istype(malf))
return
if(istype(malf.loc, /obj/machinery/power/apc)) // Already in an APC
- malf << "You must evacuate your current apc first."
+ malf << "You must evacuate your current APC first!"
return
if(!malf.can_shunt)
- malf << "You cannot shunt."
+ malf << "You cannot shunt!"
return
if(src.z != 1)
return
@@ -956,8 +956,8 @@
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
s.set_up(3, 1, src)
s.start()
- visible_message("The [src.name] suddenly lets out a blast of smoke and some sparks!", \
- "You hear sizzling electronics.")
+ visible_message("The [src.name] suddenly lets out a blast of smoke and some sparks!", \
+ "You hear sizzling electronics.")
/obj/machinery/power/apc/surplus()
diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm
index 10054d21e52..03c2ace4c12 100644
--- a/code/modules/power/cable.dm
+++ b/code/modules/power/cable.dm
@@ -135,7 +135,7 @@ By design, d1 is the smallest direction and d2 is the highest
if(istype(W, /obj/item/weapon/wirecutters))
if (shock(user, 50))
return
- visible_message("[user] cuts the cable.")
+ user.visible_message("[user] cuts the cable.", "You cut the cable.")
stored.add_fingerprint(user)
investigate_log("was cut by [key_name(usr, usr.client)] in [user.loc.loc]","wires")
Deconstruct()
@@ -144,7 +144,7 @@ By design, d1 is the smallest direction and d2 is the highest
else if(istype(W, /obj/item/stack/cable_coil))
var/obj/item/stack/cable_coil/coil = W
if (coil.get_amount() < 1)
- user << "Not enough cable"
+ user << "Not enough cable!"
return
coil.cable_join(src, user)
@@ -537,14 +537,14 @@ obj/structure/cable/proc/avail()
if(!istype(usr.loc,/turf))
return
if(src.amount <= 14)
- usr << "You need at least 15 lengths to make restraints!"
+ usr << "You need at least 15 lengths to make restraints!"
return
var/obj/item/weapon/restraints/handcuffs/cable/B = new /obj/item/weapon/restraints/handcuffs/cable(usr.loc)
B.icon_state = "cuff_[item_color]"
usr << "You wind some cable together to make some restraints."
src.use(15)
else
- usr << "You cannot do that."
+ usr << "You cannot do that!"
..()
// Items usable on a cable coil :
@@ -555,7 +555,7 @@ obj/structure/cable/proc/avail()
if( istype(W, /obj/item/weapon/wirecutters) && src.amount > 1)
src.amount--
new /obj/item/stack/cable_coil(user.loc, 1,item_color)
- user << "You cut a piece off the cable coil."
+ user << "You cut a piece off the cable coil."
src.update_icon()
return
@@ -567,18 +567,18 @@ obj/structure/cable/proc/avail()
else if(istype(W, /obj/item/stack/cable_coil))
var/obj/item/stack/cable_coil/C = W
if(C.amount >= MAXCOIL)
- user << "The coil is too long, you cannot add any more cable to it."
+ user << "The coil is too long, you cannot add any more cable to it!"
return
if( (C.amount + src.amount <= MAXCOIL) )
- user << "You join the cable coils together."
+ user << "You join the cable coils together."
C.give(src.amount) // give it cable
src.use(src.amount) // make sure this one cleans up right
return
else
var/amt = MAXCOIL - C.amount
- user << "You transfer [amt] length\s of cable from one coil to the other."
+ user << "You transfer [amt] length\s of cable from one coil to the other."
C.give(amt)
src.use(amt)
return
@@ -628,15 +628,15 @@ obj/structure/cable/proc/avail()
return
if(!T.can_have_cabling())
- user << "You can only lay cables on catwalks and plating!"
+ user << "You can only lay cables on catwalks and plating!"
return
if(get_amount() < 1) // Out of cable
- user << "There is no cable left."
+ user << "There is no cable left!"
return
if(get_dist(T,user) > 1) // Too far
- user << "You can't lay cable at a place that far away."
+ user << "You can't lay cable at a place that far away!"
return
else
@@ -649,7 +649,7 @@ obj/structure/cable/proc/avail()
for(var/obj/structure/cable/LC in T)
if(LC.d2 == dirn && LC.d1 == 0)
- user << "There's already a cable at that position."
+ user << "There's already a cable at that position!"
return
var/obj/structure/cable/C = get_new_cable(T)
@@ -690,7 +690,7 @@ obj/structure/cable/proc/avail()
return
if(get_dist(C, user) > 1) // make sure it's close enough
- user << "You can't lay cable at a place that far away."
+ user << "You can't lay cable at a place that far away!"
return
@@ -703,10 +703,10 @@ obj/structure/cable/proc/avail()
// one end of the clicked cable is pointing towards us
if(C.d1 == dirn || C.d2 == dirn)
if(!U.can_have_cabling()) //checking if it's a plating or catwalk
- user << "You can only lay cables on catwalks and plating!"
+ user << "You can only lay cables on catwalks and plating!"
return
if(U.intact) //can't place a cable if it's a plating with a tile on it
- user << "You can't lay cable there unless the floor tiles are removed."
+ user << "You can't lay cable there unless the floor tiles are removed!"
return
else
// cable is pointing at us, we're standing on an open tile
@@ -716,7 +716,7 @@ obj/structure/cable/proc/avail()
for(var/obj/structure/cable/LC in U) // check to make sure there's not a cable there already
if(LC.d1 == fdirn || LC.d2 == fdirn)
- user << "There's already a cable at that position."
+ user << "There's already a cable at that position!"
return
var/obj/structure/cable/NC = get_new_cable (U)
@@ -760,7 +760,7 @@ obj/structure/cable/proc/avail()
if(LC == C) // skip the cable we're interacting with
continue
if((LC.d1 == nd1 && LC.d2 == nd2) || (LC.d1 == nd2 && LC.d2 == nd1) ) // make sure no cable matches either direction
- user << "There's already a cable at that position."
+ user << "There's already a cable at that position!"
return
diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm
index a73e924ee08..68bf7c270b0 100644
--- a/code/modules/power/cell.dm
+++ b/code/modules/power/cell.dm
@@ -63,7 +63,7 @@
if(istype(W, /obj/item/weapon/reagent_containers/syringe))
var/obj/item/weapon/reagent_containers/syringe/S = W
- user << "You inject the solution into the power cell."
+ user << "You inject the solution into the power cell."
if(S.reagents.has_reagent("plasma", 5))
diff --git a/code/modules/power/gravitygenerator.dm b/code/modules/power/gravitygenerator.dm
index 61d2bb8a9f6..7196abe57e8 100644
--- a/code/modules/power/gravitygenerator.dm
+++ b/code/modules/power/gravitygenerator.dm
@@ -187,7 +187,7 @@ var/const/GRAV_NEEDS_WRENCH = 3
playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1)
broken_state++
else if(WT.isOn())
- user << "You don't have enough fuel to mend the damaged framework."
+ user << "You don't have enough fuel to mend the damaged framework!"
if(GRAV_NEEDS_PLASTEEL)
if(istype(I, /obj/item/stack/sheet/plasteel))
var/obj/item/stack/sheet/plasteel/PS = I
@@ -197,7 +197,7 @@ var/const/GRAV_NEEDS_WRENCH = 3
playsound(src.loc, 'sound/machines/click.ogg', 75, 1)
broken_state++
else
- user << "You need 10 sheets of plasteel."
+ user << "You need 10 sheets of plasteel!"
if(GRAV_NEEDS_WRENCH)
if(istype(I, /obj/item/weapon/wrench))
user << "You secure the plating to the framework."
@@ -347,7 +347,7 @@ var/const/GRAV_NEEDS_WRENCH = 3
/obj/machinery/gravity_generator/main/proc/pulse_radiation()
for(var/mob/living/L in view(7, src))
- L.apply_effect(20, IRRADIATE)
+ L.irradiate(20)
// Shake everyone on the z level to let them know that gravity was enagaged/disenagaged.
/obj/machinery/gravity_generator/main/proc/shake_everyone()
diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm
index 31e2944aa96..00eb9f8c827 100644
--- a/code/modules/power/lighting.dm
+++ b/code/modules/power/lighting.dm
@@ -36,9 +36,9 @@
return
var/turf/loc = get_turf(usr)
if (!istype(loc, /turf/simulated/floor))
- usr << "[src.name] cannot be placed on this spot."
+ usr << "[src.name] cannot be placed on this spot!"
return
- usr << "Attaching [src] to the wall."
+ usr << "You begin attaching [src] to the wall..."
playsound(src.loc, 'sound/machines/click.ogg', 75, 1)
var/constrdir = usr.dir
var/constrloc = usr.loc
@@ -55,7 +55,7 @@
newlight.fingerprintslast = src.fingerprintslast
usr.visible_message("[usr.name] attaches [src] to the wall.", \
- "You attach [src] to the wall.")
+ "You attach [src] to the wall.")
qdel(src)
/obj/item/light_fixture_frame/small
@@ -99,20 +99,20 @@
if (istype(W, /obj/item/weapon/wrench))
if (src.stage == 1)
playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1)
- usr << "You begin deconstructing [src]."
+ usr << "You begin deconstructing [src]..."
if (!do_after(usr, 30))
return
new /obj/item/stack/sheet/metal( get_turf(src.loc), sheets_refunded )
user.visible_message("[user.name] deconstructs [src].", \
- "You deconstruct [src].", "You hear a noise.")
+ "You deconstruct [src].", "You hear a ratchet.")
playsound(src.loc, 'sound/items/Deconstruct.ogg', 75, 1)
qdel(src)
if (src.stage == 2)
- usr << "You have to remove the wires first."
+ usr << "You have to remove the wires first!"
return
if (src.stage == 3)
- usr << "You have to unscrew the case first."
+ usr << "You have to unscrew the case first!"
return
if(istype(W, /obj/item/weapon/wirecutters))
@@ -125,7 +125,7 @@
src.icon_state = "bulb-construct-stage1"
new /obj/item/stack/cable_coil(get_turf(src.loc), 1, "red")
user.visible_message("[user.name] removes the wiring from [src].", \
- "You remove the wiring from [src].", "You hear a noise.")
+ "You remove the wiring from [src].", "You hear clicking.")
playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1)
return
@@ -140,9 +140,9 @@
src.icon_state = "bulb-construct-stage2"
src.stage = 2
user.visible_message("[user.name] adds wires to [src].", \
- "You add wires to [src].")
+ "You add wires to [src].")
else
- user << "You need one length of cable to wire [src]."
+ user << "You need one length of cable to wire [src]!"
return
if(istype(W, /obj/item/weapon/screwdriver))
@@ -154,7 +154,7 @@
src.icon_state = "bulb-empty"
src.stage = 3
user.visible_message("[user.name] closes [src]'s casing.", \
- "You close [src]'s casing.", "You hear a noise.")
+ "You close [src]'s casing.", "You hear screwing.")
playsound(src.loc, 'sound/items/Screwdriver.ogg', 75, 1)
switch(fixture_type)
@@ -277,7 +277,7 @@
update_icon()
if(on)
- if(luminosity != brightness)
+ if(!light || light.radius != brightness)
switchcount++
if(rigged)
if(status == LIGHT_OK && trigger)
@@ -295,11 +295,11 @@
use_power = 1
SetLuminosity(0)
- active_power_usage = (luminosity * 10)
+ active_power_usage = (brightness * 10)
if(on != on_gs)
on_gs = on
if(on)
- static_power_used = luminosity * 20 //20W per unit luminosity
+ static_power_used = brightness * 20 //20W per unit luminosity
addStaticPower(static_power_used, STATIC_LIGHT)
else
removeStaticPower(static_power_used, STATIC_LIGHT)
@@ -341,14 +341,14 @@
// attempt to insert light
if(istype(W, /obj/item/weapon/light))
if(status != LIGHT_EMPTY)
- user << "There is a [fitting] already inserted."
+ user << "There is a [fitting] already inserted!"
return
else
src.add_fingerprint(user)
var/obj/item/weapon/light/L = W
if(istype(L, light_type))
status = L.status
- user << "You insert the [L.name]."
+ user << "You insert the [L.name]."
switchcount = L.switchcount
rigged = L.rigged
brightness = L.brightness
@@ -361,7 +361,7 @@
if(on && rigged)
explode()
else
- user << "This type of light requires a [fitting]."
+ user << "This type of light requires a [fitting]!"
return
// attempt to break the light
@@ -376,7 +376,7 @@
user.visible_message("[user.name] smashed the light!", \
"You hit the light, and it smashes!", \
- "You hear a tinkle of breaking glass")
+ "You hear a tinkle of breaking glass.")
if(on && (W.flags & CONDUCT))
//if(!user.mutations & COLD_RESISTANCE)
if (prob(12))
@@ -384,14 +384,14 @@
broken()
else
- user.visible_message("[user.name] hits the light.")
+ user.visible_message("[user.name] hits the light!")
// attempt to stick weapon into light socket
else if(status == LIGHT_EMPTY)
if(istype(W, /obj/item/weapon/screwdriver)) //If it's a screwdriver open it.
playsound(src.loc, 'sound/items/Screwdriver.ogg', 75, 1)
- user.visible_message("[user.name] opens [src]'s casing.", \
- "You open [src]'s casing.", "You hear a noise.")
+ user.visible_message("[user.name] opens [src]'s casing.", \
+ "You open [src]'s casing.", "You hear a noise.")
var/obj/machinery/light_construct/newlight = null
switch(fitting)
if("tube")
@@ -409,7 +409,7 @@
qdel(src)
return
- user << "You stick \the [W] into the light socket!"
+ user << "You stick \the [W] into the light socket!"
if(has_power() && (W.flags & CONDUCT))
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
s.set_up(3, 1, src)
@@ -452,7 +452,7 @@
return
else if (status == LIGHT_OK||status == LIGHT_BURNED)
user.do_attack_animation(src)
- visible_message("[user.name] smashed the light!", "You hear a tinkle of breaking glass")
+ visible_message("[user.name] smashed the light!", "You hear a tinkle of breaking glass.")
broken()
return
@@ -463,7 +463,7 @@
return
else if (status == LIGHT_OK||status == LIGHT_BURNED)
M.do_attack_animation(src)
- visible_message("[M.name] smashed the light!", "You hear a tinkle of breaking glass")
+ visible_message("[M.name] smashed the light!", "You hear a tinkle of breaking glass.")
broken()
return
// attack with hand - remove tube/bulb
@@ -492,11 +492,11 @@
prot = 1
if(prot > 0)
- user << "You remove the light [fitting]"
+ user << "You remove the light [fitting]."
else if(istype(user) && user.dna.check_mutation(TK))
- user << "You telekinetically remove the light [fitting]."
+ user << "You telekinetically remove the light [fitting]."
else
- user << "You try to remove the light [fitting], but you burn your hand on it!"
+ user << "You try to remove the light [fitting], but you burn your hand on it!"
var/obj/item/organ/limb/affecting = H.get_organ("[user.hand ? "l" : "r" ]_arm")
if(affecting.take_damage( 0, 5 )) // 5 burn damage
@@ -504,7 +504,7 @@
H.updatehealth()
return // if burned, don't remove the light
else
- user << "You remove the light [fitting]."
+ user << "You remove the light [fitting]."
// create a light tube/bulb item and put it in the user's hand
var/obj/item/weapon/light/L = new light_type()
L.status = status
@@ -529,7 +529,7 @@
user << "There is no [fitting] in this light."
return
- user << "You telekinetically remove the light [fitting]."
+ user << "You telekinetically remove the light [fitting]."
// create a light tube/bulb item and put it in the user's hand
var/obj/item/weapon/light/L = new light_type()
L.status = status
@@ -681,7 +681,7 @@
if(istype(I, /obj/item/weapon/reagent_containers/syringe))
var/obj/item/weapon/reagent_containers/syringe/S = I
- user << "You inject the solution into \the [src]."
+ user << "You inject the solution into \the [src]."
if(S.reagents.has_reagent("plasma", 5))
@@ -707,7 +707,7 @@
/obj/item/weapon/light/proc/shatter()
if(status == LIGHT_OK || status == LIGHT_BURNED)
- src.visible_message("[name] shatters.","You hear a small glass object shatter.")
+ src.visible_message("[name] shatters.","You hear a small glass object shatter.")
status = LIGHT_BROKEN
force = 5
playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1)
diff --git a/code/modules/power/singularity/collector.dm b/code/modules/power/singularity/collector.dm
index 79f25526b21..3202414ffb7 100644
--- a/code/modules/power/singularity/collector.dm
+++ b/code/modules/power/singularity/collector.dm
@@ -42,11 +42,11 @@ var/global/list/rad_collectors = list()
if(!src.locked)
toggle_power()
user.visible_message("[user.name] turns the [src.name] [active? "on":"off"].", \
- "You turn the [src.name] [active? "on":"off"].")
+ "You turn the [src.name] [active? "on":"off"].")
investigate_log("turned [active?"on":"off"] by [user.key]. [P?"Fuel: [round(P.air_contents.toxins/0.29)]%":"It is empty"].","singulo")
return
else
- user << "The controls are locked!"
+ user << "The controls are locked!"
return
..()
@@ -59,10 +59,10 @@ var/global/list/rad_collectors = list()
atmosanalyzer_scan(P.air_contents, user)
else if(istype(W, /obj/item/weapon/tank/internals/plasma))
if(!src.anchored)
- user << "The [src] needs to be secured to the floor first."
+ user << "The [src] needs to be secured to the floor first!"
return 1
if(src.P)
- user << "There's already a plasma tank loaded."
+ user << "There's already a plasma tank loaded!"
return 1
user.drop_item()
src.P = W
@@ -74,32 +74,32 @@ var/global/list/rad_collectors = list()
return 1
else if(istype(W, /obj/item/weapon/wrench))
if(P)
- user << "Remove the plasma tank first."
+ user << "Remove the plasma tank first!"
return 1
if(!anchored && !isinspace())
playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1)
anchored = 1
user.visible_message("[user.name] secures the [src.name].", \
- "You secure the external bolts.", \
- "You hear a ratchet")
+ "You secure the external bolts.", \
+ "You hear a ratchet.")
connect_to_network()
else if(anchored)
playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1)
anchored = 0
user.visible_message("[user.name] unsecures the [src.name].", \
- "You unsecure the external bolts.", \
- "You hear a ratchet")
+ "You unsecure the external bolts.", \
+ "You hear a ratchet.")
disconnect_from_network()
else if(istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda))
if (src.allowed(user))
if(active)
src.locked = !src.locked
- user << "The controls are now [src.locked ? "locked." : "unlocked."]"
+ user << "You [src.locked ? "lock" : "unlock"] the controls."
else
src.locked = 0 //just in case it somehow gets locked
- user << "The controls can only be locked when \the [src] is active."
+ user << "The controls can only be locked when \the [src] is active!"
else
- user << "Access denied!"
+ user << "Access denied."
return 1
else
..()
diff --git a/code/modules/power/singularity/containment_field.dm b/code/modules/power/singularity/containment_field.dm
index 14062e210f5..ad420ffc5e6 100644
--- a/code/modules/power/singularity/containment_field.dm
+++ b/code/modules/power/singularity/containment_field.dm
@@ -94,8 +94,8 @@
user.Weaken(10)
user.burn_skin(shock_damage)
user.visible_message("[user.name] was shocked by the [src.name]!", \
- "You feel a powerful shock course through your body sending you flying!", \
- "You hear a heavy electrical crack.")
+ "You feel a powerful shock course through your body, sending you flying!", \
+ "You hear a heavy electrical crack.")
else if(issilicon(user))
if(prob(20))
@@ -103,7 +103,7 @@
user.take_overall_damage(0, shock_damage)
user.visible_message("[user.name] was shocked by the [src.name]!", \
"Energy pulse detected, system damaged!", \
- "You hear an electrical crack.")
+ "You hear an electrical crack.")
user.updatehealth()
bump(user)
diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm
index fe3691f5415..007d10b427b 100644
--- a/code/modules/power/singularity/emitter.dm
+++ b/code/modules/power/singularity/emitter.dm
@@ -30,7 +30,7 @@
if(usr.stat || !usr.canmove || usr.restrained())
return
if (src.anchored)
- usr << "It is fastened to the floor!"
+ usr << "It is fastened to the floor!"
return 0
src.dir = turn(src.dir, 90)
return 1
@@ -58,26 +58,26 @@
src.add_fingerprint(user)
if(state == 2)
if(!powernet)
- user << "The emitter isn't connected to a wire."
+ user << "The emitter isn't connected to a wire!"
return 1
if(!src.locked)
if(src.active==1)
src.active = 0
- user << "You turn off \the [src]."
+ user << "You turn off \the [src]."
message_admins("Emitter turned off by [key_name(user, user.client)](?) in ([x],[y],[z] - JMP)",0,1)
log_game("Emitter turned off by [user.ckey]([user]) in ([x],[y],[z])")
investigate_log("turned off by [user.key]","singulo")
else
src.active = 1
- user << "You turn on \the [src]."
+ user << "You turn on \the [src]."
src.shot_number = 0
src.fire_delay = 100
investigate_log("turned on by [user.key]","singulo")
update_icon()
else
- user << "The controls are locked!"
+ user << "The controls are locked!"
else
- user << "The [src] needs to be firmly secured to the floor first."
+ user << "The [src] needs to be firmly secured to the floor first!"
return 1
@@ -152,25 +152,25 @@
if(istype(W, /obj/item/weapon/wrench))
if(active)
- user << "Turn off \the [src] first."
+ user << "Turn off \the [src] first!"
return
switch(state)
if(0 && !isinspace())
state = 1
playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1)
user.visible_message("[user.name] secures [src.name] to the floor.", \
- "You secure the external reinforcing bolts to the floor.", \
- "You hear a ratchet")
+ "You secure the external reinforcing bolts to the floor.", \
+ "You hear a ratchet")
src.anchored = 1
if(1)
state = 0
playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1)
user.visible_message("[user.name] unsecures [src.name] reinforcing bolts from the floor.", \
- "You undo the external reinforcing bolts.", \
- "You hear a ratchet")
+ "You undo the external reinforcing bolts.", \
+ "You hear a ratchet.")
src.anchored = 0
if(2)
- user << "The [src.name] needs to be unwelded from the floor."
+ user << "The [src.name] needs to be unwelded from the floor!"
return
if(istype(W, /obj/item/weapon/weldingtool))
@@ -180,42 +180,42 @@
return
switch(state)
if(0)
- user << "The [src.name] needs to be wrenched to the floor."
+ user << "The [src.name] needs to be wrenched to the floor!"
if(1)
if (WT.remove_fuel(0,user))
playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1)
user.visible_message("[user.name] starts to weld the [src.name] to the floor.", \
- "You start to weld \the [src] to the floor.", \
- "You hear welding")
+ "You start to weld \the [src] to the floor...", \
+ "You hear welding.")
if (do_after(user,20))
if(!src || !WT.isOn()) return
state = 2
- user << "You weld \the [src] to the floor."
+ user << "You weld \the [src] to the floor."
connect_to_network()
if(2)
if (WT.remove_fuel(0,user))
playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1)
user.visible_message("[user.name] starts to cut the [src.name] free from the floor.", \
- "You start to cut \the [src] free from the floor.", \
- "You hear welding")
+ "You start to cut \the [src] free from the floor...", \
+ "You hear welding.")
if (do_after(user,20))
if(!src || !WT.isOn()) return
state = 1
- user << "You cut \the [src] free from the floor."
+ user << "You cut \the [src] free from the floor."
disconnect_from_network()
return
if(istype(W, /obj/item/weapon/card/id) || istype(W, /obj/item/device/pda))
if(emagged)
- user << "The lock seems to be broken."
+ user << "The lock seems to be broken!"
return
if(src.allowed(user))
if(active)
src.locked = !src.locked
- user << "The controls are now [src.locked ? "locked." : "unlocked."]"
+ user << "You [src.locked ? "lock" : "unlock"] the controls."
else
src.locked = 0 //just in case it somehow gets locked
- user << "The controls can only be locked when \the [src] is online."
+ user << "The controls can only be locked when \the [src] is online!"
else
user << "Access denied."
return
@@ -227,4 +227,4 @@
if(!emagged)
locked = 0
emagged = 1
- user.visible_message("[user.name] emags the [src.name].","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/field_generator.dm b/code/modules/power/singularity/field_generator.dm
index 4e05a8f837e..8cb5c1c626f 100644
--- a/code/modules/power/singularity/field_generator.dm
+++ b/code/modules/power/singularity/field_generator.dm
@@ -79,24 +79,24 @@ field_generator power level display
if(state == 2)
if(get_dist(src, user) <= 1)//Need to actually touch the thing to turn it on
if(src.active >= 1)
- user << "You are unable to turn off the [src.name] once it is online."
+ user << "You are unable to turn off the [src.name] once it is online!"
return 1
else
- user.visible_message("[user.name] turns on the [src.name]", \
- "You turn on the [src.name].", \
- "You hear heavy droning")
+ user.visible_message("[user.name] turns on the [src.name].", \
+ "You turn on the [src.name].", \
+ "You hear heavy droning.")
turn_on()
investigate_log("activated by [user.key].","singulo")
src.add_fingerprint(user)
else
- user << "The [src] needs to be firmly secured to the floor first."
+ user << "The [src] needs to be firmly secured to the floor first!"
return
/obj/machinery/field/generator/attackby(obj/item/W, mob/user, params)
if(active)
- user << "The [src] needs to be off."
+ user << "The [src] needs to be off!"
return
else if(istype(W, /obj/item/weapon/wrench))
switch(state)
@@ -104,47 +104,47 @@ field_generator power level display
state = 1
playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1)
user.visible_message("[user.name] secures [src.name] to the floor.", \
- "You secure the external reinforcing bolts to the floor.", \
- "You hear ratchet")
+ "You secure the external reinforcing bolts to the floor.", \
+ "You hear ratchet.")
src.anchored = 1
if(1)
state = 0
playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1)
user.visible_message("[user.name] unsecures [src.name] reinforcing bolts from the floor.", \
- "You undo the external reinforcing bolts.", \
- "You hear ratchet")
+ "You undo the external reinforcing bolts.", \
+ "You hear ratchet.")
src.anchored = 0
if(2)
- user << "The [src.name] needs to be unwelded from the floor."
+ user << "The [src.name] needs to be unwelded from the floor!"
return
else if(istype(W, /obj/item/weapon/weldingtool))
var/obj/item/weapon/weldingtool/WT = W
switch(state)
if(0)
- user << "The [src.name] needs to be wrenched to the floor."
+ user << "The [src.name] needs to be wrenched to the floor!"
return
if(1)
if (WT.remove_fuel(0,user))
playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1)
user.visible_message("[user.name] starts to weld the [src.name] to the floor.", \
- "You start to weld \the [src] to the floor.", \
- "You hear welding")
+ "You start to weld \the [src] to the floor...", \
+ "You hear welding.")
if (do_after(user,20))
if(!src || !WT.isOn()) return
state = 2
- user << "You weld the field generator to the floor."
+ user << "You weld the field generator to the floor."
else
return
if(2)
if (WT.remove_fuel(0,user))
playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1)
user.visible_message("[user.name] starts to cut the [src.name] free from the floor.", \
- "You start to cut \the [src] free from the floor.", \
- "You hear welding")
+ "You start to cut \the [src] free from the floor...", \
+ "You hear welding.")
if (do_after(user,20))
if(!src || !WT.isOn()) return
state = 1
- user << "You cut \the [src] free from the floor."
+ user << "You cut \the [src] free from the floor."
else
return
else
@@ -211,7 +211,7 @@ field_generator power level display
if(draw_power(round(power_draw/2,1)))
return 1
else
- visible_message("The [src.name] shuts down!", "You hear something shutting down")
+ visible_message("The [src.name] shuts down!", "You hear something shutting down.")
turn_off()
investigate_log("ran out of power and deactivated","singulo")
src.power = 0
diff --git a/code/modules/power/singularity/generator.dm b/code/modules/power/singularity/generator.dm
index f73e3bcfa7d..6d8e6763389 100644
--- a/code/modules/power/singularity/generator.dm
+++ b/code/modules/power/singularity/generator.dm
@@ -20,14 +20,14 @@
if(!anchored && !isinspace())
user.visible_message("[user.name] secures [src.name] to the floor.", \
- "You secure the [src.name] to the floor.", \
- "You hear a ratchet")
+ "You secure the [src.name] to the floor.", \
+ "You hear a ratchet.")
playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1)
anchored = 1
else if(anchored)
user.visible_message("[user.name] unsecures [src.name] from the floor.", \
- "You unsecure the [src.name] from the floor.", \
- "You hear a ratchet")
+ "You unsecure the [src.name] from the floor.", \
+ "You hear a ratchet.")
playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1)
anchored = 0
return
diff --git a/code/modules/power/singularity/particle_accelerator/particle.dm b/code/modules/power/singularity/particle_accelerator/particle.dm
index ed5d1f760d2..e7e3632b93e 100644
--- a/code/modules/power/singularity/particle_accelerator/particle.dm
+++ b/code/modules/power/singularity/particle_accelerator/particle.dm
@@ -56,16 +56,8 @@
/obj/effect/accelerated_particle/proc/toxmob(var/mob/living/M)
-/* var/radiation = (energy*2) //We don't need to do two multiplications and a single goddamn
- if(istype(M,/mob/living/carbon/human))
- if(M:wear_suit) //TODO: check for radiation protection
- radiation = round(radiation/2,1)
- if(istype(M,/mob/living/carbon/monkey))
- if(M:wear_suit) //TODO: check for radiation protection
- radiation = round(radiation/2,1)*/
- M.apply_effect((energy*6),IRRADIATE,0)
+ M.irradiate(energy*6)
M.updatehealth()
- //M << "\red You feel odd."
return
diff --git a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm
index 77972f145b6..9c21da66e97 100644
--- a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm
+++ b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm
@@ -218,7 +218,7 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin
"You add some wires.")
temp_state++
else
- user << "You need one length of cable to wire the [src.name]."
+ user << "You need one length of cable to wire the [src.name]!"
return
if(2)
if(istype(O, /obj/item/weapon/wirecutters))//TODO:Shock user if its on?
diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm
index 66f6d9dac2d..85d8089d926 100644
--- a/code/modules/power/singularity/singularity.dm
+++ b/code/modules/power/singularity/singularity.dm
@@ -25,7 +25,7 @@
var/target = null //its target. moves towards the target if it has one
var/last_failed_movement = 0//Will not move in the same dir if it couldnt before, will help with the getting stuck on fields thing
var/last_warning
-
+ allow_spin = 0
/obj/singularity/New(loc, var/starting_energy = 50, var/temp = 0)
//CARN: admin-alert for chuckle-fuckery.
admin_investigate_setup()
@@ -341,7 +341,7 @@
radiation = round(((src.energy-150)/50)*5,1)
radiationmin = round((radiation/5),1)//
for(var/mob/living/M in view(toxrange, src.loc))
- M.apply_effect(rand(radiationmin,radiation), IRRADIATE)
+ M.irradiate(rand(radiationmin,radiation))
toxdamage = (toxdamage - (toxdamage*M.getarmor(null, "rad")))
M.apply_effect(toxdamage, TOX)
return
diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm
index f3ace39921c..599cc293ec7 100644
--- a/code/modules/power/smes.dm
+++ b/code/modules/power/smes.dm
@@ -101,25 +101,25 @@
return
if(terminal) //is there already a terminal ?
- user << "This SMES already have a power terminal!"
+ user << "This SMES already have a power terminal!"
return
if(!panel_open) //is the panel open ?
- user << "You must open the maintenance panel first!"
+ user << "You must open the maintenance panel first!"
return
var/turf/T = get_turf(user)
if (T.intact) //is the floor plating removed ?
- user << "You must first remove the floor plating!"
+ user << "You must first remove the floor plating!"
return
var/obj/item/stack/cable_coil/C = I
if(C.amount < 10)
- user << "You need more wires."
+ user << "You need more wires!"
return
- user << "You start building the power terminal..."
+ user << "You start building the power terminal..."
playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
if(do_after(user, 20) && C.amount >= 10)
@@ -132,8 +132,8 @@
C.use(10)
user.visible_message(\
- "[user.name] has build a power terminal!",\
- "You build the power terminal.")
+ "[user.name] has built a power terminal.",\
+ "You build the power terminal.")
//build the terminal and link it to the network
make_terminal(T)
diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm
index fa2254fd807..36d4fe99f60 100644
--- a/code/modules/power/solar.dm
+++ b/code/modules/power/solar.dm
@@ -59,14 +59,14 @@
if(istype(W, /obj/item/weapon/crowbar))
playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
- user.visible_message("[user] begins to take the glass off the solar panel.")
+ user.visible_message("[user] begins to take the glass off the solar panel.", "You begin to take the glass off the solar panel...")
if(do_after(user, 50))
var/obj/item/solar_assembly/S = locate() in src
if(S)
S.loc = src.loc
S.give_glass()
playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
- user.visible_message("[user] takes the glass off the solar panel.")
+ user.visible_message("[user] takes the glass off the solar panel.", "You take the glass off the solar panel.")
qdel(src)
return
else if (W)
@@ -226,13 +226,13 @@
if(!anchored && isturf(loc))
if(istype(W, /obj/item/weapon/wrench))
anchored = 1
- user.visible_message("[user] wrenches the solar assembly into place.")
+ user.visible_message("[user] wrenches the solar assembly into place.", "You wrench the solar assembly into place.")
playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1)
return 1
else
if(istype(W, /obj/item/weapon/wrench))
anchored = 0
- user.visible_message("[user] unwrenches the solar assembly from it's place.")
+ user.visible_message("[user] unwrenches the solar assembly from its place.", "You unwrench the solar assembly from its place.")
playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1)
return 1
@@ -241,13 +241,13 @@
if(S.use(2))
glass_type = W.type
playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
- user.visible_message("[user] places the glass on the solar assembly.")
+ user.visible_message("[user] places the glass on the solar assembly.", "You place the glass on the solar assembly.")
if(tracker)
new /obj/machinery/power/tracker(get_turf(src), src)
else
new /obj/machinery/power/solar(get_turf(src), src)
else
- user << "You need two sheets of glass to put them into a solar panel."
+ user << "You need two sheets of glass to put them into a solar panel!"
return
return 1
@@ -256,13 +256,13 @@
tracker = 1
user.drop_item()
qdel(W)
- user.visible_message("[user] inserts the electronics into the solar assembly.")
+ user.visible_message("[user] inserts the electronics into the solar assembly.", "You insert the electronics into the solar assembly.")
return 1
else
if(istype(W, /obj/item/weapon/crowbar))
new /obj/item/weapon/tracker_electronics(src.loc)
tracker = 0
- user.visible_message("[user] takes out the electronics from the solar assembly.")
+ user.visible_message("[user] takes out the electronics from the solar assembly.", "You take out the electronics from the solar assembly.")
return 1
..()
diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm
index 6152f0e07ab..a04bf8dda44 100644
--- a/code/modules/power/supermatter/supermatter.dm
+++ b/code/modules/power/supermatter/supermatter.dm
@@ -119,7 +119,7 @@
var/mob/living/carbon/human/H = mob
H.hallucination += max(50, min(300, DETONATION_HALLUCINATION * sqrt(1 / (get_dist(mob, src) + 1)) ) )
var/rads = DETONATION_RADS * sqrt( 1 / (get_dist(mob, src) + 1) )
- mob.apply_effect(rads, IRRADIATE)
+ mob.irradiate(rads)
explode()
@@ -181,7 +181,7 @@
for(var/mob/living/l in range(src, round((power / 100) ** 0.25)))
var/rads = (power / 10) * sqrt( 1 / max(get_dist(l, src),1) )
- l.apply_effect(rads, IRRADIATE)
+ l.irradiate(rads)
power -= (power/500)**3
@@ -214,18 +214,18 @@
if(Adjacent(user))
return attack_hand(user)
else
- user << "You attempt to interface with the control circuits but find they are not connected to your network. Maybe in a future firmware update."
+ user << "You attempt to interface with the control circuits but find they are not connected to your network. Maybe in a future firmware update."
return
/obj/machinery/power/supermatter_shard/attack_ai(mob/user as mob)
- user << "You attempt to interface with the control circuits but find they are not connected to your network. Maybe in a future firmware update."
+ user << "You attempt to interface with the control circuits but find they are not connected to your network. Maybe in a future firmware update."
/obj/machinery/power/supermatter_shard/attack_hand(mob/living/user as mob)
if(!istype(user))
return
- user.visible_message("\The [user] reaches out and touches \the [src], inducing a resonance... \his body starts to glow and bursts into flames before flashing into ash.",\
- "You reach out and touch \the [src]. Everything starts burning and all you can hear is ringing. Your last thought is \"That was not a wise decision.\"",\
- "You hear an unearthly noise as a wave of heat washes over you.")
+ user.visible_message("\The [user] reaches out and touches \the [src], inducing a resonance... \his body starts to glow and bursts into flames before flashing into ash.",\
+ "You reach out and touch \the [src]. Everything starts burning and all you can hear is ringing. Your last thought is \"That was not a wise decision.\"",\
+ "You hear an unearthly noise as a wave of heat washes over you.")
playsound(get_turf(src), 'sound/effects/supermatter.ogg', 50, 1)
@@ -242,23 +242,23 @@
return
if(user.drop_item(W))
Consume(W)
- user.visible_message("As [user] touches \the [src] with \a [W], silence fills the room...",\
- "You touch \the [src] with \the [W], and everything suddenly goes silent.\"\n\The [W] flashes into dust as you flinch away from \the [src].",\
- "Everything suddenly goes silent.")
+ user.visible_message("As [user] touches \the [src] with \a [W], silence fills the room...",\
+ "You touch \the [src] with \the [W], and everything suddenly goes silent.\"\n\The [W] flashes into dust as you flinch away from \the [src].",\
+ "Everything suddenly goes silent.")
playsound(get_turf(src), 'sound/effects/supermatter.ogg', 50, 1)
- user.apply_effect(150, IRRADIATE)
+ user.irradiate(150)
/obj/machinery/power/supermatter_shard/Bumped(atom/AM as mob|obj)
if(istype(AM, /mob/living))
- AM.visible_message("\The [AM] slams into \the [src] inducing a resonance... \his body starts to glow and catch flame before flashing into ash.",\
- "You slam into \the [src] as your ears are filled with unearthly ringing. Your last thought is \"Oh, fuck.\"",\
- "You hear an unearthly noise as a wave of heat washes over you.")
+ AM.visible_message("\The [AM] slams into \the [src] inducing a resonance... \his body starts to glow and catch flame before flashing into ash.",\
+ "You slam into \the [src] as your ears are filled with unearthly ringing. Your last thought is \"Oh, fuck.\"",\
+ "You hear an unearthly noise as a wave of heat washes over you.")
else if(isobj(AM) && !istype(AM, /obj/effect))
- AM.visible_message("\The [AM] smacks into \the [src] and rapidly flashes to ash.",\
- "You hear a loud crack as you are washed with a wave of heat.")
+ AM.visible_message("\The [AM] smacks into \the [src] and rapidly flashes to ash.",\
+ "You hear a loud crack as you are washed with a wave of heat.")
else
return
@@ -283,10 +283,10 @@
//Some poor sod got eaten, go ahead and irradiate people nearby.
for(var/mob/living/L in range(10))
var/rads = 500 * sqrt( 1 / (get_dist(L, src) + 1) )
- L.apply_effect(rads, IRRADIATE)
+ L.irradiate(rads)
investigate_log("has irradiated [L] after consuming [AM].", "supermatter")
if(L in view())
- L.show_message("As \the [src] slowly stops resonating, you find your skin covered in new radiation burns.", 1,\
- "The unearthly ringing subsides and you notice you have new radiation burns.", 2)
+ L.show_message("As \the [src] slowly stops resonating, you find your skin covered in new radiation burns.", 1,\
+ "The unearthly ringing subsides and you notice you have new radiation burns.", 2)
else
- L.show_message("You hear an uneartly ringing and notice your skin is covered in fresh radiation burns.", 2)
+ L.show_message("You hear an uneartly ringing and notice your skin is covered in fresh radiation burns.", 2)
diff --git a/code/modules/power/terminal.dm b/code/modules/power/terminal.dm
index 834f7e3f9b3..724de7a1b41 100644
--- a/code/modules/power/terminal.dm
+++ b/code/modules/power/terminal.dm
@@ -52,12 +52,12 @@
if(istype(loc, /turf/simulated))
var/turf/simulated/T = loc
if(T.intact)
- user << "You must first expose the power terminal!"
+ user << "You must first expose the power terminal!"
return
if(master && master.can_terminal_dismantle())
- user.visible_message("[user.name] dismantles the power terminal from [master].", \
- "You begin to cut the cables...")
+ user.visible_message("[user.name] dismantles the power terminal from [master].", \
+ "You begin to cut the cables...")
playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
if(do_after(user, 50))
diff --git a/code/modules/power/tracker.dm b/code/modules/power/tracker.dm
index 9b66f6afb91..2ce74ae88dd 100644
--- a/code/modules/power/tracker.dm
+++ b/code/modules/power/tracker.dm
@@ -62,14 +62,14 @@
if(istype(W, /obj/item/weapon/crowbar))
playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
- user.visible_message("[user] begins to take the glass off the solar tracker.")
+ user.visible_message("[user] begins to take the glass off the solar tracker.", "You begin to take the glass off the solar tracker...")
if(do_after(user, 50))
var/obj/item/solar_assembly/S = locate() in src
if(S)
S.loc = src.loc
S.give_glass()
playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
- user.visible_message("[user] takes the glass off the tracker.")
+ user.visible_message("[user] takes the glass off the tracker.", "You take the glass off the tracker.")
qdel(src)
return
..()
diff --git a/code/modules/projectiles/ammunition.dm b/code/modules/projectiles/ammunition.dm
index 5ff242be8aa..f2055dc64a3 100644
--- a/code/modules/projectiles/ammunition.dm
+++ b/code/modules/projectiles/ammunition.dm
@@ -51,7 +51,7 @@
box.update_icon()
user << "You collect [boolets] shell\s. [box] now contains [box.stored_ammo.len] shell\s."
else
- user << "You fail to collect anything."
+ user << "You fail to collect anything!"
//Boxes of ammo
/obj/item/ammo_box
diff --git a/code/modules/projectiles/ammunition/energy.dm b/code/modules/projectiles/ammunition/energy.dm
index aa1e1efa356..d170962a7ae 100644
--- a/code/modules/projectiles/ammunition/energy.dm
+++ b/code/modules/projectiles/ammunition/energy.dm
@@ -125,10 +125,14 @@
/obj/item/ammo_casing/energy/plasma
projectile_type = /obj/item/projectile/plasma
select_name = "plasma burst"
- fire_sound = 'sound/weapons/pulse.ogg'
+ fire_sound = 'sound/weapons/Laser.ogg'
+ delay = 10
+ e_cost = 25
/obj/item/ammo_casing/energy/plasma/adv
projectile_type = /obj/item/projectile/plasma/adv
+ delay = 8
+ e_cost = 10
/obj/item/ammo_casing/energy/wormhole
projectile_type = /obj/item/projectile/beam/wormhole
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index 57606d89072..4cc38cb4fc2 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -91,7 +91,7 @@
if(!message)
return
if(pointblank)
- user.visible_message("[user] fires [src] point blank at [pbtarget]!", "You fire [src] point blank at [pbtarget]!", "You hear a [istype(src, /obj/item/weapon/gun/energy) ? "laser blast" : "gunshot"]!")
+ user.visible_message("[user] fires [src] point blank at [pbtarget]!", "You fire [src] point blank at [pbtarget]!", "You hear a [istype(src, /obj/item/weapon/gun/energy) ? "laser blast" : "gunshot"]!")
else
user.visible_message("[user] fires [src]!", "You fire [src]!", "You hear a [istype(src, /obj/item/weapon/gun/energy) ? "laser blast" : "gunshot"]!")
@@ -119,7 +119,7 @@
if(istype(user, /mob/living))
var/mob/living/M = user
if (M.disabilities & CLUMSY && prob(40))
- user << "You shoot yourself in the foot with \the [src]!"
+ user << "You shoot yourself in the foot with \the [src]!"
process_fire(user,user,0,params)
M.drop_item()
return
@@ -134,7 +134,7 @@
/obj/item/weapon/gun/proc/can_trigger_gun(mob/living/carbon/user)
if (!user.IsAdvancedToolUser())
- user << "You don't have the dexterity to do this!"
+ user << "You don't have the dexterity to do this!"
return 0
if(!handle_pins(user))
@@ -143,10 +143,10 @@
if(trigger_guard)
if(istype(user) && user.dna)
if(user.dna.check_mutation(HULK))
- user << "Your meaty finger is much too large for the trigger guard!"
+ user << "Your meaty finger is much too large for the trigger guard!"
return 0
if(NOGUNS in user.dna.species.specflags)
- user << "Your fingers don't fit in the trigger guard!"
+ user << "Your fingers don't fit in the trigger guard!"
return 0
return 1
@@ -159,7 +159,7 @@
pin.auth_fail(user)
return 0
else
- user << "\The [src]'s trigger is locked. This weapon doesn't have a firing pin installed!"
+ user << "\The [src]'s trigger is locked. This weapon doesn't have a firing pin installed!"
return 0
@@ -232,7 +232,7 @@
if(can_flashlight)
if(!F)
if(user.l_hand != src && user.r_hand != src)
- user << "You'll need [src] in your hands to do that."
+ user << "You'll need [src] in your hands to do that!"
return
user.drop_item()
user << "You click [S] into place on [src]."
@@ -247,7 +247,7 @@
if(istype(A, /obj/item/weapon/screwdriver))
if(F)
if(user.l_hand != src && user.r_hand != src)
- user << "You'll need [src] in your hands to do that."
+ user << "You'll need [src] in your hands to do that!"
return
for(var/obj/item/device/flashlight/seclite/S in src)
user << "You unscrew the seclite from [src]."
@@ -275,7 +275,7 @@
var/mob/living/carbon/human/user = usr
if(!isturf(user.loc))
- user << "You cannot turn the light on while in this [user.loc]."
+ user << "You cannot turn the light on while in this [user.loc]!"
F.on = !F.on
user << "You toggle the gunlight [F.on ? "on":"off"]."
diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm
index d342e89b0d4..b728fc3a886 100644
--- a/code/modules/projectiles/guns/energy.dm
+++ b/code/modules/projectiles/guns/energy.dm
@@ -67,7 +67,7 @@
fire_sound = shot.fire_sound
fire_delay = shot.delay
if (shot.select_name)
- user << "[src] is now set to [shot.select_name]."
+ user << "[src] is now set to [shot.select_name]."
update_icon()
return
diff --git a/code/modules/projectiles/guns/energy/nuclear.dm b/code/modules/projectiles/guns/energy/nuclear.dm
index d5011d4e7d5..dff570dca52 100644
--- a/code/modules/projectiles/guns/energy/nuclear.dm
+++ b/code/modules/projectiles/guns/energy/nuclear.dm
@@ -62,14 +62,14 @@
M << "Your gun feels pleasantly warm for a moment."
else
M << "You feel a warm sensation."
- M.apply_effect(rand(3,120), IRRADIATE)
+ M.irradiate(rand(3,120))
lightfail = 1
else
for (var/mob/living/M in range(rand(1,4),src)) //Big failure, TIME FOR RADIATION BITCHES
if (src in M.contents)
M << "Your gun's reactor overloads!"
M << "You feel a wave of heat wash over you."
- M.apply_effect(300, IRRADIATE)
+ M.irradiate(300)
crit_fail = 1 //break the gun so it stops recharging
SSobj.processing.Remove(src)
update_icon()
diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm
index 9fb83e560f7..58baa81e928 100644
--- a/code/modules/projectiles/guns/energy/special.dm
+++ b/code/modules/projectiles/guns/energy/special.dm
@@ -125,51 +125,17 @@
cell_type = "/obj/item/weapon/stock_parts/cell/emproof"
needs_permit = 0 // Aparently these are safe to carry? I'm sure Golliaths would disagree.
var/overheat = 0
+ var/overheat_time = 16
var/recent_reload = 1
- var/range_add = 0
- var/overheat_time = 20
- upgrades = list("diamond" = 0, "screwdriver" = 0, "plasma" = 0)
unique_rename = 1
-/obj/item/weapon/gun/energy/kinetic_accelerator/newshot()
- ..()
- if(chambered && chambered.BB)
- var/obj/item/projectile/kinetic/charge = chambered.BB
- charge.range += range_add
-
-
-/obj/item/weapon/gun/energy/kinetic_accelerator/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
- if(istype(W, /obj/item/weapon/screwdriver) && upgrades["screwdriver"] < 3)
- upgrades["screwdriver"]++
- overheat_time -= 1
- user << "You tweak [src]'s thermal exchanger."
-
-
- else if(istype(W, /obj/item/stack))
- var/obj/item/stack/S = W
-
- if(istype(S, /obj/item/stack/sheet/mineral/diamond) && upgrades["diamond"] < 3)
- upgrades["diamond"]++
- overheat_time -= 3
- user << "You upgrade [src]'s thermal exchanger with diamonds."
- S.use(1)
-
- if(istype(S, /obj/item/stack/sheet/mineral/plasma) && upgrades["plasma"] < 2)
- upgrades["plasma"]++
- range_add++
- user << "You upgrade [src]'s accelerating chamber with plasma."
- if(prob(5 * (range_add + 1) * (range_add + 1)) && power_supply)
- power_supply.rigged = 1 // This is dangerous!
- S.use(1)
-
- ..()
-
/obj/item/weapon/gun/energy/kinetic_accelerator/shoot_live_shot()
overheat = 1
spawn(overheat_time)
overheat = 0
recent_reload = 0
..()
+
/obj/item/weapon/gun/energy/kinetic_accelerator/emp_act(severity)
return
@@ -196,6 +162,7 @@
suppressed = 1
ammo_type = list(/obj/item/ammo_casing/energy/bolt)
unique_rename = 0
+ overheat_time = 20
/obj/item/weapon/gun/energy/kinetic_accelerator/crossbow/large
name = "energy crossbow"
@@ -213,65 +180,36 @@
desc = "A mining tool capable of expelling concentrated plasma bursts. You could use it to cut limbs off of xenos! Or, you know, mine stuff."
icon_state = "plasmacutter"
item_state = "plasmacutter"
- force = 15
- damtype = "fire"
modifystate = -1
origin_tech = "combat=1;materials=3;magnets=2;plasmatech=2;engineering=1"
ammo_type = list(/obj/item/ammo_casing/energy/plasma)
flags = CONDUCT | OPENCONTAINER
attack_verb = list("attacked", "slashed", "cut", "sliced")
can_charge = 0
- var/volume = 15
-/obj/item/weapon/gun/energy/plasmacutter/New()
+/obj/item/weapon/gun/energy/plasmacutter/examine(mob/user)
..()
- create_reagents(volume)
-
-/obj/item/weapon/gun/energy/plasmacutter/newshot()
- if (!ammo_type || !reagents) return
- var/obj/item/ammo_casing/energy/shot = ammo_type[select]
-
- var/amount = shot.e_cost / 100
-
- if(!reagents.get_reagent_amount("plasma") >= amount)
- return
-
- reagents.remove_reagent("plasma", amount)
- chambered = shot
- chambered.newshot()
- return
-
-/obj/item/weapon/gun/energy/plasmacutter/examine()
- ..()
- usr << "Has [reagents.get_reagent_amount("plasma")] unit\s of plasma left."
- return
+ if(power_supply)
+ user <<"[src] is [round(power_supply.percent())]% charged."
/obj/item/weapon/gun/energy/plasmacutter/attackby(var/obj/item/A, var/mob/user)
- if(reagents.maximum_volume > reagents.total_volume)
- if(istype(A, /obj/item/stack/sheet/mineral/plasma))
- var/obj/item/stack/sheet/S = A
- S.use(1)
- reagents.add_reagent("plasma", 20)
- user << "You refill [src] with [S]. [reagents.get_reagent_amount("plasma")] units of plasma left."
- if(istype(A, /obj/item/weapon/ore/plasma))
- qdel(A)
- reagents.add_reagent("plasma", 10)
- user << "You refill [src] with [A]. [reagents.get_reagent_amount("plasma")] units of plasma left."
- if(istype(A, /obj/item/weapon/storage/bag/ore))
- if(locate(/obj/item/weapon/ore/plasma) in A)
- attackby(locate(/obj/item/weapon/ore/plasma) in A, user)
- ..()
-
-/obj/item/weapon/gun/energy/plasmacutter/charged/New()
- ..()
- reagents.add_reagent("plasma", volume)
+ if(istype(A, /obj/item/stack/sheet/mineral/plasma))
+ var/obj/item/stack/sheet/S = A
+ S.use(1)
+ power_supply.give(1000)
+ user << "You insert [A] in [src], recharging it."
+ else if(istype(A, /obj/item/weapon/ore/plasma))
+ qdel(A)
+ power_supply.give(500)
+ user << "You insert [A] in [src], recharging it."
+ else
+ ..()
/obj/item/weapon/gun/energy/plasmacutter/adv
name = "advanced plasma cutter"
icon_state = "adv_plasmacutter"
origin_tech = "combat=3;materials=4;magnets=3;plasmatech=3;engineering=2"
ammo_type = list(/obj/item/ammo_casing/energy/plasma/adv)
- volume = 25
/obj/item/weapon/gun/energy/disabler
name = "disabler"
diff --git a/code/modules/projectiles/guns/grenade_launcher.dm b/code/modules/projectiles/guns/grenade_launcher.dm
new file mode 100644
index 00000000000..7e4071a78a9
--- /dev/null
+++ b/code/modules/projectiles/guns/grenade_launcher.dm
@@ -0,0 +1,60 @@
+/obj/item/weapon/gun/grenadelauncher
+ name = "grenade launcher"
+ desc = "a terrible, terrible thing. it's really awful!"
+ icon = 'icons/obj/guns/projectile.dmi'
+ icon_state = "riotgun"
+ item_state = "riotgun"
+ w_class = 4.0
+ throw_speed = 2
+ throw_range = 7
+ force = 5.0
+ var/list/grenades = new/list()
+ var/max_grenades = 3
+ m_amt = 2000
+
+/obj/item/weapon/gun/grenadelauncher/examine(mob/user)
+ ..()
+ user << "[grenades] / [max_grenades] grenades loaded."
+
+/obj/item/weapon/gun/grenadelauncher/attackby(obj/item/I as obj, mob/user as mob, params)
+
+ if((istype(I, /obj/item/weapon/grenade)))
+ if(grenades.len < max_grenades)
+ user.drop_item()
+ I.loc = src
+ grenades += I
+ user << "You put the grenade in the grenade launcher."
+ user << "[grenades.len] / [max_grenades] Grenades."
+ else
+ usr << "The grenade launcher cannot hold more grenades."
+
+/obj/item/weapon/gun/grenadelauncher/afterattack(obj/target, mob/user , flag)
+
+ if (istype(target, /obj/item/weapon/storage/backpack ))
+ return
+
+ else if (locate (/obj/structure/table, src.loc))
+ return
+
+ else if(target == user)
+ return
+
+ if(grenades.len)
+ spawn(0) fire_grenade(target,user)
+ else
+ usr << "The grenade launcher is empty."
+
+/obj/item/weapon/gun/grenadelauncher/proc/fire_grenade(atom/target, mob/user)
+ user.visible_message("[user] fired a grenade!", \
+ "You fire the grenade launcher!")
+ var/obj/item/weapon/grenade/chem_grenade/F = grenades[1] //Now with less copypasta!
+ grenades -= F
+ F.loc = user.loc
+ F.throw_at(target, 30, 2)
+ message_admins("[key_name_admin(user)] fired a grenade ([F.name]) from a grenade launcher ([src.name]).")
+ log_game("[key_name(user)] fired a grenade ([F.name]) from a grenade launcher ([src.name]).")
+ F.active = 1
+ F.icon_state = initial(icon_state) + "_active"
+ playsound(user.loc, 'sound/weapons/armbomb.ogg', 75, 1, -3)
+ spawn(15)
+ F.prime()
diff --git a/code/modules/projectiles/guns/magic/wand.dm b/code/modules/projectiles/guns/magic/wand.dm
index ad7246f8359..20cf03caaa3 100644
--- a/code/modules/projectiles/guns/magic/wand.dm
+++ b/code/modules/projectiles/guns/magic/wand.dm
@@ -48,7 +48,7 @@
/obj/item/weapon/gun/magic/wand/proc/zap_self(mob/living/user as mob)
- user.visible_message("[user] zaps \himself with [src]!")
+ user.visible_message("[user] zaps \himself with [src].")
playsound(user, fire_sound, 50, 1)
user.attack_log += "\[[time_stamp()]\] [user]/[user.ckey] zapped \himself with a [src]"
diff --git a/code/modules/projectiles/guns/projectile.dm b/code/modules/projectiles/guns/projectile.dm
index 1281adc83e5..66184119b45 100644
--- a/code/modules/projectiles/guns/projectile.dm
+++ b/code/modules/projectiles/guns/projectile.dm
@@ -79,10 +79,10 @@
update_icon()
return
else
- user << "[src] already has a suppressor."
+ user << "[src] already has a suppressor!"
return
else
- user << "You can't seem to figure out how to fit [S] on [src]."
+ user << "You can't seem to figure out how to fit [S] on [src]!"
return
return 0
diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm
index 5fe4cac6f8f..010b3686cc6 100644
--- a/code/modules/projectiles/guns/projectile/automatic.dm
+++ b/code/modules/projectiles/guns/projectile/automatic.dm
@@ -88,6 +88,9 @@
burst_size = 2
pin = /obj/item/device/firing_pin/implant/pindicate
+/obj/item/weapon/gun/projectile/automatic/c20r/unrestricted
+ pin = /obj/item/device/firing_pin
+
/obj/item/weapon/gun/projectile/automatic/c20r/New()
..()
update_icon()
@@ -133,7 +136,7 @@
/obj/item/weapon/gun/projectile/automatic/l6_saw/afterattack(atom/target as mob|obj|turf, mob/living/user as mob|obj, flag, params) //what I tried to do here is just add a check to see if the cover is open or not and add an icon_state change because I can't figure out how c-20rs do it with overlays
if(cover_open)
- user << "[src]'s cover is open! Close it before firing!"
+ user << "[src]'s cover is open! Close it before firing!"
else
..()
update_icon()
@@ -157,7 +160,7 @@
/obj/item/weapon/gun/projectile/automatic/l6_saw/attackby(var/obj/item/A as obj, mob/user as mob, params)
if(!cover_open)
- user << "[src]'s cover is closed! You can't insert a new mag!"
+ user << "[src]'s cover is closed! You can't insert a new mag."
return
..()
@@ -175,6 +178,9 @@
fire_delay = 2
pin = /obj/item/device/firing_pin/implant/pindicate
+/obj/item/weapon/gun/projectile/automatic/m90/unrestricted
+ pin = /obj/item/device/firing_pin
+
/obj/item/weapon/gun/projectile/automatic/m90/New()
..()
underbarrel = new /obj/item/weapon/gun/projectile/revolver/grenadelauncher(src)
diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm
index 0073e04b2fe..471b5401196 100644
--- a/code/modules/projectiles/guns/projectile/revolver.dm
+++ b/code/modules/projectiles/guns/projectile/revolver.dm
@@ -39,7 +39,7 @@
if (num_unloaded)
user << "You unload [num_unloaded] shell\s from [src]."
else
- user << "[src] is empty."
+ user << "[src] is empty!"
/obj/item/weapon/gun/projectile/revolver/can_shoot()
return get_ammo(0,0)
@@ -77,7 +77,7 @@
if(magazine.caliber != initial(magazine.caliber))
if(prob(70 - (magazine.ammo_count() * 10))) //minimum probability of 10, maximum of 60
playsound(user, fire_sound, 50, 1)
- user << "[src] blows up in your face!"
+ user << "[src] blows up in your face!"
user.take_organ_damage(0,20)
user.drop_item()
qdel(src)
@@ -88,31 +88,31 @@
..()
if(istype(A, /obj/item/weapon/screwdriver))
if(magazine.caliber == "38")
- user << "You begin to reinforce the barrel of [src]."
+ user << "You begin to reinforce the barrel of [src]..."
if(magazine.ammo_count())
afterattack(user, user) //you know the drill
- user.visible_message("[src] goes off!", "[src] goes off in your face!")
+ user.visible_message("[src] goes off!", "[src] goes off in your face!")
return
if(do_after(user, 30))
if(magazine.ammo_count())
- user << "You can't modify it!"
+ user << "You can't modify it!"
return
magazine.caliber = "357"
desc = "The barrel and chamber assembly seems to have been modified."
- user << "You reinforce the barrel of [src]! Now it will fire .357 rounds."
+ user << "You reinforce the barrel of [src]. Now it will fire .357 rounds."
else
- user << "You begin to revert the modifications to [src]."
+ user << "You begin to revert the modifications to [src]..."
if(magazine.ammo_count())
afterattack(user, user) //and again
- user.visible_message("[src] goes off!", "[src] goes off in your face!")
+ user.visible_message("[src] goes off!", "[src] goes off in your face!")
return
if(do_after(user, 30))
if(magazine.ammo_count())
- user << "You can't modify it!"
+ user << "You can't modify it!"
return
magazine.caliber = "38"
desc = initial(desc)
- user << "You remove the modifications on [src]! Now it will fire .38 rounds."
+ user << "You remove the modifications on [src]. Now it will fire .38 rounds."
/obj/item/weapon/gun/projectile/revolver/mateba
@@ -147,9 +147,9 @@
/obj/item/weapon/gun/projectile/revolver/russian/attackby(var/obj/item/A as obj, mob/user as mob, params)
var/num_loaded = ..()
if(num_loaded)
- user.visible_message("[user] loads a single bullet into the revolver and spins the chamber.", "You load a single bullet into the chamber and spin it.")
+ user.visible_message("[user] loads a single bullet into the revolver and spins the chamber.", "You load a single bullet into the chamber and spin it.")
else
- user.visible_message("[user] spins the chamber of the revolver.", "You spin the revolver's chamber.")
+ user.visible_message("[user] spins the chamber of the revolver.", "You spin the revolver's chamber.")
if(get_ammo() > 0)
Spin()
update_icon()
@@ -158,7 +158,7 @@
/obj/item/weapon/gun/projectile/revolver/russian/attack_self(mob/user as mob)
if(!spun && can_shoot())
- user.visible_message("[user] spins the chamber of the revolver.", "You spin the revolver's chamber.")
+ user.visible_message("[user] spins the chamber of the revolver.", "You spin the revolver's chamber.")
Spin()
else
var/num_unloaded = 0
@@ -170,7 +170,7 @@
CB.update_icon()
num_unloaded++
if (num_unloaded)
- user << "You unload [num_unloaded] shell\s from [src]!"
+ user << "You unload [num_unloaded] shell\s from [src]."
else
user << "[src] is empty."
@@ -185,13 +185,13 @@
return
if(target != user)
if(ismob(target))
- user << "A mechanism prevents you from shooting anyone but yourself."
+ user << "A mechanism prevents you from shooting anyone but yourself!"
return
if(ishuman(user))
var/mob/living/carbon/human/H = user
if(!spun)
- user << "You need to spin the revolver's chamber first."
+ user << "You need to spin the revolver's chamber first!"
return
spun = 0
@@ -204,9 +204,9 @@
var/limb_name = affecting.getDisplayName()
if(affecting.name == "head" || affecting.name == "eyes" || affecting.name == "mouth")
user.apply_damage(300, BRUTE, affecting)
- user.visible_message("[user.name] fires [src] at \his head!", "You fire [src] at your head!", "You hear a gunshot!")
+ user.visible_message("[user.name] fires [src] at \his head!", "You fire [src] at your head!", "You hear a gunshot!")
else
- user.visible_message("[user.name] cowardly fires [src] at \his [limb_name]!", "You cowardly fire [src] at your [limb_name]!", "You hear a gunshot!")
+ user.visible_message("[user.name] cowardly fires [src] at \his [limb_name]!", "You cowardly fire [src] at your [limb_name]!", "You hear a gunshot!")
return
user.visible_message("*click*")
diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm
index 0baee44780b..e5d5b462c6d 100644
--- a/code/modules/projectiles/guns/projectile/shotgun.dm
+++ b/code/modules/projectiles/guns/projectile/shotgun.dm
@@ -175,7 +175,7 @@
if (num_unloaded)
user << "You break open \the [src] and unload [num_unloaded] shell\s."
else
- user << "[src] is empty."
+ user << "[src] is empty!"
// IMPROVISED SHOTGUN //
@@ -204,7 +204,7 @@
user << "You tie the lengths of cable to the shotgun, making a sling."
update_icon()
else
- user << "You need at least ten lengths of cable if you want to make a sling."
+ user << "You need at least ten lengths of cable if you want to make a sling!"
return
// Sawing guns related procs //
@@ -224,13 +224,13 @@
/obj/item/weapon/gun/projectile/proc/sawoff(mob/user as mob)
if(sawn_state == SAWN_OFF)
- user << "\The [src] is already shortened."
+ user << "\The [src] is already shortened!"
return
if(sawn_state == SAWN_SAWING)
return
- user.visible_message("[user] begins to shorten \the [src].", "You begin to shorten \the [src].")
+ user.visible_message("[user] begins to shorten \the [src].", "You begin to shorten \the [src]...")
//if there's any live ammo inside the gun, makes it go off
if(blow_up(user))
@@ -240,7 +240,7 @@
sawn_state = SAWN_SAWING
if(do_after(user, 30))
- user.visible_message("[user] shortens \the [src]!", "You shorten \the [src]!")
+ user.visible_message("[user] shortens \the [src]!", "You shorten \the [src].")
name = "sawn-off [src.name]"
desc = sawn_desc
icon_state = "[icon_state]-sawn"
diff --git a/code/modules/projectiles/guns/syringe_gun.dm b/code/modules/projectiles/guns/syringe_gun.dm
new file mode 100644
index 00000000000..2fb641d6c56
--- /dev/null
+++ b/code/modules/projectiles/guns/syringe_gun.dm
@@ -0,0 +1,79 @@
+/obj/item/weapon/gun/syringe
+ name = "syringe gun"
+ desc = "A spring loaded rifle designed to fit syringes, used to incapacitate unruly patients from a distance."
+ icon_state = "syringegun"
+ item_state = "syringegun"
+ w_class = 3
+ throw_speed = 3
+ throw_range = 7
+ force = 4
+ m_amt = 2000
+ clumsy_check = 0
+ fire_sound = 'sound/items/syringeproj.ogg'
+ var/list/syringes = list()
+ var/max_syringes = 1
+
+/obj/item/weapon/gun/syringe/New()
+ ..()
+ chambered = new /obj/item/ammo_casing/syringegun(src)
+
+/obj/item/weapon/gun/syringe/proc/newshot()
+ if(!syringes.len) return
+
+ var/obj/item/weapon/reagent_containers/syringe/S = syringes[1]
+
+ if(!S) return
+
+ chambered.BB = new /obj/item/projectile/bullet/dart/syringe(src)
+ S.reagents.trans_to(chambered.BB, S.reagents.total_volume)
+ chambered.BB.name = S.name
+ syringes.Remove(S)
+
+ qdel(S)
+ return
+
+/obj/item/weapon/gun/syringe/process_chamber()
+ return
+
+/obj/item/weapon/gun/syringe/afterattack(atom/target as mob|obj|turf, mob/living/user as mob|obj, params)
+ if(target == loc)
+ return
+ newshot()
+ ..()
+
+/obj/item/weapon/gun/syringe/examine(mob/user)
+ ..()
+ user << "Can hold [max_syringes] syringe\s. Has [syringes.len] syringe\s remaining."
+
+/obj/item/weapon/gun/syringe/attack_self(mob/living/user as mob)
+ if(!syringes.len)
+ user << "[src] is empty!"
+ return 0
+
+ var/obj/item/weapon/reagent_containers/syringe/S = syringes[syringes.len]
+
+ if(!S) return 0
+ S.loc = user.loc
+
+ syringes.Remove(S)
+ user << "You unload [S] from \the [src]."
+
+ return 1
+
+/obj/item/weapon/gun/syringe/attackby(var/obj/item/A as obj, mob/user as mob, params, var/show_msg = 1)
+ if(istype(A, /obj/item/weapon/reagent_containers/syringe))
+ if(syringes.len < max_syringes)
+ user.drop_item()
+ user << "You load [A] into \the [src]."
+ syringes.Add(A)
+ A.loc = src
+ return 1
+ else
+ usr << "[src] cannot hold more syringes!"
+ return 0
+
+/obj/item/weapon/gun/syringe/rapidsyringe
+ name = "rapid syringe gun"
+ desc = "A modification of the syringe gun design, using a rotating cylinder to store up to six syringes."
+ icon_state = "rapidsyringegun"
+ max_syringes = 6
diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm
index 8745de421ff..37a75e268dd 100644
--- a/code/modules/projectiles/projectile.dm
+++ b/code/modules/projectiles/projectile.dm
@@ -2,12 +2,11 @@
name = "projectile"
icon = 'icons/obj/projectiles.dmi'
icon_state = "bullet"
- density = 1
+ density = 0
unacidable = 1
pass_flags = PASSTABLE
mouse_opacity = 0
hitsound = 'sound/weapons/pierce.ogg'
- var/bumped = 0 //Prevents it from hitting more than one guy at once
var/def_zone = "" //Aiming at
var/mob/firer = null//Who shot it
var/suppressed = 0 //Attack message
@@ -41,7 +40,6 @@
var/forcedodge = 0
// 1 to pass solid objects, 2 to pass solid turfs (results in bugs, bugs and tons of bugs)
var/range = 0
- var/proj_hit = 0
/obj/item/projectile/proc/Range()
if(range)
@@ -52,13 +50,34 @@
return
/obj/item/projectile/proc/on_range() //if we want there to be effects when they reach the end of their range
- proj_hit = 1
qdel(src)
/obj/item/projectile/proc/on_hit(atom/target, blocked = 0, hit_zone)
- if(!isliving(target)) return 0
- if(isanimal(target)) return 0
+ if(!isliving(target))
+ return 0
var/mob/living/L = target
+
+ var/organ_hit_text = ""
+ if(L.has_limbs)
+ organ_hit_text = " in \the [parse_zone(def_zone)]"
+ if(suppressed)
+ playsound(loc, hitsound, 5, 1, -1)
+ L << "You're shot by \a [src][organ_hit_text]!"
+ else
+ if(hitsound)
+ var/volume = vol_by_damage()
+ playsound(loc, hitsound, volume, 1, -1)
+ L.visible_message("[L] is hit by \a [src][organ_hit_text]!", \
+ "[L] is hit by \a [src][organ_hit_text]!") //X has fired Y is now given by the guns so you cant tell who shot you if you could not see the shooter
+
+ var/reagent_note
+ if(reagents && reagents.reagent_list)
+ reagent_note = " REAGENTS:"
+ for(var/datum/reagent/R in reagents.reagent_list)
+ reagent_note += R.id + " ("
+ reagent_note += num2text(R.volume) + ") "
+ add_logs(firer, L, "shot", object="[src]", addition=reagent_note)
+
L.on_hit(type)
return L.apply_effects(stun, weaken, paralyze, irradiate, stutter, slur, eyeblur, drowsy, blocked, stamina, jitter)
@@ -68,52 +87,34 @@
else
return 50 //if the projectile doesn't do damage, play its hitsound at 50% volume
-/obj/item/projectile/Bump(atom/A)
+/obj/item/projectile/Bump(atom/A, yes)
+ if(!yes) //prevents multi bumps.
+ return
if(A == firer || A == src)
loc = A.loc
return 0 //cannot shoot yourself
- if(bumped)//Stops multihit projectiles
- return 1
- bumped = 1
- if(isliving(A))
- var/mob/living/M = A
- var/reagent_note
- if(reagents && reagents.reagent_list)
- reagent_note = " REAGENTS:"
- for(var/datum/reagent/R in reagents.reagent_list)
- reagent_note += R.id + " ("
- reagent_note += num2text(R.volume) + ") "
- var/distance = get_dist(get_turf(A), starting) // Get the distance between the turf shot from and the mob we hit and use that for the calculations.
- def_zone = ran_zone(def_zone, max(100-(7*distance), 5)) //Lower accurancy/longer range tradeoff. 7 is a balanced number to use.
- if(suppressed)
- playsound(loc, hitsound, 5, 1, -1)
- M << "You've been shot by \a [src] in \the [parse_zone(def_zone)]!"
- else
- if(hitsound)
- var/volume = vol_by_damage()
- playsound(loc, hitsound, volume, 1, -1)
- M.visible_message("[M] is hit by \a [src] in the [parse_zone(def_zone)]!", \
- "[M] is hit by \a [src] in the [parse_zone(def_zone)]!") //X has fired Y is now given by the guns so you cant tell who shot you if you could not see the shooter
- add_logs(firer, M, "shot", object="[src]", addition=reagent_note)
+ var/distance = get_dist(get_turf(A), starting) // Get the distance between the turf shot from and the mob we hit and use that for the calculations.
+ def_zone = ran_zone(def_zone, max(100-(7*distance), 5)) //Lower accurancy/longer range tradeoff. 7 is a balanced number to use.
+
+ var/turf/target_turf = get_turf(A)
- var/turf/new_loc = get_turf(A)
var/permutation = A.bullet_act(src, def_zone) // searches for return value, could be deleted after run so check A isn't null
if(permutation == -1 || forcedodge)// the bullet passes through a dense object!
- bumped = 0 // reset bumped variable!
- loc = new_loc
- permutated.Add(A)
+ loc = target_turf
+ if(A)
+ permutated.Add(A)
Range()
return 0
- qdel(src)
-
-/obj/item/projectile/CanPass(atom/movable/mover, turf/target, height=0)
- if(height==0) return 1
-
- if(istype(mover, /obj/item/projectile))
- return prob(95)
else
- return 1
+ if(A && A.density && !ismob(A) && !(A.flags & ON_BORDER)) //if we hit a dense non-border obj or dense turf then we also hit one of the mobs on that tile.
+ var/list/mobs_list = list()
+ for(var/mob/living/L in target_turf)
+ mobs_list += L
+ if(mobs_list.len)
+ var/mob/living/picked_mob = pick(mobs_list)
+ picked_mob.bullet_act(src, def_zone)
+ qdel(src)
/obj/item/projectile/Process_Spacemove(var/movement_dir = 0)
return 1 //Bullets don't drift in space
@@ -129,9 +130,14 @@
if((!( current ) || loc == current))
current = locate(Clamp(x+xo,1,world.maxx),Clamp(y+yo,1,world.maxy),z)
step_towards(src, current)
- if(!bumped && ((original && original.layer>=2.75) || ismob(original)))
+ if((original && original.layer>=2.75) || ismob(original))
if(loc == get_turf(original))
if(!(original in permutated))
- Bump(original)
+ Bump(original, 1)
Range()
sleep(1)
+
+/obj/item/projectile/Crossed(atom/movable/AM as mob) //A mob moving on a tile with a projectile is hit by it.
+ ..()
+ if(isliving(AM) && AM.density && !checkpass(PASSMOB))
+ Bump(AM, 1)
\ No newline at end of file
diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm
index 785709398ea..88bacc76790 100644
--- a/code/modules/projectiles/projectile/beams.dm
+++ b/code/modules/projectiles/projectile/beams.dm
@@ -47,9 +47,9 @@
damage = 50
/obj/item/projectile/beam/pulse/on_hit(var/atom/target, var/blocked = 0)
+ . = ..()
if(istype(target,/turf/)||istype(target,/obj/structure/))
target.ex_act(2)
- ..()
/obj/item/projectile/beam/pulse/shot
damage = 40
@@ -77,12 +77,13 @@ obj/item/projectile/beam/emitter/Destroy()
var/suit_types = list(/obj/item/clothing/suit/redtag, /obj/item/clothing/suit/bluetag)
/obj/item/projectile/lasertag/on_hit(var/atom/target, var/blocked = 0)
- if(istype(target, /mob/living/carbon/human))
+ . = ..()
+ if(ishuman(target))
var/mob/living/carbon/human/M = target
if(istype(M.wear_suit))
if(M.wear_suit.type in suit_types)
M.adjustStaminaLoss(34)
- return 1
+
/obj/item/projectile/lasertag/redtag
icon_state = "laser"
diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm
index 78f8f83bfcf..09cae327199 100644
--- a/code/modules/projectiles/projectile/bullets.dm
+++ b/code/modules/projectiles/projectile/bullets.dm
@@ -57,8 +57,8 @@
color = "#FFFF00"
/obj/item/projectile/bullet/incendiary/on_hit(var/atom/target, var/blocked = 0)
- ..()
- if(istype(target, /mob/living/carbon))
+ . = ..()
+ if(iscarbon(target))
var/mob/living/carbon/M = target
M.adjust_fire_stacks(1)
M.IgniteMob()
@@ -90,7 +90,7 @@
hitsound = 'sound/effects/meteorimpact.ogg'
/obj/item/projectile/bullet/meteorshot/on_hit(var/atom/target, var/blocked = 0)
- ..()
+ . = ..()
if(istype(target, /atom/movable))
var/atom/movable/M = target
var/atom/throw_target = get_edge_target_turf(M, get_dir(src, get_step_away(M, src)))
@@ -105,7 +105,8 @@
damage = 20
/obj/item/projectile/bullet/mime/on_hit(var/atom/target, var/blocked = 0)
- if(istype(target, /mob/living/carbon))
+ . = ..()
+ if(iscarbon(target))
var/mob/living/carbon/M = target
M.silent = max(M.silent, 10)
@@ -115,23 +116,28 @@
icon_state = "cbbolt"
damage = 6
- New()
- ..()
- flags |= NOREACT
- create_reagents(50)
+/obj/item/projectile/bullet/dart/New()
+ ..()
+ flags |= NOREACT
+ create_reagents(50)
- on_hit(var/atom/target, var/blocked = 0, var/hit_zone)
- if(istype(target, /mob/living/carbon))
- var/mob/living/carbon/M = target
- if(M.can_inject(null,0,hit_zone)) // Pass the hit zone to see if it can inject by whether it hit the head or the body.
- reagents.trans_to(M, reagents.total_volume)
- return 1
- else
- target.visible_message("The [name] was deflected!", \
- "You were protected against the [name]!")
- flags &= ~NOREACT
- reagents.handle_reactions()
- return 1
+/obj/item/projectile/bullet/dart/on_hit(var/atom/target, var/blocked = 0, var/hit_zone)
+ var/deflect = 0
+ if(iscarbon(target))
+ var/mob/living/carbon/M = target
+ if(M.can_inject(null,0,hit_zone)) // Pass the hit zone to see if it can inject by whether it hit the head or the body.
+ ..()
+ reagents.trans_to(M, reagents.total_volume)
+ return 1
+ else
+ deflect = 1
+ target.visible_message("The [name] was deflected!", \
+ "You were protected against the [name]!")
+ if(!deflect)
+ ..()
+ flags &= ~NOREACT
+ reagents.handle_reactions()
+ return 1
/obj/item/projectile/bullet/dart/metalfoam
New()
@@ -155,5 +161,6 @@
/obj/item/projectile/bullet/neurotoxin/on_hit(var/atom/target, var/blocked = 0)
if(isalien(target))
- return 0
- ..() // Execute the rest of the code.
+ weaken = 0
+ nodamage = 1
+ . = ..() // Execute the rest of the code.
diff --git a/code/modules/projectiles/projectile/energy.dm b/code/modules/projectiles/projectile/energy.dm
index 4f4edc5dcd7..ea3b048e13e 100644
--- a/code/modules/projectiles/projectile/energy.dm
+++ b/code/modules/projectiles/projectile/energy.dm
@@ -19,27 +19,23 @@
range = 7
/obj/item/projectile/energy/electrode/on_hit(var/atom/target, var/blocked = 0)
- if(!proj_hit)
- if(!ismob(target) || blocked >= 2) //Fully blocked by mob or collided with dense object - burst into sparks!
- var/datum/effect/effect/system/spark_spread/sparks = new /datum/effect/effect/system/spark_spread
- sparks.set_up(1, 1, src)
- sparks.start()
- proj_hit = 1
- else if(iscarbon(target))
- var/mob/living/carbon/C = target
- if(C.dna && C.dna.check_mutation(HULK))
- C.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
- else if(C.status_flags & CANWEAKEN)
- spawn(5)
- C.do_jitter_animation(jitter)
- ..()
-
-/obj/item/projectile/energy/electrode/on_range() //to ensure the bolt sparks when it reaches the end of its range if it didn't hit a target yet
- if(!proj_hit)
+ . = ..()
+ if(!ismob(target) || blocked >= 2) //Fully blocked by mob or collided with dense object - burst into sparks!
var/datum/effect/effect/system/spark_spread/sparks = new /datum/effect/effect/system/spark_spread
sparks.set_up(1, 1, src)
sparks.start()
- proj_hit = 1
+ else if(iscarbon(target))
+ var/mob/living/carbon/C = target
+ if(C.dna && C.dna.check_mutation(HULK))
+ C.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
+ else if(C.status_flags & CANWEAKEN)
+ spawn(5)
+ C.do_jitter_animation(jitter)
+
+/obj/item/projectile/energy/electrode/on_range() //to ensure the bolt sparks when it reaches the end of its range if it didn't hit a target yet
+ var/datum/effect/effect/system/spark_spread/sparks = new /datum/effect/effect/system/spark_spread
+ sparks.set_up(1, 1, src)
+ sparks.start()
..()
/obj/item/projectile/energy/declone
diff --git a/code/modules/projectiles/projectile/magic.dm b/code/modules/projectiles/projectile/magic.dm
index d485784109c..1dd1129f74f 100644
--- a/code/modules/projectiles/projectile/magic.dm
+++ b/code/modules/projectiles/projectile/magic.dm
@@ -11,6 +11,7 @@
icon_state = "pulse1_bl"
/obj/item/projectile/magic/death/on_hit(var/target)
+ . = ..()
if(ismob(target))
var/mob/M = target
M.death(0)
@@ -31,6 +32,7 @@
..()
/obj/item/projectile/magic/fireball/on_hit(var/target)
+ . = ..()
var/turf/T = get_turf(target)
explosion(T, -1, 0, 2, 3, 0, flame_range = 2)
if(ismob(target)) //multiple flavors of pain
@@ -46,8 +48,8 @@
flag = "magic"
/obj/item/projectile/magic/resurrection/on_hit(var/mob/living/carbon/target)
-
- if(istype(target,/mob))
+ . = ..()
+ if(ismob(target))
var/old_stat = target.stat
target.revive()
target.suiciding = 0
@@ -72,6 +74,7 @@
var/outer_tele_radius = 6
/obj/item/projectile/magic/teleport/on_hit(var/mob/target)
+ . = ..()
var/teleammount = 0
var/teleloc = target
if(!isturf(target))
@@ -93,6 +96,7 @@
flag = "magic"
/obj/item/projectile/magic/door/on_hit(var/atom/target)
+ . = ..()
var/atom/T = target.loc
if(isturf(target) && target.density)
CreateDoor(target)
@@ -116,6 +120,7 @@
flag = "magic"
/obj/item/projectile/magic/change/on_hit(var/atom/change)
+ . = ..()
wabbajack(change)
proc/wabbajack(mob/living/M)
diff --git a/code/modules/projectiles/projectile/reusable.dm b/code/modules/projectiles/projectile/reusable.dm
index 0e9d010d3fe..414be55b31a 100644
--- a/code/modules/projectiles/projectile/reusable.dm
+++ b/code/modules/projectiles/projectile/reusable.dm
@@ -4,25 +4,22 @@
var/obj/item/ammo_casing/caseless/ammo_type = /obj/item/ammo_casing/caseless/
/obj/item/projectile/bullet/reusable/on_hit(var/atom/target, var/blocked = 0)
- if(!proj_hit)
- proj_hit = 1
- if (src.contents.len)
- var/obj/content
- for(content in src.contents)
- content.loc = src.loc
- else
- new ammo_type(src.loc)
- ..()
+ . = ..()
+ if (src.contents.len)
+ var/obj/content
+ for(content in src.contents)
+ content.loc = src.loc
+ else
+ new ammo_type(src.loc)
/obj/item/projectile/bullet/reusable/on_range()
- if(!proj_hit)
- if (src.contents.len)
- var/obj/content
- for(content in src.contents)
- content.loc = src.loc
- else
- new ammo_type(src.loc)
- ..()
+ if (src.contents.len)
+ var/obj/content
+ for(content in src.contents)
+ content.loc = src.loc
+ else
+ new ammo_type(src.loc)
+ ..()
/obj/item/projectile/bullet/reusable/magspear
name = "magnetic spear"
diff --git a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm
index 689fc678d63..5714b2f7b12 100644
--- a/code/modules/projectiles/projectile/special.dm
+++ b/code/modules/projectiles/projectile/special.dm
@@ -8,6 +8,7 @@
/obj/item/projectile/ion/on_hit(atom/target, blocked = 0)
+ ..()
empulse(target, 1, 1)
return 1
@@ -15,6 +16,7 @@
/obj/item/projectile/ion/weak
/obj/item/projectile/ion/weak/on_hit(atom/target, blocked = 0)
+ ..()
empulse(target, 0, 0)
return 1
@@ -26,6 +28,7 @@
flag = "bullet"
/obj/item/projectile/bullet/gyro/on_hit(atom/target, blocked = 0)
+ ..()
explosion(target, -1, 0, 2)
return 1
@@ -37,6 +40,7 @@
flag = "bullet"
/obj/item/projectile/bullet/a40mm/on_hit(atom/target, blocked = 0)
+ ..()
explosion(target, -1, 0, 2, 1, 0, flame_range = 3)
return 1
@@ -51,7 +55,8 @@
/obj/item/projectile/temp/on_hit(atom/target, blocked = 0)//These two could likely check temp protection on the mob
- if(istype(target, /mob/living))
+ ..()
+ if(isliving(target))
var/mob/M = target
M.bodytemperature = temperature
return 1
@@ -69,7 +74,9 @@
nodamage = 1
flag = "bullet"
-/obj/item/projectile/meteor/Bump(atom/A)
+/obj/item/projectile/meteor/Bump(atom/A, yes)
+ if(!yes) //prevents multi bumps.
+ return
if(A == firer)
loc = A.loc
return
@@ -100,6 +107,7 @@
name = "flayer ray"
/obj/item/projectile/beam/mindflayer/on_hit(atom/target, blocked = 0)
+ . = ..()
if(ishuman(target))
var/mob/living/carbon/human/M = target
M.adjustBrainLoss(20)
@@ -108,7 +116,7 @@
/obj/item/projectile/kinetic
name = "kinetic force"
icon_state = null
- damage = 15
+ damage = 10
damage_type = BRUTE
flag = "bomb"
range = 3
@@ -121,31 +129,24 @@ obj/item/projectile/kinetic/New()
var/pressure = environment.return_pressure()
if(pressure < 50)
name = "full strength kinetic force"
- damage *= 2
+ damage *= 4
..()
/obj/item/projectile/kinetic/Range()
range--
if(range <= 0)
new /obj/item/effect/kinetic_blast(src.loc)
- for(var/turf/T in range(1, src.loc))
- if(istype(T, /turf/simulated/mineral))
- var/turf/simulated/mineral/M = T
- M.gets_drilled(firer)
qdel(src)
/obj/item/projectile/kinetic/on_hit(atom/target)
+ . = ..()
var/turf/target_turf= get_turf(target)
if(istype(target_turf, /turf/simulated/mineral))
var/turf/simulated/mineral/M = target_turf
M.gets_drilled(firer)
new /obj/item/effect/kinetic_blast(target_turf)
- if(isturf(target))
- for(var/turf/T in range(1, target_turf))
- if(istype(T, /turf/simulated/mineral))
- var/turf/simulated/mineral/M = T
- M.gets_drilled(firer)
- ..()
+
+
/obj/item/effect/kinetic_blast
name = "kinetic explosion"
@@ -178,14 +179,14 @@ obj/item/projectile/kinetic/New()
/obj/item/projectile/beam/wormhole/on_hit(var/atom/target)
if(ismob(target))
- ..()
- return
+ return ..()
if(!gun)
qdel(src)
gun.create_portal(src)
/obj/item/projectile/bullet/gyro/on_hit(atom/target, blocked = 0)
+ ..()
explosion(target, -1, 0, 2)
return 1
@@ -196,40 +197,38 @@ obj/item/projectile/kinetic/New()
weaken = 5
/obj/item/projectile/bullet/frag12/on_hit(atom/target, blocked = 0)
+ ..()
explosion(target, -1, 0, 1)
return 1
/obj/item/projectile/plasma
name = "plasma blast"
icon_state = "plasmacutter"
- damage_type = BURN
- damage = 10
- range = 6
- var/power = 9
+ damage_type = BRUTE
+ damage = 5
+ range = 1
+
+obj/item/projectile/plasma/New()
+ var/turf/proj_turf = get_turf(src)
+ if(!istype(proj_turf, /turf))
+ return
+ var/datum/gas_mixture/environment = proj_turf.return_air()
+ var/pressure = environment.return_pressure()
+ if(pressure < 30)
+ name = "full strength plasma blast"
+ damage *= 3
+ range += 3
+ ..()
/obj/item/projectile/plasma/on_hit(var/atom/target)
if(istype(target, /turf/simulated/mineral))
- while(target && target.density && range > 0 && power > 0)
- power -= 1
- var/turf/simulated/mineral/M = target
- M.gets_drilled()
- if(range > 0 && power > 0)
- return -1
+ var/turf/simulated/mineral/M = target
+ M.gets_drilled(firer)
return ..()
/obj/item/projectile/plasma/adv
- range = 9
- power = 12
- damage = 15
-
-/obj/item/projectile/plasma/adv/on_hit(var/atom/target)
- if(!ismob(target) && !istype(target, /turf/simulated/mineral))
- target.ex_act(3)
- power -= 10
- if(range > 0 && power > 0 && (!target || !target.density))
- return -1
- return ..()
+ range = 2
/obj/item/projectile/plasma/adv/mech
- range = 12
- power = 18
\ No newline at end of file
+ damage = 10
+ range = 3
diff --git a/code/modules/reagents/Chemistry-Goon-420BlazeIt.dm b/code/modules/reagents/Chemistry-Goon-420BlazeIt.dm
index dacb964d7ab..06a63b7c8cd 100644
--- a/code/modules/reagents/Chemistry-Goon-420BlazeIt.dm
+++ b/code/modules/reagents/Chemistry-Goon-420BlazeIt.dm
@@ -25,7 +25,7 @@ datum/reagent/nicotine/on_mob_life(var/mob/living/M as mob)
datum/reagent/nicotine/overdose_process(var/mob/living/M as mob)
if(prob(20))
- M << "You feel like you smoked too much."
+ M << "You feel like you've smoked too much."
M.adjustToxLoss(1*REM)
M.adjustOxyLoss(1*REM)
..()
diff --git a/code/modules/reagents/Chemistry-Goon-Medicine.dm b/code/modules/reagents/Chemistry-Goon-Medicine.dm
index 88860f358f5..2659fed7197 100644
--- a/code/modules/reagents/Chemistry-Goon-Medicine.dm
+++ b/code/modules/reagents/Chemistry-Goon-Medicine.dm
@@ -683,7 +683,9 @@ proc/chemical_mob_spawn(var/datum/reagents/holder, var/amount_to_spawn, var/reac
/mob/living/simple_animal/hostile/asteroid/hivelordbrood,
/mob/living/simple_animal/hostile/carp/holocarp,
/mob/living/simple_animal/hostile/mining_drone,
- /mob/living/simple_animal/hostile/poison
+ /mob/living/simple_animal/hostile/poison,
+ /mob/living/simple_animal/hostile/blob,
+ /mob/living/simple_animal/ascendant_shadowling
)//exclusion list for things you don't want the reaction to create.
var/list/critters = typesof(/mob/living/simple_animal/hostile) - blocked // list of possible hostile mobs
var/atom/A = holder.my_atom
diff --git a/code/modules/reagents/Chemistry-Goon-Pyrotechnics.dm b/code/modules/reagents/Chemistry-Goon-Pyrotechnics.dm
index 53bb47c6f9e..0e3b34e44cb 100644
--- a/code/modules/reagents/Chemistry-Goon-Pyrotechnics.dm
+++ b/code/modules/reagents/Chemistry-Goon-Pyrotechnics.dm
@@ -410,9 +410,9 @@
/datum/chemical_reaction/napalm
name = "Napalm"
id = "napalm"
- result = null
- required_reagents = list("aluminium" = 1, "plasma" = 1, "sacid" = 1 )
- result_amount = 1
+ result = "napalm"
+ required_reagents = list("sugar" = 1, "fuel" = 1, "ethanol" = 1 )
+ result_amount = 3
datum/reagent/cryostylane
name = "Cryostylane"
diff --git a/code/modules/reagents/Chemistry-Goon-Toxins.dm b/code/modules/reagents/Chemistry-Goon-Toxins.dm
index 7693d241c0b..b8ebe016012 100644
--- a/code/modules/reagents/Chemistry-Goon-Toxins.dm
+++ b/code/modules/reagents/Chemistry-Goon-Toxins.dm
@@ -230,7 +230,7 @@ datum/reagent/initropidril/on_mob_life(var/mob/living/M as mob)
if(3)
var/mob/living/carbon/human/H = M
if(!H.heart_attack)
- H.visible_message("[H] clutches at their chest as if their heart stopped!")
+ H.visible_message("[H] clutches at their chest as if their heart stopped!", "You clutch at your chest as if your heart stopped!")
H.heart_attack = 1 // rip in pepperoni
else
H.losebreath += 10
diff --git a/code/modules/reagents/Chemistry-Holder.dm b/code/modules/reagents/Chemistry-Holder.dm
index 98496d254fe..a43266291d2 100644
--- a/code/modules/reagents/Chemistry-Holder.dm
+++ b/code/modules/reagents/Chemistry-Holder.dm
@@ -215,26 +215,31 @@ datum/reagents/proc/metabolize(var/mob/M)
if(M)
chem_temp = M.bodytemperature
handle_reactions()
- if(last_tick == 3)
- last_tick = 1
- for(var/A in reagent_list)
- var/datum/reagent/R = A
- if(M && R)
- if(M.reagent_check(R) != 1)
- if(R.volume >= R.overdose_threshold && !R.overdosed && R.overdose_threshold > 0)
+
+ for(var/A in reagent_list)
+ var/datum/reagent/R = A
+ if(!R.holder)
+ continue
+ if(!M)
+ M = R.holder.my_atom
+ if(M && R)
+ if(M.reagent_check(R) != 1)
+ if(R.overdose_threshold)
+ if(R.volume >= R.overdose_threshold && !R.overdosed)
R.overdosed = 1
- M << "You feel like you took too much of [R.name]!"
R.overdose_start(M)
- if(R.volume >= R.addiction_threshold && !is_type_in_list(R, addiction_list) && R.addiction_threshold > 0)
+ if(R.addiction_threshold)
+ if(R.volume >= R.addiction_threshold && !is_type_in_list(R, addiction_list))
var/datum/reagent/new_reagent = new R.type()
addiction_list.Add(new_reagent)
- if(R.overdosed)
- R.overdose_process(M)
- if(is_type_in_list(R,addiction_list))
- for(var/datum/reagent/addicted_reagent in addiction_list)
- if(istype(R, addicted_reagent))
- addicted_reagent.addiction_stage = -15 // you're satisfied for a good while.
- R.on_mob_life(M)
+ if(R.overdosed)
+ R.overdose_process(M)
+ if(is_type_in_list(R,addiction_list))
+ for(var/datum/reagent/addicted_reagent in addiction_list)
+ if(istype(R, addicted_reagent))
+ addicted_reagent.addiction_stage = -15 // you're satisfied for a good while.
+ R.on_mob_life(M)
+
if(addiction_tick == 6)
addiction_tick = 1
for(var/A in addiction_list)
@@ -258,7 +263,6 @@ datum/reagents/proc/metabolize(var/mob/M)
M << "You feel like you've gotten over your need for [R.name]."
addiction_list.Remove(R)
addiction_tick++
- last_tick++
update_total()
datum/reagents/process()
diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm
index 68118cdbcf4..4fd76334aab 100644
--- a/code/modules/reagents/Chemistry-Machinery.dm
+++ b/code/modules/reagents/Chemistry-Machinery.dm
@@ -153,13 +153,13 @@
return
if(src.beaker)
- user << "A beaker is already loaded into the machine."
+ user << "A beaker is already loaded into the machine!"
return
src.beaker = B
user.drop_item()
B.loc = src
- user << "You add the beaker to the machine!"
+ user << "You add the beaker to the machine."
SSnano.update_uis(src) // update all UIs attached to src
if(!icon_beaker)
@@ -286,23 +286,23 @@
if(istype(B, /obj/item/weapon/reagent_containers/glass))
if(src.beaker)
- user << "A beaker is already loaded into the machine."
+ user << "A beaker is already loaded into the machine!"
return
src.beaker = B
user.drop_item()
B.loc = src
- user << "You add the beaker to the machine!"
+ user << "You add the beaker to the machine."
src.updateUsrDialog()
icon_state = "mixer1"
else if(!condi && istype(B, /obj/item/weapon/storage/pill_bottle))
if(src.loaded_pill_bottle)
- user << "A pill bottle is already loaded into the machine."
+ user << "A pill bottle is already loaded into the machine!"
return
src.loaded_pill_bottle = B
user.drop_item()
B.loc = src
- user << "You add the pill bottle into the dispenser slot!"
+ user << "You add the pill bottle into the dispenser slot."
src.updateUsrDialog()
return
@@ -580,7 +580,7 @@
/obj/machinery/chem_master/constructable
name = "ChemMaster 2999"
desc = "Used to seperate chemicals and distribute them in a variety of forms."
-
+
/obj/machinery/chem_master/constructable/New()
..()
component_parts = list()
@@ -589,10 +589,10 @@
component_parts += new /obj/item/weapon/stock_parts/console_screen(null)
component_parts += new /obj/item/weapon/reagent_containers/glass/beaker(null)
component_parts += new /obj/item/weapon/reagent_containers/glass/beaker(null)
-
+
/obj/machinery/chem_master/constructable/attackby(var/obj/item/B as obj, var/mob/user as mob, params)
- if(default_deconstruction_screwdriver(user, "mixer0_nopower", "mixer0_", B))
+ if(default_deconstruction_screwdriver(user, "mixer0_nopower", "mixer0", B))
if(beaker)
beaker.loc = src.loc
beaker = null
@@ -601,37 +601,37 @@
loaded_pill_bottle.loc = src.loc
loaded_pill_bottle = null
return
-
+
if(exchange_parts(user, B))
return
-
+
if(panel_open)
if(istype(B, /obj/item/weapon/crowbar))
default_deconstruction_crowbar(B)
return 1
else
- user << "You can't use the [src.name] while it's panel is opened."
+ user << "You can't use the [src.name] while it's panel is opened!"
return 1
if(istype(B, /obj/item/weapon/reagent_containers/glass))
if(src.beaker)
- user << "A beaker is already loaded into the machine."
+ user << "A beaker is already loaded into the machine!"
return
src.beaker = B
user.drop_item()
B.loc = src
- user << "You add the beaker to the machine!"
+ user << "You add the beaker to the machine."
src.updateUsrDialog()
icon_state = "mixer1"
else if(!condi && istype(B, /obj/item/weapon/storage/pill_bottle))
if(src.loaded_pill_bottle)
- user << "A pill bottle is already loaded into the machine."
+ user << "A pill bottle is already loaded into the machine!"
return
src.loaded_pill_bottle = B
user.drop_item()
B.loc = src
- user << "You add the pill bottle into the dispenser slot!"
+ user << "You add the pill bottle into the dispenser slot."
src.updateUsrDialog()
return
@@ -760,7 +760,7 @@ obj/machinery/computer/pandemic/proc/replicator_cooldown(var/waittime)
if(!D)
return
var/name = stripped_input(usr,"Name:","Name the culture",D.name,MAX_NAME_LEN)
- if(name == null)
+ if(name == null || wait)
return
var/obj/item/weapon/reagent_containers/glass/bottle/B = new/obj/item/weapon/reagent_containers/glass/bottle(src.loc)
B.icon_state = "bottle3"
@@ -915,13 +915,13 @@ obj/machinery/computer/pandemic/proc/replicator_cooldown(var/waittime)
if(istype(I, /obj/item/weapon/reagent_containers/glass))
if(stat & (NOPOWER|BROKEN)) return
if(src.beaker)
- user << "A beaker is already loaded into the machine."
+ user << "A beaker is already loaded into the machine!"
return
src.beaker = I
user.drop_item()
I.loc = src
- user << "You add the beaker to the machine!"
+ user << "You add the beaker to the machine."
src.updateUsrDialog()
icon_state = "mixer1"
@@ -983,6 +983,7 @@ obj/machinery/computer/pandemic/proc/replicator_cooldown(var/waittime)
/obj/item/weapon/reagent_containers/food/snacks/grown/wheat = list("flour" = -5),
/obj/item/weapon/reagent_containers/food/snacks/grown/oat = list("flour" = -5),
/obj/item/weapon/reagent_containers/food/snacks/grown/cherries = list("cherryjelly" = 0),
+ /obj/item/weapon/reagent_containers/food/snacks/grown/bluecherries = list("bluecherryjelly" = 0),
/obj/item/weapon/reagent_containers/food/snacks/egg = list("eggyolk" = -5),
//Grinder stuff, but only if dry
@@ -1013,6 +1014,8 @@ obj/machinery/computer/pandemic/proc/replicator_cooldown(var/waittime)
/obj/item/weapon/reagent_containers/food/snacks/grown/watermelon = list("watermelonjuice" = 0),
/obj/item/weapon/reagent_containers/food/snacks/watermelonslice = list("watermelonjuice" = 0),
/obj/item/weapon/reagent_containers/food/snacks/grown/berries/poison = list("poisonberryjuice" = 0),
+ /obj/item/weapon/reagent_containers/food/snacks/grown/pumpkin = list("pumpkinjuice" = 0),
+ /obj/item/weapon/reagent_containers/food/snacks/grown/blumpkin = list("blumpkinjuice" = 0),
)
var/list/dried_items = list(
@@ -1059,7 +1062,7 @@ obj/machinery/computer/pandemic/proc/replicator_cooldown(var/waittime)
if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/grown))
var/obj/item/weapon/reagent_containers/food/snacks/grown/G = O
if(!G.dry)
- user << "You must dry that first!"
+ user << "You must dry that first!"
return 1
if(holdingitems && holdingitems.len >= limit)
@@ -1074,17 +1077,17 @@ obj/machinery/computer/pandemic/proc/replicator_cooldown(var/waittime)
B.remove_from_storage(G, src)
holdingitems += G
if(holdingitems && holdingitems.len >= limit) //Sanity checking so the blender doesn't overfill
- user << "You fill the All-In-One grinder to the brim."
+ user << "You fill the All-In-One grinder to the brim."
break
if(!O.contents.len)
- user << "You empty the plant bag into the All-In-One grinder."
+ user << "You empty the plant bag into the All-In-One grinder."
src.updateUsrDialog()
return 0
if (!is_type_in_list(O, blend_items) && !is_type_in_list(O, juice_items))
- user << "Cannot refine into a reagent."
+ user << "Cannot refine into a reagent!"
return 1
user.unEquip(O)
@@ -1438,13 +1441,13 @@ obj/machinery/computer/pandemic/proc/replicator_cooldown(var/waittime)
if(istype(I, /obj/item/weapon/reagent_containers/glass))
if(beaker)
- user << "A beaker is already loaded into the machine."
+ user << "A beaker is already loaded into the machine!"
return
if(user.drop_item())
beaker = I
I.loc = src
- user << "You add the beaker to the machine!"
+ user << "You add the beaker to the machine."
icon_state = "mixer1b"
SSnano.update_uis(src)
diff --git a/code/modules/reagents/Chemistry-Readme.dm b/code/modules/reagents/Chemistry-Readme.dm
index e3eab685c7b..74e9fe0b093 100644
--- a/code/modules/reagents/Chemistry-Readme.dm
+++ b/code/modules/reagents/Chemistry-Readme.dm
@@ -11,7 +11,7 @@ Structure: /////////////////// //////////////////////////
| | |
V V V
- reagents (datums) Reagents. I.e. Water , antitoxins or mercury.
+ reagents (datums) Reagents. I.e. Water , cryoxadone or mercury.
Random important notes:
@@ -198,7 +198,7 @@ About Recipes:
of that reagent. The handle_reaction proc can detect mutiples of the same recipes
so for most cases you want to set the required amount to 1.
- required_catalysts (Added May 2011)
+ required_catalysts
This is a list of the ids of the required catalysts.
Functionally similar to required_reagents, it is a list of reagents that are required
for the reaction. However, unlike required_reagents, catalysts are NOT consumed.
@@ -216,6 +216,9 @@ About Recipes:
Basically like a reagent's data variable. You can set extra requirements for a
reaction with this.
+ required_temp
+ This is the required temperature.
+
About the Tools:
@@ -244,4 +247,20 @@ About the Tools:
transfer code since you will not be able to use the standard
tools to manipulate it.
+*/
+
+
+
+
+/* GOON CHEMS README:
+
+ Credit goes to Cogwerks, and all the other goonstation coders
+ for the original idea and implementation of this over at goonstation.
+
+ THE REQUESTED DON'T PORT LIST: IF YOU PORT THESE THE GOONS WILL MURDER US IN OUR SLEEP SO PLEASE DON'T KTHX - Iamgoofball
+ Any of the Secret Chems
+ Goon in-joke chems (Eg. Cat Drugs, Hairgrownium)
+ Liquid Electricity
+ Rajajajah
+
*/
\ No newline at end of file
diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm
new file mode 100644
index 00000000000..899f1312670
--- /dev/null
+++ b/code/modules/reagents/Chemistry-Reagents.dm
@@ -0,0 +1,140 @@
+#define SOLID 1
+#define LIQUID 2
+#define GAS 3
+
+#define REM REAGENTS_EFFECT_MULTIPLIER
+
+//The reaction procs must ALWAYS set src = null, this detaches the proc from the object (the reagent)
+//so that it can continue working when the reagent is deleted while the proc is still active.
+
+
+//Various reagents
+//Toxin & acid reagents
+//Hydroponics stuff
+
+datum/reagent
+ var/name = "Reagent"
+ var/id = "reagent"
+ var/description = ""
+ var/datum/reagents/holder = null
+ var/reagent_state = LIQUID
+ var/list/data
+ var/current_cycle = 0
+ var/volume = 0
+ var/color = "#000000" // rgb: 0, 0, 0
+ var/can_synth = 1
+ var/metabolization_rate = REAGENTS_METABOLISM //how fast the reagent is metabolized by the mob
+ var/overrides_metab = 0
+ var/overdose_threshold = 0
+ var/addiction_threshold = 0
+ var/addiction_stage = 0
+ var/overdosed = 0 // You fucked up and this is now triggering it's overdose effects, purge that shit quick.
+
+datum/reagent/Destroy() // This should only be called by the holder, so it's already handled clearing its references
+ ..()
+ holder = null
+
+datum/reagent/proc/reaction_mob(var/mob/M, var/method=TOUCH, var/volume, var/show_message = 1) //By default we have a chance to transfer some
+ if(!istype(M, /mob/living))
+ return 0
+ var/datum/reagent/self = src
+ src = null //of the reagent to the mob on TOUCHING it.
+
+ if(!istype(self.holder.my_atom, /obj/effect/effect/chem_smoke))
+ // If the chemicals are in a smoke cloud, do not try to let the chemicals "penetrate" into the mob's system (balance station 13) -- Doohl
+
+ if(method == TOUCH)
+
+ var/chance = 1
+ var/block = 0
+
+ for(var/obj/item/clothing/C in M.get_equipped_items())
+ if(C.permeability_coefficient < chance) chance = C.permeability_coefficient
+ if(istype(C, /obj/item/clothing/suit/bio_suit))
+ // bio suits are just about completely fool-proof - Doohl
+ // kind of a hacky way of making bio suits more resistant to chemicals but w/e
+ if(prob(75))
+ block = 1
+
+ if(istype(C, /obj/item/clothing/head/bio_hood))
+ if(prob(75))
+ block = 1
+
+ chance = chance * 100
+
+ if(prob(chance) && !block)
+ if(M.reagents)
+ M.reagents.add_reagent(self.id,self.volume/2)
+ return 1
+
+datum/reagent/proc/reaction_obj(var/obj/O, var/volume) //By default we transfer a small part of the reagent to the object
+ src = null //if it can hold reagents. nope!
+ //if(O.reagents)
+ // O.reagents.add_reagent(id,volume/3)
+ return
+
+datum/reagent/proc/reaction_turf(var/turf/T, var/volume)
+ src = null
+ return
+
+datum/reagent/proc/on_mob_life(var/mob/living/M as mob)
+ current_cycle++
+ if(!istype(M, /mob/living))
+ return //Noticed runtime errors from facid trying to damage ghosts, this should fix. --NEO
+ holder.remove_reagent(src.id, metabolization_rate * M.metabolism_efficiency) //By default it slowly disappears.
+ return
+
+// Called when this reagent is removed while inside a mob
+datum/reagent/proc/on_mob_delete(mob/M)
+ return
+
+datum/reagent/proc/on_move(var/mob/M)
+ return
+
+// Called after add_reagents creates a new reagent.
+datum/reagent/proc/on_new(var/data)
+ return
+
+// Called when two reagents of the same are mixing.
+datum/reagent/proc/on_merge(var/data)
+ return
+
+datum/reagent/proc/on_update(var/atom/A)
+ return
+
+// Called every time reagent containers process.
+datum/reagent/proc/on_tick(var/data)
+ return
+
+// Called when the reagent container is hit by an explosion
+datum/reagent/proc/on_ex_act(var/severity)
+ return
+
+// Called if the reagent has passed the overdose threshold and is set to be triggering overdose effects
+datum/reagent/proc/overdose_process(var/mob/living/M as mob)
+ return
+
+datum/reagent/proc/overdose_start(var/mob/living/M as mob)
+ M << "You feel like you took too much of [name]!"
+ return
+
+datum/reagent/proc/addiction_act_stage1(var/mob/living/M as mob)
+ if(prob(30))
+ M << "You feel like some [name] right about now."
+ return
+
+datum/reagent/proc/addiction_act_stage2(var/mob/living/M as mob)
+ if(prob(30))
+ M << "You feel like you need [name]. You just can't get enough."
+ return
+
+datum/reagent/proc/addiction_act_stage3(var/mob/living/M as mob)
+ if(prob(30))
+ M << "You have an intense craving for [name]."
+ return
+
+datum/reagent/proc/addiction_act_stage4(var/mob/living/M as mob)
+ if(prob(30))
+ M << "You're not feeling good at all! You really need some [name]."
+ return
+
diff --git a/code/modules/reagents/Chemistry-Reagents/Blob-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Blob-Reagents.dm
index 0ddd41ef092..02c41c45711 100644
--- a/code/modules/reagents/Chemistry-Reagents/Blob-Reagents.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Blob-Reagents.dm
@@ -81,7 +81,7 @@ datum/reagent/blob/acid
datum/reagent/blob/acid/reaction_mob(var/mob/living/M as mob, var/method=TOUCH, var/volume, var/show_message = 1)
if(method == TOUCH)
- if(prob(50))
+ if(prob(50))
M.acid_act(5,1,5)
if(show_message)
M << "The blob's tendrils melt through your equipment!"
@@ -97,7 +97,7 @@ datum/reagent/blob/radioactive_liquid/reaction_mob(var/mob/living/M as mob, var/
if(method == TOUCH)
if(istype(M, /mob/living/carbon/human))
M.apply_damage(10, BRUTE)
- M.apply_effect(40,IRRADIATE,0) // irradiate the shit out of these fuckers
+ M.irradiate(40)
if(prob(33))
randmuti(M)
if(prob(98))
@@ -147,6 +147,44 @@ datum/reagent/blob/explosive/reaction_mob(var/mob/living/M as mob, var/method=TO
M << "The blob strikes you, and its tendrils explode!"
explosion(M.loc, 0, 0, 1, 0, 0)
+datum/reagent/blob/omnizine
+ name = "Omnizine"
+ id = "b_omnizine"
+ description = ""
+ color = "#C8A5DC"
+
+datum/reagent/blob/omnizine/reaction_mob(var/mob/living/M as mob, var/method=TOUCH, var/volume, var/show_message = 1)
+ if(method == TOUCH)
+ if(show_message)
+ M << "The blob squirts something at you, and you feel great!"
+ M.reagents.add_reagent("omnizine", 11)
+
+datum/reagent/blob/morphine
+ name = "Morphine"
+ id = "b_morphine"
+ description = ""
+ color = "#335555"
+
+datum/reagent/blob/morphine/reaction_mob(var/mob/living/M as mob, var/method=TOUCH, var/volume, var/show_message = 1)
+ if(method == TOUCH)
+ if(show_message)
+ M << "The blob squirts something at you, and you feel numb!"
+ M.reagents.add_reagent("morphine", 16)
+
+datum/reagent/blob/spacedrugs
+ name = "Space drugs"
+ id = "b_space_drugs"
+ description = ""
+ color = "#60A584"
+
+datum/reagent/blob/spacedrugs/reaction_mob(var/mob/living/M as mob, var/method=TOUCH, var/volume, var/show_message = 1)
+ if(method == TOUCH)
+ if(show_message)
+ M << "The blob squirts something at you, and you feel funny!"
+ M.reagents.add_reagent("space_drugs", 15)
+ M.apply_damage(10, TOX)
+
+
/proc/reagent_vortex(var/mob/living/M as mob, var/setting_type)
var/turf/pull = get_turf(M)
for(var/atom/movable/X in orange(4,pull))
@@ -159,3 +197,7 @@ datum/reagent/blob/explosive/reaction_mob(var/mob/living/M as mob, var/method=TO
step_away(X,pull)
else
X.throw_at(pull)
+
+
+
+
diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents.dm
index 33464948243..d86016f96ab 100644
--- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents.dm
@@ -253,6 +253,10 @@ datum/reagent/water
color = "#AAAAAA77" // rgb: 170, 170, 170, 77 (alpha)
var/cooling_temperature = 2
+/*
+ * Water reaction to turf
+ */
+
datum/reagent/water/reaction_turf(var/turf/simulated/T, var/volume)
if (!istype(T)) return
var/CT = cooling_temperature
@@ -272,14 +276,29 @@ datum/reagent/water/reaction_turf(var/turf/simulated/T, var/volume)
qdel(hotspot)
return
+/*
+ * Water reaction to an object
+ */
+
datum/reagent/water/reaction_obj(var/obj/O, var/volume)
src = null
+ // Monkey cube
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()
+
+ // Dehydrated carp
+ if(istype(O,/obj/item/toy/carpplushie/dehy_carp))
+ var/obj/item/toy/carpplushie/dehy_carp/dehy = O
+ dehy.Swell() // Makes a carp
+
return
+/*
+ * Water reaction to a mob
+ */
+
datum/reagent/water/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume)//Splashing people with water can help put them out!
if(!istype(M, /mob/living))
return
@@ -376,6 +395,34 @@ datum/reagent/slimetoxin
description = "A corruptive toxin produced by slimes."
color = "#13BC5E" // rgb: 19, 188, 94
+datum/reagent/unstableslimetoxin
+ name = "Unstable Mutation Toxin"
+ id = "unstablemutationtoxin"
+ description = "An unstable and unpredictable corruptive toxin produced by slimes."
+ color = "#5EFF3B" //RGB: 94, 255, 59
+ metabolization_rate = INFINITY //So it instantly removes all of itself
+
+datum/reagent/unstableslimetoxin/on_mob_life(var/mob/living/carbon/human/H as mob)
+ ..()
+ H << "You crumple in agony as your flesh wildly morphs into new forms!"
+ H.visible_message("[H] falls to the ground and screams as their skin bubbles and froths!") //'froths' sounds painful when used with SKIN.
+ H.Weaken(3)
+ sleep(30)
+ var/list/blacklisted_species = list(/datum/species/zombie, /datum/species/skeleton, /datum/species/human, /datum/species/golem, /datum/species/golem/adamantine, /datum/species/shadow)
+ var/list/possible_morphs = typesof(/datum/species/) - blacklisted_species
+ var/datum/species/mutation = pick(possible_morphs)
+ if(prob(90) && mutation && H.dna.species != /datum/species/golem && H.dna.species != /datum/species/golem/adamantine)
+ H << "The pain subsides. You feel... different."
+ H.dna.species = new mutation()
+ H.regenerate_icons()
+ if(mutation == /datum/species/slime)
+ H.faction |= "slime"
+ else
+ H.faction -= "slime"
+ else
+ H << "The pain vanishes suddenly. You feel no different."
+ return 1
+
datum/reagent/aslimetoxin
name = "Advanced Mutation Toxin"
id = "amutationtoxin"
diff --git a/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Drink-Reagents/Alcohols.dm b/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Drink-Reagents/Alcohols.dm
index f494d01b409..d375a9dcd65 100644
--- a/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Drink-Reagents/Alcohols.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Drink-Reagents/Alcohols.dm
@@ -22,7 +22,6 @@ datum/reagent/consumable/ethanol
var/boozepwr = 10 //lower numbers mean the booze will have an effect faster.
datum/reagent/consumable/ethanol/on_mob_life(var/mob/living/M as mob)
- current_cycle++
M.jitteriness = max(M.jitteriness-5,0)
if(current_cycle >= boozepwr)
if (!M.slurring) M.slurring = 1
@@ -617,3 +616,10 @@ datum/reagent/consumable/ethanol/silencer/on_mob_life(var/mob/living/M as mob)
M.heal_organ_damage(1,1)
..()
return
+
+datum/reagent/consumable/ethanol/drunkenblumpkin
+ name = "Drunken Blumpkin"
+ id = "drunkenblumpkin"
+ description = "A weird mix of whiskey and blumpkin juice."
+ color = "#1EA0FF" // rgb: 102, 67, 0
+ boozepwr = 35
\ No newline at end of file
diff --git a/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Drink-Reagents/Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Drink-Reagents/Drinks.dm
index 87496ff1a82..2ba1088cda7 100644
--- a/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Drink-Reagents/Drinks.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Drink-Reagents/Drinks.dm
@@ -1,8 +1,4 @@
-#define REM REAGENTS_EFFECT_MULTIPLIER
-
-
-
/////////////////////////////////////////////////////////////////////////////////////////////////////////
/////////////////////// DRINKS BELOW, Beer is up there though, along with cola. Cap'n Pete's Cuban Spiced Rum////////////////////////////////
@@ -59,7 +55,6 @@ datum/reagent/consumable/carrotjuice/on_mob_life(var/mob/living/M as mob)
if(21 to INFINITY)
if (prob(current_cycle-10))
M.disabilities &= ~NEARSIGHT
- current_cycle++
..()
return
@@ -400,6 +395,66 @@ datum/reagent/consumable/doctor_delight
description = "A gulp a day keeps the MediBot away. That's probably for the best."
color = "#FF8CFF" // rgb: 255, 140, 255
+datum/reagent/consumable/chocolatepudding
+ name = "Chocolate Pudding"
+ id = "chocolatepudding"
+ description = "A great dessert for chocolate lovers."
+ color = "#800000"
+ nutriment_factor = 4 * REAGENTS_METABOLISM
+
+datum/reagent/consumable/vanillapudding
+ name = "Vanilla Pudding"
+ id = "vanillapudding"
+ description = "A great dessert for vanilla lovers."
+ color = "#FAFAD2"
+ nutriment_factor = 4 * REAGENTS_METABOLISM
+
+datum/reagent/consumable/cherryshake
+ name = "Cherry Shake"
+ id = "cherryshake"
+ description = "A cherry flavored milkshake."
+ color = "#FFB6C1"
+ nutriment_factor = 4 * REAGENTS_METABOLISM
+
+datum/reagent/consumable/bluecherryshake
+ name = "Blue Cherry Shake"
+ id = "bluecherryshake"
+ description = "An exotic milkshake."
+ color = "#00F1FF"
+ nutriment_factor = 4 * REAGENTS_METABOLISM
+
+datum/reagent/consumable/pumpkin_latte
+ name = "Pumpkin Latte"
+ id = "pumpkin_latte"
+ description = "A mix of pumpkin juice and coffee."
+ color = "#F4A460"
+ nutriment_factor = 3 * REAGENTS_METABOLISM
+
+datum/reagent/consumable/gibbfloats
+ name = "Gibb Floats"
+ id = "gibbfloats"
+ description = "Icecream on top of a Dr. Gibb glass."
+ color = "#B22222"
+ nutriment_factor = 3 * REAGENTS_METABOLISM
+
+datum/reagent/consumable/pumpkinjuice
+ name = "Pumpkin Juice"
+ id = "pumpkinjuice"
+ description = "Juiced from real pumpkin."
+ color = "#FFA500"
+
+datum/reagent/consumable/blumpkinjuice
+ name = "Blumpkin Juice"
+ id = "blumpkinjuice"
+ description = "Juiced from real blumpkin."
+ color = "#00BFFF"
+
+datum/reagent/consumable/triple_citrus
+ name = "Triple Citrus"
+ id = "triple_citrus"
+ description = "A solution."
+ color = "#C8A5DC"
+
//////////////////////////////////////////////The ten friggen million reagents that get you drunk//////////////////////////////////////////////
@@ -416,7 +471,6 @@ datum/reagent/consumable/atomicbomb/on_mob_life(var/mob/living/M as mob)
if (!M.slurring)
M.slurring = 1
M.slurring += 3
- current_cycle++
switch(current_cycle)
if(51 to 200)
M.sleeping += 1
@@ -433,18 +487,19 @@ datum/reagent/consumable/gargle_blaster
color = "#664300" // rgb: 102, 67, 0
datum/reagent/consumable/gargle_blaster/on_mob_life(var/mob/living/M as mob)
- current_cycle++
M.dizziness +=6
- if(current_cycle >= 15 && current_cycle <45)
- if (!M.slurring)
- M.slurring = 1
- M.slurring += 3
- else if(current_cycle >= 45 && prob(50) && current_cycle <55)
- M.confused = max(M.confused+3,0)
- else if(current_cycle >=55)
- M.druggy = max(M.druggy, 55)
- else if(current_cycle >=200)
- M.adjustToxLoss(2)
+ switch(current_cycle)
+ if(15 to 45)
+ if(!M.slurring)
+ M.slurring = 1
+ M.slurring += 3
+ if(45 to 55)
+ if(prob(50))
+ M.confused = max(M.confused+3,0)
+ if(55 to 200)
+ M.druggy = max(M.druggy, 55)
+ if(200 to INFINITY)
+ M.adjustToxLoss(2)
..()
return
@@ -456,18 +511,19 @@ datum/reagent/consumable/neurotoxin
datum/reagent/consumable/neurotoxin/on_mob_life(var/mob/living/carbon/M as mob)
M.weakened = max(M.weakened, 3)
- current_cycle++
M.dizziness +=6
- if(current_cycle >= 15 && current_cycle <45)
- if (!M.slurring)
- M.slurring = 1
- M.slurring += 3
- else if(current_cycle >= 45 && prob(50) && current_cycle <55)
- M.confused = max(M.confused+3,0)
- else if(current_cycle >=55)
- M.druggy = max(M.druggy, 55)
- else if(current_cycle >=200)
- M.adjustToxLoss(2)
+ switch(current_cycle)
+ if(15 to 45)
+ if(!M.slurring)
+ M.slurring = 1
+ M.slurring += 3
+ if(45 to 55)
+ if(prob(50))
+ M.confused = max(M.confused+3,0)
+ if(55 to 200)
+ M.druggy = max(M.druggy, 55)
+ if(200 to INFINITY)
+ M.adjustToxLoss(2)
..()
return
@@ -481,7 +537,6 @@ datum/reagent/consumable/hippies_delight
datum/reagent/consumable/hippies_delight/on_mob_life(var/mob/living/M as mob)
M.druggy = max(M.druggy, 50)
- current_cycle++
switch(current_cycle)
if(1 to 5)
if (!M.slurring) M.slurring = 1
@@ -508,7 +563,3 @@ datum/reagent/consumable/hippies_delight/on_mob_life(var/mob/living/M as mob)
if(prob(30)) M.adjustToxLoss(2)
..()
return
-
-
-// Undefine the alias for REAGENTS_EFFECT_MULTIPLER
-#undef REM
\ No newline at end of file
diff --git a/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm
index 7343eb912c3..e10d2af11ec 100644
--- a/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm
@@ -13,6 +13,7 @@ datum/reagent/consumable
var/nutriment_factor = 1 * REAGENTS_METABOLISM
datum/reagent/consumable/on_mob_life(var/mob/living/M as mob)
+ current_cycle++
M.nutrition += nutriment_factor
holder.remove_reagent(src.id, metabolization_rate)
@@ -58,7 +59,6 @@ datum/reagent/consumable/sugar
datum/reagent/consumable/sugar/overdose_start(var/mob/living/M as mob)
M << "You go into hyperglycaemic shock! Lay off the twinkies!"
M.sleeping += 30
- ..()
return
datum/reagent/consumable/sugar/overdose_process(var/mob/living/M as mob)
@@ -288,7 +288,6 @@ datum/reagent/mushroomhallucinogen/on_mob_life(var/mob/living/M as mob)
M.druggy = max(M.druggy, 40)
if(prob(30))
M.emote(pick("twitch","giggle"))
- current_cycle++
..()
return
@@ -383,6 +382,12 @@ datum/reagent/consumable/cherryjelly
description = "Totally the best. Only to be spread on foods with excellent lateral symmetry."
color = "#801E28" // rgb: 128, 30, 40
+datum/reagent/consumable/bluecherryjelly
+ name = "Blue Cherry Jelly"
+ id = "bluecherryjelly"
+ description = "Blue and tastier kind of cherry jelly."
+ color = "#00F0FF"
+
datum/reagent/consumable/rice
name = "Rice"
id = "rice"
@@ -404,3 +409,20 @@ datum/reagent/consumable/eggyolk
id = "eggyolk"
description = "It's full of protein."
color = "#FFB500"
+
+datum/reagent/consumable/corn_starch
+ name = "Corn Starch"
+ id = "corn_starch"
+ description = "A slippery solution."
+ color = "#C8A5DC"
+
+datum/reagent/consumable/corn_syrup
+ name = "Corn Syrup"
+ id = "corn_syrup"
+ description = "Decays into sugar."
+ color = "#C8A5DC"
+
+datum/reagent/consumable/corn_syrup/on_mob_life(var/mob/living/M as mob)
+ M.reagents.add_reagent("sugar", 3)
+ M.reagents.remove_reagent("corn_syrup", 1)
+ ..()
diff --git a/code/modules/reagents/Chemistry-Reagents/Drug-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Drug-Reagents.dm
new file mode 100644
index 00000000000..17fea97c5dd
--- /dev/null
+++ b/code/modules/reagents/Chemistry-Reagents/Drug-Reagents.dm
@@ -0,0 +1,326 @@
+
+
+datum/reagent/drug
+ name = "Drug"
+ id = "drug"
+ metabolization_rate = 0.5 * REAGENTS_METABOLISM
+
+datum/reagent/drug/space_drugs
+ name = "Space drugs"
+ id = "space_drugs"
+ description = "An illegal chemical compound used as drug."
+ color = "#60A584" // rgb: 96, 165, 132
+ overdose_threshold = 25
+
+datum/reagent/drug/space_drugs/on_mob_life(var/mob/living/M as mob)
+ M.druggy = max(M.druggy, 15)
+ if(isturf(M.loc) && !istype(M.loc, /turf/space))
+ if(M.canmove)
+ if(prob(10)) step(M, pick(cardinal))
+ if(prob(7))
+ M.emote(pick("twitch","drool","moan","giggle"))
+ ..()
+ return
+
+datum/reagent/drug/space_drugs/overdose_process(var/mob/living/M as mob)
+ if(prob(20))
+ M.hallucination = max(M.hallucination, 5)
+ M.adjustBrainLoss(0.25*REM)
+ M.adjustToxLoss(0.25*REM)
+ ..()
+ return
+
+datum/reagent/drug/nicotine
+ name = "Nicotine"
+ id = "nicotine"
+ description = "Slightly reduces stun times. If overdosed it will deal toxin and oxygen damage."
+ reagent_state = LIQUID
+ color = "#60A584" // rgb: 96, 165, 132
+ addiction_threshold = 30
+
+datum/reagent/drug/nicotine/on_mob_life(var/mob/living/M as mob)
+ var/smoke_message = pick("You can just feel your lungs dying!", "You feel relaxed.", "You feel calmed.", "You feel the lung cancer forming.", "You feel the money you wasted.", "You feel like a space cowboy.", "You feel rugged.")
+ if(prob(5))
+ M << "[smoke_message]"
+ M.AdjustStunned(-1)
+ M.adjustStaminaLoss(-0.5*REM)
+ ..()
+
+datum/reagent/drug/crank
+ name = "Crank"
+ id = "crank"
+ description = "Reduces stun times by about 200%. If overdosed or addicted it will deal significant Toxin, Brute and Brain damage."
+ reagent_state = LIQUID
+ color = "#60A584" // rgb: 96, 165, 132
+ overdose_threshold = 20
+ addiction_threshold = 10
+
+datum/reagent/drug/crank/on_mob_life(var/mob/living/M as mob)
+ var/high_message = pick("You feel jittery.", "You feel like you gotta go fast.", "You feel like you need to step it up.")
+ if(prob(5))
+ M << "[high_message]"
+ M.AdjustParalysis(-1)
+ M.AdjustStunned(-1)
+ M.AdjustWeakened(-1)
+ ..()
+
+datum/reagent/drug/crank/overdose_process(var/mob/living/M as mob)
+ M.adjustBrainLoss(2*REM)
+ M.adjustToxLoss(2*REM)
+ M.adjustBruteLoss(2*REM)
+ ..()
+
+datum/reagent/drug/crank/addiction_act_stage1(var/mob/living/M as mob)
+ M.adjustBrainLoss(5*REM)
+ ..()
+
+datum/reagent/drug/crank/addiction_act_stage2(var/mob/living/M as mob)
+ M.adjustToxLoss(5*REM)
+ ..()
+
+datum/reagent/drug/crank/addiction_act_stage3(var/mob/living/M as mob)
+ M.adjustBruteLoss(5*REM)
+ ..()
+
+datum/reagent/drug/crank/addiction_act_stage4(var/mob/living/M as mob)
+ M.adjustBrainLoss(5*REM)
+ M.adjustToxLoss(5*REM)
+ M.adjustBruteLoss(5*REM)
+ ..()
+
+/datum/reagent/drug/krokodil
+ name = "Krokodil"
+ id = "krokodil"
+ description = "Cools and calms you down. If overdosed it will deal significant Brain and Toxin damage. If addicted it will begin to deal fatal amounts of Brute damage as the subject's skin falls off."
+ reagent_state = LIQUID
+ color = "#60A584" // rgb: 96, 165, 132
+ overdose_threshold = 20
+ addiction_threshold = 15
+
+
+/datum/reagent/drug/krokodil/on_mob_life(var/mob/living/M as mob)
+ var/high_message = pick("You feel calm.", "You feel collected.", "You feel like you need to relax.")
+ if(prob(5))
+ M << "[high_message]"
+ ..()
+ return
+
+/datum/reagent/drug/krokodil/overdose_process(var/mob/living/M as mob)
+ M.adjustBrainLoss(0.25*REM)
+ M.adjustToxLoss(0.25*REM)
+ ..()
+ return
+
+
+/datum/reagent/drug/krokodil/addiction_act_stage1(var/mob/living/M as mob)
+ M.adjustBrainLoss(2*REM)
+ M.adjustToxLoss(2*REM)
+ ..()
+ return
+/datum/reagent/krokodil/addiction_act_stage2(var/mob/living/M as mob)
+ if(prob(25))
+ M << "Your skin feels loose..."
+ ..()
+ return
+/datum/reagent/drug/krokodil/addiction_act_stage3(var/mob/living/M as mob)
+ if(prob(25))
+ M << "Your skin starts to peel away..."
+ M.adjustBruteLoss(3*REM)
+ ..()
+ return
+
+/datum/reagent/drug/krokodil/addiction_act_stage4(var/mob/living/carbon/human/M as mob)
+ if(!istype(M.dna.species, /datum/species/cosmetic_zombie))
+ M << "Your skin falls off easily!"
+ M.adjustBruteLoss(50*REM) // holy shit your skin just FELL THE FUCK OFF
+ hardset_dna(M, null, null, null, null, /datum/species/cosmetic_zombie)
+ else
+ M.adjustBruteLoss(5*REM)
+ ..()
+ return
+
+/datum/reagent/drug/methamphetamine
+ name = "Methamphetamine"
+ id = "methamphetamine"
+ description = "Reduces stun times by about 300%, speeds the user up, and allows the user to quickly recover stamina while dealing a small amount of Brain damage. If overdosed the subject will move randomly, laugh randomly, drop items and suffer from Toxin and Brain damage. If addicted the subject will constantly jitter and drool, before becoming dizzy and losing motor control and eventually suffer heavy toxin damage."
+ reagent_state = LIQUID
+ color = "#60A584" // rgb: 96, 165, 132
+ overdose_threshold = 20
+ addiction_threshold = 10
+ metabolization_rate = 0.75 * REAGENTS_METABOLISM
+
+/datum/reagent/drug/methamphetamine/on_mob_life(var/mob/living/M as mob)
+ var/high_message = pick("You feel hyper.", "You feel like you need to go faster.", "You feel like you can run the world.")
+ if(prob(5))
+ M << "[high_message]"
+ M.AdjustParalysis(-2)
+ M.AdjustStunned(-2)
+ M.AdjustWeakened(-2)
+ M.adjustStaminaLoss(-2)
+ M.status_flags |= GOTTAGOREALLYFAST
+ M.Jitter(2)
+ M.adjustBrainLoss(0.25)
+ if(prob(5))
+ M.emote(pick("twitch", "shiver"))
+ ..()
+ return
+
+/datum/reagent/drug/methamphetamine/overdose_process(var/mob/living/M as mob)
+ if(M.canmove && !istype(M.loc, /atom/movable))
+ for(var/i = 0, i < 4, i++)
+ step(M, pick(cardinal))
+ if(prob(20))
+ M.emote("laugh")
+ if(prob(33))
+ M.visible_message("[M]'s hands flip out and flail everywhere!")
+ var/obj/item/I = M.get_active_hand()
+ if(I)
+ M.drop_item()
+ ..()
+ M.adjustToxLoss(1)
+ M.adjustBrainLoss(pick(0.5, 0.6, 0.7, 0.8, 0.9, 1))
+ return
+
+/datum/reagent/drug/methamphetamine/addiction_act_stage1(var/mob/living/M as mob)
+ M.Jitter(5)
+ if(prob(20))
+ M.emote(pick("twitch","drool","moan"))
+ ..()
+ return
+/datum/reagent/drug/methamphetamine/addiction_act_stage2(var/mob/living/M as mob)
+ M.Jitter(10)
+ M.Dizzy(10)
+ if(prob(30))
+ M.emote(pick("twitch","drool","moan"))
+ ..()
+ return
+/datum/reagent/drug/methamphetamine/addiction_act_stage3(var/mob/living/M as mob)
+ if(M.canmove && !istype(M.loc, /atom/movable))
+ for(var/i = 0, i < 4, i++)
+ step(M, pick(cardinal))
+ M.Jitter(15)
+ M.Dizzy(15)
+ if(prob(40))
+ M.emote(pick("twitch","drool","moan"))
+ ..()
+ return
+/datum/reagent/drug/methamphetamine/addiction_act_stage4(var/mob/living/carbon/human/M as mob)
+ if(M.canmove && !istype(M.loc, /atom/movable))
+ for(var/i = 0, i < 8, i++)
+ step(M, pick(cardinal))
+ M.Jitter(20)
+ M.Dizzy(20)
+ M.adjustToxLoss(5)
+ if(prob(50))
+ M.emote(pick("twitch","drool","moan"))
+ ..()
+ return
+
+/datum/reagent/drug/bath_salts
+ name = "Bath Salts"
+ id = "bath_salts"
+ description = "Makes you nearly impervious to stuns and grants a stamina regeneration buff, but you will be a nearly uncontrollable tramp-bearded raving lunatic."
+ reagent_state = LIQUID
+ color = "#60A584" // rgb: 96, 165, 132
+ overdose_threshold = 20
+ addiction_threshold = 10
+
+
+/datum/reagent/drug/bath_salts/on_mob_life(var/mob/living/M as mob)
+ var/high_message = pick("You feel amped up.", "You feel ready.", "You feel like you can push it to the limit.")
+ if(prob(5))
+ M << "[high_message]"
+ M.AdjustParalysis(-3)
+ M.AdjustStunned(-3)
+ M.AdjustWeakened(-3)
+ M.adjustStaminaLoss(-5)
+ M.adjustBrainLoss(0.5)
+ M.adjustToxLoss(0.1)
+ M.hallucination += 10
+ if(M.canmove && !istype(M.loc, /atom/movable))
+ step(M, pick(cardinal))
+ step(M, pick(cardinal))
+ ..()
+ return
+
+/datum/reagent/drug/bath_salts/overdose_process(var/mob/living/M as mob)
+ M.hallucination += 10
+ if(M.canmove && !istype(M.loc, /atom/movable))
+ for(var/i = 0, i < 8, i++)
+ step(M, pick(cardinal))
+ if(prob(20))
+ M.emote(pick("twitch","drool","moan"))
+ if(prob(33))
+ var/obj/item/I = M.get_active_hand()
+ if(I)
+ M.drop_item()
+ ..()
+ return
+
+/datum/reagent/drug/bath_salts/addiction_act_stage1(var/mob/living/M as mob)
+ M.hallucination += 10
+ if(M.canmove && !istype(M.loc, /atom/movable))
+ for(var/i = 0, i < 8, i++)
+ step(M, pick(cardinal))
+ M.Jitter(5)
+ M.adjustBrainLoss(10)
+ if(prob(20))
+ M.emote(pick("twitch","drool","moan"))
+ ..()
+ return
+/datum/reagent/drug/bath_salts/addiction_act_stage2(var/mob/living/M as mob)
+ M.hallucination += 20
+ if(M.canmove && !istype(M.loc, /atom/movable))
+ for(var/i = 0, i < 8, i++)
+ step(M, pick(cardinal))
+ M.Jitter(10)
+ M.Dizzy(10)
+ M.adjustBrainLoss(10)
+ if(prob(30))
+ M.emote(pick("twitch","drool","moan"))
+ ..()
+ return
+/datum/reagent/drug/bath_salts/addiction_act_stage3(var/mob/living/M as mob)
+ M.hallucination += 30
+ if(M.canmove && !istype(M.loc, /atom/movable))
+ for(var/i = 0, i < 12, i++)
+ step(M, pick(cardinal))
+ M.Jitter(15)
+ M.Dizzy(15)
+ M.adjustBrainLoss(10)
+ if(prob(40))
+ M.emote(pick("twitch","drool","moan"))
+ ..()
+ return
+/datum/reagent/drug/bath_salts/addiction_act_stage4(var/mob/living/carbon/human/M as mob)
+ M.hallucination += 40
+ if(M.canmove && !istype(M.loc, /atom/movable))
+ for(var/i = 0, i < 16, i++)
+ step(M, pick(cardinal))
+ M.Jitter(50)
+ M.Dizzy(50)
+ M.adjustToxLoss(5)
+ M.adjustBrainLoss(10)
+ if(prob(50))
+ M.emote(pick("twitch","drool","moan"))
+ ..()
+ return
+
+/datum/reagent/drug/aranesp
+ name = "Aranesp"
+ id = "aranesp"
+ description = "Amps you up and gets you going, fixes all stamina damage you might have but can cause toxin and oxygen damage.."
+ reagent_state = LIQUID
+ color = "#60A584" // rgb: 96, 165, 132
+
+/datum/reagent/drug/aranesp/on_mob_life(var/mob/living/M as mob)
+ var/high_message = pick("You feel amped up.", "You feel ready.", "You feel like you can push it to the limit.")
+ if(prob(5))
+ M << "[high_message]"
+ M.adjustStaminaLoss(-18)
+ M.adjustToxLoss(0.5)
+ if(prob(50))
+ M.losebreath++
+ M.adjustOxyLoss(1)
+ ..()
+ return
diff --git a/code/modules/reagents/Chemistry-Reagents/Medicine-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Medicine-Reagents.dm
index 1765a0929af..9c0bbff9395 100644
--- a/code/modules/reagents/Chemistry-Reagents/Medicine-Reagents.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Medicine-Reagents.dm
@@ -1,6 +1,4 @@
-#define REM REAGENTS_EFFECT_MULTIPLIER
-
//////////////////////////////////////////////////////////////////////////////////////////
// MEDICINE REAGENTS
//////////////////////////////////////////////////////////////////////////////////////
@@ -12,6 +10,7 @@ datum/reagent/medicine
id = "medicine"
datum/reagent/medicine/on_mob_life(var/mob/living/M as mob)
+ current_cycle++
holder.remove_reagent(src.id, metabolization_rate / M.metabolism_efficiency) //medicine reagents stay longer if you have a better metabolism
datum/reagent/medicine/leporazine
@@ -34,7 +33,6 @@ datum/reagent/medicine/adminordrazine //An OP chemical for admins
color = "#C8A5DC" // rgb: 200, 165, 220
datum/reagent/medicine/adminordrazine/on_mob_life(var/mob/living/carbon/M as mob)
- if(!M) M = holder.my_atom ///This can even heal dead people.
M.reagents.remove_all_type(/datum/reagent/toxin, 5*REM, 0, 1)
M.setCloneLoss(0)
M.setOxyLoss(0)
@@ -127,7 +125,6 @@ datum/reagent/medicine/rezadone
color = "#669900" // rgb: 102, 153, 0
datum/reagent/medicine/rezadone/on_mob_life(var/mob/living/M as mob)
- current_cycle++
switch(current_cycle)
if(1 to 15)
M.adjustCloneLoss(-1)
@@ -152,5 +149,585 @@ datum/reagent/medicine/spaceacillin
metabolization_rate = 0.5 * REAGENTS_METABOLISM
-// Undefine the alias for REAGENTS_EFFECT_MULTIPLER
-#undef REM
\ No newline at end of file
+
+
+//------------------------------------------------------------------------------------------------------
+ //GOON MEDICINE
+//------------------------------------------------------------------------------------------------------
+
+
+datum/reagent/medicine/silver_sulfadiazine
+ name = "Silver Sulfadiazine"
+ id = "silver_sulfadiazine"
+ description = "On touch, quickly heals burn damage. Basic anti-burn healing drug. On ingestion, deals minor toxin damage."
+ reagent_state = LIQUID
+ color = "#C8A5DC"
+
+datum/reagent/medicine/silver_sulfadiazine/reaction_mob(var/mob/living/M as mob, var/method=TOUCH, var/volume, var/show_message = 1)
+ if(iscarbon(M))
+ if(method == TOUCH)
+ M.adjustFireLoss(-volume)
+ if(show_message)
+ M << "You feel your burns healing!"
+ M.emote("scream")
+ if(method == INGEST)
+ M.adjustToxLoss(0.5*volume)
+ if(show_message)
+ M << "You probably shouldn't have eaten that. Maybe you should of splashed it on, or applied a patch?"
+ ..()
+ return
+
+datum/reagent/medicine/silver_sulfadiazine/on_mob_life(var/mob/living/M as mob)
+ M.adjustFireLoss(-2*REM)
+ ..()
+ return
+
+datum/reagent/medicine/styptic_powder
+ name = "Styptic Powder"
+ id = "styptic_powder"
+ description = "On touch, quickly heals brute damage. Basic anti-brute healing drug. On ingestion, deals minor toxin damage."
+ reagent_state = LIQUID
+ color = "#C8A5DC"
+
+datum/reagent/medicine/styptic_powder/reaction_mob(var/mob/living/M as mob, var/method=TOUCH, var/volume, var/show_message = 1)
+ if(iscarbon(M))
+ if(method == TOUCH)
+ M.adjustBruteLoss(-volume)
+ if(show_message)
+ M << "You feel your wounds knitting back together!"
+ M.emote("scream")
+ if(method == INGEST)
+ M.adjustToxLoss(0.5*volume)
+ if(show_message)
+ M << "You probably shouldn't have eaten that. Maybe you should of splashed it on, or applied a patch?"
+ ..()
+ return
+
+datum/reagent/medicine/styptic_powder/on_mob_life(var/mob/living/M as mob)
+ M.adjustBruteLoss(-2*REM)
+ ..()
+ return
+
+datum/reagent/medicine/salglu_solution
+ name = "Saline-Glucose Solution"
+ id = "salglu_solution"
+ description = "Has a 33% chance per metabolism cycle to heal brute and burn damage."
+ reagent_state = LIQUID
+ color = "#C8A5DC"
+ metabolization_rate = 0.5 * REAGENTS_METABOLISM
+
+datum/reagent/medicine/salglu_solution/on_mob_life(var/mob/living/M as mob)
+ if(prob(33))
+ M.adjustBruteLoss(-0.5*REM)
+ M.adjustFireLoss(-0.5*REM)
+ ..()
+ return
+
+datum/reagent/medicine/synthflesh
+ name = "Synthflesh"
+ id = "synthflesh"
+ description = "Has a 100% chance of instantly healing brute and burn damage. One unit of the chemical will heal one point of damage. Touch application only."
+ reagent_state = LIQUID
+ color = "#C8A5DC"
+
+datum/reagent/medicine/synthflesh/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume,var/show_message = 1)
+ if(iscarbon(M))
+ if(method == TOUCH)
+ M.adjustBruteLoss(-1.5*volume)
+ M.adjustFireLoss(-1.5*volume)
+ if(show_message)
+ M << "You feel your burns healing and your flesh knitting together!"
+ ..()
+ return
+
+datum/reagent/medicine/charcoal
+ name = "Charcoal"
+ id = "charcoal"
+ description = "Heals toxin damage, and will also slowly remove any other chemicals."
+ reagent_state = LIQUID
+ color = "#C8A5DC"
+ metabolization_rate = 0.5 * REAGENTS_METABOLISM
+
+datum/reagent/medicine/charcoal/on_mob_life(var/mob/living/M as mob)
+ M.adjustToxLoss(-2*REM)
+ for(var/datum/reagent/R in M.reagents.reagent_list)
+ if(R != src)
+ M.reagents.remove_reagent(R.id,1)
+ ..()
+ return
+
+datum/reagent/medicine/omnizine
+ name = "Omnizine"
+ id = "omnizine"
+ description = "Heals 1 of each damage type a cycle. If overdosed it will deal significant amounts of each damage type."
+ reagent_state = LIQUID
+ color = "#C8A5DC"
+ metabolization_rate = 0.25 * REAGENTS_METABOLISM
+ overdose_threshold = 30
+
+datum/reagent/medicine/omnizine/on_mob_life(var/mob/living/M as mob)
+ M.adjustToxLoss(-0.5*REM)
+ M.adjustOxyLoss(-0.5*REM)
+ M.adjustBruteLoss(-0.5*REM)
+ M.adjustFireLoss(-0.5*REM)
+ ..()
+ return
+
+datum/reagent/medicine/omnizine/overdose_process(var/mob/living/M as mob)
+ M.adjustToxLoss(1.5*REM)
+ M.adjustOxyLoss(1.5*REM)
+ M.adjustBruteLoss(1.5*REM)
+ M.adjustFireLoss(1.5*REM)
+ ..()
+ return
+
+datum/reagent/medicine/calomel
+ name = "Calomel"
+ id = "calomel"
+ description = "Quickly purges the body of all chemicals. If your health is above 20, toxin damage is dealt. When you hit 20 health or lower, the damage will cease."
+ reagent_state = LIQUID
+ color = "#C8A5DC"
+ metabolization_rate = 0.5 * REAGENTS_METABOLISM
+
+datum/reagent/medicine/calomel/on_mob_life(var/mob/living/M as mob)
+ for(var/datum/reagent/R in M.reagents.reagent_list)
+ if(R != src)
+ M.reagents.remove_reagent(R.id,2.5)
+ if(M.health > 20)
+ M.adjustToxLoss(2.5*REM)
+ ..()
+ return
+
+datum/reagent/medicine/potass_iodide
+ name = "Potassium Iodide"
+ id = "potass_iodide"
+ description = "Reduces low radiation damage very effectively."
+ reagent_state = LIQUID
+ color = "#C8A5DC"
+ metabolization_rate = 2 * REAGENTS_METABOLISM
+
+datum/reagent/medicine/potass_iodide/on_mob_life(var/mob/living/M as mob)
+ if(M.radiation > 0)
+ M.radiation--
+ if(M.radiation < 0)
+ M.radiation = 0
+ ..()
+ return
+
+datum/reagent/medicine/pen_acid
+ name = "Pentetic Acid"
+ id = "pen_acid"
+ description = "Reduces massive amounts of radiation and toxin damage while purging other chemicals from the body. Has a chance of dealing brute damage."
+ reagent_state = LIQUID
+ color = "#C8A5DC"
+ metabolization_rate = 0.5 * REAGENTS_METABOLISM
+
+datum/reagent/medicine/pen_acid/on_mob_life(var/mob/living/M as mob)
+ if(M.radiation > 0)
+ M.radiation -= 4
+ M.adjustToxLoss(-2*REM)
+ if(prob(33))
+ M.adjustBruteLoss(0.5*REM)
+ if(M.radiation < 0)
+ M.radiation = 0
+ for(var/datum/reagent/R in M.reagents.reagent_list)
+ if(R != src)
+ M.reagents.remove_reagent(R.id,2)
+ ..()
+ return
+
+datum/reagent/medicine/sal_acid
+ name = "Salicyclic Acid"
+ id = "sal_acid"
+ description = "If you have less than 50 brute damage, it heals 0.25 unit. If overdosed it will deal 0.5 brute damage if the patient has less than 50 brute damage already."
+ reagent_state = LIQUID
+ color = "#C8A5DC"
+ metabolization_rate = 0.5 * REAGENTS_METABOLISM
+ overdose_threshold = 25
+
+datum/reagent/medicine/sal_acid/on_mob_life(var/mob/living/M as mob)
+ if(M.getBruteLoss() < 50)
+ M.adjustBruteLoss(-0.25*REM)
+ ..()
+ return
+
+datum/reagent/medicine/sal_acid/overdose_process(var/mob/living/M as mob)
+ if(M.getBruteLoss() < 50)
+ M.adjustBruteLoss(0.5*REM)
+ ..()
+ return
+
+datum/reagent/medicine/salbutamol
+ name = "Salbutamol"
+ id = "salbutamol"
+ description = "Quickly heals oxygen damage while slowing down suffocation. Great for stabilizing critical patients!"
+ reagent_state = LIQUID
+ color = "#C8A5DC"
+ metabolization_rate = 0.25 * REAGENTS_METABOLISM
+
+datum/reagent/medicine/salbutamol/on_mob_life(var/mob/living/M as mob)
+ M.adjustOxyLoss(-3*REM)
+ if(M.losebreath >= 4)
+ M.losebreath -= 2
+ ..()
+ return
+
+datum/reagent/medicine/perfluorodecalin
+ name = "Perfluorodecalin"
+ id = "perfluorodecalin"
+ description = "Heals suffocation damage so quickly that you could have a spacewalk, but it mutes your voice. Has a 33% chance of healing brute and burn damage per cycle as well."
+ reagent_state = LIQUID
+ color = "#C8A5DC"
+ metabolization_rate = 0.25 * REAGENTS_METABOLISM
+
+datum/reagent/medicine/perfluorodecalin/on_mob_life(var/mob/living/carbon/human/M as mob)
+ M.adjustOxyLoss(-12*REM)
+ M.silent = max(M.silent, 5)
+ if(prob(33))
+ M.adjustBruteLoss(-0.5*REM)
+ M.adjustFireLoss(-0.5*REM)
+ ..()
+ return
+
+datum/reagent/medicine/ephedrine
+ name = "Ephedrine"
+ id = "ephedrine"
+ description = "Reduces stun times, increases run speed. If overdosed it will deal toxin and oxyloss damage."
+ reagent_state = LIQUID
+ color = "#C8A5DC"
+ metabolization_rate = 0.5 * REAGENTS_METABOLISM
+ overdose_threshold = 45
+ addiction_threshold = 30
+
+datum/reagent/medicine/ephedrine/on_mob_life(var/mob/living/M as mob)
+ M.status_flags |= IGNORESLOWDOWN
+ M.AdjustParalysis(-1)
+ M.AdjustStunned(-1)
+ M.AdjustWeakened(-1)
+ M.adjustStaminaLoss(-1*REM)
+ ..()
+ return
+
+datum/reagent/medicine/ephedrine/overdose_process(var/mob/living/M as mob)
+ if(prob(33))
+ M.adjustToxLoss(0.5*REM)
+ M.losebreath++
+ ..()
+ return
+
+datum/reagent/medicine/ephedrine/addiction_act_stage1(var/mob/living/M as mob)
+ if(prob(33))
+ M.adjustToxLoss(2*REM)
+ M.losebreath += 2
+ ..()
+ return
+datum/reagent/medicine/ephedrine/addiction_act_stage2(var/mob/living/M as mob)
+ if(prob(33))
+ M.adjustToxLoss(3*REM)
+ M.losebreath += 3
+ ..()
+ return
+datum/reagent/medicine/ephedrine/addiction_act_stage3(var/mob/living/M as mob)
+ if(prob(33))
+ M.adjustToxLoss(4*REM)
+ M.losebreath += 4
+ ..()
+ return
+datum/reagent/medicine/ephedrine/addiction_act_stage4(var/mob/living/M as mob)
+ if(prob(33))
+ M.adjustToxLoss(5*REM)
+ M.losebreath += 5
+ ..()
+ return
+
+datum/reagent/medicine/diphenhydramine
+ name = "Diphenhydramine"
+ id = "diphenhydramine"
+ description = "Purges body of lethal Histamine and reduces jitteriness while causing minor drowsiness."
+ reagent_state = LIQUID
+ color = "#C8A5DC"
+ metabolization_rate = 0.5 * REAGENTS_METABOLISM
+
+datum/reagent/medicine/diphenhydramine/on_mob_life(var/mob/living/M as mob)
+ if(prob(50))
+ M.drowsyness += 1
+ M.jitteriness -= 1
+ M.reagents.remove_reagent("histamine",1.5)
+ ..()
+ return
+
+datum/reagent/medicine/morphine
+ name = "Morphine"
+ id = "morphine"
+ description = "Will allow you to ignore slowdown from equipment and damage. Will eventually knock you out if you take too much. If overdosed it will cause jitteriness, dizziness, force the victim to drop items in their hands and eventually deal toxin damage."
+ reagent_state = LIQUID
+ color = "#C8A5DC"
+ metabolization_rate = 0.5 * REAGENTS_METABOLISM
+ overdose_threshold = 30
+ addiction_threshold = 25
+
+
+datum/reagent/medicine/morphine/on_mob_life(var/mob/living/M as mob)
+ M.status_flags |= IGNORESLOWDOWN
+ if(current_cycle >= 36)
+ M.sleeping += 3
+ ..()
+ return
+
+datum/reagent/medicine/morphine/overdose_process(var/mob/living/M as mob)
+ if(prob(33))
+ var/obj/item/I = M.get_active_hand()
+ if(I)
+ M.drop_item()
+ M.Dizzy(2)
+ M.Jitter(2)
+ ..()
+ return
+
+datum/reagent/medicine/morphine/addiction_act_stage1(var/mob/living/M as mob)
+ if(prob(33))
+ var/obj/item/I = M.get_active_hand()
+ if(I)
+ M.drop_item()
+ M.Dizzy(2)
+ M.Jitter(2)
+ ..()
+ return
+datum/reagent/medicine/morphine/addiction_act_stage2(var/mob/living/M as mob)
+ if(prob(33))
+ var/obj/item/I = M.get_active_hand()
+ if(I)
+ M.drop_item()
+ M.adjustToxLoss(1*REM)
+ M.Dizzy(3)
+ M.Jitter(3)
+ ..()
+ return
+datum/reagent/medicine/morphine/addiction_act_stage3(var/mob/living/M as mob)
+ if(prob(33))
+ var/obj/item/I = M.get_active_hand()
+ if(I)
+ M.drop_item()
+ M.adjustToxLoss(2*REM)
+ M.Dizzy(4)
+ M.Jitter(4)
+ ..()
+ return
+datum/reagent/medicine/morphine/addiction_act_stage4(var/mob/living/M as mob)
+ if(prob(33))
+ var/obj/item/I = M.get_active_hand()
+ if(I)
+ M.drop_item()
+ M.adjustToxLoss(3*REM)
+ M.Dizzy(5)
+ M.Jitter(5)
+ ..()
+ return
+
+datum/reagent/medicine/oculine
+ name = "Oculine"
+ id = "oculine"
+ description = "Cures blindness and heals eye damage over time."
+ reagent_state = LIQUID
+ color = "#C8A5DC"
+ metabolization_rate = 0.25 * REAGENTS_METABOLISM
+
+datum/reagent/medicine/oculine/on_mob_life(var/mob/living/M as mob)
+ if(M.eye_blind > 0 && current_cycle > 20)
+ if(prob(30))
+ M.eye_blind = 0
+ else if(prob(80))
+ M.eye_blind = 0
+ M.eye_blurry = 1
+ if(M.eye_blurry > 0)
+ if(prob(80))
+ M.eye_blurry = 0
+ ..()
+ return
+
+datum/reagent/medicine/atropine
+ name = "Atropine"
+ id = "atropine"
+ description = "If patients health is below -25 it will heal 1.5 brute and burn damage per cycle, as well as stop any oxyloss. Good for stabilising critical patients."
+ reagent_state = LIQUID
+ color = "#C8A5DC"
+ metabolization_rate = 0.25 * REAGENTS_METABOLISM
+ overdose_threshold = 35
+
+datum/reagent/medicine/atropine/on_mob_life(var/mob/living/M as mob)
+ if(M.health > -60)
+ M.adjustToxLoss(0.5*REM)
+ if(M.health < -25)
+ M.adjustBruteLoss(-1.5*REM)
+ M.adjustFireLoss(-1.5*REM)
+ if(M.oxyloss > 65)
+ M.setOxyLoss(65)
+ if(M.losebreath > 5)
+ M.losebreath = 5
+ if(prob(20))
+ M.Dizzy(5)
+ M.Jitter(5)
+ ..()
+ return
+
+datum/reagent/medicine/atropine/overdose_process(var/mob/living/M as mob)
+ M.adjustToxLoss(0.5*REM)
+ M.Dizzy(1)
+ M.Jitter(1)
+ ..()
+ return
+
+datum/reagent/medicine/epinephrine
+ name = "Epinephrine"
+ id = "epinephrine"
+ description = "Reduces most of the knockout/stun effects, minor stamina regeneration buff. Attempts to stop you taking too much oxygen damage. If the patient is in low to severe crit, heals toxins, brute, and burn very effectively. Will not heal patients who are almost dead. If overdosed will stun and deal toxin damage"
+ reagent_state = LIQUID
+ color = "#C8A5DC"
+ metabolization_rate = 0.25 * REAGENTS_METABOLISM
+ overdose_threshold = 30
+
+datum/reagent/medicine/epinephrine/on_mob_life(var/mob/living/M as mob)
+ if(M.health < -10 && M.health > -65)
+ M.adjustToxLoss(-0.5*REM)
+ M.adjustBruteLoss(-0.5*REM)
+ M.adjustFireLoss(-0.5*REM)
+ if(M.oxyloss > 35)
+ M.setOxyLoss(35)
+ if(M.losebreath >= 4)
+ M.losebreath -= 2
+ if(M.losebreath < 0)
+ M.losebreath = 0
+ M.adjustStaminaLoss(-0.5*REM)
+ if(prob(20))
+ M.AdjustParalysis(-1)
+ M.AdjustStunned(-1)
+ M.AdjustWeakened(-1)
+ ..()
+ return
+
+datum/reagent/medicine/epinephrine/overdose_process(var/mob/living/M as mob)
+ if(prob(33))
+ M.adjustStaminaLoss(2.5*REM)
+ M.adjustToxLoss(1*REM)
+ M.losebreath++
+ ..()
+ return
+
+datum/reagent/medicine/strange_reagent
+ name = "Strange Reagent"
+ id = "strange_reagent"
+ description = "A miracle drug that can bring a dead body back to life! If the corpse has suffered too much damage, however, no change will occur to the body. If used on a living person it will deal Brute and Burn damage."
+ reagent_state = LIQUID
+ color = "#C8A5DC"
+ metabolization_rate = 0.5 * REAGENTS_METABOLISM
+
+datum/reagent/medicine/strange_reagent/reaction_mob(var/mob/living/carbon/human/M as mob, var/method=TOUCH, var/volume)
+ if(M.stat == DEAD)
+ if(M.getBruteLoss() >= 100 || M.getFireLoss() >= 100)
+ M.visible_message("[M]'s body convulses a bit, and then falls still once more.")
+ return
+ var/mob/dead/observer/ghost = M.get_ghost()
+ M.visible_message("[M]'s body convulses a bit.")
+ if(!M.suiciding && !(NOCLONE in M.mutations))
+ if(ghost)
+ ghost << "Someone is trying to revive you. Return to your body if you want to be revived! (Verbs -> Ghost -> Re-enter corpse)"
+ ghost << sound('sound/effects/genetics.ogg')
+ else
+ M.stat = 1
+ M.adjustOxyLoss(-20)
+ M.adjustToxLoss(-20)
+ dead_mob_list -= M
+ living_mob_list |= list(M)
+ M.emote("gasp")
+ add_logs(M, M, "revived", object="strange reagent")
+ ..()
+ return
+
+datum/reagent/medicine/strange_reagent/on_mob_life(var/mob/living/M as mob)
+ M.adjustBruteLoss(0.5*REM)
+ M.adjustFireLoss(0.5*REM)
+ ..()
+ return
+
+/datum/reagent/medicine/mannitol
+ name = "Mannitol"
+ id = "mannitol"
+ description = "Heals brain damage effectively. Use it in cyro tubes alongside Cryoxadone."
+ color = "#C8A5DC"
+
+/datum/reagent/medicine/mannitol/on_mob_life(mob/living/M as mob)
+ M.adjustBrainLoss(-3*REM)
+ ..()
+ return
+
+/datum/reagent/medicine/mutadone
+ name = "Mutadone"
+ id = "mutadone"
+ description = "Heals your genetic defects."
+ color = "#C8A5DC"
+
+/datum/reagent/medicine/mutadone/on_mob_life(var/mob/living/carbon/human/M as mob)
+ M.jitteriness = 0
+ if(istype(M) && M.dna)
+ M.dna.remove_all_mutations()
+ ..()
+ return
+
+datum/reagent/medicine/antihol
+ name = "Antihol"
+ id = "antihol"
+ description = "Helps remove Alcohol from someone's body, as well as eliminating its side effects."
+ color = "#C8A5DC"
+
+datum/reagent/medicine/antihol/on_mob_life(var/mob/living/M as mob)
+ M.dizziness = 0
+ M.drowsyness = 0
+ M.slurring = 0
+ M.confused = 0
+ M.reagents.remove_all_type(/datum/reagent/consumable/ethanol, 3*REM, 0, 1)
+ M.adjustToxLoss(-0.2*REM)
+ ..()
+
+/datum/reagent/medicine/stimulants
+ name = "Stimulants"
+ id = "stimulants"
+ description = "Increases run speed and eliminates stuns, can heal minor damage. If overdosed it will deal toxin damage and stun."
+ color = "#C8A5DC"
+ metabolization_rate = 0.5 * REAGENTS_METABOLISM
+ overdose_threshold = 60
+
+datum/reagent/medicine/stimulants/on_mob_life(var/mob/living/M as mob)
+ M.status_flags |= IGNORESLOWDOWN
+ if(M.health < 50 && M.health > 0)
+ M.adjustOxyLoss(-1*REM)
+ M.adjustToxLoss(-1*REM)
+ M.adjustBruteLoss(-1*REM)
+ M.adjustFireLoss(-1*REM)
+ M.AdjustParalysis(-1)
+ M.AdjustStunned(-1)
+ M.AdjustWeakened(-1)
+ M.adjustStaminaLoss(-1.5*REM)
+ ..()
+
+datum/reagent/medicine/stimulants/overdose_process(var/mob/living/M as mob)
+ if(prob(33))
+ M.adjustStaminaLoss(2.5*REM)
+ M.adjustToxLoss(1*REM)
+ M.losebreath++
+ ..()
+ return
+
+datum/reagent/medicine/insulin
+ name = "Insulin"
+ id = "insulin"
+ description = "Increases sugar depletion rates."
+ reagent_state = LIQUID
+ color = "#C8A5DC"
+ metabolization_rate = 0.5 * REAGENTS_METABOLISM
+
+datum/reagent/medicine/insulin/on_mob_life(var/mob/living/M as mob)
+ if(M.sleeping)
+ M.sleeping--
+ M.reagents.remove_reagent("sugar", 3)
+ ..()
+ return
diff --git a/code/modules/reagents/Chemistry-Reagents/Other-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Other-Reagents.dm
new file mode 100644
index 00000000000..43650c72067
--- /dev/null
+++ b/code/modules/reagents/Chemistry-Reagents/Other-Reagents.dm
@@ -0,0 +1,937 @@
+
+datum/reagent/blood
+ data = list("donor"=null,"viruses"=null,"blood_DNA"=null,"blood_type"=null,"resistances"=null,"trace_chem"=null,"mind"=null,"ckey"=null,"gender"=null,"real_name"=null,"cloneable"=null,"factions"=null)
+ name = "Blood"
+ id = "blood"
+ color = "#C80000" // rgb: 200, 0, 0
+
+datum/reagent/blood/reaction_mob(var/mob/M, var/method=TOUCH, var/volume)
+ var/datum/reagent/blood/self = src
+ src = null
+ if(self.data && self.data["viruses"])
+ for(var/datum/disease/D in self.data["viruses"])
+
+ if(D.spread_flags & SPECIAL || D.spread_flags & NON_CONTAGIOUS)
+ continue
+
+ if(method == TOUCH)
+ M.ContractDisease(D)
+ else //injected
+ M.ForceContractDisease(D)
+
+datum/reagent/blood/on_new(var/list/data)
+ if(istype(data))
+ SetViruses(src, data)
+
+datum/reagent/blood/on_merge(var/list/data)
+ if(src.data && data)
+ src.data["cloneable"] = 0 //On mix, consider the genetic sampling unviable for pod cloning, or else we won't know who's even getting cloned, etc
+ if(src.data["viruses"] || data["viruses"])
+
+ var/list/mix1 = src.data["viruses"]
+ var/list/mix2 = data["viruses"]
+
+ // Stop issues with the list changing during mixing.
+ var/list/to_mix = list()
+
+ for(var/datum/disease/advance/AD in mix1)
+ to_mix += AD
+ for(var/datum/disease/advance/AD in mix2)
+ to_mix += AD
+
+ var/datum/disease/advance/AD = Advance_Mix(to_mix)
+ if(AD)
+ var/list/preserve = list(AD)
+ for(var/D in src.data["viruses"])
+ if(!istype(D, /datum/disease/advance))
+ preserve += D
+ src.data["viruses"] = preserve
+ return 1
+
+datum/reagent/blood/reaction_turf(var/turf/simulated/T, var/volume)//splash the blood all over the place
+ if(!istype(T)) return
+ var/datum/reagent/blood/self = src
+ src = null
+ if(!(volume >= 3)) return
+ //var/datum/disease/D = self.data["virus"]
+ if(!self.data["donor"] || istype(self.data["donor"], /mob/living/carbon/human))
+ var/obj/effect/decal/cleanable/blood/blood_prop = locate() in T //find some blood here
+ if(!blood_prop) //first blood!
+ blood_prop = new(T)
+ blood_prop.blood_DNA[self.data["blood_DNA"]] = self.data["blood_type"]
+
+ for(var/datum/disease/D in self.data["viruses"])
+ var/datum/disease/newVirus = D.Copy(1)
+ blood_prop.viruses += newVirus
+ newVirus.holder = blood_prop
+
+
+ else if(istype(self.data["donor"], /mob/living/carbon/monkey))
+ var/obj/effect/decal/cleanable/blood/blood_prop = locate() in T
+ if(!blood_prop)
+ blood_prop = new(T)
+ blood_prop.blood_DNA["Non-Human DNA"] = "A+"
+ for(var/datum/disease/D in self.data["viruses"])
+ var/datum/disease/newVirus = D.Copy(1)
+ blood_prop.viruses += newVirus
+ newVirus.holder = blood_prop
+
+ else if(istype(self.data["donor"], /mob/living/carbon/alien))
+ var/obj/effect/decal/cleanable/xenoblood/blood_prop = locate() in T
+ if(!blood_prop)
+ blood_prop = new(T)
+ blood_prop.blood_DNA["UNKNOWN DNA STRUCTURE"] = "X*"
+ for(var/datum/disease/D in self.data["viruses"])
+ var/datum/disease/newVirus = D.Copy(1)
+ blood_prop.viruses += newVirus
+ newVirus.holder = blood_prop
+ return
+
+datum/reagent/vaccine
+ //data must contain virus type
+ name = "Vaccine"
+ id = "vaccine"
+ color = "#C81040" // rgb: 200, 16, 64
+
+datum/reagent/vaccine/reaction_mob(var/mob/M, var/method=TOUCH, var/volume)
+ var/datum/reagent/vaccine/self = src
+ src = null
+ if(islist(self.data) && method == INGEST)
+ for(var/datum/disease/D in M.viruses)
+ if(D.GetDiseaseID() in self.data)
+ D.cure()
+ M.resistances |= self.data
+ return
+
+datum/reagent/vaccine/on_merge(var/list/data)
+ if(istype(data))
+ src.data |= data.Copy()
+
+
+datum/reagent/water
+ name = "Water"
+ id = "water"
+ description = "A ubiquitous chemical substance that is composed of hydrogen and oxygen."
+ color = "#AAAAAA77" // rgb: 170, 170, 170, 77 (alpha)
+ var/cooling_temperature = 2
+
+/*
+ * Water reaction to turf
+ */
+
+datum/reagent/water/reaction_turf(var/turf/simulated/T, var/volume)
+ if (!istype(T)) return
+ var/CT = cooling_temperature
+ src = null
+ if(volume >= 10)
+ T.MakeSlippery()
+
+ for(var/mob/living/simple_animal/slime/M in T)
+ M.apply_water()
+
+ var/hotspot = (locate(/obj/effect/hotspot) in T)
+ if(hotspot && !istype(T, /turf/space))
+ if(T.air)
+ var/datum/gas_mixture/G = T.air
+ G.temperature = max(min(G.temperature-(CT*1000),G.temperature/CT),0)
+ G.react()
+ qdel(hotspot)
+ return
+
+/*
+ * Water reaction to an object
+ */
+
+datum/reagent/water/reaction_obj(var/obj/O, var/volume)
+ src = null
+ // Monkey cube
+ 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()
+
+ // Dehydrated carp
+ if(istype(O,/obj/item/toy/carpplushie/dehy_carp))
+ var/obj/item/toy/carpplushie/dehy_carp/dehy = O
+ dehy.Swell() // Makes a carp
+
+ return
+
+/*
+ * Water reaction to a mob
+ */
+
+datum/reagent/water/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume)//Splashing people with water can help put them out!
+ if(!istype(M, /mob/living))
+ return
+ if(method == TOUCH)
+ M.adjust_fire_stacks(-(volume / 10))
+ if(M.fire_stacks <= 0)
+ M.ExtinguishMob()
+ return
+
+datum/reagent/water/holywater
+ name = "Holy Water"
+ id = "holywater"
+ description = "Water blessed by some deity."
+ color = "#E0E8EF" // rgb: 224, 232, 239
+
+datum/reagent/water/holywater/on_mob_life(var/mob/living/M as mob)
+ if(!data) data = 1
+ data++
+ M.jitteriness = max(M.jitteriness-5,0)
+ if(data >= 30) // 12 units, 54 seconds @ metabolism 0.4 units & tick rate 1.8 sec
+ if (!M.stuttering) M.stuttering = 1
+ M.stuttering += 4
+ M.Dizzy(5)
+ if(iscultist(M) && prob(5))
+ M.say(pick("Av'te Nar'sie","Pa'lid Mors","INO INO ORA ANA","SAT ANA!","Daim'niodeis Arc'iai Le'eones","Egkau'haom'nai en Chaous","Ho Diak'nos tou Ap'iron","R'ge Na'sie","Diabo us Vo'iscum","Si gn'um Co'nu"))
+ if(data >= 75 && prob(33)) // 30 units, 135 seconds
+ if (!M.confused) M.confused = 1
+ M.confused += 3
+ if(iscultist(M))
+ ticker.mode.remove_cultist(M.mind)
+ holder.remove_reagent(src.id, src.volume) // maybe this is a little too perfect and a max() cap on the statuses would be better??
+ M.jitteriness = 0
+ M.stuttering = 0
+ M.confused = 0
+ holder.remove_reagent(src.id, 0.4) //fixed consumption to prevent balancing going out of whack
+ return
+
+datum/reagent/water/holywater/reaction_turf(var/turf/simulated/T, var/volume)
+ ..()
+ if(!istype(T)) return
+ if(volume>=10)
+ for(var/obj/effect/rune/R in T)
+ qdel(R)
+ T.Bless()
+
+datum/reagent/fuel/unholywater //if you somehow managed to extract this from someone, dont splash it on yourself and have a smoke
+ name = "Unholy Water"
+ id = "unholywater"
+ description = "Something that shouldn't exist on this plane of existance."
+
+datum/reagent/fuel/unholywater/on_mob_life(var/mob/living/M as mob)
+ M.adjustBrainLoss(3)
+ if(iscultist(M))
+ M.status_flags |= GOTTAGOFAST
+ M.drowsyness = max(M.drowsyness-5, 0)
+ M.AdjustParalysis(-2)
+ M.AdjustStunned(-2)
+ M.AdjustWeakened(-2)
+ else
+ M.adjustToxLoss(2)
+ M.adjustFireLoss(2)
+ M.adjustOxyLoss(2)
+ M.adjustBruteLoss(2)
+ holder.remove_reagent(src.id, 1)
+
+datum/reagent/hellwater //if someone has this in their system they've really pissed off an eldrich god
+ name = "Hell Water"
+ id = "hell_water"
+ description = "YOUR FLESH! IT BURNS!"
+
+datum/reagent/hellwater/on_mob_life(var/mob/living/M as mob)
+ M.fire_stacks = min(5,M.fire_stacks + 3)
+ M.IgniteMob() //Only problem with igniting people is currently the commonly availible fire suits make you immune to being on fire
+ M.adjustToxLoss(1)
+ M.adjustFireLoss(1) //Hence the other damages... ain't I a bastard?
+ M.adjustBrainLoss(5)
+ holder.remove_reagent(src.id, 1)
+
+datum/reagent/lube
+ name = "Space Lube"
+ id = "lube"
+ description = "Lubricant is a substance introduced between two moving surfaces to reduce the friction and wear between them. giggity."
+ color = "#009CA8" // rgb: 0, 156, 168
+
+datum/reagent/lube/reaction_turf(var/turf/simulated/T, var/volume)
+ if (!istype(T)) return
+ src = null
+ if(volume >= 1)
+ T.MakeSlippery(2)
+
+datum/reagent/slimetoxin
+ name = "Mutation Toxin"
+ id = "mutationtoxin"
+ description = "A corruptive toxin produced by slimes."
+ color = "#13BC5E" // rgb: 19, 188, 94
+
+datum/reagent/unstableslimetoxin
+ name = "Unstable Mutation Toxin"
+ id = "unstablemutationtoxin"
+ description = "An unstable and unpredictable corruptive toxin produced by slimes."
+ color = "#5EFF3B" //RGB: 94, 255, 59
+ metabolization_rate = INFINITY //So it instantly removes all of itself
+
+datum/reagent/unstableslimetoxin/on_mob_life(var/mob/living/carbon/human/H as mob)
+ ..()
+ H << "You crumple in agony as your flesh wildly morphs into new forms!"
+ H.visible_message("[H] falls to the ground and screams as their skin bubbles and froths!") //'froths' sounds painful when used with SKIN.
+ H.Weaken(3)
+ sleep(30)
+ var/list/blacklisted_species = list(/datum/species/zombie, /datum/species/skeleton, /datum/species/human, /datum/species/golem, /datum/species/golem/adamantine, /datum/species/shadow)
+ var/list/possible_morphs = typesof(/datum/species/) - blacklisted_species
+ var/datum/species/mutation = pick(possible_morphs)
+ if(prob(90) && mutation && H.dna.species != /datum/species/golem && H.dna.species != /datum/species/golem/adamantine)
+ H << "The pain subsides. You feel... different."
+ H.dna.species = new mutation()
+ H.regenerate_icons()
+ if(mutation == /datum/species/slime)
+ H.faction |= "slime"
+ else
+ H.faction -= "slime"
+ else
+ H << "The pain vanishes suddenly. You feel no different."
+ return 1
+
+datum/reagent/aslimetoxin
+ name = "Advanced Mutation Toxin"
+ id = "amutationtoxin"
+ description = "An advanced corruptive toxin produced by slimes."
+ color = "#13BC5E" // rgb: 19, 188, 94
+
+datum/reagent/aslimetoxin/reaction_mob(var/mob/M, var/volume)
+ src = null
+ M.ForceContractDisease(new /datum/disease/transformation/slime(0))
+
+datum/reagent/serotrotium
+ name = "Serotrotium"
+ id = "serotrotium"
+ description = "A chemical compound that promotes concentrated production of the serotonin neurotransmitter in humans."
+ color = "#202040" // rgb: 20, 20, 40
+ metabolization_rate = 0.25 * REAGENTS_METABOLISM
+
+datum/reagent/serotrotium/on_mob_life(var/mob/living/M as mob)
+ if(ishuman(M))
+ if(prob(7)) M.emote(pick("twitch","drool","moan","gasp"))
+ ..()
+ return
+
+datum/reagent/oxygen
+ name = "Oxygen"
+ id = "oxygen"
+ description = "A colorless, odorless gas."
+ reagent_state = GAS
+ color = "#808080" // rgb: 128, 128, 128
+
+datum/reagent/copper
+ name = "Copper"
+ id = "copper"
+ description = "A highly ductile metal."
+ reagent_state = SOLID
+ color = "#6E3B08" // rgb: 110, 59, 8
+
+datum/reagent/nitrogen
+ name = "Nitrogen"
+ id = "nitrogen"
+ description = "A colorless, odorless, tasteless gas."
+ reagent_state = GAS
+ color = "#808080" // rgb: 128, 128, 128
+
+datum/reagent/hydrogen
+ name = "Hydrogen"
+ id = "hydrogen"
+ description = "A colorless, odorless, nonmetallic, tasteless, highly combustible diatomic gas."
+ reagent_state = GAS
+ color = "#808080" // rgb: 128, 128, 128
+
+datum/reagent/potassium
+ name = "Potassium"
+ id = "potassium"
+ description = "A soft, low-melting solid that can easily be cut with a knife. Reacts violently with water."
+ reagent_state = SOLID
+ color = "#A0A0A0" // rgb: 160, 160, 160
+
+datum/reagent/mercury
+ name = "Mercury"
+ id = "mercury"
+ description = "A chemical element."
+ color = "#484848" // rgb: 72, 72, 72
+
+datum/reagent/mercury/on_mob_life(var/mob/living/M as mob)
+ if(M.canmove && istype(M.loc, /turf/space))
+ step(M, pick(cardinal))
+ if(prob(5))
+ M.emote(pick("twitch","drool","moan"))
+ M.adjustBrainLoss(2)
+ ..()
+ return
+
+datum/reagent/sulfur
+ name = "Sulfur"
+ id = "sulfur"
+ description = "A chemical element."
+ reagent_state = SOLID
+ color = "#BF8C00" // rgb: 191, 140, 0
+
+datum/reagent/carbon
+ name = "Carbon"
+ id = "carbon"
+ description = "A chemical element."
+ reagent_state = SOLID
+ color = "#1C1300" // rgb: 30, 20, 0
+
+datum/reagent/carbon/reaction_turf(var/turf/T, var/volume)
+ src = null
+ if(!istype(T, /turf/space))
+ new /obj/effect/decal/cleanable/dirt(T)
+
+datum/reagent/chlorine
+ name = "Chlorine"
+ id = "chlorine"
+ description = "A chemical element."
+ reagent_state = GAS
+ color = "#808080" // rgb: 128, 128, 128
+
+datum/reagent/chlorine/on_mob_life(var/mob/living/M as mob)
+ M.take_organ_damage(1*REM, 0)
+ ..()
+ return
+
+datum/reagent/fluorine
+ name = "Fluorine"
+ id = "fluorine"
+ description = "A highly-reactive chemical element."
+ reagent_state = GAS
+ color = "#808080" // rgb: 128, 128, 128
+
+datum/reagent/fluorine/on_mob_life(var/mob/living/M as mob)
+ M.adjustToxLoss(1*REM)
+ ..()
+ return
+
+datum/reagent/sodium
+ name = "Sodium"
+ id = "sodium"
+ description = "A chemical element."
+ reagent_state = SOLID
+ color = "#808080" // rgb: 128, 128, 128
+
+datum/reagent/phosphorus
+ name = "Phosphorus"
+ id = "phosphorus"
+ description = "A chemical element."
+ reagent_state = SOLID
+ color = "#832828" // rgb: 131, 40, 40
+
+datum/reagent/lithium
+ name = "Lithium"
+ id = "lithium"
+ description = "A chemical element."
+ reagent_state = SOLID
+ color = "#808080" // rgb: 128, 128, 128
+
+datum/reagent/lithium/on_mob_life(var/mob/living/M as mob)
+ if(M.canmove && istype(M.loc, /turf/space))
+ step(M, pick(cardinal))
+ if(prob(5))
+ M.emote(pick("twitch","drool","moan"))
+ ..()
+ return
+
+datum/reagent/glycerol
+ name = "Glycerol"
+ id = "glycerol"
+ description = "Glycerol is a simple polyol compound. Glycerol is sweet-tasting and of low toxicity."
+ color = "#808080" // rgb: 128, 128, 128
+
+datum/reagent/radium
+ name = "Radium"
+ id = "radium"
+ description = "Radium is an alkaline earth metal. It is extremely radioactive."
+ reagent_state = SOLID
+ color = "#C7C7C7" // rgb: 199,199,199
+
+datum/reagent/radium/on_mob_life(var/mob/living/M as mob)
+ M.apply_effect(2*REM/M.metabolism_efficiency,IRRADIATE,0)
+ ..()
+ return
+
+datum/reagent/radium/reaction_turf(var/turf/T, var/volume)
+ src = null
+ if(volume >= 3)
+ if(!istype(T, /turf/space))
+ var/obj/effect/decal/cleanable/reagentdecal = new/obj/effect/decal/cleanable/greenglow(T)
+ reagentdecal.reagents.add_reagent("uranium", volume)
+
+datum/reagent/sterilizine
+ name = "Sterilizine"
+ id = "sterilizine"
+ description = "Sterilizes wounds in preparation for surgery."
+ color = "#C8A5DC" // rgb: 200, 165, 220
+
+datum/reagent/iron
+ name = "Iron"
+ id = "iron"
+ description = "Pure iron is a metal."
+ reagent_state = SOLID
+ color = "#C8A5DC" // rgb: 200, 165, 220
+
+datum/reagent/gold
+ name = "Gold"
+ id = "gold"
+ description = "Gold is a dense, soft, shiny metal and the most malleable and ductile metal known."
+ reagent_state = SOLID
+ color = "#F7C430" // rgb: 247, 196, 48
+
+datum/reagent/silver
+ name = "Silver"
+ id = "silver"
+ description = "A soft, white, lustrous transition metal, it has the highest electrical conductivity of any element and the highest thermal conductivity of any metal."
+ reagent_state = SOLID
+ color = "#D0D0D0" // rgb: 208, 208, 208
+
+datum/reagent/uranium
+ name ="Uranium"
+ id = "uranium"
+ description = "A silvery-white metallic chemical element in the actinide series, weakly radioactive."
+ reagent_state = SOLID
+ color = "#B8B8C0" // rgb: 184, 184, 192
+
+datum/reagent/uranium/on_mob_life(var/mob/living/M as mob)
+ M.apply_effect(1/M.metabolism_efficiency,IRRADIATE,0)
+ ..()
+ return
+
+
+datum/reagent/uranium/reaction_turf(var/turf/T, var/volume)
+ src = null
+ if(volume >= 3)
+ if(!istype(T, /turf/space))
+ var/obj/effect/decal/cleanable/reagentdecal = new/obj/effect/decal/cleanable/greenglow(T)
+ reagentdecal.reagents.add_reagent("uranium", volume)
+
+datum/reagent/aluminium
+ name = "Aluminium"
+ id = "aluminium"
+ description = "A silvery white and ductile member of the boron group of chemical elements."
+ reagent_state = SOLID
+ color = "#A8A8A8" // rgb: 168, 168, 168
+
+datum/reagent/silicon
+ name = "Silicon"
+ id = "silicon"
+ description = "A tetravalent metalloid, silicon is less reactive than its chemical analog carbon."
+ reagent_state = SOLID
+ color = "#A8A8A8" // rgb: 168, 168, 168
+
+datum/reagent/fuel
+ name = "Welding fuel"
+ id = "fuel"
+ description = "Required for welders. Flamable."
+ color = "#660000" // rgb: 102, 0, 0
+
+datum/reagent/fuel/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume)//Splashing people with welding fuel to make them easy to ignite!
+ if(!istype(M, /mob/living))
+ return
+ if(method == TOUCH)
+ M.adjust_fire_stacks(volume / 10)
+ return
+
+datum/reagent/fuel/on_mob_life(var/mob/living/M as mob)
+ M.adjustToxLoss(1)
+ ..()
+ return
+
+datum/reagent/space_cleaner
+ name = "Space cleaner"
+ id = "cleaner"
+ description = "A compound used to clean things. Now with 50% more sodium hypochlorite!"
+ color = "#A5F0EE" // rgb: 165, 240, 238
+
+datum/reagent/space_cleaner/reaction_obj(var/obj/O, var/volume)
+ if(istype(O,/obj/effect/decal/cleanable))
+ qdel(O)
+ else
+ if(O)
+ O.clean_blood()
+
+datum/reagent/space_cleaner/reaction_turf(var/turf/T, var/volume)
+ if(volume >= 1)
+ T.clean_blood()
+ for(var/obj/effect/decal/cleanable/C in T)
+ qdel(C)
+
+ for(var/mob/living/simple_animal/slime/M in T)
+ M.adjustToxLoss(rand(5,10))
+ if(istype(T, /turf/simulated/floor))
+ var/turf/simulated/floor/F = T
+ if(volume >= 1)
+ F.dirt = 0
+
+datum/reagent/space_cleaner/reaction_mob(var/mob/M, var/method=TOUCH, var/volume)
+ if(iscarbon(M))
+ var/mob/living/carbon/C = M
+ if(istype(M,/mob/living/carbon/human))
+ var/mob/living/carbon/human/H = M
+ if(H.lip_style)
+ H.lip_style = null
+ H.update_body()
+ if(C.r_hand)
+ C.r_hand.clean_blood()
+ if(C.l_hand)
+ C.l_hand.clean_blood()
+ if(C.wear_mask)
+ if(C.wear_mask.clean_blood())
+ C.update_inv_wear_mask(0)
+ if(ishuman(M))
+ var/mob/living/carbon/human/H = C
+ if(H.head)
+ if(H.head.clean_blood())
+ H.update_inv_head(0)
+ if(H.wear_suit)
+ if(H.wear_suit.clean_blood())
+ H.update_inv_wear_suit(0)
+ else if(H.w_uniform)
+ if(H.w_uniform.clean_blood())
+ H.update_inv_w_uniform(0)
+ if(H.shoes)
+ if(H.shoes.clean_blood())
+ H.update_inv_shoes(0)
+ M.clean_blood()
+
+datum/reagent/cryptobiolin
+ name = "Cryptobiolin"
+ id = "cryptobiolin"
+ description = "Cryptobiolin causes confusion and dizzyness."
+ color = "#C8A5DC" // rgb: 200, 165, 220
+ metabolization_rate = 1.5 * REAGENTS_METABOLISM
+
+datum/reagent/cryptobiolin/on_mob_life(var/mob/living/M as mob)
+ M.Dizzy(1)
+ if(!M.confused)
+ M.confused = 1
+ M.confused = max(M.confused, 20)
+ ..()
+ return
+
+datum/reagent/impedrezene
+ name = "Impedrezene"
+ id = "impedrezene"
+ description = "Impedrezene is a narcotic that impedes one's ability by slowing down the higher brain cell functions."
+ color = "#C8A5DC" // rgb: 200, 165, 220
+
+datum/reagent/impedrezene/on_mob_life(var/mob/living/M as mob)
+ M.jitteriness = max(M.jitteriness-5,0)
+ if(prob(80)) M.adjustBrainLoss(1*REM)
+ if(prob(50)) M.drowsyness = max(M.drowsyness, 3)
+ if(prob(10)) M.emote("drool")
+ ..()
+ return
+
+datum/reagent/nanites
+ name = "Nanomachines"
+ id = "nanomachines"
+ description = "Microscopic construction robots."
+ color = "#535E66" // rgb: 83, 94, 102
+
+datum/reagent/nanites/reaction_mob(var/mob/M, var/method=TOUCH, var/volume)
+ src = null
+ if( (prob(10) && method==TOUCH) || method==INGEST)
+ M.ForceContractDisease(new /datum/disease/transformation/robot(0))
+
+datum/reagent/xenomicrobes
+ name = "Xenomicrobes"
+ id = "xenomicrobes"
+ description = "Microbes with an entirely alien cellular structure."
+ color = "#535E66" // rgb: 83, 94, 102
+
+datum/reagent/xenomicrobes/reaction_mob(var/mob/M, var/method=TOUCH, var/volume)
+ src = null
+ if( (prob(10) && method==TOUCH) || method==INGEST)
+ M.ContractDisease(new /datum/disease/transformation/xeno(0))
+
+datum/reagent/fluorosurfactant//foam precursor
+ name = "Fluorosurfactant"
+ id = "fluorosurfactant"
+ description = "A perfluoronated sulfonic acid that forms a foam when mixed with water."
+ color = "#9E6B38" // rgb: 158, 107, 56
+
+datum/reagent/foaming_agent// Metal foaming agent. This is lithium hydride. Add other recipes (e.g. LiH + H2O -> LiOH + H2) eventually.
+ name = "Foaming agent"
+ id = "foaming_agent"
+ description = "A agent that yields metallic foam when mixed with light metal and a strong acid."
+ reagent_state = SOLID
+ color = "#664B63" // rgb: 102, 75, 99
+
+datum/reagent/ammonia
+ name = "Ammonia"
+ id = "ammonia"
+ description = "A caustic substance commonly used in fertilizer or household cleaners."
+ reagent_state = GAS
+ color = "#404030" // rgb: 64, 64, 48
+
+datum/reagent/diethylamine
+ name = "Diethylamine"
+ id = "diethylamine"
+ description = "A secondary amine, mildly corrosive."
+ color = "#604030" // rgb: 96, 64, 48
+
+
+
+/////////////////////////Coloured Crayon Powder////////////////////////////
+//For colouring in /proc/mix_color_from_reagents
+
+
+datum/reagent/crayonpowder
+ name = "Crayon Powder"
+ id = "crayon powder"
+ var/colorname = "none"
+ description = "A powder made by grinding down crayons, good for colouring chemical reagents."
+ reagent_state = SOLID
+ color = "#FFFFFF" // rgb: 207, 54, 0
+
+datum/reagent/crayonpowder/New()
+ description = "\an [colorname] powder made by grinding down crayons, good for colouring chemical reagents."
+
+
+datum/reagent/crayonpowder/red
+ name = "Red Crayon Powder"
+ id = "redcrayonpowder"
+ colorname = "red"
+
+datum/reagent/crayonpowder/orange
+ name = "Orange Crayon Powder"
+ id = "orangecrayonpowder"
+ colorname = "orange"
+ color = "#FF9300" // orange
+
+datum/reagent/crayonpowder/yellow
+ name = "Yellow Crayon Powder"
+ id = "yellowcrayonpowder"
+ colorname = "yellow"
+ color = "#FFF200" // yellow
+
+datum/reagent/crayonpowder/green
+ name = "Green Crayon Powder"
+ id = "greencrayonpowder"
+ colorname = "green"
+ color = "#A8E61D" // green
+
+datum/reagent/crayonpowder/blue
+ name = "Blue Crayon Powder"
+ id = "bluecrayonpowder"
+ colorname = "blue"
+ color = "#00B7EF" // blue
+
+datum/reagent/crayonpowder/purple
+ name = "Purple Crayon Powder"
+ id = "purplecrayonpowder"
+ colorname = "purple"
+ color = "#DA00FF" // purple
+
+datum/reagent/crayonpowder/invisible
+ name = "Invisible Crayon Powder"
+ id = "invisiblecrayonpowder"
+ colorname = "invisible"
+ color = "#FFFFFF00" // white + no alpha
+
+
+
+
+//////////////////////////////////Hydroponics stuff///////////////////////////////
+
+datum/reagent/plantnutriment
+ name = "Generic nutriment"
+ id = "plantnutriment"
+ description = "Some kind of nutriment. You can't really tell what it is. You should probably report it, along with how you obtained it."
+ color = "#000000" // RBG: 0, 0, 0
+ var/tox_prob = 0
+
+datum/reagent/plantnutriment/on_mob_life(var/mob/living/M as mob)
+ if(prob(tox_prob))
+ M.adjustToxLoss(1*REM)
+ ..()
+ return
+
+datum/reagent/plantnutriment/eznutriment
+ name = "E-Z-Nutrient"
+ id = "eznutriment"
+ description = "Cheap and extremely common type of plant nutriment."
+ color = "#376400" // RBG: 50, 100, 0
+ tox_prob = 10
+
+datum/reagent/plantnutriment/left4zednutriment
+ name = "Left 4 Zed"
+ id = "left4zednutriment"
+ description = "Unstable nutriment that makes plants mutate more often than usual."
+ color = "#1A1E4D" // RBG: 26, 30, 77
+ tox_prob = 25
+
+datum/reagent/plantnutriment/robustharvestnutriment
+ name = "Robust Harvest"
+ id = "robustharvestnutriment"
+ description = "Very potent nutriment that prevents plants from mutating."
+ color = "#9D9D00" // RBG: 157, 157, 0
+ tox_prob = 15
+
+
+
+
+
+
+
+// GOON OTHERS
+
+
+
+datum/reagent/oil
+ name = "Oil"
+ id = "oil"
+ description = "Burns in a small smoky fire, mostly used to get Ash."
+ reagent_state = LIQUID
+ color = "#C8A5DC"
+
+datum/reagent/stable_plasma
+ name = "Stable Plasma"
+ id = "stable_plasma"
+ description = "Non-flammable plasma locked into a liquid form that cannot ignite or become gaseous/solid."
+ reagent_state = LIQUID
+ color = "#C8A5DC"
+
+datum/reagent/iodine
+ name = "Iodine"
+ id = "iodine"
+ description = "A slippery solution."
+ reagent_state = LIQUID
+ color = "#C8A5DC"
+
+datum/reagent/fluorine
+ name = "Fluorine"
+ id = "fluorine"
+ description = "A slippery solution."
+ reagent_state = LIQUID
+ color = "#C8A5DC"
+
+datum/reagent/carpet
+ name = "Carpet"
+ id = "carpet"
+ description = "A slippery solution."
+ reagent_state = LIQUID
+ color = "#C8A5DC"
+
+/datum/reagent/carpet/reaction_turf(var/turf/simulated/T, var/volume)
+ if(istype(T, /turf/simulated/floor/plating) || istype(T, /turf/simulated/floor/plasteel))
+ var/turf/simulated/floor/F = T
+ F.ChangeTurf(/turf/simulated/floor/fancy/carpet)
+ ..()
+ return
+
+datum/reagent/bromine
+ name = "Bromine"
+ id = "bromine"
+ description = "A slippery solution."
+ reagent_state = LIQUID
+ color = "#C8A5DC"
+
+datum/reagent/phenol
+ name = "Phenol"
+ id = "phenol"
+ description = "Used for certain medical recipes."
+ reagent_state = LIQUID
+ color = "#C8A5DC"
+
+datum/reagent/ash
+ name = "Ash"
+ id = "ash"
+ description = "Basic ingredient in a couple of recipes."
+ reagent_state = LIQUID
+ color = "#C8A5DC"
+
+datum/reagent/acetone
+ name = "Acetone"
+ id = "acetone"
+ description = "Common ingredient in other recipes."
+ reagent_state = LIQUID
+ color = "#C8A5DC"
+
+datum/reagent/colorful_reagent
+ name = "Colorful Reagent"
+ id = "colorful_reagent"
+ description = "A solution."
+ reagent_state = LIQUID
+ color = "#C8A5DC"
+ var/list/random_color_list = list("#00aedb","#a200ff","#f47835","#d41243","#d11141","#00b159","#00aedb","#f37735","#ffc425","#008744","#0057e7","#d62d20","#ffa700")
+
+
+datum/reagent/colorful_reagent/on_mob_life(var/mob/living/M as mob)
+ if(M && isliving(M))
+ M.color = pick(random_color_list)
+ ..()
+ return
+
+datum/reagent/colorful_reagent/reaction_mob(var/mob/living/M, var/volume)
+ if(M && isliving(M))
+ M.color = pick(random_color_list)
+ ..()
+ return
+datum/reagent/colorful_reagent/reaction_obj(var/obj/O, var/volume)
+ if(O)
+ O.color = pick(random_color_list)
+ ..()
+ return
+datum/reagent/colorful_reagent/reaction_turf(var/turf/T, var/volume)
+ if(T)
+ T.color = pick(random_color_list)
+ ..()
+ return
+
+datum/reagent/hair_dye
+ name = "Quantum Hair Dye"
+ id = "hair_dye"
+ description = "A solution."
+ reagent_state = LIQUID
+ color = "#C8A5DC"
+ var/list/potential_colors = list("0ad","a0f","f73","d14","d14","0b5","0ad","f73","fc2","084","05e","d22","fa0") // fucking hair code
+
+datum/reagent/hair_dye/reaction_mob(var/mob/living/M, var/volume)
+ if(M && ishuman(M))
+ var/mob/living/carbon/human/H = M
+ H.hair_color = pick(potential_colors)
+ H.facial_hair_color = pick(potential_colors)
+ H.update_hair()
+ ..()
+ return
+
+datum/reagent/barbers_aid
+ name = "Barber's Aid"
+ id = "barbers_aid"
+ description = "A solution to hair loss across the world."
+ reagent_state = LIQUID
+ color = "#C8A5DC"
+
+datum/reagent/barbers_aid/reaction_mob(var/mob/living/M, var/volume)
+ if(M && ishuman(M))
+ var/mob/living/carbon/human/H = M
+ var/datum/sprite_accessory/hair/picked_hair = pick(hair_styles_list)
+ var/datum/sprite_accessory/facial_hair/picked_beard = pick(facial_hair_styles_list)
+ H.hair_style = picked_hair
+ H.facial_hair_style = picked_beard
+ H.update_hair()
+ ..()
+ return
+
+datum/reagent/concentrated_barbers_aid
+ name = "Concentrated Barber's Aid"
+ id = "concentrated_barbers_aid"
+ description = "A concentrated solution to hair loss across the world."
+ reagent_state = LIQUID
+ color = "#C8A5DC"
+
+datum/reagent/concentrated_barbers_aid/reaction_mob(var/mob/living/M, var/volume)
+ if(M && ishuman(M))
+ var/mob/living/carbon/human/H = M
+ H.hair_style = "Very Long Hair"
+ H.facial_hair_style = "Very Long Beard"
+ H.update_hair()
+ ..()
+ return
+
+/datum/reagent/saltpetre
+ name = "Saltpetre"
+ id = "saltpetre"
+ description = "Volatile."
+ reagent_state = LIQUID
+ color = "#60A584" // rgb: 96, 165, 132
+
diff --git a/code/modules/reagents/Chemistry-Reagents/Pyrotechnic-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Pyrotechnic-Reagents.dm
new file mode 100644
index 00000000000..a5704d0b950
--- /dev/null
+++ b/code/modules/reagents/Chemistry-Reagents/Pyrotechnic-Reagents.dm
@@ -0,0 +1,197 @@
+
+datum/reagent/thermite
+ name = "Thermite"
+ id = "thermite"
+ description = "Thermite produces an aluminothermic reaction known as a thermite reaction. Can be used to melt walls."
+ reagent_state = SOLID
+ color = "#673910" // rgb: 103, 57, 16
+
+datum/reagent/thermite/reaction_turf(var/turf/T, var/volume)
+ src = null
+ if(volume >= 1 && istype(T, /turf/simulated/wall))
+ var/turf/simulated/wall/Wall = T
+ if(istype(Wall, /turf/simulated/wall/r_wall))
+ Wall.thermite = Wall.thermite+(volume*2.5)
+ else
+ Wall.thermite = Wall.thermite+(volume*10)
+ Wall.overlays = list()
+ Wall.overlays += image('icons/effects/effects.dmi',"thermite")
+
+datum/reagent/thermite/on_mob_life(var/mob/living/M as mob)
+ M.adjustFireLoss(1)
+ ..()
+
+datum/reagent/nitroglycerin
+ name = "Nitroglycerin"
+ id = "nitroglycerin"
+ description = "Nitroglycerin is a heavy, colorless, oily, explosive liquid obtained by nitrating glycerol."
+ color = "#808080" // rgb: 128, 128, 128
+
+/datum/reagent/stabilizing_agent
+ name = "Stabilizing Agent"
+ id = "stabilizing_agent"
+ description = "Keeps unstable chemicals stable. This does not work on everything."
+ reagent_state = LIQUID
+ color = "#FFFFFF"
+
+/datum/reagent/clf3
+ name = "Chlorine Trifluoride"
+ id = "clf3"
+ description = "Makes a temporary 3x3 fireball when it comes into existence, so be careful when mixing. ClF3 applied to a surface burns things that wouldn't otherwise burn, sometimes through the very floors of the station and exposing it to the vacuum of space."
+ reagent_state = LIQUID
+ color = "#FF0000"
+ metabolization_rate = 0.5 * REAGENTS_METABOLISM
+
+/datum/reagent/clf3/on_mob_life(var/mob/living/M as mob)
+ M.adjust_fire_stacks(2)
+ M.adjustFireLoss(0.3*M.fire_stacks)
+ ..()
+
+/datum/reagent/clf3/reaction_turf(var/turf/simulated/T, var/volume)
+ if(istype(T, /turf/simulated/floor/plating))
+ var/turf/simulated/floor/plating/F = T
+ if(prob(1 + F.burnt + 5*F.broken)) //broken or burnt plating is more susceptible to being destroyed
+ F.ChangeTurf(/turf/space)
+ if(istype(T, /turf/simulated/floor/))
+ var/turf/simulated/floor/F = T
+ if(prob(volume/10))
+ F.make_plating()
+ else if(prob(volume))
+ F.burn_tile()
+ if(istype(F, /turf/simulated/floor/))
+ new /obj/effect/hotspot(F)
+ if(istype(T, /turf/simulated/wall/))
+ var/turf/simulated/wall/W = T
+ if(prob(volume/10))
+ W.ChangeTurf(/turf/simulated/floor/plating)
+
+/datum/reagent/clf3/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume)
+ if(method == TOUCH && isliving(M))
+ M.adjust_fire_stacks(5)
+ M.IgniteMob()
+ new /obj/effect/hotspot(M.loc)
+
+/datum/reagent/sorium
+ name = "Sorium"
+ id = "sorium"
+ description = "Sends everything flying from the detonation point."
+ reagent_state = LIQUID
+ color = "#FFA500"
+
+/datum/reagent/liquid_dark_matter
+ name = "Liquid Dark Matter"
+ id = "liquid_dark_matter"
+ description = "Sucks everything into the detonation point."
+ reagent_state = LIQUID
+ color = "#800080"
+
+/datum/reagent/blackpowder
+ name = "Black Powder"
+ id = "blackpowder"
+ description = "Explodes. Violently."
+ reagent_state = LIQUID
+ color = "#000000"
+ metabolization_rate = 0.05
+
+/datum/reagent/blackpowder/on_ex_act()
+ var/location = get_turf(holder.my_atom)
+ var/datum/effect/effect/system/reagents_explosion/e = new()
+ e.set_up(1 + round(volume/6, 1), location, 0, 0, message = 0)
+ e.start()
+ holder.clear_reagents()
+
+/datum/reagent/flash_powder
+ name = "Flash Powder"
+ id = "flash_powder"
+ description = "Makes a very bright flash."
+ reagent_state = LIQUID
+ color = "#FFFF00"
+
+/datum/reagent/smoke_powder
+ name = "Smoke Powder"
+ id = "smoke_powder"
+ description = "Makes a large cloud of smoke that can carry reagents."
+ reagent_state = LIQUID
+ color = "#808080"
+
+/datum/reagent/sonic_powder
+ name = "Sonic Powder"
+ id = "sonic_powder"
+ description = "Makes a deafening noise."
+ reagent_state = LIQUID
+ color = "#0000FF"
+
+/datum/reagent/phlogiston
+ name = "Phlogiston"
+ id = "phlogiston"
+ description = "Catches you on fire and makes you ignite."
+ reagent_state = LIQUID
+ color = "#FF9999"
+
+/datum/reagent/phlogiston/on_mob_life(var/mob/living/M as mob)
+ M.adjust_fire_stacks(1)
+ M.IgniteMob()
+ M.adjustFireLoss(0.2*M.fire_stacks)
+ ..()
+ return
+
+/datum/reagent/napalm
+ name = "Napalm"
+ id = "napalm"
+ description = "Very flammable."
+ reagent_state = LIQUID
+ color = "#FF9999"
+
+/datum/reagent/napalm/on_mob_life(var/mob/living/M as mob)
+ M.adjust_fire_stacks(1)
+ ..()
+
+/datum/reagent/napalm/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume)
+ if(method == TOUCH && isliving(M))
+ M.adjust_fire_stacks(7)
+
+datum/reagent/cryostylane
+ name = "Cryostylane"
+ id = "cryostylane"
+ description = "Comes into existence at 20K. As long as there is sufficient oxygen for it to react with, Cryostylane slowly cools all other reagents in the mob down to 0K."
+ color = "#B2B2FF" // rgb: 139, 166, 233
+ metabolization_rate = 0.5 * REAGENTS_METABOLISM
+
+
+datum/reagent/cryostylane/on_mob_life(var/mob/living/M as mob) //TODO: code freezing into an ice cube
+ if(M.reagents.has_reagent("oxygen"))
+ M.reagents.remove_reagent("oxygen", 0.5)
+ M.bodytemperature -= 15
+ ..()
+
+datum/reagent/cryostylane/on_tick()
+ if(holder.has_reagent("oxygen"))
+ holder.remove_reagent("oxygen", 1)
+ holder.chem_temp -= 10
+ holder.handle_reactions()
+ ..()
+
+datum/reagent/cryostylane/reaction_turf(var/turf/simulated/T, var/volume)
+ if(volume >= 5)
+ for(var/mob/living/simple_animal/slime/M in T)
+ M.adjustToxLoss(rand(15,30))
+
+datum/reagent/pyrosium
+ name = "Pyrosium"
+ id = "pyrosium"
+ description = "Comes into existence at 20K. As long as there is sufficient oxygen for it to react with, Pyrosium slowly cools all other reagents in the mob down to 0K."
+ color = "#B20000" // rgb: 139, 166, 233
+ metabolization_rate = 0.5 * REAGENTS_METABOLISM
+
+datum/reagent/pyrosium/on_mob_life(var/mob/living/M as mob)
+ if(M.reagents.has_reagent("oxygen"))
+ M.reagents.remove_reagent("oxygen", 0.5)
+ M.bodytemperature += 15
+ ..()
+
+datum/reagent/pyrosium/on_tick()
+ if(holder.has_reagent("oxygen"))
+ holder.remove_reagent("oxygen", 1)
+ holder.chem_temp += 10
+ holder.handle_reactions()
+ ..()
diff --git a/code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm
index 96a1095694e..d20c1e40d65 100644
--- a/code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm
@@ -1,7 +1,4 @@
-#define REM REAGENTS_EFFECT_MULTIPLIER
-
-
//////////////////////////Poison stuff (Toxins & Acids)///////////////////////
datum/reagent/toxin
@@ -256,7 +253,6 @@ datum/reagent/toxin/chloralhydrate
metabolization_rate = 1.5 * REAGENTS_METABOLISM
datum/reagent/toxin/chloralhydrate/on_mob_life(var/mob/living/M as mob)
- current_cycle++
switch(current_cycle)
if(1 to 10)
M.confused += 2
@@ -283,7 +279,6 @@ datum/reagent/toxin/beer2/on_mob_life(var/mob/living/M as mob)
if(51 to INFINITY)
M.sleeping += 1
M.adjustToxLoss((current_cycle - 50)*REM)
- current_cycle++
..()
return
@@ -327,6 +322,289 @@ datum/reagent/toxin/staminatoxin/on_mob_life(mob/living/carbon/M)
data = max(data - 1, 3)
..()
+datum/reagent/toxin/polonium
+ name = "Polonium"
+ id = "polonium"
+ description = "Cause significant Radiation damage over time."
+ reagent_state = LIQUID
+ color = "#CF3600"
+ metabolization_rate = 0.125 * REAGENTS_METABOLISM
+ toxpwr = 0
+
+datum/reagent/toxin/polonium/on_mob_life(var/mob/living/M as mob)
+ M.radiation += 4
+ ..()
+
+datum/reagent/toxin/histamine
+ name = "Histamine"
+ id = "histamine"
+ description = "A dose-dependent toxin, ranges from annoying to incredibly lethal."
+ reagent_state = LIQUID
+ color = "#CF3600"
+ metabolization_rate = 0.25 * REAGENTS_METABOLISM
+ overdose_threshold = 30
+ toxpwr = 0
+
+datum/reagent/toxin/histamine/on_mob_life(var/mob/living/M as mob)
+ if(prob(50))
+ switch(pick(1, 2, 3, 4))
+ if(1)
+ M << "You can barely see!"
+ M.eye_blurry = 3
+ if(2)
+ M.emote("cough")
+ if(3)
+ M.emote("sneeze")
+ if(4)
+ if(prob(75))
+ M << "You scratch at an itch."
+ M.adjustBruteLoss(2*REM)
+ ..()
+
+datum/reagent/toxin/histamine/overdose_process(var/mob/living/M as mob)
+ M.adjustOxyLoss(1*REM)
+ M.adjustBruteLoss(1*REM)
+ M.adjustToxLoss(1*REM)
+ ..()
+
+datum/reagent/toxin/formaldehyde
+ name = "Formaldehyde"
+ id = "formaldehyde"
+ description = "Deals a moderate amount of Toxin damage over time. 10% chance to decay into 10-15 histamine."
+ reagent_state = LIQUID
+ color = "#CF3600"
+ metabolization_rate = 0.5 * REAGENTS_METABOLISM
+ toxpwr = 0.5
+
+datum/reagent/toxin/formaldehyde/on_mob_life(var/mob/living/M as mob)
+ if(prob(5))
+ M.reagents.add_reagent("histamine",pick(5,15))
+ M.reagents.remove_reagent("formaldehyde",1)
+ ..()
+
+datum/reagent/toxin/venom
+ name = "Venom"
+ id = "venom"
+ description = "Will deal scaling amounts of Toxin and Brute damage over time. 15% chance to decay into 5-10 histamine."
+ reagent_state = LIQUID
+ color = "#CF3600"
+ metabolization_rate = 0.25 * REAGENTS_METABOLISM
+ toxpwr = 0
+
+datum/reagent/toxin/venom/on_mob_life(var/mob/living/M as mob)
+ toxpwr = 0.05*volume
+ M.adjustBruteLoss((0.1*volume)*REM)
+ if(prob(15))
+ M.reagents.add_reagent("histamine",pick(5,10))
+ M.reagents.remove_reagent("venom",1)
+ ..()
+
+datum/reagent/toxin/neurotoxin2
+ name = "Neurotoxin"
+ id = "neurotoxin2"
+ description = "Deals toxin and brain damage up to 60 before it slows down, causing confusion and a knockout after 54 elapsed cycles."
+ reagent_state = LIQUID
+ color = "#CF3600"
+ metabolization_rate = 0.5 * REAGENTS_METABOLISM
+ toxpwr = 0
+
+datum/reagent/toxin/neurotoxin2/on_mob_life(var/mob/living/M as mob)
+ if(M.brainloss + M.toxloss <= 60)
+ M.adjustBrainLoss(1*REM)
+ M.adjustToxLoss(1*REM)
+ if(current_cycle >= 54)
+ M.sleeping += 5
+ ..()
+
+datum/reagent/toxin/cyanide
+ name = "Cyanide"
+ id = "cyanide"
+ description = "Deals toxin damage, alongside some oxygen loss. 8% chance of stun and some extra toxin damage."
+ reagent_state = LIQUID
+ color = "#CF3600"
+ metabolization_rate = 0.125 * REAGENTS_METABOLISM
+ toxpwr = 0.75
+
+datum/reagent/toxin/cyanide/on_mob_life(var/mob/living/M as mob)
+ if(prob(5))
+ M.losebreath += 1
+ if(prob(4))
+ M << "You feel horrendously weak!"
+ M.Stun(2)
+ M.adjustToxLoss(2*REM)
+ ..()
+
+/datum/reagent/toxin/questionmark // food poisoning
+ name = "Bad Food"
+ id = "????"
+ description = "????"
+ reagent_state = LIQUID
+ color = "#CF3600"
+ metabolization_rate = 0.25 * REAGENTS_METABOLISM
+ toxpwr = 0.5
+
+datum/reagent/toxin/itching_powder
+ name = "Itching Powder"
+ id = "itching_powder"
+ description = "Lots of annoying random effects, chances to do some brute damage from scratching. 6% chance to decay into 1-3 units of histamine."
+ reagent_state = LIQUID
+ color = "#CF3600"
+ metabolization_rate = 0.4 * REAGENTS_METABOLISM
+ toxpwr = 0
+
+/datum/reagent/toxin/itching_powder/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume)
+ if(method == TOUCH)
+ M.reagents.add_reagent("itching_powder", volume)
+ return
+
+datum/reagent/toxin/itching_powder/on_mob_life(var/mob/living/M as mob)
+ if(prob(15))
+ M << "You scratch at your head."
+ M.adjustBruteLoss(0.2*REM)
+ if(prob(15))
+ M << "You scratch at your leg."
+ M.adjustBruteLoss(0.2*REM)
+ if(prob(15))
+ M << "You scratch at your arm."
+ M.adjustBruteLoss(0.2*REM)
+ if(prob(3))
+ M.reagents.add_reagent("histamine",rand(1,3))
+ M.reagents.remove_reagent("itching_powder",1)
+ ..()
+
+datum/reagent/toxin/initropidril
+ name = "Initropidril"
+ id = "initropidril"
+ description = "Causes some toxin damage, 5% chances to cause stunning, suffocation, or immediate heart failure."
+ reagent_state = LIQUID
+ color = "#CF3600"
+ metabolization_rate = 0.5 * REAGENTS_METABOLISM
+ toxpwr = 2.5
+
+datum/reagent/toxin/initropidril/on_mob_life(var/mob/living/M as mob)
+ if(prob(5))
+ var/picked_option = rand(1,3)
+ switch(picked_option)
+ if(1)
+ M.Stun(3)
+ M.Weaken(3)
+ if(2)
+ M.losebreath += 10
+ M.adjustOxyLoss(rand(5,25))
+ if(3)
+ var/mob/living/carbon/human/H = M
+ if(!H.heart_attack)
+ H.visible_message("[H] clutches at their chest as if their heart stopped!")
+ H.heart_attack = 1 // rip in pepperoni
+ else
+ H.losebreath += 10
+ H.adjustOxyLoss(rand(5,25))
+ ..()
+
+datum/reagent/toxin/pancuronium
+ name = "Pancuronium"
+ id = "pancuronium"
+ description = "Knocks you out after 30 seconds, 7% chance to cause some oxygen loss."
+ reagent_state = LIQUID
+ color = "#CF3600"
+ metabolization_rate = 0.25 * REAGENTS_METABOLISM
+ toxpwr = 0
+
+datum/reagent/toxin/pancuronium/on_mob_life(var/mob/living/M as mob)
+ if(current_cycle >= 30)
+ M.SetParalysis(3)
+ if(prob(7))
+ M.losebreath += 4
+ ..()
+
+datum/reagent/toxin/sodium_thiopental
+ name = "Sodium Thiopental"
+ id = "sodium_thiopental"
+ description = "Puts you to sleep after 30 seconds, along with some major stamina loss."
+ reagent_state = LIQUID
+ color = "#CF3600"
+ metabolization_rate = 0.75 * REAGENTS_METABOLISM
+ toxpwr = 0
+
+datum/reagent/toxin/sodium_thiopental/on_mob_life(var/mob/living/M as mob)
+ if(current_cycle >= 30)
+ M.sleeping += 1.5
+ M.adjustStaminaLoss(5*REM)
+ ..()
+
+datum/reagent/toxin/sulfonal
+ name = "Sulfonal"
+ id = "sulfonal"
+ description = "Deals some toxin damage, and puts you to sleep after 66 seconds."
+ reagent_state = LIQUID
+ color = "#CF3600"
+ metabolization_rate = 0.125 * REAGENTS_METABOLISM
+ toxpwr = 0.5
+
+datum/reagent/toxin/sulfonal/on_mob_life(var/mob/living/M as mob)
+ if(current_cycle >= 66)
+ M.sleeping += 1.5
+ ..()
+
+datum/reagent/toxin/amanitin
+ name = "Amanitin"
+ id = "amanitin"
+ description = "On the last second that it's in you, it hits you with a stack of toxin damage based on how long it's been in you. The more you use, the longer it takes before anything happens, but the harder it hits when it does."
+ reagent_state = LIQUID
+ color = "#CF3600"
+ toxpwr = 0
+ metabolization_rate = 0.5 * REAGENTS_METABOLISM
+
+datum/reagent/toxin/amanitin/on_mob_delete(var/mob/living/M as mob)
+ M.adjustToxLoss(current_cycle*3*REM)
+ ..()
+
+datum/reagent/toxin/lipolicide
+ name = "Lipolicide"
+ id = "lipolicide"
+ description = "Deals some toxin damage unless they keep eating food. Will reduce nutrition values."
+ reagent_state = LIQUID
+ color = "#CF3600"
+ metabolization_rate = 0.5 * REAGENTS_METABOLISM
+ toxpwr = 0.5
+
+datum/reagent/toxin/lipolicide/on_mob_life(var/mob/living/M as mob)
+ if(!holder.has_reagent("nutriment"))
+ M.adjustToxLoss(0.5*REM)
+ M.nutrition -= 5 * REAGENTS_METABOLISM
+ M.overeatduration = 0
+ if(M.nutrition < 0)//Prevent from going into negatives.
+ M.nutrition = 0
+ ..()
+
+datum/reagent/toxin/coniine
+ name = "Coniine"
+ id = "coniine"
+ description = "Does moderate toxin damage and oxygen loss."
+ reagent_state = LIQUID
+ color = "#CF3600"
+ metabolization_rate = 0.06 * REAGENTS_METABOLISM
+ toxpwr = 1
+
+datum/reagent/toxin/coniine/on_mob_life(var/mob/living/M as mob)
+ M.losebreath += 3
+ ..()
+
+datum/reagent/toxin/curare
+ name = "Curare"
+ id = "curare"
+ description = "Does some oxygen and toxin damage, weakens you after 33 seconds."
+ reagent_state = LIQUID
+ color = "#CF3600"
+ metabolization_rate = 0.125 * REAGENTS_METABOLISM
+ toxpwr = 0.5
+
+datum/reagent/toxin/curare/on_mob_life(var/mob/living/M as mob)
+ if(current_cycle >= 33)
+ M.Weaken(3)
+ M.adjustOxyLoss(0.5*REM)
+ ..()
+
//ACID
@@ -361,5 +639,3 @@ datum/reagent/toxin/acid/fluacid
toxpwr = 2
acidpwr = 20
-// Undefine the alias for REAGENTS_EFFECT_MULTIPLER
-#undef REM
\ No newline at end of file
diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm
index 0f99675d8e2..7cdb73ae78a 100644
--- a/code/modules/reagents/Chemistry-Recipes.dm
+++ b/code/modules/reagents/Chemistry-Recipes.dm
@@ -19,892 +19,74 @@
/datum/chemical_reaction/proc/on_reaction(var/datum/reagents/holder, var/created_volume)
return
-
//I recommend you set the result amount to the total volume of all components.
-/datum/chemical_reaction/explosion_potassium
- name = "Explosion"
- id = "explosion_potassium"
- result = null
- required_reagents = list("water" = 1, "potassium" = 1)
- result_amount = 2
-/datum/chemical_reaction/explosion_potassium/on_reaction(var/datum/reagents/holder, var/created_volume)
- var/location = get_turf(holder.my_atom)
- var/datum/effect/effect/system/reagents_explosion/e = new()
- e.set_up(round (created_volume/10, 1), location, 0, 0)
- e.start()
- holder.clear_reagents()
- return
-/datum/chemical_reaction/emp_pulse
- name = "EMP Pulse"
- id = "emp_pulse"
- result = null
- required_reagents = list("uranium" = 1, "iron" = 1) // Yes, laugh, it's the best recipe I could think of that makes a little bit of sense
- result_amount = 2
-
-/datum/chemical_reaction/emp_pulse/on_reaction(var/datum/reagents/holder, var/created_volume)
- var/location = get_turf(holder.my_atom)
- // 100 created volume = 4 heavy range & 7 light range. A few tiles smaller than traitor EMP grandes.
- // 200 created volume = 8 heavy range & 14 light range. 4 tiles larger than traitor EMP grenades.
- empulse(location, round(created_volume / 24), round(created_volume / 14), 1)
- holder.clear_reagents()
- return
-/*
-silicate
- name = "Silicate"
- id = "silicate"
- result = "silicate"
- required_reagents = list("aluminium" = 1, "silicon" = 1, "oxygen" = 1)
- result_amount = 3
-*/
-
-/datum/chemical_reaction/sterilizine
- name = "Sterilizine"
- id = "sterilizine"
- result = "sterilizine"
- required_reagents = list("ethanol" = 1, "charcoal" = 1, "chlorine" = 1)
- result_amount = 3
-
-/datum/chemical_reaction/mutagen
- name = "Unstable mutagen"
- id = "mutagen"
- result = "mutagen"
- required_reagents = list("radium" = 1, "phosphorus" = 1, "chlorine" = 1)
- result_amount = 3
-
-//cyanide
-// name = "Cyanide"
-// id = "cyanide"
-// result = "cyanide"
-// required_reagents = list("hydrogen" = 1, "carbon" = 1, "nitrogen" = 1)
-// result_amount = 1
-
-/datum/chemical_reaction/thermite
- name = "Thermite"
- id = "thermite"
- result = "thermite"
- required_reagents = list("aluminium" = 1, "iron" = 1, "oxygen" = 1)
- result_amount = 3
-
-/datum/chemical_reaction/lexorin
- name = "Lexorin"
- id = "lexorin"
- result = "lexorin"
- required_reagents = list("plasma" = 1, "hydrogen" = 1, "nitrogen" = 1)
- result_amount = 3
-
-/datum/chemical_reaction/space_drugs
- name = "Space Drugs"
- id = "space_drugs"
- result = "space_drugs"
- required_reagents = list("mercury" = 1, "sugar" = 1, "lithium" = 1)
- result_amount = 3
-
-/datum/chemical_reaction/lube
- name = "Space Lube"
- id = "lube"
- result = "lube"
- required_reagents = list("water" = 1, "silicon" = 1, "oxygen" = 1)
- result_amount = 4
-
-/datum/chemical_reaction/synaptizine
- name = "Synaptizine"
- id = "synaptizine"
- result = "synaptizine"
- required_reagents = list("sugar" = 1, "lithium" = 1, "water" = 1)
- result_amount = 3
-
-/datum/chemical_reaction/impedrezene
- name = "Impedrezene"
- id = "impedrezene"
- result = "impedrezene"
- required_reagents = list("mercury" = 1, "oxygen" = 1, "sugar" = 1)
- result_amount = 2
-
-/datum/chemical_reaction/leporazine
- name = "Leporazine"
- id = "leporazine"
- result = "leporazine"
- required_reagents = list("silicon" = 1, "copper" = 1)
- required_catalysts = list("plasma" = 5)
- result_amount = 2
-
-/datum/chemical_reaction/cryptobiolin
- name = "Cryptobiolin"
- id = "cryptobiolin"
- result = "cryptobiolin"
- required_reagents = list("potassium" = 1, "oxygen" = 1, "sugar" = 1)
- result_amount = 3
-
-/datum/chemical_reaction/spaceacillin
- name = "Spaceacillin"
- id = "spaceacillin"
- result = "spaceacillin"
- required_reagents = list("cryptobiolin" = 1, "epinephrine" = 1)
- result_amount = 2
-
-/datum/chemical_reaction/inacusiate
- name = "inacusiate"
- id = "inacusiate"
- result = "inacusiate"
- required_reagents = list("water" = 1, "carbon" = 1, "charcoal" = 1)
- result_amount = 2
-
-/datum/chemical_reaction/glycerol
- name = "Glycerol"
- id = "glycerol"
- result = "glycerol"
- required_reagents = list("cornoil" = 3, "sacid" = 1)
- result_amount = 1
-
-/datum/chemical_reaction/nitroglycerin
- name = "Nitroglycerin"
- id = "nitroglycerin"
- result = "nitroglycerin"
- required_reagents = list("glycerol" = 1, "facid" = 1, "sacid" = 1)
- result_amount = 2
-/datum/chemical_reaction/nitroglycerin/on_reaction(var/datum/reagents/holder, var/created_volume)
- var/location = get_turf(holder.my_atom)
- var/datum/effect/effect/system/reagents_explosion/e = new()
- e.set_up(round (created_volume/2, 1), location, 0, 0)
- e.start()
-
- holder.clear_reagents()
- return
-
-/datum/chemical_reaction/sodiumchloride
- name = "Sodium Chloride"
- id = "sodiumchloride"
- result = "sodiumchloride"
- required_reagents = list("water" = 1, "sodium" = 1, "chlorine" = 1)
- result_amount = 3
-
-/datum/chemical_reaction/chloralhydrate
- name = "Chloral Hydrate"
- id = "chloralhydrate"
- result = "chloralhydrate"
- required_reagents = list("ethanol" = 1, "chlorine" = 3, "water" = 1)
- result_amount = 1
-
-/datum/chemical_reaction/mutetoxin //i'll just fit this in here snugly between other unfun chemicals :v
- name = "Mute toxin"
- id = "mutetoxin"
- result = "mutetoxin"
- required_reagents = list("uranium" = 2, "water" = 1, "carbon" = 1)
- result_amount = 2
-
-/datum/chemical_reaction/zombiepowder
- name = "Zombie Powder"
- id = "zombiepowder"
- result = "zombiepowder"
- required_reagents = list("carpotoxin" = 5, "morphine" = 5, "copper" = 5)
- result_amount = 2
-
-/datum/chemical_reaction/rezadone
- name = "Rezadone"
- id = "rezadone"
- result = "rezadone"
- required_reagents = list("carpotoxin" = 1, "cryptobiolin" = 1, "copper" = 1)
- result_amount = 3
-
-/datum/chemical_reaction/mindbreaker
- name = "Mindbreaker Toxin"
- id = "mindbreaker"
- result = "mindbreaker"
- required_reagents = list("silicon" = 1, "hydrogen" = 1, "charcoal" = 1)
- result_amount = 5
-
-/datum/chemical_reaction/plasmasolidification
- name = "Solid Plasma"
- id = "solidplasma"
- result = null
- required_reagents = list("iron" = 5, "frostoil" = 5, "plasma" = 20)
- result_amount = 1
- mob_react = 1
-
-/datum/chemical_reaction/plasmasolidification/on_reaction(var/datum/reagents/holder, var/created_volume)
- var/location = get_turf(holder.my_atom)
- new /obj/item/stack/sheet/mineral/plasma(location)
- return
-
-/datum/chemical_reaction/capsaicincondensation
- name = "Capsaicincondensation"
- id = "capsaicincondensation"
- result = "condensedcapsaicin"
- required_reagents = list("capsaicin" = 1, "ethanol" = 5)
- result_amount = 5
-
-/datum/chemical_reaction/virus_food
- name = "Virus Food"
- id = "virusfood"
- result = "virusfood"
- required_reagents = list("water" = 5, "milk" = 5)
- result_amount = 15
-
-/datum/chemical_reaction/mix_virus
- name = "Mix Virus"
- id = "mixvirus"
- result = "blood"
- required_reagents = list("virusfood" = 1)
- required_catalysts = list("blood" = 1)
- var/level_min = 0
- var/level_max = 2
-
-/datum/chemical_reaction/mix_virus/on_reaction(var/datum/reagents/holder, var/created_volume)
-
- var/datum/reagent/blood/B = locate(/datum/reagent/blood) in holder.reagent_list
- if(B && B.data)
- var/datum/disease/advance/D = locate(/datum/disease/advance) in B.data["viruses"]
- if(D)
- D.Evolve(level_min, level_max)
-
-
-/datum/chemical_reaction/mix_virus/mix_virus_2
-
- name = "Mix Virus 2"
- id = "mixvirus2"
- required_reagents = list("mutagen" = 1)
- level_min = 2
- level_max = 4
-
-/datum/chemical_reaction/mix_virus/mix_virus_3
-
- name = "Mix Virus 3"
- id = "mixvirus3"
- required_reagents = list("plasma" = 1)
- level_min = 4
- level_max = 6
-
-/datum/chemical_reaction/mix_virus/rem_virus
-
- name = "Devolve Virus"
- id = "remvirus"
- required_reagents = list("synaptizine" = 1)
- required_catalysts = list("blood" = 1)
-
-/datum/chemical_reaction/mix_virus/rem_virus/on_reaction(var/datum/reagents/holder, var/created_volume)
-
- var/datum/reagent/blood/B = locate(/datum/reagent/blood) in holder.reagent_list
- if(B && B.data)
- var/datum/disease/advance/D = locate(/datum/disease/advance) in B.data["viruses"]
- if(D)
- D.Devolve()
-
-
-
-///////////////////////////////////////////////////////////////////////////////////
-
-// foam and foam precursor
-
-/datum/chemical_reaction/surfactant
- name = "Foam surfactant"
- id = "foam surfactant"
- result = "fluorosurfactant"
- required_reagents = list("fluorine" = 2, "carbon" = 2, "sacid" = 1)
- result_amount = 5
-
-
-/datum/chemical_reaction/foam
- name = "Foam"
- id = "foam"
- result = null
- required_reagents = list("fluorosurfactant" = 1, "water" = 1)
- result_amount = 2
- mob_react = 1
-
-/datum/chemical_reaction/foam/on_reaction(var/datum/reagents/holder, var/created_volume)
- var/location = get_turf(holder.my_atom)
-
- for(var/mob/M in viewers(5, location))
- M << "The solution spews out foam!"
-
- var/datum/effect/effect/system/foam_spread/s = new()
- s.set_up(created_volume, location, holder)
- s.start()
- holder.clear_reagents()
- return
-
-
-/datum/chemical_reaction/metalfoam
- name = "Metal Foam"
- id = "metalfoam"
- result = null
- required_reagents = list("aluminium" = 3, "foaming_agent" = 1, "facid" = 1)
- result_amount = 5
- mob_react = 1
-
-/datum/chemical_reaction/metalfoam/on_reaction(var/datum/reagents/holder, var/created_volume)
- var/location = get_turf(holder.my_atom)
-
- for(var/mob/M in viewers(5, location))
- M << "The solution spews out a metallic foam!"
-
- var/datum/effect/effect/system/foam_spread/metal/s = new()
- s.set_up(created_volume, location, holder, 1)
- s.start()
- holder.clear_reagents()
- return
-
-
-/datum/chemical_reaction/ironfoam
- name = "Iron Foam"
- id = "ironlfoam"
- result = null
- required_reagents = list("iron" = 3, "foaming_agent" = 1, "facid" = 1)
- result_amount = 5
- mob_react = 1
-
-/datum/chemical_reaction/ironfoam/on_reaction(var/datum/reagents/holder, var/created_volume)
- var/location = get_turf(holder.my_atom)
-
- for(var/mob/M in viewers(5, location))
- M << "The solution spews out a metallic foam!"
-
- var/datum/effect/effect/system/foam_spread/metal/s = new()
- s.set_up(created_volume, location, holder, 2)
- s.start()
- holder.clear_reagents()
- return
-
-
-/datum/chemical_reaction/foaming_agent
- name = "Foaming Agent"
- id = "foaming_agent"
- result = "foaming_agent"
- required_reagents = list("lithium" = 1, "hydrogen" = 1)
- result_amount = 1
-
-// Synthesizing these three chemicals is pretty complex in real life, but fuck it, it's just a game!
-/datum/chemical_reaction/ammonia
- name = "Ammonia"
- id = "ammonia"
- result = "ammonia"
- required_reagents = list("hydrogen" = 3, "nitrogen" = 1)
- result_amount = 3
-
-/datum/chemical_reaction/diethylamine
- name = "Diethylamine"
- id = "diethylamine"
- result = "diethylamine"
- required_reagents = list ("ammonia" = 1, "ethanol" = 1)
- result_amount = 2
-
-/datum/chemical_reaction/space_cleaner
- name = "Space cleaner"
- id = "cleaner"
- result = "cleaner"
- required_reagents = list("ammonia" = 1, "water" = 1)
- result_amount = 2
-
-/datum/chemical_reaction/plantbgone
- name = "Plant-B-Gone"
- id = "plantbgone"
- result = "plantbgone"
- required_reagents = list("toxin" = 1, "water" = 4)
- result_amount = 5
-
-datum/chemical_reaction/weedkiller
- name = "Weed Killer"
- id = "weedkiller"
- result = "weedkiller"
- required_reagents = list("toxin" = 1, "ammonia" = 4)
- result_amount = 5
-
-datum/chemical_reaction/pestkiller
- name = "Pest Killer"
- id = "pestkiller"
- result = "pestkiller"
- required_reagents = list("toxin" = 1, "ethanol" = 4)
- result_amount = 5
-
-/////////////////////////////////////////////NEW SLIME CORE REACTIONS/////////////////////////////////////////////
-
-//Grey
-/datum/chemical_reaction/slimespawn
- name = "Slime Spawn"
- id = "m_spawn"
- result = null
- required_reagents = list("plasma" = 1)
- result_amount = 1
- required_container = /obj/item/slime_extract/grey
- required_other = 1
-/datum/chemical_reaction/slimespawn/on_reaction(var/datum/reagents/holder)
- feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
- for(var/mob/O in viewers(get_turf(holder.my_atom), null))
- O.show_message(text("Infused with plasma, the core begins to quiver and grow, and soon a new baby slime emerges from it!"), 1)
- var/mob/living/simple_animal/slime/S = new /mob/living/simple_animal/slime
- S.loc = get_turf(holder.my_atom)
-
-/datum/chemical_reaction/slimeinaprov
- name = "Slime epinephrine"
- id = "m_inaprov"
- result = "epinephrine"
- required_reagents = list("water" = 5)
- result_amount = 3
- required_other = 1
- required_container = /obj/item/slime_extract/grey
-/datum/chemical_reaction/slimeinaprov/on_reaction(var/datum/reagents/holder)
- feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
-
-/datum/chemical_reaction/slimemonkey
- name = "Slime Monkey"
- id = "m_monkey"
- result = null
- required_reagents = list("blood" = 1)
- result_amount = 1
- required_container = /obj/item/slime_extract/grey
- required_other = 1
-/datum/chemical_reaction/slimemonkey/on_reaction(var/datum/reagents/holder)
- feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
- for(var/i = 1, i <= 3, i++)
- var /obj/item/weapon/reagent_containers/food/snacks/monkeycube/M = new /obj/item/weapon/reagent_containers/food/snacks/monkeycube
- M.loc = get_turf(holder.my_atom)
-
-//Green
-/datum/chemical_reaction/slimemutate
- name = "Mutation Toxin"
- id = "mutationtoxin"
- result = "mutationtoxin"
- required_reagents = list("plasma" = 1)
- result_amount = 1
- required_other = 1
- required_container = /obj/item/slime_extract/green
-/datum/chemical_reaction/slimemutate/on_reaction(var/datum/reagents/holder)
- feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
-
-//Metal
-/datum/chemical_reaction/slimemetal
- name = "Slime Metal"
- id = "m_metal"
- result = null
- required_reagents = list("plasma" = 1)
- result_amount = 1
- required_container = /obj/item/slime_extract/metal
- required_other = 1
-/datum/chemical_reaction/slimemetal/on_reaction(var/datum/reagents/holder)
- feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
- var/obj/item/stack/sheet/metal/M = new /obj/item/stack/sheet/metal
- M.amount = 15
- M.loc = get_turf(holder.my_atom)
- var/obj/item/stack/sheet/plasteel/P = new /obj/item/stack/sheet/plasteel
- P.amount = 5
- P.loc = get_turf(holder.my_atom)
-
-//Gold
-/datum/chemical_reaction/slimecrit
- name = "Slime Crit"
- id = "m_tele"
- result = null
- required_reagents = list("plasma" = 1)
- result_amount = 1
- required_container = /obj/item/slime_extract/gold
- required_other = 1
-/datum/chemical_reaction/slimecrit/on_reaction(var/datum/reagents/holder)
- feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
- for(var/mob/O in viewers(get_turf(holder.my_atom), null))
- O.show_message(text("The slime extract begins to vibrate violently !"), 1)
- spawn(50)
-
- chemical_mob_spawn(holder, 5, "Gold Slime")
-
-/datum/chemical_reaction/slimecritlesser
- name = "Slime Crit Lesser"
- id = "m_tele3"
- result = null
- required_reagents = list("blood" = 1)
- result_amount = 1
- required_container = /obj/item/slime_extract/gold
- required_other = 1
-/datum/chemical_reaction/slimecritlesser/on_reaction(var/datum/reagents/holder)
- feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
- for(var/mob/O in viewers(get_turf(holder.my_atom), null))
- O.show_message(text("The slime extract begins to vibrate violently !"), 1)
- spawn(50)
-
- chemical_mob_spawn(holder, 1, "Lesser Gold Slime", "neutral")
-
-//Silver
-/datum/chemical_reaction/slimebork
- name = "Slime Bork"
- id = "m_tele2"
- result = null
- required_reagents = list("plasma" = 1)
- result_amount = 1
- required_container = /obj/item/slime_extract/silver
- required_other = 1
-/datum/chemical_reaction/slimebork/on_reaction(var/datum/reagents/holder)
-
- feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
-
- var/list/borks = typesof(/obj/item/weapon/reagent_containers/food/snacks) - /obj/item/weapon/reagent_containers/food/snacks
- // BORK BORK BORK
-
- playsound(get_turf(holder.my_atom), 'sound/effects/phasein.ogg', 100, 1)
-
- for(var/mob/living/carbon/human/M in viewers(get_turf(holder.my_atom), null))
- M.flash_eyes()
-
- for(var/i = 1, i <= 4 + rand(1,2), i++)
- var/chosen = pick(borks)
- var/obj/B = new chosen
- if(B)
- B.loc = get_turf(holder.my_atom)
+/datum/chemical_reaction/proc/chemical_mob_spawn(var/datum/reagents/holder, var/amount_to_spawn, var/reaction_name, var/mob_faction = "chemicalsummon")
+ if(holder && holder.my_atom)
+ var/blocked = list(/mob/living/simple_animal/hostile,
+ /mob/living/simple_animal/hostile/pirate,
+ /mob/living/simple_animal/hostile/pirate/ranged,
+ /mob/living/simple_animal/hostile/russian,
+ /mob/living/simple_animal/hostile/russian/ranged,
+ /mob/living/simple_animal/hostile/syndicate,
+ /mob/living/simple_animal/hostile/syndicate/melee,
+ /mob/living/simple_animal/hostile/syndicate/melee/space,
+ /mob/living/simple_animal/hostile/syndicate/ranged,
+ /mob/living/simple_animal/hostile/syndicate/ranged/space,
+ /mob/living/simple_animal/hostile/alien/queen/large,
+ /mob/living/simple_animal/hostile/retaliate,
+ /mob/living/simple_animal/hostile/retaliate/clown,
+ /mob/living/simple_animal/hostile/mushroom,
+ /mob/living/simple_animal/hostile/asteroid,
+ /mob/living/simple_animal/hostile/asteroid/basilisk,
+ /mob/living/simple_animal/hostile/asteroid/goldgrub,
+ /mob/living/simple_animal/hostile/asteroid/goliath,
+ /mob/living/simple_animal/hostile/asteroid/hivelord,
+ /mob/living/simple_animal/hostile/asteroid/hivelordbrood,
+ /mob/living/simple_animal/hostile/carp/holocarp,
+ /mob/living/simple_animal/hostile/mining_drone,
+ /mob/living/simple_animal/hostile/poison,
+ /mob/living/simple_animal/hostile/blob,
+ /mob/living/simple_animal/ascendant_shadowling
+ )//exclusion list for things you don't want the reaction to create.
+ var/list/critters = typesof(/mob/living/simple_animal/hostile) - blocked // list of possible hostile mobs
+ var/atom/A = holder.my_atom
+ var/turf/T = get_turf(A)
+ var/area/my_area = get_area(T)
+ var/message = "A [reaction_name] reaction has occured in [my_area.name]. (JMP)"
+ message += " (VV)"
+
+ var/mob/M = get(A, /mob)
+ if(M)
+ message += " - Carried By: [M.real_name] ([M.key]) (PP) (?)"
+ else
+ message += " - Last Fingerprint: [(A.fingerprintslast ? A.fingerprintslast : "N/A")]"
+
+ message_admins(message, 0, 1)
+
+ playsound(get_turf(holder.my_atom), 'sound/effects/phasein.ogg', 100, 1)
+
+ for(var/mob/living/carbon/human/H in viewers(get_turf(holder.my_atom), null))
+ H.flash_eyes()
+ for(var/i = 1, i <= amount_to_spawn, i++)
+ var/chosen = pick(critters)
+ var/mob/living/simple_animal/hostile/C = new chosen
+ C.faction |= mob_faction
+ C.loc = get_turf(holder.my_atom)
if(prob(50))
for(var/j = 1, j <= rand(1, 3), j++)
- step(B, pick(NORTH,SOUTH,EAST,WEST))
-
-
-/datum/chemical_reaction/slimebork2
- name = "Slime Bork 2"
- id = "m_tele4"
- result = null
- required_reagents = list("water" = 1)
- result_amount = 1
- required_container = /obj/item/slime_extract/silver
- required_other = 1
-/datum/chemical_reaction/slimebork2/on_reaction(var/datum/reagents/holder)
-
- feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
-
- var/list/borks = typesof(/obj/item/weapon/reagent_containers/food/drinks) - /obj/item/weapon/reagent_containers/food/drinks
- // BORK BORK BORK
-
- playsound(get_turf(holder.my_atom), 'sound/effects/phasein.ogg', 100, 1)
-
- for(var/mob/living/carbon/human/M in viewers(get_turf(holder.my_atom), null))
- M.flash_eyes()
-
- for(var/i = 1, i <= 4 + rand(1,2), i++)
- var/chosen = pick(borks)
- var/obj/B = new chosen
- if(B)
- B.loc = get_turf(holder.my_atom)
- if(prob(50))
- for(var/j = 1, j <= rand(1, 3), j++)
- step(B, pick(NORTH,SOUTH,EAST,WEST))
-
-
-//Blue
-/datum/chemical_reaction/slimefrost
- name = "Slime Frost Oil"
- id = "m_frostoil"
- result = "frostoil"
- required_reagents = list("plasma" = 1)
- result_amount = 10
- required_container = /obj/item/slime_extract/blue
- required_other = 1
-/datum/chemical_reaction/slimefrost/on_reaction(var/datum/reagents/holder)
- feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
-
-//Dark Blue
-/datum/chemical_reaction/slimefreeze
- name = "Slime Freeze"
- id = "m_freeze"
- result = null
- required_reagents = list("plasma" = 1)
- result_amount = 1
- required_container = /obj/item/slime_extract/darkblue
- required_other = 1
-/datum/chemical_reaction/slimefreeze/on_reaction(var/datum/reagents/holder)
- feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
- for(var/mob/O in viewers(get_turf(holder.my_atom), null))
- O.show_message(text("The slime extract begins to vibrate violently !"), 1)
- spawn(50)
- if(holder && holder.my_atom)
- playsound(get_turf(holder.my_atom), 'sound/effects/phasein.ogg', 100, 1)
- for(var/mob/living/M in range (get_turf(holder.my_atom), 7))
- M.bodytemperature -= 240
- M << "You feel a chill!"
-
-//Orange
-/datum/chemical_reaction/slimecasp
- name = "Slime Capsaicin Oil"
- id = "m_capsaicinoil"
- result = "capsaicin"
- required_reagents = list("blood" = 1)
- result_amount = 10
- required_container = /obj/item/slime_extract/orange
- required_other = 1
-/datum/chemical_reaction/slimecasp/on_reaction(var/datum/reagents/holder)
- feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
-
-/datum/chemical_reaction/slimefire
- name = "Slime fire"
- id = "m_fire"
- result = null
- required_reagents = list("plasma" = 1)
- result_amount = 1
- required_container = /obj/item/slime_extract/orange
- required_other = 1
-/datum/chemical_reaction/slimefire/on_reaction(var/datum/reagents/holder)
- feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
- for(var/mob/O in viewers(get_turf(holder.my_atom), null))
- O.show_message(text("The slime extract begins to vibrate violently !"), 1)
- spawn(50)
- if(holder && holder.my_atom)
- var/turf/simulated/T = get_turf(holder.my_atom)
- if(istype(T))
- T.atmos_spawn_air(SPAWN_HEAT | SPAWN_TOXINS, 50)
-
-//Yellow
-
-/datum/chemical_reaction/slimeoverload
- name = "Slime EMP"
- id = "m_emp"
- result = null
- required_reagents = list("blood" = 1)
- result_amount = 1
- required_container = /obj/item/slime_extract/yellow
- required_other = 1
-/datum/chemical_reaction/slimeoverload/on_reaction(var/datum/reagents/holder, var/created_volume)
- feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
- empulse(get_turf(holder.my_atom), 3, 7)
-
-
-/datum/chemical_reaction/slimecell
- name = "Slime Powercell"
- id = "m_cell"
- result = null
- required_reagents = list("plasma" = 1)
- result_amount = 1
- required_container = /obj/item/slime_extract/yellow
- required_other = 1
-/datum/chemical_reaction/slimecell/on_reaction(var/datum/reagents/holder, var/created_volume)
- feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
- var/obj/item/weapon/stock_parts/cell/high/slime/P = new /obj/item/weapon/stock_parts/cell/high/slime
- P.loc = get_turf(holder.my_atom)
-
-/datum/chemical_reaction/slimeglow
- name = "Slime Glow"
- id = "m_glow"
- result = null
- required_reagents = list("water" = 1)
- result_amount = 1
- required_container = /obj/item/slime_extract/yellow
- required_other = 1
-/datum/chemical_reaction/slimeglow/on_reaction(var/datum/reagents/holder)
- feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
- for(var/mob/O in viewers(get_turf(holder.my_atom), null))
- O.show_message(text("The slime begins to emit a soft light. Squeezing it will cause it to grow brightly."), 1)
- var/obj/item/device/flashlight/slime/F = new /obj/item/device/flashlight/slime
- F.loc = get_turf(holder.my_atom)
-
-//Purple
-
-/datum/chemical_reaction/slimepsteroid
- name = "Slime Steroid"
- id = "m_steroid"
- result = null
- required_reagents = list("plasma" = 1)
- result_amount = 1
- required_container = /obj/item/slime_extract/purple
- required_other = 1
-/datum/chemical_reaction/slimepsteroid/on_reaction(var/datum/reagents/holder)
- feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
- var/obj/item/weapon/slimesteroid/P = new /obj/item/weapon/slimesteroid
- P.loc = get_turf(holder.my_atom)
-
-/datum/chemical_reaction/slimejam
- name = "Slime Jam"
- id = "m_jam"
- result = "slimejelly"
- required_reagents = list("sugar" = 1)
- result_amount = 10
- required_container = /obj/item/slime_extract/purple
- required_other = 1
-/datum/chemical_reaction/slimejam/on_reaction(var/datum/reagents/holder)
- feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
-
-
-//Dark Purple
-/datum/chemical_reaction/slimeplasma
- name = "Slime Plasma"
- id = "m_plasma"
- result = null
- required_reagents = list("plasma" = 1)
- result_amount = 1
- required_container = /obj/item/slime_extract/darkpurple
- required_other = 1
-/datum/chemical_reaction/slimeplasma/on_reaction(var/datum/reagents/holder)
- feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
- var/obj/item/stack/sheet/mineral/plasma/P = new /obj/item/stack/sheet/mineral/plasma
- P.amount = 10
- P.loc = get_turf(holder.my_atom)
-
-//Red
-/datum/chemical_reaction/slimeglycerol
- name = "Slime Glycerol"
- id = "m_glycerol"
- result = "glycerol"
- required_reagents = list("plasma" = 1)
- result_amount = 8
- required_container = /obj/item/slime_extract/red
- required_other = 1
-/datum/chemical_reaction/slimeglycerol/on_reaction(var/datum/reagents/holder)
- feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
-
-
-/datum/chemical_reaction/slimebloodlust
- name = "Bloodlust"
- id = "m_bloodlust"
- result = null
- required_reagents = list("blood" = 1)
- result_amount = 1
- required_container = /obj/item/slime_extract/red
- required_other = 1
-/datum/chemical_reaction/slimebloodlust/on_reaction(var/datum/reagents/holder)
- feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
- for(var/mob/living/simple_animal/slime/slime in viewers(get_turf(holder.my_atom), null))
- slime.rabid = 1
- for(var/mob/O in viewers(get_turf(holder.my_atom), null))
- O.show_message(text("The [slime] is driven into a frenzy!"), 1)
-
-//Pink
-/datum/chemical_reaction/slimeppotion
- name = "Slime Potion"
- id = "m_potion"
- result = null
- required_reagents = list("plasma" = 1)
- result_amount = 1
- required_container = /obj/item/slime_extract/pink
- required_other = 1
-/datum/chemical_reaction/slimeppotion/on_reaction(var/datum/reagents/holder)
- feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
- var/obj/item/slimepotion/P = new /obj/item/slimepotion
- P.loc = get_turf(holder.my_atom)
-
-
-//Black
-/datum/chemical_reaction/slimemutate2
- name = "Advanced Mutation Toxin"
- id = "mutationtoxin2"
- result = "amutationtoxin"
- required_reagents = list("plasma" = 1)
- result_amount = 1
- required_other = 1
- required_container = /obj/item/slime_extract/black
-/datum/chemical_reaction/slimemutate2/on_reaction(var/datum/reagents/holder)
- feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
-
-//Oil
-/datum/chemical_reaction/slimeexplosion
- name = "Slime Explosion"
- id = "m_explosion"
- result = null
- required_reagents = list("plasma" = 1)
- result_amount = 1
- required_container = /obj/item/slime_extract/oil
- required_other = 1
-/datum/chemical_reaction/slimeexplosion/on_reaction(var/datum/reagents/holder)
- feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
- for(var/mob/O in viewers(get_turf(holder.my_atom), null))
- O.show_message(text("The slime extract begins to vibrate violently !"), 1)
- spawn(50)
- if(holder && holder.my_atom)
- explosion(get_turf(holder.my_atom), 1 ,3, 6)
-//Light Pink
-/datum/chemical_reaction/slimepotion2
- name = "Slime Potion 2"
- id = "m_potion2"
- result = null
- result_amount = 1
- required_container = /obj/item/slime_extract/lightpink
- required_reagents = list("plasma" = 1)
- required_other = 1
-/datum/chemical_reaction/slimepotion2/on_reaction(var/datum/reagents/holder)
- feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
- var/obj/item/slimepotion2/P = new /obj/item/slimepotion2
- P.loc = get_turf(holder.my_atom)
-//Adamantine
-/datum/chemical_reaction/slimegolem
- name = "Slime Golem"
- id = "m_golem"
- result = null
- required_reagents = list("plasma" = 1)
- result_amount = 1
- required_container = /obj/item/slime_extract/adamantine
- required_other = 1
-/datum/chemical_reaction/slimegolem/on_reaction(var/datum/reagents/holder)
- feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
- var/obj/effect/golemrune/Z = new /obj/effect/golemrune
- Z.loc = get_turf(holder.my_atom)
- notify_ghosts("Golem rune created in [get_area(Z)].", 'sound/effects/ghost2.ogg')
-
-//Bluespace
-
-/datum/chemical_reaction/slimecrystal
- name = "Slime Crystal"
- id = "m_crystal"
- result = null
- required_reagents = list("blood" = 1)
- result_amount = 1
- required_container = /obj/item/slime_extract/bluespace
- required_other = 1
-/datum/chemical_reaction/slimecrystal/on_reaction(var/datum/reagents/holder, var/created_volume)
- feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
- if(holder.my_atom)
- var/obj/item/bluespace_crystal/BC = new(get_turf(holder.my_atom))
- BC.visible_message("The [BC.name] appears out of thin air!")
-
-//Cerulean
-
-/datum/chemical_reaction/slimepsteroid2
- name = "Slime Steroid 2"
- id = "m_steroid2"
- result = null
- required_reagents = list("plasma" = 1)
- result_amount = 1
- required_container = /obj/item/slime_extract/cerulean
- required_other = 1
-/datum/chemical_reaction/slimepsteroid2/on_reaction(var/datum/reagents/holder)
- feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
- var/obj/item/weapon/slimesteroid2/P = new /obj/item/weapon/slimesteroid2
- P.loc = get_turf(holder.my_atom)
-
-//Sepia
-/datum/chemical_reaction/slimecamera
- name = "Slime Camera"
- id = "m_camera"
- result = null
- required_reagents = list("plasma" = 1)
- result_amount = 1
- required_container = /obj/item/slime_extract/sepia
- required_other = 1
-/datum/chemical_reaction/slimecamera/on_reaction(var/datum/reagents/holder)
- feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
- var/obj/item/device/camera/P = new /obj/item/device/camera
- P.loc = get_turf(holder.my_atom)
-
-/datum/chemical_reaction/slimefilm
- name = "Slime Film"
- id = "m_film"
- result = null
- required_reagents = list("blood" = 1)
- result_amount = 1
- required_container = /obj/item/slime_extract/sepia
- required_other = 1
-/datum/chemical_reaction/slimefilm/on_reaction(var/datum/reagents/holder)
- feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
- var/obj/item/device/camera_film/P = new /obj/item/device/camera_film
- P.loc = get_turf(holder.my_atom)
-
-
-//Pyrite
-
-/datum/chemical_reaction/slimepaint
- name = "Slime Paint"
- id = "s_paint"
- result = null
- required_reagents = list("plasma" = 1)
- result_amount = 1
- required_container = /obj/item/slime_extract/pyrite
- required_other = 1
-/datum/chemical_reaction/slimepaint/on_reaction(var/datum/reagents/holder)
- feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
- var/list/paints = typesof(/obj/item/weapon/paint) - /obj/item/weapon/paint
- var/chosen = pick(paints)
- var/obj/P = new chosen
- if(P)
- P.loc = get_turf(holder.my_atom)
+ step(C, pick(NORTH,SOUTH,EAST,WEST))
+/datum/chemical_reaction/proc/goonchem_vortex(var/turf/simulated/T, var/setting_type, var/range, var/pull_times)
+ for(var/atom/movable/X in orange(range, T))
+ if(istype(X, /obj/effect))
+ continue //stop pulling smoke and hotspots please
+ if(istype(X, /atom/movable))
+ if((X) && !X.anchored)
+ if(setting_type)
+ for(var/i = 0, i < pull_times, i++)
+ step_away(X,T)
+ else
+ for(var/i = 0, i < pull_times, i++)
+ step_towards(X,T)
\ No newline at end of file
diff --git a/code/modules/reagents/Chemistry-Recipes/Drugs.dm b/code/modules/reagents/Chemistry-Recipes/Drugs.dm
new file mode 100644
index 00000000000..6916187a7eb
--- /dev/null
+++ b/code/modules/reagents/Chemistry-Recipes/Drugs.dm
@@ -0,0 +1,48 @@
+/datum/chemical_reaction/space_drugs
+ name = "Space Drugs"
+ id = "space_drugs"
+ result = "space_drugs"
+ required_reagents = list("mercury" = 1, "sugar" = 1, "lithium" = 1)
+ result_amount = 3
+
+/datum/chemical_reaction/crank
+ name = "Crank"
+ id = "crank"
+ result = "crank"
+ required_reagents = list("diphenhydramine" = 1, "ammonia" = 1, "lithium" = 1, "sacid" = 1, "fuel" = 1)
+ result_amount = 5
+ mix_message = "The mixture violently reacts, leaving behind a few crystalline shards."
+ required_temp = 390
+
+
+/datum/chemical_reaction/krokodil
+ name = "Krokodil"
+ id = "krokodil"
+ result = "krokodil"
+ required_reagents = list("diphenhydramine" = 1, "morphine" = 1, "cleaner" = 1, "potassium" = 1, "phosphorus" = 1, "fuel" = 1)
+ result_amount = 6
+ mix_message = "The mixture dries into a pale blue powder."
+ required_temp = 380
+
+/datum/chemical_reaction/methamphetamine
+ name = "methamphetamine"
+ id = "methamphetamine"
+ result = "methamphetamine"
+ required_reagents = list("ephedrine" = 1, "iodine" = 1, "phosphorus" = 1, "hydrogen" = 1)
+ result_amount = 4
+ required_temp = 374
+
+/datum/chemical_reaction/bath_salts
+ name = "bath_salts"
+ id = "bath_salts"
+ result = "bath_salts"
+ required_reagents = list("????" = 1, "saltpetre" = 1, "nutriment" = 1, "cleaner" = 1, "enzyme" = 1, "tea" = 1, "mercury" = 1)
+ result_amount = 7
+ required_temp = 374
+
+/datum/chemical_reaction/aranesp
+ name = "aranesp"
+ id = "aranesp"
+ result = "aranesp"
+ required_reagents = list("epinephrine" = 1, "atropine" = 1, "morphine" = 1)
+ result_amount = 3
diff --git a/code/modules/reagents/Chemistry-Recipes/Medicine.dm b/code/modules/reagents/Chemistry-Recipes/Medicine.dm
new file mode 100644
index 00000000000..a73477d8629
--- /dev/null
+++ b/code/modules/reagents/Chemistry-Recipes/Medicine.dm
@@ -0,0 +1,197 @@
+
+/datum/chemical_reaction/leporazine
+ name = "Leporazine"
+ id = "leporazine"
+ result = "leporazine"
+ required_reagents = list("silicon" = 1, "copper" = 1)
+ required_catalysts = list("plasma" = 5)
+ result_amount = 2
+
+/datum/chemical_reaction/rezadone
+ name = "Rezadone"
+ id = "rezadone"
+ result = "rezadone"
+ required_reagents = list("carpotoxin" = 1, "cryptobiolin" = 1, "copper" = 1)
+ result_amount = 3
+
+/datum/chemical_reaction/spaceacillin
+ name = "Spaceacillin"
+ id = "spaceacillin"
+ result = "spaceacillin"
+ required_reagents = list("cryptobiolin" = 1, "epinephrine" = 1)
+ result_amount = 2
+
+/datum/chemical_reaction/inacusiate
+ name = "inacusiate"
+ id = "inacusiate"
+ result = "inacusiate"
+ required_reagents = list("water" = 1, "carbon" = 1, "charcoal" = 1)
+ result_amount = 2
+
+/datum/chemical_reaction/synaptizine
+ name = "Synaptizine"
+ id = "synaptizine"
+ result = "synaptizine"
+ required_reagents = list("sugar" = 1, "lithium" = 1, "water" = 1)
+ result_amount = 3
+
+/datum/chemical_reaction/charcoal
+ name = "Charcoal"
+ id = "charcoal"
+ result = "charcoal"
+ required_reagents = list("ash" = 1, "sodiumchloride" = 1)
+ result_amount = 2
+ mix_message = "The mixture yields a fine black powder."
+ required_temp = 380
+
+/datum/chemical_reaction/silver_sulfadiazine
+ name = "Silver Sulfadiazine"
+ id = "silver_sulfadiazine"
+ result = "silver_sulfadiazine"
+ required_reagents = list("ammonia" = 1, "silver" = 1, "sulfur" = 1, "oxygen" = 1, "chlorine" = 1)
+ result_amount = 5
+
+/datum/chemical_reaction/salglu_solution
+ name = "Saline-Glucose Solution"
+ id = "salglu_solution"
+ result = "salglu_solution"
+ required_reagents = list("sodiumchloride" = 1, "water" = 1, "sugar" = 1)
+ result_amount = 3
+
+/datum/chemical_reaction/synthflesh
+ name = "Synthflesh"
+ id = "synthflesh"
+ result = "synthflesh"
+ required_reagents = list("blood" = 1, "carbon" = 1, "styptic_powder" = 1)
+ result_amount = 3
+
+/datum/chemical_reaction/styptic_powder
+ name = "Styptic Powder"
+ id = "styptic_powder"
+ result = "styptic_powder"
+ required_reagents = list("aluminium" = 1, "hydrogen" = 1, "oxygen" = 1, "sacid" = 1)
+ result_amount = 4
+ mix_message = "The solution yields an astringent powder."
+
+/datum/chemical_reaction/calomel
+ name = "Calomel"
+ id = "calomel"
+ result = "calomel"
+ required_reagents = list("mercury" = 1, "chlorine" = 1)
+ result_amount = 2
+ required_temp = 374
+
+/datum/chemical_reaction/potass_iodide
+ name = "Potassium Iodide"
+ id = "potass_iodide"
+ result = "potass_iodide"
+ required_reagents = list("potassium" = 1, "iodine" = 1)
+ result_amount = 2
+
+/datum/chemical_reaction/pen_acid
+ name = "Pentetic Acid"
+ id = "pen_acid"
+ result = "pen_acid"
+ required_reagents = list("fuel" = 1, "chlorine" = 1, "ammonia" = 1, "formaldehyde" = 1, "sodium" = 1, "cyanide" = 1)
+ result_amount = 6
+
+/datum/chemical_reaction/sal_acid
+ name = "Salicyclic Acid"
+ id = "sal_acid"
+ result = "sal_acid"
+ required_reagents = list("sodium" = 1, "phenol" = 1, "carbon" = 1, "oxygen" = 1, "sacid" = 1)
+ result_amount = 5
+
+
+/datum/chemical_reaction/salbutamol
+ name = "Salbutamol"
+ id = "salbutamol"
+ result = "salbutamol"
+ required_reagents = list("sal_acid" = 1, "lithium" = 1, "aluminium" = 1, "bromine" = 1, "ammonia" = 1)
+ result_amount = 5
+
+/datum/chemical_reaction/perfluorodecalin
+ name = "Perfluorodecalin"
+ id = "perfluorodecalin"
+ result = "perfluorodecalin"
+ required_reagents = list("hydrogen" = 1, "fluorine" = 1, "oil" = 1)
+ result_amount = 3
+ required_temp = 370
+ mix_message = "The mixture rapidly turns into a dense pink liquid."
+
+/datum/chemical_reaction/ephedrine
+ name = "Ephedrine"
+ id = "ephedrine"
+ result = "ephedrine"
+ required_reagents = list("sugar" = 1, "oil" = 1, "hydrogen" = 1, "diethylamine" = 1)
+ result_amount = 4
+ mix_message = "The solution fizzes and gives off toxic fumes."
+
+/datum/chemical_reaction/diphenhydramine
+ name = "Diphenhydramine"
+ id = "diphenhydramine"
+ result = "diphenhydramine"
+ required_reagents = list("oil" = 1, "carbon" = 1, "bromine" = 1, "diethylamine" = 1, "ethanol" = 1)
+ result_amount = 4
+ mix_message = "The mixture dries into a pale blue powder."
+
+/datum/chemical_reaction/oculine
+ name = "Oculine"
+ id = "oculine"
+ result = "oculine"
+ required_reagents = list("charcoal" = 1, "carbon" = 1, "hydrogen" = 1)
+ result_amount = 3
+ mix_message = "The mixture sputters loudly and becomes a pale pink color."
+
+/datum/chemical_reaction/atropine
+ name = "Atropine"
+ id = "atropine"
+ result = "atropine"
+ required_reagents = list("ethanol" = 1, "acetone" = 1, "diethylamine" = 1, "phenol" = 1, "sacid" = 1)
+ result_amount = 5
+
+/datum/chemical_reaction/epinephrine
+ name = "Epinephrine"
+ id = "epinephrine"
+ result = "epinephrine"
+ required_reagents = list("phenol" = 1, "acetone" = 1, "diethylamine" = 1, "oxygen" = 1, "chlorine" = 1, "hydrogen" = 1)
+ result_amount = 6
+
+/datum/chemical_reaction/strange_reagent
+ name = "Strange Reagent"
+ id = "strange_reagent"
+ result = "strange_reagent"
+ required_reagents = list("omnizine" = 1, "holywater" = 1, "mutagen" = 1)
+ result_amount = 3
+
+/datum/chemical_reaction/mannitol
+ name = "Mannitol"
+ id = "mannitol"
+ result = "mannitol"
+ required_reagents = list("sugar" = 1, "hydrogen" = 1, "water" = 1)
+ result_amount = 3
+ mix_message = "The solution slightly bubbles, becoming thicker."
+
+/datum/chemical_reaction/mutadone
+ name = "Mutadone"
+ id = "mutadone"
+ result = "mutadone"
+ required_reagents = list("mutagen" = 1, "acetone" = 1, "bromine" = 1)
+ result_amount = 3
+
+/datum/chemical_reaction/antihol
+ name = "antihol"
+ id = "antihol"
+ result = "antihol"
+ required_reagents = list("ethanol" = 1, "charcoal" = 1, "copper" = 1)
+ result_amount = 3
+
+/datum/chemical_reaction/cryoxadone
+ name = "Cryoxadone"
+ id = "cryoxadone"
+ result = "cryoxadone"
+ required_reagents = list("stable_plasma" = 1, "acetone" = 1, "mutagen" = 1)
+ result_amount = 3
+
+
+
diff --git a/code/modules/reagents/Chemistry-Recipes/Others.dm b/code/modules/reagents/Chemistry-Recipes/Others.dm
new file mode 100644
index 00000000000..8a44606fcbc
--- /dev/null
+++ b/code/modules/reagents/Chemistry-Recipes/Others.dm
@@ -0,0 +1,342 @@
+
+/datum/chemical_reaction/sterilizine
+ name = "Sterilizine"
+ id = "sterilizine"
+ result = "sterilizine"
+ required_reagents = list("ethanol" = 1, "charcoal" = 1, "chlorine" = 1)
+ result_amount = 3
+
+/datum/chemical_reaction/lube
+ name = "Space Lube"
+ id = "lube"
+ result = "lube"
+ required_reagents = list("water" = 1, "silicon" = 1, "oxygen" = 1)
+ result_amount = 4
+
+/datum/chemical_reaction/impedrezene
+ name = "Impedrezene"
+ id = "impedrezene"
+ result = "impedrezene"
+ required_reagents = list("mercury" = 1, "oxygen" = 1, "sugar" = 1)
+ result_amount = 2
+
+/datum/chemical_reaction/cryptobiolin
+ name = "Cryptobiolin"
+ id = "cryptobiolin"
+ result = "cryptobiolin"
+ required_reagents = list("potassium" = 1, "oxygen" = 1, "sugar" = 1)
+ result_amount = 3
+
+/datum/chemical_reaction/glycerol
+ name = "Glycerol"
+ id = "glycerol"
+ result = "glycerol"
+ required_reagents = list("cornoil" = 3, "sacid" = 1)
+ result_amount = 1
+
+/datum/chemical_reaction/sodiumchloride
+ name = "Sodium Chloride"
+ id = "sodiumchloride"
+ result = "sodiumchloride"
+ required_reagents = list("water" = 1, "sodium" = 1, "chlorine" = 1)
+ result_amount = 3
+
+/datum/chemical_reaction/plasmasolidification
+ name = "Solid Plasma"
+ id = "solidplasma"
+ result = null
+ required_reagents = list("iron" = 5, "frostoil" = 5, "plasma" = 20)
+ result_amount = 1
+ mob_react = 1
+
+/datum/chemical_reaction/plasmasolidification/on_reaction(var/datum/reagents/holder, var/created_volume)
+ var/location = get_turf(holder.my_atom)
+ new /obj/item/stack/sheet/mineral/plasma(location)
+ return
+
+/datum/chemical_reaction/capsaicincondensation
+ name = "Capsaicincondensation"
+ id = "capsaicincondensation"
+ result = "condensedcapsaicin"
+ required_reagents = list("capsaicin" = 1, "ethanol" = 5)
+ result_amount = 5
+
+
+////////////////////////////////// VIROLOGY //////////////////////////////////////////
+
+/datum/chemical_reaction/virus_food
+ name = "Virus Food"
+ id = "virusfood"
+ result = "virusfood"
+ required_reagents = list("water" = 5, "milk" = 5)
+ result_amount = 15
+
+/datum/chemical_reaction/mix_virus
+ name = "Mix Virus"
+ id = "mixvirus"
+ result = "blood"
+ required_reagents = list("virusfood" = 1)
+ required_catalysts = list("blood" = 1)
+ var/level_min = 0
+ var/level_max = 2
+
+/datum/chemical_reaction/mix_virus/on_reaction(var/datum/reagents/holder, var/created_volume)
+
+ var/datum/reagent/blood/B = locate(/datum/reagent/blood) in holder.reagent_list
+ if(B && B.data)
+ var/datum/disease/advance/D = locate(/datum/disease/advance) in B.data["viruses"]
+ if(D)
+ D.Evolve(level_min, level_max)
+
+
+/datum/chemical_reaction/mix_virus/mix_virus_2
+
+ name = "Mix Virus 2"
+ id = "mixvirus2"
+ required_reagents = list("mutagen" = 1)
+ level_min = 2
+ level_max = 4
+
+/datum/chemical_reaction/mix_virus/mix_virus_3
+
+ name = "Mix Virus 3"
+ id = "mixvirus3"
+ required_reagents = list("plasma" = 1)
+ level_min = 4
+ level_max = 6
+
+/datum/chemical_reaction/mix_virus/rem_virus
+
+ name = "Devolve Virus"
+ id = "remvirus"
+ required_reagents = list("synaptizine" = 1)
+ required_catalysts = list("blood" = 1)
+
+/datum/chemical_reaction/mix_virus/rem_virus/on_reaction(var/datum/reagents/holder, var/created_volume)
+
+ var/datum/reagent/blood/B = locate(/datum/reagent/blood) in holder.reagent_list
+ if(B && B.data)
+ var/datum/disease/advance/D = locate(/datum/disease/advance) in B.data["viruses"]
+ if(D)
+ D.Devolve()
+
+
+
+////////////////////////////////// foam and foam precursor ///////////////////////////////////////////////////
+
+
+/datum/chemical_reaction/surfactant
+ name = "Foam surfactant"
+ id = "foam surfactant"
+ result = "fluorosurfactant"
+ required_reagents = list("fluorine" = 2, "carbon" = 2, "sacid" = 1)
+ result_amount = 5
+
+
+/datum/chemical_reaction/foam
+ name = "Foam"
+ id = "foam"
+ result = null
+ required_reagents = list("fluorosurfactant" = 1, "water" = 1)
+ result_amount = 2
+ mob_react = 1
+
+/datum/chemical_reaction/foam/on_reaction(var/datum/reagents/holder, var/created_volume)
+ var/location = get_turf(holder.my_atom)
+
+ for(var/mob/M in viewers(5, location))
+ M << "The solution spews out foam!"
+
+ var/datum/effect/effect/system/foam_spread/s = new()
+ s.set_up(created_volume, location, holder)
+ s.start()
+ holder.clear_reagents()
+ return
+
+
+/datum/chemical_reaction/metalfoam
+ name = "Metal Foam"
+ id = "metalfoam"
+ result = null
+ required_reagents = list("aluminium" = 3, "foaming_agent" = 1, "facid" = 1)
+ result_amount = 5
+ mob_react = 1
+
+/datum/chemical_reaction/metalfoam/on_reaction(var/datum/reagents/holder, var/created_volume)
+ var/location = get_turf(holder.my_atom)
+
+ for(var/mob/M in viewers(5, location))
+ M << "The solution spews out a metallic foam!"
+
+ var/datum/effect/effect/system/foam_spread/metal/s = new()
+ s.set_up(created_volume, location, holder, 1)
+ s.start()
+ holder.clear_reagents()
+
+/datum/chemical_reaction/ironfoam
+ name = "Iron Foam"
+ id = "ironlfoam"
+ result = null
+ required_reagents = list("iron" = 3, "foaming_agent" = 1, "facid" = 1)
+ result_amount = 5
+ mob_react = 1
+
+/datum/chemical_reaction/ironfoam/on_reaction(var/datum/reagents/holder, var/created_volume)
+ var/location = get_turf(holder.my_atom)
+ for(var/mob/M in viewers(5, location))
+ M << "The solution spews out a metallic foam!"
+ var/datum/effect/effect/system/foam_spread/metal/s = new()
+ s.set_up(created_volume, location, holder, 2)
+ s.start()
+ holder.clear_reagents()
+
+/datum/chemical_reaction/foaming_agent
+ name = "Foaming Agent"
+ id = "foaming_agent"
+ result = "foaming_agent"
+ required_reagents = list("lithium" = 1, "hydrogen" = 1)
+ result_amount = 1
+
+
+/////////////////////////////// Cleaning and hydroponics /////////////////////////////////////////////////
+
+/datum/chemical_reaction/ammonia
+ name = "Ammonia"
+ id = "ammonia"
+ result = "ammonia"
+ required_reagents = list("hydrogen" = 3, "nitrogen" = 1)
+ result_amount = 3
+
+/datum/chemical_reaction/diethylamine
+ name = "Diethylamine"
+ id = "diethylamine"
+ result = "diethylamine"
+ required_reagents = list ("ammonia" = 1, "ethanol" = 1)
+ result_amount = 2
+
+/datum/chemical_reaction/space_cleaner
+ name = "Space cleaner"
+ id = "cleaner"
+ result = "cleaner"
+ required_reagents = list("ammonia" = 1, "water" = 1)
+ result_amount = 2
+
+/datum/chemical_reaction/plantbgone
+ name = "Plant-B-Gone"
+ id = "plantbgone"
+ result = "plantbgone"
+ required_reagents = list("toxin" = 1, "water" = 4)
+ result_amount = 5
+
+datum/chemical_reaction/weedkiller
+ name = "Weed Killer"
+ id = "weedkiller"
+ result = "weedkiller"
+ required_reagents = list("toxin" = 1, "ammonia" = 4)
+ result_amount = 5
+
+datum/chemical_reaction/pestkiller
+ name = "Pest Killer"
+ id = "pestkiller"
+ result = "pestkiller"
+ required_reagents = list("toxin" = 1, "ethanol" = 4)
+ result_amount = 5
+
+
+//////////////////////////////////// Other goon stuff ///////////////////////////////////////////
+
+/datum/chemical_reaction/acetone
+ name = "acetone"
+ id = "acetone"
+ result = "acetone"
+ required_reagents = list("oil" = 1, "fuel" = 1, "oxygen" = 1)
+ result_amount = 3
+
+/datum/chemical_reaction/carpet
+ name = "carpet"
+ id = "carpet"
+ result = "carpet"
+ required_reagents = list("space_drugs" = 1, "blood" = 1)
+ result_amount = 2
+
+
+/datum/chemical_reaction/oil
+ name = "Oil"
+ id = "oil"
+ result = "oil"
+ required_reagents = list("fuel" = 1, "carbon" = 1, "hydrogen" = 1)
+ result_amount = 3
+
+/datum/chemical_reaction/phenol
+ name = "phenol"
+ id = "phenol"
+ result = "phenol"
+ required_reagents = list("water" = 1, "chlorine" = 1, "oil" = 1)
+ result_amount = 3
+
+/datum/chemical_reaction/ash
+ name = "Ash"
+ id = "ash"
+ result = "ash"
+ required_reagents = list("oil" = 1)
+ result_amount = 1
+ required_temp = 480
+
+/datum/chemical_reaction/colorful_reagent
+ name = "colorful_reagent"
+ id = "colorful_reagent"
+ result = "colorful_reagent"
+ required_reagents = list("stable_plasma" = 1, "radium" = 1, "space_drugs" = 1, "cryoxadone" = 1, "triple_citrus" = 1)
+ result_amount = 5
+
+/datum/chemical_reaction/life
+ name = "Life"
+ id = "life"
+ result = null
+ required_reagents = list("strange_reagent" = 1, "synthflesh" = 1, "blood" = 1)
+ result_amount = 1
+ required_temp = 374
+
+/datum/chemical_reaction/life/on_reaction(var/datum/reagents/holder, var/created_volume)
+ chemical_mob_spawn(holder, 1, "Life")
+
+/datum/chemical_reaction/corgium
+ name = "corgium"
+ id = "corgium"
+ result = null
+ required_reagents = list("nutriment" = 1, "colorful_reagent" = 1, "strange_reagent" = 1, "blood" = 1)
+ result_amount = 1
+ required_temp = 374
+
+/datum/chemical_reaction/corgium/on_reaction(var/datum/reagents/holder, var/created_volume)
+ var/location = get_turf(holder.my_atom)
+ new /mob/living/simple_animal/pet/corgi(location)
+ ..()
+
+/datum/chemical_reaction/hair_dye
+ name = "hair_dye"
+ id = "hair_dye"
+ result = "hair_dye"
+ required_reagents = list("colorful_reagent" = 1, "radium" = 1, "space_drugs" = 1)
+ result_amount = 5
+
+/datum/chemical_reaction/barbers_aid
+ name = "barbers_aid"
+ id = "barbers_aid"
+ result = "barbers_aid"
+ required_reagents = list("carpet" = 1, "radium" = 1, "space_drugs" = 1)
+ result_amount = 5
+
+/datum/chemical_reaction/concentrated_barbers_aid
+ name = "concentrated_barbers_aid"
+ id = "concentrated_barbers_aid"
+ result = "concentrated_barbers_aid"
+ required_reagents = list("barbers_aid" = 1, "mutagen" = 1)
+ result_amount = 2
+
+/datum/chemical_reaction/saltpetre
+ name = "saltpetre"
+ id = "saltpetre"
+ result = "saltpetre"
+ required_reagents = list("potassium" = 1, "nitrogen" = 1, "oxygen" = 3)
+ result_amount = 3
\ No newline at end of file
diff --git a/code/modules/reagents/Chemistry-Recipes/Pyrotechnics.dm b/code/modules/reagents/Chemistry-Recipes/Pyrotechnics.dm
new file mode 100644
index 00000000000..737f9bb5e92
--- /dev/null
+++ b/code/modules/reagents/Chemistry-Recipes/Pyrotechnics.dm
@@ -0,0 +1,353 @@
+
+/datum/chemical_reaction/nitroglycerin
+ name = "Nitroglycerin"
+ id = "nitroglycerin"
+ result = "nitroglycerin"
+ required_reagents = list("glycerol" = 1, "facid" = 1, "sacid" = 1)
+ result_amount = 2
+
+/datum/chemical_reaction/nitroglycerin/on_reaction(var/datum/reagents/holder, var/created_volume)
+ if(holder.has_reagent("stabilizing_agent"))
+ return
+ holder.remove_reagent("nitroglycerin", created_volume)
+ var/location = get_turf(holder.my_atom)
+ var/datum/effect/effect/system/reagents_explosion/e = new()
+ e.set_up(round (created_volume/2, 1), location, 0, 0)
+ e.start()
+ holder.clear_reagents()
+
+/datum/chemical_reaction/nitroglycerin_explosion
+ name = "Nitroglycerin explosion"
+ id = "nitroglycerin_explosion"
+ result = null
+ required_reagents = list("nitroglycerin" = 1)
+ result_amount = 1
+ required_temp = 474
+
+/datum/chemical_reaction/nitroglycerin_explosion/on_reaction(var/datum/reagents/holder, var/created_volume)
+ var/location = get_turf(holder.my_atom)
+ var/datum/effect/effect/system/reagents_explosion/e = new()
+ e.set_up(round(created_volume/2, 1), location, 0, 0)
+ e.start()
+ holder.clear_reagents()
+
+/datum/chemical_reaction/potassium_explosion
+ name = "Explosion"
+ id = "potassium_explosion"
+ result = null
+ required_reagents = list("water" = 1, "potassium" = 1)
+ result_amount = 2
+
+/datum/chemical_reaction/potassium_explosion/on_reaction(var/datum/reagents/holder, var/created_volume)
+ var/location = get_turf(holder.my_atom)
+ var/datum/effect/effect/system/reagents_explosion/e = new()
+ e.set_up(round (created_volume/10, 1), location, 0, 0)
+ e.start()
+ holder.clear_reagents()
+
+/datum/chemical_reaction/blackpowder
+ name = "Black Powder"
+ id = "blackpowder"
+ result = "blackpowder"
+ required_reagents = list("saltpetre" = 1, "charcoal" = 1, "sulfur" = 1)
+ result_amount = 3
+
+/datum/chemical_reaction/blackpowder_explosion
+ name = "Black Powder Kaboom"
+ id = "blackpowder_explosion"
+ result = null
+ required_reagents = list("blackpowder" = 1)
+ result_amount = 1
+ required_temp = 474
+ mix_message = "Sparks start flying around the black powder!"
+
+/datum/chemical_reaction/blackpowder_explosion/on_reaction(var/datum/reagents/holder, var/created_volume)
+ sleep(rand(50,100))
+ var/location = get_turf(holder.my_atom)
+ var/datum/effect/effect/system/reagents_explosion/e = new()
+ e.set_up(1 + round(created_volume/6, 1), location, 0, 0)
+ e.start()
+ holder.clear_reagents()
+
+/datum/chemical_reaction/thermite
+ name = "Thermite"
+ id = "thermite"
+ result = "thermite"
+ required_reagents = list("aluminium" = 1, "iron" = 1, "oxygen" = 1)
+ result_amount = 3
+
+/datum/chemical_reaction/emp_pulse
+ name = "EMP Pulse"
+ id = "emp_pulse"
+ result = null
+ required_reagents = list("uranium" = 1, "iron" = 1) // Yes, laugh, it's the best recipe I could think of that makes a little bit of sense
+ result_amount = 2
+
+/datum/chemical_reaction/emp_pulse/on_reaction(var/datum/reagents/holder, var/created_volume)
+ var/location = get_turf(holder.my_atom)
+ // 100 created volume = 4 heavy range & 7 light range. A few tiles smaller than traitor EMP grandes.
+ // 200 created volume = 8 heavy range & 14 light range. 4 tiles larger than traitor EMP grenades.
+ empulse(location, round(created_volume / 24), round(created_volume / 14), 1)
+ holder.clear_reagents()
+
+/datum/chemical_reaction/stabilizing_agent
+ name = "stabilizing_agent"
+ id = "stabilizing_agent"
+ result = "stabilizing_agent"
+ required_reagents = list("iron" = 1, "oxygen" = 1, "hydrogen" = 1)
+ result_amount = 3
+
+
+/datum/chemical_reaction/clf3
+ name = "Chlorine Trifluoride"
+ id = "clf3"
+ result = "clf3"
+ required_reagents = list("chlorine" = 1, "fluorine" = 3)
+ result_amount = 4
+ required_temp = 424
+
+/datum/chemical_reaction/clf3/on_reaction(var/datum/reagents/holder, var/created_volume)
+ var/turf/T = get_turf(holder.my_atom)
+ for(var/turf/turf in range(1,T))
+ new /obj/effect/hotspot(turf)
+ holder.chem_temp = 1000 // hot as shit
+
+/datum/chemical_reaction/sorium
+ name = "Sorium"
+ id = "sorium"
+ result = "sorium"
+ required_reagents = list("mercury" = 1, "oxygen" = 1, "nitrogen" = 1, "carbon" = 1)
+ result_amount = 4
+
+/datum/chemical_reaction/sorium/on_reaction(var/datum/reagents/holder, var/created_volume)
+ if(holder.has_reagent("stabilizing_agent"))
+ return
+ holder.remove_reagent("sorium", created_volume)
+ var/turf/simulated/T = get_turf(holder.my_atom)
+ goonchem_vortex(T, 1, 5, 6)
+
+/datum/chemical_reaction/sorium_vortex
+ name = "sorium_vortex"
+ id = "sorium_vortex"
+ result = null
+ required_reagents = list("sorium" = 1)
+ required_temp = 474
+
+/datum/chemical_reaction/sorium_vortex/on_reaction(var/datum/reagents/holder, var/created_volume)
+ var/turf/simulated/T = get_turf(holder.my_atom)
+ goonchem_vortex(T, 1, 5, 6)
+
+
+/datum/chemical_reaction/liquid_dark_matter
+ name = "Liquid Dark Matter"
+ id = "liquid_dark_matter"
+ result = "liquid_dark_matter"
+ required_reagents = list("stable_plasma" = 1, "radium" = 1, "carbon" = 1)
+ result_amount = 3
+
+/datum/chemical_reaction/liquid_dark_matter/on_reaction(var/datum/reagents/holder, var/created_volume)
+ if(holder.has_reagent("stabilizing_agent"))
+ return
+ holder.remove_reagent("liquid_dark_matter", created_volume)
+ var/turf/simulated/T = get_turf(holder.my_atom)
+ goonchem_vortex(T, 0, 5, 6)
+
+/datum/chemical_reaction/ldm_vortex
+ name = "LDM Vortex"
+ id = "ldm_vortex"
+ result = null
+ required_reagents = list("liquid_dark_matter" = 1)
+ required_temp = 474
+
+/datum/chemical_reaction/ldm_vortex/on_reaction(var/datum/reagents/holder, var/created_volume)
+ var/turf/simulated/T = get_turf(holder.my_atom)
+ goonchem_vortex(T, 0, 5, 6)
+
+/datum/chemical_reaction/flash_powder
+ name = "Flash powder"
+ id = "flash_powder"
+ result = "flash_powder"
+ required_reagents = list("aluminium" = 1, "potassium" = 1, "sulfur" = 1 )
+ result_amount = 3
+
+/datum/chemical_reaction/flash_powder/on_reaction(var/datum/reagents/holder, var/created_volume)
+ if(holder.has_reagent("stabilizing_agent"))
+ return
+ var/location = get_turf(holder.my_atom)
+ var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
+ s.set_up(2, 1, location)
+ s.start()
+ for(var/mob/living/carbon/C in get_hearers_in_view(created_volume/10, location))
+ if(C.flash_eyes())
+ if(get_dist(C, location) < 4)
+ C.Weaken(5)
+ else
+ C.Stun(5)
+ holder.remove_reagent("flash_powder", created_volume)
+
+/datum/chemical_reaction/flash_powder_flash
+ name = "Flash powder activation"
+ id = "flash_powder_flash"
+ result = null
+ required_reagents = list("flash_powder" = 1)
+ result_amount = 1
+ required_temp = 374
+
+/datum/chemical_reaction/flash_powder_flash/on_reaction(var/datum/reagents/holder, var/created_volume)
+ var/location = get_turf(holder.my_atom)
+ var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
+ s.set_up(2, 1, location)
+ s.start()
+ for(var/mob/living/carbon/C in get_hearers_in_view(created_volume/10, location))
+ if(C.flash_eyes())
+ if(get_dist(C, location) < 4)
+ C.Weaken(5)
+ else
+ C.Stun(5)
+
+/datum/chemical_reaction/smoke_powder
+ name = "smoke_powder"
+ id = "smoke_powder"
+ result = "smoke_powder"
+ required_reagents = list("potassium" = 1, "sugar" = 1, "phosphorus" = 1)
+ result_amount = 3
+
+/datum/chemical_reaction/smoke_powder/on_reaction(var/datum/reagents/holder, var/created_volume)
+ if(holder.has_reagent("stabilizing_agent"))
+ return
+ holder.remove_reagent("smoke_powder", created_volume)
+ var/location = get_turf(holder.my_atom)
+ var/datum/effect/effect/system/chem_smoke_spread/S = new /datum/effect/effect/system/chem_smoke_spread
+ S.attach(location)
+ playsound(location, 'sound/effects/smoke.ogg', 50, 1, -3)
+ spawn(0)
+ if(S)
+ S.set_up(holder, 10, 0, location)
+ S.start()
+ sleep(10)
+ S.start()
+ if(holder && holder.my_atom)
+ holder.clear_reagents()
+ return
+
+/datum/chemical_reaction/smoke_powder_smoke
+ name = "smoke_powder_smoke"
+ id = "smoke_powder_smoke"
+ result = null
+ required_reagents = list("smoke_powder" = 1)
+ required_temp = 374
+ result_amount = 1
+ secondary = 1
+ mob_react = 1
+
+/datum/chemical_reaction/smoke_powder_smoke/on_reaction(var/datum/reagents/holder, var/created_volume)
+ var/location = get_turf(holder.my_atom)
+ var/datum/effect/effect/system/chem_smoke_spread/S = new /datum/effect/effect/system/chem_smoke_spread
+ S.attach(location)
+ playsound(location, 'sound/effects/smoke.ogg', 50, 1, -3)
+ spawn(0)
+ if(S)
+ S.set_up(holder, 10, 0, location)
+ S.start()
+ sleep(10)
+ S.start()
+ if(holder && holder.my_atom)
+ holder.clear_reagents()
+ return
+
+
+/datum/chemical_reaction/sonic_powder
+ name = "sonic_powder"
+ id = "sonic_powder"
+ result = "sonic_powder"
+ required_reagents = list("oxygen" = 1, "cola" = 1, "phosphorus" = 1)
+ result_amount = 3
+
+/datum/chemical_reaction/sonic_powder/on_reaction(var/datum/reagents/holder, var/created_volume)
+ if(holder.has_reagent("stabilizing_agent"))
+ return
+ holder.remove_reagent("sonic_powder", created_volume)
+ var/location = get_turf(holder.my_atom)
+ playsound(location, 'sound/effects/bang.ogg', 25, 1)
+ for(var/mob/living/carbon/C in get_hearers_in_view(created_volume/10, location))
+ if(C.check_ear_prot())
+ continue
+ C.show_message("BANG", 2)
+ C.Stun(5)
+ C.Weaken(5)
+ C.setEarDamage(C.ear_damage + rand(0, 5), max(C.ear_deaf,15))
+ if(C.ear_damage >= 15)
+ C << "Your ears start to ring badly!"
+ else if(C.ear_damage >= 5)
+ C << "Your ears start to ring!"
+
+/datum/chemical_reaction/sonic_powder_deafen
+ name = "sonic_powder_deafen"
+ id = "sonic_powder_deafen"
+ result = null
+ required_reagents = list("sonic_powder" = 1)
+ required_temp = 374
+ result_amount = 1
+
+/datum/chemical_reaction/sonic_powder_deafen/on_reaction(var/datum/reagents/holder, var/created_volume)
+ var/location = get_turf(holder.my_atom)
+ playsound(location, 'sound/effects/bang.ogg', 25, 1)
+ for(var/mob/living/carbon/C in get_hearers_in_view(created_volume/10, location))
+ if(C.check_ear_prot())
+ continue
+ C.show_message("BANG", 2)
+ C.Stun(5)
+ C.Weaken(5)
+ C.setEarDamage(C.ear_damage + rand(0, 5), max(C.ear_deaf,15))
+ if(C.ear_damage >= 15)
+ C << "Your ears start to ring badly!"
+ else if(C.ear_damage >= 5)
+ C << "Your ears start to ring!"
+
+
+/datum/chemical_reaction/phlogiston
+ name = "phlogiston"
+ id = "phlogiston"
+ result = "phlogiston"
+ required_reagents = list("phosphorus" = 1, "sacid" = 1, "stable_plasma" = 1)
+ result_amount = 3
+
+/datum/chemical_reaction/phlogiston/on_reaction(var/datum/reagents/holder, var/created_volume)
+ if(holder.has_reagent("stabilizing_agent"))
+ return
+ var/turf/simulated/T = get_turf(holder.my_atom)
+ if(istype(T))
+ T.atmos_spawn_air(SPAWN_HEAT | SPAWN_TOXINS, created_volume)
+ return
+
+
+/datum/chemical_reaction/napalm
+ name = "Napalm"
+ id = "napalm"
+ result = "napalm"
+ required_reagents = list("sugar" = 1, "fuel" = 1, "ethanol" = 1 )
+ result_amount = 3
+
+
+/datum/chemical_reaction/cryostylane
+ name = "cryostylane"
+ id = "cryostylane"
+ result = "cryostylane"
+ required_reagents = list("water" = 1, "stable_plasma" = 1, "nitrogen" = 1)
+ result_amount = 3
+
+/datum/chemical_reaction/cryostylane/on_reaction(var/datum/reagents/holder, var/created_volume)
+ holder.chem_temp = 20 // cools the fuck down
+ return
+
+
+/datum/chemical_reaction/pyrosium
+ name = "pyrosium"
+ id = "pyrosium"
+ result = "pyrosium"
+ required_reagents = list("stable_plasma" = 1, "radium" = 1, "phosphorus" = 1)
+ result_amount = 3
+
+/datum/chemical_reaction/pyrosium/on_reaction(var/datum/reagents/holder, var/created_volume)
+ holder.chem_temp = 20 // also cools the fuck down
+ return
\ No newline at end of file
diff --git a/code/modules/reagents/Chemistry-Recipes/Slime_extracts.dm b/code/modules/reagents/Chemistry-Recipes/Slime_extracts.dm
new file mode 100644
index 00000000000..732d6c39b48
--- /dev/null
+++ b/code/modules/reagents/Chemistry-Recipes/Slime_extracts.dm
@@ -0,0 +1,548 @@
+
+//Grey
+/datum/chemical_reaction/slimespawn
+ name = "Slime Spawn"
+ id = "m_spawn"
+ result = null
+ required_reagents = list("plasma" = 1)
+ result_amount = 1
+ required_container = /obj/item/slime_extract/grey
+ required_other = 1
+
+/datum/chemical_reaction/slimespawn/on_reaction(var/datum/reagents/holder)
+ feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
+ for(var/mob/O in viewers(get_turf(holder.my_atom), null))
+ O.show_message(text("Infused with plasma, the core begins to quiver and grow, and soon a new baby slime emerges from it!"), 1)
+ var/mob/living/simple_animal/slime/S = new /mob/living/simple_animal/slime
+ S.loc = get_turf(holder.my_atom)
+
+/datum/chemical_reaction/slimeinaprov
+ name = "Slime epinephrine"
+ id = "m_inaprov"
+ result = "epinephrine"
+ required_reagents = list("water" = 5)
+ result_amount = 3
+ required_other = 1
+ required_container = /obj/item/slime_extract/grey
+
+/datum/chemical_reaction/slimeinaprov/on_reaction(var/datum/reagents/holder)
+ feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
+
+/datum/chemical_reaction/slimemonkey
+ name = "Slime Monkey"
+ id = "m_monkey"
+ result = null
+ required_reagents = list("blood" = 1)
+ result_amount = 1
+ required_container = /obj/item/slime_extract/grey
+ required_other = 1
+
+/datum/chemical_reaction/slimemonkey/on_reaction(var/datum/reagents/holder)
+ feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
+ for(var/i = 1, i <= 3, i++)
+ var /obj/item/weapon/reagent_containers/food/snacks/monkeycube/M = new /obj/item/weapon/reagent_containers/food/snacks/monkeycube
+ M.loc = get_turf(holder.my_atom)
+
+//Green
+/datum/chemical_reaction/slimemutate
+ name = "Mutation Toxin"
+ id = "mutationtoxin"
+ result = "mutationtoxin"
+ required_reagents = list("plasma" = 1)
+ result_amount = 1
+ required_other = 1
+ required_container = /obj/item/slime_extract/green
+
+/datum/chemical_reaction/slimemutate/on_reaction(var/datum/reagents/holder)
+ feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
+
+//Mutated Green
+/datum/chemical_reaction/slimemutate_unstable
+ name = "Unstable Mutation Toxin"
+ id = "unstablemutationtoxin"
+ result = "unstablemutationtoxin"
+ required_reagents = list("radium" = 1)
+ result_amount = 1
+ required_other = 1
+ required_container = /obj/item/slime_extract/green
+ mix_message = "The mixture rapidly expands and contracts, its appearance shifting into a sickening green."
+
+/datum/chemical_reaction/slimemutate_unstable/on_reaction(var/datum/reagents/holder)
+ feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
+
+//Metal
+/datum/chemical_reaction/slimemetal
+ name = "Slime Metal"
+ id = "m_metal"
+ result = null
+ required_reagents = list("plasma" = 1)
+ result_amount = 1
+ required_container = /obj/item/slime_extract/metal
+ required_other = 1
+
+/datum/chemical_reaction/slimemetal/on_reaction(var/datum/reagents/holder)
+ feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
+ var/obj/item/stack/sheet/metal/M = new /obj/item/stack/sheet/metal
+ M.amount = 15
+ M.loc = get_turf(holder.my_atom)
+ var/obj/item/stack/sheet/plasteel/P = new /obj/item/stack/sheet/plasteel
+ P.amount = 5
+ P.loc = get_turf(holder.my_atom)
+
+//Gold
+/datum/chemical_reaction/slimecrit
+ name = "Slime Crit"
+ id = "m_tele"
+ result = null
+ required_reagents = list("plasma" = 1)
+ result_amount = 1
+ required_container = /obj/item/slime_extract/gold
+ required_other = 1
+
+/datum/chemical_reaction/slimecrit/on_reaction(var/datum/reagents/holder)
+ feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
+ for(var/mob/O in viewers(get_turf(holder.my_atom), null))
+ O.show_message(text("The slime extract begins to vibrate violently !"), 1)
+ spawn(50)
+
+ chemical_mob_spawn(holder, 5, "Gold Slime")
+
+/datum/chemical_reaction/slimecritlesser
+ name = "Slime Crit Lesser"
+ id = "m_tele3"
+ result = null
+ required_reagents = list("blood" = 1)
+ result_amount = 1
+ required_container = /obj/item/slime_extract/gold
+ required_other = 1
+
+/datum/chemical_reaction/slimecritlesser/on_reaction(var/datum/reagents/holder)
+ feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
+ for(var/mob/O in viewers(get_turf(holder.my_atom), null))
+ O.show_message(text("The slime extract begins to vibrate violently !"), 1)
+ spawn(50)
+
+ chemical_mob_spawn(holder, 1, "Lesser Gold Slime", "neutral")
+
+//Silver
+/datum/chemical_reaction/slimebork
+ name = "Slime Bork"
+ id = "m_tele2"
+ result = null
+ required_reagents = list("plasma" = 1)
+ result_amount = 1
+ required_container = /obj/item/slime_extract/silver
+ required_other = 1
+
+/datum/chemical_reaction/slimebork/on_reaction(var/datum/reagents/holder)
+
+ feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
+ var/list/blocked = list(/obj/item/weapon/reagent_containers/food/snacks,
+ /obj/item/weapon/reagent_containers/food/snacks/store/bread,
+ /obj/item/weapon/reagent_containers/food/snacks/breadslice,
+ /obj/item/weapon/reagent_containers/food/snacks/store/cake,
+ /obj/item/weapon/reagent_containers/food/snacks/cakeslice,
+ /obj/item/weapon/reagent_containers/food/snacks/store,
+ /obj/item/weapon/reagent_containers/food/snacks/pie,
+ /obj/item/weapon/reagent_containers/food/snacks/kebab,
+ /obj/item/weapon/reagent_containers/food/snacks/pizza,
+ /obj/item/weapon/reagent_containers/food/snacks/pizzaslice,
+ /obj/item/weapon/reagent_containers/food/snacks/salad,
+ /obj/item/weapon/reagent_containers/food/snacks/meat,
+ /obj/item/weapon/reagent_containers/food/snacks/soup,
+ /obj/item/weapon/reagent_containers/food/snacks/grown,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom
+ )
+ blocked |= typesof(/obj/item/weapon/reagent_containers/food/snacks/customizable)
+
+ var/list/borks = typesof(/obj/item/weapon/reagent_containers/food/snacks) - blocked
+ // BORK BORK BORK
+
+ playsound(get_turf(holder.my_atom), 'sound/effects/phasein.ogg', 100, 1)
+
+ for(var/mob/living/carbon/human/M in viewers(get_turf(holder.my_atom), null))
+ M.flash_eyes()
+
+ for(var/i = 1, i <= 4 + rand(1,2), i++)
+ var/chosen = pick(borks)
+ var/obj/B = new chosen
+ if(B)
+ B.loc = get_turf(holder.my_atom)
+ if(prob(50))
+ for(var/j = 1, j <= rand(1, 3), j++)
+ step(B, pick(NORTH,SOUTH,EAST,WEST))
+
+
+/datum/chemical_reaction/slimebork2
+ name = "Slime Bork 2"
+ id = "m_tele4"
+ result = null
+ required_reagents = list("water" = 1)
+ result_amount = 1
+ required_container = /obj/item/slime_extract/silver
+ required_other = 1
+
+/datum/chemical_reaction/slimebork2/on_reaction(var/datum/reagents/holder)
+
+ feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
+
+ var/list/borks = typesof(/obj/item/weapon/reagent_containers/food/drinks) - /obj/item/weapon/reagent_containers/food/drinks
+ // BORK BORK BORK
+
+ playsound(get_turf(holder.my_atom), 'sound/effects/phasein.ogg', 100, 1)
+
+ for(var/mob/living/carbon/human/M in viewers(get_turf(holder.my_atom), null))
+ M.flash_eyes()
+
+ for(var/i = 1, i <= 4 + rand(1,2), i++)
+ var/chosen = pick(borks)
+ var/obj/B = new chosen
+ if(B)
+ B.loc = get_turf(holder.my_atom)
+ if(prob(50))
+ for(var/j = 1, j <= rand(1, 3), j++)
+ step(B, pick(NORTH,SOUTH,EAST,WEST))
+
+
+//Blue
+/datum/chemical_reaction/slimefrost
+ name = "Slime Frost Oil"
+ id = "m_frostoil"
+ result = "frostoil"
+ required_reagents = list("plasma" = 1)
+ result_amount = 10
+ required_container = /obj/item/slime_extract/blue
+ required_other = 1
+
+/datum/chemical_reaction/slimefrost/on_reaction(var/datum/reagents/holder)
+ feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
+
+//Dark Blue
+/datum/chemical_reaction/slimefreeze
+ name = "Slime Freeze"
+ id = "m_freeze"
+ result = null
+ required_reagents = list("plasma" = 1)
+ result_amount = 1
+ required_container = /obj/item/slime_extract/darkblue
+ required_other = 1
+
+/datum/chemical_reaction/slimefreeze/on_reaction(var/datum/reagents/holder)
+ feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
+ for(var/mob/O in viewers(get_turf(holder.my_atom), null))
+ O.show_message(text("The slime extract begins to vibrate violently !"), 1)
+ spawn(50)
+ if(holder && holder.my_atom)
+ playsound(get_turf(holder.my_atom), 'sound/effects/phasein.ogg', 100, 1)
+ for(var/mob/living/M in range (get_turf(holder.my_atom), 7))
+ M.bodytemperature -= 240
+ M << "You feel a chill!"
+
+//Orange
+/datum/chemical_reaction/slimecasp
+ name = "Slime Capsaicin Oil"
+ id = "m_capsaicinoil"
+ result = "capsaicin"
+ required_reagents = list("blood" = 1)
+ result_amount = 10
+ required_container = /obj/item/slime_extract/orange
+ required_other = 1
+
+/datum/chemical_reaction/slimecasp/on_reaction(var/datum/reagents/holder)
+ feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
+
+/datum/chemical_reaction/slimefire
+ name = "Slime fire"
+ id = "m_fire"
+ result = null
+ required_reagents = list("plasma" = 1)
+ result_amount = 1
+ required_container = /obj/item/slime_extract/orange
+ required_other = 1
+
+/datum/chemical_reaction/slimefire/on_reaction(var/datum/reagents/holder)
+ feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
+ for(var/mob/O in viewers(get_turf(holder.my_atom), null))
+ O.show_message(text("The slime extract begins to vibrate violently !"), 1)
+ spawn(50)
+ if(holder && holder.my_atom)
+ var/turf/simulated/T = get_turf(holder.my_atom)
+ if(istype(T))
+ T.atmos_spawn_air(SPAWN_HEAT | SPAWN_TOXINS, 50)
+
+//Yellow
+
+/datum/chemical_reaction/slimeoverload
+ name = "Slime EMP"
+ id = "m_emp"
+ result = null
+ required_reagents = list("blood" = 1)
+ result_amount = 1
+ required_container = /obj/item/slime_extract/yellow
+ required_other = 1
+
+/datum/chemical_reaction/slimeoverload/on_reaction(var/datum/reagents/holder, var/created_volume)
+ feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
+ empulse(get_turf(holder.my_atom), 3, 7)
+
+
+/datum/chemical_reaction/slimecell
+ name = "Slime Powercell"
+ id = "m_cell"
+ result = null
+ required_reagents = list("plasma" = 1)
+ result_amount = 1
+ required_container = /obj/item/slime_extract/yellow
+ required_other = 1
+
+/datum/chemical_reaction/slimecell/on_reaction(var/datum/reagents/holder, var/created_volume)
+ feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
+ var/obj/item/weapon/stock_parts/cell/high/slime/P = new /obj/item/weapon/stock_parts/cell/high/slime
+ P.loc = get_turf(holder.my_atom)
+
+/datum/chemical_reaction/slimeglow
+ name = "Slime Glow"
+ id = "m_glow"
+ result = null
+ required_reagents = list("water" = 1)
+ result_amount = 1
+ required_container = /obj/item/slime_extract/yellow
+ required_other = 1
+
+/datum/chemical_reaction/slimeglow/on_reaction(var/datum/reagents/holder)
+ feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
+ for(var/mob/O in viewers(get_turf(holder.my_atom), null))
+ O.show_message(text("The slime begins to emit a soft light. Squeezing it will cause it to grow brightly."), 1)
+ var/obj/item/device/flashlight/slime/F = new /obj/item/device/flashlight/slime
+ F.loc = get_turf(holder.my_atom)
+
+//Purple
+
+/datum/chemical_reaction/slimepsteroid
+ name = "Slime Steroid"
+ id = "m_steroid"
+ result = null
+ required_reagents = list("plasma" = 1)
+ result_amount = 1
+ required_container = /obj/item/slime_extract/purple
+ required_other = 1
+
+/datum/chemical_reaction/slimepsteroid/on_reaction(var/datum/reagents/holder)
+ feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
+ var/obj/item/weapon/slimesteroid/P = new /obj/item/weapon/slimesteroid
+ P.loc = get_turf(holder.my_atom)
+
+/datum/chemical_reaction/slimejam
+ name = "Slime Jam"
+ id = "m_jam"
+ result = "slimejelly"
+ required_reagents = list("sugar" = 1)
+ result_amount = 10
+ required_container = /obj/item/slime_extract/purple
+ required_other = 1
+
+/datum/chemical_reaction/slimejam/on_reaction(var/datum/reagents/holder)
+ feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
+
+
+//Dark Purple
+/datum/chemical_reaction/slimeplasma
+ name = "Slime Plasma"
+ id = "m_plasma"
+ result = null
+ required_reagents = list("plasma" = 1)
+ result_amount = 1
+ required_container = /obj/item/slime_extract/darkpurple
+ required_other = 1
+
+/datum/chemical_reaction/slimeplasma/on_reaction(var/datum/reagents/holder)
+ feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
+ var/obj/item/stack/sheet/mineral/plasma/P = new /obj/item/stack/sheet/mineral/plasma
+ P.amount = 10
+ P.loc = get_turf(holder.my_atom)
+
+//Red
+/datum/chemical_reaction/slimeglycerol
+ name = "Slime Glycerol"
+ id = "m_glycerol"
+ result = "glycerol"
+ required_reagents = list("plasma" = 1)
+ result_amount = 8
+ required_container = /obj/item/slime_extract/red
+ required_other = 1
+
+/datum/chemical_reaction/slimeglycerol/on_reaction(var/datum/reagents/holder)
+ feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
+
+
+/datum/chemical_reaction/slimebloodlust
+ name = "Bloodlust"
+ id = "m_bloodlust"
+ result = null
+ required_reagents = list("blood" = 1)
+ result_amount = 1
+ required_container = /obj/item/slime_extract/red
+ required_other = 1
+
+/datum/chemical_reaction/slimebloodlust/on_reaction(var/datum/reagents/holder)
+ feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
+ for(var/mob/living/simple_animal/slime/slime in viewers(get_turf(holder.my_atom), null))
+ slime.rabid = 1
+ for(var/mob/O in viewers(get_turf(holder.my_atom), null))
+ O.show_message(text("The [slime] is driven into a frenzy!"), 1)
+
+//Pink
+/datum/chemical_reaction/slimeppotion
+ name = "Slime Potion"
+ id = "m_potion"
+ result = null
+ required_reagents = list("plasma" = 1)
+ result_amount = 1
+ required_container = /obj/item/slime_extract/pink
+ required_other = 1
+
+/datum/chemical_reaction/slimeppotion/on_reaction(var/datum/reagents/holder)
+ feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
+ var/obj/item/slimepotion/P = new /obj/item/slimepotion
+ P.loc = get_turf(holder.my_atom)
+
+
+//Black
+/datum/chemical_reaction/slimemutate2
+ name = "Advanced Mutation Toxin"
+ id = "mutationtoxin2"
+ result = "amutationtoxin"
+ required_reagents = list("plasma" = 1)
+ result_amount = 1
+ required_other = 1
+ required_container = /obj/item/slime_extract/black
+
+/datum/chemical_reaction/slimemutate2/on_reaction(var/datum/reagents/holder)
+ feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
+
+//Oil
+/datum/chemical_reaction/slimeexplosion
+ name = "Slime Explosion"
+ id = "m_explosion"
+ result = null
+ required_reagents = list("plasma" = 1)
+ result_amount = 1
+ required_container = /obj/item/slime_extract/oil
+ required_other = 1
+
+/datum/chemical_reaction/slimeexplosion/on_reaction(var/datum/reagents/holder)
+ feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
+ for(var/mob/O in viewers(get_turf(holder.my_atom), null))
+ O.show_message(text("The slime extract begins to vibrate violently !"), 1)
+ spawn(50)
+ if(holder && holder.my_atom)
+ explosion(get_turf(holder.my_atom), 1 ,3, 6)
+
+//Light Pink
+/datum/chemical_reaction/slimepotion2
+ name = "Slime Potion 2"
+ id = "m_potion2"
+ result = null
+ result_amount = 1
+ required_container = /obj/item/slime_extract/lightpink
+ required_reagents = list("plasma" = 1)
+ required_other = 1
+
+/datum/chemical_reaction/slimepotion2/on_reaction(var/datum/reagents/holder)
+ feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
+ var/obj/item/slimepotion2/P = new /obj/item/slimepotion2
+ P.loc = get_turf(holder.my_atom)
+
+//Adamantine
+/datum/chemical_reaction/slimegolem
+ name = "Slime Golem"
+ id = "m_golem"
+ result = null
+ required_reagents = list("plasma" = 1)
+ result_amount = 1
+ required_container = /obj/item/slime_extract/adamantine
+ required_other = 1
+
+/datum/chemical_reaction/slimegolem/on_reaction(var/datum/reagents/holder)
+ feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
+ var/obj/effect/golemrune/Z = new /obj/effect/golemrune
+ Z.loc = get_turf(holder.my_atom)
+ notify_ghosts("Golem rune created in [get_area(Z)].", 'sound/effects/ghost2.ogg')
+
+//Bluespace
+/datum/chemical_reaction/slimecrystal
+ name = "Slime Crystal"
+ id = "m_crystal"
+ result = null
+ required_reagents = list("blood" = 1)
+ result_amount = 1
+ required_container = /obj/item/slime_extract/bluespace
+ required_other = 1
+
+/datum/chemical_reaction/slimecrystal/on_reaction(var/datum/reagents/holder, var/created_volume)
+ feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
+ if(holder.my_atom)
+ var/obj/item/bluespace_crystal/BC = new(get_turf(holder.my_atom))
+ BC.visible_message("The [BC.name] appears out of thin air!")
+
+//Cerulean
+/datum/chemical_reaction/slimepsteroid2
+ name = "Slime Steroid 2"
+ id = "m_steroid2"
+ result = null
+ required_reagents = list("plasma" = 1)
+ result_amount = 1
+ required_container = /obj/item/slime_extract/cerulean
+ required_other = 1
+
+/datum/chemical_reaction/slimepsteroid2/on_reaction(var/datum/reagents/holder)
+ feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
+ var/obj/item/weapon/slimesteroid2/P = new /obj/item/weapon/slimesteroid2
+ P.loc = get_turf(holder.my_atom)
+
+//Sepia
+/datum/chemical_reaction/slimecamera
+ name = "Slime Camera"
+ id = "m_camera"
+ result = null
+ required_reagents = list("plasma" = 1)
+ result_amount = 1
+ required_container = /obj/item/slime_extract/sepia
+ required_other = 1
+
+/datum/chemical_reaction/slimecamera/on_reaction(var/datum/reagents/holder)
+ feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
+ var/obj/item/device/camera/P = new /obj/item/device/camera
+ P.loc = get_turf(holder.my_atom)
+
+/datum/chemical_reaction/slimefilm
+ name = "Slime Film"
+ id = "m_film"
+ result = null
+ required_reagents = list("blood" = 1)
+ result_amount = 1
+ required_container = /obj/item/slime_extract/sepia
+ required_other = 1
+
+/datum/chemical_reaction/slimefilm/on_reaction(var/datum/reagents/holder)
+ feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
+ var/obj/item/device/camera_film/P = new /obj/item/device/camera_film
+ P.loc = get_turf(holder.my_atom)
+
+//Pyrite
+/datum/chemical_reaction/slimepaint
+ name = "Slime Paint"
+ id = "s_paint"
+ result = null
+ required_reagents = list("plasma" = 1)
+ result_amount = 1
+ required_container = /obj/item/slime_extract/pyrite
+ required_other = 1
+
+/datum/chemical_reaction/slimepaint/on_reaction(var/datum/reagents/holder)
+ feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
+ var/list/paints = typesof(/obj/item/weapon/paint) - /obj/item/weapon/paint
+ var/chosen = pick(paints)
+ var/obj/P = new chosen
+ if(P)
+ P.loc = get_turf(holder.my_atom)
\ No newline at end of file
diff --git a/code/modules/reagents/Chemistry-Recipes/Toxins.dm b/code/modules/reagents/Chemistry-Recipes/Toxins.dm
new file mode 100644
index 00000000000..95f2a28507a
--- /dev/null
+++ b/code/modules/reagents/Chemistry-Recipes/Toxins.dm
@@ -0,0 +1,95 @@
+
+/datum/chemical_reaction/formaldehyde
+ name = "formaldehyde"
+ id = "Formaldehyde"
+ result = "formaldehyde"
+ required_reagents = list("ethanol" = 1, "oxygen" = 1, "silver" = 1)
+ result_amount = 3
+ required_temp = 420
+
+/datum/chemical_reaction/neurotoxin2
+ name = "neurotoxin2"
+ id = "neurotoxin2"
+ result = "neurotoxin2"
+ required_reagents = list("space_drugs" = 1)
+ result_amount = 1
+ required_temp = 674
+
+/datum/chemical_reaction/cyanide
+ name = "Cyanide"
+ id = "cyanide"
+ result = "cyanide"
+ required_reagents = list("oil" = 1, "ammonia" = 1, "oxygen" = 1)
+ result_amount = 3
+ required_temp = 380
+
+/datum/chemical_reaction/itching_powder
+ name = "Itching Powder"
+ id = "itching_powder"
+ result = "itching_powder"
+ required_reagents = list("fuel" = 1, "ammonia" = 1, "charcoal" = 1)
+ result_amount = 3
+
+/datum/chemical_reaction/facid
+ name = "Fluorosulfuric acid"
+ id = "facid"
+ result = "facid"
+ required_reagents = list("sacid" = 1, "fluorine" = 1, "hydrogen" = 1, "potassium" = 1)
+ result_amount = 4
+ required_temp = 380
+
+/datum/chemical_reaction/sulfonal
+ name = "sulfonal"
+ id = "sulfonal"
+ result = "sulfonal"
+ required_reagents = list("acetone" = 1, "diethylamine" = 1, "sulfur" = 1)
+ result_amount = 3
+
+/datum/chemical_reaction/lipolicide
+ name = "lipolicide"
+ id = "lipolicide"
+ result = "lipolicide"
+ required_reagents = list("mercury" = 1, "diethylamine" = 1, "ephedrine" = 1)
+ result_amount = 3
+
+/datum/chemical_reaction/mutagen
+ name = "Unstable mutagen"
+ id = "mutagen"
+ result = "mutagen"
+ required_reagents = list("radium" = 1, "phosphorus" = 1, "chlorine" = 1)
+ result_amount = 3
+
+/datum/chemical_reaction/lexorin
+ name = "Lexorin"
+ id = "lexorin"
+ result = "lexorin"
+ required_reagents = list("plasma" = 1, "hydrogen" = 1, "nitrogen" = 1)
+ result_amount = 3
+
+/datum/chemical_reaction/chloralhydrate
+ name = "Chloral Hydrate"
+ id = "chloralhydrate"
+ result = "chloralhydrate"
+ required_reagents = list("ethanol" = 1, "chlorine" = 3, "water" = 1)
+ result_amount = 1
+
+/datum/chemical_reaction/mutetoxin //i'll just fit this in here snugly between other unfun chemicals :v
+ name = "Mute toxin"
+ id = "mutetoxin"
+ result = "mutetoxin"
+ required_reagents = list("uranium" = 2, "water" = 1, "carbon" = 1)
+ result_amount = 2
+
+/datum/chemical_reaction/zombiepowder
+ name = "Zombie Powder"
+ id = "zombiepowder"
+ result = "zombiepowder"
+ required_reagents = list("carpotoxin" = 5, "morphine" = 5, "copper" = 5)
+ result_amount = 2
+
+/datum/chemical_reaction/mindbreaker
+ name = "Mindbreaker Toxin"
+ id = "mindbreaker"
+ result = "mindbreaker"
+ required_reagents = list("silicon" = 1, "hydrogen" = 1, "charcoal" = 1)
+ result_amount = 5
\ No newline at end of file
diff --git a/code/modules/reagents/grenade_launcher.dm b/code/modules/reagents/grenade_launcher.dm
index 0ae8523e6f8..f3bd6bbea87 100644
--- a/code/modules/reagents/grenade_launcher.dm
+++ b/code/modules/reagents/grenade_launcher.dm
@@ -1,61 +1,61 @@
-/obj/item/weapon/gun/grenadelauncher
- name = "grenade launcher"
- desc = "a terrible, terrible thing. it's really awful!"
- icon = 'icons/obj/guns/projectile.dmi'
- icon_state = "riotgun"
- item_state = "riotgun"
- w_class = 4.0
- throw_speed = 2
- throw_range = 7
- force = 5.0
- var/list/grenades = new/list()
- var/max_grenades = 3
- m_amt = 2000
-
-/obj/item/weapon/gun/grenadelauncher/examine(mob/user)
- ..()
- user << "[grenades] / [max_grenades] grenades loaded."
-
-/obj/item/weapon/gun/grenadelauncher/attackby(obj/item/I as obj, mob/user as mob, params)
-
- if((istype(I, /obj/item/weapon/grenade)))
- if(grenades.len < max_grenades)
- user.drop_item()
- I.loc = src
- grenades += I
- user << "You put the grenade in the grenade launcher."
- user << "[grenades.len] / [max_grenades] Grenades."
- else
- usr << "The grenade launcher cannot hold more grenades."
-
-/obj/item/weapon/gun/grenadelauncher/afterattack(obj/target, mob/user , flag)
-
- if (istype(target, /obj/item/weapon/storage/backpack ))
- return
-
- else if (locate (/obj/structure/table, src.loc))
- return
-
- else if(target == user)
- return
-
- if(grenades.len)
- spawn(0) fire_grenade(target,user)
- else
- usr << "The grenade launcher is empty."
-
-/obj/item/weapon/gun/grenadelauncher/proc/fire_grenade(atom/target, mob/user)
- for(var/mob/O in viewers(world.view, user))
- O.show_message(text("[] fired a grenade!", user), 1)
- user << "You fire the grenade launcher!"
- var/obj/item/weapon/grenade/chem_grenade/F = grenades[1] //Now with less copypasta!
- grenades -= F
- F.loc = user.loc
- F.throw_at(target, 30, 2)
- message_admins("[key_name_admin(user)] fired a grenade ([F.name]) from a grenade launcher ([src.name]).")
- log_game("[key_name(user)] fired a grenade ([F.name]) from a grenade launcher ([src.name]).")
- F.active = 1
- F.icon_state = initial(icon_state) + "_active"
- playsound(user.loc, 'sound/weapons/armbomb.ogg', 75, 1, -3)
- spawn(15)
- F.prime()
+/obj/item/weapon/gun/grenadelauncher
+ name = "grenade launcher"
+ desc = "a terrible, terrible thing. it's really awful!"
+ icon = 'icons/obj/guns/projectile.dmi'
+ icon_state = "riotgun"
+ item_state = "riotgun"
+ w_class = 4.0
+ throw_speed = 2
+ throw_range = 7
+ force = 5.0
+ var/list/grenades = new/list()
+ var/max_grenades = 3
+ m_amt = 2000
+
+/obj/item/weapon/gun/grenadelauncher/examine(mob/user)
+ ..()
+ user << "[grenades] / [max_grenades] grenades loaded."
+
+/obj/item/weapon/gun/grenadelauncher/attackby(obj/item/I as obj, mob/user as mob, params)
+
+ if((istype(I, /obj/item/weapon/grenade)))
+ if(grenades.len < max_grenades)
+ user.drop_item()
+ I.loc = src
+ grenades += I
+ user << "You put the grenade in the grenade launcher."
+ user << "[grenades.len] / [max_grenades] Grenades."
+ else
+ usr << "The grenade launcher cannot hold more grenades!"
+
+/obj/item/weapon/gun/grenadelauncher/afterattack(obj/target, mob/user , flag)
+
+ if (istype(target, /obj/item/weapon/storage/backpack ))
+ return
+
+ else if (locate (/obj/structure/table, src.loc))
+ return
+
+ else if(target == user)
+ return
+
+ if(grenades.len)
+ spawn(0) fire_grenade(target,user)
+ else
+ usr << "The grenade launcher is empty!"
+
+/obj/item/weapon/gun/grenadelauncher/proc/fire_grenade(atom/target, mob/user)
+ for(var/mob/O in viewers(world.view, user))
+ O.show_message(text("[] fired a grenade!", user), 1)
+ user << "You fire the grenade launcher!"
+ var/obj/item/weapon/grenade/chem_grenade/F = grenades[1] //Now with less copypasta!
+ grenades -= F
+ F.loc = user.loc
+ F.throw_at(target, 30, 2)
+ message_admins("[key_name_admin(user)] fired a grenade ([F.name]) from a grenade launcher ([src.name]).")
+ log_game("[key_name(user)] fired a grenade ([F.name]) from a grenade launcher ([src.name]).")
+ F.active = 1
+ F.icon_state = initial(icon_state) + "_active"
+ playsound(user.loc, 'sound/weapons/armbomb.ogg', 75, 1, -3)
+ spawn(15)
+ F.prime()
diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm
index ab4fd76f5ac..a938b092061 100644
--- a/code/modules/reagents/reagent_containers.dm
+++ b/code/modules/reagents/reagent_containers.dm
@@ -54,28 +54,18 @@
else return "No reagents"
/obj/item/weapon/reagent_containers/proc/canconsume(mob/eater, mob/user)
- if(!eater.SpeciesCanConsume())
+ if(!iscarbon(eater))
+ return 0
+ var/mob/living/carbon/C = eater
+ var/covered = ""
+ if(C.is_mouth_covered(head_only = 1))
+ covered = "headgear"
+ else if(C.is_mouth_covered(mask_only = 1))
+ covered = "mask"
+ if(covered)
+ var/who = (isnull(user) || eater == user) ? "your" : "their"
+ user << "You have to remove [who] [covered] first!"
return 0
- //Check for covering mask
- var/obj/item/clothing/cover = eater.get_item_by_slot(slot_wear_mask)
-
- if(isnull(cover)) // No mask, do we have any helmet?
- cover = eater.get_item_by_slot(slot_head)
- else
- var/obj/item/clothing/mask/covermask = cover
- if(covermask.alloweat) // Specific cases, clownmask for example.
- return 1
-
- if(!isnull(cover))
- if((cover.flags & HEADCOVERSMOUTH) || (cover.flags & MASKCOVERSMOUTH))
- var/who = (isnull(user) || eater == user) ? "your" : "their"
-
- if(istype(cover, /obj/item/clothing/mask/))
- user << "You have to remove [who] mask first!"
- else
- user << "You have to remove [who] helmet first!"
-
- return 0
return 1
/obj/item/weapon/reagent_containers/ex_act()
diff --git a/code/modules/reagents/reagent_containers/borghydro.dm b/code/modules/reagents/reagent_containers/borghydro.dm
index 7e2e63aba62..f4304ba596a 100644
--- a/code/modules/reagents/reagent_containers/borghydro.dm
+++ b/code/modules/reagents/reagent_containers/borghydro.dm
@@ -123,7 +123,7 @@ Borg Hypospray
empty = 0
if(empty)
- usr << "It is currently empty. Allow some time for the internal syntheszier to produce more."
+ usr << "It is currently empty! Allow some time for the internal syntheszier to produce more."
/*
Borg Shaker
*/
@@ -167,7 +167,7 @@ Borg Shaker
else if(target.is_open_container() && target.reagents)
var/datum/reagents/R = reagent_list[mode]
if(!R.total_volume)
- user << "[src] is currently out of this ingredient. Please allow some time for the synthesizer to produce more."
+ user << "[src] is currently out of this ingredient! Please allow some time for the synthesizer to produce more."
return
if(target.reagents.total_volume >= target.reagents.maximum_volume)
@@ -187,7 +187,7 @@ Borg Shaker
empty = 0
if(empty)
- usr << "It is currently empty. Please allow some time for the synthesizer to produce more."
+ usr << "It is currently empty! Please allow some time for the synthesizer to produce more."
/obj/item/weapon/reagent_containers/borghypo/borgshaker/hacked
..()
diff --git a/code/modules/reagents/reagent_containers/dropper.dm b/code/modules/reagents/reagent_containers/dropper.dm
index bba70ba32b1..8a8f5f1728b 100644
--- a/code/modules/reagents/reagent_containers/dropper.dm
+++ b/code/modules/reagents/reagent_containers/dropper.dm
@@ -17,7 +17,7 @@
return
if(!target.is_open_container() && !ismob(target) && !istype(target,/obj/item/weapon/reagent_containers/food) && !istype(target, /obj/item/clothing/mask/cigarette)) //You can inject humans and food but you cant remove the shit.
- user << "You cannot directly fill [target]."
+ user << "You cannot directly fill [target]!"
return
var/trans = 0
@@ -73,7 +73,7 @@
return
if(!target.reagents.total_volume)
- user << "[target] is empty."
+ user << "[target] is empty!"
return
var/trans = target.reagents.trans_to(src, amount_per_transfer_from_this)
diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm
index aa31cb5e0a1..8cf1fb79d65 100644
--- a/code/modules/reagents/reagent_containers/glass.dm
+++ b/code/modules/reagents/reagent_containers/glass.dm
@@ -50,7 +50,7 @@
else if(istype(target, /obj/structure/reagent_dispensers)) //A dispenser. Transfer FROM it TO us.
if(target.reagents && !target.reagents.total_volume)
- user << "[target] is empty and can't be refilled."
+ user << "[target] is empty and can't be refilled!"
return
if(reagents.total_volume >= reagents.maximum_volume)
@@ -62,7 +62,7 @@
else if(target.is_open_container() && target.reagents) //Something like a glass. Player probably wants to transfer TO it.
if(!reagents.total_volume)
- user << "[src] is empty."
+ user << "[src] is empty!"
return
if(target.reagents.total_volume >= target.reagents.maximum_volume)
@@ -90,12 +90,7 @@
else if(reagents.total_volume)
user << "You splash the solution onto [target]."
reagents.reaction(target, TOUCH)
- if(istype(target, /turf/simulated/floor))
- var/obj/effect/decal/cleanable/reagentdecal = new/obj/effect/decal/cleanable/chem_pile(target)
- reagents.trans_to(reagentdecal, volume)
- reagentdecal.color = mix_color_from_reagents(reagentdecal.reagents.reagent_list)
- else
- reagents.clear_reagents()
+ reagents.clear_reagents()
/obj/item/weapon/reagent_containers/glass/attackby(var/obj/item/I, mob/user as mob, params)
if(istype(I, /obj/item/clothing/mask/cigarette)) //ciggies are weird
@@ -109,7 +104,7 @@
user << "You heat [src] with [I]."
reagents.handle_reactions()
else
- user << "[src] is already hotter than [I]."
+ user << "[src] is already hotter than [I]!"
if(istype(I,/obj/item/weapon/reagent_containers/food/snacks/egg)) //breaking eggs
var/obj/item/weapon/reagent_containers/food/snacks/egg/E = I
diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm
index 16b8d2a05d2..b6da840f2cf 100644
--- a/code/modules/reagents/reagent_containers/hypospray.dm
+++ b/code/modules/reagents/reagent_containers/hypospray.dm
@@ -16,7 +16,7 @@
/obj/item/weapon/reagent_containers/hypospray/attack(mob/living/M, mob/user)
if(!reagents.total_volume)
- user << "[src] is empty."
+ user << "[src] is empty!"
return
if(!istype(M))
return
@@ -93,7 +93,7 @@
/obj/item/weapon/reagent_containers/hypospray/medipen/stimpack //goliath kiting
name = "stimpack medipen"
- desc = "A rapid way to stimulate your body's adrenaline, allowing for freer movement in restrictive armor as well as a ."
+ desc = "A rapid way to stimulate your body's adrenaline, allowing for freer movement in restrictive armor."
icon_state = "stimpen"
volume = 20
amount_per_transfer_from_this = 20
diff --git a/code/modules/reagents/reagent_containers/patch.dm b/code/modules/reagents/reagent_containers/patch.dm
index e524f00a9b3..f87d3682a7c 100644
--- a/code/modules/reagents/reagent_containers/patch.dm
+++ b/code/modules/reagents/reagent_containers/patch.dm
@@ -17,7 +17,7 @@
return // thanks inheritance again
/obj/item/weapon/reagent_containers/pill/patch/canconsume(mob/eater, mob/user)
- if(!eater.SpeciesCanConsume())
+ if(!iscarbon(eater))
return 0
return 1 // Masks were stopping people from "eating" patches. Thanks, inheritance.
diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm
index e663258acc7..4520bb48afb 100644
--- a/code/modules/reagents/reagent_containers/pill.dm
+++ b/code/modules/reagents/reagent_containers/pill.dm
@@ -59,11 +59,11 @@
if(!proximity) return
if(target.is_open_container() != 0 && target.reagents)
if(!target.reagents.total_volume)
- user << "[target] is empty. There's nothing to dissolve [src] in."
+ user << "[target] is empty! There's nothing to dissolve [src] in."
return
user << "You dissolve [src] in [target]."
for(var/mob/O in viewers(2, user)) //viewers is necessary here because of the small radius
- O << "[user] slips something into [target]."
+ O << "[user] slips something into [target]!"
reagents.trans_to(target, reagents.total_volume)
spawn(5)
qdel(src)
@@ -96,7 +96,7 @@
name = "stimulant pill"
desc = "Often taken by overworked employees, athletes, and the inebriated. You'll snap to attention immediately!"
icon_state = "pill19"
- list_reagents = list("ephedrine" = 10, "ethylredoxrazine" = 10, "coffee" = 30)
+ list_reagents = list("ephedrine" = 10, "antihol" = 10, "coffee" = 30)
roundstart = 1
/obj/item/weapon/reagent_containers/pill/salbutamol
name = "salbutamol pill"
@@ -140,4 +140,4 @@
desc = "Handles hyperglycaemic coma."
icon_state = "pill5"
list_reagents = list("insulin" = 50)
- roundstart = 1
\ No newline at end of file
+ roundstart = 1
diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm
index 43484c7cc4b..edfce7a4595 100644
--- a/code/modules/reagents/reagent_containers/spray.dm
+++ b/code/modules/reagents/reagent_containers/spray.dm
@@ -40,7 +40,7 @@
return
if(reagents.total_volume < amount_per_transfer_from_this)
- user << "\The [src] is empty!"
+ user << "\The [src] is empty!"
return
spray(A)
diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm
index 8c14b5d5b77..9d7988c289e 100644
--- a/code/modules/reagents/reagent_containers/syringes.dm
+++ b/code/modules/reagents/reagent_containers/syringes.dm
@@ -69,19 +69,19 @@
var/mob/living/carbon/human/H = target
if(H.dna)
if(NOBLOOD in H.dna.species.specflags && !H.dna.species.exotic_blood)
- user << "You are unable to locate any blood."
+ user << "You are unable to locate any blood!"
return
if(reagents.has_reagent("blood"))
- user << "There is already a blood sample in this syringe."
+ 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/amount = src.reagents.maximum_volume - src.reagents.total_volume
var/mob/living/carbon/T = target
if(!check_dna_integrity(T))
- user << "You are unable to locate any blood."
+ user << "You are unable to locate any blood!"
return
if(NOCLONE in T.mutations) //target done been eat, no more blood in him
- user << "You are unable to locate any blood."
+ user << "You are unable to locate any blood!"
return
if(target != user)
target.visible_message("[user] is trying to take a blood sample from [target]!", \
@@ -99,22 +99,22 @@
if(H.dna && H.dna.species.exotic_blood && H.reagents.total_volume)
target.reagents.trans_to(src, amount)
else
- user << "You are unable to locate any blood."
+ user << "You are unable to locate any blood!"
return
if (B)
src.reagents.reagent_list += B
src.reagents.update_total()
src.on_reagent_change()
src.reagents.handle_reactions()
- user.visible_message("[user] takes a blood sample from [target].")
+ user.visible_message("[user] takes a blood sample from [target].")
else //if not mob
if(!target.reagents.total_volume)
- user << "[target] is empty."
+ user << "[target] is empty!"
return
if(!target.is_open_container() && !istype(target,/obj/structure/reagent_dispensers) && !istype(target,/obj/item/slime_extract))
- user << "You cannot directly remove reagents from [target]."
+ user << "You cannot directly remove reagents from [target]!"
return
var/trans = target.reagents.trans_to(src, amount_per_transfer_from_this) // transfer from, transfer to - who cares?
@@ -132,7 +132,7 @@
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))
- user << "You cannot directly fill [target]."
+ user << "You cannot directly fill [target]!"
return
if(target.reagents.total_volume >= target.reagents.maximum_volume)
user << "[target] is full."
diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm
index 5c2928a6556..ab72b62f722 100644
--- a/code/modules/reagents/reagent_dispenser.dm
+++ b/code/modules/reagents/reagent_dispenser.dm
@@ -149,11 +149,11 @@
if((!istype(user)) || (user.stat))
return
if(cups <= 0)
- user << "What? No cups?"
+ user << "No cups left!"
return
cups--
user.put_in_hands(new /obj/item/weapon/reagent_containers/food/drinks/sillycup)
- user.visible_message("[user] gets a cup from [src].","You get a cup from [src].")
+ user.visible_message("[user] gets a cup from [src].","You get a cup from [src].")
/obj/structure/reagent_dispensers/water_cooler/attackby(var/obj/item/I, var/mob/user, params)
if(istype(I, /obj/item/weapon/paper))
diff --git a/code/modules/reagents/syringe_gun.dm b/code/modules/reagents/syringe_gun.dm
index 3786555a0e8..5c6327abcfa 100644
--- a/code/modules/reagents/syringe_gun.dm
+++ b/code/modules/reagents/syringe_gun.dm
@@ -1,77 +1,77 @@
-/obj/item/weapon/gun/syringe
- name = "syringe gun"
- desc = "A spring loaded rifle designed to fit syringes, used to incapacitate unruly patients from a distance."
- icon_state = "syringegun"
- item_state = "syringegun"
- w_class = 3
- throw_speed = 3
- throw_range = 7
- force = 4
- m_amt = 2000
- clumsy_check = 0
- fire_sound = 'sound/items/syringeproj.ogg'
- var/list/syringes = list()
- var/max_syringes = 1
-
-/obj/item/weapon/gun/syringe/New()
- ..()
- chambered = new /obj/item/ammo_casing/syringegun(src)
-
-/obj/item/weapon/gun/syringe/proc/newshot()
- if(!syringes.len) return
-
- var/obj/item/weapon/reagent_containers/syringe/S = syringes[1]
-
- if(!S) return
-
- chambered.BB = new /obj/item/projectile/bullet/dart/syringe(src)
- S.reagents.trans_to(chambered.BB, S.reagents.total_volume)
- chambered.BB.name = S.name
- syringes.Remove(S)
-
- qdel(S)
- return
-
-/obj/item/weapon/gun/syringe/process_chamber()
- return
-
-/obj/item/weapon/gun/syringe/afterattack(atom/target as mob|obj|turf, mob/living/user as mob|obj, params)
- newshot()
- ..()
-
-/obj/item/weapon/gun/syringe/examine(mob/user)
- ..()
- user << "Can hold [max_syringes] syringe\s. Has [syringes.len] syringe\s remaining."
-
-/obj/item/weapon/gun/syringe/attack_self(mob/living/user as mob)
- if(!syringes.len)
- user << "[src] is empty."
- return 0
-
- var/obj/item/weapon/reagent_containers/syringe/S = syringes[syringes.len]
-
- if(!S) return 0
- S.loc = user.loc
-
- syringes.Remove(S)
- user << "You unload [S] from \the [src]!"
-
- return 1
-
-/obj/item/weapon/gun/syringe/attackby(var/obj/item/A as obj, mob/user as mob, params, var/show_msg = 1)
- if(istype(A, /obj/item/weapon/reagent_containers/syringe))
- if(syringes.len < max_syringes)
- user.drop_item()
- user << "You load [A] into \the [src]."
- syringes.Add(A)
- A.loc = src
- return 1
- else
- usr << "[src] cannot hold more syringes."
- return 0
-
-/obj/item/weapon/gun/syringe/rapidsyringe
- name = "rapid syringe gun"
- desc = "A modification of the syringe gun design, using a rotating cylinder to store up to six syringes."
- icon_state = "rapidsyringegun"
- max_syringes = 6
+/obj/item/weapon/gun/syringe
+ name = "syringe gun"
+ desc = "A spring loaded rifle designed to fit syringes, used to incapacitate unruly patients from a distance."
+ icon_state = "syringegun"
+ item_state = "syringegun"
+ w_class = 3
+ throw_speed = 3
+ throw_range = 7
+ force = 4
+ m_amt = 2000
+ clumsy_check = 0
+ fire_sound = 'sound/items/syringeproj.ogg'
+ var/list/syringes = list()
+ var/max_syringes = 1
+
+/obj/item/weapon/gun/syringe/New()
+ ..()
+ chambered = new /obj/item/ammo_casing/syringegun(src)
+
+/obj/item/weapon/gun/syringe/proc/newshot()
+ if(!syringes.len) return
+
+ var/obj/item/weapon/reagent_containers/syringe/S = syringes[1]
+
+ if(!S) return
+
+ chambered.BB = new /obj/item/projectile/bullet/dart/syringe(src)
+ S.reagents.trans_to(chambered.BB, S.reagents.total_volume)
+ chambered.BB.name = S.name
+ syringes.Remove(S)
+
+ qdel(S)
+ return
+
+/obj/item/weapon/gun/syringe/process_chamber()
+ return
+
+/obj/item/weapon/gun/syringe/afterattack(atom/target as mob|obj|turf, mob/living/user as mob|obj, params)
+ newshot()
+ ..()
+
+/obj/item/weapon/gun/syringe/examine(mob/user)
+ ..()
+ user << "Can hold [max_syringes] syringe\s. Has [syringes.len] syringe\s remaining."
+
+/obj/item/weapon/gun/syringe/attack_self(mob/living/user as mob)
+ if(!syringes.len)
+ user << "[src] is empty."
+ return 0
+
+ var/obj/item/weapon/reagent_containers/syringe/S = syringes[syringes.len]
+
+ if(!S) return 0
+ S.loc = user.loc
+
+ syringes.Remove(S)
+ user << "You unload [S] from \the [src]."
+
+ return 1
+
+/obj/item/weapon/gun/syringe/attackby(var/obj/item/A as obj, mob/user as mob, params, var/show_msg = 1)
+ if(istype(A, /obj/item/weapon/reagent_containers/syringe))
+ if(syringes.len < max_syringes)
+ user.drop_item()
+ user << "You load [A] into \the [src]."
+ syringes.Add(A)
+ A.loc = src
+ return 1
+ else
+ usr << "[src] cannot hold more syringes!"
+ return 0
+
+/obj/item/weapon/gun/syringe/rapidsyringe
+ name = "rapid syringe gun"
+ desc = "A modification of the syringe gun design, using a rotating cylinder to store up to six syringes."
+ icon_state = "rapidsyringegun"
+ max_syringes = 6
diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm
index 3d725cafcfd..5e077f56ea3 100644
--- a/code/modules/recycling/conveyor2.dm
+++ b/code/modules/recycling/conveyor2.dm
@@ -126,7 +126,7 @@
return
if(isrobot(user)) return //Carn: fix for borgs dropping their modules on conveyor belts
if(!user.drop_item())
- user << "\The [I] is stuck to your hand, you cannot place it on the conveyor!"
+ user << "\The [I] is stuck to your hand, you cannot place it on the conveyor!"
return
if(I && I.loc) I.loc = src.loc
return
diff --git a/code/modules/recycling/disposal-construction.dm b/code/modules/recycling/disposal-construction.dm
index 33b1ae0df0f..69ffea18298 100644
--- a/code/modules/recycling/disposal-construction.dm
+++ b/code/modules/recycling/disposal-construction.dm
@@ -98,7 +98,7 @@
return
if(anchored)
- usr << "You must unfasten the pipe before rotating it."
+ usr << "You must unfasten the pipe before rotating it!"
return
dir = turn(dir, -90)
@@ -112,7 +112,7 @@
return
if(anchored)
- usr << "You must unfasten the pipe before flipping it."
+ usr << "You must unfasten the pipe before flipping it!"
return
dir = turn(dir, 180)
@@ -170,10 +170,14 @@
nicetype = "pipe"
var/turf/T = loc
- if(T.intact)
- user << "You can only attach the [nicetype] if the floor plating is removed."
+ if(T.intact && istype(T, /turf/simulated/floor))
+ user << "You can only attach the [nicetype] if the floor plating is removed!"
return
-
+
+ if(!ispipe && istype(T, /turf/simulated/wall))
+ user << "You can't build [nicetype]s on walls, only disposal pipes!"
+ return
+
var/obj/structure/disposalpipe/CP = locate() in T
if(istype(I, /obj/item/weapon/wrench))
@@ -184,15 +188,15 @@
density = 0
else
density = 1
- user << "You detach the [nicetype] from the underfloor."
+ user << "You detach the [nicetype] from the underfloor."
else
if(!is_pipe()) // Disposal or outlet
if(CP) // There's something there
if(!istype(CP,/obj/structure/disposalpipe/trunk))
- user << "The [nicetype] requires a trunk underneath it in order to work."
+ user << "The [nicetype] requires a trunk underneath it in order to work!"
return
else // Nothing under, fuck.
- user << "The [nicetype] requires a trunk underneath it in order to work."
+ user << "The [nicetype] requires a trunk underneath it in order to work!"
return
else
if(CP)
@@ -201,7 +205,7 @@
if(istype(CP, /obj/structure/disposalpipe/broken))
pdir = CP.dir
if(pdir & dpdir)
- user << "There is already a [nicetype] at that location."
+ user << "There is already a [nicetype] at that location!"
return
anchored = 1
if(ispipe)
@@ -209,7 +213,7 @@
density = 0
else
density = 1 // We don't want disposal bins or outlets to go density 0
- user << "You attach the [nicetype] to the underfloor."
+ user << "You attach the [nicetype] to the underfloor."
playsound(loc, 'sound/items/Ratchet.ogg', 100, 1)
update()
@@ -218,11 +222,11 @@
var/obj/item/weapon/weldingtool/W = I
if(W.remove_fuel(0,user))
playsound(loc, 'sound/items/Welder2.ogg', 100, 1)
- user << "Welding the [nicetype] in place."
+ user << "You start welding the [nicetype] in place..."
if(do_after(user, 20))
if(!loc || !W.isOn())
return
- user << "The [nicetype] has been welded in place!"
+ user << "The [nicetype] has been welded in place."
update() // TODO: Make this neat
if(ispipe)
@@ -250,7 +254,7 @@
return
else
- user << "You need to attach it to the plating first!"
+ user << "You need to attach it to the plating first!"
return
/obj/structure/disposalconstruct/proc/is_pipe()
diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm
index b7815cfad11..0cbd54f514f 100644
--- a/code/modules/recycling/disposal.dm
+++ b/code/modules/recycling/disposal.dm
@@ -105,11 +105,11 @@
var/obj/item/weapon/weldingtool/W = I
if(W.remove_fuel(0,user))
playsound(src.loc, 'sound/items/Welder2.ogg', 100, 1)
- user << "You start slicing the floorweld off \the [src]."
+ user << "You start slicing the floorweld off \the [src]..."
if(do_after(user,20))
if(!src || !W.isOn()) return
- user << "You've sliced the floorweld off \the [src]."
+ user << "You slice the floorweld off \the [src]."
Deconstruct()
return
else
@@ -134,7 +134,7 @@
user.drop_item()
I.loc = src
- user.visible_message("[user.name] places \the [I] into \the [src].", \
+ user.visible_message("[user.name] places \the [I] into \the [src].", \
"You place \the [I] into \the [src].")
update()
@@ -149,23 +149,23 @@
if(!iscarbon(user) && !user.ventcrawler) //only carbon and ventcrawlers can climb into disposal by themselves.
return
if(target.mob_size > MOB_SIZE_HUMAN)
- user << "[target] doesn't fit inside [src]."
+ user << "[target] doesn't fit inside [src]!"
return
src.add_fingerprint(user)
if(user == target)
- user.visible_message("[user] starts climbing into [src].", \
- "[user] starts climbing into [src].")
+ user.visible_message("[user] starts climbing into [src].", \
+ "You start climbing into [src]...")
else
target.visible_message("[user] starts putting [target] into [src].", \
- "[user] starts putting [target] into [src]!")
+ "[user] starts putting you into [src]!")
if(do_mob(user, target, 20))
if (target.client)
target.client.perspective = EYE_PERSPECTIVE
target.client.eye = src
target.loc = src
if(user == target)
- user.visible_message("[user] climbs into [src].", \
- "[user] climbs into [src].")
+ user.visible_message("[user] climbs into [src].", \
+ "You climb into [src].")
else
target.visible_message("[user] has placed [target] in [src].", \
"[user] has placed [target] in [src].")
@@ -214,7 +214,7 @@
// human interact with machine
/obj/machinery/disposal/attack_hand(mob/user as mob)
if(user && user.loc == src)
- usr << "You cannot reach the controls from inside."
+ usr << "You cannot reach the controls from inside!"
return
/*
if(mode==-1)
@@ -271,7 +271,7 @@
if(..())
return
if(usr.loc == src)
- usr << "You cannot reach the controls from inside."
+ usr << "You cannot reach the controls from inside!"
return
if(mode==-1 && !href_list["eject"]) // only allow ejecting if mode is -1
@@ -729,10 +729,11 @@
var/turf/target
- if(istype(T, /turf/simulated/floor) && !istype(T, /turf/simulated/floor/plating)) //intact floor, pop the tile
+ if(istype(T, /turf/simulated/floor)) //intact floor, pop the tile
var/turf/simulated/floor/myturf = T
- if(myturf.floor_tile)
- new myturf.floor_tile(T)
+ if(myturf.builtin_tile)
+ myturf.builtin_tile.loc = T
+ myturf.builtin_tile = null
myturf.make_plating()
if(direction) // direction is specified
@@ -845,12 +846,12 @@
if(W.remove_fuel(0,user))
playsound(src.loc, 'sound/items/Welder2.ogg', 100, 1)
- user << "You start slicing the disposal pipe."
+ user << "You start slicing the disposal pipe..."
// check if anything changed over 2 seconds
if(do_after(user,30))
if(!src || !W.isOn()) return
Deconstruct()
- user << "You've sliced the disposal pipe."
+ user << "You slice the disposal pipe."
else
return
@@ -1145,16 +1146,16 @@
var/obj/item/weapon/weldingtool/W = I
if(linked)
- user << "You need to deconstruct disposal machinery above this pipe."
+ user << "You need to deconstruct disposal machinery above this pipe!"
return
if(W.remove_fuel(0,user))
playsound(src.loc, 'sound/items/Welder2.ogg', 100, 1)
- user << "You start slicing the disposal pipe."
+ user << "You start slicing the disposal pipe..."
if(do_after(user,30))
if(!src || !W.isOn()) return
Deconstruct()
- user << "You've sliced the disposal pipe."
+ user << "You slice the disposal pipe."
else
return
@@ -1284,10 +1285,10 @@
var/obj/item/weapon/weldingtool/W = I
if(W.remove_fuel(0,user))
playsound(src.loc, 'sound/items/Welder2.ogg', 100, 1)
- user << "You start slicing the floorweld off \the [src]."
+ user << "You start slicing the floorweld off \the [src]..."
if(do_after(user,20))
if(!src || !W.isOn()) return
- user << "You've sliced the floorweld off \the [src]."
+ user << "You slice the floorweld off \the [src]."
stored.loc = loc
src.transfer_fingerprints_to(stored)
stored.update()
diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm
index de964360207..19d4496b315 100644
--- a/code/modules/recycling/sortingmachinery.dm
+++ b/code/modules/recycling/sortingmachinery.dm
@@ -38,15 +38,15 @@
else if(istype(W, /obj/item/weapon/pen))
var/str = copytext(sanitize(input(user,"Label text?","Set label","")),1,MAX_NAME_LEN)
if(!str || !length(str))
- user << "Invalid text."
+ user << "Invalid text!"
return
- user.visible_message("[user] labels [src] as [str].")
+ user.visible_message("[user] labels [src] as [str].")
name = "[name] ([str])"
else if(istype(W, /obj/item/stack/wrapping_paper) && !giftwrapped)
var/obj/item/stack/wrapping_paper/WP = W
if(WP.use(3))
- user.visible_message("[user] wraps the package in festive paper!")
+ user.visible_message("[user] wraps the package in festive paper!")
giftwrapped = 1
if(istype(wrapped, /obj/structure/closet/crate))
icon_state = "giftcrate"
@@ -55,7 +55,7 @@
if(WP.amount <= 0 && !WP.loc) //if we used our last wrapping paper, drop a cardboard tube
new /obj/item/weapon/c_tube( get_turf(user) )
else
- user << "You need more paper."
+ user << "You need more paper!"
/obj/item/smallDelivery
@@ -92,9 +92,9 @@
else if(istype(W, /obj/item/weapon/pen))
var/str = copytext(sanitize(input(user,"Label text?","Set label","")),1,MAX_NAME_LEN)
if(!str || !length(str))
- user << "Invalid text."
+ user << "Invalid text!"
return
- user.visible_message("[user] labels [src] as [str].")
+ user.visible_message("[user] labels [src] as [str].")
name = "[name] ([str])"
else if(istype(W, /obj/item/stack/wrapping_paper) && !giftwrapped)
@@ -102,11 +102,11 @@
if(WP.use(1))
icon_state = "giftcrate[wrapped.w_class]"
giftwrapped = 1
- user.visible_message("[user] wraps the package in festive paper!")
+ user.visible_message("[user] wraps the package in festive paper!")
if(WP.amount <= 0 && !WP.loc) //if we used our last wrapping paper, drop a cardboard tube
new /obj/item/weapon/c_tube( get_turf(user) )
else
- user << "You need more paper."
+ user << "You need more paper!"
@@ -161,7 +161,7 @@
P.wrapped = O
O.loc = P
else
- user << "You need more paper."
+ user << "You need more paper!"
return
else if(istype (target, /obj/structure/closet))
var/obj/structure/closet/O = target
@@ -173,13 +173,13 @@
O.welded = 1
O.loc = P
else
- user << "You need more paper."
+ user << "You need more paper!"
return
else
- user << "The object you are trying to wrap is unsuitable for the sorting machinery."
+ user << "The object you are trying to wrap is unsuitable for the sorting machinery!"
return
- user.visible_message("[user] wraps [target].")
+ user.visible_message("[user] wraps [target].")
user.attack_log += text("\[[time_stamp()]\] Has used [name] on [target]")
if(amount <= 0 && !src.loc) //if we used our last wrapping paper, drop a cardboard tube
@@ -342,11 +342,11 @@
if(W.remove_fuel(0,user))
playsound(loc, 'sound/items/Welder2.ogg', 100, 1)
- user << "You start slicing the floorweld off the delivery chute."
+ user << "You start slicing the floorweld off the delivery chute..."
if(do_after(user,20))
if(!src || !W.isOn()) return
Deconstruct()
- user << "You sliced the floorweld off the delivery chute."
+ user << "You slice the floorweld off the delivery chute."
return
else
return
diff --git a/code/modules/research/circuitprinter.dm b/code/modules/research/circuitprinter.dm
index 1e9bcb8c6a0..3663a339382 100644
--- a/code/modules/research/circuitprinter.dm
+++ b/code/modules/research/circuitprinter.dm
@@ -101,7 +101,7 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis).
default_deconstruction_crowbar(O)
return
else
- user << "You can't load the [src.name] while it's opened."
+ user << "You can't load the [src.name] while it's opened!"
return
if (disabled)
return
@@ -116,11 +116,11 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis).
if (stat)
return
if (busy)
- user << "The [name] is busy. Please wait for completion of previous operation."
+ user << "The [name] is busy! Please wait for completion of previous operation."
return
var/obj/item/stack/sheet/stack = O
if ((TotalMaterials() + stack.perunit) > max_material_amount)
- user << "The [name] is full. Please remove glass from the protolathe in order to insert more."
+ user << "The [name] is full! Please remove glass from the protolathe in order to insert more."
return
var/amount = round(input("How many sheets do you want to add?") as num)
diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm
index 520c48354e8..5b5533a9c28 100644
--- a/code/modules/research/designs.dm
+++ b/code/modules/research/designs.dm
@@ -153,7 +153,7 @@ datum/design/proc/CalcReliability(var/list/temp_techs)
id = "plasmacutter"
req_tech = list("materials" = 2, "plasmatech" = 2, "engineering" = 2, "combat" = 1, "magnets" = 2)
build_type = PROTOLATHE
- materials = list("$metal" = 1500, "$glass" = 500, "$plasma" = 200)
+ materials = list("$metal" = 1500, "$glass" = 500, "$plasma" = 400)
reliability = 79
build_path = /obj/item/weapon/gun/energy/plasmacutter
category = list("Mining Designs")
@@ -164,7 +164,7 @@ datum/design/proc/CalcReliability(var/list/temp_techs)
id = "plasmacutter_adv"
req_tech = list("materials" = 4, "plasmatech" = 3, "engineering" = 3, "combat" = 3, "magnets" = 3)
build_type = PROTOLATHE
- materials = list("$metal" = 3000, "$glass" = 1000, "$plasma" = 1000, "$silver" = 500, "$gold" = 100)
+ materials = list("$metal" = 3000, "$glass" = 1000, "$plasma" = 2000, "$gold" = 500)
reliability = 79
build_path = /obj/item/weapon/gun/energy/plasmacutter/adv
category = list("Mining Designs")
@@ -249,7 +249,7 @@ datum/design/proc/CalcReliability(var/list/temp_techs)
build_type = PROTOLATHE
materials = list("$metal" = 50, "$glass" = 50)
build_path = /obj/item/clothing/glasses/hud/health
- category = list("Equipement")
+ category = list("Equipment")
/datum/design/health_hud_night
name = "Night Vision Health Scanner HUD"
@@ -259,7 +259,7 @@ datum/design/proc/CalcReliability(var/list/temp_techs)
build_type = PROTOLATHE
materials = list("$metal" = 200, "$glass" = 200, "$uranium" = 1000, "$silver" = 250)
build_path = /obj/item/clothing/glasses/hud/health/night
- category = list("Equipement")
+ category = list("Equipment")
/datum/design/security_hud
name = "Security HUD"
@@ -269,7 +269,7 @@ datum/design/proc/CalcReliability(var/list/temp_techs)
build_type = PROTOLATHE
materials = list("$metal" = 50, "$glass" = 50)
build_path = /obj/item/clothing/glasses/hud/security
- category = list("Equipement")
+ category = list("Equipment")
/datum/design/security_hud_night
name = "Night Vision Security HUD"
@@ -279,7 +279,7 @@ datum/design/proc/CalcReliability(var/list/temp_techs)
build_type = PROTOLATHE
materials = list("$metal" = 200, "$glass" = 200, "$uranium" = 1000, "$gold" = 350)
build_path = /obj/item/clothing/glasses/hud/security/night
- category = list("Equipement")
+ category = list("Equipment")
/////////////////////////////////////////
//////////////////Test///////////////////
@@ -307,7 +307,7 @@ datum/design/proc/CalcReliability(var/list/temp_techs)
build_type = PROTOLATHE
materials = list("$metal" = 4000, "$glass" = 1000)
build_path = /obj/item/clothing/mask/gas/welding
- category = list("Equipement")
+ category = list("Equipment")
/datum/design/air_horn
name = "Air Horn"
@@ -317,7 +317,7 @@ datum/design/proc/CalcReliability(var/list/temp_techs)
build_type = PROTOLATHE
materials = list("$metal" = 4000, "$bananium" = 1000)
build_path = /obj/item/weapon/bikehorn/airhorn
- category = list("Equipement")
+ category = list("Equipment")
/datum/design/mesons
name = "Optical Meson Scanners"
@@ -327,7 +327,7 @@ datum/design/proc/CalcReliability(var/list/temp_techs)
build_type = PROTOLATHE
materials = list("$metal" = 200, "$glass" = 300)
build_path = /obj/item/clothing/glasses/meson
- category = list("Equipement")
+ category = list("Equipment")
/datum/design/engine_goggles
name = "Engineering Scanner Goggles"
@@ -337,7 +337,7 @@ datum/design/proc/CalcReliability(var/list/temp_techs)
build_type = PROTOLATHE
materials = list("$metal" = 200, "$glass" = 300, "$plasma" = 100)
build_path = /obj/item/clothing/glasses/meson/engine
- category = list("Equipement")
+ category = list("Equipment")
/datum/design/nvgmesons
name = "Night Vision Optical Meson Scanners"
@@ -347,7 +347,7 @@ datum/design/proc/CalcReliability(var/list/temp_techs)
build_type = PROTOLATHE
materials = list("$metal" = 300, "$glass" = 400, "$plasma" = 250, "$uranium" = 1000)
build_path = /obj/item/clothing/glasses/meson/night
- category = list("Equipement")
+ category = list("Equipment")
/datum/design/night_vision_goggles
name = "Night Vision Goggles"
@@ -357,7 +357,7 @@ datum/design/proc/CalcReliability(var/list/temp_techs)
build_type = PROTOLATHE
materials = list("$metal" = 100, "$glass" = 100, "$uranium" = 1000)
build_path = /obj/item/clothing/glasses/night
- category = list("Equipement")
+ category = list("Equipment")
/datum/design/magboots
name = "Magnetic Boots"
@@ -367,7 +367,7 @@ datum/design/proc/CalcReliability(var/list/temp_techs)
build_type = PROTOLATHE
materials = list("$metal" = 4500, "$silver" = 1500, "$gold" = 2500)
build_path = /obj/item/clothing/shoes/magboots
- category = list("Equipement")
+ category = list("Equipment")
/////////////////////////////////////////
////////////Janitor Designs//////////////
@@ -381,7 +381,7 @@ datum/design/proc/CalcReliability(var/list/temp_techs)
build_type = PROTOLATHE
materials = list("$metal" = 3000, "$glass" = 200)
build_path = /obj/item/janiupgrade
- category = list("Equipement")
+ category = list("Equipment")
/datum/design/holosign
name = "Holographic Sign Projector"
@@ -391,4 +391,4 @@ datum/design/proc/CalcReliability(var/list/temp_techs)
build_type = PROTOLATHE
materials = list("$metal" = 2000, "$glass" = 1000)
build_path = /obj/item/weapon/holosign_creator
- category = list("Equipement")
+ category = list("Equipment")
diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm
index 72e30978b11..b8e4560a26a 100644
--- a/code/modules/research/designs/autolathe_designs.dm
+++ b/code/modules/research/designs/autolathe_designs.dm
@@ -106,6 +106,14 @@
build_path = /obj/item/weapon/stock_parts/console_screen
category = list("initial", "Electronics")
+/datum/design/apc_board
+ name = "APC Power Control Module"
+ id = "power control"
+ build_type = AUTOLATHE
+ materials = list("$metal" = 100, "$glass" = 100)
+ build_path = /obj/item/weapon/module/power_control
+ category = list("initial", "Electronics")
+
/datum/design/airlock_board
name = "Airlock electronics"
id = "airlock_board"
diff --git a/code/modules/research/designs/mechfabricator_designs.dm b/code/modules/research/designs/mechfabricator_designs.dm
index 73eab21ea2e..26e29741279 100644
--- a/code/modules/research/designs/mechfabricator_designs.dm
+++ b/code/modules/research/designs/mechfabricator_designs.dm
@@ -487,7 +487,7 @@
//Exosuit Equipment
/datum/design/mech_hydraulic_clamp
- name = "Exosuit Engineering Equipement (Hydraulic Clamp)"
+ name = "Exosuit Engineering Equipment (Hydraulic Clamp)"
id = "mech_hydraulic_clamp"
build_type = MECHFAB
build_path = /obj/item/mecha_parts/mecha_equipment/tool/hydraulic_clamp
@@ -496,7 +496,7 @@
category = list("Exosuit Equipment")
/datum/design/mech_drill
- name = "Exosuit Engineering Equipement (Drill)"
+ name = "Exosuit Engineering Equipment (Drill)"
id = "mech_drill"
build_type = MECHFAB
build_path = /obj/item/mecha_parts/mecha_equipment/tool/drill
@@ -504,8 +504,17 @@
construction_time = 100
category = list("Exosuit Equipment")
+/datum/design/mech_mining_scanner
+ name = "Exosuit Engineering Equipement (Mining Scanner)"
+ id = "mech_mscanner"
+ build_type = MECHFAB
+ build_path = /obj/item/mecha_parts/mecha_equipment/tool/mining_scanner
+ materials = list("$metal"=5000,"$glass"=2500)
+ construction_time = 50
+ category = list("Exosuit Equipment")
+
/datum/design/mech_extinguisher
- name = "Exosuit Engineering Equipement (Extinguisher)"
+ name = "Exosuit Engineering Equipment (Extinguisher)"
id = "mech_extinguisher"
build_type = MECHFAB
build_path = /obj/item/mecha_parts/mecha_equipment/tool/extinguisher
@@ -514,7 +523,7 @@
category = list("Exosuit Equipment")
/datum/design/mech_cable_layer
- name = "Exosuit Engineering Equipement (Cable Layer)"
+ name = "Exosuit Engineering Equipment (Cable Layer)"
id = "mech_cable_layer"
build_type = MECHFAB
build_path = /obj/item/mecha_parts/mecha_equipment/tool/cable_layer
@@ -523,7 +532,7 @@
category = list("Exosuit Equipment")
/datum/design/mech_sleeper
- name = "Exosuit Medical Equipement (Mounted Sleeper)"
+ name = "Exosuit Medical Equipment (Mounted Sleeper)"
id = "mech_sleeper"
build_type = MECHFAB
build_path = /obj/item/mecha_parts/mecha_equipment/tool/sleeper
@@ -532,7 +541,7 @@
category = list("Exosuit Equipment")
/datum/design/mech_syringe_gun
- name = "Exosuit Medical Equipement (Syringe Gun)"
+ name = "Exosuit Medical Equipment (Syringe Gun)"
id = "mech_syringe_gun"
build_type = MECHFAB
build_path = /obj/item/mecha_parts/mecha_equipment/tool/syringe_gun
@@ -541,7 +550,7 @@
category = list("Exosuit Equipment")
/datum/design/mech_generator
- name = "Exosuit Equipement (Plasma Generator)"
+ name = "Exosuit Equipment (Plasma Generator)"
id = "mech_generator"
build_type = MECHFAB
build_path = /obj/item/mecha_parts/mecha_equipment/generator
diff --git a/code/modules/research/designs/medical_designs.dm b/code/modules/research/designs/medical_designs.dm
index ff9be3891c2..14f20655f4b 100644
--- a/code/modules/research/designs/medical_designs.dm
+++ b/code/modules/research/designs/medical_designs.dm
@@ -158,7 +158,7 @@ datum/design/bluespacebodybag
build_path = /obj/item/cybernetic_implant/brain/anti_stun
category = list("Medical Designs")
-/datum/design/cyberimp_nutriment
+/*/datum/design/cyberimp_nutriment
name = "Nutriment pump implant"
desc = "This implant with synthesize and pump into your bloodstream a small amount of nutriment when you are starving."
id = "ci-nutriment"
@@ -174,13 +174,4 @@ datum/design/bluespacebodybag
req_tech = list("materials" = 6, "programming" = 4, "biotech" = 6)
build_type = PROTOLATHE | MECHFAB
materials = list("$metal" = 200, "$glass" = 200, "$gold" = 500, "$uranium" = 750)
- category = list("Medical Designs")
-
-/datum/design/cyberimp_reviver
- name = "Reviver implant"
- desc = "This implant will automatically deliver a therapeutic dose of electrical energy to your heart if it ever stops beating, and inject you with nanites. A second chance!"
- id = "ci-reviver"
- req_tech = list("materials" = 6, "programming" = 4, "biotech" = 6)
- build_type = PROTOLATHE | MECHFAB
- materials = list("$metal" = 500, "$gold" = 1000, "$uranium" = 1000, "$diamond" = 2000)
- category = list("Medical Designs")
\ No newline at end of file
+ category = list("Medical Designs")*/
\ No newline at end of file
diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm
index bcf7bd9a33f..be722fe8fb0 100644
--- a/code/modules/research/experimentor.dm
+++ b/code/modules/research/experimentor.dm
@@ -156,7 +156,7 @@
loaded_item = O
user.drop_item()
O.loc = src
- user << "You add the [O.name] to the machine!"
+ user << "You add the [O.name] to the machine."
flick("h_lathe_load", src)
return
@@ -254,21 +254,21 @@
var/criticalReaction = locate(exp_on) in critical_items ? TRUE : FALSE
////////////////////////////////////////////////////////////////////////////////////////////////
if(exp == SCANTYPE_POKE)
- visible_message("[src] prods at [exp_on] with mechanical arms.")
+ visible_message("[src] prods at [exp_on] with mechanical arms.")
if(prob(EFFECT_PROB_LOW) && criticalReaction)
- visible_message("[exp_on] is gripped in just the right way, enhancing it's focus.")
+ visible_message("[exp_on] is gripped in just the right way, enhancing its focus.")
badThingCoeff++
if(prob(EFFECT_PROB_VERYLOW-badThingCoeff))
- visible_message("[src] malfunctions and destroys [exp_on], lashing it's arms out at nearby people!.")
+ visible_message("[src] malfunctions and destroys [exp_on], lashing its arms out at nearby people!")
for(var/mob/living/m in oview(1, src))
m.apply_damage(15,"brute",pick("head","chest","groin"))
investigate_log("Experimentor dealt minor brute to [m].", "experimentor")
ejectItem(TRUE)
if(prob(EFFECT_PROB_LOW-badThingCoeff))
- visible_message("[src] malfunctions!.")
+ visible_message("[src] malfunctions!")
exp = SCANTYPE_OBLITERATE
if(prob(EFFECT_PROB_MEDIUM-badThingCoeff))
- visible_message("[src] malfunctions, throwing the [exp_on]!.")
+ visible_message("[src] malfunctions, throwing the [exp_on]!")
var/mob/living/target = locate(/mob/living) in oview(7,src)
if(target)
var/obj/item/throwing = loaded_item
@@ -278,21 +278,21 @@
throwing.throw_at(target, 10, 1)
////////////////////////////////////////////////////////////////////////////////////////////////
if(exp == SCANTYPE_IRRADIATE)
- visible_message("[src] reflects radioactive rays at [exp_on]!")
+ visible_message("[src] reflects radioactive rays at [exp_on]!")
if(prob(EFFECT_PROB_LOW) && criticalReaction)
- visible_message("[exp_on] has activated an unknown subroutine!")
+ visible_message("[exp_on] has activated an unknown subroutine!")
cloneMode = TRUE
cloneCount = badThingCoeff
investigate_log("Experimentor has made a clone of [exp_on]", "experimentor")
ejectItem()
if(prob(EFFECT_PROB_VERYLOW-badThingCoeff))
- visible_message("[src] malfunctions, melting [exp_on] and leaking radiation!.")
+ visible_message("[src] malfunctions, melting [exp_on] and leaking radiation!")
for(var/mob/living/m in oview(1, src))
- m.apply_effect(25,IRRADIATE)
+ m.irradiate(25)
investigate_log("Experimentor has irradiated [m]", "experimentor") //One entry per person so we know what was irradiated.
ejectItem(TRUE)
if(prob(EFFECT_PROB_LOW-badThingCoeff))
- visible_message("[src] malfunctions, spewing toxic waste!.")
+ visible_message("[src] malfunctions, spewing toxic waste!")
for(var/turf/T in oview(1, src))
if(!T.density)
if(prob(EFFECT_PROB_VERYHIGH))
@@ -303,7 +303,7 @@
ejectItem(TRUE)
var/newPath = pickWeighted(valid_items)
loaded_item = new newPath(src)
- visible_message("[src] malfunctions, transforming [savedName] into [loaded_item]!.")
+ visible_message("[src] malfunctions, transforming [savedName] into [loaded_item]!")
investigate_log("Experimentor has transformed [savedName] into [loaded_item]", "experimentor")
if(istype(loaded_item,/obj/item/weapon/grenade/chem_grenade))
var/obj/item/weapon/grenade/chem_grenade/CG = loaded_item
@@ -311,12 +311,12 @@
ejectItem()
////////////////////////////////////////////////////////////////////////////////////////////////
if(exp == SCANTYPE_GAS)
- visible_message("[src] fills it's chamber with gas, [exp_on] included.")
+ visible_message("[src] fills its chamber with gas, [exp_on] included.")
if(prob(EFFECT_PROB_LOW) && criticalReaction)
- visible_message("[exp_on] achieves the perfect mix!")
+ visible_message("[exp_on] achieves the perfect mix!")
new /obj/item/stack/sheet/mineral/plasma(get_turf(pick(oview(1,src))))
if(prob(EFFECT_PROB_VERYLOW-badThingCoeff))
- visible_message("[src] destroys [exp_on], leaking dangerous gas!.")
+ visible_message("[src] destroys [exp_on], leaking dangerous gas!")
chosenchem = pick("carbon","radium","toxin","condensedcapsaicin","mushroomhallucinogen","space_drugs","ethanol","beepskysmash")
var/datum/reagents/R = new/datum/reagents(50)
R.my_atom = src
@@ -343,18 +343,18 @@
warn_admins(usr, "[chosenchem] smoke")
investigate_log("Experimentor has released [chosenchem] smoke!", "experimentor")
if(prob(EFFECT_PROB_LOW-badThingCoeff))
- visible_message("[src] malfunctions, spewing harmless gas!.")
+ visible_message("[src] malfunctions, spewing harmless gas.>")
throwSmoke(src.loc)
if(prob(EFFECT_PROB_MEDIUM-badThingCoeff))
- visible_message("[src] melts [exp_on], ionizing the air around it!.")
+ visible_message("[src] melts [exp_on], ionizing the air around it!")
empulse(src.loc, 4, 6)
investigate_log("Experimentor has generated an Electromagnetic Pulse.", "experimentor")
ejectItem(TRUE)
////////////////////////////////////////////////////////////////////////////////////////////////
if(exp == SCANTYPE_HEAT)
- visible_message("[src] raises [exp_on]'s temperature.")
+ visible_message("[src] raises [exp_on]'s temperature.")
if(prob(EFFECT_PROB_LOW) && criticalReaction)
- visible_message("[src]'s emergency coolant system gives off a small ding!")
+ visible_message("[src]'s emergency coolant system gives off a small ding!")
playsound(src.loc, 'sound/machines/ding.ogg', 50, 1)
var/obj/item/weapon/reagent_containers/food/drinks/coffee/C = new /obj/item/weapon/reagent_containers/food/drinks/coffee(get_turf(pick(oview(1,src))))
chosenchem = pick("plasma","capsaicin","ethanol")
@@ -377,12 +377,12 @@
FB.xo = MT.x - start.x
FB.fire()
if(prob(EFFECT_PROB_LOW-badThingCoeff))
- visible_message("[src] malfunctions, melting [exp_on] and releasing a burst of flame!.")
+ visible_message("[src] malfunctions, melting [exp_on] and releasing a burst of flame!")
explosion(src.loc, -1, 0, 0, 0, 0, flame_range = 2)
investigate_log("Experimentor started a fire.", "experimentor")
ejectItem(TRUE)
if(prob(EFFECT_PROB_MEDIUM-badThingCoeff))
- visible_message("[src] malfunctions, melting [exp_on] and leaking hot air!.")
+ visible_message("[src] malfunctions, melting [exp_on] and leaking hot air!")
var/datum/gas_mixture/env = src.loc.return_air()
var/transfer_moles = 0.25 * env.total_moles()
var/datum/gas_mixture/removed = env.remove(transfer_moles)
@@ -396,7 +396,7 @@
investigate_log("Experimentor has released hot air.", "experimentor")
ejectItem(TRUE)
if(prob(EFFECT_PROB_MEDIUM-badThingCoeff))
- visible_message("[src] malfunctions, activating it's emergency coolant systems!.")
+ visible_message("[src] malfunctions, activating its emergency coolant systems!")
throwSmoke(src.loc)
for(var/mob/living/m in oview(1, src))
m.apply_damage(5,"burn",pick("head","chest","groin"))
@@ -404,9 +404,9 @@
ejectItem()
////////////////////////////////////////////////////////////////////////////////////////////////
if(exp == SCANTYPE_COLD)
- visible_message("[src] lowers [exp_on]'s temperature.")
+ visible_message("[src] lowers [exp_on]'s temperature.")
if(prob(EFFECT_PROB_LOW) && criticalReaction)
- visible_message("[src]'s emergency coolant system gives off a small ding!")
+ visible_message("[src]'s emergency coolant system gives off a small ding!")
var/obj/machinery/vending/coffee/C = new /obj/machinery/vending/coffee(get_turf(pick(oview(1,src))))
playsound(src.loc, 'sound/machines/ding.ogg', 50, 1) //Ding! Your death coffee is ready!
chosenchem = pick("uranium","frostoil","ephedrine")
@@ -416,7 +416,7 @@
C.desc = "It has a large hazard symbol printed on the side in fading ink."
investigate_log("Experimentor has made a cup of [chosenchem] coffee.", "experimentor")
if(prob(EFFECT_PROB_VERYLOW-badThingCoeff))
- visible_message("[src] malfunctions, shattering [exp_on] and releasing a dangerous cloud of coolant!")
+ visible_message("[src] malfunctions, shattering [exp_on] and releasing a dangerous cloud of coolant!")
var/datum/reagents/R = new/datum/reagents(50)
R.my_atom = src
R.add_reagent("frostoil" , 50)
@@ -428,7 +428,7 @@
qdel(R)
ejectItem(TRUE)
if(prob(EFFECT_PROB_LOW-badThingCoeff))
- visible_message("[src] malfunctions, shattering [exp_on] and leaking cold air!.")
+ visible_message("[src] malfunctions, shattering [exp_on] and leaking cold air!")
var/datum/gas_mixture/env = src.loc.return_air()
var/transfer_moles = 0.25 * env.total_moles()
var/datum/gas_mixture/removed = env.remove(transfer_moles)
@@ -442,22 +442,22 @@
investigate_log("Experimentor has released cold air.", "experimentor")
ejectItem(TRUE)
if(prob(EFFECT_PROB_MEDIUM-badThingCoeff))
- visible_message("[src] malfunctions, releasing a flurry of chilly air as [exp_on] pops out!.")
+ visible_message("[src] malfunctions, releasing a flurry of chilly air as [exp_on] pops out!")
var/datum/effect/effect/system/harmless_smoke_spread/smoke = new
smoke.set_up(1,0, src.loc, 0)
smoke.start()
ejectItem()
////////////////////////////////////////////////////////////////////////////////////////////////
if(exp == SCANTYPE_OBLITERATE)
- visible_message("[exp_on] activates the crushing mechanism, [exp_on] is destroyed!")
+ visible_message("[exp_on] activates the crushing mechanism, [exp_on] is destroyed!")
if(prob(EFFECT_PROB_LOW) && criticalReaction)
- visible_message("[src]'s crushing mechanism slowly and smoothly descends, flattening the [exp_on]!")
+ visible_message("[src]'s crushing mechanism slowly and smoothly descends, flattening the [exp_on]!")
new /obj/item/stack/sheet/plasteel(get_turf(pick(oview(1,src))))
if(linked_console.linked_lathe)
linked_console.linked_lathe.m_amount += min((linked_console.linked_lathe.max_material_storage - linked_console.linked_lathe.TotalMaterials()), (exp_on.m_amt))
linked_console.linked_lathe.g_amount += min((linked_console.linked_lathe.max_material_storage - linked_console.linked_lathe.TotalMaterials()), (exp_on.g_amt))
if(prob(EFFECT_PROB_VERYLOW-badThingCoeff))
- visible_message("[src]'s crusher goes way too many levels too high, crushing right through space-time!")
+ visible_message("[src]'s crusher goes way too many levels too high, crushing right through space-time!")
playsound(src.loc, 'sound/effects/supermatter.ogg', 50, 1, -3)
investigate_log("Experimentor has triggered the 'throw things' reaction.", "experimentor")
var/list/throwAt = list()
@@ -469,7 +469,7 @@
var/cast = throwAt[counter]
cast:throw_at(src,10,1)
if(prob(EFFECT_PROB_LOW-badThingCoeff))
- visible_message("[src]'s crusher goes one level too high, crushing right into space-time!.")
+ visible_message("[src]'s crusher goes one level too high, crushing right into space-time!")
playsound(src.loc, 'sound/effects/supermatter.ogg', 50, 1, -3)
investigate_log("Experimentor has triggered the 'minor throw things' reaction.", "experimentor")
var/list/oViewStuff = oview(7,src)
@@ -486,10 +486,10 @@
if(exp == FAIL)
var/a = pick("rumbles","shakes","vibrates","shudders")
var/b = pick("crushes","spins","viscerates","smashes","insults")
- visible_message("[exp_on] [a], and [b], the experiment was a failiure!")
+ visible_message("[exp_on] [a], and [b], the experiment was a failure.")
if(exp == SCANTYPE_DISCOVER)
- visible_message("[src] scans the [exp_on], revealing it's true nature!.")
+ visible_message("[src] scans the [exp_on], revealing its true nature!")
playsound(src.loc, 'sound/effects/supermatter.ogg', 50, 3, -1)
var/obj/item/weapon/relic/R = loaded_item
R.reveal()
@@ -500,11 +500,11 @@
if(prob(EFFECT_PROB_VERYLOW-badThingCoeff))
var/globalMalf = rand(1,100)
if(globalMalf < 15)
- visible_message("[src]'s onboard detection system has malfunctioned!.")
+ visible_message("[src]'s onboard detection system has malfunctioned!")
item_reactions["[exp_on.type]"] = pick(SCANTYPE_POKE,SCANTYPE_IRRADIATE,SCANTYPE_GAS,SCANTYPE_HEAT,SCANTYPE_COLD,SCANTYPE_OBLITERATE)
ejectItem()
if(globalMalf > 16 && globalMalf < 35)
- visible_message("[src] melts [exp_on], ian-izing the air around it!.")
+ visible_message("[src] melts [exp_on], ian-izing the air around it!")
throwSmoke(src.loc)
if(trackedIan)
throwSmoke(trackedIan.loc)
@@ -515,7 +515,7 @@
investigate_log("Experimentor has spawned a new corgi.", "experimentor")
ejectItem(TRUE)
if(globalMalf > 36 && globalMalf < 50)
- visible_message("[src] improves [exp_on], drawing the life essence of those nearby!")
+ visible_message("[src] improves [exp_on], drawing the life essence of those nearby!")
for(var/mob/living/m in view(4,src))
m << "You feel your flesh being torn from you, mists of blood drifting to [src]!"
m.apply_damage(50,"brute","chest")
@@ -526,7 +526,7 @@
exp_on.origin_tech = list2params(reqs)
investigate_log("Experimentor has set the origin tech of [exp_on] to [exp_on.origin_tech]", "experimentor")
if(globalMalf > 51 && globalMalf < 75)
- visible_message("[src] encounters a run-time error!")
+ visible_message("[src] encounters a run-time error!")
throwSmoke(src.loc)
if(trackedRuntime)
throwSmoke(trackedRuntime.loc)
@@ -537,7 +537,7 @@
investigate_log("Experimentor failed to steal runtime, and instead spawned a new cat.", "experimentor")
ejectItem(TRUE)
if(globalMalf > 76)
- visible_message("[src] begins to smoke and hiss, shaking violently!")
+ visible_message("[src] begins to smoke and hiss, shaking violently!")
use_power(500000)
investigate_log("Experimentor has drained power from its APC", "experimentor")
@@ -567,7 +567,7 @@
src.updateUsrDialog()
else
if(recentlyExperimented)
- usr << "[src] has been used too recently!"
+ usr << "[src] has been used too recently!"
return
var/dotype
if(text2num(scantype) == SCANTYPE_DISCOVER)
@@ -638,7 +638,7 @@
/obj/item/weapon/relic/attack_self(mob/user as mob)
if(revealed)
if(cooldown)
- user << "[src] does not react."
+ user << "[src] does not react!"
return
else if(src.loc == user)
cooldown = TRUE
@@ -690,7 +690,7 @@
qdel(src)
/obj/item/weapon/relic/proc/rapidDupe(var/mob/user)
- audible_message("[src] emits a loud pop!")
+ audible_message("[src] emits a loud pop!")
var/list/dupes = list()
var/counter
var/max = rand(5,10)
@@ -737,4 +737,4 @@
if(priority) //For truly dangerous relics that may need an admin's attention. BWOINK!
message_admins("[RelicType] relic activated by [key_name(user, user.client)](?) in ([T.x],[T.y],[T.z] - JMP)",0,1)
log_game(log_msg)
- investigate_log(log_msg, "experimentor")
+ investigate_log(log_msg, "experimentor")
diff --git a/code/modules/research/protolathe.dm b/code/modules/research/protolathe.dm
index ed202ccb9f5..9322e7c9286 100644
--- a/code/modules/research/protolathe.dm
+++ b/code/modules/research/protolathe.dm
@@ -30,7 +30,7 @@ Note: Must be placed west/left of and R&D console to function.
"Medical Designs",
"Bluespace Designs",
"Stock Parts",
- "Equipement",
+ "Equipment",
"Mining Designs",
"Electronics",
"Weapons",
@@ -140,7 +140,7 @@ Note: Must be placed west/left of and R&D console to function.
default_deconstruction_crowbar(O)
return 1
else
- user << "You can't load the [src.name] while it's opened."
+ user << "You can't load the [src.name] while it's opened!"
return 1
if (disabled)
return
@@ -148,7 +148,7 @@ Note: Must be placed west/left of and R&D console to function.
user << " The [src.name] must be linked to an R&D console first!"
return 1
if (busy)
- user << "The [src.name] is busy. Please wait for completion of previous operation."
+ user << "The [src.name] is busy! Please wait for completion of previous operation."
return 1
if (O.is_open_container())
return
@@ -160,7 +160,7 @@ Note: Must be placed west/left of and R&D console to function.
if(istype(O,/obj/item/stack/sheet))
var/obj/item/stack/sheet/S = O
if (TotalMaterials() + S.perunit > max_material_storage)
- user << "The [src.name]'s material bin is full. Please remove material before adding more."
+ user << "The [src.name]'s material bin is full! Please remove material before adding more."
return 1
var/obj/item/stack/sheet/stack = O
diff --git a/code/modules/research/rdmachines.dm b/code/modules/research/rdmachines.dm
index ee922a055a6..e4ed832817e 100644
--- a/code/modules/research/rdmachines.dm
+++ b/code/modules/research/rdmachines.dm
@@ -73,10 +73,10 @@
if(href_list["pulse"])
var/temp_wire = href_list["wire"]
if (!istype(usr.get_active_hand(), /obj/item/device/multitool))
- usr << "You need a multitool!"
+ usr << "You need a multitool!"
else
if(src.wires[temp_wire])
- usr << "You can't pulse a cut wire."
+ usr << "You can't pulse a cut wire!"
else
if(src.hack_wire == href_list["wire"])
src.hacked = !src.hacked
@@ -91,7 +91,7 @@
spawn(100) src.shocked = !src.shocked
if(href_list["cut"])
if (!istype(usr.get_active_hand(), /obj/item/weapon/wirecutters))
- usr << "You need wirecutters!"
+ usr << "You need wirecutters!"
else
var/temp_wire = href_list["wire"]
wires[temp_wire] = !wires[temp_wire]
diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm
index 12b76321f27..f054bbb6867 100644
--- a/code/modules/research/xenobiology/xenobiology.dm
+++ b/code/modules/research/xenobiology/xenobiology.dm
@@ -23,7 +23,7 @@
if(Uses == 0)
user << " You can't enhance a used extract!"
return ..()
- user <<"You apply the enhancer. It now has triple the amount of uses."
+ user <<"You apply the enhancer. It now has triple the amount of uses."
Uses = 3
enhanced = 1
qdel(O)
@@ -204,8 +204,8 @@
M.languages |= HUMAN
M.faction -= "neutral"
M << "All at once it makes sense, you know what you are and who you are! Self awareness is yours!"
- M << "You are grateful to be self aware and owe [user] a great debt. Serve [user], and assist them in completing their goals at any cost."
- user << "[M] is suddenly attentive and aware. It worked!"
+ M << "You are grateful to be self aware and owe [user] a great debt. Serve [user], and assist them in completing their goals at any cost."
+ user << "[M] is suddenly attentive and aware. It worked!"
qdel(src)
else
user << "[M] looks interested for a moment, but then looks back down. Maybe you should try again later..."
@@ -232,7 +232,7 @@
user <<" The slime already has the maximum amount of extract!"
return..()
- user <<"You feed the slime the steroid. It now has triple the amount of extract."
+ user <<"You feed the slime the steroid. It now has triple the amount of extract."
M.cores = 3
qdel(src)
@@ -350,7 +350,7 @@
ghost = O
break
if(!ghost)
- user << "The rune fizzles uselessly. There is no spirit nearby."
+ user << "The rune fizzles uselessly! There is no spirit nearby."
return
var/mob/living/carbon/human/G = new /mob/living/carbon/human
if(prob(50)) G.gender = "female"
diff --git a/code/modules/security levels/keycard authentication.dm b/code/modules/security levels/keycard authentication.dm
index 3d75e5a227a..2a1909a15dd 100644
--- a/code/modules/security levels/keycard authentication.dm
+++ b/code/modules/security levels/keycard authentication.dm
@@ -25,7 +25,7 @@
return
/obj/machinery/keycard_auth/attack_paw(mob/user as mob)
- user << "You are too primitive to use this device."
+ user << "You are too primitive to use this device!"
return
/obj/machinery/keycard_auth/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
@@ -53,10 +53,10 @@
/obj/machinery/keycard_auth/attack_hand(mob/user as mob)
if(user.stat || stat & (NOPOWER|BROKEN))
- user << "This device is not powered."
+ user << "This device is not powered!"
return
if(busy)
- user << "This device is busy."
+ user << "This device is busy!"
return
user.set_machine(src)
diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm
index 846f7e28c14..204b94477e7 100644
--- a/code/modules/shuttle/shuttle.dm
+++ b/code/modules/shuttle/shuttle.dm
@@ -321,6 +321,8 @@
for(var/obj/O in T0)
if(O.invisibility >= 101)
continue
+ if(O == T0.lighting_object)
+ continue
O.loc = T1
//close open doors
@@ -350,13 +352,13 @@
//air system updates
for(var/turf/T1 in L1)
- T1.shift_to_subarea()
+ T1.redraw_lighting()
SSair.remove_from_active(T1)
T1.CalculateAdjacentTurfs()
SSair.add_to_active(T1,1)
for(var/turf/T0 in L0)
- T0.shift_to_subarea()
+ T0.redraw_lighting()
SSair.remove_from_active(T0)
T0.CalculateAdjacentTurfs()
SSair.add_to_active(T0,1)
diff --git a/code/modules/surgery/appendectomy.dm b/code/modules/surgery/appendectomy.dm
index 7ba9ad03ba0..0ba1db2da7c 100644
--- a/code/modules/surgery/appendectomy.dm
+++ b/code/modules/surgery/appendectomy.dm
@@ -15,17 +15,17 @@
/datum/surgery_step/extract_appendix/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
A = locate() in target.internal_organs
if(A)
- user.visible_message("[user] begins to extract [target]'s appendix.")
+ user.visible_message("[user] begins to extract [target]'s appendix.", "You begin to extract [target]'s appendix...")
else
- user.visible_message("[user] looks for an appendix in [target].")
+ user.visible_message("[user] looks for an appendix in [target].", "You look for an appendix in [target]...")
/datum/surgery_step/extract_appendix/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
if(A)
- user.visible_message("[user] successfully removes [target]'s appendix!")
+ user.visible_message("[user] successfully removes [target]'s appendix!", "You successfully removes [target]'s appendix.")
A.loc = get_turf(target)
target.internal_organs -= A
for(var/datum/disease/appendicitis in target.viruses)
appendicitis.cure()
else
- user.visible_message("[user] can't find an appendix in [target]!")
+ user << "You can't find an appendix in [target]!"
return 1
\ No newline at end of file
diff --git a/code/modules/surgery/brain_removal.dm b/code/modules/surgery/brain_removal.dm
index 41c3b4ee68c..0d57fb6f9a2 100644
--- a/code/modules/surgery/brain_removal.dm
+++ b/code/modules/surgery/brain_removal.dm
@@ -14,13 +14,13 @@
/datum/surgery_step/extract_brain/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
B = target.getorgan(/obj/item/organ/brain)
if(B)
- user.visible_message("[user] begins to extract [target]'s brain.")
+ user.visible_message("[user] begins to extract [target]'s brain.", "You begin to extract [target]'s brain...")
else
- user.visible_message("[user] looks for a brain in [target].")
+ user.visible_message("[user] looks for a brain in [target].", "You look for a brain in [target]...")
/datum/surgery_step/extract_brain/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
if(B)
- user.visible_message("[user] successfully removes [target]'s brain!")
+ user.visible_message("[user] successfully removes [target]'s brain!", "You successfully remove [target]'s brain.")
B.loc = get_turf(target)
B.transfer_identity(target)
target.internal_organs -= B
@@ -30,7 +30,7 @@
H.apply_damage(25,"brute","head")
add_logs(user, target, "debrained", addition="INTENT: [uppertext(user.a_intent)]")
else
- user.visible_message("[user] can't find a brain in [target]!")
+ user << "You can't find a brain in [target]!"
return 1
diff --git a/code/modules/surgery/cavity_implant.dm b/code/modules/surgery/cavity_implant.dm
index 289dadeec2d..4373e3c2a8b 100644
--- a/code/modules/surgery/cavity_implant.dm
+++ b/code/modules/surgery/cavity_implant.dm
@@ -19,27 +19,27 @@
IC = I
break
if(tool)
- user.visible_message("[user] begins to insert [tool] into [target]'s [target_zone].")
+ user.visible_message("[user] begins to insert [tool] into [target]'s [target_zone].", "You begin to insert [tool] into [target]'s [target_zone]...")
else
- user.visible_message("[user] checks for items in [target]'s [target_zone].")
+ user.visible_message("[user] checks for items in [target]'s [target_zone].", "You check for items in [target]'s [target_zone]...")
/datum/surgery_step/handle_cavity/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
if(tool)
if(IC || tool.w_class > 3 || NODROP in tool.flags || tool.GetTypeInAllContents(/obj/item/weapon/disk/nuclear) || istype(tool, /obj/item/weapon/disk/nuclear) || istype(tool, /obj/item/organ))
- user.visible_message("[user] can't seem to fit [tool] in [target]'s [target_zone].")
+ user << "You can't seem to fit [tool] in [target]'s [target_zone]!"
return 0
else
- user.visible_message("[user] stuffs [tool] into [target]'s [target_zone]!")
+ user.visible_message("[user] stuffs [tool] into [target]'s [target_zone]!", "You stuff [tool] into [target]'s [target_zone].")
user.drop_item()
target.internal_organs += tool
tool.loc = target
return 1
else
if(IC)
- user.visible_message("[user] pulls [IC] out of [target]'s [target_zone]!")
+ user.visible_message("[user] pulls [IC] out of [target]'s [target_zone]!", "You pull [IC] out of [target]'s [target_zone].")
user.put_in_hands(IC)
target.internal_organs -= IC
return 1
else
- user.visible_message("[user] doesn't find anything in [target]'s [target_zone].")
+ user << "You don't find anything in [target]'s [target_zone]."
return 0
\ No newline at end of file
diff --git a/code/modules/surgery/core_removal.dm b/code/modules/surgery/core_removal.dm
index 2f8dff6988f..6a38e160560 100644
--- a/code/modules/surgery/core_removal.dm
+++ b/code/modules/surgery/core_removal.dm
@@ -11,14 +11,13 @@
time = 16
/datum/surgery_step/extract_core/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
- user.visible_message("[user] begins to extract a core from [target].")
+ user.visible_message("[user] begins to extract a core from [target].", "You begin to extract a core from [target]...")
/datum/surgery_step/extract_core/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
var/mob/living/simple_animal/slime/slime = target
if(slime.cores > 0)
slime.cores--
- user.visible_message("[user] successfully extracts a core from [target]!")
- user << "[slime.cores] core\s remaining."
+ user.visible_message("[user] successfully extracts a core from [target]!", "You successfully extract a core from [target]. [slime.cores] core\s remaining.")
new slime.coretype(slime.loc)
@@ -28,5 +27,5 @@
else
return 0
else
- user.visible_message("There aren't any cores left in [target].")
+ user << "There aren't any cores left in [target]!"
return 1
\ No newline at end of file
diff --git a/code/modules/surgery/cybernetic_implants.dm b/code/modules/surgery/cybernetic_implants.dm
index 66792e9c61b..3f4dcb5210c 100644
--- a/code/modules/surgery/cybernetic_implants.dm
+++ b/code/modules/surgery/cybernetic_implants.dm
@@ -2,7 +2,7 @@
#define MAX_CHEST_IMPLANT 3
/datum/surgery_step/cybernetic_implant/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/cybernetic_implant/implant, datum/surgery/surgery)
- user.visible_message("[user] begins to implant [target] with [implant].")
+ user.visible_message("[user] begins to implant [target] with [implant].", "You begin to implant [target] with [implant]...")
//[[[[EYES]]]]
/datum/surgery/eye_cybernetic_implant/eyes
@@ -63,18 +63,14 @@
if(full < MAX_CHEST_IMPLANT)
full = 0
- if(istype(implant,/obj/item/cybernetic_implant/chest/heart))
- if(locate(/obj/item/cybernetic_implant/chest/heart) in target.internal_organs)
- full = 1
-
insert(user,target,implant,target_zone,full)
return 1
/datum/surgery_step/cybernetic_implant/proc/insert(mob/user, mob/living/carbon/target, obj/item/cybernetic_implant/implant,target_zone,full)
if(full)
- user.visible_message("[user] can't seem to implant anything else into the [target]'s [target_zone].")
+ user << "You can't seem to implant anything else into the [target]'s [target_zone]!"
else
- user.visible_message("[user] inserts [implant] into the [target]'s [target_zone == "head" ? "brain" : target_zone]!")
+ user.visible_message("[user] inserts [implant] into the [target]'s [target_zone == "head" ? "brain" : target_zone]!", "You insert [implant] into the [target]'s [target_zone == "head" ? "brain" : target_zone].")
implant.owner = target
implant.function()
user.drop_item()
diff --git a/code/modules/surgery/eye_surgery.dm b/code/modules/surgery/eye_surgery.dm
index 0fb7f2413cb..71e136efa72 100644
--- a/code/modules/surgery/eye_surgery.dm
+++ b/code/modules/surgery/eye_surgery.dm
@@ -11,10 +11,10 @@
time = 64
/datum/surgery_step/fix_eyes/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
- user.visible_message("[user] begins to fix [target]'s eyes.")
+ user.visible_message("[user] begins to fix [target]'s eyes.", "You begin to fix [target]'s eyes...")
/datum/surgery_step/fix_eyes/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
- user.visible_message("[user] successfully fixes [target]'s eyes!")
+ user.visible_message("[user] successfully fixes [target]'s eyes!", "You succeed in fixing [target]'s eyes.")
target.disabilities &= ~BLIND
target.disabilities &= ~NEARSIGHT
target.eye_blurry = 35 //this will fix itself slowly.
@@ -23,8 +23,8 @@
/datum/surgery_step/fix_eyes/failure(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
if(target.getorgan(/obj/item/organ/brain))
- user.visible_message("[user] accidentally stabs [target] right in the brain!")
+ user.visible_message("[user] accidentally stabs [target] right in the brain!", "You accidentally stab [target] right in the brain!")
target.adjustBrainLoss(100)
else
- user.visible_message("[user] accidentally stabs [target] right in the brain! Or would have, if [target] had a brain.")
+ user.visible_message("[user] accidentally stabs [target] right in the brain! Or would have, if [target] had a brain.", "You accidentally stab [target] right in the brain! Or would have, if [target] had a brain.")
return 0
\ No newline at end of file
diff --git a/code/modules/surgery/gender_reassignment.dm b/code/modules/surgery/gender_reassignment.dm
index 0ef01d56d7c..4cc6be2d953 100644
--- a/code/modules/surgery/gender_reassignment.dm
+++ b/code/modules/surgery/gender_reassignment.dm
@@ -13,18 +13,18 @@
/datum/surgery_step/reshape_genitals/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
if(target.gender == FEMALE)
- user.visible_message("[user] begins to reshape [target]'s genitals to look more masculine.")
+ user.visible_message("[user] begins to reshape [target]'s genitals to look more masculine.", "You begin to reshape [target]'s genitals to look more masculine...")
else
- user.visible_message("[user] begins to reshape [target]'s genitals to look more feminine.")
+ user.visible_message("[user] begins to reshape [target]'s genitals to look more feminine.", "You begin to reshape [target]'s genitals to look more feminine...")
/datum/surgery_step/reshape_genitals/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
var/mob/living/carbon/human/H = target //no type check, as that should be handled by the surgery
H.gender_ambiguous = 0
if(target.gender == FEMALE)
- user.visible_message("[user] has made a man of [target]!")
+ user.visible_message("[user] has made a man of [target]!", "You made [target] a man.")
target.gender = MALE
else
- user.visible_message("[user] has made a woman of [target]!")
+ user.visible_message("[user] has made a woman of [target]!", "You made [target] a woman.")
target.gender = FEMALE
target.regenerate_icons()
return 1
@@ -32,7 +32,7 @@
/datum/surgery_step/reshape_genitals/failure(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
var/mob/living/carbon/human/H = target
H.gender_ambiguous = 1
- user.visible_message("[user] mutilates [target]'s genitals beyond the point of recognition!")
+ user.visible_message("[user] accidentally mutilates [target]'s genitals beyond the point of recognition!", "You accidentally mutilate [target]'s genitals beyond the point of recognition!")
target.gender = pick(MALE, FEMALE)
target.regenerate_icons()
return 1
diff --git a/code/modules/surgery/generic_steps.dm b/code/modules/surgery/generic_steps.dm
index 7683c9444ff..b31ec1afe24 100644
--- a/code/modules/surgery/generic_steps.dm
+++ b/code/modules/surgery/generic_steps.dm
@@ -5,7 +5,7 @@
time = 24
/datum/surgery_step/incise/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
- user.visible_message("[user] begins to make an incision in [target]'s [parse_zone(target_zone)].")
+ user.visible_message("[user] begins to make an incision in [target]'s [parse_zone(target_zone)].", "You begin to make an incision in [target]'s [parse_zone(target_zone)]...")
@@ -15,7 +15,7 @@
time = 48
/datum/surgery_step/clamp_bleeders/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
- user.visible_message("[user] begins to clamp bleeders in [target]'s [parse_zone(target_zone)].")
+ user.visible_message("[user] begins to clamp bleeders in [target]'s [parse_zone(target_zone)].", "You begin to clamp bleeders in [target]'s [parse_zone(target_zone)]...")
//retract skin
@@ -24,7 +24,7 @@
time = 32
/datum/surgery_step/retract_skin/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
- user.visible_message("[user] begins to retract the skin in [target]'s [parse_zone(target_zone)].")
+ user.visible_message("[user] begins to retract the skin in [target]'s [parse_zone(target_zone)].", "You begin to retract the skin in [target]'s [parse_zone(target_zone)]...")
@@ -34,7 +34,7 @@
time = 32
/datum/surgery_step/close/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
- user.visible_message("[user] begins to mend the incision in [target]'s [parse_zone(target_zone)].")
+ user.visible_message("[user] begins to mend the incision in [target]'s [parse_zone(target_zone)].", "You begin to mend the incision in [target]'s [parse_zone(target_zone)]...")
/datum/surgery_step/close/tool_check(mob/user, obj/item/tool)
@@ -62,7 +62,7 @@
time = 64
/datum/surgery_step/saw/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
- user.visible_message("[user] begins to saw through the bone in [target]'s [parse_zone(target_zone)].")
+ user.visible_message("[user] begins to saw through the bone in [target]'s [parse_zone(target_zone)].", "You begin to saw through the bone in [target]'s [parse_zone(target_zone)]...")
diff --git a/code/modules/surgery/helpers.dm b/code/modules/surgery/helpers.dm
index 8d23d98378d..a25e97df091 100644
--- a/code/modules/surgery/helpers.dm
+++ b/code/modules/surgery/helpers.dm
@@ -8,6 +8,12 @@
if(locate(S.type) in M.surgeries)
continue
+ if(S.user_species_restricted)
+ if(!istype(user, /mob/living/carbon/human))
+ continue
+ var/mob/living/carbon/human/doc = user
+ if(!(doc.dna.species.id in S.user_species_ids))
+ continue
if(S.target_must_be_dead && M.stat != DEAD)
continue
if(S.target_must_be_fat && !(M.disabilities & FAT))
@@ -35,16 +41,16 @@
var/datum/surgery/S = available_surgeries[P]
var/datum/surgery/procedure = new S.type
if(procedure)
- if(get_location_accessible(M, procedure.location))
+ if(get_location_accessible(M, procedure.location) || procedure.ignore_clothes)
if(procedure.location == "anywhere") // if location == "anywhere" change location to the surgeon's target, otherwise leave location as is.
procedure.location = user.zone_sel.selecting
M.surgeries += procedure
- user.visible_message("[user] drapes [I] over [M]'s [parse_zone(procedure.location)] to prepare for \an [procedure.name].")
+ user.visible_message("[user] drapes [I] over [M]'s [parse_zone(procedure.location)] to prepare for \an [procedure.name].", "You drape [I] over [M]'s [parse_zone(procedure.location)] to prepare for \an [procedure.name].")
add_logs(user, M, "operated", addition="Operation type: [procedure.name]")
return 1
else
- user << "You need to expose [M]'s [procedure.location] first."
+ user << "You need to expose [M]'s [procedure.location] first!"
return 1 //return 1 so we don't slap the guy in the dick with the drapes.
else
return 1 //once the input menu comes up, cancelling it shouldn't hit the guy with the drapes either.
@@ -70,13 +76,13 @@ proc/get_location_modifier(mob/M)
var/eyesmouth_covered = 0 //based on flags
if(iscarbon(M))
var/mob/living/carbon/C = M
- for(var/obj/item/clothing/I in list(C.back, C.wear_mask))
+ for(var/obj/item/clothing/I in list(C.back, C.wear_mask, C.head))
covered_locations |= I.body_parts_covered
face_covered |= I.flags_inv
eyesmouth_covered |= I.flags
if(ishuman(C))
var/mob/living/carbon/human/H = C
- for(var/obj/item/I in list(H.wear_suit, H.w_uniform, H.shoes, H.belt, H.gloves, H.glasses, H.head, H.ears))
+ for(var/obj/item/I in list(H.wear_suit, H.w_uniform, H.shoes, H.belt, H.gloves, H.glasses, H.ears))
covered_locations |= I.body_parts_covered
face_covered |= I.flags_inv
eyesmouth_covered |= I.flags
@@ -89,7 +95,7 @@ proc/get_location_modifier(mob/M)
if(covered_locations & HEAD || face_covered & HIDEEYES || eyesmouth_covered & GLASSESCOVERSEYES)
return 0
if("mouth")
- if(covered_locations & HEAD || face_covered & HIDEFACE || eyesmouth_covered & MASKCOVERSMOUTH)
+ if(covered_locations & HEAD || face_covered & HIDEFACE || eyesmouth_covered & MASKCOVERSMOUTH || eyesmouth_covered & HEADCOVERSMOUTH)
return 0
if("chest")
if(covered_locations & CHEST)
diff --git a/code/modules/surgery/implant_removal.dm b/code/modules/surgery/implant_removal.dm
index 97277220159..8e21fae2ff2 100644
--- a/code/modules/surgery/implant_removal.dm
+++ b/code/modules/surgery/implant_removal.dm
@@ -19,19 +19,19 @@
I = W
break
if(I)
- user.visible_message("[user] begins to extract [I] from [target]'s [target_zone].")
+ user.visible_message("[user] begins to extract [I] from [target]'s [target_zone].", "You begin to extract [I] from [target]'s [target_zone]...")
else
- user.visible_message("[user] looks for an implant in [target]'s [target_zone].")
+ user.visible_message("[user] looks for an implant in [target]'s [target_zone].", "You look for an implant in [target]'s [target_zone]...")
/datum/surgery_step/extract_implant/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
if(I)
- user.visible_message("[user] successfully removes [I] from [target]'s [target_zone]!")
+ user.visible_message("[user] successfully removes [I] from [target]'s [target_zone]!", "You successfully remove [I] from [target]'s [target_zone].")
if(istype(I, /obj/item/weapon/implant/loyalty))
- target << "You feel a sense of liberation as Nanotrasen's grip on your mind fades away."
+ target << "You feel a sense of liberation as Nanotrasen's grip on your mind fades away."
qdel(I)
if(istype(target, /mob/living/carbon/human))
var/mob/living/carbon/human/H = target
H.sec_hud_set_implants()
else
- user.visible_message("[user] can't find anything in [target]'s [target_zone].")
+ user << "You can't find anything in [target]'s [target_zone]!"
return 1
diff --git a/code/modules/surgery/limb augmentation.dm b/code/modules/surgery/limb augmentation.dm
index f9a26f9f49a..b520fb5a4e8 100644
--- a/code/modules/surgery/limb augmentation.dm
+++ b/code/modules/surgery/limb augmentation.dm
@@ -10,7 +10,7 @@
/datum/surgery_step/replace/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
- user.visible_message("[user] begins to sever the muscles on [target]'s [parse_zone(user.zone_sel.selecting)]!")
+ user.visible_message("[user] begins to sever the muscles on [target]'s [parse_zone(user.zone_sel.selecting)].", "You begin to sever the muscles on [target]'s [parse_zone(user.zone_sel.selecting)]...")
/datum/surgery_step/add_limb
@@ -24,9 +24,9 @@
/datum/surgery_step/add_limb/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
L = new_organ
if(L)
- user.visible_message("[user] begins to augment [target]'s [parse_zone(user.zone_sel.selecting)].")
+ user.visible_message("[user] begins to augment [target]'s [parse_zone(user.zone_sel.selecting)].", "You begin to augment [target]'s [parse_zone(user.zone_sel.selecting)]...")
else
- user.visible_message("[user] looks for [target]'s [parse_zone(user.zone_sel.selecting)].")
+ user.visible_message("[user] looks for [target]'s [parse_zone(user.zone_sel.selecting)].", "You look for [target]'s [parse_zone(user.zone_sel.selecting)]...")
@@ -46,7 +46,7 @@
if(L)
if(ishuman(target))
var/mob/living/carbon/human/H = target
- user.visible_message("[user] successfully augments [target]'s [parse_zone(target_zone)]!")
+ user.visible_message("[user] successfully augments [target]'s [parse_zone(target_zone)]!", "You successfully augment [target]'s [parse_zone(target_zone)].")
L.loc = get_turf(target)
H.organs -= L
switch(target_zone)
@@ -72,5 +72,5 @@
H.update_augments() //Gives them the Cyber limb overlay
add_logs(user, target, "augmented", addition="by giving him new [parse_zone(target_zone)] INTENT: [uppertext(user.a_intent)]")
else
- user.visible_message("[user] [target] has no organic [parse_zone(target_zone)] there!")
+ user << "[target] has no organic [parse_zone(target_zone)] there!"
return 1
diff --git a/code/modules/surgery/lipoplasty.dm b/code/modules/surgery/lipoplasty.dm
index ae8b5147e91..88f2cd2f4d1 100644
--- a/code/modules/surgery/lipoplasty.dm
+++ b/code/modules/surgery/lipoplasty.dm
@@ -13,10 +13,10 @@
time = 64
/datum/surgery_step/cut_fat/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
- user.visible_message("[user] begins to cut away [target]'s excess fat!")
+ user.visible_message("[user] begins to cut away [target]'s excess fat.", "You begin to cut away [target]'s excess fat...")
/datum/surgery_step/cut_fat/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
- user.visible_message("[user] cuts [target]'s excess fat loose!")
+ user.visible_message("[user] cuts [target]'s excess fat loose!", "You cut [target]'s excess fat loose.")
return 1
//remove fat
@@ -25,15 +25,15 @@
time = 32
/datum/surgery_step/remove_fat/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
- user.visible_message("[user] begins to extract [target]'s loose fat!")
+ user.visible_message("[user] begins to extract [target]'s loose fat!", "You begin to extract [target]'s loose fat...")
/datum/surgery_step/remove_fat/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
- user.visible_message("[user] extracts [target]'s fat!")
+ user.visible_message("[user] extracts [target]'s fat!", "You extract [target]'s fat.")
target.overeatduration = 0 //patient is unfatted
var/removednutriment = target.nutrition
target.nutrition = NUTRITION_LEVEL_WELL_FED
removednutriment -= 450 //whatever was removed goes into the meat
- var/obj/item/weapon/reagent_containers/food/snacks/meat/human/newmeat = new
+ var/obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/newmeat = new
newmeat.name = "fatty meat"
newmeat.desc = "Extremely fatty tissue taken from a patient."
newmeat.reagents.add_reagent ("nutriment", (removednutriment / 15)) //To balance with nutriment_factor of nutriment
diff --git a/code/modules/surgery/organs/cybernetic_implants.dm b/code/modules/surgery/organs/cybernetic_implants.dm
index 7a37f071333..5a6d84c3019 100644
--- a/code/modules/surgery/organs/cybernetic_implants.dm
+++ b/code/modules/surgery/organs/cybernetic_implants.dm
@@ -308,66 +308,3 @@
return
owner.reagents.add_reagent("????",poison_amount / severity) //food poisoning
owner << "You feel like your insides are burning."
-
-/obj/item/cybernetic_implant/chest/heart/reviver
- name = "Reviver implant"
- desc = "This implant will automatically deliver a therapeutic dose of electrical energy to your heart if it ever stops beating, and inject nanites into your bloodstream. A second chance!"
- icon_state = "chest_implant"
- implant_color = "#AD0000"
- var/defibrillating = 0
- var/recharge_time = 0
- origin_tech = "materials=7;programming=3;biotech=4"
-
-/obj/item/cybernetic_implant/chest/heart/reviver/function()
- if(istype(owner,/mob/living/carbon/human))
- recharge_time = world.time + 2000
- SSobj.processing |= src
-
-/obj/item/cybernetic_implant/chest/heart/reviver/process()
- if(defibrillating)
- return
- if(!owner)
- SSobj.processing.Remove(src)
- qdel(src)
- return
- if(world.time < recharge_time)
- return
- if(owner.stat != DEAD)
- return
-
- defibrillating = 1
- spawn(600)
- if(owner.stat == DEAD)
- owner.visible_message("[owner]'s body convulses by itself.")
- playsound(owner, "bodyfall", 50, 1)
- playsound(owner, 'sound/machines/defib_zap.ogg', 50, 1, -1)
- dead_mob_list -= owner
- living_mob_list |= list(owner)
- owner.stat = UNCONSCIOUS
- owner.reagents.add_reagent("nanites",10)
- var/mob/living/carbon/human/H = owner
- var/amount = BLOOD_VOLUME_OKAY - H.vessel.total_volume
- H.vessel.add_reagent("blood", amount)
- H.vessel.update_total()
- owner.heart_attack = 0
- owner.emote("gasp")
- add_logs(owner, owner, "revived", object="defibrillator implant")
- recharge_time = world.time + 20000
- defibrillating = 0
-
-/obj/item/cybernetic_implant/chest/heart/reviver/emp_act(severity)
- if(!owner)
- return
- if(recharge_time < world.time)
- recharge_time = world.time + (2000 / severity)
- else
- recharge_time += 2000 / severity
-
- if(prob(60/severity))
- playsound(owner, 'sound/machines/defib_saftyOff.ogg', 50, 1, -1)
- spawn(30)
- playsound(owner, 'sound/machines/defib_zap.ogg', 50, 1, -1)
- owner.heart_attack = 1
- if(owner.stat == CONSCIOUS)
- owner.Weaken(5)
- owner.visible_message("[owner] clutches at their chest as if their heart stopped!")
\ No newline at end of file
diff --git a/code/modules/surgery/plastic_surgery.dm b/code/modules/surgery/plastic_surgery.dm
index aa744928a95..e0a4dc96c76 100644
--- a/code/modules/surgery/plastic_surgery.dm
+++ b/code/modules/surgery/plastic_surgery.dm
@@ -10,15 +10,15 @@
time = 64
/datum/surgery_step/reshape_face/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
- user.visible_message("[user] begins to alter [target]'s appearance.")
+ user.visible_message("[user] begins to alter [target]'s appearance.", "You begin to alter [target]'s appearance...")
/datum/surgery_step/reshape_face/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
if(target.status_flags & DISFIGURED)
target.status_flags &= ~DISFIGURED
- user.visible_message("[user] successfully restores [target]'s appearance!")
+ user.visible_message("[user] successfully restores [target]'s appearance!", "You successfully restore [target]'s appearance.")
else
var/oldname = target.real_name
target.real_name = random_name(target.gender)
var/newname = target.real_name //something about how the code handles names required that I use this instead of target.real_name
- user.visible_message("[user] alters [oldname]'s appearance completely, they are now [newname]!")
+ user.visible_message("[user] alters [oldname]'s appearance completely, they are now [newname]!", "You alter [oldname]'s appearance completely, they are now [newname].")
return 1
\ No newline at end of file
diff --git a/code/modules/surgery/remove_embedded_object.dm b/code/modules/surgery/remove_embedded_object.dm
index 749faa22698..33968dd8968 100644
--- a/code/modules/surgery/remove_embedded_object.dm
+++ b/code/modules/surgery/remove_embedded_object.dm
@@ -18,9 +18,9 @@
/datum/surgery_step/remove_object/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
L = new_organ
if(L)
- user.visible_message("[user] looks for objects embedded in [target]'s [parse_zone(user.zone_sel.selecting)].")
+ user.visible_message("[user] looks for objects embedded in [target]'s [parse_zone(user.zone_sel.selecting)].", "You look for objects embedded in [target]'s [parse_zone(user.zone_sel.selecting)]...")
else
- user.visible_message("[user] looks for [target]'s [parse_zone(user.zone_sel.selecting)].")
+ user.visible_message("[user] looks for [target]'s [parse_zone(user.zone_sel.selecting)].", "You look for [target]'s [parse_zone(user.zone_sel.selecting)]...")
/datum/surgery_step/remove_object/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
@@ -34,11 +34,11 @@
L.embedded_objects -= I
if(objects > 0)
- user.visible_message("[user] sucessfully removes [objects] objects from [H]'s [L.getDisplayName()]!")
+ user.visible_message("[user] sucessfully removes [objects] objects from [H]'s [L.getDisplayName()]!", "You sucessfully remove [objects] objects from [H]'s [L.getDisplayName()].")
else
- user.visible_message("[user] finds no objects embedded in [H]'s [L.getDisplayName()].")
+ user << "You find no objects embedded in [H]'s [L.getDisplayName()]!"
else
- user.visible_message("[user] can't find [target]'s [parse_zone(user.zone_sel.selecting)], let alone any objects embedded in it!")
+ user << "You can't find [target]'s [parse_zone(user.zone_sel.selecting)], let alone any objects embedded in it!"
return 1
\ No newline at end of file
diff --git a/code/modules/surgery/surgery.dm b/code/modules/surgery/surgery.dm
index 0ade9193386..fff1661c6bd 100644
--- a/code/modules/surgery/surgery.dm
+++ b/code/modules/surgery/surgery.dm
@@ -9,7 +9,9 @@
var/target_must_be_fat = 0 //Needs to be fat
var/requires_organic_chest = 0 //Prevents you from performing an operation on Robotic chests***
var/has_multi_loc = 0 //Multiple locations - RR
-
+ var/user_species_restricted = 0 //Surgery only performable BY species
+ var/list/user_species_ids
+ var/ignore_clothes = 0 //This surgery ignores clothes
/datum/surgery/proc/next_step(mob/user, mob/living/carbon/target)
if(step_in_progress) return
diff --git a/code/modules/surgery/surgery_step.dm b/code/modules/surgery/surgery_step.dm
index 19d5eca182c..f139e46f55d 100644
--- a/code/modules/surgery/surgery_step.dm
+++ b/code/modules/surgery/surgery_step.dm
@@ -29,7 +29,7 @@
initiate(user, target, target_zone, tool, surgery)
return 1
else
- user << "You need to expose [target]'s [parse_zone(target_zone)] to perform surgery on it!"
+ user << "You need to expose [target]'s [parse_zone(target_zone)] to perform surgery on it!"
return 1 //returns 1 so we don't stab the guy in the dick or wherever.
if(isrobot(user) && user.a_intent != "harm") //to save asimov borgs a LOT of heartache
return 1
@@ -68,22 +68,22 @@
/datum/surgery_step/proc/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
- user.visible_message("[user] begins to perform surgery on [target].")
+ user.visible_message("[user] begins to perform surgery on [target].", "You begin to perform surgery on [target]...")
/datum/surgery_step/proc/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
- user.visible_message("[user] succeeds!")
+ user.visible_message("[user] succeeds!", "You succeed.")
return 1
/datum/surgery_step/saw/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
if(ishuman(target))
var/mob/living/carbon/human/H = target
H.apply_damage(75,"brute","[target_zone]")
- user.visible_message("[user] saws [target]'s [parse_zone(target_zone)] open!")
+ user.visible_message("[user] saws [target]'s [parse_zone(target_zone)] open!", "You saw [target]'s [parse_zone(target_zone)] open.")
return 1
/datum/surgery_step/proc/failure(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
- user.visible_message("[user] screws up!")
+ user.visible_message("[user] screws up!", "You screw up!")
return 0
/datum/surgery_step/close/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
diff --git a/code/modules/surgery/xenomorph_removal.dm b/code/modules/surgery/xenomorph_removal.dm
index 98b81efcf5e..15f83e82622 100644
--- a/code/modules/surgery/xenomorph_removal.dm
+++ b/code/modules/surgery/xenomorph_removal.dm
@@ -13,13 +13,13 @@
time = 64
/datum/surgery_step/xenomorph_removal/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
- user.visible_message("[user] begins to search in [target]'s chest for a xenomorph.")
+ user.visible_message("[user] begins to search in [target]'s chest for a xenomorph embryo.", "You begin to search in [target]'s chest for a xenomorph embryo...")
/datum/surgery_step/xenomorph_removal/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
if(remove_xeno(user, target))
- user.visible_message("[user] successfully extracts the xenomorph from [target]!")
+ user.visible_message("[user] successfully extracts the xenomorph embryo from [target]!", "You successfully extract the xenomorph embryo from [target].")
else
- user.visible_message("[user] can't find anything in [target]'s chest!")
+ user.visible_message("[user] can't seem to find anything in [target]'s chest!", "You can't find anything in [target]'s chest!")
return 1
/datum/surgery_step/xenomorph_removal/proc/remove_xeno(mob/user, mob/living/carbon/target)
@@ -42,8 +42,8 @@
if(A)
if(prob(50))
A.AttemptGrow(0)
- user.visible_message("[user] accidentally pokes the xenomorph in [target]!")
+ user.visible_message("[user] accidentally pokes the xenomorph in [target]!", "You accidentally poke the xenomorph in [target]!")
else
target.adjustOxyLoss(30)
- user.visible_message("[user] accidentally pokes [target] in the lungs!")
+ user.visible_message("[user] accidentally pokes [target] in the lungs!", "You accidentally poke [target] in the lungs!")
return 0
\ No newline at end of file
diff --git a/code/modules/telesci/bscrystal.dm b/code/modules/telesci/bscrystal.dm
index 7c64352ca8f..c006939d876 100644
--- a/code/modules/telesci/bscrystal.dm
+++ b/code/modules/telesci/bscrystal.dm
@@ -17,7 +17,7 @@
/obj/item/bluespace_crystal/attack_self(var/mob/user)
- user.visible_message("[user] crushes [src]!")
+ user.visible_message("[user] crushes [src]!", "You crush [src]!")
PoolOrNew(/obj/effect/effect/sparks, loc)
playsound(src.loc, "sparks", 50, 1)
blink_mob(user)
diff --git a/code/modules/telesci/telesci_computer.dm b/code/modules/telesci/telesci_computer.dm
index ea9d253b54f..6d602467fa1 100644
--- a/code/modules/telesci/telesci_computer.dm
+++ b/code/modules/telesci/telesci_computer.dm
@@ -50,7 +50,7 @@
crystals += new /obj/item/bluespace_crystal/artificial(null) // starting crystals
/obj/machinery/computer/telescience/attack_paw(mob/user)
- user << "You are too primitive to use this computer."
+ user << "You are too primitive to use this computer!"
return
/obj/machinery/computer/telescience/attackby(obj/item/W, mob/user, params)
@@ -61,14 +61,14 @@
user.drop_item()
crystals += W
W.loc = null
- user.visible_message("[user] inserts [W] into \the [src]'s crystal slot.")
+ user.visible_message("[user] inserts [W] into \the [src]'s crystal slot.", "You insert [W] into \the [src]'s crystal slot.")
updateDialog()
else if(istype(W, /obj/item/device/gps))
if(!inserted_gps)
inserted_gps = W
user.unEquip(W)
W.loc = src
- user.visible_message("[user] inserts [W] into \the [src]'s GPS device slot.")
+ user.visible_message("[user] inserts [W] into \the [src]'s GPS device slot.", "You insert [W] into \the [src]'s GPS device slot.")
else if(istype(W, /obj/item/device/multitool))
var/obj/item/device/multitool/M = W
if(M.buffer && istype(M.buffer, /obj/machinery/telepad))
diff --git a/code/world.dm b/code/world.dm
index 182130a4ce2..de98ae35678 100644
--- a/code/world.dm
+++ b/code/world.dm
@@ -146,7 +146,10 @@
log << "#[count]\t[index]"
#endif
spawn(0)
- world << sound(pick('sound/AI/newroundsexy.ogg','sound/misc/apcdestroyed.ogg','sound/misc/bangindonk.ogg','sound/misc/leavingtg.ogg')) // random end sounds!! - LastyBatsy
+ if(ticker && ticker.round_end_sound)
+ world << sound(ticker.round_end_sound)
+ else
+ world << sound(pick('sound/AI/newroundsexy.ogg','sound/misc/apcdestroyed.ogg','sound/misc/bangindonk.ogg','sound/misc/leavingtg.ogg')) // random end sounds!! - LastyBatsy
for(var/client/C in clients)
if(config.server) //if you set a server location in config.txt, it sends you there instead of trying to reconnect to the same world address. -- NeoFite
diff --git a/config/admins.txt b/config/admins.txt
index e420f765d0e..7ee8062dcb0 100644
--- a/config/admins.txt
+++ b/config/admins.txt
@@ -81,3 +81,4 @@ lo6a4evskiy = Game Master
vekter = Game Master
Ahammer18 = Game Master
ACCount12 = Game Master
+fayrik = Game Master
diff --git a/config/game_options.txt b/config/game_options.txt
index 683ec17b46b..ae06f1b3675 100644
--- a/config/game_options.txt
+++ b/config/game_options.txt
@@ -82,28 +82,38 @@ PROBABILITY TRAITORCHAN 4
PROBABILITY DOUBLE_AGENTS 3
PROBABILITY NUCLEAR 2
PROBABILITY REVOLUTION 2
-PROBABILITY GANG 0
+PROBABILITY SHADOWLING 2
+PROBABILITY GANG 2
PROBABILITY CULT 2
PROBABILITY CHANGELING 2
PROBABILITY WIZARD 4
PROBABILITY MALFUNCTION 1
PROBABILITY BLOB 2
PROBABILITY RAGINMAGES 2
-PROBABILITY MONKEY 1
+PROBABILITY MONKEY 0
PROBABILITY METEOR 0
PROBABILITY EXTENDED 0
## You probably want to keep sandbox off by default for secret and random.
PROBABILITY SANDBOX 0
-## Uncomment to make rounds which end instantly (Rev, Wizard, Malf) continue until
-## the shuttle is called or the station is nuked.
-## Malf and Rev will let the shuttle be called when the antags/protags are dead.
-#CONTINUOUS_ROUND_REV
-#CONTINUOUS_ROUND_GANG
-#CONTINUOUS_ROUND_WIZ
-#CONTINUOUS_ROUND_MALF
-#CONTINUOUS_ROUND_BLOB
+
+## Toggles for continuous modes.
+## Modes that aren't continuous will end the instant all antagonists are dead.
+## Unlisted modes are not currently supported for noncontinous play
+
+#CONTINUOUS REVOLUTION
+CONTINUOUS WIZARD
+CONTINUOUS MALFUNCTION
+CONTINUOUS BLOB
+
+## Toggles for allowing midround antagonists (aka mulligan antagonists).
+## In modes that are continuous, if all antagonists should die then a new set of antagonists will be created.
+## Only the listed modes are currently supported for this system
+
+MIDROUND_ANTAG WIZARD
+MIDROUND_ANTAG MALFUNCTION
+MIDROUND_ANTAG BLOB
## The amount of time it takes for the emergency shuttle to be called, from round start.
SHUTTLE_REFUEL_DELAY 12000
@@ -216,9 +226,6 @@ SILICON_MAX_LAW_AMOUNT 12
## Uncoment to give players the choice of their species before they join the game
#JOIN_WITH_MUTANT_RACE
-## Uncomment to allow certain species to have custom colors
-#MUTANT_COLORS
-
## Assistant slot cap. Set to -1 for unlimited.
ASSISTANT_CAP -1
diff --git a/config/tips.txt b/config/tips.txt
index 4738b3c6780..c779fb3c653 100644
--- a/config/tips.txt
+++ b/config/tips.txt
@@ -76,4 +76,12 @@ Alt-click on an adjacent tile to see its contents in the top right pane.
While observing or as a ghost, double click on people, bots, or the singularity to follow them.
Ghosts can click on active teleporters, portals, wormholes, or the gateway to jump to its destination!
Ghosts can double-click their corpse, or the object containing their corpse (such as the cloning scanner), to re-enter it.
-Ghosts can see inside storage items that have been left on the ground.
\ No newline at end of file
+Ghosts can see inside storage items that have been left on the ground.
+If you click on the command/chat bar to give it full focus you can use control + arrow keys to move the cursor around or scroll through the history of commands. (Control + home/end work too)
+Locked down rogue borgs can be dismantled to return the mmi for placement in a new borg.
+Fore = north, aft = south, starboard = east and port = west.
+Many things that bind you can be resisted out of with the resist button. This includes locked or welded lockers, chairs, handcuffs. When ever stuck, just give it a try!
+You can use . or # instead of : for radio channels. Building this habit reduces the chance of accidentally saying things on common.
+Clicking on a tile with an empty hand while pulling something moves it to that tile. No more getting stuck in maint while dragging something!
+Things that override clicks like decks of cards or paper bins can still be picked up by dragging them to your character. Equipped things that override click can be unequipped by dragging it to an empty hand.
+In the job selection menu, from the lobby, you can use right click on the "Low/Medium/High" priority button to make it cycle backwards.
diff --git a/html/changelog.html b/html/changelog.html
index ae4ca94a7e4..1b28e0f192c 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,267 @@
-->
+
25 April 2015
+
Boggart updated:
+
+ - Ports Nienhaus's guitar, generalizes handheld instrument code.
+ - Fixes being unable to build disposal pipes on walls, makes changing the RPD's settings not affect pipes that are currently building, makes the RPD use the datum/browser ui, makes it use categories and makes it show the selected mode.
+
+
Gun Hog updated:
+
+ - Nanotrasen has provided designs for fabrication of APC power control modules. You may print them at any autolathe.
+
+
Ikarrus updated:
+
+ - Gangs can now purchase switchblades, a relatively cheap and decently robust melee weapon.
+ - Gangs now require at least 66% control of the station to win.
+ - Gang spraycan uses reduced to 15.
+ - Pistol cost increased to 30 Influence
+ - Promotions now start off cheap at 20 influence but get more expensive the more people you promote.
+
+
Xhuis updated:
+
+ - Added a Create Antagonist button for revenants.
+ - Removed Mind Blast.
+ - Revenants no longer get killed by explosions.
+ - Mind spike cooldown increased to 4 seconds.
+ - Harvest now takes 8 seconds and requires you to be adjacent to the target.
+ - Hypnotise sleeps targets for longer.
+ - Revenant now starts with 3 strikes.
+
+
phil235 updated:
+
+ - Telecom machines are now deconstructed the same way as all other constructable machines.
+ - You can no longer overdose on nicotine but you can get addicted (very mild effects).
+
+
+
22 April 2015
+
Incoming5643 updated:
+
+ - Adds a new fun button for admins: 'Set Round End Sound'. You can use the set round end sound button to set the round end sound. Glad we cleared that up!
+
+
Miauw62 updated:
+
+ - Very slightly expanded atmos and added an external airlock.
+
+
Xhuis updated:
+
+ - A few issues have been fixed for revenants. In addition, the Mind Blast/Mind Spike sound effect has been removed.
+ - Adds the Hypnotize ability to revenants. It will cause a target to fall asleep after a short time.
+
+
xxalpha updated:
+
+ - Added an Exosuit Mining Scanner to the robotics fabricator.
+ - Buffed Ripley's movement and drilling speed in low pressure environments.
+
+
+
21 April 2015
+
Ikarrus updated:
+
+ - Gang mode has had some considerable work done on it, including a new objective and currency dynamic.
+ - New objective: Claim half the station as territory by tagging it with spray cans supplied to gang bosses, but usable by any member.
+ - An area can only be tagged by one gang at a time, remove your opponent's tag or spray over it.
+ - New recruitment: Recruiment pens replace flashes, stab people to recruit them.
+ - Recruitment is silent, but causes brief seizures and has a cooldown that scales upwards with a gang's size.
+ - New tool: The Gangtool is used by bosses and lieutenants to recall the shuttle and purchase supplies.
+ - Pistols, ammo, spraycans, recruitment pens and additional gangtools can all be bought.
+ - Gangtools also alert the user of promotions, purchases and territory changes within the gang.
+ - Lieutenants are promoted from gang members when given their own gangtool; they're immune to deconversion and able to do anything a boss can except promotion.
+ - New currency: Influence is used to purchase with the gangtool and is generated every 5 minutes by each territory owned by the gang.
+ - Thermite can be cleaned off walls now.
+
+
+
20 April 2015
+
Fayrik updated:
+
+ - Abductors now get advanced camera consoles.
+ - Redesigned Centcom again. There's a bar at the thunderdome now.
+ - Headsets can now be locked to a spesific frequency, this only occurs for nuke ops and deathsquads.
+ - The Centcom channel is now available over all z-levels, regardless of telecomms status.
+ - The Deathsquad space suits have been upgraded to hardsuits.
+ - The Deathsquad now have thermal imaging huds, which can swap which hud they display on the fly.
+
+
phil235 updated:
+
+ - Reagents are now back to being metabolized every tick. Fixes frost oil and capsaicin not working.
+ - Fixes not being able to make sterilizine.
+ - Adding overdose to space drug, causing mild hallucination and toxin and brain damage.
+ - Nerfed healing power of stimulant reagent. Buffed ephedrine a bit.
+ - Nitroglycerin can now be stabilized with stabilizing agent, and explodes when heated.
+
+
+
19 April 2015
+
AnturK updated:
+
+ - Observers can now see abductor hivemind messages.
+ - Adds advanced baton for abductors: Stun, Sleep and Cuff in one tool.
+ - Abductor agents now have vest cameras.
+ - New sprites for abductors and their gear made by Ausops.
+
+
Fayrik updated:
+
+ - Added jobban options for Abductors and Deathsquads.
+ - Made admin antag spawning buttons more efficient and less prone to failure.
+
+
Xhuis updated:
+
+ - Recent sightings aboard space stations shows that spirits seem to be manifesting as malevolent revenants and draining the life of crew. The chaplain may be helpful in stopping this new threat.
+
+
kingofkosmos updated:
+
+ - Girder and machine frame construction protocols has been changed. They can now be secured/unsecured with a wrench and disassembled with a welder.
+
+
+
16 April 2015
+
AnturK updated:
+
+ - Nanotrasen authorities are reporting sightings of unidentified space craft near space station 13. Report any strange sightings or mental breakdowns to central command.
+ - PS : Abductions are not covered by health insurance.
+ - Shadowlings and their thralls now have HUD icons.
+ - Thralls learn their master's objectives when enthralled.
+ - Regenerate Chitin ability lets shadowlings re-equip their armor if lost.
+ - Loyalty implanted people take 25% longer to enthrall, but lose their implant and become immune to re-implanting.
+ - Shadowlings now have a message in their spawning text which specifies that cooperation is mandatory.
+ - Veil now works on equipped lights.
+ - Shadowlings now take correct amount of burn damage and in light and heal clone and brain damage in darkness.
+ - Fixes 'Round end code broke' displaying every round.
+ - Shadowlings who ascend will nore greentext properly.
+
+
Gun Hog updated:
+
+ - Thinktronic Systems, LTD. has increased the Value of the Value-PAK PDA cartridge! Standard issue for Captain PDAs, it can now access security bots, medibots, cleanbots, and floorbots ALL AT ONCE! In addition, it can also connect to your station's Newscaster network at NO EXTRA CHARGE! As a Thank you for our contract with them, they have thrown in Newscaster access for the HumanResources9001 cartridge, Heads of Personnel rejoice!
+ - The Newscaster app has also gotten a free upgrade which allows it to display images and comments inside of posts!
+ - Nanotrasen has concurrently released a patch for bots which will allow off-station bots to properly patrol.
+
+
Incoming5643 updated:
+
+ - Changeling head slugs have been given player control, ventcrawling, and a short escape period after egg laying.
+
+
MrStonedOne updated:
+
+ - Admin ghosts can now drag ghosts to mobs to put that ghost in control of that mob.
+
+
Xhuis updated:
+
+ - Nanotrasen scientists have recently observed a strange genome shift in green slimes. Experiments have shown that injection of radium into an active green slime extract will create a very unstable mutation toxin. Use with caution.
+
+
+
13 April 2015
+
AnturK updated:
+
+ - Spacemen have learned the basics of martial arts: Boxing, unleash it's power by wearing Boxing Gloves.
+ - While boxing you can't grab or disarm, but you hit harder with a knockout chance that scales off stamina damage above 50.
+ - Rumors have been heard of powerful martial styles avaliable only to the gods themselves.
+
+
CosmicScientist updated:
+
+ - Added a dehydrated space carp to traitor items, bought with telecrystals. Use dehydrated space carp in hand to school them on loyalty. Add water to create a vicious murder machine just for the halibut.
+ - The toy carp plushie now has attack verbs for fun, hit your friend with one today. I put my sole into this mod.
+ - If you can think of a better fish pun let minnow but I shouldn't leave it to salmon else.
+
+
Ikarrus updated:
+
+ - Gang bosses can no longer purchase certain potent traitor items but instead have access to some of a nuke op's arsenal of weapons.
+
+
Incoming5643 updated:
+
+ - Three new chemical types of blob can occur: Omnizine, Morphine and Space Drugs.
+
+
MrPerson updated:
+
+ - New lighting system! Lighting now smoothly transfers from one lighting level to the next.
+
+
Xhuis updated:
+
+ - There have been... odd sighting in Space Station 13's sector. Alien organisms have appeared on stations 57, 23, and outlying.
+ - Nanotrasen personnel have reason to believe that Space Station 13 is under attack by shadowlings. We have little intel on these creatures, but be on the lookout for odd behavior and dark areas. Use plenty of lights.
+
+
Zelacks updated:
+
+ - Defibs no longer have a minimum damage requirement for a successful revive. Patients will have 150 total damage on a successful revive.
+ - Additional feedback is given for several failure states of the defib.
+
+
xxalpha updated:
+
+ - Airlock crushing damage increased.
+
+
+
11 April 2015
+
Gun Hog updated:
+
+ - Nanotrasen has approved an access upgrade for Cargo Technicians! They are now authorized to release minerals from the ore redemption machine, to allow proper inventory management and shipping.
+
+
Iamgoofball updated:
+
+ - Blobbernauts no longer deal chemical damage, brute damage increased however.
+
+
Ikarrus updated:
+
+ - Getting converted by a rev or cultist will stun you for a few seconds.
+
+
Incoming5643 updated:
+
+ - Fixes some AI malf powers being usable when dead.
+
+
MrPerson updated:
+
+ - Reduces movement speed penalty from being cold.
+
+
Xhuis updated:
+
+ - Adds a pizza bomb traitor item for 4 telecrystals. It's a bomb, diguised as a pizza box. You can also attempt to defuse it by using wirecutters.
+
+
kingofkosmos updated:
+
+ - Activating internals with an adjusted breath mask will automatically push it up to normal state.
+ - Masks can now be adjusted when buckled to a chair.
+
+
optimumtact updated:
+
+ - Stun batons no longer lose charge over time when on.
+
+
phil235 updated:
+
+ - The AI holopads now use a popup window just like computers and other machines.
+ - Nerfs kinetic accelerator and plasma cutters. Plasma cutter is no longer in the mining vendor. Reduces the drilling cost of all drills.
+ - Adding 40+ new food and drink recipes, mostly using the newest plants. Notably rice recipes, burritos, nachos, salads, pizzas.
+ - Opening the tablecrafting window can now also be done by dragging the mouse from any food (that's on a table) onto you.
+ - The kitchen cabinet starts with one rice pack.
+ - Glasses with unknown reagent will no longer be always brown but will take the color of their reagents.
+
+
+
09 April 2015
+
Iamgoofball updated:
+
+ - Quite a lot of cleanables can now be scooped up with a beaker in order to acquire the contents.
+ - Light a piece of paper on fire with a lighter, and scoop up the ashes!
+ - Scoop up the flour the clown sprayed everywhere as a 'joke'!
+ - Scoop up the oil left behind by exploding robots for re-usage in chemistry!
+ - You can splash the contents of a beaker onto the floor to create a Chemical Pile! This pile can be heated or blown up and have the reagents take the effects. Make a string of black powder around a department in maint. and then heat it with a welder today!
+ - Reagents now can have processing effects when just sitting in a beaker.
+ - Pyrosium and Cryostylane now feed off of oxygen and heat/cool the beaker without having to be inside of a person!
+ - Reagents can now respond to explosions!
+ - Black Powder now instantly detonates if there is an explosion that effects it.
+ - Fire now heats up beakers and their contents!
+ - Activate some smoke powder in style by lighting the beaker on fire with a burning hot plasma fire!
+
+
RemieRichards updated:
+
+ - Ninja stars are summoned to your hand to be thrown rather than automatically targetting nearby mobs.
+ - Added Sword Recall: pulls your katana towards you, hitting mobs in the way. Free if within sight, cost scales with distance otherwise.
+ - Enemies can be electrocuted by a ninja as the cost of his energy, stunning and injuring them.
+ - Removed SpiderOS, functions moved to status panel.
+ - Fixed energy nets not anchoring target, katana emag spam and sound delay.
+
+
optimumtact updated:
+
+ - Mimes can't use megaphone without breaking their vow anymore.
+
+
phil235 updated:
+
+ - Flying animals no longer triggers mouse traps, bear traps or mines.
+
+
04 April 2015
ACCount updated:
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 032ce58f6b0..a14052090dd 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -2078,3 +2078,250 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
- tweak: Cauterizing a surgery wound will now heal some of the damage done by the
bonesaw if it was used as part of the same surgery.
- tweak: Added ability for Medical HUDs to detect cybernetic implants in humans.
+2015-04-09:
+ Iamgoofball:
+ - rscadd: Quite a lot of cleanables can now be scooped up with a beaker in order
+ to acquire the contents.
+ - rscadd: Light a piece of paper on fire with a lighter, and scoop up the ashes!
+ - rscadd: Scoop up the flour the clown sprayed everywhere as a 'joke'!
+ - rscadd: Scoop up the oil left behind by exploding robots for re-usage in chemistry!
+ - rscadd: You can splash the contents of a beaker onto the floor to create a Chemical
+ Pile! This pile can be heated or blown up and have the reagents take the effects.
+ Make a string of black powder around a department in maint. and then heat it
+ with a welder today!
+ - rscadd: Reagents now can have processing effects when just sitting in a beaker.
+ - rscadd: Pyrosium and Cryostylane now feed off of oxygen and heat/cool the beaker
+ without having to be inside of a person!
+ - rscadd: Reagents can now respond to explosions!
+ - rscadd: Black Powder now instantly detonates if there is an explosion that effects
+ it.
+ - rscadd: Fire now heats up beakers and their contents!
+ - rscadd: Activate some smoke powder in style by lighting the beaker on fire with
+ a burning hot plasma fire!
+ RemieRichards:
+ - tweak: Ninja stars are summoned to your hand to be thrown rather than automatically
+ targetting nearby mobs.
+ - rscadd: 'Added Sword Recall: pulls your katana towards you, hitting mobs in the
+ way. Free if within sight, cost scales with distance otherwise.'
+ - rscadd: Enemies can be electrocuted by a ninja as the cost of his energy, stunning
+ and injuring them.
+ - rscdel: Removed SpiderOS, functions moved to status panel.
+ - bugfix: Fixed energy nets not anchoring target, katana emag spam and sound delay.
+ optimumtact:
+ - bugfix: Mimes can't use megaphone without breaking their vow anymore.
+ phil235:
+ - tweak: Flying animals no longer triggers mouse traps, bear traps or mines.
+2015-04-11:
+ Gun Hog:
+ - tweak: Nanotrasen has approved an access upgrade for Cargo Technicians! They are
+ now authorized to release minerals from the ore redemption machine, to allow
+ proper inventory management and shipping.
+ Iamgoofball:
+ - tweak: Blobbernauts no longer deal chemical damage, brute damage increased however.
+ Ikarrus:
+ - experiment: Getting converted by a rev or cultist will stun you for a few seconds.
+ Incoming5643:
+ - bugfix: Fixes some AI malf powers being usable when dead.
+ MrPerson:
+ - tweak: Reduces movement speed penalty from being cold.
+ Xhuis:
+ - rscadd: Adds a pizza bomb traitor item for 4 telecrystals. It's a bomb, diguised
+ as a pizza box. You can also attempt to defuse it by using wirecutters.
+ kingofkosmos:
+ - rscadd: Activating internals with an adjusted breath mask will automatically push
+ it up to normal state.
+ - tweak: Masks can now be adjusted when buckled to a chair.
+ optimumtact:
+ - tweak: Stun batons no longer lose charge over time when on.
+ phil235:
+ - tweak: The AI holopads now use a popup window just like computers and other machines.
+ - rscdel: Nerfs kinetic accelerator and plasma cutters. Plasma cutter is no longer
+ in the mining vendor. Reduces the drilling cost of all drills.
+ - rscadd: Adding 40+ new food and drink recipes, mostly using the newest plants.
+ Notably rice recipes, burritos, nachos, salads, pizzas.
+ - tweak: Opening the tablecrafting window can now also be done by dragging the mouse
+ from any food (that's on a table) onto you.
+ - rscadd: The kitchen cabinet starts with one rice pack.
+ - tweak: Glasses with unknown reagent will no longer be always brown but will take
+ the color of their reagents.
+2015-04-13:
+ AnturK:
+ - rscadd: 'Spacemen have learned the basics of martial arts: Boxing, unleash it''s
+ power by wearing Boxing Gloves.'
+ - rscadd: While boxing you can't grab or disarm, but you hit harder with a knockout
+ chance that scales off stamina damage above 50.
+ - rscadd: Rumors have been heard of powerful martial styles avaliable only to the
+ gods themselves.
+ CosmicScientist:
+ - rscadd: Added a dehydrated space carp to traitor items, bought with telecrystals.
+ Use dehydrated space carp in hand to school them on loyalty. Add water to create
+ a vicious murder machine just for the halibut.
+ - tweak: The toy carp plushie now has attack verbs for fun, hit your friend with
+ one today. I put my sole into this mod.
+ - wip: If you can think of a better fish pun let minnow but I shouldn't leave it
+ to salmon else.
+ Ikarrus:
+ - tweak: Gang bosses can no longer purchase certain potent traitor items but instead
+ have access to some of a nuke op's arsenal of weapons.
+ Incoming5643:
+ - rscadd: 'Three new chemical types of blob can occur: Omnizine, Morphine and Space
+ Drugs.'
+ MrPerson:
+ - experiment: New lighting system! Lighting now smoothly transfers from one lighting
+ level to the next.
+ Xhuis:
+ - rscadd: There have been... odd sighting in Space Station 13's sector. Alien organisms
+ have appeared on stations 57, 23, and outlying.
+ - rscadd: Nanotrasen personnel have reason to believe that Space Station 13 is under
+ attack by shadowlings. We have little intel on these creatures, but be on the
+ lookout for odd behavior and dark areas. Use plenty of lights.
+ Zelacks:
+ - tweak: Defibs no longer have a minimum damage requirement for a successful revive.
+ Patients will have 150 total damage on a successful revive.
+ - tweak: Additional feedback is given for several failure states of the defib.
+ xxalpha:
+ - wip: Airlock crushing damage increased.
+2015-04-16:
+ AnturK:
+ - rscadd: Nanotrasen authorities are reporting sightings of unidentified space craft
+ near space station 13. Report any strange sightings or mental breakdowns to
+ central command.
+ - rscadd: 'PS : Abductions are not covered by health insurance.'
+ - rscadd: Shadowlings and their thralls now have HUD icons.
+ - rscadd: Thralls learn their master's objectives when enthralled.
+ - rscadd: Regenerate Chitin ability lets shadowlings re-equip their armor if lost.
+ - tweak: Loyalty implanted people take 25% longer to enthrall, but lose their implant
+ and become immune to re-implanting.
+ - experiment: Shadowlings now have a message in their spawning text which specifies
+ that cooperation is mandatory.
+ - bugfix: Veil now works on equipped lights.
+ - bugfix: Shadowlings now take correct amount of burn damage and in light and heal
+ clone and brain damage in darkness.
+ - bugfix: Fixes 'Round end code broke' displaying every round.
+ - bugfix: Shadowlings who ascend will nore greentext properly.
+ Gun Hog:
+ - rscadd: Thinktronic Systems, LTD. has increased the Value of the Value-PAK PDA
+ cartridge! Standard issue for Captain PDAs, it can now access security bots,
+ medibots, cleanbots, and floorbots ALL AT ONCE! In addition, it can also connect
+ to your station's Newscaster network at NO EXTRA CHARGE! As a Thank you for
+ our contract with them, they have thrown in Newscaster access for the HumanResources9001
+ cartridge, Heads of Personnel rejoice!
+ - tweak: The Newscaster app has also gotten a free upgrade which allows it to display
+ images and comments inside of posts!
+ - bugfix: Nanotrasen has concurrently released a patch for bots which will allow
+ off-station bots to properly patrol.
+ Incoming5643:
+ - rscadd: Changeling head slugs have been given player control, ventcrawling, and
+ a short escape period after egg laying.
+ MrStonedOne:
+ - rscadd: Admin ghosts can now drag ghosts to mobs to put that ghost in control
+ of that mob.
+ Xhuis:
+ - rscadd: Nanotrasen scientists have recently observed a strange genome shift in
+ green slimes. Experiments have shown that injection of radium into an active
+ green slime extract will create a very unstable mutation toxin. Use with caution.
+2015-04-19:
+ AnturK:
+ - bugfix: Observers can now see abductor hivemind messages.
+ - rscadd: 'Adds advanced baton for abductors: Stun, Sleep and Cuff in one tool.'
+ - rscadd: Abductor agents now have vest cameras.
+ - imageadd: New sprites for abductors and their gear made by Ausops.
+ Fayrik:
+ - rscadd: Added jobban options for Abductors and Deathsquads.
+ - tweak: Made admin antag spawning buttons more efficient and less prone to failure.
+ Xhuis:
+ - rscadd: Recent sightings aboard space stations shows that spirits seem to be manifesting
+ as malevolent revenants and draining the life of crew. The chaplain may be helpful
+ in stopping this new threat.
+ kingofkosmos:
+ - wip: Girder and machine frame construction protocols has been changed. They can
+ now be secured/unsecured with a wrench and disassembled with a welder.
+2015-04-20:
+ Fayrik:
+ - rscadd: Abductors now get advanced camera consoles.
+ - tweak: Redesigned Centcom again. There's a bar at the thunderdome now.
+ - rscadd: Headsets can now be locked to a spesific frequency, this only occurs for
+ nuke ops and deathsquads.
+ - rscadd: The Centcom channel is now available over all z-levels, regardless of
+ telecomms status.
+ - tweak: The Deathsquad space suits have been upgraded to hardsuits.
+ - rscadd: The Deathsquad now have thermal imaging huds, which can swap which hud
+ they display on the fly.
+ phil235:
+ - tweak: Reagents are now back to being metabolized every tick. Fixes frost oil
+ and capsaicin not working.
+ - tweak: Fixes not being able to make sterilizine.
+ - rscadd: Adding overdose to space drug, causing mild hallucination and toxin and
+ brain damage.
+ - tweak: Nerfed healing power of stimulant reagent. Buffed ephedrine a bit.
+ - rscadd: Nitroglycerin can now be stabilized with stabilizing agent, and explodes
+ when heated.
+2015-04-21:
+ Ikarrus:
+ - wip: Gang mode has had some considerable work done on it, including a new objective
+ and currency dynamic.
+ - rscadd: New objective: Claim half the station as territory by tagging it
+ with spray cans supplied to gang bosses, but usable by any member.
+ - wip: An area can only be tagged by one gang at a time, remove your opponent's
+ tag or spray over it.
+ - rscadd: New recruitment: Recruiment pens replace flashes, stab people to
+ recruit them.
+ - experiment: Recruitment is silent, but causes brief seizures and has a cooldown
+ that scales upwards with a gang's size.
+ - rscadd: New tool: The Gangtool is used by bosses and lieutenants to recall
+ the shuttle and purchase supplies.
+ - rscadd: Pistols, ammo, spraycans, recruitment pens and additional gangtools can
+ all be bought.
+ - tweak: Gangtools also alert the user of promotions, purchases and territory changes
+ within the gang.
+ - rscadd: Lieutenants are promoted from gang members when given their own gangtool;
+ they're immune to deconversion and able to do anything a boss can except promotion.
+ - rscadd: New currency: Influence is used to purchase with the gangtool and
+ is generated every 5 minutes by each territory owned by the gang.
+ - tweak: Thermite can be cleaned off walls now.
+2015-04-22:
+ Incoming5643:
+ - rscadd: 'Adds a new fun button for admins: ''Set Round End Sound''. You can use
+ the set round end sound button to set the round end sound. Glad we cleared that
+ up!'
+ Miauw62:
+ - wip: Very slightly expanded atmos and added an external airlock.
+ Xhuis:
+ - bugfix: A few issues have been fixed for revenants. In addition, the Mind Blast/Mind
+ Spike sound effect has been removed.
+ - rscadd: Adds the Hypnotize ability to revenants. It will cause a target to fall
+ asleep after a short time.
+ xxalpha:
+ - rscadd: Added an Exosuit Mining Scanner to the robotics fabricator.
+ - tweak: Buffed Ripley's movement and drilling speed in low pressure environments.
+2015-04-25:
+ Boggart:
+ - rscadd: Ports Nienhaus's guitar, generalizes handheld instrument code.
+ - rscadd: Fixes being unable to build disposal pipes on walls, makes changing the
+ RPD's settings not affect pipes that are currently building, makes the RPD use
+ the datum/browser ui, makes it use categories and makes it show the selected
+ mode.
+ Gun Hog:
+ - rscadd: Nanotrasen has provided designs for fabrication of APC power control modules.
+ You may print them at any autolathe.
+ Ikarrus:
+ - rscadd: Gangs can now purchase switchblades, a relatively cheap and decently robust
+ melee weapon.
+ - tweak: Gangs now require at least 66% control of the station to win.
+ - tweak: Gang spraycan uses reduced to 15.
+ - tweak: Pistol cost increased to 30 Influence
+ - tweak: Promotions now start off cheap at 20 influence but get more expensive the
+ more people you promote.
+ Xhuis:
+ - rscadd: Added a Create Antagonist button for revenants.
+ - rscdel: Removed Mind Blast.
+ - bugfix: Revenants no longer get killed by explosions.
+ - tweak: Mind spike cooldown increased to 4 seconds.
+ - tweak: Harvest now takes 8 seconds and requires you to be adjacent to the target.
+ - tweak: Hypnotise sleeps targets for longer.
+ - tweak: Revenant now starts with 3 strikes.
+ phil235:
+ - tweak: Telecom machines are now deconstructed the same way as all other constructable
+ machines.
+ - tweak: You can no longer overdose on nicotine but you can get addicted (very mild
+ effects).
diff --git a/html/changelogs/Iamgoofball-ReagentDecals.yml b/html/changelogs/Iamgoofball-ReagentDecals.yml
deleted file mode 100644
index 10d4c764d9a..00000000000
--- a/html/changelogs/Iamgoofball-ReagentDecals.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-# Your name.
-author: Iamgoofball
-
-# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
-delete-after: True
-
-# Any changes you've made. See valid prefix list above.
-# INDENT WITH TWO SPACES. NOT TABS. SPACES.
-# SCREW THIS UP AND IT WON'T WORK.
-# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit.
-# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
-changes:
- - rscadd: "Quite a lot of cleanables can now be scooped up with a beaker in order to acquire the contents."
- - rscadd: "Light a piece of paper on fire with a lighter, and scoop up the ashes!"
- - rscadd: "Scoop up the flour the clown sprayed everywhere as a "joke"!"
- - rscadd: "Scoop up the oil left behind by exploding robots for re-usage in chemistry!"
- - rscadd: "You can splash the contents of a beaker onto the floor to create a Chemical Pile! This pile can be heated or blown up and have the reagents take the effects. Make a string of black powder around a department in maint. and then heat it with a welder today!"
- - rscadd: "Reagents now can have processing effects when just sitting in a beaker."
- - rscadd: "Pyrosium and Cryostylane now feed off of oxygen and heat/cool the beaker without having to be inside of a person!"
- - rscadd: "Reagents can now respond to explosions!"
- - rscadd: "Black Powder now instantly detonates if there is an explosion that effects it."
- - rscadd: "Fire now heats up beakers and their contents!"
- - rscadd: "Activate some smoke powder in style by lighting the beaker on fire with a burning hot plasma fire!"
\ No newline at end of file
diff --git a/html/changelogs/Ikarrus-gang5.yml b/html/changelogs/Ikarrus-gang5.yml
new file mode 100644
index 00000000000..9716bc9d8a5
--- /dev/null
+++ b/html/changelogs/Ikarrus-gang5.yml
@@ -0,0 +1,10 @@
+author: Ikarrus
+
+delete-after: True
+
+changes:
+ - rscadd: "Spraycans and crayons can now draw Poseur Tags, aka Fake Gang Tags, as grafiti."
+ - tweak: "Gangs Capture goal reduced to 60%"
+ - tweak: "Influence income changed to provide weaker gangs a bigger boost, while slowing down stronger gangs to promote opportunity for comebacks."
+ - tweak: "Gangs only earn influence on territories they have held on to since the previous Status Report (the income calculation every 5 minutes). This places more significance on defending your existing territory."
+ - bugfix: "You must be in the territory physically to tag it now. So no more tagging everything from maint."
\ No newline at end of file
diff --git a/html/changelogs/RemieRichards-PR-9090.yml b/html/changelogs/RemieRichards-PR-9090.yml
new file mode 100644
index 00000000000..7fc9dbe8c21
--- /dev/null
+++ b/html/changelogs/RemieRichards-PR-9090.yml
@@ -0,0 +1,6 @@
+author: RemieRichards
+delete-after: True
+changes:
+ - rscadd: "Ports VG's Ventcrawling overhaul!"
+ - tweak: "Crawling through vents is no longer instant, you now have to move and navigate manually"
+ - rscadd: "While inside pipes and other atmos machinery, you now see pipe vision"
diff --git a/html/changelogs/phil235-BeartrapFix.yml b/html/changelogs/phil235-BeartrapFix.yml
deleted file mode 100644
index 6b8ba68298e..00000000000
--- a/html/changelogs/phil235-BeartrapFix.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-author: phil235
-
-delete-after: True
-
-changes:
- - tweak: "flying animals no longer triggers mouse traps, bear traps or mines."
-
diff --git a/icons/effects/alphacolors.dmi b/icons/effects/alphacolors.dmi
index 02316fbf64d..74452b58dcf 100644
Binary files a/icons/effects/alphacolors.dmi and b/icons/effects/alphacolors.dmi differ
diff --git a/icons/effects/crayondecal.dmi b/icons/effects/crayondecal.dmi
index e22bf5c64b9..5525d3b1cbf 100644
Binary files a/icons/effects/crayondecal.dmi and b/icons/effects/crayondecal.dmi differ
diff --git a/icons/effects/effects.dmi b/icons/effects/effects.dmi
index 0b9074d181b..1fe7f1c5713 100644
Binary files a/icons/effects/effects.dmi and b/icons/effects/effects.dmi differ
diff --git a/icons/effects/water.dmi b/icons/effects/water.dmi
index e6387973bf8..b980915653d 100644
Binary files a/icons/effects/water.dmi and b/icons/effects/water.dmi differ
diff --git a/icons/mecha/mecha_equipment.dmi b/icons/mecha/mecha_equipment.dmi
index 96687396a37..930d0685de4 100644
Binary files a/icons/mecha/mecha_equipment.dmi and b/icons/mecha/mecha_equipment.dmi differ
diff --git a/icons/mob/actions.dmi b/icons/mob/actions.dmi
new file mode 100644
index 00000000000..bc98f542874
Binary files /dev/null and b/icons/mob/actions.dmi differ
diff --git a/icons/mob/animal.dmi b/icons/mob/animal.dmi
index 672d83db4da..0997a3676f5 100644
Binary files a/icons/mob/animal.dmi and b/icons/mob/animal.dmi differ
diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi
index de23909c72f..04b6d65e00c 100644
Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ
diff --git a/icons/mob/hud.dmi b/icons/mob/hud.dmi
index a9746f5b5c3..84ed7d9fc07 100644
Binary files a/icons/mob/hud.dmi and b/icons/mob/hud.dmi differ
diff --git a/icons/mob/human.dmi b/icons/mob/human.dmi
index 39b58a18272..1f29999f1a7 100644
Binary files a/icons/mob/human.dmi and b/icons/mob/human.dmi differ
diff --git a/icons/mob/human_face.dmi b/icons/mob/human_face.dmi
index a80ad0382f8..f7a5528eda3 100644
Binary files a/icons/mob/human_face.dmi and b/icons/mob/human_face.dmi differ
diff --git a/icons/mob/inhands/guns_lefthand.dmi b/icons/mob/inhands/guns_lefthand.dmi
index 7f449152507..25337a3ae20 100644
Binary files a/icons/mob/inhands/guns_lefthand.dmi and b/icons/mob/inhands/guns_lefthand.dmi differ
diff --git a/icons/mob/inhands/guns_righthand.dmi b/icons/mob/inhands/guns_righthand.dmi
index 569aa7a2ded..470c1756985 100644
Binary files a/icons/mob/inhands/guns_righthand.dmi and b/icons/mob/inhands/guns_righthand.dmi differ
diff --git a/icons/mob/inhands/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi
index c23c2b987dc..9a75e1666b5 100644
Binary files a/icons/mob/inhands/items_lefthand.dmi and b/icons/mob/inhands/items_lefthand.dmi differ
diff --git a/icons/mob/inhands/items_righthand.dmi b/icons/mob/inhands/items_righthand.dmi
index 51534f8225e..17fdcfdd538 100644
Binary files a/icons/mob/inhands/items_righthand.dmi and b/icons/mob/inhands/items_righthand.dmi differ
diff --git a/icons/mob/mob.dmi b/icons/mob/mob.dmi
index 9a1d08d0dbe..ee03734f007 100644
Binary files a/icons/mob/mob.dmi and b/icons/mob/mob.dmi differ
diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi
index af783f10da5..1dce6fa6429 100644
Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ
diff --git a/icons/mob/underwear.dmi b/icons/mob/underwear.dmi
index d28501b353c..15919bf8ae7 100644
Binary files a/icons/mob/underwear.dmi and b/icons/mob/underwear.dmi differ
diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi
index 6b1fab51883..1ffa26810ac 100644
Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ
diff --git a/icons/obj/abductor.dmi b/icons/obj/abductor.dmi
new file mode 100644
index 00000000000..dbb322992eb
Binary files /dev/null and b/icons/obj/abductor.dmi differ
diff --git a/icons/obj/atmospherics/unary_devices.dmi b/icons/obj/atmospherics/unary_devices.dmi
index 60dec4db9a3..bc43f452e17 100644
Binary files a/icons/obj/atmospherics/unary_devices.dmi and b/icons/obj/atmospherics/unary_devices.dmi differ
diff --git a/icons/obj/barsigns.dmi b/icons/obj/barsigns.dmi
index ae720ac6cd2..89cf1610f74 100644
Binary files a/icons/obj/barsigns.dmi and b/icons/obj/barsigns.dmi differ
diff --git a/icons/obj/bureaucracy.dmi b/icons/obj/bureaucracy.dmi
index 5ad94298551..3e50217bb16 100644
Binary files a/icons/obj/bureaucracy.dmi and b/icons/obj/bureaucracy.dmi differ
diff --git a/icons/obj/closet.dmi b/icons/obj/closet.dmi
index 83dc8c5874e..b222152c602 100644
Binary files a/icons/obj/closet.dmi and b/icons/obj/closet.dmi differ
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index 79e23dafd65..e6157b2bbb4 100644
Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ
diff --git a/icons/obj/crayons.dmi b/icons/obj/crayons.dmi
index 7d3489285c3..a3966103053 100644
Binary files a/icons/obj/crayons.dmi and b/icons/obj/crayons.dmi differ
diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi
index 36224612d34..f2e01a166fa 100644
Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ
diff --git a/icons/obj/economy.dmi b/icons/obj/economy.dmi
index f096851d1e8..4b65337dbee 100644
Binary files a/icons/obj/economy.dmi and b/icons/obj/economy.dmi differ
diff --git a/icons/obj/food.dmi b/icons/obj/food.dmi
deleted file mode 100644
index 89112e632d9..00000000000
Binary files a/icons/obj/food.dmi and /dev/null differ
diff --git a/icons/obj/food/burgerbread.dmi b/icons/obj/food/burgerbread.dmi
new file mode 100644
index 00000000000..b7e1165b674
Binary files /dev/null and b/icons/obj/food/burgerbread.dmi differ
diff --git a/icons/obj/food/containers.dmi b/icons/obj/food/containers.dmi
new file mode 100644
index 00000000000..89af09b0d20
Binary files /dev/null and b/icons/obj/food/containers.dmi differ
diff --git a/icons/obj/food/food.dmi b/icons/obj/food/food.dmi
new file mode 100644
index 00000000000..7bab43843a2
Binary files /dev/null and b/icons/obj/food/food.dmi differ
diff --git a/icons/obj/food/food_ingredients.dmi b/icons/obj/food/food_ingredients.dmi
new file mode 100644
index 00000000000..b761943de00
Binary files /dev/null and b/icons/obj/food/food_ingredients.dmi differ
diff --git a/icons/obj/food/piecake.dmi b/icons/obj/food/piecake.dmi
new file mode 100644
index 00000000000..58cc44e5688
Binary files /dev/null and b/icons/obj/food/piecake.dmi differ
diff --git a/icons/obj/food/pizzaspaghetti.dmi b/icons/obj/food/pizzaspaghetti.dmi
new file mode 100644
index 00000000000..8fb643c03ca
Binary files /dev/null and b/icons/obj/food/pizzaspaghetti.dmi differ
diff --git a/icons/obj/food/soupsalad.dmi b/icons/obj/food/soupsalad.dmi
new file mode 100644
index 00000000000..fe4c07362af
Binary files /dev/null and b/icons/obj/food/soupsalad.dmi differ
diff --git a/icons/obj/food_ingredients.dmi b/icons/obj/food_ingredients.dmi
deleted file mode 100644
index b5504ea1546..00000000000
Binary files a/icons/obj/food_ingredients.dmi and /dev/null differ
diff --git a/icons/obj/guns/energy.dmi b/icons/obj/guns/energy.dmi
index 76f629b26f2..ff23c626c9f 100644
Binary files a/icons/obj/guns/energy.dmi and b/icons/obj/guns/energy.dmi differ
diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi
index 4234dc72af5..b91bec2571b 100644
Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ
diff --git a/icons/obj/machines/telecomms.dmi b/icons/obj/machines/telecomms.dmi
new file mode 100644
index 00000000000..f47fcc63f87
Binary files /dev/null and b/icons/obj/machines/telecomms.dmi differ
diff --git a/icons/obj/musician.dmi b/icons/obj/musician.dmi
index b0a0efe03af..f191f97fca6 100644
Binary files a/icons/obj/musician.dmi and b/icons/obj/musician.dmi differ
diff --git a/icons/obj/stationobjs.dmi b/icons/obj/stationobjs.dmi
index edb1b1fe792..a30ab24fcbe 100644
Binary files a/icons/obj/stationobjs.dmi and b/icons/obj/stationobjs.dmi differ
diff --git a/icons/obj/structures.dmi b/icons/obj/structures.dmi
index adaa8481569..ccdac8d866d 100644
Binary files a/icons/obj/structures.dmi and b/icons/obj/structures.dmi differ
diff --git a/icons/obj/weapons.dmi b/icons/obj/weapons.dmi
index e2d406a6c91..9b5be0100e8 100644
Binary files a/icons/obj/weapons.dmi and b/icons/obj/weapons.dmi differ
diff --git a/icons/turf/floors.dmi b/icons/turf/floors.dmi
index 9894e89c626..15ec64bf77e 100644
Binary files a/icons/turf/floors.dmi and b/icons/turf/floors.dmi differ
diff --git a/icons/turf/walls.dmi b/icons/turf/walls.dmi
index d129a462dff..c9ab9f06a05 100644
Binary files a/icons/turf/walls.dmi and b/icons/turf/walls.dmi differ
diff --git a/interface/stylesheet.dm b/interface/stylesheet.dm
index 824d72b31a1..411af48189e 100644
--- a/interface/stylesheet.dm
+++ b/interface/stylesheet.dm
@@ -63,6 +63,7 @@ h1.alert, h2.alert {color: #000000;}
.unconscious {color: #0000ff; font-weight: bold;}
.suicide {color: #ff5050; font-style: italic;}
.green {color: #03ff39;}
+.shadowling {color: #311648;}
.newscaster {color: #800000;}
.ghostalert {color: #5c00e6; font-style: italic; font-weight: bold;}
@@ -76,6 +77,10 @@ h1.alert, h2.alert {color: #000000;}
.sans {font-family: "Comic Sans MS", cursive, sans-serif;}
.robot {font-family: "Courier New", cursive, sans-serif;}
+.big {font-size: 3;}
+.greentext {color: #00FF00; font-size: 3;}
+.redtext {color: #FF0000; font-size: 3;}
+
BIG IMG.icon {width: 32px; height: 32px;}
"}
diff --git a/sound/guitar/Ab3.ogg b/sound/guitar/Ab3.ogg
new file mode 100644
index 00000000000..6e242786c40
Binary files /dev/null and b/sound/guitar/Ab3.ogg differ
diff --git a/sound/guitar/Ab4.ogg b/sound/guitar/Ab4.ogg
new file mode 100644
index 00000000000..6f854ea5d3f
Binary files /dev/null and b/sound/guitar/Ab4.ogg differ
diff --git a/sound/guitar/Ab5.ogg b/sound/guitar/Ab5.ogg
new file mode 100644
index 00000000000..53ba1c01520
Binary files /dev/null and b/sound/guitar/Ab5.ogg differ
diff --git a/sound/guitar/Ab6.ogg b/sound/guitar/Ab6.ogg
new file mode 100644
index 00000000000..d0a238ba607
Binary files /dev/null and b/sound/guitar/Ab6.ogg differ
diff --git a/sound/guitar/An3.ogg b/sound/guitar/An3.ogg
new file mode 100644
index 00000000000..1f06e6d4f28
Binary files /dev/null and b/sound/guitar/An3.ogg differ
diff --git a/sound/guitar/An4.ogg b/sound/guitar/An4.ogg
new file mode 100644
index 00000000000..f3354df46b9
Binary files /dev/null and b/sound/guitar/An4.ogg differ
diff --git a/sound/guitar/An5.ogg b/sound/guitar/An5.ogg
new file mode 100644
index 00000000000..fc3b1b345c9
Binary files /dev/null and b/sound/guitar/An5.ogg differ
diff --git a/sound/guitar/An6.ogg b/sound/guitar/An6.ogg
new file mode 100644
index 00000000000..f58a50d2a65
Binary files /dev/null and b/sound/guitar/An6.ogg differ
diff --git a/sound/guitar/Bb3.ogg b/sound/guitar/Bb3.ogg
new file mode 100644
index 00000000000..e88343d88fb
Binary files /dev/null and b/sound/guitar/Bb3.ogg differ
diff --git a/sound/guitar/Bb4.ogg b/sound/guitar/Bb4.ogg
new file mode 100644
index 00000000000..11b883285da
Binary files /dev/null and b/sound/guitar/Bb4.ogg differ
diff --git a/sound/guitar/Bb5.ogg b/sound/guitar/Bb5.ogg
new file mode 100644
index 00000000000..5d9b10f87a6
Binary files /dev/null and b/sound/guitar/Bb5.ogg differ
diff --git a/sound/guitar/Bb6.ogg b/sound/guitar/Bb6.ogg
new file mode 100644
index 00000000000..c7f11ef59a6
Binary files /dev/null and b/sound/guitar/Bb6.ogg differ
diff --git a/sound/guitar/Bn3.ogg b/sound/guitar/Bn3.ogg
new file mode 100644
index 00000000000..0d6022369fa
Binary files /dev/null and b/sound/guitar/Bn3.ogg differ
diff --git a/sound/guitar/Bn4.ogg b/sound/guitar/Bn4.ogg
new file mode 100644
index 00000000000..7e8682d5ff0
Binary files /dev/null and b/sound/guitar/Bn4.ogg differ
diff --git a/sound/guitar/Bn5.ogg b/sound/guitar/Bn5.ogg
new file mode 100644
index 00000000000..1912da7f66c
Binary files /dev/null and b/sound/guitar/Bn5.ogg differ
diff --git a/sound/guitar/Bn6.ogg b/sound/guitar/Bn6.ogg
new file mode 100644
index 00000000000..985ec744dfb
Binary files /dev/null and b/sound/guitar/Bn6.ogg differ
diff --git a/sound/guitar/Cb4.ogg b/sound/guitar/Cb4.ogg
new file mode 100644
index 00000000000..0d6022369fa
Binary files /dev/null and b/sound/guitar/Cb4.ogg differ
diff --git a/sound/guitar/Cb5.ogg b/sound/guitar/Cb5.ogg
new file mode 100644
index 00000000000..7e8682d5ff0
Binary files /dev/null and b/sound/guitar/Cb5.ogg differ
diff --git a/sound/guitar/Cb6.ogg b/sound/guitar/Cb6.ogg
new file mode 100644
index 00000000000..1912da7f66c
Binary files /dev/null and b/sound/guitar/Cb6.ogg differ
diff --git a/sound/guitar/Cb7.ogg b/sound/guitar/Cb7.ogg
new file mode 100644
index 00000000000..985ec744dfb
Binary files /dev/null and b/sound/guitar/Cb7.ogg differ
diff --git a/sound/guitar/Cn4.ogg b/sound/guitar/Cn4.ogg
new file mode 100644
index 00000000000..0279b73f8bd
Binary files /dev/null and b/sound/guitar/Cn4.ogg differ
diff --git a/sound/guitar/Cn5.ogg b/sound/guitar/Cn5.ogg
new file mode 100644
index 00000000000..ece600a6c1a
Binary files /dev/null and b/sound/guitar/Cn5.ogg differ
diff --git a/sound/guitar/Cn6.ogg b/sound/guitar/Cn6.ogg
new file mode 100644
index 00000000000..8c2fecc62aa
Binary files /dev/null and b/sound/guitar/Cn6.ogg differ
diff --git a/sound/guitar/Db4.ogg b/sound/guitar/Db4.ogg
new file mode 100644
index 00000000000..8a14f1f8365
Binary files /dev/null and b/sound/guitar/Db4.ogg differ
diff --git a/sound/guitar/Db5.ogg b/sound/guitar/Db5.ogg
new file mode 100644
index 00000000000..46a67f20ce0
Binary files /dev/null and b/sound/guitar/Db5.ogg differ
diff --git a/sound/guitar/Db6.ogg b/sound/guitar/Db6.ogg
new file mode 100644
index 00000000000..a07095c6033
Binary files /dev/null and b/sound/guitar/Db6.ogg differ
diff --git a/sound/guitar/Dn4.ogg b/sound/guitar/Dn4.ogg
new file mode 100644
index 00000000000..587099a0ddc
Binary files /dev/null and b/sound/guitar/Dn4.ogg differ
diff --git a/sound/guitar/Dn5.ogg b/sound/guitar/Dn5.ogg
new file mode 100644
index 00000000000..d6a9c38415a
Binary files /dev/null and b/sound/guitar/Dn5.ogg differ
diff --git a/sound/guitar/Dn6.ogg b/sound/guitar/Dn6.ogg
new file mode 100644
index 00000000000..4e44d5e72fe
Binary files /dev/null and b/sound/guitar/Dn6.ogg differ
diff --git a/sound/guitar/Eb4.ogg b/sound/guitar/Eb4.ogg
new file mode 100644
index 00000000000..1f93c8273d1
Binary files /dev/null and b/sound/guitar/Eb4.ogg differ
diff --git a/sound/guitar/Eb5.ogg b/sound/guitar/Eb5.ogg
new file mode 100644
index 00000000000..5b795377f38
Binary files /dev/null and b/sound/guitar/Eb5.ogg differ
diff --git a/sound/guitar/Eb6.ogg b/sound/guitar/Eb6.ogg
new file mode 100644
index 00000000000..5febf7a37b3
Binary files /dev/null and b/sound/guitar/Eb6.ogg differ
diff --git a/sound/guitar/En3.ogg b/sound/guitar/En3.ogg
new file mode 100644
index 00000000000..d9679bd78ea
Binary files /dev/null and b/sound/guitar/En3.ogg differ
diff --git a/sound/guitar/En4.ogg b/sound/guitar/En4.ogg
new file mode 100644
index 00000000000..50dad80f506
Binary files /dev/null and b/sound/guitar/En4.ogg differ
diff --git a/sound/guitar/En5.ogg b/sound/guitar/En5.ogg
new file mode 100644
index 00000000000..8617c069201
Binary files /dev/null and b/sound/guitar/En5.ogg differ
diff --git a/sound/guitar/En6.ogg b/sound/guitar/En6.ogg
new file mode 100644
index 00000000000..a487ce33e4b
Binary files /dev/null and b/sound/guitar/En6.ogg differ
diff --git a/sound/guitar/Fb3.ogg b/sound/guitar/Fb3.ogg
new file mode 100644
index 00000000000..d9679bd78ea
Binary files /dev/null and b/sound/guitar/Fb3.ogg differ
diff --git a/sound/guitar/Fb4.ogg b/sound/guitar/Fb4.ogg
new file mode 100644
index 00000000000..50dad80f506
Binary files /dev/null and b/sound/guitar/Fb4.ogg differ
diff --git a/sound/guitar/Fb5.ogg b/sound/guitar/Fb5.ogg
new file mode 100644
index 00000000000..8617c069201
Binary files /dev/null and b/sound/guitar/Fb5.ogg differ
diff --git a/sound/guitar/Fb6.ogg b/sound/guitar/Fb6.ogg
new file mode 100644
index 00000000000..a487ce33e4b
Binary files /dev/null and b/sound/guitar/Fb6.ogg differ
diff --git a/sound/guitar/Fn3.ogg b/sound/guitar/Fn3.ogg
new file mode 100644
index 00000000000..4e37dc58126
Binary files /dev/null and b/sound/guitar/Fn3.ogg differ
diff --git a/sound/guitar/Fn4.ogg b/sound/guitar/Fn4.ogg
new file mode 100644
index 00000000000..3bf9957d48a
Binary files /dev/null and b/sound/guitar/Fn4.ogg differ
diff --git a/sound/guitar/Fn5.ogg b/sound/guitar/Fn5.ogg
new file mode 100644
index 00000000000..ad0a0ecec79
Binary files /dev/null and b/sound/guitar/Fn5.ogg differ
diff --git a/sound/guitar/Fn6.ogg b/sound/guitar/Fn6.ogg
new file mode 100644
index 00000000000..50457e7bf4c
Binary files /dev/null and b/sound/guitar/Fn6.ogg differ
diff --git a/sound/guitar/Gb3.ogg b/sound/guitar/Gb3.ogg
new file mode 100644
index 00000000000..1b2e6c503de
Binary files /dev/null and b/sound/guitar/Gb3.ogg differ
diff --git a/sound/guitar/Gb4.ogg b/sound/guitar/Gb4.ogg
new file mode 100644
index 00000000000..122a0c5c17d
Binary files /dev/null and b/sound/guitar/Gb4.ogg differ
diff --git a/sound/guitar/Gb5.ogg b/sound/guitar/Gb5.ogg
new file mode 100644
index 00000000000..b0346e2f365
Binary files /dev/null and b/sound/guitar/Gb5.ogg differ
diff --git a/sound/guitar/Gb6.ogg b/sound/guitar/Gb6.ogg
new file mode 100644
index 00000000000..4f873de27cf
Binary files /dev/null and b/sound/guitar/Gb6.ogg differ
diff --git a/sound/guitar/Gn3.ogg b/sound/guitar/Gn3.ogg
new file mode 100644
index 00000000000..783cded9fe5
Binary files /dev/null and b/sound/guitar/Gn3.ogg differ
diff --git a/sound/guitar/Gn4.ogg b/sound/guitar/Gn4.ogg
new file mode 100644
index 00000000000..92f9cd2fd9d
Binary files /dev/null and b/sound/guitar/Gn4.ogg differ
diff --git a/sound/guitar/Gn5.ogg b/sound/guitar/Gn5.ogg
new file mode 100644
index 00000000000..42fdebc209b
Binary files /dev/null and b/sound/guitar/Gn5.ogg differ
diff --git a/sound/guitar/Gn6.ogg b/sound/guitar/Gn6.ogg
new file mode 100644
index 00000000000..a36bf38f001
Binary files /dev/null and b/sound/guitar/Gn6.ogg differ
diff --git a/sound/machines/ventcrawl.ogg b/sound/machines/ventcrawl.ogg
new file mode 100644
index 00000000000..2df8b5c8981
Binary files /dev/null and b/sound/machines/ventcrawl.ogg differ
diff --git a/tgstation.dme b/tgstation.dme
index 1843f02fe78..5ff1207a086 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -76,6 +76,7 @@
#include "code\_onclick\overmind.dm"
#include "code\_onclick\telekinesis.dm"
#include "code\_onclick\hud\_defines.dm"
+#include "code\_onclick\hud\action.dm"
#include "code\_onclick\hud\ai.dm"
#include "code\_onclick\hud\alert.dm"
#include "code\_onclick\hud\alien.dm"
@@ -118,7 +119,6 @@
#include "code\ATMOSPHERICS\pipes\simple.dm"
#include "code\ATMOSPHERICS\pipes\tank.dm"
#include "code\ATMOSPHERICS\pipes\vent.dm"
-#include "code\controllers\_DynamicAreaLighting_TG.dm"
#include "code\controllers\configuration.dm"
#include "code\controllers\failsafe.dm"
#include "code\controllers\master_controller.dm"
@@ -154,6 +154,7 @@
#include "code\datums\datumvars.dm"
#include "code\datums\gas_mixture.dm"
#include "code\datums\hud.dm"
+#include "code\datums\martial.dm"
#include "code\datums\mind.dm"
#include "code\datums\mixed.dm"
#include "code\datums\modules.dm"
@@ -214,6 +215,7 @@
#include "code\datums\helper_datums\events.dm"
#include "code\datums\helper_datums\getrev.dm"
#include "code\datums\helper_datums\global_iterator.dm"
+#include "code\datums\helper_datums\icon_snapshot.dm"
#include "code\datums\helper_datums\teleport.dm"
#include "code\datums\helper_datums\topic_input.dm"
#include "code\datums\spells\area_teleport.dm"
@@ -280,6 +282,15 @@
#include "code\game\gamemodes\objective.dm"
#include "code\game\gamemodes\objective_items.dm"
#include "code\game\gamemodes\setupgame.dm"
+#include "code\game\gamemodes\abduction\abduction.dm"
+#include "code\game\gamemodes\abduction\abduction_gear.dm"
+#include "code\game\gamemodes\abduction\abduction_surgery.dm"
+#include "code\game\gamemodes\abduction\gland.dm"
+#include "code\game\gamemodes\abduction\machinery\camera.dm"
+#include "code\game\gamemodes\abduction\machinery\console.dm"
+#include "code\game\gamemodes\abduction\machinery\dispenser.dm"
+#include "code\game\gamemodes\abduction\machinery\experiment.dm"
+#include "code\game\gamemodes\abduction\machinery\pad.dm"
#include "code\game\gamemodes\blob\blob.dm"
#include "code\game\gamemodes\blob\blob_finish.dm"
#include "code\game\gamemodes\blob\blob_report.dm"
@@ -337,6 +348,10 @@
#include "code\game\gamemodes\sandbox\airlock_maker.dm"
#include "code\game\gamemodes\sandbox\h_sandbox.dm"
#include "code\game\gamemodes\sandbox\sandbox.dm"
+#include "code\game\gamemodes\shadowling\shadowling.dm"
+#include "code\game\gamemodes\shadowling\shadowling_abilities.dm"
+#include "code\game\gamemodes\shadowling\shadowling_items.dm"
+#include "code\game\gamemodes\shadowling\special_shadowling_abilities.dm"
#include "code\game\gamemodes\traitor\double_agents.dm"
#include "code\game\gamemodes\traitor\traitor.dm"
#include "code\game\gamemodes\wizard\artefact.dm"
@@ -431,6 +446,7 @@
#include "code\game\machinery\computer\atmos_alert.dm"
#include "code\game\machinery\computer\buildandrepair.dm"
#include "code\game\machinery\computer\camera.dm"
+#include "code\game\machinery\computer\camera_advanced.dm"
#include "code\game\machinery\computer\card.dm"
#include "code\game\machinery\computer\cloning.dm"
#include "code\game\machinery\computer\communications.dm"
@@ -467,13 +483,20 @@
#include "code\game\machinery\embedded_controller\simple_vent_controller.dm"
#include "code\game\machinery\pipe\construction.dm"
#include "code\game\machinery\pipe\pipe_dispenser.dm"
-#include "code\game\machinery\telecomms\broadcaster.dm"
-#include "code\game\machinery\telecomms\logbrowser.dm"
+#include "code\game\machinery\telecomms\broadcasting.dm"
#include "code\game\machinery\telecomms\machine_interactions.dm"
-#include "code\game\machinery\telecomms\presets.dm"
#include "code\game\machinery\telecomms\telecomunications.dm"
-#include "code\game\machinery\telecomms\telemonitor.dm"
-#include "code\game\machinery\telecomms\traffic_control.dm"
+#include "code\game\machinery\telecomms\computers\logbrowser.dm"
+#include "code\game\machinery\telecomms\computers\telemonitor.dm"
+#include "code\game\machinery\telecomms\computers\traffic_control.dm"
+#include "code\game\machinery\telecomms\machines\allinone.dm"
+#include "code\game\machinery\telecomms\machines\broadcaster.dm"
+#include "code\game\machinery\telecomms\machines\bus.dm"
+#include "code\game\machinery\telecomms\machines\hub.dm"
+#include "code\game\machinery\telecomms\machines\processor.dm"
+#include "code\game\machinery\telecomms\machines\receiver.dm"
+#include "code\game\machinery\telecomms\machines\relay.dm"
+#include "code\game\machinery\telecomms\machines\server.dm"
#include "code\game\mecha\mech_bay.dm"
#include "code\game\mecha\mech_fabricator.dm"
#include "code\game\mecha\mecha.dm"
@@ -544,6 +567,7 @@
#include "code\game\objects\items\bodybag.dm"
#include "code\game\objects\items\candle.dm"
#include "code\game\objects\items\crayons.dm"
+#include "code\game\objects\items\dehy_carp.dm"
#include "code\game\objects\items\documents.dm"
#include "code\game\objects\items\holotape.dm"
#include "code\game\objects\items\latexballoon.dm"
@@ -555,12 +579,14 @@
#include "code\game\objects\items\devices\chameleonproj.dm"
#include "code\game\objects\items\devices\flash.dm"
#include "code\game\objects\items\devices\flashlight.dm"
+#include "code\game\objects\items\devices\instruments.dm"
#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\multitool.dm"
#include "code\game\objects\items\devices\paicard.dm"
#include "code\game\objects\items\devices\pipe_painter.dm"
+#include "code\game\objects\items\devices\pizza_bomb.dm"
#include "code\game\objects\items\devices\powersink.dm"
#include "code\game\objects\items\devices\recaller.dm"
#include "code\game\objects\items\devices\scanners.dm"
@@ -569,7 +595,6 @@
#include "code\game\objects\items\devices\traitordevices.dm"
#include "code\game\objects\items\devices\transfer_valve.dm"
#include "code\game\objects\items\devices\uplinks.dm"
-#include "code\game\objects\items\devices\violin.dm"
#include "code\game\objects\items\devices\PDA\cart.dm"
#include "code\game\objects\items\devices\PDA\chatroom.dm"
#include "code\game\objects\items\devices\PDA\PDA.dm"
@@ -1009,6 +1034,7 @@
#include "code\modules\library\lib_items.dm"
#include "code\modules\library\lib_machines.dm"
#include "code\modules\library\lib_readme.dm"
+#include "code\modules\lighting\lighting_system.dm"
#include "code\modules\mining\equipment_locker.dm"
#include "code\modules\mining\machine_input_output_plates.dm"
#include "code\modules\mining\machine_processing.dm"
@@ -1055,6 +1081,7 @@
#include "code\modules\mob\living\login.dm"
#include "code\modules\mob\living\logout.dm"
#include "code\modules\mob\living\say.dm"
+#include "code\modules\mob\living\ventcrawling.dm"
#include "code\modules\mob\living\carbon\carbon.dm"
#include "code\modules\mob\living\carbon\carbon_defense.dm"
#include "code\modules\mob\living\carbon\carbon_defines.dm"
@@ -1166,6 +1193,7 @@
#include "code\modules\mob\living\silicon\robot\robot_modules.dm"
#include "code\modules\mob\living\silicon\robot\robot_movement.dm"
#include "code\modules\mob\living\silicon\robot\say.dm"
+#include "code\modules\mob\living\simple_animal\ascendant_shadowling.dm"
#include "code\modules\mob\living\simple_animal\constructs.dm"
#include "code\modules\mob\living\simple_animal\corpse.dm"
#include "code\modules\mob\living\simple_animal\parrot.dm"
@@ -1211,6 +1239,9 @@
#include "code\modules\mob\living\simple_animal\hostile\retaliate\bat.dm"
#include "code\modules\mob\living\simple_animal\hostile\retaliate\clown.dm"
#include "code\modules\mob\living\simple_animal\hostile\retaliate\retaliate.dm"
+#include "code\modules\mob\living\simple_animal\revenant\revenant.dm"
+#include "code\modules\mob\living\simple_animal\revenant\revenant_abilities.dm"
+#include "code\modules\mob\living\simple_animal\revenant\revenant_spawn_event.dm"
#include "code\modules\mob\living\simple_animal\slime\death.dm"
#include "code\modules\mob\living\simple_animal\slime\emote.dm"
#include "code\modules\mob\living\simple_animal\slime\life.dm"
@@ -1315,8 +1346,10 @@
#include "code\modules\projectiles\ammunition\magazines.dm"
#include "code\modules\projectiles\ammunition\special.dm"
#include "code\modules\projectiles\guns\energy.dm"
+#include "code\modules\projectiles\guns\grenade_launcher.dm"
#include "code\modules\projectiles\guns\magic.dm"
#include "code\modules\projectiles\guns\projectile.dm"
+#include "code\modules\projectiles\guns\syringe_gun.dm"
#include "code\modules\projectiles\guns\energy\laser.dm"
#include "code\modules\projectiles\guns\energy\nuclear.dm"
#include "code\modules\projectiles\guns\energy\pulse.dm"
@@ -1338,27 +1371,28 @@
#include "code\modules\projectiles\projectile\reusable.dm"
#include "code\modules\projectiles\projectile\special.dm"
#include "code\modules\reagents\Chemistry-Colours.dm"
-#include "code\modules\reagents\Chemistry-Goon-420BlazeIt.dm"
-#include "code\modules\reagents\Chemistry-Goon-Medicine.dm"
-#include "code\modules\reagents\Chemistry-Goon-Other.dm"
-#include "code\modules\reagents\Chemistry-Goon-Pyrotechnics.dm"
-#include "code\modules\reagents\Chemistry-Goon-Readme.dm"
-#include "code\modules\reagents\Chemistry-Goon-Toxins.dm"
#include "code\modules\reagents\Chemistry-Holder.dm"
#include "code\modules\reagents\Chemistry-Machinery.dm"
#include "code\modules\reagents\Chemistry-Readme.dm"
+#include "code\modules\reagents\Chemistry-Reagents.dm"
#include "code\modules\reagents\Chemistry-Recipes.dm"
-#include "code\modules\reagents\grenade_launcher.dm"
#include "code\modules\reagents\reagent_containers.dm"
#include "code\modules\reagents\reagent_dispenser.dm"
-#include "code\modules\reagents\syringe_gun.dm"
#include "code\modules\reagents\Chemistry-Reagents\Blob-Reagents.dm"
-#include "code\modules\reagents\Chemistry-Reagents\Chemistry-Reagents.dm"
+#include "code\modules\reagents\Chemistry-Reagents\Drug-Reagents.dm"
#include "code\modules\reagents\Chemistry-Reagents\Medicine-Reagents.dm"
+#include "code\modules\reagents\Chemistry-Reagents\Other-Reagents.dm"
+#include "code\modules\reagents\Chemistry-Reagents\Pyrotechnic-Reagents.dm"
#include "code\modules\reagents\Chemistry-Reagents\Toxin-Reagents.dm"
#include "code\modules\reagents\Chemistry-Reagents\Consumable-Reagents\Food-Reagents.dm"
#include "code\modules\reagents\Chemistry-Reagents\Consumable-Reagents\Drink-Reagents\Alcohols.dm"
#include "code\modules\reagents\Chemistry-Reagents\Consumable-Reagents\Drink-Reagents\Drinks.dm"
+#include "code\modules\reagents\Chemistry-Recipes\Drugs.dm"
+#include "code\modules\reagents\Chemistry-Recipes\Medicine.dm"
+#include "code\modules\reagents\Chemistry-Recipes\Others.dm"
+#include "code\modules\reagents\Chemistry-Recipes\Pyrotechnics.dm"
+#include "code\modules\reagents\Chemistry-Recipes\Slime_extracts.dm"
+#include "code\modules\reagents\Chemistry-Recipes\Toxins.dm"
#include "code\modules\reagents\reagent_containers\blood_pack.dm"
#include "code\modules\reagents\reagent_containers\borghydro.dm"
#include "code\modules\reagents\reagent_containers\bottle.dm"
diff --git a/tools/Spriting Resources/previewing_color_in_photoshop.psd b/tools/Spriting Resources/previewing_color_in_photoshop.psd
new file mode 100644
index 00000000000..47a5473c7b8
Binary files /dev/null and b/tools/Spriting Resources/previewing_color_in_photoshop.psd differ
Power Monitor
Floorbot Access
Medical Records
[scanmode == 1 ? "Disable" : "Enable"] Medical Scanner
Medibot Access
Security Records
Custodial Locator
Cleanbot Access
Signaler System