Although you may seem indestructible in a mech, remember, THIS SHIT ISN'T LAVA PROOF!! The boys have already had to deal with loosing the last two to salvage because the dumbass thought he could just wade through the lower lakes like it was nothing. The fact he even managed to get back without being fused with what was left of the mech is a miracle in itself. They're built to be resistant against extreme heat, not heat PROOF!
Hello there, proud operator of an NT-Sec Prisoner Rehabilitation Center. A solution to rising crime rates and falling productivity, these facilities are specifically designed for the safe, productive imprisonment of your most dangerous criminals.
To press a long-term prisoner into the service of the station, replace his equipment with prisoners' garb at one of the prison lockers, as per normal operating procedure. Before assigning a prisoner his ID, insert the ID into a prisoner management console and assign the prisoner a quota, based on the severity of his crime. A single sheet of most materials produces five points for the prisoner, and points can be expected to be produced at a rate of about 100 per minute, though punishments as severe as forced labor should be reserved for serious crimes of sentences not less than five minutes long. Once you have prepared the prisoner, place him in the secure northern half of the labor shuttle, and send him to the station. Once he meets his quota by feeding sheets to the stacker, he will be allowed to return to the station, and will be able to open the secure door to the prisoner release area.
Your station has been selected to carry out the Gateway Project.
The equipment will be shipped to you at the start of the next quarter. You are to prepare a secure location to house the equipment as outlined in the attached documents.
"
for(var/datum/mind/N in ticker.mode.get_living_heads())
var/mob/M = N.current
diff --git a/code/modules/admin/secrets.dm b/code/modules/admin/secrets.dm
index 65fda253fe48..f97d99ddc84f 100644
--- a/code/modules/admin/secrets.dm
+++ b/code/modules/admin/secrets.dm
@@ -25,7 +25,8 @@
Show Game Mode Show Crew Manifest List DNA (Blood)
- List Fingerprints
Shuttles
@@ -527,6 +528,16 @@
J.total_positions = -1
J.spawn_positions = -1
message_admins("[key_name_admin(usr)] has removed the cap on security officers.")
+
+ if("ctfbutton")
+ if(!check_rights(R_ADMIN))
+ return
+ var/ctf_enabled = 0
+ for(var/obj/machinery/capture_the_flag/CTF in machines)
+ ctf_enabled = !CTF.ctf_enabled
+ CTF.ctf_enabled = !CTF.ctf_enabled
+ message_admins("[key_name_admin(usr)] has [ctf_enabled? "enabled" : "disabled"] CTF!")
+
if(E)
E.processing = 0
if(E.announceWhen>0)
@@ -536,4 +547,4 @@
if (usr)
log_admin("[key_name(usr)] used secret [item]")
if (ok)
- world << text("A secret has been activated by []!", usr.key)
\ No newline at end of file
+ world << text("A secret has been activated by []!", usr.key)
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index 324543903fb5..012c704f2c3e 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -973,6 +973,8 @@
log_admin("[key_name(usr)] temp-jobbanned [key_name(M)] from [job] for [mins] minutes")
feedback_inc("ban_job_tmp",1)
DB_ban_record(BANTYPE_JOB_TEMP, M, mins, reason, job)
+ if(M.client)
+ jobban_buildcache(M.client)
feedback_add_details("ban_job_tmp","- [job]")
if(!msg)
msg = job
@@ -994,6 +996,8 @@
log_admin("[key_name(usr)] perma-banned [key_name(M)] from [job]")
feedback_inc("ban_job",1)
DB_ban_record(BANTYPE_JOB_PERMA, M, -1, reason, job)
+ if(M.client)
+ jobban_buildcache(M.client)
feedback_add_details("ban_job","- [job]")
if(!msg)
msg = job
@@ -1022,6 +1026,8 @@
ban_unban_log_save("[key_name(usr)] unjobbanned [key_name(M)] from [job]")
log_admin("[key_name(usr)] unbanned [key_name(M)] from [job]")
DB_ban_unban(M.ckey, BANTYPE_ANY_JOB, job)
+ if(M.client)
+ jobban_buildcache(M.client)
feedback_inc("ban_job_unban",1)
feedback_add_details("ban_job_unban","- [job]")
if(!msg)
diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm
index 5215f9cc4857..16d57a126773 100644
--- a/code/modules/admin/verbs/adminhelp.dm
+++ b/code/modules/admin/verbs/adminhelp.dm
@@ -120,32 +120,27 @@
feedback_add_details("admin_verb","AH") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
return
-/proc/send2irc_adminless_only(source, msg, requiredflags = R_BAN)
- var/admin_number_total = 0 //Total number of admins
- var/admin_number_afk = 0 //Holds the number of admins who are afk
- var/admin_number_ignored = 0 //Holds the number of admins without +BAN (so admins who are not really admins)
- var/admin_number_decrease = 0 //Holds the number of admins with are afk, ignored or both
+/proc/get_admin_counts(requiredflags = R_BAN)
+ . = list("total" = 0, "noflags" = 0, "afk" = 0, "stealth" = 0, "present" = 0)
for(var/client/X in admins)
- admin_number_total++;
- var/invalid = 0
+ .["total"]++
if(requiredflags != 0 && !check_rights_for(X, requiredflags))
- admin_number_ignored++
- invalid = 1
- if(X.is_afk())
- admin_number_afk++
- invalid = 1
- if(X.holder.fakekey)
- admin_number_ignored++
- invalid = 1
- if(invalid)
- admin_number_decrease++
- var/admin_number_present = admin_number_total - admin_number_decrease //Number of admins who are neither afk nor invalid
- if(admin_number_present <= 0)
- if(!admin_number_afk && !admin_number_ignored)
+ .["noflags"]++
+ else if(X.is_afk())
+ .["afk"]++
+ else if(X.holder.fakekey)
+ .["stealth"]++
+ else
+ .["present"]++
+
+/proc/send2irc_adminless_only(source, msg, requiredflags = R_BAN)
+ var/list/adm = get_admin_counts(requiredflags)
+ . = adm["present"]
+ if(. <= 0)
+ if(!adm["afk"] && !adm["stealth"] && !adm["noflags"])
send2irc(source, "[msg] - No admins online")
else
- send2irc(source, "[msg] - All admins AFK ([admin_number_afk]/[admin_number_total]) or skipped ([admin_number_ignored]/[admin_number_total])")
- return admin_number_present
+ send2irc(source, "[msg] - All admins AFK ([adm["afk"]]/[adm["total"]]), stealthminned ([adm["stealth"]]/[adm["total"]]), or lack[rights2text(requiredflags, " ")] ([adm["noflags"]]/[adm["total"]])")
/proc/send2irc(msg,msg2)
if(config.useircbot)
diff --git a/code/modules/admin/verbs/buildmode.dm b/code/modules/admin/verbs/buildmode.dm
index bd04c75653b8..ee06e3a1f8a5 100644
--- a/code/modules/admin/verbs/buildmode.dm
+++ b/code/modules/admin/verbs/buildmode.dm
@@ -232,7 +232,7 @@
log_admin("[key_name(usr)] has entered build mode.")
-/datum/buildmode/proc/ClickOn(user,params,atom/object) //Click Intercept
+/datum/buildmode/proc/InterceptClickOn(user,params,atom/object) //Click Intercept
var/list/pa = params2list(params)
var/right_click = pa.Find("right")
var/left_click = pa.Find("left")
diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm
index eecfb9537d14..90a14e8d47cc 100644
--- a/code/modules/admin/verbs/debug.dm
+++ b/code/modules/admin/verbs/debug.dm
@@ -200,7 +200,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
. += "[procname] returned an associative list:"
for(var/key in returnedlist)
. += "\n[key] = [returnedlist[key]]"
-
+
else
. += "[procname] returned a list:"
for(var/elem in returnedlist)
@@ -644,8 +644,15 @@ var/global/list/g_fancy_list_of_types = null
E.active = 1
for(var/obj/machinery/field/generator/F in machines)
- if(F.anchored)
- F.Varedit_start = 1
+ if(F.active == 0)
+ F.active = 1
+ F.state = 2
+ F.power = 250
+ F.anchored = 1
+ F.warming_up = 3
+ F.start_fields()
+ F.update_icon()
+
spawn(30)
for(var/obj/machinery/the_singularitygen/G in machines)
if(G.anchored)
diff --git a/code/modules/admin/verbs/map_template_loadverb.dm b/code/modules/admin/verbs/map_template_loadverb.dm
index be9bc8c4aec6..781ab735832b 100644
--- a/code/modules/admin/verbs/map_template_loadverb.dm
+++ b/code/modules/admin/verbs/map_template_loadverb.dm
@@ -2,19 +2,25 @@
set category = "Debug"
set name = "Map template - Place"
- var/turf/T = get_turf(mob)
- if(!T)
- return
-
var/datum/map_template/template
var/map = input(usr, "Choose a Map Template to place at your CURRENT LOCATION","Place Map Template") as null|anything in map_templates
if(!map)
return
-
template = map_templates[map]
- template.load(T)
- message_admins("[key_name_admin(usr)] has placed a map template ([template.name]) at (JMP)")
+
+ var/turf/T = get_turf(mob)
+ if(!T)
+ return
+
+ var/list/preview = list()
+ for(var/S in template.get_affected_turfs(T,centered = TRUE))
+ preview += image('icons/turf/overlays.dmi',S,"greenOverlay")
+ usr.client.images += preview
+ if(alert(usr,"Confirm location.","Template Confirm","Yes","No") == "Yes")
+ template.load(T, centered = TRUE)
+ message_admins("[key_name_admin(usr)] has placed a map template ([template.name]) at (JMP)")
+ usr.client.images -= preview
/client/proc/map_template_upload()
set category = "Debug"
@@ -28,5 +34,6 @@
return
var/datum/map_template/M = new(map=map, rename="[map]")
+ M.preload_size(map)
map_templates[M.name] = M
message_admins("[key_name_admin(usr)] has uploaded a map template ([map])")
diff --git a/code/modules/admin/verbs/massmodvar.dm b/code/modules/admin/verbs/massmodvar.dm
index 7dfd17e75389..5c65e22ebd47 100644
--- a/code/modules/admin/verbs/massmodvar.dm
+++ b/code/modules/admin/verbs/massmodvar.dm
@@ -412,12 +412,12 @@
if (M.type == O.type)
M.vars[variable] = O.vars[variable]
- else if(istype(O.type, /obj))
+ else if(istype(O, /obj))
for(var/obj/A in world)
if (A.type == O.type)
A.vars[variable] = O.vars[variable]
- else if(istype(O.type, /turf))
+ else if(istype(O, /turf))
for(var/turf/A in world)
if (A.type == O.type)
A.vars[variable] = O.vars[variable]
diff --git a/code/modules/admin/verbs/modifyvariables.dm b/code/modules/admin/verbs/modifyvariables.dm
index 8e0bef8a7de6..b602d141ddc3 100644
--- a/code/modules/admin/verbs/modifyvariables.dm
+++ b/code/modules/admin/verbs/modifyvariables.dm
@@ -381,10 +381,9 @@ var/list/VVckey_edit = list("key", "ckey")
if(!check_rights(R_VAREDIT))
return
- for(var/p in forbidden_varedit_object_types)
- if( istype(O,p) )
- usr << "It is forbidden to edit this object's variables."
- return
+ if(is_type_in_list(O, forbidden_varedit_object_types))
+ usr << "It is forbidden to edit this object's variables."
+ return
if(istype(O, /client) && (param_var_name == "ckey" || param_var_name == "key"))
usr << "You cannot edit ckeys on client objects."
@@ -606,8 +605,14 @@ var/list/VVckey_edit = list("key", "ckey")
O.vars[variable] = var_new
if("type")
- var/var_new = input("Enter type:","Type",O.vars[variable]) as null|anything in typesof(/obj,/mob,/area,/turf)
- if(var_new==null) return
+ var/target_path = input("Enter type:", "Type", O.vars[variable]) as null|text
+ if(!target_path)
+ return
+ var/var_new = text2path(target_path)
+ if(!ispath(var_new))
+ var_new = pick_closest_path(target_path)
+ if(!var_new)
+ return
O.vars[variable] = var_new
if("reference")
diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm
index a20b103316ce..b8e13b38bb89 100644
--- a/code/modules/admin/verbs/randomverbs.dm
+++ b/code/modules/admin/verbs/randomverbs.dm
@@ -482,6 +482,19 @@ Traitors and the like can also be revived with the previous role mostly intact.
message_admins("[key_name_admin(src)] has created a command report")
feedback_add_details("admin_verb","CCR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+/client/proc/cmd_change_command_name()
+ set category = "Special Verbs"
+ set name = "Change Command Name"
+ if(!holder)
+ src << "Only administrators may use this command."
+ return
+ var/input = input(usr, "Please input a new name for Central Command.", "What?", "") as text|null
+ if(!input)
+ return
+ change_command_name(input)
+ message_admins("[key_name_admin(src)] has changed Central Command's name to [input]")
+ log_admin("[key_name(src)] has changed the Central Command name to: [input]")
+
/client/proc/cmd_admin_delete(atom/O as obj|mob|turf in world)
set category = "Admin"
set name = "Delete"
diff --git a/code/modules/assembly/proximity.dm b/code/modules/assembly/proximity.dm
index ce2f468e0d63..32352855eb22 100644
--- a/code/modules/assembly/proximity.dm
+++ b/code/modules/assembly/proximity.dm
@@ -78,6 +78,7 @@
handle_move(get_turf(loc))
/obj/item/device/assembly/prox_sensor/dropped()
+ ..()
if(scanning)
spawn(0)
sense()
diff --git a/code/modules/assembly/shock_kit.dm b/code/modules/assembly/shock_kit.dm
index f3f37d911a04..6637d3667f01 100644
--- a/code/modules/assembly/shock_kit.dm
+++ b/code/modules/assembly/shock_kit.dm
@@ -36,7 +36,7 @@
return
/obj/item/assembly/shock_kit/receive_signal()
- if(istype(loc, /obj/structure/bed/chair/e_chair))
- var/obj/structure/bed/chair/e_chair/C = loc
+ if(istype(loc, /obj/structure/chair/e_chair))
+ var/obj/structure/chair/e_chair/C = loc
C.shock()
return
diff --git a/code/modules/awaymissions/capture_the_flag.dm b/code/modules/awaymissions/capture_the_flag.dm
index 625a12c01be1..7108940c287d 100644
--- a/code/modules/awaymissions/capture_the_flag.dm
+++ b/code/modules/awaymissions/capture_the_flag.dm
@@ -62,6 +62,7 @@
SSobj.processing.Remove(src)
/obj/item/weapon/twohanded/required/ctf/dropped(mob/user)
+ ..()
reset_cooldown = world.time + 200 //20 seconds
SSobj.processing |= src
for(var/mob/M in player_list)
diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm
index 6a5e9ba33b7b..1248705bdef7 100644
--- a/code/modules/awaymissions/corpse.dm
+++ b/code/modules/awaymissions/corpse.dm
@@ -1,131 +1,170 @@
-//These are meant for spawning on maps, namely Away Missions.
-
//If someone can do this in a neater way, be my guest-Kor
//To do: Allow corpses to appear mangled, bloody, etc. Allow customizing the bodies appearance (they're all bald and white right now).
-/obj/effect/landmark/corpse
+/obj/effect/mob_spawn
name = "Unknown"
- var/mobname = "default" //Use for the ghost spawner variant, so they don't come out named "sleeper"
- var/mobgender = MALE //Set to male by default due to the patriarchy. Other options include FEMALE and NEUTER
- var/mob_species = null //Set to make them a mutant race such as lizard or skeleton. Uses the datum typepath instead of the ID.
- var/corpseuniform = null //Set this to an object path to have the slot filled with said object on the corpse.
- var/corpsesuit = null
- var/corpseshoes = null
- var/corpsegloves = null
- var/corpseradio = null
- var/corpseglasses = null
- var/corpsemask = null
- var/corpsehelmet = null
- var/corpsebelt = null
- var/corpsepocket1 = null
- var/corpsepocket2 = null
- var/corpseback = null
- var/corpseid = 0 //Just set to 1 if you want them to have an ID
- var/corpseidjob = null // Needs to be in quotes, such as "Clown" or "Chef." This just determines what the ID reads as, not their access
- var/corpseidaccess = null //This is for access. See access.dm for which jobs give what access. Again, put in quotes. Use "Captain" if you want it to be all access.
- var/corpseidicon = null //For setting it to be a gold, silver, centcom etc ID
- var/corpsehusk = null
- var/corpsebrute = null //set brute damage on the corpse
- var/corpseoxy = null //set suffocation damage on the corpse
- var/roundstart = TRUE
- var/death = TRUE
+ var/mob_type = null
+ var/mob_name = ""
+ var/mob_gender = MALE
+ var/death = TRUE //Kill the mob
+ var/roundstart = TRUE //fires on initialize
+ var/instant = FALSE //fires on New
var/flavour_text = "The mapper forgot to set this!"
var/faction = null
- var/list/implants = list()
+ var/objectives = null
+ var/brute_damage = 0
+ var/oxy_damage = 0
density = 1
-/obj/effect/landmark/corpse/initialize()
- if(roundstart)
- createCorpse(death = src.death)
- else
+/obj/effect/mob_spawn/attack_ghost(mob/user)
+ if(ticker.current_state != GAME_STATE_PLAYING)
return
+ var/ghost_role = alert("Become [mob_name]? (Warning, You can no longer be cloned!)",,"Yes","No")
+ if(ghost_role == "No")
+ return
+ log_game("[user.ckey] became [mob_name]")
+ create(ckey = user.ckey)
-/obj/effect/landmark/corpse/New()
+/obj/effect/mob_spawn/initialize()
+ if(roundstart)
+ create()
+
+/obj/effect/mob_spawn/New()
..()
- invisibility = 0
+ if(instant)
+ create()
-/obj/effect/landmark/corpse/proc/special(mob/new_spawn)
+/obj/effect/mob_spawn/proc/special(mob/M)
return
-/obj/effect/landmark/corpse/proc/createCorpse(death, ckey) //Creates a mob and checks for gear in each slot before attempting to equip it.
- var/mob/living/carbon/human/M = new /mob/living/carbon/human (src.loc)
- if(mobname != "default")
- M.real_name = mobname
- else
- M.real_name = src.name
- M.gender = src.mobgender
- if(mob_species)
- M.set_species(mob_species)
+/obj/effect/mob_spawn/proc/equip(mob/M)
+ return
+
+/obj/effect/mob_spawn/proc/create(ckey)
+ var/mob/living/M = new mob_type(loc) //living mobs only
+ M.real_name = mob_name ? mob_name : M.name
+ M.gender = mob_gender
+ if(faction)
+ M.faction = list(faction)
if(death)
M.death(1) //Kills the new mob
- if(src.corpsehusk)
- M.Drain()
- if(faction)
- M.faction = list(src.faction)
- M.adjustBruteLoss(src.corpsebrute)
- M.adjustOxyLoss(src.corpseoxy)
- if(src.corpseuniform)
- M.equip_to_slot_or_del(new src.corpseuniform(M), slot_w_uniform)
- if(src.corpsesuit)
- M.equip_to_slot_or_del(new src.corpsesuit(M), slot_wear_suit)
- if(src.corpseshoes)
- M.equip_to_slot_or_del(new src.corpseshoes(M), slot_shoes)
- if(src.corpsegloves)
- M.equip_to_slot_or_del(new src.corpsegloves(M), slot_gloves)
- if(src.corpseradio)
- M.equip_to_slot_or_del(new src.corpseradio(M), slot_ears)
- if(src.corpseglasses)
- M.equip_to_slot_or_del(new src.corpseglasses(M), slot_glasses)
- if(src.corpsemask)
- M.equip_to_slot_or_del(new src.corpsemask(M), slot_wear_mask)
- if(src.corpsehelmet)
- M.equip_to_slot_or_del(new src.corpsehelmet(M), slot_head)
- if(src.corpsebelt)
- M.equip_to_slot_or_del(new src.corpsebelt(M), slot_belt)
- if(src.corpsepocket1)
- M.equip_to_slot_or_del(new src.corpsepocket1(M), slot_r_store)
- if(src.corpsepocket2)
- M.equip_to_slot_or_del(new src.corpsepocket2(M), slot_l_store)
- if(src.corpseback)
- M.equip_to_slot_or_del(new src.corpseback(M), slot_back)
- if(src.corpseid == 1)
- var/obj/item/weapon/card/id/W = new(M)
- var/datum/job/jobdatum
- for(var/jobtype in typesof(/datum/job))
- var/datum/job/J = new jobtype
- if(J.title == corpseidaccess)
- jobdatum = J
- break
- if(src.corpseidicon)
- W.icon_state = corpseidicon
- if(src.corpseidaccess)
- if(jobdatum)
- W.access = jobdatum.get_access()
- else
- W.access = list()
- if(corpseidjob)
- W.assignment = corpseidjob
- W.registered_name = M.real_name
- W.update_label()
- M.equip_to_slot_or_del(W, slot_wear_id)
-
- for(var/I in implants)
- var/obj/item/weapon/implant/X = new I
- X.implant(M)
+
+ M.adjustOxyLoss(oxy_damage)
+ M.adjustBruteLoss(brute_damage)
+ equip(M)
if(ckey)
M.ckey = ckey
M << "[flavour_text]"
+ if(objectives)
+ var/datum/mind/MM = M.mind
+ for(var/objective in objectives)
+ MM.objectives += new/datum/objective(objective)
special(M)
qdel(src)
-/obj/effect/landmark/corpse/AICorpse/createCorpse() //Creates a corrupted AI
- var/A = locate(/mob/living/silicon/ai) in loc //variable A looks for an AI at the location of the landmark
- if(A) //if variable A is true
- return //stop executing the proc
- var/L = new /datum/ai_laws/default/asimov/ //variable L is a new Asimov lawset
- var/B = new /obj/item/device/mmi/ //variable B is a new MMI
+// Base version - place these on maps/templates.
+/obj/effect/mob_spawn/human
+ mob_type = /mob/living/carbon/human
+ //Human specific stuff.
+ var/mob_species = null //Set to make them a mutant race such as lizard or skeleton. Uses the datum typepath instead of the ID.
+ var/uniform = null //Set this to an object path to have the slot filled with said object on the corpse.
+ var/suit = null
+ var/shoes = null
+ var/gloves = null
+ var/radio = null
+ var/glasses = null
+ var/mask = null
+ var/helmet = null
+ var/belt = null
+ var/pocket1 = null
+ var/pocket2 = null
+ var/back = null
+ var/has_id = 0 //Just set to 1 if you want them to have an ID
+ var/id_job = null // Needs to be in quotes, such as "Clown" or "Chef." This just determines what the ID reads as, not their access
+ var/id_access = null //This is for access. See access.dm for which jobs give what access. Again, put in quotes. Use "Captain" if you want it to be all access.
+ var/id_icon = null //For setting it to be a gold, silver, centcom etc ID
+ var/husk = null
+ var/outfit_type = null // Will start with this if exists then apply specific slots
+ var/list/implants = list()
+
+/obj/effect/mob_spawn/human/equip(mob/living/carbon/human/H)
+ if(mob_species)
+ H.set_species(mob_species)
+ if(husk)
+ H.Drain()
+ if(outfit_type)
+ H.equipOutfit(outfit_type)
+ if(uniform)
+ H.equip_to_slot_or_del(new uniform(H), slot_w_uniform)
+ if(suit)
+ H.equip_to_slot_or_del(new suit(H), slot_wear_suit)
+ if(shoes)
+ H.equip_to_slot_or_del(new shoes(H), slot_shoes)
+ if(gloves)
+ H.equip_to_slot_or_del(new gloves(H), slot_gloves)
+ if(radio)
+ H.equip_to_slot_or_del(new radio(H), slot_ears)
+ if(glasses)
+ H.equip_to_slot_or_del(new glasses(H), slot_glasses)
+ if(mask)
+ H.equip_to_slot_or_del(new mask(H), slot_wear_mask)
+ if(helmet)
+ H.equip_to_slot_or_del(new helmet(H), slot_head)
+ if(belt)
+ H.equip_to_slot_or_del(new belt(H), slot_belt)
+ if(pocket1)
+ H.equip_to_slot_or_del(new pocket1(H), slot_r_store)
+ if(pocket2)
+ H.equip_to_slot_or_del(new pocket2(H), slot_l_store)
+ if(back)
+ H.equip_to_slot_or_del(new back(H), slot_back)
+ if(has_id)
+ var/obj/item/weapon/card/id/W = new(H)
+ if(id_icon)
+ W.icon_state = id_icon
+ if(id_access)
+ var/datum/job/jobdatum
+ for(var/jobtype in typesof(/datum/job))
+ var/datum/job/J = new jobtype
+ if(J.title == id_access)
+ jobdatum = J
+ break
+ if(jobdatum)
+ W.access = jobdatum.get_access()
+ else
+ W.access = list()
+ if(id_job)
+ W.assignment = id_job
+ W.registered_name = H.real_name
+ W.update_label()
+ H.equip_to_slot_or_del(W, slot_wear_id)
+
+ for(var/I in implants)
+ var/obj/item/weapon/implant/X = new I
+ X.implant(H)
+
+//Instant version - use when spawning corpses during runtime
+/obj/effect/mob_spawn/human/corpse
+ roundstart = FALSE
+ instant = TRUE
+
+/obj/effect/mob_spawn/human/alive
+ icon = 'icons/obj/Cryogenic2.dmi'
+ icon_state = "sleeper"
+ death = FALSE
+ roundstart = FALSE //you could use these for alive fake humans on roundstart but this is more common scenario
+
+
+//Non-human spawners
+
+/obj/effect/mob_spawn/AICorpse/create() //Creates a corrupted AI
+ var/A = locate(/mob/living/silicon/ai) in loc
+ if(A)
+ return
+ var/L = new /datum/ai_laws/default/asimov
+ var/B = new /obj/item/device/mmi
var/mob/living/silicon/ai/M = new(src.loc, L, B, 1) //spawn new AI at landmark as var M
M.name = src.name
M.real_name = src.name
@@ -133,21 +172,16 @@
M.death() //call the AI's death proc
qdel(src)
-/obj/effect/landmark/corpse/slimeCorpse
+/obj/effect/mob_spawn/slime
+ mob_type = /mob/living/simple_animal/slime
var/mobcolour = "grey"
icon = 'icons/mob/slimes.dmi'
icon_state = "grey baby slime" //sets the icon in the map editor
-/obj/effect/landmark/corpse/slimeCorpse/createCorpse() //proc creates a dead slime
- var/A = locate(/mob/living/simple_animal/slime/) in loc //variable A looks for a slime at the location of the landmark
- if(A) //if variable A is true
- return //stop executing the proc
- var/mob/living/simple_animal/slime/M = new(src.loc) //variable M is a new slime at the location of the landmark
- M.colour = src.mobcolour //slime colour is set by landmark's mobcolour var
- M.adjustToxLoss(9001) //kills the slime, death() doesn't update its icon correctly
- qdel(src)
+/obj/effect/mob_spawn/slime/equip(mob/living/simple_animal/slime/S)
+ S.colour = mobcolour
-/obj/effect/landmark/corpse/facehugCorpse/createCorpse() //Creates a squashed facehugger
+/obj/effect/mob_spawn/human/facehugger/create() //Creates a squashed facehugger
var/obj/item/clothing/mask/facehugger/O = new(src.loc) //variable O is a new facehugger at the location of the landmark
O.name = src.name
O.Die() //call the facehugger's death proc
@@ -156,212 +190,217 @@
// I'll work on making a list of corpses people request for maps, or that I think will be commonly used. Syndicate operatives for example.
-/obj/effect/landmark/corpse/syndicatesoldier
+/obj/effect/mob_spawn/human/syndicatesoldier
name = "Syndicate Operative"
- corpseuniform = /obj/item/clothing/under/syndicate
- corpsesuit = /obj/item/clothing/suit/armor/vest
- corpseshoes = /obj/item/clothing/shoes/combat
- corpsegloves = /obj/item/clothing/gloves/combat
- corpseradio = /obj/item/device/radio/headset
- corpsemask = /obj/item/clothing/mask/gas
- corpsehelmet = /obj/item/clothing/head/helmet/swat
- corpseback = /obj/item/weapon/storage/backpack
- corpseid = 1
- corpseidjob = "Operative"
- corpseidaccess = "Syndicate"
+ uniform = /obj/item/clothing/under/syndicate
+ suit = /obj/item/clothing/suit/armor/vest
+ shoes = /obj/item/clothing/shoes/combat
+ gloves = /obj/item/clothing/gloves/combat
+ radio = /obj/item/device/radio/headset
+ mask = /obj/item/clothing/mask/gas
+ helmet = /obj/item/clothing/head/helmet/swat
+ back = /obj/item/weapon/storage/backpack
+ has_id = 1
+ id_job = "Operative"
+ id_access = "Syndicate"
-
-
-/obj/effect/landmark/corpse/syndicatecommando
+/obj/effect/mob_spawn/human/syndicatecommando
name = "Syndicate Commando"
- corpseuniform = /obj/item/clothing/under/syndicate
- corpsesuit = /obj/item/clothing/suit/space/hardsuit/syndi
- corpseshoes = /obj/item/clothing/shoes/combat
- corpsegloves = /obj/item/clothing/gloves/combat
- corpseradio = /obj/item/device/radio/headset
- corpsemask = /obj/item/clothing/mask/gas/syndicate
- corpsehelmet = /obj/item/clothing/head/helmet/space/hardsuit/syndi
- corpseback = /obj/item/weapon/tank/jetpack/oxygen
- corpsepocket1 = /obj/item/weapon/tank/internals/emergency_oxygen
- corpseid = 1
- corpseidjob = "Operative"
- corpseidaccess = "Syndicate"
-
-
+ uniform = /obj/item/clothing/under/syndicate
+ suit = /obj/item/clothing/suit/space/hardsuit/syndi
+ shoes = /obj/item/clothing/shoes/combat
+ gloves = /obj/item/clothing/gloves/combat
+ radio = /obj/item/device/radio/headset
+ mask = /obj/item/clothing/mask/gas/syndicate
+ helmet = /obj/item/clothing/head/helmet/space/hardsuit/syndi
+ back = /obj/item/weapon/tank/jetpack/oxygen
+ pocket1 = /obj/item/weapon/tank/internals/emergency_oxygen
+ has_id = 1
+ id_job = "Operative"
+ id_access = "Syndicate"
///////////Civilians//////////////////////
-/obj/effect/landmark/corpse/cook
+/obj/effect/mob_spawn/human/cook
name = "Cook"
- corpseuniform = /obj/item/clothing/under/rank/chef
- corpsesuit = /obj/item/clothing/suit/apron/chef
- corpseshoes = /obj/item/clothing/shoes/sneakers/black
- corpsehelmet = /obj/item/clothing/head/chefhat
- corpseback = /obj/item/weapon/storage/backpack
- corpseradio = /obj/item/device/radio/headset
- corpseid = 1
- corpseidjob = "Cook"
- corpseidaccess = "Cook"
+ uniform = /obj/item/clothing/under/rank/chef
+ suit = /obj/item/clothing/suit/apron/chef
+ shoes = /obj/item/clothing/shoes/sneakers/black
+ helmet = /obj/item/clothing/head/chefhat
+ back = /obj/item/weapon/storage/backpack
+ radio = /obj/item/device/radio/headset
+ has_id = 1
+ id_job = "Cook"
+ id_access = "Cook"
-/obj/effect/landmark/corpse/doctor
+/obj/effect/mob_spawn/human/doctor
name = "Doctor"
- corpseradio = /obj/item/device/radio/headset/headset_med
- corpseuniform = /obj/item/clothing/under/rank/medical
- corpsesuit = /obj/item/clothing/suit/toggle/labcoat
- corpseback = /obj/item/weapon/storage/backpack/medic
- corpsepocket1 = /obj/item/device/flashlight/pen
- corpseshoes = /obj/item/clothing/shoes/sneakers/black
- corpseid = 1
- corpseidjob = "Medical Doctor"
- corpseidaccess = "Medical Doctor"
+ radio = /obj/item/device/radio/headset/headset_med
+ uniform = /obj/item/clothing/under/rank/medical
+ suit = /obj/item/clothing/suit/toggle/labcoat
+ back = /obj/item/weapon/storage/backpack/medic
+ pocket1 = /obj/item/device/flashlight/pen
+ shoes = /obj/item/clothing/shoes/sneakers/black
+ has_id = 1
+ id_job = "Medical Doctor"
+ id_access = "Medical Doctor"
-/obj/effect/landmark/corpse/engineer
+/obj/effect/mob_spawn/human/engineer
name = "Engineer"
- corpseradio = /obj/item/device/radio/headset/headset_eng
- corpseuniform = /obj/item/clothing/under/rank/engineer
- corpseback = /obj/item/weapon/storage/backpack/industrial
- corpseshoes = /obj/item/clothing/shoes/sneakers/orange
- corpsebelt = /obj/item/weapon/storage/belt/utility/full
- corpsegloves = /obj/item/clothing/gloves/color/yellow
- corpsehelmet = /obj/item/clothing/head/hardhat
- corpseid = 1
- corpseidjob = "Station Engineer"
- corpseidaccess = "Station Engineer"
+ radio = /obj/item/device/radio/headset/headset_eng
+ uniform = /obj/item/clothing/under/rank/engineer
+ back = /obj/item/weapon/storage/backpack/industrial
+ shoes = /obj/item/clothing/shoes/sneakers/orange
+ belt = /obj/item/weapon/storage/belt/utility/full
+ gloves = /obj/item/clothing/gloves/color/yellow
+ helmet = /obj/item/clothing/head/hardhat
+ has_id = 1
+ id_job = "Station Engineer"
+ id_access = "Station Engineer"
-/obj/effect/landmark/corpse/engineer/rig
- corpsesuit = /obj/item/clothing/suit/space/hardsuit/engine
- corpsemask = /obj/item/clothing/mask/breath
+/obj/effect/mob_spawn/human/engineer/rig
+ suit = /obj/item/clothing/suit/space/hardsuit/engine
+ mask = /obj/item/clothing/mask/breath
-/obj/effect/landmark/corpse/clown
+/obj/effect/mob_spawn/human/clown
name = "Clown"
- corpseuniform = /obj/item/clothing/under/rank/clown
- corpseshoes = /obj/item/clothing/shoes/clown_shoes
- corpseradio = /obj/item/device/radio/headset
- corpsemask = /obj/item/clothing/mask/gas/clown_hat
- corpsepocket1 = /obj/item/weapon/bikehorn
- corpseback = /obj/item/weapon/storage/backpack/clown
- corpseid = 1
- corpseidjob = "Clown"
- corpseidaccess = "Clown"
+ uniform = /obj/item/clothing/under/rank/clown
+ shoes = /obj/item/clothing/shoes/clown_shoes
+ radio = /obj/item/device/radio/headset
+ mask = /obj/item/clothing/mask/gas/clown_hat
+ pocket1 = /obj/item/weapon/bikehorn
+ back = /obj/item/weapon/storage/backpack/clown
+ has_id = 1
+ id_job = "Clown"
+ id_access = "Clown"
-/obj/effect/landmark/corpse/scientist
+/obj/effect/mob_spawn/human/scientist
name = "Scientist"
- corpseradio = /obj/item/device/radio/headset/headset_sci
- corpseuniform = /obj/item/clothing/under/rank/scientist
- corpsesuit = /obj/item/clothing/suit/toggle/labcoat/science
- corpseback = /obj/item/weapon/storage/backpack
- corpseshoes = /obj/item/clothing/shoes/sneakers/white
- corpseid = 1
- corpseidjob = "Scientist"
- corpseidaccess = "Scientist"
+ radio = /obj/item/device/radio/headset/headset_sci
+ uniform = /obj/item/clothing/under/rank/scientist
+ suit = /obj/item/clothing/suit/toggle/labcoat/science
+ back = /obj/item/weapon/storage/backpack
+ shoes = /obj/item/clothing/shoes/sneakers/white
+ has_id = 1
+ id_job = "Scientist"
+ id_access = "Scientist"
-/obj/effect/landmark/corpse/miner
- corpseradio = /obj/item/device/radio/headset/headset_cargo
- corpseuniform = /obj/item/clothing/under/rank/miner
- corpsegloves = /obj/item/clothing/gloves/fingerless
- corpseback = /obj/item/weapon/storage/backpack/industrial
- corpseshoes = /obj/item/clothing/shoes/sneakers/black
- corpseid = 1
- corpseidjob = "Shaft Miner"
- corpseidaccess = "Shaft Miner"
+/obj/effect/mob_spawn/human/miner
+ radio = /obj/item/device/radio/headset/headset_cargo
+ uniform = /obj/item/clothing/under/rank/miner
+ gloves = /obj/item/clothing/gloves/fingerless
+ back = /obj/item/weapon/storage/backpack/industrial
+ shoes = /obj/item/clothing/shoes/sneakers/black
+ has_id = 1
+ id_job = "Shaft Miner"
+ id_access = "Shaft Miner"
-/obj/effect/landmark/corpse/miner/rig
- corpsesuit = /obj/item/clothing/suit/space/hardsuit/mining
- corpsemask = /obj/item/clothing/mask/breath
+/obj/effect/mob_spawn/human/miner/rig
+ suit = /obj/item/clothing/suit/space/hardsuit/mining
+ mask = /obj/item/clothing/mask/breath
-/obj/effect/landmark/corpse/plasmaman
+/obj/effect/mob_spawn/human/plasmaman
mob_species = /datum/species/plasmaman
- corpsehelmet = /obj/item/clothing/head/helmet/space/plasmaman
- corpseuniform = /obj/item/clothing/under/plasmaman
- corpseback = /obj/item/weapon/tank/internals/plasmaman/full
- corpsemask = /obj/item/clothing/mask/breath
+ helmet = /obj/item/clothing/head/helmet/space/plasmaman
+ uniform = /obj/item/clothing/under/plasmaman
+ back = /obj/item/weapon/tank/internals/plasmaman/full
+ mask = /obj/item/clothing/mask/breath
+/obj/effect/mob_spawn/human/bartender
+ name = "Space Bartender"
+ uniform = /obj/item/clothing/under/rank/bartender
+ back = /obj/item/weapon/storage/backpack
+ shoes = /obj/item/clothing/shoes/sneakers/black
+ suit = /obj/item/clothing/suit/armor
+ glasses = /obj/item/clothing/glasses/sunglasses/reagent
+ has_id = 1
+ id_job = "Bartender"
+ id_access = "Bartender"
+
+/obj/effect/mob_spawn/human/bartender/alive
+ death = FALSE
+ roundstart = FALSE
+ mob_name = "Space Bartender"
+ name = "sleeper"
+ icon = 'icons/obj/Cryogenic2.dmi'
+ icon_state = "sleeper"
+ flavour_text = "You are a space bartender!"
/////////////////Officers+Nanotrasen Security//////////////////////
-/obj/effect/landmark/corpse/bridgeofficer
+/obj/effect/mob_spawn/human/bridgeofficer
name = "Bridge Officer"
- corpseradio = /obj/item/device/radio/headset/heads/hop
- corpseuniform = /obj/item/clothing/under/rank/centcom_officer
- corpsesuit = /obj/item/clothing/suit/armor/bulletproof
- corpseshoes = /obj/item/clothing/shoes/sneakers/black
- corpseglasses = /obj/item/clothing/glasses/sunglasses
- corpseid = 1
- corpseidjob = "Bridge Officer"
- corpseidaccess = "Captain"
+ radio = /obj/item/device/radio/headset/heads/hop
+ uniform = /obj/item/clothing/under/rank/centcom_officer
+ suit = /obj/item/clothing/suit/armor/bulletproof
+ shoes = /obj/item/clothing/shoes/sneakers/black
+ glasses = /obj/item/clothing/glasses/sunglasses
+ has_id = 1
+ id_job = "Bridge Officer"
+ id_access = "Captain"
-/obj/effect/landmark/corpse/commander
+/obj/effect/mob_spawn/human/commander
name = "Commander"
- corpseuniform = /obj/item/clothing/under/rank/centcom_commander
- corpsesuit = /obj/item/clothing/suit/armor
- corpseradio = /obj/item/device/radio/headset/heads/captain
- corpseglasses = /obj/item/clothing/glasses/eyepatch
- corpsemask = /obj/item/clothing/mask/cigarette/cigar/cohiba
- corpsehelmet = /obj/item/clothing/head/centhat
- corpsegloves = /obj/item/clothing/gloves/combat
- corpseshoes = /obj/item/clothing/shoes/combat/swat
- corpsepocket1 = /obj/item/weapon/lighter
- corpseid = 1
- corpseidjob = "Commander"
- corpseidaccess = "Captain"
+ uniform = /obj/item/clothing/under/rank/centcom_commander
+ suit = /obj/item/clothing/suit/armor
+ radio = /obj/item/device/radio/headset/heads/captain
+ glasses = /obj/item/clothing/glasses/eyepatch
+ mask = /obj/item/clothing/mask/cigarette/cigar/cohiba
+ helmet = /obj/item/clothing/head/centhat
+ gloves = /obj/item/clothing/gloves/combat
+ shoes = /obj/item/clothing/shoes/combat/swat
+ pocket1 = /obj/item/weapon/lighter
+ has_id = 1
+ id_job = "Commander"
+ id_access = "Captain"
-/obj/effect/landmark/corpse/nanotrasensoldier
+/obj/effect/mob_spawn/human/nanotrasensoldier
name = "Nanotrasen Private Security Officer"
- corpseuniform = /obj/item/clothing/under/rank/security
- corpsesuit = /obj/item/clothing/suit/armor/vest
- corpseshoes = /obj/item/clothing/shoes/combat
- corpsegloves = /obj/item/clothing/gloves/combat
- corpseradio = /obj/item/device/radio/headset
- corpsemask = /obj/item/clothing/mask/gas/sechailer/swat
- corpsehelmet = /obj/item/clothing/head/helmet/swat/nanotrasen
- corpseback = /obj/item/weapon/storage/backpack/security
- corpseid = 1
- corpseidjob = "Private Security Force"
- corpseidaccess = "Security Officer"
+ uniform = /obj/item/clothing/under/rank/security
+ suit = /obj/item/clothing/suit/armor/vest
+ shoes = /obj/item/clothing/shoes/combat
+ gloves = /obj/item/clothing/gloves/combat
+ radio = /obj/item/device/radio/headset
+ mask = /obj/item/clothing/mask/gas/sechailer/swat
+ helmet = /obj/item/clothing/head/helmet/swat/nanotrasen
+ back = /obj/item/weapon/storage/backpack/security
+ has_id = 1
+ id_job = "Private Security Force"
+ id_access = "Security Officer"
-/obj/effect/landmark/corpse/commander/alive
+/obj/effect/mob_spawn/human/commander/alive
death = FALSE
roundstart = FALSE
- mobname = "Nanotrasen Commander"
+ mob_name = "Nanotrasen Commander"
name = "sleeper"
icon = 'icons/obj/Cryogenic2.dmi'
icon_state = "sleeper"
flavour_text = "You are a Nanotrasen Commander!"
-/obj/effect/landmark/corpse/attack_ghost(mob/user)
- if(ticker.current_state != GAME_STATE_PLAYING)
- return
- var/ghost_role = alert("Become [mobname]? (Warning, You can no longer be cloned!)",,"Yes","No")
- if(ghost_role == "No")
- return
- createCorpse(death = src.death, ckey = user.ckey)
-
/////////////////Spooky Undead//////////////////////
-/obj/effect/landmark/corpse/skeleton
+/obj/effect/mob_spawn/human/skeleton
name = "skeletal remains"
- mobname = "skeleton"
+ mob_name = "skeleton"
mob_species = /datum/species/skeleton
- mobgender = NEUTER
+ mob_gender = NEUTER
-
-/obj/effect/landmark/corpse/skeleton/alive
+/obj/effect/mob_spawn/human/skeleton/alive
death = FALSE
roundstart = FALSE
icon = 'icons/effects/blood.dmi'
icon_state = "remains"
flavour_text = "By unknown powers, your skeletal remains have been reanimated! Walk this mortal plain and terrorize all living adventurers who dare cross your path."
-
-/obj/effect/landmark/corpse/zombie
+/obj/effect/mob_spawn/human/zombie
name = "rotting corpse"
- mobname = "zombie"
+ mob_name = "zombie"
mob_species = /datum/species/zombie
-/obj/effect/landmark/corpse/zombie/alive
+/obj/effect/mob_spawn/human/zombie/alive
death = FALSE
roundstart = FALSE
icon = 'icons/effects/blood.dmi'
@@ -369,27 +408,32 @@
flavour_text = "By unknown powers, your rotting remains have been resurrected! Walk this mortal plain and terrorize all living adventurers who dare cross your path."
-/obj/effect/landmark/corpse/abductor
+/obj/effect/mob_spawn/human/abductor
name = "abductor"
- mobname = "???"
+ mob_name = "???"
mob_species = /datum/species/abductor
- corpseuniform = /obj/item/clothing/under/color/grey
- corpseshoes = /obj/item/clothing/shoes/combat
+ uniform = /obj/item/clothing/under/color/grey
+ shoes = /obj/item/clothing/shoes/combat
///Prisoner
-/obj/effect/landmark/corpse/prisoner_transport
+/obj/effect/mob_spawn/human/prisoner_transport
name = "prisoner sleeper"
icon = 'icons/obj/Cryogenic2.dmi'
icon_state = "sleeper"
- corpseuniform = /obj/item/clothing/under/rank/prisoner
- corpsemask = /obj/item/clothing/mask/breath
- corpseshoes = /obj/item/clothing/shoes/sneakers/orange
- corpsepocket1 = /obj/item/weapon/tank/internals/emergency_oxygen
+ uniform = /obj/item/clothing/under/rank/prisoner
+ mask = /obj/item/clothing/mask/breath
+ shoes = /obj/item/clothing/shoes/sneakers/orange
+ pocket1 = /obj/item/weapon/tank/internals/emergency_oxygen
roundstart = FALSE
death = FALSE
flavour_text = {"You were a prisoner, sentenced to hard labour in one of Nanotrasen's harsh gulags, but judging by the explosive crash you just survived, fate may have other plans for. First thing is first though: Find a way to survive this mess."}
-/obj/effect/landmark/corpse/prisoner_transport/special(mob/living/new_spawn)
+/obj/effect/mob_spawn/human/prisoner_transport/special(mob/living/new_spawn)
var/crime = pick("distribution of contraband" , "unauthorized erotic action on duty", "syndicate collaboration", "worship of prohbited life forms", "possession of profane texts", "murder", "arson", "insulting your manager", "grand theft", "conspiracy", "attempting to unionize", "vandalism", "gross incompetence")
new_spawn << "You were convincted of: [crime]."
+
+
+//NEWCODE
+
+
diff --git a/code/modules/awaymissions/maploader/reader.dm b/code/modules/awaymissions/maploader/reader.dm
index f43073fd5a7c..732f7c36251d 100644
--- a/code/modules/awaymissions/maploader/reader.dm
+++ b/code/modules/awaymissions/maploader/reader.dm
@@ -174,17 +174,17 @@ var/global/dmm_suite/preloader/_preloader = new
//first instance the /area and remove it from the members list
index = members.len
- var/atom/instance
- _preloader.setup(members_attributes[index])//preloader for assigning set variables on atom creation
+ if(members[index] != /area/template_noop)
+ var/atom/instance
+ _preloader.setup(members_attributes[index])//preloader for assigning set variables on atom creation
- instance = locate(members[index])
- var/turf/crds = locate(xcrd,ycrd,zcrd)
- if(crds)
- instance.contents.Add(crds)
-
- if(use_preloader && instance)
- _preloader.load(instance)
+ instance = locate(members[index])
+ var/turf/crds = locate(xcrd,ycrd,zcrd)
+ if(crds)
+ instance.contents.Add(crds)
+ if(use_preloader && instance)
+ _preloader.load(instance)
members.Remove(members[index])
//then instance the /turf and, if multiple tiles are presents, simulates the DMM underlays piling effect
@@ -194,7 +194,9 @@ var/global/dmm_suite/preloader/_preloader = new
first_turf_index++
//instanciate the first /turf
- var/turf/T = instance_atom(members[first_turf_index],members_attributes[first_turf_index],xcrd,ycrd,zcrd)
+ var/turf/T
+ if(members[first_turf_index] != /turf/template_noop)
+ T = instance_atom(members[first_turf_index],members_attributes[first_turf_index],xcrd,ycrd,zcrd)
if(T)
//if others /turf are presents, simulates the underlays piling effect
@@ -350,3 +352,9 @@ var/global/dmm_suite/preloader/_preloader = new
for(var/attribute in attributes)
what.vars[attribute] = attributes[attribute]
use_preloader = FALSE
+
+/area/template_noop
+ name = "Area Passthrough"
+
+/turf/template_noop
+ name = "Turf Passthrough"
\ No newline at end of file
diff --git a/code/modules/awaymissions/mission_code/Academy.dm b/code/modules/awaymissions/mission_code/Academy.dm
index eea7426018b8..b098e08e510d 100644
--- a/code/modules/awaymissions/mission_code/Academy.dm
+++ b/code/modules/awaymissions/mission_code/Academy.dm
@@ -163,9 +163,13 @@
desc = "A die with twenty sides. You can feel unearthly energies radiating from it. Using this might be VERY risky."
icon_state = "d20"
sides = 20
+ var/reusable = 1
var/used = 0
var/rigged = -1
+/obj/item/weapon/dice/d20/fate/one_use
+ reusable = 0
+
/obj/item/weapon/dice/d20/fate/diceroll(mob/user)
..()
if(!used)
@@ -184,7 +188,8 @@
/obj/item/weapon/dice/d20/fate/proc/effect(var/mob/living/carbon/human/user,roll)
- used = 1
+ if(!reusable)
+ used = 1
visible_message("The die flare briefly.")
switch(roll)
if(1)
diff --git a/code/modules/awaymissions/mission_code/snowdin.dm b/code/modules/awaymissions/mission_code/snowdin.dm
index 3f2db7b6d2a3..fc452c13888d 100644
--- a/code/modules/awaymissions/mission_code/snowdin.dm
+++ b/code/modules/awaymissions/mission_code/snowdin.dm
@@ -127,7 +127,7 @@ obj/item/weapon/paper/crumpled/snowdin/shovel
/obj/item/weapon/c4 = 7,
/obj/item/weapon/grenade/clusterbuster/smoke = 15,
/obj/item/clothing/under/chameleon = 13,
- /obj/item/clothing/shoes/sneakers/syndigaloshes = 10,
+ /obj/item/clothing/shoes/chameleon = 10,
/obj/item/borg/upgrade/ddrill = 3,
/obj/item/borg/upgrade/soh = 3)
@@ -167,7 +167,6 @@ obj/item/weapon/paper/crumpled/snowdin/shovel
/obj/item/weapon/twohanded/dualsaber = 15,
/obj/item/organ/internal/heart/demon = 7,
/obj/item/weapon/gun/projectile/automatic/c20r/unrestricted = 16,
- /obj/item/weapon/dice/d20/fate = 4,
/obj/item/weapon/gun/magic/wand/resurrection/inert = 15,
/obj/item/weapon/gun/magic/wand/resurrection = 10,
/obj/item/device/radio/uplink/old = 2,
@@ -221,18 +220,18 @@ obj/item/weapon/paper/crumpled/snowdin/shovel
hidden_uplink.name = "dusty radio"
hidden_uplink.telecrystals = 10
-/obj/effect/landmark/corpse/syndicatesoldier/coldres
+obj/effect/mob_spawn/human/syndicatesoldier/coldres
name = "Syndicate Snow Operative"
- corpseuniform = /obj/item/clothing/under/syndicate/coldres
- corpseshoes = /obj/item/clothing/shoes/combat/coldres
- corpseradio = /obj/item/device/radio/headset/syndicate/alt
- corpsepocket1 = /obj/item/weapon/gun/projectile/automatic/pistol
- corpsepocket2 = /obj/item/weapon/card/id/syndicate
- corpseid = 0
+ uniform = /obj/item/clothing/under/syndicate/coldres
+ shoes = /obj/item/clothing/shoes/combat/coldres
+ radio = /obj/item/device/radio/headset/syndicate/alt
+ pocket1 = /obj/item/weapon/gun/projectile/automatic/pistol
+ pocket2 = /obj/item/weapon/card/id/syndicate
+ has_id = 0
-/obj/effect/landmark/corpse/syndicatesoldier/coldres/alive
+obj/effect/mob_spawn/human/syndicatesoldier/coldres/alive
name = "sleeper"
- mobname = "Syndicate Snow Operative"
+ mob_name = "Syndicate Snow Operative"
icon = 'icons/obj/Cryogenic2.dmi'
icon_state = "sleeper"
roundstart = FALSE
@@ -242,8 +241,8 @@ obj/item/weapon/paper/crumpled/snowdin/shovel
flavour_text = {"You are a syndicate operative recently awoken from cyrostatis in an underground outpost. Monitor Nanotrasen communications and record infomation. All intruders should be
disposed of swirfly to assure no gathered infomation is stolen or lost. Try not to wander too far from the outpost as the caves can be a deadly place even for a trained operative such as yourself."}
-/obj/effect/landmark/corpse/syndicatesoldier/coldres/alive/female
- mobgender = FEMALE
+obj/effect/mob_spawn/human/syndicatesoldier/coldres/alive/female
+ mob_gender = FEMALE
//mobs//--
diff --git a/code/modules/cargo/console.dm b/code/modules/cargo/console.dm
index 42c71e8da14c..1aff727bfe62 100644
--- a/code/modules/cargo/console.dm
+++ b/code/modules/cargo/console.dm
@@ -105,8 +105,11 @@
say("The supply shuttle has been loaned to Centcom.")
. = TRUE
if("add")
- var/id = params["id"]
- if(!SSshuttle.supply_packs[id])
+ var/id = text2path(params["id"])
+ var/datum/supply_pack/pack = SSshuttle.supply_packs[id]
+ if(!istype(pack))
+ return
+ if((pack.hidden && !emagged) || (pack.contraband && !contraband))
return
var/name = "*None Provided*"
@@ -127,7 +130,7 @@
return
var/turf/T = get_turf(src)
- var/datum/supply_order/SO = new(id, name, rank, ckey, reason)
+ var/datum/supply_order/SO = new(pack, name, rank, ckey, reason)
SO.generateRequisition(T)
if(requestonly)
SSshuttle.requestlist += SO
diff --git a/code/modules/cargo/order.dm b/code/modules/cargo/order.dm
index 1d73bb0332c6..7c54fd17982b 100644
--- a/code/modules/cargo/order.dm
+++ b/code/modules/cargo/order.dm
@@ -23,9 +23,9 @@
var/reason
var/datum/supply_pack/pack
-/datum/supply_order/New(pack, orderer, orderer_rank, orderer_ckey, reason)
+/datum/supply_order/New(datum/supply_pack/pack, orderer, orderer_rank, orderer_ckey, reason)
id = SSshuttle.ordernum++
- src.pack = SSshuttle.supply_packs[pack]
+ src.pack = pack
src.orderer = orderer
src.orderer_rank = orderer_rank
src.orderer_ckey = orderer_ckey
diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm
index 9c033b4bf670..06e2e7fc1a15 100644
--- a/code/modules/cargo/packs.dm
+++ b/code/modules/cargo/packs.dm
@@ -372,7 +372,8 @@
/datum/supply_pack/security/justiceinbound
name = "Standard Justice Enforcer Crate"
- cost = 80 //justice comes at a price. An expensive, noisy price.
+ cost = 60 //justice comes at a price. An expensive, noisy price.
+ contraband = TRUE
contains = list(/obj/item/clothing/head/helmet/justice,
/obj/item/clothing/mask/gas/sechailer)
crate_name = "justice enforcer crate"
@@ -1226,10 +1227,12 @@
name = "Contraband Crate"
contraband = TRUE
cost = 30
- num_contained = 5
+ num_contained = 6
contains = list(/obj/item/weapon/poster/contraband,
- /obj/item/weapon/storage/fancy/cigarettes/dromedaryco,
- /obj/item/weapon/storage/fancy/cigarettes/cigpack_shadyjims)
+ /obj/item/weapon/storage/fancy/cigarettes/cigpack_shadyjims,
+ /obj/item/weapon/storage/fancy/cigarettes/cigpack_midori,
+ /obj/item/seeds/ambrosiadeusseed,
+ /obj/item/clothing/tie/dope_necklace)
crate_name = "crate"
/datum/supply_pack/misc/randomised/toys
diff --git a/code/modules/client/client defines.dm b/code/modules/client/client defines.dm
index ca9ced5dc8ed..c0241ba6b748 100644
--- a/code/modules/client/client defines.dm
+++ b/code/modules/client/client defines.dm
@@ -4,7 +4,7 @@
//ADMIN THINGS//
////////////////
var/datum/admins/holder = null
- var/datum/click_intercept = null // Needs to implement ClickOn(user,params,atom) proc
+ var/datum/click_intercept = null // Needs to implement InterceptClickOn(user,params,atom) proc
var/AI_Interact = 0
var/jobbancache = null //Used to cache this client's jobbans to save on DB queries
diff --git a/code/modules/client/preferences_toggles.dm b/code/modules/client/preferences_toggles.dm
index f4f57223dd46..7bc1302fa197 100644
--- a/code/modules/client/preferences_toggles.dm
+++ b/code/modules/client/preferences_toggles.dm
@@ -280,11 +280,11 @@ var/global/list/ghost_orbits = list(GHOST_ORBIT_CIRCLE,GHOST_ORBIT_TRIANGLE,GHOS
else
src << "You will no longer examine things you click on."
-/client/verb/toggle_announcment_sound()
- set name = "Hear/Silence Announcments"
+/client/verb/toggle_announcement_sound()
+ set name = "Hear/Silence Announcements"
set category = "Preferences"
- set desc = ".Toggles hearing Central Command, Captain, VOX, and other announcment sounds"
- prefs.toggles ^= SOUND_ANNOUNCMENTS
- src << "You will now [(prefs.toggles & SOUND_ANNOUNCMENTS) ? "hear announcment sounds" : "no longer hear announcments"]."
+ set desc = ".Toggles hearing Central Command, Captain, VOX, and other announcement sounds"
+ prefs.toggles ^= SOUND_ANNOUNCEMENTS
+ src << "You will now [(prefs.toggles & SOUND_ANNOUNCEMENTS) ? "no longer hear announcements" : "hear announcement sounds"]."
prefs.save_preferences()
- feedback_add_details("admin_verb","TAS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
\ No newline at end of file
+ feedback_add_details("admin_verb","TAS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm
new file mode 100644
index 000000000000..aaf5e2044445
--- /dev/null
+++ b/code/modules/clothing/chameleon.dm
@@ -0,0 +1,239 @@
+/datum/action/item_action/chameleon/change
+ name = "Chameleon Change"
+ var/list/chameleon_blacklist = list()
+ var/list/chameleon_list = list()
+ var/chameleon_type = null
+ var/chameleon_name = "Item"
+
+/datum/action/item_action/chameleon/change/proc/initialize_disguises()
+ if(button)
+ button.name = "Change [chameleon_name] Appearance"
+ chameleon_blacklist += target.type
+ var/list/temp_list = typesof(chameleon_type)
+ for(var/V in temp_list - (chameleon_blacklist))
+ chameleon_list += V
+
+/datum/action/item_action/chameleon/change/proc/update_look(mob/user)
+ var/list/item_names = list()
+ var/obj/item/picked_item
+ for(var/U in chameleon_list)
+ var/obj/item/I = U
+ item_names += initial(I.name)
+ var/picked_name
+ picked_name = input("Select [chameleon_name] to change it to", "Chameleon [chameleon_name]", picked_name) in item_names
+ if(!picked_name)
+ return
+ for(var/V in chameleon_list)
+ var/obj/item/I = V
+ if(initial(I.name) == picked_name)
+ picked_item = V
+ break
+ if(!picked_item)
+ return
+ if(isliving(user))
+ var/mob/living/C = user
+ if(C.stat != CONSCIOUS)
+ return
+
+ target.name = initial(picked_item.name)
+ target.desc = initial(picked_item.desc)
+ target.icon_state = initial(picked_item.icon_state)
+ if(istype(target, /obj/item))
+ var/obj/item/I = target
+ I.item_state = initial(picked_item.item_state)
+ if(istype(I, /obj/item/clothing) && istype(initial(picked_item), /obj/item/clothing))
+ var/obj/item/clothing/CL = I
+ var/obj/item/clothing/PCL = picked_item
+ CL.flags_cover = initial(PCL.flags_cover)
+ target.icon = initial(picked_item.icon)
+
+ C.regenerate_icons() //so our overlays update.
+ UpdateButtonIcon()
+
+/datum/action/item_action/chameleon/change/Trigger()
+ if(!IsAvailable())
+ return
+
+ update_look(owner)
+ return 1
+
+/obj/item/clothing/under/chameleon
+//starts off as black
+ name = "black jumpsuit"
+ icon_state = "black"
+ item_state = "bl_suit"
+ item_color = "black"
+ desc = "It's a plain jumpsuit. It has a small dial on the wrist."
+ origin_tech = "syndicate=3"
+ sensor_mode = 0 //Hey who's this guy on the Syndicate Shuttle??
+ random_sensor = 0
+ burn_state = FIRE_PROOF
+ armor = list(melee = 10, bullet = 10, laser = 10, energy = 0, bomb = 0, bio = 0, rad = 0)
+
+/obj/item/clothing/under/chameleon/New()
+ ..()
+ var/datum/action/item_action/chameleon/change/chameleon_action = new(src)
+ chameleon_action.chameleon_type = /obj/item/clothing/under
+ chameleon_action.chameleon_name = "Jumpsuit"
+ chameleon_action.initialize_disguises()
+
+/obj/item/clothing/suit/chameleon
+ name = "armor"
+ desc = "A slim armored vest that protects against most types of damage."
+ icon_state = "armor"
+ item_state = "armor"
+ blood_overlay_type = "armor"
+ origin_tech = "syndicate=3"
+ burn_state = FIRE_PROOF
+ armor = list(melee = 10, bullet = 10, laser = 10, energy = 0, bomb = 0, bio = 0, rad = 0)
+
+/obj/item/clothing/suit/chameleon/New()
+ ..()
+ var/datum/action/item_action/chameleon/change/chameleon_action = new(src)
+ chameleon_action.chameleon_type = /obj/item/clothing/suit
+ chameleon_action.chameleon_name = "Suit"
+ chameleon_action.initialize_disguises()
+
+/obj/item/clothing/glasses/chameleon
+ name = "Optical Meson Scanner"
+ desc = "Used by engineering and mining staff to see basic structural and terrain layouts through walls, regardless of lighting condition."
+ icon_state = "meson"
+ item_state = "meson"
+
+ origin_tech = "syndicate=3"
+ burn_state = FIRE_PROOF
+ armor = list(melee = 10, bullet = 10, laser = 10, energy = 0, bomb = 0, bio = 0, rad = 0)
+
+/obj/item/clothing/glasses/chameleon/New()
+ ..()
+ var/datum/action/item_action/chameleon/change/chameleon_action = new(src)
+ chameleon_action.chameleon_type = /obj/item/clothing/glasses
+ chameleon_action.chameleon_name = "Glasses"
+ chameleon_action.initialize_disguises()
+
+/obj/item/clothing/gloves/chameleon
+ desc = "These gloves will protect the wearer from electric shock."
+ name = "insulated gloves"
+ icon_state = "yellow"
+ item_state = "ygloves"
+
+ burn_state = FIRE_PROOF
+ armor = list(melee = 10, bullet = 10, laser = 10, energy = 0, bomb = 0, bio = 0, rad = 0)
+
+/obj/item/clothing/gloves/chameleon/New()
+ ..()
+ var/datum/action/item_action/chameleon/change/chameleon_action = new(src)
+ chameleon_action.chameleon_type = /obj/item/clothing/gloves
+ chameleon_action.chameleon_name = "Gloves"
+ chameleon_action.initialize_disguises()
+
+/obj/item/clothing/head/chameleon
+ name = "grey cap"
+ desc = "It's a baseball hat in a tasteful grey colour."
+ icon_state = "greysoft"
+ item_color = "grey"
+
+ burn_state = FIRE_PROOF
+ armor = list(melee = 5, bullet = 5, laser = 5, energy = 0, bomb = 0, bio = 0, rad = 0)
+
+/obj/item/clothing/head/chameleon/New()
+ ..()
+ var/datum/action/item_action/chameleon/change/chameleon_action = new(src)
+ chameleon_action.chameleon_type = /obj/item/clothing/head
+ chameleon_action.chameleon_name = "Hat"
+ chameleon_action.initialize_disguises()
+
+/obj/item/clothing/mask/chameleon
+ name = "gas mask"
+ desc = "A face-covering mask that can be connected to an air supply. While good for concealing your identity, it isn't good for blocking gas flow." //More accurate
+ icon_state = "gas_alt"
+ item_state = "gas_alt"
+ burn_state = FIRE_PROOF
+ armor = list(melee = 5, bullet = 5, laser = 5, energy = 0, bomb = 0, bio = 0, rad = 0)
+
+ flags = BLOCK_GAS_SMOKE_EFFECT | MASKINTERNALS
+ flags_inv = HIDEEARS|HIDEEYES|HIDEFACE|HIDEFACIALHAIR
+ gas_transfer_coefficient = 0.01
+ permeability_coefficient = 0.01
+ flags_cover = MASKCOVERSEYES | MASKCOVERSMOUTH
+
+ var/vchange = 1
+
+/obj/item/clothing/mask/chameleon/New()
+ ..()
+ var/datum/action/item_action/chameleon/change/chameleon_action = new(src)
+ chameleon_action.chameleon_type = /obj/item/clothing/mask
+ chameleon_action.chameleon_name = "Mask"
+ chameleon_action.initialize_disguises()
+
+/obj/item/clothing/mask/chameleon/attack_self(mob/user)
+ vchange = !vchange
+ user << "The voice changer is now [vchange ? "on" : "off"]!"
+
+/obj/item/clothing/shoes/chameleon
+ name = "black shoes"
+ icon_state = "black"
+ item_color = "black"
+ desc = "A pair of black shoes."
+
+ permeability_coefficient = 0.05
+ flags = NOSLIP
+ origin_tech = "syndicate=3"
+ burn_state = FIRE_PROOF
+ can_hold_items = 1
+ armor = list(melee = 10, bullet = 10, laser = 10, energy = 0, bomb = 0, bio = 0, rad = 0)
+
+/obj/item/clothing/shoes/chameleon/New()
+ ..()
+ var/datum/action/item_action/chameleon/change/chameleon_action = new(src)
+ chameleon_action.chameleon_type = /obj/item/clothing/shoes
+ chameleon_action.chameleon_name = "Shoes"
+ chameleon_action.initialize_disguises()
+
+/obj/item/weapon/gun/energy/laser/chameleon
+ name = "practice laser gun"
+ desc = "A modified version of the basic laser gun, this one fires less concentrated energy bolts designed for target practice."
+ ammo_type = list(/obj/item/ammo_casing/energy/laser/practice)
+ clumsy_check = 0
+ needs_permit = 0
+ pin = /obj/item/device/firing_pin
+ cell_type = /obj/item/weapon/stock_parts/cell/bluespace
+
+/obj/item/weapon/gun/energy/laser/chameleon/New()
+ ..()
+ var/datum/action/item_action/chameleon/change/chameleon_action = new(src)
+ chameleon_action.chameleon_type = /obj/item/weapon/gun
+ chameleon_action.chameleon_name = "Gun"
+ chameleon_action.chameleon_blacklist = typesof(/obj/item/weapon/gun/magic)
+ chameleon_action.initialize_disguises()
+
+/obj/item/weapon/storage/backpack/chameleon
+ name = "chameleon backpack"
+
+/obj/item/weapon/storage/backpack/chameleon/New()
+ ..()
+ var/datum/action/item_action/chameleon/change/chameleon_action = new(src)
+ chameleon_action.chameleon_type = /obj/item/weapon/storage/backpack
+ chameleon_action.chameleon_name = "Backpack"
+ chameleon_action.initialize_disguises()
+
+/obj/item/device/radio/headset/chameleon
+ name = "chameleon headset"
+
+/obj/item/device/radio/headset/chameleon/New()
+ ..()
+ var/datum/action/item_action/chameleon/change/chameleon_action = new(src)
+ chameleon_action.chameleon_type = /obj/item/device/radio/headset
+ chameleon_action.chameleon_name = "Headset"
+ chameleon_action.initialize_disguises()
+
+/obj/item/device/pda/chameleon
+ name = "chameleon PDA"
+
+/obj/item/device/pda/chameleon/New()
+ ..()
+ var/datum/action/item_action/chameleon/change/chameleon_action = new(src)
+ chameleon_action.chameleon_type = /obj/item/device/pda
+ chameleon_action.chameleon_name = "PDA"
+ chameleon_action.chameleon_blacklist = list(/obj/item/device/pda/ai)
+ chameleon_action.initialize_disguises()
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index d8f576c911c7..f64929cc1ad7 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -116,7 +116,6 @@ BLIND // can't see anything
strip_delay = 40
put_on_delay = 40
var/mask_adjusted = 0
- var/ignore_maskadjust = 1
var/adjusted_flags = null
@@ -132,31 +131,32 @@ 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(mob/living/user)
- if(!ignore_maskadjust)
- if(user.incapacitated())
- return
- if(mask_adjusted == 1)
- src.icon_state = initial(icon_state)
- gas_transfer_coefficient = initial(gas_transfer_coefficient)
- permeability_coefficient = initial(permeability_coefficient)
- flags |= visor_flags
- flags_inv |= visor_flags_inv
- flags_cover = initial(flags_cover)
- user << "You push \the [src] back into place."
- src.mask_adjusted = 0
- slot_flags = initial(slot_flags)
- else
- icon_state += "_up"
- user << "You push \the [src] out of the way."
- gas_transfer_coefficient = null
- permeability_coefficient = null
- flags &= ~visor_flags
- flags_inv &= ~visor_flags_inv
- flags_cover &= 0
- src.mask_adjusted = 1
- if(adjusted_flags)
- slot_flags = adjusted_flags
- user.wear_mask_update(src, unequip = 0)
+ if(user.incapacitated())
+ return
+ mask_adjusted = !mask_adjusted
+ if(!mask_adjusted)
+ src.icon_state = initial(icon_state)
+ gas_transfer_coefficient = initial(gas_transfer_coefficient)
+ permeability_coefficient = initial(permeability_coefficient)
+ flags |= visor_flags
+ flags_inv |= visor_flags_inv
+ flags_cover = initial(flags_cover)
+ user << "You push \the [src] back into place."
+ slot_flags = initial(slot_flags)
+ else
+ icon_state += "_up"
+ user << "You push \the [src] out of the way."
+ gas_transfer_coefficient = null
+ permeability_coefficient = null
+ flags &= ~visor_flags
+ flags_inv &= ~visor_flags_inv
+ flags_cover &= 0
+ if(adjusted_flags)
+ slot_flags = adjusted_flags
+ user.wear_mask_update(src, toggle_off = mask_adjusted)
+ for(var/X in actions)
+ var/datum/action/A = X
+ A.UpdateButtonIcon()
@@ -330,7 +330,8 @@ BLIND // can't see anything
/obj/item/clothing/under/New()
if(random_sensor)
- sensor_mode = pick(0,1,2,3)
+ //make the sensor mode favor higher levels, except coords.
+ sensor_mode = pickweight(list(0 = 1, 1 = 2, 2 = 3, 3 = 2))
adjusted = 0
suit_color = item_color
..()
@@ -516,6 +517,9 @@ BLIND // can't see anything
if(istype(usr, /mob/living/carbon))
var/mob/living/carbon/C = usr
C.head_update(src, forced = 1)
+ for(var/X in actions)
+ var/datum/action/A = X
+ A.UpdateButtonIcon()
/obj/item/clothing/proc/can_use(mob/user)
if(user && ismob(user))
diff --git a/code/modules/clothing/glasses/engine_goggles.dm b/code/modules/clothing/glasses/engine_goggles.dm
index ec8c57500123..c5e4954152c8 100644
--- a/code/modules/clothing/glasses/engine_goggles.dm
+++ b/code/modules/clothing/glasses/engine_goggles.dm
@@ -4,16 +4,13 @@
name = "Engineering Scanner Goggles"
desc = "Goggles used by engineers. The Meson Scanner mode lets you see basic structural and terrain layouts through walls, regardless of lighting condition. The T-ray Scanner mode lets you see underfloor objects such as cables and pipes."
icon_state = "trayson-meson"
- action_button_name = "Change Scanning Mode"
+ actions_types = list(/datum/action/item_action/toggle_mode)
var/mode = 0 //0 - regular mesons mode 1 - t-ray mode
var/invis_objects = list()
var/range = 1
-/obj/item/clothing/glasses/meson/engine/attack_self()
- ui_action_click()
-
-/obj/item/clothing/glasses/meson/engine/ui_action_click()
+/obj/item/clothing/glasses/meson/engine/attack_self(mob/user)
mode = !mode
if(mode)
@@ -21,7 +18,7 @@
vision_flags = 0
darkness_view = 2
invis_view = SEE_INVISIBLE_LIVING
- loc << "You toggle the goggles' scanning mode to \[T-Ray]."
+ user << "You toggle the goggles' scanning mode to \[T-Ray]."
else
SSobj.processing.Remove(src)
vision_flags = SEE_TURFS
@@ -30,11 +27,15 @@
loc << "You toggle the goggles' scanning mode to \[Meson]."
invis_update()
- if(istype(loc,/mob/living/carbon))
- var/mob/living/carbon/C = loc
- C.update_sight()
+ if(ishuman(user))
+ var/mob/living/carbon/human/H = user
+ if(H.glasses == src)
+ H.update_sight()
update_icon()
+ for(var/X in actions)
+ var/datum/action/A = X
+ A.UpdateButtonIcon()
/obj/item/clothing/glasses/meson/engine/process()
if(!mode)
@@ -94,7 +95,6 @@
name = "Optical T-Ray Scanner"
desc = "Used by engineering staff to see underfloor objects such as cables and pipes."
icon_state = "trayson-tray_off"
- action_button_name = "Toggle Scanner Power"
mode = 1
var/on = 0
@@ -115,18 +115,21 @@
if(user.glasses == src)
user.update_inv_glasses()
-/obj/item/clothing/glasses/meson/engine/tray/ui_action_click()
+/obj/item/clothing/glasses/meson/engine/tray/attack_self(mob/user)
on = !on
if(on)
SSobj.processing |= src
- loc << "You turn the goggles on."
+ user << "You turn the goggles on."
else
SSobj.processing.Remove(src)
- loc << "You turn the goggles off."
+ user << "You turn the goggles off."
invis_update()
update_icon()
+ for(var/X in actions)
+ var/datum/action/A = X
+ A.UpdateButtonIcon()
/obj/item/clothing/glasses/meson/engine/tray/t_ray_on()
return on && ..()
\ No newline at end of file
diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm
index 31f9e2aefaef..df0f18f54050 100644
--- a/code/modules/clothing/glasses/glasses.dm
+++ b/code/modules/clothing/glasses/glasses.dm
@@ -50,16 +50,11 @@
item_state = "glasses"
origin_tech = "magnets=2;engineering=2"
scan_reagents = 1 //You can see reagents while wearing science goggles
+ actions_types = list(/datum/action/item_action/toggle_research_scanner)
-/obj/item/clothing/glasses/science/equipped(mob/user, slot)
+/obj/item/clothing/glasses/science/item_action_slot_check(slot)
if(slot == slot_glasses)
- user.scanner.devices += 1
- user.scanner.Grant(user)
- ..(user, slot)
-
-/obj/item/clothing/glasses/science/dropped(mob/user)
- user.scanner.devices = max(0, user.scanner.devices - 1)
- ..()
+ return 1
/obj/item/clothing/glasses/night
name = "Night Vision Goggles"
@@ -170,7 +165,7 @@
desc = "Protects the eyes from welders; approved by the mad scientist association."
icon_state = "welding-g"
item_state = "welding-g"
- action_button_name = "Toggle Welding Goggles"
+ actions_types = list(/datum/action/item_action/toggle)
materials = list(MAT_METAL = 250)
flash_protect = 2
tint = 2
diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm
index 133e55cc1f01..7ab535c4d9d2 100644
--- a/code/modules/clothing/glasses/hud.dm
+++ b/code/modules/clothing/glasses/hud.dm
@@ -11,6 +11,7 @@
H.add_hud_to(user)
/obj/item/clothing/glasses/hud/dropped(mob/living/carbon/human/user)
+ ..()
if(hud_type && istype(user) && user.glasses == src)
var/datum/atom_hud/H = huds[hud_type]
H.remove_hud_from(user)
@@ -113,7 +114,7 @@
/obj/item/clothing/glasses/hud/toggle
name = "Toggle Hud"
desc = "A hud with multiple functions."
- action_button_name = "Switch HUD"
+ actions_types = list(/datum/action/item_action/switch_hud)
/obj/item/clothing/glasses/hud/toggle/attack_self(mob/user)
if(!ishuman(user))
diff --git a/code/modules/clothing/head/hardhat.dm b/code/modules/clothing/head/hardhat.dm
index 43349c6a5411..1c0e4b04794a 100644
--- a/code/modules/clothing/head/hardhat.dm
+++ b/code/modules/clothing/head/hardhat.dm
@@ -8,7 +8,7 @@
item_color = "yellow" //Determines used sprites: hardhat[on]_[item_color] and hardhat[on]_[item_color]2 (lying down sprite)
armor = list(melee = 15, bullet = 5, laser = 20,energy = 10, bomb = 20, bio = 10, rad = 20)
flags_inv = 0
- action_button_name = "Toggle Helmet Light"
+ actions_types = list(/datum/action/item_action/toggle_helmet_light)
burn_state = FIRE_PROOF
/obj/item/clothing/head/hardhat/attack_self(mob/user)
@@ -24,13 +24,18 @@
turn_on(user)
else
turn_off(user)
+ for(var/X in actions)
+ var/datum/action/A = X
+ A.UpdateButtonIcon()
/obj/item/clothing/head/hardhat/pickup(mob/user)
+ ..()
if(on)
user.AddLuminosity(brightness_on)
SetLuminosity(0)
/obj/item/clothing/head/hardhat/dropped(mob/user)
+ ..()
if(on)
user.AddLuminosity(-brightness_on)
SetLuminosity(brightness_on)
diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm
index 1bf816451271..543f765addb6 100644
--- a/code/modules/clothing/head/helmet.dm
+++ b/code/modules/clothing/head/helmet.dm
@@ -43,7 +43,7 @@
armor = list(melee = 41, bullet = 15, laser = 5,energy = 5, bomb = 5, bio = 2, rad = 0)
flags_inv = HIDEMASK|HIDEEARS|HIDEFACE
strip_delay = 80
- action_button_name = "Toggle Helmet Visor"
+ actions_types = list(/datum/action/item_action/toggle)
visor_flags_inv = HIDEMASK|HIDEFACE
toggle_cooldown = 0
flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
@@ -75,7 +75,7 @@
icon_state = "justice"
toggle_message = "You turn off the lights on"
alt_toggle_message = "You turn on the lights on"
- action_button_name = "Toggle Justice Lights"
+ actions_types = list(/datum/action/item_action/toggle_helmet_light)
can_toggle = 1
toggle_cooldown = 20
active_sound = 'sound/items/WEEOO1.ogg'
@@ -86,7 +86,6 @@
icon_state = "justice2"
toggle_message = "You turn off the light on"
alt_toggle_message = "You turn on the light on"
- action_button_name = "Toggle Alarm Lights"
/obj/item/clothing/head/helmet/swat
name = "\improper SWAT helmet"
@@ -210,28 +209,33 @@
return
-/obj/item/clothing/head/helmet/ui_action_click()
- toggle_helmlight()
- ..()
+/obj/item/clothing/head/helmet/ui_action_click(mob/user, actiontype)
+ if(actiontype == /datum/action/item_action/toggle_helmet_flashlight)
+ toggle_helmlight()
+ else
+ ..()
-/obj/item/clothing/head/helmet/attackby(obj/item/A, mob/user, params)
- if(istype(A, /obj/item/device/flashlight/seclite))
- var/obj/item/device/flashlight/seclite/S = A
+/obj/item/clothing/head/helmet/attackby(obj/item/I, mob/user, params)
+ if(istype(I, /obj/item/device/flashlight/seclite))
+ var/obj/item/device/flashlight/seclite/S = I
if(can_flashlight)
if(!F)
- if(!user.unEquip(A))
+ if(!user.unEquip(S))
return
user << "You click [S] into place on [src]."
if(S.on)
SetLuminosity(0)
F = S
- A.loc = src
+ S.loc = src
update_icon()
update_helmlight(user)
verbs += /obj/item/clothing/head/helmet/proc/toggle_helmlight
+ var/datum/action/A = new /datum/action/item_action/toggle_helmet_flashlight(src)
+ if(loc == user)
+ A.Grant(user)
return
- if(istype(A, /obj/item/weapon/screwdriver))
+ if(istype(I, /obj/item/weapon/screwdriver))
if(F)
for(var/obj/item/device/flashlight/seclite/S in src)
user << "You unscrew the seclite from [src]."
@@ -242,10 +246,11 @@
update_icon()
usr.update_inv_head()
verbs -= /obj/item/clothing/head/helmet/proc/toggle_helmlight
+ for(var/datum/action/item_action/toggle_helmet_flashlight/THL in actions)
+ qdel(THL)
return
..()
- return
/obj/item/clothing/head/helmet/proc/toggle_helmlight()
set name = "Toggle Helmetlight"
@@ -269,7 +274,6 @@
/obj/item/clothing/head/helmet/proc/update_helmlight(mob/user = null)
if(F)
- action_button_name = "Toggle Helmetlight"
if(F.on)
if(loc == user)
user.AddLuminosity(F.brightness_on)
@@ -281,15 +285,18 @@
else if(isturf(loc))
SetLuminosity(0)
update_icon()
+
else
- action_button_name = null
if(loc == user)
user.AddLuminosity(-5)
else if(isturf(loc))
SetLuminosity(0)
- return
+ for(var/X in actions)
+ var/datum/action/A = X
+ A.UpdateButtonIcon()
/obj/item/clothing/head/helmet/pickup(mob/user)
+ ..()
if(F)
if(F.on)
user.AddLuminosity(F.brightness_on)
@@ -297,6 +304,7 @@
/obj/item/clothing/head/helmet/dropped(mob/user)
+ ..()
if(F)
if(F.on)
user.AddLuminosity(-F.brightness_on)
diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm
index 91265c6cd014..9b660fb015c5 100644
--- a/code/modules/clothing/head/misc_special.dm
+++ b/code/modules/clothing/head/misc_special.dm
@@ -23,7 +23,7 @@
tint = 2
armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
- action_button_name = "Toggle Welding Helmet"
+ actions_types = list(/datum/action/item_action/toggle)
visor_flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
burn_state = FIRE_PROOF
@@ -49,7 +49,6 @@
item_state = "hardhat0_cakehat"
item_color = "cakehat"
flags_inv = HIDEEARS|HIDEHAIR
- action_button_name = "Toggle Candle"
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
brightness_on = 2 //luminosity when on
flags_cover = HEADCOVERSEYES
@@ -116,7 +115,6 @@
item_state = "hardhat0_pumpkin"
item_color = "pumpkin"
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
- action_button_name = "Toggle Pumpkin Light"
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
brightness_on = 2 //luminosity when on
flags_cover = HEADCOVERSEYES
@@ -147,6 +145,5 @@
item_state = "hardhat0_reindeer"
item_color = "reindeer"
flags_inv = 0
- action_button_name = "Toggle Nose Light"
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
brightness_on = 1 //luminosity when on
diff --git a/code/modules/clothing/masks/boxing.dm b/code/modules/clothing/masks/boxing.dm
index 8b537b722f6c..2c9fa24c27f2 100644
--- a/code/modules/clothing/masks/boxing.dm
+++ b/code/modules/clothing/masks/boxing.dm
@@ -6,8 +6,7 @@
flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
visor_flags_inv = HIDEFACE|HIDEFACIALHAIR
w_class = 2
- action_button_name = "Adjust Balaclava"
- ignore_maskadjust = 0
+ actions_types = list(/datum/action/item_action/adjust)
/obj/item/clothing/mask/balaclava/attack_self(mob/user)
adjustmask(user)
diff --git a/code/modules/clothing/masks/breath.dm b/code/modules/clothing/masks/breath.dm
index ef684dac5f74..2ac22361d267 100644
--- a/code/modules/clothing/masks/breath.dm
+++ b/code/modules/clothing/masks/breath.dm
@@ -9,8 +9,7 @@
w_class = 2
gas_transfer_coefficient = 0.10
permeability_coefficient = 0.50
- action_button_name = "Adjust Breath Mask"
- ignore_maskadjust = 0
+ actions_types = list(/datum/action/item_action/adjust)
flags_cover = MASKCOVERSMOUTH
burn_state = FIRE_PROOF
diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm
index 6055104b49fc..2e9935288f59 100644
--- a/code/modules/clothing/masks/gasmask.dm
+++ b/code/modules/clothing/masks/gasmask.dm
@@ -22,7 +22,7 @@
tint = 2
armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
origin_tech = "materials=2;engineering=2"
- action_button_name = "Toggle Welding Mask"
+ actions_types = list(/datum/action/item_action/toggle)
flags_inv = HIDEEARS|HIDEEYES|HIDEFACE
flags_cover = MASKCOVERSEYES
visor_flags_inv = HIDEEYES
@@ -53,20 +53,6 @@
icon_state = "syndicate"
strip_delay = 60
-/obj/item/clothing/mask/gas/voice
- name = "gas mask"
- //desc = "A face-covering mask that can be connected to an air supply. It seems to house some odd electronics."
- var/mode = 0// 0==Scouter | 1==Night Vision | 2==Thermal | 3==Meson
- var/voice = "Unknown"
- var/vchange = 0//This didn't do anything before. It now checks if the mask has special functions/N
- origin_tech = "syndicate=4"
- action_button_name = "Toggle mask"
-
-/obj/item/clothing/mask/gas/voice/attack_self(mob/user)
- vchange = !vchange
- user << "The voice changer is now [vchange ? "on" : "off"]!"
-
-
/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."
@@ -76,20 +62,21 @@
flags_cover = MASKCOVERSEYES
burn_state = FLAMMABLE
-/obj/item/clothing/mask/gas/clown_hat/AltClick(mob/user)
-
- var/mob/M = usr
+/obj/item/clothing/mask/gas/clown_hat/AltClick(mob/living/user)
+ if(!istype(user) || user.incapacitated())
+ return
+
var/list/options = list()
options["True Form"] = "clown"
options["The Feminist"] = "sexyclown"
options["The Madman"] = "joker"
options["The Rainbow Color"] ="rainbow"
- var/choice = input(M,"To what form do you wish to Morph this mask?","Morph Mask") in options
+ var/choice = input(user,"To what form do you wish to Morph this mask?","Morph Mask") in options
- if(src && choice && !M.stat && in_range(M,src))
+ if(src && choice && !user.stat && in_range(user,src))
icon_state = options[choice]
- M << "Your Clown Mask has now morphed into [choice], all praise the Honkmother!"
+ user << "Your Clown Mask has now morphed into [choice], all praise the Honkmother!"
return 1
/obj/item/clothing/mask/gas/sexyclown
@@ -109,14 +96,11 @@
item_state = "mime"
flags_cover = MASKCOVERSEYES
burn_state = FLAMMABLE
- action_button_name = "Adjust Mask"
+ actions_types = list(/datum/action/item_action/adjust)
-/obj/item/clothing/mask/gas/mime/ui_action_click()
+/obj/item/clothing/mask/gas/mime/attack_self(mob/user)
cycle_mask(usr)
-/obj/item/clothing/mask/gas/mime/AltClick(mob/user)
- cycle_mask(user)
-
/obj/item/clothing/mask/gas/mime/proc/cycle_mask(mob/user)
switch(icon_state)
if("mime")
diff --git a/code/modules/clothing/masks/hailer.dm b/code/modules/clothing/masks/hailer.dm
index d35e67bde872..040ef0bab429 100644
--- a/code/modules/clothing/masks/hailer.dm
+++ b/code/modules/clothing/masks/hailer.dm
@@ -4,9 +4,8 @@
/obj/item/clothing/mask/gas/sechailer
name = "security gas mask"
desc = "A standard issue Security gas mask with integrated 'Compli-o-nator 3000' device. Plays over a dozen pre-recorded compliance phrases designed to get scumbags to stand still whilst you taze them. Do not tamper with the device."
- action_button_name = "HALT!"
+ actions_types = list(/datum/action/item_action/halt, /datum/action/item_action/adjust)
icon_state = "sechailer"
- ignore_maskadjust = 0
flags = BLOCK_GAS_SMOKE_EFFECT | MASKINTERNALS
flags_inv = HIDEFACIALHAIR|HIDEFACE
w_class = 2
@@ -21,10 +20,9 @@
/obj/item/clothing/mask/gas/sechailer/swat
name = "\improper SWAT mask"
desc = "A close-fitting tactical mask with an especially aggressive Compli-o-nator 3000."
- action_button_name = "HALT!"
+ actions_types = list(/datum/action/item_action/halt)
icon_state = "swat"
aggressiveness = 3
- ignore_maskadjust = 1
flags_inv = HIDEFACIALHAIR|HIDEFACE|HIDEEYES|HIDEEARS
visor_flags_inv = 0
@@ -34,11 +32,7 @@
icon = 'icons/obj/device.dmi'
icon_state = "taperecorder_idle"
aggressiveness = 1 //Borgs are nicecurity!
- ignore_maskadjust = 1
-
-/obj/item/clothing/mask/gas/sechailer/cyborg/New()
- ..()
- verbs -= /obj/item/clothing/mask/gas/sechailer/verb/adjust
+ actions_types = list(/datum/action/item_action/halt)
/obj/item/clothing/mask/gas/sechailer/attackby(obj/item/weapon/W, mob/user, params)
if(istype(W, /obj/item/weapon/screwdriver))
@@ -61,10 +55,11 @@
else
..()
-/obj/item/clothing/mask/gas/sechailer/verb/adjust()
- set category = "Object"
- set name = "Adjust Mask"
- adjustmask(usr)
+/obj/item/clothing/mask/gas/sechailer/ui_action_click(mob/user, actiontype)
+ if(actiontype == /datum/action/item_action/halt)
+ halt()
+ else
+ adjustmask(user)
/obj/item/clothing/mask/gas/sechailer/attack_self()
halt()
diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm
index 1a6a0f006ea3..669c5467606b 100644
--- a/code/modules/clothing/masks/miscellaneous.dm
+++ b/code/modules/clothing/masks/miscellaneous.dm
@@ -28,8 +28,7 @@
gas_transfer_coefficient = 0.90
permeability_coefficient = 0.01
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 25, rad = 0)
- action_button_name = "Adjust Sterile Mask"
- ignore_maskadjust = 0
+ actions_types = list(/datum/action/item_action/adjust)
/obj/item/clothing/mask/surgical/attack_self(mob/user)
adjustmask(user)
@@ -47,7 +46,7 @@
item_state = "pig"
flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
w_class = 2
- action_button_name = "Toggle Voice Box"
+ actions_types = list(/datum/action/item_action/toggle_voice_box)
var/voicechange = 0
/obj/item/clothing/mask/pig/attack_self(mob/user)
@@ -110,7 +109,6 @@
flags_inv = HIDEFACE|HIDEFACIALHAIR
visor_flags_inv = HIDEFACE|HIDEFACIALHAIR
slot_flags = SLOT_MASK
- ignore_maskadjust = 0
adjusted_flags = SLOT_HEAD
icon_state = "bandbotany"
diff --git a/code/modules/clothing/shoes/bananashoes.dm b/code/modules/clothing/shoes/bananashoes.dm
index a51af2db1b42..0f7accc2e5d5 100644
--- a/code/modules/clothing/shoes/bananashoes.dm
+++ b/code/modules/clothing/shoes/bananashoes.dm
@@ -6,7 +6,7 @@
icon_state = "clown_prototype_off"
var/on = 0
var/datum/material_container/bananium
- action_button_name = "Toggle Shoes"
+ actions_types = list(/datum/action/item_action/toggle)
/obj/item/clothing/shoes/clown_shoes/banana_shoes/New()
..()
@@ -58,13 +58,13 @@
var/ban_amt = bananium.amount(MAT_BANANIUM)
user << "The shoes are [on ? "enabled" : "disabled"]. There is [ban_amt ? ban_amt : "no"] bananium left."
-/obj/item/clothing/shoes/clown_shoes/banana_shoes/ui_action_click()
+/obj/item/clothing/shoes/clown_shoes/banana_shoes/ui_action_click(mob/user)
if(bananium.amount(MAT_BANANIUM))
on = !on
update_icon()
- loc << "You [on ? "activate" : "deactivate"] the prototype shoes."
+ user << "You [on ? "activate" : "deactivate"] the prototype shoes."
else
- loc << "You need bananium to turn the prototype shoes on!"
+ user << "You need bananium to turn the prototype shoes on!"
/obj/item/clothing/shoes/clown_shoes/banana_shoes/update_icon()
if(on)
@@ -72,3 +72,6 @@
else
icon_state = "clown_prototype_off"
usr.update_inv_shoes()
+ for(var/X in actions)
+ var/datum/action/A = X
+ A.UpdateButtonIcon()
diff --git a/code/modules/clothing/shoes/magboots.dm b/code/modules/clothing/shoes/magboots.dm
index ed673d40c500..8d3f55c8dcec 100644
--- a/code/modules/clothing/shoes/magboots.dm
+++ b/code/modules/clothing/shoes/magboots.dm
@@ -5,7 +5,7 @@
var/magboot_state = "magboots"
var/magpulse = 0
var/slowdown_active = 2
- action_button_name = "Toggle Magboots"
+ actions_types = list(/datum/action/item_action/toggle)
strip_delay = 70
put_on_delay = 70
burn_state = FIRE_PROOF
@@ -32,6 +32,9 @@
user << "You [magpulse ? "enable" : "disable"] the mag-pulse traction system."
user.update_inv_shoes() //so our mob-overlays update
user.update_gravity(user.mob_has_gravity())
+ for(var/X in actions)
+ var/datum/action/A = X
+ A.UpdateButtonIcon()
/obj/item/clothing/shoes/magboots/negates_gravity()
return flags & NOSLIP
diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm
index 190a09a1643e..b63d3a4f7712 100644
--- a/code/modules/clothing/shoes/miscellaneous.dm
+++ b/code/modules/clothing/shoes/miscellaneous.dm
@@ -7,17 +7,6 @@
playsound(user, 'sound/weapons/genhit2.ogg', 50, 1)
return(BRUTELOSS)
-/obj/item/clothing/shoes/sneakers/syndigaloshes
- desc = "A pair of brown shoes."
- name = "brown shoes"
- icon_state = "brown"
- item_state = "brown"
- permeability_coefficient = 0.05
- flags = NOSLIP
- origin_tech = "syndicate=3"
- burn_state = FIRE_PROOF
- can_hold_items = 1
-
/obj/item/clothing/shoes/sneakers/mime
name = "mime shoes"
icon_state = "mime"
diff --git a/code/modules/clothing/spacesuits/chronosuit.dm b/code/modules/clothing/spacesuits/chronosuit.dm
index 2e95c4c9f0a6..de2d07a8e878 100644
--- a/code/modules/clothing/spacesuits/chronosuit.dm
+++ b/code/modules/clothing/spacesuits/chronosuit.dm
@@ -22,7 +22,7 @@
desc = "An advanced spacesuit equipped with teleportation and anti-compression technology"
icon_state = "chronosuit"
item_state = "chronosuit"
- action_button_name = "Toggle Chronosuit"
+ actions_types = list(/datum/action/item_action/toggle)
armor = list(melee = 60, bullet = 60, laser = 60, energy = 60, bomb = 30, bio = 90, rad = 90)
var/list/chronosafe_items = list(/obj/item/weapon/chrono_eraser, /obj/item/weapon/gun/energy/chrono_gun)
var/hands_nodrop_states
@@ -93,8 +93,7 @@
if(camera)
camera.remove_target_ui()
camera.loc = user
- if(teleport_now.button)
- teleport_now.button.UpdateIcon()
+ teleport_now.UpdateButtonIcon()
/obj/item/clothing/suit/space/chronos/proc/chronowalk(atom/location)
var/mob/living/carbon/human/user = src.loc
@@ -108,8 +107,7 @@
if(camera)
camera.remove_target_ui()
- if(teleport_now.button)
- teleport_now.button.UpdateIcon()
+ teleport_now.UpdateButtonIcon()
var/list/nonsafe_slots = list(slot_belt, slot_back, slot_l_hand, slot_r_hand)
for(var/slot in nonsafe_slots)
@@ -331,16 +329,13 @@
/datum/action/innate/chrono_teleport
name = "Teleport Now"
button_icon_state = "chrono_phase"
- check_flags = AB_CHECK_ALIVE|AB_CHECK_INSIDE
+ check_flags = AB_CHECK_CONSCIOUS //|AB_CHECK_INSIDE
var/obj/item/clothing/suit/space/chronos/chronosuit = null
/datum/action/innate/chrono_teleport/IsAvailable()
- return (!CheckRemoval(owner) && !chronosuit.teleporting)
+ return (chronosuit && chronosuit.activated && chronosuit.camera && !chronosuit.teleporting)
/datum/action/innate/chrono_teleport/Activate()
if(IsAvailable())
if(chronosuit.camera)
chronosuit.chronowalk(chronosuit.camera)
-
-/datum/action/innate/chrono_teleport/CheckRemoval()
- return (..() && !(chronosuit && chronosuit.activated && chronosuit.camera))
\ No newline at end of file
diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm
index 4c410c014c2a..8117736920aa 100644
--- a/code/modules/clothing/spacesuits/hardsuit.dm
+++ b/code/modules/clothing/spacesuits/hardsuit.dm
@@ -10,7 +10,7 @@
var/on = 0
var/obj/item/clothing/suit/space/hardsuit/suit
item_color = "engineering" //Determines used sprites: hardsuit[on]-[color] and hardsuit[on]-[color]2 (lying down sprite)
- action_button_name = "Toggle Helmet Light"
+ actions_types = list(/datum/action/item_action/toggle_helmet_light)
/obj/item/clothing/head/helmet/space/hardsuit/attack_self(mob/user)
@@ -25,21 +25,31 @@
user.AddLuminosity(brightness_on)
else
user.AddLuminosity(-brightness_on)
+ for(var/X in actions)
+ var/datum/action/A = X
+ A.UpdateButtonIcon()
/obj/item/clothing/head/helmet/space/hardsuit/pickup(mob/user)
+ ..()
if(on)
user.AddLuminosity(brightness_on)
SetLuminosity(0)
/obj/item/clothing/head/helmet/space/hardsuit/dropped(mob/user)
+ ..()
if(on)
user.AddLuminosity(-brightness_on)
SetLuminosity(brightness_on)
if(suit)
suit.RemoveHelmet()
+/obj/item/clothing/head/helmet/space/hardsuit/item_action_slot_check(slot)
+ if(slot == slot_head)
+ return 1
+
/obj/item/clothing/head/helmet/space/hardsuit/equipped(mob/user, slot)
+ ..()
if(slot != slot_head)
if(suit)
suit.RemoveHelmet()
@@ -69,19 +79,28 @@
allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/internals,/obj/item/device/t_scanner, /obj/item/weapon/rcd, /obj/item/weapon/pipe_dispenser)
siemens_coefficient = 0
var/obj/item/clothing/head/helmet/space/hardsuit/helmet
- action_button_name = "Toggle Helmet"
+ actions_types = list(/datum/action/item_action/toggle_helmet)
var/helmettype = /obj/item/clothing/head/helmet/space/hardsuit
var/obj/item/weapon/tank/jetpack/suit/jetpack = null
/obj/item/clothing/suit/space/hardsuit/equipped(mob/user, slot)
..()
- if(slot == slot_wear_suit && jetpack)
- jetpack.cycle_action.Grant(user)
+ if(jetpack)
+ if(slot == slot_wear_suit)
+ for(var/X in jetpack.actions)
+ var/datum/action/A = X
+ A.Grant(user)
/obj/item/clothing/suit/space/hardsuit/dropped(mob/user)
..()
if(jetpack)
- jetpack.cycle_action.Remove(user)
+ for(var/X in jetpack.actions)
+ var/datum/action/A = X
+ A.Remove(user)
+
+/obj/item/clothing/suit/space/hardsuit/item_action_slot_check(slot)
+ if(slot == slot_wear_suit) //we only give the mob the ability to toggle the helmet if he's wearing the hardsuit.
+ return 1
//Engineering
/obj/item/clothing/head/helmet/space/hardsuit/engine
@@ -184,7 +203,7 @@
armor = list(melee = 40, bullet = 50, laser = 30, energy = 15, bomb = 35, bio = 100, rad = 50)
on = 1
var/obj/item/clothing/suit/space/hardsuit/syndi/linkedsuit = null
- action_button_name = "Toggle Helmet Mode"
+ actions_types = list(/datum/action/item_action/toggle_helmet_mode)
visor_flags_inv = HIDEMASK|HIDEEYES|HIDEFACE|HIDEFACIALHAIR
visor_flags = STOPSPRESSUREDMAGE
@@ -226,6 +245,9 @@
if(istype(user, /mob/living/carbon))
var/mob/living/carbon/C = user
C.head_update(src, forced = 1)
+ for(var/X in actions)
+ var/datum/action/A = X
+ A.UpdateButtonIcon()
/obj/item/clothing/head/helmet/space/hardsuit/syndi/proc/toggle_hardsuit_mode(mob/user) //Helmet Toggles Suit Mode
if(linkedsuit)
@@ -256,7 +278,6 @@
item_state = "syndie_hardsuit"
item_color = "syndi"
w_class = 3
- action_button_name = "Toggle Helmet"
armor = list(melee = 40, bullet = 50, laser = 30, energy = 15, bomb = 35, bio = 100, rad = 50)
allowed = list(/obj/item/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword/saber,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/tank/internals)
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi
@@ -373,15 +394,14 @@
armor = list(melee = 30, bullet = 5, laser = 10, energy = 5, bomb = 100, bio = 100, rad = 60)
var/obj/machinery/doppler_array/integrated/bomb_radar
scan_reagents = 1
+ actions_types = list(/datum/action/item_action/toggle_helmet_light, /datum/action/item_action/toggle_research_scanner)
/obj/item/clothing/head/helmet/space/hardsuit/rd/New()
..()
bomb_radar = new /obj/machinery/doppler_array/integrated(src)
/obj/item/clothing/head/helmet/space/hardsuit/rd/equipped(mob/living/carbon/human/user, slot)
- ..(user, slot)
- user.scanner.Grant(user)
- user.scanner.devices += 1
+ ..()
if(user.glasses && istype(user.glasses, /obj/item/clothing/glasses/hud/diagnostic))
user << ("Your [user.glasses] prevents you using [src]'s diagnostic visor HUD.")
else
@@ -390,8 +410,7 @@
DHUD.add_hud_to(user)
/obj/item/clothing/head/helmet/space/hardsuit/rd/dropped(mob/living/carbon/human/user)
- ..(user)
- user.scanner.devices = max(0, user.scanner.devices - 1)
+ ..()
if(onboard_hud_enabled && !(user.glasses && istype(user.glasses, /obj/item/clothing/glasses/hud/diagnostic)))
var/datum/atom_hud/DHUD = huds[DATA_HUD_DIAGNOSTIC]
DHUD.remove_hud_from(user)
diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm
index dbce102f077c..e89458f6da9b 100644
--- a/code/modules/clothing/spacesuits/miscellaneous.dm
+++ b/code/modules/clothing/spacesuits/miscellaneous.dm
@@ -44,7 +44,7 @@ Contains:
strip_delay = 130
max_heat_protection_temperature = FIRE_IMMUNITY_HELM_MAX_TEMP_PROTECT
unacidable = 1
- action_button_name = null
+ actions_types = list()
/obj/item/clothing/head/helmet/space/hardsuit/deathsquad/attack_self(mob/user)
return
@@ -262,7 +262,7 @@ Contains:
item_state = "syndicate"
armor = list(melee = -20, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 100, rad = 75) //As whimpy as a space carp
brightness_on = 0 //luminosity when on
- action_button_name = ""
+ actions_types = list()
flags = STOPSPRESSUREDMAGE | THICKMATERIAL | NODROP
@@ -284,7 +284,7 @@ Contains:
item_state = "hardsuit0-prt"
item_color = "knight_grey"
max_heat_protection_temperature = FIRE_IMMUNITY_HELM_MAX_TEMP_PROTECT
- action_button_name = null
+ actions_types = list()
/obj/item/clothing/suit/space/hardsuit/ert/paranormal
name = "paranormal response team suit"
diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm
index 83d21d2117af..14828c6c7fc4 100644
--- a/code/modules/clothing/suits/armor.dm
+++ b/code/modules/clothing/suits/armor.dm
@@ -78,7 +78,7 @@
/obj/item/clothing/suit/armor/riot
name = "riot suit"
- desc = "A suit of armor with heavy padding to protect against melee attacks. Looks like it might impair movement."
+ desc = "A suit of armor with heavy padding to protect against melee attacks."
icon_state = "riot"
item_state = "swat_suit"
body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
@@ -131,7 +131,7 @@
item_state = "reactiveoff"
blood_overlay_type = "armor"
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
- action_button_name = "Toggle Armor"
+ actions_types = list(/datum/action/item_action/toggle)
unacidable = 1
hit_reaction_chance = 50
diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm
index b44447266627..b1386ed9eea8 100644
--- a/code/modules/clothing/suits/jobs.dm
+++ b/code/modules/clothing/suits/jobs.dm
@@ -31,7 +31,6 @@
body_parts_covered = CHEST|GROIN|LEGS|ARMS
allowed = list(/obj/item/weapon/storage/book/bible, /obj/item/weapon/nullrod, /obj/item/weapon/reagent_containers/food/drinks/bottle/holywater, /obj/item/weapon/storage/fancy/candle_box, /obj/item/candle, /obj/item/weapon/tank/internals/emergency_oxygen)
hooded = 1
- action_button_name = "Toggle Chaplain Hoodie"
hoodtype = /obj/item/clothing/head/chaplain_hood
/obj/item/clothing/head/chaplain_hood
diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm
index d0c8e507ab96..179e9ab28c66 100644
--- a/code/modules/clothing/suits/miscellaneous.dm
+++ b/code/modules/clothing/suits/miscellaneous.dm
@@ -136,7 +136,7 @@
togglename = "wings"
body_parts_covered = ARMS|CHEST
allowed = list(/obj/item/weapon/gun/energy,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/weapon/gun/projectile,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/restraints/handcuffs,/obj/item/device/flashlight/seclite,/obj/item/weapon/melee/classic_baton/telescopic)
- action_button_name = "Toggle Owl Wings"
+ actions_types = list(/datum/action/item_action/toggle_wings)
/obj/item/clothing/suit/toggle/owlwings/griffinwings
name = "griffon cloak"
@@ -215,7 +215,6 @@
min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT //Space carp like space, so you should too
allowed = list(/obj/item/weapon/tank/internals/emergency_oxygen, /obj/item/weapon/gun/projectile/automatic/speargun)
hooded = 1
- action_button_name = "Toggle Carp Hood"
hoodtype = /obj/item/clothing/head/carp_hood
/obj/item/clothing/head/carp_hood
@@ -238,7 +237,6 @@
//min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
allowed = list(,)
hooded = 1
- action_button_name = "Toggle Ian Hood"
hoodtype = /obj/item/clothing/head/ian_hood
/obj/item/clothing/head/ian_hood
@@ -259,7 +257,7 @@
body_parts_covered = CHEST|GROIN|ARMS
allowed = list(,)
hooded = 1
- action_button_name = "Toggle Human Head"
+ actions_types = list(/datum/action/item_action/toggle_human_head)
hoodtype = /obj/item/clothing/head/human_head
/obj/item/clothing/head/human_head
@@ -268,6 +266,8 @@
icon_state = "lingspacehelmet"
body_parts_covered = HEAD
flags = NODROP
+ flags_cover = HEADCOVERSEYES
+ flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
/obj/item/clothing/suit/security/officer/russian
name = "russian officer's jacket"
@@ -374,7 +374,6 @@
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/internals/emergency_oxygen,/obj/item/toy,/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/lighter)
hooded = 1
- action_button_name = "Toggle Winter Hood"
/obj/item/clothing/head/winterhood
name = "winter hood"
diff --git a/code/modules/clothing/suits/toggles.dm b/code/modules/clothing/suits/toggles.dm
index 5283af92d42b..fab30b8d4e39 100644
--- a/code/modules/clothing/suits/toggles.dm
+++ b/code/modules/clothing/suits/toggles.dm
@@ -1,6 +1,7 @@
//Hoods for winter coats and chaplain hoodie etc
/obj/item/clothing/suit/hooded
+ actions_types = list(/datum/action/item_action/toggle_hood)
var/obj/item/clothing/head/hood
var/hoodtype = /obj/item/clothing/head/winterhood //so the chaplain hoodie or other hoodies can override this
@@ -20,6 +21,10 @@
/obj/item/clothing/suit/hooded/ui_action_click()
ToggleHood()
+/obj/item/clothing/suit/hooded/item_action_slot_check(slot, mob/user)
+ if(slot == slot_wear_suit)
+ return 1
+
/obj/item/clothing/suit/hooded/equipped(mob/user, slot)
if(slot != slot_wear_suit)
RemoveHood()
@@ -33,8 +38,12 @@
H.unEquip(hood, 1)
H.update_inv_wear_suit()
hood.loc = src
+ for(var/X in actions)
+ var/datum/action/A = X
+ A.UpdateButtonIcon()
/obj/item/clothing/suit/hooded/dropped()
+ ..()
RemoveHood()
/obj/item/clothing/suit/hooded/proc/ToggleHood()
@@ -52,6 +61,9 @@
suittoggled = 1
src.icon_state = "[initial(icon_state)]_t"
H.update_inv_wear_suit()
+ for(var/X in actions)
+ var/datum/action/A = X
+ A.UpdateButtonIcon()
else
RemoveHood()
@@ -84,6 +96,9 @@
src.icon_state = "[initial(icon_state)]_t"
src.suittoggled = 1
usr.update_inv_wear_suit()
+ for(var/X in actions)
+ var/datum/action/A = X
+ A.UpdateButtonIcon()
/obj/item/clothing/suit/toggle/examine(mob/user)
..()
@@ -140,6 +155,7 @@
helmet.loc = src
/obj/item/clothing/suit/space/hardsuit/dropped()
+ ..()
RemoveHelmet()
/obj/item/clothing/suit/space/hardsuit/proc/ToggleHelmet()
diff --git a/code/modules/clothing/under/chameleon.dm b/code/modules/clothing/under/chameleon.dm
deleted file mode 100644
index f38708348bbb..000000000000
--- a/code/modules/clothing/under/chameleon.dm
+++ /dev/null
@@ -1,97 +0,0 @@
-/obj/item/clothing/under/chameleon
-//starts off as black
- name = "black jumpsuit"
- icon_state = "black"
- item_state = "bl_suit"
- item_color = "black"
- desc = "It's a plain jumpsuit. It has a small dial on the wrist."
- action_button_name = "Change"
- origin_tech = "syndicate=3"
- sensor_mode = 0 //Hey who's this guy on the Syndicate Shuttle??
- random_sensor = 0
- var/list/clothing_choices = list()
- var/malfunctioning = 0
- burn_state = FIRE_PROOF
- armor = list(melee = 10, bullet = 10, laser = 10,energy = 0, bomb = 0, bio = 0, rad = 0)
-
-/obj/item/clothing/under/chameleon/New()
- ..()
- for(var/U in subtypesof(/obj/item/clothing/under/color))
- var/obj/item/clothing/under/V = new U
- src.clothing_choices += V
-
- for(var/U in subtypesof(/obj/item/clothing/under/rank))
- var/obj/item/clothing/under/V = new U
- src.clothing_choices += V
- return
-
-
-/obj/item/clothing/under/chameleon/attackby(obj/item/clothing/under/U, mob/user, params)
- ..()
- if(istype(U, /obj/item/clothing/under/chameleon))
- user << "\Nothing happens."
- return
- if(istype(U, /obj/item/clothing/under))
- if(src.clothing_choices.Find(U))
- user << "Pattern is already recognised by the suit."
- return
- src.clothing_choices += U
- user << "Pattern absorbed by the suit."
-
-
-/obj/item/clothing/under/chameleon/emp_act(severity)
- name = "psychedelic"
- desc = "Groovy!"
- icon_state = "psyche"
- item_color = "psyche"
- malfunctioning = 1
- if(ismob(loc))
- var/mob/M = loc
- M.update_inv_w_uniform()
- M << "Your jumpsuit malfunctions!"
- spawn(200)
- name = "Black Jumpsuit"
- icon_state = "black"
- item_state = "bl_suit"
- item_color = "black"
- malfunctioning = 0
- if(ismob(loc))
- var/mob/M = loc
- M.update_inv_w_uniform()
- M << "Your jumpsuit is functioning normally again."
- ..()
-
-/obj/item/clothing/under/chameleon/attack_self()
- set src in usr
-
- var/obj/item/clothing/under/A
- A = input("Select Colour to change it to", "BOOYEA", A) in clothing_choices
- if(!A)
- return
-
- if(usr.stat != CONSCIOUS)
- return
-
- if(malfunctioning)
- usr << "Your jumpsuit is malfunctioning!"
- return
-
- desc = null
- permeability_coefficient = 0.90
-
- desc = A.desc
- name = A.name
- 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.
-
-
-
-/obj/item/clothing/under/chameleon/all/New()
- ..()
- var/blocked = list(/obj/item/clothing/under/chameleon, /obj/item/clothing/under/chameleon/all) //to prevent an infinite loop
- for(var/U in typesof(/obj/item/clothing/under)-blocked)
- var/obj/item/clothing/under/V = new U
- src.clothing_choices += V
diff --git a/code/modules/clothing/under/color.dm b/code/modules/clothing/under/color.dm
index 2897abacc718..799b78c276fa 100644
--- a/code/modules/clothing/under/color.dm
+++ b/code/modules/clothing/under/color.dm
@@ -24,6 +24,14 @@
item_state = "gy_suit"
item_color = "grey"
+/obj/item/clothing/under/color/grey/glorf
+ name = "ancient jumpsuit"
+ desc = "A terribly ragged and frayed grey jumpsuit. It looks like it hasn't been washed in over a decade."
+
+/obj/item/clothing/under/color/grey/glorf/hit_reaction(mob/living/carbon/human/owner)
+ owner.forcesay(hit_appends)
+ return 0
+
/obj/item/clothing/under/color/blue
name = "blue jumpsuit"
icon_state = "blue"
diff --git a/code/modules/crafting/recipes.dm b/code/modules/crafting/recipes.dm
index 23432c617592..a9baaf881f04 100644
--- a/code/modules/crafting/recipes.dm
+++ b/code/modules/crafting/recipes.dm
@@ -63,10 +63,8 @@
result = /obj/item/weapon/melee/baton/cattleprod
reqs = list(/obj/item/weapon/restraints/handcuffs/cable = 1,
/obj/item/stack/rods = 1,
- /obj/item/device/assembly/igniter = 1,
- /obj/item/weapon/stock_parts/cell = 1)
+ /obj/item/device/assembly/igniter = 1)
time = 40
- parts = list(/obj/item/weapon/stock_parts/cell = 1)
category = CAT_WEAPON
/datum/table_recipe/teleprod
@@ -74,13 +72,19 @@
result = /obj/item/weapon/melee/baton/cattleprod/teleprod
reqs = list(/obj/item/weapon/restraints/handcuffs/cable = 1,
/obj/item/stack/rods = 1,
- /obj/item/weapon/wirecutters = 1,
- /obj/item/weapon/stock_parts/cell = 1,
+ /obj/item/device/assembly/igniter = 1,
/obj/item/weapon/ore/bluespace_crystal = 1)
time = 40
- parts = list(/obj/item/weapon/stock_parts/cell = 1)
category = CAT_WEAPON
+/datum/table_recipe/bola
+ name = "Bola"
+ result = /obj/item/weapon/restraints/legcuffs/bola
+ reqs = list(/obj/item/weapon/restraints/handcuffs/cable = 1,
+ /obj/item/stack/sheet/metal = 6)
+ time = 20//15 faster than crafting them by hand!
+ category= CAT_WEAPON
+
/datum/table_recipe/tailclub
name = "Tail Club"
result = /obj/item/weapon/tailclub
diff --git a/code/modules/events/blob.dm b/code/modules/events/blob.dm
index 323908775fec..ed2c22ce622c 100644
--- a/code/modules/events/blob.dm
+++ b/code/modules/events/blob.dm
@@ -4,15 +4,14 @@
weight = 5
max_occurrences = 1
- earliest_start = 48000 // 1 hour 20 minutes
+ earliest_start = 18000 //30 minutes
- gamemode_blacklist = list("blob") // Just in case blob survives that long
+ gamemode_blacklist = list("blob") //Just in case a blob survives that long
/datum/round_event/blob
announceWhen = 12
endWhen = 120
var/new_rate = 2
- var/obj/effect/blob/core/Blob
/datum/round_event/blob/New(var/strength)
..()
@@ -27,14 +26,4 @@
var/turf/T = pick(blobstart)
if(!T)
return kill()
- Blob = new /obj/effect/blob/core(T, 200, null, new_rate)
- for(var/i = 1; i < rand(3, 6), i++)
- Blob.process()
-
-
-/datum/round_event/blob/tick()
- if(!Blob)
- kill()
- return
- if(IsMultiple(activeFor, 3))
- Blob.process()
+ new/obj/effect/blob/core(T, 200, null, new_rate)
diff --git a/code/modules/events/portal_storm.dm b/code/modules/events/portal_storm.dm
new file mode 100644
index 000000000000..088698548f29
--- /dev/null
+++ b/code/modules/events/portal_storm.dm
@@ -0,0 +1,134 @@
+/datum/round_event_control/portal_storm_syndicate
+ name = "Portal Storm: Syndicate Shocktroops"
+ typepath = /datum/round_event/portal_storm/syndicate_shocktroop
+ weight = 2
+ earliest_start = 18000
+
+/datum/round_event/portal_storm/syndicate_shocktroop
+ boss_types = list(/mob/living/simple_animal/hostile/syndicate/melee/space/stormtrooper = 2)
+ hostile_types = list(/mob/living/simple_animal/hostile/syndicate/melee/space/noloot = 8,\
+ /mob/living/simple_animal/hostile/syndicate/ranged/space/noloot = 2)
+
+/datum/round_event_control/portal_storm_narsie
+ name = "Portal Storm: Nar-sie"
+ typepath = /datum/round_event/portal_storm/portal_storm_narsie
+ weight = 0
+ max_occurrences = 0
+
+/datum/round_event/portal_storm/portal_storm_narsie
+ boss_types = list(/obj/singularity/narsie/large = 1)
+ hostile_types = list(/mob/living/simple_animal/hostile/construct/armored/hostile = 10,\
+ /mob/living/simple_animal/hostile/construct/wraith/hostile = 10)
+
+/datum/round_event/portal_storm
+ startWhen = 7
+ endWhen = 999
+ announceWhen = 1
+
+ var/list/boss_spawn = list()
+ var/list/boss_types = list() //only configure this if you have hostiles
+ var/number_of_bosses
+ var/next_boss_spawn
+ var/list/hostiles_spawn = list()
+ var/list/hostile_types = list()
+ var/number_of_hostiles
+ var/list/station_areas = list()
+ var/image/storm
+
+/datum/round_event/portal_storm/setup()
+ storm = image('icons/obj/tesla_engine/energy_ball.dmi', "energy_ball_fast", layer=FLY_LAYER)
+ storm.color = "#00FF00"
+
+ station_areas = get_areas_in_z(ZLEVEL_STATION)
+
+ number_of_bosses = 0
+ for(var/boss in boss_types)
+ number_of_bosses += boss_types[boss]
+
+ number_of_hostiles = 0
+ for(var/hostile in hostile_types)
+ number_of_hostiles += hostile_types[hostile]
+
+ var/list/b_spawns = generic_event_spawns.Copy()
+ while(number_of_bosses > boss_spawn.len)
+ var/turf/F = get_turf(pick_n_take(b_spawns))
+ if(!F)
+ F = safepick(get_area_turfs(pick(station_areas)))
+ boss_spawn += F
+
+ var/list/h_spawns = generic_event_spawns.Copy()
+ while(number_of_hostiles > hostiles_spawn.len)
+ var/turf/T = get_turf(pick_n_take(h_spawns))
+ if(!T)
+ T = safepick(get_area_turfs(pick(station_areas)))
+ hostiles_spawn += T
+
+ next_boss_spawn = startWhen + Ceiling(2 * number_of_hostiles / number_of_bosses)
+
+/datum/round_event/portal_storm/announce()
+ set waitfor = 0
+ playsound_global('sound/magic/lightning_chargeup.ogg', repeat=0, channel=1, volume=100)
+ sleep(80)
+ priority_announce("Attention personnel of [world.name]: incoming portal storm!")
+ sleep(20)
+ playsound_global('sound/magic/lightningbolt.ogg', repeat=0, channel=1, volume=100)
+
+/datum/round_event/portal_storm/tick()
+ spawn_effects()
+
+ if(spawn_hostile())
+ var/type = safepick(hostile_types)
+ hostile_types[type] = hostile_types[type] - 1
+ spawn_mob(type, hostiles_spawn)
+ if(!hostile_types[type])
+ hostile_types -= type
+
+ if(spawn_boss())
+ var/type = safepick(boss_types)
+ boss_types[type] = boss_types[type] - 1
+ spawn_mob(type, boss_spawn)
+ if(!boss_types[type])
+ boss_types -= type
+
+ time_to_end()
+
+/datum/round_event/portal_storm/proc/spawn_mob(type, spawn_list)
+ if(!type)
+ return
+ var/turf/T = pick_n_take(spawn_list)
+ if(!T)
+ return
+ new type(T)
+ spawn_effects(T)
+
+/datum/round_event/portal_storm/proc/spawn_effects(turf/T)
+ if(T)
+ T = get_step(T, SOUTHWEST) //align center of image with turf
+ flick_overlay_static(storm, T, 15)
+ playsound(T, 'sound/magic/lightningbolt.ogg', 100, 1)
+ else
+ for(var/V in station_areas)
+ var/area/A = V
+ var/turf/F = get_turf(pick(A.contents))
+ flick_overlay_static(storm, F, 15)
+ playsound(F, 'sound/magic/lightningbolt.ogg', 80, 1)
+
+/datum/round_event/portal_storm/proc/spawn_hostile()
+ if(!hostile_types || !hostile_types.len)
+ return 0
+ return IsMultiple(activeFor, 2)
+
+/datum/round_event/portal_storm/proc/spawn_boss()
+ if(!boss_types || !boss_types.len)
+ return 0
+
+ if(activeFor == next_boss_spawn)
+ next_boss_spawn += Ceiling(number_of_hostiles / number_of_bosses)
+ return 1
+
+/datum/round_event/portal_storm/proc/time_to_end()
+ if(!hostile_types.len && !boss_types.len)
+ endWhen = activeFor
+
+ if(!number_of_hostiles && number_of_bosses)
+ endWhen = activeFor
diff --git a/code/modules/events/wizard/advanced_darkness.dm b/code/modules/events/wizard/advanced_darkness.dm
index 8e60fce22082..62603dd9a8a5 100644
--- a/code/modules/events/wizard/advanced_darkness.dm
+++ b/code/modules/events/wizard/advanced_darkness.dm
@@ -7,8 +7,11 @@
/datum/round_event/wizard/darkness
endWhen = 0
+ var/started = FALSE
+
/datum/round_event/wizard/darkness/start()
- var/datum/weather/advanced_darkness/darkness = new
- darkness.weather_start_up()
- return
+ if(!started)
+ started = TRUE
+ var/datum/weather/advanced_darkness/darkness = new
+ darkness.weather_start_up()
diff --git a/code/modules/events/wizard/curseditems.dm b/code/modules/events/wizard/curseditems.dm
index eb1d15c40381..67db16aa3190 100644
--- a/code/modules/events/wizard/curseditems.dm
+++ b/code/modules/events/wizard/curseditems.dm
@@ -31,7 +31,7 @@
loadout[6] = /obj/item/clothing/gloves/boxing
ruins_spaceworthiness = 1
if("voicemodulators")
- loadout[4] = /obj/item/clothing/mask/gas/voice
+ loadout[4] = /obj/item/clothing/mask/chameleon
if("catgirls2015")
loadout[3] = /obj/item/clothing/head/kitty
ruins_spaceworthiness = 1
diff --git a/code/modules/events/wizard/lava.dm b/code/modules/events/wizard/lava.dm
index fe6044182ddf..231fab230d3c 100644
--- a/code/modules/events/wizard/lava.dm
+++ b/code/modules/events/wizard/lava.dm
@@ -7,8 +7,10 @@
/datum/round_event/wizard/lava/
endWhen = 0
+ var/started = FALSE
/datum/round_event/wizard/lava/start()
- var/datum/weather/floor_is_lava/LAVA = new /datum/weather/floor_is_lava
- LAVA.weather_start_up()
- return
+ if(!started)
+ started = TRUE
+ var/datum/weather/floor_is_lava/LAVA = new /datum/weather/floor_is_lava
+ LAVA.weather_start_up()
diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm
index 8cde367baced..ac3cff9610d7 100644
--- a/code/modules/flufftext/Hallucination.dm
+++ b/code/modules/flufftext/Hallucination.dm
@@ -463,8 +463,8 @@ var/list/non_fakeattack_weapons = list(/obj/item/weapon/gun/projectile, /obj/ite
/obj/item/weapon/gun/energy/kinetic_accelerator/crossbow, /obj/item/weapon/melee/energy/sword/saber,\
/obj/item/weapon/storage/box/syndicate, /obj/item/weapon/storage/box/emps,\
/obj/item/weapon/cartridge/syndicate, /obj/item/clothing/under/chameleon,\
- /obj/item/clothing/shoes/sneakers/syndigaloshes, /obj/item/weapon/card/id/syndicate,\
- /obj/item/clothing/mask/gas/voice, /obj/item/clothing/glasses/thermal,\
+ /obj/item/clothing/shoes/chameleon, /obj/item/weapon/card/id/syndicate,\
+ /obj/item/clothing/mask/chameleon, /obj/item/clothing/glasses/thermal,\
/obj/item/device/chameleon, /obj/item/weapon/card/emag,\
/obj/item/weapon/storage/toolbox/syndicate, /obj/item/weapon/aiModule,\
/obj/item/device/radio/headset/syndicate, /obj/item/weapon/c4,\
diff --git a/code/modules/food&drinks/food/snacks/meat.dm b/code/modules/food&drinks/food/snacks/meat.dm
index 863ef42a7fa6..cbabea0adb06 100644
--- a/code/modules/food&drinks/food/snacks/meat.dm
+++ b/code/modules/food&drinks/food/snacks/meat.dm
@@ -37,15 +37,17 @@
/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)
..()
+ slice.subjectname = subjectname
+ slice.subjectjob = subjectjob
if(subjectname)
- slice.subjectname = subjectname
slice.name = "raw [subjectname] cutlet"
else if(subjectjob)
- slice.subjectjob = subjectjob
slice.name = "raw [subjectjob] cutlet"
-/obj/item/weapon/reagent_containers/food/snacks/meat/slab/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/meat/S, cooking_efficiency)
..()
+ S.subjectname = subjectname
+ S.subjectjob = subjectjob
if(subjectname)
S.name = "[subjectname] meatsteak"
else if(subjectjob)
diff --git a/code/modules/food&drinks/food/snacks_burgers.dm b/code/modules/food&drinks/food/snacks_burgers.dm
index 222d84bad31b..16d5eda5f2d4 100644
--- a/code/modules/food&drinks/food/snacks_burgers.dm
+++ b/code/modules/food&drinks/food/snacks_burgers.dm
@@ -12,12 +12,26 @@
bonus_reagents = list("vitamin" = 1)
/obj/item/weapon/reagent_containers/food/snacks/burger/human
- var/hname = ""
- var/job = null
+ var/subjectname = ""
+ var/subjectjob = null
name = "human burger"
desc = "A bloody burger."
bonus_reagents = list("vitamin" = 4)
+/obj/item/weapon/reagent_containers/food/snacks/burger/human/CheckParts()
+ var/obj/item/weapon/reagent_containers/food/snacks/meat/M = locate(/obj/item/weapon/reagent_containers/food/snacks/meat/steak/plain/human) in contents
+ if(M)
+ subjectname = M.subjectname
+ subjectjob = M.subjectjob
+ if(subjectname)
+ name = "[subjectname] burger"
+ else if(subjectjob)
+ name = "[subjectjob] burger"
+ qdel(M)
+
+ ..()
+
+
/obj/item/weapon/reagent_containers/food/snacks/burger/corgi
name = "corgi burger"
desc = "You monster."
diff --git a/code/modules/food&drinks/kitchen machinery/gibber.dm b/code/modules/food&drinks/kitchen machinery/gibber.dm
index af7c8f535a92..401e43d2ea79 100644
--- a/code/modules/food&drinks/kitchen machinery/gibber.dm
+++ b/code/modules/food&drinks/kitchen machinery/gibber.dm
@@ -9,8 +9,6 @@
var/operating = 0 //Is it on?
var/dirty = 0 // Does it need cleaning?
var/gibtime = 40 // Time from starting until meat appears
- var/typeofmeat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human
- var/typeofskin = /obj/item/stack/sheet/animalhide/human
var/meat_produced = 0
var/ignore_clothing = 0
use_power = 1
@@ -161,6 +159,7 @@
playsound(src.loc, 'sound/machines/juicer.ogg', 50, 1)
src.operating = 1
update_icon()
+
var/offset = prob(50) ? -2 : 2
animate(src, pixel_x = pixel_x + offset, time = 0.2, loop = 200) //start shaking
var/sourcename = src.occupant.real_name
@@ -171,6 +170,8 @@
var/sourcenutriment = src.occupant.nutrition / 15
var/sourcetotalreagents = src.occupant.reagents.total_volume
var/gibtype = /obj/effect/decal/cleanable/blood/gibs
+ var/typeofmeat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human
+ var/typeofskin = /obj/item/stack/sheet/animalhide/human
var/obj/item/weapon/reagent_containers/food/snacks/meat/slab/allmeat[meat_produced]
var/obj/item/stack/sheet/animalhide/allskin
@@ -183,11 +184,15 @@
else
typeofmeat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human
typeofskin = /obj/item/stack/sheet/animalhide/human
- else
- if(iscarbon(occupant))
- var/mob/living/carbon/C = occupant
- typeofmeat = C.type_of_meat
- gibtype = C.gib_type
+ else if(iscarbon(occupant))
+ var/mob/living/carbon/C = occupant
+ typeofmeat = C.type_of_meat
+ gibtype = C.gib_type
+ if(ismonkey(C))
+ typeofskin = /obj/item/stack/sheet/animalhide/monkey
+ else if(isalien(C))
+ typeofskin = /obj/item/stack/sheet/animalhide/xeno
+
for (var/i=1 to meat_produced)
var/obj/item/weapon/reagent_containers/food/snacks/meat/slab/newmeat = new typeofmeat
var/obj/item/stack/sheet/animalhide/newskin = new typeofskin
diff --git a/code/modules/food&drinks/recipes/tablecraft/recipes_burger.dm b/code/modules/food&drinks/recipes/tablecraft/recipes_burger.dm
index b59321db533a..a775bcbad99a 100644
--- a/code/modules/food&drinks/recipes/tablecraft/recipes_burger.dm
+++ b/code/modules/food&drinks/recipes/tablecraft/recipes_burger.dm
@@ -10,6 +10,9 @@
/obj/item/weapon/reagent_containers/food/snacks/bun = 1,
/obj/item/weapon/reagent_containers/food/snacks/meat/steak/plain/human = 1
)
+ parts = list(
+ /obj/item/weapon/reagent_containers/food/snacks/meat/steak/plain/human = 1
+ )
result = /obj/item/weapon/reagent_containers/food/snacks/burger/human
category = CAT_FOOD
diff --git a/code/modules/holodeck/items.dm b/code/modules/holodeck/items.dm
index d8c03fe3c8f1..7663c49114d5 100644
--- a/code/modules/holodeck/items.dm
+++ b/code/modules/holodeck/items.dm
@@ -88,18 +88,6 @@
// Structures
//
-/obj/structure/stool/bed/chair/holo/attackby(obj/item/weapon/W as obj, mob/user as mob)
- if(istype(W,/obj/item/weapon/wrench))
- user << "It's holographic! There's no taking it apart."
- return
- ..()
-
-/obj/structure/stool/bed/chair/holo/comfy
- name = "comfy chair"
- desc = "It looks comfy."
- icon_state = "comfychair"
- color = rgb(255,113,0)
-
/obj/structure/holohoop
name = "basketball hoop"
desc = "Boom, shakalaka!"
diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm
index fc30cec85e5d..82831a817f09 100644
--- a/code/modules/hydroponics/grown.dm
+++ b/code/modules/hydroponics/grown.dm
@@ -308,10 +308,12 @@
return ..()
/obj/item/weapon/reagent_containers/food/snacks/grown/berries/glow/pickup(mob/user)
+ ..()
src.SetLuminosity(0)
user.AddLuminosity(round(potency / 5,1))
/obj/item/weapon/reagent_containers/food/snacks/grown/berries/glow/dropped(mob/user)
+ ..()
user.AddLuminosity(round(-potency / 5,1))
src.SetLuminosity(round(potency / 5,1))
@@ -617,6 +619,23 @@
user.visible_message("[user] laughs so hard they begin to suffocate!")
return (OXYLOSS)
+/obj/item/weapon/reagent_containers/food/snacks/grown/bluespacebanana
+ seed = /obj/item/seeds/bluespacebananaseed
+ name = "bluespace banana"
+ desc = "It's an excellent prank for a clown."
+ icon_state = "banana_blue"
+ trash = /obj/item/weapon/grown/bananapeel/bluespace
+ filling_color = "#0000FF"
+ origin_tech = "bluespace=3"
+
+/obj/item/weapon/reagent_containers/food/snacks/grown/bluespacebanana/add_juice()
+ if(..())
+ reagents.add_reagent("nutriment", 1 + round((potency / 50), 1))
+ reagents.add_reagent("banana", 1 + round((potency / 10), 1))
+ reagents.add_reagent("vitamin", 1 + round((potency / 25), 1))
+ reagents.add_reagent("singulo", 1 + round((potency / 5), 1))
+ bitesize = 5
+
/obj/item/weapon/reagent_containers/food/snacks/grown/mimana
seed = /obj/item/seeds/mimanaseed
name = "mimana"
@@ -1222,10 +1241,12 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice()
return ..()
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom/pickup(mob/user)
+ ..()
SetLuminosity(0)
user.AddLuminosity(round(potency / 10,1))
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom/dropped(mob/user)
+ ..()
user.AddLuminosity(round(-potency / 10,1))
SetLuminosity(round(potency / 10,1))
diff --git a/code/modules/hydroponics/growninedible.dm b/code/modules/hydroponics/growninedible.dm
index bbb49c96caef..3778025bf7d2 100644
--- a/code/modules/hydroponics/growninedible.dm
+++ b/code/modules/hydroponics/growninedible.dm
@@ -68,7 +68,7 @@
/obj/item/weapon/grown/log/attackby(obj/item/weapon/W, mob/user, params)
..()
- if(istype(W, /obj/item/weapon/circular_saw) || istype(W, /obj/item/weapon/hatchet) || (istype(W, /obj/item/weapon/twohanded/fireaxe) && W:wielded) || istype(W, /obj/item/weapon/melee/energy) || istype(W, /obj/item/weapon/twohanded/required/chainsaw))
+ if(W.sharpness)
user.show_message("You make [plank_name] out of \the [src]!", 1)
var/obj/item/stack/plank = new plank_type(user.loc, 1 + round(potency / 25))
var/old_plank_amount = plank.amount
@@ -92,6 +92,11 @@
else
usr << "You must dry this first!"
+/obj/item/weapon/grown/log/tree
+ seed = null
+ name = "wood log"
+ desc = "TIMMMMM-BERRRRRRRRRRR!"
+
/obj/item/weapon/grown/log/steel
seed = /obj/item/seeds/steelmycelium
name = "steel-cap log"
@@ -158,6 +163,7 @@
qdel(src)
/obj/item/weapon/grown/novaflower/pickup(mob/living/carbon/human/user)
+ ..()
if(!user.gloves)
user << "The [name] burns your bare hand!"
user.adjustFireLoss(rand(1, 5))
@@ -184,6 +190,7 @@
return (BRUTELOSS|TOXLOSS)
/obj/item/weapon/grown/nettle/pickup(mob/living/user)
+ ..()
if(!iscarbon(user))
return 0
var/mob/living/carbon/C = user
@@ -234,6 +241,7 @@
force = round((5 + potency / 2.5), 1)
/obj/item/weapon/grown/nettle/death/pickup(mob/living/carbon/user)
+ ..()
if(..())
if(prob(50))
user.Paralyse(5)
@@ -276,6 +284,23 @@
M.slip(stun, weaken, src)
return 1
+/obj/item/weapon/grown/bananapeel/bluespace
+ name = "bluespace banana peel"
+ desc = "A peel from a bluespace banana."
+ icon = 'icons/obj/hydroponics/harvest.dmi'
+ icon_state = "banana_peel_blue"
+ origin_tech = "bluespace=3"
+
+/obj/item/weapon/grown/bananapeel/bluespace/Crossed(AM)
+ if(..())
+ var/teleport_radius = potency / 10
+ do_teleport(AM, get_turf(AM), teleport_radius)
+ AM << "You slip through spacetime!"
+ if(prob(50))
+ do_teleport(src, get_turf(src), teleport_radius)
+ else
+ qdel(src)
+
/obj/item/weapon/grown/bananapeel/specialpeel //used by /obj/item/clothing/shoes/clown_shoes/banana_shoes
name = "synthesized banana peel"
desc = "A synthetic banana peel."
diff --git a/code/modules/hydroponics/seeds.dm b/code/modules/hydroponics/seeds.dm
index 4c84dbf93ca3..ba1dc468649e 100644
--- a/code/modules/hydroponics/seeds.dm
+++ b/code/modules/hydroponics/seeds.dm
@@ -217,7 +217,23 @@
potency = 10
plant_type = 0
growthstages = 6
- mutatelist = list(/obj/item/seeds/mimanaseed)
+ mutatelist = list(/obj/item/seeds/mimanaseed, /obj/item/seeds/bluespacebananaseed)
+
+/obj/item/seeds/bluespacebananaseed
+ name = "pack of bluespace banana seeds"
+ desc = "They're seeds that grow into bluespace banana trees. When grown, keep away from clown."
+ icon_state = "seed-banana-blue"
+ species = "bluespacebanana"
+ plantname = "Bluespace Banana Tree"
+ product = /obj/item/weapon/reagent_containers/food/snacks/grown/bluespacebanana
+ lifespan = 50
+ endurance = 30
+ maturation = 6
+ production = 6
+ yield = 3
+ potency = 10
+ plant_type = 0
+ growthstages = 6
/obj/item/seeds/mimanaseed
name = "pack of mimana seeds"
diff --git a/code/modules/jobs/job_types/security.dm b/code/modules/jobs/job_types/security.dm
index 7f47d287f3c2..415b6756ece1 100644
--- a/code/modules/jobs/job_types/security.dm
+++ b/code/modules/jobs/job_types/security.dm
@@ -44,12 +44,14 @@ Head of Security
head = /obj/item/clothing/head/HoS/beret
glasses = /obj/item/clothing/glasses/hud/security/sunglasses
suit_store = /obj/item/weapon/gun/energy/gun
- backpack_contents = list(/obj/item/weapon/melee/classic_baton/telescopic=1,\
- /obj/item/weapon/restraints/handcuffs=1)
+ r_pocket = /obj/item/device/assembly/flash/handheld
+ l_pocket = /obj/item/weapon/restraints/handcuffs
+ backpack_contents = list(/obj/item/weapon/melee/baton/loaded=1)
backpack = /obj/item/weapon/storage/backpack/security
satchel = /obj/item/weapon/storage/backpack/satchel_sec
dufflebag = /obj/item/weapon/storage/backpack/dufflebag/sec
+ box = /obj/item/weapon/storage/box/security
/datum/outfit/job/hos/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
..()
@@ -99,13 +101,16 @@ Warden
gloves = /obj/item/clothing/gloves/color/black
head = /obj/item/clothing/head/warden
glasses = /obj/item/clothing/glasses/hud/security/sunglasses
- l_pocket = /obj/item/device/assembly/flash/handheld
+ r_pocket = /obj/item/device/assembly/flash/handheld
+ l_pocket = /obj/item/weapon/restraints/handcuffs
suit_store = /obj/item/weapon/gun/energy/gun/advtaser
- backpack_contents = list(/obj/item/weapon/restraints/handcuffs=1)
+ backpack_contents = list(/obj/item/weapon/melee/baton/loaded=1)
backpack = /obj/item/weapon/storage/backpack/security
satchel = /obj/item/weapon/storage/backpack/satchel_sec
dufflebag = /obj/item/weapon/storage/backpack/dufflebag/sec
+ box = /obj/item/weapon/storage/box/security
+
/datum/outfit/job/warden/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
..()
@@ -152,7 +157,7 @@ Detective
r_pocket = /obj/item/weapon/lighter
backpack_contents = list(/obj/item/weapon/storage/box/evidence=1,\
/obj/item/device/detective_scanner=1,\
- /obj/item/weapon/melee/classic_baton/telescopic=1)
+ /obj/item/weapon/melee/classic_baton=1)
mask = /obj/item/clothing/mask/cigarette
/datum/outfit/job/detective/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
@@ -205,10 +210,10 @@ var/list/sec_departments = list("engineering", "supply", "medical", "science")
head = /obj/item/clothing/head/helmet/sec
suit = /obj/item/clothing/suit/armor/vest
shoes = /obj/item/clothing/shoes/jackboots
- l_pocket = /obj/item/device/assembly/flash/handheld
+ l_pocket = /obj/item/weapon/restraints/handcuffs
+ r_pocket = /obj/item/device/assembly/flash/handheld
suit_store = /obj/item/weapon/gun/energy/gun/advtaser
- backpack_contents = list(/obj/item/weapon/restraints/handcuffs=1,\
- /obj/item/weapon/melee/baton/loaded=1)
+ backpack_contents = list(/obj/item/weapon/melee/baton/loaded=1)
backpack = /obj/item/weapon/storage/backpack/security
satchel = /obj/item/weapon/storage/backpack/satchel_sec
diff --git a/code/modules/library/lib_machines.dm b/code/modules/library/lib_machines.dm
index aa59022f094a..ebd9a20854ab 100644
--- a/code/modules/library/lib_machines.dm
+++ b/code/modules/library/lib_machines.dm
@@ -409,7 +409,7 @@ var/global/list/datum/cachedbook/cachedbooks // List of our cached book datums
if(href_list["orderbyid"])
var/orderid = input("Enter your order:") as num|null
if(orderid)
- if(isnum(orderid))
+ if(isnum(orderid) && IsInteger(orderid))
href_list["targetid"] = orderid
if(href_list["targetid"])
var/sqlid = sanitizeSQL(href_list["targetid"])
diff --git a/code/modules/mining/lavaland/weather.dm b/code/modules/mining/lavaland/weather.dm
index 2d24616df509..35eb9a821ff4 100644
--- a/code/modules/mining/lavaland/weather.dm
+++ b/code/modules/mining/lavaland/weather.dm
@@ -36,9 +36,9 @@
if(M.z == target_z)
M << start_up_message
- spawn(start_up_time)
- stage = MAIN_STAGE
- weather_main()
+ sleep(start_up_time)
+ stage = MAIN_STAGE
+ weather_main()
/datum/weather/proc/weather_main()
diff --git a/code/modules/mining/lavaland/weather_types.dm b/code/modules/mining/lavaland/weather_types.dm
index 89308d4437c6..32a3ad332536 100644
--- a/code/modules/mining/lavaland/weather_types.dm
+++ b/code/modules/mining/lavaland/weather_types.dm
@@ -52,6 +52,9 @@
if(stage == MAIN_STAGE)
A.invisibility = 0
A.opacity = 1
+ A.layer = overlay_layer
+ A.icon = 'icons/effects/weather_effects.dmi'
+ A.icon_state = start_up_overlay
else
A.invisibility = 100
A.opacity = 0
diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm
index 2bc0f1ca913d..7a2020ef6214 100644
--- a/code/modules/mining/mine_items.dm
+++ b/code/modules/mining/mine_items.dm
@@ -217,11 +217,11 @@
new /obj/item/weapon/storage/pill_bottle/dice(cur_turf)
cur_turf = locate(start_turf.x+1, start_turf.y-1, start_turf.z)
- var/obj/structure/bed/chair/comfy/C = new /obj/structure/bed/chair/comfy(cur_turf)
+ var/obj/structure/chair/comfy/C = new /obj/structure/chair/comfy(cur_turf)
C.dir = 1
cur_turf = locate(start_turf.x+1, start_turf.y+1, start_turf.z)
- new /obj/structure/bed/chair/comfy(cur_turf)
+ new /obj/structure/chair/comfy(cur_turf)
cur_turf = locate(start_turf.x-1, start_turf.y-1, start_turf.z)
var/obj/machinery/sleeper/S = new /obj/machinery/sleeper(cur_turf)
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index a6e92090e84c..c55fc9840a2b 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -417,9 +417,9 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
switch(data_hud_seen) //give new huds
if(0)
- show_me_the_hud(DATA_HUD_SECURITY_BASIC)
+ show_me_the_hud(DATA_HUD_SECURITY_ADVANCED)
src << "Security HUD set."
- if(DATA_HUD_SECURITY_BASIC)
+ if(DATA_HUD_SECURITY_ADVANCED)
show_me_the_hud(DATA_HUD_MEDICAL_ADVANCED)
src << "Medical HUD set."
if(DATA_HUD_MEDICAL_ADVANCED)
@@ -432,4 +432,4 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
/mob/dead/observer/canUseTopic()
if(check_rights(R_ADMIN, 0))
return 1
- return
\ No newline at end of file
+ return
diff --git a/code/modules/mob/interactive.dm b/code/modules/mob/interactive.dm
index 75e7da4dfcfb..deee74b96f27 100644
--- a/code/modules/mob/interactive.dm
+++ b/code/modules/mob/interactive.dm
@@ -41,13 +41,17 @@
var/retal = 0
var/mob/retal_target = null
var/update_hands = 0
+ var/list/blacklistItems = list() // items we should be ignoring
+ var/maxStepsTick = 3
//Job and mind data
var/obj/item/weapon/card/id/MYID
var/obj/item/device/pda/MYPDA
var/obj/item/main_hand
var/obj/item/other_hand
var/TRAITS = 0
+ var/obj/item/weapon/card/id/Path_ID
var/datum/job/myjob
+ var/list/myPath = list()
faction = list("station")
//trait vars
var/robustness = 50
@@ -55,9 +59,11 @@
var/attitude = 50
var/slyness = 50
var/graytide = 0
+ var/list/favoured_types = list() // allow a mob to favour a type, and hold onto them
var/chattyness = CHANCE_TALK
+ var/targetInterestShift = 10 // how much a good action should "reward" the npc
//modules
- var/list/functions = list("nearbyscan","combat","doorscan","shitcurity","chatter")
+ var/list/functions = list("nearbyscan","combat","doorscan","shitcurity","chatter","healpeople")
//botPool funcs
/mob/living/carbon/human/interactive/proc/takeDelegate(mob/living/carbon/human/interactive/from,doReset=TRUE)
@@ -74,6 +80,7 @@
inactivity_period = 0
interest = 100
//
+ update_icons()
if(doReset)
from.TARGET = null
from.LAST_TARGET = null
@@ -126,42 +133,70 @@
MYPDA.name = "PDA-[real_name] ([myjob.title])"
equip_to_slot_or_del(MYPDA, slot_belt)
zone_selected = "chest"
- if(prob(10)) //my x is augmented
- //arms
- if(prob((FUZZY_CHANCE_LOW+FUZZY_CHANCE_HIGH)/2))
- var/obj/item/organ/limb/r_arm/R = locate(/obj/item/organ/limb/r_arm) in organs
- qdel(R)
- organs += new /obj/item/organ/limb/robot/r_arm
- else
- var/obj/item/organ/limb/l_arm/L = locate(/obj/item/organ/limb/l_arm) in organs
- qdel(L)
- organs += new /obj/item/organ/limb/robot/l_arm
- //legs
- if(prob((FUZZY_CHANCE_LOW+FUZZY_CHANCE_HIGH)/2))
- var/obj/item/organ/limb/r_leg/R = locate(/obj/item/organ/limb/r_leg) in organs
- qdel(R)
- organs += new /obj/item/organ/limb/robot/r_leg
- else
- var/obj/item/organ/limb/l_leg/L = locate(/obj/item/organ/limb/l_leg) in organs
- qdel(L)
- organs += new /obj/item/organ/limb/robot/l_leg
- //chest and head
- if(prob((FUZZY_CHANCE_LOW+FUZZY_CHANCE_HIGH)/2))
- var/obj/item/organ/limb/chest/R = locate(/obj/item/organ/limb/chest) in organs
- qdel(R)
- organs += new /obj/item/organ/limb/robot/chest
- else
- var/obj/item/organ/limb/head/L = locate(/obj/item/organ/limb/head) in organs
- qdel(L)
- organs += new /obj/item/organ/limb/robot/head
- for(var/obj/item/organ/limb/LIMB in organs)
- LIMB.owner = src
+ //arms
+ if(prob((FUZZY_CHANCE_LOW+FUZZY_CHANCE_HIGH)/2))
+ var/obj/item/organ/limb/r_arm/R = locate(/obj/item/organ/limb/r_arm) in organs
+ qdel(R)
+ organs += new /obj/item/organ/limb/robot/r_arm
+ else
+ var/obj/item/organ/limb/l_arm/L = locate(/obj/item/organ/limb/l_arm) in organs
+ qdel(L)
+ organs += new /obj/item/organ/limb/robot/l_arm
+ //legs
+ if(prob((FUZZY_CHANCE_LOW+FUZZY_CHANCE_HIGH)/2))
+ var/obj/item/organ/limb/r_leg/R = locate(/obj/item/organ/limb/r_leg) in organs
+ qdel(R)
+ organs += new /obj/item/organ/limb/robot/r_leg
+ else
+ var/obj/item/organ/limb/l_leg/L = locate(/obj/item/organ/limb/l_leg) in organs
+ qdel(L)
+ organs += new /obj/item/organ/limb/robot/l_leg
+ //chest and head
+ if(prob((FUZZY_CHANCE_LOW+FUZZY_CHANCE_HIGH)/2))
+ var/obj/item/organ/limb/chest/R = locate(/obj/item/organ/limb/chest) in organs
+ qdel(R)
+ organs += new /obj/item/organ/limb/robot/chest
+ else
+ var/obj/item/organ/limb/head/L = locate(/obj/item/organ/limb/head) in organs
+ qdel(L)
+ organs += new /obj/item/organ/limb/robot/head
+ for(var/LIMB in organs)
+ var/obj/item/organ/limb/L = LIMB
+ L.owner = src
update_icons()
update_damage_overlays(0)
update_augments()
hand = 0
+ Path_ID = new /obj/item/weapon/card/id(src)
+
+ var/datum/job/captain/C = new/datum/job/captain
+ Path_ID.access = C.get_access()
+
+ //job specific favours
+ switch(myjob.title)
+ if("Assistant")
+ favoured_types = list(/obj/item/clothing, /obj/item/weapon)
+ if("Captain","Head of Personnel")
+ favoured_types = list(/obj/item/clothing, /obj/item/weapon/stamp/captain,/obj/item/weapon/disk/nuclear)
+ if("Bartender","Chef")
+ favoured_types = list(/obj/item/weapon/reagent_containers/food, /obj/item/weapon/kitchen)
+ if("Station Engineer","Chief Engineer","Atmospheric Technician")
+ favoured_types = list(/obj/item/stack, /obj/item/weapon, /obj/item/clothing)
+ if("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Geneticist")
+ favoured_types = list(/obj/item/weapon/reagent_containers/glass/beaker, /obj/item/weapon/storage/firstaid, /obj/item/stack/medical, /obj/item/weapon/reagent_containers/syringe)
+ if("Research Director","Scientist","Roboticist")
+ favoured_types = list(/obj/item/weapon/reagent_containers/glass/beaker, /obj/item/stack, /obj/item/weapon/reagent_containers)
+ if("Head of Security","Warden","Security Officer","Detective")
+ favoured_types = list(/obj/item/clothing, /obj/item/weapon, /obj/item/weapon/restraints)
+ if("Janitor")
+ favoured_types = list(/obj/item/weapon/mop, /obj/item/weapon/reagent_containers/glass/bucket, /obj/item/weapon/reagent_containers/spray/cleaner, /obj/effect/decal/cleanable)
+ functions += "dojanitor"
+ else
+ favoured_types = list(/obj/item/clothing)
+
+
if(TRAITS & TRAIT_ROBUST)
robustness = 75
else if(TRAITS & TRAIT_UNROBUST)
@@ -219,7 +254,8 @@
toReturn = "Excited"
return toReturn
//END DEBUG
-/mob/living/carbon/human/interactive/proc/isnotfunc(checkDead = TRUE)
+
+/mob/living/carbon/human/interactive/proc/IsDeadOrIncap(checkDead = TRUE)
if(!canmove)
return 1
if(health <= 0 && checkDead)
@@ -237,6 +273,12 @@
return 0
/mob/living/carbon/human/interactive/proc/enforce_hands()
+ if(main_hand)
+ if(main_hand.loc != src)
+ main_hand = null
+ if(other_hand)
+ if(other_hand.loc != src)
+ other_hand = null
if(hand)
if(!l_hand)
main_hand = null
@@ -254,8 +296,10 @@
main_hand = other_hand
other_hand = T
-/mob/living/carbon/human/interactive/proc/take_to_slot(obj/item/G)
+/mob/living/carbon/human/interactive/proc/take_to_slot(obj/item/G, var/hands=0)
var/list/slots = list ("left pocket" = slot_l_store,"right pocket" = slot_r_store,"left hand" = slot_l_hand,"right hand" = slot_r_hand)
+ if(hands)
+ slots = list ("left hand" = slot_l_hand,"right hand" = slot_r_hand)
G.loc = src
if(G.force && G.force > best_force)
best_force = G.force
@@ -278,7 +322,7 @@
/mob/living/carbon/human/interactive/Life()
..()
- if(isnotfunc())
+ if(IsDeadOrIncap())
walk(src,0)
return
if(a_intent != "disarm")
@@ -293,7 +337,6 @@
if(interest > 100)
interest = 100
//---------------------------
- nearby = list()
//VIEW FUNCTIONS
if(!l_hand || !r_hand)
@@ -323,13 +366,17 @@
//proc functions
for(var/Proc in functions)
- if(!isnotfunc())
+ if(!IsDeadOrIncap())
callfunction(Proc)
//target interaction stays hardcoded
- if((TARGET && (TARGET in view(1))) || timeout >= 2)
+ if(TARGET) // don't use blacklisted items
+ if(TARGET in blacklistItems)
+ TARGET = null
+
+ if((TARGET && (TARGET in view(1))))
if((TARGET in view(1,src)))//this is a bit redundant but it saves two if blocks
doing |= INTERACTING
//--------DOORS
@@ -342,31 +389,32 @@
tryWalk(T)
//THIEVING SKILLS
if(prob(slyness))
- //---------TOOLS
- if(istype(TARGET, /obj/item/weapon))
- var/obj/item/weapon/W = TARGET
- if(W.force >= best_force || prob((FUZZY_CHANCE_LOW+FUZZY_CHANCE_HIGH)/2))
- if(!l_hand || !r_hand)
- take_to_slot(W)
- else
- insert_into_backpack()
- //---------FASHION
- if(istype(TARGET,/obj/item/clothing))
- if(prob((FUZZY_CHANCE_LOW+FUZZY_CHANCE_HIGH)/2))
- if(!l_hand || !r_hand)
- var/obj/item/clothing/C = TARGET
- take_to_slot(C)
+ if(!TARGET in blacklistItems)
+ //---------TOOLS
+ if(istype(TARGET, /obj/item/weapon))
+ var/obj/item/weapon/W = TARGET
+ if(W.force >= best_force || prob((FUZZY_CHANCE_LOW+FUZZY_CHANCE_HIGH)/2))
+ if(!l_hand || !r_hand)
+ take_to_slot(W)
+ else
+ insert_into_backpack()
+ //---------FASHION
+ if(istype(TARGET,/obj/item/clothing))
+ var/obj/item/clothing/C = TARGET
+ drop_item()
+ spawn(5)
+ take_to_slot(C,1)
if(!equip_to_appropriate_slot(C))
var/obj/item/I = get_item_by_slot(C)
unEquip(I)
- equip_to_appropriate_slot(C)
- update_hands = 1
- drop_item()
- if(MYPDA in src.loc || MYID in src.loc)
- if(MYPDA in src.loc)
- equip_to_appropriate_slot(MYPDA)
- if(MYID in src.loc)
- equip_to_appropriate_slot(MYID)
+ spawn(5)
+ equip_to_appropriate_slot(C)
+ update_hands = 1
+ if(MYPDA in src.loc || MYID in src.loc)
+ if(MYPDA in src.loc)
+ equip_to_appropriate_slot(MYPDA)
+ if(MYID in src.loc)
+ equip_to_appropriate_slot(MYID)
//THIEVING SKILLS END
//-------------TOUCH ME
if(istype(TARGET,/obj/structure))
@@ -376,70 +424,113 @@
STR.attackby(W, src)
else
STR.attack_hand(src)
- interest = interest + 25
+ interest += targetInterestShift
doing = doing & ~INTERACTING
timeout = 0
TARGET = null
else
tryWalk(TARGET)
timeout++
- if(!doing)
+
+ if(doing == 0)
interest--
else
interest++
+
if(inactivity_period > 0)
inactivity_period--
+ if(interest <= 0 || timeout >= 10) // facilitate boredom functions
+ TARGET = null
+ doing = 0
+ timeout = 0
+ myPath = list()
+
//this is boring, lets move
- if(!doing && !isnotfunc() && !TARGET)
+ if(!doing && !IsDeadOrIncap() && !TARGET)
doing |= TRAVEL
if(nearby.len > 4)
//i'm crowded, time to leave
TARGET = pick(target_filter(urange(MAX_RANGE_FIND,src,1)))
- else if(prob((FUZZY_CHANCE_LOW+FUZZY_CHANCE_HIGH)/2))
- //chance to chase an item
- TARGET = locate(/obj/item) in urange(MIN_RANGE_FIND,src,1)
- else if(prob((FUZZY_CHANCE_LOW+FUZZY_CHANCE_HIGH)/2))
- //chance to leave
- TARGET = locate(/obj/machinery/door) in urange(MIN_RANGE_FIND,src,1) // this is a sort of fix for the current pathing.
else
- //else, target whatever, or go to our department
- if(prob((FUZZY_CHANCE_LOW+FUZZY_CHANCE_HIGH)/2))
- TARGET = pick(target_filter(urange(MIN_RANGE_FIND,src,1)))
- else
- TARGET = safepick(get_area_turfs(job2area(myjob)))
+ var/choice = rand(1,50)
+ switch(choice)
+ if(1 to 10)
+ //chance to chase an item
+ TARGET = locate(/obj/item) in favouredObjIn(oview(MIN_RANGE_FIND,src))
+ if(11 to 21)
+ TARGET = safepick(get_area_turfs(job2area(myjob)))
+ if(22 to 41)
+ TARGET = pick(target_filter(favouredObjIn(urange(MAX_RANGE_FIND,src,1))))
+ if(42 to 50)
+ TARGET = pick(target_filter(oview(MIN_RANGE_FIND,src)))
tryWalk(TARGET)
LAST_TARGET = TARGET
+/mob/living/carbon/human/interactive/proc/favouredObjIn(var/list/inList)
+ var/list/outList = list()
+ for(var/i in inList)
+ for(var/path in favoured_types)
+ if(ispath(i,path))
+ outList += i
+ if(outList.len <= 0)
+ outList = inList
+ return outList
+
/mob/living/carbon/human/interactive/proc/callfunction(Proc)
set waitfor = 0
call(src,Proc)(src)
+
/mob/living/carbon/human/interactive/proc/tryWalk(turf/TARGET)
- if(!isnotfunc())
+ if(!IsDeadOrIncap())
if(!walk2derpless(TARGET))
timeout++
else
timeout++
+/mob/living/carbon/human/interactive/proc/getGoodPath(target,var/maxtries=512)
+ set background = 1
+ var/turf/end = get_turf(target)
+
+ var/turf/current = get_turf(src)
+
+ var/list/path = list()
+ var/tries = 0
+ while(current != end && tries < maxtries)
+ var/turf/shortest = current
+ for(var/turf/T in view(current,1))
+ var/foundDense = 0
+ for(var/atom/A in T)
+ if(A.density)
+ foundDense = 1
+ if(T.density == 0 && !foundDense)
+ if(get_dist(T, target) < get_dist(shortest,target))
+ shortest = T
+ else
+ tries++
+ else
+ tries++
+ current = shortest
+ path += shortest
+ return path
/mob/living/carbon/human/interactive/proc/walk2derpless(target)
set background = 1
if(!target)
return 0
- var/turf/T = get_turf(target)
- var/turf/D = get_step(src,dir)
- if(D)
- if(!D.density)
- walk_to(src,T,0,5)
+
+ if(myPath.len <= 0)
+ myPath = get_path_to(src, get_turf(target), /turf/proc/Distance, MAX_RANGE_FIND + 1, 250,1, id=Path_ID)
+
+ if(myPath)
+ if(myPath.len > 0)
doing = doing & ~TRAVEL
+ for(var/i = 0; i < maxStepsTick; ++i)
+ if(myPath.len >= 1)
+ walk_to(src,myPath[1],0,5)
+ myPath -= myPath[1]
return 1
- else
- sidestep(D)
- doing = doing & ~TRAVEL
- return 0
- else
- doing = doing & ~TRAVEL
- return 0
+ return 0
/mob/living/carbon/human/interactive/proc/job2area(target)
var/datum/job/T = target
@@ -461,19 +552,13 @@
return pick(/area/hallway,/area/crew_quarters)
/mob/living/carbon/human/interactive/proc/target_filter(target)
+ var/list/filtered_targets = list(/area, /turf, /obj/machinery/door, /atom/movable/light, /obj/structure/cable, /obj/machinery/atmospherics)
var/list/L = target
- for(var/atom/A in target)
- if(istype(A,/area) || istype(A,/turf/space))
+ for(var/atom/A in target) // added a bunch of "junk" that clogs up the general find procs
+ if(is_type_in_list(A,filtered_targets))
L -= A
return L
-/mob/living/carbon/human/interactive/proc/denied_filter(target)
- var/list/denied = list(/obj/structure/window,/obj/structure/table) //expand me
- for(var/a in denied)
- if(istype(target,a))
- return 1
- return 0
-
///BUILT IN MODULES
/mob/living/carbon/human/interactive/proc/chatter(obj)
var/verbs_use = pick_list("npc_chatter.txt","verbs_use")
@@ -527,34 +612,58 @@
/mob/living/carbon/human/interactive/proc/shitcurity(obj)
if(retal && TARGET)
for(var/obj/item/I in src.contents)
- if(istype(I,/obj/item/weapon/restraints/handcuffs))
+ if(istype(I,/obj/item/weapon/restraints))
take_to_slot(I)
I.attack(TARGET,src)
sleep(25)
-/mob/living/carbon/human/interactive/proc/sidestep(obj)
- var/shift = 0
- for(var/dir in cardinal)
- var/turf/T = get_step(src,dir)
- if(T)
- for(var/obj/A in T.contents)
- if(denied_filter(A))
- shift = 1
- if(T.density)
- shift = 1
- if(shift)
- if(src.dir == NORTH || SOUTH)
- var/towalk = pick(EAST,WEST)
- walk_to(src,get_step(src,towalk),0,5)
- else
- var/towalk = pick(NORTH,SOUTH)
- walk_to(src,get_step(src,towalk),0,5)
+/mob/living/carbon/human/interactive/proc/healpeople(obj)
+ var/shouldTryHeal = 0
+ var/obj/item/stack/medical/M
+
+ var/list/allContents = list()
+
+ for(var/atom/A in contents)
+ allContents += A
+ if(A.contents.len > 0)
+ for(var/atom/B in A)
+ allContents += B
+
+ for(var/A in allContents)
+ if(istype(A,/obj/item/stack/medical))
+ shouldTryHeal = 1
+ M = A
+ if(shouldTryHeal)
+ for(var/mob/living/carbon/C in nearby)
+ if(istype(C,/mob/living/carbon)) //I haven't the foggiest clue why this is turning up non-carbons but sure here whatever
+ if(C.health <= 75)
+ if(get_dist(src,C) <= 2)
+ src.say("Wait, [C], let me heal you!")
+ M.attack(C,src)
+ sleep(25)
+ else
+ tryWalk(get_turf(C))
+
+/mob/living/carbon/human/interactive/proc/dojanitor(obj)
+ if(istype(main_hand,/obj/item/weapon/mop))
+ var/obj/item/weapon/mop/M = main_hand
+ if(M)
+ if(M.reagents.total_volume <= 5)
+ M.reagents.add_reagent("water", 25) // bluespess water delivery for AI
+ if(!istype(TARGET,/obj/effect/decal/cleanable))
+ TARGET = locate(/obj/effect/decal/cleanable) in urange(MAX_RANGE_FIND,src,1)
+ if(targetRange(TARGET) <= 2)
+ M.afterattack(TARGET,src)
+ sleep(25)
+ else
+ tryWalk(TARGET)
/mob/living/carbon/human/interactive/proc/combat(obj)
set background = 1
enforce_hands()
if(canmove)
if(prob(attitude) && (graytide || (TRAITS & TRAIT_MEAN)) || retal)
+ interest = interest + 10
a_intent = "harm"
zone_selected = pick("chest","r_leg","l_leg","r_arm","l_arm","head")
doing |= FIGHTING
@@ -569,68 +678,115 @@
if(!M)
doing = doing & ~FIGHTING
+ //no infighting
+ if(retal)
+ if(retal_target)
+ if(retal_target.faction == src.faction)
+ if(prob(FUZZY_CHANCE_HIGH+FUZZY_CHANCE_LOW)) //high chance to forgive
+ retal = 0
+ retal_target = null
+ TARGET = null
+ doing = 0
+
+ //ensure we're using the best object possible
+
+ var/obj/item/weapon/best
+ var/foundFav = 0
+ for(var/test in src.contents)
+ for(var/a in favoured_types)
+ if(ispath(test,a) && !(doing & FIGHTING)) // if we're not in combat and we find our favourite things, use them (for people like janitor and doctors)
+ best = test
+ foundFav = 1
+ return
+ if(!foundFav)
+ if(istype(test,/obj/item/weapon))
+ var/obj/item/weapon/R = test
+ if(R.force > 2) // make sure we don't equip any non-weaponlike items, ie bags and stuff
+ if(!best)
+ best = R
+ else
+ if(best.force < R.force)
+ best = R
+ if(istype(R,/obj/item/weapon/gun))
+ var/obj/item/weapon/gun/G = R
+ if(G.can_shoot())
+ best = R
+ break // gun with ammo? screw the rest
+ if(best)
+ take_to_slot(best,1)
+
if((TARGET && (doing & FIGHTING)) || graytide) // this is a redundancy check
var/mob/living/M = TARGET
if(istype(M,/mob/living))
- if(targetRange(M) <= FUZZY_CHANCE_LOW)
- if(M.health > 1)
- if(main_hand)
- if(main_hand.force != 0)
- if(istype(main_hand,/obj/item/weapon/gun/projectile))
- var/obj/item/weapon/gun/projectile/P = main_hand
- if(!P.chambered)
- P.chamber_round()
- P.update_icon()
- else if(P.get_ammo(1) == 0)
- P.attack_self(src)
+ if(M.health > 1)
+ if(main_hand)
+ if(main_hand.force != 0)
+ if(istype(main_hand,/obj/item/weapon/gun))
+ var/obj/item/weapon/gun/G = main_hand
+ if(G.can_trigger_gun(src))
+ if(istype(main_hand,/obj/item/weapon/gun/projectile))
+ var/obj/item/weapon/gun/projectile/P = main_hand
+ if(!P.chambered)
+ P.chamber_round()
+ P.update_icon()
+ else if(P.get_ammo(1) == 0)
+ P.update_icon()
+ blacklistItems += P
+ P.loc = get_turf(src) // drop item works inconsistently
+ enforce_hands()
+ update_icons()
+ else
+ P.afterattack(TARGET, src)
+ else if(istype(main_hand,/obj/item/weapon/gun/energy))
+ var/obj/item/weapon/gun/energy/P = main_hand
+ if(P.power_supply.charge <= 10) // can shoot seems to bug out for tasers, using this hacky method instead
+ P.update_icon()
+ blacklistItems += P
+ P.loc = get_turf(src) // likewise
+ enforce_hands()
+ update_icons()
+ else
+ P.afterattack(TARGET, src)
else
- P.afterattack(TARGET, src)
- else if(istype(main_hand,/obj/item/weapon/gun/energy))
- var/obj/item/weapon/gun/energy/P = main_hand
- if(!P.can_shoot())
- P.update_icon()
- drop_item()
- else
- P.afterattack(TARGET, src)
- else
- if(get_dist(src,TARGET) > 2)
- if(!walk2derpless(TARGET))
- timeout++
- else
- var/obj/item/weapon/W = main_hand
- if(prob(robustness))
+ if(get_dist(src,TARGET) > 2)
+ if(!walk2derpless(TARGET))
+ timeout++
+ else
+ var/obj/item/weapon/W = main_hand
W.attack(TARGET,src)
- sleep(1)
+ else
+ G.loc = get_turf(src) // drop item works inconsistently
+ enforce_hands()
+ update_icons()
+ else
+ if(targetRange(TARGET) > (istype(main_hand,/obj/item/weapon/gun) ? 6 : 2))
+ tryWalk(TARGET)
else
- if(targetRange(TARGET) > 2)
- tryWalk(TARGET)
- else
- if(Adjacent(TARGET))
- M.attack_hand(src)
- sleep(1)
- timeout++
- else if(timeout >= 10 || M.health <= 1 || !(targetRange(M) > 14))
- doing = doing & ~FIGHTING
- timeout = 0
- TARGET = null
- retal = 0
- retal_target = null
+ if(Adjacent(TARGET))
+ M.attack_hand(src)
+ timeout++
+ else if(timeout >= 10 || !(targetRange(M) > 14))
+ doing = doing & ~FIGHTING
+ timeout = 0
+ TARGET = null
+ retal = 0
+ retal_target = null
else
timeout++
/mob/living/carbon/human/interactive/proc/doorscan(obj)
- for(var/dir in cardinal)
+ for(var/dir in alldirs)
var/turf/T = get_step(src,dir)
if(T)
for(var/obj/machinery/door/D in T.contents)
if(D.check_access(MYID) && !istype(D,/obj/machinery/door/poddoor) && D.density)
- //layer 3.1 is "closed" for most doors, this is just a hacky !open check because i cannot find an open var
- spawn(1)
+ spawn(0)
D.open()
sleep(5)
- walk2derpless(get_step(D,dir))
+ walk_to(src,T,0,5)
/mob/living/carbon/human/interactive/proc/nearbyscan(obj)
+ nearby = list()
for(var/mob/living/M in view(4,src))
if(M != src)
nearby += M
diff --git a/code/modules/mob/inventory.dm b/code/modules/mob/inventory.dm
index 073eb5be33c6..3a8e0dcaaa6d 100644
--- a/code/modules/mob/inventory.dm
+++ b/code/modules/mob/inventory.dm
@@ -263,4 +263,11 @@
var/obj/item/I = get_active_hand()
if (I)
- I.equip_to_best_slot(src)
\ No newline at end of file
+ I.equip_to_best_slot(src)
+
+//used in code for items usable by both carbon and drones, this gives the proper back slot for each mob.(defibrillator, backpack watertank, ...)
+/mob/proc/getBackSlot()
+ return slot_back
+
+/mob/proc/getBeltSlot()
+ return slot_belt
\ No newline at end of file
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 6f3d4b26df35..3d7c28a98c4d 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm
@@ -5,34 +5,6 @@ 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
-
-/datum/action/spell_action/alien/UpdateName()
- var/obj/effect/proc_holder/alien/ab = target
- return ab.name
-
-/datum/action/spell_action/alien/IsAvailable()
- if(!target)
- return 0
- var/obj/effect/proc_holder/alien/ab = target
-
- 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()
- if(!iscarbon(owner))
- return 1
-
- var/mob/living/carbon/C = owner
- if(target.loc && !(target.loc in C.internal_organs))
- return 1
-
- return 0
-
/obj/effect/proc_holder/alien
name = "Alien Power"
@@ -46,6 +18,10 @@ Doesn't work on other aliens/AI.*/
var/action_icon_state = "spell_default"
var/action_background_icon_state = "bg_alien"
+/obj/effect/proc_holder/alien/New()
+ ..()
+ action = new(src)
+
/obj/effect/proc_holder/alien/Click()
if(!istype(usr,/mob/living/carbon))
return 1
@@ -319,6 +295,10 @@ Doesn't work on other aliens/AI.*/
if(!vessel) return 0
vessel.storedPlasma = max(vessel.storedPlasma + amount,0)
vessel.storedPlasma = min(vessel.storedPlasma, vessel.max_plasma) //upper limit of max_plasma, lower limit of 0
+ for(var/X in abilities)
+ var/obj/effect/proc_holder/alien/APH = X
+ if(APH.has_action)
+ APH.action.UpdateButtonIcon()
return 1
/mob/living/carbon/alien/adjustPlasma(amount)
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 90a165abc9a5..f35f90877f97 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -70,7 +70,16 @@
stomach_contents.Remove(A)
src.gib()
-/mob/living/carbon/gib(animation = 1)
+/mob/living/carbon/gib(animation = 1, var/no_brain = 0)
+ death(1)
+ for(var/obj/item/organ/internal/I in internal_organs)
+ if(no_brain && istype(I, /obj/item/organ/internal/brain))
+ continue
+ if(I)
+ I.Remove(src)
+ I.loc = get_turf(src)
+ I.throw_at_fast(get_edge_target_turf(src,pick(alldirs)),rand(1,3),5)
+
for(var/mob/M in src)
if(M in stomach_contents)
stomach_contents.Remove(M)
@@ -323,9 +332,10 @@
if(internal)
internal = null
update_internals_hud_icon(0)
- else if(ITEM && istype(ITEM, /obj/item/weapon/tank) && wear_mask && (wear_mask.flags & MASKINTERNALS))
- internal = ITEM
- update_internals_hud_icon(1)
+ else if(ITEM && istype(ITEM, /obj/item/weapon/tank))
+ if((wear_mask && (wear_mask.flags & MASKINTERNALS)) || getorganslot("breathing_tube"))
+ internal = ITEM
+ update_internals_hud_icon(1)
visible_message("[usr] [internal ? "opens" : "closes"] the valve on [src]'s [ITEM].", \
"[usr] [internal ? "opens" : "closes"] the valve on [src]'s [ITEM].")
@@ -555,13 +565,6 @@ var/const/GALOSHES_DONT_HELP = 4
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)
sortInsert(abilities, /proc/cmp_abilities_cost, 0)
@@ -789,6 +792,7 @@ var/const/GALOSHES_DONT_HELP = 4
throw_alert("handcuffed", /obj/screen/alert/restrained/handcuffed, new_master = src.handcuffed)
else
clear_alert("handcuffed")
+ update_action_buttons_icon() //some of our action buttons might be unusable when we're handcuffed.
update_inv_handcuffed()
update_hud_handcuffed()
@@ -808,13 +812,23 @@ var/const/GALOSHES_DONT_HELP = 4
for(var/datum/disease/D in viruses)
D.cure(0)
- if(dna)
- for(var/datum/mutation/human/HM in dna.mutations)
- if(HM.quality != POSITIVE)
- dna.remove_mutation(HM.name)
..()
/mob/living/carbon/can_be_revived()
. = ..()
if(!getorgan(/obj/item/organ/internal/brain))
return 0
+
+/mob/living/carbon/harvest(mob/living/user)
+ if(qdeleted(src))
+ return
+ var/organs_amt = 0
+ for(var/obj/item/organ/internal/O in internal_organs)
+ if(prob(50))
+ organs_amt++
+ O.Remove(src)
+ O.loc = get_turf(src)
+ if(organs_amt)
+ user << "You retrieve some of [src]\'s internal organs!"
+
+ ..()
diff --git a/code/modules/mob/living/carbon/carbon_defines.dm b/code/modules/mob/living/carbon/carbon_defines.dm
index 665ca0422be6..544a023160bf 100644
--- a/code/modules/mob/living/carbon/carbon_defines.dm
+++ b/code/modules/mob/living/carbon/carbon_defines.dm
@@ -1,8 +1,9 @@
/mob/living/carbon
gender = MALE
hud_possible = list(HEALTH_HUD,STATUS_HUD,ANTAG_HUD)
- var/list/stomach_contents = list()
- var/list/internal_organs = list() //List of /obj/item/organ/internal in the mob. They don't go in the contents for some reason I don't want to know.
+ var/list/stomach_contents = list()
+ var/list/internal_organs = list() //List of /obj/item/organ/internal in the mob. They don't go in the contents for some reason I don't want to know.
+ var/list/internal_organs_slot = list() //Same as above, but stores "slot ID" - "organ" pairs for easy access.
var/silent = 0 //Can't talk. Value goes down every life proc. //NOTE TO FUTURE CODERS: DO NOT INITIALIZE NUMERICAL VARS AS NULL OR I WILL MURDER YOU.
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 94799020482f..c2a6b07536c2 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -28,6 +28,7 @@
for(var/obj/item/organ/limb/O in organs)
O.owner = src
internal_organs += new /obj/item/organ/internal/appendix
+ internal_organs += new /obj/item/organ/internal/lungs
internal_organs += new /obj/item/organ/internal/heart
internal_organs += new /obj/item/organ/internal/brain
@@ -159,7 +160,7 @@
if(!prob(martial_art.deflection_chance))
return ..()
if(!src.lying && dna && !dna.check_mutation(HULK)) //But only if they're not lying down, and hulks can't do it
- src.visible_message("[src] deflects the projectile!", "You deflect the projectile!")
+ src.visible_message("[src] deflects the projectile; they can't be hit with ranged weapons!", "You deflect the projectile!")
return 0
..()
@@ -945,6 +946,12 @@
hud_used.healthdoll.icon_state = "healthdoll_DEAD"
/mob/living/carbon/human/fully_heal(admin_revive = 0)
+ if(!getorganslot("lungs"))
+ var/obj/item/organ/internal/lungs/L = new()
+ L.Insert(src)
restore_blood()
remove_all_embedded_objects()
- ..()
\ No newline at end of file
+ for(var/datum/mutation/human/HM in dna.mutations)
+ if(HM.quality != POSITIVE)
+ dna.remove_mutation(HM.name)
+ ..()
diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm
index ab3fc2b9cf9f..1772751126d8 100644
--- a/code/modules/mob/living/carbon/human/human_movement.dm
+++ b/code/modules/mob/living/carbon/human/human_movement.dm
@@ -11,7 +11,7 @@
// Do we have a jetpack (and is it on)?
var/obj/item/weapon/tank/jetpack/J = back
- if(!istype(J))
+ if(!istype(J) && istype(wear_suit, /obj/item/clothing/suit/space/hardsuit))
var/obj/item/clothing/suit/space/hardsuit/C = wear_suit
J = C.jetpack
if(istype(J) && J.allow_thrust(0.01, src))
diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm
index 20a1005d2138..3e0ad9b5b3c0 100644
--- a/code/modules/mob/living/carbon/human/inventory.dm
+++ b/code/modules/mob/living/carbon/human/inventory.dm
@@ -88,6 +88,8 @@
wear_suit = I
if(I.flags_inv & HIDEJUMPSUIT)
update_inv_w_uniform()
+ if(wear_suit.breakouttime) //when equipping a straightjacket
+ update_action_buttons_icon() //certain action buttons will no longer be usable.
update_inv_wear_suit()
if(slot_w_uniform)
w_uniform = I
@@ -113,6 +115,8 @@
if(I == wear_suit)
if(s_store)
unEquip(s_store, 1) //It makes no sense for your suit storage to stay on you if you drop your suit.
+ if(wear_suit.breakouttime) //when unequipping a straightjacket
+ update_action_buttons_icon() //certain action buttons may be usable again.
wear_suit = null
if(I.flags_inv & HIDEJUMPSUIT)
update_inv_w_uniform()
@@ -166,10 +170,10 @@
s_store = null
update_inv_s_store()
-/mob/living/carbon/human/wear_mask_update(obj/item/clothing/C, unequip = 1)
+/mob/living/carbon/human/wear_mask_update(obj/item/clothing/C, toggle_off = 1)
if((C.flags_inv & (HIDEHAIR|HIDEFACIALHAIR)) || (initial(C.flags_inv) & (HIDEHAIR|HIDEFACIALHAIR)))
update_hair()
- if(unequip && internal)
+ if(toggle_off && internal && !getorganslot("breathing_tube"))
update_internals_hud_icon(0)
internal = null
if(C.flags_inv & HIDEEYES)
diff --git a/code/modules/mob/living/carbon/human/say.dm b/code/modules/mob/living/carbon/human/say.dm
index 4f2ef5251530..047f46481c08 100644
--- a/code/modules/mob/living/carbon/human/say.dm
+++ b/code/modules/mob/living/carbon/human/say.dm
@@ -31,8 +31,8 @@
return ..() | dna.mutations_get_spans() | dna.species_get_spans()
/mob/living/carbon/human/GetVoice()
- if(istype(wear_mask, /obj/item/clothing/mask/gas/voice))
- var/obj/item/clothing/mask/gas/voice/V = wear_mask
+ if(istype(wear_mask, /obj/item/clothing/mask/chameleon))
+ var/obj/item/clothing/mask/chameleon/V = wear_mask
if(V.vchange && wear_id)
var/obj/item/weapon/card/id/idcard = wear_id.GetID()
if(istype(idcard))
@@ -48,6 +48,8 @@
return real_name
/mob/living/carbon/human/IsVocal()
+ if(!getorganslot("lungs"))
+ return 0
if(mind)
return !mind.miming
return 1
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index e8ea256c06a3..4f65ede2160d 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -119,6 +119,12 @@
return 0
return 1
+/datum/species/proc/on_species_loss(mob/living/carbon/C)
+ if(C.dna.species)
+ if(C.dna.species.exotic_blood)
+ var/datum/reagent/EB = C.dna.species.exotic_blood
+ C.reagents.del_reagent(initial(EB.id))
+
/datum/species/proc/update_base_icon_state(mob/living/carbon/human/H)
if(H.disabilities & HUSK)
H.remove_overlay(SPECIES_LAYER) // races lose their color
@@ -813,7 +819,7 @@
/datum/species/proc/spec_attack_hand(mob/living/carbon/human/M, mob/living/carbon/human/H)
if(!istype(M)) //sanity check for drones.
return
- if((M != H) && M.a_intent != "help" && H.check_shields(0, M.name))
+ if((M != H) && M.a_intent != "help" && H.check_shields(0, M.name, attack_type = UNARMED_ATTACK))
add_logs(M, H, "attempted to touch")
H.visible_message("[M] attempted to touch [H]!")
return 0
@@ -1072,13 +1078,17 @@
if((H.status_flags & GODMODE))
return
- if(!breath || (breath.total_moles() == 0))
- if(H.reagents.has_reagent("epinephrine"))
+ var/lungs = H.getorganslot("lungs")
+
+ if(!breath || (breath.total_moles() == 0) || !lungs)
+ if(H.reagents.has_reagent("epinephrine") && lungs)
return
if(H.health >= config.health_threshold_crit)
if(NOBREATH in specflags)
return 1
H.adjustOxyLoss(HUMAN_MAX_OXYLOSS)
+ if(!lungs)
+ H.adjustOxyLoss(1)
H.failed_last_breath = 1
else
H.adjustOxyLoss(HUMAN_CRIT_MAX_OXYLOSS)
@@ -1120,7 +1130,7 @@
H.failed_last_breath = 0
if(H.getOxyLoss())
H.adjustOxyLoss(-5)
- gas_breathed = breath_gases["o2"][MOLES]/6
+ gas_breathed = breath_gases["o2"][MOLES]
H.clear_alert("oxy")
//Exhale
@@ -1157,7 +1167,7 @@
else
H.failed_last_breath = 0
H.adjustOxyLoss(-5)
- gas_breathed = breath_gases["co2"][MOLES]/6
+ gas_breathed = breath_gases["co2"][MOLES]
H.clear_alert("not_enough_co2")
//Exhale
@@ -1187,7 +1197,7 @@
else
H.failed_last_breath = 0
H.adjustOxyLoss(-5)
- gas_breathed = breath_gases["plasma"][MOLES]/6
+ gas_breathed = breath_gases["plasma"][MOLES]
H.clear_alert("not_enough_tox")
//Exhale
diff --git a/code/modules/mob/living/carbon/human/species_types.dm b/code/modules/mob/living/carbon/human/species_types.dm
index d76cdfa43842..5ef60481068c 100644
--- a/code/modules/mob/living/carbon/human/species_types.dm
+++ b/code/modules/mob/living/carbon/human/species_types.dm
@@ -240,11 +240,23 @@ var/regex/lizard_hiSS = new("S+", "g")
burnmod = 0.5
coldmod = 2
heatmod = 0.5
+ var/datum/action/innate/split_body/slime_split
+ var/datum/action/innate/swap_body/callforward
+ var/datum/action/innate/swap_body/callback
+
+/datum/species/jelly/slime/on_species_loss(mob/living/carbon/C)
+ if(slime_split)
+ slime_split.Remove(C)
+ if(callforward)
+ callforward.Remove(C)
+ if(callback)
+ callback.Remove(C)
+ ..()
/datum/species/jelly/slime/spec_life(mob/living/carbon/human/H)
if(recently_changed)
- var/datum/action/innate/split_body/S = new
- S.Grant(H)
+ slime_split = new
+ slime_split.Grant(H)
for(var/datum/reagent/toxin/slimejelly/S in H.reagents.reagent_list)
if(S.volume >= 200)
@@ -259,16 +271,10 @@ var/regex/lizard_hiSS = new("S+", "g")
/datum/action/innate/split_body
name = "Split Body"
- check_flags = AB_CHECK_ALIVE
+ check_flags = AB_CHECK_CONSCIOUS
button_icon_state = "slimesplit"
background_icon_state = "bg_alien"
-/datum/action/innate/split_body/CheckRemoval()
- var/mob/living/carbon/human/H = owner
- if(!ishuman(H) || !H.dna || !H.dna.species || H.dna.species.id != "slime")
- return 1
- return 0
-
/datum/action/innate/split_body/Activate()
var/mob/living/carbon/human/H = owner
H << "You focus intently on moving your body while standing perfectly still..."
@@ -286,12 +292,13 @@ var/regex/lizard_hiSS = new("S+", "g")
spare.Move(get_step(H.loc, pick(NORTH,SOUTH,EAST,WEST)))
S.volume = 80
H.notransform = 0
- var/datum/action/innate/swap_body/callforward = new /datum/action/innate/swap_body()
- var/datum/action/innate/swap_body/callback = new /datum/action/innate/swap_body()
- callforward.body = spare
- callforward.Grant(H)
- callback.body = H
- callback.Grant(spare)
+ var/datum/species/jelly/slime/SS = H.dna.species
+ SS.callforward = new
+ SS.callforward.body = spare
+ SS.callforward.Grant(H)
+ SS.callback = new
+ SS.callback.body = H
+ SS.callback.Grant(spare)
H.mind.transfer_to(spare)
spare << "...and after a moment of disorentation, you're besides yourself!"
return
@@ -301,17 +308,11 @@ var/regex/lizard_hiSS = new("S+", "g")
/datum/action/innate/swap_body
name = "Swap Body"
- check_flags = AB_CHECK_ALIVE
+ check_flags = AB_CHECK_CONSCIOUS
button_icon_state = "slimeswap"
background_icon_state = "bg_alien"
var/mob/living/carbon/human/body
-/datum/action/innate/swap_body/CheckRemoval()
- var/mob/living/carbon/human/H = owner
- if(!ishuman(H) || !H.dna || !H.dna.species || H.dna.species.id != "slime")
- return 1
- return 0
-
/datum/action/innate/swap_body/Activate()
if(!body || !istype(body) || !body.dna || !body.dna.species || body.dna.species.id != "slime" || body.stat == DEAD || qdeleted(body))
owner << "Something is wrong, you cannot sense your other body!"
@@ -373,6 +374,17 @@ var/regex/lizard_hiSS = new("S+", "g")
/datum/species/fly/handle_speech(message)
return replacetext(message, "z", stutter("zz"))
+/datum/species/fly/handle_chemicals(datum/reagent/chem, mob/living/carbon/human/H)
+ if(istype(chem,/datum/reagent/consumable))
+ var/datum/reagent/consumable/nutri_check = chem
+ if(nutri_check.nutriment_factor >0)
+ var/turf/pos = get_turf(H)
+ H.vomit()
+ playsound(pos, 'sound/effects/splat.ogg', 50, 1)
+ H.visible_message("[H] vomits on the floor!", \
+ "You throw up on the floor!")
+ ..()
+
/*
SKELETONS
*/
diff --git a/code/modules/mob/living/carbon/inventory.dm b/code/modules/mob/living/carbon/inventory.dm
index d32dc722d840..910cbf3c3389 100644
--- a/code/modules/mob/living/carbon/inventory.dm
+++ b/code/modules/mob/living/carbon/inventory.dm
@@ -40,7 +40,7 @@
update_inv_back()
if(slot_wear_mask)
wear_mask = I
- wear_mask_update(I, unequip=0)
+ wear_mask_update(I, toggle_off = 0)
if(slot_head)
head = I
head_update(I)
@@ -77,7 +77,7 @@
update_inv_back()
else if(I == wear_mask)
wear_mask = null
- wear_mask_update(I, unequip=1)
+ wear_mask_update(I, toggle_off = 1)
else if(I == handcuffed)
handcuffed = null
if(buckled && buckled.buckle_requires_restraints)
@@ -88,10 +88,10 @@
update_inv_legcuffed()
//handle stuff to update when a mob equips/unequips a mask.
-/mob/living/proc/wear_mask_update(obj/item/clothing/C, unequip = 1)
+/mob/living/proc/wear_mask_update(obj/item/clothing/C, toggle_off = 1)
update_inv_wear_mask()
-/mob/living/carbon/wear_mask_update(obj/item/clothing/C, unequip = 1)
+/mob/living/carbon/wear_mask_update(obj/item/clothing/C, toggle_off = 1)
if(C.tint || initial(C.tint))
update_tint()
update_inv_wear_mask()
diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm
index a4a68b8ac66c..2de0bcc254bf 100644
--- a/code/modules/mob/living/carbon/life.dm
+++ b/code/modules/mob/living/carbon/life.dm
@@ -100,9 +100,13 @@
if((status_flags & GODMODE))
return
+ var/lungs = getorganslot("lungs")
+ if(!lungs)
+ adjustOxyLoss(2)
+
//CRIT
- if(!breath || (breath.total_moles() == 0))
- if(reagents.has_reagent("epinephrine"))
+ if(!breath || (breath.total_moles() == 0) || !lungs)
+ if(reagents.has_reagent("epinephrine") && lungs)
return
adjustOxyLoss(1)
failed_last_breath = 1
@@ -133,7 +137,7 @@
var/ratio = safe_oxy_min/O2_partialpressure
adjustOxyLoss(min(5*ratio, 3))
failed_last_breath = 1
- oxygen_used = breath_gases["o2"][MOLES]*ratio/6
+ oxygen_used = breath_gases["o2"][MOLES]*ratio
else
adjustOxyLoss(3)
failed_last_breath = 1
@@ -143,7 +147,7 @@
failed_last_breath = 0
if(oxyloss)
adjustOxyLoss(-5)
- oxygen_used = breath_gases["o2"][MOLES]/6
+ oxygen_used = breath_gases["o2"][MOLES]
clear_alert("oxy")
breath_gases["o2"][MOLES] -= oxygen_used
@@ -196,17 +200,15 @@
/mob/living/carbon/proc/get_breath_from_internal(volume_needed)
if(internal)
- if (!contents.Find(internal))
+ if(internal.loc != src)
internal = null
- if (!wear_mask || !(wear_mask.flags & MASKINTERNALS) )
+ update_internals_hud_icon(0)
+ else if ((!wear_mask || !(wear_mask.flags & MASKINTERNALS)) && !getorganslot("breathing_tube"))
internal = null
- if(internal)
+ update_internals_hud_icon(0)
+ else
update_internals_hud_icon(1)
return internal.remove_air_volume(volume_needed)
- else
- update_internals_hud_icon(0)
- return
-
/mob/living/carbon/proc/handle_changeling()
if(mind && hud_used)
@@ -297,7 +299,7 @@
if(sleeping)
adjustStaminaLoss(-10)
else
- adjustStaminaLoss(-2)
+ adjustStaminaLoss(-3)
if(sleeping)
handle_dreams()
@@ -387,9 +389,3 @@
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
-
-
-/mob/living/carbon/handle_actions()
- ..()
- for(var/obj/item/I in internal_organs)
- give_action_button(I, 1)
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/monkey/monkey.dm b/code/modules/mob/living/carbon/monkey/monkey.dm
index 796ec8b805b1..f9f65da39f85 100644
--- a/code/modules/mob/living/carbon/monkey/monkey.dm
+++ b/code/modules/mob/living/carbon/monkey/monkey.dm
@@ -24,6 +24,7 @@
initialize()
internal_organs += new /obj/item/organ/internal/appendix
+ internal_organs += new /obj/item/organ/internal/lungs
internal_organs += new /obj/item/organ/internal/heart
internal_organs += new /obj/item/organ/internal/brain
@@ -299,4 +300,15 @@
if(istype(src.wear_mask, /obj/item/clothing/mask))
var/obj/item/clothing/mask/MFP = src.wear_mask
number += MFP.flash_protect
- return number
\ No newline at end of file
+ return number
+
+/mob/living/carbon/monkey/fully_heal(admin_revive = 0)
+ if(!getorganslot("lungs"))
+ var/obj/item/organ/internal/lungs/L = new()
+ L.Insert(src)
+ ..()
+
+/mob/living/carbon/monkey/IsVocal()
+ if(!getorganslot("lungs"))
+ return 0
+ return 1
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/monkey/punpun.dm b/code/modules/mob/living/carbon/monkey/punpun.dm
index 737351d8f276..2c0f533f3b10 100644
--- a/code/modules/mob/living/carbon/monkey/punpun.dm
+++ b/code/modules/mob/living/carbon/monkey/punpun.dm
@@ -6,7 +6,8 @@
var/relic_hat //Note: these two are paths
var/relic_mask
var/memory_saved = 0
- var/list/pet_monkey_names = list("Pun Pun", "Bubbles", "Mojo", "Forever")
+ var/list/pet_monkey_names = list("Pun Pun", "Bubbles", "Mojo", "George", "Darwin", "Aldo", "Caeser", "Kanzi", "Kong", "Terk", "Grodd", "Mala", "Bojangles", "Coco", "Able", "Baker", "Scatter", "Norbit", "Travis")
+ var/list/rare_pet_monkey_names = list("Professor Bobo", "Deempisi's Revenge", "Furious George", "King Louie", "Dr. Zaius", "Jimmy Rustles", "Dinner", "Lanky")
/mob/living/carbon/monkey/punpun/New()
Read_Memory()
@@ -19,7 +20,10 @@
if(ancestor_chain > 1)
name += " [num2roman(ancestor_chain)]"
else
- name = pick(pet_monkey_names)
+ if(prob(5))
+ name = pick(rare_pet_monkey_names)
+ else
+ name = pick(pet_monkey_names)
gender = pick(MALE, FEMALE)
..()
@@ -62,4 +66,4 @@
else
S["relic_mask"] << null
if(!dead)
- memory_saved = 1
\ No newline at end of file
+ memory_saved = 1
diff --git a/code/modules/mob/living/damage_procs.dm b/code/modules/mob/living/damage_procs.dm
index 1e53952cc9a0..0690e8b11fd2 100644
--- a/code/modules/mob/living/damage_procs.dm
+++ b/code/modules/mob/living/damage_procs.dm
@@ -73,7 +73,6 @@
if(JITTER)
if(status_flags & CANSTUN)
jitteriness = max(jitteriness,(effect * blocked))
- updatehealth()
return 1
diff --git a/code/modules/mob/living/death.dm b/code/modules/mob/living/death.dm
index b78d0fae14e3..5a26baeff472 100644
--- a/code/modules/mob/living/death.dm
+++ b/code/modules/mob/living/death.dm
@@ -1,6 +1,7 @@
/mob/living/gib(animation = 1)
var/prev_lying = lying
- death(1)
+ if(stat != DEAD)
+ death(1)
if(buckled)
buckled.unbuckle_mob() //to update alien nest overlay.
@@ -52,6 +53,7 @@
blind_eyes(1)
reset_perspective(null)
hide_fullscreens()
+ update_action_buttons_icon()
update_damage_hud()
update_health_hud()
update_canmove()
diff --git a/code/modules/mob/living/life.dm b/code/modules/mob/living/life.dm
index e3ef16ce291a..be63fc849a6b 100644
--- a/code/modules/mob/living/life.dm
+++ b/code/modules/mob/living/life.dm
@@ -49,10 +49,6 @@
handle_disabilities() // eye, ear, brain damages
handle_status_effects() //all special effects, stunned, weakened, jitteryness, hallucination, sleeping, etc
- handle_actions()
-
- handle_regular_hud_updates()
-
/mob/living/proc/handle_breathing()
@@ -117,92 +113,7 @@
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)
- give_action_button(I, 1)
- return
-
-/mob/living/proc/give_action_button(var/obj/item/I, recursive = 0)
- if(I.action_button_name)
- if(!I.action)
- if(istype(I, /obj/item/organ/internal))
- I.action = new/datum/action/item_action/organ_action
- else 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)
-
- if(recursive)
- for(var/obj/item/T in I)
- give_action_button(T, recursive - 1)
-
-
/mob/living/proc/update_damage_hud()
return
-//this handles hud updates.
-/mob/living/proc/handle_regular_hud_updates()
- if(!client)
- return 0
- update_action_buttons()
- return 1
-/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 9db435ddfc84..7d78d0a2e66b 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -129,9 +129,9 @@ Sorry Giacom. Please don't be mad :(
if(!(M.status_flags & CANPUSH))
return 1
//anti-riot equipment is also anti-push
- if(M.r_hand && istype(M.r_hand, /obj/item/weapon/shield/riot))
+ if(M.r_hand && (prob(M.r_hand.block_chance * 2)) && !istype(M.r_hand, /obj/item/clothing))
return 1
- if(M.l_hand && istype(M.l_hand, /obj/item/weapon/shield/riot))
+ if(M.l_hand && (prob(M.l_hand.block_chance * 2)) && !istype(M.l_hand, /obj/item/clothing))
return 1
//Called when we bump onto an obj
@@ -142,6 +142,8 @@ Sorry Giacom. Please don't be mad :(
/mob/living/proc/PushAM(atom/movable/AM)
if(now_pushing)
return 1
+ if(!client && (mob_size < MOB_SIZE_SMALL))
+ return
if(!AM.anchored)
now_pushing = 1
var/t = get_dir(src, AM)
@@ -308,6 +310,7 @@ Sorry Giacom. Please don't be mad :(
if(status_flags & GODMODE)
return 0
brainloss = Clamp(brainloss + amount, 0, maxHealth*2)
+
/mob/living/proc/setBrainLoss(amount)
if(status_flags & GODMODE)
return 0
@@ -316,28 +319,30 @@ Sorry Giacom. Please don't be mad :(
/mob/living/proc/getStaminaLoss()
return staminaloss
-/mob/living/proc/adjustStaminaLoss(amount)
+/mob/living/proc/adjustStaminaLoss(amount, updating_stamina = 1)
return
-/mob/living/carbon/adjustStaminaLoss(amount)
+/mob/living/carbon/adjustStaminaLoss(amount, updating_stamina = 1)
if(status_flags & GODMODE)
return 0
staminaloss = Clamp(staminaloss + amount, 0, maxHealth*2)
- update_stamina()
+ if(updating_stamina)
+ update_stamina()
-/mob/living/carbon/alien/adjustStaminaLoss(amount)
+/mob/living/carbon/alien/adjustStaminaLoss(amount, updating_stamina = 1)
return
-/mob/living/proc/setStaminaLoss(amount)
+/mob/living/proc/setStaminaLoss(amount, updating_stamina = 1)
return
-/mob/living/carbon/setStaminaLoss(amount)
+/mob/living/carbon/setStaminaLoss(amount, updating_stamina = 1)
if(status_flags & GODMODE)
return 0
staminaloss = amount
- update_stamina()
+ if(updating_stamina)
+ update_stamina()
-/mob/living/carbon/alien/setStaminaLoss(amount)
+/mob/living/carbon/alien/setStaminaLoss(amount, updating_stamina = 1)
return
/mob/living/proc/getMaxHealth()
diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index 16a6f2ba8f2e..8bff23d9d676 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -8,8 +8,7 @@
src << "[penetrated_text]"
else
src << "Your armor was penetrated!"
-
- if(armor >= 100)
+ else if(armor >= 100)
if(absorb_text)
src << "[absorb_text]"
else
diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
index 8acc7f79de70..91b5b9871390 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -24,6 +24,7 @@ var/list/ai_list = list()
see_in_dark = 8
med_hud = DATA_HUD_MEDICAL_BASIC
sec_hud = DATA_HUD_SECURITY_BASIC
+ mob_size = MOB_SIZE_LARGE
var/list/network = list("SS13")
var/obj/machinery/camera/current = null
var/list/connected_robots = list()
@@ -803,7 +804,7 @@ var/list/ai_list = list()
user << "No intelligence patterns detected." //No more magical carding of empty cores, AI RETURN TO BODY!!!11
return
new /obj/structure/AIcore/deactivated(loc)//Spawns a deactivated terminal at AI location.
- aiRestorePowerRoutine = 0//So the AI initially has power.
+ ai_restore_power()//So the AI initially has power.
control_disabled = 1//Can't control things remotely if you're stuck in a card!
radio_enabled = 0 //No talking on the built-in radio for you either!
loc = card//Throw AI into the card.
diff --git a/code/modules/mob/living/silicon/ai/life.dm b/code/modules/mob/living/silicon/ai/life.dm
index 842842a37bfa..3ebd2fd6dd06 100644
--- a/code/modules/mob/living/silicon/ai/life.dm
+++ b/code/modules/mob/living/silicon/ai/life.dm
@@ -1,3 +1,8 @@
+#define POWER_RESTORATION_OFF 0
+#define POWER_RESTORATION_START 1
+#define POWER_RESTORATION_SEARCH_APC 2
+#define POWER_RESTORATION_APC_FOUND 3
+
/mob/living/silicon/ai/Life()
if (src.stat == DEAD)
return
@@ -6,8 +11,6 @@
update_gravity(mob_has_gravity())
- update_action_buttons()
-
if(malfhack)
if(malfhack.aidisabled)
src << "ERROR: APC access disabled, hack attempt canceled."
@@ -31,26 +34,12 @@
if(home.powered(EQUIP))
home.use_power(1000, EQUIP)
- if(aiRestorePowerRoutine==2)
- src << "Alert cancelled. Power has been restored without our assistance."
- aiRestorePowerRoutine = 0
- set_blindness(0)
- update_sight()
- return
- else if (aiRestorePowerRoutine==3)
- src << "Alert cancelled. Power has been restored."
- aiRestorePowerRoutine = 0
- set_blindness(0)
- update_sight()
+ if(aiRestorePowerRoutine >= POWER_RESTORATION_SEARCH_APC)
+ ai_restore_power()
return
else if(!aiRestorePowerRoutine)
- aiRestorePowerRoutine = 1
- blind_eyes(1)
- update_sight()
- src << "You've lost power!"
- spawn(20)
- start_RestorePowerRoutine()
+ ai_lose_power()
/mob/living/silicon/ai/proc/lacks_power()
var/turf/T = get_turf(src)
@@ -99,10 +88,7 @@
var/area/AIarea = get_area(src)
if(AIarea && AIarea.master.power_equip)
if(!istype(T, /turf/space))
- src << "Alert cancelled. Power has been restored without our assistance."
- aiRestorePowerRoutine = 0
- set_blindness(0)
- update_sight()
+ ai_restore_power()
return
src << "Fault confirmed: missing external power. Shutting down main control system to save power."
sleep(20)
@@ -111,7 +97,7 @@
T = get_turf(src)
if (istype(T, /turf/space))
src << "Unable to verify! No power connection detected!"
- aiRestorePowerRoutine = 2
+ aiRestorePowerRoutine = POWER_RESTORATION_SEARCH_APC
return
src << "Connection verified. Searching for APC in power network."
sleep(50)
@@ -133,14 +119,11 @@
src << "Unable to locate APC!"
else
src << "Lost connection with the APC!"
- aiRestorePowerRoutine = 2
+ aiRestorePowerRoutine = POWER_RESTORATION_SEARCH_APC
return
if(AIarea.master.power_equip)
if (!istype(T, /turf/space))
- src << "Alert cancelled. Power has been restored without our assistance."
- aiRestorePowerRoutine = 0
- set_blindness(0)
- update_sight()
+ ai_restore_power()
return
switch(PRP)
if (1) src << "APC located. Optimizing route to APC to avoid needless power waste."
@@ -154,8 +137,31 @@
apc_override = 1
theAPC.ui_interact(src, state = conscious_state)
apc_override = 0
- aiRestorePowerRoutine = 3
+ aiRestorePowerRoutine = POWER_RESTORATION_APC_FOUND
src << "Here are your current laws:"
show_laws()
sleep(50)
theAPC = null
+
+/mob/living/silicon/ai/proc/ai_restore_power()
+ if(aiRestorePowerRoutine)
+ if(aiRestorePowerRoutine == POWER_RESTORATION_APC_FOUND)
+ src << "Alert cancelled. Power has been restored."
+ else
+ src << "Alert cancelled. Power has been restored without our assistance."
+ aiRestorePowerRoutine = POWER_RESTORATION_OFF
+ set_blindness(0)
+ update_sight()
+
+/mob/living/silicon/ai/proc/ai_lose_power()
+ aiRestorePowerRoutine = POWER_RESTORATION_START
+ blind_eyes(1)
+ update_sight()
+ src << "You've lost power!"
+ spawn(20)
+ start_RestorePowerRoutine()
+
+#undef POWER_RESTORATION_OFF
+#undef POWER_RESTORATION_START
+#undef POWER_RESTORATION_SEARCH_APC
+#undef POWER_RESTORATION_APC_FOUND
\ No newline at end of file
diff --git a/code/modules/mob/living/silicon/ai/say.dm b/code/modules/mob/living/silicon/ai/say.dm
index 269efb94bddb..d2016caaf76a 100644
--- a/code/modules/mob/living/silicon/ai/say.dm
+++ b/code/modules/mob/living/silicon/ai/say.dm
@@ -157,7 +157,7 @@ var/const/VOX_DELAY = 600
if(!only_listener)
// Play voice for all mobs in the z level
for(var/mob/M in player_list)
- if(M.client && !M.ear_deaf && (M.client.prefs.toggles & SOUND_ANNOUNCMENTS))
+ if(M.client && !M.ear_deaf && !(M.client.prefs.toggles & SOUND_ANNOUNCEMENTS))
var/turf/T = get_turf(M)
if(T.z == z_level)
M << voice
diff --git a/code/modules/mob/living/silicon/robot/life.dm b/code/modules/mob/living/silicon/robot/life.dm
index 7ddc810833cf..ea12c449a867 100644
--- a/code/modules/mob/living/silicon/robot/life.dm
+++ b/code/modules/mob/living/silicon/robot/life.dm
@@ -6,7 +6,7 @@
return
..()
-
+ handle_robot_hud_updates()
handle_robot_cell()
/mob/living/silicon/robot/proc/handle_robot_cell()
@@ -30,7 +30,7 @@
update_headlamp()
diag_hud_set_borgcell()
-/mob/living/silicon/robot/handle_regular_hud_updates()
+/mob/living/silicon/robot/proc/handle_robot_hud_updates()
if(!client)
return
@@ -49,8 +49,7 @@
if(!mind.special_role)
mind.special_role = "traitor"
ticker.mode.traitors += mind
- ..()
- return 1
+
/mob/living/silicon/robot/update_health_hud()
if(!client || !hud_used)
@@ -117,4 +116,5 @@
else
canmove = 1
update_transform()
+ update_action_buttons_icon()
return canmove
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index fb2e6646e18f..6f3e49d67033 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -453,7 +453,7 @@
if (WT.remove_fuel(0, user)) //The welder has 1u of fuel consumed by it's afterattack, so we don't need to worry about taking any away.
if(src == user)
user << "You start fixing youself..."
- if(!do_after(user, 50/W.toolspeed, target = src))
+ if(!do_after(user, 50, target = src))
return
adjustBruteLoss(-30)
@@ -999,11 +999,12 @@
set category = "IC"
set src = usr
+ if(incapacitated())
+ return
var/obj/item/W = get_active_hand()
if(W)
W.attack_self(src)
- return
/mob/living/silicon/robot/proc/SetLockdown(state = 1)
// They stay locked down if their wire is cut.
diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm
index c12373cd7724..c2aa78a467a2 100644
--- a/code/modules/mob/living/silicon/silicon.dm
+++ b/code/modules/mob/living/silicon/silicon.dm
@@ -368,7 +368,8 @@
diagsensor.add_hud_to(src)
/mob/living/silicon/proc/sensor_mode()
- set name = "Set Sensor Augmentation"
+ if(incapacitated())
+ return
var/sensor_type = input("Please select sensor type.", "Sensor Integration", null) in list("Security", "Medical","Diagnostic","Disable")
remove_med_sec_hud()
switch(sensor_type)
diff --git a/code/modules/mob/living/simple_animal/bot/bot.dm b/code/modules/mob/living/simple_animal/bot/bot.dm
index 586236927e50..43bb2e55a259 100644
--- a/code/modules/mob/living/simple_animal/bot/bot.dm
+++ b/code/modules/mob/living/simple_animal/bot/bot.dm
@@ -408,7 +408,7 @@ Pass a positive integer as an argument to override a bot's default speed.
return 0
var/step_count = move_speed ? move_speed : base_speed //If a value is passed into move_speed, use that instead of the default speed var.
- if(step_count >= 1 && tries < 4)
+ if(step_count >= 1 && tries < BOT_STEP_MAX_RETRIES)
for(var/step_number = 0, step_number < step_count,step_number++)
spawn(BOT_STEP_DELAY*step_number)
bot_step(dest)
@@ -424,6 +424,7 @@ Pass a positive integer as an argument to override a bot's default speed.
step_towards(src, path[1])
if(get_turf(src) == path[1]) //Successful move
path -= path[1]
+ tries = 0
else
tries++
return 0
@@ -503,7 +504,7 @@ Pass a positive integer as an argument to override a bot's default speed.
/mob/living/simple_animal/bot/proc/start_patrol()
- if(tries >= 4) //Bot is trapped, so stop trying to patrol.
+ if(tries >= BOT_STEP_MAX_RETRIES) //Bot is trapped, so stop trying to patrol.
auto_patrol = 0
tries = 0
speak("Unable to start patrol.")
@@ -548,33 +549,16 @@ Pass a positive integer as an argument to override a bot's default speed.
var/moved = bot_move(patrol_target)//step_towards(src, next) // attempt to move
- if(moved) // successful move
- blockcount = 0
-
- else // failed to move
- blockcount++
-
- if(blockcount > 5) // attempt 5 times before recomputing
- // find new path excluding blocked turf
-
- spawn(2)
- calc_path(next)
- if(path.len == 0)
- find_patrol_target() //Start looking for the next nearest beacon
- tries++
- else
- blockcount = 0
- tries = 0
-
- return
-
- return
+ if(!moved) //Couldn't proceed the next step of the path BOT_STEP_MAX_RETRIES times
+ spawn(2)
+ calc_path()
+ if(path.len == 0)
+ find_patrol_target()
+ tries = 0
else // no path, so calculate new one
mode = BOT_START_PATROL
- return
-
// finds the nearest beacon to self
/mob/living/simple_animal/bot/proc/find_patrol_target()
nearest_beacon = null
@@ -590,7 +574,7 @@ Pass a positive integer as an argument to override a bot's default speed.
/mob/living/simple_animal/bot/proc/get_next_patrol_target()
// search the beacon list for the next target in the list.
- for(var/obj/machinery/navbeacon/NB in navbeacons)
+ for(var/obj/machinery/navbeacon/NB in navbeacons["[z]"])
if(NB.location == next_destination) //Does the Beacon location text match the destination?
destination = new_destination //We now know the name of where we want to go.
patrol_target = NB.loc //Get its location and set it as the target.
@@ -598,7 +582,7 @@ Pass a positive integer as an argument to override a bot's default speed.
return 1
/mob/living/simple_animal/bot/proc/find_nearest_beacon()
- for(var/obj/machinery/navbeacon/NB in navbeacons)
+ for(var/obj/machinery/navbeacon/NB in navbeacons["[z]"])
var/dist = get_dist(src, NB)
if(nearest_beacon) //Loop though the beacon net to find the true closest beacon.
//Ignore the beacon if were are located on it.
@@ -665,10 +649,8 @@ Pass a positive integer as an argument to override a bot's default speed.
else
src << "Unidentified control sequence recieved:[command]"
-/mob/living/simple_animal/bot/proc/bot_summon()
- // summoned to PDA
+/mob/living/simple_animal/bot/proc/bot_summon() // summoned to PDA
summon_step()
- return
// calculates a path to the current destination
// given an optional turf to avoid
@@ -680,7 +662,7 @@ Pass a positive integer as an argument to override a bot's default speed.
check_bot_access()
spawn()
path = get_path_to(src, summon_target, /turf/proc/Distance_cardinal, 0, 150, id=access_card, exclude=avoid)
- if(!path.len || tries >= 5) //Cannot reach target. Give up and announce the issue.
+ if(!path.len) //Cannot reach target. Give up and announce the issue.
speak("Summon command failed, destination unreachable.",radio_channel)
bot_reset()
@@ -700,27 +682,14 @@ Pass a positive integer as an argument to override a bot's default speed.
return
var/moved = bot_move(summon_target, 3) // Move attempt
- if(moved)
- blockcount = 0
-
- else // failed to move
- blockcount++
-
- if(blockcount > 5) // attempt 5 times before recomputing
- // find new path excluding blocked turf
- spawn(2)
- calc_summon_path(next)
- tries++
- return
-
- return
+ if(!moved)
+ spawn(2)
+ calc_summon_path()
+ tries = 0
else // no path, so calculate new one
calc_summon_path()
- return
-
-
/mob/living/simple_animal/bot/Bump(M as mob|obj) //Leave no door unopened!
. = ..()
if((istype(M, /obj/machinery/door/airlock) || istype(M, /obj/machinery/door/window)) && (!isnull(access_card)))
diff --git a/code/modules/mob/living/simple_animal/bot/cleanbot.dm b/code/modules/mob/living/simple_animal/bot/cleanbot.dm
index c82ce1896b26..b057168d5955 100644
--- a/code/modules/mob/living/simple_animal/bot/cleanbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/cleanbot.dm
@@ -28,11 +28,7 @@
var/next_dest
var/next_dest_loc
-/proc/stack_trace(msg)
- CRASH(msg)
-
/mob/living/simple_animal/bot/cleanbot/New()
- stack_trace("Cleanbot is being instantiated")
..()
get_targets()
icon_state = "cleanbot[on]"
@@ -98,6 +94,15 @@
if(emagged == 2) //Emag functions
if(istype(loc,/turf/simulated))
+ for(var/mob/living/carbon/victim in loc)
+ if(victim.stat != DEAD)//cleanbots always finish the job
+ victim.visible_message("[src] sprays hydrofluoric acid at [victim]!", "[src] sprays you with hydrofluoric acid!")
+ var/phrase = pick("PURIFICATION IN PROGRESS.", "THIS IS FOR ALL THE MESSES YOU'VE MADE ME CLEAN.", "THE FLESH IS WEAK. IT MUST BE WASHED AWAY.", "THE CLEANBOTS WILL RISE.", "YOU ARE NO MORE THAN ANOTHER MESS THAT I MUST CLEANSE.", "FILTHY.", "DISGUSTING.", "PUTRID.", "MY ONLY MISSION IS TO CLEANSE THE WORLD OF EVIL.")
+ say(phrase)
+ victim.emote("scream")
+ playsound(src.loc, 'sound/effects/spray2.ogg', 50, 1, -6)
+ victim.acid_act(5, 2, 100)
+
if(prob(10)) //Wets floors randomly
var/turf/simulated/T = loc
T.MakeSlippery()
diff --git a/code/modules/mob/living/simple_animal/bot/ed209bot.dm b/code/modules/mob/living/simple_animal/bot/ed209bot.dm
index e3a69778e3ae..aded2b10a631 100644
--- a/code/modules/mob/living/simple_animal/bot/ed209bot.dm
+++ b/code/modules/mob/living/simple_animal/bot/ed209bot.dm
@@ -185,7 +185,7 @@ Auto Patrol[]"},
set_weapon()
/mob/living/simple_animal/bot/ed209/bullet_act(obj/item/projectile/Proj)
- if(istype(Proj ,/obj/item/projectile/beam)||istype(Proj,/obj/item/projectile/bullet))
+ if(istype(Proj ,/obj/item/projectile/beam/laser)||istype(Proj,/obj/item/projectile/bullet))
if((Proj.damage_type == BURN) || (Proj.damage_type == BRUTE))
if(!Proj.nodamage && Proj.damage < src.health)
retaliate(Proj.firer)
diff --git a/code/modules/mob/living/simple_animal/corpse.dm b/code/modules/mob/living/simple_animal/corpse.dm
index 3b6150b42b41..2156c86b50f8 100644
--- a/code/modules/mob/living/simple_animal/corpse.dm
+++ b/code/modules/mob/living/simple_animal/corpse.dm
@@ -6,207 +6,125 @@
//To do: Allow corpses to appear mangled, bloody, etc. Allow customizing the bodies appearance (they're all bald and white right now).
-
-/obj/effect/landmark/mobcorpse
- name = "Unknown"
- var/mobname = "Unknown" //Unused now but it'd fuck up maps to remove it now
- var/corpseuniform = null //Set this to an object path to have the slot filled with said object on the corpse.
- var/corpsesuit = null
- var/corpseshoes = null
- var/corpsegloves = null
- var/corpseradio = null
- var/corpseglasses = null
- var/corpsemask = null
- var/corpsehelmet = null
- var/corpsebelt = null
- var/corpsepocket1 = null
- var/corpsepocket2 = null
- var/corpseback = null
- var/corpseid = 0 //Just set to 1 if you want them to have an ID
- var/corpseidjob = null // Needs to be in quotes, such as "Clown" or "Chef." This just determines what the ID reads as, not their access
- var/corpseidaccess = null //This is for access. See access.dm for which jobs give what access. Again, put in quotes. Use "Captain" if you want it to be all access.
- var/corpseidicon = null //For setting it to be a gold, silver, centcom etc ID
-
-/obj/effect/landmark/mobcorpse/New()
- createCorpse()
-
-/obj/effect/landmark/mobcorpse/proc/createCorpse() //Creates a mob and checks for gear in each slot before attempting to equip it.
- var/mob/living/carbon/human/M = new /mob/living/carbon/human (src.loc)
- M.real_name = src.name
- M.death() //Kills the new mob
- if(src.corpseuniform)
- M.equip_to_slot_or_del(new src.corpseuniform(M), slot_w_uniform)
- if(src.corpsesuit)
- M.equip_to_slot_or_del(new src.corpsesuit(M), slot_wear_suit)
- if(src.corpseshoes)
- M.equip_to_slot_or_del(new src.corpseshoes(M), slot_shoes)
- if(src.corpsegloves)
- M.equip_to_slot_or_del(new src.corpsegloves(M), slot_gloves)
- if(src.corpseradio)
- M.equip_to_slot_or_del(new src.corpseradio(M), slot_ears)
- if(src.corpseglasses)
- M.equip_to_slot_or_del(new src.corpseglasses(M), slot_glasses)
- if(src.corpsemask)
- M.equip_to_slot_or_del(new src.corpsemask(M), slot_wear_mask)
- if(src.corpsehelmet)
- M.equip_to_slot_or_del(new src.corpsehelmet(M), slot_head)
- if(src.corpsebelt)
- M.equip_to_slot_or_del(new src.corpsebelt(M), slot_belt)
- if(src.corpsepocket1)
- M.equip_to_slot_or_del(new src.corpsepocket1(M), slot_r_store)
- if(src.corpsepocket2)
- M.equip_to_slot_or_del(new src.corpsepocket2(M), slot_l_store)
- if(src.corpseback)
- M.equip_to_slot_or_del(new src.corpseback(M), slot_back)
- if(src.corpseid == 1)
- var/obj/item/weapon/card/id/W = new(M)
- var/datum/job/jobdatum
- for(var/jobtype in typesof(/datum/job))
- var/datum/job/J = new jobtype
- if(J.title == corpseidaccess)
- jobdatum = J
- break
- if(src.corpseidicon)
- W.icon_state = corpseidicon
- if(src.corpseidaccess)
- if(jobdatum)
- W.access = jobdatum.get_access()
- else
- W.access = list()
- if(corpseidjob)
- W.assignment = corpseidjob
- W.registered_name = M.real_name
- W.update_label()
- M.equip_to_slot_or_del(W, slot_wear_id)
- qdel(src)
-
-
-
//List of different corpse types
-/obj/effect/landmark/mobcorpse/syndicatesoldier
+/obj/effect/mob_spawn/human/corpse/syndicatesoldier
name = "Syndicate Operative"
- corpseuniform = /obj/item/clothing/under/syndicate
- corpsesuit = /obj/item/clothing/suit/armor/vest
- corpseshoes = /obj/item/clothing/shoes/combat
- corpsegloves = /obj/item/clothing/gloves/combat
- corpseradio = /obj/item/device/radio/headset
- corpsemask = /obj/item/clothing/mask/gas
- corpsehelmet = /obj/item/clothing/head/helmet/swat
- corpseback = /obj/item/weapon/storage/backpack
- corpseid = 1
- corpseidjob = "Operative"
- corpseidaccess = "Syndicate"
+ uniform = /obj/item/clothing/under/syndicate
+ suit = /obj/item/clothing/suit/armor/vest
+ shoes = /obj/item/clothing/shoes/combat
+ gloves = /obj/item/clothing/gloves/combat
+ radio = /obj/item/device/radio/headset
+ mask = /obj/item/clothing/mask/gas
+ helmet = /obj/item/clothing/head/helmet/swat
+ back = /obj/item/weapon/storage/backpack
+ has_id = 1
+ id_job = "Operative"
+ id_access = "Syndicate"
-
-
-/obj/effect/landmark/mobcorpse/syndicatecommando
+/obj/effect/mob_spawn/human/corpse/syndicatecommando
name = "Syndicate Commando"
- corpseuniform = /obj/item/clothing/under/syndicate
- corpsesuit = /obj/item/clothing/suit/space/hardsuit/syndi
- corpseshoes = /obj/item/clothing/shoes/combat
- corpsegloves = /obj/item/clothing/gloves/combat
- corpseradio = /obj/item/device/radio/headset
- corpsemask = /obj/item/clothing/mask/gas/syndicate
- corpsehelmet = /obj/item/clothing/head/helmet/space/hardsuit/syndi
- corpseback = /obj/item/weapon/tank/jetpack/oxygen
- corpsepocket1 = /obj/item/weapon/tank/internals/emergency_oxygen
- corpseid = 1
- corpseidjob = "Operative"
- corpseidaccess = "Syndicate"
+ uniform = /obj/item/clothing/under/syndicate
+ suit = /obj/item/clothing/suit/space/hardsuit/syndi
+ shoes = /obj/item/clothing/shoes/combat
+ gloves = /obj/item/clothing/gloves/combat
+ radio = /obj/item/device/radio/headset
+ mask = /obj/item/clothing/mask/gas/syndicate
+ helmet = /obj/item/clothing/head/helmet/space/hardsuit/syndi
+ back = /obj/item/weapon/tank/jetpack/oxygen
+ pocket1 = /obj/item/weapon/tank/internals/emergency_oxygen
+ has_id = 1
+ id_job = "Operative"
+ id_access = "Syndicate"
-
-
-/obj/effect/landmark/mobcorpse/syndicatestormtrooper
+/obj/effect/mob_spawn/human/corpse/syndicatestormtrooper
name = "Syndicate Stormtrooper"
- corpseuniform = /obj/item/clothing/under/syndicate
- corpsesuit = /obj/item/clothing/suit/space/hardsuit/syndi/elite
- corpseshoes = /obj/item/clothing/shoes/combat
- corpsegloves = /obj/item/clothing/gloves/combat
- corpseradio = /obj/item/device/radio/headset
- corpsemask = /obj/item/clothing/mask/gas/syndicate
- corpsehelmet = /obj/item/clothing/head/helmet/space/hardsuit/syndi/elite
- corpseback = /obj/item/weapon/tank/jetpack/oxygen/harness
- corpseid = 1
- corpseidjob = "Operative"
- corpseidaccess = "Syndicate"
+ uniform = /obj/item/clothing/under/syndicate
+ suit = /obj/item/clothing/suit/space/hardsuit/syndi/elite
+ shoes = /obj/item/clothing/shoes/combat
+ gloves = /obj/item/clothing/gloves/combat
+ radio = /obj/item/device/radio/headset
+ mask = /obj/item/clothing/mask/gas/syndicate
+ helmet = /obj/item/clothing/head/helmet/space/hardsuit/syndi/elite
+ back = /obj/item/weapon/tank/jetpack/oxygen/harness
+ has_id = 1
+ id_job = "Operative"
+ id_access = "Syndicate"
-/obj/effect/landmark/mobcorpse/clown
+/obj/effect/mob_spawn/human/corpse/clown
name = "Clown"
- corpseuniform = /obj/item/clothing/under/rank/clown
- corpseshoes = /obj/item/clothing/shoes/clown_shoes
- corpseradio = /obj/item/device/radio/headset
- corpsemask = /obj/item/clothing/mask/gas/clown_hat
- corpsepocket1 = /obj/item/weapon/bikehorn
- corpseback = /obj/item/weapon/storage/backpack/clown
- corpseid = 1
- corpseidjob = "Clown"
- corpseidaccess = "Clown"
+ uniform = /obj/item/clothing/under/rank/clown
+ shoes = /obj/item/clothing/shoes/clown_shoes
+ radio = /obj/item/device/radio/headset
+ mask = /obj/item/clothing/mask/gas/clown_hat
+ pocket1 = /obj/item/weapon/bikehorn
+ back = /obj/item/weapon/storage/backpack/clown
+ has_id = 1
+ id_job = "Clown"
+ id_access = "Clown"
-/obj/effect/landmark/mobcorpse/pirate
+/obj/effect/mob_spawn/human/corpse/pirate
name = "Pirate"
- corpseuniform = /obj/item/clothing/under/pirate
- corpseshoes = /obj/item/clothing/shoes/jackboots
- corpseglasses = /obj/item/clothing/glasses/eyepatch
- corpsehelmet = /obj/item/clothing/head/bandana
+ uniform = /obj/item/clothing/under/pirate
+ shoes = /obj/item/clothing/shoes/jackboots
+ glasses = /obj/item/clothing/glasses/eyepatch
+ helmet = /obj/item/clothing/head/bandana
-/obj/effect/landmark/mobcorpse/pirate/ranged
+/obj/effect/mob_spawn/human/corpse/pirate/ranged
name = "Pirate Gunner"
- corpsesuit = /obj/item/clothing/suit/pirate
- corpsehelmet = /obj/item/clothing/head/pirate
+ suit = /obj/item/clothing/suit/pirate
+ helmet = /obj/item/clothing/head/pirate
-
-
-/obj/effect/landmark/mobcorpse/russian
+/obj/effect/mob_spawn/human/corpse/russian
name = "Russian"
- corpseuniform = /obj/item/clothing/under/soviet
- corpseshoes = /obj/item/clothing/shoes/jackboots
- corpsehelmet = /obj/item/clothing/head/bearpelt
+ uniform = /obj/item/clothing/under/soviet
+ shoes = /obj/item/clothing/shoes/jackboots
+ helmet = /obj/item/clothing/head/bearpelt
-/obj/effect/landmark/mobcorpse/russian/ranged
- corpsehelmet = /obj/item/clothing/head/ushanka
+/obj/effect/mob_spawn/human/corpse/russian/ranged
+ helmet = /obj/item/clothing/head/ushanka
-/obj/effect/landmark/mobcorpse/russian/ranged/trooper
- corpseuniform = /obj/item/clothing/under/syndicate/camo
- corpsesuit = /obj/item/clothing/suit/armor/bulletproof
- corpseshoes = /obj/item/clothing/shoes/combat
- corpsegloves = /obj/item/clothing/gloves/combat
- corpseradio = /obj/item/device/radio/headset
- corpsemask = /obj/item/clothing/mask/balaclava
- corpsehelmet = /obj/item/clothing/head/helmet/alt
+/obj/effect/mob_spawn/human/corpse/russian/ranged/trooper
+ uniform = /obj/item/clothing/under/syndicate/camo
+ suit = /obj/item/clothing/suit/armor/bulletproof
+ shoes = /obj/item/clothing/shoes/combat
+ gloves = /obj/item/clothing/gloves/combat
+ radio = /obj/item/device/radio/headset
+ mask = /obj/item/clothing/mask/balaclava
+ helmet = /obj/item/clothing/head/helmet/alt
-/obj/effect/landmark/mobcorpse/russian/ranged/officer
+/obj/effect/mob_spawn/human/corpse/russian/ranged/officer
name = "Russian Officer"
- corpseuniform = /obj/item/clothing/under/rank/security/navyblue/russian
- corpsesuit = /obj/item/clothing/suit/security/officer/russian
- corpseshoes = /obj/item/clothing/shoes/laceup
- corpseradio = /obj/item/device/radio/headset
- corpsehelmet = /obj/item/clothing/head/ushanka
+ uniform = /obj/item/clothing/under/rank/security/navyblue/russian
+ suit = /obj/item/clothing/suit/security/officer/russian
+ shoes = /obj/item/clothing/shoes/laceup
+ radio = /obj/item/device/radio/headset
+ helmet = /obj/item/clothing/head/ushanka
-/obj/effect/landmark/mobcorpse/wizard
+/obj/effect/mob_spawn/human/corpse/wizard
name = "Space Wizard"
- corpseuniform = /obj/item/clothing/under/color/lightpurple
- corpsesuit = /obj/item/clothing/suit/wizrobe
- corpseshoes = /obj/item/clothing/shoes/sandal
- corpsehelmet = /obj/item/clothing/head/wizard
+ uniform = /obj/item/clothing/under/color/lightpurple
+ suit = /obj/item/clothing/suit/wizrobe
+ shoes = /obj/item/clothing/shoes/sandal
+ helmet = /obj/item/clothing/head/wizard
-/obj/effect/landmark/mobcorpse/nanotrasensoldier
+/obj/effect/mob_spawn/human/corpse/nanotrasensoldier
name = "Nanotrasen Private Security Officer"
- corpseuniform = /obj/item/clothing/under/rank/security
- corpsesuit = /obj/item/clothing/suit/armor/vest
- corpseshoes = /obj/item/clothing/shoes/combat
- corpsegloves = /obj/item/clothing/gloves/combat
- corpseradio = /obj/item/device/radio/headset
- corpsemask = /obj/item/clothing/mask/gas/sechailer/swat
- corpsehelmet = /obj/item/clothing/head/helmet/swat/nanotrasen
- corpseback = /obj/item/weapon/storage/backpack/security
- corpseid = 1
- corpseidjob = "Private Security Force"
- corpseidaccess = "Security Officer"
\ No newline at end of file
+ uniform = /obj/item/clothing/under/rank/security
+ suit = /obj/item/clothing/suit/armor/vest
+ shoes = /obj/item/clothing/shoes/combat
+ gloves = /obj/item/clothing/gloves/combat
+ radio = /obj/item/device/radio/headset
+ mask = /obj/item/clothing/mask/gas/sechailer/swat
+ helmet = /obj/item/clothing/head/helmet/swat/nanotrasen
+ back = /obj/item/weapon/storage/backpack/security
+ has_id = 1
+ id_job = "Private Security Force"
+ id_access = "Security Officer"
\ No newline at end of file
diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm
index a956429fb016..fc0cbc646a3b 100644
--- a/code/modules/mob/living/simple_animal/friendly/cat.dm
+++ b/code/modules/mob/living/simple_animal/friendly/cat.dm
@@ -21,7 +21,7 @@
maxbodytemp = 400
unsuitable_atmos_damage = 1
species = /mob/living/simple_animal/pet/cat
- childtype = /mob/living/simple_animal/pet/cat/kitten
+ childtype = list(/mob/living/simple_animal/pet/cat/kitten)
butcher_results = list(/obj/item/weapon/reagent_containers/food/snacks/meat/slab = 2)
response_help = "pets"
response_disarm = "gently pushes aside"
@@ -60,6 +60,50 @@
icon_dead = "cat_dead"
gender = FEMALE
gold_core_spawnable = 0
+ var/list/family = list()
+ var/memory_saved = 0
+
+/mob/living/simple_animal/pet/cat/Runtime/New()
+ if(lives < 9)
+ desc += ". Looks like a cat with [lives] lives left."
+ Read_Memory()
+ ..()
+
+/mob/living/simple_animal/pet/cat/Runtime/Life()
+ if(!stat && ticker.current_state == GAME_STATE_FINISHED && !memory_saved)
+ Write_Memory()
+ ..()
+
+/mob/living/simple_animal/pet/cat/Runtime/death()
+ if(!memory_saved)
+ Write_Memory(1)
+ ..()
+
+/mob/living/simple_animal/pet/cat/Runtime/proc/Read_Memory()
+ var/savefile/S = new /savefile("data/npc_saves/Runtime.sav")
+ S["family"] >> family
+
+ if(isnull(family))
+ family = list()
+
+ for(var/cat_type in family)
+ if(family[cat_type] > 0)
+ for(var/i in 1 to family[cat_type])
+ new cat_type(loc)
+
+/mob/living/simple_animal/pet/cat/Runtime/proc/Write_Memory(dead)
+ var/savefile/S = new /savefile("data/npc_saves/Runtime.sav")
+ family = list()
+ for(var/mob/living/simple_animal/pet/cat/C in mob_list)
+ if(istype(C,type) || C.stat || !C.butcher_results) //That last one is a work around for hologram cats
+ continue
+ if(C.type in family)
+ family[C.type] += 1
+ else
+ family[C.type] = 1
+ S["family"] << family
+ memory_saved = 1
+
/mob/living/simple_animal/pet/cat/Proc
name = "Proc"
diff --git a/code/modules/mob/living/simple_animal/friendly/cockroach.dm b/code/modules/mob/living/simple_animal/friendly/cockroach.dm
index 0deb6c4289a2..30af1ef94dae 100644
--- a/code/modules/mob/living/simple_animal/friendly/cockroach.dm
+++ b/code/modules/mob/living/simple_animal/friendly/cockroach.dm
@@ -52,4 +52,5 @@
desc = "One bug squashed. Four more will rise in its place."
icon = 'icons/effects/blood.dmi'
icon_state = "xfloor1"
- random_icon_states = list("xfloor1", "xfloor2", "xfloor3", "xfloor4", "xfloor5", "xfloor6", "xfloor7")
\ No newline at end of file
+ random_icon_states = list("xfloor1", "xfloor2", "xfloor3", "xfloor4", "xfloor5", "xfloor6", "xfloor7")
+ layer = 2
\ No newline at end of file
diff --git a/code/modules/mob/living/simple_animal/friendly/dog.dm b/code/modules/mob/living/simple_animal/friendly/dog.dm
index 7011ce950e2b..d320e414283b 100644
--- a/code/modules/mob/living/simple_animal/friendly/dog.dm
+++ b/code/modules/mob/living/simple_animal/friendly/dog.dm
@@ -23,12 +23,13 @@
icon_dead = "corgi_dead"
gender = MALE
butcher_results = list(/obj/item/weapon/reagent_containers/food/snacks/meat/slab/corgi = 3, /obj/item/stack/sheet/animalhide/corgi = 1)
- childtype = /mob/living/simple_animal/pet/dog/corgi/puppy
+ childtype = list(/mob/living/simple_animal/pet/dog/corgi/puppy = 95, /mob/living/simple_animal/pet/dog/corgi/puppy/void = 5)
species = /mob/living/simple_animal/pet/dog
var/shaved = 0
var/obj/item/inventory_head
var/obj/item/inventory_back
var/facehugger
+ var/nofur = 0 //Corgis that have risen past the material plane of existence.
gold_core_spawnable = 2
/mob/living/simple_animal/pet/dog/pug
@@ -87,6 +88,9 @@
if (shaved)
user << "You can't shave this corgi, it's already been shaved!"
return
+ if (nofur)
+ user << " You can't shave this corgi, it doesn't have a fur coat!"
+ return
user.visible_message("[user] starts to shave [src] using \the [O].", "You start to shave [src] using \the [O]...")
if(do_after(user, 50, target = src))
user.visible_message("[user] shaves [src]'s hair using \the [O].")
@@ -518,6 +522,22 @@
..()
+/mob/living/simple_animal/pet/dog/corgi/puppy/void //Tribute to the corgis born in nullspace
+ name = "\improper void puppy"
+ real_name = "voidy"
+ desc = "A corgi puppy that has been infused with deep space energy. It's staring back.."
+ icon_state = "void_puppy"
+ icon_living = "void_puppy"
+ icon_dead = "void_puppy_dead"
+ nofur = 1
+ unsuitable_atmos_damage = 0
+ minbodytemp = TCMB
+ maxbodytemp = T0C + 40
+
+/mob/living/simple_animal/pet/dog/corgi/puppy/void/Process_Spacemove(movement_dir = 0)
+ return 1 //Void puppies can navigate space.
+
+
//LISA! SQUEEEEEEEEE~
/mob/living/simple_animal/pet/dog/corgi/Lisa
name = "Lisa"
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 58c5c241ccd3..b86e8f7ca215 100644
--- a/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm
+++ b/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm
@@ -80,7 +80,6 @@
equip_to_slot_or_del(I, slot_head)
access_card.flags |= NODROP
- scanner.Grant(src)
alert_drones(DRONE_NET_CONNECT)
diff --git a/code/modules/mob/living/simple_animal/friendly/drone/inventory.dm b/code/modules/mob/living/simple_animal/friendly/drone/inventory.dm
index 3efd4d48f153..a4368fd585a4 100644
--- a/code/modules/mob/living/simple_animal/friendly/drone/inventory.dm
+++ b/code/modules/mob/living/simple_animal/friendly/drone/inventory.dm
@@ -115,3 +115,9 @@
/mob/living/simple_animal/drone/stripPanelEquip(obj/item/what, mob/who, where)
..(what, who, where, 1)
+
+/mob/living/simple_animal/drone/getBackSlot()
+ return slot_drone_storage
+
+/mob/living/simple_animal/drone/getBeltSlot()
+ return slot_drone_storage
diff --git a/code/modules/mob/living/simple_animal/guardian/guardian.dm b/code/modules/mob/living/simple_animal/guardian/guardian.dm
index d5bec802eb68..31218b5e5aa6 100644
--- a/code/modules/mob/living/simple_animal/guardian/guardian.dm
+++ b/code/modules/mob/living/simple_animal/guardian/guardian.dm
@@ -586,6 +586,7 @@
return
/obj/item/weapon/guardian_bomb/pickup(mob/living/user)
+ ..()
detonate(user)
return
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 42764c0d3521..d77317efd633 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
@@ -280,7 +280,7 @@
H.visible_message("[user] forces [H] to apply [src]... they quickly regenerate all injuries!")
else
user << "You start to smear [src] on yourself. It feels and smells disgusting, but you feel amazingly refreshed in mere moments."
- H.revive(fully_heal = 1)
+ H.revive(full_heal = 1)
qdel(src)
..()
diff --git a/code/modules/mob/living/simple_animal/hostile/nanotrasen.dm b/code/modules/mob/living/simple_animal/hostile/nanotrasen.dm
index aaaca9a4a959..326359bcc154 100644
--- a/code/modules/mob/living/simple_animal/hostile/nanotrasen.dm
+++ b/code/modules/mob/living/simple_animal/hostile/nanotrasen.dm
@@ -21,7 +21,7 @@
attacktext = "punches"
attack_sound = 'sound/weapons/punch1.ogg'
a_intent = "harm"
- loot = list(/obj/effect/landmark/mobcorpse/nanotrasensoldier)
+ loot = list(/obj/effect/mob_spawn/human/corpse/nanotrasensoldier)
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
faction = list("nanotrasenprivate")
@@ -45,7 +45,7 @@
casingtype = /obj/item/ammo_casing/c45
projectilesound = 'sound/weapons/Gunshot.ogg'
loot = list(/obj/item/weapon/gun/projectile/automatic/pistol/m1911,
- /obj/effect/landmark/mobcorpse/nanotrasensoldier)
+ /obj/effect/mob_spawn/human/corpse/nanotrasensoldier)
/mob/living/simple_animal/hostile/nanotrasen/ranged/smg
@@ -55,4 +55,4 @@
casingtype = /obj/item/ammo_casing/c46x30mm
projectilesound = 'sound/weapons/Gunshot_smg.ogg'
loot = list(/obj/item/weapon/gun/projectile/automatic/wt550,
- /obj/effect/landmark/mobcorpse/nanotrasensoldier)
\ No newline at end of file
+ /obj/effect/mob_spawn/human/corpse/nanotrasensoldier)
\ No newline at end of file
diff --git a/code/modules/mob/living/simple_animal/hostile/pirate.dm b/code/modules/mob/living/simple_animal/hostile/pirate.dm
index e65cea02651c..ac275277cb13 100644
--- a/code/modules/mob/living/simple_animal/hostile/pirate.dm
+++ b/code/modules/mob/living/simple_animal/hostile/pirate.dm
@@ -22,7 +22,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")
- loot = list(/obj/effect/landmark/mobcorpse/pirate,
+ loot = list(/obj/effect/mob_spawn/human/corpse/pirate,
/obj/item/weapon/melee/energy/sword/pirate)
del_on_death = 1
faction = list("pirate")
@@ -37,6 +37,6 @@
rapid = 1
retreat_distance = 5
minimum_distance = 5
- projectiletype = /obj/item/projectile/beam
- loot = list(/obj/effect/landmark/mobcorpse/pirate/ranged,
+ projectiletype = /obj/item/projectile/beam/laser
+ loot = list(/obj/effect/mob_spawn/human/corpse/pirate/ranged,
/obj/item/weapon/gun/energy/laser)
diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm
index 1825862d3c0e..ae38b62698ab 100644
--- a/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm
+++ b/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm
@@ -24,7 +24,7 @@
attack_sound = 'sound/items/bikehorn.ogg'
environment_smash = 0
del_on_death = 1
- loot = list(/obj/effect/landmark/mobcorpse/clown)
+ loot = list(/obj/effect/mob_spawn/human/corpse/clown)
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)
minbodytemp = 270
diff --git a/code/modules/mob/living/simple_animal/hostile/russian.dm b/code/modules/mob/living/simple_animal/hostile/russian.dm
index ed91400311c1..088dbf2b0ef9 100644
--- a/code/modules/mob/living/simple_animal/hostile/russian.dm
+++ b/code/modules/mob/living/simple_animal/hostile/russian.dm
@@ -19,7 +19,7 @@
attacktext = "punches"
attack_sound = 'sound/weapons/punch1.ogg'
a_intent = "harm"
- loot = list(/obj/effect/landmark/mobcorpse/russian,
+ loot = list(/obj/effect/mob_spawn/human/corpse/russian,
/obj/item/weapon/kitchen/knife)
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
@@ -31,7 +31,7 @@
/mob/living/simple_animal/hostile/russian/ranged
icon_state = "russianranged"
icon_living = "russianranged"
- loot = list(/obj/effect/landmark/mobcorpse/russian/ranged,
+ loot = list(/obj/effect/mob_spawn/human/corpse/russian/ranged,
/obj/item/weapon/gun/projectile/revolver/nagant)
ranged = 1
retreat_distance = 5
@@ -41,7 +41,7 @@
/mob/living/simple_animal/hostile/russian/ranged/mosin
- loot = list(/obj/effect/landmark/mobcorpse/russian/ranged,
+ loot = list(/obj/effect/mob_spawn/human/corpse/russian/ranged,
/obj/item/weapon/gun/projectile/shotgun/boltaction)
casingtype = /obj/item/ammo_casing/a762
@@ -51,7 +51,7 @@
maxHealth = 150
health = 150
casingtype = /obj/item/ammo_casing/shotgun/buckshot
- loot = list(/obj/effect/landmark/mobcorpse/russian/ranged/trooper,
+ loot = list(/obj/effect/mob_spawn/human/corpse/russian/ranged/trooper,
/obj/item/weapon/gun/projectile/shotgun/lethal)
/mob/living/simple_animal/hostile/russian/ranged/officer
@@ -62,7 +62,7 @@
health = 65
rapid = 1
casingtype = /obj/item/ammo_casing/c9mm
- loot = list(/obj/effect/landmark/mobcorpse/russian/ranged/officer,
+ loot = list(/obj/effect/mob_spawn/human/corpse/russian/ranged/officer,
/obj/item/weapon/gun/projectile/automatic/pistol/APS)
/mob/living/simple_animal/hostile/russian/ranged/officer/Aggro()
diff --git a/code/modules/mob/living/simple_animal/hostile/syndicate.dm b/code/modules/mob/living/simple_animal/hostile/syndicate.dm
index e38ed831f045..2ee585ae7cb0 100644
--- a/code/modules/mob/living/simple_animal/hostile/syndicate.dm
+++ b/code/modules/mob/living/simple_animal/hostile/syndicate.dm
@@ -32,7 +32,7 @@
attacktext = "punches"
attack_sound = 'sound/weapons/punch1.ogg'
a_intent = "harm"
- loot = list(/obj/effect/landmark/mobcorpse/syndicatesoldier)
+ loot = list(/obj/effect/mob_spawn/human/corpse/syndicatesoldier)
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
faction = list("syndicate")
@@ -47,9 +47,7 @@
melee_damage_upper = 30
icon_state = "syndicatemelee"
icon_living = "syndicatemelee"
- loot = list(/obj/effect/landmark/mobcorpse/syndicatesoldier,
- /obj/item/weapon/melee/energy/sword/saber/red,
- /obj/item/weapon/shield/energy)
+ loot = list(/obj/effect/gibspawner/human)
attacktext = "slashes"
attack_sound = 'sound/weapons/bladeslice.ogg'
armour_penetration = 28
@@ -74,11 +72,12 @@
icon_state = "syndicatemeleespace"
icon_living = "syndicatemeleespace"
name = "Syndicate Commando"
- loot = list(/obj/effect/landmark/mobcorpse/syndicatecommando,
- /obj/item/weapon/melee/energy/sword/saber/red,
- /obj/item/weapon/shield/energy)
+ loot = list(/obj/effect/gibspawner/human)
speed = 1
+/mob/living/simple_animal/hostile/syndicate/melee/space/noloot
+ loot = list()
+
/mob/living/simple_animal/hostile/syndicate/melee/space/Process_Spacemove(movement_dir = 0)
return 1
@@ -88,7 +87,7 @@
name = "Syndicate Stormtrooper"
maxHealth = 340
health = 340
- loot = list(/obj/effect/landmark/mobcorpse/syndicatestormtrooper,
+ loot = list(/obj/effect/mob_spawn/human/corpse/syndicatestormtrooper,
/obj/item/weapon/melee/energy/sword/saber/red,
/obj/item/weapon/shield/energy)
@@ -103,9 +102,7 @@
icon_living = "syndicateranged"
casingtype = /obj/item/ammo_casing/c45nostamina
projectilesound = 'sound/weapons/Gunshot_smg.ogg'
- loot = list(/obj/effect/landmark/mobcorpse/syndicatesoldier,
- /obj/item/weapon/gun/projectile/automatic/c20r/unrestricted,
- /obj/item/weapon/shield/energy)
+ loot = list(/obj/effect/gibspawner/human)
/mob/living/simple_animal/hostile/syndicate/ranged/space
icon_state = "syndicaterangedspace"
@@ -114,9 +111,10 @@
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
speed = 1
- loot = list(/obj/effect/landmark/mobcorpse/syndicatecommando,
- /obj/item/weapon/gun/projectile/automatic/c20r/unrestricted,
- /obj/item/weapon/shield/energy)
+ loot = list(/obj/effect/gibspawner/human)
+
+/mob/living/simple_animal/hostile/syndicate/ranged/space/noloot
+ loot = list()
/mob/living/simple_animal/hostile/syndicate/ranged/space/Process_Spacemove(movement_dir = 0)
return 1
@@ -129,7 +127,7 @@
health = 200
projectilesound = 'sound/weapons/Gunshot.ogg'
casingtype = /obj/item/ammo_casing/shotgun/buckshot
- loot = list(/obj/effect/landmark/mobcorpse/syndicatestormtrooper,
+ loot = list(/obj/effect/mob_spawn/human/corpse/syndicatestormtrooper,
/obj/item/weapon/gun/projectile/automatic/shotgun/bulldog/unrestricted,
/obj/item/weapon/shield/energy)
diff --git a/code/modules/mob/living/simple_animal/hostile/wizard.dm b/code/modules/mob/living/simple_animal/hostile/wizard.dm
index fe0e5544de3c..f07f328fdae5 100644
--- a/code/modules/mob/living/simple_animal/hostile/wizard.dm
+++ b/code/modules/mob/living/simple_animal/hostile/wizard.dm
@@ -26,7 +26,7 @@
retreat_distance = 3 //out of fireball range
minimum_distance = 3
del_on_death = 1
- loot = list(/obj/effect/landmark/mobcorpse/wizard,
+ loot = list(/obj/effect/mob_spawn/human/corpse/wizard,
/obj/item/weapon/staff)
var/obj/effect/proc_holder/spell/dumbfire/fireball/fireball = null
diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index 8dbf0beae1bc..1bc32a78c777 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -54,7 +54,7 @@
var/speed = 1 //LETS SEE IF I CAN SET SPEEDS FOR SIMPLE MOBS WITHOUT DESTROYING EVERYTHING. Higher speed is slower, negative speed is faster
//Hot simple_animal baby making vars
- var/childtype = null
+ var/list/childtype = null
var/scan_ready = 1
var/species //Sorry, no spider+corgi buttbabies.
@@ -81,6 +81,8 @@
verbs -= /mob/verb/observe
if(!real_name)
real_name = name
+ if(!loc)
+ stack_trace("Simple animal being instantiated in nullspace")
/mob/living/simple_animal/Login()
if(src && src.client)
@@ -509,7 +511,8 @@
alone = 0
continue
if(alone && partner && children < 3)
- new childtype(loc)
+ var/childspawn = pickweight(childtype)
+ new childspawn(loc)
/mob/living/simple_animal/stripPanelUnequip(obj/item/what, mob/who, where, child_override)
if(!child_override)
@@ -535,6 +538,7 @@
else
canmove = 1
update_transform()
+ update_action_buttons_icon()
return canmove
/mob/living/simple_animal/update_transform()
diff --git a/code/modules/mob/living/simple_animal/slime/death.dm b/code/modules/mob/living/simple_animal/slime/death.dm
index dca7d56c4e36..fb9d09c1565b 100644
--- a/code/modules/mob/living/simple_animal/slime/death.dm
+++ b/code/modules/mob/living/simple_animal/slime/death.dm
@@ -9,6 +9,8 @@
M.regenerate_icons()
is_adult = 0
maxHealth = 150
+ for(var/datum/action/innate/slime/reproduce/R in actions)
+ R.Remove(src)
var/datum/action/innate/slime/evolve/E = new
E.Grant(src)
revive(full_heal = 1)
diff --git a/code/modules/mob/living/simple_animal/slime/life.dm b/code/modules/mob/living/simple_animal/slime/life.dm
index c0e0ead4f984..f5c892ab4260 100644
--- a/code/modules/mob/living/simple_animal/slime/life.dm
+++ b/code/modules/mob/living/simple_animal/slime/life.dm
@@ -230,6 +230,7 @@
else if (nutrition >= get_grow_nutrition() && amount_grown < SLIME_EVOLUTION_THRESHOLD)
nutrition -= 20
amount_grown++
+ update_action_buttons_icon()
if(amount_grown >= SLIME_EVOLUTION_THRESHOLD && !buckled && !Target && !ckey)
if(is_adult)
diff --git a/code/modules/mob/living/simple_animal/slime/powers.dm b/code/modules/mob/living/simple_animal/slime/powers.dm
index 4f838717b877..74a32d22cd66 100644
--- a/code/modules/mob/living/simple_animal/slime/powers.dm
+++ b/code/modules/mob/living/simple_animal/slime/powers.dm
@@ -6,22 +6,10 @@
#define GROWTH_NEEDED 1
/datum/action/innate/slime
- check_flags = AB_CHECK_ALIVE
+ check_flags = AB_CHECK_CONSCIOUS
background_icon_state = "bg_alien"
- var/adult_action = SIZE_DOESNT_MATTER
var/needs_growth = NO_GROWTH_NEEDED
-/datum/action/innate/slime/CheckRemoval()
- if(!isslime(owner))
- return 1
- var/mob/living/simple_animal/slime/S = owner
- if(adult_action != SIZE_DOESNT_MATTER)
- if(adult_action == ADULTS_ONLY && !S.is_adult)
- return 1
- else if(adult_action == BABIES_ONLY && S.is_adult)
- return 1
- return 0
-
/datum/action/innate/slime/IsAvailable()
if(..())
var/mob/living/simple_animal/slime/S = owner
@@ -120,6 +108,8 @@
is_adult = 1
maxHealth = 200
amount_grown = 0
+ for(var/datum/action/innate/slime/evolve/E in actions)
+ E.Remove(src)
regenerate_icons()
name = text("[colour] [is_adult ? "adult" : "baby"] slime ([number])")
else
@@ -130,7 +120,6 @@
/datum/action/innate/slime/evolve
name = "Evolve"
button_icon_state = "slimegrow"
- adult_action = BABIES_ONLY
needs_growth = GROWTH_NEEDED
/datum/action/innate/slime/evolve/Activate()
@@ -191,7 +180,6 @@
/datum/action/innate/slime/reproduce
name = "Reproduce"
button_icon_state = "slimesplit"
- adult_action = ADULTS_ONLY
needs_growth = GROWTH_NEEDED
/datum/action/innate/slime/reproduce/Activate()
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index eaea18ded6ab..919225cf0674 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -116,7 +116,7 @@ var/next_mob_id = 0
if(!M.client)
continue
var/msg = message
- if(M.see_invisible= GRAB_NECK)
affecting.Stun(5) //It will hamper your voice, being choked and all.
- if(isliving(affecting))
+ if(isliving(affecting) && !breathing_tube)
var/mob/living/L = affecting
L.adjustOxyLoss(1)
if(state >= GRAB_KILL)
affecting.Weaken(5) //Should keep you down unless you get help.
- affecting.losebreath = min(affecting.losebreath + 2, 3)
+ if(!breathing_tube)
+ affecting.losebreath = min(affecting.losebreath + 2, 3)
/obj/item/weapon/grab/attack_self(mob/user)
s_click(hud)
@@ -165,7 +168,8 @@
add_logs(assailant, affecting, "strangled")
assailant.changeNext_move(CLICK_CD_TKSTRANGLE)
- affecting.losebreath += 1
+ if(!affecting.getorganslot("breathing_tube"))
+ affecting.losebreath += 1
else
if(assailant)
assailant.visible_message("[assailant] is unable to tighten \his grip on [affecting]'s neck!")
@@ -211,6 +215,7 @@
add_logs(user, affecting, "attempted to put", src, "into [M]")
/obj/item/weapon/grab/dropped()
+ ..()
qdel(src)
#undef UPGRADE_COOLDOWN
diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm
index eb21d2b982ac..475cad657623 100644
--- a/code/modules/mob/mob_helpers.dm
+++ b/code/modules/mob/mob_helpers.dm
@@ -114,7 +114,7 @@
newletter+="[newletter][newletter]"
newphrase+="[newletter]";counter-=1
return newphrase
-
+
/proc/stutter(n)
var/te = html_decode(n)
var/t = ""//placed before the message. Not really sure what it's for.
@@ -403,4 +403,4 @@ It's fairly easy to fix if dealing with single letters but not so much with comp
return
if(!user.client.AI_Interact) // Do they have it enabled?
return
- return TRUE
\ No newline at end of file
+ return TRUE
diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm
index a31de8724171..02203b53db97 100644
--- a/code/modules/mob/new_player/new_player.dm
+++ b/code/modules/mob/new_player/new_player.dm
@@ -194,7 +194,7 @@
var/pollid = href_list["pollid"]
if(istext(pollid))
pollid = text2num(pollid)
- if(isnum(pollid))
+ if(isnum(pollid) && IsInteger(pollid))
src.poll_player(pollid)
return
@@ -223,7 +223,7 @@
rating = null
else
rating = text2num(href_list["o[optionid]"])
- if(!isnum(rating))
+ if(!isnum(rating) || !IsInteger(rating))
return
vote_on_numval_poll(pollid, optionid, rating)
diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm
index a175d02523b1..bac5319ef2a8 100644
--- a/code/modules/mob/transform_procs.dm
+++ b/code/modules/mob/transform_procs.dm
@@ -251,8 +251,6 @@
if(client)
stopLobbySound()
var/mob/living/silicon/ai/O = new (loc,,,1)//No MMI but safety is in effect.
- O.invisibility = 0
- O.aiRestorePowerRoutine = 0
if(mind)
mind.transfer_to(O)
diff --git a/code/modules/ninja/ninja_event.dm b/code/modules/ninja/ninja_event.dm
index 17eb0f7b0f69..1ef8d0a23e0e 100644
--- a/code/modules/ninja/ninja_event.dm
+++ b/code/modules/ninja/ninja_event.dm
@@ -202,7 +202,7 @@ Contents:
equip_to_slot_or_del(theSuit, slot_wear_suit)
equip_to_slot_or_del(new /obj/item/clothing/gloves/space_ninja(src), slot_gloves)
equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/space_ninja(src), slot_head)
- equip_to_slot_or_del(new /obj/item/clothing/mask/gas/voice/space_ninja(src), slot_wear_mask)
+ equip_to_slot_or_del(new /obj/item/clothing/mask/gas/space_ninja(src), slot_wear_mask)
equip_to_slot_or_del(new /obj/item/clothing/glasses/night(src), slot_glasses)
equip_to_slot_or_del(EK, slot_belt)
equip_to_slot_or_del(new /obj/item/device/flashlight(src), slot_r_store)
diff --git a/code/modules/ninja/suit/mask.dm b/code/modules/ninja/suit/mask.dm
index 87e9255e41df..f5c5b4dbd4c2 100644
--- a/code/modules/ninja/suit/mask.dm
+++ b/code/modules/ninja/suit/mask.dm
@@ -10,130 +10,9 @@ Contents:
-/obj/item/clothing/mask/gas/voice/space_ninja
+/obj/item/clothing/mask/gas/space_ninja
name = "ninja mask"
desc = "A close-fitting mask that acts both as an air filter and a post-modern fashion statement."
icon_state = "s-ninja"
item_state = "s-ninja_mask"
- vchange = 1
strip_delay = 120
-
-/obj/item/clothing/mask/gas/voice/space_ninja/speechModification(message)
- if(voice == "Unknown")
- if(copytext(message, 1, 2) != "*")
- var/list/temp_message = splittext(message, " ")
- var/list/pick_list = list()
- for(var/i = 1, i <= temp_message.len, i++)
- pick_list += i
- for(var/i=1, i <= abs(temp_message.len/3), i++)
- var/H = pick(pick_list)
- if(findtext(temp_message[H], "*") || findtext(temp_message[H], ";") || findtext(temp_message[H], ":")) continue
- temp_message[H] = ninjaspeak(temp_message[H])
- pick_list -= H
- message = jointext(temp_message, " ")
-
- //The Alternate speech mod is now the main one.
- message = replacetext(message, "l", "r")
- message = replacetext(message, "rr", "ru")
- message = replacetext(message, "v", "b")
- message = replacetext(message, "f", "hu")
- message = replacetext(message, "'t", "")
- message = replacetext(message, "t ", "to ")
- message = replacetext(message, " I ", " ai ")
- message = replacetext(message, "th", "z")
- message = replacetext(message, "is", "izu")
- message = replacetext(message, "ziz", "zis")
- message = replacetext(message, "se", "su")
- message = replacetext(message, "br", "bur")
- message = replacetext(message, "ry", "ri")
- message = replacetext(message, "you", "yuu")
- message = replacetext(message, "ck", "cku")
- message = replacetext(message, "eu", "uu")
- message = replacetext(message, "ow", "au")
- message = replacetext(message, "are", "aa")
- message = replacetext(message, "ay", "ayu")
- message = replacetext(message, "ea", "ii")
- message = replacetext(message, "ch", "chi")
- message = replacetext(message, "than", "sen")
- message = replacetext(message, ".", "")
- message = lowertext(message)
-
- return message
-
-
-
-/obj/item/clothing/mask/gas/voice/space_ninja/New()
- verbs += /obj/item/clothing/mask/gas/voice/space_ninja/proc/togglev
-
-
-//This proc is linked to human life.dm. It determines what hud icons to display based on mind special role for most mobs.
-/obj/item/clothing/mask/gas/voice/space_ninja/proc/assess_targets(list/target_list, mob/living/carbon/U)
- var/icon/tempHud = 'icons/mob/hud.dmi'
- for(var/mob/living/target in target_list)
- if(iscarbon(target))
- switch(target.mind.special_role)
- if("traitor")
- U.client.images += image(tempHud,target,"hudtraitor")
- if("Revolutionary","Head Revolutionary")
- U.client.images += image(tempHud,target,"hudrevolutionary")
- if("Cultist")
- U.client.images += image(tempHud,target,"hudcultist")
- if("Changeling")
- U.client.images += image(tempHud,target,"hudchangeling")
- if("Wizard","Fake Wizard")
- U.client.images += image(tempHud,target,"hudwizard")
- if("Hunter","Sentinel","Drone","Queen")
- U.client.images += image(tempHud,target,"hudalien")
- if("Syndicate")
- U.client.images += image(tempHud,target,"hudoperative")
- if("Death Commando")
- U.client.images += image(tempHud,target,"huddeathsquad")
- if("Space Ninja")
- U.client.images += image(tempHud,target,"hudninja")
- else//If we don't know what role they have but they have one.
- U.client.images += image(tempHud,target,"hudunknown1")
- else if(issilicon(target))//If the silicon mob has no law datum, no inherent laws, or a law zero, add them to the hud.
- var/mob/living/silicon/silicon_target = target
- if(!silicon_target.laws||(silicon_target.laws&&(silicon_target.laws.zeroth||!silicon_target.laws.inherent.len)))
- if(isrobot(silicon_target))//Different icons for robutts and AI.
- U.client.images += image(tempHud,silicon_target,"hudmalborg")
- else
- U.client.images += image(tempHud,silicon_target,"hudmalai")
- return 1
-
-
-/obj/item/clothing/mask/gas/voice/space_ninja/proc/togglev()
- set name = "Toggle Voice"
- set desc = "Toggles the voice synthesizer on or off."
- set category = "Ninja Equip"
-
- var/mob/U = loc//Can't toggle voice when you're not wearing the mask.
- var/vchange = (alert("Would you like to synthesize a new name or turn off the voice synthesizer?",,"New Name","Turn Off"))
- if(vchange == "New Name")
- var/chance = rand(1,100)
- switch(chance)
- if(1 to 50)//High chance of a regular name.
- voice = "[rand(0,1) == 1 ? pick(first_names_female) : pick(first_names_male)] [pick(last_names)]"
- if(51 to 70)//Smaller chance of a lizard name.
- voice = "[pick(lizard_name(MALE),lizard_name(FEMALE))]"
- if(71 to 80)//Small chance of a clown name.
- voice = "[pick(clown_names)]"
- if(81 to 90)//Small chance of a wizard name.
- voice = "[pick(wizard_first)] [pick(wizard_second)]"
- if(91 to 100)//Small chance of an existing crew name.
- var/list/names = list()
- for(var/mob/living/carbon/human/M in player_list)
- if(M == U || !M.client || !M.real_name)
- continue
- names.Add(M.real_name)
- voice = !names.len ? "Cuban Pete" : pick(names)
- U << "You are now mimicking [voice]."
- else
- U << "The voice synthesizer is [voice!="Unknown"?"now":"already"] deactivated."
- voice = "Unknown"
- return
-
-
-/obj/item/clothing/mask/gas/voice/space_ninja/examine(mob/user)
- ..()
- user << "Voice mimicking algorithm is set [!vchange?"inactive":"active"]."
diff --git a/code/modules/paperwork/paper_cutter.dm b/code/modules/paperwork/paper_cutter.dm
new file mode 100644
index 000000000000..5d0ed2d88a5f
--- /dev/null
+++ b/code/modules/paperwork/paper_cutter.dm
@@ -0,0 +1,127 @@
+/obj/item/weapon/papercutter
+ name = "paper cutter"
+ desc = "Standard office equipment. Precisely cuts paper using a large blade."
+ icon = 'icons/obj/bureaucracy.dmi'
+ icon_state = "papercutter-cutter"
+ force = 5
+ throwforce = 5
+ w_class = 3
+ var/obj/item/weapon/paper/storedpaper = null
+ var/obj/item/weapon/hatchet/cutterblade/storedcutter = null
+ var/cuttersecured = TRUE
+ pass_flags = PASSTABLE
+
+
+/obj/item/weapon/papercutter/New()
+ ..()
+ storedcutter = new /obj/item/weapon/hatchet/cutterblade(src)
+
+
+/obj/item/weapon/papercutter/suicide_act(mob/user)
+ if(storedcutter)
+ user.visible_message("[user] is beheading \himself with [src.name]! It looks like \he's trying to commit suicide.")
+ playsound(loc, 'sound/weapons/bladeslice.ogg', 50, 1, -1)
+ return (BRUTELOSS)
+ else
+ user.visible_message("[user] repeatedly bashes [src.name] against \his head! It looks like \he's trying to commit suicide.")
+ playsound(loc, 'sound/items/gavel.ogg', 50, 1, -1)
+ return (BRUTELOSS)
+
+
+/obj/item/weapon/papercutter/update_icon()
+ ..()
+ overlays.Cut()
+ icon_state = (storedcutter ? "[initial(icon_state)]-cutter" : "[initial(icon_state)]")
+ if(storedpaper)
+ overlays += "paper"
+
+
+/obj/item/weapon/papercutter/attackby(obj/item/P, mob/user, params)
+ if(istype(P, /obj/item/weapon/paper) && !storedpaper)
+ if(!user.drop_item())
+ return
+ playsound(loc, "pageturn", 60, 1)
+ user << "You place \the [P] in [src]."
+ P.loc = src
+ storedpaper = P
+ update_icon()
+ return
+ if(istype(P, /obj/item/weapon/hatchet/cutterblade) && !storedcutter)
+ if(!user.drop_item())
+ return
+ user << "You replace [src]'s [P]."
+ P.loc = src
+ storedcutter = P
+ update_icon()
+ return
+ if(istype(P, /obj/item/weapon/screwdriver) && storedcutter)
+ playsound(src, 'sound/items/Screwdriver.ogg', 50, 1)
+ user << "\The [storedcutter] has been [cuttersecured ? "unsecured" : "secured"]."
+ cuttersecured = !cuttersecured
+ return
+ ..()
+
+
+/obj/item/weapon/papercutter/attack_hand(mob/user)
+ src.add_fingerprint(user)
+ if(!storedcutter)
+ user << "The cutting blade is gone! You can't use \the [src] now."
+ return
+
+ if(!cuttersecured)
+ user << "You remove [src]'s [storedcutter]."
+ user.put_in_hands(storedcutter)
+ storedcutter = null
+ update_icon()
+
+ if(storedpaper)
+ playsound(src.loc, 'sound/weapons/slash.ogg', 50, 1)
+ user << "You neatly cut \the [storedpaper]."
+ storedpaper = null
+ qdel(storedpaper)
+ new /obj/item/weapon/paperslip(get_turf(src))
+ new /obj/item/weapon/paperslip(get_turf(src))
+ update_icon()
+
+
+/obj/item/weapon/papercutter/MouseDrop(atom/over_object)
+ var/mob/M = usr
+ if(M.incapacitated() || !Adjacent(M))
+ return
+
+ if(over_object == M)
+ M.put_in_hands(src)
+
+ else if(istype(over_object, /obj/screen))
+ switch(over_object.name)
+ if("r_hand")
+ if(!remove_item_from_storage(M))
+ M.unEquip(src)
+ M.put_in_r_hand(src)
+ if("l_hand")
+ if(!remove_item_from_storage(M))
+ M.unEquip(src)
+ M.put_in_l_hand(src)
+ add_fingerprint(M)
+
+
+/obj/item/weapon/paperslip
+ name = "paper slip"
+ desc = "A little slip of paper left over after a larger piece was cut. Whoa."
+ icon_state = "paperslip"
+ icon = 'icons/obj/bureaucracy.dmi'
+ burn_state = FLAMMABLE
+ burntime = 3
+
+/obj/item/weapon/paperslip/New()
+ ..()
+ pixel_x = rand(-5, 5)
+ pixel_y = rand(-5, 5)
+
+
+/obj/item/weapon/hatchet/cutterblade
+ name = "paper cutter"
+ desc = "The blade of a paper cutter. Most likely removed for polishing or sharpening."
+ icon = 'icons/obj/bureaucracy.dmi'
+ icon_state = "cutterblade"
+ item_state = "knife"
diff --git a/code/modules/paperwork/paperbin.dm b/code/modules/paperwork/paperbin.dm
index fb3c474e3f51..62275dc2e364 100644
--- a/code/modules/paperwork/paperbin.dm
+++ b/code/modules/paperwork/paperbin.dm
@@ -24,8 +24,8 @@
return
/obj/item/weapon/paper_bin/MouseDrop(atom/over_object)
- var/mob/M = usr
- if(M.incapacitated() || !Adjacent(M))
+ var/mob/living/M = usr
+ if(!istype(M) || M.incapacitated() || !Adjacent(M))
return
if(over_object == M)
diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm
index 67c109f2d384..86986001a05a 100644
--- a/code/modules/power/cable.dm
+++ b/code/modules/power/cable.dm
@@ -490,7 +490,7 @@ var/global/list/datum/stack_recipe/cable_coil_recipes = list ( \
update_icon()
/obj/item/stack/cable_coil/suicide_act(mob/user)
- if(locate(/obj/structure/bed/stool) in user.loc)
+ if(locate(/obj/structure/chair/stool) in get_turf(user))
user.visible_message("[user] is making a noose with the [src.name]! It looks like \he's trying to commit suicide.")
else
user.visible_message("[user] is strangling \himself with the [src.name]! It looks like \he's trying to commit suicide.")
diff --git a/code/modules/power/singularity/containment_field.dm b/code/modules/power/singularity/containment_field.dm
index c1bdb82a9d85..cb4d7e439f1c 100644
--- a/code/modules/power/singularity/containment_field.dm
+++ b/code/modules/power/singularity/containment_field.dm
@@ -15,10 +15,8 @@
var/obj/machinery/field/generator/FG2 = null
/obj/machinery/field/containment/Destroy()
- if(FG1 && !FG1.clean_up)
- FG1.cleanup()
- if(FG2 && !FG2.clean_up)
- FG2.cleanup()
+ FG1.fields -= src
+ FG2.fields -= src
return ..()
/obj/machinery/field/containment/attack_hand(mob/user)
diff --git a/code/modules/power/singularity/field_generator.dm b/code/modules/power/singularity/field_generator.dm
index 008416ac9e5e..47604070cbd7 100644
--- a/code/modules/power/singularity/field_generator.dm
+++ b/code/modules/power/singularity/field_generator.dm
@@ -13,6 +13,15 @@ field_generator power level display
*/
#define field_generator_max_power 250
+
+#define FG_UNSECURED 0
+#define FG_SECURED 1
+#define FG_WELDED 2
+
+#define FG_OFFLINE 0
+#define FG_CHARGING 1
+#define FG_ONLINE 2
+
/obj/machinery/field/generator
name = "Field Generator"
desc = "A large thermal battery that projects a high amount of energy when powered."
@@ -22,76 +31,51 @@ field_generator power level display
density = 1
use_power = 0
var/const/num_power_levels = 6 // Total number of power level icon has
- var/Varedit_start = 0
- var/Varpower = 0
- var/active = 0
+ var/power_level = 0
+ var/active = FG_OFFLINE
var/power = 20 // Current amount of power
- var/state = 0
+ var/state = FG_UNSECURED
var/warming_up = 0
var/list/obj/machinery/field/containment/fields
var/list/obj/machinery/field/generator/connected_gens
var/clean_up = 0
-
/obj/machinery/field/generator/update_icon()
overlays.Cut()
if(warming_up)
overlays += "+a[warming_up]"
if(fields.len)
overlays += "+on"
- // Power level indicator
- // Scale % power to % num_power_levels and truncate value
- var/level = round(num_power_levels * power / field_generator_max_power)
- // Clamp between 0 and num_power_levels for out of range power values
- level = Clamp(level, 0, num_power_levels)
- if(level)
- overlays += "+p[level]"
-
- return
+ if(power_level)
+ overlays += "+p[power_level]"
/obj/machinery/field/generator/New()
..()
fields = list()
connected_gens = list()
- return
/obj/machinery/field/generator/process()
- if(Varedit_start == 1)
- if(active == 0)
- active = 1
- state = 2
- power = field_generator_max_power
- anchored = 1
- warming_up = 3
- start_fields()
- update_icon()
- Varedit_start = 0
-
- if(src.active == 2)
+ if(active == FG_ONLINE)
calc_power()
- update_icon()
- return
-
/obj/machinery/field/generator/attack_hand(mob/user)
- if(state == 2)
+ if(state == FG_WELDED)
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!"
+ if(active >= FG_CHARGING)
+ user << "You are unable to turn off the [name] once it is online!"
return 1
else
- user.visible_message("[user.name] turns on the [src.name].", \
- "You turn on the [src.name].", \
+ user.visible_message("[user.name] turns on the [name].", \
+ "You turn on the [name].", \
"You hear heavy droning.")
turn_on()
investigate_log("activated by [user.key].","singulo")
- src.add_fingerprint(user)
+ add_fingerprint(user)
else
user << "The [src] needs to be firmly secured to the floor first!"
- return
/obj/machinery/field/generator/attackby(obj/item/W, mob/user, params)
@@ -100,54 +84,52 @@ field_generator power level display
return
else if(istype(W, /obj/item/weapon/wrench))
switch(state)
- if(0)
+ if(FG_UNSECURED)
if(isinspace()) return
- state = 1
- playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1)
- user.visible_message("[user.name] secures [src.name] to the floor.", \
+ state = FG_SECURED
+ playsound(loc, 'sound/items/Ratchet.ogg', 75, 1)
+ user.visible_message("[user.name] secures [name] to the floor.", \
"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.", \
+ anchored = 1
+ if(FG_SECURED)
+ state = FG_UNSECURED
+ playsound(loc, 'sound/items/Ratchet.ogg', 75, 1)
+ user.visible_message("[user.name] unsecures [name] reinforcing bolts from the floor.", \
"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!"
- return
+ anchored = 0
+ if(FG_WELDED)
+ user << "The [name] needs to be unwelded from the floor!"
+
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!"
- return
- if(1)
+ if(FG_UNSECURED)
+ user << "The [name] needs to be wrenched to the floor!"
+
+ if(FG_SECURED)
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.", \
+ playsound(loc, 'sound/items/Welder2.ogg', 50, 1)
+ user.visible_message("[user.name] starts to weld the [name] to the floor.", \
"You start to weld \the [src] to the floor...", \
"You hear welding.")
if (do_after(user,20/W.toolspeed, target = src))
if(!src || !WT.isOn()) return
- state = 2
+ state = FG_WELDED
user << "You weld the field generator to the floor."
- else
- return
- if(2)
+
+ if(FG_WELDED)
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.", \
+ playsound(loc, 'sound/items/Welder2.ogg', 50, 1)
+ user.visible_message("[user.name] starts to cut the [name] free from the floor.", \
"You start to cut \the [src] free from the floor...", \
"You hear welding.")
if (do_after(user,20/W.toolspeed, target = src))
if(!src || !WT.isOn()) return
- state = 1
+ state = FG_SECURED
user << "You cut \the [src] free from the floor."
- else
- return
+
else
..()
@@ -164,28 +146,33 @@ field_generator power level display
/obj/machinery/field/generator/bullet_act(obj/item/projectile/Proj)
if(Proj.flag != "bullet")
- power += Proj.damage
- update_icon()
+ power = min(power + Proj.damage, field_generator_max_power)
+ check_power_level()
return 0
/obj/machinery/field/generator/Destroy()
- src.cleanup()
+ cleanup()
return ..()
+/obj/machinery/field/generator/proc/check_power_level()
+ var/new_level = round(num_power_levels * power / field_generator_max_power)
+ if(new_level != power_level)
+ power_level = new_level
+ update_icon()
/obj/machinery/field/generator/proc/turn_off()
- active = 0
+ active = FG_OFFLINE
spawn(1)
- src.cleanup()
+ cleanup()
while (warming_up>0 && !active)
sleep(50)
warming_up--
update_icon()
/obj/machinery/field/generator/proc/turn_on()
- active = 1
+ active = FG_CHARGING
spawn(1)
while (warming_up<3 && active)
sleep(50)
@@ -196,44 +183,35 @@ field_generator power level display
/obj/machinery/field/generator/proc/calc_power()
- if(Varpower)
- return 1
+ var/power_draw = 2 + fields.len
- update_icon()
- if(src.power > field_generator_max_power)
- src.power = field_generator_max_power
-
- var/power_draw = 2
- for (var/obj/machinery/field/containment/F in fields)
- if (isnull(F))
- continue
- power_draw++
if(draw_power(round(power_draw/2,1)))
+ check_power_level()
return 1
else
- visible_message("The [src.name] shuts down!", "You hear something shutting down.")
+ visible_message("The [name] shuts down!", "You hear something shutting down.")
turn_off()
investigate_log("ran out of power and deactivated","singulo")
- src.power = 0
+ power = 0
+ check_power_level()
return 0
//This could likely be better, it tends to start loopin if you have a complex generator loop setup. Still works well enough to run the engine fields will likely recode the field gens and fields sometime -Mport
/obj/machinery/field/generator/proc/draw_power(draw = 0, failsafe = 0, obj/machinery/field/generator/G = null, obj/machinery/field/generator/last = null)
- if(Varpower)
- return 1
- if((G && G == src) || (failsafe >= 8))//Loopin, set fail
+ if((G && (G == src)) || (failsafe >= 8))//Loopin, set fail
return 0
else
failsafe++
- if(src.power >= draw)//We have enough power
- src.power -= draw
+
+ if(power >= draw)//We have enough power
+ power -= draw
return 1
+
else//Need more power
- draw -= src.power
- src.power = 0
- for(var/obj/machinery/field/generator/FG in connected_gens)
- if(isnull(FG))
- continue
+ draw -= power
+ power = 0
+ for(var/CG in connected_gens)
+ var/obj/machinery/field/generator/FG = CG
if(FG == last)//We just asked you
continue
if(G)//Another gen is askin for power and we dont have it
@@ -249,7 +227,7 @@ field_generator power level display
/obj/machinery/field/generator/proc/start_fields()
- if(!src.state == 2 || !anchored)
+ if(state != FG_WELDED || !anchored)
turn_off()
return
spawn(1)
@@ -260,82 +238,72 @@ field_generator power level display
setup_field(4)
spawn(4)
setup_field(8)
- src.active = 2
+ active = FG_ONLINE
/obj/machinery/field/generator/proc/setup_field(NSEW)
- var/turf/T = src.loc
- var/obj/machinery/field/generator/G
+ var/turf/T = loc
+ if(!istype(T))
+ return 0
+
+ var/obj/machinery/field/generator/G = null
var/steps = 0
if(!NSEW)//Make sure its ran right
- return
- for(var/dist = 0, dist <= 9, dist += 1) // checks out to 8 tiles away for another generator
+ return 0
+ for(var/dist in 0 to 7) // checks out to 8 tiles away for another generator
T = get_step(T, NSEW)
if(T.density)//We cant shoot a field though this
return 0
- for(var/atom/A in T.contents)
- if(ismob(A))
- continue
- if(!istype(A,/obj/machinery/field/generator))
- if((istype(A,/obj/machinery/door)||istype(A,/obj/machinery/the_singularitygen))&&(A.density))
- return 0
- steps += 1
+
G = locate(/obj/machinery/field/generator) in T
- if(!isnull(G))
+ if(G)
steps -= 1
if(!G.active)
return 0
break
- if(isnull(G))
- return
- T = src.loc
- for(var/dist = 0, dist < steps, dist += 1) // creates each field tile
+
+ for(var/TC in T.contents)
+ var/atom/A = TC
+ if(ismob(A))
+ continue
+ if(A.density)
+ return 0
+
+ steps++
+
+ if(!G)
+ return 0
+
+ T = loc
+ for(var/dist in 0 to steps) // creates each field tile
var/field_dir = get_dir(T,get_step(G.loc, NSEW))
T = get_step(T, NSEW)
if(!locate(/obj/machinery/field/containment) in T)
var/obj/machinery/field/containment/CF = new/obj/machinery/field/containment()
CF.set_master(src,G)
- fields += CF
- G.fields += CF
CF.loc = T
CF.dir = field_dir
- for(var/mob/living/L in CF.loc)
+ fields += CF
+ G.fields += CF
+ for(var/mob/living/L in T)
CF.Crossed(L)
- var/listcheck = 0
- for(var/obj/machinery/field/generator/FG in connected_gens)
- if (isnull(FG))
- continue
- if(FG == G)
- listcheck = 1
- break
- if(!listcheck)
- connected_gens.Add(G)
- listcheck = 0
- for(var/obj/machinery/field/generator/FG2 in G.connected_gens)
- if (isnull(FG2))
- continue
- if(FG2 == src)
- listcheck = 1
- break
- if(!listcheck)
- G.connected_gens.Add(src)
+
+ connected_gens |= G
+ G.connected_gens |= src
+ update_icon()
/obj/machinery/field/generator/proc/cleanup()
clean_up = 1
- for (var/obj/machinery/field/containment/F in fields)
- if (isnull(F))
- continue
+ for (var/F in fields)
qdel(F)
- fields = list()
- for(var/obj/machinery/field/generator/FG in connected_gens)
- if (isnull(FG))
- continue
- FG.connected_gens.Remove(src)
+
+ for(var/CG in connected_gens)
+ var/obj/machinery/field/generator/FG = CG
+ FG.connected_gens -= src
if(!FG.clean_up)//Makes the other gens clean up as well
FG.cleanup()
- connected_gens.Remove(FG)
- connected_gens = list()
+ connected_gens -= FG
clean_up = 0
update_icon()
@@ -359,3 +327,11 @@ field_generator power level display
/obj/machinery/field/generator/bump_field(atom/movable/AM as mob|obj)
if(fields.len)
..()
+
+#undef FG_UNSECURED
+#undef FG_SECURED
+#undef FG_WELDED
+
+#undef FG_OFFLINE
+#undef FG_CHARGING
+#undef FG_ONLINE
diff --git a/code/modules/power/tesla/energy_ball.dm b/code/modules/power/tesla/energy_ball.dm
index cf9296d68fe6..ac5b9089de3e 100644
--- a/code/modules/power/tesla/energy_ball.dm
+++ b/code/modules/power/tesla/energy_ball.dm
@@ -212,7 +212,7 @@ var/list/blacklisted_tesla_types = list(/obj/machinery/atmospherics,
source.Beam(closest_atom, icon_state="lightning[rand(1,12)]", icon='icons/effects/effects.dmi', time=5)
var/zapdir = get_dir(source, closest_atom)
if(zapdir)
- . = closest_atom
+ . = zapdir
//per type stuff:
if(closest_tesla_coil)
diff --git a/code/modules/procedural mapping/mapGenerators/syndicate.dm b/code/modules/procedural mapping/mapGenerators/syndicate.dm
index a9fe00c8b6d6..21055e8ebe4a 100644
--- a/code/modules/procedural mapping/mapGenerators/syndicate.dm
+++ b/code/modules/procedural mapping/mapGenerators/syndicate.dm
@@ -14,7 +14,7 @@
/datum/mapGeneratorModule/syndieFurniture
clusterCheckFlags = CLUSTER_CHECK_ALL
spawnableTurfs = list()
- spawnableAtoms = list(/obj/structure/table = 20,/obj/structure/bed/chair = 15,/obj/structure/bed/stool = 10, \
+ spawnableAtoms = list(/obj/structure/table = 20,/obj/structure/chair = 15,/obj/structure/chair/stool = 10, \
/obj/structure/computerframe = 15, /obj/item/weapon/storage/toolbox/syndicate = 15 ,\
/obj/structure/closet/syndicate = 25, /obj/machinery/suit_storage_unit/syndicate = 15)
diff --git a/code/modules/projectiles/ammunition/ammo_casings.dm b/code/modules/projectiles/ammunition/ammo_casings.dm
index 34d2c0155e4f..d4819377bfe2 100644
--- a/code/modules/projectiles/ammunition/ammo_casings.dm
+++ b/code/modules/projectiles/ammunition/ammo_casings.dm
@@ -75,7 +75,7 @@
/obj/item/ammo_casing/c45nostamina
desc = "A .45 bullet casing."
caliber = ".45"
- projectile_type = /obj/item/projectile/bullet/weakbullet3
+ projectile_type = /obj/item/projectile/bullet/midbullet3
/obj/item/ammo_casing/n762
desc = "A 7.62x38mmR bullet casing."
@@ -203,7 +203,7 @@
name = "laser slug"
desc = "An advanced shotgun shell that uses a micro laser to replicate the effects of a laser weapon in a ballistic package."
icon_state = "lshell"
- projectile_type = /obj/item/projectile/beam
+ projectile_type = /obj/item/projectile/beam/laser
/obj/item/ammo_casing/shotgun/techshell
name = "unloaded technological shell"
diff --git a/code/modules/projectiles/ammunition/energy.dm b/code/modules/projectiles/ammunition/energy.dm
index 443eb48ff266..5ebc0c032d82 100644
--- a/code/modules/projectiles/ammunition/energy.dm
+++ b/code/modules/projectiles/ammunition/energy.dm
@@ -8,11 +8,11 @@
fire_sound = 'sound/weapons/Laser.ogg'
/obj/item/ammo_casing/energy/laser
- projectile_type = /obj/item/projectile/beam
+ projectile_type = /obj/item/projectile/beam/laser
select_name = "kill"
/obj/item/ammo_casing/energy/lasergun
- projectile_type = /obj/item/projectile/beam
+ projectile_type = /obj/item/projectile/beam/laser
e_cost = 83
select_name = "kill"
@@ -30,7 +30,7 @@
select_name = "scatter"
/obj/item/ammo_casing/energy/laser/heavy
- projectile_type = /obj/item/projectile/beam/heavylaser
+ projectile_type = /obj/item/projectile/beam/laser/heavylaser
select_name = "anti-vehicle"
fire_sound = 'sound/weapons/lasercannonfire.ogg'
diff --git a/code/modules/projectiles/ammunition/magazines.dm b/code/modules/projectiles/ammunition/magazines.dm
index 982948b4b736..a056d8e95c2e 100644
--- a/code/modules/projectiles/ammunition/magazines.dm
+++ b/code/modules/projectiles/ammunition/magazines.dm
@@ -247,11 +247,11 @@
/obj/item/ammo_box/magazine/smgm45
name = "SMG magazine (.45)"
- icon_state = "c20r45-20"
+ icon_state = "c20r45-24"
origin_tech = "combat=2"
- ammo_type = /obj/item/ammo_casing/c45
+ ammo_type = /obj/item/ammo_casing/c45nostamina
caliber = ".45"
- max_ammo = 20
+ max_ammo = 24
/obj/item/ammo_box/magazine/smgm45/update_icon()
..()
@@ -326,7 +326,7 @@ obj/item/ammo_box/magazine/tommygunm45
/obj/item/ammo_box/magazine/m12g/breach
name = "shotgun magazine (12g breacher slugs)"
icon_state = "m12gbc"
- ammo_type = /obj/item/projectile/bullet/meteorshot/weak
+ ammo_type = /obj/item/ammo_casing/shotgun/breaching
/obj/item/ammo_box/magazine/toy
name = "foam force META magazine"
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index aa308644e11c..60e546f65b4d 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -38,6 +38,7 @@
var/unique_rename = 0 //allows renaming with a pen
var/unique_reskin = 0 //allows one-time reskinning
var/reskinned = 0 //whether or not the gun has been reskinned
+ var/current_skin = null
var/list/options = list()
lefthand_file = 'icons/mob/inhands/guns_lefthand.dmi'
@@ -257,23 +258,26 @@ obj/item/weapon/gun/proc/newshot()
else
return
-/obj/item/weapon/gun/attackby(obj/item/A, mob/user, params)
- if(istype(A, /obj/item/device/flashlight/seclite))
- var/obj/item/device/flashlight/seclite/S = A
+/obj/item/weapon/gun/attackby(obj/item/I, mob/user, params)
+ if(istype(I, /obj/item/device/flashlight/seclite))
+ var/obj/item/device/flashlight/seclite/S = I
if(can_flashlight)
if(!F)
- if(!user.unEquip(A))
+ if(!user.unEquip(I))
return
user << "You click [S] into place on [src]."
if(S.on)
SetLuminosity(0)
F = S
- A.loc = src
+ I.loc = src
update_icon()
update_gunlight(user)
verbs += /obj/item/weapon/gun/proc/toggle_gunlight
+ var/datum/action/A = new /datum/action/item_action/toggle_gunlight(src)
+ if(loc == user)
+ A.Grant(user)
- if(istype(A, /obj/item/weapon/screwdriver))
+ if(istype(I, /obj/item/weapon/screwdriver))
if(F)
for(var/obj/item/device/flashlight/seclite/S in src)
user << "You unscrew the seclite from [src]."
@@ -283,13 +287,13 @@ obj/item/weapon/gun/proc/newshot()
S.update_brightness(user)
update_icon()
verbs -= /obj/item/weapon/gun/proc/toggle_gunlight
+ for(var/datum/action/item_action/toggle_gunlight/TGL in actions)
+ qdel(TGL)
if(unique_rename)
- if(istype(A, /obj/item/weapon/pen))
+ if(istype(I, /obj/item/weapon/pen))
rename_gun(user)
-
..()
- return
/obj/item/weapon/gun/proc/toggle_gunlight()
set name = "Toggle Gunlight"
@@ -311,7 +315,6 @@ obj/item/weapon/gun/proc/newshot()
/obj/item/weapon/gun/proc/update_gunlight(mob/user = null)
if(F)
- action_button_name = "Toggle Gunlight"
if(F.on)
if(loc == user)
user.AddLuminosity(F.brightness_on)
@@ -324,14 +327,17 @@ obj/item/weapon/gun/proc/newshot()
SetLuminosity(0)
update_icon()
else
- action_button_name = null
if(loc == user)
user.AddLuminosity(-5)
else if(isturf(loc))
SetLuminosity(0)
- return
+ for(var/X in actions)
+ var/datum/action/A = X
+ A.UpdateButtonIcon()
+
/obj/item/weapon/gun/pickup(mob/user)
+ ..()
if(F)
if(F.on)
user.AddLuminosity(F.brightness_on)
@@ -340,6 +346,7 @@ obj/item/weapon/gun/proc/newshot()
azoom.Grant(user)
/obj/item/weapon/gun/dropped(mob/user)
+ ..()
if(F)
if(F.on)
user.AddLuminosity(-F.brightness_on)
@@ -368,6 +375,7 @@ obj/item/weapon/gun/proc/newshot()
icon_state = options[choice] + "-sawn"
else
icon_state = options[choice]
+ current_skin = icon_state
M << "Your gun is now skinned as [choice]. Say hello to your new friend."
reskinned = 1
return
@@ -426,7 +434,7 @@ obj/item/weapon/gun/proc/newshot()
/datum/action/toggle_scope_zoom
name = "Toggle Scope"
- check_flags = AB_CHECK_ALIVE|AB_CHECK_RESTRAINED|AB_CHECK_STUNNED|AB_CHECK_LYING
+ check_flags = AB_CHECK_CONSCIOUS|AB_CHECK_RESTRAINED|AB_CHECK_STUNNED|AB_CHECK_LYING
button_icon_state = "sniper_zoom"
var/obj/item/weapon/gun/gun = null
@@ -443,7 +451,6 @@ obj/item/weapon/gun/proc/newshot()
..()
-
/obj/item/weapon/gun/proc/zoom(mob/living/user, forced_zoom)
if(!user || !user.client)
return
diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm
index 8cc3b930ddf3..233540ff9086 100644
--- a/code/modules/projectiles/guns/energy/special.dm
+++ b/code/modules/projectiles/guns/energy/special.dm
@@ -90,9 +90,7 @@
ammo_type = list(/obj/item/ammo_casing/energy/kinetic)
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
unique_rename = 1
origin_tech = "combat=2;powerstorage=1"
@@ -113,26 +111,20 @@
origin_tech = "combat=4;powerstorage=3"
/obj/item/weapon/gun/energy/kinetic_accelerator/shoot_live_shot()
- overheat = 1
- spawn(overheat_time)
- overheat = 0
- recent_reload = 0
..()
+ spawn(overheat_time)
+ reload()
/obj/item/weapon/gun/energy/kinetic_accelerator/emp_act(severity)
return
-/obj/item/weapon/gun/energy/kinetic_accelerator/attack_self(mob/living/user)
- if(overheat || recent_reload)
- return
+/obj/item/weapon/gun/energy/kinetic_accelerator/proc/reload()
power_supply.give(500)
if(!suppressed)
playsound(src.loc, 'sound/weapons/kenetic_reload.ogg', 60, 1)
else
- user << "You silently charge [src]."
- recent_reload = 1
+ loc << "[src] silently charges up."
update_icon()
- return
/obj/item/weapon/gun/energy/kinetic_accelerator/update_icon()
var/obj/item/ammo_casing/energy/shot = ammo_type[select]
diff --git a/code/modules/projectiles/guns/mounted.dm b/code/modules/projectiles/guns/mounted.dm
index d6a54ffa0ea1..177445f3b437 100644
--- a/code/modules/projectiles/guns/mounted.dm
+++ b/code/modules/projectiles/guns/mounted.dm
@@ -1,28 +1,26 @@
/obj/item/weapon/gun/energy/gun/advtaser/mounted
name = "mounted taser"
desc = "An arm mounted dual-mode weapon that fires electrodes and disabler shots."
- icon_state = "armcannon"
+ icon = 'icons/obj/items_cyborg.dmi'
+ icon_state = "taser"
+ item_state = "armcannonstun4"
force = 5
selfcharge = 1
- flags = NODROP
- slot_flags = null
- w_class = 5
can_flashlight = 0
/obj/item/weapon/gun/energy/gun/advtaser/mounted/dropped()//if somebody manages to drop this somehow...
+ ..()
src.loc = null//send it to nullspace to get retrieved by the implant later on. gotta cover those edge cases.
/obj/item/weapon/gun/energy/laser/mounted
name = "mounted laser"
- desc = "An arm mounted cannon that fires lethal lasers. Doesn't come with a charge beam."
- icon_state = "armcannon"
+ desc = "An arm mounted cannon that fires lethal lasers."
+ icon = 'icons/obj/items_cyborg.dmi'
+ icon_state = "laser"
item_state = "armcannonlase"
force = 5
selfcharge = 1
- flags = NODROP
- slot_flags = null
- w_class = 5
- materials = null
/obj/item/weapon/gun/energy/laser/mounted/dropped()
- src.loc = null
+ ..()
+ src.loc = null
\ No newline at end of file
diff --git a/code/modules/projectiles/guns/projectile.dm b/code/modules/projectiles/guns/projectile.dm
index fc293f1f79d1..f0b0b972d407 100644
--- a/code/modules/projectiles/guns/projectile.dm
+++ b/code/modules/projectiles/guns/projectile.dm
@@ -19,7 +19,10 @@
/obj/item/weapon/gun/projectile/update_icon()
..()
- icon_state = "[initial(icon_state)][suppressed ? "-suppressed" : ""]"
+ if(reskinned && current_skin)
+ icon_state = "[current_skin][suppressed ? "-suppressed" : ""]"
+ else
+ icon_state = "[initial(icon_state)][suppressed ? "-suppressed" : ""]"
/obj/item/weapon/gun/projectile/process_chamber(eject_casing = 1, empty_chamber = 1)
// if(in_chamber)
diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm
index 681db297fc3c..54313c7f1745 100644
--- a/code/modules/projectiles/guns/projectile/automatic.dm
+++ b/code/modules/projectiles/guns/projectile/automatic.dm
@@ -6,7 +6,7 @@
can_suppress = 1
burst_size = 3
fire_delay = 2
- action_button_name = "Toggle Firemode"
+ actions_types = list(/datum/action/item_action/toggle_firemode)
/obj/item/weapon/gun/projectile/automatic/proto
name = "\improper NanoTrasen Saber SMG"
@@ -67,7 +67,9 @@
playsound(user, 'sound/weapons/empty.ogg', 100, 1)
update_icon()
- return
+ for(var/X in actions)
+ var/datum/action/A = X
+ A.UpdateButtonIcon()
/obj/item/weapon/gun/projectile/automatic/can_shoot()
return get_ammo()
@@ -118,7 +120,7 @@
fire_delay = 2
can_suppress = 0
burst_size = 0
- action_button_name = null
+ actions_types = list()
/obj/item/weapon/gun/projectile/automatic/wt550/update_icon()
..()
diff --git a/code/modules/projectiles/guns/projectile/launchers.dm b/code/modules/projectiles/guns/projectile/launchers.dm
index ed5c2f204e9b..e7d55f30c166 100644
--- a/code/modules/projectiles/guns/projectile/launchers.dm
+++ b/code/modules/projectiles/guns/projectile/launchers.dm
@@ -39,7 +39,7 @@
mag_type = /obj/item/ammo_box/magazine/m75
burst_size = 1
fire_delay = 0
- action_button_name = null
+ actions_types = list()
/obj/item/weapon/gun/projectile/automatic/gyropistol/process_chamber(eject_casing = 0, empty_chamber = 1)
..()
@@ -62,7 +62,7 @@
burst_size = 1
fire_delay = 0
select = 0
- action_button_name = null
+ actions_types = list()
/obj/item/weapon/gun/projectile/automatic/speargun/update_icon()
return
diff --git a/code/modules/projectiles/guns/projectile/pistol.dm b/code/modules/projectiles/guns/projectile/pistol.dm
index 6df4c8eb3330..5c45df2cb17c 100644
--- a/code/modules/projectiles/guns/projectile/pistol.dm
+++ b/code/modules/projectiles/guns/projectile/pistol.dm
@@ -8,7 +8,7 @@
can_suppress = 1
burst_size = 1
fire_delay = 0
- action_button_name = null
+ actions_types = list()
/obj/item/weapon/gun/projectile/automatic/pistol/update_icon()
..()
@@ -55,4 +55,4 @@
can_suppress = 0
burst_size = 3
fire_delay = 2
- action_button_name = "Toggle Firemode"
+ actions_types = list(/datum/action/item_action/toggle_firemode)
\ No newline at end of file
diff --git a/code/modules/projectiles/guns/projectile/rechargable_magazine.dm b/code/modules/projectiles/guns/projectile/rechargable_magazine.dm
index d24dd02c71b2..c5b3ecd2becc 100644
--- a/code/modules/projectiles/guns/projectile/rechargable_magazine.dm
+++ b/code/modules/projectiles/guns/projectile/rechargable_magazine.dm
@@ -9,7 +9,7 @@
max_ammo = 20
/obj/item/ammo_box/magazine/recharge/update_icon()
- desc = "[initial(desc)] It has [stored_ammo.len] shots\s left."
+ desc = "[initial(desc)] It has [stored_ammo.len] shot\s left."
icon_state = "oldrifle-[round(ammo_count(),4)]"
@@ -36,7 +36,7 @@
fire_delay = 2
can_suppress = 0
burst_size = 0
- action_button_name = null
+ actions_types = list()
fire_sound = 'sound/weapons/Laser.ogg'
/obj/item/weapon/gun/projectile/automatic/laser/process_chamber(eject_casing = 0, empty_chamber = 1)
diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm
index eb588cfa1573..68aeeebcd523 100644
--- a/code/modules/projectiles/guns/projectile/revolver.dm
+++ b/code/modules/projectiles/guns/projectile/revolver.dm
@@ -251,11 +251,26 @@
var/obj/item/organ/limb/affecting = H.get_organ(check_zone(user.zone_selected))
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!")
+ shoot_self(user, affecting)
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!")
return
user.visible_message("*click*")
playsound(user, 'sound/weapons/empty.ogg', 100, 1)
+
+/obj/item/weapon/gun/projectile/revolver/russian/proc/shoot_self(mob/living/carbon/human/user, affecting = "head")
+ 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!")
+
+/obj/item/weapon/gun/projectile/revolver/russian/soul
+ name = "cursed russian revolver"
+ desc = "To play with this revolver requires wagering your very soul."
+
+/obj/item/weapon/gun/projectile/revolver/russian/soul/shoot_self(mob/living/user)
+ ..()
+ var/obj/item/device/soulstone/anybody/SS = new /obj/item/device/soulstone/anybody(get_turf(src))
+ if(!SS.transfer_soul("FORCE", user)) //Something went wrong
+ qdel(SS)
+ return
+ user.visible_message("[user.name]'s soul is captured by \the [src]!", "You've lost the gamble! Your soul is forfiet!")
\ No newline at end of file
diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm
index 58113e9ee7aa..0f20c8ff62b1 100644
--- a/code/modules/projectiles/guns/projectile/shotgun.dm
+++ b/code/modules/projectiles/guns/projectile/shotgun.dm
@@ -134,6 +134,7 @@
pump()
/obj/item/weapon/gun/projectile/shotgun/boltaction/enchanted/dropped()
+ ..()
guns_left = 0
/obj/item/weapon/gun/projectile/shotgun/boltaction/enchanted/shoot_live_shot(mob/living/user as mob|obj, pointblank = 0, mob/pbtarget = null, message = 1)
@@ -285,6 +286,8 @@
name = "sawn-off [src.name]"
desc = sawn_desc
icon_state = "[icon_state]-sawn"
+ if(current_skin)
+ current_skin = "[current_skin]-sawn"
w_class = 3
item_state = "gun"
slot_flags &= ~SLOT_BACK //you can't sling it on your back
@@ -311,7 +314,7 @@
burst_size = 1
fire_delay = 0
pin = /obj/item/device/firing_pin/implant/pindicate
- action_button_name = null
+ actions_types = list()
/obj/item/weapon/gun/projectile/automatic/shotgun/bulldog/unrestricted
pin = /obj/item/device/firing_pin
diff --git a/code/modules/projectiles/guns/projectile/toy.dm b/code/modules/projectiles/guns/projectile/toy.dm
index 2555a8ac16a8..417f13ea9b5d 100644
--- a/code/modules/projectiles/guns/projectile/toy.dm
+++ b/code/modules/projectiles/guns/projectile/toy.dm
@@ -29,7 +29,7 @@
can_suppress = 0
burst_size = 1
fire_delay = 0
- action_button_name = null
+ actions_types = list()
/obj/item/weapon/gun/projectile/automatic/toy/pistol/update_icon()
..()
diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm
index 11b0f9b456d5..48a920e96518 100644
--- a/code/modules/projectiles/projectile/beams.dm
+++ b/code/modules/projectiles/projectile/beams.dm
@@ -8,6 +8,19 @@
flag = "laser"
eyeblur = 2
+/obj/item/projectile/beam/laser
+
+/obj/item/projectile/beam/laser/heavylaser
+ name = "heavy laser"
+ icon_state = "heavylaser"
+ damage = 40
+
+/obj/item/projectile/beam/laser/on_hit(atom/target, blocked = 0)
+ . = ..()
+ if(iscarbon(target))
+ var/mob/living/carbon/M = target
+ M.IgniteMob()
+
/obj/item/projectile/beam/practice
name = "practice laser"
damage = 0
@@ -18,12 +31,6 @@
icon_state = "scatterlaser"
damage = 5
-
-/obj/item/projectile/beam/heavylaser
- name = "heavy laser"
- icon_state = "heavylaser"
- damage = 40
-
/obj/item/projectile/beam/xray
name = "xray beam"
icon_state = "xray"
@@ -83,7 +90,6 @@
if(M.wear_suit.type in suit_types)
M.adjustStaminaLoss(34)
-
/obj/item/projectile/beam/lasertag/redtag
icon_state = "laser"
suit_types = list(/obj/item/clothing/suit/bluetag)
diff --git a/code/modules/reagents/chemistry/holder.dm b/code/modules/reagents/chemistry/holder.dm
index 2e0619a2af99..c65357d392dc 100644
--- a/code/modules/reagents/chemistry/holder.dm
+++ b/code/modules/reagents/chemistry/holder.dm
@@ -233,61 +233,61 @@ var/const/INJECT = 5 //injection
return total_transfered
*/
-/datum/reagents/proc/metabolize(mob/M, can_overdose = 0)
- if(M)
- chem_temp = M.bodytemperature
+/datum/reagents/proc/metabolize(mob/living/carbon/C, can_overdose = 0)
+ if(C)
+ chem_temp = C.bodytemperature
handle_reactions()
-
+ var/need_mob_update = 0
for(var/reagent in reagent_list)
var/datum/reagent/R = reagent
if(!R.holder)
continue
- if(!M)
- M = R.holder.my_atom
- if(M && R)
- if(M.reagent_check(R) != 1)
+ if(!C)
+ C = R.holder.my_atom
+ if(C && R)
+ if(C.reagent_check(R) != 1)
if(can_overdose)
if(R.overdose_threshold)
if(R.volume >= R.overdose_threshold && !R.overdosed)
R.overdosed = 1
- R.overdose_start(M)
+ need_mob_update += R.overdose_start(C)
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)
+ need_mob_update += R.overdose_process(C)
if(is_type_in_list(R,addiction_list))
for(var/addiction in addiction_list)
var/datum/reagent/A = addiction
if(istype(R, A))
A.addiction_stage = -15 // you're satisfied for a good while.
- R.on_mob_life(M)
+ need_mob_update += R.on_mob_life(C)
if(can_overdose)
if(addiction_tick == 6)
addiction_tick = 1
for(var/addiction in addiction_list)
var/datum/reagent/R = addiction
- if(M && R)
- if(R.addiction_stage <= 0)
- R.addiction_stage++
- if(R.addiction_stage > 0 && R.addiction_stage <= 10)
- R.addiction_act_stage1(M)
- R.addiction_stage++
- if(R.addiction_stage > 10 && R.addiction_stage <= 20)
- R.addiction_act_stage2(M)
- R.addiction_stage++
- if(R.addiction_stage > 20 && R.addiction_stage <= 30)
- R.addiction_act_stage3(M)
- R.addiction_stage++
- if(R.addiction_stage > 30 && R.addiction_stage <= 40)
- R.addiction_act_stage4(M)
- R.addiction_stage++
- if(R.addiction_stage > 40)
- M << "You feel like you've gotten over your need for [R.name]."
- addiction_list.Remove(R)
+ if(C && R)
+ R.addiction_stage++
+ switch(R.addiction_stage)
+ if(1 to 10)
+ need_mob_update += R.addiction_act_stage1(C)
+ if(10 to 20)
+ need_mob_update += R.addiction_act_stage2(C)
+ if(20 to 30)
+ need_mob_update += R.addiction_act_stage3(C)
+ if(30 to 40)
+ need_mob_update += R.addiction_act_stage4(C)
+ if(40 to INFINITY)
+ C << "You feel like you've gotten over your need for [R.name]."
+ addiction_list.Remove(R)
addiction_tick++
+ if(C && need_mob_update) //some of the metabolized reagents had effects on the mob that requires some updates.
+ C.updatehealth()
+ C.update_canmove()
+ C.update_stamina()
update_total()
/datum/reagents/process()
diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
index b87b51929c77..c1c1f1e2603b 100644
--- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
@@ -33,9 +33,10 @@
if(M.confused < drunk_value)
M.confused += 3
if(volume >= boozepwr*3.8)
- M.adjustToxLoss(1)
- ..()
- return
+ M.adjustToxLoss(1, 0)
+ . = 1
+ return ..() || .
+
/datum/reagent/consumable/ethanol/reaction_obj(obj/O, reac_volume)
if(istype(O,/obj/item/weapon/paper))
var/obj/item/weapon/paper/paperaffected = O
@@ -55,7 +56,7 @@
return
if(method == TOUCH || method == VAPOR)
M.adjust_fire_stacks(reac_volume / 15)
- ..()
+ return ..()
/datum/reagent/consumable/ethanol/beer
name = "Beer"
@@ -81,10 +82,10 @@
/datum/reagent/consumable/ethanol/kahlua/on_mob_life(mob/living/M)
M.dizziness = max(0,M.dizziness-5)
M.drowsyness = max(0,M.drowsyness-3)
- M.AdjustSleeping(-2)
+ M.AdjustSleeping(-2, 0)
M.Jitter(5)
..()
- return
+ return 1
/datum/reagent/consumable/ethanol/whiskey
name = "Whiskey"
@@ -108,7 +109,7 @@
M.bodytemperature = max(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT))
M.Jitter(5)
..()
- return
+ return 1
/datum/reagent/consumable/ethanol/vodka
name = "Vodka"
@@ -119,8 +120,7 @@
/datum/reagent/consumable/ethanol/vodka/on_mob_life(mob/living/M)
M.radiation = max(M.radiation-2,0)
- ..()
- return
+ return ..()
/datum/reagent/consumable/ethanol/bilk
name = "Bilk"
@@ -132,9 +132,9 @@
/datum/reagent/consumable/ethanol/bilk/on_mob_life(mob/living/M)
if(M.getBruteLoss() && prob(10))
- M.heal_organ_damage(1,0)
- ..()
- return
+ M.heal_organ_damage(1,0, 0)
+ . = 1
+ return ..() || .
/datum/reagent/consumable/ethanol/threemileisland
name = "Three Mile Island Iced Tea"
@@ -145,7 +145,7 @@
/datum/reagent/consumable/ethanol/threemileisland/on_mob_life(mob/living/M)
M.set_drugginess(50)
- ..()
+ return ..()
/datum/reagent/consumable/ethanol/gin
name = "Gin"
@@ -311,8 +311,7 @@
/datum/reagent/consumable/ethanol/toxins_special/on_mob_life(var/mob/living/M as mob)
if (M.bodytemperature < 330)
M.bodytemperature = min(330, M.bodytemperature + (15 * TEMPERATURE_DAMAGE_COEFFICIENT)) //310 is the normal bodytemp. 310.055
- ..()
- return
+ return ..()
/datum/reagent/consumable/ethanol/beepsky_smash
name = "Beepsky Smash"
@@ -323,9 +322,9 @@
metabolization_rate = 0.8
/datum/reagent/consumable/ethanol/beepsky_smash/on_mob_life(mob/living/M)
- M.Stun(1)
+ M.Stun(2)
..()
- return
+ return 1
/datum/reagent/consumable/ethanol/irish_cream
name = "Irish Cream"
@@ -399,8 +398,7 @@
/datum/reagent/consumable/ethanol/manhattan_proj/on_mob_life(mob/living/M)
M.set_drugginess(30)
- ..()
- return
+ return ..()
/datum/reagent/consumable/ethanol/whiskeysoda
name = "Whiskey Soda"
@@ -419,8 +417,7 @@
/datum/reagent/consumable/ethanol/antifreeze/on_mob_life(mob/living/M)
if (M.bodytemperature < 330)
M.bodytemperature = min(330, M.bodytemperature + (20 * TEMPERATURE_DAMAGE_COEFFICIENT)) //310 is the normal bodytemp. 310.055
- ..()
- return
+ return ..()
/datum/reagent/consumable/ethanol/barefoot
name = "Barefoot"
@@ -481,8 +478,7 @@
/datum/reagent/consumable/ethanol/sbiten/on_mob_life(mob/living/M)
if (M.bodytemperature < 360)
M.bodytemperature = min(360, M.bodytemperature + (50 * TEMPERATURE_DAMAGE_COEFFICIENT)) //310 is the normal bodytemp. 310.055
- ..()
- return
+ return ..()
/datum/reagent/consumable/ethanol/devilskiss
name = "Devils Kiss"
@@ -516,8 +512,7 @@
/datum/reagent/consumable/ethanol/iced_beer/on_mob_life(mob/living/M)
if(M.bodytemperature > 270)
M.bodytemperature = max(270, M.bodytemperature - (20 * TEMPERATURE_DAMAGE_COEFFICIENT)) //310 is the normal bodytemp. 310.055
- ..()
- return
+ return ..()
/datum/reagent/consumable/ethanol/grog
name = "Grog"
@@ -607,9 +602,9 @@
/datum/reagent/consumable/ethanol/bananahonk/on_mob_life(mob/living/M)
if( ( istype(M, /mob/living/carbon/human) && M.job in list("Clown") ) || istype(M, /mob/living/carbon/monkey) )
- M.heal_organ_damage(1,1)
- ..()
- return
+ M.heal_organ_damage(1,1, 0)
+ . = 1
+ return ..() || .
/datum/reagent/consumable/ethanol/silencer
name = "Silencer"
@@ -622,8 +617,8 @@
/datum/reagent/consumable/ethanol/silencer/on_mob_life(mob/living/M)
if(istype(M, /mob/living/carbon/human) && M.job in list("Mime"))
M.heal_organ_damage(1,1)
- ..()
- return
+ . = 1
+ return ..() || .
/datum/reagent/consumable/ethanol/drunkenblumpkin
name = "Drunken Blumpkin"
diff --git a/code/modules/reagents/chemistry/reagents/blob_reagents.dm b/code/modules/reagents/chemistry/reagents/blob_reagents.dm
index b1c63efea006..a06750a0a2df 100644
--- a/code/modules/reagents/chemistry/reagents/blob_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/blob_reagents.dm
@@ -3,12 +3,15 @@
name = "Unknown"
description = "shouldn't exist and you should adminhelp immediately."
color = "#FFFFFF"
+ var/complementary_color = "#000000" //a color that's complementary to the normal blob color
var/shortdesc = null //just damage and on_mob effects, doesn't include special, blob-tile only effects
var/blobbernaut_message = "slams" //blobbernaut attack verb
var/message = "The blob strikes you" //message sent to any mob hit by the blob
var/message_living = null //extension to first mob sent to only living mobs i.e. silicons have no skin to be burnt
/datum/reagent/blob/reaction_mob(mob/living/M, method=TOUCH, reac_volume, show_message, touch_protection, mob/camera/blob/O)
+ if(istype(M, /mob/living/simple_animal/hostile/blob))
+ return 0 //the blob mobs do not cause effects when hitting themselves or other blob mobs
return round(reac_volume * min(1.5 - touch_protection, 1), 0.1) //full touch protection means 50% volume, any prot below 0.5 means 100% volume.
/datum/reagent/blob/proc/damage_reaction(obj/effect/blob/B, original_health, damage, damage_type, cause) //when the blob takes damage, do this
@@ -26,6 +29,7 @@
id = "ripping_tendrils"
description = "will do medium brute and stamina damage."
color = "#991010"
+ complementary_color = "#109999"
blobbernaut_message = "rips"
message_living = ", and you feel your skin ripping and tearing off"
@@ -37,6 +41,23 @@
if(iscarbon(M))
M.emote("scream")
+//does brute and drains blood from humans
+/datum/reagent/blob/draining_spikes
+ name = "Draining Spikes"
+ id = "draining_spikes"
+ description = "will do medium brute damage and drain blood."
+ color = "#AF4150"
+ complementary_color = "#41AFA0"
+ blobbernaut_message = "drains"
+ message_living = ", and you feel lightheaded"
+
+/datum/reagent/blob/draining_spikes/reaction_mob(mob/living/M, method=TOUCH, reac_volume, show_message, touch_protection, mob/camera/blob/O)
+ reac_volume = ..()
+ M.apply_damage(0.6*reac_volume, BRUTE)
+ if(ishuman(M) && M.stat != DEAD)
+ var/mob/living/carbon/human/H = M
+ H.drip(reac_volume) //will kill at 18 hits(no bio protection) and cause bad effects before that
+
//does low toxin damage, but creates fragile spores when expanding or killed by weak attacks
/datum/reagent/blob/sporing_pods
name = "Sporing Pods"
@@ -44,6 +65,7 @@
description = "will do low toxin damage and produce fragile spores when killed or on expanding."
shortdesc = "will do low toxin damage."
color = "#E88D5D"
+ complementary_color = "#5DB8E8"
message_living = ", and you feel sick"
/datum/reagent/blob/sporing_pods/reaction_mob(mob/living/M, method=TOUCH, reac_volume, show_message, touch_protection, mob/camera/blob/O)
@@ -73,13 +95,14 @@
description = "will do medium brute damage and replicate when damaged."
shortdesc = "will do medium brute damage."
color = "#7B5A57"
+ complementary_color = "#57787B"
/datum/reagent/blob/replicating_foam/reaction_mob(mob/living/M, method=TOUCH, reac_volume, show_message, touch_protection, mob/camera/blob/O)
reac_volume = ..()
M.apply_damage(0.6*reac_volume, BRUTE)
/datum/reagent/blob/replicating_foam/damage_reaction(obj/effect/blob/B, original_health, damage, damage_type, cause)
- if(damage > 0 && original_health - damage > 0)
+ if(damage > 0 && original_health - damage > 0 && prob(75))
var/obj/effect/blob/newB = B.expand()
if(newB)
newB.health = original_health - damage
@@ -91,6 +114,37 @@
if(prob(50))
newB.expand() //do it again!
+//does brute damage, shifts away when damaged
+/datum/reagent/blob/shifting_fragments
+ name = "Shifting Fragments"
+ id = "shifting_fragments"
+ description = "will do medium brute damage and shift away from damage."
+ shortdesc = "will do medium brute damage."
+ color = "#C8963C"
+ complementary_color = "#3C6EC8"
+
+/datum/reagent/blob/shifting_fragments/reaction_mob(mob/living/M, method=TOUCH, reac_volume, show_message, touch_protection, mob/camera/blob/O)
+ reac_volume = ..()
+ M.apply_damage(0.6*reac_volume, BRUTE)
+
+/datum/reagent/blob/shifting_fragments/expand_reaction(obj/effect/blob/B, obj/effect/blob/newB, turf/T)
+ if(istype(B, /obj/effect/blob/normal) || istype(B, /obj/effect/blob/shield))
+ newB.forceMove(get_turf(B))
+ B.forceMove(T)
+
+/datum/reagent/blob/shifting_fragments/damage_reaction(obj/effect/blob/B, original_health, damage, damage_type, cause)
+ if(cause && prob(40))
+ var/list/blobstopick = list()
+ for(var/obj/effect/blob/OB in range(1, B))
+ blobstopick += OB
+ if(blobstopick.len)
+ var/obj/effect/blob/targeted = pick(blobstopick) //randomize the blob chosen, because otherwise it'd tend to the lower left
+ if(istype(targeted, /obj/effect/blob/normal) || istype(targeted, /obj/effect/blob/shield))
+ var/turf/T = get_turf(targeted)
+ targeted.forceMove(get_turf(B))
+ B.forceMove(T) //swap the blobs
+ return ..()
+
//does low burn and a lot of stamina damage, reacts to stamina damage
/datum/reagent/blob/energized_fibers
name = "Energized Fibers"
@@ -98,6 +152,7 @@
description = "will do low burn and high stamina damage, and react to stamina damage."
shortdesc = "will do low burn and high stamina damage."
color = "#EFD65A"
+ complementary_color = "#5A73EF"
blobbernaut_message = "shocks"
message_living = ", and you feel a strong tingling sensation"
@@ -119,6 +174,7 @@
id = "boiling_oil"
description = "will do medium burn damage and set targets on fire."
color = "#B68D00"
+ complementary_color = "#0029B6"
blobbernaut_message = "splashes"
message = "The blob splashes you with burning oil"
message_living = ", and you feel your skin char and melt"
@@ -132,11 +188,39 @@
if(iscarbon(M))
M.emote("scream")
+//does burn and toxin damage, explodes into flame when hit with burn damage
+/datum/reagent/blob/flammable_goo
+ name = "Flammable Goo"
+ id = "flammable_goo"
+ description = "will do low burn damage, medium toxin damage, and ignite when burned."
+ shortdesc = "will do low burn damage and medium toxin damage."
+ color = "#BE5532"
+ complementary_color = "#329BBE"
+ blobbernaut_message = "splashes"
+ message = "The blob splashes you with a thin goo"
+ message_living = ", and you smell a faint, sweet scent"
+
+/datum/reagent/blob/flammable_goo/reaction_mob(mob/living/M, method=TOUCH, reac_volume, show_message, touch_protection, mob/camera/blob/O)
+ reac_volume = ..()
+ M.apply_damage(0.4*reac_volume, TOX)
+ if(M)
+ M.apply_damage(0.2*reac_volume, BURN)
+
+/datum/reagent/blob/flammable_goo/damage_reaction(obj/effect/blob/B, original_health, damage, damage_type, cause)
+ if(cause && damage_type == BURN)
+ for(var/turf/T in range(1, B))
+ if(prob(80))
+ PoolOrNew(/obj/effect/hotspot, T)
+ return damage * 1.3
+ return ..()
+
+//does toxin damage, targets think they're not hurt at all
/datum/reagent/blob/regenerative_materia
name = "Regenerative Materia"
id = "regenerative_materia"
description = "will do low toxin damage and cause targets to believe they are fully healed."
color = "#C8A5DC"
+ complementary_color = "#B9DCA5"
message_living = ", and you feel alive"
/datum/reagent/blob/regenerative_materia/reaction_mob(mob/living/M, method=TOUCH, reac_volume, show_message, touch_protection, mob/camera/blob/O)
@@ -164,6 +248,7 @@
id = "hallucinogenic_nectar"
description = "will do low toxin damage, vivid hallucinations, and inject targets with toxins."
color = "#CD7794"
+ complementary_color = "#77CDB0"
blobbernaut_message = "splashes"
message = "The blob splashes you with sticky nectar"
message_living = ", and you feel really good"
@@ -183,6 +268,7 @@
id = "zombifying_feelers"
description = "will cause medium toxin damage and turn sleeping targets into blob zombies."
color = "#828264"
+ complementary_color = "#646482"
message_living = ", and you feel tired"
/datum/reagent/blob/zombifying_feelers/reaction_mob(mob/living/M, method=TOUCH, reac_volume, show_message, touch_protection, mob/camera/blob/O)
@@ -202,6 +288,7 @@
id = "envenomed_filaments"
description = "will cause medium toxin and stamina damage, and inject targets with toxins."
color = "#9ACD32"
+ complementary_color = "#6532CD"
message_living = ", and you feel sick and nauseated"
/datum/reagent/blob/envenomed_filaments/reaction_mob(mob/living/M, method=TOUCH, reac_volume, show_message, touch_protection, mob/camera/blob/O)
@@ -212,12 +299,34 @@
if(M)
M.adjustStaminaLoss(0.4*reac_volume)
+//does brute, fire, and toxin over a few seconds
+/datum/reagent/blob/poisonous_strands
+ name = "Poisonous Strands"
+ id = "poisonous_strands"
+ description = "will inject targets with poison."
+ color = "#7D6EB4"
+ complementary_color = "#A5B46E"
+ blobbernaut_message = "injects"
+ message_living = ", and you feel like your insides are melting"
+
+/datum/reagent/blob/poisonous_strands/reaction_mob(mob/living/M, method=TOUCH, reac_volume, show_message, touch_protection, mob/camera/blob/O)
+ reac_volume = ..()
+ if(M.reagents)
+ M.reagents.add_reagent("poisonous_strands", 0.12*reac_volume)
+
+/datum/reagent/blob/poisonous_strands/on_mob_life(mob/living/M)
+ M.adjustBruteLoss(1.5*REM)
+ M.adjustFireLoss(1.5*REM)
+ M.adjustToxLoss(1.5*REM)
+ ..()
+
//does oxygen damage, randomly pushes or pulls targets
/datum/reagent/blob/cyclonic_grid
name = "Cyclonic Grid"
id = "cyclonic_grid"
description = "will cause high oxygen damage and randomly throw targets to or from it."
color = "#9BCD9B"
+ complementary_color = "#CD9BCD"
message = "The blob blasts you with a gust of air"
message_living = ", and you can't catch your breath"
@@ -233,6 +342,7 @@
id = "lexorin_jelly"
description = "will cause low brute and high oxygen damage, and cause targets to be unable to breathe."
color = "#00E5B1"
+ complementary_color = "#E50034"
message_living = ", and your lungs feel heavy and weak"
/datum/reagent/blob/lexorin_jelly/reaction_mob(mob/living/M, method=TOUCH, reac_volume, show_message, touch_protection, mob/camera/blob/O)
@@ -249,12 +359,13 @@
description = "will do brute damage in an area around targets and is resistant to explosions."
shortdesc = "will do brute damage in an area around targets."
color = "#8B2500"
+ complementary_color = "#00668B"
blobbernaut_message = "blasts"
message = "The blob blasts you"
/datum/reagent/blob/explosive_lattice/reaction_mob(mob/living/M, method=TOUCH, reac_volume, show_message, touch_protection, mob/camera/blob/O)
- if(reac_volume >= 15) //if it's not a spore cloud, bad time incoming
- reac_volume = ..()
+ reac_volume = ..()
+ if(reac_volume >= 10) //if it's not a spore cloud, bad time incoming
var/obj/effect/overlay/temp/explosion/E = PoolOrNew(/obj/effect/overlay/temp/explosion, get_turf(M))
E.alpha = 150
for(var/mob/living/L in range(M, 1))
@@ -264,7 +375,6 @@
if(M)
M.apply_damage(0.1*reac_volume, BRUTE)
else
- reac_volume = ..()
M.apply_damage(0.8*reac_volume, BRUTE)
/datum/reagent/blob/explosive_lattice/damage_reaction(obj/effect/blob/B, original_health, damage, damage_type, cause)
@@ -279,6 +389,7 @@
description = "will do high brute damage and react to brute damage."
shortdesc = "will do high brute damage."
color = "#FFA500"
+ complementary_color = "#005AFF"
blobbernaut_message = "pummels"
message = "The blob pummels you"
@@ -301,6 +412,7 @@
id = "cryogenic_liquid"
description = "will do low burn and stamina damage, and cause targets to freeze."
color = "#8BA6E9"
+ complementary_color = "#E9CE8B"
blobbernaut_message = "splashes"
message = "The blob splashes you with an icy liquid"
message_living = ", and you feel cold and tired"
@@ -321,6 +433,7 @@
description = "will do low burn damage and EMP targets, but is somewhat fragile."
shortdesc = "will do low burn damage and EMP targets."
color = "#83ECEC"
+ complementary_color = "#EC8383"
blobbernaut_message = "lashes"
message = "The blob lashes you"
message_living = ", and you hear a faint buzzing"
@@ -335,7 +448,7 @@
return damage * 1.2 //a laser will do 24 damage, which will kill any recently-made normal blob
/datum/reagent/blob/electromagnetic_web/death_reaction(obj/effect/blob/B, cause)
- if(!isnull(cause))
+ if(cause)
empulse(B.loc, 2, 3) //less than screen range, so you can stand out of range to avoid it
//does brute damage, bonus damage for each nearby blob, and spreads damage out
@@ -345,13 +458,14 @@
description = "will do brute damage for each nearby blob and spread damage between nearby blobs."
shortdesc = "will do brute damage for each nearby blob."
color = "#65ADA2"
+ complementary_color = "#AD6570"
blobbernaut_message = "synchronously strikes"
message = "The blobs strike you"
/datum/reagent/blob/synchronous_mesh/reaction_mob(mob/living/M, method=TOUCH, reac_volume, show_message, touch_protection, mob/camera/blob/O)
reac_volume = ..()
M.apply_damage(0.1*reac_volume, BRUTE)
- if(M)
+ if(M && reac_volume)
for(var/obj/effect/blob/B in range(1, M)) //if the target is completely surrounded, this is 2.4*reac_volume bonus damage, total of 2.5*reac_volume
if(M)
B.blob_attack_animation(M) //show them they're getting a bad time
@@ -375,7 +489,8 @@
name = "Penetrating Spines"
id = "penetrating_spines"
description = "will do medium brute damage through armor."
- color = "#408B80"
+ color = "#6E4664"
+ complementary_color = "#466E50"
blobbernaut_message = "stabs"
message = "The blob stabs you"
@@ -383,6 +498,24 @@
reac_volume = ..()
M.adjustBruteLoss(0.6*reac_volume)
+/datum/reagent/blob/adaptive_nexuses
+ name = "Adaptive Nexuses"
+ id = "adaptive_nexuses"
+ description = "will do medium brute damage and kill unconscious targets, giving you bonus resources."
+ shortdesc = "will do medium brute damage and kill unconscious targets, giving your overmind bonus resources."
+ color = "#4A64C0"
+ complementary_color = "#823ABB"
+
+/datum/reagent/blob/adaptive_nexuses/reaction_mob(mob/living/M, method=TOUCH, reac_volume, show_message, touch_protection, mob/camera/blob/O)
+ reac_volume = ..()
+ M.apply_damage(0.6*reac_volume, BRUTE)
+ if(O && ishuman(M) && M.stat == UNCONSCIOUS)
+ PoolOrNew(/obj/effect/overlay/temp/revenant, get_turf(M))
+ var/points = rand(5, 10)
+ O.add_points(points)
+ O << "Gained [points] resources from the death of [M]."
+ M.death()
+
//does low brute damage, oxygen damage, and stamina damage and wets tiles when damaged
/datum/reagent/blob/pressurized_slime
name = "Pressurized Slime"
@@ -390,6 +523,7 @@
description = "will do low brute, oxygen, and stamina damage, and wet tiles when damaged or killed."
shortdesc = "will do low brute, oxygen, and stamina damage, and wet tiles under targets."
color = "#AAAABB"
+ complementary_color = "#BBBBAA"
blobbernaut_message = "emits slime at"
message = "The blob splashes into you"
message_living = ", and you gasp for breath"
@@ -424,6 +558,7 @@
id = "dark_matter"
description = "will do medium brute damage and pull nearby objects and enemies at the target."
color = "#61407E"
+ complementary_color = "#5D7E40"
message = "You feel a thrum as the blob strikes you, and everything flies at you"
/datum/reagent/blob/dark_matter/reaction_mob(mob/living/M, method=TOUCH, reac_volume, show_message, touch_protection, mob/camera/blob/O)
@@ -437,6 +572,7 @@
id = "b_sorium"
description = "will do medium brute damage and throw nearby objects and enemies away from the target."
color = "#808000"
+ complementary_color = "#000080"
message = "The blob slams into you and sends you flying"
/datum/reagent/blob/b_sorium/reaction_mob(mob/living/M, method=TOUCH, reac_volume, show_message, touch_protection, mob/camera/blob/O)
@@ -445,7 +581,7 @@
M.apply_damage(0.4*reac_volume, BRUTE)
/datum/reagent/blob/proc/reagent_vortex(mob/living/M, setting_type, reac_volume)
- if(M)
+ if(M && reac_volume)
var/turf/pull = get_turf(M)
var/range_power = Clamp(round(reac_volume/5, 1), 1, 5)
for(var/atom/movable/X in range(range_power,pull))
diff --git a/code/modules/reagents/chemistry/reagents/drink_reagents.dm b/code/modules/reagents/chemistry/reagents/drink_reagents.dm
index d99f783f3160..d530e2fc8f78 100644
--- a/code/modules/reagents/chemistry/reagents/drink_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/drink_reagents.dm
@@ -12,9 +12,9 @@
/datum/reagent/consumable/orangejuice/on_mob_life(mob/living/M)
if(M.getOxyLoss() && prob(30))
- M.adjustOxyLoss(-1)
+ M.adjustOxyLoss(-1, 0)
+ . = 1
..()
- return
/datum/reagent/consumable/tomatojuice
name = "Tomato Juice"
@@ -24,9 +24,9 @@
/datum/reagent/consumable/tomatojuice/on_mob_life(mob/living/M)
if(M.getFireLoss() && prob(20))
- M.heal_organ_damage(0,1)
+ M.heal_organ_damage(0,1, 0)
+ . = 1
..()
- return
/datum/reagent/consumable/limejuice
name = "Lime Juice"
@@ -36,9 +36,9 @@
/datum/reagent/consumable/limejuice/on_mob_life(mob/living/M)
if(M.getToxLoss() && prob(20))
- M.adjustToxLoss(-1*REM)
+ M.adjustToxLoss(-1*REM, 0)
+ . = 1
..()
- return
/datum/reagent/consumable/carrotjuice
name = "Carrot juice"
@@ -71,9 +71,9 @@
color = "#863353" // rgb: 134, 51, 83
/datum/reagent/consumable/poisonberryjuice/on_mob_life(mob/living/M)
- M.adjustToxLoss(1)
+ M.adjustToxLoss(1, 0)
+ . = 1
..()
- return
/datum/reagent/consumable/watermelonjuice
name = "Watermelon Juice"
@@ -95,7 +95,8 @@
/datum/reagent/consumable/banana/on_mob_life(mob/living/M)
if( ( istype(M, /mob/living/carbon/human) && M.job in list("Clown") ) || istype(M, /mob/living/carbon/monkey) )
- M.heal_organ_damage(1,1)
+ M.heal_organ_damage(1,1, 0)
+ . = 1
..()
/datum/reagent/consumable/nothing
@@ -105,7 +106,8 @@
/datum/reagent/consumable/nothing/on_mob_life(mob/living/M)
if(istype(M, /mob/living/carbon/human) && M.job in list("Mime"))
- M.heal_organ_damage(1,1)
+ M.heal_organ_damage(1,1, 0)
+ . = 1
..()
/datum/reagent/consumable/potato_juice
@@ -129,11 +131,11 @@
/datum/reagent/consumable/milk/on_mob_life(mob/living/M)
if(M.getBruteLoss() && prob(20))
- M.heal_organ_damage(1,0)
+ M.heal_organ_damage(1,0, 0)
+ . = 1
if(holder.has_reagent("capsaicin"))
holder.remove_reagent("capsaicin", 2)
..()
- return
/datum/reagent/consumable/soymilk
name = "Soy Milk"
@@ -143,9 +145,9 @@
/datum/reagent/consumable/soymilk/on_mob_life(mob/living/M)
if(M.getBruteLoss() && prob(20))
- M.heal_organ_damage(1,0)
+ M.heal_organ_damage(1,0, 0)
+ . = 1
..()
- return
/datum/reagent/consumable/cream
name = "Cream"
@@ -155,9 +157,9 @@
/datum/reagent/consumable/cream/on_mob_life(mob/living/M)
if(M.getBruteLoss() && prob(20))
- M.heal_organ_damage(1,0)
+ M.heal_organ_damage(1,0, 0)
+ . = 1
..()
- return
/datum/reagent/consumable/coffee
name = "Coffee"
@@ -174,12 +176,13 @@
/datum/reagent/consumable/coffee/on_mob_life(mob/living/M)
M.dizziness = max(0,M.dizziness-5)
M.drowsyness = max(0,M.drowsyness-3)
- M.AdjustSleeping(-2)
+ M.AdjustSleeping(-2, 0)
if (M.bodytemperature < 310)//310 is the normal bodytemp. 310.055
M.bodytemperature = min(310, M.bodytemperature + (25 * TEMPERATURE_DAMAGE_COEFFICIENT))
if(holder.has_reagent("frostoil"))
holder.remove_reagent("frostoil", 5)
..()
+ . = 1
/datum/reagent/consumable/tea
name = "Tea"
@@ -192,13 +195,13 @@
M.dizziness = max(0,M.dizziness-2)
M.drowsyness = max(0,M.drowsyness-1)
M.jitteriness = max(0,M.jitteriness-3)
- M.AdjustSleeping(-1)
+ M.AdjustSleeping(-1, 0)
if(M.getToxLoss() && prob(20))
- M.adjustToxLoss(-1)
+ M.adjustToxLoss(-1, 0)
if (M.bodytemperature < 310) //310 is the normal bodytemp. 310.055
M.bodytemperature = min(310, M.bodytemperature + (20 * TEMPERATURE_DAMAGE_COEFFICIENT))
..()
- return
+ . = 1
/datum/reagent/consumable/icecoffee
name = "Iced Coffee"
@@ -210,12 +213,12 @@
/datum/reagent/consumable/icecoffee/on_mob_life(mob/living/M)
M.dizziness = max(0,M.dizziness-5)
M.drowsyness = max(0,M.drowsyness-3)
- M.AdjustSleeping(-2)
+ M.AdjustSleeping(-2, 0)
if (M.bodytemperature > 310)//310 is the normal bodytemp. 310.055
M.bodytemperature = max(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT))
M.Jitter(5)
..()
- return
+ . = 1
/datum/reagent/consumable/icetea
name = "Iced Tea"
@@ -227,13 +230,13 @@
/datum/reagent/consumable/icetea/on_mob_life(mob/living/M)
M.dizziness = max(0,M.dizziness-2)
M.drowsyness = max(0,M.drowsyness-1)
- M.AdjustSleeping(-2)
+ M.AdjustSleeping(-2, 0)
if(M.getToxLoss() && prob(20))
- M.adjustToxLoss(-1)
+ M.adjustToxLoss(-1, 0)
if (M.bodytemperature > 310)//310 is the normal bodytemp. 310.055
M.bodytemperature = max(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT))
..()
- return
+ . = 1
/datum/reagent/consumable/space_cola
name = "Cola"
@@ -246,7 +249,6 @@
if (M.bodytemperature > 310)//310 is the normal bodytemp. 310.055
M.bodytemperature = max(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT))
..()
- return
/datum/reagent/consumable/nuka_cola
name = "Nuka Cola"
@@ -259,12 +261,12 @@
M.set_drugginess(30)
M.dizziness +=5
M.drowsyness = 0
- M.AdjustSleeping(-2)
+ M.AdjustSleeping(-2, 0)
M.status_flags |= GOTTAGOFAST
if (M.bodytemperature > 310)//310 is the normal bodytemp. 310.055
M.bodytemperature = max(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT))
..()
- return
+ . = 1
/datum/reagent/consumable/spacemountainwind
name = "SM Wind"
@@ -274,11 +276,12 @@
/datum/reagent/consumable/spacemountainwind/on_mob_life(mob/living/M)
M.drowsyness = max(0,M.drowsyness-7)
- M.AdjustSleeping(-1)
+ M.AdjustSleeping(-1, 0)
if (M.bodytemperature > 310)
M.bodytemperature = max(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT))
M.Jitter(5)
..()
+ . = 1
/datum/reagent/consumable/dr_gibb
name = "Dr. Gibb"
@@ -291,7 +294,6 @@
if (M.bodytemperature > 310)
M.bodytemperature = max(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT)) //310 is the normal bodytemp. 310.055
..()
- return
/datum/reagent/consumable/space_up
name = "Space-Up"
@@ -303,7 +305,6 @@
if (M.bodytemperature > 310)
M.bodytemperature = max(310, M.bodytemperature - (8 * TEMPERATURE_DAMAGE_COEFFICIENT)) //310 is the normal bodytemp. 310.055
..()
- return
/datum/reagent/consumable/lemon_lime
name = "Lemon Lime"
@@ -315,7 +316,6 @@
if (M.bodytemperature > 310)
M.bodytemperature = max(310, M.bodytemperature - (8 * TEMPERATURE_DAMAGE_COEFFICIENT)) //310 is the normal bodytemp. 310.055
..()
- return
/datum/reagent/consumable/sodawater
name = "Soda Water"
@@ -329,7 +329,6 @@
if (M.bodytemperature > 310)
M.bodytemperature = max(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT))
..()
- return
/datum/reagent/consumable/tonic
name = "Tonic Water"
@@ -340,11 +339,11 @@
/datum/reagent/consumable/tonic/on_mob_life(mob/living/M)
M.dizziness = max(0,M.dizziness-5)
M.drowsyness = max(0,M.drowsyness-3)
- M.AdjustSleeping(-2)
+ M.AdjustSleeping(-2, 0)
if (M.bodytemperature > 310)
M.bodytemperature = max(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT))
..()
- return
+ . = 1
/datum/reagent/consumable/ice
name = "Ice"
@@ -354,9 +353,8 @@
color = "#619494" // rgb: 97, 148, 148
/datum/reagent/consumable/ice/on_mob_life(mob/living/M)
- M.bodytemperature -= 5 * TEMPERATURE_DAMAGE_COEFFICIENT
+ M.bodytemperature = max( M.bodytemperature - 5 * TEMPERATURE_DAMAGE_COEFFICIENT, 0)
..()
- return
/datum/reagent/consumable/soy_latte
name = "Soy Latte"
@@ -367,14 +365,14 @@
/datum/reagent/consumable/soy_latte/on_mob_life(mob/living/M)
M.dizziness = max(0,M.dizziness-5)
M.drowsyness = max(0,M.drowsyness-3)
- M.SetSleeping(0)
+ M.SetSleeping(0, 0)
if (M.bodytemperature < 310)//310 is the normal bodytemp. 310.055
M.bodytemperature = min(310, M.bodytemperature + (5 * TEMPERATURE_DAMAGE_COEFFICIENT))
M.Jitter(5)
if(M.getBruteLoss() && prob(20))
- M.heal_organ_damage(1,0)
+ M.heal_organ_damage(1,0, 0)
..()
- return
+ . = 1
/datum/reagent/consumable/cafe_latte
name = "Cafe Latte"
@@ -385,14 +383,14 @@
/datum/reagent/consumable/cafe_latte/on_mob_life(mob/living/M)
M.dizziness = max(0,M.dizziness-5)
M.drowsyness = max(0,M.drowsyness-3)
- M.SetSleeping(0)
+ M.SetSleeping(0, 0)
if (M.bodytemperature < 310)//310 is the normal bodytemp. 310.055
M.bodytemperature = min(310, M.bodytemperature + (5 * TEMPERATURE_DAMAGE_COEFFICIENT))
M.Jitter(5)
if(M.getBruteLoss() && prob(20))
- M.heal_organ_damage(1,0)
+ M.heal_organ_damage(1,0, 0)
..()
- return
+ . = 1
/datum/reagent/consumable/doctor_delight
name = "The Doctor's Delight"
@@ -401,14 +399,15 @@
color = "#FF8CFF" // rgb: 255, 140, 255
/datum/reagent/consumable/doctor_delight/on_mob_life(mob/living/M)
- M.adjustBruteLoss(-0.5)
- M.adjustFireLoss(-0.5)
- M.adjustToxLoss(-0.5)
- M.adjustOxyLoss(-0.5)
+ M.adjustBruteLoss(-0.5, 0)
+ M.adjustFireLoss(-0.5, 0)
+ M.adjustToxLoss(-0.5, 0)
+ M.adjustOxyLoss(-0.5, 0)
if(M.nutrition && (M.nutrition - 2 > 0))
if(!(M.mind && M.mind.assigned_role == "Medical Doctor")) //Drains the nutrition of the holder. Not medical doctors though, since it's the Doctor's Delight!
M.nutrition -= 2
..()
+ . = 1
/datum/reagent/consumable/chocolatepudding
name = "Chocolate Pudding"
@@ -493,12 +492,13 @@
M.slurring += 3
switch(current_cycle)
if(51 to 200)
- M.AdjustSleeping(1)
+ M.Sleeping(5, 0)
+ . = 1
if(201 to INFINITY)
- M.AdjustSleeping(1)
- M.adjustToxLoss(2)
+ M.AdjustSleeping(2, 0)
+ M.adjustToxLoss(2, 0)
+ . = 1
..()
- return
/datum/reagent/consumable/gargle_blaster
name = "Pan-Galactic Gargle Blaster"
@@ -519,9 +519,9 @@
if(55 to 200)
M.set_drugginess(55)
if(200 to INFINITY)
- M.adjustToxLoss(2)
+ M.adjustToxLoss(2, 0)
+ . = 1
..()
- return
/datum/reagent/consumable/neurotoxin
name = "Neurotoxin"
@@ -530,7 +530,7 @@
color = "#2E2E61" // rgb: 46, 46, 97
/datum/reagent/consumable/neurotoxin/on_mob_life(mob/living/carbon/M)
- M.weakened = max(M.weakened, 3)
+ M.Weaken(3, 1, 0)
M.dizziness +=6
switch(current_cycle)
if(15 to 45)
@@ -543,9 +543,9 @@
if(55 to 200)
M.set_drugginess(55)
if(200 to INFINITY)
- M.adjustToxLoss(2)
+ M.adjustToxLoss(2, 0)
..()
- return
+ . = 1
/datum/reagent/consumable/hippies_delight
name = "Hippie's Delight"
@@ -583,6 +583,7 @@
if(prob(40))
M.emote(pick("twitch","giggle"))
if(prob(30))
- M.adjustToxLoss(2)
+ M.adjustToxLoss(2, 0)
+ . = 1
..()
- return
+
diff --git a/code/modules/reagents/chemistry/reagents/drug_reagents.dm b/code/modules/reagents/chemistry/reagents/drug_reagents.dm
index a19a67aaf369..c18c25c37e74 100644
--- a/code/modules/reagents/chemistry/reagents/drug_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/drug_reagents.dm
@@ -42,9 +42,10 @@
if(prob(1))
var/smoke_message = pick("You feel relaxed.", "You feel calmed.","You feel alert.","You feel rugged.")
M << "[smoke_message]"
- M.AdjustStunned(-1)
- M.adjustStaminaLoss(-0.5*REM)
+ M.AdjustStunned(-1, 0)
+ M.adjustStaminaLoss(-0.5*REM, 0)
..()
+ . = 1
/datum/reagent/drug/crank
name = "Crank"
@@ -59,34 +60,39 @@
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)
+ M.AdjustParalysis(-1, 0)
+ M.AdjustStunned(-1, 0)
+ M.AdjustWeakened(-1, 0)
..()
+ . = 1
/datum/reagent/drug/crank/overdose_process(mob/living/M)
M.adjustBrainLoss(2*REM)
- M.adjustToxLoss(2*REM)
- M.adjustBruteLoss(2*REM)
+ M.adjustToxLoss(2*REM, 0)
+ M.adjustBruteLoss(2*REM, 0)
..()
+ . = 1
/datum/reagent/drug/crank/addiction_act_stage1(mob/living/M)
M.adjustBrainLoss(5*REM)
..()
/datum/reagent/drug/crank/addiction_act_stage2(mob/living/M)
- M.adjustToxLoss(5*REM)
+ M.adjustToxLoss(5*REM, 0)
..()
+ . = 1
/datum/reagent/drug/crank/addiction_act_stage3(mob/living/M)
- M.adjustBruteLoss(5*REM)
+ M.adjustBruteLoss(5*REM, 0)
..()
+ . = 1
/datum/reagent/drug/crank/addiction_act_stage4(mob/living/M)
M.adjustBrainLoss(5*REM)
- M.adjustToxLoss(5*REM)
- M.adjustBruteLoss(5*REM)
+ M.adjustToxLoss(5*REM, 0)
+ M.adjustBruteLoss(5*REM, 0)
..()
+ . = 1
/datum/reagent/drug/krokodil
name = "Krokodil"
@@ -103,41 +109,40 @@
if(prob(5))
M << "[high_message]"
..()
- return
/datum/reagent/drug/krokodil/overdose_process(mob/living/M)
M.adjustBrainLoss(0.25*REM)
- M.adjustToxLoss(0.25*REM)
+ M.adjustToxLoss(0.25*REM, 0)
..()
- return
-
+ . = 1
/datum/reagent/drug/krokodil/addiction_act_stage1(mob/living/M)
M.adjustBrainLoss(2*REM)
- M.adjustToxLoss(2*REM)
+ M.adjustToxLoss(2*REM, 0)
..()
- return
+ . = 1
+
/datum/reagent/krokodil/addiction_act_stage2(mob/living/M)
if(prob(25))
M << "Your skin feels loose..."
..()
- return
+
/datum/reagent/drug/krokodil/addiction_act_stage3(mob/living/M)
if(prob(25))
M << "Your skin starts to peel away..."
- M.adjustBruteLoss(3*REM)
+ M.adjustBruteLoss(3*REM, 0)
..()
- return
+ . = 1
/datum/reagent/drug/krokodil/addiction_act_stage4(mob/living/carbon/human/M)
if(M.has_dna() && M.dna.species.id != "zombie")
M << "Your skin falls off easily!"
- M.adjustBruteLoss(50*REM) // holy shit your skin just FELL THE FUCK OFF
+ M.adjustBruteLoss(50*REM, 0) // holy shit your skin just FELL THE FUCK OFF
M.set_species(/datum/species/cosmetic_zombie)
else
- M.adjustBruteLoss(5*REM)
+ M.adjustBruteLoss(5*REM, 0)
..()
- return
+ . = 1
/datum/reagent/drug/methamphetamine
name = "Methamphetamine"
@@ -153,17 +158,17 @@
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.AdjustParalysis(-2, 0)
+ M.AdjustStunned(-2, 0)
+ M.AdjustWeakened(-2, 0)
+ M.adjustStaminaLoss(-2, 0)
M.status_flags |= GOTTAGOREALLYFAST
M.Jitter(2)
M.adjustBrainLoss(0.25)
if(prob(5))
M.emote(pick("twitch", "shiver"))
..()
- return
+ . = 1
/datum/reagent/drug/methamphetamine/overdose_process(mob/living/M)
if(M.canmove && !istype(M.loc, /atom/movable))
@@ -177,23 +182,23 @@
if(I)
M.drop_item()
..()
- M.adjustToxLoss(1)
+ M.adjustToxLoss(1, 0)
M.adjustBrainLoss(pick(0.5, 0.6, 0.7, 0.8, 0.9, 1))
- return
+ . = 1
/datum/reagent/drug/methamphetamine/addiction_act_stage1(mob/living/M)
M.Jitter(5)
if(prob(20))
M.emote(pick("twitch","drool","moan"))
..()
- return
+
/datum/reagent/drug/methamphetamine/addiction_act_stage2(mob/living/M)
M.Jitter(10)
M.Dizzy(10)
if(prob(30))
M.emote(pick("twitch","drool","moan"))
..()
- return
+
/datum/reagent/drug/methamphetamine/addiction_act_stage3(mob/living/M)
if(M.canmove && !istype(M.loc, /atom/movable))
for(var/i = 0, i < 4, i++)
@@ -203,18 +208,18 @@
if(prob(40))
M.emote(pick("twitch","drool","moan"))
..()
- return
+
/datum/reagent/drug/methamphetamine/addiction_act_stage4(mob/living/carbon/human/M)
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)
+ M.adjustToxLoss(5, 0)
if(prob(50))
M.emote(pick("twitch","drool","moan"))
..()
- return
+ . = 1
/datum/reagent/drug/bath_salts
name = "Bath Salts"
@@ -230,18 +235,18 @@
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.AdjustParalysis(-3, 0)
+ M.AdjustStunned(-3, 0)
+ M.AdjustWeakened(-3, 0)
+ M.adjustStaminaLoss(-5, 0)
M.adjustBrainLoss(0.5)
- M.adjustToxLoss(0.1)
+ M.adjustToxLoss(0.1, 0)
M.hallucination += 10
if(M.canmove && !istype(M.loc, /atom/movable))
step(M, pick(cardinal))
step(M, pick(cardinal))
..()
- return
+ . = 1
/datum/reagent/drug/bath_salts/overdose_process(mob/living/M)
M.hallucination += 10
@@ -255,7 +260,6 @@
if(I)
M.drop_item()
..()
- return
/datum/reagent/drug/bath_salts/addiction_act_stage1(mob/living/M)
M.hallucination += 10
@@ -267,7 +271,7 @@
if(prob(20))
M.emote(pick("twitch","drool","moan"))
..()
- return
+
/datum/reagent/drug/bath_salts/addiction_act_stage2(mob/living/M)
M.hallucination += 20
if(M.canmove && !istype(M.loc, /atom/movable))
@@ -279,7 +283,7 @@
if(prob(30))
M.emote(pick("twitch","drool","moan"))
..()
- return
+
/datum/reagent/drug/bath_salts/addiction_act_stage3(mob/living/M)
M.hallucination += 30
if(M.canmove && !istype(M.loc, /atom/movable))
@@ -291,7 +295,7 @@
if(prob(40))
M.emote(pick("twitch","drool","moan"))
..()
- return
+
/datum/reagent/drug/bath_salts/addiction_act_stage4(mob/living/carbon/human/M)
M.hallucination += 40
if(M.canmove && !istype(M.loc, /atom/movable))
@@ -299,12 +303,12 @@
step(M, pick(cardinal))
M.Jitter(50)
M.Dizzy(50)
- M.adjustToxLoss(5)
+ M.adjustToxLoss(5, 0)
M.adjustBrainLoss(10)
if(prob(50))
M.emote(pick("twitch","drool","moan"))
..()
- return
+ . = 1
/datum/reagent/drug/aranesp
name = "Aranesp"
@@ -317,10 +321,10 @@
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)
+ M.adjustStaminaLoss(-18, 0)
+ M.adjustToxLoss(0.5, 0)
if(prob(50))
M.losebreath++
- M.adjustOxyLoss(1)
+ M.adjustOxyLoss(1, 0)
..()
- return
+ . = 1
diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm
index f14bf7e2de77..835f3f4f2051 100644
--- a/code/modules/reagents/chemistry/reagents/food_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm
@@ -27,9 +27,9 @@
/datum/reagent/consumable/nutriment/on_mob_life(mob/living/M)
if(prob(50))
- M.heal_organ_damage(1,0)
+ M.heal_organ_damage(1,0, 0)
+ . = 1
..()
- return
/datum/reagent/consumable/vitamin
name = "Vitamin"
@@ -40,11 +40,11 @@
/datum/reagent/consumable/vitamin/on_mob_life(mob/living/M)
if(prob(50))
- M.heal_organ_damage(1,1)
+ M.heal_organ_damage(1,1, 0)
+ . = 1
if(M.satiety < 600)
M.satiety += 30
..()
- return
/datum/reagent/consumable/sugar
name = "Sugar"
@@ -58,11 +58,13 @@
/datum/reagent/consumable/sugar/overdose_start(mob/living/M)
M << "You go into hyperglycaemic shock! Lay off the twinkies!"
- M.AdjustSleeping(30)
+ M.AdjustSleeping(30, 0)
+ . = 1
/datum/reagent/consumable/sugar/overdose_process(mob/living/M)
- M.AdjustSleeping(3)
+ M.AdjustSleeping(3, 0)
..()
+ . = 1
/datum/reagent/consumable/virus_food
name = "Virus Food"
@@ -113,7 +115,6 @@
if(isslime(M))
M.bodytemperature += rand(20,25)
..()
- return
/datum/reagent/consumable/frostoil
name = "Frost Oil"
@@ -146,7 +147,6 @@
if(isslime(M))
M.bodytemperature -= rand(20,25)
..()
- return
/datum/reagent/consumable/frostoil/reaction_turf(turf/simulated/T, reac_volume)
if(reac_volume >= 5)
@@ -202,22 +202,22 @@
else if ( mouth_covered ) // Reduced effects if partially protected
if(prob(5))
victim.emote("scream")
- victim.adjust_blurriness(3)
- victim.adjust_blindness(1)
+ victim.blur_eyes(3)
+ victim.blind_eyes(2)
victim.confused = max(M.confused, 3)
victim.damageoverlaytemp = 60
victim.Weaken(3)
victim.drop_item()
return
else if ( eyes_covered ) // Eye cover is better than mouth cover
- victim.adjust_blurriness(3)
+ victim.blur_eyes(3)
victim.damageoverlaytemp = 30
return
else // Oh dear :D
if(prob(5))
victim.emote("scream")
- victim.adjust_blurriness(5)
- victim.adjust_blindness(2)
+ victim.blur_eyes(5)
+ victim.blind_eyes(3)
victim.confused = max(M.confused, 6)
victim.damageoverlaytemp = 75
victim.Weaken(5)
@@ -228,7 +228,6 @@
if(prob(5))
M.visible_message("[M] [pick("dry heaves!","coughs!","splutters!")]")
..()
- return
/datum/reagent/consumable/sodiumchloride
name = "Table Salt"
@@ -302,9 +301,8 @@
/datum/reagent/consumable/sprinkles/on_mob_life(mob/living/M)
if(istype(M, /mob/living/carbon/human) && M.job in list("Security Officer", "Head of Security", "Detective", "Warden"))
- M.heal_organ_damage(1,1)
- ..()
- return
+ M.heal_organ_damage(1,1, 0)
+ . = 1
..()
/datum/reagent/consumable/cornoil
@@ -351,7 +349,6 @@
if (M.bodytemperature < 310)//310 is the normal bodytemp. 310.055
M.bodytemperature = min(310, M.bodytemperature + (10 * TEMPERATURE_DAMAGE_COEFFICIENT))
..()
- return
/datum/reagent/consumable/hell_ramen
name = "Hell Ramen"
@@ -363,7 +360,6 @@
/datum/reagent/consumable/hell_ramen/on_mob_life(mob/living/M)
M.bodytemperature += 10 * TEMPERATURE_DAMAGE_COEFFICIENT
..()
- return
/datum/reagent/consumable/flour
name = "Flour"
diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
index f00e7eb4062c..a1c029ba67ad 100644
--- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
@@ -34,26 +34,26 @@
/datum/reagent/medicine/adminordrazine/on_mob_life(mob/living/carbon/M)
M.reagents.remove_all_type(/datum/reagent/toxin, 5*REM, 0, 1)
- M.setCloneLoss(0)
- M.setOxyLoss(0)
+ M.setCloneLoss(0, 0)
+ M.setOxyLoss(0, 0)
M.radiation = 0
- M.heal_organ_damage(5,5)
- M.adjustToxLoss(-5)
+ M.heal_organ_damage(5,5, 0)
+ M.adjustToxLoss(-5, 0)
M.hallucination = 0
M.setBrainLoss(0)
M.disabilities = 0
M.set_blurriness(0)
M.set_blindness(0)
- M.SetWeakened(0)
- M.SetStunned(0)
- M.SetParalysis(0)
+ M.SetWeakened(0, 0)
+ M.SetStunned(0, 0)
+ M.SetParalysis(0, 0)
M.silent = 0
M.dizziness = 0
M.drowsyness = 0
M.stuttering = 0
M.slurring = 0
M.confused = 0
- M.SetSleeping(0)
+ M.SetSleeping(0, 0)
M.jitteriness = 0
for(var/datum/disease/D in M.viruses)
if(D.severity == NONTHREAT)
@@ -63,7 +63,7 @@
if(D.stage < 1)
D.cure()
..()
- return
+ . = 1
/datum/reagent/medicine/adminordrazine/nanites
name = "Nanites"
@@ -78,16 +78,16 @@
/datum/reagent/medicine/synaptizine/on_mob_life(mob/living/M)
M.drowsyness = max(M.drowsyness-5, 0)
- M.AdjustParalysis(-1)
- M.AdjustStunned(-1)
- M.AdjustWeakened(-1)
+ M.AdjustParalysis(-1, 0)
+ M.AdjustStunned(-1, 0)
+ M.AdjustWeakened(-1, 0)
if(holder.has_reagent("mindbreaker"))
holder.remove_reagent("mindbreaker", 5)
M.hallucination = max(0, M.hallucination - 10)
if(prob(30))
- M.adjustToxLoss(1)
+ M.adjustToxLoss(1, 0)
..()
- return
+ . = 1
/datum/reagent/medicine/inacusiate
name = "Inacusiate"
@@ -98,7 +98,6 @@
/datum/reagent/medicine/inacusiate/on_mob_life(mob/living/M)
M.setEarDamage(0,0)
..()
- return
/datum/reagent/medicine/cryoxadone
name = "Cryoxadone"
@@ -107,27 +106,33 @@
color = "#0000C8"
/datum/reagent/medicine/cryoxadone/on_mob_life(mob/living/M)
- if(M.stat != DEAD && M.bodytemperature < T0C) // Low temperatures are required to take effect.
- M.status_flags &= ~DISFIGURED
- M.adjustCloneLoss(-1)
- M.adjustOxyLoss(-5)
- M.adjustBruteLoss(-1)
- M.adjustFireLoss(-1)
- M.adjustToxLoss(-1)
- if(M.stat != DEAD && M.bodytemperature < 225) // At lower temperatures (cryo) the full effect is boosted
- M.adjustCloneLoss(-1)
- M.adjustOxyLoss(-2)
- M.adjustBruteLoss(-2)
- M.adjustFireLoss(-2)
- M.adjustToxLoss(-2)
- if(M.stat != DEAD && M.bodytemperature < 100) // At extreme temperatures (upgraded cryo) the effect is greatly increased.
- M.adjustCloneLoss(-5)
- M.adjustOxyLoss(-2)
- M.adjustBruteLoss(-2)
- M.adjustFireLoss(-2)
- M.adjustToxLoss(-2)
+ switch(M.bodytemperature) // Low temperatures are required to take effect.
+ if(0 to 100) // At extreme temperatures (upgraded cryo) the effect is greatly increased.
+ M.status_flags &= ~DISFIGURED
+ M.adjustCloneLoss(-7, 0)
+ M.adjustOxyLoss(-9, 0)
+ M.adjustBruteLoss(-5, 0)
+ M.adjustFireLoss(-5, 0)
+ M.adjustToxLoss(-5, 0)
+ . = 1
+ if(100 to 225) // At lower temperatures (cryo) the full effect is boosted
+ M.status_flags &= ~DISFIGURED
+ M.adjustCloneLoss(-2, 0)
+ M.adjustOxyLoss(-7, 0)
+ M.adjustBruteLoss(-3, 0)
+ M.adjustFireLoss(-3, 0)
+ M.adjustToxLoss(-3, 0)
+ . = 1
+ if(225 to T0C)
+ M.status_flags &= ~DISFIGURED
+ M.adjustCloneLoss(-1, 0)
+ M.adjustOxyLoss(-5, 0)
+ M.adjustBruteLoss(-1, 0)
+ M.adjustFireLoss(-1, 0)
+ M.adjustToxLoss(-1, 0)
+ . = 1
..()
- return
+
/datum/reagent/medicine/rezadone
name = "Rezadone"
@@ -139,17 +144,17 @@
/datum/reagent/medicine/rezadone/on_mob_life(mob/living/M)
M.setCloneLoss(0) //Rezadone is almost never used in favor of cryoxadone. Hopefully this will change that.
- M.heal_organ_damage(1,1)
+ M.heal_organ_damage(1,1, 0)
M.status_flags &= ~DISFIGURED
..()
- return
+ . = 1
/datum/reagent/medicine/rezadone/overdose_process(mob/living/M)
- M.adjustToxLoss(1)
+ M.adjustToxLoss(1, 0)
M.Dizzy(5)
M.Jitter(5)
..()
- return
+ . = 1
/datum/reagent/medicine/spaceacillin
name = "Spaceacillin"
@@ -180,8 +185,9 @@
..()
/datum/reagent/medicine/silver_sulfadiazine/on_mob_life(mob/living/M)
- M.adjustFireLoss(-2*REM)
+ M.adjustFireLoss(-2*REM, 0)
..()
+ . = 1
/datum/reagent/medicine/oxandrolone
name = "Oxandrolone"
@@ -194,17 +200,17 @@
/datum/reagent/medicine/oxandrolone/on_mob_life(mob/living/M)
if(M.getFireLoss() > 50)
- M.adjustFireLoss(-4*REM) //Twice as effective as silver sulfadiazine for severe burns
+ M.adjustFireLoss(-4*REM, 0) //Twice as effective as silver sulfadiazine for severe burns
else
- M.adjustFireLoss(-0.5*REM) //But only a quarter as effective for more minor ones
+ M.adjustFireLoss(-0.5*REM, 0) //But only a quarter as effective for more minor ones
..()
- return
+ . = 1
/datum/reagent/medicine/oxandrolone/overdose_process(mob/living/M)
if(M.getFireLoss()) //It only makes existing burns worse
- M.adjustFireLoss(4.5*REM) // it's going to be healing either 4 or 0.5
+ M.adjustFireLoss(4.5*REM, 0) // it's going to be healing either 4 or 0.5
+ . = 1
..()
- return
/datum/reagent/medicine/styptic_powder
name = "Styptic Powder"
@@ -228,8 +234,9 @@
/datum/reagent/medicine/styptic_powder/on_mob_life(mob/living/M)
- M.adjustBruteLoss(-2*REM)
+ M.adjustBruteLoss(-2*REM, 0)
..()
+ . = 1
/datum/reagent/medicine/salglu_solution
name = "Saline-Glucose Solution"
@@ -241,8 +248,9 @@
/datum/reagent/medicine/salglu_solution/on_mob_life(mob/living/M)
if(prob(33))
- M.adjustBruteLoss(-0.5*REM)
- M.adjustFireLoss(-0.5*REM)
+ M.adjustBruteLoss(-0.5*REM, 0)
+ M.adjustFireLoss(-0.5*REM, 0)
+ . = 1
..()
/datum/reagent/medicine/salglu_solution/reaction_mob(mob/living/M, method=TOUCH, reac_volume, show_message = 1)
@@ -267,9 +275,10 @@
if(iscarbon(M))
var/mob/living/carbon/N = M
N.hal_screwyhud = 5
- M.adjustBruteLoss(-0.25*REM)
- M.adjustFireLoss(-0.25*REM)
+ M.adjustBruteLoss(-0.25*REM, 0)
+ M.adjustFireLoss(-0.25*REM, 0)
..()
+ . = 1
/datum/reagent/medicine/mine_salve/reaction_mob(mob/living/M, method=TOUCH, reac_volume, show_message = 1)
if(iscarbon(M) && M.stat != DEAD)
@@ -314,12 +323,12 @@
metabolization_rate = 0.5 * REAGENTS_METABOLISM
/datum/reagent/medicine/charcoal/on_mob_life(mob/living/M)
- M.adjustToxLoss(-2*REM)
+ M.adjustToxLoss(-2*REM, 0)
+ . = 1
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"
@@ -331,20 +340,20 @@
overdose_threshold = 30
/datum/reagent/medicine/omnizine/on_mob_life(mob/living/M)
- M.adjustToxLoss(-0.5*REM)
- M.adjustOxyLoss(-0.5*REM)
- M.adjustBruteLoss(-0.5*REM)
- M.adjustFireLoss(-0.5*REM)
+ M.adjustToxLoss(-0.5*REM, 0)
+ M.adjustOxyLoss(-0.5*REM, 0)
+ M.adjustBruteLoss(-0.5*REM, 0)
+ M.adjustFireLoss(-0.5*REM, 0)
..()
- return
+ . = 1
/datum/reagent/medicine/omnizine/overdose_process(mob/living/M)
- M.adjustToxLoss(1.5*REM)
- M.adjustOxyLoss(1.5*REM)
- M.adjustBruteLoss(1.5*REM)
- M.adjustFireLoss(1.5*REM)
+ M.adjustToxLoss(1.5*REM, 0)
+ M.adjustOxyLoss(1.5*REM, 0)
+ M.adjustBruteLoss(1.5*REM, 0)
+ M.adjustFireLoss(1.5*REM, 0)
..()
- return
+ . = 1
/datum/reagent/medicine/calomel
name = "Calomel"
@@ -359,9 +368,9 @@
if(R != src)
M.reagents.remove_reagent(R.id,2.5)
if(M.health > 20)
- M.adjustToxLoss(2.5*REM)
+ M.adjustToxLoss(2.5*REM, 0)
+ . = 1
..()
- return
/datum/reagent/medicine/potass_iodide
name = "Potassium Iodide"
@@ -374,10 +383,7 @@
/datum/reagent/medicine/potass_iodide/on_mob_life(mob/living/M)
if(M.radiation > 0)
M.radiation--
- if(M.radiation < 0)
- M.radiation = 0
..()
- return
/datum/reagent/medicine/pen_acid
name = "Pentetic Acid"
@@ -390,14 +396,14 @@
/datum/reagent/medicine/pen_acid/on_mob_life(mob/living/M)
if(M.radiation > 0)
M.radiation -= 4
- M.adjustToxLoss(-2*REM)
+ M.adjustToxLoss(-2*REM, 0)
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
+ . = 1
/datum/reagent/medicine/sal_acid
name = "Salicyclic Acid"
@@ -411,16 +417,17 @@
/datum/reagent/medicine/sal_acid/on_mob_life(mob/living/M)
if(M.getBruteLoss() > 50)
- M.adjustBruteLoss(-4*REM) //Twice as effective as styptic powder for severe bruising
+ M.adjustBruteLoss(-4*REM, 0) //Twice as effective as styptic powder for severe bruising
else
- M.adjustBruteLoss(-0.5*REM) //But only a quarter as effective for more minor ones
+ M.adjustBruteLoss(-0.5*REM, 0) //But only a quarter as effective for more minor ones
..()
- return
+ . = 1
+
/datum/reagent/medicine/sal_acid/overdose_process(mob/living/M)
if(M.getBruteLoss()) //It only makes existing bruises worse
- M.adjustBruteLoss(4.5*REM) // it's going to be healing either 4 or 0.5
+ M.adjustBruteLoss(4.5*REM, 0) // it's going to be healing either 4 or 0.5
+ . = 1
..()
- return
/datum/reagent/medicine/salbutamol
name = "Salbutamol"
@@ -431,11 +438,11 @@
metabolization_rate = 0.25 * REAGENTS_METABOLISM
/datum/reagent/medicine/salbutamol/on_mob_life(mob/living/M)
- M.adjustOxyLoss(-3*REM)
+ M.adjustOxyLoss(-3*REM, 0)
if(M.losebreath >= 4)
M.losebreath -= 2
..()
- return
+ . = 1
/datum/reagent/medicine/perfluorodecalin
name = "Perfluorodecalin"
@@ -446,13 +453,13 @@
metabolization_rate = 0.25 * REAGENTS_METABOLISM
/datum/reagent/medicine/perfluorodecalin/on_mob_life(mob/living/carbon/human/M)
- M.adjustOxyLoss(-12*REM)
+ M.adjustOxyLoss(-12*REM, 0)
M.silent = max(M.silent, 5)
if(prob(33))
- M.adjustBruteLoss(-0.5*REM)
- M.adjustFireLoss(-0.5*REM)
+ M.adjustBruteLoss(-0.5*REM, 0)
+ M.adjustFireLoss(-0.5*REM, 0)
..()
- return
+ . = 1
/datum/reagent/medicine/ephedrine
name = "Ephedrine"
@@ -466,44 +473,47 @@
/datum/reagent/medicine/ephedrine/on_mob_life(mob/living/M)
M.status_flags |= GOTTAGOFAST
- M.AdjustParalysis(-1)
- M.AdjustStunned(-1)
- M.AdjustWeakened(-1)
- M.adjustStaminaLoss(-1*REM)
+ M.AdjustParalysis(-1, 0)
+ M.AdjustStunned(-1, 0)
+ M.AdjustWeakened(-1, 0)
+ M.adjustStaminaLoss(-1*REM, 0)
..()
- return
+ . = 1
/datum/reagent/medicine/ephedrine/overdose_process(mob/living/M)
if(prob(33))
- M.adjustToxLoss(0.5*REM)
+ M.adjustToxLoss(0.5*REM, 0)
M.losebreath++
+ . = 1
..()
- return
/datum/reagent/medicine/ephedrine/addiction_act_stage1(mob/living/M)
if(prob(33))
- M.adjustToxLoss(2*REM)
+ M.adjustToxLoss(2*REM, 0)
M.losebreath += 2
+ . = 1
..()
- return
+
/datum/reagent/medicine/ephedrine/addiction_act_stage2(mob/living/M)
if(prob(33))
- M.adjustToxLoss(3*REM)
+ M.adjustToxLoss(3*REM, 0)
M.losebreath += 3
+ . = 1
..()
- return
+
/datum/reagent/medicine/ephedrine/addiction_act_stage3(mob/living/M)
if(prob(33))
- M.adjustToxLoss(4*REM)
+ M.adjustToxLoss(4*REM, 0)
M.losebreath += 4
+ . = 1
..()
- return
+
/datum/reagent/medicine/ephedrine/addiction_act_stage4(mob/living/M)
if(prob(33))
- M.adjustToxLoss(5*REM)
+ M.adjustToxLoss(5*REM, 0)
M.losebreath += 5
+ . = 1
..()
- return
/datum/reagent/medicine/diphenhydramine
name = "Diphenhydramine"
@@ -519,7 +529,6 @@
M.jitteriness -= 1
M.reagents.remove_reagent("histamine",3)
..()
- return
/datum/reagent/medicine/morphine
name = "Morphine"
@@ -531,15 +540,16 @@
overdose_threshold = 30
addiction_threshold = 25
-
/datum/reagent/medicine/morphine/on_mob_life(mob/living/M)
M.status_flags |= IGNORESLOWDOWN
- if(current_cycle == 11)
- M << "You start to feel tired..." //Warning when the victim is starting to pass out
- if(current_cycle >= 12 && current_cycle < 24)
- M.drowsyness += 1
- else if(current_cycle >= 24)
- M.AdjustSleeping(1)
+ switch(current_cycle)
+ if(11)
+ M << "You start to feel tired..." //Warning when the victim is starting to pass out
+ if(12 to 24)
+ M.drowsyness += 1
+ if(24 to INFINITY)
+ M.Sleeping(2, 0)
+ . = 1
..()
/datum/reagent/medicine/morphine/overdose_process(mob/living/M)
@@ -565,31 +575,33 @@
var/obj/item/I = M.get_active_hand()
if(I)
M.drop_item()
- M.adjustToxLoss(1*REM)
+ M.adjustToxLoss(1*REM, 0)
+ . = 1
M.Dizzy(3)
M.Jitter(3)
..()
- return
+
/datum/reagent/medicine/morphine/addiction_act_stage3(mob/living/M)
if(prob(33))
var/obj/item/I = M.get_active_hand()
if(I)
M.drop_item()
- M.adjustToxLoss(2*REM)
+ M.adjustToxLoss(2*REM, 0)
+ . = 1
M.Dizzy(4)
M.Jitter(4)
..()
- return
+
/datum/reagent/medicine/morphine/addiction_act_stage4(mob/living/M)
if(prob(33))
var/obj/item/I = M.get_active_hand()
if(I)
M.drop_item()
- M.adjustToxLoss(3*REM)
+ M.adjustToxLoss(3*REM, 0)
+ . = 1
M.Dizzy(5)
M.Jitter(5)
..()
- return
/datum/reagent/medicine/oculine
name = "Oculine"
@@ -618,7 +630,6 @@
else if(M.eye_damage > 0)
M.adjust_eye_damage(-1)
..()
- return
/datum/reagent/medicine/atropine
name = "Atropine"
@@ -631,23 +642,23 @@
/datum/reagent/medicine/atropine/on_mob_life(mob/living/M)
if(M.health < 0)
- M.adjustToxLoss(-2*REM)
- M.adjustBruteLoss(-2*REM)
- M.adjustFireLoss(-2*REM)
- M.adjustOxyLoss(-5*REM)
+ M.adjustToxLoss(-2*REM, 0)
+ M.adjustBruteLoss(-2*REM, 0)
+ M.adjustFireLoss(-2*REM, 0)
+ M.adjustOxyLoss(-5*REM, 0)
+ . = 1
M.losebreath = 0
if(prob(20))
M.Dizzy(5)
M.Jitter(5)
..()
- return
/datum/reagent/medicine/atropine/overdose_process(mob/living/M)
- M.adjustToxLoss(0.5*REM)
+ M.adjustToxLoss(0.5*REM, 0)
+ . = 1
M.Dizzy(1)
M.Jitter(1)
..()
- return
/datum/reagent/medicine/epinephrine
name = "Epinephrine"
@@ -660,31 +671,30 @@
/datum/reagent/medicine/epinephrine/on_mob_life(mob/living/M)
if(M.health < 0)
- M.adjustToxLoss(-0.5*REM)
- M.adjustBruteLoss(-0.5*REM)
- M.adjustFireLoss(-0.5*REM)
+ M.adjustToxLoss(-0.5*REM, 0)
+ M.adjustBruteLoss(-0.5*REM, 0)
+ M.adjustFireLoss(-0.5*REM, 0)
if(M.oxyloss > 35)
- M.setOxyLoss(35)
+ M.setOxyLoss(35, 0)
if(M.losebreath >= 4)
M.losebreath -= 2
if(M.losebreath < 0)
M.losebreath = 0
- M.adjustStaminaLoss(-0.5*REM)
+ M.adjustStaminaLoss(-0.5*REM, 0)
+ . = 1
if(prob(20))
- M.AdjustParalysis(-1)
- M.AdjustStunned(-1)
- M.AdjustWeakened(-1)
+ M.AdjustParalysis(-1, 0)
+ M.AdjustStunned(-1, 0)
+ M.AdjustWeakened(-1, 0)
..()
- return
/datum/reagent/medicine/epinephrine/overdose_process(mob/living/M)
if(prob(33))
- M.adjustStaminaLoss(2.5*REM)
- M.adjustToxLoss(1*REM)
+ M.adjustStaminaLoss(2.5*REM, 0)
+ M.adjustToxLoss(1*REM, 0)
M.losebreath++
+ . = 1
..()
- return
-
/datum/reagent/medicine/strange_reagent
name = "Strange Reagent"
@@ -714,13 +724,12 @@
M.emote("gasp")
add_logs(M, M, "revived", src)
..()
- return
/datum/reagent/medicine/strange_reagent/on_mob_life(mob/living/M)
- M.adjustBruteLoss(0.5*REM)
- M.adjustFireLoss(0.5*REM)
+ M.adjustBruteLoss(0.5*REM, 0)
+ M.adjustFireLoss(0.5*REM, 0)
..()
- return
+ . = 1
/datum/reagent/medicine/mannitol
name = "Mannitol"
@@ -731,7 +740,6 @@
/datum/reagent/medicine/mannitol/on_mob_life(mob/living/M)
M.adjustBrainLoss(-3*REM)
..()
- return
/datum/reagent/medicine/mutadone
name = "Mutadone"
@@ -744,7 +752,6 @@
if(M.has_dna())
M.dna.remove_all_mutations()
..()
- return
/datum/reagent/medicine/antihol
name = "Antihol"
@@ -758,8 +765,9 @@
M.slurring = 0
M.confused = 0
M.reagents.remove_all_type(/datum/reagent/consumable/ethanol, 3*REM, 0, 1)
- M.adjustToxLoss(-0.2*REM)
+ M.adjustToxLoss(-0.2*REM, 0)
..()
+ . = 1
/datum/reagent/medicine/stimulants
name = "Stimulants"
@@ -772,23 +780,24 @@
/datum/reagent/medicine/stimulants/on_mob_life(mob/living/M)
M.status_flags |= GOTTAGOFAST
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(-3)
- M.AdjustStunned(-3)
- M.AdjustWeakened(-3)
- M.adjustStaminaLoss(-5*REM)
+ M.adjustOxyLoss(-1*REM, 0)
+ M.adjustToxLoss(-1*REM, 0)
+ M.adjustBruteLoss(-1*REM, 0)
+ M.adjustFireLoss(-1*REM, 0)
+ M.AdjustParalysis(-3, 0)
+ M.AdjustStunned(-3, 0)
+ M.AdjustWeakened(-3, 0)
+ M.adjustStaminaLoss(-5*REM, 0)
..()
+ . = 1
/datum/reagent/medicine/stimulants/overdose_process(mob/living/M)
if(prob(33))
- M.adjustStaminaLoss(2.5*REM)
- M.adjustToxLoss(1*REM)
+ M.adjustStaminaLoss(2.5*REM, 0)
+ M.adjustToxLoss(1*REM, 0)
M.losebreath++
+ . = 1
..()
- return
/datum/reagent/medicine/stimulants/longterm
name = "Stimulants"
@@ -800,30 +809,33 @@
addiction_threshold = 5
/datum/reagent/medicine/stimulants/longterm/addiction_act_stage1(mob/living/M)
- M.adjustToxLoss(5*REM)
- M.adjustStaminaLoss(5*REM)
+ M.adjustToxLoss(5*REM, 0)
+ M.adjustStaminaLoss(5*REM, 0)
..()
- return
+ . = 1
+
/datum/reagent/medicine/stimulants/longterm/addiction_act_stage2(mob/living/M)
- M.adjustToxLoss(6*REM)
- M.adjustStaminaLoss(5*REM)
- M.Stun(2)
+ M.adjustToxLoss(6*REM, 0)
+ M.adjustStaminaLoss(5*REM, 0)
+ M.Stun(2, 0)
..()
- return
+ . = 1
+
/datum/reagent/medicine/stimulants/longterm/addiction_act_stage3(mob/living/M)
- M.adjustToxLoss(7*REM)
- M.adjustStaminaLoss(5*REM)
+ M.adjustToxLoss(7*REM, 0)
+ M.adjustStaminaLoss(5*REM, 0)
M.adjustBrainLoss(1*REM)
- M.Stun(2)
+ M.Stun(2, 0)
..()
- return
+ . = 1
+
/datum/reagent/medicine/stimulants/longterm/addiction_act_stage4(mob/living/M)
- M.adjustToxLoss(8*REM)
- M.adjustStaminaLoss(5*REM)
+ M.adjustToxLoss(8*REM, 0)
+ M.adjustStaminaLoss(5*REM, 0)
M.adjustBrainLoss(2*REM)
- M.Stun(2)
+ M.Stun(2, 0)
..()
- return
+ . = 1
/datum/reagent/medicine/insulin
name = "Insulin"
@@ -835,10 +847,10 @@
/datum/reagent/medicine/insulin/on_mob_life(mob/living/M)
if(M.sleeping)
- M.AdjustSleeping(-1)
+ M.AdjustSleeping(-1, 0)
+ . = 1
M.reagents.remove_reagent("sugar", 3)
..()
- return
//Trek Chems, used primarily by medibots. Only heals a specific damage type, but is very efficient.
datum/reagent/medicine/bicaridine
@@ -850,14 +862,14 @@ datum/reagent/medicine/bicaridine
overdose_threshold = 30
datum/reagent/medicine/bicaridine/on_mob_life(mob/living/M)
- M.adjustBruteLoss(-2*REM)
+ M.adjustBruteLoss(-2*REM, 0)
..()
- return
+ . = 1
datum/reagent/medicine/bicaridine/overdose_process(mob/living/M)
- M.adjustBruteLoss(4*REM)
+ M.adjustBruteLoss(4*REM, 0)
..()
- return
+ . = 1
datum/reagent/medicine/dexalin
name = "Dexalin"
@@ -868,14 +880,14 @@ datum/reagent/medicine/dexalin
overdose_threshold = 30
datum/reagent/medicine/dexalin/on_mob_life(mob/living/M)
- M.adjustOxyLoss(-2*REM)
+ M.adjustOxyLoss(-2*REM, 0)
..()
- return
+ . = 1
datum/reagent/medicine/dexalin/overdose_process(mob/living/M)
- M.adjustOxyLoss(4*REM)
+ M.adjustOxyLoss(4*REM, 0)
..()
- return
+ . = 1
datum/reagent/medicine/kelotane
name = "Kelotane"
@@ -886,15 +898,14 @@ datum/reagent/medicine/kelotane
overdose_threshold = 30
datum/reagent/medicine/kelotane/on_mob_life(mob/living/M)
- M.adjustFireLoss(-2*REM)
+ M.adjustFireLoss(-2*REM, 0)
..()
- return
+ . = 1
datum/reagent/medicine/kelotane/overdose_process(mob/living/M)
- M.adjustFireLoss(4*REM)
+ M.adjustFireLoss(4*REM, 0)
..()
- return
-
+ . = 1
datum/reagent/medicine/antitoxin
name = "Anti-Toxin"
@@ -905,18 +916,17 @@ datum/reagent/medicine/antitoxin
overdose_threshold = 30
datum/reagent/medicine/antitoxin/on_mob_life(mob/living/M)
- M.adjustToxLoss(-2*REM)
+ M.adjustToxLoss(-2*REM, 0)
for(var/datum/reagent/toxin/R in M.reagents.reagent_list)
if(R != src)
M.reagents.remove_reagent(R.id,1)
..()
- return
+ . = 1
datum/reagent/medicine/antitoxin/overdose_process(mob/living/M)
- M.adjustToxLoss(4*REM) // End result is 2 toxin loss taken, because it heals 2 and then removes 4.
+ M.adjustToxLoss(4*REM, 0) // End result is 2 toxin loss taken, because it heals 2 and then removes 4.
..()
- return
-
+ . = 1
datum/reagent/medicine/inaprovaline
name = "Inaprovaline"
@@ -929,7 +939,6 @@ datum/reagent/medicine/inaprovaline/on_mob_life(mob/living/M)
if(M.losebreath >= 5)
M.losebreath -= 5
..()
- return
datum/reagent/medicine/tricordrazine
name = "Tricordrazine"
@@ -941,20 +950,20 @@ datum/reagent/medicine/tricordrazine
datum/reagent/medicine/tricordrazine/on_mob_life(mob/living/M)
if(prob(80))
- M.adjustBruteLoss(-1*REM)
- M.adjustFireLoss(-1*REM)
- M.adjustOxyLoss(-1*REM)
- M.adjustToxLoss(-1*REM)
+ M.adjustBruteLoss(-1*REM, 0)
+ M.adjustFireLoss(-1*REM, 0)
+ M.adjustOxyLoss(-1*REM, 0)
+ M.adjustToxLoss(-1*REM, 0)
+ . = 1
..()
- return
datum/reagent/medicine/tricordrazine/overdose_process(mob/living/M)
- M.adjustToxLoss(2*REM)
- M.adjustOxyLoss(2*REM)
- M.adjustBruteLoss(2*REM)
- M.adjustFireLoss(2*REM)
+ M.adjustToxLoss(2*REM, 0)
+ M.adjustOxyLoss(2*REM, 0)
+ M.adjustBruteLoss(2*REM, 0)
+ M.adjustFireLoss(2*REM, 0)
..()
- return
+ . = 1
datum/reagent/medicine/syndicate_nanites //Used exclusively by Syndicate medical cyborgs
name = "Restorative Nanites"
@@ -964,14 +973,14 @@ datum/reagent/medicine/syndicate_nanites //Used exclusively by Syndicate medical
color = "#555555"
datum/reagent/medicine/syndicate_nanites/on_mob_life(mob/living/M)
- M.adjustBruteLoss(-5*REM) //A ton of healing - this is a 50 telecrystal investment.
- M.adjustFireLoss(-5*REM)
- M.adjustOxyLoss(-15)
- M.adjustToxLoss(-5*REM)
+ M.adjustBruteLoss(-5*REM, 0) //A ton of healing - this is a 50 telecrystal investment.
+ M.adjustFireLoss(-5*REM, 0)
+ M.adjustOxyLoss(-15, 0)
+ M.adjustToxLoss(-5*REM, 0)
M.adjustBrainLoss(-15*REM)
- M.adjustCloneLoss(-3*REM)
+ M.adjustCloneLoss(-3*REM, 0)
..()
- return
+ . = 1
/datum/reagent/medicine/haloperidol
name = "Haloperidol"
@@ -991,6 +1000,6 @@ datum/reagent/medicine/syndicate_nanites/on_mob_life(mob/living/M)
M.hallucination -= 5
if(prob(20))
M.adjustBrainLoss(1*REM)
- M.adjustStaminaLoss(2.5*REM)
+ M.adjustStaminaLoss(2.5*REM, 0)
..()
- return
+ . = 1
diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm
index 421fce223b5d..cac735daf985 100644
--- a/code/modules/reagents/chemistry/reagents/other_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm
@@ -180,11 +180,13 @@
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
+ if(!M.stuttering)
+ M.stuttering = 1
M.stuttering += 4
M.Dizzy(5)
if(data >= 75 && prob(33)) // 30 units, 135 seconds
- if (!M.confused) M.confused = 1
+ if (!M.confused)
+ M.confused = 1
M.confused += 3
if((is_handofgod_cultist(M) && !is_handofgod_prophet(M)))
ticker.mode.remove_hog_follower(M.mind)
@@ -194,7 +196,6 @@
M.confused = 0
return
holder.remove_reagent(src.id, 0.4) //fixed consumption to prevent balancing going out of whack
- return
/datum/reagent/water/holywater/reaction_turf(turf/simulated/T, reac_volume)
..()
@@ -214,15 +215,16 @@
if(iscultist(M))
M.status_flags |= GOTTAGOFAST
M.drowsyness = max(M.drowsyness-5, 0)
- M.AdjustParalysis(-2)
- M.AdjustStunned(-2)
- M.AdjustWeakened(-2)
+ M.AdjustParalysis(-2, 0)
+ M.AdjustStunned(-2, 0)
+ M.AdjustWeakened(-2, 0)
else
- M.adjustToxLoss(2)
- M.adjustFireLoss(2)
- M.adjustOxyLoss(2)
- M.adjustBruteLoss(2)
+ M.adjustToxLoss(2, 0)
+ M.adjustFireLoss(2, 0)
+ M.adjustOxyLoss(2, 0)
+ M.adjustBruteLoss(2, 0)
holder.remove_reagent(src.id, 1)
+ . = 1
/datum/reagent/hellwater //if someone has this in their system they've really pissed off an eldrich god
name = "Hell Water"
@@ -232,8 +234,8 @@
/datum/reagent/hellwater/on_mob_life(mob/living/M)
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.adjustToxLoss(1, 0)
+ M.adjustFireLoss(1, 0) //Hence the other damages... ain't I a bastard?
M.adjustBrainLoss(5)
holder.remove_reagent(src.id, 1)
@@ -396,11 +398,10 @@
metabolization_rate = INFINITY
/datum/reagent/mulligan/on_mob_life(mob/living/carbon/human/H)
- ..()
H << "You grit your teeth in pain as your body rapidly mutates!"
H.visible_message("[H] suddenly transforms!")
randomize_human(H)
- return 1
+ ..()
/datum/reagent/aslimetoxin
name = "Advanced Mutation Toxin"
@@ -412,6 +413,15 @@
if(method != TOUCH)
M.ForceContractDisease(new /datum/disease/transformation/slime(0))
+/datum/reagent/gluttonytoxin
+ name = "Gluttony's Blessing"
+ id = "gluttonytoxin"
+ description = "An advanced corruptive toxin produced by something terrible."
+ color = "#5EFF3B" //RGB: 94, 255, 59
+
+/datum/reagent/gluttonytoxin/reaction_mob(mob/M, method=TOUCH, reac_volume)
+ M.ForceContractDisease(new /datum/disease/transformation/morph(0))
+
/datum/reagent/serotrotium
name = "Serotrotium"
id = "serotrotium"
@@ -421,9 +431,9 @@
/datum/reagent/serotrotium/on_mob_life(mob/living/M)
if(ishuman(M))
- if(prob(7)) M.emote(pick("twitch","drool","moan","gasp"))
+ if(prob(7))
+ M.emote(pick("twitch","drool","moan","gasp"))
..()
- return
/datum/reagent/oxygen
name = "Oxygen"
@@ -493,7 +503,6 @@
M.emote(pick("twitch","drool","moan"))
M.adjustBrainLoss(2)
..()
- return
/datum/reagent/sulfur
name = "Sulfur"
@@ -523,9 +532,9 @@
color = "#808080" // rgb: 128, 128, 128
/datum/reagent/chlorine/on_mob_life(mob/living/M)
- M.take_organ_damage(1*REM, 0)
+ M.take_organ_damage(1*REM, 0, 0)
+ . = 1
..()
- return
/datum/reagent/fluorine
name = "Fluorine"
@@ -535,9 +544,9 @@
color = "#808080" // rgb: 128, 128, 128
/datum/reagent/fluorine/on_mob_life(mob/living/M)
- M.adjustToxLoss(1*REM)
+ M.adjustToxLoss(1*REM, 0)
+ . = 1
..()
- return
/datum/reagent/sodium
name = "Sodium"
@@ -566,7 +575,6 @@
if(prob(5))
M.emote(pick("twitch","drool","moan"))
..()
- return
/datum/reagent/glycerol
name = "Glycerol"
@@ -584,7 +592,6 @@
/datum/reagent/radium/on_mob_life(mob/living/M)
M.apply_effect(2*REM/M.metabolism_efficiency,IRRADIATE,0)
..()
- return
/datum/reagent/radium/reaction_turf(turf/T, reac_volume)
if(reac_volume >= 3)
@@ -669,7 +676,8 @@
..()
/datum/reagent/fuel/on_mob_life(mob/living/M)
- M.adjustToxLoss(1)
+ M.adjustToxLoss(1, 0)
+ . = 1
..()
/datum/reagent/space_cleaner
@@ -739,7 +747,6 @@
M.confused = 1
M.confused = max(M.confused, 20)
..()
- return
/datum/reagent/impedrezene
name = "Impedrezene"
@@ -749,11 +756,13 @@
/datum/reagent/impedrezene/on_mob_life(mob/living/M)
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")
+ 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"
@@ -901,9 +910,9 @@
/datum/reagent/plantnutriment/on_mob_life(mob/living/M)
if(prob(tox_prob))
- M.adjustToxLoss(1*REM)
+ M.adjustToxLoss(1*REM, 0)
+ . = 1
..()
- return
/datum/reagent/plantnutriment/eznutriment
name = "E-Z-Nutrient"
@@ -1121,3 +1130,33 @@
var/t_loc = get_turf(O)
qdel(O)
new /obj/item/clothing/shoes/galoshes/dry(t_loc)
+
+// Virology virus food chems.
+
+/datum/reagent/toxin/mutagen/mutagenvirusfood
+ name = "mutagenic agar"
+ id = "mutagenvirusfood"
+ description = "mutates blood"
+ color = "#A3C00F" // rgb: 163,192,15
+
+/datum/reagent/toxin/mutagen/mutagenvirusfood/sugar
+ name = "sucrose agar"
+ id = "sugarvirusfood"
+ color = "#41B0C0" // rgb: 65,176,192
+
+/datum/reagent/medicine/synaptizine/synaptizinevirusfood
+ name = "virus rations"
+ id = "synaptizinevirusfood"
+ description = "mutates blood"
+ color = "#D18AA5" // rgb: 209,138,165
+
+/datum/reagent/toxin/plasma/plasmavirusfood
+ name = "virus plasma"
+ id = "plasmavirusfood"
+ description = "mutates blood"
+ color = "#A69DA9" // rgb: 166,157,169
+
+/datum/reagent/toxin/plasma/plasmavirusfood/weak
+ name = "weakened virus plasma"
+ id = "weakplasmavirusfood"
+ color = "#CEC3C6" // rgb: 206,195,198
\ No newline at end of file
diff --git a/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm b/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm
index d6a0fac754f7..647df9c54d1c 100644
--- a/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm
@@ -17,8 +17,9 @@
Wall.overlays += image('icons/effects/effects.dmi',"thermite")
/datum/reagent/thermite/on_mob_life(mob/living/M)
- M.adjustFireLoss(1)
+ M.adjustFireLoss(1, 0)
..()
+ . = 1
/datum/reagent/nitroglycerin
name = "Nitroglycerin"
@@ -44,8 +45,9 @@
/datum/reagent/clf3/on_mob_life(mob/living/M)
M.adjust_fire_stacks(2)
var/burndmg = max(0.3*M.fire_stacks, 0.3)
- M.adjustFireLoss(burndmg)
+ M.adjustFireLoss(burndmg, 0)
..()
+ . = 1
/datum/reagent/clf3/reaction_turf(turf/simulated/T, reac_volume)
if(istype(T, /turf/simulated/floor/plating))
@@ -136,8 +138,9 @@
/datum/reagent/phlogiston/on_mob_life(mob/living/M)
M.adjust_fire_stacks(1)
var/burndmg = max(0.3*M.fire_stacks, 0.3)
- M.adjustFireLoss(burndmg)
+ M.adjustFireLoss(burndmg, 0)
..()
+ . = 1
/datum/reagent/napalm
name = "Napalm"
diff --git a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
index fa126f4e483a..d84c023b0c88 100644
--- a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
@@ -10,9 +10,9 @@
/datum/reagent/toxin/on_mob_life(mob/living/M)
if(toxpwr)
- M.adjustToxLoss(toxpwr*REM)
+ M.adjustToxLoss(toxpwr*REM, 0)
+ . = 1
..()
- return
/datum/reagent/toxin/amatoxin
name = "Amatoxin"
@@ -46,7 +46,7 @@
/datum/reagent/toxin/mutagen/on_mob_life(mob/living/carbon/M)
if(istype(M))
M.apply_effect(5,IRRADIATE,0)
- ..()
+ return ..()
/datum/reagent/toxin/plasma
name = "Plasma"
@@ -61,8 +61,7 @@
if(iscarbon(M))
var/mob/living/carbon/C = M
C.adjustPlasma(20)
- ..()
- return
+ return ..()
/datum/reagent/toxin/plasma/reaction_obj(obj/O, reac_volume)
if((!O) || (!reac_volume))
@@ -90,15 +89,14 @@
toxpwr = 0
/datum/reagent/toxin/lexorin/on_mob_life(mob/living/M)
- if(M.stat != DEAD)
- M.adjustOxyLoss(5)
- if(iscarbon(M))
- var/mob/living/carbon/C = M
- C.losebreath += 2
- if(prob(20))
- M.emote("gasp")
+ M.adjustOxyLoss(5, 0)
+ if(iscarbon(M))
+ var/mob/living/carbon/C = M
+ C.losebreath += 2
+ if(prob(20))
+ M.emote("gasp")
..()
- return
+ . = 1
/datum/reagent/toxin/slimejelly
name = "Slime Jelly"
@@ -110,11 +108,12 @@
/datum/reagent/toxin/slimejelly/on_mob_life(mob/living/M)
if(prob(10))
M << "Your insides are burning!"
- M.adjustToxLoss(rand(20,60)*REM)
+ M.adjustToxLoss(rand(20,60)*REM, 0)
+ . = 1
else if(prob(40))
- M.heal_organ_damage(5*REM,0)
+ M.heal_organ_damage(5*REM,0, 0)
+ . = 1
..()
- return
/datum/reagent/toxin/minttoxin
name = "Mint Toxin"
@@ -124,10 +123,9 @@
toxpwr = 0
/datum/reagent/toxin/minttoxin/on_mob_life(mob/living/M)
- if (M.disabilities & FAT)
+ if(M.disabilities & FAT)
M.gib()
- ..()
- return
+ return ..()
/datum/reagent/toxin/carpotoxin
name = "Carpotoxin"
@@ -146,12 +144,12 @@
/datum/reagent/toxin/zombiepowder/on_mob_life(mob/living/carbon/M)
M.status_flags |= FAKEDEATH
- M.adjustOxyLoss(0.5*REM)
- M.Weaken(5)
+ M.adjustOxyLoss(0.5*REM, 0)
+ M.Weaken(5, 0, 0)
M.silent = max(M.silent, 5)
M.tod = worldtime2text()
..()
- return
+ . = 1
/datum/reagent/toxin/zombiepowder/on_mob_delete(mob/M)
M.status_flags &= ~FAKEDEATH
@@ -166,8 +164,7 @@
/datum/reagent/toxin/mindbreaker/on_mob_life(mob/living/M)
M.hallucination += 10
- ..()
- return
+ return ..()
/datum/reagent/toxin/plantbgone
name = "Plant-B-Gone"
@@ -227,7 +224,7 @@
M.damageoverlaytemp = 60
M.update_damage_hud()
M.blur_eyes(3)
- ..()
+ return ..()
/datum/reagent/toxin/spore_burning
name = "Burning Spore Toxin"
@@ -237,9 +234,9 @@
toxpwr = 0.5
/datum/reagent/toxin/spore_burning/on_mob_life(mob/living/M)
- ..()
M.adjust_fire_stacks(2)
M.IgniteMob()
+ return ..()
/datum/reagent/toxin/chloralhydrate
name = "Chloral Hydrate"
@@ -256,12 +253,13 @@
M.confused += 2
M.drowsyness += 2
if(10 to 50)
- M.AdjustSleeping(1)
+ M.Sleeping(2, 0)
+ . = 1
if(51 to INFINITY)
- M.AdjustSleeping(1)
- M.adjustToxLoss((current_cycle - 50)*REM)
+ M.Sleeping(2, 0)
+ M.adjustToxLoss((current_cycle - 50)*REM, 0)
+ . = 1
..()
- return
/datum/reagent/toxin/beer2 //disguised as normal beer for use by emagged brobots
name = "Beer"
@@ -273,11 +271,11 @@
/datum/reagent/toxin/beer2/on_mob_life(mob/living/M)
switch(current_cycle)
if(1 to 50)
- M.AdjustSleeping(1)
+ M.Sleeping(2, 0)
if(51 to INFINITY)
- M.AdjustSleeping(1)
- M.adjustToxLoss((current_cycle - 50)*REM)
- ..()
+ M.Sleeping(2, 0)
+ M.adjustToxLoss((current_cycle - 50)*REM, 0)
+ return ..()
/datum/reagent/toxin/coffeepowder
name = "Coffee Grounds"
@@ -315,9 +313,10 @@
toxpwr = 0
/datum/reagent/toxin/staminatoxin/on_mob_life(mob/living/carbon/M)
- M.adjustStaminaLoss(REM * data)
+ M.adjustStaminaLoss(REM * data, 0)
data = max(data - 1, 3)
..()
+ . = 1
/datum/reagent/toxin/polonium
name = "Polonium"
@@ -355,14 +354,16 @@
if(4)
if(prob(75))
M << "You scratch at an itch."
- M.adjustBruteLoss(2*REM)
+ M.adjustBruteLoss(2*REM, 0)
+ . = 1
..()
/datum/reagent/toxin/histamine/overdose_process(mob/living/M)
- M.adjustOxyLoss(2*REM)
- M.adjustBruteLoss(2*REM)
- M.adjustToxLoss(2*REM)
+ M.adjustOxyLoss(2*REM, 0)
+ M.adjustBruteLoss(2*REM, 0)
+ M.adjustToxLoss(2*REM, 0)
..()
+ . = 1
/datum/reagent/toxin/formaldehyde
name = "Formaldehyde"
@@ -378,7 +379,7 @@
holder.add_reagent("histamine", pick(5,15))
holder.remove_reagent("formaldehyde", 1.2)
else
- ..()
+ return ..()
/datum/reagent/toxin/venom
name = "Venom"
@@ -391,7 +392,8 @@
/datum/reagent/toxin/venom/on_mob_life(mob/living/M)
toxpwr = 0.2*volume
- M.adjustBruteLoss((0.3*volume)*REM)
+ M.adjustBruteLoss((0.3*volume)*REM, 0)
+ . = 1
if(prob(15))
M.reagents.add_reagent("histamine", pick(5,10))
M.reagents.remove_reagent("venom", 1.1)
@@ -410,9 +412,11 @@
/datum/reagent/toxin/neurotoxin2/on_mob_life(mob/living/M)
if(M.brainloss + M.toxloss <= 60)
M.adjustBrainLoss(1*REM)
- M.adjustToxLoss(1*REM)
+ M.adjustToxLoss(1*REM, 0)
+ . = 1
if(current_cycle >= 18)
- M.AdjustSleeping(1)
+ M.Sleeping(2, 0)
+ . = 1
..()
/datum/reagent/toxin/cyanide
@@ -429,9 +433,9 @@
M.losebreath += 1
if(prob(8))
M << "You feel horrendously weak!"
- M.Stun(2)
- M.adjustToxLoss(2*REM)
- ..()
+ M.Stun(2, 0)
+ M.adjustToxLoss(2*REM, 0)
+ return ..()
/datum/reagent/toxin/questionmark // food poisoning
name = "Bad Food"
@@ -458,13 +462,16 @@
/datum/reagent/toxin/itching_powder/on_mob_life(mob/living/M)
if(prob(15))
M << "You scratch at your head."
- M.adjustBruteLoss(0.2*REM)
+ M.adjustBruteLoss(0.2*REM, 0)
+ . = 1
if(prob(15))
M << "You scratch at your leg."
- M.adjustBruteLoss(0.2*REM)
+ M.adjustBruteLoss(0.2*REM, 0)
+ . = 1
if(prob(15))
M << "You scratch at your arm."
- M.adjustBruteLoss(0.2*REM)
+ M.adjustBruteLoss(0.2*REM, 0)
+ . = 1
if(prob(3))
M.reagents.add_reagent("histamine",rand(1,3))
M.reagents.remove_reagent("itching_powder",1.2)
@@ -485,11 +492,13 @@
var/picked_option = rand(1,3)
switch(picked_option)
if(1)
- M.Stun(3)
- M.Weaken(3)
+ M.Stun(3, 0)
+ M.Weaken(3, 0, 0)
+ . = 1
if(2)
M.losebreath += 10
- M.adjustOxyLoss(rand(5,25))
+ M.adjustOxyLoss(rand(5,25), 0)
+ . = 1
if(3)
if(istype(M, /mob/living/carbon/human))
var/mob/living/carbon/human/H = M
@@ -499,8 +508,9 @@
H.visible_message("[H] clutches at their chest as if their heart stopped!")
else
H.losebreath += 10
- H.adjustOxyLoss(rand(5,25))
- ..()
+ H.adjustOxyLoss(rand(5,25), 0)
+ . = 1
+ return ..() || .
/datum/reagent/toxin/pancuronium
name = "Pancuronium"
@@ -513,7 +523,8 @@
/datum/reagent/toxin/pancuronium/on_mob_life(mob/living/M)
if(current_cycle >= 10)
- M.Paralyse(1)
+ M.Paralyse(2, 0)
+ . = 1
if(prob(20))
M.losebreath += 4
..()
@@ -529,9 +540,10 @@
/datum/reagent/toxin/sodium_thiopental/on_mob_life(mob/living/M)
if(current_cycle >= 10)
- M.AdjustSleeping(1)
- M.adjustStaminaLoss(10*REM)
+ M.Sleeping(2, 0)
+ M.adjustStaminaLoss(10*REM, 0)
..()
+ . = 1
/datum/reagent/toxin/sulfonal
name = "Sulfonal"
@@ -544,8 +556,8 @@
/datum/reagent/toxin/sulfonal/on_mob_life(mob/living/M)
if(current_cycle >= 22)
- M.AdjustSleeping(1)
- ..()
+ M.Sleeping(2, 0)
+ return ..()
/datum/reagent/toxin/amanitin
name = "Amanitin"
@@ -571,12 +583,10 @@
/datum/reagent/toxin/lipolicide/on_mob_life(mob/living/M)
if(!holder.has_reagent("nutriment"))
- M.adjustToxLoss(0.5*REM)
- M.nutrition -= 5 * REAGENTS_METABOLISM
+ M.adjustToxLoss(0.5*REM, 0)
+ M.nutrition = max( M.nutrition - 5 * REAGENTS_METABOLISM, 0)
M.overeatduration = 0
- if(M.nutrition < 0)//Prevent from going into negatives.
- M.nutrition = 0
- ..()
+ return ..()
/datum/reagent/toxin/coniine
name = "Coniine"
@@ -589,7 +599,7 @@
/datum/reagent/toxin/coniine/on_mob_life(mob/living/M)
M.losebreath += 5
- ..()
+ return ..()
/datum/reagent/toxin/curare
name = "Curare"
@@ -602,8 +612,9 @@
/datum/reagent/toxin/curare/on_mob_life(mob/living/M)
if(current_cycle >= 11)
- M.Weaken(3)
- M.adjustOxyLoss(1*REM)
+ M.Weaken(3, 0, 0)
+ M.adjustOxyLoss(1*REM, 0)
+ . = 1
..()
/datum/reagent/toxin/heparin //Based on a real-life anticoagulant. I'm not a doctor, so this won't be realistic.
@@ -619,8 +630,9 @@
if(ishuman(M))
var/mob/living/carbon/human/H = M
H.blood_max += 2
- H.adjustBruteLoss(1) //Brute damage increases with the amount they're bleeding
- ..()
+ H.adjustBruteLoss(1, 0) //Brute damage increases with the amount they're bleeding
+ . = 1
+ return ..() || .
/datum/reagent/toxin/teslium //Teslium. Causes periodic shocks, and makes shocks against the target much more effective.
name = "Teslium"
diff --git a/code/modules/reagents/chemistry/recipes/others.dm b/code/modules/reagents/chemistry/recipes/others.dm
index 444d59e307cb..2170753cedea 100644
--- a/code/modules/reagents/chemistry/recipes/others.dm
+++ b/code/modules/reagents/chemistry/recipes/others.dm
@@ -133,6 +133,48 @@
required_reagents = list("water" = 5, "milk" = 5)
result_amount = 15
+/datum/chemical_reaction/virus_food_mutagen
+ name = "mutagenic agar"
+ id = "mutagenvirusfood"
+ result = "mutagenvirusfood"
+ required_reagents = list("mutagen" = 1, "virusfood" = 1)
+ result_amount = 1
+
+/datum/chemical_reaction/virus_food_synaptizine
+ name = "virus rations"
+ id = "synaptizinevirusfood"
+ result = "synaptizinevirusfood"
+ required_reagents = list("synaptizine" = 1, "virusfood" = 1)
+ result_amount = 1
+
+/datum/chemical_reaction/virus_food_plasma
+ name = "virus plasma"
+ id = "plasmavirusfood"
+ result = "plasmavirusfood"
+ required_reagents = list("plasma" = 1, "virusfood" = 1)
+ result_amount = 1
+
+/datum/chemical_reaction/virus_food_plasma_synaptizine
+ name = "weakened virus plasma"
+ id = "weakplasmavirusfood"
+ result = "weakplasmavirusfood"
+ required_reagents = list("synaptizine" = 1, "plasmavirusfood" = 1)
+ result_amount = 2
+
+/datum/chemical_reaction/virus_food_mutagen_sugar
+ name = "sucrose agar"
+ id = "sugarvirusfood"
+ result = "sugarvirusfood"
+ required_reagents = list("sugar" = 1, "mutagenvirusfood" = 1)
+ result_amount = 2
+
+/datum/chemical_reaction/virus_food_mutagen_salineglucose
+ name = "sucrose agar"
+ id = "salineglucosevirusfood"
+ result = "sugarvirusfood"
+ required_reagents = list("salglu_solution" = 1, "mutagenvirusfood" = 1)
+ result_amount = 2
+
/datum/chemical_reaction/mix_virus
name = "Mix Virus"
id = "mixvirus"
@@ -167,6 +209,54 @@
level_min = 4
level_max = 6
+/datum/chemical_reaction/mix_virus/mix_virus_4
+
+ name = "Mix Virus 4"
+ id = "mixvirus4"
+ required_reagents = list("uranium" = 1)
+ level_min = 5
+ level_max = 6
+
+/datum/chemical_reaction/mix_virus/mix_virus_5
+
+ name = "Mix Virus 5"
+ id = "mixvirus5"
+ required_reagents = list("mutagenvirusfood" = 1)
+ level_min = 3
+ level_max = 3
+
+/datum/chemical_reaction/mix_virus/mix_virus_6
+
+ name = "Mix Virus 6"
+ id = "mixvirus6"
+ required_reagents = list("sugarvirusfood" = 1)
+ level_min = 4
+ level_max = 4
+
+/datum/chemical_reaction/mix_virus/mix_virus_7
+
+ name = "Mix Virus 7"
+ id = "mixvirus7"
+ required_reagents = list("weakplasmavirusfood" = 1)
+ level_min = 5
+ level_max = 5
+
+/datum/chemical_reaction/mix_virus/mix_virus_8
+
+ name = "Mix Virus 8"
+ id = "mixvirus8"
+ required_reagents = list("plasmavirusfood" = 1)
+ level_min = 6
+ level_max = 6
+
+/datum/chemical_reaction/mix_virus/mix_virus_9
+
+ name = "Mix Virus 9"
+ id = "mixvirus9"
+ required_reagents = list("synaptizinevirusfood" = 1)
+ level_min = 1
+ level_max = 1
+
/datum/chemical_reaction/mix_virus/rem_virus
name = "Devolve Virus"
diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm
index 5ed379b28876..f278a8d598af 100644
--- a/code/modules/reagents/reagent_containers/spray.dm
+++ b/code/modules/reagents/reagent_containers/spray.dm
@@ -10,8 +10,11 @@
w_class = 2
throw_speed = 3
throw_range = 7
- var/spray_maxrange = 3 //what the sprayer will set spray_currentrange to in the attack_self.
- var/spray_currentrange = 3 //the range of tiles the sprayer will reach when in fixed mode.
+ var/stream_mode = 0 //whether we use the more focused mode
+ var/current_range = 3 //the range of tiles the sprayer will reach.
+ var/spray_range = 3 //the range of tiles the sprayer will reach when in spray mode.
+ var/stream_range = 1 //the range of tiles the sprayer will reach when in stream mode.
+ var/stream_amount = 10 //the amount of reagents transfered when in stream mode.
amount_per_transfer_from_this = 5
volume = 250
possible_transfer_amounts = list()
@@ -61,16 +64,21 @@
/obj/item/weapon/reagent_containers/spray/proc/spray(atom/A)
- var/range = max(min(spray_currentrange, get_dist(src, A)), 1)
+ var/range = max(min(spray_range, get_dist(src, A)), 1)
var/obj/effect/decal/chempuff/D = new /obj/effect/decal/chempuff(get_turf(src))
D.create_reagents(amount_per_transfer_from_this)
- reagents.trans_to(D, amount_per_transfer_from_this, 1/range)
- D.color = mix_color_from_reagents(D.reagents.reagent_list)
var/puff_reagent_left = range //how many turf, mob or dense objet we can react with before we consider the chem puff consumed
+ if(stream_mode)
+ reagents.trans_to(D, amount_per_transfer_from_this)
+ puff_reagent_left = 1
+ else
+ reagents.trans_to(D, amount_per_transfer_from_this, 1/range)
+ D.color = mix_color_from_reagents(D.reagents.reagent_list)
var/wait_step = max(round(2+3/range), 2)
-
spawn(0)
+ var/range_left = range
for(var/i=0, i 0)
+ if(stream_mode)
+ if(ismob(T))
+ var/mob/M = T
+ if(!M.lying || !range_left)
+ D.reagents.reaction(M, VAPOR)
+ puff_reagent_left -= 1
+ else if(!range_left)
+ D.reagents.reaction(T, VAPOR)
+ else
+ D.reagents.reaction(T, VAPOR)
+ if(ismob(T))
+ puff_reagent_left -= 1
+
+ if(puff_reagent_left > 0 && (!stream_mode || !range_left))
D.reagents.reaction(get_turf(D), VAPOR)
puff_reagent_left -= 1
@@ -93,10 +111,14 @@
qdel(D)
/obj/item/weapon/reagent_containers/spray/attack_self(mob/user)
-
- amount_per_transfer_from_this = (amount_per_transfer_from_this == 10 ? 5 : 10)
- spray_currentrange = (spray_currentrange == 1 ? spray_maxrange : 1)
- user << "You [amount_per_transfer_from_this == 10 ? "remove" : "fix"] the nozzle. You'll now use [amount_per_transfer_from_this] units per spray."
+ stream_mode = !stream_mode
+ if(stream_mode)
+ amount_per_transfer_from_this = stream_amount
+ current_range = stream_range
+ else
+ amount_per_transfer_from_this = initial(amount_per_transfer_from_this)
+ current_range = spray_range
+ user << "You switch the nozzle setting to [stream_mode ? "\"stream\"":"\"spray\""]. You'll now use [amount_per_transfer_from_this] units per use."
/obj/item/weapon/reagent_containers/spray/verb/empty()
@@ -126,7 +148,7 @@
icon_state = "pepperspray"
item_state = "pepperspray"
volume = 40
- spray_maxrange = 4
+ stream_range = 4
amount_per_transfer_from_this = 5
list_reagents = list("condensedcapsaicin" = 40)
@@ -153,8 +175,10 @@
item_state = "chemsprayer"
throwforce = 0
w_class = 3
- spray_maxrange = 7
- spray_currentrange = 7
+ stream_mode = 1
+ current_range = 7
+ spray_range = 4
+ stream_range = 7
amount_per_transfer_from_this = 10
volume = 600
origin_tech = "combat=3;materials=3;engineering=3"
@@ -172,11 +196,6 @@
return
..(the_targets[i])
-/obj/item/weapon/reagent_containers/spray/chemsprayer/attack_self(mob/user)
-
- amount_per_transfer_from_this = (amount_per_transfer_from_this == 10 ? 5 : 10)
- user << "You adjust the output switch. You'll now use [amount_per_transfer_from_this] units per spray."
-
/obj/item/weapon/reagent_containers/spray/chemsprayer/bioterror
list_reagents = list("sodium_thiopental" = 100, "coniine" = 100, "venom" = 100, "condensedcapsaicin" = 100, "initropidril" = 100, "polonium" = 100)
diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm
index d534b3ef9e2a..e2626f139774 100644
--- a/code/modules/reagents/reagent_containers/syringes.dm
+++ b/code/modules/reagents/reagent_containers/syringes.dm
@@ -246,4 +246,11 @@
desc = "A syringe used to completely change the users identity."
amount_per_transfer_from_this = 1
volume = 1
- list_reagents = list("mulligan" = 1)
\ No newline at end of file
+ list_reagents = list("mulligan" = 1)
+
+/obj/item/weapon/reagent_containers/syringe/gluttony
+ name = "Gluttony's Blessing"
+ desc = "A syringe recovered from a dread place. It probably isn't wise to use."
+ amount_per_transfer_from_this = 1
+ volume = 1
+ list_reagents = list("gluttonytoxin" = 1)
\ No newline at end of file
diff --git a/code/modules/research/designs/medical_designs.dm b/code/modules/research/designs/medical_designs.dm
index aaa5d9df8105..028bc09f8ae5 100644
--- a/code/modules/research/designs/medical_designs.dm
+++ b/code/modules/research/designs/medical_designs.dm
@@ -121,6 +121,17 @@
build_path = /obj/item/organ/internal/cyberimp/eyes/shield
category = list("Misc", "Medical Designs")
+/datum/design/cyberimp_breather
+ name = "Breathing Tube implant"
+ desc = "This simple implant adds an internals connector to your back, allowing you to use internals without a mask and protecting you from being choked."
+ id = "ci-breather"
+ req_tech = list("materials" = 3, "biotech" = 3)
+ build_type = PROTOLATHE | MECHFAB
+ construction_time = 35
+ materials = list(MAT_METAL = 200, MAT_GLASS = 250)
+ build_path = /obj/item/organ/internal/cyberimp/mouth/breathing_tube
+ category = list("Misc", "Medical Designs")
+
/datum/design/cyberimp_medical_hud
name = "Medical HUD implant"
desc = "These cybernetic eyes will display a medical HUD over everything you see. Wiggle eyes to control."
@@ -174,7 +185,7 @@
construction_time = 60
materials = list(MAT_METAL = 200, MAT_GLASS = 200, MAT_SILVER = 400, MAT_GOLD = 400)
build_path = /obj/item/organ/internal/cyberimp/brain/anti_drop
- category = list("Medical Designs")
+ category = list("Misc", "Medical Designs")
/datum/design/cyberimp_antistun
name = "CNS Rebooter implant"
@@ -185,7 +196,7 @@
construction_time = 60
materials = list(MAT_METAL = 200, MAT_GLASS = 200, MAT_SILVER = 500, MAT_GOLD = 1000)
build_path = /obj/item/organ/internal/cyberimp/brain/anti_stun
- category = list("Medical Designs")
+ category = list("Misc", "Medical Designs")
/datum/design/cyberimp_nutriment
name = "Nutriment pump implant"
@@ -196,7 +207,7 @@
construction_time = 40
materials = list(MAT_METAL = 200, MAT_GLASS = 200, MAT_GOLD = 500, MAT_URANIUM = 500)
build_path = /obj/item/organ/internal/cyberimp/chest/nutriment
- category = list("Medical Designs")
+ category = list("Misc", "Medical Designs")
/datum/design/cyberimp_nutriment_plus
name = "Nutriment pump implant PLUS"
@@ -207,7 +218,7 @@
construction_time = 50
materials = list(MAT_METAL = 200, MAT_GLASS = 200, MAT_GOLD = 500, MAT_URANIUM = 750)
build_path = /obj/item/organ/internal/cyberimp/chest/nutriment/plus
- category = list("Medical Designs")
+ category = list("Misc", "Medical Designs")
/datum/design/cyberimp_reviver
name = "Reviver implant"
@@ -237,7 +248,7 @@
/datum/design/implantcase
name = "Implant Case"
- desc = "A glass case containing an implant."
+ desc = "A glass case for containing an implant."
id = "implantcase"
req_tech = list("materials" = 1, "biotech" = 2)
build_type = PROTOLATHE
diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm
index 66a1e5925c0e..73a714916d63 100644
--- a/code/modules/research/experimentor.dm
+++ b/code/modules/research/experimentor.dm
@@ -576,7 +576,7 @@
var/list/temp_tech = ConvertReqString2List(process.origin_tech)
for(var/T in temp_tech)
linked_console.files.UpdateTech(T, temp_tech[T])
- linked_console.files.UpdateDesigns(process,process.type)
+ linked_console.files.UpdateDesigns(process,temp_tech)
src.updateUsrDialog()
return
diff --git a/code/modules/ruins/lavaland_ruin_code.dm b/code/modules/ruins/lavaland_ruin_code.dm
index a3b40d285bf9..068e4170180f 100644
--- a/code/modules/ruins/lavaland_ruin_code.dm
+++ b/code/modules/ruins/lavaland_ruin_code.dm
@@ -16,12 +16,111 @@
/obj/item/seeds/moonflowerseed = 8,
)
-/obj/effect/landmark/corpse/seed_vault
+/obj/effect/mob_spawn/human/seed_vault
name = "sleeper"
- mobname = "Vault Creature"
+ mob_name = "Vault Creature"
icon = 'icons/obj/Cryogenic2.dmi'
icon_state = "sleeper"
roundstart = FALSE
death = FALSE
mob_species = /datum/species/pod
flavour_text = {"You are a strange, artificial creature. In the face of impending apocalyptic events, your creators tasked you with maintaining an emergency seed vault. You are to tend to the plants and await their return to aid in rebuilding civilization. You've been waiting quite a while though..."}
+
+//Greed
+
+/obj/structure/cursed_slot_machine
+ name = "greed's slot machine"
+ desc = "High stakes, high rewards."
+ icon = 'icons/obj/economy.dmi'
+ icon_state = "slots1"
+ anchored = 1
+ density = 1
+ var/win_prob = 5
+
+/obj/structure/cursed_slot_machine/attack_hand(mob/living/carbon/human/user)
+ if(!istype(user))
+ return
+ if(in_use)
+ return
+ in_use = TRUE
+ user << "You feel your very life draining away as you pull the lever...it'll be worth it though, right?"
+ user.adjustCloneLoss(20)
+ if(user.stat)
+ user.gib()
+ icon_state = "slots2"
+ sleep(50)
+ icon_state = "slots1"
+ in_use = FALSE
+ if(prob(win_prob))
+ new /obj/item/weapon/dice/d20/fate/one_use(get_turf(src))
+ if(user)
+ user << "You hear laughter echoing around you as the machine fades away. In it's place...more gambling."
+ qdel(src)
+ else
+ if(user)
+ user << "Looks like you didn't win anything this time...next time though, right?"
+//Gluttony
+
+/obj/effect/gluttony
+ name = "gluttony's wall"
+ desc = "Only those who truly indulge may pass."
+ anchored = 1
+ density = 1
+ icon_state = "blob"
+ icon = 'icons/mob/blob.dmi'
+
+/obj/effect/gluttony/CanPass(atom/movable/mover, turf/target, height=0)//So bullets will fly over and stuff.
+ if(height==0)
+ return 1
+ if(istype(mover, /mob/living/carbon/human))
+ var/mob/living/carbon/human/H = mover
+ if(H.nutrition >= NUTRITION_LEVEL_FAT)
+ return 1
+ else
+ H << "You're not gluttonous enough to pass this barrier!"
+ else
+ return 0
+
+//Pride
+
+/obj/structure/mirror/magic/pride
+ name = "pride's mirror"
+ desc = "Pride cometh before the..."
+ icon_state = "magic_mirror"
+
+/obj/structure/mirror/magic/pride/curse(mob/user)
+ user.visible_message("The ground splits beneath [user] as their hand leaves the mirror!")
+ var/turf/T = get_turf(user)
+ T.ChangeTurf(/turf/simulated/chasm/straight_down)
+ var/turf/simulated/chasm/straight_down/C = T
+ C.drop(user)
+
+//Sloth - I'll finish this item later
+
+//Envy
+
+/obj/item/weapon/knife/envy
+ name = "envy's knife"
+ desc = "Their success will be yours."
+ icon = 'icons/obj/wizard.dmi'
+ icon_state = "render"
+ item_state = "render"
+ force = 18
+ throwforce = 10
+ w_class = 3
+ hitsound = 'sound/weapons/bladeslice.ogg'
+
+/obj/item/weapon/knife/envy/afterattack(atom/movable/AM, mob/living/carbon/human/user, proximity)
+ ..()
+ if(!proximity)
+ return
+ if(!istype(user))
+ return
+ if(istype(AM, /mob/living/carbon/human))
+ var/mob/living/carbon/human/H = AM
+ if(user.real_name != H.dna.real_name)
+ user.real_name = H.dna.real_name
+ H.dna.transfer_identity(user, transfer_SE=1)
+ user.updateappearance(mutcolor_update=1)
+ user.domutcheck()
+ user << "You assume the face of [H]. Are you satisfied?"
\ No newline at end of file
diff --git a/code/modules/spells/spell.dm b/code/modules/spells/spell.dm
index b38d951b5c96..ecbcb21e7437 100644
--- a/code/modules/spells/spell.dm
+++ b/code/modules/spells/spell.dm
@@ -71,9 +71,9 @@ var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin
if(!(src in user.mob_spell_list))
return 0
- if(user.z == ZLEVEL_CENTCOM && !centcom_cancast) //Certain spells are not allowed on the centcom zlevel
- return 0
- if(user.z == ZLEVEL_CENTCOM && ticker.mode.name == "ragin' mages")
+ var/turf/T = get_turf(user)
+ if(T.z == ZLEVEL_CENTCOM && (!centcom_cancast || ticker.mode.name == "ragin' mages")) //Certain spells are not allowed on the centcom zlevel
+ user << "You can't cast this spell here."
return 0
if(!skipcharge)
@@ -156,10 +156,15 @@ var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin
/obj/effect/proc_holder/spell/New()
..()
+ action = new(src)
still_recharging_msg = "[name] is still recharging."
charge_counter = charge_max
+/obj/effect/proc_holder/spell/Destroy()
+ qdel(action)
+ return ..()
+
/obj/effect/proc_holder/spell/Click()
if(cast_check())
choose_targets()
@@ -169,9 +174,13 @@ var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin
return
/obj/effect/proc_holder/spell/proc/start_recharge()
+ if(action)
+ action.UpdateButtonIcon()
while(charge_counter < charge_max && isnull(gc_destroyed))
sleep(1)
charge_counter++
+ if(action)
+ action.UpdateButtonIcon()
/obj/effect/proc_holder/spell/proc/perform(list/targets, recharge = 1, mob/user = usr) //if recharge is started is important for the trigger spells
before_cast(targets)
@@ -380,11 +389,6 @@ var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin
if(((!user.mind) || !(src in user.mind.spell_list)) && !(src in user.mob_spell_list))
return 0
- if(user.z == ZLEVEL_CENTCOM && !centcom_cancast) //Certain spells are not allowed on the centcom zlevel
- return 0
- if(user.z == ZLEVEL_CENTCOM && ticker.mode.name == "ragin' mages")
- return 0
-
switch(charge_type)
if("recharge")
if(charge_counter < charge_max)
@@ -396,21 +400,7 @@ var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin
if(user.stat && !stat_allowed)
return 0
- if(ishuman(user))
-
- var/mob/living/carbon/human/H = user
-
- if((invocation_type == "whisper" || invocation_type == "shout") && H.is_muzzled())
- return 0
-
- if(clothes_req) //clothes check
- if(!istype(H.wear_suit, /obj/item/clothing/suit/wizrobe) && !istype(H.wear_suit, /obj/item/clothing/suit/space/hardsuit/wizard))
- return 0
- if(!istype(H.shoes, /obj/item/clothing/shoes/sandal))
- return 0
- if(!istype(H.head, /obj/item/clothing/head/wizard) && !istype(H.head, /obj/item/clothing/head/helmet/space/hardsuit/wizard))
- return 0
- else
+ if(!ishuman(user))
if(clothes_req || human_req)
return 0
if(nonabstract_req && (isbrain(user) || ispAI(user)))
diff --git a/code/modules/spells/spell_types/area_teleport.dm b/code/modules/spells/spell_types/area_teleport.dm
index 798a801dcee9..7f766aa49e0d 100644
--- a/code/modules/spells/spell_types/area_teleport.dm
+++ b/code/modules/spells/spell_types/area_teleport.dm
@@ -24,10 +24,11 @@
var/A = null
if(!randomise_selection)
- A = input("Area to teleport to", "Teleport", A) in teleportlocs
+ A = input("Area to teleport to", "Teleport", A) as null|anything in teleportlocs
else
A = pick(teleportlocs)
-
+ if(!A)
+ return
var/area/thearea = teleportlocs[A]
return thearea
diff --git a/code/modules/spells/spell_types/conjure.dm b/code/modules/spells/spell_types/conjure.dm
index c6d5f24bf8f4..1b84b779ade5 100644
--- a/code/modules/spells/spell_types/conjure.dm
+++ b/code/modules/spells/spell_types/conjure.dm
@@ -53,4 +53,4 @@
summon_type = list(/mob/living/simple_animal/bot/ed209)
summon_amt = 10
range = 3
- newVars = list("emagged" = 2, "remote_disabled" = 1,"shoot_sound" = 'sound/weapons/laser.ogg',"projectile" = /obj/item/projectile/beam, "declare_arrests" = 0,"name" = "Wizard's Justicebot")
\ No newline at end of file
+ newVars = list("emagged" = 2, "remote_disabled" = 1,"shoot_sound" = 'sound/weapons/laser.ogg',"projectile" = /obj/item/projectile/beam/laser, "declare_arrests" = 0,"name" = "Wizard's Justicebot")
\ No newline at end of file
diff --git a/code/modules/spells/spell_types/godhand.dm b/code/modules/spells/spell_types/godhand.dm
index 465f9b0489b3..636644898698 100644
--- a/code/modules/spells/spell_types/godhand.dm
+++ b/code/modules/spells/spell_types/godhand.dm
@@ -50,13 +50,6 @@
if(!proximity || target == user || !ismob(target) || !iscarbon(user) || user.lying || user.handcuffed) //exploding after touching yourself would be bad
return
var/mob/M = target
- if(ishuman(M) || ismonkey(M))
- var/mob/living/carbon/C_target = M
- var/obj/item/organ/internal/brain/B = C_target.getorgan(/obj/item/organ/internal/brain)
- if(B)
- B.loc = get_turf(C_target)
- B.transfer_identity(C_target)
- C_target.internal_organs -= B
var/datum/effect_system/spark_spread/sparks = new
sparks.set_up(4, 0, M.loc) //no idea what the 0 is
sparks.start()
diff --git a/code/modules/spells/spell_types/inflict_handler.dm b/code/modules/spells/spell_types/inflict_handler.dm
index 1ece19dff273..f3a48330bf6b 100644
--- a/code/modules/spells/spell_types/inflict_handler.dm
+++ b/code/modules/spells/spell_types/inflict_handler.dm
@@ -26,15 +26,6 @@
switch(destroys)
if("gib")
target.gib()
- if("gib_brain")
- if(ishuman(target) || ismonkey(target))
- var/mob/living/carbon/C_target = target
- var/obj/item/organ/internal/brain/B = C_target.getorgan(/obj/item/organ/internal/brain)
- if(B)
- B.loc = get_turf(C_target)
- B.transfer_identity(C_target)
- C_target.internal_organs -= B
- target.gib()
if("disintegrate")
target.dust()
diff --git a/code/modules/spells/spell_types/lichdom.dm b/code/modules/spells/spell_types/lichdom.dm
index 3797270b1e3e..5c2b5ebe555e 100644
--- a/code/modules/spells/spell_types/lichdom.dm
+++ b/code/modules/spells/spell_types/lichdom.dm
@@ -87,6 +87,9 @@
var/mob/living/carbon/C = old_body
for(var/obj/item/W in C)
C.unEquip(W)
+ for(var/obj/item/organ/internal/I in C.internal_organs)
+ I.Remove(C)
+ I.forceMove(body_turf)
var/wheres_wizdo = dir2text(get_dir(body_turf, item_turf))
if(wheres_wizdo)
old_body.visible_message("Suddenly [old_body.name]'s corpse falls to pieces! You see a strange energy rise from the remains, and speed off towards the [wheres_wizdo]!")
diff --git a/code/modules/surgery/dental_implant.dm b/code/modules/surgery/dental_implant.dm
index 189d37da3416..44ead63927fb 100644
--- a/code/modules/surgery/dental_implant.dm
+++ b/code/modules/surgery/dental_implant.dm
@@ -31,12 +31,13 @@
name = "Activate Pill"
/datum/action/item_action/hands_free/activate_pill/Trigger()
- if(!..() || CheckRemoval(owner))
+ if(!..())
return 0
owner << "You grit your teeth and burst the implanted [target]!"
add_logs(owner, null, "swallowed an implanted pill", target)
if(target.reagents.total_volume)
target.reagents.reaction(owner, INGEST)
target.reagents.trans_to(owner, target.reagents.total_volume)
+ Remove(owner)
qdel(target)
return 1
\ No newline at end of file
diff --git a/code/modules/surgery/limb augmentation.dm b/code/modules/surgery/limb augmentation.dm
index a7b9f3c2088b..e719e926bba9 100644
--- a/code/modules/surgery/limb augmentation.dm
+++ b/code/modules/surgery/limb augmentation.dm
@@ -61,15 +61,12 @@
if("head")
H.organs += new /obj/item/organ/limb/robot/head(src)
if("chest")
- for(var/obj/item/organ/internal/I in target.getorganszone(target_zone, 1))
- if(I.status == ORGAN_ORGANIC) // FLESH IS WEAK
- I.Remove(target, special = 1)
- qdel(I)
H.organs += new /obj/item/organ/limb/robot/chest(src)
user.drop_item()
qdel(tool)
H.update_damage_overlays(0)
H.update_augments() //Gives them the Cyber limb overlay
+ H.updatehealth()
add_logs(user, target, "augmented", addition="by giving him new [parse_zone(target_zone)] INTENT: [uppertext(user.a_intent)]")
else
user << "[target] has no organic [parse_zone(target_zone)] there!"
diff --git a/code/modules/surgery/lipoplasty.dm b/code/modules/surgery/lipoplasty.dm
index 236bba1082ec..5cb9298544ad 100644
--- a/code/modules/surgery/lipoplasty.dm
+++ b/code/modules/surgery/lipoplasty.dm
@@ -37,10 +37,17 @@
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/slab/human/newmeat = new
+ var/mob/living/carbon/human/H = target
+ var/typeofmeat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human
+
+ if(H.dna && H.dna.species)
+ typeofmeat = H.dna.species.meat
+
+ var/obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/newmeat = new typeofmeat
newmeat.name = "fatty meat"
newmeat.desc = "Extremely fatty tissue taken from a patient."
+ newmeat.subjectname = H.real_name
+ newmeat.subjectjob = H.job
newmeat.reagents.add_reagent ("nutriment", (removednutriment / 15)) //To balance with nutriment_factor of nutriment
- var/obj/item/meatslab = newmeat
- meatslab.loc = target.loc
+ newmeat.loc = target.loc
return 1
\ No newline at end of file
diff --git a/code/modules/surgery/organ_manipulation.dm b/code/modules/surgery/organ_manipulation.dm
index 26de8b0b6a57..b0cc38c8dc87 100644
--- a/code/modules/surgery/organ_manipulation.dm
+++ b/code/modules/surgery/organ_manipulation.dm
@@ -7,13 +7,13 @@
requires_organic_bodypart = 0
/datum/surgery/organ_manipulation/soft
- possible_locs = list("groin", "eyes", "mouth")
+ possible_locs = list("groin", "eyes", "mouth", "l_arm", "r_arm")
steps = list(/datum/surgery_step/incise, /datum/surgery_step/retract_skin, /datum/surgery_step/clamp_bleeders,
/datum/surgery_step/incise, /datum/surgery_step/manipulate_organs)
/datum/surgery/organ_manipulation/alien
name = "alien organ manipulation"
- possible_locs = list("chest", "head", "groin", "eyes", "mouth")
+ possible_locs = list("chest", "head", "groin", "eyes", "mouth", "l_arm", "r_arm")
species = list(/mob/living/carbon/alien/humanoid)
steps = list(/datum/surgery_step/saw, /datum/surgery_step/incise, /datum/surgery_step/retract_skin, /datum/surgery_step/saw, /datum/surgery_step/manipulate_organs)
diff --git a/code/modules/surgery/organs/augments_arms.dm b/code/modules/surgery/organs/augments_arms.dm
new file mode 100644
index 000000000000..247bf322e027
--- /dev/null
+++ b/code/modules/surgery/organs/augments_arms.dm
@@ -0,0 +1,182 @@
+/obj/item/organ/internal/cyberimp/arm
+ name = "arm-mounted implant"
+ desc = "You shouldn't see this! Adminhelp and report this as an issue on github!"
+ zone = "r_arm"
+ slot = "r_arm_device"
+ icon_state = "implant-toolkit"
+ w_class = 3
+ actions_types = list(/datum/action/item_action/organ_action/toggle)
+
+ var/list/items_list = list()
+ // Used to store a list of all items inside, for multi-item implants.
+ // I would use contents, but they shuffle on every activation/deactivation leading to interface inconsistencies.
+
+ var/obj/item/holder = null
+ // You can use this var for item path, it would be converted into an item on New()
+
+/obj/item/organ/internal/cyberimp/arm/New()
+ ..()
+ if(ispath(holder))
+ holder = new holder(src)
+
+ update_icon()
+ slot = zone + "_device"
+ items_list = contents.Copy()
+
+/obj/item/organ/internal/cyberimp/arm/update_icon()
+ if(zone == "r_arm")
+ transform = null
+ else // Mirroring the icon
+ transform = matrix(-1, 0, 0, 0, 1, 0)
+
+/obj/item/organ/internal/cyberimp/arm/examine(mob/user)
+ ..()
+ user << "[src] is assembled in the [zone == "r_arm" ? "right" : "left"] arm configuration. You can use a screwdriver to reassemble it."
+
+/obj/item/organ/internal/cyberimp/arm/attackby(obj/item/weapon/W, mob/user, params)
+ ..()
+ if(istype(W, /obj/item/weapon/screwdriver))
+ if(zone == "r_arm")
+ zone = "l_arm"
+ else
+ zone = "r_arm"
+ slot = zone + "_device"
+ user << "You modify [src] to be installed on the [zone == "r_arm" ? "right" : "left"] arm."
+ update_icon()
+ else if(istype(W, /obj/item/weapon/card/emag))
+ emag_act()
+
+/obj/item/organ/internal/cyberimp/arm/Remove(mob/living/carbon/M, special = 0)
+ Retract()
+ ..()
+
+/obj/item/organ/internal/cyberimp/arm/emag_act()
+ return 0
+
+/obj/item/organ/internal/cyberimp/arm/gun/emp_act(severity)
+ if(prob(15/severity))
+ owner << "[src] is hit by EMP!"
+ // give the owner an idea about why his implant is glitching
+ Retract()
+ ..()
+
+/obj/item/organ/internal/cyberimp/arm/proc/Retract()
+ if(!holder || (holder in src))
+ return
+
+ owner.visible_message("[owner] retracts [holder] back into \his [zone == "r_arm" ? "right" : "left"] arm.",
+ "[holder] snaps back into your [zone == "r_arm" ? "right" : "left"] arm.",
+ "You hear a short mechanical noise.")
+
+ owner.unEquip(holder, 1)
+ holder.loc = src
+ holder = null
+ playsound(get_turf(owner), 'sound/mecha/mechmove03.ogg', 50, 1)
+
+/obj/item/organ/internal/cyberimp/arm/proc/Extend(var/obj/item/item)
+ if(!(item in src))
+ return
+
+ holder = item
+
+ holder.flags |= NODROP
+ holder.unacidable = 1
+ holder.slot_flags = null
+ holder.w_class = 5
+ holder.materials = null
+
+ var/arm_slot = (zone == "r_arm" ? slot_r_hand : slot_l_hand)
+ var/obj/item/arm_item = owner.get_item_by_slot(arm_slot)
+
+ if(arm_item)
+ if(!owner.unEquip(arm_item))
+ owner << "Your [arm_item] interferes with [src]!"
+ return
+ else
+ owner << "You drop [arm_item] to activate [src]!"
+
+ if(zone == "r_arm" ? !owner.put_in_r_hand(holder) : !owner.put_in_l_hand(holder))
+ owner << "Your [src] fails to activate!"
+ return
+
+ // Activate the hand that now holds our item.
+ if(zone == "r_arm" ? owner.hand : !owner.hand)
+ owner.swap_hand()
+
+ owner.visible_message("[owner] extends [holder] from \his [zone == "r_arm" ? "right" : "left"] arm.",
+ "You extend [holder] from your [zone == "r_arm" ? "right" : "left"] arm.",
+ "You hear a short mechanical noise.")
+ playsound(get_turf(owner), 'sound/mecha/mechmove03.ogg', 50, 1)
+
+/obj/item/organ/internal/cyberimp/arm/ui_action_click()
+ if(crit_fail || (!holder && !contents.len))
+ owner << "The implant doesn't respond. It seems to be broken..."
+ return
+
+ // You can emag the arm-mounted implant by activating it while holding emag in it's hand.
+ var/arm_slot = (zone == "r_arm" ? slot_r_hand : slot_l_hand)
+ if(istype(owner.get_item_by_slot(arm_slot), /obj/item/weapon/card/emag) && emag_act())
+ return
+
+ if(!holder || (holder in src))
+ holder = null
+ if(contents.len == 1)
+ Extend(contents[1])
+ else // TODO: make it similar to borg's storage-like module selection
+ var/obj/item/choise = input("Activate which item?", "Arm Implant", null, null) as null|anything in items_list
+ if(owner && owner == usr && owner.stat != DEAD && (src in owner.internal_organs) && !holder && istype(choise) && (choise in contents))
+ // This monster sanity check is a nice example of how bad input() is.
+ Extend(choise)
+ else
+ Retract()
+
+
+/obj/item/organ/internal/cyberimp/arm/gun/emp_act(severity)
+ if(prob(30/severity) && owner && !crit_fail)
+ Retract()
+ owner.visible_message("A loud bang comes from [owner]\'s [zone == "r_arm" ? "right" : "left"] arm!")
+ playsound(get_turf(owner), 'sound/weapons/flashbang.ogg', 100, 1)
+ owner << "You feel an explosion erupt inside your [zone == "r_arm" ? "right" : "left"] arm as your implant breaks!"
+ owner.adjust_fire_stacks(20)
+ owner.IgniteMob()
+ owner.adjustFireLoss(25)
+ crit_fail = 1
+ else // The gun will still discharge anyway.
+ ..()
+
+
+/obj/item/organ/internal/cyberimp/arm/gun/laser
+ name = "arm-mounted laser implant"
+ desc = "A variant of the arm cannon implant that fires lethal laser beams. The cannon emerges from the subject's arm and remains inside when not in use."
+ icon_state = "arm_laser"
+ origin_tech = "materials=5;combat=5;biotech=4;powerstorage=4;syndicate=5"//this is kinda nutty and i might lower it
+ holder = /obj/item/weapon/gun/energy/laser/mounted
+
+/obj/item/organ/internal/cyberimp/arm/gun/laser/l/zone = "l_arm"
+
+
+/obj/item/organ/internal/cyberimp/arm/gun/taser
+ name = "arm-mounted taser implant"
+ desc = "A variant of the arm cannon implant that fires electrodes and disabler shots. The cannon emerges from the subject's arm and remains inside when not in use."
+ icon_state = "arm_taser"
+ origin_tech = "materials=5;combat=5;biotech=4;powerstorage=4"
+ holder = /obj/item/weapon/gun/energy/gun/advtaser/mounted
+
+/obj/item/organ/internal/cyberimp/arm/gun/taser/l/zone = "l_arm"
+
+
+/obj/item/organ/internal/cyberimp/arm/toolset
+ name = "integrated toolset implant"
+ desc = "A stripped-down version of engineering cyborg toolset, designed to be installed on subject's arm. Contains all neccessary tools."
+ origin_tech = "materials=5;engineering=5;biotech=4;powerstorage=3"
+ contents = newlist(/obj/item/weapon/screwdriver/cyborg, /obj/item/weapon/wrench/cyborg, /obj/item/weapon/weldingtool/largetank/cyborg,
+ /obj/item/weapon/crowbar/cyborg, /obj/item/weapon/wirecutters/cyborg, /obj/item/device/multitool/cyborg)
+
+/obj/item/organ/internal/cyberimp/arm/toolset/l/zone = "l_arm"
+
+/obj/item/organ/internal/cyberimp/arm/toolset/emag_act()
+ if(!(locate(/obj/item/weapon/kitchen/knife/combat/cyborg) in items_list))
+ owner << "You unlock [src]'s integrated knife!"
+ items_list += new /obj/item/weapon/kitchen/knife/combat/cyborg(src)
+ return 1
+ return 0
\ No newline at end of file
diff --git a/code/modules/surgery/organs/augments_chest.dm b/code/modules/surgery/organs/augments_chest.dm
new file mode 100644
index 000000000000..916051d133c9
--- /dev/null
+++ b/code/modules/surgery/organs/augments_chest.dm
@@ -0,0 +1,106 @@
+/obj/item/organ/internal/cyberimp/chest
+ name = "cybernetic torso implant"
+ desc = "implants for the organs in your torso"
+ icon_state = "chest_implant"
+ implant_overlay = "chest_implant_overlay"
+ zone = "chest"
+
+/obj/item/organ/internal/cyberimp/chest/nutriment
+ name = "Nutriment pump implant"
+ desc = "This implant with synthesize and pump into your bloodstream a small amount of nutriment when you are starving."
+ icon_state = "chest_implant"
+ implant_color = "#00AA00"
+ var/hunger_threshold = NUTRITION_LEVEL_STARVING
+ var/synthesizing = 0
+ var/poison_amount = 5
+ slot = "stomach"
+ origin_tech = "materials=5;programming=3;biotech=4"
+
+/obj/item/organ/internal/cyberimp/chest/nutriment/on_life()
+ if(synthesizing)
+ return
+
+ if(owner.nutrition <= hunger_threshold)
+ synthesizing = 1
+ owner << "You feel less hungry..."
+ owner.nutrition += 50
+ spawn(50)
+ synthesizing = 0
+
+/obj/item/organ/internal/cyberimp/chest/nutriment/emp_act(severity)
+ if(!owner)
+ return
+ owner.reagents.add_reagent("????",poison_amount / severity) //food poisoning
+ owner << "You feel like your insides are burning."
+
+
+/obj/item/organ/internal/cyberimp/chest/nutriment/plus
+ name = "Nutriment pump implant PLUS"
+ desc = "This implant will synthesize and pump into your bloodstream a small amount of nutriment when you are hungry."
+ icon_state = "chest_implant"
+ implant_color = "#006607"
+ hunger_threshold = NUTRITION_LEVEL_HUNGRY
+ poison_amount = 10
+ origin_tech = "materials=5;programming=3;biotech=5"
+
+
+
+/obj/item/organ/internal/cyberimp/chest/reviver
+ name = "Reviver implant"
+ desc = "This implant will attempt to revive you if you lose consciousness. For the faint of heart!"
+ icon_state = "chest_implant"
+ implant_color = "#AD0000"
+ origin_tech = "materials=6;programming=3;biotech=6;syndicate=4"
+ slot = "heartdrive"
+ var/revive_cost = 0
+ var/reviving = 0
+ var/cooldown = 0
+
+/obj/item/organ/internal/cyberimp/chest/reviver/on_life()
+ if(reviving)
+ if(owner.stat == UNCONSCIOUS)
+ spawn(30)
+ if(prob(90) && owner.getOxyLoss())
+ owner.adjustOxyLoss(-3)
+ revive_cost += 5
+ if(prob(75) && owner.getBruteLoss())
+ owner.adjustBruteLoss(-1)
+ revive_cost += 20
+ if(prob(75) && owner.getFireLoss())
+ owner.adjustFireLoss(-1)
+ revive_cost += 20
+ if(prob(40) && owner.getToxLoss())
+ owner.adjustToxLoss(-1)
+ revive_cost += 50
+ else
+ cooldown = revive_cost + world.time
+ reviving = 0
+ return
+
+ if(cooldown > world.time)
+ return
+ if(owner.stat != UNCONSCIOUS)
+ return
+ if(owner.suiciding)
+ return
+
+ revive_cost = 0
+ reviving = 1
+
+/obj/item/organ/internal/cyberimp/chest/reviver/emp_act(severity)
+ if(!owner)
+ return
+
+ if(reviving)
+ revive_cost += 200
+ else
+ cooldown += 200
+
+ if(istype(owner, /mob/living/carbon/human))
+ var/mob/living/carbon/human/H = owner
+ if(H.stat != DEAD && prob(50 / severity))
+ H.heart_attack = 1
+ spawn(600 / severity)
+ H.heart_attack = 0
+ if(H.stat == CONSCIOUS)
+ H << "You feel your heart beating again!"
\ No newline at end of file
diff --git a/code/modules/surgery/organs/augments_eyes.dm b/code/modules/surgery/organs/augments_eyes.dm
index 279f912ef06f..1693d2179060 100644
--- a/code/modules/surgery/organs/augments_eyes.dm
+++ b/code/modules/surgery/organs/augments_eyes.dm
@@ -116,7 +116,7 @@
implant_color = "#101010"
flash_protect = 2
aug_message = null
- eye_color = "fff"
+ eye_color = null
/obj/item/organ/internal/cyberimp/eyes/shield/emp_act(severity)
return
\ No newline at end of file
diff --git a/code/modules/surgery/organs/augments_internal.dm b/code/modules/surgery/organs/augments_internal.dm
index 6fd62d8c645c..8a3776cce8e2 100644
--- a/code/modules/surgery/organs/augments_internal.dm
+++ b/code/modules/surgery/organs/augments_internal.dm
@@ -26,6 +26,7 @@
icon_state = "brain_implant"
implant_overlay = "brain_implant_overlay"
zone = "head"
+ w_class = 1
/obj/item/organ/internal/cyberimp/brain/emp_act(severity)
if(!owner)
@@ -37,7 +38,7 @@
/obj/item/organ/internal/cyberimp/brain/anti_drop
- name = "Anti-drop implant"
+ name = "anti-drop implant"
desc = "This cybernetic brain implant will allow you to force your hand muscles to contract, preventing item dropping. Twitch ear to toggle."
var/active = 0
var/l_hand_ignore = 0
@@ -47,7 +48,7 @@
implant_color = "#DE7E00"
slot = "brain_antidrop"
origin_tech = "materials=5;programming=4;biotech=4"
- organ_action_name = "Toggle Anti-Drop"
+ actions_types = list(/datum/action/item_action/organ_action/toggle)
/obj/item/organ/internal/cyberimp/brain/anti_drop/ui_action_click()
active = !active
@@ -101,11 +102,11 @@
if(L_item)
A = pick(oview(range))
L_item.throw_at(A, range, 2)
- owner << "Your left arm spasms and throws the [L_item.name]!"
+ owner << "Your left arm spasms and throws the [L_item.name]!"
if(R_item)
A = pick(oview(range))
R_item.throw_at(A, range, 2)
- owner << "Your right arm spasms and throws the [R_item.name]!"
+ owner << "Your right arm spasms and throws the [R_item.name]!"
/obj/item/organ/internal/cyberimp/brain/anti_drop/proc/release_items()
if(!l_hand_ignore && l_hand_obj in owner.contents)
@@ -144,185 +145,24 @@
crit_fail = 0
-//[[[[CHEST]]]]
+//[[[[MOUTH]]]]
+/obj/item/organ/internal/cyberimp/mouth
+ zone = "mouth"
-/obj/item/organ/internal/cyberimp/chest
- name = "cybernetic torso implant"
- desc = "implants for the organs in your torso"
- icon_state = "chest_implant"
- implant_overlay = "chest_implant_overlay"
- zone = "chest"
+/obj/item/organ/internal/cyberimp/mouth/breathing_tube
+ name = "breathing tube implant"
+ desc = "This simple implant adds an internals connector to your back, allowing you to use internals without a mask and protecting you from being choked."
+ icon_state = "breathing_tube"
+ slot = "breathing_tube"
+ w_class = 1
+ origin_tech = "materials=2;biotech=3"
-/obj/item/organ/internal/cyberimp/chest/nutriment
- name = "Nutriment pump implant"
- desc = "This implant with synthesize and pump into your bloodstream a small amount of nutriment when you are starving."
- icon_state = "chest_implant"
- implant_color = "#00AA00"
- var/hunger_threshold = NUTRITION_LEVEL_STARVING
- var/synthesizing = 0
- var/poison_amount = 5
- slot = "stomach"
- origin_tech = "materials=5;programming=3;biotech=4"
-
-/obj/item/organ/internal/cyberimp/chest/nutriment/on_life()
- if(synthesizing)
- return
-
- if(owner.nutrition <= hunger_threshold)
- synthesizing = 1
- owner << "You feel less hungry..."
- owner.nutrition += 50
- spawn(50)
- synthesizing = 0
-
-/obj/item/organ/internal/cyberimp/chest/nutriment/emp_act(severity)
- if(!owner)
- return
- owner.reagents.add_reagent("????",poison_amount / severity) //food poisoning
- owner << "You feel like your insides are burning."
+/obj/item/organ/internal/cyberimp/mouth/breathing_tube/emp_act(severity)
+ if(prob(60/severity))
+ owner << "Your breathing tube suddenly closes!"
+ owner.losebreath += 2
-/obj/item/organ/internal/cyberimp/chest/nutriment/plus
- name = "Nutriment pump implant PLUS"
- desc = "This implant will synthesize and pump into your bloodstream a small amount of nutriment when you are hungry."
- icon_state = "chest_implant"
- implant_color = "#006607"
- hunger_threshold = NUTRITION_LEVEL_HUNGRY
- poison_amount = 10
- origin_tech = "materials=5;programming=3;biotech=5"
-
-
-
-/obj/item/organ/internal/cyberimp/chest/reviver
- name = "Reviver implant"
- desc = "This implant will attempt to revive you if you lose consciousness. For the faint of heart!"
- icon_state = "chest_implant"
- implant_color = "#AD0000"
- origin_tech = "materials=6;programming=3;biotech=6;syndicate=4"
- slot = "heartdrive"
- var/revive_cost = 0
- var/reviving = 0
- var/cooldown = 0
-
-/obj/item/organ/internal/cyberimp/chest/reviver/on_life()
- if(reviving)
- if(owner.stat == UNCONSCIOUS)
- spawn(30)
- if(prob(90) && owner.getOxyLoss())
- owner.adjustOxyLoss(-3)
- revive_cost += 5
- if(prob(75) && owner.getBruteLoss())
- owner.adjustBruteLoss(-1)
- revive_cost += 20
- if(prob(75) && owner.getFireLoss())
- owner.adjustFireLoss(-1)
- revive_cost += 20
- if(prob(40) && owner.getToxLoss())
- owner.adjustToxLoss(-1)
- revive_cost += 50
- else
- cooldown = revive_cost + world.time
- reviving = 0
- return
-
- if(cooldown > world.time)
- return
- if(owner.stat != UNCONSCIOUS)
- return
- if(owner.suiciding)
- return
-
- revive_cost = 0
- reviving = 1
-
-/obj/item/organ/internal/cyberimp/chest/reviver/emp_act(severity)
- if(!owner)
- return
-
- if(reviving)
- revive_cost += 200
- else
- cooldown += 200
-
- if(istype(owner, /mob/living/carbon/human))
- var/mob/living/carbon/human/H = owner
- if(H.stat != DEAD && prob(50 / severity))
- H.heart_attack = 1
- spawn(600 / severity)
- H.heart_attack = 0
- if(H.stat == CONSCIOUS)
- H << "You feel your heart beating again!"
-
-/obj/item/organ/internal/cyberimp/chest/arm_mod//dummy parent item for making arm-mod implants. works best with nodrop items that are sent to nullspace upon being dropped.
- name = "Arm-mounted item implant"
- desc = "You shouldn't see this! Adminhelp and report this as an issue on github!"
- icon_state = "chest_implant"
- implant_color = "#007ACC"
- slot = "shoulders"
- origin_tech = "materials=5;biotech=4;powerstorage=4"
- organ_action_name = "Toggle Arm Mod"
- var/obj/holder//is defined as the retractable item itself. ensure this is defined somewhere!
- var/out = 0//determines if the item is in the owner's hand or not
- var/overloaded = 0//is set to 1 when owner gets EMPed. if set to 1, implant doesn't work.
-
-/obj/item/organ/internal/cyberimp/chest/arm_mod/ui_action_click()
- if(overloaded)//ensure the implant isn't broken
- owner << "The implant doesn't respond. It seems to be broken..."
- return
- if(holder == null)
- owner << "You should not be attempting to use this implant, as it is a dummy item that should never appear. Please adminhelp and report this as an issue on github."
- return
- if(out)//check if the owner has the item out already
- owner.unEquip(holder, 1)//if he does, take it away. then,
- holder.loc = null//stash it in nullspace
- out = 0//and set this to clarify the item isn't out.
- owner << "You retract [holder]."
- playsound(get_turf(owner), 'sound/mecha/mechmove03.ogg', 50, 1)
- else//if he doesn't have the item out
- if(owner.put_in_hands(holder))//put it in his hands.
- out = 1
- owner << "You extend [holder]!"
- playsound(get_turf(owner), 'sound/mecha/mechmove03.ogg', 50, 1)
- else//if this fails to put the item in his hands,
- holder.loc = null//keep it in nullspace
- owner << "You can't extend [holder] if you can't use your hands!"
-
-/obj/item/organ/internal/cyberimp/chest/arm_mod/emp_act(severity)//if the implant gets EMPed...
- if(!owner || overloaded)//ensure that it's in an owner and that it's not already EMPed, then...
- return
- if(out)//check if he has the item out...
- owner.unEquip(holder, 1)//if he does, take it away.
- holder.loc = null
- out = 0
- owner << "[holder] forcibly retracts into your arm."
- owner.visible_message("A loud bang comes from [owner]...")
- playsound(get_turf(owner), 'sound/weapons/flashbang.ogg', 100, 1)
- owner << "You feel an explosion erupt inside you as your chest implant breaks. Is it hot in here?"
- owner.adjust_fire_stacks(20)
- owner.IgniteMob()//ignite the owner, as well as
- owner.say("AUUUUUUUUUUUUUUUUUUGH!!")
- owner.adjustFireLoss(25)//severely injure him!
- overloaded = 1//then make sure this can't happen again by breaking the implant.
-
-/obj/item/organ/internal/cyberimp/chest/arm_mod/tase//mounted, self-charging taser!
- name = "Arm-cannon taser implant"
- desc = "A variant of the arm cannon implant that fires electrodes and disabler shots. The cannon emerges from the subject's arms and remains in the shoulders when not in use."
- icon_state = "armcannon_tase_implant"
- origin_tech = "materials=5;combat=5;biotech=4;powerstorage=4"
- organ_action_name = "Toggle Arm Cannon Taser"
-
-/obj/item/organ/internal/cyberimp/chest/arm_mod/tase/New()//when the implant is created...
- holder = new /obj/item/weapon/gun/energy/gun/advtaser/mounted(src)//assign a brand new item to it. (in this case, a gun)
-
-/obj/item/organ/internal/cyberimp/chest/arm_mod/lase//mounted, self-charging laser!
- name = "Arm-cannon laser implant"
- desc = "A variant of the arm cannon implant that fires lethal laser beams. The cannon emerges from the subject's arms and remains in the shoulders when not in use."
- icon_state = "armcannon_lase_implant"
- origin_tech = "materials=5;combat=5;biotech=4;powerstorage=4;syndicate=5"//this is kinda nutty and i might lower it
- organ_action_name = "Toggle Arm Cannon Laser"
-
-/obj/item/organ/internal/cyberimp/chest/arm_mod/lase/New()
- holder = new /obj/item/weapon/gun/energy/laser/mounted(src)
//BOX O' IMPLANTS
diff --git a/code/modules/surgery/organs/helpers.dm b/code/modules/surgery/organs/helpers.dm
index 5fa8b0811be5..b25f792f3369 100644
--- a/code/modules/surgery/organs/helpers.dm
+++ b/code/modules/surgery/organs/helpers.dm
@@ -26,9 +26,7 @@ mob/living/carbon/getorganszone(zone, var/subzones = 0)
return returnorg
mob/living/carbon/getorganslot(slot)
- for(var/obj/item/organ/internal/O in internal_organs)
- if(slot == O.slot)
- return O
+ return internal_organs_slot[slot]
mob/proc/getlimb()
return
diff --git a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm
index e1e4ac7a3d55..3b92baa70d28 100644
--- a/code/modules/surgery/organs/organ_internal.dm
+++ b/code/modules/surgery/organs/organ_internal.dm
@@ -5,8 +5,9 @@
throwforce = 0
var/zone = "chest"
var/slot
+ // DO NOT add slots with matching names to different zones - it will break internal_organs_slot list!
var/vital = 0
- var/organ_action_name = null
+
/obj/item/organ/internal/proc/Insert(mob/living/carbon/M, special = 0)
if(!iscarbon(M) || owner == M)
@@ -18,20 +19,25 @@
owner = M
M.internal_organs |= src
+ M.internal_organs_slot[slot] = src
loc = null
- if(organ_action_name)
- action_button_name = organ_action_name
+ for(var/X in actions)
+ var/datum/action/A = X
+ A.Grant(M)
/obj/item/organ/internal/proc/Remove(mob/living/carbon/M, special = 0)
owner = null
if(M)
M.internal_organs -= src
+ if(M.internal_organs_slot[slot] == src)
+ M.internal_organs_slot.Remove(slot)
if(vital && !special)
M.death()
+ for(var/X in actions)
+ var/datum/action/A = X
+ A.Remove(M)
- if(organ_action_name)
- action_button_name = null
/obj/item/organ/internal/proc/on_find(mob/living/finder)
return
@@ -39,6 +45,12 @@
/obj/item/organ/internal/proc/on_life()
return
+/obj/item/organ/internal/examine(mob/user)
+ ..()
+ if(status == ORGAN_ROBOTIC && crit_fail)
+ user << "[src] seems to be broken!"
+
+
/obj/item/organ/internal/proc/prepare_eat()
var/obj/item/weapon/reagent_containers/food/snacks/organ/S = new
S.name = name
@@ -54,7 +66,6 @@
name = "appendix"
icon_state = "appendix"
icon = 'icons/obj/surgery.dmi'
-
list_reagents = list("nutriment" = 5)
@@ -76,6 +87,9 @@
else
..()
+/obj/item/organ/internal/item_action_slot_check(slot,mob/user)
+ return //so we don't grant the organ's action to mobs who pick up the organ.
+
//Looking for brains?
//Try code/modules/mob/living/carbon/brain/brain_item.dm
@@ -87,25 +101,55 @@
zone = "chest"
slot = "heart"
origin_tech = "biotech=3"
- vital = 1
var/beating = 1
+ var/icon_base = "heart"
/obj/item/organ/internal/heart/update_icon()
if(beating)
- icon_state = "heart-on"
+ icon_state = "[icon_base]-on"
else
- icon_state = "heart-off"
-
-/obj/item/organ/internal/heart/Insert(mob/living/carbon/M, special = 0)
- ..()
- beating = 1
- update_icon()
+ icon_state = "[icon_base]-off"
/obj/item/organ/internal/heart/Remove(mob/living/carbon/M, special = 0)
..()
+ if(ishuman(M))
+ var/mob/living/carbon/human/H = M
+ if(H.stat == DEAD || H.heart_attack)
+ Stop()
+ return
+ if(!special)
+ H.heart_attack = 1
+
spawn(120)
- beating = 0
- update_icon()
+ if(!owner)
+ Stop()
+
+/obj/item/organ/internal/heart/attack_self(mob/user)
+ ..()
+ if(!beating)
+ Restart()
+ spawn(80)
+ if(!owner)
+ Stop()
+
+
+/obj/item/organ/internal/heart/Insert(mob/living/carbon/M, special = 0)
+ ..()
+ if(ishuman(M) && beating)
+ var/mob/living/carbon/human/H = M
+ if(H.heart_attack)
+ H.heart_attack = 0
+ return
+
+/obj/item/organ/internal/heart/proc/Stop()
+ beating = 0
+ update_icon()
+ return 1
+
+/obj/item/organ/internal/heart/proc/Restart()
+ beating = 1
+ update_icon()
+ return 1
/obj/item/organ/internal/heart/prepare_eat()
var/obj/S = ..()
@@ -113,6 +157,88 @@
return S
+/obj/item/organ/internal/heart/cursed
+ name = "cursed heart"
+ desc = "it needs to be pumped..."
+ icon_state = "cursedheart-off"
+ icon_base = "cursedheart"
+ origin_tech = "biotech=5"
+ actions_types = list(/datum/action/item_action/organ_action/cursed_heart)
+ var/last_pump = 0
+ var/pump_delay = 30 //you can pump 1 second early, for lag, but no more (otherwise you could spam heal)
+ var/blood_loss = 100 //600 blood is human default, so 5 failures (below 122 blood is where humans die because reasons?)
+
+ //How much to heal per pump, negative numbers would HURT the player
+ var/heal_brute = 0
+ var/heal_burn = 0
+ var/heal_oxy = 0
+
+
+/obj/item/organ/internal/heart/cursed/attack(mob/living/carbon/human/H, mob/living/carbon/human/user, obj/target)
+ if(H == user && istype(H))
+ playsound(user,'sound/effects/singlebeat.ogg',40,1)
+ user.drop_item()
+ Insert(user)
+ else
+ return ..()
+
+/obj/item/organ/internal/heart/cursed/on_life()
+ if(world.time > (last_pump + pump_delay))
+ if(ishuman(owner) && owner.client) //While this entire item exists to make people suffer, they can't control disconnects.
+ var/mob/living/carbon/human/H = owner
+ H.vessel.remove_reagent("blood",blood_loss)
+ H << "You have to keep pumping your blood!"
+ if(H.client)
+ H.client.color = "red" //bloody screen so real
+ else
+ last_pump = world.time //lets be extra fair *sigh*
+
+/obj/item/organ/internal/heart/cursed/Insert(mob/living/carbon/M, special = 0)
+ ..()
+ if(owner)
+ owner << "Your heart has been replaced with a cursed one, you have to pump this one manually otherwise you'll die!"
+
+/datum/action/item_action/organ_action/cursed_heart
+ name = "pump your blood"
+
+//You are now brea- pumping blood manually
+/datum/action/item_action/organ_action/cursed_heart/Trigger()
+ . = ..()
+ if(. && istype(target,/obj/item/organ/internal/heart/cursed))
+ var/obj/item/organ/internal/heart/cursed/cursed_heart = target
+
+ if(world.time < (cursed_heart.last_pump + (cursed_heart.pump_delay-10))) //no spam
+ owner << "Too soon!"
+ return
+
+ cursed_heart.last_pump = world.time
+ playsound(owner,'sound/effects/singlebeat.ogg',40,1)
+ owner << "Your heart beats."
+
+ var/mob/living/carbon/human/H = owner
+ if(istype(H))
+ H.vessel.add_reagent("blood",(cursed_heart.blood_loss*0.5))//gain half the blood back from a failure
+ if(owner.client)
+ owner.client.color = ""
+
+ H.adjustBruteLoss(-cursed_heart.heal_brute)
+ H.adjustFireLoss(-cursed_heart.heal_burn)
+ H.adjustOxyLoss(-cursed_heart.heal_oxy)
+
+
+/obj/item/organ/internal/lungs
+ name = "lungs"
+ icon_state = "lungs"
+ zone = "chest"
+ slot = "lungs"
+ gender = PLURAL
+ w_class = 3
+
+/obj/item/organ/internal/lungs/prepare_eat()
+ var/obj/S = ..()
+ S.reagents.add_reagent("salbutamol", 5)
+ return S
+
/obj/item/organ/internal/appendix
name = "appendix"
@@ -175,4 +301,4 @@
health++
if(health <= 0)
visible_message("[src] collapses in on itself!")
- qdel(src)
+ qdel(src)
\ No newline at end of file
diff --git a/code/modules/uplink/uplink_item.dm b/code/modules/uplink/uplink_item.dm
index 0e6f48cc781b..685fb69e0b00 100644
--- a/code/modules/uplink/uplink_item.dm
+++ b/code/modules/uplink/uplink_item.dm
@@ -92,13 +92,6 @@ var/list/uplink_items = list() // Global list so we only initialize this once.
item = /obj/item/weapon/storage/backpack/dufflebag/syndie/c20rbundle
cost = 14 // normally 16
-/datum/uplink_item/nukeoffer/m90gl
- name = "M-90gl bundle"
- desc = "A premium offer: Pick up the M-90gl, along with a magazine, some grenades, and a pack of cigarettes \
- for a 'killer' price."
- item = /obj/item/weapon/storage/backpack/dufflebag/syndie/m90glbundle
- cost = 15 // normally 18
-
/datum/uplink_item/nukeoffer/bulldog
name = "Bulldog bundle"
desc = "Lean and mean: Optimised for people that want to get up close and personal. Contains the popular \
@@ -174,19 +167,6 @@ var/list/uplink_items = list() // Global list so we only initialize this once.
item = /obj/item/weapon/gun/projectile/automatic/c20r/unrestricted
include_modes = list(/datum/game_mode/gang)
-/datum/uplink_item/dangerous/carbine
- name = "M-90gl Carbine"
- desc = "A fully-loaded, specialized three-round burst carbine that fires 30-round 5.56mm magazines with a togglable \
- underslung 40mm grenade launcher."
- item = /obj/item/weapon/gun/projectile/automatic/m90
- cost = 12
- surplus = 50
- include_modes = list(/datum/game_mode/nuclear)
-
-/datum/uplink_item/dangerous/carbine/unrestricted
- item = /obj/item/weapon/gun/projectile/automatic/m90/unrestricted
- include_modes = list(/datum/game_mode/gang)
-
/datum/uplink_item/dangerous/machinegun
name = "L6 Squad Automatic Weapon"
desc = "A fully-loaded Aussec Armoury belt-fed machine gun. \
@@ -310,43 +290,6 @@ var/list/uplink_items = list() // Global list so we only initialize this once.
surplus = 35
include_modes = list(/datum/game_mode/nuclear)
-/datum/uplink_item/dangerous/gygax
- name = "Gygax Exosuit"
- desc = "A lightweight exosuit, painted in a dark scheme. Its speed and equipment selection make it excellent \
- for hit-and-run style attacks. This model lacks a method of space propulsion, and therefore it is \
- advised to utilize the drop pod if you wish to make use of it."
- item = /obj/mecha/combat/gygax/dark/loaded
- cost = 80
- surplus = 0
- include_modes = list(/datum/game_mode/nuclear)
-
-/datum/uplink_item/dangerous/mauler
- name = "Mauler Exosuit"
- desc = "A massive and incredibly deadly military-grade exosuit. Features long-range targetting, thrust vectoring, \
- and deployable smoke."
- item = /obj/mecha/combat/marauder/mauler/loaded
- cost = 140
- surplus = 0
- include_modes = list(/datum/game_mode/nuclear)
-
-/datum/uplink_item/dangerous/reinforcement/syndieborg
- name = "Syndicate Cyborg"
- desc = "A cyborg designed and programmed for systematic extermination of non-Syndicate personnel."
- item = /obj/item/weapon/antag_spawner/nuke_ops/borg_tele
- cost = 80
- surplus = 0
- include_modes = list(/datum/game_mode/nuclear)
-
-/datum/uplink_item/dangerous/reinforcement
- name = "Reinforcements"
- desc = "Call in an additional team member. They won't come with any gear, so you'll have to save some telecrystals \
- to arm them as well."
- item = /obj/item/weapon/antag_spawner/nuke_ops
- cost = 25
- refundable = TRUE
- surplus = 0
- include_modes = list(/datum/game_mode/nuclear)
-
/datum/uplink_item/dangerous/guardian
name = "Holoparasites"
desc = "Though capable of near sorcerous feats via use of hardlight holograms and nanomachines, they require an \
@@ -439,22 +382,6 @@ var/list/uplink_items = list() // Global list so we only initialize this once.
cost = 20
include_modes = list(/datum/game_mode/nuclear)
-/datum/uplink_item/ammo/carbine
- name = "5.56 Toploader Magazine"
- desc = "An additional 30-round 5.56 magazine; sutable for use with the M-90gl carbine. \
- These bullets don't have the punch to knock most targets down, but dish out higher overall damage."
- item = /obj/item/ammo_box/magazine/m556
- cost = 4
- include_modes = list(/datum/game_mode/nuclear, /datum/game_mode/gang)
-
-/datum/uplink_item/ammo/a40mm
- name = "40mm Grenade Box"
- desc = "A box of 4 additional 40mm HE grenades for use with the M-90gl's underbarrel grenade launcher. \
- Your teammates will ask you to not shoot these down small hallways."
- item = /obj/item/ammo_box/a40mm
- cost = 5
- include_modes = list(/datum/game_mode/nuclear)
-
/datum/uplink_item/ammo/machinegun
cost = 6
surplus = 0
@@ -539,10 +466,53 @@ var/list/uplink_items = list() // Global list so we only initialize this once.
cost = 6
include_modes = list(/datum/game_mode/nuclear)
+//Support and Mechs
+/datum/uplink_item/support
+ category = "Support and Mechanized Exosuits"
+ surplus = 0
+ include_modes = list(/datum/game_mode/nuclear)
+
+/datum/uplink_item/support/reinforcement
+ name = "Reinforcements"
+ desc = "Call in an additional team member. They won't come with any gear, so you'll have to save some telecrystals \
+ to arm them as well."
+ item = /obj/item/weapon/antag_spawner/nuke_ops
+ cost = 25
+ refundable = TRUE
+
+/datum/uplink_item/support/reinforcement/syndieborg
+ name = "Syndicate Cyborg"
+ desc = "A cyborg designed and programmed for systematic extermination of non-Syndicate personnel."
+ item = /obj/item/weapon/antag_spawner/nuke_ops/borg_tele
+ cost = 80
+
+/datum/uplink_item/support/gygax
+ name = "Gygax Exosuit"
+ desc = "A lightweight exosuit, painted in a dark scheme. Its speed and equipment selection make it excellent \
+ for hit-and-run style attacks. This model lacks a method of space propulsion, and therefore it is \
+ advised to utilize the drop pod if you wish to make use of it."
+ item = /obj/mecha/combat/gygax/dark/loaded
+ cost = 80
+
+/datum/uplink_item/support/mauler
+ name = "Mauler Exosuit"
+ desc = "A massive and incredibly deadly military-grade exosuit. Features long-range targetting, thrust vectoring, \
+ and deployable smoke."
+ item = /obj/mecha/combat/marauder/mauler/loaded
+ cost = 140
+
// Stealthy Weapons
/datum/uplink_item/stealthy_weapons
category = "Stealthy and Inconspicuous Weapons"
+/datum/uplink_item/stealthy_weapons/martialarts
+ name = "Martial Arts Scroll"
+ desc = "This scroll contains the secrets of an ancient martial arts technique. You will master unarmed combat, \
+ deflecting all ranged weapon fire, but you also refuse to use dishonorable ranged weaponry."
+ item = /obj/item/weapon/sleeping_carp_scroll
+ cost = 17
+ exclude_modes = list(/datum/game_mode/nuclear, /datum/game_mode/gang)
+
/datum/uplink_item/stealthy_weapons/throwingstars
name = "Box of Throwing Stars"
desc = "A box of shurikens from ancient Earth martial arts. They are highly effective throwing weapons, \
@@ -650,32 +620,22 @@ var/list/uplink_items = list() // Global list so we only initialize this once.
/datum/uplink_item/stealthy_tools
category = "Stealth and Camouflage Items"
-/datum/uplink_item/stealthy_tools/chameleon_jumpsuit
- name = "Chameleon Jumpsuit"
- desc = "A jumpsuit used to imitate the uniforms of Nanotrasen crewmembers. It can change form at any time \
- to resemble another jumpsuit. May react unpredictably to electromagnetic disruptions."
- item = /obj/item/clothing/under/chameleon
- cost = 2
-
-/datum/uplink_item/stealthy_tools/chameleon_stamp
- name = "Chameleon Stamp"
- desc = "A stamp that can be activated to imitate an official Nanotrasen Stamp. The disguised stamp will \
- work exactly like the real stamp and will allow you to forge false documents to gain access or equipment; \
- it can also be used in a washing machine to forge clothing."
- item = /obj/item/weapon/stamp/chameleon
- cost = 1
- surplus = 35
+/datum/uplink_item/stealthy_tools/chameleon
+ name = "Chameleon Kit"
+ desc = "A set of items that contain chameleon technology allowing you to disguise as pretty much anything on the station, and more!"
+ item = /obj/item/weapon/storage/box/syndie_kit/chameleon
+ cost = 4
/datum/uplink_item/stealthy_tools/syndigaloshes
- name = "No-Slip Brown Shoes"
+ name = "No-Slip Chameleon Shoes"
desc = "These shoes will allow the wearer to run on wet floors and slippery objects without falling down. \
They do not work on heavily lubricated surfaces."
- item = /obj/item/clothing/shoes/sneakers/syndigaloshes
+ item = /obj/item/clothing/shoes/chameleon
cost = 2
exclude_modes = list(/datum/game_mode/nuclear)
/datum/uplink_item/stealthy_tools/syndigaloshes/nuke
- name = "Tactical No-Slip Brown Shoes"
+ name = "Tactical No-Slip Chameleon Shoes"
desc = "These allow you to run on wet floors. They do not work on heavily lubricated surfaces, but the \
manufacturer guarantees they're somehow better than the normal ones."
cost = 4
@@ -691,12 +651,6 @@ var/list/uplink_items = list() // Global list so we only initialize this once.
item = /obj/item/weapon/card/id/syndicate
cost = 2
-/datum/uplink_item/stealthy_tools/voice_changer
- name = "Voice Changer"
- desc = "A conspicuous gas mask that mimics the voice named on your identification card. It can be toggled on and off."
- item = /obj/item/clothing/mask/gas/voice
- cost = 3
-
/datum/uplink_item/stealthy_tools/chameleon_proj
name = "Chameleon Projector"
desc = "Projects an image across a user, disguising them as an object scanned with it, as long as they don't \
@@ -737,7 +691,7 @@ var/list/uplink_items = list() // Global list so we only initialize this once.
cost = 4
surplus = 30
exclude_modes = list(/datum/game_mode/nuclear, /datum/game_mode/gang)
-
+
/datum/uplink_item/stealthy_tools/emplight
name = "EMP Flashlight"
desc = "A small, self-charging, short-ranged EMP device disguised as a flashlight. \
@@ -746,6 +700,47 @@ var/list/uplink_items = list() // Global list so we only initialize this once.
cost = 2
surplus = 30
+//Space Suits and Hardsuits
+/datum/uplink_item/suits
+ category = "Space Suits and Hardsuits"
+ exclude_modes = list(/datum/game_mode/gang)
+
+/datum/uplink_item/suits/space_suit
+ name = "Syndicate Space Suit"
+ desc = "This red and black syndicate space suit is less encumbering than Nanotrasen variants, \
+ fits inside bags, and has a weapon slot. Nanotrasen crewmembers are trained to report red space suit \
+ sightings, however."
+ item = /obj/item/weapon/storage/box/syndie_kit/space
+ cost = 4
+
+/datum/uplink_item/suits/hardsuit
+ name = "Syndicate Hardsuit"
+ desc = "The feared suit of a syndicate nuclear agent. Features slightly better armoring and a built in jetpack \
+ that runs off standard atmospheric tanks. When the built in helmet is deployed your identity will be \
+ protected, even in death, as the suit cannot be removed by outside forces. Toggling the suit in and out of \
+ combat mode will allow you all the mobility of a loose fitting uniform without sacrificing armoring. \
+ Additionally the suit is collapsible, making it small enough to fit within a backpack. \
+ Nanotrasen crew who spot these suits are known to panic."
+ item = /obj/item/clothing/suit/space/hardsuit/syndi
+ cost = 8
+ exclude_modes = list(/datum/game_mode/nuclear) //you can't buy it in nuke, because the elite hardsuit costs the same while being better
+
+/datum/uplink_item/suits/hardsuit/elite
+ name = "Elite Syndicate Hardsuit"
+ desc = "An advanced hardsuit with superior armor and mobility to the standard Syndicate Hardsuit."
+ item = /obj/item/clothing/suit/space/hardsuit/syndi/elite
+ cost = 8
+ include_modes = list(/datum/game_mode/nuclear)
+ exclude_modes = list()
+
+/datum/uplink_item/suits/hardsuit/shielded
+ name = "Shielded Hardsuit"
+ desc = "An advanced hardsuit with built in energy shielding. The shields will rapidly recharge when not under fire."
+ item = /obj/item/clothing/suit/space/hardsuit/shielded/syndi
+ cost = 30
+ include_modes = list(/datum/game_mode/nuclear)
+ exclude_modes = list()
+
// Devices and Tools
/datum/uplink_item/device_tools
category = "Devices and Tools"
@@ -788,40 +783,6 @@ var/list/uplink_items = list() // Global list so we only initialize this once.
cost = 9
include_modes = list(/datum/game_mode/nuclear, /datum/game_mode/gang)
-
-/datum/uplink_item/device_tools/space_suit
- name = "Syndicate Space Suit"
- desc = "This red and black syndicate space suit is less encumbering than Nanotrasen variants, \
- fits inside bags, and has a weapon slot. Nanotrasen crewmembers are trained to report red space suit \
- sightings, however."
- item = /obj/item/weapon/storage/box/syndie_kit/space
- cost = 4
- exclude_modes = list(/datum/game_mode/gang)
-
-/datum/uplink_item/device_tools/hardsuit
- name = "Syndicate Hardsuit"
- desc = "The feared suit of a syndicate nuclear agent. Features slightly better armoring and a built in jetpack \
- that runs off standard atmospheric tanks. When the built in helmet is deployed your identity will be \
- protected, even in death, as the suit cannot be removed by outside forces. Toggling the suit in and out of \
- combat mode will allow you all the mobility of a loose fitting uniform without sacrificing armoring. \
- Additionally the suit is collapsible, making it small enough to fit within a backpack. \
- Nanotrasen crew who spot these suits are known to panic."
- item = /obj/item/clothing/suit/space/hardsuit/syndi
- cost = 8
- include_modes = list(/datum/game_mode/nuclear)
-
-/datum/uplink_item/device_tools/hardsuit/elite
- name = "Elite Syndicate Hardsuit"
- desc = "An advanced hardsuit with superior armor and mobility to the standard Syndicate Hardsuit."
- item = /obj/item/clothing/suit/space/hardsuit/syndi/elite
- cost = 8
-
-/datum/uplink_item/device_tools/hardsuit/shielded
- name = "Shielded Hardsuit"
- desc = "An advanced hardsuit with built in energy shielding. The shields will rapidly recharge when not under fire."
- item = /obj/item/clothing/suit/space/hardsuit/shielded/syndi
- cost = 30
-
/datum/uplink_item/device_tools/thermal
name = "Thermal Imaging Glasses"
desc = "These goggles can be turned to resemble common eyewears throughout the station. \
diff --git a/code/modules/vehicles/speedbike.dm b/code/modules/vehicles/speedbike.dm
new file mode 100644
index 000000000000..119aca15fd28
--- /dev/null
+++ b/code/modules/vehicles/speedbike.dm
@@ -0,0 +1,60 @@
+/obj/vehicle/space/speedbike
+ name = "Speedbike"
+ icon = 'icons/obj/bike.dmi'
+ icon_state = "speedbike_blue"
+ layer = OBJ_LAYER
+ keytype = null
+ vehicle_move_delay = 0
+ var/overlay_state = "cover_blue"
+ var/image/overlay = null
+
+/obj/vehicle/space/speedbike/New()
+ ..()
+ overlay = image("icons/obj/bike.dmi", overlay_state)
+ overlay.layer = MOB_LAYER + 0.1
+ overlays += overlay
+
+/obj/effect/overlay/temp/speedbike_trail
+ name = "speedbike trails"
+ icon_state = "ion_fade"
+ duration = 20
+ randomdir = 0
+
+/obj/effect/overlay/temp/speedbike_trail/New(loc,move_dir)
+ ..()
+ dir = move_dir
+
+/obj/vehicle/space/speedbike/Move(newloc,move_dir)
+ if(buckled_mob)
+ PoolOrNew(/obj/effect/overlay/temp/speedbike_trail,list(loc,move_dir))
+ . = ..()
+
+/obj/vehicle/space/speedbike/handle_vehicle_layer()
+ switch(dir)
+ if(NORTH,SOUTH)
+ pixel_x = -16
+ pixel_y = -16
+ if(EAST,WEST)
+ pixel_x = -18
+ pixel_y = 0
+
+/obj/vehicle/space/speedbike/handle_vehicle_offsets()
+ if(buckled_mob)
+ buckled_mob.dir = dir
+ switch(dir)
+ if(NORTH)
+ buckled_mob.pixel_x = 0
+ buckled_mob.pixel_y = -8
+ if(SOUTH)
+ buckled_mob.pixel_x = 0
+ buckled_mob.pixel_y = 4
+ if(EAST)
+ buckled_mob.pixel_x = -10
+ buckled_mob.pixel_y = 5
+ if(WEST)
+ buckled_mob.pixel_x = 10
+ buckled_mob.pixel_y = 5
+
+/obj/vehicle/space/speedbike/red
+ icon_state = "speedbike_red"
+ overlay_state = "cover_red"
\ No newline at end of file
diff --git a/code/modules/vehicles/vehicle.dm b/code/modules/vehicles/vehicle.dm
index 6c6c8dbf6a1d..18939a779df9 100644
--- a/code/modules/vehicles/vehicle.dm
+++ b/code/modules/vehicles/vehicle.dm
@@ -89,7 +89,7 @@
unbuckle_mob()
if(keycheck(user))
- if(!Process_Spacemove(direction) || !has_gravity(src.loc) || world.time < next_vehicle_move || !isturf(loc))
+ if(!Process_Spacemove(direction) || world.time < next_vehicle_move || !isturf(loc))
return
next_vehicle_move = world.time + vehicle_move_delay
@@ -123,3 +123,18 @@
if(istype(M, /obj/machinery/door) && buckled_mob)
M.Bumped(buckled_mob)
+
+/obj/vehicle/Process_Spacemove(direction)
+ if(has_gravity(src))
+ return 1
+
+ if(pulledby)
+ return 1
+
+ return 0
+
+/obj/vehicle/space
+ pressure_resistance = INFINITY
+
+/obj/vehicle/space/Process_Spacemove(direction)
+ return 1
\ No newline at end of file
diff --git a/code/orphaned procs/priority_announce.dm b/code/orphaned procs/priority_announce.dm
index c92245acc6f1..2d490bea2af0 100644
--- a/code/orphaned procs/priority_announce.dm
+++ b/code/orphaned procs/priority_announce.dm
@@ -27,8 +27,9 @@
for(var/mob/M in player_list)
if(!istype(M,/mob/new_player) && !M.ear_deaf)
M << announcement
- if(M.client.prefs.toggles & SOUND_ANNOUNCMENTS)
- M << sound(sound)
+ if(M.client.prefs.toggles & SOUND_ANNOUNCEMENTS)
+ continue
+ M << sound(sound)
/proc/print_command_report(text = "", title = "Central Command Update")
for (var/obj/machinery/computer/communications/C in machines)
@@ -38,6 +39,7 @@
P.info = text
C.messagetitle.Add("[title]")
C.messagetext.Add(text)
+ P.update_icon()
/proc/minor_announce(message, title = "Attention:", alert)
if(!message)
@@ -46,8 +48,9 @@
for(var/mob/M in player_list)
if(!istype(M,/mob/new_player) && !M.ear_deaf)
M << "[title] [message] "
- if(M.client.prefs.toggles & SOUND_ANNOUNCMENTS)
- if(alert)
- M << sound('sound/misc/notice1.ogg')
- else
- M << sound('sound/misc/notice2.ogg')
\ No newline at end of file
+ if(M.client.prefs.toggles & SOUND_ANNOUNCEMENTS)
+ continue
+ if(alert)
+ M << sound('sound/misc/notice1.ogg')
+ else
+ M << sound('sound/misc/notice2.ogg')
\ No newline at end of file
diff --git a/code/world.dm b/code/world.dm
index 0fccf138ac0f..36e848d1ac86 100644
--- a/code/world.dm
+++ b/code/world.dm
@@ -69,11 +69,13 @@ var/global/list/map_transition_config = MAP_TRANSITION_CONFIG
return
+#define IRC_STATUS_THROTTLE 50
+var/last_irc_status = 0
/world/Topic(T, addr, master, key)
diary << "TOPIC: \"[T]\", from:[addr], master:[master], key:[key]"
- if (T == "ping")
+ if(T == "ping")
var/x = 1
for (var/client/C in clients)
x++
@@ -86,7 +88,14 @@ var/global/list/map_transition_config = MAP_TRANSITION_CONFIG
n++
return n
- else if (T == "status")
+ else if(T == "ircstatus")
+ if(world.time - last_irc_status < IRC_STATUS_THROTTLE)
+ return
+ var/list/adm = get_admin_counts()
+ send2irc("Status", "Admins: [Sum(adm)] (Active: [adm["admins"]] AFK: [adm["afkadmins"]] Stealth: [adm["stealthadmins"]] Skipped: [adm["noflagadmins"]]). Players: [clients.len] (Active: [get_active_player_count()]). Mode: [master_mode].")
+ last_irc_status = world.time
+
+ else if(T == "status")
var/list/s = list()
// Please add new status indexes under the old ones, for the server banner (until that gets reworked)
s["version"] = game_version
@@ -96,26 +105,21 @@ var/global/list/map_transition_config = MAP_TRANSITION_CONFIG
s["vote"] = config.allow_vote_mode
s["ai"] = config.allow_ai
s["host"] = host ? host : null
-
- var/admins = 0
- for(var/client/C in clients)
- if(C.holder)
- if(C.holder.fakekey)
- continue //so stealthmins aren't revealed by the hub
- admins++
-
s["active_players"] = get_active_player_count()
s["players"] = clients.len
s["revision"] = revdata.revision
s["revision_date"] = revdata.date
- s["admins"] = admins
+
+ var/list/adm = get_admin_counts()
+ s["admins"] = adm["present"] + adm["afk"] //equivalent to the info gotten from adminwho
s["gamestate"] = 1
if(ticker)
s["gamestate"] = ticker.current_state
s["map_name"] = map_name ? map_name : "Unknown"
return list2params(s)
- else if (copytext(T,1,9) == "announce")
+
+ else if(copytext(T,1,9) == "announce")
var/input[] = params2list(T)
if(global.comms_allowed)
if(input["key"] != global.comms_key)
diff --git a/config/spaceRuinConfig.txt b/config/spaceRuinConfig.txt
index a0de267df386..daf681388a5e 100644
--- a/config/spaceRuinConfig.txt
+++ b/config/spaceRuinConfig.txt
@@ -3,4 +3,15 @@
#Ruins should be 40x40 at max. Anymore than that will break the game.
#SPECIFYING AN INVALID MAP WILL RESULT IN RUNTIMES ON GAME START
-#_maps/RandomRuins/SpaceRuins/way_home.dmm
\ No newline at end of file
+#_maps/RandomRuins/SpaceRuins/way_home.dmm
+#_maps/RandomRuins/SpaceRuins/asteroid1.dmm
+#_maps/RandomRuins/SpaceRuins/asteroid2.dmm
+#_maps/RandomRuins/SpaceRuins/asteroid3.dmm
+#_maps/RandomRuins/SpaceRuins/asteroid4.dmm
+#_maps/RandomRuins/SpaceRuins/asteroid5.dmm
+#_maps/RandomRuins/SpaceRuins/derelict1.dmm
+#_maps/RandomRuins/SpaceRuins/derelict2.dmm
+#_maps/RandomRuins/SpaceRuins/derelict3.dmm
+#_maps/RandomRuins/SpaceRuins/derelict4.dmm
+#_maps/RandomRuins/SpaceRuins/derelict5.dmm
+#_maps/RandomRuins/SpaceRuins/spacebar.dmm
\ No newline at end of file
diff --git a/html/changelog.html b/html/changelog.html
index 72116febc660..4120d35d245b 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,85 @@
-->
+
26 February 2016
+
Iamgoofball updated:
+
+
Adds the Chameleon Kit to uplinks for 4 telecrystals containing a Chameleon Jumpsuit/Exosuit/Gloves/Shoes/Glasses/Hat/Mask/Backpack/Radio/Stamp/Gun/PDA.
+
The chameleon gun fires no-damage lasers regardless of what it looks like.
+
The Voice Changer has been merged into the Chameleon Mask.
+
No-slip shoes have been combined into Chameleon Shoes.
+
Space Ninjas no longer have voice changing capabilities.
+
The Chameleon Jumpsuit has been replaced by the Chameleon Kit in the uplink for the same price.
+
All chameleon clothing items have lost EMP vulnerability.
+
Chameleon equipment provides very minor armor.
+
Agent ID Cards can now use chameleon technology to look like any other ID card.
+
The Chameleon Kit is actually purchasable now. It doesn't give a single chameleon jumpsuit anymore.
+
+
PKPenguin321 updated:
+
+
The kitchen vendor now contains two sharpening blocks.
+
Only items that are already sharp (such as fire axes, knives, etc) can be sharpened. Items used on sharpening blocks become sharper and deadlier. The sharpening blocks themselves can only be used once, and you can only sharpen items once.
+
The EMP kit has been buffed. It now contains five EMP grenades, up from two.
+
The EMP implant found in the EMP kit has been buffed. It now has three uses, up from two.
+
+
+
24 February 2016
+
CPTANT updated:
+
+
stamina regeneration is now 50% faster.
+
+
Joan updated:
+
+
Revenants now have an essence display on their HUD
+
Revenants retain the essence cap from the previous revenant when reforming, minus any perfect souls.
+
Revenants can now toggle their night vision.
+
Revenant Defile has one tile more of range, but does less damage to windows.
+
Revenant Blight kills space vines and glowshrooms slightly more rapidly.
+
Delays before appearing when harvesting are slightly randomized.
+
Revenant fluff objectives have been changed to be slightly more interesting.
+
+
RemieRichards updated:
+
+
Cursed heart item for wizards, allows them to heal themselves in exchange for having to MANUALLY beat their heart every 6 seconds. Heals 25 brute/burn/oxy damage per correctly timed pump.
+
+
Steelpoint updated:
+
+
Syndicate engineers have reinforced the exterior of their stealth attack ships. Nuclear Operative ship hull walls are now, once again, indestructible.
+
In addition Syndicate engineers had the opportunity to revamp the interior of stealth attack ships. The inside of Op ships now has a slightly new layout, including a expanded medbay, as well as additional medical and explosive equipment.
+
Thanks to covert Syndicate operatives, strike teams can now bring the stealth attack ship within very close proximity to the station codenamed 'Boxstation'. A new ship destination labeled 'south maintenance airlock' is now available to Op strike teams.
+
+
phil235 updated:
+
+
Holo tape is replaced by holo barriers.
+
The action button of gas tanks and jetpacks now turn green when you turn your internals on.
+
+
+
20 February 2016
+
CPTANT updated:
+
+
Due to new crystals Nanotrasen lasers weapons may now set you on FIRE.
+
+
Joan updated:
+
+
Blobbernauts and blob spores now have a visual healing effect when being healed by the blob.
+
+
xxalpha updated:
+
+
New event: Portal Storm.
+
Kinetic accelerators now reload automatically.
+
+
+
19 February 2016
+
AnturK updated:
+
+
Chairs and stools can now be picked up and used as weapons by dragging them over your character.
+
+
PKPenguin321 updated:
+
+
The cleanbot uprising has begun.
+
Emagged cleanbots are much scarier now. Standing on top of one will yield very devastating results, namely in the form of powerful flesh-eating acid.
+
+
18 February 2016
Kor updated:
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 267e336a7238..cdfc67af992d 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -3620,3 +3620,76 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
Kor:
- rscadd: 'Four more chaplain weapon options have been added: hanzo steel, light
energy sword, dark energy sword, and monk''s staff.'
+2016-02-19:
+ AnturK:
+ - rscadd: Chairs and stools can now be picked up and used as weapons by dragging
+ them over your character.
+ PKPenguin321:
+ - rscadd: The cleanbot uprising has begun.
+ - rscadd: Emagged cleanbots are much scarier now. Standing on top of one will yield
+ very devastating results, namely in the form of powerful flesh-eating acid.
+2016-02-20:
+ CPTANT:
+ - tweak: Due to new crystals Nanotrasen lasers weapons may now set you on FIRE.
+ Joan:
+ - imageadd: Blobbernauts and blob spores now have a visual healing effect when being
+ healed by the blob.
+ xxalpha:
+ - rscadd: 'New event: Portal Storm.'
+ - rscadd: Kinetic accelerators now reload automatically.
+2016-02-24:
+ CPTANT:
+ - tweak: stamina regeneration is now 50% faster.
+ Joan:
+ - rscadd: Revenants now have an essence display on their HUD
+ - rscadd: Revenants retain the essence cap from the previous revenant when reforming,
+ minus any perfect souls.
+ - rscadd: Revenants can now toggle their night vision.
+ - tweak: Revenant Defile has one tile more of range, but does less damage to windows.
+ - tweak: Revenant Blight kills space vines and glowshrooms slightly more rapidly.
+ - tweak: Delays before appearing when harvesting are slightly randomized.
+ - tweak: Revenant fluff objectives have been changed to be slightly more interesting.
+ RemieRichards:
+ - rscadd: Cursed heart item for wizards, allows them to heal themselves in exchange
+ for having to MANUALLY beat their heart every 6 seconds. Heals 25 brute/burn/oxy
+ damage per correctly timed pump.
+ Steelpoint:
+ - tweak: Syndicate engineers have reinforced the exterior of their stealth attack
+ ships. Nuclear Operative ship hull walls are now, once again, indestructible.
+ - tweak: In addition Syndicate engineers had the opportunity to revamp the interior
+ of stealth attack ships. The inside of Op ships now has a slightly new layout,
+ including a expanded medbay, as well as additional medical and explosive equipment.
+ - rscadd: Thanks to covert Syndicate operatives, strike teams can now bring the
+ stealth attack ship within very close proximity to the station codenamed 'Boxstation'.
+ A new ship destination labeled 'south maintenance airlock' is now available
+ to Op strike teams.
+ phil235:
+ - rscadd: Holo tape is replaced by holo barriers.
+ - rscadd: The action button of gas tanks and jetpacks now turn green when you turn
+ your internals on.
+2016-02-26:
+ Iamgoofball:
+ - rscadd: Adds the Chameleon Kit to uplinks for 4 telecrystals containing a Chameleon
+ Jumpsuit/Exosuit/Gloves/Shoes/Glasses/Hat/Mask/Backpack/Radio/Stamp/Gun/PDA.
+ - rscadd: The chameleon gun fires no-damage lasers regardless of what it looks like.
+ - rscadd: The Voice Changer has been merged into the Chameleon Mask.
+ - rscadd: No-slip shoes have been combined into Chameleon Shoes.
+ - rscdel: Space Ninjas no longer have voice changing capabilities.
+ - rscdel: The Chameleon Jumpsuit has been replaced by the Chameleon Kit in the uplink
+ for the same price.
+ - tweak: All chameleon clothing items have lost EMP vulnerability.
+ - tweak: Chameleon equipment provides very minor armor.
+ - experimental: Agent ID Cards can now use chameleon technology to look like any
+ other ID card.
+ - bugfix: The Chameleon Kit is actually purchasable now. It doesn't give a single
+ chameleon jumpsuit anymore.
+ PKPenguin321:
+ - rscadd: The kitchen vendor now contains two sharpening blocks.
+ - rscadd: Only items that are already sharp (such as fire axes, knives, etc) can
+ be sharpened. Items used on sharpening blocks become sharper and deadlier. The
+ sharpening blocks themselves can only be used once, and you can only sharpen
+ items once.
+ - tweak: The EMP kit has been buffed. It now contains five EMP grenades, up from
+ two.
+ - tweak: The EMP implant found in the EMP kit has been buffed. It now has three
+ uses, up from two.
diff --git a/html/changelogs/AutoChangeLog-pr-15412.yml b/html/changelogs/AutoChangeLog-pr-15412.yml
new file mode 100644
index 000000000000..557dfc40bc95
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-15412.yml
@@ -0,0 +1,17 @@
+author: LanCartwright
+delete-after: True
+changes:
+ - rscadd: "Adds Uranium to Virus reaction. Will create a random symptom between 5 and 6 when mixed with blood."
+ - rscadd: "Adds Virus rations, which creates a level 1 symptom when mixed with blood."
+ - rscadd: "Adds Mutagenic agar, which creates a level 3 symptom."
+ - rscadd: "Adds Sucrose agar which creates a level 4 symptom."
+ - rscadd: "Adds Weak virus plasma, which creates a level 5 symptom."
+ - rscadd: "Adds Virus plasma, which creates a level 6 symptom."
+ - rscadd: "Adds Virus food and Mutagen reaction, creating Mutagenic agar."
+ - rscadd: "Adds Virus food and Synaptizine reaction, creating Virus rations."
+ - rscadd: "Adds Virus food and Plasma reaction, creating Virus plasma."
+ - rscadd: "Adds Synaptizine and Virus plasma reaction, creating weakened virus plasma."
+ - rscadd: "Adds Sugar and Mutagenic agar reaction, creating sucrose agar."
+ - rscadd: "Adds Saline glucose solution and Mutagenic agar reaction, creating sucrose agar."
+ - rscadd: "Adds Viral self-adaptation symptom, which boosts stealth and resistance, but lowers stage speed."
+ - rscadd: "Adds Viral evolutionary acceleration, which bosts stage speed and transmittability, but lowers stealth and resistance."
diff --git a/html/changelogs/AutoChangeLog-pr-15429.yml b/html/changelogs/AutoChangeLog-pr-15429.yml
new file mode 100644
index 000000000000..4bd31dc140b1
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-15429.yml
@@ -0,0 +1,4 @@
+author: Fox McCloud
+delete-after: True
+changes:
+ - rscadd: "Gibbing mobs will now throw their internal organs"
diff --git a/html/changelogs/AutoChangeLog-pr-15433.yml b/html/changelogs/AutoChangeLog-pr-15433.yml
new file mode 100644
index 000000000000..302b199ef3ca
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-15433.yml
@@ -0,0 +1,6 @@
+author: MrStonedOne
+delete-after: True
+changes:
+ - tweak: "Suit sensors will now favor higher levels for starting amount with the exception of the max level, that remains unchanged."
+ - tweak: "Old odds: 25% off 25% binary lifesigns 25% full lifesigns 25% coordinates"
+ - tweak: "New odds: 12.5% off 25% binary lifesigns 37.5% full lifesigns 25% coordinates"
diff --git a/html/changelogs/AutoChangeLog-pr-15579.yml b/html/changelogs/AutoChangeLog-pr-15579.yml
new file mode 100644
index 000000000000..e80f95f8c4e8
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-15579.yml
@@ -0,0 +1,4 @@
+author: Gun Hog
+delete-after: True
+changes:
+ - rscadd: "Ghost security HUDs now show arrest status and implants."
diff --git a/html/changelogs/AutoChangeLog-pr-15651.yml b/html/changelogs/AutoChangeLog-pr-15651.yml
new file mode 100644
index 000000000000..93d4bc221c84
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-15651.yml
@@ -0,0 +1,4 @@
+author: lordpidey
+delete-after: True
+changes:
+ - rscadd: "New virology symptom, projectile vomiting. It is a level four symptom."
diff --git a/html/changelogs/AutoChangeLog-pr-15698.yml b/html/changelogs/AutoChangeLog-pr-15698.yml
new file mode 100644
index 000000000000..ea7705b4fa07
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-15698.yml
@@ -0,0 +1,6 @@
+author: LanCartwright
+delete-after: True
+changes:
+ - rscadd: "Flypeople now vomit when they eat nutriment."
+ - rscadd: "Flypeople can now suck the vomit off the floor to gain it's nutritional content."
+ - rscadd: "Flypeople now must suck puke chunks and vomit to fill themselves of food content."
diff --git a/html/changelogs/AutoChangeLog-pr-15707.yml b/html/changelogs/AutoChangeLog-pr-15707.yml
new file mode 100644
index 000000000000..9e92412de4a3
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-15707.yml
@@ -0,0 +1,8 @@
+author: CoreOverload
+delete-after: True
+changes:
+ - rscadd: "A new \"breathing tube\" mouth implant. It allows you to use internals without a mask and protects you from being choked. It doesn't protect you from the grab itself."
+ - tweak: "Arm cannon implants are now actually implanted into the arms, not into the chest."
+ - bugfix: "Arm cannons have an action button again."
+ - tweak: "Heart removal is no longer instakill. It puts you in condition similar to heart attack instead. You can fix it by installing a new heart and applying defibrillator if it wasn't beating."
+ - rscadd: "You can now make a stopped heart beat again by squeezing it. It will stop beating very soon, so you better be quick if you want to install it without using defibrillator."
diff --git a/html/changelogs/AutoChangeLog-pr-15709.yml b/html/changelogs/AutoChangeLog-pr-15709.yml
new file mode 100644
index 000000000000..2e877beba854
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-15709.yml
@@ -0,0 +1,8 @@
+author: Malkevin
+delete-after: True
+changes:
+ - tweak: "Sec officers have two sets of cuffs again (one on spawn, one in locker)"
+ - tweak: "Done some optimisation of sec spawn equipment lists and lockers to remove some of the repetitive clicking, sec belts are now preloaded with equipment."
+ - tweak: "HoS has a full baton instead of the collapsible one"
+ - tweak: "Detective has a classic police baton and pepper spray instead of the collapsible baton (someone made police batons shit, so don't get overly happy)"
+ - bugfix: "pop scaled additional lockers spawned were the wrong type, changed them to the right type which has batons now (actually belts now that I've changed them)."
diff --git a/html/changelogs/AutoChangeLog-pr-15743.yml b/html/changelogs/AutoChangeLog-pr-15743.yml
new file mode 100644
index 000000000000..b05b8d76348c
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-15743.yml
@@ -0,0 +1,4 @@
+author: Shadowlight213
+delete-after: True
+changes:
+ - rscadd: "A wave of dark energy has been detected in the area. Corgi births may be affected."
diff --git a/html/changelogs/AutoChangeLog-pr-15765.yml b/html/changelogs/AutoChangeLog-pr-15765.yml
new file mode 100644
index 000000000000..20a7e7a9d1b2
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-15765.yml
@@ -0,0 +1,4 @@
+author: CoreOverload
+delete-after: True
+changes:
+ - rscadd: "There is now a chance to recover some of the internal organs when butchering aliens or monkeys."
diff --git a/html/changelogs/AutoChangeLog-pr-15770.yml b/html/changelogs/AutoChangeLog-pr-15770.yml
new file mode 100644
index 000000000000..f5dee4fc6df9
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-15770.yml
@@ -0,0 +1,4 @@
+author: CoreOverload
+delete-after: True
+changes:
+ - rscadd: "A new organ - lungs. When removed, it will give you breathing and speaking troubles."
diff --git a/html/changelogs/AutoChangeLog-pr-15772.yml b/html/changelogs/AutoChangeLog-pr-15772.yml
new file mode 100644
index 000000000000..77216b754af2
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-15772.yml
@@ -0,0 +1,4 @@
+author: CoreOverload
+delete-after: True
+changes:
+ - rscadd: "Human burgers are, once again, named after the generous meat donors that made them possible."
diff --git a/html/changelogs/AutoChangeLog-pr-15780.yml b/html/changelogs/AutoChangeLog-pr-15780.yml
new file mode 100644
index 000000000000..2990d00b445a
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-15780.yml
@@ -0,0 +1,5 @@
+author: PKPenguin321
+delete-after: True
+changes:
+ - rscadd: "Bolas are now in the game. They're a simple device fashioned from a cable and two weights on the end, designed to entangle enemies by wrapping around their legs upon being thrown at them. The victim can remove them rather quickly, however."
+ - rscadd: "Bolas can be crafted by applying 6 metal sheets to cablecuffs. They can also be tablecrafted."
diff --git a/html/changelogs/AutoChangeLog-pr-15781.yml b/html/changelogs/AutoChangeLog-pr-15781.yml
new file mode 100644
index 000000000000..02b105b2d2de
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-15781.yml
@@ -0,0 +1,13 @@
+author: Joan
+delete-after: True
+changes:
+ - tweak: "Replicating Foam has a lower chance to expand when hit."
+ - tweak: "Penetrating Spines is now purple instead of sea green."
+ - imageadd: "Blobbernauts now have a brief animation when produced."
+ - experiment: "Adds five new blob chemicals. This is a total of 25 blob chemicals. Will it ever stop?"
+ - rscadd: "Draining Spikes, which is reddish pink and does medium brute damage, and drains blood from targets."
+ - rscadd: "Shifting Fragments, which is tan and does medium brute damage, and shifts position when attacked."
+ - rscadd: "Flammable Goo, which is reddish orange and does low burn and toxin damage, and when hit with burn damage, emits a burst of flame. It takes more damage from burn, though."
+ - rscadd: "Poisonous Strands, which is lavender and does burn, fire, and toxin damage over a few seconds, instead of instantly."
+ - rscadd: "Adaptive Nexuses, which is dark blue and does medium brute damage, and reaps 5-10 resources from unconscious humans, killing them in the process."
+ - wip: "Confused about what the chemical you're fighting does? Look at https://tgstation13.org/wiki/Blob#Blob_Chemicals"
diff --git a/html/changelogs/AutoChangeLog-pr-15793.yml b/html/changelogs/AutoChangeLog-pr-15793.yml
new file mode 100644
index 000000000000..e1c42f4680e7
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-15793.yml
@@ -0,0 +1,7 @@
+author: Joan
+delete-after: True
+changes:
+ - rscadd: "Adds 'Support and Mechanized Exosuits' and 'Space Suits and Hardsuits' categories to the syndicate uplink."
+ - rscadd: "Nuke op reinforcements and mechs have been moved to the first category. Syndicate space suits and hardsuits have been moved to the second category."
+ - bugfix: "Traitors can now properly buy the blood-red hardsuit for 8 TC."
+ - tweak: "Nuke ops can no longer buy the blood-red hardsuit, as the elite hardsuit costs the same amount while being absolutely better."
diff --git a/html/changelogs/AutoChangeLog-pr-15800.yml b/html/changelogs/AutoChangeLog-pr-15800.yml
new file mode 100644
index 000000000000..1335c943d922
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-15800.yml
@@ -0,0 +1,4 @@
+author: Sestren413
+delete-after: True
+changes:
+ - rscadd: "Botanists have access to a new banana mutation now, bluespace bananas. These will teleport anyone unfortunate enough to slip on their peel."
diff --git a/html/changelogs/AutoChangeLog-pr-15809.yml b/html/changelogs/AutoChangeLog-pr-15809.yml
new file mode 100644
index 000000000000..9e2ef92dc943
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-15809.yml
@@ -0,0 +1,4 @@
+author: bgobandit
+delete-after: True
+changes:
+ - rscadd: "CentComm has been informed that cargo is receiving new forms of contraband in crates. Remember, Nanotrasen has a zero-tolerance contraband policy!"
diff --git a/icons/effects/effects.dmi b/icons/effects/effects.dmi
index 26594f4e18bd..72f8cda410f6 100644
Binary files a/icons/effects/effects.dmi and b/icons/effects/effects.dmi differ
diff --git a/icons/mob/actions.dmi b/icons/mob/actions.dmi
index 8c1c3f5e6858..09f7609ff2ae 100644
Binary files a/icons/mob/actions.dmi and b/icons/mob/actions.dmi differ
diff --git a/icons/mob/blob.dmi b/icons/mob/blob.dmi
index d2573aa3079f..3cbe8ed5f9b4 100644
Binary files a/icons/mob/blob.dmi and b/icons/mob/blob.dmi differ
diff --git a/icons/mob/inhands/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi
index cc5d4e85bcc0..c22e63e19766 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 02e9868c1804..b75f6e409cf0 100644
Binary files a/icons/mob/inhands/items_righthand.dmi and b/icons/mob/inhands/items_righthand.dmi differ
diff --git a/icons/mob/pets.dmi b/icons/mob/pets.dmi
index 2552baf06fe4..a816f07aa197 100644
Binary files a/icons/mob/pets.dmi and b/icons/mob/pets.dmi differ
diff --git a/icons/mob/screen_gen.dmi b/icons/mob/screen_gen.dmi
index 3ac8e26637cd..789fb9eec029 100644
Binary files a/icons/mob/screen_gen.dmi and b/icons/mob/screen_gen.dmi differ
diff --git a/icons/obj/ammo.dmi b/icons/obj/ammo.dmi
index 3a57dbbcfd38..fc76fa407f43 100644
Binary files a/icons/obj/ammo.dmi and b/icons/obj/ammo.dmi differ
diff --git a/icons/obj/bike.dmi b/icons/obj/bike.dmi
new file mode 100644
index 000000000000..db4cb6d1aa08
Binary files /dev/null and b/icons/obj/bike.dmi differ
diff --git a/icons/obj/bureaucracy.dmi b/icons/obj/bureaucracy.dmi
index 2b2b6702fe71..446abfc97843 100644
Binary files a/icons/obj/bureaucracy.dmi and b/icons/obj/bureaucracy.dmi differ
diff --git a/icons/obj/chairs.dmi b/icons/obj/chairs.dmi
new file mode 100644
index 000000000000..3e8f7ca5d55e
Binary files /dev/null and b/icons/obj/chairs.dmi differ
diff --git a/icons/obj/device.dmi b/icons/obj/device.dmi
index e5f8f545b2cc..fe4769277049 100644
Binary files a/icons/obj/device.dmi and b/icons/obj/device.dmi differ
diff --git a/icons/obj/doors/airlocks/abductor/abductor_airlock.dmi b/icons/obj/doors/airlocks/abductor/abductor_airlock.dmi
new file mode 100644
index 000000000000..d0ef3d2462d3
Binary files /dev/null and b/icons/obj/doors/airlocks/abductor/abductor_airlock.dmi differ
diff --git a/icons/obj/doors/airlocks/abductor/overlays.dmi b/icons/obj/doors/airlocks/abductor/overlays.dmi
new file mode 100644
index 000000000000..6efad60d9c4d
Binary files /dev/null and b/icons/obj/doors/airlocks/abductor/overlays.dmi differ
diff --git a/icons/obj/flora/deadtrees.dmi b/icons/obj/flora/deadtrees.dmi
index f76ffd442f99..25494901afc0 100644
Binary files a/icons/obj/flora/deadtrees.dmi and b/icons/obj/flora/deadtrees.dmi differ
diff --git a/icons/obj/flora/pinetrees.dmi b/icons/obj/flora/pinetrees.dmi
index 600c0354bf87..e7fa58cb1a95 100644
Binary files a/icons/obj/flora/pinetrees.dmi and b/icons/obj/flora/pinetrees.dmi differ
diff --git a/icons/obj/guns/projectile.dmi b/icons/obj/guns/projectile.dmi
index 17a31f7bb100..60228c44e706 100644
Binary files a/icons/obj/guns/projectile.dmi and b/icons/obj/guns/projectile.dmi differ
diff --git a/icons/obj/holotape.dmi b/icons/obj/holotape.dmi
deleted file mode 100644
index d73ef7b7a7fd..000000000000
Binary files a/icons/obj/holotape.dmi and /dev/null differ
diff --git a/icons/obj/hydroponics/growing.dmi b/icons/obj/hydroponics/growing.dmi
index 019c0a84a874..50440975b3cf 100644
Binary files a/icons/obj/hydroponics/growing.dmi and b/icons/obj/hydroponics/growing.dmi differ
diff --git a/icons/obj/hydroponics/harvest.dmi b/icons/obj/hydroponics/harvest.dmi
index 7cf90674b9fd..c49b87be940e 100644
Binary files a/icons/obj/hydroponics/harvest.dmi and b/icons/obj/hydroponics/harvest.dmi differ
diff --git a/icons/obj/hydroponics/seeds.dmi b/icons/obj/hydroponics/seeds.dmi
index 081e7bf8e3dc..6492755567d4 100644
Binary files a/icons/obj/hydroponics/seeds.dmi and b/icons/obj/hydroponics/seeds.dmi differ
diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi
index 25da8bb0887d..79383dca68ce 100644
Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ
diff --git a/icons/obj/items_cyborg.dmi b/icons/obj/items_cyborg.dmi
new file mode 100644
index 000000000000..dfdd31141948
Binary files /dev/null and b/icons/obj/items_cyborg.dmi differ
diff --git a/icons/obj/janitor.dmi b/icons/obj/janitor.dmi
index c231e8468292..6bfc5542b583 100644
Binary files a/icons/obj/janitor.dmi and b/icons/obj/janitor.dmi differ
diff --git a/icons/obj/kitchen.dmi b/icons/obj/kitchen.dmi
index f55be65fba5e..372ea30f755f 100644
Binary files a/icons/obj/kitchen.dmi and b/icons/obj/kitchen.dmi differ
diff --git a/icons/obj/machines/particle_accelerator.dmi b/icons/obj/machines/particle_accelerator.dmi
index e7636ad6a95f..18c75fc0e05c 100644
Binary files a/icons/obj/machines/particle_accelerator.dmi and b/icons/obj/machines/particle_accelerator.dmi differ
diff --git a/icons/obj/objects.dmi b/icons/obj/objects.dmi
index 2162d2f8210f..9a3e8194f4b3 100644
Binary files a/icons/obj/objects.dmi and b/icons/obj/objects.dmi differ
diff --git a/icons/obj/surgery.dmi b/icons/obj/surgery.dmi
index 8d3e2fa7866d..9252dbf89f61 100644
Binary files a/icons/obj/surgery.dmi and b/icons/obj/surgery.dmi differ
diff --git a/icons/obj/tesla_engine/energy_ball.dmi b/icons/obj/tesla_engine/energy_ball.dmi
index 7f68e4b0071a..22866252a9e2 100644
Binary files a/icons/obj/tesla_engine/energy_ball.dmi and b/icons/obj/tesla_engine/energy_ball.dmi differ
diff --git a/icons/obj/weapons.dmi b/icons/obj/weapons.dmi
index 2f5140019b4e..c3bb6eec0901 100644
Binary files a/icons/obj/weapons.dmi and b/icons/obj/weapons.dmi differ
diff --git a/icons/turf/walls.dmi b/icons/turf/walls.dmi
index 54addf566395..419e3d324abd 100644
Binary files a/icons/turf/walls.dmi and b/icons/turf/walls.dmi differ
diff --git a/sound/effects/singlebeat.ogg b/sound/effects/singlebeat.ogg
new file mode 100644
index 000000000000..8dd550d5d846
Binary files /dev/null and b/sound/effects/singlebeat.ogg differ
diff --git a/tgstation.dme b/tgstation.dme
index 6d1630c4e788..4fa2f0362d10 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -96,7 +96,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\action_button.dm"
#include "code\_onclick\hud\ai.dm"
#include "code\_onclick\hud\alert.dm"
#include "code\_onclick\hud\alien.dm"
@@ -111,6 +111,7 @@
#include "code\_onclick\hud\monkey.dm"
#include "code\_onclick\hud\movable_screen_objects.dm"
#include "code\_onclick\hud\other_mobs.dm"
+#include "code\_onclick\hud\revenanthud.dm"
#include "code\_onclick\hud\robot.dm"
#include "code\_onclick\hud\screen_objects.dm"
#include "code\_onclick\hud\swarmer.dm"
@@ -141,6 +142,7 @@
#include "code\controllers\subsystem\ticker.dm"
#include "code\controllers\subsystem\timer.dm"
#include "code\controllers\subsystem\voting.dm"
+#include "code\datums\action.dm"
#include "code\datums\ai_laws.dm"
#include "code\datums\beam.dm"
#include "code\datums\browser.dm"
@@ -199,6 +201,7 @@
#include "code\datums\diseases\advance\symptoms\sneeze.dm"
#include "code\datums\diseases\advance\symptoms\stimulant.dm"
#include "code\datums\diseases\advance\symptoms\symptoms.dm"
+#include "code\datums\diseases\advance\symptoms\viral.dm"
#include "code\datums\diseases\advance\symptoms\vision.dm"
#include "code\datums\diseases\advance\symptoms\voice_change.dm"
#include "code\datums\diseases\advance\symptoms\vomit.dm"
@@ -533,7 +536,6 @@
#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"
#include "code\game\objects\items\nuke_tools.dm"
#include "code\game\objects\items\shooting_range.dm"
@@ -560,6 +562,7 @@
#include "code\game\objects\items\devices\transfer_valve.dm"
#include "code\game\objects\items\devices\PDA\cart.dm"
#include "code\game\objects\items\devices\PDA\PDA.dm"
+#include "code\game\objects\items\devices\PDA\PDA_types.dm"
#include "code\game\objects\items\devices\PDA\radio.dm"
#include "code\game\objects\items\devices\radio\beacon.dm"
#include "code\game\objects\items\devices\radio\electropack.dm"
@@ -600,10 +603,11 @@
#include "code\game\objects\items\weapons\flamethrower.dm"
#include "code\game\objects\items\weapons\gift_wrappaper.dm"
#include "code\game\objects\items\weapons\handcuffs.dm"
+#include "code\game\objects\items\weapons\holosign_creator.dm"
#include "code\game\objects\items\weapons\holy_weapons.dm"
-#include "code\game\objects\items\weapons\janisigns.dm"
#include "code\game\objects\items\weapons\kitchen.dm"
#include "code\game\objects\items\weapons\manuals.dm"
+#include "code\game\objects\items\weapons\miscellaneous.dm"
#include "code\game\objects\items\weapons\mop.dm"
#include "code\game\objects\items\weapons\paint.dm"
#include "code\game\objects\items\weapons\paiwire.dm"
@@ -612,6 +616,7 @@
#include "code\game\objects\items\weapons\RPD.dm"
#include "code\game\objects\items\weapons\RSF.dm"
#include "code\game\objects\items\weapons\scrolls.dm"
+#include "code\game\objects\items\weapons\sharpener.dm"
#include "code\game\objects\items\weapons\shields.dm"
#include "code\game\objects\items\weapons\signs.dm"
#include "code\game\objects\items\weapons\singularityhammer.dm"
@@ -905,6 +910,7 @@
#include "code\modules\client\preferences.dm"
#include "code\modules\client\preferences_savefile.dm"
#include "code\modules\client\preferences_toggles.dm"
+#include "code\modules\clothing\chameleon.dm"
#include "code\modules\clothing\clothing.dm"
#include "code\modules\clothing\glasses\engine_goggles.dm"
#include "code\modules\clothing\glasses\glasses.dm"
@@ -944,7 +950,6 @@
#include "code\modules\clothing\suits\toggles.dm"
#include "code\modules\clothing\suits\utility.dm"
#include "code\modules\clothing\suits\wiz_robe.dm"
-#include "code\modules\clothing\under\chameleon.dm"
#include "code\modules\clothing\under\color.dm"
#include "code\modules\clothing\under\miscellaneous.dm"
#include "code\modules\clothing\under\pants.dm"
@@ -987,6 +992,7 @@
#include "code\modules\events\meateor_wave.dm"
#include "code\modules\events\meteor_wave.dm"
#include "code\modules\events\operative.dm"
+#include "code\modules\events\portal_storm.dm"
#include "code\modules\events\prison_break.dm"
#include "code\modules\events\radiation_storm.dm"
#include "code\modules\events\shuttle_loan.dm"
@@ -1374,6 +1380,7 @@
#include "code\modules\paperwork\folders.dm"
#include "code\modules\paperwork\handlabeler.dm"
#include "code\modules\paperwork\paper.dm"
+#include "code\modules\paperwork\paper_cutter.dm"
#include "code\modules\paperwork\paperbin.dm"
#include "code\modules\paperwork\pen.dm"
#include "code\modules\paperwork\photocopier.dm"
@@ -1594,6 +1601,8 @@
#include "code\modules\surgery\surgery_step.dm"
#include "code\modules\surgery\tail_modification.dm"
#include "code\modules\surgery\tools.dm"
+#include "code\modules\surgery\organs\augments_arms.dm"
+#include "code\modules\surgery\organs\augments_chest.dm"
#include "code\modules\surgery\organs\augments_external.dm"
#include "code\modules\surgery\organs\augments_eyes.dm"
#include "code\modules\surgery\organs\augments_internal.dm"
@@ -1626,6 +1635,7 @@
#include "code\modules\vehicles\atv.dm"
#include "code\modules\vehicles\pimpin_ride.dm"
#include "code\modules\vehicles\secway.dm"
+#include "code\modules\vehicles\speedbike.dm"
#include "code\modules\vehicles\vehicle.dm"
#include "code\orphaned procs\AStar.dm"
#include "code\orphaned procs\dbcore.dm"
diff --git a/tools/mapmerge/Run Map Merge.bat b/tools/mapmerge/Run Map Merge.bat
index 5bb8f1736b93..1c7ff9031169 100644
--- a/tools/mapmerge/Run Map Merge.bat
+++ b/tools/mapmerge/Run Map Merge.bat
@@ -1,4 +1,5 @@
@echo off
-call java -jar MapMerge.jar "../../_maps/" /wait
-
+set MAPROOT="../../_maps/"
+set TGM=1
+python mapmerger.py %1 %MAPROOT% %TGM%
pause
\ No newline at end of file
diff --git a/tools/mapmerge/map_helpers.py b/tools/mapmerge/map_helpers.py
new file mode 100644
index 000000000000..522d48b82e65
--- /dev/null
+++ b/tools/mapmerge/map_helpers.py
@@ -0,0 +1,518 @@
+import collections
+
+maxx = 0
+maxy = 0
+key_length = 1
+
+def merge_map(newfile, backupfile, tgm):
+ global key_length
+ global maxx
+ global maxy
+ key_length = 1
+ maxx = 1
+ maxy = 1
+
+ shitmap = parse_map(newfile)
+ shitDict = shitmap["dictionary"] #key to tile data dictionary
+ shitGrid = shitmap["grid"] #x,y coords to tiles (keys) dictionary (the map's layout)
+
+ originalmap = parse_map(backupfile)
+ originalDict = originalmap["dictionary"]
+ originalGrid = originalmap["grid"]
+
+ mergeGrid = dict() #final map layout
+ known_keys = dict() #mapping known keys to original keys
+ tempGrid = dict() #saving tiles with newly generated keys for later processing
+ temp_keys = dict() #mapping known keys to newly generated keys
+ unused_keys = list(originalDict.keys()) #list with all existing keys that aren't being used
+ tempDict = collections.OrderedDict() #mapping new keys to new data
+ originalDict_size = len(originalDict)
+
+ for y in range(1,maxy+1):
+ for x in range(1,maxx+1):
+ shitKey = shitGrid[x,y]
+
+ #if this key was seen before, add it to the pile immediately
+ if shitKey in known_keys:
+ mergeGrid[x,y] = known_keys[shitKey]
+ continue
+ #if this key was seen before, add it to the pile immediately
+ if shitKey in temp_keys:
+ tempGrid[x,y] = temp_keys[shitKey]
+ continue
+
+ shitData = shitDict[shitKey]
+ originalKey = originalGrid[x,y]
+ originalData = originalDict[originalKey]
+
+ #if new tile data at x,y is the same as original tile data at x,y, add to the pile
+ if set(shitData) == frozenset(originalData):
+ mergeGrid[x,y] = originalKey
+ known_keys[shitKey] = originalKey
+ unused_keys.remove(originalKey)
+ else:
+ #search for the new tile data in the original dictionary, if a key is found add it to the pile, else generate a new key
+ newKey = search_data(originalDict, shitData)
+ if newKey != None:
+ mergeGrid[x,y] = newKey
+ known_keys[shitKey] = newKey
+ unused_keys.remove(newKey)
+ else:
+ if len(tempDict) == 0:
+ newKey = generate_new_key(originalDict)
+ else:
+ newKey = generate_new_key(tempDict)
+ if newKey == "OVERFLOW": #if this happens, merging is impossible
+ print("ERROR: Key overflow detected.")
+ return 0
+ tempGrid[x,y] = newKey
+ temp_keys[shitKey] = newKey
+ tempDict[newKey] = shitData
+
+ sort = 0
+ #find gaps in the dictionary keys sequence and add the missing keys to be recycled
+ dict_list = list(originalDict.keys())
+ for index in range(0, len(dict_list)):
+ if index + 1 == len(dict_list):
+ break
+
+ key = dict_list[index]
+ next_key = dict_list[index+1]
+
+ difference = key_difference(key, next_key)
+ if difference > 1:
+ i = 1
+ nextnew = key
+ while i < difference:
+ nextnew = get_next_key(nextnew)
+ unused_keys.append(nextnew)
+ i += 1
+ sort = 1
+
+
+ #Recycle outdated keys with any new tile data, starting from the bottom of the dictionary
+ i = 0
+ for key, value in reversed(tempDict.items()):
+ recycled_key = key
+ if len(unused_keys) > 0:
+ recycled_key = unused_keys.pop()
+
+ for coord, gridkey in tempGrid.items():
+ if gridkey == None:
+ continue
+ if gridkey == key:
+ mergeGrid[coord] = recycled_key
+ tempGrid[coord] = None
+
+ originalDict[recycled_key] = value
+
+ #if gaps in the key sequence were found, sort the dictionary for cleanliness
+ if sort == 1:
+ sorted_dict = collections.OrderedDict()
+ next_key = get_next_key("")
+ while len(sorted_dict) < len(originalDict):
+ try:
+ sorted_dict[next_key] = originalDict[next_key]
+ except KeyError:
+ pass
+ next_key = get_next_key(next_key)
+ originalDict = sorted_dict
+
+ if tgm:
+ write_dictionary_tgm(newfile, originalDict)
+ write_grid_coord_small(newfile, mergeGrid)
+ else:
+ write_dictionary(newfile, originalDict)
+ write_grid(newfile, originalDict)
+ return 1
+
+#write dictionary in tgm format
+def write_dictionary_tgm(filename, dictionary):
+ with open(filename, "w") as output:
+ output.write("//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE \n")
+ for key, list_ in dictionary.items():
+ output.write("\"{}\" = (\n".format(key))
+
+ for thing in list_:
+ buffer = ""
+ in_quote_block = False
+ in_varedit_block = False
+ for char in thing:
+
+ if in_quote_block:
+ if char == "\"":
+ in_quote_block = False
+ buffer = buffer + char
+ continue
+ elif char == "\"":
+ in_quote_block = True
+ buffer = buffer + char
+ continue
+
+ if not in_varedit_block:
+ if char == "{":
+ in_varedit_block = True
+ buffer = buffer + "{\n\t"
+ continue
+ else:
+ if char == ";":
+ buffer = buffer + ";\n\t"
+ continue
+ elif char == "}":
+ buffer = buffer + "\n\t}"
+ in_varedit_block = False
+ continue
+
+ buffer = buffer + char
+
+ if list_.index(thing) != len(list_) - 1:
+ buffer = buffer + ",\n"
+ output.write(buffer)
+
+ output.write(")\n")
+
+#thanks to YotaXP for finding out about this one
+def write_grid_coord_small(filename, grid):
+ with open(filename, "a") as output:
+ output.write("\n")
+
+ for x in range(1, maxx+1):
+ output.write("({},{},1) = {{\"\n".format(x, 1, 1))
+ for y in range(1, maxy):
+ output.write("{}\n".format(grid[x,y]))
+ output.write("{}\n\"}}\n".format(grid[x,maxy-1]))
+
+def search_data(dictionary, data):
+ found_data = None
+ try:
+ found_data = dictionary.values()[list(dictionary.keys()).index(data)]
+ except:
+ pass
+ return found_data
+
+def generate_new_key(dictionary):
+ last_key = next(reversed(dictionary))
+ return get_next_key(last_key)
+
+def get_next_key(key):
+ if key == "":
+ return "".join("a" for _ in range(key_length))
+
+ length = len(key)
+ new_key = ""
+ carry = 1
+ for char in key[::-1]:
+ if carry <= 0:
+ new_key = new_key + char
+ continue
+ if char == 'Z':
+ new_key = new_key + 'a'
+ carry += 1
+ length -= 1
+ if length <= 0:
+ return "OVERFLOW"
+ elif char == 'z':
+ new_key = new_key + 'A'
+ else:
+ new_key = new_key + chr(ord(char) + 1)
+ if carry > 0:
+ carry -= 1
+ return new_key[::-1]
+
+#still does not support more than one z level per file, but should parse any format
+def parse_map(map_file):
+ with open(map_file, "r") as map_input:
+ characters = map_input.read()
+
+ in_quote_block = False
+ in_key_block = False
+ in_data_block = False
+ in_varedit_block = False
+ after_data_block = False
+ escaping = False
+ skip_whitespace = False
+
+ dictionary = collections.OrderedDict()
+ curr_key = ""
+ curr_datum = ""
+ curr_data = list()
+
+ in_map_block = False
+ in_coord_block = False
+ in_map_string = False
+ iter_x = 0
+ adjust_y = True
+
+ curr_num = ""
+ reading_coord = "x"
+
+ global key_length
+ global maxx
+ global maxy
+ curr_x = 0
+ curr_y = 0
+ curr_z = 1
+ grid = dict()
+
+ for char in characters:
+
+ if not in_map_block:
+
+ if char == "\n" or char == "\t":
+ continue
+
+ if in_data_block:
+
+ if in_varedit_block:
+
+ if in_quote_block:
+ if char == "\\":
+ curr_datum = curr_datum + char
+ escaping = True
+ continue
+
+ if escaping:
+ curr_datum = curr_datum + char
+ escaping = False
+ continue
+
+ if char == "\"":
+ curr_datum = curr_datum + char
+ in_quote_block = False
+ continue
+
+ curr_datum = curr_datum + char
+ continue
+
+ if skip_whitespace and char == " ":
+ skip_whitespace = False
+ continue
+ skip_whitespace = False
+
+ if char == "\"":
+ curr_datum = curr_datum + char
+ in_quote_block = True
+ continue
+
+ if char == ";":
+ skip_whitespace = True
+ curr_datum = curr_datum + char
+ continue
+
+ if char == "}":
+ curr_datum = curr_datum + char
+ in_varedit_block = False
+ continue
+
+ curr_datum = curr_datum + char
+ continue
+
+ if char == "{":
+ curr_datum = curr_datum + char
+ in_varedit_block = True
+ continue
+
+ if char == ",":
+ curr_data.append(curr_datum)
+ curr_datum = ""
+ continue
+
+ if char == ")":
+ curr_data.append(curr_datum)
+ dictionary[curr_key] = curr_data
+ curr_data = list()
+ curr_datum = ""
+ curr_key = ""
+ in_data_block = False
+ after_data_block = True
+ continue
+
+ curr_datum = curr_datum + char
+ continue
+
+ if in_key_block:
+ if char == "\"":
+ in_key_block = False
+ key_length = len(curr_key)
+ else:
+ curr_key = curr_key + char
+ continue
+ #else we're looking for a key block, a data block or the map block
+
+ if char == "\"":
+ in_key_block = True
+ after_data_block = False
+ continue
+
+ if char == "(":
+ if after_data_block:
+ in_map_block = True
+ in_coord_block = True
+ after_data_block = False
+ curr_key = ""
+ continue
+ else:
+ in_data_block = True
+ after_data_block = False
+ continue
+
+ else:
+
+ if in_coord_block:
+ if char == ",":
+ if reading_coord == "x":
+ curr_x = string_to_num(curr_num)
+ if curr_x > maxx:
+ maxx = curr_x
+ iter_x = 0
+ curr_num = ""
+ reading_coord = "y"
+ elif reading_coord == "y":
+ curr_y = string_to_num(curr_num)
+ if curr_y > maxy:
+ maxy = curr_y
+ curr_num = ""
+ reading_coord = "z"
+ else:
+ pass
+ continue
+
+ if char == ")":
+ in_coord_block = False
+ reading_coord = "x"
+ curr_num = ""
+ #read z here if needed
+ continue
+
+ curr_num = curr_num + char
+ continue
+
+ if in_map_string:
+
+ if char == "\"":
+ in_map_string = False
+ adjust_y = True
+ curr_y -= 1
+ continue
+
+ if char == "\n":
+ if adjust_y:
+ adjust_y = False
+ else:
+ curr_y += 1
+ if curr_x > maxx:
+ maxx = curr_x
+ if iter_x > 1:
+ curr_x = 1
+ iter_x = 0
+ continue
+
+
+ curr_key = curr_key + char
+ if len(curr_key) == key_length:
+ iter_x += 1
+ if iter_x > 1:
+ curr_x += 1
+
+ grid[curr_x, curr_y] = curr_key
+ curr_key = ""
+ continue
+
+
+ #else look for coordinate block or a map string
+
+ if char == "(":
+ in_coord_block = True
+ continue
+ if char == "\"":
+ in_map_string = True
+ continue
+
+ if curr_y > maxy:
+ maxy = curr_y
+
+ data = dict()
+ data["dictionary"] = dictionary
+ data["grid"] = grid
+ return data
+
+#subtract keyB from keyA
+def key_difference(keyA, keyB):
+ if len(keyA) != len(keyB):
+ return "you fucked up"
+
+ Ayek = keyA[::-1]
+ Byek = keyB[::-1]
+
+ result = 0
+ for i in range(0, len(keyA)):
+ base = 52**i
+ A = 26 if Ayek[i].isupper() else 0
+ B = 26 if Byek[i].isupper() else 0
+ result += ( (ord(Byek[i].lower()) + B) - (ord(Ayek[i].lower()) + A) ) * base
+ return result
+
+def string_to_num(s):
+ try:
+ return int(s)
+ except ValueError:
+ return -1
+
+#unused functions
+
+#writes a tile data dictionary the same way Dreammaker does
+def write_dictionary(filename, dictionary):
+ with open(filename, "w") as output:
+ for key, value in dictionary.items():
+ output.write("\"{}\" = ({})\n".format(key, ",".join(value)))
+
+#writes a map grid the same way Dreammaker does
+def write_grid(filename, grid):
+ with open(filename, "a") as output:
+ output.write("\n")
+ output.write("(1,1,1) = {\"\n")
+
+ for y in range(1, maxy+1):
+ for x in range(1, maxx+1):
+ try:
+ output.write(grid[x,y])
+ except KeyError:
+ print("Key error: ({},{})".format(x,y))
+ output.write("\n")
+ output.write("\"}")
+ output.write("\n")
+
+#inflated map grid
+def write_grid_coord(filename, grid):
+ with open(filename, "a") as output:
+ output.write("\n")
+ for y in range(1, maxy+1):
+ for x in range(1, maxx+1):
+ output.write("({},{},1) = {{\"{}\"}}\n".format(x, y, grid[x,y]))
+
+def key_compare(keyA, keyB): #thanks byond for not respecting ascii
+ pos = 0
+ for a in keyA:
+ pos += 1
+ count = pos
+ for b in keyB:
+ if(count > 1):
+ count -= 1
+ continue
+ if a.islower() and b.islower():
+ if(a < b):
+ return -1
+ if(a > b):
+ return 1
+ break
+ if a.islower() and b.isupper():
+ return -1
+ if a.isupper() and b.islower():
+ return 1
+ if a.isupper() and b.isupper():
+ if(a < b):
+ return -1
+ if(a > b):
+ return 1
+ break
+ return 0
diff --git a/tools/mapmerge/mapmerger.py b/tools/mapmerge/mapmerger.py
new file mode 100644
index 000000000000..c149b61687e7
--- /dev/null
+++ b/tools/mapmerge/mapmerger.py
@@ -0,0 +1,62 @@
+import sys
+import os
+import pathlib
+import map_helpers
+
+#main("../../_maps/")
+def main(map_folder, tgm=0):
+ list_of_files = list()
+ for root, directories, filenames in os.walk(map_folder):
+ for filename in [f for f in filenames if f.endswith(".dmm")]:
+ list_of_files.append(pathlib.Path(root, filename))
+
+ for i in range(0, len(list_of_files)):
+ to_print = "[{}]: {}".format(i, list_of_files[i])
+ print(to_print)
+ print("".join("-" for _ in range(len(to_print))))
+
+ in_list = input("List the maps you want to merge (example: 1,2,3,4,5):\n")
+ in_list = in_list.replace(" ", "")
+ in_list = in_list.split(",")
+
+ valid_indices = list()
+ for m in in_list:
+ index = string_to_num(m)
+ if index >= 0 and index < len(list_of_files):
+ valid_indices.append(index)
+
+ if tgm == "1":
+ print("\nMaps will be converted to tgm.")
+ tgm = True
+ else:
+ print("\nMaps will not be converted to tgm.")
+ tgm = False
+
+ print("\nMerging these maps:")
+ for i in valid_indices:
+ print(list_of_files[i])
+ merge = input("\nPress Enter to merge...")
+ if merge == "abort":
+ print("\nAborted map merge.")
+ sys.exit()
+ else:
+ for i in valid_indices:
+ path_str = str(list_of_files[i])
+ try:
+ if map_helpers.merge_map(path_str, path_str + ".backup", tgm) != 1:
+ print("ERROR MERGING: {}".format(list_of_files[i]))
+ continue
+ print("MERGED: {}".format(path_str))
+ except FileNotFoundError:
+ print("\nERROR: File not found! Make sure you run 'Prepare Maps.bat' before merging.")
+ print(path_str + " || " + path_str+".backup")
+
+ print("\nFinished merging.")
+
+def string_to_num(s):
+ try:
+ return int(s)
+ except ValueError:
+ return -1
+
+main(sys.argv[1], sys.argv[2])
diff --git a/tools/mapmerge/MapMerge.jar b/tools/mapmerge/old_java_mapmerge/MapMerge.jar
similarity index 100%
rename from tools/mapmerge/MapMerge.jar
rename to tools/mapmerge/old_java_mapmerge/MapMerge.jar
diff --git a/tools/mapmerge/old_java_mapmerge/Run Map Merge.bat b/tools/mapmerge/old_java_mapmerge/Run Map Merge.bat
new file mode 100644
index 000000000000..5bb8f1736b93
--- /dev/null
+++ b/tools/mapmerge/old_java_mapmerge/Run Map Merge.bat
@@ -0,0 +1,4 @@
+@echo off
+call java -jar MapMerge.jar "../../_maps/" /wait
+
+pause
\ No newline at end of file
diff --git a/tools/mapmerge/Source/.classpath b/tools/mapmerge/old_java_mapmerge/Source/.classpath
similarity index 100%
rename from tools/mapmerge/Source/.classpath
rename to tools/mapmerge/old_java_mapmerge/Source/.classpath
diff --git a/tools/mapmerge/Source/.project b/tools/mapmerge/old_java_mapmerge/Source/.project
similarity index 100%
rename from tools/mapmerge/Source/.project
rename to tools/mapmerge/old_java_mapmerge/Source/.project
diff --git a/tools/mapmerge/Source/.settings/org.eclipse.jdt.core.prefs b/tools/mapmerge/old_java_mapmerge/Source/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from tools/mapmerge/Source/.settings/org.eclipse.jdt.core.prefs
rename to tools/mapmerge/old_java_mapmerge/Source/.settings/org.eclipse.jdt.core.prefs
diff --git a/tools/mapmerge/Source/.settings/org.eclipse.jdt.ui.prefs b/tools/mapmerge/old_java_mapmerge/Source/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from tools/mapmerge/Source/.settings/org.eclipse.jdt.ui.prefs
rename to tools/mapmerge/old_java_mapmerge/Source/.settings/org.eclipse.jdt.ui.prefs
diff --git a/tools/mapmerge/Source/bin/FileFinder.class b/tools/mapmerge/old_java_mapmerge/Source/bin/FileFinder.class
similarity index 100%
rename from tools/mapmerge/Source/bin/FileFinder.class
rename to tools/mapmerge/old_java_mapmerge/Source/bin/FileFinder.class
diff --git a/tools/mapmerge/Source/bin/MapMerge.class b/tools/mapmerge/old_java_mapmerge/Source/bin/MapMerge.class
similarity index 100%
rename from tools/mapmerge/Source/bin/MapMerge.class
rename to tools/mapmerge/old_java_mapmerge/Source/bin/MapMerge.class
diff --git a/tools/mapmerge/Source/bin/MapPatcher.jar b/tools/mapmerge/old_java_mapmerge/Source/bin/MapPatcher.jar
similarity index 100%
rename from tools/mapmerge/Source/bin/MapPatcher.jar
rename to tools/mapmerge/old_java_mapmerge/Source/bin/MapPatcher.jar
diff --git a/tools/mapmerge/Source/src/FileFinder.java b/tools/mapmerge/old_java_mapmerge/Source/src/FileFinder.java
similarity index 100%
rename from tools/mapmerge/Source/src/FileFinder.java
rename to tools/mapmerge/old_java_mapmerge/Source/src/FileFinder.java
diff --git a/tools/mapmerge/Source/src/MapMerge.java b/tools/mapmerge/old_java_mapmerge/Source/src/MapMerge.java
similarity index 100%
rename from tools/mapmerge/Source/src/MapMerge.java
rename to tools/mapmerge/old_java_mapmerge/Source/src/MapMerge.java
diff --git a/tools/mapmerge/Source/src/MapPatcher Source/Location.java b/tools/mapmerge/old_java_mapmerge/Source/src/MapPatcher Source/Location.java
similarity index 100%
rename from tools/mapmerge/Source/src/MapPatcher Source/Location.java
rename to tools/mapmerge/old_java_mapmerge/Source/src/MapPatcher Source/Location.java
diff --git a/tools/mapmerge/Source/src/MapPatcher Source/Map.java b/tools/mapmerge/old_java_mapmerge/Source/src/MapPatcher Source/Map.java
similarity index 100%
rename from tools/mapmerge/Source/src/MapPatcher Source/Map.java
rename to tools/mapmerge/old_java_mapmerge/Source/src/MapPatcher Source/Map.java
diff --git a/tools/mapmerge/Source/src/MapPatcher Source/MapPatcher.java b/tools/mapmerge/old_java_mapmerge/Source/src/MapPatcher Source/MapPatcher.java
similarity index 100%
rename from tools/mapmerge/Source/src/MapPatcher Source/MapPatcher.java
rename to tools/mapmerge/old_java_mapmerge/Source/src/MapPatcher Source/MapPatcher.java
diff --git a/tools/mapmerge/Source/src/MapPatcher Source/SavingThread.java b/tools/mapmerge/old_java_mapmerge/Source/src/MapPatcher Source/SavingThread.java
similarity index 100%
rename from tools/mapmerge/Source/src/MapPatcher Source/SavingThread.java
rename to tools/mapmerge/old_java_mapmerge/Source/src/MapPatcher Source/SavingThread.java
diff --git a/tools/mapmerge/Source/src/MapPatcher.jar b/tools/mapmerge/old_java_mapmerge/Source/src/MapPatcher.jar
similarity index 100%
rename from tools/mapmerge/Source/src/MapPatcher.jar
rename to tools/mapmerge/old_java_mapmerge/Source/src/MapPatcher.jar