" : "")
+ dat += "[extra_font]\tSalbutamol: [target.reagents.get_reagent_amount("salbutamol")] units
"
+
+ dat += "
"
+ dat += ""
+ dat += "| Organ | "
+ dat += "Burn Damage | "
+ dat += "Brute Damage | "
+ dat += "Other Wounds | "
+ dat += "
"
+
+ for(var/obj/item/organ/external/e in target.bodyparts)
+ dat += ""
+ var/AN = ""
+ var/open = ""
+ var/infected = ""
+ var/robot = ""
+ var/imp = ""
+ var/bled = ""
+ var/splint = ""
+ var/internal_bleeding = ""
+ var/lung_ruptured = ""
+ if(e.internal_bleeding)
+ internal_bleeding = "
Internal bleeding"
+ if(istype(e, /obj/item/organ/external/chest) && target.is_lung_ruptured())
+ lung_ruptured = "Lung ruptured:"
+ if(e.status & ORGAN_SPLINTED)
+ splint = "Splinted:"
+ if(e.status & ORGAN_BROKEN)
+ AN = "[e.broken_description]:"
+ if(e.is_robotic())
+ robot = "Robotic:"
+ if(e.open)
+ open = "Open:"
+ switch(e.germ_level)
+ if(INFECTION_LEVEL_ONE to INFECTION_LEVEL_ONE + 200)
+ infected = "Mild Infection:"
+ if(INFECTION_LEVEL_ONE + 200 to INFECTION_LEVEL_ONE + 300)
+ infected = "Mild Infection+:"
+ if(INFECTION_LEVEL_ONE + 300 to INFECTION_LEVEL_ONE + 400)
+ infected = "Mild Infection++:"
+ if(INFECTION_LEVEL_TWO to INFECTION_LEVEL_TWO + 200)
+ infected = "Acute Infection:"
+ if(INFECTION_LEVEL_TWO + 200 to INFECTION_LEVEL_TWO + 300)
+ infected = "Acute Infection+:"
+ if(INFECTION_LEVEL_TWO + 300 to INFECTION_LEVEL_TWO + 400)
+ infected = "Acute Infection++:"
+ if(INFECTION_LEVEL_THREE to INFINITY)
+ infected = "Septic:"
+
+ var/unknown_body = 0
+ for(var/I in e.embedded_objects)
+ unknown_body++
+
+ if(unknown_body || e.hidden)
+ imp += "Unknown body present:"
+ if(!AN && !open && !infected & !imp)
+ AN = "None:"
+ dat += "[e.name] | [e.burn_dam] | [e.brute_dam] | [robot][bled][AN][splint][open][infected][imp][internal_bleeding][lung_ruptured] | "
+ dat += "
"
+ for(var/obj/item/organ/internal/i in target.internal_organs)
+ var/mech = i.desc
+ var/infection = "None"
+ switch(i.germ_level)
+ if(1 to INFECTION_LEVEL_ONE + 200)
+ infection = "Mild Infection:"
+ if(INFECTION_LEVEL_ONE + 200 to INFECTION_LEVEL_ONE + 300)
+ infection = "Mild Infection+:"
+ if(INFECTION_LEVEL_ONE + 300 to INFECTION_LEVEL_ONE + 400)
+ infection = "Mild Infection++:"
+ if(INFECTION_LEVEL_TWO to INFECTION_LEVEL_TWO + 200)
+ infection = "Acute Infection:"
+ if(INFECTION_LEVEL_TWO + 200 to INFECTION_LEVEL_TWO + 300)
+ infection = "Acute Infection+:"
+ if(INFECTION_LEVEL_TWO + 300 to INFINITY)
+ infection = "Acute Infection++:"
+
+ dat += ""
+ dat += "| [i.name] | N/A | [i.damage] | [infection]:[mech] | | "
+ dat += "
"
+ dat += "
"
+ if(target.disabilities & BLIND)
+ dat += "Cataracts detected.
"
+ if(target.disabilities & COLOURBLIND)
+ dat += "Photoreceptor abnormalities detected.
"
+ if(target.disabilities & NEARSIGHTED)
+ dat += "Retinal misalignment detected.
"
+
+ return dat
diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm
index 08e6ada170e..2c0f3cb1e70 100644
--- a/code/game/objects/items/robot/robot_upgrades.dm
+++ b/code/game/objects/items/robot/robot_upgrades.dm
@@ -302,14 +302,12 @@
if(cyborg.health < cyborg.maxHealth)
if(cyborg.health < 0)
- repair_amount = -2.5
+ repair_amount = 2.5
powercost = 30
else
- repair_amount = -1
+ repair_amount = 1
powercost = 10
- cyborg.adjustBruteLoss(repair_amount)
- cyborg.adjustFireLoss(repair_amount)
- cyborg.updatehealth()
+ cyborg.heal_overall_damage(repair_amount, repair_amount)
cyborg.cell.use(powercost)
else
cyborg.cell.use(5)
diff --git a/code/game/objects/items/shooting_range.dm b/code/game/objects/items/shooting_range.dm
index 300e08c5ef5..2a4a5a3fab1 100644
--- a/code/game/objects/items/shooting_range.dm
+++ b/code/game/objects/items/shooting_range.dm
@@ -94,9 +94,7 @@
hp -= Proj.damage
if(hp <= 0)
- for(var/mob/O in oviewers())
- if((O.client && !( O.blinded )))
- to_chat(O, "[src] breaks into tiny pieces and collapses!")
+ visible_message("[src] breaks into tiny pieces and collapses!")
qdel(src)
// Create a temporary object to represent the damage
diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm
index 45059d3e80b..0bdc88c5b52 100644
--- a/code/game/objects/items/stacks/medical.dm
+++ b/code/game/objects/items/stacks/medical.dm
@@ -73,7 +73,6 @@
else
M.heal_organ_damage(heal_brute, heal_burn)
- M.updatehealth()
user.visible_message("[user] applies [src] on [M].", \
"You apply [src] on [M].")
use(1)
diff --git a/code/game/objects/items/stacks/nanopaste.dm b/code/game/objects/items/stacks/nanopaste.dm
index ec5ba4ef684..aaaa0dbc579 100644
--- a/code/game/objects/items/stacks/nanopaste.dm
+++ b/code/game/objects/items/stacks/nanopaste.dm
@@ -15,9 +15,7 @@
if(istype(M,/mob/living/silicon/robot)) //Repairing cyborgs
var/mob/living/silicon/robot/R = M
if(R.getBruteLoss() || R.getFireLoss() )
- R.adjustBruteLoss(-15)
- R.adjustFireLoss(-15)
- R.updatehealth()
+ R.heal_overall_damage(15, 15)
use(1)
user.visible_message("\The [user] applied some [src] at [R]'s damaged areas.",\
"You apply some [src] at [R]'s damaged areas.")
@@ -31,7 +29,6 @@
if(S && S.is_robotic())
if(S.get_damage())
S.heal_damage(15, 15, robo_repair = 1)
- H.updatehealth()
use(1)
user.visible_message("\The [user] applies some nanite paste at[user != M ? " \the [M]'s" : " \the"][S.name] with \the [src].",\
"You apply some nanite paste at [user == M ? "your" : "[M]'s"] [S.name].")
diff --git a/code/game/objects/items/weapons/defib.dm b/code/game/objects/items/weapons/defib.dm
index c37c1cce2c8..a1ae9b5485b 100644
--- a/code/game/objects/items/weapons/defib.dm
+++ b/code/game/objects/items/weapons/defib.dm
@@ -332,7 +332,6 @@
"[user] has touched [H.name] with [src]!")
H.adjustStaminaLoss(50)
H.Weaken(5)
- H.updatehealth() //forces health update before next life tick
playsound(get_turf(src), 'sound/machines/defib_zap.ogg', 50, 1, -1)
H.emote("gasp")
if(!H.undergoing_cardiac_arrest() && (prob(10) || defib.combat)) // Your heart explodes.
@@ -479,7 +478,6 @@
"[user] has touched [H.name] with [src]!")
H.adjustStaminaLoss(50)
H.Weaken(5)
- H.updatehealth() //forces health update before next life tick
if(!H.undergoing_cardiac_arrest() && prob(10)) // Your heart explodes.
H.set_heartattack(TRUE)
playsound(get_turf(src), 'sound/machines/defib_zap.ogg', 50, 1, -1)
diff --git a/code/game/objects/items/weapons/explosives.dm b/code/game/objects/items/weapons/explosives.dm
index edf7e0fc32b..26639543426 100644
--- a/code/game/objects/items/weapons/explosives.dm
+++ b/code/game/objects/items/weapons/explosives.dm
@@ -60,7 +60,7 @@
if(nadeassembly)
nadeassembly.attack_self(user)
return
- var/newtime = input(usr, "Please set the timer.", "Timer", 10) as num
+ var/newtime = input(usr, "Please set the timer.", "Timer", det_time) as num
if(user.is_in_active_hand(src))
newtime = Clamp(newtime, 10, 60000)
det_time = newtime
@@ -231,3 +231,38 @@
CB.prime()
..()
+
+/obj/item/grenade/plastic/x4/thermite
+ name = "T4"
+ desc = "A wall breaching charge, containing fuel, metal oxide and metal powder mixed in just the right way. One hell of a combination. Effective against walls, ineffective against airlocks..."
+ det_time = 2
+ icon_state = "t4breach0"
+ item_state = "t4breach"
+
+/obj/item/grenade/plastic/x4/thermite/prime()
+ var/turf/location
+ if(target)
+ if(!QDELETED(target))
+ location = get_turf(target)
+ target.overlays -= image_overlay
+ else
+ location = get_turf(src)
+ if(location)
+ var/datum/effect_system/smoke_spread/smoke = new
+ smoke.set_up(8,0, location, aim_dir)
+ if(target && target.density)
+ var/turf/T = get_step(location, aim_dir)
+ for(var/turf/simulated/wall/W in range(1, location))
+ W.thermitemelt(speed = 30)
+ addtimer(CALLBACK(null, .proc/explosion, T, 0, 0, 2), 3)
+ addtimer(CALLBACK(smoke, /datum/effect_system/smoke_spread/.proc/start), 3)
+ else
+ addtimer(CALLBACK(null, .proc/explosion, T, 0, 0, 2), 3)
+ addtimer(CALLBACK(smoke, /datum/effect_system/smoke_spread/.proc/start), 3)
+
+
+ if(isliving(target))
+ var/mob/living/M = target
+ M.adjust_fire_stacks(2)
+ M.IgniteMob()
+ qdel(src)
diff --git a/code/game/objects/items/weapons/lighters.dm b/code/game/objects/items/weapons/lighters.dm
index 94e97ea7c20..ac8c7d04a95 100644
--- a/code/game/objects/items/weapons/lighters.dm
+++ b/code/game/objects/items/weapons/lighters.dm
@@ -56,7 +56,6 @@
var/obj/item/organ/external/affecting = H.get_organ("[user.hand ? "l" : "r" ]_hand")
if(affecting.receive_damage( 0, 5 )) //INFERNO
H.UpdateDamageIcon()
- H.updatehealth()
user.visible_message("After a few attempts, [user] manages to light the [src], [user.p_they()] however burn[user.p_s()] [user.p_their()] finger in the process.")
set_light(2)
@@ -184,6 +183,7 @@
attack_verb = list("burnt","singed")
processing_objects.Add(src)
update_icon()
+ return TRUE
/obj/item/match/proc/matchburnout()
if(lit)
@@ -197,6 +197,7 @@
desc = "A match. This one has seen better days."
attack_verb = list("flicked")
processing_objects.Remove(src)
+ return TRUE
/obj/item/match/dropped(mob/user)
matchburnout()
diff --git a/code/game/objects/items/weapons/shards.dm b/code/game/objects/items/weapons/shards.dm
index 0f771fee03d..88de9de1b11 100644
--- a/code/game/objects/items/weapons/shards.dm
+++ b/code/game/objects/items/weapons/shards.dm
@@ -50,7 +50,6 @@
to_chat(H, "[src] cuts into your hand!")
if(affecting.receive_damage(force*0.5))
H.UpdateDamageIcon()
- H.updatehealth()
/obj/item/shard/attackby(obj/item/I, mob/user, params)
if(iswelder(I))
@@ -87,7 +86,6 @@
H.Weaken(3)
if(affecting.receive_damage(5, 0))
H.UpdateDamageIcon()
- H.updatehealth()
..()
/obj/item/shard/plasma
@@ -126,4 +124,4 @@
to_chat(usr, "You add the newly-formed plasma glass to the stack. It now contains [NG.amount] sheets.")
qdel(src)
else
- return ..()
\ No newline at end of file
+ return ..()
diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm
index 65524fec445..5ba58e2f313 100644
--- a/code/game/objects/items/weapons/storage/belt.dm
+++ b/code/game/objects/items/weapons/storage/belt.dm
@@ -246,6 +246,15 @@
new /obj/item/grenade/flashbang(src)
update_icon()
+/obj/item/storage/belt/security/response_team_gamma/New()
+ ..()
+ new /obj/item/melee/baton/loaded(src)
+ new /obj/item/reagent_containers/spray/pepper(src)
+ new /obj/item/flash(src)
+ new /obj/item/grenade/flashbang(src)
+ new /obj/item/grenade/flashbang(src)
+ update_icon()
+
/obj/item/storage/belt/soulstone
name = "soul stone belt"
desc = "Designed for ease of access to the shards during a fight, as to not let a single enemy spirit slip away"
diff --git a/code/game/objects/items/weapons/storage/lockbox.dm b/code/game/objects/items/weapons/storage/lockbox.dm
index d4482c55f14..d461700695d 100644
--- a/code/game/objects/items/weapons/storage/lockbox.dm
+++ b/code/game/objects/items/weapons/storage/lockbox.dm
@@ -123,3 +123,13 @@
new /obj/item/clothing/accessory/medal/conduct(src)
new /obj/item/clothing/accessory/medal/conduct(src)
new /obj/item/clothing/accessory/medal/gold/captain(src)
+
+/obj/item/storage/lockbox/t4
+ name = "lockbox (T4)"
+ desc = "Contains three T4 breaching charges."
+ req_access = list(access_cent_specops)
+
+/obj/item/storage/lockbox/t4/New()
+ ..()
+ for(var/i = 0, i < 3, i++)
+ new /obj/item/grenade/plastic/x4/thermite(src)
\ No newline at end of file
diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm
index f24b60c62d0..4defb3b4aae 100644
--- a/code/game/objects/items/weapons/storage/storage.dm
+++ b/code/game/objects/items/weapons/storage/storage.dm
@@ -166,7 +166,7 @@
if(display_contents_with_number)
for(var/datum/numbered_display/ND in display_contents)
- ND.sample_object.mouse_opacity = 2
+ ND.sample_object.mouse_opacity = MOUSE_OPACITY_OPAQUE
ND.sample_object.screen_loc = "[cx]:16,[cy]:16"
ND.sample_object.maptext = "[(ND.number > 1)? "[ND.number]" : ""]"
ND.sample_object.layer = 20
@@ -177,7 +177,7 @@
cy--
else
for(var/obj/O in contents)
- O.mouse_opacity = 2 //This is here so storage items that spawn with contents correctly have the "click around item to equip"
+ O.mouse_opacity = MOUSE_OPACITY_OPAQUE //This is here so storage items that spawn with contents correctly have the "click around item to equip"
O.screen_loc = "[cx]:16,[cy]:16"
O.maptext = ""
O.layer = 20
@@ -309,7 +309,7 @@
src.orient2hud(usr)
if(usr.s_active)
usr.s_active.show_to(usr)
- W.mouse_opacity = 2 //So you can click on the area around the item to equip it, instead of having to pixel hunt
+ W.mouse_opacity = MOUSE_OPACITY_OPAQUE //So you can click on the area around the item to equip it, instead of having to pixel hunt
update_icon()
return 1
diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm
index 31cc7a1faf2..a24beced667 100644
--- a/code/game/objects/items/weapons/stunbaton.dm
+++ b/code/game/objects/items/weapons/stunbaton.dm
@@ -14,6 +14,7 @@
var/status = 0
var/obj/item/stock_parts/cell/high/bcell = null
var/hitcost = 1000
+ var/throw_hit_chance = 35
/obj/item/melee/baton/suicide_act(mob/user)
user.visible_message("[user] is putting the live [name] in [user.p_their()] mouth! It looks like [user.p_theyre()] trying to commit suicide.")
@@ -28,6 +29,11 @@
QDEL_NULL(bcell)
return ..()
+/obj/item/melee/baton/throw_impact(atom/hit_atom)
+ ..()
+ if(status && prob(throw_hit_chance))
+ baton_stun(hit_atom)
+
/obj/item/melee/baton/loaded/New() //this one starts with a cell pre-installed.
..()
bcell = new(src)
@@ -138,15 +144,17 @@
if(H.check_shields(0, "[user]'s [name]", src, MELEE_ATTACK)) //No message; check_shields() handles that
playsound(L, 'sound/weapons/Genhit.ogg', 50, 1)
return
- user.lastattacked = L
- L.lastattacker = user
L.Stun(stunforce)
L.Weaken(stunforce)
L.apply_effect(STUTTER, stunforce)
- L.visible_message("[user] has stunned [L] with [src]!", \
- "[user] has stunned you with [src]!")
+ if(user)
+ user.lastattacked = L
+ L.lastattacker = user
+ L.visible_message("[user] has stunned [L] with [src]!", \
+ "[user] has stunned you with [src]!")
+ add_attack_logs(user, L, "stunned")
playsound(loc, 'sound/weapons/Egloves.ogg', 50, 1, -1)
if(isrobot(loc))
@@ -160,8 +168,6 @@
var/mob/living/carbon/human/H = L
H.forcesay(hit_appends)
- add_attack_logs(user, L, "Stunned with [src]")
-
/obj/item/melee/baton/emp_act(severity)
if(bcell)
deductcharge(1000 / severity)
@@ -193,6 +199,7 @@
throwforce = 5
stunforce = 5
hitcost = 2000
+ throw_hit_chance = 10
slot_flags = SLOT_BACK
var/obj/item/assembly/igniter/sparkler = null
diff --git a/code/game/objects/items/weapons/tanks/watertank.dm b/code/game/objects/items/weapons/tanks/watertank.dm
index 64a5c95f5c0..364fd49847b 100644
--- a/code/game/objects/items/weapons/tanks/watertank.dm
+++ b/code/game/objects/items/weapons/tanks/watertank.dm
@@ -315,7 +315,7 @@
desc = "A frozen shell of ice containing nanofrost that freezes the surrounding area after activation."
icon = 'icons/effects/effects.dmi'
icon_state = "frozen_smoke_capsule"
- mouse_opacity = 0
+ mouse_opacity = MOUSE_OPACITY_TRANSPARENT
pass_flags = PASSTABLE
/obj/effect/nanofrost_container/proc/Smoke()
diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm
index 00860477833..f74a3b542ca 100644
--- a/code/game/objects/structures.dm
+++ b/code/game/objects/structures.dm
@@ -147,7 +147,6 @@
H.adjustBruteLoss(damage)
H.UpdateDamageIcon()
- H.updatehealth()
return
/obj/structure/proc/can_touch(var/mob/user)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
index 646adc30551..b5f715d165f 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
@@ -60,9 +60,7 @@
if(allowed(user))
locked = !locked
playsound(loc, 'sound/machines/click.ogg', 15, 1, -3)
- for(var/mob/O in viewers(user, 3))
- if((O.client && !( O.blinded )))
- to_chat(O, "The locker has been [locked ? null : "un"]locked by [user].")
+ visible_message("The locker has been [locked ? null : "un"]locked by [user].")
update_icon()
else
to_chat(user, "Access Denied")
@@ -93,12 +91,11 @@
/obj/structure/closet/secure_closet/emag_act(mob/user)
if(!broken)
- broken = 1
- locked = 0
- desc = "It appears to be broken."
+ broken = TRUE
+ locked = FALSE
icon_state = icon_off
flick(icon_broken, src)
- to_chat(user, "You unlock \the [src].")
+ to_chat(user, "You break the lock on \the [src].")
/obj/structure/closet/secure_closet/attack_hand(mob/user)
add_fingerprint(user)
diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm
index b3530156d91..26b3e53362e 100644
--- a/code/game/objects/structures/crates_lockers/crates.dm
+++ b/code/game/objects/structures/crates_lockers/crates.dm
@@ -270,9 +270,7 @@
return
if(src.allowed(user))
src.locked = !src.locked
- for(var/mob/O in viewers(user, 3))
- if((O.client && !( O.blinded )))
- to_chat(O, "The crate has been [locked ? null : "un"]locked by [user].")
+ visible_message("The crate has been [locked ? null : "un"]locked by [user].")
update_icon()
else
to_chat(user, "Access Denied")
diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm
index e015f349c1d..6b8f5544428 100644
--- a/code/game/objects/structures/grille.dm
+++ b/code/game/objects/structures/grille.dm
@@ -18,7 +18,7 @@
var/grille_type
var/broken_type = /obj/structure/grille/broken
var/shockcooldown = 0
- var/my_shockcooldown = 50
+ var/my_shockcooldown = 1 SECONDS
/obj/structure/grille/fence/
var/width = 3
diff --git a/code/game/objects/structures/lamarr_cage.dm b/code/game/objects/structures/lamarr_cage.dm
index 03182f69547..7fa0357cfaf 100644
--- a/code/game/objects/structures/lamarr_cage.dm
+++ b/code/game/objects/structures/lamarr_cage.dm
@@ -69,10 +69,7 @@
if(src.destroyed)
return
else
- to_chat(usr, text("You kick the lab cage."))
- for(var/mob/O in oviewers())
- if((O.client && !( O.blinded )))
- to_chat(O, text("[] kicks the lab cage.", usr))
+ user.visible_message("[user] kicks the lab cage.", "You kick the lab cage.")
src.health -= 2
healthcheck()
return
@@ -82,4 +79,4 @@
new /obj/item/clothing/mask/facehugger/lamarr(src.loc)
occupied = 0
update_icon()
- return
\ No newline at end of file
+ return
diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm
index 60ca03ad0f7..968fcef2fd5 100644
--- a/code/game/objects/structures/morgue.dm
+++ b/code/game/objects/structures/morgue.dm
@@ -207,9 +207,7 @@
return
O.forceMove(loc)
if(user != O)
- for(var/mob/B in viewers(user, 3))
- if((B.client && !( B.blinded )))
- to_chat(B, text("[] stuffs [] into []!", user, O, src))
+ user.visible_message("[user] stuffs [O] into [src]!")
return
/obj/structure/m_tray/Destroy()
@@ -440,9 +438,7 @@
return
O.forceMove(loc)
if(user != O)
- for(var/mob/B in viewers(user, 3))
- if((B.client && !( B.blinded )))
- to_chat(B, text("[] stuffs [] into []!", user, O, src))
+ user.visible_message("[user] stuffs [O] into [src]!")
//Foreach goto(99)
return
diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm
index 31bfadee7d7..751ade6081f 100644
--- a/code/game/objects/structures/watercloset.dm
+++ b/code/game/objects/structures/watercloset.dm
@@ -278,7 +278,7 @@
icon_state = "mist"
layer = MOB_LAYER + 1
anchored = 1
- mouse_opacity = 0
+ mouse_opacity = MOUSE_OPACITY_TRANSPARENT
/obj/machinery/shower/attack_hand(mob/M as mob)
on = !on
diff --git a/code/game/response_team.dm b/code/game/response_team.dm
deleted file mode 100644
index d7aa9e88504..00000000000
--- a/code/game/response_team.dm
+++ /dev/null
@@ -1,777 +0,0 @@
-// ERTs
-
-#define ERT_TYPE_AMBER 1
-#define ERT_TYPE_RED 2
-#define ERT_TYPE_GAMMA 3
-
-/datum/game_mode
- var/list/datum/mind/ert = list()
-
-var/list/response_team_members = list()
-var/responseteam_age = 21 // Minimum account age to play as an ERT member
-var/datum/response_team/active_team = null
-var/send_emergency_team = 0
-var/ert_request_answered = 0
-
-/client/proc/response_team()
- set name = "Dispatch CentComm Response Team"
- set category = "Event"
- set desc = "Send an CentComm response team to the station."
-
- if(!check_rights(R_EVENT))
- return
-
- if(!ticker)
- to_chat(usr, "The game hasn't started yet!")
- return
-
- if(ticker.current_state == 1)
- to_chat(usr, "The round hasn't started yet!")
- return
-
- if(send_emergency_team)
- to_chat(usr, "Central Command has already dispatched an emergency response team!")
- return
-
- var/datum/nano_module/ert_manager/E = new()
- E.ui_interact(usr)
-
-
-/mob/dead/observer/proc/JoinResponseTeam()
- if(!send_emergency_team)
- to_chat(src, "No emergency response team is currently being sent.")
- return 0
-
- if(jobban_isbanned(src, ROLE_ERT))
- to_chat(src, "You are jobbanned from the emergency reponse team!")
- return 0
-
- var/player_age_check = check_client_age(client, responseteam_age)
- if(player_age_check && config.use_age_restriction_for_antags)
- to_chat(src, "This role is not yet available to you. You need to wait another [player_age_check] days.")
- return 0
-
- if(cannotPossess(src))
- to_chat(src, "Upon using the antagHUD you forfeited the ability to join the round.")
- return 0
-
- if(response_team_members.len > 6)
- to_chat(src, "The emergency response team is already full!")
- return 0
-
- return 1
-
-/proc/trigger_armed_response_team(var/datum/response_team/response_team_type, commander_slots, security_slots, medical_slots, engineering_slots, janitor_slots, paranormal_slots, cyborg_slots)
- response_team_members = list()
- active_team = response_team_type
- active_team.setSlots(commander_slots, security_slots, medical_slots, engineering_slots, janitor_slots, paranormal_slots, cyborg_slots)
-
- send_emergency_team = 1
- var/list/ert_candidates = pollCandidates("Join the Emergency Response Team?",, responseteam_age, 600, 1, role_playtime_requirements[ROLE_ERT])
- if(!ert_candidates.len)
- active_team.cannot_send_team()
- send_emergency_team = 0
- return 0
-
- // Respawnable players get first dibs
- for(var/mob/dead/observer/M in ert_candidates)
- if(jobban_isbanned(M, ROLE_TRAITOR) || jobban_isbanned(M, "Security Officer") || jobban_isbanned(M, "Captain") || jobban_isbanned(M, "Cyborg"))
- continue
- if((M in respawnable_list) && M.JoinResponseTeam())
- response_team_members |= M
- // If there's still open slots, non-respawnable players can fill them
- for(var/mob/dead/observer/M in (ert_candidates - respawnable_list))
- if(M.JoinResponseTeam())
- response_team_members |= M
-
- if(!response_team_members.len)
- active_team.cannot_send_team()
- send_emergency_team = 0
- return 0
-
- var/index = 1
- var/ert_spawn_seconds = 120
- spawn(ert_spawn_seconds * 10) // to account for spawn() using deciseconds
- var/list/unspawnable_ert = list()
- for(var/mob/M in response_team_members)
- if(M)
- unspawnable_ert |= M
- if(unspawnable_ert.len)
- message_admins("ERT SPAWN: The following ERT members could not be spawned within [ert_spawn_seconds] seconds:")
- for(var/mob/M in unspawnable_ert)
- message_admins("- Unspawned ERT: [ADMIN_FULLMONTY(M)]")
- for(var/mob/M in response_team_members)
- if(index > emergencyresponseteamspawn.len)
- index = 1
-
- if(!M || !M.client)
- continue
- var/client/C = M.client
- var/mob/living/new_commando = C.create_response_team(emergencyresponseteamspawn[index])
- if(!M || !new_commando)
- continue
- new_commando.mind.key = M.key
- new_commando.key = M.key
- new_commando.update_icons()
- index++
-
- send_emergency_team = 0
- active_team.announce_team()
- return 1
-
-/client/proc/create_response_team(var/turf/spawn_location)
- var/class = 0
- while(!class)
- class = input(src, "Which loadout would you like to choose?") in active_team.get_slot_list()
- if(!active_team.check_slot_available(class)) // Because the prompt does not update automatically when a slot gets filled.
- class = 0
-
- if(class == "Cyborg")
- active_team.reduceCyborgSlots()
- var/cyborg_unlock = active_team.getCyborgUnlock()
- var/mob/living/silicon/robot/ert/R = new /mob/living/silicon/robot/ert(spawn_location, cyborg_unlock)
- return R
-
- var/mob/living/carbon/human/M = new(null)
- var/obj/item/organ/external/head/head_organ = M.get_organ("head")
-
- var/new_gender = alert(src, "Please select your gender.", "ERT Character Generation", "Male", "Female")
-
- if(new_gender)
- if(new_gender == "Male")
- M.change_gender(MALE)
- else
- M.change_gender(FEMALE)
-
- M.set_species(/datum/species/human, TRUE)
- M.dna.ready_dna(M)
- M.reagents.add_reagent("mutadone", 1) //No fat/blind/colourblind/epileptic/whatever ERT.
- M.overeatduration = 0
-
- var/hair_c = pick("#8B4513","#000000","#FF4500","#FFD700") // Brown, black, red, blonde
- var/eye_c = pick("#000000","#8B4513","1E90FF") // Black, brown, blue
- var/skin_tone = rand(-120, 20) // A range of skin colors
-
- head_organ.facial_colour = hair_c
- head_organ.sec_facial_colour = hair_c
- head_organ.hair_colour = hair_c
- head_organ.sec_hair_colour = hair_c
- M.change_eye_color(eye_c)
- M.s_tone = skin_tone
- head_organ.h_style = random_hair_style(M.gender, head_organ.dna.species.name)
- head_organ.f_style = random_facial_hair_style(M.gender, head_organ.dna.species.name)
-
- M.rename_character(null, "[pick("Corporal", "Sergeant", "Staff Sergeant", "Sergeant First Class", "Master Sergeant", "Sergeant Major")] [pick(last_names)]")
- M.age = rand(23,35)
- M.regenerate_icons()
- M.update_body()
- M.update_dna()
-
- //Creates mind stuff.
- M.mind = new
- M.mind.current = M
- M.mind.original = M
- M.mind.assigned_role = SPECIAL_ROLE_ERT
- M.mind.special_role = SPECIAL_ROLE_ERT
- if(!(M.mind in ticker.minds))
- ticker.minds += M.mind //Adds them to regular mind list.
- ticker.mode.ert += M.mind
- M.forceMove(spawn_location)
-
- job_master.CreateMoneyAccount(M, class, null)
-
- active_team.equip_officer(class, M)
-
- return M
-
-
-/datum/response_team
- var/command_slots = 1
- var/engineer_slots = 3
- var/medical_slots = 3
- var/security_slots = 3
- var/janitor_slots = 0
- var/paranormal_slots = 0
- var/cyborg_slots = 0
-
- var/command_outfit
- var/engineering_outfit
- var/medical_outfit
- var/security_outfit
- var/janitor_outfit
- var/paranormal_outfit
- var/cyborg_unlock = 0
-
-/datum/response_team/proc/setSlots(com, sec, med, eng, jan, par, cyb)
- command_slots = com == null ? command_slots : com
- security_slots = sec == null ? security_slots : sec
- medical_slots = med == null ? medical_slots : med
- engineer_slots = eng == null ? engineer_slots : eng
- janitor_slots = jan == null ? janitor_slots : jan
- paranormal_slots = par == null ? paranormal_slots : par
- cyborg_slots = cyb == null ? cyborg_slots : cyb
-
-/datum/response_team/proc/reduceCyborgSlots()
- cyborg_slots--
-
-/datum/response_team/proc/getCyborgUnlock()
- return cyborg_unlock
-
-/datum/response_team/proc/get_slot_list()
- var/list/slots_available = list()
- if(command_slots)
- slots_available |= "Commander"
- if(security_slots)
- slots_available |= "Security"
- if(engineer_slots)
- slots_available |= "Engineer"
- if(medical_slots)
- slots_available |= "Medic"
- if(janitor_slots)
- slots_available |= "Janitor"
- if(paranormal_slots)
- slots_available |= "Paranormal"
- if(cyborg_slots)
- slots_available |= "Cyborg"
- return slots_available
-
-/datum/response_team/proc/check_slot_available(var/slot)
- switch(slot)
- if("Commander")
- return command_slots
- if("Security")
- return security_slots
- if("Engineer")
- return engineer_slots
- if("Medic")
- return medical_slots
- if("Janitor")
- return janitor_slots
- if("Paranormal")
- return paranormal_slots
- if("Cyborg")
- return cyborg_slots
- return 0
-
-/datum/response_team/proc/equip_officer(var/officer_type, var/mob/living/carbon/human/M)
- switch(officer_type)
- if("Engineer")
- engineer_slots -= 1
- M.equipOutfit(engineering_outfit)
- M.job = "ERT Engineering"
-
- if("Security")
- security_slots -= 1
- M.equipOutfit(security_outfit)
- M.job = "ERT Security"
-
- if("Medic")
- medical_slots -= 1
- M.equipOutfit(medical_outfit)
- M.job = "ERT Medical"
-
- if("Janitor")
- janitor_slots -= 1
- M.equipOutfit(janitor_outfit)
- M.job = "ERT Janitor"
-
- if("Paranormal")
- paranormal_slots -= 1
- M.equipOutfit(paranormal_outfit)
- M.job = "ERT Paranormal"
-
- if("Commander")
- command_slots = 0
-
- // Override name and age for the commander
- M.rename_character(null, "[pick("Lieutenant", "Captain", "Major")] [pick(last_names)]")
- M.age = rand(35,45)
-
- M.equipOutfit(command_outfit)
- M.job = "ERT Commander"
-
-/datum/response_team/proc/cannot_send_team()
- event_announcement.Announce("[station_name()], we are unfortunately unable to send you an Emergency Response Team at this time.", "ERT Unavailable")
-
-/datum/response_team/proc/announce_team()
- event_announcement.Announce("Attention, [station_name()]. We are sending a team of highly trained assistants to aid(?) you. Standby.", "ERT En-Route")
-
-// -- AMBER TEAM --
-
-/datum/response_team/amber
- engineering_outfit = /datum/outfit/job/centcom/response_team/engineer/amber
- security_outfit = /datum/outfit/job/centcom/response_team/security/amber
- medical_outfit = /datum/outfit/job/centcom/response_team/medic/amber
- command_outfit = /datum/outfit/job/centcom/response_team/commander/amber
- janitor_outfit = /datum/outfit/job/centcom/response_team/janitorial/amber
- paranormal_outfit = /datum/outfit/job/centcom/response_team/paranormal/amber
-
-/datum/response_team/amber/announce_team()
- event_announcement.Announce("Attention, [station_name()]. We are sending a code AMBER light Emergency Response Team. Standby.", "ERT En-Route")
-
-// -- RED TEAM --
-
-/datum/response_team/red
- engineering_outfit = /datum/outfit/job/centcom/response_team/engineer/red
- security_outfit = /datum/outfit/job/centcom/response_team/security/red
- medical_outfit = /datum/outfit/job/centcom/response_team/medic/red
- command_outfit = /datum/outfit/job/centcom/response_team/commander/red
- janitor_outfit = /datum/outfit/job/centcom/response_team/janitorial/red
- paranormal_outfit = /datum/outfit/job/centcom/response_team/paranormal/red
-
-/datum/response_team/red/announce_team()
- event_announcement.Announce("Attention, [station_name()]. We are sending a code RED Emergency Response Team. Standby.", "ERT En-Route")
-
-// -- GAMMA TEAM --
-
-/datum/response_team/gamma
- engineering_outfit = /datum/outfit/job/centcom/response_team/engineer/gamma
- security_outfit = /datum/outfit/job/centcom/response_team/security/gamma
- medical_outfit = /datum/outfit/job/centcom/response_team/medic/gamma
- command_outfit = /datum/outfit/job/centcom/response_team/commander/gamma
- janitor_outfit = /datum/outfit/job/centcom/response_team/janitorial/gamma
- paranormal_outfit = /datum/outfit/job/centcom/response_team/paranormal/gamma
- cyborg_unlock = 1
-
-/datum/response_team/gamma/announce_team()
- event_announcement.Announce("Attention, [station_name()]. We are sending a code GAMMA elite Emergency Response Team. Standby.", "ERT En-Route")
-
-/datum/outfit/job/centcom/response_team
- name = "Response team"
- var/rt_assignment = "Emergency Response Team Member"
- var/rt_job = "This is a bug"
- allow_backbag_choice = FALSE
- allow_loadout = FALSE
- pda = /obj/item/pda/heads/ert
- id = /obj/item/card/id/ert
- l_ear = /obj/item/radio/headset/ert/alt
-
- implants = list(/obj/item/implant/mindshield)
-
-/datum/outfit/job/centcom/response_team/pre_equip()
- . = ..()
- backpack_contents.Insert(1, /obj/item/storage/box/responseteam)
- backpack_contents[/obj/item/storage/box/responseteam] = 1
-
-/datum/outfit/job/centcom/response_team/imprint_idcard(mob/living/carbon/human/H)
- var/obj/item/card/id/W = H.wear_id
- if(!istype(W))
- return
- W.assignment = rt_assignment
- W.rank = W.assignment
- W.age = H.age
- W.sex = capitalize(H.gender)
- W.registered_name = H.real_name
- W.name = "[H.real_name]'s ID Card ([rt_job])"
- W.access = get_centcom_access(W.assignment)
- W.photo = get_id_photo(H)
- if(H.mind && H.mind.initial_account && H.mind.initial_account.account_number)
- W.associated_account_number = H.mind.initial_account.account_number
-
-/datum/outfit/job/centcom/response_team/imprint_pda(mob/living/carbon/human/H)
- var/obj/item/pda/PDA = H.wear_pda
- if(istype(PDA))
- PDA.owner = H.real_name
- PDA.ownjob = rt_assignment
- PDA.ownrank = rt_assignment
- PDA.name = "PDA-[H.real_name] ([PDA.ownjob])"
-
-/datum/outfit/job/centcom/response_team/commander
- name = "RT Commander"
- rt_assignment = "Emergency Response Team Leader"
- rt_job = "Emergency Response Team Leader"
-
- uniform = /obj/item/clothing/under/rank/centcom_officer
- back = /obj/item/storage/backpack/ert/commander
-
- id = /obj/item/card/id/ert/commander
-
- l_pocket = /obj/item/pinpointer
- r_pocket = /obj/item/melee/classic_baton/telescopic
-
-/datum/outfit/job/centcom/response_team/commander/amber
- name = "RT Commander (Amber)"
- shoes = /obj/item/clothing/shoes/combat
- gloves = /obj/item/clothing/gloves/color/black
- suit = /obj/item/clothing/suit/armor/vest/ert/command
- glasses = /obj/item/clothing/glasses/sunglasses
-
- belt = /obj/item/gun/energy/gun
-
- backpack_contents = list(
- /obj/item/clothing/head/helmet/ert/command = 1,
- /obj/item/clothing/mask/gas/sechailer = 1,
- /obj/item/restraints/handcuffs = 1,
- /obj/item/storage/lockbox/mindshield = 1
- )
-
-/datum/outfit/job/centcom/response_team/commander/red
- name = "RT Commander (Red)"
- shoes = /obj/item/clothing/shoes/combat
- gloves = /obj/item/clothing/gloves/combat
- suit = /obj/item/clothing/suit/space/hardsuit/ert/commander
- glasses = /obj/item/clothing/glasses/sunglasses
- cybernetic_implants = list(
- /obj/item/organ/internal/cyberimp/eyes/hud/security,
- /obj/item/organ/internal/cyberimp/chest/nutriment
- )
- belt = /obj/item/gun/energy/gun/nuclear
-
- backpack_contents = list(
- /obj/item/clothing/head/helmet/space/hardsuit/ert/commander = 1,
- /obj/item/clothing/mask/gas/sechailer/swat = 1,
- /obj/item/gun/energy/ionrifle/carbine = 1,
- /obj/item/restraints/handcuffs = 1,
- /obj/item/clothing/shoes/magboots = 1,
- /obj/item/storage/lockbox/mindshield = 1
- )
-
-/datum/outfit/job/centcom/response_team/commander/gamma
- name = "RT Commander (Gamma)"
- shoes = /obj/item/clothing/shoes/magboots/advance
- gloves = /obj/item/clothing/gloves/combat
- suit = /obj/item/clothing/suit/space/hardsuit/ert/commander
- glasses = /obj/item/clothing/glasses/hud/security/night
-
- belt = /obj/item/gun/energy/gun/nuclear
-
- backpack_contents = list(
- /obj/item/clothing/head/helmet/space/hardsuit/ert/commander = 1,
- /obj/item/clothing/mask/gas/sechailer/swat = 1,
- /obj/item/restraints/handcuffs = 1,
- /obj/item/storage/lockbox/mindshield = 1,
- /obj/item/gun/energy/pulse/pistol = 1
- )
-
-/datum/outfit/job/centcom/response_team/security
- name = "RT Security"
- rt_job = "Emergency Response Team Officer"
- uniform = /obj/item/clothing/under/rank/security
- back = /obj/item/storage/backpack/ert/security
- belt = /obj/item/storage/belt/security/response_team
- pda = /obj/item/pda/heads/ert/security
- id = /obj/item/card/id/ert/security
- var/has_grenades = FALSE
-
-/datum/outfit/job/centcom/response_team/security/amber
- name = "RT Security (Amber)"
- shoes = /obj/item/clothing/shoes/combat
- gloves = /obj/item/clothing/gloves/color/black
- suit = /obj/item/clothing/suit/armor/vest/ert/security
- suit_store = /obj/item/gun/energy/gun/advtaser
- glasses = /obj/item/clothing/glasses/hud/security/sunglasses
-
- r_hand = /obj/item/gun/energy/laser
-
- backpack_contents = list(
- /obj/item/clothing/head/helmet/ert/security = 1,
- /obj/item/clothing/mask/gas/sechailer = 1,
- /obj/item/storage/box/zipties = 1,
- /obj/item/storage/box/teargas = 1,
- /obj/item/flashlight/seclite = 1
- )
-
-/datum/outfit/job/centcom/response_team/security/red
- name = "RT Security (Red)"
- has_grenades = TRUE
-
- shoes = /obj/item/clothing/shoes/combat
- gloves = /obj/item/clothing/gloves/color/black
- suit = /obj/item/clothing/suit/space/hardsuit/ert/security
- suit_store = /obj/item/gun/energy/gun/blueshield
- glasses = /obj/item/clothing/glasses/hud/security/sunglasses
- cybernetic_implants = list(
- /obj/item/organ/internal/cyberimp/arm/flash,
- /obj/item/organ/internal/cyberimp/chest/nutriment
- )
- r_hand = /obj/item/gun/projectile/automatic/lasercarbine
-
- backpack_contents = list(
- /obj/item/clothing/head/helmet/space/hardsuit/ert/security = 1,
- /obj/item/clothing/mask/gas/sechailer = 1,
- /obj/item/clothing/shoes/magboots = 1,
- /obj/item/storage/box/handcuffs = 1,
- /obj/item/storage/box/teargas = 1,
- /obj/item/grenade/flashbang = 1,
- /obj/item/ammo_box/magazine/laser = 2
- )
-
-/datum/outfit/job/centcom/response_team/security/gamma
- name = "RT Security (Gamma)"
- has_grenades = TRUE
- shoes = /obj/item/clothing/shoes/magboots/advance
- gloves = /obj/item/clothing/gloves/combat
- suit = /obj/item/clothing/suit/space/hardsuit/ert/security
- suit_store = /obj/item/gun/energy/gun/nuclear
- glasses = /obj/item/clothing/glasses/hud/security/night
-
- r_hand = /obj/item/gun/energy/pulse/carbine
-
- backpack_contents = list(
- /obj/item/clothing/head/helmet/space/hardsuit/ert/security = 1,
- /obj/item/clothing/mask/gas/sechailer/swat = 1,
- /obj/item/storage/box/handcuffs = 1,
- /obj/item/gun/energy/ionrifle/carbine = 1
- )
-
-/datum/outfit/job/centcom/response_team/engineer
- name = "RT Engineer"
- rt_job = "Emergency Response Team Engineer"
- back = /obj/item/storage/backpack/ert/engineer
- uniform = /obj/item/clothing/under/rank/engineer
-
- belt = /obj/item/storage/belt/utility/full/multitool
- pda = /obj/item/pda/heads/ert/engineering
- id = /obj/item/card/id/ert/engineering
-
-/datum/outfit/job/centcom/response_team/engineer/amber
- name = "RT Engineer (Amber)"
- shoes = /obj/item/clothing/shoes/magboots
- gloves = /obj/item/clothing/gloves/color/yellow
- suit = /obj/item/clothing/suit/space/hardsuit/ert/engineer
- suit_store = /obj/item/tank/emergency_oxygen/engi
- glasses = /obj/item/clothing/glasses/meson
-
- l_pocket = /obj/item/gun/energy/gun/mini
- r_pocket = /obj/item/melee/classic_baton/telescopic
-
- backpack_contents = list(
- /obj/item/clothing/head/helmet/space/hardsuit/ert/engineer = 1,
- /obj/item/clothing/mask/gas = 1,
- /obj/item/t_scanner = 1,
- /obj/item/stack/sheet/glass/fifty = 1,
- /obj/item/stack/sheet/metal/fifty = 1
- )
-
-/datum/outfit/job/centcom/response_team/engineer/red
- name = "RT Engineer (Red)"
- shoes = /obj/item/clothing/shoes/magboots/advance
- gloves = /obj/item/clothing/gloves/color/yellow
- belt = /obj/item/storage/belt/utility/chief/full
- suit = /obj/item/clothing/suit/space/hardsuit/ert/engineer
- suit_store = /obj/item/tank/emergency_oxygen/engi
- glasses = /obj/item/clothing/glasses/meson
- cybernetic_implants = list(
- /obj/item/organ/internal/cyberimp/eyes/shield,
- /obj/item/organ/internal/cyberimp/chest/nutriment
- )
- l_pocket = /obj/item/t_scanner/extended_range
- r_pocket = /obj/item/melee/classic_baton/telescopic
-
- backpack_contents = list(
- /obj/item/clothing/head/helmet/space/hardsuit/ert/engineer = 1,
- /obj/item/clothing/mask/gas = 1,
- /obj/item/rcd/preloaded = 1,
- /obj/item/rcd_ammo = 3,
- /obj/item/gun/energy/gun = 1
- )
-
-/datum/outfit/job/centcom/response_team/engineer/gamma
- name = "RT Engineer (Gamma)"
- shoes = /obj/item/clothing/shoes/magboots/advance
- gloves = /obj/item/clothing/gloves/color/yellow
- suit = /obj/item/clothing/suit/space/hardsuit/ert/engineer
- suit_store = /obj/item/tank/emergency_oxygen/double/full
- glasses = /obj/item/clothing/glasses/meson/night
-
- l_pocket = /obj/item/t_scanner/extended_range
- r_pocket = /obj/item/melee/classic_baton/telescopic
-
- backpack_contents = list(
- /obj/item/clothing/head/helmet/space/hardsuit/ert/engineer = 1,
- /obj/item/clothing/mask/gas/sechailer/swat = 1,
- /obj/item/rcd/combat = 1,
- /obj/item/rcd_ammo/large = 3,
- /obj/item/gun/energy/pulse/pistol = 1
- )
-
-/datum/outfit/job/centcom/response_team/medic
- name = "RT Medic"
- rt_job = "Emergency Response Team Medic"
- uniform = /obj/item/clothing/under/rank/medical
- back = /obj/item/storage/backpack/ert/medical
- pda = /obj/item/pda/heads/ert/medical
- id = /obj/item/card/id/ert/medic
-
-/datum/outfit/job/centcom/response_team/medic/amber
- name = "RT Medic (Amber)"
-
- shoes = /obj/item/clothing/shoes/white
- gloves = /obj/item/clothing/gloves/color/latex
- suit = /obj/item/clothing/suit/armor/vest/ert/medical
- suit_store = /obj/item/gun/energy/gun/mini
- glasses = /obj/item/clothing/glasses/hud/health
-
- belt = /obj/item/storage/belt/medical/surgery/loaded
-
- l_pocket = /obj/item/reagent_containers/hypospray/safety/ert
- r_pocket = /obj/item/melee/classic_baton/telescopic
-
- backpack_contents = list(
- /obj/item/clothing/head/helmet/ert/medical = 1,
- /obj/item/clothing/mask/surgical = 1,
- /obj/item/storage/firstaid/adv = 1,
- /obj/item/storage/firstaid/regular = 1,
- /obj/item/storage/box/autoinjectors = 1,
- /obj/item/roller = 1,
- /obj/item/storage/pill_bottle/ert = 1
- )
-
-/datum/outfit/job/centcom/response_team/medic/red
- name = "RT Medic (Red)"
- shoes = /obj/item/clothing/shoes/white
- gloves = /obj/item/clothing/gloves/color/latex/nitrile
- suit = /obj/item/clothing/suit/space/hardsuit/ert/medical
- glasses = /obj/item/clothing/glasses/hud/health/health_advanced
- suit_store = /obj/item/gun/energy/gun
- cybernetic_implants = list(
- /obj/item/organ/internal/cyberimp/arm/surgery,
- /obj/item/organ/internal/cyberimp/chest/nutriment
- )
- belt = /obj/item/defibrillator/compact/loaded
-
- l_pocket = /obj/item/reagent_containers/hypospray/safety/ert
- r_pocket = /obj/item/melee/classic_baton/telescopic
-
- backpack_contents = list(
- /obj/item/clothing/head/helmet/space/hardsuit/ert/medical = 1,
- /obj/item/clothing/mask/surgical = 1,
- /obj/item/storage/firstaid/toxin = 1,
- /obj/item/storage/firstaid/brute = 1,
- /obj/item/storage/firstaid/fire = 1,
- /obj/item/storage/box/autoinjectors = 1,
- /obj/item/roller = 1,
- /obj/item/clothing/shoes/magboots = 1
- )
-
-/datum/outfit/job/centcom/response_team/medic/gamma
- name = "RT Medic (Gamma)"
- shoes = /obj/item/clothing/shoes/magboots/advance
- gloves = /obj/item/clothing/gloves/combat
- suit = /obj/item/clothing/suit/space/hardsuit/ert/medical
- glasses = /obj/item/clothing/glasses/hud/health/night
- cybernetic_implants = list(
- /obj/item/organ/internal/cyberimp/arm/surgery
- )
-
- belt = /obj/item/defibrillator/compact/loaded
-
- l_pocket = /obj/item/reagent_containers/hypospray/combat/nanites
-
- r_hand = /obj/item/gun/medbeam
- backpack_contents = list(
- /obj/item/clothing/head/helmet/space/hardsuit/ert/medical = 1,
- /obj/item/clothing/mask/gas/sechailer/swat = 1,
- /obj/item/storage/firstaid/surgery = 1,
- /obj/item/gun/energy/pulse/pistol = 1
- )
-
-/datum/outfit/job/centcom/response_team/paranormal
- name = "RT Paranormal"
- rt_job = "Emergency Response Team Inquisitor"
- uniform = /obj/item/clothing/under/rank/chaplain
- back = /obj/item/storage/backpack/ert/security
- gloves = /obj/item/clothing/gloves/color/black
- shoes = /obj/item/clothing/shoes/combat
- l_ear = /obj/item/radio/headset/ert/alt
- glasses = /obj/item/clothing/glasses/hud/security/sunglasses
- belt = /obj/item/storage/belt/security/response_team
- id = /obj/item/card/id/centcom
- pda = /obj/item/pda/centcom
- backpack_contents = list(
- /obj/item/clothing/mask/gas/sechailer/swat = 1,
- /obj/item/storage/box/zipties = 1,
- /obj/item/flashlight = 1)
-
-/datum/outfit/job/centcom/response_team/paranormal/amber
- name = "RT Paranormal (Amber)"
- suit = /obj/item/clothing/suit/armor/vest/ert/security
- suit_store = /obj/item/gun/energy/gun/advtaser
- r_pocket = /obj/item/nullrod
-
-/datum/outfit/job/centcom/response_team/paranormal/red
- name = "RT Paranormal (Red)"
- suit = /obj/item/clothing/suit/space/hardsuit/ert/paranormal/inquisitor
- head = /obj/item/clothing/head/helmet/space/hardsuit/ert/paranormal/inquisitor
- suit_store = /obj/item/gun/energy/gun/nuclear
- r_pocket = /obj/item/nullrod
-
-/datum/outfit/job/centcom/response_team/paranormal/gamma
- name = "RT Paranormal (Gamma)"
- suit = /obj/item/clothing/suit/space/hardsuit/ert/paranormal/inquisitor
- head = /obj/item/clothing/head/helmet/space/hardsuit/ert/paranormal/inquisitor
- suit_store = /obj/item/gun/energy/gun/nuclear
- r_pocket = /obj/item/gun/energy/pulse/pistol
- l_pocket = /obj/item/grenade/clusterbuster/holy
- shoes = /obj/item/clothing/shoes/magboots/advance
-
-/datum/outfit/job/centcom/response_team/janitorial
- name = "RT Janitor"
- rt_job = "Emergency Response Team Janitor"
- uniform = /obj/item/clothing/under/color/purple
- back = /obj/item/storage/backpack/ert/janitor
- belt = /obj/item/storage/belt/janitor/full
- gloves = /obj/item/clothing/gloves/color/yellow
- shoes = /obj/item/clothing/shoes/galoshes
- l_ear = /obj/item/radio/headset/ert/alt
- id = /obj/item/card/id/centcom
- pda = /obj/item/pda/centcom
- l_pocket = /obj/item/melee/classic_baton/telescopic
- backpack_contents = list(
- /obj/item/grenade/chem_grenade/antiweed = 2,
- /obj/item/reagent_containers/spray/cleaner = 1,
- /obj/item/storage/bag/trash = 1,
- /obj/item/storage/box/lights/mixed = 1,
- /obj/item/holosign_creator = 1,
- /obj/item/flashlight = 1)
-
-/datum/outfit/job/centcom/response_team/janitorial/amber
- name = "RT Janitor (Amber)"
- suit = /obj/item/clothing/suit/armor/vest/ert/janitor
- head = /obj/item/clothing/head/helmet/ert/janitor
- glasses = /obj/item/clothing/glasses/sunglasses
-
- r_hand = /obj/item/gun/energy/disabler
-
-/datum/outfit/job/centcom/response_team/janitorial/red
- name = "RT Janitor (Red)"
- suit = /obj/item/clothing/suit/space/hardsuit/ert/janitor
- head = /obj/item/clothing/head/helmet/space/hardsuit/ert/janitor
- glasses = /obj/item/clothing/glasses/hud/security/sunglasses
- cybernetic_implants = list(
- /obj/item/organ/internal/cyberimp/chest/nutriment
- )
- r_pocket = /obj/item/scythe/tele
- l_pocket = /obj/item/gun/energy/gun/mini
-
-/datum/outfit/job/centcom/response_team/janitorial/gamma
- name = "RT Janitor (Gamma)"
- suit = /obj/item/clothing/suit/space/hardsuit/ert/janitor
- head = /obj/item/clothing/head/helmet/space/hardsuit/ert/janitor
- glasses = /obj/item/clothing/glasses/hud/security/sunglasses
- gloves = /obj/item/clothing/gloves/combat
- suit_store = /obj/item/gun/energy/pulse/pistol
- l_pocket = /obj/item/grenade/clusterbuster/cleaner
- r_pocket = /obj/item/grenade/clusterbuster/antiweed
- shoes = /obj/item/clothing/shoes/magboots/advance
-
-/obj/item/radio/centcom
- name = "centcomm bounced radio"
- frequency = ERT_FREQ
- icon_state = "radio"
-
-/obj/item/storage/box/responseteam/
- name = "boxed survival kit"
-
-/obj/item/storage/box/responseteam/New()
- ..()
- contents = list()
- sleep(1)
- new /obj/item/clothing/mask/breath( src )
- new /obj/item/tank/emergency_oxygen/engi( src )
- new /obj/item/flashlight/flare( src )
- new /obj/item/kitchen/knife/combat( src )
- new /obj/item/radio/centcom( src )
- new /obj/item/reagent_containers/food/pill/salicylic( src )
- new /obj/item/reagent_containers/food/pill/patch/synthflesh( src )
- return
diff --git a/code/game/turfs/simulated/floor.dm b/code/game/turfs/simulated/floor.dm
index d26a24b39a2..42d241404b1 100644
--- a/code/game/turfs/simulated/floor.dm
+++ b/code/game/turfs/simulated/floor.dm
@@ -180,6 +180,7 @@ var/list/icons_to_ignore_at_floor_init = list("damaged1","damaged2","damaged3","
var/turf/simulated/floor/plating/P = pry_tile(CB, user, TRUE)
if(!istype(P))
return
+ update_icon()
P.attackby(T, user, params)
/turf/simulated/floor/proc/pry_tile(obj/item/C, mob/user, silent = FALSE)
diff --git a/code/game/turfs/simulated/floor/fancy_floor.dm b/code/game/turfs/simulated/floor/fancy_floor.dm
index 0121daf3ee4..1eb86650e4d 100644
--- a/code/game/turfs/simulated/floor/fancy_floor.dm
+++ b/code/game/turfs/simulated/floor/fancy_floor.dm
@@ -82,7 +82,6 @@
// NEEDS TO BE UPDATED
/turf/simulated/floor/basalt //By your powers combined, I am captain planet
name = "volcanic floor"
- icon = 'icons/turf/floors.dmi'
icon_state = "basalt0"
oxygen = 14
nitrogen = 23
diff --git a/code/game/turfs/simulated/floor/misc_floor.dm b/code/game/turfs/simulated/floor/misc_floor.dm
index de42f454202..6cfea0cb8f6 100644
--- a/code/game/turfs/simulated/floor/misc_floor.dm
+++ b/code/game/turfs/simulated/floor/misc_floor.dm
@@ -48,10 +48,11 @@
icon = 'icons/misc/beach2.dmi'
icon_state = "sandwater"
-/turf/simulated/floor/beach/water
+/turf/simulated/floor/beach/water // TODO - Refactor water so they share the same parent type - Or alternatively component something like that
name = "water"
icon_state = "water"
- mouse_opacity = 0
+ mouse_opacity = MOUSE_OPACITY_TRANSPARENT
+ var/obj/machinery/poolcontroller/linkedcontroller = null
/turf/simulated/floor/beach/water/pry_tile(obj/item/C, mob/user, silent = FALSE)
return //cannot pry off tiles of water
@@ -61,6 +62,26 @@
..()
overlays += image("icon"='icons/misc/beach.dmi',"icon_state"="water5","layer"=MOB_LAYER+0.1)
+/turf/simulated/floor/beach/water/Entered(atom/movable/AM, atom/OldLoc)
+ . = ..()
+ if(!linkedcontroller)
+ return
+ if(ismob(AM))
+ linkedcontroller.mobinpool += AM
+
+/turf/simulated/floor/beach/water/Exited(atom/movable/AM, atom/newloc)
+ . = ..()
+ if(!linkedcontroller)
+ return
+ if(ismob(AM))
+ linkedcontroller.mobinpool -= AM
+
+/turf/simulated/floor/beach/water/InitializedOn(atom/A)
+ if(!linkedcontroller)
+ return
+ if(istype(A, /obj/effect/decal/cleanable)) // Better a typecheck than looping through thousands of turfs everyday
+ linkedcontroller.decalinpool += A
+
/turf/simulated/floor/noslip
name = "high-traction floor"
icon_state = "noslip"
diff --git a/code/game/turfs/simulated/floor/plating.dm b/code/game/turfs/simulated/floor/plating.dm
index bd1ff075aca..7f71cf981bd 100644
--- a/code/game/turfs/simulated/floor/plating.dm
+++ b/code/game/turfs/simulated/floor/plating.dm
@@ -1,6 +1,7 @@
/turf/simulated/floor/plating
name = "plating"
icon_state = "plating"
+ icon = 'icons/turf/floors/plating.dmi'
intact = 0
floor_tile = null
broken_states = list("damaged1", "damaged2", "damaged3", "damaged4", "damaged5")
@@ -14,12 +15,17 @@
/turf/simulated/floor/plating/New()
..()
icon_plating = icon_state
+ if(icon == 'icons/turf/floors/plating.dmi')
+ smooth = SMOOTH_MORE
+ canSmoothWith = list(/turf/simulated/floor/plating, /turf/space)
+ update_icon()
/turf/simulated/floor/plating/update_icon()
if(!..())
return
if(!broken && !burnt)
icon_state = icon_plating //Because asteroids are 'platings' too.
+ underlays += image(icon, icon_state)
/turf/simulated/floor/plating/attackby(obj/item/C, mob/user, params)
if(..())
diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm
index a24e6f2953f..c22c7530505 100644
--- a/code/game/turfs/simulated/walls.dm
+++ b/code/game/turfs/simulated/walls.dm
@@ -200,7 +200,10 @@
for(var/i=0, iThe thermite starts melting through the wall.")
+ if(user)
+ to_chat(user, "The thermite starts melting through the wall.")
- spawn(100)
+ spawn(wait)
if(O) qdel(O)
return
diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm
index 012d270005a..2e60537ce6f 100644
--- a/code/game/turfs/turf.dm
+++ b/code/game/turfs/turf.dm
@@ -226,6 +226,8 @@
for(var/obj/structure/cable/C in contents)
qdel(C)
+ smooth_icon(src)
+
/turf/simulated/AfterChange(ignore_air, keep_cabling = FALSE)
..()
RemoveLattice()
@@ -477,4 +479,4 @@
SSair.add_to_active(T0,1)
/turf/AllowDrop()
- return TRUE
\ No newline at end of file
+ return TRUE
diff --git a/code/game/turfs/unsimulated/beach.dm b/code/game/turfs/unsimulated/beach.dm
index e3fad855558..b7c76359c46 100644
--- a/code/game/turfs/unsimulated/beach.dm
+++ b/code/game/turfs/unsimulated/beach.dm
@@ -2,7 +2,7 @@
name = "Beach"
icon = 'icons/misc/beach.dmi'
var/water_overlay_image = null
- mouse_opacity = 0
+ mouse_opacity = MOUSE_OPACITY_TRANSPARENT
/turf/unsimulated/beach/New()
..()
@@ -12,7 +12,7 @@
/turf/unsimulated/beach/sand
name = "Sand"
icon_state = "desert"
- mouse_opacity = 1
+ mouse_opacity = MOUSE_OPACITY_ICON
/turf/unsimulated/beach/sand/New() //adds some aesthetic randomness to the beach sand
icon_state = pick("desert", "desert0", "desert1", "desert2", "desert3", "desert4")
@@ -35,6 +35,27 @@
name = "Shallow Water"
icon_state = "seashallow"
water_overlay_image = "water_shallow"
+ var/obj/machinery/poolcontroller/linkedcontroller = null
+
+/turf/unsimulated/beach/water/Entered(atom/movable/AM, atom/OldLoc)
+ . = ..()
+ if(!linkedcontroller)
+ return
+ if(ismob(AM))
+ linkedcontroller.mobinpool += AM
+
+/turf/unsimulated/beach/water/Exited(atom/movable/AM, atom/newloc)
+ . = ..()
+ if(!linkedcontroller)
+ return
+ if(ismob(AM))
+ linkedcontroller.mobinpool -= AM
+
+/turf/unsimulated/beach/water/InitializedOn(atom/A)
+ if(!linkedcontroller)
+ return
+ if(istype(A, /obj/effect/decal/cleanable)) // Better a typecheck than looping through thousands of turfs everyday
+ linkedcontroller.decalinpool += A
/turf/unsimulated/beach/water/dense //for boundary "walls"
density = 1
@@ -101,4 +122,4 @@
density = 1
opacity = 1
explosion_block = 2
- mouse_opacity = 1
+ mouse_opacity = MOUSE_OPACITY_ICON
diff --git a/code/game/verbs/suicide.dm b/code/game/verbs/suicide.dm
index 59f50797cf1..06b168da042 100644
--- a/code/game/verbs/suicide.dm
+++ b/code/game/verbs/suicide.dm
@@ -24,24 +24,24 @@
//Do dmgamt damage divided by the number of damage types applied.
if(damagetype & BRUTELOSS)
- adjustBruteLoss(dmgamt / damage_mod)
+ adjustBruteLoss(dmgamt / damage_mod, FALSE)
if(damagetype & FIRELOSS)
- adjustFireLoss(dmgamt / damage_mod)
+ adjustFireLoss(dmgamt / damage_mod, FALSE)
if(damagetype & TOXLOSS)
- adjustToxLoss(dmgamt / damage_mod)
+ adjustToxLoss(dmgamt / damage_mod, FALSE)
if(damagetype & OXYLOSS)
- adjustOxyLoss(dmgamt / damage_mod)
+ adjustOxyLoss(dmgamt / damage_mod, FALSE)
// Failing that...
if(!(damagetype & BRUTELOSS) && !(damagetype & FIRELOSS) && !(damagetype & TOXLOSS) && !(damagetype & OXYLOSS))
if(NO_BREATHE in dna.species.species_traits)
// the ultimate fallback
- take_overall_damage(max(dmgamt - getToxLoss() - getFireLoss() - getBruteLoss() - getOxyLoss(), 0), 0)
+ take_overall_damage(max(dmgamt - getToxLoss() - getFireLoss() - getBruteLoss() - getOxyLoss(), 0), 0, updating_health = FALSE)
else
- adjustOxyLoss(max(dmgamt - getToxLoss() - getFireLoss() - getBruteLoss() - getOxyLoss(), 0))
+ adjustOxyLoss(max(dmgamt - getToxLoss() - getFireLoss() - getBruteLoss() - getOxyLoss(), 0), FALSE)
var/obj/item/organ/external/affected = get_organ("head")
if(affected)
@@ -87,8 +87,6 @@
to_chat(viewers(src), "[src] [replacetext(pick(dna.species.suicide_messages), "their", p_their())] It looks like [p_theyre()] trying to commit suicide.")
do_suicide(0)
- updatehealth()
-
/mob/living/carbon/brain/verb/suicide()
set hidden = 1
@@ -132,7 +130,6 @@
to_chat(viewers(src), "[src] is powering down. It looks like [p_theyre()] trying to commit suicide.")
//put em at -175
adjustOxyLoss(max(maxHealth * 2 - getToxLoss() - getFireLoss() - getBruteLoss() - getOxyLoss(), 0))
- updatehealth()
/mob/living/silicon/robot/verb/suicide()
set hidden = 1
@@ -152,7 +149,6 @@
to_chat(viewers(src), "[src] is powering down. It looks like [p_theyre()] trying to commit suicide.")
//put em at -175
adjustOxyLoss(max(maxHealth * 2 - getToxLoss() - getFireLoss() - getBruteLoss() - getOxyLoss(), 0))
- updatehealth()
/mob/living/silicon/pai/verb/suicide()
set category = "pAI Commands"
@@ -189,7 +185,6 @@
to_chat(viewers(src), "[src] is thrashing wildly! It looks like [p_theyre()] trying to commit suicide.")
//put em at -175
adjustOxyLoss(max(175 - getFireLoss() - getBruteLoss() - getOxyLoss(), 0))
- updatehealth()
/mob/living/carbon/slime/verb/suicide()
@@ -206,9 +201,9 @@
if(confirm == "Yes")
suiciding = 1
- setOxyLoss(100)
- adjustBruteLoss(100 - getBruteLoss())
- setToxLoss(100)
- setCloneLoss(100)
+ setOxyLoss(100, FALSE)
+ adjustBruteLoss(100 - getBruteLoss(), FALSE)
+ setToxLoss(100, FALSE)
+ setCloneLoss(100, FALSE)
updatehealth()
diff --git a/code/game/world.dm b/code/game/world.dm
index 949172f0d89..bb5df66be53 100644
--- a/code/game/world.dm
+++ b/code/game/world.dm
@@ -122,9 +122,8 @@ var/world_topic_spam_protect_time = world.timeofday
if(key_valid)
if(ticker && ticker.mode)
s["real_mode"] = ticker.mode.name
-
- s["security_level"] = get_security_level()
- s["ticker_state"] = ticker.current_state
+ s["security_level"] = get_security_level()
+ s["ticker_state"] = ticker.current_state
if(SSshuttle && SSshuttle.emergency)
// Shuttle status, see /__DEFINES/stat.dm
diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index d76b73ae10c..bbff1eb2c2e 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -212,7 +212,6 @@ var/list/admin_verbs_proccall = list(
)
var/list/admin_verbs_snpc = list(
/client/proc/resetSNPC,
- /client/proc/toggleSNPC,
/client/proc/customiseSNPC,
/client/proc/hide_snpc_verbs
)
diff --git a/code/modules/admin/buildmode.dm b/code/modules/admin/buildmode.dm
deleted file mode 100644
index b04b9d2b96a..00000000000
--- a/code/modules/admin/buildmode.dm
+++ /dev/null
@@ -1,656 +0,0 @@
-#define BASIC_BUILDMODE 1
-#define ADV_BUILDMODE 2
-#define VAR_BUILDMODE 3
-#define THROW_BUILDMODE 4
-#define AREA_BUILDMODE 5
-#define COPY_BUILDMODE 6
-#define AREAEDIT_BUILDMODE 7
-#define FILL_BUILDMODE 8
-#define LINK_BUILDMODE 9
-#define BOOM_BUILDMODE 10
-#define SAVE_BUILDMODE 11
-#define NUM_BUILDMODES 11
-
-/obj/screen/buildmode
- icon = 'icons/misc/buildmode.dmi'
- var/datum/click_intercept/buildmode/bd
- layer = HUD_LAYER_BUILDMODE
-
-/obj/screen/buildmode/New(bld)
- ..()
- bd = bld
-
-/obj/screen/buildmode/mode
- name = "Toggle Mode"
- icon_state = "buildmode1"
- screen_loc = "NORTH,WEST"
-
-/obj/screen/buildmode/mode/Click(location, control, params)
- var/list/pa = params2list(params)
-
- if(pa.Find("left"))
- bd.toggle_modes()
- else if(pa.Find("right"))
- bd.change_settings(usr)
- update_icon()
- return 1
-
-/obj/screen/buildmode/mode/update_icon()
- icon_state = "buildmode[bd.mode]"
- return
-
-/obj/screen/buildmode/help
- icon_state = "buildhelp"
- screen_loc = "NORTH,WEST+1"
- name = "Buildmode Help"
-
-/obj/screen/buildmode/help/Click()
- bd.show_help(usr)
- return 1
-
-/obj/screen/buildmode/bdir
- icon_state = "build"
- screen_loc = "NORTH,WEST+2"
- name = "Change Dir"
-
-/obj/screen/buildmode/bdir/update_icon()
- dir = bd.build_dir
- return
-
-/obj/screen/buildmode/bdir/Click()
- bd.change_dir()
- update_icon()
- return 1
-
-/obj/screen/buildmode/quit
- icon_state = "buildquit"
- screen_loc = "NORTH,WEST+3"
- name = "Quit Buildmode"
-
-/obj/screen/buildmode/quit/Click()
- bd.quit()
- return 1
-
-/obj/screen/buildmode/dir/Click()
- bd.change_dir()
- update_icon()
- return 1
-
-/obj/effect/buildmode_reticule
- var/image/I
- var/client/cl
- anchored = TRUE
-
-/obj/effect/buildmode_reticule/New(var/turf/t, var/client/c)
- loc = t
- I = image('icons/mob/blob.dmi', t, "marker",19.0,2) // Sprite reuse wooo
- if(c)
- cl = c
- cl.images += I
- else
- log_runtime(EXCEPTION("Buildmode reticule created without a client!"), src)
-
-/obj/effect/buildmode_reticule/proc/deselect()
- qdel(src)
-
-/obj/effect/buildmode_reticule/Destroy()
- cl.images -= I
- cl = null
- qdel(I)
- return ..()
-
-/obj/effect/buildmode_line
- var/image/I
- var/client/cl
-
-/obj/effect/buildmode_line/New(var/client/c, var/atom/atom_a, var/atom/atom_b, var/linename)
- name = linename
- loc = get_turf(atom_a)
- I = image('icons/misc/mark.dmi', src, "line", 19.0)
- var/x_offset = ((atom_b.x * 32) + atom_b.pixel_x) - ((atom_a.x * 32) + atom_a.pixel_x)
- var/y_offset = ((atom_b.y * 32) + atom_b.pixel_y) - ((atom_a.y * 32) + atom_a.pixel_y)
-
- var/matrix/M = matrix()
- M.Translate(0, 16)
- M.Scale(1, sqrt((x_offset * x_offset) + (y_offset * y_offset)) / 32)
- M.Turn(90 - Atan2(x_offset, y_offset)) // So... You pass coords in order x,y to this version of atan2. It should be called acsc2.
- M.Translate(atom_a.pixel_x, atom_a.pixel_y)
-
- transform = M
- cl = c
- cl.images += I
-
-/obj/effect/buildmode_line/Destroy()
- if(I)
- if(istype(cl))
- cl.images -= I
- cl = null
- QDEL_NULL(I)
- return ..()
-
-/datum/click_intercept
- var/client/holder = null
- var/list/obj/screen/buttons = list()
-
-/datum/click_intercept/New(client/c)
- create_buttons()
- holder = c
- holder.click_intercept = src
- holder.show_popup_menus = 0
- holder.screen += buttons
-
-/datum/click_intercept/Destroy()
- QDEL_LIST(buttons)
- return ..()
-
-
-/datum/click_intercept/proc/create_buttons()
- return
-
-/datum/click_intercept/proc/InterceptClickOn(user,params,atom/object)
- return
-
-/datum/click_intercept/proc/quit()
- holder.screen -= buttons
- holder.click_intercept = null
- holder.show_popup_menus = 1
- qdel(src)
-
-
-
-/datum/click_intercept/buildmode
- var/mode = BASIC_BUILDMODE
- var/build_dir = SOUTH
- var/atom/movable/throw_atom = null
- var/obj/effect/buildmode_reticule/cornerA = null
- var/obj/effect/buildmode_reticule/cornerB = null
- var/generator_path = null
- var/varholder = "name"
- var/valueholder = "derp"
- var/objholder = /obj/structure/closet
- var/area/storedarea = null
- var/image/areaimage
- var/atom/movable/stored = null
- var/list/link_lines = list()
- var/obj/link_obj
- var/valid_links = 0
- //Explosion mode
- var/devastation = -1
- var/heavy = -1
- var/light = -1
- var/flash = -1
- var/flames = -1
- // Saving mode
- var/use_json = TRUE
-
-/datum/click_intercept/buildmode/New(client/c)
- ..()
- areaimage = image('icons/turf/areas.dmi',null,"yellow")
- holder.images += areaimage
-
-/datum/click_intercept/buildmode/Destroy()
- stored = null
- Reset()
- areaimage.loc = null
- qdel(areaimage)
- return ..()
-
-/datum/click_intercept/buildmode/create_buttons()
- buttons += new /obj/screen/buildmode/mode(src)
- buttons += new /obj/screen/buildmode/help(src)
- buttons += new /obj/screen/buildmode/bdir(src)
- buttons += new /obj/screen/buildmode/quit(src)
-
-/datum/click_intercept/buildmode/proc/toggle_modes()
- mode = (mode % NUM_BUILDMODES) +1
- Reset()
- return
-
-/datum/click_intercept/buildmode/proc/show_help(mob/user)
- switch(mode)
- if(BASIC_BUILDMODE)
- to_chat(user, "***********************************************************")
- to_chat(user, "Left Mouse Button = Construct / Upgrade")
- to_chat(user, "Right Mouse Button = Deconstruct / Delete / Downgrade")
- to_chat(user, "Left Mouse Button + ctrl = R-Window")
- to_chat(user, "Left Mouse Button + alt = Airlock")
- to_chat(user, "")
- to_chat(user, "Use the button in the upper left corner to")
- to_chat(user, "change the direction of built objects.")
- to_chat(user, "***********************************************************")
- if(ADV_BUILDMODE)
- to_chat(user, "***********************************************************")
- to_chat(user, "Right Mouse Button on buildmode button = Set object type")
- to_chat(user, "Left Mouse Button on turf/obj = Place objects")
- to_chat(user, "Right Mouse Button = Delete objects")
- to_chat(user, "")
- to_chat(user, "Use the button in the upper left corner to")
- to_chat(user, "change the direction of built objects.")
- to_chat(user, "***********************************************************")
- if(VAR_BUILDMODE)
- to_chat(user, "***********************************************************")
- to_chat(user, "Right Mouse Button on buildmode button = Select var(type) & value")
- to_chat(user, "Left Mouse Button on turf/obj/mob = Set var(type) & value")
- to_chat(user, "Right Mouse Button on turf/obj/mob = Reset var's value")
- to_chat(user, "***********************************************************")
- if(THROW_BUILDMODE)
- to_chat(user, "***********************************************************")
- to_chat(user, "Left Mouse Button on turf/obj/mob = Select")
- to_chat(user, "Right Mouse Button on turf/obj/mob = Throw")
- to_chat(user, "***********************************************************")
- if(AREA_BUILDMODE)
- to_chat(user, "***********************************************************")
- to_chat(user, "Left Mouse Button on turf/obj/mob = Select corner")
- to_chat(user, "Right Mouse Button on buildmode button = Select generator")
- to_chat(user, "***********************************************************")
- if(COPY_BUILDMODE)
- to_chat(user, "***********************************************************")
- to_chat(user, "Left Mouse Button on obj/turf/mob = Spawn a Copy of selected target")
- to_chat(user, "Right Mouse Button on obj/mob = Select target to copy")
- to_chat(user, "***********************************************************")
- if(AREAEDIT_BUILDMODE)
- to_chat(user, "***********************************************************")
- to_chat(user, "Left Mouse Button on obj/turf/mob = Paint area")
- to_chat(user, "Right Mouse Button on obj/turf/mob = Select area to paint")
- to_chat(user, "Right Mouse Button on buildmode button = Create new area")
- to_chat(user, "***********************************************************")
- if(FILL_BUILDMODE)
- to_chat(user, "***********************************************************")
- to_chat(user, "Left Mouse Button on turf/obj/mob = Select corner")
- to_chat(user, "Left Mouse Button + Alt on turf/obj/mob = Delete region")
- to_chat(user, "Right Mouse Button on buildmode button = Select object type")
- to_chat(user, "***********************************************************")
- if(LINK_BUILDMODE)
- to_chat(user, "***********************************************************")
- to_chat(user, "Left Mouse Button on obj = Select button to link")
- to_chat(user, "Right Mouse Button on obj = Link/unlink to selected button")
- to_chat(user, "***********************************************************")
- if(BOOM_BUILDMODE)
- to_chat(user, "***********************************************************")
- to_chat(user, "Mouse Button on obj = Kaboom")
- to_chat(user, "***********************************************************")
- if(SAVE_BUILDMODE)
- to_chat(user, "***********************************************************")
- to_chat(user, "Left Mouse Button on turf/obj/mob = Select corner")
- to_chat(user, "***********************************************************")
-
-
-
-
-/datum/click_intercept/buildmode/proc/change_settings(mob/user)
- switch(mode)
- if(BASIC_BUILDMODE)
-
- return 1
- if(ADV_BUILDMODE)
- var/target_path = input(user,"Enter typepath:" ,"Typepath","/obj/structure/closet")
- objholder = text2path(target_path)
- if(!ispath(objholder))
- objholder = pick_closest_path(target_path)
- if(!objholder || ispath(objholder, /area))
- objholder = /obj/structure/closet
- alert("That path is not allowed.")
- else
- if(ispath(objholder,/mob) && !check_rights(R_DEBUG,0))
- objholder = /obj/structure/closet
- if(VAR_BUILDMODE)
- var/list/locked = list("vars", "key", "ckey", "client", "firemut", "ishulk", "telekinesis", "xray", "virus", "viruses", "cuffed", "ka", "last_eaten", "urine")
-
- varholder = input(user,"Enter variable name:" ,"Name", "name")
- if(varholder in locked && !check_rights(R_DEBUG,0))
-
- return 1
- var/thetype = input(user,"Select variable type:" ,"Type") in list("text","number","mob-reference","obj-reference","turf-reference")
- if(!thetype) return 1
- switch(thetype)
- if("text")
- valueholder = input(user,"Enter variable value:" ,"Value", "value") as text
- if("number")
- valueholder = input(user,"Enter variable value:" ,"Value", 123) as num
- if("mob-reference")
- valueholder = input(user,"Enter variable value:" ,"Value") as mob in mob_list
- if("obj-reference")
- valueholder = input(user,"Enter variable value:" ,"Value") as obj in world
- if("turf-reference")
- valueholder = input(user,"Enter variable value:" ,"Value") as turf in world
- if(AREA_BUILDMODE)
- var/list/gen_paths = subtypesof(/datum/mapGenerator)
-
- var/type = input(user,"Select Generator Type","Type") as null|anything in gen_paths
- if(!type) return
-
- generator_path = type
- cornerA = null
- cornerB = null
- if(AREAEDIT_BUILDMODE)
- var/target_path = input(user,"Enter typepath:", "Typepath", "/area")
- var/areatype = text2path(target_path)
- if(ispath(areatype,/area))
- var/areaname = input(user,"Enter area name:", "Area name", "Area")
- if(!areaname || !length(areaname))
- return
- storedarea = new areatype
- storedarea.power_equip = 0
- storedarea.power_light = 0
- storedarea.power_environ = 0
- storedarea.always_unpowered = 0
- storedarea.name = areaname
- areaimage.loc = storedarea
- if(FILL_BUILDMODE)
- var/target_path = input(user,"Enter typepath:" ,"Typepath","/obj/structure/closet")
- objholder = text2path(target_path)
- if(!ispath(objholder))
- objholder = pick_closest_path(target_path)
- if(!objholder || ispath(objholder, /area))
- objholder = /obj/structure/closet
- return
- else
- if(ispath(objholder,/mob) && !check_rights(R_DEBUG,0))
- objholder = /obj/structure/closet
- deselect_region()
- if(BOOM_BUILDMODE)
- devastation = input("Range of total devastation. -1 to none", text("Input")) as num|null
- if(devastation == null) devastation = -1
- heavy = input("Range of heavy impact. -1 to none", text("Input")) as num|null
- if(heavy == null) heavy = -1
- light = input("Range of light impact. -1 to none", text("Input")) as num|null
- if(light == null) light = -1
- flash = input("Range of flash. -1 to none", text("Input")) as num|null
- if(flash == null) flash = -1
- flames = input("Range of flames. -1 to none", text("Input")) as num|null
- if(flames == null) flames = -1
-
- if(SAVE_BUILDMODE)
- use_json = (alert("Would you like to use json (Default is \"Yes\")?",,"Yes","No") == "Yes")
-
-/datum/click_intercept/buildmode/proc/change_dir()
- switch(build_dir)
- if(NORTH)
- build_dir = EAST
- if(EAST)
- build_dir = SOUTH
- if(SOUTH)
- build_dir = WEST
- if(WEST)
- build_dir = NORTHWEST
- if(NORTHWEST)
- build_dir = NORTH
- return 1
-
-/datum/click_intercept/buildmode/proc/deselect_region()
- QDEL_NULL(cornerA)
- QDEL_NULL(cornerB)
-
-/datum/click_intercept/buildmode/proc/Reset()//Reset temporary variables
- deselect_region()
- if(mode == AREAEDIT_BUILDMODE)
- areaimage.loc = storedarea
- else
- areaimage.loc = null
- for(var/obj/effect/buildmode_line/L in link_lines)
- qdel(L)
- link_lines -= L
-
-/datum/click_intercept/buildmode/proc/select_tile(var/turf/T)
- return new /obj/effect/buildmode_reticule(T, holder)
-
-/proc/togglebuildmode(mob/M as mob in player_list)
- set name = "Toggle Build Mode"
- set category = "Event"
-
- if(M.client)
- if(istype(M.client.click_intercept,/datum/click_intercept/buildmode))
- var/datum/click_intercept/buildmode/B = M.client.click_intercept
- B.quit()
- log_admin("[key_name(usr)] has left build mode.")
- else
- new/datum/click_intercept/buildmode(M.client)
- message_admins("[key_name_admin(usr)] has entered build mode.")
- log_admin("[key_name(usr)] has entered build mode.")
-
-/datum/click_intercept/buildmode/InterceptClickOn(user,params,atom/object) //Click Intercept
- var/list/pa = params2list(params)
- var/right_click = pa.Find("right")
- var/left_click = pa.Find("left")
- var/alt_click = pa.Find("alt")
- var/ctrl_click = pa.Find("ctrl")
-
- . = 1
- switch(mode)
- if(BASIC_BUILDMODE)
- if(istype(object,/turf) && left_click && !alt_click && !ctrl_click)
- var/turf/T = object
- if(istype(object,/turf/space))
- T.ChangeTurf(/turf/simulated/floor/plasteel)
- else if(istype(object,/turf/simulated/floor))
- T.ChangeTurf(/turf/simulated/wall)
- else if(istype(object,/turf/simulated/wall))
- T.ChangeTurf(/turf/simulated/wall/r_wall)
- log_admin("Build Mode: [key_name(user)] built [T] at ([T.x],[T.y],[T.z])")
- return
- else if(right_click)
- log_admin("Build Mode: [key_name(user)] deleted [object] at ([object.x],[object.y],[object.z])")
- if(istype(object,/turf/simulated/wall))
- var/turf/T = object
- T.ChangeTurf(/turf/simulated/floor/plasteel)
- else if(istype(object,/turf/simulated/floor))
- var/turf/T = object
- T.ChangeTurf(/turf/space)
- else if(istype(object,/turf/simulated/wall/r_wall))
- var/turf/T = object
- T.ChangeTurf(/turf/simulated/wall)
- else if(istype(object,/obj))
- qdel(object)
- return
- else if(istype(object,/turf) && alt_click && left_click)
- log_admin("Build Mode: [key_name(user)] built an airlock at ([object.x],[object.y],[object.z])")
- new/obj/machinery/door/airlock(get_turf(object))
- else if(istype(object,/turf) && ctrl_click && left_click)
- var/obj/structure/window/reinforced/WIN = new/obj/structure/window/reinforced(get_turf(object))
- WIN.setDir(build_dir)
- log_admin("Build Mode: [key_name(user)] built a window at ([object.x],[object.y],[object.z])")
-
- if(ADV_BUILDMODE)
- if(left_click)
- if(ispath(objholder,/turf))
- var/turf/T = get_turf(object)
- log_admin("Build Mode: [key_name(user)] modified [T] ([T.x],[T.y],[T.z]) to [objholder]")
- T.ChangeTurf(objholder)
- else if(!isnull(objholder))
- var/obj/A = new objholder (get_turf(object))
- A.setDir(build_dir)
- log_admin("Build Mode: [key_name(user)] modified [A]'s ([A.x],[A.y],[A.z]) dir to [build_dir]")
- else
- to_chat(user, "Select object type first.")
- else if(right_click)
- if(isobj(object))
- log_admin("Build Mode: [key_name(user)] deleted [object] at ([object.x],[object.y],[object.z])")
- qdel(object)
-
- if(VAR_BUILDMODE)
- if(left_click) //I cant believe this shit actually compiles.
- if(object.vars.Find(varholder))
- log_admin("Build Mode: [key_name(user)] modified [object.name]'s [varholder] to [valueholder]")
- object.vars[varholder] = valueholder
- else
- to_chat(user, "[initial(object.name)] does not have a var called '[varholder]'")
- if(right_click)
- if(object.vars.Find(varholder))
- log_admin("Build Mode: [key_name(user)] modified [object.name]'s [varholder] to [valueholder]")
- object.vars[varholder] = initial(object.vars[varholder])
- else
- to_chat(user, "[initial(object.name)] does not have a var called '[varholder]'")
-
- if(THROW_BUILDMODE)
- if(left_click)
- if(isturf(object))
- return
- throw_atom = object
- if(right_click)
- if(throw_atom)
- throw_atom.throw_at(object, 10, 1,user)
- log_admin("Build Mode: [key_name(user)] threw [throw_atom] at [object] ([object.x],[object.y],[object.z])")
- if(AREA_BUILDMODE)
- if(!cornerA)
- cornerA = select_tile(get_turf(object))
- return
- if(cornerA && !cornerB)
- cornerB = select_tile(get_turf(object))
- if(left_click) //rectangular
- if(cornerA && cornerB)
- if(!generator_path)
- to_chat(user, "Select generator type first.")
- else
- var/datum/mapGenerator/G = new generator_path
- G.defineRegion(cornerA.loc,cornerB.loc,1)
- G.generate()
- deselect_region()
- return
-
- //Something wrong - Reset
- deselect_region()
- if(COPY_BUILDMODE)
- if(left_click)
- var/turf/T = get_turf(object)
- if(stored)
- DuplicateObject(stored, perfectcopy=1, sameloc=0,newloc=T)
- else if(right_click)
- if(ismovableatom(object)) // No copying turfs for now.
- to_chat(user, "[object] set as template.")
- stored = object
- if(AREAEDIT_BUILDMODE)
- if(left_click)
- if(!storedarea)
- return
- var/turf/T = get_turf(object)
- if(get_area(T) != storedarea)
- storedarea.contents.Add(T)
- else if(right_click)
- var/turf/T = get_turf(object)
- storedarea = get_area(T)
- areaimage.loc = storedarea
- if(FILL_BUILDMODE)
- if(!cornerA)
- cornerA = select_tile(get_turf(object))
- return
- if(cornerA && !cornerB)
- cornerB = select_tile(get_turf(object))
- if(left_click) //rectangular
- if(cornerA && cornerB)
- if(alt_click)
- empty_region(block(get_turf(cornerA),get_turf(cornerB)))
- deselect_region()
- else
- if(!objholder)
- to_chat(user, "Select object type first.")
- else
- for(var/turf/T in block(get_turf(cornerA),get_turf(cornerB)))
- if(ispath(objholder,/turf))
- T.ChangeTurf(objholder)
- else
- var/obj/A = new objholder(T)
- A.setDir(build_dir)
- deselect_region()
- return
-
- //Something wrong - Reset
- deselect_region()
- if(LINK_BUILDMODE)
- if(left_click && istype(object, /obj/machinery))
- link_obj = object
- if(right_click && istype(object, /obj/machinery))
- if(istype(link_obj, /obj/machinery/door_control) && istype(object, /obj/machinery/door/airlock))
- var/obj/machinery/door_control/M = link_obj
- var/obj/machinery/door/airlock/P = object
- if(!M.id || M.id == "")
- M.id = input(holder, "Please select an ID for the button", "Buildmode", "")
- if(!M.id || M.id == "")
- goto(line_jump)
- if(P.id_tag == M.id && (P in range(M.range, M)) && P.id_tag && P.id_tag != "")
- P.id_tag = null
- to_chat(holder, "[P] unlinked.")
- goto(line_jump)
- if(!M.normaldoorcontrol)
- if(link_lines.len && alert(holder, "Warning: This will disable links to connected pod doors. Continue?", "Buildmode", "Yes", "No") == "No")
- goto(line_jump)
- M.normaldoorcontrol = 1
- if(P.id_tag && alert(holder, "Warning: This will unlink something else from the door. Continue?", "Buildmode", "Yes", "No") == "No")
- goto(line_jump)
- P.id_tag = M.id
- if(istype(link_obj, /obj/machinery/door_control) && istype(object, /obj/machinery/door/poddoor))
- var/obj/machinery/door_control/M = link_obj
- var/obj/machinery/door/poddoor/P = object
- if(!M.id || M.id == "")
- M.id = input(holder, "Please select an ID for the button", "Buildmode", "")
- if(!M.id || M.id == "")
- goto(line_jump)
- if(P.id_tag == M.id && P.id_tag && P.id_tag != "")
- P.id_tag = null
- to_chat(holder, "[P] unlinked.")
- goto(line_jump)
- if(M.normaldoorcontrol)
- if(link_lines.len && alert(holder, "Warning: This will disable links to connected airlocks. Continue?", "Buildmode", "Yes", "No") == "No")
- goto(line_jump)
- M.normaldoorcontrol = 0
- if(!M.id || M.id == "")
- M.id = input(holder, "Please select an ID for the button", "Buildmode", "")
- if(!M.id || M.id == "")
- goto(line_jump)
- if(P.id_tag && P.id_tag != 1 && alert(holder, "Warning: This will unlink something else from the door. Continue?", "Buildmode", "Yes", "No") == "No")
- goto(line_jump)
- P.id_tag = M.id
-
- line_jump // For the goto
- valid_links = 0
- for(var/obj/effect/buildmode_line/L in link_lines)
- qdel(L)
- link_lines -= L
-
- if(istype(link_obj, /obj/machinery/door_control))
- var/obj/machinery/door_control/M = link_obj
- for(var/obj/machinery/door/airlock/P in range(M.range,M))
- if(P.id_tag == M.id)
- var/obj/effect/buildmode_line/L = new(holder, M, P, "[M.name] to [P.name]")
- L.color = M.normaldoorcontrol ? "#339933" : "#993333"
- if(M.normaldoorcontrol)
- valid_links = 1
- link_lines += L
- var/obj/effect/buildmode_line/L2 = new(holder, P, M, "[M.name] to [P.name]") // Yes, reversed one so that you can see it from both sides.
- L2.color = L.color
- link_lines += L2
- for(var/obj/machinery/door/poddoor/P in airlocks)
- if(P.id_tag == M.id)
- var/obj/effect/buildmode_line/L = new(holder, M, P, "[M.name] to [P.name]")
- L.color = M.normaldoorcontrol ? "#993333" : "#339933"
- if(M.normaldoorcontrol)
- valid_links = 0
- link_lines += L
- var/obj/effect/buildmode_line/L2 = new(holder, P, M, "[M.name] to [P.name]") // Yes, reversed one so that you can see it from both sides.
- L2.color = L.color
- link_lines += L2
- if(BOOM_BUILDMODE)
- explosion(object, devastation, heavy, light, flash, null, TRUE, flames)
- if(SAVE_BUILDMODE)
- if(!cornerA)
- cornerA = select_tile(get_turf(object))
- return
- if(!cornerB)
- cornerB = select_tile(get_turf(object))
- if(left_click)
- if(cornerA && cornerB)
- var/turf/A = get_turf(cornerA)
- var/turf/B = get_turf(cornerB)
- deselect_region() // So we don't read our own reticules
- var/map_name = input(holder, "Please select a name for your map", "Buildmode", "")
- if(map_name == "")
- return
- var/map_flags = 0
- if(use_json)
- map_flags = 32 // Magic number defined in `writer.dm` that I can't use directly
- // because #defines are for some reason our coding standard
- var/our_map = maploader.save_map(A,B,map_name,map_flags)
- holder << ftp(our_map) // send the map they've made! Or are stealing, whatever
- to_chat(holder, "Map saving complete! [our_map]")
- return
-
- deselect_region()
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index 6495c8fabfd..31600856238 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -2066,7 +2066,7 @@
var/input = input(src.owner, "Please enter a reason for denying [key_name(H)]'s ERT request.","Outgoing message from CentComm", "")
if(!input) return
- ert_request_answered = 1
+ ert_request_answered = TRUE
to_chat(src.owner, "You sent [input] to [H] via a secure channel.")
log_admin("[src.owner] denied [key_name(H)]'s ERT request with the message [input].")
to_chat(H, "You hear something crackle in your headset for a moment before a voice speaks. \"Your ERT request has been denied for the following reasons: [input]. Message ends.\"")
diff --git a/code/modules/admin/verbs/modifyvariables.dm b/code/modules/admin/verbs/modifyvariables.dm
index c1e28a48f8d..d899fda5b56 100644
--- a/code/modules/admin/verbs/modifyvariables.dm
+++ b/code/modules/admin/verbs/modifyvariables.dm
@@ -516,6 +516,24 @@ var/list/VVpixelmovement = list("step_x", "step_y", "step_size", "bound_height",
log_admin("[key_name(src)] modified [original_name]'s [objectvar]: [original_var]=[new_var]")
message_admins("[key_name_admin(src)] modified [original_name]'s varlist [objectvar]: [original_var]=[new_var]")
+/proc/vv_varname_lockcheck(param_var_name)
+ if(param_var_name in VVlocked)
+ if(!check_rights(R_DEBUG))
+ return FALSE
+ if(param_var_name in VVckey_edit)
+ if(!check_rights(R_EVENT | R_DEBUG))
+ return FALSE
+ if(param_var_name in VVicon_edit_lock)
+ if(!check_rights(R_EVENT | R_DEBUG))
+ return FALSE
+ if(param_var_name in VVpixelmovement)
+ if(!check_rights(R_DEBUG))
+ return FALSE
+ var/prompt = alert(usr, "Editing this var may irreparably break tile gliding for the rest of the round. THIS CAN'T BE UNDONE", "DANGER", "ABORT ", "Continue", " ABORT")
+ if(prompt != "Continue")
+ return FALSE
+ return TRUE
+
/client/proc/modify_variables(atom/O, param_var_name = null, autodetect_class = 0)
if(!check_rights(R_VAREDIT))
return
@@ -544,25 +562,11 @@ var/list/VVpixelmovement = list("step_x", "step_y", "step_size", "bound_height",
if(!O.can_vv_get(variable))
return
+ if(!vv_varname_lockcheck(variable))
+ return
+
var_value = O.vars[variable]
- if(variable in VVlocked)
- if(!check_rights(R_DEBUG))
- return
- if(variable in VVckey_edit)
- if(!check_rights(R_EVENT | R_DEBUG))
- return
- if(variable in VVicon_edit_lock)
- if(!check_rights(R_EVENT | R_DEBUG))
- return
- if(variable in VVpixelmovement)
- if(!check_rights(R_DEBUG))
- return
- var/prompt = alert(src, "Editing this var may irreparably break tile gliding for the rest of the round. THIS CAN'T BE UNDONE", "DANGER", "ABORT ", "Continue", " ABORT")
- if(prompt != "Continue")
- return
-
-
var/default = vv_get_class(var_value)
if(isnull(default))
diff --git a/code/modules/assembly/mousetrap.dm b/code/modules/assembly/mousetrap.dm
index 5d6aa7490e2..011e46e7990 100644
--- a/code/modules/assembly/mousetrap.dm
+++ b/code/modules/assembly/mousetrap.dm
@@ -54,7 +54,6 @@
H.Stun(3)
if(affecting)
affecting.receive_damage(1, 0)
- H.updatehealth()
else if(ismouse(target))
var/mob/living/simple_animal/mouse/M = target
visible_message("SPLAT!")
diff --git a/code/modules/awaymissions/mission_code/beach.dm b/code/modules/awaymissions/mission_code/beach.dm
index 4d2384ceb67..2da10ecbd98 100644
--- a/code/modules/awaymissions/mission_code/beach.dm
+++ b/code/modules/awaymissions/mission_code/beach.dm
@@ -3,7 +3,7 @@
icon = 'icons/effects/effects.dmi'
icon_state = "extinguish"
opacity = 0
- mouse_opacity = 0
+ mouse_opacity = MOUSE_OPACITY_TRANSPARENT
density = 0
anchored = 1
invisibility = 101
diff --git a/code/modules/awaymissions/mission_code/wildwest.dm b/code/modules/awaymissions/mission_code/wildwest.dm
index 9ebd1d88b6b..90d27fbf7ed 100644
--- a/code/modules/awaymissions/mission_code/wildwest.dm
+++ b/code/modules/awaymissions/mission_code/wildwest.dm
@@ -262,8 +262,9 @@
return list()
/mob/living/simple_animal/hostile/syndicate/ranged/wildwest/death(gibbed)
- if(!on_alert)
+ // putting this up here so we don't say anything after deathgasp
+ if(can_die() && !on_alert)
say("How could you betray the Syndicate?")
for(var/mob/living/simple_animal/hostile/syndicate/ranged/wildwest/W in living_mob_list)
W.on_alert = TRUE
- ..(gibbed)
+ return ..(gibbed)
diff --git a/code/modules/buildmode/README.md b/code/modules/buildmode/README.md
new file mode 100644
index 00000000000..37ce2ce6b1b
--- /dev/null
+++ b/code/modules/buildmode/README.md
@@ -0,0 +1,297 @@
+# Buildmode
+
+## Code layout
+
+### Buildmode
+
+Manager for buildmode modes. Contains logic to manage switching between each mode, and presenting a suitable user interface.
+
+### Effects
+
+Special graphics used by buildmode modes for user interface purposes.
+
+### Buildmode Mode
+
+Implementer of buildmode behaviors.
+
+Existing varieties:
+
++ Basic
+
+ **Description**:
+
+ Allows creation of simple structures consisting of floors, walls, windows, and airlocks.
+
+ **Controls**:
+
+ + *Left click a turf*:
+
+ "Upgrades" the turf based on the following rules below:
+
+ + Space -> Tiled floor
+ + Simulated floor -> Regular wall
+ + Wall -> Reinforced wall
+
+ + *Right click a turf*:
+
+ "Downgrades" the turf based on the following rules below:
+
+ + Reinforced wall -> Regular wall
+ + Wall -> Tiled floor
+ + Simulated floor -> Space
+
+ + *Right click an object*:
+
+ Deletes the clicked object.
+
+ + *Alt+Left click a location*:
+
+ Places an airlock at the clicked location.
+
+ + *Ctrl+Left click a location*:
+
+ Places a window at the clicked location.
+
++ Advanced
+
+ **Description**:
+
+ Creates an instance of a configurable atom path where you click.
+
+ **Controls**:
+
+ + *Right click on the mode selector*:
+
+ Choose a path to spawn.
+
+ + *Alt+Left click a turf, object, or mob*:
+
+ Select the type of the object clicked.
+
+ + *Left click a location* (requires chosen path):
+
+ Place an instance of the chosen path at the location.
+
+ + *Right click an object*:
+
+ Delete the object.
+
++ Fill
+
+ **Description**:
+
+ Creates an instance of an atom path on every tile in a chosen region.
+
+ With a special control input, instead deletes everything within the region.
+
+ **Controls**:
+
+ + *Right click on the mode selector*:
+
+ Choose a path to spawn.
+
+ + *Left click on a region* (requires chosen path):
+
+ Fill the region with the chosen path.
+
+ + *Alt+Left click on a region*:
+
+ Deletes everything within the region.
+
+ + *Right click during region selection*:
+
+ Cancel region selection.
+
++ Atmos
+
+ **Description**:
+
+ Fills a region with configurable atmos. By default, ignores unsimulated turfs, but is able to "overwrite" the atmos of unsimulated turfs with a special control input.
+
+ By default, fills a region with a breathable, standard atmosphere.
+
+ **Controls**:
+
+ + *Right click on the mode selector icon*:
+
+ Set the following traits:
+
+ + Total Pressure
+ + Temperature
+ + Partial Pressure Ratio (PPR) Oxygen
+ + PPR Nitrogen
+ + PPR Plasma
+ + PPR CO2
+ + PPR N2O
+
+ + *Left click a region*:
+
+ Fill the region with the configured atmos.
+
+ + *Control+Left click a region*:
+
+ As with the regular left click, but also "overwrites" the base atmos of any unsimulated turfs in the region - such as space turfs.
+
+ + *Right click during region selection*:
+
+ Cancel region selection.
+
++ Copy
+
+ **Description**:
+
+ Take an existing object in the world, and place duplicates with identical attributes where you click.
+
+ May not always work nicely - "deep" variables such as lists or datums may malfunction.
+
+ **Controls**:
+
+ + *Right click an existing object*:
+
+ Select the clicked object as a template.
+
+ + *Left click a location* (Requires a selected object as template):
+
+ Place a duplicate of the template at the clicked location.
+
++ Link
+
+ **Description**:
+
+ Form links between door control buttons and either airlocks or pod bay doors.
+
+ The selected button will be highlighted, and visible lines will be drawn between the doors it is linked to and itself.
+
+ **Controls**:
+
+ + *Left click a door control button*:
+
+ Makes the button active, and show what doors it is linked to.
+
+ + *Right click an airlock* (requires active button):
+
+ Links the airlock to the active button. Will remove all links from the button first, if the button is linked to pod bay doors.
+
+ + *Right click a pod bay door* (requires active button):
+
+ Links the pod bay door to the active button. Will remove all links from the button first, if the button is linked to regular airlocks.
+
++ Area Edit
+
+ **Description**:
+
+ Modifies and creates areas.
+
+ The active area will be highlighted in yellow.
+
+ **Controls**:
+
+ + *Right click the mode selector*:
+
+ Create a new area, and make it active.
+
+ + *Right click an existing area*:
+
+ Make the clicked area active.
+
+ + *Left click a turf*:
+
+ When an area is active, adds the turf to the active area.
+
++ Var Edit
+
+ **Description**:
+
+ Allows for setting and resetting variables of objects with a click.
+
+ If the object does not have the var, will do nothing and print a warning message.
+
+ **Controls**:
+
+ + *Right click the mode selector*:
+
+ Choose which variable to set, and what to set it to.
+
+ + *Left click an atom*:
+
+ Change the clicked atom's variables as configured.
+
+ + *Right click an atom*:
+
+ Reset the targeted variable to its original value in the code.
+
++ Map Generator
+
+ **Description**:
+
+ Fills rectangular regions with algorithmically generated content. Right click during region selection to cancel.
+
+ See the `procedural_mapping` module for the generators themselves.
+
+ **Controls**:
+
+ + *Right-click on the mode selector*:
+
+ Select a map generator from all the generators present in the codebase.
+
+ + *Left click two corners of an area*:
+
+ Use the generator to populate the region.
+
+ + *Right click during region selection*:
+
+ Cancel region selection.
+
++ Save
+
+ **Description**:
+
+ Captures a rectangular region in a `.dmm` format, which can be loaded back later using the "Place Map Template" debug verb.
+
+ Keep in mind this feature is somewhat experimental, and may not always work.
+
+ **Controls**:
+
+ + *Right click on the mode selector*:
+
+ Configure whether to save in either JSON mode or not.
+
+ + *Left click two corners of an area*:
+
+ Save the region to a `.dmm` file. You will be prompted for where to save this - a copy will be saved in the `_maps/quicksave` folder.
+
+ + *Right click during region selection*:
+
+ Cancel region selection.
+
++ Throwing
+
+ **Description**:
+
+ Select an object with left click, and right click to throw it towards where you clicked.
+
+ **Controls**:
+
+ + *Left click on a movable atom*:
+
+ Select the atom for throwing.
+
+ + *Right click on a location*:
+
+ Throw the selected atom towards that location.
+
++ Boom
+
+ **Description**:
+
+ Make explosions where you click.
+
+ **Controls**:
+
+ + *Right click the mode selector*:
+
+ Configure the explosion size.
+
+ + *Left click a location*:
+
+ Cause an explosion where you clicked.
\ No newline at end of file
diff --git a/code/modules/buildmode/bm_mode.dm b/code/modules/buildmode/bm_mode.dm
new file mode 100644
index 00000000000..de4c09a192d
--- /dev/null
+++ b/code/modules/buildmode/bm_mode.dm
@@ -0,0 +1,87 @@
+/datum/buildmode_mode
+ var/key = "oops"
+
+ var/datum/click_intercept/buildmode/BM
+
+ var/use_corner_selection = FALSE
+ var/processing_selection = FALSE
+ var/list/preview
+ var/turf/cornerA
+ var/turf/cornerB
+
+/datum/buildmode_mode/New(datum/click_intercept/buildmode/newBM)
+ BM = newBM
+ preview = list()
+ return ..()
+
+/datum/buildmode_mode/Destroy()
+ Reset()
+ return ..()
+
+/datum/buildmode_mode/proc/enter_mode(datum/click_intercept/buildmode/BM)
+ return
+
+/datum/buildmode_mode/proc/exit_mode(datum/click_intercept/buildmode/BM)
+ return
+
+/datum/buildmode_mode/proc/get_button_iconstate()
+ return "buildmode_[key]"
+
+/datum/buildmode_mode/proc/show_help(mob/user)
+ CRASH("No help defined, yell at a coder")
+ to_chat(user, "There is no help defined for this mode, this is a bug.")
+
+/datum/buildmode_mode/proc/change_settings(mob/user)
+ to_chat(user, "There is no configuration available for this mode")
+
+/datum/buildmode_mode/proc/Reset()
+ deselect_region()
+
+/datum/buildmode_mode/proc/select_tile(turf/T, corner_to_select)
+ var/overlaystate
+ BM.holder.images -= preview
+ switch(corner_to_select)
+ if(AREASELECT_CORNERA)
+ overlaystate = "greenOverlay"
+ if(AREASELECT_CORNERB)
+ overlaystate = "blueOverlay"
+ preview += image('icons/turf/overlays.dmi', T, overlaystate)
+ BM.holder.images += preview
+ return T
+
+/datum/buildmode_mode/proc/highlight_region(region)
+ BM.holder.images -= preview
+ for(var/t in region)
+ preview += image('icons/turf/overlays.dmi', T, "redOverlay")
+ BM.holder.images += preview
+
+/datum/buildmode_mode/proc/deselect_region()
+ BM.holder.images -= preview
+ QDEL_LIST(preview)
+ cornerA = null
+ cornerB = null
+
+/datum/buildmode_mode/proc/handle_click(user, params, object)
+ var/list/pa = params2list(params)
+ var/left_click = pa.Find("left")
+ if(use_corner_selection)
+ if(left_click)
+ if(!cornerA)
+ cornerA = select_tile(get_turf(object), AREASELECT_CORNERA)
+ return
+ else if(!cornerB)
+ cornerB = select_tile(get_turf(object), AREASELECT_CORNERB)
+ to_chat(user, "Region selected, if you're happy with your selection left click again, otherwise right click.")
+ return
+ if(processing_selection)
+ return
+ processing_selection = TRUE
+ handle_selected_region(user, params)
+ processing_selection = FALSE
+ deselect_region()
+ else if(cornerA || cornerB)
+ to_chat(user, "Region selection canceled!")
+ deselect_region()
+
+/datum/buildmode_mode/proc/handle_selected_region(mob/user, params)
+ return
\ No newline at end of file
diff --git a/code/modules/buildmode/buildmode.dm b/code/modules/buildmode/buildmode.dm
new file mode 100644
index 00000000000..934eba8117c
--- /dev/null
+++ b/code/modules/buildmode/buildmode.dm
@@ -0,0 +1,127 @@
+#define BM_SWITCHSTATE_NONE 0
+#define BM_SWITCHSTATE_MODE 1
+#define BM_SWITCHSTATE_DIR 2
+
+/datum/click_intercept/buildmode
+ var/build_dir = SOUTH
+ var/datum/buildmode_mode/mode
+
+ // SECTION UI
+
+ // Switching management
+ var/switch_state = BM_SWITCHSTATE_NONE
+ var/switch_width = 5
+ // modeswitch UI
+ var/obj/screen/buildmode/mode/modebutton
+ var/list/modeswitch_buttons = list()
+ // dirswitch UI
+ var/obj/screen/buildmode/bdir/dirbutton
+ var/list/dirswitch_buttons = list()
+
+/datum/click_intercept/buildmode/New()
+ mode = new /datum/buildmode_mode/basic(src)
+ . = ..()
+ mode.enter_mode(src)
+
+/datum/click_intercept/buildmode/Destroy()
+ close_switchstates()
+ QDEL_NULL(mode)
+ QDEL_LIST(modeswitch_buttons)
+ QDEL_LIST(dirswitch_buttons)
+ return ..()
+
+/datum/click_intercept/buildmode/create_buttons()
+ // keep a reference so we can update it upon mode switch
+ modebutton = new /obj/screen/buildmode/mode(src)
+ buttons += modebutton
+ buttons += new /obj/screen/buildmode/help(src)
+ // keep a reference so we can update it upon dir switch
+ dirbutton = new /obj/screen/buildmode/bdir(src)
+ buttons += dirbutton
+ buttons += new /obj/screen/buildmode/quit(src)
+ // build the list of modeswitching buttons
+ build_options_grid(subtypesof(/datum/buildmode_mode), modeswitch_buttons, /obj/screen/buildmode/modeswitch)
+ build_options_grid(list(SOUTH,EAST,WEST,NORTH,NORTHWEST), dirswitch_buttons, /obj/screen/buildmode/dirswitch)
+
+/datum/click_intercept/buildmode/proc/build_options_grid(list/elements, list/buttonslist, buttontype)
+ var/pos_idx = 0
+ for(var/thing in elements)
+ var/x = pos_idx % switch_width
+ var/y = FLOOR(pos_idx / switch_width, 1)
+ var/obj/screen/buildmode/B = new buttontype(src, thing)
+ // extra .5 for a nice offset look
+ B.screen_loc = "NORTH-[(1 + 0.5 + y*1.5)],WEST+[0.5 + x*1.5]"
+ buttonslist += B
+ pos_idx++
+
+/datum/click_intercept/buildmode/proc/close_switchstates()
+ switch(switch_state)
+ if(BM_SWITCHSTATE_MODE)
+ close_modeswitch()
+ if(BM_SWITCHSTATE_DIR)
+ close_dirswitch()
+
+/datum/click_intercept/buildmode/proc/toggle_modeswitch()
+ if(switch_state == BM_SWITCHSTATE_MODE)
+ close_modeswitch()
+ else
+ close_switchstates()
+ open_modeswitch()
+
+/datum/click_intercept/buildmode/proc/open_modeswitch()
+ switch_state = BM_SWITCHSTATE_MODE
+ holder.screen += modeswitch_buttons
+
+/datum/click_intercept/buildmode/proc/close_modeswitch()
+ switch_state = BM_SWITCHSTATE_NONE
+ holder.screen -= modeswitch_buttons
+
+/datum/click_intercept/buildmode/proc/toggle_dirswitch()
+ if(switch_state == BM_SWITCHSTATE_DIR)
+ close_dirswitch()
+ else
+ close_switchstates()
+ open_dirswitch()
+
+/datum/click_intercept/buildmode/proc/open_dirswitch()
+ switch_state = BM_SWITCHSTATE_DIR
+ holder.screen += dirswitch_buttons
+
+/datum/click_intercept/buildmode/proc/close_dirswitch()
+ switch_state = BM_SWITCHSTATE_NONE
+ holder.screen -= dirswitch_buttons
+
+/datum/click_intercept/buildmode/proc/change_mode(newmode)
+ mode.exit_mode(src)
+ QDEL_NULL(mode)
+ close_switchstates()
+ mode = new newmode(src)
+ mode.enter_mode(src)
+ modebutton.update_icon()
+
+/datum/click_intercept/buildmode/proc/change_dir(newdir)
+ build_dir = newdir
+ close_dirswitch()
+ dirbutton.update_icon()
+ return TRUE
+
+/datum/click_intercept/buildmode/InterceptClickOn(user, params, atom/object)
+ mode.handle_click(user, params, object)
+
+/proc/togglebuildmode(mob/M in player_list)
+ set name = "Toggle Build Mode"
+ set category = "Event"
+
+ if(M.client)
+ if(istype(M.client.click_intercept, /datum/click_intercept/buildmode))
+ var/datum/click_intercept/buildmode/B = M.client.click_intercept
+ B.quit()
+ log_admin("[key_name(usr)] has left build mode.")
+ else
+ new/datum/click_intercept/buildmode(M.client)
+ message_admins("[key_name_admin(usr)] has entered build mode.")
+ log_admin("[key_name(usr)] has entered build mode.")
+
+#undef BM_SWITCHSTATE_NONE
+#undef BM_SWITCHSTATE_MODE
+#undef BM_SWITCHSTATE_DIR
\ No newline at end of file
diff --git a/code/modules/buildmode/buttons.dm b/code/modules/buildmode/buttons.dm
new file mode 100644
index 00000000000..c07be97a9eb
--- /dev/null
+++ b/code/modules/buildmode/buttons.dm
@@ -0,0 +1,88 @@
+/obj/screen/buildmode
+ icon = 'icons/misc/buildmode.dmi'
+ var/datum/click_intercept/buildmode/bd
+ layer = HUD_LAYER_BUILDMODE
+
+/obj/screen/buildmode/New(bld)
+ bd = bld
+ return ..()
+
+/obj/screen/buildmode/Destroy()
+ bd = null
+ return ..()
+
+/obj/screen/buildmode/mode
+ name = "Toggle Mode"
+ icon_state = "buildmode_basic"
+ screen_loc = "NORTH,WEST"
+
+/obj/screen/buildmode/mode/Click(location, control, params)
+ var/list/pa = params2list(params)
+
+ if(pa.Find("left"))
+ bd.toggle_modeswitch()
+ else if(pa.Find("right"))
+ bd.mode.change_settings(usr)
+ update_icon()
+ return TRUE
+
+/obj/screen/buildmode/mode/update_icon()
+ icon_state = bd.mode.get_button_iconstate()
+
+/obj/screen/buildmode/help
+ icon_state = "buildhelp"
+ screen_loc = "NORTH,WEST+1"
+ name = "Buildmode Help"
+
+/obj/screen/buildmode/help/Click()
+ bd.mode.show_help(usr)
+ return TRUE
+
+/obj/screen/buildmode/bdir
+ icon_state = "build"
+ screen_loc = "NORTH,WEST+2"
+ name = "Change Dir"
+
+/obj/screen/buildmode/bdir/update_icon()
+ dir = bd.build_dir
+
+/obj/screen/buildmode/bdir/Click()
+ bd.toggle_dirswitch()
+ update_icon()
+ return TRUE
+
+// used to switch between modes
+/obj/screen/buildmode/modeswitch
+ var/datum/buildmode_mode/modetype
+
+/obj/screen/buildmode/modeswitch/New(bld, mt)
+ modetype = mt
+ icon_state = "buildmode_[initial(modetype.key)]"
+ name = initial(modetype.key)
+ return ..(bld)
+
+/obj/screen/buildmode/modeswitch/Click()
+ bd.change_mode(modetype)
+ return TRUE
+
+// used to switch between dirs
+/obj/screen/buildmode/dirswitch
+ icon_state = "build"
+
+/obj/screen/buildmode/dirswitch/New(bld, newdir)
+ dir = newdir
+ name = dir2text(dir)
+ return ..(bld)
+
+/obj/screen/buildmode/dirswitch/Click()
+ bd.change_dir(dir)
+ return TRUE
+
+/obj/screen/buildmode/quit
+ icon_state = "buildquit"
+ screen_loc = "NORTH,WEST+3"
+ name = "Quit Buildmode"
+
+/obj/screen/buildmode/quit/Click()
+ bd.quit()
+ return TRUE
\ No newline at end of file
diff --git a/code/modules/buildmode/effects/line.dm b/code/modules/buildmode/effects/line.dm
new file mode 100644
index 00000000000..4b59e8a673c
--- /dev/null
+++ b/code/modules/buildmode/effects/line.dm
@@ -0,0 +1,28 @@
+/obj/effect/buildmode_line
+ var/image/I
+ var/client/cl
+
+/obj/effect/buildmode_line/New(client/C, atom/atom_a, atom/atom_b, linename)
+ name = linename
+ loc = get_turf(atom_a)
+ I = image('icons/misc/mark.dmi', src, "line", 19.0)
+ var/x_offset = ((atom_b.x * 32) + atom_b.pixel_x) - ((atom_a.x * 32) + atom_a.pixel_x)
+ var/y_offset = ((atom_b.y * 32) + atom_b.pixel_y) - ((atom_a.y * 32) + atom_a.pixel_y)
+
+ var/matrix/mat = matrix()
+ mat.Translate(0, 16)
+ mat.Scale(1, sqrt((x_offset * x_offset) + (y_offset * y_offset)) / 32)
+ mat.Turn(90 - Atan2(x_offset, y_offset)) // So... You pass coords in order x,y to this version of atan2. It should be called acsc2.
+ mat.Translate(atom_a.pixel_x, atom_a.pixel_y)
+
+ transform = mat
+ cl = C
+ cl.images += I
+
+/obj/effect/buildmode_line/Destroy()
+ if(I)
+ if(istype(cl))
+ cl.images -= I
+ cl = null
+ QDEL_NULL(I)
+ return ..()
\ No newline at end of file
diff --git a/code/modules/buildmode/submodes/advanced.dm b/code/modules/buildmode/submodes/advanced.dm
new file mode 100644
index 00000000000..fadd46753bb
--- /dev/null
+++ b/code/modules/buildmode/submodes/advanced.dm
@@ -0,0 +1,59 @@
+/datum/buildmode_mode/advanced
+ key = "advanced"
+ var/objholder = null
+
+// FIXME: add logic which adds a button displaying the icon
+// of the currently selected path
+
+/datum/buildmode_mode/advanced/show_help(mob/user)
+ to_chat(user, "***********************************************************")
+ to_chat(user, "Right Mouse Button on buildmode button = Set object type")
+ to_chat(user, "Left Mouse Button + alt on turf/obj = Copy object type")
+ to_chat(user, "Left Mouse Button on turf/obj = Place objects")
+ to_chat(user, "Right Mouse Button = Delete objects")
+ to_chat(user, "")
+ to_chat(user, "Use the button in the upper left corner to")
+ to_chat(user, "change the direction of built objects.")
+ to_chat(user, "***********************************************************")
+
+/datum/buildmode_mode/advanced/change_settings(mob/user)
+ var/target_path = input(user,"Enter typepath:" ,"Typepath","/obj/structure/closet")
+ objholder = text2path(target_path)
+ if(!ispath(objholder))
+ objholder = pick_closest_path(target_path)
+ if(!objholder)
+ alert("No path was selected")
+ return
+ else if(ispath(objholder, /area))
+ objholder = null
+ alert("That path is not allowed.")
+ return
+
+/datum/buildmode_mode/advanced/handle_click(user, params, obj/object)
+ var/list/pa = params2list(params)
+ var/left_click = pa.Find("left")
+ var/right_click = pa.Find("right")
+ var/alt_click = pa.Find("alt")
+
+ if(left_click && alt_click)
+ if (isturf(object) || isobj(object) || ismob(object))
+ objholder = object.type
+ to_chat(user, "[initial(object.name)] ([object.type]) selected.")
+ else
+ to_chat(user, "[initial(object.name)] is not a turf, object, or mob! Please select again.")
+ else if(left_click)
+ if(ispath(objholder,/turf))
+ var/turf/T = get_turf(object)
+ log_admin("Build Mode: [key_name(user)] modified [T] ([T.x],[T.y],[T.z]) to [objholder]")
+ T.ChangeTurf(objholder)
+ else if(!isnull(objholder))
+ var/obj/A = new objholder (get_turf(object))
+ A.setDir(BM.build_dir)
+ log_admin("Build Mode: [key_name(user)] modified [A]'s ([A.x],[A.y],[A.z]) dir to [BM.build_dir]")
+ else
+ to_chat(user, "Select object type first.")
+ else if(right_click)
+ if(isobj(object))
+ log_admin("Build Mode: [key_name(user)] deleted [object] at ([object.x],[object.y],[object.z])")
+ qdel(object)
+
\ No newline at end of file
diff --git a/code/modules/buildmode/submodes/area_edit.dm b/code/modules/buildmode/submodes/area_edit.dm
new file mode 100644
index 00000000000..d60950d294f
--- /dev/null
+++ b/code/modules/buildmode/submodes/area_edit.dm
@@ -0,0 +1,59 @@
+/datum/buildmode_mode/area_edit
+ key = "areaedit"
+ var/area/storedarea
+ var/image/areaimage
+
+/datum/buildmode_mode/area_edit/New()
+ areaimage = image('icons/turf/areas.dmi', null, "yellow")
+ ..()
+
+/datum/buildmode_mode/area_edit/enter_mode(datum/click_intercept/buildmode/BM)
+ BM.holder.images += areaimage
+
+/datum/buildmode_mode/area_edit/exit_mode(datum/click_intercept/buildmode/BM)
+ areaimage.loc = null // de-color the area
+ BM.holder.images -= areaimage
+ return ..()
+
+/datum/buildmode_mode/area_edit/Destroy()
+ QDEL_NULL(areaimage)
+ return ..()
+
+/datum/buildmode_mode/area_edit/show_help(mob/user)
+ to_chat(user, "***********************************************************")
+ to_chat(user, "Left Mouse Button on obj/turf/mob = Paint area")
+ to_chat(user, "Right Mouse Button on obj/turf/mob = Select area to paint")
+ to_chat(user, "Right Mouse Button on buildmode button = Create new area")
+ to_chat(user, "***********************************************************")
+
+/datum/buildmode_mode/area_edit/change_settings(mob/user)
+ var/target_path = input(user,"Enter typepath:", "Typepath", "/area")
+ var/areatype = text2path(target_path)
+ if(ispath(areatype,/area))
+ var/areaname = input(user,"Enter area name:", "Area name", "Area")
+ if(!areaname || !length(areaname))
+ return
+ storedarea = new areatype
+ storedarea.power_equip = 0
+ storedarea.power_light = 0
+ storedarea.power_environ = 0
+ storedarea.always_unpowered = 0
+ storedarea.name = areaname
+ areaimage.loc = storedarea // color our area
+
+/datum/buildmode_mode/area_edit/handle_click(user, params, object)
+ var/list/pa = params2list(params)
+ var/left_click = pa.Find("left")
+ var/right_click = pa.Find("right")
+
+ if(left_click)
+ if(!storedarea)
+ to_chat(user, "Configure or select the area you want to paint first!")
+ return
+ var/turf/T = get_turf(object)
+ if(get_area(T) != storedarea)
+ storedarea.contents.Add(T)
+ else if(right_click)
+ var/turf/T = get_turf(object)
+ storedarea = get_area(T)
+ areaimage.loc = storedarea // color our area
diff --git a/code/modules/buildmode/submodes/atmos.dm b/code/modules/buildmode/submodes/atmos.dm
new file mode 100644
index 00000000000..f12fdb1eb1a
--- /dev/null
+++ b/code/modules/buildmode/submodes/atmos.dm
@@ -0,0 +1,72 @@
+/datum/buildmode_mode/atmos
+ key = "atmos"
+
+ use_corner_selection = TRUE
+ var/pressure = ONE_ATMOSPHERE
+ var/temperature = T20C
+ var/oxygen = O2STANDARD
+ var/nitrogen = N2STANDARD
+ var/plasma = 0
+ var/cdiox = 0
+ var/nitrox = 0
+
+
+/datum/buildmode_mode/atmos/show_help(mob/user)
+ to_chat(user, "***********************************************************")
+ to_chat(user, "Left Mouse Button on turf = Select corner")
+ to_chat(user, "Left Mouse Button + Ctrl on turf = Set 'base atmos conditions' for unsimulated turfs in region")
+ to_chat(user, "Right Mouse Button on buildmode button = Adjust target atmos")
+ to_chat(user, "Notice: Starts out with standard breathable/liveable defaults")
+ to_chat(user, "***********************************************************")
+
+// FIXME this is a little tedious, something where you don't have to fill in each field would be cooler
+// maybe some kind of stat panel thing?
+/datum/buildmode_mode/atmos/change_settings(mob/user)
+ pressure = input(user, "Atmospheric Pressure", "Input", ONE_ATMOSPHERE) as num|null
+ temperature = input(user, "Temperature", "Input", T20C) as num|null
+ oxygen = input(user, "Oxygen ratio", "Input", O2STANDARD) as num|null
+ nitrogen = input(user, "Nitrogen ratio", "Input", N2STANDARD) as num|null
+ plasma = input(user, "Plasma ratio", "Input", 0) as num|null
+ cdiox = input(user, "CO2 ratio", "Input", 0) as num|null
+ nitrox = input(user, "N2O ratio", "Input", 0) as num|null
+
+/datum/buildmode_mode/atmos/proc/ppratio_to_moles(ppratio)
+ // ideal gas equation: Pressure * Volume = Moles * r * Temperature
+ // air datum fields are in moles, we have partial pressure ratios
+ // Moles = (Pressure * Volume) / (r * Temperature)
+ return ((ppratio * pressure) * CELL_VOLUME) / (temperature * R_IDEAL_GAS_EQUATION)
+
+/datum/buildmode_mode/atmos/handle_selected_region(mob/user, params)
+ var/list/pa = params2list(params)
+ var/left_click = pa.Find("left")
+ var/ctrl_click = pa.Find("ctrl")
+ if(left_click) //rectangular
+ for(var/turf/T in block(cornerA,cornerB))
+ if(istype(T, /turf/simulated))
+ // fill the turf with the appropriate gasses
+ // this feels slightly icky
+ var/turf/simulated/S = T
+ if(S.air)
+ S.air.temperature = temperature
+ S.air.oxygen = ppratio_to_moles(oxygen)
+ S.air.nitrogen = ppratio_to_moles(nitrogen)
+ S.air.toxins = ppratio_to_moles(plasma)
+ S.air.carbon_dioxide = ppratio_to_moles(cdiox)
+ S.air.trace_gases.Cut()
+ if(nitrox)
+ var/datum/gas/TG = new /datum/gas/sleeping_agent
+ TG.moles = ppratio_to_moles(nitrox)
+ S.air.trace_gases += TG
+ S.update_visuals()
+ S.air_update_turf()
+ else if(ctrl_click) // overwrite "default" unsimulated air
+ T.temperature = temperature
+ T.oxygen = ppratio_to_moles(oxygen)
+ T.nitrogen = ppratio_to_moles(nitrogen)
+ T.toxins = ppratio_to_moles(plasma)
+ T.carbon_dioxide = ppratio_to_moles(cdiox)
+ // no interface for trace gases on unsim turfs
+ T.air_update_turf()
+
+ // admin log
+ log_admin("Build Mode: [key_name(user)] changed the atmos of region [COORD(cornerA)] to [COORD(cornerB)]. T: [temperature], P: [pressure], Ox: [oxygen]%, N2: [nitrogen]%, Plsma: [plasma]%, CO2: [cdiox]%, N2O: [nitrox]%. [ctrl_click ? "Overwrote base unsimulated turf gases." : ""]")
\ No newline at end of file
diff --git a/code/modules/buildmode/submodes/basic.dm b/code/modules/buildmode/submodes/basic.dm
new file mode 100644
index 00000000000..1ca36920c64
--- /dev/null
+++ b/code/modules/buildmode/submodes/basic.dm
@@ -0,0 +1,50 @@
+/datum/buildmode_mode/basic
+ key = "basic"
+
+/datum/buildmode_mode/basic/show_help(mob/user)
+ to_chat(user, "***********************************************************")
+ to_chat(user, "Left Mouse Button = Construct / Upgrade")
+ to_chat(user, "Right Mouse Button = Deconstruct / Delete / Downgrade")
+ to_chat(user, "Left Mouse Button + ctrl = R-Window")
+ to_chat(user, "Left Mouse Button + alt = Airlock")
+ to_chat(user, "")
+ to_chat(user, "Use the button in the upper left corner to")
+ to_chat(user, "change the direction of built objects.")
+ to_chat(user, "***********************************************************")
+
+/datum/buildmode_mode/basic/handle_click(user, params, obj/object)
+ var/list/pa = params2list(params)
+ var/left_click = pa.Find("left")
+ var/right_click = pa.Find("right")
+ var/ctrl_click = pa.Find("ctrl")
+ var/alt_click = pa.Find("alt")
+
+ if(istype(object,/turf) && left_click && !alt_click && !ctrl_click)
+ var/turf/T = object
+ if(istype(object,/turf/space))
+ T.ChangeTurf(/turf/simulated/floor/plasteel)
+ else if(istype(object,/turf/simulated/floor))
+ T.ChangeTurf(/turf/simulated/wall)
+ else if(istype(object,/turf/simulated/wall))
+ T.ChangeTurf(/turf/simulated/wall/r_wall)
+ log_admin("Build Mode: [key_name(user)] built [T] at ([T.x],[T.y],[T.z])")
+ else if(right_click)
+ log_admin("Build Mode: [key_name(user)] deleted [object] at ([object.x],[object.y],[object.z])")
+ if(istype(object,/turf/simulated/wall))
+ var/turf/T = object
+ T.ChangeTurf(/turf/simulated/floor/plasteel)
+ else if(istype(object,/turf/simulated/floor))
+ var/turf/T = object
+ T.ChangeTurf(/turf/space)
+ else if(istype(object,/turf/simulated/wall/r_wall))
+ var/turf/T = object
+ T.ChangeTurf(/turf/simulated/wall)
+ else if(istype(object,/obj))
+ qdel(object)
+ else if(istype(object,/turf) && alt_click && left_click)
+ log_admin("Build Mode: [key_name(user)] built an airlock at ([object.x],[object.y],[object.z])")
+ new/obj/machinery/door/airlock(get_turf(object))
+ else if(istype(object,/turf) && ctrl_click && left_click)
+ var/obj/structure/window/reinforced/WIN = new/obj/structure/window/reinforced(get_turf(object))
+ WIN.setDir(BM.build_dir)
+ log_admin("Build Mode: [key_name(user)] built a window at ([object.x],[object.y],[object.z])")
diff --git a/code/modules/buildmode/submodes/boom.dm b/code/modules/buildmode/submodes/boom.dm
new file mode 100644
index 00000000000..271e5c01bc5
--- /dev/null
+++ b/code/modules/buildmode/submodes/boom.dm
@@ -0,0 +1,32 @@
+/datum/buildmode_mode/boom
+ key = "boom"
+
+ var/devastation = -1
+ var/heavy = -1
+ var/light = -1
+ var/flash = -1
+ var/flames = -1
+
+/datum/buildmode_mode/boom/show_help(mob/user)
+ to_chat(user, "***********************************************************")
+ to_chat(user, "Mouse Button on obj = Kaboom")
+ to_chat(user, "***********************************************************")
+
+/datum/buildmode_mode/boom/change_settings(mob/user)
+ devastation = input("Range of total devastation. -1 to none", text("Input")) as num|null
+ if(devastation == null) devastation = -1
+ heavy = input("Range of heavy impact. -1 to none", text("Input")) as num|null
+ if(heavy == null) heavy = -1
+ light = input("Range of light impact. -1 to none", text("Input")) as num|null
+ if(light == null) light = -1
+ flash = input("Range of flash. -1 to none", text("Input")) as num|null
+ if(flash == null) flash = -1
+ flames = input("Range of flames. -1 to none", text("Input")) as num|null
+ if(flames == null) flames = -1
+
+/datum/buildmode_mode/boom/handle_click(user, params, obj/object)
+ var/list/pa = params2list(params)
+ var/left_click = pa.Find("left")
+
+ if(left_click)
+ explosion(object, devastation, heavy, light, flash, null, TRUE, flames)
diff --git a/code/modules/buildmode/submodes/copy.dm b/code/modules/buildmode/submodes/copy.dm
new file mode 100644
index 00000000000..48cbb2c3cf0
--- /dev/null
+++ b/code/modules/buildmode/submodes/copy.dm
@@ -0,0 +1,27 @@
+/datum/buildmode_mode/copy
+ key = "copy"
+ var/atom/movable/stored = null
+
+/datum/buildmode_mode/copy/exit_mode()
+ stored = null
+ return ..()
+
+/datum/buildmode_mode/copy/show_help(mob/user)
+ to_chat(user, "***********************************************************")
+ to_chat(user, "Left Mouse Button on obj/turf/mob = Spawn a Copy of selected target")
+ to_chat(user, "Right Mouse Button on obj/mob = Select target to copy")
+ to_chat(user, "***********************************************************")
+
+/datum/buildmode_mode/copy/handle_click(user, params, obj/object)
+ var/list/pa = params2list(params)
+ var/left_click = pa.Find("left")
+ var/right_click = pa.Find("right")
+
+ if(left_click)
+ var/turf/T = get_turf(object)
+ if(stored)
+ DuplicateObject(stored, perfectcopy=1, sameloc=0,newloc=T)
+ else if(right_click)
+ if(ismovableatom(object)) // No copying turfs for now.
+ to_chat(user, "[object] set as template.")
+ stored = object
diff --git a/code/modules/buildmode/submodes/fill.dm b/code/modules/buildmode/submodes/fill.dm
new file mode 100644
index 00000000000..b143b2c9b90
--- /dev/null
+++ b/code/modules/buildmode/submodes/fill.dm
@@ -0,0 +1,49 @@
+/datum/buildmode_mode/fill
+ key = "fill"
+
+ use_corner_selection = TRUE
+ var/objholder = null
+
+/datum/buildmode_mode/fill/show_help(mob/user)
+ to_chat(user, "***********************************************************")
+ to_chat(user, "Left Mouse Button on turf/obj/mob = Select corner")
+ to_chat(user, "Left Mouse Button + Alt on turf/obj/mob = Delete region")
+ to_chat(user, "Right Mouse Button on buildmode button = Select object type")
+ to_chat(user, "***********************************************************")
+
+/datum/buildmode_mode/fill/change_settings(mob/user)
+ var/target_path = input(user,"Enter typepath:" ,"Typepath","/obj/structure/closet")
+ objholder = text2path(target_path)
+ if(!ispath(objholder))
+ objholder = pick_closest_path(target_path)
+ if(!objholder)
+ alert("No path has been selected.")
+ return
+ else if(ispath(objholder, /area))
+ objholder = null
+ alert("Area paths are not supported for this mode, use the area edit mode instead.")
+ return
+ deselect_region()
+
+/datum/buildmode_mode/fill/handle_click(mob/user, params, obj/object)
+ if(isnull(objholder))
+ to_chat(user, "Select an object type first.")
+ deselect_region()
+ return
+ ..()
+
+/datum/buildmode_mode/fill/handle_selected_region(mob/user, params)
+ var/list/pa = params2list(params)
+ var/left_click = pa.Find("left")
+ var/alt_click = pa.Find("alt")
+
+ if(left_click) //rectangular
+ if(alt_click)
+ empty_region(block(cornerA,cornerB))
+ else
+ for(var/turf/T in block(cornerA,cornerB))
+ if(ispath(objholder,/turf))
+ T.ChangeTurf(objholder)
+ else
+ var/obj/A = new objholder(T)
+ A.setDir(BM.build_dir)
\ No newline at end of file
diff --git a/code/modules/buildmode/submodes/link.dm b/code/modules/buildmode/submodes/link.dm
new file mode 100644
index 00000000000..153b5a7698e
--- /dev/null
+++ b/code/modules/buildmode/submodes/link.dm
@@ -0,0 +1,94 @@
+/datum/buildmode_mode/link
+ key = "link"
+
+ var/list/link_lines = list()
+ var/obj/link_obj
+
+
+/datum/buildmode_mode/link/proc/clear_lines()
+ QDEL_LIST(link_lines)
+
+/datum/buildmode_mode/link/proc/form_connection(atom/source, atom/dest, valid)
+ var/obj/effect/buildmode_line/L = new(BM.holder, source, dest, "[source.name] to [dest.name]")
+ L.color = valid ? "#339933" : "#993333"
+ link_lines += L
+ var/obj/effect/buildmode_line/L2 = new(BM.holder, dest, source, "[dest.name] to [source.name]") // Yes, reversed one so that you can see it source both sides.
+ L2.color = L.color
+ link_lines += L2
+
+/datum/buildmode_mode/link/Destroy()
+ clear_lines()
+ link_obj = null
+ return ..()
+
+/datum/buildmode_mode/link/Reset()
+ clear_lines()
+ link_obj = null
+ ..()
+
+/datum/buildmode_mode/link/show_help(mob/user)
+ to_chat(user, "***********************************************************")
+ to_chat(user, "Left Mouse Button on obj = Select button to link")
+ to_chat(user, "Right Mouse Button on obj = Link/unlink to selected button")
+ to_chat(user, "***********************************************************")
+
+// FIXME: this probably would work better with something component-based
+/datum/buildmode_mode/link/handle_click(mob/user, params, obj/object)
+ var/list/pa = params2list(params)
+ var/left_click = pa.Find("left")
+ var/right_click = pa.Find("right")
+ if(left_click && istype(object, /obj/machinery))
+ link_obj = object
+ if(right_click && istype(object, /obj/machinery))
+ if(istype(link_obj, /obj/machinery/door_control) && istype(object, /obj/machinery/door/airlock))
+ var/obj/machinery/door_control/M = link_obj
+ var/obj/machinery/door/airlock/P = object
+ if(!M.id || M.id == "")
+ M.id = input(user, "Please select an ID for the button", "Buildmode", "")
+ if(!M.id || M.id == "")
+ goto(line_jump)
+ if(P.id_tag == M.id && (P in range(M.range, M)) && P.id_tag && P.id_tag != "")
+ P.id_tag = null
+ to_chat(user, "[P] unlinked.")
+ goto(line_jump)
+ if(!M.normaldoorcontrol)
+ if(link_lines.len && alert(user, "Warning: This will disable links to connected pod doors. Continue?", "Buildmode", "Yes", "No") == "No")
+ goto(line_jump)
+ M.normaldoorcontrol = 1
+ if(P.id_tag && alert(user, "Warning: This will unlink something else from the door. Continue?", "Buildmode", "Yes", "No") == "No")
+ goto(line_jump)
+ P.id_tag = M.id
+ if(istype(link_obj, /obj/machinery/door_control) && istype(object, /obj/machinery/door/poddoor))
+ var/obj/machinery/door_control/M = link_obj
+ var/obj/machinery/door/poddoor/P = object
+ if(!M.id || M.id == "")
+ M.id = input(user, "Please select an ID for the button", "Buildmode", "")
+ if(!M.id || M.id == "")
+ goto(line_jump)
+ if(P.id_tag == M.id && P.id_tag && P.id_tag != "")
+ P.id_tag = null
+ to_chat(user, "[P] unlinked.")
+ goto(line_jump)
+ if(M.normaldoorcontrol)
+ if(link_lines.len && alert(user, "Warning: This will disable links to connected airlocks. Continue?", "Buildmode", "Yes", "No") == "No")
+ goto(line_jump)
+ M.normaldoorcontrol = 0
+ if(!M.id || M.id == "")
+ M.id = input(user, "Please select an ID for the button", "Buildmode", "")
+ if(!M.id || M.id == "")
+ goto(line_jump)
+ if(P.id_tag && P.id_tag != 1 && alert(user, "Warning: This will unlink something else from the door. Continue?", "Buildmode", "Yes", "No") == "No")
+ goto(line_jump)
+ P.id_tag = M.id
+
+ line_jump // For the goto
+ clear_lines()
+
+ if(istype(link_obj, /obj/machinery/door_control))
+ var/obj/machinery/door_control/M = link_obj
+ for(var/obj/machinery/door/airlock/P in range(M.range,M))
+ if(P.id_tag == M.id)
+ form_connection(M, P, M.normaldoorcontrol)
+ for(var/obj/machinery/door/poddoor/P in airlocks)
+ if(P.id_tag == M.id)
+ form_connection(M, P, !M.normaldoorcontrol)
diff --git a/code/modules/buildmode/submodes/mapgen.dm b/code/modules/buildmode/submodes/mapgen.dm
new file mode 100644
index 00000000000..22be429c2ce
--- /dev/null
+++ b/code/modules/buildmode/submodes/mapgen.dm
@@ -0,0 +1,40 @@
+/datum/buildmode_mode/mapgen
+ key = "mapgen"
+
+ use_corner_selection = TRUE
+ var/generator_path
+
+/datum/buildmode_mode/mapgen/show_help(mob/user)
+ to_chat(user, "***********************************************************")
+ to_chat(user, "Left Mouse Button on turf/obj/mob = Select corner")
+ to_chat(user, "Right Mouse Button on buildmode button = Select generator")
+ to_chat(user, "***********************************************************")
+
+/datum/buildmode_mode/mapgen/change_settings(mob/user)
+ var/list/gen_paths = subtypesof(/datum/mapGenerator)
+
+ var/type = input(user,"Select Generator Type","Type") as null|anything in gen_paths
+ if(!type) return
+
+ generator_path = type
+ deselect_region()
+
+/datum/buildmode_mode/mapgen/handle_click(mob/user, params, obj/object)
+ if(isnull(generator_path))
+ to_chat(user, "Select generator type first.")
+ deselect_region()
+ return
+ ..()
+
+/datum/buildmode_mode/mapgen/handle_selected_region(mob/user, params)
+ var/list/pa = params2list(params)
+ var/left_click = pa.Find("left")
+
+ if(left_click) //rectangular
+ if(cornerA && cornerB)
+ var/datum/mapGenerator/G = new generator_path
+ G.defineRegion(cornerA, cornerB, 1)
+ highlight_region(G.map)
+ var/confirm = alert("Are you sure you want run the map generator?", "Run generator", "Yes", "No")
+ if(confirm == "Yes")
+ G.generate()
\ No newline at end of file
diff --git a/code/modules/buildmode/submodes/save.dm b/code/modules/buildmode/submodes/save.dm
new file mode 100644
index 00000000000..43a1f9af174
--- /dev/null
+++ b/code/modules/buildmode/submodes/save.dm
@@ -0,0 +1,28 @@
+/datum/buildmode_mode/save
+ key = "save"
+
+ use_corner_selection = TRUE
+ var/use_json = TRUE
+
+/datum/buildmode_mode/save/show_help(mob/user)
+ to_chat(user, "***********************************************************")
+ to_chat(user, "Left Mouse Button on turf/obj/mob = Select corner")
+ to_chat(user, "***********************************************************")
+
+/datum/buildmode_mode/save/change_settings(mob/user)
+ use_json = (alert("Would you like to use json (Default is \"Yes\")?",,"Yes","No") == "Yes")
+
+/datum/buildmode_mode/save/handle_selected_region(mob/user, params)
+ var/list/pa = params2list(params)
+ var/left_click = pa.Find("left")
+ if(left_click)
+ var/map_name = input(user, "Please select a name for your map", "Buildmode", "")
+ if(map_name == "")
+ return
+ var/map_flags = 0
+ if(use_json)
+ map_flags = 32 // Magic number defined in `writer.dm` that I can't use directly
+ // because #defines are for some reason our coding standard
+ var/our_map = maploader.save_map(cornerA, cornerB, map_name, map_flags)
+ user << ftp(our_map) // send the map they've made! Or are stealing, whatever
+ to_chat(user, "Map saving complete! [our_map]")
diff --git a/code/modules/buildmode/submodes/sdql.dm b/code/modules/buildmode/submodes/sdql.dm
new file mode 100644
index 00000000000..104b7bd7af6
--- /dev/null
+++ b/code/modules/buildmode/submodes/sdql.dm
@@ -0,0 +1,12 @@
+// SKELETON CODE, not yet functional
+
+/datum/buildmode_mode/sdql
+ key = "sdql"
+
+ var/sdql_command = "SELECT /turf IN"
+
+/datum/buildmode_mode/sdql/show_help(mob/user)
+
+/datum/buildmode_mode/sdql/change_settings(mob/user)
+
+/datum/buildmode_mode/sdql/handle_click(mob/user, params, obj/object)
diff --git a/code/modules/buildmode/submodes/throwing.dm b/code/modules/buildmode/submodes/throwing.dm
new file mode 100644
index 00000000000..24470a680b5
--- /dev/null
+++ b/code/modules/buildmode/submodes/throwing.dm
@@ -0,0 +1,25 @@
+/datum/buildmode_mode/throwing
+ key = "throw"
+
+ var/atom/movable/throw_atom = null
+
+/datum/buildmode_mode/throwing/show_help(mob/user)
+ to_chat(user, "***********************************************************")
+ to_chat(user, "Left Mouse Button on turf/obj/mob = Select")
+ to_chat(user, "Right Mouse Button on turf/obj/mob = Throw")
+ to_chat(user, "***********************************************************")
+
+/datum/buildmode_mode/throwing/handle_click(user, params, obj/object)
+ var/list/pa = params2list(params)
+ var/left_click = pa.Find("left")
+ var/right_click = pa.Find("right")
+
+ if(left_click)
+ if(isturf(object))
+ return
+ throw_atom = object
+ to_chat(user, "Selected object '[throw_atom]'")
+ if(right_click)
+ if(throw_atom)
+ throw_atom.throw_at(object, 10, 1, user)
+ log_admin("Build Mode: [key_name(user)] threw [throw_atom] at [object] ([object.x],[object.y],[object.z])")
diff --git a/code/modules/buildmode/submodes/variable_edit.dm b/code/modules/buildmode/submodes/variable_edit.dm
new file mode 100644
index 00000000000..ebf0035bccf
--- /dev/null
+++ b/code/modules/buildmode/submodes/variable_edit.dm
@@ -0,0 +1,55 @@
+/datum/buildmode_mode/varedit
+ key = "edit"
+ // Varedit mode
+ var/varholder = "name"
+ var/valueholder = "value"
+
+/datum/buildmode_mode/varedit/show_help(mob/user)
+ to_chat(user, "***********************************************************")
+ to_chat(user, "Right Mouse Button on buildmode button = Select var(type) & value")
+ to_chat(user, "Left Mouse Button on turf/obj/mob = Set var(type) & value")
+ to_chat(user, "Right Mouse Button on turf/obj/mob = Reset var's value")
+ to_chat(user, "***********************************************************")
+
+// FIXME: This needs to use a standard var-editing interface instead of
+// doing its own thing here
+/datum/buildmode_mode/varedit/change_settings(mob/user)
+ var/temp_varname = input(user,"Enter variable name:", "Name", "name")
+ if(!vv_varname_lockcheck(temp_varname))
+ return
+
+ var/temp_value = user.client.vv_get_value()
+ if(isnull(temp_value["class"]))
+ Reset()
+ to_chat(user, "Variable unset.")
+ return
+ // we assign this once all user input is done, since things could get wonky otherwise
+ varholder = temp_varname
+ valueholder = temp_value["value"]
+
+/datum/buildmode_mode/varedit/handle_click(user, params, obj/object)
+ var/list/pa = params2list(params)
+ var/left_click = pa.Find("left")
+ var/right_click = pa.Find("right")
+
+ if(isnull(varholder))
+ to_chat(user, "Choose a variable to modify first.")
+ return
+ if(left_click)
+ if(object.vars.Find(varholder))
+ if(!object.vv_edit_var(varholder, valueholder))
+ to_chat(user, "Your edit was rejected by [object].")
+ return
+ log_admin("Build Mode: [key_name(user)] modified [object.name]'s [varholder] to [valueholder]")
+ else
+ to_chat(user, "[initial(object.name)] does not have a var called '[varholder]'")
+ if(right_click)
+ if(object.vars.Find(varholder))
+ var/reset_value = initial(object.vars[varholder])
+ if(!object.vv_edit_var(varholder, reset_value))
+ to_chat(user, "Your edit was rejected by [object].")
+ return
+ log_admin("Build Mode: [key_name(user)] modified [object.name]'s [varholder] to [reset_value]")
+ else
+ to_chat(user, "[initial(object.name)] does not have a var called '[varholder]'")
+
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index 50872791f59..bc6f7259ebc 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -385,18 +385,12 @@ BLIND // can't see anything
/obj/item/clothing/shoes/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/match) && src.loc == user)
var/obj/item/match/M = I
- if(!M.lit) // Match isn't lit, but isn't burnt.
- M.lit = 1
- M.icon_state = "match_lit"
- processing_objects.Add(M)
- M.update_icon()
+ if(M.matchignite()) // Match isn't lit, but isn't burnt.
user.visible_message("[user] strikes a [M] on the bottom of [src], lighting it.","You strike the [M] on the bottom of [src] to light it.")
playsound(user.loc, 'sound/goonstation/misc/matchstick_light.ogg', 50, 1)
- else if(M.lit == 1) // Match is lit, not extinguished.
- M.dropped()
+ else
user.visible_message("[user] crushes the [M] into the bottom of [src], extinguishing it.","You crush the [M] into the bottom of [src], extinguishing it.")
- else // Match has been previously lit and extinguished.
- to_chat(user, "The [M] has already been extinguished.")
+ M.dropped()
return
if(istype(I, /obj/item/wirecutters))
diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm
index c3595288213..cbe1b1c1e62 100644
--- a/code/modules/clothing/head/helmet.dm
+++ b/code/modules/clothing/head/helmet.dm
@@ -238,6 +238,12 @@ obj/item/clothing/head/blob
desc = "An in-atmosphere helmet worn by security members of the Nanotrasen Emergency Response Team. Has red highlights."
icon_state = "erthelmet_sec"
+/obj/item/clothing/head/helmet/ert/security/paranormal
+ name = "paranormal emergency response team helmet"
+ desc = "An in-atmosphere helmet worn by paranormal members of the Nanotrasen Emergency Response Team. Has crusader sigils."
+ icon_state = "knight_templar"
+ item_state = "knight_templar"
+
//Engineer
/obj/item/clothing/head/helmet/ert/engineer
name = "emergency response team engineer helmet"
diff --git a/code/modules/clothing/masks/breath.dm b/code/modules/clothing/masks/breath.dm
index afefbbc93cc..b47856fb38c 100644
--- a/code/modules/clothing/masks/breath.dm
+++ b/code/modules/clothing/masks/breath.dm
@@ -24,6 +24,12 @@
/obj/item/clothing/mask/breath/attack_self(var/mob/user)
adjustmask(user)
+/obj/item/clothing/mask/breath/AltClick(mob/user)
+ ..()
+ if( (!in_range(src, user)) || user.stat || user.restrained() )
+ return
+ adjustmask(user)
+
/obj/item/clothing/mask/breath/medical
desc = "A close-fitting sterile mask that can be connected to an air supply."
name = "medical mask"
@@ -41,3 +47,9 @@
permeability_coefficient = 0.01
species_restricted = list("Vox")
actions_types = list()
+
+/obj/item/clothing/mask/breath/vox/attack_self(var/mob/user)
+ return
+
+/obj/item/clothing/mask/breath/vox/AltClick(mob/user)
+ return
diff --git a/code/modules/clothing/spacesuits/chronosuit.dm b/code/modules/clothing/spacesuits/chronosuit.dm
index 6348f32aa11..3be698eee1e 100644
--- a/code/modules/clothing/spacesuits/chronosuit.dm
+++ b/code/modules/clothing/spacesuits/chronosuit.dm
@@ -183,7 +183,7 @@
anchored = 1
invisibility = 101
opacity = 0
- mouse_opacity = 0
+ mouse_opacity = MOUSE_OPACITY_TRANSPARENT
var/mob/holder = null
/obj/effect/chronos_cam/relaymove(var/mob/user, direction)
diff --git a/code/modules/clothing/spacesuits/ert.dm b/code/modules/clothing/spacesuits/ert.dm
index 2597b3cdde7..2fbf38a7e07 100644
--- a/code/modules/clothing/spacesuits/ert.dm
+++ b/code/modules/clothing/spacesuits/ert.dm
@@ -40,7 +40,7 @@
allowed = list(/obj/item/flashlight, /obj/item/tank, /obj/item/t_scanner, /obj/item/rcd, /obj/item/crowbar, \
/obj/item/screwdriver, /obj/item/weldingtool, /obj/item/wirecutters, /obj/item/wrench, /obj/item/multitool, \
/obj/item/radio, /obj/item/analyzer, /obj/item/gun/energy/laser, /obj/item/gun/energy/pulse, \
- /obj/item/gun/energy/gun/advtaser, /obj/item/melee/baton, /obj/item/gun/energy/gun, /obj/item/gun/projectile/automatic/lasercarbine, /obj/item/gun/energy/gun/blueshield)
+ /obj/item/gun/energy/gun/advtaser, /obj/item/melee/baton, /obj/item/gun/energy/gun, /obj/item/gun/projectile/automatic/lasercarbine, /obj/item/gun/energy/gun/blueshield, /obj/item/gun/energy/immolator/multi)
strip_delay = 130
species_fit = list("Drask", "Vox")
sprite_sheets = list(
@@ -56,12 +56,25 @@
item_state = "helm-command"
item_color = "ert_commander"
+/obj/item/clothing/head/helmet/space/hardsuit/ert/commander/gamma
+ name = "elite emergency response team commander helmet"
+ max_heat_protection_temperature = FIRE_IMMUNITY_HELM_MAX_TEMP_PROTECT
+ icon_state = "hardsuit0-gammacommander"
+ item_color = "gammacommander"
+ species_fit = null
+
/obj/item/clothing/suit/space/hardsuit/ert/commander
name = "emergency response team commander suit"
desc = "A suit worn by the commander of a Nanotrasen Emergency Response Team. Has blue highlights. Armoured, space ready, and fire resistant."
icon_state = "ert_commander"
item_state = "suit-command"
+/obj/item/clothing/suit/space/hardsuit/ert/commander/gamma
+ name = "elite emergency response team commander suit"
+ max_heat_protection_temperature = FIRE_IMMUNITY_SUIT_MAX_TEMP_PROTECT
+ icon_state = "ert_gcommander"
+ species_fit = null
+
//Security
/obj/item/clothing/head/helmet/space/hardsuit/ert/security
name = "emergency response team security helmet"
@@ -70,12 +83,25 @@
item_state = "syndicate-helm-black-red"
item_color = "ert_security"
+/obj/item/clothing/head/helmet/space/hardsuit/ert/security/gamma
+ name = "elite emergency response team security helmet"
+ max_heat_protection_temperature = FIRE_IMMUNITY_HELM_MAX_TEMP_PROTECT
+ icon_state = "hardsuit0-gammasecurity"
+ item_color = "gammasecurity"
+ species_fit = null
+
/obj/item/clothing/suit/space/hardsuit/ert/security
name = "emergency response team security suit"
desc = "A suit worn by security members of a Nanotrasen Emergency Response Team. Has red highlights. Armoured, space ready, and fire resistant."
icon_state = "ert_security"
item_state = "syndicate-black-red"
+/obj/item/clothing/suit/space/hardsuit/ert/security/gamma
+ name = "elite emergency response team security suit"
+ max_heat_protection_temperature = FIRE_IMMUNITY_SUIT_MAX_TEMP_PROTECT
+ icon_state = "ert_gsecurity"
+ species_fit = null
+
//Engineer
/obj/item/clothing/head/helmet/space/hardsuit/ert/engineer
name = "emergency response team engineer helmet"
@@ -84,12 +110,26 @@
item_state = "helm-orange"
item_color = "ert_engineer"
+//Engineer
+/obj/item/clothing/head/helmet/space/hardsuit/ert/engineer/gamma
+ name = "elite emergency response team engineer helmet"
+ max_heat_protection_temperature = FIRE_IMMUNITY_HELM_MAX_TEMP_PROTECT
+ icon_state = "hardsuit0-gammaengineer"
+ item_color = "gammaengineer"
+ species_fit = null
+
/obj/item/clothing/suit/space/hardsuit/ert/engineer
name = "emergency response team engineer suit"
desc = "A suit worn by the engineers of a Nanotrasen Emergency Response Team. Has yellow highlights. Armoured, space ready, and fire resistant."
icon_state = "ert_engineer"
item_state = "suit-orange"
+/obj/item/clothing/suit/space/hardsuit/ert/engineer/gamma
+ name = "elite emergency response team engineer suit"
+ max_heat_protection_temperature = FIRE_IMMUNITY_SUIT_MAX_TEMP_PROTECT
+ icon_state = "ert_gengineer"
+ species_fit = null
+
//Medical
/obj/item/clothing/head/helmet/space/hardsuit/ert/medical
name = "emergency response team medical helmet"
@@ -97,11 +137,24 @@
icon_state = "hardsuit0-ert_medical"
item_color = "ert_medical"
+/obj/item/clothing/head/helmet/space/hardsuit/ert/medical/gamma
+ name = "elite emergency response team medical helmet"
+ max_heat_protection_temperature = FIRE_IMMUNITY_HELM_MAX_TEMP_PROTECT
+ icon_state = "hardsuit0-gammamedical"
+ item_color = "gammamedical"
+ species_fit = null
+
/obj/item/clothing/suit/space/hardsuit/ert/medical
name = "emergency response team medical suit"
desc = "A suit worn by medical members of a Nanotrasen Emergency Response Team. Has white highlights. Armoured and space ready."
icon_state = "ert_medical"
+/obj/item/clothing/suit/space/hardsuit/ert/medical/gamma
+ name = "elite emergency response team medical suit"
+ max_heat_protection_temperature = FIRE_IMMUNITY_SUIT_MAX_TEMP_PROTECT
+ icon_state = "ert_gmedical"
+ species_fit = null
+
//Janitor
/obj/item/clothing/head/helmet/space/hardsuit/ert/janitor
name = "emergency response team janitor helmet"
@@ -109,11 +162,24 @@
icon_state = "hardsuit0-ert_janitor"
item_color = "ert_janitor"
+/obj/item/clothing/head/helmet/space/hardsuit/ert/janitor/gamma
+ name = "elite emergency response team janitor helmet"
+ max_heat_protection_temperature = FIRE_IMMUNITY_HELM_MAX_TEMP_PROTECT
+ icon_state = "hardsuit0-gammajanitor"
+ item_color = "gammajanitor"
+ species_fit = null
+
/obj/item/clothing/suit/space/hardsuit/ert/janitor
name = "emergency response team janitor suit"
desc = "A suit worn by the janitorial of a Nanotrasen Emergency Response Team. Has purple highlights. Armoured, space ready, and fire resistant."
icon_state = "ert_janitor"
+/obj/item/clothing/suit/space/hardsuit/ert/janitor/gamma
+ name = "elite emergency response team janitor suit"
+ max_heat_protection_temperature = FIRE_IMMUNITY_SUIT_MAX_TEMP_PROTECT
+ icon_state = "ert_gjanitor"
+ species_fit = null
+
//Paranormal
/obj/item/clothing/head/helmet/space/hardsuit/ert/paranormal
name = "paranormal response unit helmet"
diff --git a/code/modules/clothing/spacesuits/rig/suits/ert.dm b/code/modules/clothing/spacesuits/rig/suits/ert_suits.dm
similarity index 100%
rename from code/modules/clothing/spacesuits/rig/suits/ert.dm
rename to code/modules/clothing/spacesuits/rig/suits/ert_suits.dm
diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm
index bda11216a06..bc8ded8a233 100644
--- a/code/modules/clothing/suits/armor.dm
+++ b/code/modules/clothing/suits/armor.dm
@@ -295,7 +295,7 @@
return 0
if(prob(hit_reaction_chance))
var/mob/living/carbon/human/H = owner
- owner.visible_message("The reactive teleport system flings [H] clear of [attack_text], shutting itself off in the process!")
+ owner.visible_message("The reactive teleport system flings [H] clear of [attack_text]!")
var/list/turfs = new/list()
for(var/turf/T in orange(tele_range, H))
if(istype(T, /turf/space))
@@ -440,6 +440,13 @@
name = "emergency response team security armor"
desc = "A set of armor worn by security members of the Nanotrasen Emergency Response Team. Has red highlights."
icon_state = "ertarmor_sec"
+
+
+/obj/item/clothing/suit/armor/vest/ert/security/paranormal
+ name = "emergency response team paranormal armor"
+ desc = "A set of armor worn by paranormal members of the Nanotrasen Emergency Response Team. Has crusader sigils."
+ icon_state = "knight_templar"
+ item_state = "knight_templar"
//Engineer
/obj/item/clothing/suit/armor/vest/ert/engineer
diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm
index c4ce1055324..caa13863937 100644
--- a/code/modules/customitems/item_defines.dm
+++ b/code/modules/customitems/item_defines.dm
@@ -135,6 +135,27 @@
/obj/item/claymore/fluff/hit_reaction()
return 0
+/obj/item/fluff/rsik_katana //Xydonus: Rsik Ugsharki
+ name = "ceremonial katana"
+ desc = "A shimmering ceremonial golden katana, for the most discerning class of ninja. Looks expensive, and fragile."
+ icon = 'icons/obj/custom_items.dmi'
+ icon_state = "rsik_katana"
+ item_state = "rsik_katana"
+ lefthand_file = 'icons/mob/inhands/fluff_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/fluff_righthand.dmi'
+ force = 5
+ sharp = 0
+ flags = CONDUCT
+ slot_flags = SLOT_BELT
+ throwforce = 5
+ w_class = WEIGHT_CLASS_NORMAL
+ attack_verb = list("attacked", "slashed", "stabbed", "sliced")
+ hitsound = 'sound/weapons/bladeslice.ogg'
+
+/obj/item/fluff/rsik_katana/suicide_act(mob/user)
+ user.visible_message("[user] tries to stab [src] into [user.p_their()] stomach! Except [src] shatters! [user.p_they(TRUE)] look[user.p_s()] as if [user.p_they()] might die from the shame.")
+ return(BRUTELOSS)
+
/obj/item/crowbar/fluff/zelda_creedy_1 // Zomgponies: Griffin Rowley
name = "Zelda's Crowbar"
desc = "A pink crow bar that has an engraving that reads, 'To Zelda. Love always, Dawn'"
@@ -1484,3 +1505,4 @@
item_state = "Xann_necklace"
item_color = "Xann_necklace"
slot_flags = SLOT_TIE
+
diff --git a/code/modules/events/anomaly_bluespace.dm b/code/modules/events/anomaly_bluespace.dm
index 1ecc62e5b5f..29baf834bb5 100644
--- a/code/modules/events/anomaly_bluespace.dm
+++ b/code/modules/events/anomaly_bluespace.dm
@@ -59,7 +59,7 @@
blueeffect.icon = 'icons/effects/effects.dmi'
blueeffect.icon_state = "shieldsparkles"
blueeffect.layer = 17
- blueeffect.mouse_opacity = 0
+ blueeffect.mouse_opacity = MOUSE_OPACITY_TRANSPARENT
M.client.screen += blueeffect
sleep(20)
M.client.screen -= blueeffect
diff --git a/code/modules/events/sentience.dm b/code/modules/events/sentience.dm
index cfa0d24d98e..f926f8b6aea 100644
--- a/code/modules/events/sentience.dm
+++ b/code/modules/events/sentience.dm
@@ -13,12 +13,12 @@
if(!(L in player_list) && !L.mind && (L.sentience_type == sentience_type))
potential += L
+ if(!candidates.len || !potential.len) //if there are no players or simple animals to choose from, then end
+ return FALSE
+
var/mob/living/simple_animal/SA = pick(potential)
var/mob/SG = pick(candidates)
- if(!SA || !SG) //if you can't find either a simple animal or a player, end
- return FALSE
-
var/sentience_report = "[command_name()] Medium-Priority Update"
var/data = pick("scans from our long-range sensors", "our sophisticated probabilistic models", "our omnipotence", "the communications traffic on your station", "energy emissions we detected", "\[REDACTED\]", "Steve")
diff --git a/code/modules/events/spacevine.dm b/code/modules/events/spacevine.dm
index 176b6679604..55e87f575b0 100644
--- a/code/modules/events/spacevine.dm
+++ b/code/modules/events/spacevine.dm
@@ -411,7 +411,7 @@
anchored = TRUE
density = FALSE
layer = SPACEVINE_LAYER
- mouse_opacity = 2 //Clicking anywhere on the turf is good enough
+ mouse_opacity = MOUSE_OPACITY_OPAQUE //Clicking anywhere on the turf is good enough
pass_flags = PASSTABLE | PASSGRILLE
max_integrity = 50
var/energy = 0
diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm
index 74a0baf8cd5..2f0032d619f 100644
--- a/code/modules/flufftext/Hallucination.dm
+++ b/code/modules/flufftext/Hallucination.dm
@@ -301,7 +301,7 @@ Gunshots/explosions/opening doors/less rare audio (done)
if(bubblegum.Adjacent(target) && !charged)
charged = TRUE
target.Weaken(4)
- target.staminaloss += 40
+ target.adjustStaminaLoss(40)
step_away(target, bubblegum)
shake_camera(target, 4, 3)
target.visible_message("[target] jumps backwards, falling on the ground!","[bubblegum] slams into you!")
@@ -637,7 +637,7 @@ Gunshots/explosions/opening doors/less rare audio (done)
if(weapon_name)
my_target.playsound_local(my_target, weap.hitsound, 1)
my_target.show_message("[src.name] has attacked [my_target] with [weapon_name]!", 1)
- my_target.staminaloss += 30
+ my_target.adjustStaminaLoss(30)
if(prob(20))
my_target.AdjustEyeBlurry(3)
if(prob(33))
@@ -646,7 +646,7 @@ Gunshots/explosions/opening doors/less rare audio (done)
else
my_target.playsound_local(my_target, pick('sound/weapons/punch1.ogg','sound/weapons/punch2.ogg','sound/weapons/punch3.ogg','sound/weapons/punch4.ogg'), 25, 1, -1)
my_target.show_message("[src.name] has punched [my_target]!", 1)
- my_target.staminaloss += 30
+ my_target.adjustStaminaLoss(30)
if(prob(33))
if(!locate(/obj/effect/overlay) in my_target.loc)
fake_blood(my_target)
diff --git a/code/modules/food_and_drinks/food/customizables.dm b/code/modules/food_and_drinks/food/customizables.dm
index 70027028344..b0ac9d20d6c 100644
--- a/code/modules/food_and_drinks/food/customizables.dm
+++ b/code/modules/food_and_drinks/food/customizables.dm
@@ -73,7 +73,7 @@
bitesize = 4
var/top = 1 //Do we have a top?
var/obj/item/toptype
- var/add_overlays = 1 //Do we stack?
+ var/snack_overlays = 1 //Do we stack?
// var/offsetstuff = 1 //Do we offset the overlays?
var/sandwich_limit = 40
var/fullycustom = 0
@@ -87,7 +87,7 @@
icon_state = "personal_pizza"
baseicon = "personal_pizza"
basename = "personal pizza"
- add_overlays = 0
+ snack_overlays = 0
top = 0
/obj/item/reagent_containers/food/snacks/customizable/pasta
@@ -96,7 +96,7 @@
icon_state = "pasta_bot"
baseicon = "pasta_bot"
basename = "pasta"
- add_overlays = 0
+ snack_overlays = 0
top = 0
/obj/item/reagent_containers/food/snacks/customizable/cook/bread
@@ -105,7 +105,7 @@
icon_state = "breadcustom"
baseicon = "breadcustom"
basename = "bread"
- add_overlays = 0
+ snack_overlays = 0
top = 0
/obj/item/reagent_containers/food/snacks/customizable/cook/pie
@@ -114,7 +114,7 @@
icon_state = "piecustom"
baseicon = "piecustom"
basename = "pie"
- add_overlays = 0
+ snack_overlays = 0
top = 0
/obj/item/reagent_containers/food/snacks/customizable/cook/cake
@@ -123,7 +123,7 @@
icon_state = "cakecustom"
baseicon = "cakecustom"
basename = "cake"
- add_overlays = 0
+ snack_overlays = 0
top = 0
/obj/item/reagent_containers/food/snacks/customizable/cook/jelly
@@ -132,7 +132,7 @@
icon_state = "jellycustom"
baseicon = "jellycustom"
basename = "jelly"
- add_overlays = 0
+ snack_overlays = 0
top = 0
/obj/item/reagent_containers/food/snacks/customizable/cook/donkpocket
@@ -141,7 +141,7 @@
icon_state = "donkcustom"
baseicon = "donkcustom"
basename = "donk pocket"
- add_overlays = 0
+ snack_overlays = 0
top = 0
/obj/item/reagent_containers/food/snacks/customizable/cook/kebab
@@ -150,7 +150,7 @@
icon_state = "kababcustom"
baseicon = "kababcustom"
basename = "kebab"
- add_overlays = 0
+ snack_overlays = 0
top = 0
/obj/item/reagent_containers/food/snacks/customizable/cook/salad
@@ -159,7 +159,7 @@
icon_state = "saladcustom"
baseicon = "saladcustom"
basename = "salad"
- add_overlays = 0
+ snack_overlays = 0
top = 0
/obj/item/reagent_containers/food/snacks/customizable/cook/waffles
@@ -168,7 +168,7 @@
icon_state = "wafflecustom"
baseicon = "wafflecustom"
basename = "waffles"
- add_overlays = 0
+ snack_overlays = 0
top = 0
/obj/item/reagent_containers/food/snacks/customizable/candy/cookie
@@ -177,7 +177,7 @@
icon_state = "cookiecustom"
baseicon = "cookiecustom"
basename = "cookie"
- add_overlays = 0
+ snack_overlays = 0
top = 0
/obj/item/reagent_containers/food/snacks/customizable/candy/cotton
@@ -186,7 +186,7 @@
icon_state = "cottoncandycustom"
baseicon = "cottoncandycustom"
basename = "flavored cotton candy"
- add_overlays = 0
+ snack_overlays = 0
top = 0
/obj/item/reagent_containers/food/snacks/customizable/candy/gummybear
@@ -195,7 +195,7 @@
icon_state = "gummybearcustom"
baseicon = "gummybearcustom"
basename = "flavored giant gummy bear"
- add_overlays = 0
+ snack_overlays = 0
top = 0
/obj/item/reagent_containers/food/snacks/customizable/candy/gummyworm
@@ -204,7 +204,7 @@
icon_state = "gummywormcustom"
baseicon = "gummywormcustom"
basename = "flavored giant gummy worm"
- add_overlays = 0
+ snack_overlays = 0
top = 0
/obj/item/reagent_containers/food/snacks/customizable/candy/jellybean
@@ -213,7 +213,7 @@
icon_state = "jellybeancustom"
baseicon = "jellybeancustom"
basename = "flavored giant jelly bean"
- add_overlays = 0
+ snack_overlays = 0
top = 0
/obj/item/reagent_containers/food/snacks/customizable/candy/jawbreaker
@@ -222,7 +222,7 @@
icon_state = "jawbreakercustom"
baseicon = "jawbreakercustom"
basename = "flavored jawbreaker"
- add_overlays = 0
+ snack_overlays = 0
top = 0
/obj/item/reagent_containers/food/snacks/customizable/candy/candycane
@@ -231,7 +231,7 @@
icon_state = "candycanecustom"
baseicon = "candycanecustom"
basename = "flavored candy cane"
- add_overlays = 0
+ snack_overlays = 0
top = 0
/obj/item/reagent_containers/food/snacks/customizable/candy/gum
@@ -240,7 +240,7 @@
icon_state = "gumcustom"
baseicon = "gumcustom"
basename = "flavored gum"
- add_overlays = 0
+ snack_overlays = 0
top = 0
/obj/item/reagent_containers/food/snacks/customizable/candy/donut
@@ -249,7 +249,7 @@
icon_state = "donutcustom"
baseicon = "donutcustom"
basename = "filled donut"
- add_overlays = 0
+ snack_overlays = 0
top = 0
/obj/item/reagent_containers/food/snacks/customizable/candy/bar
@@ -258,7 +258,7 @@
icon_state = "barcustom"
baseicon = "barcustom"
basename = "flavored chocolate bar"
- add_overlays = 0
+ snack_overlays = 0
top = 0
/obj/item/reagent_containers/food/snacks/customizable/candy/sucker
@@ -267,7 +267,7 @@
icon_state = "suckercustom"
baseicon = "suckercustom"
basename = "flavored sucker"
- add_overlays = 0
+ snack_overlays = 0
top = 0
/obj/item/reagent_containers/food/snacks/customizable/candy/cash
@@ -276,7 +276,7 @@
icon_state = "cashcustom"
baseicon = "cashcustom"
basename = "flavored cash"
- add_overlays = 0
+ snack_overlays = 0
top = 0
/obj/item/reagent_containers/food/snacks/customizable/candy/coin
@@ -285,7 +285,7 @@
icon_state = "coincustom"
baseicon = "coincustom"
basename = "flavored coin"
- add_overlays = 0
+ snack_overlays = 0
top = 0
/obj/item/reagent_containers/food/snacks/customizable/fullycustom // In the event you fuckers find something I forgot to add a customizable food for.
@@ -294,7 +294,7 @@
icon_state = "fullycustom"
baseicon = "fullycustom"
basename = "on a plate"
- add_overlays = 0
+ snack_overlays = 0
top = 0
sandwich_limit = 20
fullycustom = 1
@@ -305,7 +305,7 @@
icon_state = "soup"
baseicon = "soup"
basename = "soup"
- add_overlays = 0
+ snack_overlays = 0
trash = /obj/item/trash/bowl
top = 0
@@ -355,7 +355,7 @@
I.color = pick("#FF0000","#0000FF","#008000","#FFFF00")
else
I.color = pick("#FF0000","#0000FF","#008000","#FFFF00")
- if(add_overlays)
+ if(snack_overlays)
I.pixel_x = pick(list(-1,0,1))
I.pixel_y = (i*2)+1
overlays += I
diff --git a/code/modules/food_and_drinks/food/snacks.dm b/code/modules/food_and_drinks/food/snacks.dm
index 4803405520a..d9b6c6694a7 100644
--- a/code/modules/food_and_drinks/food/snacks.dm
+++ b/code/modules/food_and_drinks/food/snacks.dm
@@ -45,15 +45,15 @@
to_chat(user, "None of [src] left, oh no!")
M.unEquip(src) //so icons update :[
qdel(src)
- return 0
+ return FALSE
if(iscarbon(M))
var/mob/living/carbon/C = M
if(C.eat(src, user))
bitecount++
On_Consume(C, user)
- return 1
- return 0
+ return TRUE
+ return FALSE
/obj/item/reagent_containers/food/snacks/afterattack(obj/target, mob/user, proximity)
return
@@ -115,70 +115,7 @@
TrashItem = trash
TrashItem.forceMove(loc)
qdel(src)
- return 1
-
- if((slices_num <= 0 || !slices_num) || !slice_path)
- return 0
-
- var/inaccurate = 0
- if( \
- istype(W, /obj/item/kitchen/knife) || \
- istype(W, /obj/item/scalpel) \
- )
- else if( \
- istype(W, /obj/item/circular_saw) || \
- istype(W, /obj/item/melee/energy/sword/saber) && W:active || \
- istype(W, /obj/item/melee/energy/blade) || \
- istype(W, /obj/item/shovel) || \
- istype(W, /obj/item/hatchet) \
- )
- inaccurate = 1
- else if(W.w_class <= WEIGHT_CLASS_SMALL && istype(src,/obj/item/reagent_containers/food/snacks/sliceable))
- var/newweight = GetTotalContentsWeight() + W.GetTotalContentsWeight() + W.w_class
- if(newweight > MAX_WEIGHT_CLASS)
- // Nope, no bluespace slice food
- to_chat(user, "You cannot fit [W] in [src]!")
- return 1
- if(!iscarbon(user))
- return 1
- to_chat(user, "You slip [W] inside [src].")
- user.unEquip(W)
- if((user.client && user.s_active != src))
- user.client.screen -= W
- W.dropped(user)
- total_w_class += W.w_class
- add_fingerprint(user)
- contents += W
- return
- else
- return 1
- if( \
- !isturf(loc) || \
- !(locate(/obj/structure/table) in loc) && \
- !(locate(/obj/machinery/optable) in loc) && \
- !(locate(/obj/item/storage/bag/tray) in loc) \
- )
- to_chat(user, "You cannot slice [src] here! You need a table or at least a tray to do it.")
- return 1
- var/slices_lost = 0
- if(!inaccurate)
- user.visible_message( \
- "[user] slices [src]!", \
- "You slice [src]!" \
- )
- else
- user.visible_message( \
- "[user] crudely slices [src] with [W]!", \
- "You crudely slice [src] with your [W]!" \
- )
- slices_lost = rand(1,min(1,round(slices_num/2)))
- var/reagents_per_slice = reagents.total_volume/slices_num
- for(var/i=1 to (slices_num-slices_lost))
- var/obj/slice = new slice_path (loc)
- reagents.trans_to(slice,reagents_per_slice)
- qdel(src)
-
- return
+ return TRUE
/obj/item/reagent_containers/food/snacks/proc/generate_trash(atom/location)
if(trash)
@@ -228,7 +165,60 @@
N.adjustBruteLoss(-1)
N.adjustFireLoss(-1)
+/obj/item/reagent_containers/food/snacks/sliceable/examine(mob/user)
+ . = ..()
+ to_chat(user, "Alt-click to put something small inside.")
+/obj/item/reagent_containers/food/snacks/sliceable/AltClick(mob/user)
+ var/obj/item/I = user.get_active_hand()
+ if(!I)
+ return
+ if(I.w_class > WEIGHT_CLASS_SMALL)
+ to_chat(user, "You cannot fit [I] in [src]!")
+ return
+ var/newweight = GetTotalContentsWeight() + I.GetTotalContentsWeight() + I.w_class
+ if(newweight > MAX_WEIGHT_CLASS)
+ // Nope, no bluespace slice food
+ to_chat(user, "You cannot fit [I] in [src]!")
+ return
+ if(!iscarbon(user))
+ return
+ if(!user.drop_item())
+ to_chat(user, "You cannot slip [I] inside [src]!")
+ return
+ to_chat(user, "You slip [I] inside [src].")
+ total_w_class += I.w_class
+ add_fingerprint(user)
+ I.forceMove(src)
+
+/obj/item/reagent_containers/food/snacks/sliceable/attackby(obj/item/I, mob/user, params)
+ if((slices_num <= 0 || !slices_num) || !slice_path)
+ return FALSE
+
+ var/inaccurate = TRUE
+ if(I.sharp)
+ if(istype(I, /obj/item/kitchen/knife) || istype(I, /obj/item/scalpel))
+ inaccurate = FALSE
+ else
+ return TRUE
+ if(!isturf(loc) || !(locate(/obj/structure/table) in loc) && \
+ !(locate(/obj/machinery/optable) in loc) && !(locate(/obj/item/storage/bag/tray) in loc))
+ to_chat(user, "You cannot slice [src] here! You need a table or at least a tray to do it.")
+ return TRUE
+ var/slices_lost = 0
+ if(!inaccurate)
+ user.visible_message("[user] slices [src]!",
+ "You slice [src]!")
+ else
+ user.visible_message("[user] crudely slices [src] with [I]!",
+ "You crudely slice [src] with your [I]!")
+ slices_lost = rand(1,min(1,round(slices_num/2)))
+ var/reagents_per_slice = reagents.total_volume/slices_num
+ for(var/i=1 to (slices_num-slices_lost))
+ var/obj/slice = new slice_path (loc)
+ reagents.trans_to(slice,reagents_per_slice)
+ qdel(src)
+ return ..()
////////////////////////////////////////////////////////////////////////////////
/// FOOD END
////////////////////////////////////////////////////////////////////////////////
@@ -301,4 +291,4 @@
list_reagents = list("nutriment" = 3)
-#undef MAX_WEIGHT_CLASS
\ No newline at end of file
+#undef MAX_WEIGHT_CLASS
diff --git a/code/modules/lighting/lighting_overlay.dm b/code/modules/lighting/lighting_overlay.dm
index 1a421e6d1ad..dd28f990322 100644
--- a/code/modules/lighting/lighting_overlay.dm
+++ b/code/modules/lighting/lighting_overlay.dm
@@ -1,7 +1,7 @@
/var/total_lighting_overlays = 0
/atom/movable/lighting_overlay
name = ""
- mouse_opacity = 0
+ mouse_opacity = MOUSE_OPACITY_TRANSPARENT
simulated = 0
anchored = 1
icon = LIGHTING_ICON
diff --git a/code/modules/mining/equipment_locker.dm b/code/modules/mining/equipment_locker.dm
index 852bcd3edf3..3d3c67701e8 100644
--- a/code/modules/mining/equipment_locker.dm
+++ b/code/modules/mining/equipment_locker.dm
@@ -722,7 +722,7 @@
icon = 'icons/effects/effects.dmi'
icon_state = "shield1"
layer = 4.1
- mouse_opacity = 0
+ mouse_opacity = MOUSE_OPACITY_TRANSPARENT
var/resonance_damage = 20
/obj/effect/resonance/New(loc, var/creator = null, var/timetoburst)
@@ -975,7 +975,7 @@
layer = 18
icon = 'icons/turf/mining.dmi'
anchored = 1
- mouse_opacity = 0
+ mouse_opacity = MOUSE_OPACITY_TRANSPARENT
duration = 30
pixel_x = -4
pixel_y = -4
diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm
index 865f02a7eb8..6a5ae52ce27 100644
--- a/code/modules/mining/mine_turfs.dm
+++ b/code/modules/mining/mine_turfs.dm
@@ -453,7 +453,6 @@ var/global/list/rockTurfEdgeCache = list(
/turf/simulated/floor/plating/airless/asteroid
name = "Asteroid"
- icon = 'icons/turf/floors.dmi'
icon_state = "asteroid"
icon_plating = "asteroid"
var/dug = 0 //0 = has not yet been dug, 1 = has already been dug
@@ -463,10 +462,10 @@ var/global/list/rockTurfEdgeCache = list(
/turf/simulated/floor/plating/airless/asteroid/New()
var/proper_name = name
- ..()
name = proper_name
if(prob(20))
icon_state = "asteroid[rand(0,12)]"
+ ..()
/turf/simulated/floor/plating/airless/asteroid/ex_act(severity, target)
switch(severity)
@@ -663,4 +662,4 @@ var/global/list/rockTurfEdgeCache = list(
#undef NORTH_EDGING
#undef SOUTH_EDGING
#undef EAST_EDGING
-#undef WEST_EDGING
\ No newline at end of file
+#undef WEST_EDGING
diff --git a/code/modules/mining/minebot.dm b/code/modules/mining/minebot.dm
index 16464aff11c..490d8c8fe0d 100644
--- a/code/modules/mining/minebot.dm
+++ b/code/modules/mining/minebot.dm
@@ -9,7 +9,7 @@
icon_state = "mining_drone"
icon_living = "mining_drone"
status_flags = CANSTUN|CANWEAKEN|CANPUSH
- mouse_opacity = 1
+ mouse_opacity = MOUSE_OPACITY_ICON
faction = list("neutral")
a_intent = INTENT_HARM
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)
@@ -92,12 +92,14 @@
..()
/mob/living/simple_animal/hostile/mining_drone/death()
- ..()
+ // Only execute the below if we successfully died
+ . = ..()
+ if(!.)
+ return FALSE
visible_message("[src] is destroyed!")
new /obj/effect/decal/cleanable/blood/gibs/robot(src.loc)
DropOre(0)
qdel(src)
- return
/mob/living/simple_animal/hostile/mining_drone/attack_hand(mob/living/carbon/human/M)
if(M.a_intent == INTENT_HELP)
@@ -307,4 +309,4 @@
origin_tech = "programming=6"
#undef MINEDRONE_COLLECT
-#undef MINEDRONE_ATTACK
\ No newline at end of file
+#undef MINEDRONE_ATTACK
diff --git a/code/modules/mob/camera/camera.dm b/code/modules/mob/camera/camera.dm
index f9cb1123ca3..38b5e81a87b 100644
--- a/code/modules/mob/camera/camera.dm
+++ b/code/modules/mob/camera/camera.dm
@@ -5,7 +5,7 @@
density = 0
anchored = 1
status_flags = GODMODE // You can't damage it.
- mouse_opacity = 0
+ mouse_opacity = MOUSE_OPACITY_TRANSPARENT
see_in_dark = 7
invisibility = 101 // No one can see us
sight = SEE_SELF
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index f20ba3b734d..36afcd3868e 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -12,7 +12,6 @@ var/list/image/ghost_darkness_images = list() //this is a list of images for thi
stat = DEAD
density = 0
canmove = 0
- blinded = 0
anchored = 1 // don't get pushed around
invisibility = INVISIBILITY_OBSERVER
var/can_reenter_corpse
@@ -171,7 +170,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
response = alert(src, alertmsg,"Are you sure you want to ghost?","Stay in body","Ghost")
if(response != "Ghost")
return //didn't want to ghost after-all
- resting = 1
+ StartResting()
var/mob/dead/observer/ghost = ghostize(0) //0 parameter is so we can never re-enter our body, "Charlie, you can never come baaaack~" :3
ghost.timeofdeath = world.time // Because the living mob won't have a time of death and we want the respawn timer to work properly.
var/obj/structure/morgue/Morgue = locate() in M.loc
diff --git a/code/modules/mob/death.dm b/code/modules/mob/death.dm
index cf3e4c320b5..e9ef1f37b93 100644
--- a/code/modules/mob/death.dm
+++ b/code/modules/mob/death.dm
@@ -1,94 +1,12 @@
-//This is the proc for gibbing a mob. Cannot gib ghosts.
-//added different sort of gibs and animations. N
+// can't die if you're not alive
/mob/proc/gib()
- death(1)
- var/atom/movable/overlay/animation = null
- notransform = 1
- canmove = 0
- icon = null
- invisibility = 101
+ return FALSE
- playsound(src.loc, 'sound/goonstation/effects/gib.ogg', 50, 1)
-
- animation = new(loc)
- animation.icon_state = "blank"
- animation.icon = 'icons/mob/mob.dmi'
- animation.master = src
-
-// flick("gibbed-m", animation)
- gibs(loc, dna)
- dead_mob_list -= src
- if(client)
- respawnable_list += src
- spawn(15)
- if(animation) qdel(animation)
- if(src) qdel(src)
-
-
-//This is the proc for turning a mob into ash. Mostly a copy of gib code (above).
-//Originally created for wizard disintegrate. I've removed the virus code since it's irrelevant here.
-//Dusting robots does not eject the MMI, so it's a bit more powerful than gib() /N
/mob/proc/dust()
- death(1)
- var/atom/movable/overlay/animation = null
- notransform = 1
- canmove = 0
- icon = null
- invisibility = 101
-
- animation = new(loc)
- animation.icon_state = "blank"
- animation.icon = 'icons/mob/mob.dmi'
- animation.master = src
-
-// flick("dust-m", animation)
- new /obj/effect/decal/cleanable/ash(loc)
-
- dead_mob_list -= src
- if(client)
- respawnable_list += src
- spawn(15)
- if(animation) qdel(animation)
- if(src) qdel(src)
+ return FALSE
/mob/proc/melt()
- death(1)
- var/atom/movable/overlay/animation = null
- notransform = 1
- canmove = 0
- icon = null
- invisibility = 101
-
- animation = new(loc)
- animation.icon_state = "blank"
- animation.icon = 'icons/mob/mob.dmi'
- animation.master = src
-
-// flick("liquify", animation)
-// new /obj/effect/decal/cleanable/ash(loc)
-
- dead_mob_list -= src
- if(client)
- respawnable_list += src
- spawn(15)
- if(animation) qdel(animation)
- if(src) qdel(src)
+ return FALSE
/mob/proc/death(gibbed)
-
- //Makes it so gib/dust/melt all unbuckle their victims from anything they may be buckled to to avoid breaking beds/chairs/etc
- if(gibbed && buckled)
- buckled.unbuckle_mob()
-
- //Quick fix for corpses kept propped up in chairs. ~Z
- drop_r_hand()
- drop_l_hand()
- //End of fix.
-
- timeofdeath = world.time
-
- living_mob_list -= src
- dead_mob_list += src
- if(client)
- respawnable_list += src
- return ..(gibbed)
+ return FALSE
diff --git a/code/modules/mob/hear_say.dm b/code/modules/mob/hear_say.dm
index 6c11ee7a3a4..2593d2eebaf 100644
--- a/code/modules/mob/hear_say.dm
+++ b/code/modules/mob/hear_say.dm
@@ -28,7 +28,7 @@
//non-verbal languages are garbled if you can't see the speaker. Yes, this includes if they are inside a closet.
if(language && (language.flags & NONVERBAL))
- if(!has_vision()) //blind people can't see dumbass
+ if(!has_vision(information_only = TRUE)) //blind people can't see dumbass
message = stars(message)
if(!speaker || !(speaker in view(src)))
@@ -95,7 +95,7 @@
//non-verbal languages are garbled if you can't see the speaker. Yes, this includes if they are inside a closet.
if(language && (language.flags & NONVERBAL))
- if(!has_vision()) //blind people can't see dumbass
+ if(!has_vision(information_only=TRUE)) //blind people can't see dumbass
message = stars(message)
if(!speaker || !(speaker in view(src)))
diff --git a/code/modules/mob/living/carbon/alien/alien.dm b/code/modules/mob/living/carbon/alien/alien.dm
index 8f74fbce413..7d2b92b1d14 100644
--- a/code/modules/mob/living/carbon/alien/alien.dm
+++ b/code/modules/mob/living/carbon/alien/alien.dm
@@ -19,6 +19,8 @@
var/leaping = 0
ventcrawler = 2
var/list/alien_organs = list()
+ var/death_message = "lets out a waning guttural screech, green blood bubbling from its maw..."
+ var/death_sound = 'sound/voice/hiss6.ogg'
/mob/living/carbon/alien/New()
verbs += /mob/living/verb/mob_sleep
@@ -49,25 +51,25 @@
/mob/living/carbon/alien/adjustToxLoss(amount)
- return
+ return STATUS_UPDATE_NONE
/mob/living/carbon/alien/adjustFireLoss(amount) // Weak to Fire
if(amount > 0)
- ..(amount * 2)
+ return ..(amount * 2)
else
- ..(amount)
- return
+ return ..(amount)
/mob/living/carbon/alien/check_eye_prot()
return 2
-/mob/living/carbon/alien/updatehealth()
+/mob/living/carbon/alien/updatehealth(reason = "none given")
if(status_flags & GODMODE)
health = maxHealth
stat = CONSCIOUS
return
health = maxHealth - getOxyLoss() - getFireLoss() - getBruteLoss() - getCloneLoss()
+ update_stat("updatehealth([reason])")
/mob/living/carbon/alien/handle_environment(var/datum/gas_mixture/environment)
@@ -256,4 +258,4 @@ Des: Removes all infected images from the alien.
if(getBruteLoss() < 200)
return pick("xltrails_1", "xltrails_2")
else
- return pick("xttrails_1", "xttrails_2")
\ No newline at end of file
+ return pick("xttrails_1", "xttrails_2")
diff --git a/code/modules/mob/living/carbon/alien/alien_defense.dm b/code/modules/mob/living/carbon/alien/alien_defense.dm
index 72bf30ceedf..ec2d96ed880 100644
--- a/code/modules/mob/living/carbon/alien/alien_defense.dm
+++ b/code/modules/mob/living/carbon/alien/alien_defense.dm
@@ -17,7 +17,7 @@ In all, this is a lot like the monkey code. /N
switch(M.a_intent)
if(INTENT_HELP)
AdjustSleeping(-5)
- resting = 0
+ StopResting()
AdjustParalysis(-3)
AdjustStunned(-3)
AdjustWeakened(-3)
@@ -36,7 +36,6 @@ In all, this is a lot like the monkey code. /N
"[M.name] bites [src]!")
adjustBruteLoss(damage)
add_attack_logs(M, src, "Alien attack", ATKLOG_ALL)
- updatehealth()
else
to_chat(M, "[name] is too injured for that.")
@@ -75,4 +74,3 @@ In all, this is a lot like the monkey code. /N
adjustCloneLoss(damage)
if(STAMINA)
adjustStaminaLoss(damage)
- updatehealth()
diff --git a/code/modules/mob/living/carbon/alien/death.dm b/code/modules/mob/living/carbon/alien/death.dm
index 6d663d6f3d4..e8982bb89e6 100644
--- a/code/modules/mob/living/carbon/alien/death.dm
+++ b/code/modules/mob/living/carbon/alien/death.dm
@@ -43,18 +43,15 @@
if(src) qdel(src)
/mob/living/carbon/alien/death(gibbed)
- if(stat == DEAD) return
- if(healths) healths.icon_state = "health6"
- stat = DEAD
+ // Only execute the below if we successfully died
+ . = ..(gibbed)
+ if(!.)
+ return FALSE
+ if(healths)
+ healths.icon_state = "health6"
if(!gibbed)
- playsound(loc, 'sound/voice/hiss6.ogg', 80, 1, 1)
- for(var/mob/O in viewers(src, null))
- O.show_message("[src] lets out a waning guttural screech, green blood bubbling from its maw...", 1)
- update_canmove()
+ if(death_sound)
+ playsound(loc, death_sound, 80, 1, 1)
+ visible_message("[src] [death_message]")
update_icons()
-
- timeofdeath = world.time
- if(mind) mind.store_memory("Time of death: [station_time_timestamp("hh:mm:ss", timeofdeath)]", 0)
-
- return ..(gibbed)
diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
index 8946189b4cb..da47f8c80b5 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
@@ -73,10 +73,7 @@
AdjustEarDamage(15)
AdjustEarDeaf(60)
- adjustBruteLoss(b_loss)
- adjustFireLoss(f_loss)
-
- updatehealth()
+ take_overall_damage(b_loss, f_loss)
/mob/living/carbon/alien/humanoid/attack_slime(mob/living/carbon/slime/M)
..()
@@ -85,7 +82,6 @@
damage = rand(10, 40)
adjustBruteLoss(damage)
add_attack_logs(src, M, "Slime'd for [damage] damage")
- updatehealth()
return
/mob/living/carbon/alien/humanoid/restrained()
diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid_defense.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid_defense.dm
index 3fa08702605..cef087f343c 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/humanoid_defense.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid_defense.dm
@@ -30,7 +30,6 @@
"You hear someone fall.")
adjustBruteLoss(damage)
add_attack_logs(M, src, "Melee attacked with fists")
- updatehealth()
else
playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
visible_message("[M] has attempted to punch [src]!")
@@ -56,4 +55,4 @@
/mob/living/carbon/alien/humanoid/do_attack_animation(atom/A, visual_effect_icon, obj/item/used_item, no_effect, end_pixel_y)
if(!no_effect && !visual_effect_icon)
visual_effect_icon = ATTACK_EFFECT_CLAW
- ..()
\ No newline at end of file
+ ..()
diff --git a/code/modules/mob/living/carbon/alien/humanoid/life.dm b/code/modules/mob/living/carbon/alien/humanoid/life.dm
index 180d6bd8072..7771f1f5f90 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/life.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/life.dm
@@ -44,12 +44,10 @@
updatehealth()
if(stat == DEAD) //DEAD. BROWN BREAD. SWIMMING WITH THE SPESS CARP
- blinded = 1
SetSilence(0)
else //ALIVE. LIGHTS ARE ON
if(health < config.health_threshold_dead || !get_int_organ(/obj/item/organ/internal/brain))
death()
- blinded = 1
SetSilence(0)
return 1
@@ -62,10 +60,8 @@
Paralyse(3)
if(paralysis)
- blinded = 1
stat = UNCONSCIOUS
else if(sleeping)
- blinded = 1
stat = UNCONSCIOUS
if(prob(10) && health)
emote("hiss")
@@ -77,12 +73,8 @@
if(move_delay_add > 0)
move_delay_add = max(0, move_delay_add - rand(1, 2))
- //Eyes
- if(disabilities & BLIND) //disabled-blind, doesn't get better on its own
- blinded = 1
- else if(eye_blind) //blindness, heals slowly over time
+ if(eye_blind) //blindness, heals slowly over time
AdjustEyeBlind(-1)
- blinded = 1
else if(eye_blurry) //blurry eyes heal slowly
AdjustEyeBlurry(-1)
diff --git a/code/modules/mob/living/carbon/alien/larva/death.dm b/code/modules/mob/living/carbon/alien/larva/death.dm
deleted file mode 100644
index 7d1101ca7d8..00000000000
--- a/code/modules/mob/living/carbon/alien/larva/death.dm
+++ /dev/null
@@ -1,15 +0,0 @@
-/mob/living/carbon/alien/larva/death(gibbed)
- if(stat == DEAD) return
- if(healths) healths.icon_state = "health6"
- stat = DEAD
- icon_state = "larva_dead"
-
- if(!gibbed)
- visible_message("[src] lets out a waning high-pitched cry.")
- update_canmove()
-
- timeofdeath = world.time
- if(mind) mind.store_memory("Time of death: [station_time_timestamp("hh:mm:ss", timeofdeath)]", 0)
- living_mob_list -= src
-
- return ..(gibbed)
diff --git a/code/modules/mob/living/carbon/alien/larva/larva.dm b/code/modules/mob/living/carbon/alien/larva/larva.dm
index 783d683f060..d0deac3e132 100644
--- a/code/modules/mob/living/carbon/alien/larva/larva.dm
+++ b/code/modules/mob/living/carbon/alien/larva/larva.dm
@@ -12,6 +12,8 @@
var/amount_grown = 0
var/max_grown = 200
var/time_of_birth
+ death_message = "lets out a waning high-pitched cry."
+ death_sound = null
//This is fine right now, if we're adding organ specific damage this needs to be updated
/mob/living/carbon/alien/larva/New()
diff --git a/code/modules/mob/living/carbon/alien/larva/life.dm b/code/modules/mob/living/carbon/alien/larva/life.dm
index 5bbb31c00d1..654e9e27af3 100644
--- a/code/modules/mob/living/carbon/alien/larva/life.dm
+++ b/code/modules/mob/living/carbon/alien/larva/life.dm
@@ -11,12 +11,10 @@
updatehealth()
if(stat == DEAD) //DEAD. BROWN BREAD. SWIMMING WITH THE SPESS CARP
- blinded = 1
SetSilence(0)
else //ALIVE. LIGHTS ARE ON
if(health < -25 || !get_int_organ(/obj/item/organ/internal/brain))
death()
- blinded = 1
SetSilence(0)
return 1
@@ -30,10 +28,8 @@
Paralyse(3)
if(paralysis)
- blinded = 1
stat = UNCONSCIOUS
else if(sleeping)
- blinded = 1
stat = UNCONSCIOUS
if(prob(10) && health)
emote("hiss_")
@@ -45,12 +41,8 @@
if(move_delay_add > 0)
move_delay_add = max(0, move_delay_add - rand(1, 2))
- //Eyes
- if(disabilities & BLIND) //disabled-blind, doesn't get better on its own
- blinded = 1
- else if(eye_blind) //blindness, heals slowly over time
+ if(eye_blind) //blindness, heals slowly over time
AdjustEyeBlind(-1)
- blinded = 1
else if(eye_blurry) //blurry eyes heal slowly
AdjustEyeBlurry(-1)
diff --git a/code/modules/mob/living/carbon/alien/larva/powers.dm b/code/modules/mob/living/carbon/alien/larva/powers.dm
index b3df2879f8f..f1076721cf1 100644
--- a/code/modules/mob/living/carbon/alien/larva/powers.dm
+++ b/code/modules/mob/living/carbon/alien/larva/powers.dm
@@ -9,16 +9,10 @@
if(layer != TURF_LAYER+0.2)
layer = TURF_LAYER+0.2
- to_chat(src, text("You are now hiding."))
- for(var/mob/O in oviewers(src, null))
- if((O.client && !( O.blinded )))
- to_chat(O, text("[] scurries to the ground!", src))
+ visible_message("[src] scurries to the ground!", "You are now hiding.")
else
layer = MOB_LAYER
- to_chat(src, text("You have stopped hiding."))
- for(var/mob/O in oviewers(src, null))
- if((O.client && !( O.blinded )))
- to_chat(O, text("[] slowly peaks up from the ground...", src))
+ visible_message("[src] slowly peeks up from the ground...", "You have stopped hiding.")
/mob/living/carbon/alien/larva/verb/evolve()
set name = "Evolve"
diff --git a/code/modules/mob/living/carbon/brain/death.dm b/code/modules/mob/living/carbon/brain/death.dm
index c38823173eb..777fce50423 100644
--- a/code/modules/mob/living/carbon/brain/death.dm
+++ b/code/modules/mob/living/carbon/brain/death.dm
@@ -1,42 +1,26 @@
/mob/living/carbon/brain/death(gibbed)
- if(stat == DEAD) return
+ // Only execute the below if we successfully died
+ . = ..()
+ if(!.)
+ return FALSE
if(!gibbed && container && istype(container, /obj/item/mmi))//If not gibbed but in a container.
- for(var/mob/O in viewers(container, null))
- O.show_message(text("[]'s MMI flatlines!", src), 1, "You hear something flatline.", 2)
+ visible_message("[src]'s MMI flatlines!", "You hear something flatline.")
container.icon_state = "mmi_dead"
- stat = DEAD
-
- sight |= SEE_TURFS|SEE_MOBS|SEE_OBJS
- see_in_dark = 8
- see_invisible = SEE_INVISIBLE_LEVEL_TWO
-
- timeofdeath = world.time
- if(mind) mind.store_memory("Time of death: [station_time_timestamp("hh:mm:ss", timeofdeath)]", 0) //mind. ?
-
- return ..(gibbed)
/mob/living/carbon/brain/gib()
- death(1)
- var/atom/movable/overlay/animation = null
+ // can we muster a parent call here?
+ if(!death(TRUE) && stat != DEAD)
+ return FALSE
notransform = 1
canmove = 0
icon = null
invisibility = 101
- animation = new(loc)
- animation.icon_state = "blank"
- animation.icon = 'icons/mob/mob.dmi'
- animation.master = src
-
-// flick("gibbed-m", animation)
gibs(loc, dna)
- dead_mob_list -= src
if(container && istype(container, /obj/item/mmi))
qdel(container)//Gets rid of the MMI if there is one
if(loc)
if(istype(loc,/obj/item/organ/internal/brain))
qdel(loc)//Gets rid of the brain item
- spawn(15)
- if(animation) qdel(animation)
- if(src) qdel(src)
+ QDEL_IN(src, 0)
diff --git a/code/modules/mob/living/carbon/brain/life.dm b/code/modules/mob/living/carbon/brain/life.dm
index 757ccab9fb9..2ac3b3c4d6b 100644
--- a/code/modules/mob/living/carbon/brain/life.dm
+++ b/code/modules/mob/living/carbon/brain/life.dm
@@ -29,19 +29,12 @@
adjustFireLoss(5.0*discomfort)
/mob/living/carbon/brain/handle_regular_status_updates()
- updatehealth()
+ . = ..()
- if(stat == DEAD)
- blinded = 1
- SetSilence(0)
- else
+ if(.)
if(!container && (health < config.health_threshold_dead || ((world.time - timeofhostdeath) > config.revival_brain_life)))
death()
- blinded = 1
- SetSilence(0)
- return 1
-
- . = 1
+ return 0
/mob/living/carbon/brain/breathe()
return
diff --git a/code/modules/mob/living/carbon/brain/update_status.dm b/code/modules/mob/living/carbon/brain/update_status.dm
index 2532edfe37d..431d1eea0c3 100644
--- a/code/modules/mob/living/carbon/brain/update_status.dm
+++ b/code/modules/mob/living/carbon/brain/update_status.dm
@@ -1,8 +1,16 @@
-/mob/living/carbon/brain/update_stat()
+/mob/living/carbon/brain/update_stat(reason = "none given")
if(status_flags & GODMODE)
return
// if(health <= min_health)
- if(health <= config.health_threshold_dead)
- if(stat != DEAD)
+ if(stat == DEAD)
+ if(container && health > config.health_threshold_dead)
+ update_revive()
+ create_debug_log("revived, trigger reason: [reason]")
+ return
+ else
+ if(!container || health <= config.health_threshold_dead)
+ // Considered "dead" without any external apparatus
death()
+ create_debug_log("died, trigger reason: [reason]")
+ return
// Put brain(organ) damaging code here
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 8e4bfb95105..c5557028896 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -60,7 +60,7 @@
if(organ.receive_damage(d, 0))
H.UpdateDamageIcon()
- H.updatehealth()
+ H.updatehealth("stomach attack")
else
src.take_organ_damage(d)
@@ -144,7 +144,7 @@
return 0
if(reagents.has_reagent("teslium"))
shock_damage *= 1.5 //If the mob has teslium in their body, shocks are 50% more damaging!
- take_overall_damage(0,shock_damage, used_weapon = "Electrocution")
+ take_overall_damage(0,shock_damage, TRUE, used_weapon = "Electrocution")
visible_message(
"[src] was shocked by \the [source]!", \
"You feel a powerful shock coursing through your body!", \
@@ -269,7 +269,7 @@
H.w_uniform.add_fingerprint(M)
AdjustSleeping(-5)
if(sleeping == 0)
- resting = 0
+ StopResting()
AdjustParalysis(-3)
AdjustStunned(-3)
AdjustWeakened(-3)
diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm
index 5df7407ec71..e22b3b25445 100644
--- a/code/modules/mob/living/carbon/carbon_defense.dm
+++ b/code/modules/mob/living/carbon/carbon_defense.dm
@@ -55,9 +55,9 @@
var/stunprob = M.powerlevel * 7 + 10
if(prob(stunprob) && M.powerlevel >= 8)
adjustFireLoss(M.powerlevel * rand(6,10))
- updatehealth()
+ updatehealth("slime attack")
return 1
/mob/living/carbon/is_mouth_covered(head_only = FALSE, mask_only = FALSE)
if((!mask_only && head && (head.flags_cover & HEADCOVERSMOUTH)) || (!head_only && wear_mask && (wear_mask.flags_cover & MASKCOVERSMOUTH)))
- return TRUE
\ No newline at end of file
+ return TRUE
diff --git a/code/modules/mob/living/carbon/death.dm b/code/modules/mob/living/carbon/death.dm
index 2ad9b1ef6ab..8a06d1474a0 100644
--- a/code/modules/mob/living/carbon/death.dm
+++ b/code/modules/mob/living/carbon/death.dm
@@ -1,12 +1,11 @@
/mob/living/carbon/death(gibbed)
- SetLoseBreath(0)
- med_hud_set_health()
- med_hud_set_status()
+ // Only execute the below if we successfully died
+ . = ..(gibbed)
+ if(!.)
+ return FALSE
if(reagents)
reagents.death_metabolize(src)
for(var/obj/item/organ/internal/I in internal_organs)
I.on_owner_death()
-
- ..(gibbed)
diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm
index bdca496d256..b2d2d24400b 100644
--- a/code/modules/mob/living/carbon/human/death.dm
+++ b/code/modules/mob/living/carbon/human/death.dm
@@ -1,5 +1,6 @@
/mob/living/carbon/human/gib()
- death(1)
+ if(!death(TRUE) && stat != DEAD)
+ return FALSE
var/atom/movable/overlay/animation = null
notransform = 1
canmove = 0
@@ -43,13 +44,13 @@
var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
s.set_up(3, 1, src)
s.start()
-
- spawn(15)
- if(animation) qdel(animation)
- if(src) qdel(src)
+ QDEL_IN(animation, 15)
+ QDEL_IN(src, 0)
+ return TRUE
/mob/living/carbon/human/dust()
- death(1)
+ if(!death(TRUE) && stat != DEAD)
+ return FALSE
var/atom/movable/overlay/animation = null
notransform = 1
canmove = 0
@@ -63,13 +64,13 @@
flick("dust-h", animation)
new dna.species.remains_type(get_turf(src))
-
- spawn(15)
- if(animation) qdel(animation)
- if(src) qdel(src)
+ QDEL_IN(src, 0)
+ QDEL_IN(animation, 15)
+ return TRUE
/mob/living/carbon/human/melt()
- death(1)
+ if(!death(TRUE) && stat != DEAD)
+ return FALSE
var/atom/movable/overlay/animation = null
notransform = 1
canmove = 0
@@ -82,60 +83,48 @@
animation.master = src
flick("liquify", animation)
+ QDEL_IN(src, 0)
+ QDEL_IN(animation, 15)
//new /obj/effect/decal/remains/human(loc)
-
- spawn(15)
- if(animation) qdel(animation)
- if(src) qdel(src)
+ return TRUE
/mob/living/carbon/human/death(gibbed)
- if(stat == DEAD)
- return
- if(healths)
- healths.icon_state = "health5"
-
- if(!gibbed)
+ if(can_die() && !gibbed)
emote("deathgasp") //let the world KNOW WE ARE DEAD
- stat = DEAD
- SetDizzy(0)
- SetJitter(0)
+ // Only execute the below if we successfully died
+ . = ..(gibbed)
+ if(!.)
+ return FALSE
+
set_heartattack(FALSE)
- //Handle species-specific deaths.
if(dna.species)
+ dna.species.handle_hud_icons(src)
+ //Handle species-specific deaths.
dna.species.handle_death(src)
- callHook("death", list(src, gibbed))
-
if(ishuman(LAssailant))
var/mob/living/carbon/human/H=LAssailant
if(H.mind)
H.mind.kills += "[key_name(src)]"
- if(!gibbed)
- update_canmove()
-
- timeofdeath = world.time
- med_hud_set_health()
- med_hud_set_status()
- if(mind) mind.store_memory("Time of death: [station_time_timestamp("hh:mm:ss", timeofdeath)]", 0)
if(ticker && ticker.mode)
// log_world("k")
sql_report_death(src)
- ticker.mode.check_win() //Calls the rounds wincheck, mainly for wizard, malf, and changeling now
if(wearing_rig)
wearing_rig.notify_ai("Warning: user death event. Mobility control passed to integrated intelligence system.")
- return ..(gibbed)
-
/mob/living/carbon/human/update_revive()
. = ..()
- // Update healthdoll
if(. && healthdoll)
// We're alive again, so re-build the entire healthdoll
healthdoll.cached_healthdoll_overlays.Cut()
+ // Update healthdoll
+ if(dna.species)
+ dna.species.update_sight(src)
+ dna.species.handle_hud_icons(src)
/mob/living/carbon/human/proc/makeSkeleton()
var/obj/item/organ/external/head/H = get_organ("head")
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index d718e7e95d3..fd72a50bca1 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -294,7 +294,7 @@
if(prob(50) && !shielded)
Paralyse(10)
- take_overall_damage(b_loss,f_loss, used_weapon = "Explosive Blast")
+ take_overall_damage(b_loss,f_loss, TRUE, used_weapon = "Explosive Blast")
..()
@@ -1272,7 +1272,7 @@
else
to_chat(usr, "[self ? "Your" : "[src]'s"] pulse is [src.get_pulse(GETPULSE_HAND)].")
-/mob/living/carbon/human/proc/set_species(datum/species/new_species, default_colour, delay_icon_update = FALSE, skip_same_check = FALSE)
+/mob/living/carbon/human/proc/set_species(datum/species/new_species, default_colour, delay_icon_update = FALSE, skip_same_check = FALSE, retain_damage = FALSE)
if(!skip_same_check)
if(dna.species.name == initial(new_species.name))
return
@@ -1325,7 +1325,69 @@
if(I)
kept_items[I] = thing
- dna.species.create_organs(src)
+ if(retain_damage)
+ //Create a list of body parts which are damaged by burn or brute and save them to apply after new organs are generated. First we just handle external organs.
+ var/bodypart_damages = list()
+ //Loop through all external organs and save the damage states for brute and burn
+ for(var/obj/item/organ/external/E in bodyparts)
+ if(E.brute_dam == 0 && E.burn_dam == 0 && E.internal_bleeding == FALSE) //If there's no damage we don't bother remembering it.
+ continue
+ var/brute = E.brute_dam
+ var/burn = E.burn_dam
+ var/IB = E.internal_bleeding
+ var/obj/item/organ/external/OE = new E.type()
+ var/stats = list(OE, brute, burn, IB)
+ bodypart_damages += list(stats)
+
+ //Now we do the same for internal organs via the same proceedure.
+ var/internal_damages = list()
+ for(var/obj/item/organ/internal/I in internal_organs)
+ if(I.damage == 0)
+ continue
+ var/obj/item/organ/internal/OI = new I.type()
+ var/damage = I.damage
+ var/broken = I.is_broken()
+ var/stats = list(OI, damage, broken)
+ internal_damages += list(stats)
+
+ //Create the new organs for the species change
+ dna.species.create_organs(src)
+
+ //Apply relevant damages and variables to the new organs.
+ for(var/B in bodyparts)
+ var/obj/item/organ/external/E = B
+ for(var/list/part in bodypart_damages)
+ var/obj/item/organ/external/OE = part[1]
+ if((E.type == OE.type)) // Type has to be explicit, as right limbs are a child of left ones etc.
+ var/brute = part[2]
+ var/burn = part[3]
+ var/IB = part[4]
+ //Deal the damage to the new organ and then delete the entry to prevent duplicate checks
+ E.receive_damage(brute, burn, ignore_resists = TRUE)
+ E.internal_bleeding = IB
+ qdel(part)
+
+ for(var/O in internal_organs)
+ var/obj/item/organ/internal/I = O
+ for(var/list/part in internal_damages)
+ var/obj/item/organ/internal/OI = part[1]
+ var/organ_type
+
+ if(OI.parent_type == /obj/item/organ/internal) //Dealing with species organs
+ organ_type = OI.type
+ else
+ organ_type = OI.parent_type
+
+ if(istype(I, organ_type))
+ var/damage = part[2]
+ var/broken = part[3]
+ I.receive_damage(damage, 1)
+ if(broken && !(I.status & ORGAN_BROKEN))
+ I.status |= ORGAN_BROKEN
+ qdel(part)
+
+ else
+ dna.species.create_organs(src)
for(var/thing in kept_items)
equip_to_slot_if_possible(thing, kept_items[thing], redraw_mob = 0)
@@ -1598,7 +1660,7 @@ Eyes need to have significantly high darksight to shine unless the mob has the X
if(H.health > config.health_threshold_dead && H.health <= config.health_threshold_crit)
var/suff = min(H.getOxyLoss(), 7)
H.adjustOxyLoss(-suff)
- H.updatehealth()
+ H.updatehealth("cpr")
visible_message("[src] performs CPR on [H.name]!", \
"You perform CPR on [H.name].")
@@ -1867,4 +1929,4 @@ Eyes need to have significantly high darksight to shine unless the mob has the X
/mob/living/carbon/human/proc/special_post_clone_handling()
if(mind && mind.assigned_role == "Cluwne") //HUNKE your suffering never stops
- makeCluwne()
\ No newline at end of file
+ makeCluwne()
diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm
index ddfce48f6ce..d82fc719d88 100644
--- a/code/modules/mob/living/carbon/human/human_damage.dm
+++ b/code/modules/mob/living/carbon/human/human_damage.dm
@@ -1,5 +1,5 @@
//Updates the mob's health from organs and mob damage variables
-/mob/living/carbon/human/updatehealth()
+/mob/living/carbon/human/updatehealth(reason = "none given")
if(status_flags & GODMODE)
health = maxHealth
stat = CONSCIOUS
@@ -17,20 +17,14 @@
//TODO: fix husking
if(((maxHealth - total_burn) < config.health_threshold_dead) && stat == DEAD)
ChangeToHusk()
- if(dna.species.can_revive_by_healing)
- var/obj/item/organ/internal/brain/B = get_int_organ(/obj/item/organ/internal/brain)
- if(B)
- if((health >= (config.health_threshold_dead + config.health_threshold_crit) * 0.5) && stat == DEAD && getBrainLoss()<120)
- update_revive()
- if(stat == CONSCIOUS && (src in dead_mob_list)) //Defib fix
- update_revive()
+ update_stat("updatehealth([reason])")
med_hud_set_health()
med_hud_set_status()
- handle_hud_icons()
+ handle_hud_icons_health()
-/mob/living/carbon/human/adjustBrainLoss(amount)
+/mob/living/carbon/human/adjustBrainLoss(amount, updating = TRUE)
if(status_flags & GODMODE)
- return 0 //godmode
+ return STATUS_UPDATE_NONE //godmode
if(dna.species && dna.species.has_organ["brain"])
var/obj/item/organ/internal/brain/sponge = get_int_organ(/obj/item/organ/internal/brain)
@@ -38,15 +32,13 @@
if(dna.species)
amount = amount * dna.species.brain_mod
sponge.receive_damage(amount, 1)
- brainloss = sponge.damage
- else
- brainloss = 200
- else
- brainloss = 0
+ if(updating)
+ update_stat("adjustBrainLoss")
+ return STATUS_UPDATE_STAT
-/mob/living/carbon/human/setBrainLoss(amount)
+/mob/living/carbon/human/setBrainLoss(amount, updating = TRUE)
if(status_flags & GODMODE)
- return 0 //godmode
+ return STATUS_UPDATE_NONE //godmode
if(dna.species && dna.species.has_organ["brain"])
var/obj/item/organ/internal/brain/sponge = get_int_organ(/obj/item/organ/internal/brain)
@@ -54,11 +46,9 @@
if(dna.species)
amount = amount * dna.species.brain_mod
sponge.damage = min(max(amount, 0), (maxHealth*2))
- brainloss = sponge.damage
- else
- brainloss = 200
- else
- brainloss = 0
+ if(updating)
+ update_stat("setBrainLoss")
+ return STATUS_UPDATE_STAT
/mob/living/carbon/human/getBrainLoss()
if(status_flags & GODMODE)
@@ -67,12 +57,11 @@
if(dna.species && dna.species.has_organ["brain"])
var/obj/item/organ/internal/brain/sponge = get_int_organ(/obj/item/organ/internal/brain)
if(sponge)
- brainloss = min(sponge.damage,maxHealth*2)
+ return min(sponge.damage,maxHealth*2)
else
- brainloss = 200
+ return 200
else
- brainloss = 0
- return brainloss
+ return 0
//These procs fetch a cumulative total damage from all organs
/mob/living/carbon/human/getBruteLoss()
@@ -88,23 +77,27 @@
return amount
-/mob/living/carbon/human/adjustBruteLoss(amount, damage_source, robotic=0)
+/mob/living/carbon/human/adjustBruteLoss(amount, updating_health = TRUE, damage_source = null, robotic = FALSE)
if(dna.species)
amount = amount * dna.species.brute_mod
if(amount > 0)
- take_overall_damage(amount, 0, used_weapon = damage_source)
+ take_overall_damage(amount, 0, updating_health, used_weapon = damage_source)
else
- heal_overall_damage(-amount, 0, 0, robotic)
+ heal_overall_damage(-amount, 0, updating_health, FALSE, robotic)
+ // brainless default for now
+ return STATUS_UPDATE_HEALTH
-/mob/living/carbon/human/adjustFireLoss(amount, damage_source, robotic=0)
+/mob/living/carbon/human/adjustFireLoss(amount, updating_health = TRUE, damage_source = null, robotic = FALSE)
if(dna.species)
amount = amount * dna.species.burn_mod
if(amount > 0)
- take_overall_damage(0, amount, used_weapon = damage_source)
+ take_overall_damage(0, amount, updating_health, used_weapon = damage_source)
else
- heal_overall_damage(0, -amount, 0, robotic)
+ heal_overall_damage(0, -amount, updating_health, FALSE, robotic)
+ // brainless default for now
+ return STATUS_UPDATE_HEALTH
-/mob/living/carbon/human/proc/adjustBruteLossByPart(amount, organ_name, obj/damage_source = null)
+/mob/living/carbon/human/proc/adjustBruteLossByPart(amount, organ_name, obj/damage_source = null, updating_health = TRUE)
if(dna.species)
amount = amount * dna.species.brute_mod
@@ -112,13 +105,14 @@
var/obj/item/organ/external/O = get_organ(organ_name)
if(amount > 0)
- O.receive_damage(amount, 0, sharp=is_sharp(damage_source), used_weapon=damage_source)
+ O.receive_damage(amount, 0, sharp=is_sharp(damage_source), used_weapon=damage_source, list(), FALSE, updating_health)
else
//if you don't want to heal robot organs, they you will have to check that yourself before using this proc.
- O.heal_damage(-amount, 0, internal = 0, robo_repair = O.is_robotic())
+ O.heal_damage(-amount, 0, internal = 0, robo_repair = O.is_robotic(), updating_health = updating_health)
+ return STATUS_UPDATE_HEALTH
-/mob/living/carbon/human/proc/adjustFireLossByPart(amount, organ_name, obj/damage_source = null)
+/mob/living/carbon/human/proc/adjustFireLossByPart(amount, organ_name, obj/damage_source = null, updating_health = TRUE)
if(dna.species)
amount = amount * dna.species.burn_mod
@@ -126,22 +120,23 @@
var/obj/item/organ/external/O = get_organ(organ_name)
if(amount > 0)
- O.receive_damage(0, amount, sharp=is_sharp(damage_source), used_weapon=damage_source)
+ O.receive_damage(0, amount, sharp=is_sharp(damage_source), used_weapon=damage_source, forbidden_limbs = list(), ignore_resists = FALSE, updating_health = updating_health)
else
//if you don't want to heal robot organs, they you will have to check that yourself before using this proc.
- O.heal_damage(0, -amount, internal = 0, robo_repair = O.is_robotic())
+ O.heal_damage(0, -amount, internal = 0, robo_repair = O.is_robotic(), updating_health = updating_health)
+ return STATUS_UPDATE_HEALTH
/mob/living/carbon/human/Paralyse(amount)
// Notify our AI if they can now control the suit.
if(wearing_rig && !stat && paralysis < amount) //We are passing out right this second.
wearing_rig.notify_ai("Warning: user consciousness failure. Mobility control passed to integrated intelligence system.")
- ..()
+ return ..()
/mob/living/carbon/human/adjustCloneLoss(amount)
if(dna.species)
amount = amount * dna.species.clone_mod
- ..()
+ . = ..()
var/heal_prob = max(0, 80 - getCloneLoss())
var/mut_prob = min(80, getCloneLoss() + 10)
@@ -181,22 +176,22 @@
/mob/living/carbon/human/adjustOxyLoss(amount)
if(dna.species)
amount = amount * dna.species.oxy_mod
- ..()
+ . = ..()
/mob/living/carbon/human/setOxyLoss(amount)
if(dna.species)
amount = amount * dna.species.oxy_mod
- ..()
+ . = ..()
/mob/living/carbon/human/adjustToxLoss(amount)
if(dna.species)
amount = amount * dna.species.tox_mod
- ..()
+ . = ..()
/mob/living/carbon/human/setToxLoss(amount)
if(dna.species)
amount = amount * dna.species.tox_mod
- ..()
+ . = ..()
////////////////////////////////////////////
@@ -223,31 +218,29 @@
//Heals ONE external organ, organ gets randomly selected from damaged ones.
//It automatically updates damage overlays if necesary
//It automatically updates health status
-/mob/living/carbon/human/heal_organ_damage(brute, burn)
+/mob/living/carbon/human/heal_organ_damage(brute, burn, updating_health = TRUE)
var/list/obj/item/organ/external/parts = get_damaged_organs(brute,burn)
if(!parts.len)
return
var/obj/item/organ/external/picked = pick(parts)
- if(picked.heal_damage(brute,burn))
+ if(picked.heal_damage(brute,burn, updating_health))
UpdateDamageIcon()
- updatehealth()
//Damages ONE external organ, organ gets randomly selected from damagable ones.
//It automatically updates damage overlays if necesary
//It automatically updates health status
-/mob/living/carbon/human/take_organ_damage(brute, burn, sharp = 0, edge = 0)
+/mob/living/carbon/human/take_organ_damage(brute, burn, updating_health = TRUE, sharp = 0, edge = 0)
var/list/obj/item/organ/external/parts = get_damageable_organs()
if(!parts.len)
return
var/obj/item/organ/external/picked = pick(parts)
- if(picked.receive_damage(brute, burn, sharp))
+ if(picked.receive_damage(brute, burn, sharp, updating_health))
UpdateDamageIcon()
- updatehealth()
speech_problem_flag = 1
//Heal MANY external organs, in random order
-/mob/living/carbon/human/heal_overall_damage(brute, burn, internal=0, robotic=0)
+/mob/living/carbon/human/heal_overall_damage(brute, burn, updating_health = TRUE, internal=0, robotic=0)
var/list/obj/item/organ/external/parts = get_damaged_organs(brute,burn)
var/update = 0
@@ -257,20 +250,21 @@
var/brute_was = picked.brute_dam
var/burn_was = picked.burn_dam
- update |= picked.heal_damage(brute,burn, internal, robotic)
+ update |= picked.heal_damage(brute,burn, internal, robotic, updating_health = FALSE)
brute -= (brute_was-picked.brute_dam)
burn -= (burn_was-picked.burn_dam)
parts -= picked
- updatehealth()
+ if(updating_health)
+ updatehealth("heal overall damage")
speech_problem_flag = 1
if(update)
UpdateDamageIcon()
// damage MANY external organs, in random order
-/mob/living/carbon/human/take_overall_damage(brute, burn, sharp = 0, edge = 0, used_weapon = null)
+/mob/living/carbon/human/take_overall_damage(brute, burn, updating_health = TRUE, used_weapon = null, sharp = 0, edge = 0)
if(status_flags & GODMODE)
return //godmode
var/list/obj/item/organ/external/parts = get_damageable_organs()
@@ -285,14 +279,15 @@
var/burn_was = picked.burn_dam
- update |= picked.receive_damage(brute_per_part, burn_per_part, sharp, used_weapon)
+ update |= picked.receive_damage(brute_per_part, burn_per_part, sharp, used_weapon, list(), FALSE, FALSE)
brute -= (picked.brute_dam - brute_was)
burn -= (picked.burn_dam - burn_was)
parts -= picked
- updatehealth()
+ if(updating_health)
+ updatehealth("take overall damage")
if(update)
UpdateDamageIcon()
@@ -364,7 +359,7 @@ This function restores all organs.
var/list/attack_bubble_recipients = list()
var/mob/living/user
for(var/mob/O in viewers(user, src))
- if(O.client && !(O.blinded))
+ if(O.client && O.has_vision(information_only=TRUE))
attack_bubble_recipients.Add(O.client)
spawn(0)
var/image/dmgIcon = image('icons/effects/hit_blips.dmi', src, "dmg[rand(1,2)]",MOB_LAYER+1)
@@ -383,5 +378,5 @@ This function restores all organs.
UpdateDamageIcon()
// Will set our damageoverlay icon to the next level, which will then be set back to the normal level the next mob.Life().
- updatehealth()
+ updatehealth("apply damage")
return 1
diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index b8e209498c2..6e1d35fb0d2 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -375,7 +375,7 @@ emp_act
var/obj/item/organ/external/affecting = get_organ(ran_zone(L.zone_sel.selecting))
var/armor_block = run_armor_check(affecting, "melee")
apply_damage(damage, BRUTE, affecting, armor_block)
- updatehealth()
+ updatehealth("larva attack")
/mob/living/carbon/human/attack_alien(mob/living/carbon/alien/humanoid/M)
if(check_shields(0, M.name))
@@ -404,7 +404,7 @@ emp_act
"[M] has wounded [src]!")
apply_effect(4, WEAKEN, armor_block)
add_attack_logs(M, src, "Alien attacked")
- updatehealth()
+ updatehealth("alien attack")
if(M.a_intent == INTENT_DISARM)
if(prob(80))
@@ -434,7 +434,7 @@ emp_act
if(affected)
affected.add_autopsy_data(M.name, damage) // Add the mob's name to the autopsy data
apply_damage(damage, M.melee_damage_type, affecting, armor)
- updatehealth()
+ updatehealth("animal attack")
/mob/living/carbon/human/attack_slime(mob/living/carbon/slime/M)
..()
@@ -473,7 +473,7 @@ emp_act
M.mech_toxin_damage(src)
else
return
- updatehealth()
+ updatehealth("mech melee attack")
M.occupant_message("You hit [src].")
visible_message("[src] has been hit by [M.name].", \
@@ -502,4 +502,4 @@ emp_act
if(check_head && head && (head.flags_cover & HEADCOVERSEYES))
return TRUE
if(check_mask && wear_mask && (wear_mask.flags_cover & MASKCOVERSMOUTH))
- return TRUE
\ No newline at end of file
+ return TRUE
diff --git a/code/modules/mob/living/carbon/human/human_organs.dm b/code/modules/mob/living/carbon/human/human_organs.dm
index 5dcae16b87a..2c03e66bf8a 100644
--- a/code/modules/mob/living/carbon/human/human_organs.dm
+++ b/code/modules/mob/living/carbon/human/human_organs.dm
@@ -38,7 +38,7 @@
// Buckled to a bed/chair. Stance damage is forced to 0 since they're sitting on something solid
// Not standing, so no need to care about stance
- if(istype(buckled, /obj/structure/stool/bed) || !isturf(loc))
+ if(istype(buckled, /obj/structure/chair) || !isturf(loc))
return
for(var/limb_tag in list("l_leg","r_leg","l_foot","r_foot"))
diff --git a/code/modules/mob/living/carbon/human/interactive/interactive.dm b/code/modules/mob/living/carbon/human/interactive/interactive.dm
index d8d469cfd57..abdcf9d7373 100644
--- a/code/modules/mob/living/carbon/human/interactive/interactive.dm
+++ b/code/modules/mob/living/carbon/human/interactive/interactive.dm
@@ -67,14 +67,13 @@
//modules
var/list/functions = list("nearbyscan","combat","shitcurity","chatter")
var/restrictedJob = 0
- var/shouldUseDynamicProc = 0 // switch to make the AI control it's own proccessing
- var/alternateProcessing = 0
var/forceProcess = 0
- var/processTime = 10
var/speak_file = "npc_chatter.json"
var/debugexamine = FALSE //If we show debug info in our examine
var/showexaminetext = TRUE //If we show our telltale examine text
+ var/voice_saved = FALSE
+
var/list/knownStrings = list()
//snpc traitor variables
@@ -95,6 +94,8 @@
knownStrings = list()
/mob/living/carbon/human/interactive/proc/saveVoice()
+ if(voice_saved)
+ return
var/savefile/S = new /savefile("data/npc_saves/snpc.sav")
S["knownStrings"] << knownStrings
@@ -142,7 +143,7 @@
doing = 0
inactivity_period = 0
-/client/proc/resetSNPC(mob/living/carbon/human/interactive/T in npc_master.botPool_l)
+/client/proc/resetSNPC(mob/living/carbon/human/interactive/T in SSnpcpool.processing)
set name = "Reset SNPC"
set desc = "Reset the SNPC"
set category = "Debug"
@@ -153,20 +154,7 @@
if(istype(T))
T.reset()
-/client/proc/toggleSNPC(mob/living/carbon/human/interactive/T in npc_master.botPool_l)
- set name = "Toggle SNPC Proccessing Mode"
- set desc = "Toggle SNPC Proccessing Mode"
- set category = "Debug"
-
- if(!holder)
- return
-
- if(istype(T))
- T.alternateProcessing = !T.alternateProcessing
- T.forceProcess = 1
- to_chat(usr, "[T]'s processing has been switched to [T.alternateProcessing ? "High Profile" : "Low Profile"]")
-
-/client/proc/customiseSNPC(mob/living/carbon/human/interactive/T in npc_master.botPool_l)
+/client/proc/customiseSNPC(mob/living/carbon/human/interactive/T in SSnpcpool.processing)
set name = "Customize SNPC"
set desc = "Customize the SNPC"
set category = "Debug"
@@ -191,8 +179,12 @@
T.myjob = cjob
T.job = cjob.title
T.mind.assigned_role = cjob.title
- for(var/obj/item/W in T)
- qdel(W)
+ for(var/obj/item/I in T)
+ if(istype(I, /obj/item/implant))
+ continue
+ if(istype(I, /obj/item/organ))
+ continue
+ qdel(I)
T.myjob.equip(T)
T.doSetup(alt_title)
@@ -316,6 +308,12 @@
if(TRAITS & TRAIT_THIEVING)
slyness = 75
+/mob/living/carbon/human/interactive/proc/InteractiveProcess()
+ if(ticker.current_state == GAME_STATE_FINISHED)
+ saveVoice()
+ voice_saved = TRUE
+ doProcess()
+
/mob/living/carbon/human/interactive/proc/setup_job(thejob)
switch(thejob)
if("Civilian")
@@ -419,7 +417,7 @@
sync_mind()
random()
doSetup()
- npc_master.insertBot(src)
+ START_PROCESSING(SSnpcpool, src)
loadVoice()
hear_radio_list += src
@@ -432,9 +430,7 @@
doProcess()
/mob/living/carbon/human/interactive/Destroy()
- hear_radio_list -= src
- snpc_list -= src
- npc_master.removeBot(src)
+ SSnpcpool.stop_processing(src)
return ..()
/mob/living/carbon/human/interactive/proc/retalTarget(mob/living/target)
@@ -578,8 +574,11 @@
return get_dist(get_turf(towhere), get_turf(src))
/mob/living/carbon/human/interactive/death()
+ // Only execute the below if we successfully died
+ . = ..()
+ if(!.)
+ return FALSE
saveVoice()
- ..()
/mob/living/carbon/human/interactive/hear_say(message, verb = "says", datum/language/language = null, italics = 0, mob/speaker = null, sound/speech_sound, sound_vol)
if(!istype(speaker, /mob/living/carbon/human/interactive))
@@ -592,17 +591,7 @@
..()
/mob/living/carbon/human/interactive/proc/doProcess()
- forceProcess = 0
-
- if(shouldUseDynamicProc)
- var/isSeen = 0
- for(var/mob/living/carbon/human/A in orange(12, src))
- if(A.client)
- isSeen = 1
- alternateProcessing = isSeen
- if(alternateProcessing)
- forceProcess = 1
-
+ set waitfor = FALSE
if(IsDeadOrIncap())
reset()
return
@@ -630,10 +619,13 @@
if(istype(D,/obj/machinery/door/airlock))
var/obj/machinery/door/airlock/AL = D
if(!AL.CanAStarPass(RPID)) // only crack open doors we can't get through
+ inactivity_period = 20
AL.panel_open = 1
AL.update_icon()
AL.shock(src, mistake_chance)
sleep(5)
+ if(QDELETED(AL))
+ return
AL.unlock()
if(prob(mistake_chance))
if(!AL.wires.IsIndexCut(AIRLOCK_WIRE_DOOR_BOLTS))
@@ -650,6 +642,8 @@
if(prob(mistake_chance) && !AL.wires.IsIndexCut(AIRLOCK_WIRE_ELECTRIFY))
AL.wires.CutWireIndex(AIRLOCK_WIRE_ELECTRIFY)
sleep(5)
+ if(QDELETED(AL))
+ return
AL.panel_open = 0
AL.update_icon()
D.open()
@@ -683,7 +677,7 @@
//proc functions
for(var/Proc in functions)
if(!IsDeadOrIncap())
- callfunction(Proc)
+ INVOKE_ASYNC(src, Proc)
//target interaction stays hardcoded
@@ -697,8 +691,8 @@
if(istype(TARGET, /obj/machinery/door))
var/obj/machinery/door/D = TARGET
if(D.check_access(MYID) && !istype(D,/obj/machinery/door/poddoor))
+ inactivity_period = 10
D.open()
- sleep(15)
var/turf/T = get_step(get_step(D.loc, dir), dir) //recursion yo
tryWalk(T)
//THIEVING SKILLS
@@ -722,15 +716,8 @@
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)
- spawn(5)
- equip_to_appropriate_slot(C)
+ dressup(TARGET)
update_hands = 1
if(MYPDA in loc)
equip_to_appropriate_slot(MYPDA)
@@ -787,9 +774,19 @@
TARGET = traitorTarget
tryWalk(TARGET)
LAST_TARGET = TARGET
- if(alternateProcessing)
- spawn(processTime)
- doProcess()
+
+/mob/living/carbon/human/interactive/proc/dressup(obj/item/clothing/C)
+ set waitfor = FALSE
+ inactivity_period = 12
+ sleep(5)
+ if(!QDELETED(C) && !QDELETED(src))
+ take_to_slot(C,1)
+ if(!equip_to_appropriate_slot(C))
+ var/obj/item/I = get_item_by_slot(C)
+ unEquip(I)
+ sleep(5)
+ if(!QDELETED(src) && !QDELETED(C))
+ equip_to_appropriate_slot(C)
/mob/living/carbon/human/interactive/proc/favouredObjIn(list/inList)
var/list/outList = list()
@@ -801,10 +798,6 @@
outList = inList
return outList
-/mob/living/carbon/human/interactive/proc/callfunction(Proc)
- spawn(0)
- call(src, Proc)(src)
-
/mob/living/carbon/human/interactive/proc/tryWalk(turf/inTarget)
if(restrictedJob) // we're a job that has to stay in our home
if(!(get_turf(inTarget) in get_area_turfs(job2area(myjob))))
diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm
index 50848851646..c74d7b47c56 100644
--- a/code/modules/mob/living/carbon/human/inventory.dm
+++ b/code/modules/mob/living/carbon/human/inventory.dm
@@ -114,7 +114,7 @@
if(G.tint)
update_tint()
if(G.prescription)
- clear_fullscreen("nearsighted")
+ update_nearsighted_effects()
if(G.vision_flags || G.darkness_view || G.invis_override || G.invis_view)
update_sight()
update_inv_glasses()
@@ -266,8 +266,7 @@
if(G.tint)
update_tint()
if(G.prescription)
- if(disabilities & NEARSIGHTED)
- overlay_fullscreen("nearsighted", /obj/screen/fullscreen/impaired, 1)
+ update_nearsighted_effects()
if(G.vision_flags || G.darkness_view || G.invis_override || G.invis_view)
update_sight()
update_inv_glasses(redraw_mob)
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index d577a02e2c4..11df45462c4 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -144,12 +144,12 @@
if(3)
emote("drool")
- if(getBrainLoss() >= 100 && stat != 2) //you lapse into a coma and die without immediate aid; RIP. -Fox
+ if(getBrainLoss() >= 100 && stat != DEAD) //you lapse into a coma and die without immediate aid; RIP. -Fox
Weaken(20)
AdjustLoseBreath(10)
AdjustSilence(2)
- if(getBrainLoss() >= 120 && stat != 2) //they died from stupidity--literally. -Fox
+ if(getBrainLoss() >= 120 && stat != DEAD) //they died from stupidity--literally. -Fox
visible_message("[src] goes limp, [p_their()] facial expression utterly blank.")
death()
@@ -339,16 +339,16 @@
if(bodytemperature >= dna.species.heat_level_1 && bodytemperature <= dna.species.heat_level_2)
throw_alert("temp", /obj/screen/alert/hot, 1)
- take_overall_damage(burn=mult*HEAT_DAMAGE_LEVEL_1, used_weapon = "High Body Temperature")
+ take_overall_damage(burn=mult*HEAT_DAMAGE_LEVEL_1, updating_health = TRUE, used_weapon = "High Body Temperature")
if(bodytemperature > dna.species.heat_level_2 && bodytemperature <= dna.species.heat_level_3)
throw_alert("temp", /obj/screen/alert/hot, 2)
- take_overall_damage(burn=mult*HEAT_DAMAGE_LEVEL_2, used_weapon = "High Body Temperature")
+ take_overall_damage(burn=mult*HEAT_DAMAGE_LEVEL_2, updating_health = TRUE, used_weapon = "High Body Temperature")
if(bodytemperature > dna.species.heat_level_3 && bodytemperature < INFINITY)
throw_alert("temp", /obj/screen/alert/hot, 3)
if(on_fire)
- take_overall_damage(burn=mult*HEAT_DAMAGE_LEVEL_3, used_weapon = "Fire")
+ take_overall_damage(burn=mult*HEAT_DAMAGE_LEVEL_3, updating_health = TRUE, used_weapon = "Fire")
else
- take_overall_damage(burn=mult*HEAT_DAMAGE_LEVEL_2, used_weapon = "High Body Temperature")
+ take_overall_damage(burn=mult*HEAT_DAMAGE_LEVEL_2, updating_health = TRUE, used_weapon = "High Body Temperature")
else if(bodytemperature < dna.species.cold_level_1)
if(status_flags & GODMODE)
@@ -360,13 +360,13 @@
var/mult = dna.species.coldmod
if(bodytemperature >= dna.species.cold_level_2 && bodytemperature <= dna.species.cold_level_1)
throw_alert("temp", /obj/screen/alert/cold, 1)
- take_overall_damage(burn=mult*COLD_DAMAGE_LEVEL_1, used_weapon = "Low Body Temperature")
+ take_overall_damage(burn=mult*COLD_DAMAGE_LEVEL_1, updating_health = TRUE, used_weapon = "Low Body Temperature")
if(bodytemperature >= dna.species.cold_level_3 && bodytemperature < dna.species.cold_level_2)
throw_alert("temp", /obj/screen/alert/cold, 2)
- take_overall_damage(burn=mult*COLD_DAMAGE_LEVEL_2, used_weapon = "Low Body Temperature")
+ take_overall_damage(burn=mult*COLD_DAMAGE_LEVEL_2, updating_health = TRUE, used_weapon = "Low Body Temperature")
if(bodytemperature > -INFINITY && bodytemperature < dna.species.cold_level_3)
throw_alert("temp", /obj/screen/alert/cold, 3)
- take_overall_damage(burn=mult*COLD_DAMAGE_LEVEL_3, used_weapon = "Low Body Temperature")
+ take_overall_damage(burn=mult*COLD_DAMAGE_LEVEL_3, updating_health = TRUE, used_weapon = "Low Body Temperature")
else
clear_alert("temp")
else
@@ -382,7 +382,7 @@
if(adjusted_pressure >= dna.species.hazard_high_pressure)
if(!(HEATRES in mutations))
var/pressure_damage = min( ( (adjusted_pressure / dna.species.hazard_high_pressure) -1 )*PRESSURE_DAMAGE_COEFFICIENT , MAX_HIGH_PRESSURE_DAMAGE)
- take_overall_damage(brute=pressure_damage, used_weapon = "High Pressure")
+ take_overall_damage(brute=pressure_damage, updating_health = TRUE, used_weapon = "High Pressure")
throw_alert("pressure", /obj/screen/alert/highpressure, 2)
else
clear_alert("pressure")
@@ -396,7 +396,7 @@
if(COLDRES in mutations)
clear_alert("pressure")
else
- take_overall_damage(brute=LOW_PRESSURE_DAMAGE, used_weapon = "Low Pressure")
+ take_overall_damage(brute=LOW_PRESSURE_DAMAGE, updating_health = TRUE, used_weapon = "Low Pressure")
throw_alert("pressure", /obj/screen/alert/lowpressure, 2)
@@ -657,8 +657,6 @@
handle_trace_chems()
- updatehealth()
-
return //TODO: DEFERRED
/mob/living/carbon/human/handle_drunk()
@@ -744,13 +742,11 @@
heal_overall_damage(0.1, 0.1)
if(paralysis)
- blinded = 1
stat = UNCONSCIOUS
else if(sleeping)
speech_problem_flag = 1
- blinded = 1
stat = UNCONSCIOUS
if(mind)
@@ -761,7 +757,6 @@
adjustToxLoss(-1)
else if(status_flags & FAKEDEATH)
- blinded = 1
stat = UNCONSCIOUS
//Vision //god knows why this is here
@@ -771,26 +766,21 @@
if(!dna.species.vision_organ) // Presumably if a species has no vision organs, they see via some other means.
SetEyeBlind(0)
- blinded = 0
SetEyeBlurry(0)
else if(!vision || vision.is_broken()) // Vision organs cut out or broken? Permablind.
EyeBlind(2)
- blinded = 1
EyeBlurry(2)
else
//blindness
if(disabilities & BLIND) // Disabled-blind, doesn't get better on its own
- blinded = 1
else if(eye_blind) // Blindness, heals slowly over time
AdjustEyeBlind(-1)
- blinded = 1
else if(istype(glasses, /obj/item/clothing/glasses/sunglasses/blindfold)) //resting your eyes with a blindfold heals blurry eyes faster
AdjustEyeBlurry(-3)
- blinded = 1
//blurry sight
if(vision.is_bruised()) // Vision organs impaired? Permablurry.
@@ -826,7 +816,6 @@
else //dead
- blinded = 1
SetSilence(0)
@@ -860,11 +849,13 @@
remoteview_target = null
reset_perspective(null)
- dna.species.handle_vision(src)
-
/mob/living/carbon/human/handle_hud_icons()
dna.species.handle_hud_icons(src)
+/mob/living/carbon/human/handle_hud_icons_health()
+ dna.species.handle_hud_icons_health(src)
+ handle_hud_icons_health_overlay()
+
/mob/living/carbon/human/handle_random_events()
// Puke if toxloss is too high
if(!stat)
diff --git a/code/modules/mob/living/carbon/human/species/_species.dm b/code/modules/mob/living/carbon/human/species/_species.dm
index cb1d9b55319..ea6abc3a65c 100644
--- a/code/modules/mob/living/carbon/human/species/_species.dm
+++ b/code/modules/mob/living/carbon/human/species/_species.dm
@@ -504,43 +504,23 @@
/datum/species/proc/handle_can_equip(obj/item/I, slot, disable_warning = 0, mob/living/carbon/human/user)
return FALSE
-/datum/species/proc/handle_vision(mob/living/carbon/human/H)
- // Right now this just handles blind, blurry, and similar states
- if(H.blinded || H.eye_blind)
- H.overlay_fullscreen("blind", /obj/screen/fullscreen/blind)
- H.throw_alert("blind", /obj/screen/alert/blind)
- else
- H.clear_fullscreen("blind")
- H.clear_alert("blind")
-
-
- if(H.disabilities & NEARSIGHTED) //this looks meh but saves a lot of memory by not requiring to add var/prescription
- if(H.glasses) //to every /obj/item
- var/obj/item/clothing/glasses/G = H.glasses
- if(G.prescription)
- H.clear_fullscreen("nearsighted")
- else
- H.overlay_fullscreen("nearsighted", /obj/screen/fullscreen/impaired, 1)
- else
- H.overlay_fullscreen("nearsighted", /obj/screen/fullscreen/impaired, 1)
- else
- H.clear_fullscreen("nearsighted")
-
- if(H.eye_blurry)
- H.overlay_fullscreen("blurry", /obj/screen/fullscreen/blurry)
- else
- H.clear_fullscreen("blurry")
-
- if(H.druggy)
- H.overlay_fullscreen("high", /obj/screen/fullscreen/high)
- H.throw_alert("high", /obj/screen/alert/high)
- else
- H.clear_fullscreen("high")
- H.clear_alert("high")
+/datum/species/proc/get_perceived_trauma(mob/living/carbon/human/H)
+ return 100 - ((NO_PAIN in species_traits) ? 0 : H.traumatic_shock) - H.getStaminaLoss()
/datum/species/proc/handle_hud_icons(mob/living/carbon/human/H)
if(!H.client)
return
+ handle_hud_icons_health(H)
+ H.handle_hud_icons_health_overlay()
+ handle_hud_icons_nutrition(H)
+
+/datum/species/proc/handle_hud_icons_health(mob/living/carbon/H)
+ if(!H.client)
+ return
+ handle_hud_icons_health_side(H)
+ handle_hud_icons_health_doll(H)
+
+/datum/species/proc/handle_hud_icons_health_side(mob/living/carbon/human/H)
if(H.healths)
if(H.stat == DEAD)
H.healths.icon_state = "health7"
@@ -550,7 +530,7 @@
if(SCREWYHUD_DEAD) H.healths.icon_state = "health7"
if(SCREWYHUD_HEALTHY) H.healths.icon_state = "health0"
else
- switch(100 - ((NO_PAIN in species_traits) ? 0 : H.traumatic_shock) - H.staminaloss)
+ switch(get_perceived_trauma(H))
if(100 to INFINITY) H.healths.icon_state = "health0"
if(80 to 100) H.healths.icon_state = "health1"
if(60 to 80) H.healths.icon_state = "health2"
@@ -559,6 +539,7 @@
if(0 to 20) H.healths.icon_state = "health5"
else H.healths.icon_state = "health6"
+/datum/species/proc/handle_hud_icons_health_doll(mob/living/carbon/human/H)
if(H.healthdoll)
if(H.stat == DEAD)
H.healthdoll.icon_state = "healthdoll_DEAD"
@@ -588,6 +569,7 @@
H.healthdoll.overlays -= (cached_overlays - new_overlays)
H.healthdoll.cached_healthdoll_overlays = new_overlays
+/datum/species/proc/handle_hud_icons_nutrition(mob/living/carbon/human/H)
switch(H.nutrition)
if(NUTRITION_LEVEL_FULL to INFINITY)
H.throw_alert("nutrition", /obj/screen/alert/fat)
@@ -717,4 +699,4 @@ It'll return null if the organ doesn't correspond, so include null checks when u
random_species += initial(S.name)
var/picked_species = pick(random_species)
var/datum/species/selected_species = GLOB.all_species[picked_species]
- return species_name ? picked_species : selected_species.type
\ No newline at end of file
+ return species_name ? picked_species : selected_species.type
diff --git a/code/modules/mob/living/carbon/human/species/station.dm b/code/modules/mob/living/carbon/human/species/station.dm
new file mode 100644
index 00000000000..ec8076cf37b
--- /dev/null
+++ b/code/modules/mob/living/carbon/human/species/station.dm
@@ -0,0 +1,1040 @@
+/datum/species/human
+ name = "Human"
+ name_plural = "Humans"
+ icobase = 'icons/mob/human_races/r_human.dmi'
+ deform = 'icons/mob/human_races/r_def_human.dmi'
+ primitive_form = /datum/species/monkey
+ language = "Sol Common"
+ species_traits = list(LIPS, CAN_BE_FAT)
+ skinned_type = /obj/item/stack/sheet/animalhide/human
+ clothing_flags = HAS_UNDERWEAR | HAS_UNDERSHIRT | HAS_SOCKS
+ bodyflags = HAS_SKIN_TONE | HAS_BODY_MARKINGS
+ dietflags = DIET_OMNI
+ blurb = "Humanity originated in the Sol system, and over the last five centuries has spread \
+ colonies across a wide swathe of space. They hold a wide range of forms and creeds.
\
+ While the central Sol government maintains control of its far-flung people, powerful corporate \
+ interests, rampant cyber and bio-augmentation and secretive factions make life on most human \
+ worlds tumultous at best."
+
+ reagent_tag = PROCESS_ORG
+ //Has standard darksight of 2.
+
+/datum/species/unathi
+ name = "Unathi"
+ name_plural = "Unathi"
+ icobase = 'icons/mob/human_races/r_lizard.dmi'
+ deform = 'icons/mob/human_races/r_def_lizard.dmi'
+ language = "Sinta'unathi"
+ tail = "sogtail"
+ skinned_type = /obj/item/stack/sheet/animalhide/lizard
+ unarmed_type = /datum/unarmed_attack/claws
+ primitive_form = /datum/species/monkey/unathi
+
+ blurb = "A heavily reptillian species, Unathi (or 'Sinta as they call themselves) hail from the \
+ Uuosa-Eso system, which roughly translates to 'burning mother'.
Coming from a harsh, radioactive \
+ desert planet, they mostly hold ideals of honesty, virtue, martial combat and bravery above all \
+ else, frequently even their own lives. They prefer warmer temperatures than most species and \
+ their native tongue is a heavy hissing laungage called Sinta'Unathi."
+
+ species_traits = list(LIPS)
+ clothing_flags = HAS_UNDERWEAR | HAS_UNDERSHIRT | HAS_SOCKS
+ bodyflags = HAS_TAIL | HAS_HEAD_ACCESSORY | HAS_BODY_MARKINGS | HAS_HEAD_MARKINGS | HAS_SKIN_COLOR | HAS_ALT_HEADS | TAIL_WAGGING
+ dietflags = DIET_CARN
+
+ cold_level_1 = 280 //Default 260 - Lower is better
+ cold_level_2 = 220 //Default 200
+ cold_level_3 = 140 //Default 120
+
+ heat_level_1 = 380 //Default 360 - Higher is better
+ heat_level_2 = 420 //Default 400
+ heat_level_3 = 480 //Default 460
+
+ flesh_color = "#34AF10"
+ reagent_tag = PROCESS_ORG
+ base_color = "#066000"
+ //Default styles for created mobs.
+ default_headacc = "Simple"
+ default_headacc_colour = "#404040"
+ butt_sprite = "unathi"
+ brute_mod = 1.05
+
+ has_organ = list(
+ "heart" = /obj/item/organ/internal/heart,
+ "lungs" = /obj/item/organ/internal/lungs,
+ "liver" = /obj/item/organ/internal/liver/unathi,
+ "kidneys" = /obj/item/organ/internal/kidneys,
+ "brain" = /obj/item/organ/internal/brain,
+ "appendix" = /obj/item/organ/internal/appendix,
+ "eyes" = /obj/item/organ/internal/eyes/unathi //3 darksight.
+ )
+
+ allowed_consumed_mobs = list(/mob/living/simple_animal/mouse, /mob/living/simple_animal/lizard, /mob/living/simple_animal/chick, /mob/living/simple_animal/chicken,
+ /mob/living/simple_animal/crab, /mob/living/simple_animal/butterfly, /mob/living/simple_animal/parrot, /mob/living/simple_animal/tribble)
+
+ suicide_messages = list(
+ "is attempting to bite their tongue off!",
+ "is jamming their claws into their eye sockets!",
+ "is twisting their own neck!",
+ "is holding their breath!")
+
+ var/datum/action/innate/tail_lash/lash = new()
+
+
+/datum/species/unathi/handle_post_spawn(var/mob/living/carbon/human/H)
+ lash.Grant(H)
+ ..()
+
+/datum/action/innate/tail_lash
+ name = "Tail lash"
+ icon_icon = 'icons/effects/effects.dmi'
+ button_icon_state = "tail"
+
+/datum/action/innate/tail_lash/Activate()
+ var/mob/living/carbon/human/user = owner
+ if(!user.restrained() || !user.buckled)
+ to_chat(user, "You need freedom of movement to tail lash!")
+ return
+ if(user.getStaminaLoss() >= 50)
+ to_chat(user, "Rest before tail lashing again!")
+ return
+ for(var/mob/living/carbon/human/C in orange(1))
+ var/obj/item/organ/external/E = C.get_organ(pick("l_leg", "r_leg", "l_foot", "r_foot", "groin"))
+ if(E)
+ user.changeNext_move(CLICK_CD_MELEE)
+ user.visible_message("[src] smacks [C] in [E] with their tail! ", "You hit [C] in [E] with your tail!")
+ user.adjustStaminaLoss(15)
+ C.apply_damage(5, BRUTE, E)
+ user.spin(20, 1)
+ playsound(user.loc, 'sound/weapons/slash.ogg', 50, 0)
+
+
+
+/datum/species/unathi/handle_death(var/mob/living/carbon/human/H)
+ H.stop_tail_wagging(1)
+
+/datum/species/tajaran
+ name = "Tajaran"
+ name_plural = "Tajaran"
+ icobase = 'icons/mob/human_races/r_tajaran.dmi'
+ deform = 'icons/mob/human_races/r_def_tajaran.dmi'
+ language = "Siik'tajr"
+ tail = "tajtail"
+ skinned_type = /obj/item/stack/sheet/fur
+ unarmed_type = /datum/unarmed_attack/claws
+
+ blurb = "The Tajaran race is a species of feline-like bipeds hailing from the planet of Ahdomai in the \
+ S'randarr system. They have been brought up into the space age by the Humans and Skrell, and have been \
+ influenced heavily by their long history of Slavemaster rule. They have a structured, clan-influenced way \
+ of family and politics. They prefer colder environments, and speak a variety of languages, mostly Siik'Maas, \
+ using unique inflections their mouths form."
+
+ cold_level_1 = 240
+ cold_level_2 = 180
+ cold_level_3 = 100
+
+ heat_level_1 = 340
+ heat_level_2 = 380
+ heat_level_3 = 440
+
+ primitive_form = /datum/species/monkey/tajaran
+
+ species_traits = list(LIPS, CAN_BE_FAT)
+ clothing_flags = HAS_UNDERWEAR | HAS_UNDERSHIRT | HAS_SOCKS
+ bodyflags = HAS_TAIL | HAS_HEAD_ACCESSORY | HAS_HEAD_MARKINGS | HAS_BODY_MARKINGS | HAS_SKIN_COLOR | TAIL_WAGGING
+ dietflags = DIET_OMNI
+ taste_sensitivity = TASTE_SENSITIVITY_SHARP
+ reagent_tag = PROCESS_ORG
+ flesh_color = "#AFA59E"
+ base_color = "#424242"
+ butt_sprite = "tajaran"
+
+ has_organ = list(
+ "heart" = /obj/item/organ/internal/heart,
+ "lungs" = /obj/item/organ/internal/lungs,
+ "liver" = /obj/item/organ/internal/liver/tajaran,
+ "kidneys" = /obj/item/organ/internal/kidneys,
+ "brain" = /obj/item/organ/internal/brain,
+ "appendix" = /obj/item/organ/internal/appendix,
+ "eyes" = /obj/item/organ/internal/eyes/tajaran /*Most Tajara see in full colour as a result of genetic augmentation, although it cost them their darksight (darksight = 2)
+ unless they choose otherwise by selecting the colourblind disability in character creation (darksight = 8 but colourblind).*/
+ )
+
+ allowed_consumed_mobs = list(/mob/living/simple_animal/mouse, /mob/living/simple_animal/chick, /mob/living/simple_animal/butterfly, /mob/living/simple_animal/parrot,
+ /mob/living/simple_animal/tribble)
+
+ suicide_messages = list(
+ "is attempting to bite their tongue off!",
+ "is jamming their claws into their eye sockets!",
+ "is twisting their own neck!",
+ "is holding their breath!")
+
+/datum/species/tajaran/handle_death(var/mob/living/carbon/human/H)
+ H.stop_tail_wagging(1)
+
+/datum/species/vulpkanin
+ name = "Vulpkanin"
+ name_plural = "Vulpkanin"
+ icobase = 'icons/mob/human_races/r_vulpkanin.dmi'
+ deform = 'icons/mob/human_races/r_vulpkanin.dmi'
+ language = "Canilunzt"
+ primitive_form = /datum/species/monkey/vulpkanin
+ tail = "vulptail"
+ skinned_type = /obj/item/stack/sheet/fur
+ unarmed_type = /datum/unarmed_attack/claws
+
+ blurb = "Vulpkanin are a species of sharp-witted canine-pideds residing on the planet Altam just barely within the \
+ dual-star Vazzend system. Their politically de-centralized society and independent natures have led them to become a species and \
+ culture both feared and respected for their scientific breakthroughs. Discovery, loyalty, and utilitarianism dominates their lifestyles \
+ to the degree it can cause conflict with more rigorous and strict authorities. They speak a guttural language known as 'Canilunzt' \
+ which has a heavy emphasis on utilizing tail positioning and ear twitches to communicate intent."
+
+ species_traits = list(LIPS)
+ clothing_flags = HAS_UNDERWEAR | HAS_UNDERSHIRT | HAS_SOCKS
+ bodyflags = HAS_TAIL | TAIL_WAGGING | TAIL_OVERLAPPED | HAS_HEAD_ACCESSORY | HAS_MARKINGS | HAS_SKIN_COLOR
+ dietflags = DIET_OMNI
+ hunger_drain = 0.11
+ taste_sensitivity = TASTE_SENSITIVITY_SHARP
+ reagent_tag = PROCESS_ORG
+ flesh_color = "#966464"
+ base_color = "#CF4D2F"
+ butt_sprite = "vulp"
+
+ scream_verb = "yelps"
+
+ has_organ = list(
+ "heart" = /obj/item/organ/internal/heart,
+ "lungs" = /obj/item/organ/internal/lungs,
+ "liver" = /obj/item/organ/internal/liver/vulpkanin,
+ "kidneys" = /obj/item/organ/internal/kidneys,
+ "brain" = /obj/item/organ/internal/brain,
+ "appendix" = /obj/item/organ/internal/appendix,
+ "eyes" = /obj/item/organ/internal/eyes/vulpkanin /*Most Vulpkanin see in full colour as a result of genetic augmentation, although it cost them their darksight (darksight = 2)
+ unless they choose otherwise by selecting the colourblind disability in character creation (darksight = 8 but colourblind).*/
+ )
+
+ allowed_consumed_mobs = list(/mob/living/simple_animal/mouse, /mob/living/simple_animal/lizard, /mob/living/simple_animal/chick, /mob/living/simple_animal/chicken,
+ /mob/living/simple_animal/crab, /mob/living/simple_animal/butterfly, /mob/living/simple_animal/parrot, /mob/living/simple_animal/tribble)
+
+ suicide_messages = list(
+ "is attempting to bite their tongue off!",
+ "is jamming their claws into their eye sockets!",
+ "is twisting their own neck!",
+ "is holding their breath!")
+
+/datum/species/vulpkanin/handle_death(var/mob/living/carbon/human/H)
+ H.stop_tail_wagging(1)
+
+/datum/species/skrell
+ name = "Skrell"
+ name_plural = "Skrell"
+ icobase = 'icons/mob/human_races/r_skrell.dmi'
+ deform = 'icons/mob/human_races/r_def_skrell.dmi'
+ language = "Skrellian"
+ primitive_form = /datum/species/monkey/skrell
+
+ blurb = "An amphibious species, Skrell come from the star system known as Qerr'Vallis, which translates to 'Star of \
+ the royals' or 'Light of the Crown'.
Skrell are a highly advanced and logical race who live under the rule \
+ of the Qerr'Katish, a caste within their society which keeps the empire of the Skrell running smoothly. Skrell are \
+ herbivores on the whole and tend to be co-operative with the other species of the galaxy, although they rarely reveal \
+ the secrets of their empire to their allies."
+
+ species_traits = list(LIPS)
+ clothing_flags = HAS_UNDERWEAR | HAS_UNDERSHIRT | HAS_SOCKS
+ bodyflags = HAS_SKIN_COLOR | HAS_BODY_MARKINGS
+ dietflags = DIET_HERB
+ taste_sensitivity = TASTE_SENSITIVITY_DULL
+ flesh_color = "#8CD7A3"
+ blood_color = "#1D2CBF"
+ base_color = "#38b661" //RGB: 56, 182, 97.
+ default_hair_colour = "#38b661"
+ eyes = "skrell_eyes_s"
+ //Default styles for created mobs.
+ default_hair = "Skrell Male Tentacles"
+ reagent_tag = PROCESS_ORG
+ butt_sprite = "skrell"
+
+ has_organ = list(
+ "heart" = /obj/item/organ/internal/heart,
+ "lungs" = /obj/item/organ/internal/lungs,
+ "liver" = /obj/item/organ/internal/liver/skrell,
+ "kidneys" = /obj/item/organ/internal/kidneys,
+ "brain" = /obj/item/organ/internal/brain,
+ "appendix" = /obj/item/organ/internal/appendix,
+ "eyes" = /obj/item/organ/internal/eyes, //Default darksight of 2.
+ "headpocket" = /obj/item/organ/internal/headpocket
+ )
+
+ suicide_messages = list(
+ "is attempting to bite their tongue off!",
+ "is jamming their thumbs into their eye sockets!",
+ "is twisting their own neck!",
+ "makes like a fish and suffocates!",
+ "is strangling themselves with their own tendrils!")
+
+/datum/species/vox
+ name = "Vox"
+ name_plural = "Vox"
+ icobase = 'icons/mob/human_races/vox/r_vox.dmi'
+ deform = 'icons/mob/human_races/vox/r_def_vox.dmi'
+ language = "Vox-pidgin"
+ tail = "voxtail"
+ speech_sounds = list('sound/voice/shriek1.ogg')
+ speech_chance = 20
+ unarmed_type = /datum/unarmed_attack/claws //I dont think it will hurt to give vox claws too.
+
+ blurb = "The Vox are the broken remnants of a once-proud race, now reduced to little more than \
+ scavenging vermin who prey on isolated stations, ships or planets to keep their own ancient arkships \
+ alive. They are four to five feet tall, reptillian, beaked, tailed and quilled; human crews often \
+ refer to them as 'shitbirds' for their violent and offensive nature, as well as their horrible \
+ smell.
Most humans will never meet a Vox raider, instead learning of this insular species through \
+ dealing with their traders and merchants; those that do rarely enjoy the experience."
+
+ brute_mod = 1.2 //20% more brute damage. Fragile bird bones.
+
+ warning_low_pressure = 50
+ hazard_low_pressure = 0
+
+ cold_level_1 = 80
+ cold_level_2 = 50
+ cold_level_3 = 0
+
+ breathid = "n2"
+
+ eyes = "vox_eyes_s"
+
+ species_traits = list(NO_SCAN, IS_WHITELISTED, NOTRANSSTING)
+ clothing_flags = HAS_SOCKS
+ dietflags = DIET_OMNI
+ bodyflags = HAS_ICON_SKIN_TONE | HAS_TAIL | TAIL_WAGGING | TAIL_OVERLAPPED | HAS_BODY_MARKINGS | HAS_TAIL_MARKINGS
+
+ blood_color = "#2299FC"
+ flesh_color = "#808D11"
+ //Default styles for created mobs.
+ default_hair = "Short Vox Quills"
+ default_hair_colour = "#614f19" //R: 97, G: 79, B: 25
+ butt_sprite = "vox"
+
+ reagent_tag = PROCESS_ORG
+ scream_verb = "shrieks"
+ male_scream_sound = 'sound/voice/shriek1.ogg'
+ female_scream_sound = 'sound/voice/shriek1.ogg'
+ male_cough_sounds = list('sound/voice/shriekcough.ogg')
+ female_cough_sounds = list('sound/voice/shriekcough.ogg')
+ male_sneeze_sound = 'sound/voice/shrieksneeze.ogg'
+ female_sneeze_sound = 'sound/voice/shrieksneeze.ogg'
+
+ icon_skin_tones = list(
+ 1 = "Default Green",
+ 2 = "Dark Green",
+ 3 = "Brown",
+ 4 = "Grey",
+ 5 = "Emerald",
+ 6 = "Azure"
+ )
+
+ has_organ = list(
+ "heart" = /obj/item/organ/internal/heart,
+ "lungs" = /obj/item/organ/internal/lungs/vox,
+ "liver" = /obj/item/organ/internal/liver/vox,
+ "kidneys" = /obj/item/organ/internal/kidneys,
+ "brain" = /obj/item/organ/internal/brain,
+ "appendix" = /obj/item/organ/internal/appendix,
+ "eyes" = /obj/item/organ/internal/eyes, //Default darksight of 2.
+ "stack" = /obj/item/organ/internal/stack //Not the same as the cortical stack implant Vox Raiders spawn with. The cortical stack implant is used
+ ) //for determining the success of the heist game-mode's 'leave nobody behind' objective, while this is just an organ.
+
+ suicide_messages = list(
+ "is attempting to bite their tongue off!",
+ "is jamming their claws into their eye sockets!",
+ "is twisting their own neck!",
+ "is holding their breath!",
+ "is deeply inhaling oxygen!")
+
+/datum/species/vox/handle_death(var/mob/living/carbon/human/H)
+ H.stop_tail_wagging(1)
+
+/datum/species/vox/after_equip_job(datum/job/J, mob/living/carbon/human/H)
+ if(!H.mind || !H.mind.assigned_role || H.mind.assigned_role != "Clown" && H.mind.assigned_role != "Mime")
+ H.unEquip(H.wear_mask)
+ H.unEquip(H.l_hand)
+
+ H.equip_or_collect(new /obj/item/clothing/mask/breath/vox(H), slot_wear_mask)
+ var/tank_pref = H.client && H.client.prefs ? H.client.prefs.speciesprefs : null
+ if(tank_pref)//Diseasel, here you go
+ H.equip_or_collect(new /obj/item/tank/nitrogen(H), slot_l_hand)
+ else
+ H.equip_or_collect(new /obj/item/tank/emergency_oxygen/vox(H), slot_l_hand)
+ to_chat(H, "You are now running on nitrogen internals from the [H.l_hand] in your hand. Your species finds oxygen toxic, so you must breathe nitrogen only.")
+ H.internal = H.l_hand
+ H.update_action_buttons_icon()
+
+/datum/species/vox/handle_post_spawn(var/mob/living/carbon/human/H)
+ updatespeciescolor(H)
+ H.update_icons()
+ //H.verbs += /mob/living/carbon/human/proc/leap
+ ..()
+
+/datum/species/vox/updatespeciescolor(var/mob/living/carbon/human/H, var/owner_sensitive = 1) //Handling species-specific skin-tones for the Vox race.
+ if(H.dna.species.bodyflags & HAS_ICON_SKIN_TONE) //Making sure we don't break Armalis.
+ var/new_icobase = 'icons/mob/human_races/vox/r_vox.dmi' //Default Green Vox.
+ var/new_deform = 'icons/mob/human_races/vox/r_def_vox.dmi' //Default Green Vox.
+ switch(H.s_tone)
+ if(6) //Azure Vox.
+ new_icobase = 'icons/mob/human_races/vox/r_voxazu.dmi'
+ new_deform = 'icons/mob/human_races/vox/r_def_voxazu.dmi'
+ H.tail = "voxtail_azu"
+ if(5) //Emerald Vox.
+ new_icobase = 'icons/mob/human_races/vox/r_voxemrl.dmi'
+ new_deform = 'icons/mob/human_races/vox/r_def_voxemrl.dmi'
+ H.tail = "voxtail_emrl"
+ if(4) //Grey Vox.
+ new_icobase = 'icons/mob/human_races/vox/r_voxgry.dmi'
+ new_deform = 'icons/mob/human_races/vox/r_def_voxgry.dmi'
+ H.tail = "voxtail_gry"
+ if(3) //Brown Vox.
+ new_icobase = 'icons/mob/human_races/vox/r_voxbrn.dmi'
+ new_deform = 'icons/mob/human_races/vox/r_def_voxbrn.dmi'
+ H.tail = "voxtail_brn"
+ if(2) //Dark Green Vox.
+ new_icobase = 'icons/mob/human_races/vox/r_voxdgrn.dmi'
+ new_deform = 'icons/mob/human_races/vox/r_def_voxdgrn.dmi'
+ H.tail = "voxtail_dgrn"
+ else //Default Green Vox.
+ H.tail = "voxtail" //Ensures they get an appropriately coloured tail depending on the skin-tone.
+
+ H.change_icobase(new_icobase, new_deform, owner_sensitive) //Update the icobase/deform of all our organs, but make sure we don't mess with frankenstein limbs in doing so.
+ H.update_dna()
+
+/datum/species/vox/handle_reagents(var/mob/living/carbon/human/H, var/datum/reagent/R)
+ if(R.id == "oxygen") //Armalis are above such petty things.
+ H.adjustToxLoss(1*REAGENTS_EFFECT_MULTIPLIER) //Same as plasma.
+ H.reagents.remove_reagent(R.id, REAGENTS_METABOLISM)
+ return 0 //Handling reagent removal on our own.
+
+ return ..()
+
+/datum/species/vox/armalis/handle_post_spawn(var/mob/living/carbon/human/H)
+ H.verbs += /mob/living/carbon/human/proc/leap
+ H.verbs += /mob/living/carbon/human/proc/gut
+ ..()
+
+/datum/species/vox/armalis
+ name = "Vox Armalis"
+ name_plural = "Vox Armalis"
+ icobase = 'icons/mob/human_races/r_armalis.dmi'
+ deform = 'icons/mob/human_races/r_armalis.dmi'
+ unarmed_type = /datum/unarmed_attack/claws/armalis
+
+ warning_low_pressure = 50
+ hazard_low_pressure = 0
+
+ cold_level_1 = 80
+ cold_level_2 = 50
+ cold_level_3 = 0
+
+ heat_level_1 = 2000
+ heat_level_2 = 3000
+ heat_level_3 = 4000
+
+ brute_mod = 0.2
+ burn_mod = 0.2
+
+ eyes = "blank_eyes"
+
+ species_traits = list(NO_SCAN, NO_BLOOD, NO_PAIN, IS_WHITELISTED)
+ bodyflags = HAS_TAIL
+ dietflags = DIET_OMNI //should inherit this from vox, this is here just in case
+
+ blood_color = "#2299FC"
+ flesh_color = "#808D11"
+
+ reagent_tag = PROCESS_ORG
+
+ tail = "armalis_tail"
+ icon_template = 'icons/mob/human_races/r_armalis.dmi'
+
+ has_organ = list(
+ "heart" = /obj/item/organ/internal/heart,
+ "lungs" = /obj/item/organ/internal/lungs/vox,
+ "liver" = /obj/item/organ/internal/liver,
+ "kidneys" = /obj/item/organ/internal/kidneys,
+ "brain" = /obj/item/organ/internal/brain,
+ "eyes" = /obj/item/organ/internal/eyes, //Default darksight of 2.
+ "stack" = /obj/item/organ/internal/stack //Not the same as the cortical stack implant Vox Raiders spawn with. The cortical stack implant is used
+ ) //for determining the success of the heist game-mode's 'leave nobody behind' objective, while this is just an organ.
+
+ suicide_messages = list(
+ "is attempting to bite their tongue off!",
+ "is jamming their claws into their eye sockets!",
+ "is twisting their own neck!",
+ "is holding their breath!",
+ "is huffing oxygen!")
+
+/datum/species/vox/armalis/handle_reagents() //Skip the Vox oxygen reagent toxicity. Armalis are above such things.
+ return 1
+
+/datum/species/kidan
+ name = "Kidan"
+ name_plural = "Kidan"
+ icobase = 'icons/mob/human_races/r_kidan.dmi'
+ deform = 'icons/mob/human_races/r_def_kidan.dmi'
+ language = "Chittin"
+ unarmed_type = /datum/unarmed_attack/claws
+
+ brute_mod = 0.8
+
+ species_traits = list(IS_WHITELISTED)
+ clothing_flags = HAS_UNDERWEAR | HAS_UNDERSHIRT | HAS_SOCKS
+ bodyflags = HAS_HEAD_ACCESSORY | HAS_HEAD_MARKINGS | HAS_BODY_MARKINGS
+ eyes = "kidan_eyes_s"
+ dietflags = DIET_HERB
+ blood_color = "#FB9800"
+ reagent_tag = PROCESS_ORG
+ //Default styles for created mobs.
+ default_headacc = "Normal Antennae"
+ butt_sprite = "kidan"
+
+ has_organ = list(
+ "heart" = /obj/item/organ/internal/heart,
+ "lungs" = /obj/item/organ/internal/lungs,
+ "liver" = /obj/item/organ/internal/liver/kidan,
+ "kidneys" = /obj/item/organ/internal/kidneys,
+ "brain" = /obj/item/organ/internal/brain,
+ "appendix" = /obj/item/organ/internal/appendix,
+ "eyes" = /obj/item/organ/internal/eyes, //Default darksight of 2.
+ "lantern" = /obj/item/organ/internal/lantern
+ )
+
+ allowed_consumed_mobs = list(/mob/living/simple_animal/diona)
+
+ suicide_messages = list(
+ "is attempting to bite their antenna off!",
+ "is jamming their claws into their eye sockets!",
+ "is twisting their own neck!",
+ "is cracking their exoskeleton!",
+ "is stabbing themselves with their mandibles!",
+ "is holding their breath!")
+
+/datum/species/slime
+ name = "Slime People"
+ name_plural = "Slime People"
+ language = "Bubblish"
+ icobase = 'icons/mob/human_races/r_slime.dmi'
+ deform = 'icons/mob/human_races/r_slime.dmi'
+ remains_type = /obj/effect/decal/remains/slime
+
+ // More sensitive to the cold
+ cold_level_1 = 280
+ cold_level_2 = 240
+ cold_level_3 = 200
+ coldmod = 3
+
+ oxy_mod = 0
+ brain_mod = 2.5
+
+ male_cough_sounds = list('sound/effects/slime_squish.ogg')
+ female_cough_sounds = list('sound/effects/slime_squish.ogg')
+
+ species_traits = list(LIPS, IS_WHITELISTED, NO_BREATHE, NO_INTORGANS, NO_SCAN)
+ clothing_flags = HAS_UNDERWEAR | HAS_UNDERSHIRT | HAS_SOCKS
+ bodyflags = HAS_SKIN_COLOR | NO_EYES
+ dietflags = DIET_CARN
+ reagent_tag = PROCESS_ORG
+
+ blood_color = "#0064C8"
+ exotic_blood = "water"
+ blood_damage_type = TOX
+
+ butt_sprite = "slime"
+ //Has default darksight of 2.
+
+ has_organ = list(
+ "brain" = /obj/item/organ/internal/brain/slime
+ )
+
+ suicide_messages = list(
+ "is melting into a puddle!",
+ "is ripping out their own core!",
+ "is turning a dull, brown color and melting into a puddle!")
+
+ var/reagent_skin_coloring = FALSE
+
+ var/datum/action/innate/regrow/grow = new()
+
+ species_abilities = list(
+ /mob/living/carbon/human/verb/toggle_recolor_verb,
+ /mob/living/carbon/human/proc/regrow_limbs
+ )
+
+/datum/species/slime/handle_post_spawn(var/mob/living/carbon/human/H)
+ grow.Grant(H)
+ ..()
+
+/datum/action/innate/regrow
+ name = "Regrow limbs"
+ icon_icon = 'icons/effects/effects.dmi'
+ button_icon_state = "greenglow"
+
+/datum/action/innate/regrow/Activate()
+ var/mob/living/carbon/human/user = owner
+ user.regrow_limbs()
+
+
+/datum/species/slime/handle_life(var/mob/living/carbon/human/H)
+//This is allegedly for code "style". Like a plaid sweater?
+#define SLIMEPERSON_COLOR_SHIFT_TRIGGER 0.1
+#define SLIMEPERSON_ICON_UPDATE_PERIOD 200 // 20 seconds
+#define SLIMEPERSON_BLOOD_SCALING_FACTOR 5 // Used to adjust how much of an effect the blood has on the rate of color change. Higher is slower.
+ // Slowly shifting to the color of the reagents
+ if(reagent_skin_coloring && H.reagents.total_volume > SLIMEPERSON_COLOR_SHIFT_TRIGGER)
+ var/blood_amount = H.blood_volume
+ var/r_color = mix_color_from_reagents(H.reagents.reagent_list)
+ var/new_body_color = BlendRGB(r_color, H.skin_colour, (blood_amount*SLIMEPERSON_BLOOD_SCALING_FACTOR)/((blood_amount*SLIMEPERSON_BLOOD_SCALING_FACTOR)+(H.reagents.total_volume)))
+ H.skin_colour = new_body_color
+ if(world.time % SLIMEPERSON_ICON_UPDATE_PERIOD > SLIMEPERSON_ICON_UPDATE_PERIOD - 20) // The 20 is because this gets called every 2 seconds, from the mob controller
+ for(var/organname in H.bodyparts_by_name)
+ var/obj/item/organ/external/E = H.bodyparts_by_name[organname]
+ if(istype(E) && E.dna && istype(E.dna.species, /datum/species/slime))
+ E.sync_colour_to_human(H)
+ H.update_hair(0)
+ H.update_body()
+ ..()
+
+#undef SLIMEPERSON_COLOR_SHIFT_TRIGGER
+#undef SLIMEPERSON_ICON_UPDATE_PERIOD
+#undef SLIMEPERSON_BLOOD_SCALING_FACTOR
+
+/mob/living/carbon/human/proc/toggle_recolor(silent = FALSE)
+ if(!isslimeperson(src))
+ if(!silent)
+ to_chat(src, "You're not a slime person!")
+ return
+
+ var/datum/species/slime/S = dna.species
+ if(S.reagent_skin_coloring)
+ S.reagent_skin_coloring = TRUE
+ if(!silent)
+ to_chat(src, "You adjust your internal chemistry to filter out pigments from things you consume.")
+ else
+ S.reagent_skin_coloring = TRUE
+ if(!silent)
+ to_chat(src, "You adjust your internal chemistry to permit pigments in chemicals you consume to tint you.")
+
+/mob/living/carbon/human/verb/toggle_recolor_verb()
+ set category = "IC"
+ set name = "Toggle Reagent Recoloring"
+ set desc = "While active, you'll slowly adjust your body's color to that of the reagents inside of you, moderated by how much blood you have."
+
+ toggle_recolor()
+
+
+/mob/living/carbon/human/proc/regrow_limbs()
+ set category = "IC"
+ set name = "Regrow Limbs"
+ set desc = "Regrow one of your missing limbs at the cost of a large amount of hunger"
+
+#define SLIMEPERSON_HUNGERCOST 50
+#define SLIMEPERSON_MINHUNGER 250
+#define SLIMEPERSON_REGROWTHDELAY 450 // 45 seconds
+
+ if(stat || paralysis || stunned)
+ to_chat(src, "You cannot regenerate missing limbs in your current state.")
+ return
+
+ if(nutrition < SLIMEPERSON_MINHUNGER)
+ to_chat(src, "You're too hungry to regenerate a limb!")
+ return
+
+ var/list/missing_limbs = list()
+ for(var/l in bodyparts_by_name)
+ var/obj/item/organ/external/E = bodyparts_by_name[l]
+ if(!istype(E))
+ var/list/limblist = dna.species.has_limbs[l]
+ var/obj/item/organ/external/limb = limblist["path"]
+ var/parent_organ = initial(limb.parent_organ)
+ var/obj/item/organ/external/parentLimb = bodyparts_by_name[parent_organ]
+ if(!istype(parentLimb))
+ continue
+ missing_limbs[initial(limb.name)] = l
+
+ if(!missing_limbs.len)
+ to_chat(src, "You're not missing any limbs!")
+ return
+
+ var/limb_select = input(src, "Choose a limb to regrow", "Limb Regrowth") as null|anything in missing_limbs
+ var/chosen_limb = missing_limbs[limb_select]
+
+ visible_message("[src] begins to hold still and concentrate on [p_their()] missing [limb_select]...", "You begin to focus on regrowing your missing [limb_select]... (This will take [round(SLIMEPERSON_REGROWTHDELAY/10)] seconds, and you must hold still.)")
+ if(do_after(src, SLIMEPERSON_REGROWTHDELAY, needhand=0, target = src))
+ if(stat || paralysis || stunned)
+ to_chat(src, "You cannot regenerate missing limbs in your current state.")
+ return
+
+ if(nutrition < SLIMEPERSON_MINHUNGER)
+ to_chat(src, "You're too hungry to regenerate a limb!")
+ return
+
+ var/obj/item/organ/external/O = bodyparts_by_name[chosen_limb]
+
+ var/stored_brute = 0
+ var/stored_burn = 0
+ if(istype(O))
+ to_chat(src, "You distribute the damaged tissue around your body, out of the way of your new pseudopod!")
+ var/obj/item/organ/external/doomedStump = O
+ stored_brute = doomedStump.brute_dam
+ stored_burn = doomedStump.burn_dam
+ qdel(O)
+
+ var/limb_list = dna.species.has_limbs[chosen_limb]
+ var/obj/item/organ/external/limb_path = limb_list["path"]
+ // Parent check
+ var/obj/item/organ/external/potential_parent = bodyparts_by_name[initial(limb_path.parent_organ)]
+ if(!istype(potential_parent))
+ to_chat(src, "You've lost the organ that you've been growing your new part on!")
+ return // No rayman for you
+ // Grah this line will leave a "not used" warning, in spite of the fact that the new() proc WILL do the thing.
+ // Bothersome.
+ var/obj/item/organ/external/new_limb = new limb_path(src)
+ new_limb.open = 0 // This is just so that the compiler won't think that new_limb is unused, because the compiler is horribly stupid.
+ adjustBruteLoss(stored_brute)
+ adjustFireLoss(stored_burn)
+ update_body()
+ updatehealth("slime person regrowth")
+ UpdateDamageIcon()
+ nutrition -= SLIMEPERSON_HUNGERCOST
+ visible_message("[src] finishes regrowing [p_their()] missing [new_limb]!", "You finish regrowing your [limb_select]")
+ else
+ to_chat(src, "You need to hold still in order to regrow a limb!")
+ return
+
+#undef SLIMEPERSON_HUNGERCOST
+#undef SLIMEPERSON_MINHUNGER
+#undef SLIMEPERSON_REGROWTHDELAY
+
+/datum/species/slime/handle_pre_change(mob/living/carbon/human/H)
+ ..()
+ if(reagent_skin_coloring)
+ H.toggle_recolor(silent = 1)
+
+/datum/species/grey
+ name = "Grey"
+ name_plural = "Greys"
+ icobase = 'icons/mob/human_races/r_grey.dmi'
+ deform = 'icons/mob/human_races/r_def_grey.dmi'
+ language = "Psionic Communication"
+ eyes = "grey_eyes_s"
+ butt_sprite = "grey"
+
+ has_organ = list(
+ "heart" = /obj/item/organ/internal/heart,
+ "lungs" = /obj/item/organ/internal/lungs,
+ "liver" = /obj/item/organ/internal/liver/grey,
+ "kidneys" = /obj/item/organ/internal/kidneys,
+ "brain" = /obj/item/organ/internal/brain/grey,
+ "appendix" = /obj/item/organ/internal/appendix,
+ "eyes" = /obj/item/organ/internal/eyes/grey //5 darksight.
+ )
+
+ brute_mod = 1.25 //greys are fragile
+
+ default_genes = list(REMOTE_TALK)
+
+
+ species_traits = list(LIPS, IS_WHITELISTED, CAN_BE_FAT)
+ clothing_flags = HAS_UNDERWEAR | HAS_UNDERSHIRT | HAS_SOCKS
+ bodyflags = HAS_BODY_MARKINGS
+ dietflags = DIET_HERB
+ reagent_tag = PROCESS_ORG
+ blood_color = "#A200FF"
+
+/datum/species/grey/handle_dna(var/mob/living/carbon/C, var/remove)
+ if(!remove)
+ C.dna.SetSEState(REMOTETALKBLOCK,1,1)
+ genemutcheck(C,REMOTETALKBLOCK,null,MUTCHK_FORCED)
+ else
+ C.dna.SetSEState(REMOTETALKBLOCK,0,1)
+ genemutcheck(C,REMOTETALKBLOCK,null,MUTCHK_FORCED)
+ ..()
+
+/datum/species/grey/water_act(var/mob/living/carbon/C, volume, temperature, source)
+ ..()
+ C.take_organ_damage(5,min(volume,20))
+ C.emote("scream")
+
+/datum/species/grey/after_equip_job(datum/job/J, mob/living/carbon/human/H)
+ var/speech_pref = H.client.prefs.speciesprefs
+ if(speech_pref)
+ H.mind.speech_span = "wingdings"
+
+/datum/species/grey/handle_reagents(mob/living/carbon/human/H, datum/reagent/R)
+ if(R.id == "sacid")
+ H.reagents.del_reagent(R.id)
+ return 0
+ return ..()
+
+/datum/species/diona
+ name = "Diona"
+ name_plural = "Dionaea"
+ icobase = 'icons/mob/human_races/r_diona.dmi'
+ deform = 'icons/mob/human_races/r_def_plant.dmi'
+ language = "Rootspeak"
+ speech_sounds = list('sound/voice/dionatalk1.ogg') //Credit https://www.youtube.com/watch?v=ufnvlRjsOTI [0:13 - 0:16]
+ speech_chance = 20
+ unarmed_type = /datum/unarmed_attack/diona
+ //primitive_form = "Nymph"
+ slowdown = 5
+ remains_type = /obj/effect/decal/cleanable/ash
+
+
+ warning_low_pressure = 50
+ hazard_low_pressure = -1
+
+ cold_level_1 = 50
+ cold_level_2 = -1
+ cold_level_3 = -1
+
+ heat_level_1 = 300
+ heat_level_2 = 340
+ heat_level_3 = 400
+
+ blurb = "Commonly referred to (erroneously) as 'plant people', the Dionaea are a strange space-dwelling collective \
+ species hailing from Epsilon Ursae Minoris. Each 'diona' is a cluster of numerous cat-sized organisms called nymphs; \
+ there is no effective upper limit to the number that can fuse in gestalt, and reports exist of the Epsilon Ursae \
+ Minoris primary being ringed with a cloud of singing space-station-sized entities.
The Dionaea coexist peacefully with \
+ all known species, especially the Skrell. Their communal mind makes them slow to react, and they have difficulty understanding \
+ even the simplest concepts of other minds. Their alien physiology allows them survive happily off a diet of nothing but light, \
+ water and other radiation."
+
+ species_traits = list(NO_BREATHE, RADIMMUNE, IS_PLANT, NO_BLOOD, NO_PAIN)
+ clothing_flags = HAS_SOCKS
+ default_hair_colour = "#000000"
+ dietflags = 0 //Diona regenerate nutrition in light and water, no diet necessary
+ taste_sensitivity = TASTE_SENSITIVITY_NO_TASTE
+ skinned_type = /obj/item/stack/sheet/wood
+
+ oxy_mod = 0
+
+ body_temperature = T0C + 15 //make the plant people have a bit lower body temperature, why not
+ blood_color = "#004400"
+ flesh_color = "#907E4A"
+ butt_sprite = "diona"
+
+ reagent_tag = PROCESS_ORG
+
+ has_organ = list(
+ "nutrient channel" = /obj/item/organ/internal/liver/diona,
+ "neural strata" = /obj/item/organ/internal/heart/diona,
+ "receptor node" = /obj/item/organ/internal/eyes/diona, //Default darksight of 2.
+ "gas bladder" = /obj/item/organ/internal/brain/diona,
+ "polyp segment" = /obj/item/organ/internal/kidneys/diona,
+ "anchoring ligament" = /obj/item/organ/internal/appendix/diona
+ )
+
+ vision_organ = /obj/item/organ/internal/eyes/diona
+ has_limbs = list(
+ "chest" = list("path" = /obj/item/organ/external/chest/diona),
+ "groin" = list("path" = /obj/item/organ/external/groin/diona),
+ "head" = list("path" = /obj/item/organ/external/head/diona),
+ "l_arm" = list("path" = /obj/item/organ/external/arm/diona),
+ "r_arm" = list("path" = /obj/item/organ/external/arm/right/diona),
+ "l_leg" = list("path" = /obj/item/organ/external/leg/diona),
+ "r_leg" = list("path" = /obj/item/organ/external/leg/right/diona),
+ "l_hand" = list("path" = /obj/item/organ/external/hand/diona),
+ "r_hand" = list("path" = /obj/item/organ/external/hand/right/diona),
+ "l_foot" = list("path" = /obj/item/organ/external/foot/diona),
+ "r_foot" = list("path" = /obj/item/organ/external/foot/right/diona)
+ )
+
+ suicide_messages = list(
+ "is losing branches!",
+ "pulls out a secret stash of herbicide and takes a hearty swig!",
+ "is pulling themselves apart!")
+
+/datum/species/diona/can_understand(var/mob/other)
+ if(istype(other, /mob/living/simple_animal/diona))
+ return 1
+ return 0
+
+/datum/species/diona/handle_post_spawn(var/mob/living/carbon/human/H)
+ H.gender = NEUTER
+
+ return ..()
+
+/datum/species/diona/handle_life(var/mob/living/carbon/human/H)
+ H.radiation = Clamp(H.radiation, 0, 100) //We have to clamp this first, then decrease it, or there's a few edge cases of massive heals if we clamp and decrease at the same time.
+ var/rads = H.radiation / 25
+ H.radiation = max(H.radiation-rads, 0)
+ H.nutrition = min(H.nutrition+rads, NUTRITION_LEVEL_WELL_FED+10)
+ H.adjustBruteLoss(-(rads))
+ H.adjustToxLoss(-(rads))
+
+ var/light_amount = 0 //how much light there is in the place, affects receiving nutrition and healing
+ if(isturf(H.loc)) //else, there's considered to be no light
+ var/turf/T = H.loc
+ light_amount = min(T.get_lumcount() * 10, 5) //hardcapped so it's not abused by having a ton of flashlights
+ H.nutrition = min(H.nutrition+light_amount, NUTRITION_LEVEL_WELL_FED+10)
+
+ if(light_amount > 0)
+ H.clear_alert("nolight")
+ else
+ H.throw_alert("nolight", /obj/screen/alert/nolight)
+
+ if((light_amount >= 5) && !H.suiciding) //if there's enough light, heal
+
+ H.adjustBruteLoss(-(light_amount/2))
+ H.adjustFireLoss(-(light_amount/4))
+ if(H.nutrition < NUTRITION_LEVEL_STARVING+50)
+ H.take_overall_damage(10,0)
+ ..()
+
+/datum/species/machine
+ name = "Machine"
+ name_plural = "Machines"
+
+ blurb = "Positronic intelligence really took off in the 26th century, and it is not uncommon to see independant, free-willed \
+ robots on many human stations, particularly in fringe systems where standards are slightly lax and public opinion less relevant \
+ to corporate operations. IPCs (Integrated Positronic Chassis) are a loose category of self-willed robots with a humanoid form, \
+ generally self-owned after being 'born' into servitude; they are reliable and dedicated workers, albeit more than slightly \
+ inhuman in outlook and perspective."
+
+ icobase = 'icons/mob/human_races/r_machine.dmi'
+ deform = 'icons/mob/human_races/r_machine.dmi'
+ language = "Trinary"
+ remains_type = /obj/effect/decal/remains/robot
+ skinned_type = /obj/item/stack/sheet/metal // Let's grind up IPCs for station resources!
+
+ eyes = "blank_eyes"
+ brute_mod = 2.5 // 100% * 2.5 * 0.6 (robolimbs) ~= 150%
+ burn_mod = 2.5 // So they take 50% extra damage from brute/burn overall.
+ tox_mod = 0
+ clone_mod = 0
+ oxy_mod = 0
+ death_message = "gives one shrill beep before falling limp, their monitor flashing blue before completely shutting off..."
+
+ species_traits = list(IS_WHITELISTED, NO_BREATHE, NO_SCAN, NO_BLOOD, NO_PAIN, NO_DNA, RADIMMUNE, VIRUSIMMUNE, NOTRANSSTING)
+ clothing_flags = HAS_UNDERWEAR | HAS_UNDERSHIRT | HAS_SOCKS
+ bodyflags = HAS_SKIN_COLOR | HAS_HEAD_MARKINGS | HAS_HEAD_ACCESSORY | ALL_RPARTS
+ dietflags = 0 //IPCs can't eat, so no diet
+ taste_sensitivity = TASTE_SENSITIVITY_NO_TASTE
+ blood_color = "#1F181F"
+ flesh_color = "#AAAAAA"
+ //Default styles for created mobs.
+ default_hair = "Blue IPC Screen"
+ can_revive_by_healing = 1
+ has_gender = FALSE
+ reagent_tag = PROCESS_SYN
+ male_scream_sound = 'sound/goonstation/voice/robot_scream.ogg'
+ female_scream_sound = 'sound/goonstation/voice/robot_scream.ogg'
+ male_cough_sounds = list('sound/effects/mob_effects/m_machine_cougha.ogg','sound/effects/mob_effects/m_machine_coughb.ogg', 'sound/effects/mob_effects/m_machine_coughc.ogg')
+ female_cough_sounds = list('sound/effects/mob_effects/f_machine_cougha.ogg','sound/effects/mob_effects/f_machine_coughb.ogg')
+ male_sneeze_sound = 'sound/effects/mob_effects/machine_sneeze.ogg'
+ female_sneeze_sound = 'sound/effects/mob_effects/f_machine_sneeze.ogg'
+ butt_sprite = "machine"
+
+ has_organ = list(
+ "brain" = /obj/item/organ/internal/brain/mmi_holder/posibrain,
+ "cell" = /obj/item/organ/internal/cell,
+ "optics" = /obj/item/organ/internal/eyes/optical_sensor, //Default darksight of 2.
+ "charger" = /obj/item/organ/internal/cyberimp/arm/power_cord
+ )
+
+ vision_organ = /obj/item/organ/internal/eyes/optical_sensor
+ has_limbs = list(
+ "chest" = list("path" = /obj/item/organ/external/chest/ipc),
+ "groin" = list("path" = /obj/item/organ/external/groin/ipc),
+ "head" = list("path" = /obj/item/organ/external/head/ipc),
+ "l_arm" = list("path" = /obj/item/organ/external/arm/ipc),
+ "r_arm" = list("path" = /obj/item/organ/external/arm/right/ipc),
+ "l_leg" = list("path" = /obj/item/organ/external/leg/ipc),
+ "r_leg" = list("path" = /obj/item/organ/external/leg/right/ipc),
+ "l_hand" = list("path" = /obj/item/organ/external/hand/ipc),
+ "r_hand" = list("path" = /obj/item/organ/external/hand/right/ipc),
+ "l_foot" = list("path" = /obj/item/organ/external/foot/ipc),
+ "r_foot" = list("path" = /obj/item/organ/external/foot/right/ipc)
+ )
+
+ suicide_messages = list(
+ "is powering down!",
+ "is smashing their own monitor!",
+ "is twisting their own neck!",
+ "is downloading extra RAM!",
+ "is frying their own circuits!",
+ "is blocking their ventilation port!")
+
+ species_abilities = list(
+ /mob/living/carbon/human/proc/change_monitor
+ )
+
+/datum/species/machine/handle_death(var/mob/living/carbon/human/H)
+ var/obj/item/organ/external/head/head_organ = H.get_organ("head")
+ if(!head_organ)
+ return
+ head_organ.h_style = "Bald"
+ head_organ.f_style = "Shaved"
+ spawn(100)
+ if(H)
+ H.update_hair()
+ H.update_fhair()
+
+/datum/species/drask
+ name = "Drask"
+ name_plural = "Drask"
+ icobase = 'icons/mob/human_races/r_drask.dmi'
+ deform = 'icons/mob/human_races/r_drask.dmi'
+ language = "Orluum"
+ eyes = "drask_eyes_s"
+
+ speech_sounds = list('sound/voice/DraskTalk.ogg')
+ speech_chance = 20
+ male_scream_sound = 'sound/voice/DraskTalk2.ogg'
+ female_scream_sound = 'sound/voice/DraskTalk2.ogg'
+ male_cough_sounds = 'sound/voice/DraskCough.ogg'
+ female_cough_sounds = 'sound/voice/DraskCough.ogg'
+ male_sneeze_sound = 'sound/voice/DraskSneeze.ogg'
+ female_sneeze_sound = 'sound/voice/DraskSneeze.ogg'
+
+ burn_mod = 2
+ //exotic_blood = "cryoxadone"
+ body_temperature = 273
+
+ blurb = "Hailing from Hoorlm, planet outside what is usually considered a habitable \
+ orbit, the Drask evolved to live in extreme cold. Their strange bodies seem \
+ to operate better the colder their surroundings are, and can regenerate rapidly \
+ when breathing supercooled gas.
On their homeworld, the Drask live long lives \
+ in their labyrinthine settlements, carved out beneath Hoorlm's icy surface, where the air \
+ is of breathable density."
+
+ suicide_messages = list(
+ "is self-warming with friction!",
+ "is jamming fingers through their big eyes!",
+ "is sucking in warm air!",
+ "is holding their breath!")
+
+ species_traits = list(LIPS, IS_WHITELISTED)
+ clothing_flags = HAS_UNDERWEAR | HAS_UNDERSHIRT
+ bodyflags = HAS_SKIN_TONE | HAS_BODY_MARKINGS
+ dietflags = DIET_OMNI
+
+ cold_level_1 = -1 //Default 260 - Lower is better
+ cold_level_2 = -1 //Default 200
+ cold_level_3 = -1 //Default 120
+ coldmod = -1
+
+ heat_level_1 = 300 //Default 360 - Higher is better
+ heat_level_2 = 340 //Default 400
+ heat_level_3 = 400 //Default 460
+ heatmod = 2
+
+ flesh_color = "#a3d4eb"
+ reagent_tag = PROCESS_ORG
+ base_color = "#a3d4eb"
+ blood_color = "#a3d4eb"
+ butt_sprite = "drask"
+
+ has_organ = list(
+ "heart" = /obj/item/organ/internal/heart/drask,
+ "lungs" = /obj/item/organ/internal/lungs/drask,
+ "metabolic strainer" = /obj/item/organ/internal/liver/drask,
+ "eyes" = /obj/item/organ/internal/eyes/drask, //5 darksight.
+ "brain" = /obj/item/organ/internal/brain/drask
+ )
diff --git a/code/modules/mob/living/carbon/human/update_stat.dm b/code/modules/mob/living/carbon/human/update_stat.dm
new file mode 100644
index 00000000000..e079328206e
--- /dev/null
+++ b/code/modules/mob/living/carbon/human/update_stat.dm
@@ -0,0 +1,27 @@
+/mob/living/carbon/human/update_stat(reason = "none given")
+ if(status_flags & GODMODE)
+ return
+ ..(reason)
+ if(stat != DEAD)
+ switch(getBrainLoss())
+ if(100 to 120)
+ Weaken(20)
+ create_debug_log("collapsed from brain damage, trigger reason: [reason]")
+ if(120 to INFINITY)
+ visible_message("[src] goes limp, [p_their()] facial expression utterly blank.")
+ death()
+ create_debug_log("died of brain damage, trigger reason: [reason]")
+ else
+ if(dna.species && dna.species.can_revive_by_healing)
+ var/obj/item/organ/internal/brain/B = get_int_organ(/obj/item/organ/internal/brain)
+ if(B)
+ if((health >= (config.health_threshold_dead + config.health_threshold_crit) * 0.5) && getBrainLoss()<120)
+ update_revive()
+ create_debug_log("revived from healing, trigger reason: [reason]")
+
+/mob/living/carbon/human/update_nearsighted_effects()
+ var/obj/item/clothing/glasses/G = glasses
+ if((disabilities & NEARSIGHTED) && (!istype(G) || !G.prescription))
+ overlay_fullscreen("nearsighted", /obj/screen/fullscreen/impaired, 1)
+ else
+ clear_fullscreen("nearsighted")
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm
index 1a590c2e397..18e42c98d08 100644
--- a/code/modules/mob/living/carbon/life.dm
+++ b/code/modules/mob/living/carbon/life.dm
@@ -219,19 +219,19 @@
radiation--
if(prob(25))
adjustToxLoss(1)
- updatehealth()
+ updatehealth("handle mutations and radiation(0-50)")
if(50 to 75)
radiation -= 2
adjustToxLoss(1)
if(prob(5))
radiation -= 5
- updatehealth()
+ updatehealth("handle mutations and radiation(50-75)")
if(75 to 100)
radiation -= 3
adjustToxLoss(3)
- updatehealth()
+ updatehealth("handle mutations and radiation(75-100)")
radiation = Clamp(radiation, 0, 100)
@@ -259,39 +259,11 @@
M.adjustBruteLoss(5)
nutrition += 10
-//This updates the health and status of the mob (conscious, unconscious, dead)
-/mob/living/carbon/handle_regular_status_updates()
-
- if(..()) //alive
-
- if(health <= config.health_threshold_dead)
- death()
- return
-
- if(getOxyLoss() > 50 || health <= config.health_threshold_crit)
- Paralyse(3)
- stat = UNCONSCIOUS
-
- if(sleeping)
- stat = UNCONSCIOUS
-
- return 1
-
-/mob/living/carbon/proc/CheckStamina()
- if(staminaloss)
- var/total_health = (health - staminaloss)
- if(total_health <= config.health_threshold_softcrit && !stat)
- to_chat(src, "You're too exhausted to keep going...")
- Weaken(5)
- setStaminaLoss(health - 2)
- return
- setStaminaLoss(max((staminaloss - 3), 0))
-
//this updates all special effects: stunned, sleeping, weakened, druggy, stuttering, etc..
/mob/living/carbon/handle_status_effects()
..()
- CheckStamina()
+ setStaminaLoss(max((staminaloss - 3), 0))
var/restingpwr = 1 + 4 * resting
@@ -375,61 +347,6 @@
Sleeping(2)
return sleeping
-
-//this handles hud updates. Calls update_vision() and handle_hud_icons()
-/mob/living/carbon/handle_regular_hud_updates()
- if(!client)
- return 0
-
- if(stat == UNCONSCIOUS && health <= config.health_threshold_crit)
- var/severity = 0
- switch(health)
- if(-20 to -10) severity = 1
- if(-30 to -20) severity = 2
- if(-40 to -30) severity = 3
- if(-50 to -40) severity = 4
- if(-60 to -50) severity = 5
- if(-70 to -60) severity = 6
- if(-80 to -70) severity = 7
- if(-90 to -80) severity = 8
- if(-95 to -90) severity = 9
- if(-INFINITY to -95) severity = 10
- overlay_fullscreen("crit", /obj/screen/fullscreen/crit, severity)
- else
- clear_fullscreen("crit")
- if(oxyloss)
- var/severity = 0
- switch(oxyloss)
- if(10 to 20) severity = 1
- if(20 to 25) severity = 2
- if(25 to 30) severity = 3
- if(30 to 35) severity = 4
- if(35 to 40) severity = 5
- if(40 to 45) severity = 6
- if(45 to INFINITY) severity = 7
- overlay_fullscreen("oxy", /obj/screen/fullscreen/oxy, severity)
- else
- clear_fullscreen("oxy")
-
- //Fire and Brute damage overlay (BSSR)
- var/hurtdamage = getBruteLoss() + getFireLoss() + damageoverlaytemp
- damageoverlaytemp = 0 // We do this so we can detect if someone hits us or not.
- if(hurtdamage)
- var/severity = 0
- switch(hurtdamage)
- if(5 to 15) severity = 1
- if(15 to 30) severity = 2
- if(30 to 45) severity = 3
- if(45 to 70) severity = 4
- if(70 to 85) severity = 5
- if(85 to INFINITY) severity = 6
- overlay_fullscreen("brute", /obj/screen/fullscreen/brute, severity)
- else
- clear_fullscreen("brute")
-
- ..()
- return 1
-
/mob/living/carbon/update_sight()
if(!client)
return
@@ -464,6 +381,9 @@
return
/mob/living/carbon/handle_hud_icons_health()
+ if(!client)
+ return
+
if(healths)
if(stat != DEAD)
switch(health)
@@ -483,3 +403,51 @@
healths.icon_state = "health6"
else
healths.icon_state = "health7"
+ handle_hud_icons_health_overlay()
+
+/mob/living/carbon/proc/handle_hud_icons_health_overlay()
+ if(stat == UNCONSCIOUS && health <= config.health_threshold_crit)
+ var/severity = 0
+ switch(health)
+ if(-20 to -10) severity = 1
+ if(-30 to -20) severity = 2
+ if(-40 to -30) severity = 3
+ if(-50 to -40) severity = 4
+ if(-60 to -50) severity = 5
+ if(-70 to -60) severity = 6
+ if(-80 to -70) severity = 7
+ if(-90 to -80) severity = 8
+ if(-95 to -90) severity = 9
+ if(-INFINITY to -95) severity = 10
+ overlay_fullscreen("crit", /obj/screen/fullscreen/crit, severity)
+ else if(stat == CONSCIOUS)
+ clear_fullscreen("crit")
+ if(oxyloss)
+ var/severity = 0
+ switch(oxyloss)
+ if(10 to 20) severity = 1
+ if(20 to 25) severity = 2
+ if(25 to 30) severity = 3
+ if(30 to 35) severity = 4
+ if(35 to 40) severity = 5
+ if(40 to 45) severity = 6
+ if(45 to INFINITY) severity = 7
+ overlay_fullscreen("oxy", /obj/screen/fullscreen/oxy, severity)
+ else
+ clear_fullscreen("oxy")
+
+ //Fire and Brute damage overlay (BSSR)
+ var/hurtdamage = getBruteLoss() + getFireLoss() + damageoverlaytemp
+ damageoverlaytemp = 0 // We do this so we can detect if someone hits us or not.
+ if(hurtdamage)
+ var/severity = 0
+ switch(hurtdamage)
+ if(5 to 15) severity = 1
+ if(15 to 30) severity = 2
+ if(30 to 45) severity = 3
+ if(45 to 70) severity = 4
+ if(70 to 85) severity = 5
+ if(85 to INFINITY) severity = 6
+ overlay_fullscreen("brute", /obj/screen/fullscreen/brute, severity)
+ else
+ clear_fullscreen("brute")
diff --git a/code/modules/mob/living/carbon/slime/death.dm b/code/modules/mob/living/carbon/slime/death.dm
index 5c551d6e470..055f972df07 100644
--- a/code/modules/mob/living/carbon/slime/death.dm
+++ b/code/modules/mob/living/carbon/slime/death.dm
@@ -1,6 +1,8 @@
/mob/living/carbon/slime/death(gibbed)
- if(stat == DEAD)
- return
+ // Only execute the below if we successfully died
+ . = ..()
+ if(!.)
+ return FALSE
if(!gibbed)
if(is_adult)
var/mob/living/carbon/slime/M = new /mob/living/carbon/slime(loc)
@@ -15,13 +17,5 @@
return
else
visible_message("The [name] seizes up and falls limp...")
- stat = DEAD
icon_state = "[colour] baby slime dead"
- overlays.len = 0
-
- update_canmove()
-
- if(ticker && ticker.mode)
- ticker.mode.check_win()
-
- return ..(gibbed)
\ No newline at end of file
+ overlays.Cut()
diff --git a/code/modules/mob/living/carbon/slime/life.dm b/code/modules/mob/living/carbon/slime/life.dm
index 5b0ee885ce7..2f2c05c9452 100644
--- a/code/modules/mob/living/carbon/slime/life.dm
+++ b/code/modules/mob/living/carbon/slime/life.dm
@@ -131,7 +131,7 @@
else // a hot place
bodytemperature += adjust_body_temperature(bodytemperature, loc_temp, 1)
- updatehealth()
+ updatehealth("handle environment")
return //TODO: DEFERRED
@@ -163,7 +163,7 @@
if(reagents.get_reagent_amount("epinephrine")>=5)
mutation_chance = max(mutation_chance - 5,0) //Prevents mutation chance going <0%
reagents.remove_reagent("epinephrine", 5)
- updatehealth()
+ updatehealth("handle chemicals in body")
return //TODO: DEFERRED
@@ -195,7 +195,6 @@
if(src.stat == DEAD)
src.lying = 1
- src.blinded = 1
else
if(src.paralysis || src.stunned || src.weakened || (status_flags && FAKEDEATH)) //Stunned etc.
if(src.stunned > 0)
@@ -207,7 +206,6 @@
src.stat = 0
if(src.paralysis > 0)
AdjustParalysis(-1)
- src.blinded = 0
src.lying = 0
src.stat = 0
@@ -219,7 +217,6 @@
if(src.eye_blind)
src.SetEyeBlind(0)
- src.blinded = 1
if(src.ear_deaf > 0) SetEarDeaf(0)
if(src.ear_damage < 25)
@@ -227,8 +224,6 @@
src.density = !( src.lying )
- if(src.disabilities & BLIND)
- src.blinded = 1
if(src.disabilities & DEAF)
EarDeaf(1)
diff --git a/code/modules/mob/living/carbon/slime/powers.dm b/code/modules/mob/living/carbon/slime/powers.dm
index a2aca96c163..23918680197 100644
--- a/code/modules/mob/living/carbon/slime/powers.dm
+++ b/code/modules/mob/living/carbon/slime/powers.dm
@@ -102,9 +102,9 @@
adjustFireLoss(-10)
adjustCloneLoss(-10)
- updatehealth()
+ updatehealth("slime feeding")
if(Victim)
- Victim.updatehealth()
+ Victim.updatehealth("slime feeding")
sleep(rand(15,45))
diff --git a/code/modules/mob/living/carbon/update_status.dm b/code/modules/mob/living/carbon/update_status.dm
index 33838b3e8f2..63d34788a98 100644
--- a/code/modules/mob/living/carbon/update_status.dm
+++ b/code/modules/mob/living/carbon/update_status.dm
@@ -1,15 +1,29 @@
-/mob/living/carbon/update_stat()
+/mob/living/carbon/update_stat(reason = "none given")
if(status_flags & GODMODE)
return
if(stat != DEAD)
// if(health <= min_health)
if(health <= config.health_threshold_dead)
death()
+ create_debug_log("died of damage, trigger reason: [reason]")
return
// if(paralysis || sleeping || getOxyLoss() > low_oxy_ko || (status_flags & FAKEDEATH) || health <= crit_health)
if(paralysis || sleeping || getOxyLoss() > 50 || (status_flags & FAKEDEATH) || health <= config.health_threshold_crit)
if(stat == CONSCIOUS)
KnockOut()
+ create_debug_log("fell unconscious, trigger reason: [reason]")
else
if(stat == UNCONSCIOUS)
WakeUp()
+ create_debug_log("woke up, trigger reason: [reason]")
+
+/mob/living/carbon/update_stamina()
+ ..()
+ if(staminaloss)
+ var/total_health = (health - staminaloss)
+ if(total_health <= config.health_threshold_softcrit && !stat)
+ to_chat(src, "You're too exhausted to keep going...")
+ Weaken(5)
+ setStaminaLoss(health - 2)
+ handle_hud_icons_health()
+ return
diff --git a/code/modules/mob/living/damage_procs.dm b/code/modules/mob/living/damage_procs.dm
index 96caf40b191..734dd556b48 100644
--- a/code/modules/mob/living/damage_procs.dm
+++ b/code/modules/mob/living/damage_procs.dm
@@ -24,7 +24,7 @@
adjustCloneLoss(damage * blocked)
if(STAMINA)
adjustStaminaLoss(damage * blocked)
- updatehealth()
+ updatehealth("apply damage")
return 1
/mob/living/proc/apply_damage_type(damage = 0, damagetype = BRUTE) //like apply damage except it always uses the damage procs
@@ -83,7 +83,7 @@
if(JITTER)
if(status_flags & CANSTUN)
Jitter(effect * blocked)
- updatehealth()
+ updatehealth("apply effect")
return 1
/mob/living/proc/apply_effects(var/stun = 0, var/weaken = 0, var/paralyze = 0, var/irradiate = 0, var/slur = 0, var/stutter = 0, var/eyeblur = 0, var/drowsy = 0, var/blocked = 0, var/stamina = 0, var/jitter = 0)
@@ -99,3 +99,205 @@
if(stamina) apply_damage(stamina, STAMINA, null, blocked)
if(jitter) apply_effect(jitter, JITTER, blocked)
return 1
+
+
+/mob/living/proc/getBruteLoss()
+ return bruteloss
+
+/mob/living/proc/adjustBruteLoss(var/amount, updating_health = TRUE)
+ if(status_flags & GODMODE)
+ return FALSE //godmode
+ var/old_bruteloss = bruteloss
+ bruteloss = min(max(bruteloss + amount, 0),(maxHealth*2))
+ if(old_bruteloss == bruteloss)
+ updating_health = FALSE
+ . = STATUS_UPDATE_NONE
+ else
+ . = STATUS_UPDATE_HEALTH
+ if(updating_health)
+ updatehealth("adjustBruteLoss")
+
+/mob/living/proc/getOxyLoss()
+ return oxyloss
+
+/mob/living/proc/adjustOxyLoss(var/amount, updating_health = TRUE)
+ if(status_flags & GODMODE)
+ return FALSE //godmode
+ var/old_oxyloss = oxyloss
+ oxyloss = min(max(oxyloss + amount, 0),(maxHealth*2))
+ if(old_oxyloss == oxyloss)
+ updating_health = FALSE
+ . = STATUS_UPDATE_NONE
+ else
+ . = STATUS_UPDATE_HEALTH
+ if(updating_health)
+ updatehealth("adjustOxyLoss")
+
+/mob/living/proc/setOxyLoss(amount, updating_health = TRUE)
+ if(status_flags & GODMODE)
+ return FALSE //godmode
+ var/old_oxyloss = oxyloss
+ oxyloss = amount
+ if(old_oxyloss == oxyloss)
+ updating_health = FALSE
+ . = STATUS_UPDATE_NONE
+ else
+ . = STATUS_UPDATE_HEALTH
+ if(updating_health)
+ updatehealth("setOxyLoss")
+
+/mob/living/proc/getToxLoss()
+ return toxloss
+
+/mob/living/proc/adjustToxLoss(var/amount, updating_health = TRUE)
+ if(status_flags & GODMODE)
+ return FALSE //godmode
+ var/old_toxloss = toxloss
+ toxloss = min(max(toxloss + amount, 0),(maxHealth*2))
+ if(old_toxloss == toxloss)
+ updating_health = FALSE
+ . = STATUS_UPDATE_NONE
+ else
+ . = STATUS_UPDATE_HEALTH
+ if(updating_health)
+ updatehealth("adjustToxLoss")
+
+/mob/living/proc/setToxLoss(var/amount, updating_health = TRUE)
+ if(status_flags & GODMODE)
+ return FALSE //godmode
+ var/old_toxloss = toxloss
+ toxloss = amount
+ if(old_toxloss == toxloss)
+ updating_health = FALSE
+ . = STATUS_UPDATE_NONE
+ else
+ . = STATUS_UPDATE_HEALTH
+ if(updating_health)
+ updatehealth("setToxLoss")
+
+/mob/living/proc/getFireLoss()
+ return fireloss
+
+/mob/living/proc/adjustFireLoss(var/amount, updating_health = TRUE)
+ if(status_flags & GODMODE)
+ return FALSE //godmode
+ var/old_fireloss = fireloss
+ fireloss = min(max(fireloss + amount, 0),(maxHealth*2))
+ if(old_fireloss == fireloss)
+ updating_health = FALSE
+ . = STATUS_UPDATE_NONE
+ else
+ . = STATUS_UPDATE_HEALTH
+ if(updating_health)
+ updatehealth("adjustFireLoss")
+
+/mob/living/proc/getCloneLoss()
+ return cloneloss
+
+/mob/living/proc/adjustCloneLoss(var/amount, updating_health = TRUE)
+ if(status_flags & GODMODE)
+ return FALSE //godmode
+ var/old_cloneloss = cloneloss
+ cloneloss = min(max(cloneloss + amount, 0),(maxHealth*2))
+ if(old_cloneloss == cloneloss)
+ updating_health = FALSE
+ . = STATUS_UPDATE_NONE
+ else
+ . = STATUS_UPDATE_HEALTH
+ if(updating_health)
+ updatehealth("adjustCloneLoss")
+
+/mob/living/proc/setCloneLoss(var/amount, updating_health = TRUE)
+ if(status_flags & GODMODE) return 0 //godmode
+ var/old_cloneloss = cloneloss
+ cloneloss = amount
+ if(old_cloneloss == cloneloss)
+ updating_health = FALSE
+ . = STATUS_UPDATE_NONE
+ else
+ . = STATUS_UPDATE_HEALTH
+ if(updating_health)
+ updatehealth("setCloneLoss")
+
+/mob/living/proc/getBrainLoss()
+ return 0
+
+/mob/living/proc/adjustBrainLoss(amount, updating = TRUE)
+ return STATUS_UPDATE_NONE
+
+/mob/living/proc/setBrainLoss(amount, updating = TRUE)
+ return STATUS_UPDATE_NONE
+
+/mob/living/proc/getStaminaLoss()
+ return staminaloss
+
+/mob/living/proc/adjustStaminaLoss(amount, updating = TRUE)
+ if(status_flags & GODMODE)
+ return FALSE
+ var/old_stamloss = staminaloss
+ staminaloss = min(max(staminaloss + amount, 0),(maxHealth*2))
+ if(old_stamloss == staminaloss)
+ updating = FALSE
+ . = STATUS_UPDATE_NONE
+ else
+ . = STATUS_UPDATE_STAMINA
+ if(updating)
+ handle_hud_icons_health()
+ update_stamina()
+
+/mob/living/proc/setStaminaLoss(amount, updating = TRUE)
+ if(status_flags & GODMODE)
+ return FALSE
+ var/old_stamloss = staminaloss
+ staminaloss = amount
+ if(old_stamloss == staminaloss)
+ updating = FALSE
+ . = STATUS_UPDATE_NONE
+ else
+ . = STATUS_UPDATE_STAMINA
+ if(updating)
+ handle_hud_icons_health()
+ update_stamina()
+
+/mob/living/proc/getMaxHealth()
+ return maxHealth
+
+/mob/living/proc/setMaxHealth(var/newMaxHealth)
+ maxHealth = newMaxHealth
+
+
+
+// heal ONE external organ, organ gets randomly selected from damaged ones.
+/mob/living/proc/heal_organ_damage(brute, burn, updating_health = TRUE)
+ adjustBruteLoss(-brute, FALSE)
+ adjustFireLoss(-burn, FALSE)
+ if(updating_health)
+ updatehealth("heal organ damage")
+
+// damage ONE external organ, organ gets randomly selected from damaged ones.
+/mob/living/proc/take_organ_damage(brute, burn, updating_health = TRUE)
+ if(status_flags & GODMODE)
+ return FALSE //godmode
+ adjustBruteLoss(brute, FALSE)
+ adjustFireLoss(burn, FALSE)
+ if(updating_health)
+ updatehealth("take organ damage")
+
+// heal MANY external organs, in random order
+/mob/living/proc/heal_overall_damage(brute, burn, updating_health = TRUE)
+ adjustBruteLoss(-brute, FALSE)
+ adjustFireLoss(-burn, FALSE)
+ if(updating_health)
+ updatehealth("heal overall damage")
+
+// damage MANY external organs, in random order
+/mob/living/proc/take_overall_damage(brute, burn, updating_health = TRUE, used_weapon = null)
+ if(status_flags & GODMODE)
+ return FALSE //godmode
+ adjustBruteLoss(brute, FALSE)
+ adjustFireLoss(burn, FALSE)
+ if(updating_health)
+ updatehealth("take overall damage")
+
+/mob/living/proc/has_organic_damage()
+ return (maxHealth - health)
diff --git a/code/modules/mob/living/death.dm b/code/modules/mob/living/death.dm
index 9056a078791..7987f460815 100644
--- a/code/modules/mob/living/death.dm
+++ b/code/modules/mob/living/death.dm
@@ -1,12 +1,71 @@
+//This is the proc for gibbing a mob. Cannot gib ghosts.
+//added different sort of gibs and animations. N
+/mob/living/gib()
+ if(!death(TRUE) && stat != DEAD)
+ return FALSE
+ // hide and freeze for the GC
+ notransform = 1
+ canmove = 0
+ icon = null
+ invisibility = 101
+
+ playsound(src.loc, 'sound/goonstation/effects/gib.ogg', 50, 1)
+ gibs(loc, dna)
+ QDEL_IN(src, 0)
+ return TRUE
+
+//This is the proc for turning a mob into ash. Mostly a copy of gib code (above).
+//Originally created for wizard disintegrate. I've removed the virus code since it's irrelevant here.
+//Dusting robots does not eject the MMI, so it's a bit more powerful than gib() /N
+/mob/living/dust()
+ if(!death(TRUE) && stat != DEAD)
+ return FALSE
+ new /obj/effect/decal/cleanable/ash(loc)
+ // hide and freeze them while they get GC'd
+ notransform = 1
+ canmove = 0
+ icon = null
+ invisibility = 101
+ QDEL_IN(src, 0)
+ return TRUE
+
+/mob/living/melt()
+ if(!death(TRUE) && stat != DEAD)
+ return FALSE
+ // hide and freeze them while they get GC'd
+ notransform = 1
+ canmove = 0
+ icon = null
+ invisibility = 101
+ QDEL_IN(src, 0)
+ return TRUE
+
+/mob/living/proc/can_die()
+ return !(stat == DEAD || (status_flags & GODMODE))
+
+// Returns true if mob transitioned from live to dead
+// Do a check with `can_die` beforehand if you need to do any
+// handling before `stat` is set
/mob/living/death(gibbed)
- blinded = max(blinded, 1)
+ if(!can_die())
+ // Whew! Good thing I'm indestructible! (or already dead)
+ return FALSE
+
+ stat = DEAD
+ SetDizzy(0)
+ SetJitter(0)
+ SetLoseBreath(0)
if(suiciding)
mind.suicided = TRUE
-
clear_fullscreens()
+ update_sight()
update_action_buttons_icon()
+ med_hud_set_health()
+ med_hud_set_status()
+ callHook("death", list(src, gibbed))
+
for(var/s in ownedSoullinks)
var/datum/soullink/S = s
S.ownerDies(gibbed, src)
@@ -14,7 +73,19 @@
var/datum/soullink/S = s
S.sharerDies(gibbed, src)
- med_hud_set_health()
- med_hud_set_status()
+ if(!gibbed)
+ update_canmove()
- ..(gibbed)
+ timeofdeath = world.time
+
+ living_mob_list -= src
+ dead_mob_list += src
+ if(mind)
+ mind.store_memory("Time of death: [station_time_timestamp("hh:mm:ss", timeofdeath)]", 0)
+ respawnable_list += src
+
+ if(ticker && ticker.mode)
+ ticker.mode.check_win()
+
+ // u no we dead
+ return TRUE
diff --git a/code/modules/mob/living/life.dm b/code/modules/mob/living/life.dm
index f02065b3a0a..032f46d42dd 100644
--- a/code/modules/mob/living/life.dm
+++ b/code/modules/mob/living/life.dm
@@ -8,12 +8,6 @@
return
var/datum/gas_mixture/environment = loc.return_air()
- //Apparently, the person who wrote this code designed it so that
- //blinded get reset each cycle and then get activated later in the
- //code. Very ugly. I dont care. Moving this stuff here so its easy
- //to find it.
- blinded = null
-
if(stat != DEAD)
//Chemicals in the body
handle_chemicals_in_body()
@@ -51,8 +45,6 @@
handle_disabilities() // eye, ear, brain damages
handle_status_effects() //all special effects, stunned, weakened, jitteryness, hallucination, sleeping, etc
- update_canmove(1) // set to 1 to not update icon action buttons; rip this argument out if Life is ever refactored to be non-stupid. -Fox
-
if(client)
//regular_hud_updates() //THIS DOESN'T FUCKING UPDATE SHIT
handle_regular_hud_updates() //IT JUST REMOVES FUCKING HUD IMAGES
@@ -90,21 +82,7 @@
//This updates the health and status of the mob (conscious, unconscious, dead)
/mob/living/proc/handle_regular_status_updates()
-
- updatehealth()
-
- if(stat != DEAD)
-
- if(paralysis)
- stat = UNCONSCIOUS
-
- else if(status_flags & FAKEDEATH)
- stat = UNCONSCIOUS
-
- else
- stat = CONSCIOUS
-
- return 1
+ return stat != DEAD
//this updates all special effects: stunned, sleeping, weakened, druggy, stuttering, etc..
/mob/living/proc/handle_status_effects()
@@ -215,29 +193,6 @@
if(stat == DEAD)
return
- if(blinded || eye_blind)
- overlay_fullscreen("blind", /obj/screen/fullscreen/blind)
- throw_alert("blind", /obj/screen/alert/blind)
- else
- clear_fullscreen("blind")
- clear_alert("blind")
-
- if(disabilities & NEARSIGHTED)
- overlay_fullscreen("nearsighted", /obj/screen/fullscreen/impaired, 1)
- else
- clear_fullscreen("nearsighted")
-
- if(eye_blurry)
- overlay_fullscreen("blurry", /obj/screen/fullscreen/blurry)
- else
- clear_fullscreen("blurry")
-
- if(druggy)
- overlay_fullscreen("high", /obj/screen/fullscreen/high)
- throw_alert("high", /obj/screen/alert/high)
- else
- clear_fullscreen("high")
- clear_alert("high")
if(machine)
if(!machine.check_eye(src))
@@ -247,6 +202,8 @@
reset_perspective(null)
/mob/living/proc/update_sight()
+ if(stat == DEAD)
+ grant_death_vision()
return
// Gives a mob the vision of being dead
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 4cfdc7bb1f4..fdd91bf1cd9 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -214,16 +214,14 @@
/mob/living/verb/succumb()
set hidden = 1
if(InCritical())
- attack_log += "[src] has ["succumbed to death"] with [round(health, 0.1)] points of health!"
+ create_attack_log("[src] has ["succumbed to death"] with [round(health, 0.1)] points of health!")
adjustOxyLoss(health - config.health_threshold_dead)
- updatehealth()
// super check for weird mobs, including ones that adjust hp
// we don't want to go overboard and gib them, though
for(var/i = 1 to 5)
if(health < config.health_threshold_dead)
break
take_overall_damage(max(5, health - config.health_threshold_dead), 0)
- updatehealth()
to_chat(src, "You have given up life and succumbed to death.")
/mob/living/proc/InCritical()
@@ -233,12 +231,15 @@
..()
flash_eyes()
-/mob/living/proc/updatehealth()
+/mob/living/proc/updatehealth(reason = "none given")
if(status_flags & GODMODE)
health = maxHealth
stat = CONSCIOUS
return
health = maxHealth - getOxyLoss() - getToxLoss() - getFireLoss() - getBruteLoss() - getCloneLoss()
+
+ update_stat("updatehealth([reason])")
+ handle_hud_icons_health()
med_hud_set_health()
@@ -268,89 +269,6 @@
return temperature
-// ++++ROCKDTBEN++++ MOB PROCS -- Ask me before touching.
-// Stop! ... Hammertime! ~Carn
-// I touched them without asking... I'm soooo edgy ~Erro (added nodamage checks)
-// no ~Tigerkitty
-
-/mob/living/proc/getBruteLoss()
- return bruteloss
-
-/mob/living/proc/adjustBruteLoss(var/amount)
- if(status_flags & GODMODE) return 0 //godmode
- bruteloss = min(max(bruteloss + amount, 0),(maxHealth*2))
-
-/mob/living/proc/getOxyLoss()
- return oxyloss
-
-/mob/living/proc/adjustOxyLoss(var/amount)
- if(status_flags & GODMODE) return 0 //godmode
- oxyloss = min(max(oxyloss + amount, 0),(maxHealth*2))
-
-/mob/living/proc/setOxyLoss(var/amount)
- if(status_flags & GODMODE) return 0 //godmode
- oxyloss = amount
-
-/mob/living/proc/getToxLoss()
- return toxloss
-
-/mob/living/proc/adjustToxLoss(var/amount)
- if(status_flags & GODMODE) return 0 //godmode
- toxloss = min(max(toxloss + amount, 0),(maxHealth*2))
-
-/mob/living/proc/setToxLoss(var/amount)
- if(status_flags & GODMODE) return 0 //godmode
- toxloss = amount
-
-/mob/living/proc/getFireLoss()
- return fireloss
-
-/mob/living/proc/adjustFireLoss(var/amount)
- if(status_flags & GODMODE) return 0 //godmode
- fireloss = min(max(fireloss + amount, 0),(maxHealth*2))
-
-/mob/living/proc/getCloneLoss()
- return cloneloss
-
-/mob/living/proc/adjustCloneLoss(var/amount)
- if(status_flags & GODMODE) return 0 //godmode
- cloneloss = min(max(cloneloss + amount, 0),(maxHealth*2))
-
-/mob/living/proc/setCloneLoss(var/amount)
- if(status_flags & GODMODE) return 0 //godmode
- cloneloss = amount
-
-/mob/living/proc/getBrainLoss()
- return brainloss
-
-/mob/living/proc/adjustBrainLoss(var/amount)
- if(status_flags & GODMODE) return 0 //godmode
- brainloss = min(max(brainloss + amount, 0),(maxHealth*2))
-
-/mob/living/proc/setBrainLoss(var/amount)
- if(status_flags & GODMODE) return 0 //godmode
- brainloss = amount
-
-/mob/living/proc/getStaminaLoss()
- return staminaloss
-
-/mob/living/proc/adjustStaminaLoss(var/amount)
- if(status_flags & GODMODE) return 0
- staminaloss = min(max(staminaloss + amount, 0),(maxHealth*2))
-
-/mob/living/proc/setStaminaLoss(var/amount)
- if(status_flags & GODMODE) return 0
- staminaloss = amount
-
-/mob/living/proc/getMaxHealth()
- return maxHealth
-
-/mob/living/proc/setMaxHealth(var/newMaxHealth)
- maxHealth = newMaxHealth
-
-// ++++ROCKDTBEN++++ MOB PROCS //END
-
-
/mob/proc/get_contents()
@@ -421,35 +339,6 @@
var/obj/item/organ/external/def_zone = ran_zone(t)
return def_zone
-// heal ONE external organ, organ gets randomly selected from damaged ones.
-/mob/living/proc/heal_organ_damage(var/brute, var/burn)
- adjustBruteLoss(-brute)
- adjustFireLoss(-burn)
- updatehealth()
-
-// damage ONE external organ, organ gets randomly selected from damaged ones.
-/mob/living/proc/take_organ_damage(var/brute, var/burn)
- if(status_flags & GODMODE) return 0 //godmode
- adjustBruteLoss(brute)
- adjustFireLoss(burn)
- updatehealth()
-
-// heal MANY external organs, in random order
-/mob/living/proc/heal_overall_damage(var/brute, var/burn)
- adjustBruteLoss(-brute)
- adjustFireLoss(-burn)
- updatehealth()
-
-// damage MANY external organs, in random order
-/mob/living/proc/take_overall_damage(var/brute, var/burn, var/used_weapon = null)
- if(status_flags & GODMODE) return 0 //godmode
- adjustBruteLoss(brute)
- adjustFireLoss(burn)
- updatehealth()
-
-/mob/living/proc/has_organic_damage()
- return (maxHealth - health)
-
/mob/living/proc/restore_all_organs()
return
@@ -474,6 +363,8 @@
C.reagents.clear_reagents()
C.reagents.addiction_list.Cut()
+// rejuvenate: Called by `revive` to get the mob into a revivable state
+// the admin "rejuvenate" command calls `revive`, not this proc.
/mob/living/proc/rejuvenate()
var/mob/living/carbon/human/human_mob = null //Get this declared for use later.
@@ -496,7 +387,6 @@
radiation = 0
SetDruggy(0)
SetHallucinate(0)
- blinded = 0
nutrition = NUTRITION_LEVEL_FED + 50
bodytemperature = 310
CureBlind()
@@ -544,11 +434,10 @@
restore_all_organs()
surgeries.Cut() //End all surgeries.
if(stat == DEAD)
- dead_mob_list -= src
- living_mob_list += src
- timeofdeath = 0
+ update_revive()
+ else if(stat == UNCONSCIOUS)
+ WakeUp()
- stat = CONSCIOUS
update_fire()
regenerate_icons()
restore_blood()
diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index aaeb26fe2c6..ed6ef267fb0 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -122,7 +122,7 @@
M.mech_toxin_damage(src)
else
return
- updatehealth()
+ updatehealth("mech melee attack")
M.occupant_message("You hit [src].")
visible_message("[src] has been hit by [M.name].", \
"[src] has been hit by [M.name].")
diff --git a/code/modules/mob/living/living_defines.dm b/code/modules/mob/living/living_defines.dm
index 4afdd9281ce..44d34516ab0 100644
--- a/code/modules/mob/living/living_defines.dm
+++ b/code/modules/mob/living/living_defines.dm
@@ -12,7 +12,6 @@
var/toxloss = 0 //Toxic damage caused by being poisoned or radiated
var/fireloss = 0 //Burn damage caused by being way too hot, too cold or burnt.
var/cloneloss = 0 //Damage caused by being cloned or ejected from the cloner early. slimes also deal cloneloss damage to victims
- var/brainloss = 0 //'Retardation' damage caused by someone hitting you in the head with a bible or being infected with brainrot.
var/staminaloss = 0 //Stamina damage, or exhaustion. You recover it slowly naturally, and are stunned if it gets too high. Holodeck and hallucinations deal this.
@@ -67,4 +66,3 @@
hud_possible = list(HEALTH_HUD,STATUS_HUD,SPECIALROLE_HUD)
var/list/status_effects //a list of all status effects the mob has
-
diff --git a/code/modules/mob/living/login.dm b/code/modules/mob/living/login.dm
index a2fc8e934cb..57e5623cbbf 100644
--- a/code/modules/mob/living/login.dm
+++ b/code/modules/mob/living/login.dm
@@ -2,6 +2,8 @@
..()
//Mind updates
sync_mind()
+ update_stat("mob login")
+ update_sight()
//If they're SSD, remove it so they can wake back up.
player_logged = 0
@@ -11,8 +13,8 @@
to_chat(src, "You can ventcrawl! Use alt+click on vents to quickly travel about the station.")
if(ranged_ability)
- ranged_ability.add_ranged_ability(src, "You currently have [ranged_ability] active!")
-
+ ranged_ability.add_ranged_ability(src, "You currently have [ranged_ability] active!")
+
//Should update regardless of if we can ventcrawl, since we can end up in pipes in other ways.
update_pipe_vision()
diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
index 2c4b4612e5f..daf723597de 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -549,7 +549,6 @@ var/list/ai_verbs_default = list(
/mob/living/silicon/ai/blob_act()
if(stat != 2)
adjustBruteLoss(60)
- updatehealth()
return TRUE
return FALSE
@@ -685,7 +684,6 @@ var/list/ai_verbs_default = list(
/mob/living/silicon/ai/bullet_act(var/obj/item/projectile/Proj)
..(Proj)
- updatehealth()
return 2
/mob/living/silicon/ai/reset_perspective(atom/A)
diff --git a/code/modules/mob/living/silicon/ai/death.dm b/code/modules/mob/living/silicon/ai/death.dm
index 553af6f09b8..ca4d2da70bd 100644
--- a/code/modules/mob/living/silicon/ai/death.dm
+++ b/code/modules/mob/living/silicon/ai/death.dm
@@ -1,19 +1,16 @@
/mob/living/silicon/ai/death(gibbed)
- if(stat == DEAD)
- return
- stat = DEAD
+ // Only execute the below if we successfully died
+ . = ..(gibbed)
+ if(!.)
+ return FALSE
if(custom_sprite == 1)//check for custom AI sprite, defaulting to blue screen if no.
icon_state = "[ckey]-ai_dead"
else if("[icon_state]_dead" in icon_states(icon,1))
icon_state = "[icon_state]_dead"
else
icon_state = "ai_dead"
- update_canmove()
if(eyeobj)
eyeobj.setLoc(get_turf(src))
- sight |= SEE_TURFS|SEE_MOBS|SEE_OBJS
- see_in_dark = 8
- see_invisible = SEE_INVISIBLE_LEVEL_TWO
shuttle_caller_list -= src
SSshuttle.autoEvac()
@@ -38,12 +35,7 @@
explosion(src.loc, 3, 6, 12, 15)
for(var/obj/machinery/ai_status_display/O in world) //change status
- spawn( 0 )
O.mode = 2
- if(istype(loc, /obj/item/aicard))
- loc.icon_state = "aicard-404"
- timeofdeath = world.time
- if(mind) mind.store_memory("Time of death: [station_time_timestamp("hh:mm:ss", timeofdeath)]", 0)
-
- return ..(gibbed)
+ if(istype(loc, /obj/item/aicard))
+ loc.icon_state = "aicard-404"
diff --git a/code/modules/mob/living/silicon/ai/life.dm b/code/modules/mob/living/silicon/ai/life.dm
index 42f132e39d4..c3b22129cb8 100644
--- a/code/modules/mob/living/silicon/ai/life.dm
+++ b/code/modules/mob/living/silicon/ai/life.dm
@@ -14,13 +14,11 @@
reset_perspective(null)
unset_machine()
- updatehealth()
+ updatehealth("life")
+ if(stat == DEAD)
+ return
update_gravity(mob_has_gravity())
- if(health <= config.health_threshold_dead)
- death()
- return 0
-
if(!eyeobj || QDELETED(eyeobj) || !eyeobj.loc)
view_core()
@@ -44,21 +42,15 @@
var/area/my_area = get_area(src)
if(!lacks_power())
- if(aiRestorePowerRoutine == 2)
- to_chat(src, "Alert cancelled. Power has been restored without our assistance.")
+ if(aiRestorePowerRoutine > 1)
+ update_blind_effects()
aiRestorePowerRoutine = 0
- clear_fullscreen("blind")
- update_sight()
- else if(aiRestorePowerRoutine == 3)
- to_chat(src, "Alert cancelled. Power has been restored.")
- aiRestorePowerRoutine = 0
- clear_fullscreen("blind")
update_sight()
+ to_chat(src, "Alert cancelled. Power has been restored[aiRestorePowerRoutine == 2 ? "without our assistance" : ""].")
else
- overlay_fullscreen("blind", /obj/screen/fullscreen/blind)
-
if(lacks_power())
if(!aiRestorePowerRoutine)
+ update_blind_effects()
aiRestorePowerRoutine = 1
update_sight()
to_chat(src, "You have lost power!")
@@ -73,7 +65,7 @@
if(!lacks_power())
to_chat(src, "Alert cancelled. Power has been restored without our assistance.")
aiRestorePowerRoutine = 0
- clear_fullscreen("blind")
+ update_blind_effects()
update_sight()
return
to_chat(src, "Fault confirmed: missing external power. Shutting down main control system to save power.")
@@ -112,7 +104,7 @@
if(!lacks_power())
to_chat(src, "Alert cancelled. Power has been restored without our assistance.")
aiRestorePowerRoutine = 0
- clear_fullscreen("blind")
+ update_blind_effects()
update_sight()
return
@@ -143,12 +135,13 @@
if(get_nations_mode())
process_nations_ai()
-/mob/living/silicon/ai/updatehealth()
+/mob/living/silicon/ai/updatehealth(reason = "none given")
if(status_flags & GODMODE)
health = 100
stat = CONSCIOUS
else
health = 100 - getOxyLoss() - getToxLoss() - getFireLoss() - getBruteLoss()
+ update_stat("updatehealth([reason])")
diag_hud_set_status()
diag_hud_set_health()
diff --git a/code/modules/mob/living/silicon/ai/update_status.dm b/code/modules/mob/living/silicon/ai/update_status.dm
index 4fa060abf39..18a35534db8 100644
--- a/code/modules/mob/living/silicon/ai/update_status.dm
+++ b/code/modules/mob/living/silicon/ai/update_status.dm
@@ -1,10 +1,15 @@
-/mob/living/silicon/ai/update_stat()
+/mob/living/silicon/ai/update_stat(reason = "none given")
if(status_flags & GODMODE)
return
if(stat != DEAD)
if(health <= config.health_threshold_dead)
death()
+ create_debug_log("died of damage, trigger reason: [reason]")
return
else if(stat == UNCONSCIOUS)
WakeUp()
+ create_debug_log("woke up, trigger reason: [reason]")
//diag_hud_set_status()
+
+/mob/living/silicon/ai/has_vision(information_only = FALSE)
+ return ..() && !lacks_power()
diff --git a/code/modules/mob/living/silicon/decoy/death.dm b/code/modules/mob/living/silicon/decoy/death.dm
index 624343af464..46a60822aa8 100644
--- a/code/modules/mob/living/silicon/decoy/death.dm
+++ b/code/modules/mob/living/silicon/decoy/death.dm
@@ -1,10 +1,10 @@
/mob/living/silicon/decoy/death(gibbed)
- if(stat == DEAD)
- return
- stat = DEAD
+ // Only execute the below if we successfully died
+ . = ..()
+ if(!.)
+ return FALSE
icon_state = "ai-crash"
for(var/obj/machinery/ai_status_display/O in world) //change status
if(atoms_share_level(O, src))
O.mode = 2
- ..(0)
- gib()
\ No newline at end of file
+ gib()
diff --git a/code/modules/mob/living/silicon/decoy/life.dm b/code/modules/mob/living/silicon/decoy/life.dm
index dc1324dc6dd..b8919373faf 100644
--- a/code/modules/mob/living/silicon/decoy/life.dm
+++ b/code/modules/mob/living/silicon/decoy/life.dm
@@ -2,17 +2,18 @@
return
-/mob/living/silicon/decoy/updatehealth()
+/mob/living/silicon/decoy/updatehealth(reason = "none given")
if(status_flags & GODMODE)
health = 100
stat = CONSCIOUS
else
health = 100 - getOxyLoss() - getToxLoss() - getFireLoss() - getBruteLoss()
- update_stat()
+ update_stat("updatehealth([reason])")
-/mob/living/silicon/decoy/update_stat()
+/mob/living/silicon/decoy/update_stat(reason = "none given")
if(stat == DEAD)
return
if(health <= 0)
- death()
\ No newline at end of file
+ death()
+ create_debug_log("died of damage, trigger reason: [reason]")
diff --git a/code/modules/mob/living/silicon/pai/death.dm b/code/modules/mob/living/silicon/pai/death.dm
index b0f498014d8..48539a9689b 100644
--- a/code/modules/mob/living/silicon/pai/death.dm
+++ b/code/modules/mob/living/silicon/pai/death.dm
@@ -1,28 +1,17 @@
/mob/living/silicon/pai/death(gibbed, cleanWipe)
- if(stat == DEAD)
- return
+ if(can_die())
+ if(!cleanWipe)
+ force_fold_out()
- if(!cleanWipe)
- force_fold_out()
+ visible_message("[src] emits a dull beep before it loses power and collapses.", "You hear a dull beep followed by the sound of glass crunching.")
+ name = "pAI debris"
+ desc = "The unfortunate remains of some poor personal AI device."
+ icon_state = "[chassis]_dead"
- var/turf/T = get_turf_or_move(loc)
- for(var/mob/M in viewers(T))
- M.show_message("[src] emits a dull beep before it loses power and collapses.", 3, "You hear a dull beep followed by the sound of glass crunching.", 2)
- name = "pAI debris"
- desc = "The unfortunate remains of some poor personal AI device."
- icon_state = "[chassis]_dead"
- stat = DEAD
- canmove = 0
- sight |= SEE_TURFS|SEE_MOBS|SEE_OBJS
- see_in_dark = 8
- see_invisible = SEE_INVISIBLE_LEVEL_TWO
+ // Only execute the below if we successfully died
+ . = ..(gibbed)
+ if(!.)
+ return FALSE
- //var/tod = time2text(world.realtime,"hh:mm:ss") //weasellos time of death patch
- //mind.store_memory("Time of death: [tod]", 0)
-
- //New pAI's get a brand new mind to prevent meta stuff from their previous life. This new mind causes problems down the line if it's not deleted here.
- //Read as: I have no idea what I'm doing but asking for help got me nowhere so this is what you get. - Nodrak
- if(mind) qdel(mind)
- living_mob_list -= src
if(icon_state != "[chassis]_dead" || cleanWipe)
qdel(src)
diff --git a/code/modules/mob/living/silicon/pai/life.dm b/code/modules/mob/living/silicon/pai/life.dm
index abcfc6bd643..0abaa12bdd9 100644
--- a/code/modules/mob/living/silicon/pai/life.dm
+++ b/code/modules/mob/living/silicon/pai/life.dm
@@ -18,11 +18,10 @@
qdel(src.cable)
cable = null
-/mob/living/silicon/pai/updatehealth()
+/mob/living/silicon/pai/updatehealth(reason = "none given")
if(status_flags & GODMODE)
health = 100
stat = CONSCIOUS
else
health = 100 - getBruteLoss() - getFireLoss()
- if(health <= 0)
- death(0)
\ No newline at end of file
+ update_stat("updatehealth([reason])")
diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm
index d635422073f..210aeadb7ee 100644
--- a/code/modules/mob/living/silicon/pai/pai.dm
+++ b/code/modules/mob/living/silicon/pai/pai.dm
@@ -160,9 +160,8 @@
return 1
/mob/living/silicon/pai/blob_act()
- if(stat != 2)
+ if(stat != DEAD)
adjustBruteLoss(60)
- updatehealth()
return 1
return 0
@@ -238,7 +237,6 @@
var/damage = rand(M.melee_damage_lower, M.melee_damage_upper)
add_attack_logs(M, src, "Animal attacked for [damage] damage")
adjustBruteLoss(damage)
- updatehealth()
/mob/living/silicon/pai/proc/switchCamera(var/obj/machinery/camera/C)
usr:cameraFollow = null
@@ -454,9 +452,7 @@
if(stat == DEAD)
to_chat(user, "\The [src] is beyond help, at this point.")
else if(getBruteLoss() || getFireLoss())
- adjustBruteLoss(-15)
- adjustFireLoss(-15)
- updatehealth()
+ heal_overall_damage(15, 15)
N.use(1)
user.visible_message("[user.name] applied some [W] at [src]'s damaged areas.",\
"You apply some [W] at [name]'s damaged areas.")
@@ -467,7 +463,6 @@
else if(W.force)
visible_message("[user.name] attacks [src] with [W]!")
adjustBruteLoss(W.force)
- updatehealth()
else
visible_message("[user.name] bonks [src] harmlessly with [W].")
spawn(1)
@@ -557,7 +552,6 @@
/mob/living/silicon/pai/bullet_act(var/obj/item/projectile/Proj)
..(Proj)
- updatehealth()
if(stat != 2)
spawn(1)
close_up()
diff --git a/code/modules/mob/living/silicon/pai/recruit.dm b/code/modules/mob/living/silicon/pai/recruit.dm
index 2d52af6e89d..29bfabddb0a 100644
--- a/code/modules/mob/living/silicon/pai/recruit.dm
+++ b/code/modules/mob/living/silicon/pai/recruit.dm
@@ -226,7 +226,7 @@ var/datum/paiController/paiController // Global handler for pAI candidates
Submit Personality |
-
+
"}
M << browse(dat, "window=paiRecruit;size=580x580;")
diff --git a/code/modules/mob/living/silicon/pai/update_status.dm b/code/modules/mob/living/silicon/pai/update_status.dm
index 155ecc84a28..110b645c11f 100644
--- a/code/modules/mob/living/silicon/pai/update_status.dm
+++ b/code/modules/mob/living/silicon/pai/update_status.dm
@@ -1,3 +1,4 @@
-/mob/living/silicon/pai/update_stat()
+/mob/living/silicon/pai/update_stat(reason = "none given")
if(health <= 0)
death(gibbed = 0)
+ create_debug_log("died of damage, trigger reason: [reason]")
diff --git a/code/modules/mob/living/silicon/robot/component.dm b/code/modules/mob/living/silicon/robot/component.dm
index dfdaac8015c..69cf6f93872 100644
--- a/code/modules/mob/living/silicon/robot/component.dm
+++ b/code/modules/mob/living/silicon/robot/component.dm
@@ -21,7 +21,9 @@
src.owner = R
/datum/robot_component/proc/install()
+ go_online()
/datum/robot_component/proc/uninstall()
+ go_offline()
/datum/robot_component/proc/destroy()
if(wrapped)
@@ -34,34 +36,62 @@
installed = -1
uninstall()
-/datum/robot_component/proc/take_damage(brute, electronics, sharp)
+/datum/robot_component/proc/take_damage(brute, electronics, sharp, updating_health = TRUE)
if(installed != 1)
return
+ if(owner && updating_health)
+ owner.updatehealth("component '[src]' take damage")
+
brute_damage += brute
electronics_damage += electronics
if(brute_damage + electronics_damage >= max_damage)
destroy()
-/datum/robot_component/proc/heal_damage(brute, electronics)
+/datum/robot_component/proc/heal_damage(brute, electronics, updating_health = TRUE)
if(installed != 1)
// If it's not installed, can't repair it.
return 0
+ if(owner && updating_health)
+ owner.updatehealth("component '[src]' heal damage")
+
brute_damage = max(0, brute_damage - brute)
electronics_damage = max(0, electronics_damage - electronics)
/datum/robot_component/proc/is_powered()
return (installed == 1) && (brute_damage + electronics_damage < max_damage) && (powered)
-
/datum/robot_component/proc/consume_power()
if(toggled == 0)
powered = 0
return
powered = 1
+/datum/robot_component/proc/disable()
+ if(!component_disabled)
+ go_offline()
+ component_disabled++
+
+/datum/robot_component/proc/enable()
+ component_disabled--
+ if(!component_disabled)
+ go_online()
+
+/datum/robot_component/proc/toggle()
+ toggled = !toggled
+ if(toggled)
+ go_online()
+ else
+ go_offline()
+
+/datum/robot_component/proc/go_online()
+ return
+
+/datum/robot_component/proc/go_offline()
+ return
+
/datum/robot_component/armour
name = "armour plating"
external_type = /obj/item/robot_parts/robot_component/armour
@@ -72,10 +102,25 @@
external_type = /obj/item/robot_parts/robot_component/actuator
max_damage = 50
+/datum/robot_component/actuator/go_online()
+ owner.update_stat()
+
+/datum/robot_component/actuator/go_offline()
+ owner.update_stat()
+
/datum/robot_component/cell
name = "power cell"
max_damage = 50
+/datum/robot_component/cell/is_powered()
+ return ..() && owner.cell
+
+/datum/robot_component/cell/go_online()
+ owner.update_stat()
+
+/datum/robot_component/cell/go_offline()
+ owner.update_stat()
+
/datum/robot_component/cell/destroy()
..()
owner.cell = null
@@ -95,6 +140,14 @@
external_type = /obj/item/robot_parts/robot_component/camera
max_damage = 40
+/datum/robot_component/camera/go_online()
+ owner.update_blind_effects()
+ owner.update_sight()
+
+/datum/robot_component/camera/go_offline()
+ owner.update_blind_effects()
+ owner.update_sight()
+
/datum/robot_component/diagnosis_unit
name = "self-diagnosis unit"
external_type = /obj/item/robot_parts/robot_component/diagnosis_unit
@@ -117,9 +170,9 @@
/mob/living/silicon/robot/proc/disable_component(module_name, duration)
var/datum/robot_component/D = get_component(module_name)
- D.component_disabled++
+ D.disable()
spawn(duration)
- D.component_disabled--
+ D.enable()
// Returns component by it's string name
/mob/living/silicon/robot/proc/get_component(var/component_name)
@@ -154,6 +207,8 @@
name = "camera"
icon_state = "camera"
+
+
/obj/item/robot_parts/robot_component/diagnosis_unit
name = "diagnosis unit"
icon_state = "diagnosis_unit"
diff --git a/code/modules/mob/living/silicon/robot/death.dm b/code/modules/mob/living/silicon/robot/death.dm
index 82667be2d3d..f9432ab7836 100644
--- a/code/modules/mob/living/silicon/robot/death.dm
+++ b/code/modules/mob/living/silicon/robot/death.dm
@@ -46,11 +46,20 @@
/mob/living/silicon/robot/death(gibbed)
- if(stat == DEAD) return
- if(!gibbed)
- emote("deathgasp")
- stat = DEAD
- update_canmove()
+ if(can_die())
+ if(!gibbed)
+ emote("deathgasp")
+
+ if(module)
+ module.handle_death(gibbed)
+
+ // Only execute the below if we successfully died
+ . = ..(gibbed)
+ if(!.)
+ return FALSE
+
+ diag_hud_set_status()
+ diag_hud_set_health()
if(camera)
camera.status = 0
update_headlamp(1) //So borg lights are disabled when killed.
@@ -59,13 +68,6 @@
var/obj/machinery/recharge_station/RC = loc
RC.go_out()
- sight |= SEE_TURFS|SEE_MOBS|SEE_OBJS
- see_in_dark = 8
- see_invisible = SEE_INVISIBLE_LEVEL_TWO
update_icons()
- timeofdeath = world.time
- if(mind) mind.store_memory("Time of death: [station_time_timestamp("hh:mm:ss", timeofdeath)]", 0)
sql_report_cyborg_death(src)
-
- return ..(gibbed)
diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm
index aaaeb15b283..eb1596c55c6 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone.dm
@@ -215,33 +215,13 @@
//DRONE LIFE/DEATH
//For some goddamn reason robots have this hardcoded. Redefining it for our fragile friends here.
-/mob/living/silicon/robot/drone/updatehealth()
+/mob/living/silicon/robot/drone/updatehealth(reason = "none given")
if(status_flags & GODMODE)
health = 35
stat = CONSCIOUS
return
health = 35 - (getBruteLoss() + getFireLoss())
- return
-
-//Easiest to check this here, then check again in the robot proc.
-//Standard robots use config for crit, which is somewhat excessive for these guys.
-//Drones killed by damage will gib.
-/mob/living/silicon/robot/drone/handle_regular_status_updates()
-
- if(health <= -35 && src.stat != DEAD)
- timeofdeath = world.time
- death() //Possibly redundant, having trouble making death() cooperate.
- gib()
- return
- return ..() // If you don't return anything here, you won't update status effects, like weakening
-
-/mob/living/silicon/robot/drone/death(gibbed)
-
- if(module)
- var/obj/item/gripper/G = locate(/obj/item/gripper) in module
- if(G) G.drop_item()
-
- ..(gibbed)
+ update_stat("updatehealth([reason])")
//CONSOLE PROCS
diff --git a/code/modules/mob/living/silicon/robot/drone/drone_damage.dm b/code/modules/mob/living/silicon/robot/drone/drone_damage.dm
index 57ffc898873..1ca0ecbfbbc 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone_damage.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone_damage.dm
@@ -1,24 +1,28 @@
//Redefining some robot procs, since drones can't be repaired and really shouldn't take component damage.
-/mob/living/silicon/robot/drone/take_overall_damage(var/brute = 0, var/burn = 0, var/sharp = 0, var/used_weapon = null)
+/mob/living/silicon/robot/drone/take_overall_damage(brute, burn, updating_health = TRUE, used_weapon = null, sharp = 0)
bruteloss += brute
fireloss += burn
+ if(updating_health)
+ updatehealth("take overall damage")
-/mob/living/silicon/robot/drone/heal_overall_damage(var/brute, var/burn)
+/mob/living/silicon/robot/drone/heal_overall_damage(brute, burn, updating_health = TRUE)
bruteloss -= brute
fireloss -= burn
if(bruteloss<0) bruteloss = 0
if(fireloss<0) fireloss = 0
+ if(updating_health)
+ updatehealth("heal overall damage")
-/mob/living/silicon/robot/drone/take_organ_damage(var/brute = 0, var/burn = 0, var/sharp = 0)
- take_overall_damage(brute,burn)
+/mob/living/silicon/robot/drone/take_organ_damage(brute, burn, updating_health = TRUE, sharp = 0)
+ take_overall_damage(brute,burn, updating_health, null, sharp)
-/mob/living/silicon/robot/drone/heal_organ_damage(var/brute, var/burn)
- heal_overall_damage(brute,burn)
+/mob/living/silicon/robot/drone/heal_organ_damage(brute, burn, updating_health = TRUE)
+ heal_overall_damage(brute,burn, updating_health)
/mob/living/silicon/robot/drone/getFireLoss()
return fireloss
/mob/living/silicon/robot/drone/getBruteLoss()
- return bruteloss
\ No newline at end of file
+ return bruteloss
diff --git a/code/modules/mob/living/silicon/robot/drone/update_status.dm b/code/modules/mob/living/silicon/robot/drone/update_status.dm
index 97d2214c2e2..80eac952966 100644
--- a/code/modules/mob/living/silicon/robot/drone/update_status.dm
+++ b/code/modules/mob/living/silicon/robot/drone/update_status.dm
@@ -1,10 +1,11 @@
//Easiest to check this here, then check again in the robot proc.
//Standard robots use config for crit, which is somewhat excessive for these guys.
//Drones killed by damage will gib.
-/mob/living/silicon/robot/drone/update_stat()
+/mob/living/silicon/robot/drone/update_stat(reason = "none given")
if(status_flags & GODMODE)
return
if(health <= -35 && stat != DEAD)
gib()
+ create_debug_log("died of damage, trigger reason: [reason]")
return
- return ..()
+ return ..(reason)
diff --git a/code/modules/mob/living/silicon/robot/inventory.dm b/code/modules/mob/living/silicon/robot/inventory.dm
index d590892cc01..8eb8bb80763 100644
--- a/code/modules/mob/living/silicon/robot/inventory.dm
+++ b/code/modules/mob/living/silicon/robot/inventory.dm
@@ -13,7 +13,7 @@
if(!O)
return 0
- O.mouse_opacity = 2
+ O.mouse_opacity = MOUSE_OPACITY_OPAQUE
if(client)
client.screen -= O
diff --git a/code/modules/mob/living/silicon/robot/life.dm b/code/modules/mob/living/silicon/robot/life.dm
index afa10c1772b..752cdc0f631 100644
--- a/code/modules/mob/living/silicon/robot/life.dm
+++ b/code/modules/mob/living/silicon/robot/life.dm
@@ -21,22 +21,22 @@
/mob/living/silicon/robot/proc/handle_robot_cell()
if(stat != DEAD)
- if(!is_component_functioning("power cell") || !cell)
- Paralyse(2)
+ if(!is_component_functioning("power cell"))
uneq_all()
low_power_mode = 1
update_headlamp()
diag_hud_set_borgcell()
return
if(low_power_mode)
- if(is_component_functioning("power cell") && cell && cell.charge)
+ if(is_component_functioning("power cell") && cell.charge)
low_power_mode = 0
update_headlamp()
else if(stat == CONSCIOUS)
use_power()
/mob/living/silicon/robot/proc/use_power()
- if(is_component_functioning("power cell") && cell && cell.charge)
+ // this check is safe because `cell` is guaranteed to be set when the power cell is functioning
+ if(is_component_functioning("power cell") && cell.charge)
if(cell.charge <= 100)
uneq_all()
var/amt = Clamp((lamp_intensity - 2) * 2,1,cell.charge) //Always try to use at least one charge per tick, but allow it to completely drain the cell.
@@ -57,22 +57,10 @@
else
camera.status = 1
- if(getOxyLoss() > 50)
- Paralyse(3)
-
if(sleeping)
- Paralyse(3)
AdjustSleeping(-1)
- if(resting)
- Weaken(5)
-
if(.) //alive
- if(health <= config.health_threshold_dead)
- death()
- diag_hud_set_status()
- return
-
if(!istype(src, /mob/living/silicon/robot/drone))
if(health < 50) //Gradual break down of modules as more damage is sustained
if(uneq_module(module_state_3))
@@ -86,19 +74,8 @@
if(uneq_module(module_state_1))
to_chat(src, "CRITICAL ERROR: All modules OFFLINE.")
- if(paralysis || stunned || weakened)
- stat = UNCONSCIOUS
-
- if(!paralysis > 0)
- SetEyeBlind(0)
-
- else
- stat = CONSCIOUS
-
diag_hud_set_health()
diag_hud_set_status()
- else //dead
- SetEyeBlind(0)
//update the state of modules and components here
if(stat != CONSCIOUS)
@@ -109,14 +86,6 @@
else
radio.on = 1
- if(is_component_functioning("camera") && stat == CONSCIOUS)
- blinded = 0
- else
- blinded = 1
-
- if(!is_component_functioning("actuator"))
- Paralyse(3)
-
return 1
/mob/living/silicon/robot/update_sight()
@@ -234,7 +203,7 @@
weaponlock_time = 120
/mob/living/silicon/robot/update_canmove(delay_action_updates = 0)
- if(paralysis || stunned || weakened || buckled || lockcharge)
+ if(paralysis || stunned || weakened || buckled || lockcharge || stat)
canmove = 0
else
canmove = 1
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index b9a7d0d12a0..d2e065d3b8d 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -477,12 +477,8 @@ var/list/robot_verbs_default = list(
return
var/datum/robot_component/C = components[toggle]
- if(C.toggled)
- C.toggled = 0
- to_chat(src, "You disable [C.name].")
- else
- C.toggled = 1
- to_chat(src, "You enable [C.name].")
+ C.toggle()
+ to_chat(src, "You [C.toggled ? "enable" : "disable"] [C.name].")
/mob/living/silicon/robot/proc/sensor_mode()
set name = "Set Sensor Augmentation"
@@ -528,9 +524,8 @@ var/list/robot_verbs_default = list(
thruster_button.icon_state = "ionpulse[ionpulse_on]"
/mob/living/silicon/robot/blob_act()
- if(stat != 2)
+ if(stat != DEAD)
adjustBruteLoss(60)
- updatehealth()
return 1
else
gib()
@@ -573,7 +568,6 @@ var/list/robot_verbs_default = list(
/mob/living/silicon/robot/bullet_act(var/obj/item/projectile/Proj)
..(Proj)
- updatehealth()
if(prob(75) && Proj.damage > 0) spark_system.start()
return 2
@@ -609,7 +603,6 @@ var/list/robot_verbs_default = list(
if(WT.remove_fuel(0))
playsound(src.loc, W.usesound, 50, 1)
adjustBruteLoss(-30)
- updatehealth()
add_fingerprint(user)
user.visible_message("\The [user] patches some dents on \the [src] with \the [WT].")
else
@@ -1259,7 +1252,9 @@ var/list/robot_verbs_default = list(
/mob/living/silicon/robot/adjustOxyLoss(var/amount)
if(suiciding)
- ..()
+ return ..()
+ else
+ return STATUS_UPDATE_NONE
/mob/living/silicon/robot/regenerate_icons()
..()
@@ -1439,6 +1434,7 @@ var/list/robot_verbs_default = list(
disable_component("comms", 160)
if(2)
disable_component("comms", 60)
+
/mob/living/silicon/robot/rejuvenate()
..()
var/brute = 1000
diff --git a/code/modules/mob/living/silicon/robot/robot_damage.dm b/code/modules/mob/living/silicon/robot/robot_damage.dm
index f84696c9964..ef7734c1e0d 100644
--- a/code/modules/mob/living/silicon/robot/robot_damage.dm
+++ b/code/modules/mob/living/silicon/robot/robot_damage.dm
@@ -1,17 +1,12 @@
-/mob/living/silicon/robot/updatehealth()
+/mob/living/silicon/robot/updatehealth(reason = "none given")
if(status_flags & GODMODE)
health = maxHealth
stat = CONSCIOUS
return
health = maxHealth - (getOxyLoss() + getFireLoss() + getBruteLoss())
- if(stat == DEAD && health > 0)
- update_revive()
- var/mob/dead/observer/ghost = get_ghost()
- if(ghost)
- to_chat(ghost, "Your cyborg shell has been repaired, re-enter if you want to continue! (Verbs -> Ghost -> Re-enter corpse)")
- ghost << sound('sound/effects/genetics.ogg')
- return
-
+ update_stat("updatehealth([reason])")
+ handle_hud_icons_health()
+ diag_hud_set_health()
/mob/living/silicon/robot/getBruteLoss()
var/amount = 0
@@ -27,17 +22,19 @@
if(C.installed != 0) amount += C.electronics_damage
return amount
-/mob/living/silicon/robot/adjustBruteLoss(var/amount)
+/mob/living/silicon/robot/adjustBruteLoss(amount, updating_health = TRUE)
if(amount > 0)
- take_overall_damage(amount, 0)
+ take_overall_damage(amount, 0, updating_health)
else
- heal_overall_damage(-amount, 0)
+ heal_overall_damage(-amount, 0, updating_health)
+ return STATUS_UPDATE_HEALTH
-/mob/living/silicon/robot/adjustFireLoss(var/amount)
+/mob/living/silicon/robot/adjustFireLoss(amount, updating_health = TRUE)
if(amount > 0)
- take_overall_damage(0, amount)
+ take_overall_damage(0, amount, updating_health)
else
- heal_overall_damage(0, -amount)
+ heal_overall_damage(0, -amount, updating_health)
+ return STATUS_UPDATE_HEALTH
/mob/living/silicon/robot/proc/get_damaged_components(var/brute, var/burn, var/get_all)
var/list/datum/robot_component/parts = list()
@@ -62,13 +59,13 @@
return C
return 0
-/mob/living/silicon/robot/heal_organ_damage(var/brute, var/burn)
+/mob/living/silicon/robot/heal_organ_damage(brute, burn, updating_health = TRUE)
var/list/datum/robot_component/parts = get_damaged_components(brute,burn)
if(!parts.len) return
var/datum/robot_component/picked = pick(parts)
- picked.heal_damage(brute,burn)
+ picked.heal_damage(brute,burn, updating_health)
-/mob/living/silicon/robot/take_organ_damage(var/brute = 0, var/burn = 0, var/sharp = 0, var/edge = 0)
+/mob/living/silicon/robot/take_organ_damage(brute = 0, burn = 0, updating_health = TRUE, sharp = 0, edge = 0)
var/list/components = get_damageable_components()
if(!components.len)
return
@@ -98,13 +95,13 @@
var/datum/robot_component/armour/A = get_armour()
if(A)
- A.take_damage(brute, burn, sharp)
+ A.take_damage(brute, burn, sharp, updating_health)
return
var/datum/robot_component/C = pick(components)
- C.take_damage(brute, burn, sharp)
+ C.take_damage(brute, burn, sharp, updating_health)
-/mob/living/silicon/robot/heal_overall_damage(var/brute, var/burn)
+/mob/living/silicon/robot/heal_overall_damage(var/brute, var/burn, updating_health = TRUE)
var/list/datum/robot_component/parts = get_damaged_components(brute,burn)
while(parts.len && (brute>0 || burn>0) )
@@ -113,14 +110,14 @@
var/brute_was = picked.brute_damage
var/burn_was = picked.electronics_damage
- picked.heal_damage(brute,burn)
+ picked.heal_damage(brute,burn, updating_health)
brute -= (brute_was-picked.brute_damage)
burn -= (burn_was-picked.electronics_damage)
parts -= picked
-/mob/living/silicon/robot/take_overall_damage(var/brute = 0, var/burn = 0, var/sharp = 0, var/used_weapon = null)
+/mob/living/silicon/robot/take_overall_damage(brute = 0, burn = 0, updating_health = TRUE, used_weapon = null, sharp = 0)
if(status_flags & GODMODE) return //godmode
var/list/datum/robot_component/parts = get_damageable_components()
@@ -158,9 +155,10 @@
var/brute_was = picked.brute_damage
var/burn_was = picked.electronics_damage
- picked.take_damage(brute, burn)
+ picked.take_damage(brute, burn, sharp, FALSE)
brute -= (picked.brute_damage - brute_was)
burn -= (picked.electronics_damage - burn_was)
parts -= picked
+ updatehealth()
diff --git a/code/modules/mob/living/silicon/robot/robot_defense.dm b/code/modules/mob/living/silicon/robot/robot_defense.dm
index e18ca8d6a17..161b81e3cd2 100644
--- a/code/modules/mob/living/silicon/robot/robot_defense.dm
+++ b/code/modules/mob/living/silicon/robot/robot_defense.dm
@@ -34,7 +34,6 @@
damage = rand(5, 35)
damage = round(damage / 2) // borgs recieve half damage
adjustBruteLoss(damage)
- updatehealth()
return
/mob/living/silicon/robot/attack_hand(mob/living/carbon/human/user)
@@ -47,7 +46,7 @@
user.put_in_active_hand(cell)
to_chat(user, "You remove \the [cell].")
cell = null
- update_icons()
+ update_stat()
diag_hud_set_borgcell()
if(!opened)
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index 486b2a72e8f..2330d0ecd64 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -40,10 +40,10 @@
/obj/item/robot_module/proc/fix_modules()
for(var/obj/item/I in modules)
I.flags |= NODROP
- I.mouse_opacity = 2
+ I.mouse_opacity = MOUSE_OPACITY_OPAQUE
if(emag)
emag.flags |= NODROP
- emag.mouse_opacity = 2
+ emag.mouse_opacity = MOUSE_OPACITY_OPAQUE
/obj/item/robot_module/proc/respawn_consumable(mob/living/silicon/robot/R)
if(!stacktypes || !stacktypes.len)
@@ -106,7 +106,10 @@
// Return true in an overridden subtype to prevent normal removal handling
/obj/item/robot_module/proc/handle_custom_removal(component_id, mob/living/user, obj/item/W, params)
- return FALSE
+ return FALSE
+
+/obj/item/robot_module/proc/handle_death(gibbed)
+ return
/obj/item/robot_module/standard
name = "standard robot module"
@@ -217,6 +220,11 @@
fix_modules()
+/obj/item/robot_module/engineering/handle_death()
+ var/obj/item/gripper/G = locate(/obj/item/gripper) in modules
+ if(G)
+ G.drop_item()
+
/obj/item/robot_module/security
name = "security robot module"
module_type = "Security"
@@ -530,6 +538,12 @@
..()
+
+/obj/item/robot_module/drone/handle_death()
+ var/obj/item/gripper/G = locate(/obj/item/gripper) in modules
+ if(G)
+ G.drop_item()
+
//checks whether this item is a module of the robot it is located in.
/obj/item/proc/is_robot_module()
if(!istype(loc, /mob/living/silicon/robot))
diff --git a/code/modules/mob/living/silicon/robot/update_status.dm b/code/modules/mob/living/silicon/robot/update_status.dm
index ca755748231..352750a23ea 100644
--- a/code/modules/mob/living/silicon/robot/update_status.dm
+++ b/code/modules/mob/living/silicon/robot/update_status.dm
@@ -3,19 +3,38 @@
if(stat || lockcharge || weakened || stunned || paralysis || !is_component_functioning("actuator"))
return TRUE
-/mob/living/silicon/robot/update_stat()
+/mob/living/silicon/robot/has_vision(information_only = FALSE)
+ return ..(information_only) && ((stat == DEAD && information_only) || is_component_functioning("camera"))
+
+/mob/living/silicon/robot/update_stat(reason = "none given")
if(status_flags & GODMODE)
return
if(stat != DEAD)
if(health <= -maxHealth) //die only once
death()
+ create_debug_log("died of damage, trigger reason: [reason]")
return
- if(!is_component_functioning("actuator") || paralysis || sleeping || stunned || weakened || getOxyLoss() > maxHealth * 0.5)
+ if(!is_component_functioning("actuator") || !is_component_functioning("power cell") || paralysis || sleeping || resting || stunned || weakened || getOxyLoss() > maxHealth * 0.5)
if(stat == CONSCIOUS)
KnockOut()
+ create_debug_log("fell unconscious, trigger reason: [reason]")
else
if(stat == UNCONSCIOUS)
WakeUp()
+ create_debug_log("woke up, trigger reason: [reason]")
+ else
+ if(health > 0)
+ update_revive()
+ var/mob/dead/observer/ghost = get_ghost()
+ if(ghost)
+ to_chat(ghost, "Your cyborg shell has been repaired, re-enter if you want to continue! (Verbs -> Ghost -> Re-enter corpse)")
+ ghost << sound('sound/effects/genetics.ogg')
+ create_attack_log("revived, trigger reason: [reason]")
// diag_hud_set_status()
// diag_hud_set_health()
// update_health_hud()
+
+/mob/living/silicon/robot/update_revive(updating = TRUE)
+ . = ..(updating)
+ if(.)
+ update_icons()
diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm
index 60b1a263922..b7a64908a42 100644
--- a/code/modules/mob/living/silicon/silicon.dm
+++ b/code/modules/mob/living/silicon/silicon.dm
@@ -317,7 +317,7 @@
to_chat(src, "[A.alarm_name()]! ([(cameratext)? cameratext : "No Camera"])")
/mob/living/silicon/adjustToxLoss(var/amount)
- return
+ return STATUS_UPDATE_NONE
/mob/living/silicon/get_access()
return IGNORE_ACCESS //silicons always have access
diff --git a/code/modules/mob/living/simple_animal/bot/bot.dm b/code/modules/mob/living/simple_animal/bot/bot.dm
index 7f5c1916619..72184f36e2f 100644
--- a/code/modules/mob/living/simple_animal/bot/bot.dm
+++ b/code/modules/mob/living/simple_animal/bot/bot.dm
@@ -202,8 +202,11 @@
return ..()
/mob/living/simple_animal/bot/death(gibbed)
+ // Only execute the below if we successfully died
+ . = ..()
+ if(!.)
+ return FALSE
explode()
- ..()
/mob/living/simple_animal/bot/proc/explode()
qdel(src)
@@ -242,8 +245,8 @@
new /obj/effect/decal/cleanable/blood/oil(loc)
return ..(amount)
-/mob/living/simple_animal/bot/updatehealth()
- ..()
+/mob/living/simple_animal/bot/updatehealth(reason = "none given")
+ ..(reason)
diag_hud_set_bothealth()
/mob/living/simple_animal/bot/handle_automated_action()
diff --git a/code/modules/mob/living/simple_animal/bot/medbot.dm b/code/modules/mob/living/simple_animal/bot/medbot.dm
index 007688fb7db..dc4805462fa 100644
--- a/code/modules/mob/living/simple_animal/bot/medbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/medbot.dm
@@ -442,7 +442,7 @@
/mob/living/simple_animal/bot/medbot/examinate(atom/A as mob|obj|turf in view())
..()
- if(!is_blind(src))
+ if(has_vision(information_only=TRUE))
chemscan(src, A)
/mob/living/simple_animal/bot/medbot/proc/medicate_patient(mob/living/carbon/C)
diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm
index ea7db302c43..e1d61c5aa55 100644
--- a/code/modules/mob/living/simple_animal/friendly/cat.dm
+++ b/code/modules/mob/living/simple_animal/friendly/cat.dm
@@ -60,9 +60,9 @@
return baby
/mob/living/simple_animal/pet/cat/Runtime/death()
- if(!memory_saved)
+ if(can_die() && !memory_saved)
Write_Memory(1)
- ..()
+ return ..()
/mob/living/simple_animal/pet/cat/Runtime/proc/Read_Memory()
var/savefile/S = new /savefile("data/npc_saves/Runtime.sav")
@@ -176,4 +176,4 @@
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
melee_damage_lower = 5
- melee_damage_upper = 15
\ No newline at end of file
+ melee_damage_upper = 15
diff --git a/code/modules/mob/living/simple_animal/friendly/cockroach.dm b/code/modules/mob/living/simple_animal/friendly/cockroach.dm
index c0f7efca2c6..e92174bd6c2 100644
--- a/code/modules/mob/living/simple_animal/friendly/cockroach.dm
+++ b/code/modules/mob/living/simple_animal/friendly/cockroach.dm
@@ -21,10 +21,8 @@
loot = list(/obj/effect/decal/cleanable/deadcockroach)
del_on_death = 1
-/mob/living/simple_animal/cockroach/death(gibbed)
- if(ticker.cinematic) //If the nuke is going off, then cockroaches are invincible. Keeps the nuke from killing them, cause cockroaches are immune to nukes.
- return
- ..()
+/mob/living/simple_animal/cockroach/can_die()
+ return ..() && !ticker.cinematic //If the nuke is going off, then cockroaches are invincible. Keeps the nuke from killing them, cause cockroaches are immune to nukes.
/mob/living/simple_animal/cockroach/Crossed(var/atom/movable/AM)
if(isliving(AM))
@@ -48,4 +46,4 @@
icon = 'icons/effects/blood.dmi'
icon_state = "xfloor1"
random_icon_states = list("xfloor1", "xfloor2", "xfloor3", "xfloor4", "xfloor5", "xfloor6", "xfloor7")
- anchored = 1
\ No newline at end of file
+ anchored = 1
diff --git a/code/modules/mob/living/simple_animal/friendly/corgi.dm b/code/modules/mob/living/simple_animal/friendly/corgi.dm
index bda169fe576..77d930b6b69 100644
--- a/code/modules/mob/living/simple_animal/friendly/corgi.dm
+++ b/code/modules/mob/living/simple_animal/friendly/corgi.dm
@@ -41,14 +41,6 @@
. = ..()
regenerate_icons()
-/mob/living/simple_animal/pet/corgi/death(gibbed)
- ..()
- regenerate_icons()
-
-/mob/living/simple_animal/pet/corgi/revive()
- ..()
- regenerate_icons()
-
/mob/living/simple_animal/pet/corgi/show_inv(mob/user as mob)
user.set_machine(src)
if(user.stat) return
@@ -626,7 +618,10 @@
s.start()
/mob/living/simple_animal/pet/corgi/Ian/borgi/death(gibbed)
+ // Only execute the below if we successfully died
+ . = ..(gibbed)
+ if(!.)
+ return FALSE
var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
s.set_up(3, 1, src)
s.start()
- ..()
diff --git a/code/modules/mob/living/simple_animal/friendly/corgi_powers.dm b/code/modules/mob/living/simple_animal/friendly/corgi_powers.dm
index 52769f9dba6..5f6f34b8b1c 100644
--- a/code/modules/mob/living/simple_animal/friendly/corgi_powers.dm
+++ b/code/modules/mob/living/simple_animal/friendly/corgi_powers.dm
@@ -2,8 +2,5 @@
set name = "Chase your tail"
set desc = "d'awwww."
set category = "Corgi"
- to_chat(src, text("[pick("You dance around","You chase your tail")]."))
- for(var/mob/O in oviewers(src, null))
- if((O.client && !( O.blinded )))
- to_chat(O, text("[] [pick("dances around","chases its tail")].", src))
- spin(20, 1)
\ No newline at end of file
+ visible_message("[src] [pick("dances around","chases [p_their()] tail")].","[pick("You dance around","You chase your tail")].")
+ spin(20, 1)
diff --git a/code/modules/mob/living/simple_animal/friendly/crab.dm b/code/modules/mob/living/simple_animal/friendly/crab.dm
index 665afa16cb2..6e49437455e 100644
--- a/code/modules/mob/living/simple_animal/friendly/crab.dm
+++ b/code/modules/mob/living/simple_animal/friendly/crab.dm
@@ -67,22 +67,15 @@
MED.amount -= 1
if(MED.amount <= 0)
qdel(MED)
- for(var/mob/M in viewers(src, null))
- if((M.client && !( M.blinded )))
- M.show_message("[user] applies the [MED] on [src]")
+ user.visible_message("[user] applies the [MED] on [src]")
else
to_chat(user, "this [src] is dead, medical items won't bring it back to life.")
else
if(O.force)
health -= O.force
- for(var/mob/M in viewers(src, null))
- if((M.client && !( M.blinded )))
- M.show_message("[src] has been attacked with the [O] by [user]. ")
+ visible_message("[src] has been attacked with the [O] by [user]. ")
else
- to_chat(usr, "This weapon is ineffective, it does no damage.")
- for(var/mob/M in viewers(src, null))
- if((M.client && !( M.blinded )))
- M.show_message("[user] gently taps [src] with the [O]. ")
+ user.visible_message("[user] gently taps [src] with the [O]. ","This weapon is ineffective, it does no damage.")
/mob/living/simple_animal/crab/Topic(href, href_list)
if(usr.stat) return
diff --git a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
index 370418134c3..d8a3f793d3a 100644
--- a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
+++ b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
@@ -250,7 +250,10 @@ var/global/chicken_count = 0
chicken_count += 1
/mob/living/simple_animal/chicken/death(gibbed)
- ..(gibbed)
+ // Only execute the below if we successfully died
+ . = ..(gibbed)
+ if(!.)
+ return
chicken_count -= 1
/mob/living/simple_animal/chicken/attackby(obj/item/O, mob/user, params)
diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm
index 762dea31272..3ed45508b87 100644
--- a/code/modules/mob/living/simple_animal/friendly/mouse.dm
+++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm
@@ -117,10 +117,13 @@
..()
/mob/living/simple_animal/mouse/death(gibbed)
+ // Only execute the below if we successfully died
+ . = ..(gibbed)
+ if(!.)
+ return FALSE
layer = MOB_LAYER
if(client)
client.time_died_as_mouse = world.time
- ..()
/*
* Mouse types
diff --git a/code/modules/mob/living/simple_animal/hostile/bees.dm b/code/modules/mob/living/simple_animal/hostile/bees.dm
index 06176add94d..0b10513b7cd 100644
--- a/code/modules/mob/living/simple_animal/hostile/bees.dm
+++ b/code/modules/mob/living/simple_animal/hostile/bees.dm
@@ -31,7 +31,7 @@
move_to_delay = 0
obj_damage = 0
environment_smash = 0
- mouse_opacity = 2
+ mouse_opacity = MOUSE_OPACITY_OPAQUE
pass_flags = PASSTABLE | PASSGRILLE | PASSMOB
flying = 1
search_objects = 1 //have to find those plant trays!
diff --git a/code/modules/mob/living/simple_animal/hostile/hivebot.dm b/code/modules/mob/living/simple_animal/hostile/hivebot.dm
index c2284764050..e08e7e11502 100644
--- a/code/modules/mob/living/simple_animal/hostile/hivebot.dm
+++ b/code/modules/mob/living/simple_animal/hostile/hivebot.dm
@@ -48,10 +48,13 @@
ranged = 1
/mob/living/simple_animal/hostile/hivebot/death(gibbed)
+ // Only execute the below if we successfully died
+ . = ..(gibbed)
+ if(!.)
+ return FALSE
var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
s.set_up(3, 1, src)
s.start()
- ..()
/mob/living/simple_animal/hostile/hivebot/tele//this still needs work
name = "Beacon"
diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm
index f3e31925228..93182226972 100644
--- a/code/modules/mob/living/simple_animal/hostile/hostile.dm
+++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm
@@ -289,8 +289,11 @@
//////////////END HOSTILE MOB TARGETTING AND AGGRESSION////////////
/mob/living/simple_animal/hostile/death(gibbed)
+ // Only execute the below if we successfully died
+ . = ..(gibbed)
+ if(!.)
+ return FALSE
LoseTarget()
- ..(gibbed)
/mob/living/simple_animal/hostile/proc/summon_backup(distance)
do_alert_animation(src)
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
index fe80846935d..39215985963 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
@@ -95,17 +95,16 @@ Difficulty: Hard
visible_message("\"Vitemvw gsqtpixi. Stivexmsrep ijjmgmirgc gsqtvsqmwih.\"")*/
/mob/living/simple_animal/hostile/megafauna/hierophant/death()
- if(health > 0 || stat == DEAD)
- return
- else
- stat = DEAD
- blinking = TRUE //we do a fancy animation, release a huge burst(), and leave our staff.
- animate(src, alpha = 0, color = "660099", time = 20, easing = EASE_OUT)
- burst_range = 10
- //visible_message("\"Mrmxmexmrk wipj-hiwxvygx wiuyirgi...\"")
- visible_message("[src] disappears in a massive burst of magic, leaving only its staff.")
- burst(get_turf(src))
- ..()
+ if(!can_die())
+ return FALSE
+ blinking = TRUE //we do a fancy animation, release a huge burst(), and leave our staff.
+ animate(src, alpha = 0, color = "660099", time = 20, easing = EASE_OUT)
+ burst_range = 10
+ //visible_message("\"Mrmxmexmrk wipj-hiwxvygx wiuyirgi...\"")
+ visible_message("[src] disappears in a massive burst of magic, leaving only its staff.")
+ burst(get_turf(src))
+ // Things are in this order due to `del_on_death`
+ return ..()
/mob/living/simple_animal/hostile/megafauna/hierophant/Destroy()
QDEL_NULL(spawned_rune)
@@ -612,4 +611,4 @@ Difficulty: Hard
icon_state = "hierophant"
smooth = SMOOTH_TRUE
-#undef MEDAL_PREFIX
\ No newline at end of file
+#undef MEDAL_PREFIX
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm
index 1bfb56bd26f..ae37f388b8a 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm
@@ -48,7 +48,7 @@ Difficulty: Medium
elimination = 1
idle_vision_range = 13
appearance_flags = 0
- mouse_opacity = 1
+ mouse_opacity = MOUSE_OPACITY_ICON
stat_attack = 1 // Overriden from /tg/ - otherwise Legion starts chasing its minions
/mob/living/simple_animal/hostile/megafauna/legion/New()
@@ -89,9 +89,12 @@ Difficulty: Medium
speed = 2
charging = 0
+/mob/living/simple_animal/hostile/megafauna/legion/can_die()
+ return ..() && health <= 0
+
/mob/living/simple_animal/hostile/megafauna/legion/death()
- if(health > 0)
- return
+ if(!can_die())
+ return FALSE
if(size > 1)
adjustHealth(-maxHealth) //heal ourself to full in prep for splitting
var/mob/living/simple_animal/hostile/megafauna/legion/L = new(loc)
@@ -117,7 +120,9 @@ Difficulty: Medium
L.GiveTarget(target)
visible_message("[src] splits in twain!")
+ return FALSE // not dead
else
+ // this must come before the parent call due to the setting of `loot` here
var/last_legion = TRUE
for(var/mob/living/simple_animal/hostile/megafauna/legion/other in mob_list)
if(other != src)
@@ -128,7 +133,7 @@ Difficulty: Medium
elimination = 0
else if(prob(5))
loot = list(/obj/structure/closet/crate/necropolis/tendril)
- ..()
+ return ..()
/mob/living/simple_animal/hostile/megafauna/legion/Process_Spacemove(movement_dir = 0)
return 1
@@ -139,4 +144,4 @@ Difficulty: Medium
desc = "The message repeats."
invisibility = 100
-#undef MEDAL_PREFIX
\ No newline at end of file
+#undef MEDAL_PREFIX
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm
index 23a25d6df28..118ee54e858 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm
@@ -41,33 +41,22 @@
anchored = TRUE
mob_size = MOB_SIZE_LARGE
layer = MOB_LAYER + 0.5 //Looks weird with them slipping under mineral walls and cameras and shit otherwise
- mouse_opacity = 2 // Easier to click on in melee, they're giant targets anyway
+ mouse_opacity = MOUSE_OPACITY_OPAQUE // Easier to click on in melee, they're giant targets anyway
/mob/living/simple_animal/hostile/megafauna/Destroy()
QDEL_NULL(internal_gps)
. = ..()
+/mob/living/simple_animal/hostile/megafauna/can_die()
+ return ..() && health <= 0
+
/mob/living/simple_animal/hostile/megafauna/death(gibbed)
- if(health > 0)
- return
- else
- if(!admin_spawned)
- feedback_set_details("megafauna_kills","[initial(name)]")
- if(!elimination) //used so the achievment only occurs for the last legion to die.
- grant_achievement(medal_type,score_type)
- ..()
-
-/mob/living/simple_animal/hostile/megafauna/gib()
- if(health > 0)
- return
- else
- ..()
-
-/mob/living/simple_animal/hostile/megafauna/dust()
- if(health > 0)
- return
- else
- ..()
+ // this happens before the parent call because `del_on_death` may be set
+ if(can_die() && !admin_spawned)
+ feedback_set_details("megafauna_kills","[initial(name)]")
+ if(!elimination) //used so the achievment only occurs for the last legion to die.
+ grant_achievement(medal_type,score_type)
+ return ..()
/mob/living/simple_animal/hostile/megafauna/AttackingTarget()
..()
diff --git a/code/modules/mob/living/simple_animal/hostile/mimic.dm b/code/modules/mob/living/simple_animal/hostile/mimic.dm
index 5832f7bdd60..5c26fe1ba57 100644
--- a/code/modules/mob/living/simple_animal/hostile/mimic.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mimic.dm
@@ -92,11 +92,13 @@
icon_state = initial(icon_state)
/mob/living/simple_animal/hostile/mimic/crate/death(gibbed)
- var/obj/structure/closet/crate/C = new(get_turf(src))
- // Put loot in crate
- for(var/obj/O in src)
- O.loc = C
- ..()
+ if(can_die())
+ var/obj/structure/closet/crate/C = new(get_turf(src))
+ // Put loot in crate
+ for(var/obj/O in src)
+ O.loc = C
+ // due to `del_on_death`
+ return ..()
/mob/living/simple_animal/hostile/mimic/crate/AttackingTarget()
. =..()
@@ -129,9 +131,11 @@ var/global/list/protected_objects = list(/obj/structure/table, /obj/structure/ca
death()
/mob/living/simple_animal/hostile/mimic/copy/death(gibbed)
- for(var/atom/movable/M in src)
- M.loc = get_turf(src)
- ..()
+ if(can_die())
+ for(var/atom/movable/M in src)
+ M.loc = get_turf(src)
+ // due to `del_on_death`
+ return ..()
/mob/living/simple_animal/hostile/mimic/copy/ListTargets()
. = ..()
diff --git a/code/modules/mob/living/simple_animal/hostile/mining/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining/hivelord.dm
index 6da4c6e8b68..4041e95c6c7 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining/hivelord.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining/hivelord.dm
@@ -7,7 +7,7 @@
icon_aggro = "Hivelord_alert"
icon_dead = "Hivelord_dead"
icon_gib = "syndicate_gib"
- mouse_opacity = 2
+ mouse_opacity = MOUSE_OPACITY_OPAQUE
move_to_delay = 14
ranged = 1
vision_range = 5
@@ -46,8 +46,11 @@
OpenFire()
/mob/living/simple_animal/hostile/asteroid/hivelord/death(gibbed)
- mouse_opacity = 1
- ..(gibbed)
+ // Only execute the below if we successfully died
+ . = ..(gibbed)
+ if(!.)
+ return FALSE
+ mouse_opacity = MOUSE_OPACITY_ICON
/obj/item/organ/internal/hivelord_core
name = "hivelord remains"
@@ -132,7 +135,7 @@
icon_aggro = "Hivelordbrood"
icon_dead = "Hivelordbrood"
icon_gib = "syndicate_gib"
- mouse_opacity = 2
+ mouse_opacity = MOUSE_OPACITY_OPAQUE
move_to_delay = 1
friendly = "buzzes near"
vision_range = 10
@@ -165,9 +168,10 @@
color = "#C80000"
/mob/living/simple_animal/hostile/asteroid/hivelordbrood/blood/death()
- if(loc) // Splash the turf we are on with blood
+ if(can_die() && loc)
+ // Splash the turf we are on with blood
reagents.reaction(get_turf(src))
- ..()
+ return ..()
/mob/living/simple_animal/hostile/asteroid/hivelordbrood/blood/New()
create_reagents(30)
@@ -235,15 +239,17 @@
var/mob/living/carbon/human/stored_mob
/mob/living/simple_animal/hostile/asteroid/hivelord/legion/death(gibbed)
- visible_message("The skulls on [src] wail in anger as they flee from their dying host!")
- var/turf/T = get_turf(src)
- if(T)
- if(stored_mob)
- stored_mob.forceMove(get_turf(src))
- stored_mob = null
- else
- new /obj/effect/mob_spawn/human/corpse/charredskeleton(T)
- ..(gibbed)
+ if(can_die())
+ visible_message("The skulls on [src] wail in anger as they flee from their dying host!")
+ var/turf/T = get_turf(src)
+ if(T)
+ if(stored_mob)
+ stored_mob.forceMove(get_turf(src))
+ stored_mob = null
+ else
+ new /obj/effect/mob_spawn/human/corpse/charredskeleton(T)
+ // due to `del_on_death`
+ return ..(gibbed)
/mob/living/simple_animal/hostile/asteroid/hivelordbrood/legion
@@ -330,4 +336,4 @@
mob_gender = NEUTER
husk = FALSE
mob_species = /datum/species/skeleton
- mob_color = "#454545"
\ No newline at end of file
+ mob_color = "#454545"
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 cc0de6aea4e..2edfb7cea5d 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
@@ -25,7 +25,8 @@
/mob/living/simple_animal/hostile/asteroid/LoseAggro()
..()
- icon_state = icon_living
+ if(stat == CONSCIOUS)
+ icon_state = icon_living
/mob/living/simple_animal/hostile/asteroid/bullet_act(var/obj/item/projectile/P)//Reduces damage from most projectiles to curb off-screen kills
if(!stat)
@@ -115,7 +116,7 @@
icon_dead = "Goliath_dead"
icon_gib = "syndicate_gib"
attack_sound = 'sound/weapons/punch4.ogg'
- mouse_opacity = 2
+ mouse_opacity = MOUSE_OPACITY_OPAQUE
move_to_delay = 40
ranged = 1
ranged_cooldown = 2 //By default, start the Goliath with his cooldown off so that people can run away quickly on first sight
diff --git a/code/modules/mob/living/simple_animal/hostile/mushroom.dm b/code/modules/mob/living/simple_animal/hostile/mushroom.dm
index 2c775074253..59c23953e6b 100644
--- a/code/modules/mob/living/simple_animal/hostile/mushroom.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mushroom.dm
@@ -22,7 +22,7 @@
faction = list("mushroom")
environment_smash = 0
stat_attack = 2
- mouse_opacity = 1
+ mouse_opacity = MOUSE_OPACITY_ICON
speed = 1
ventcrawler = 2
robust_searching = 1
@@ -91,7 +91,10 @@
UpdateMushroomCap()
/mob/living/simple_animal/hostile/mushroom/death(gibbed)
- ..()
+ // Only execute the below if we successfully died
+ . = ..(gibbed)
+ if(!.)
+ return FALSE
UpdateMushroomCap()
/mob/living/simple_animal/hostile/mushroom/proc/UpdateMushroomCap()
@@ -160,4 +163,4 @@
S.reagents.add_reagent("psilocybin", powerlevel)
S.reagents.add_reagent("omnizine", powerlevel)
S.reagents.add_reagent("synaptizine", powerlevel)
- qdel(src)
\ No newline at end of file
+ qdel(src)
diff --git a/code/modules/mob/living/simple_animal/hostile/spaceworms.dm b/code/modules/mob/living/simple_animal/hostile/spaceworms.dm
index 30546ecb17d..93e03e8279e 100644
--- a/code/modules/mob/living/simple_animal/hostile/spaceworms.dm
+++ b/code/modules/mob/living/simple_animal/hostile/spaceworms.dm
@@ -184,7 +184,10 @@
//Harder to kill the head, but it can kill off the whole worm
/mob/living/simple_animal/hostile/spaceWorm/wormHead/death(gibbed)
- ..()
+ // Only execute the below if we successfully died
+ . = ..(gibbed)
+ if(!.)
+ return FALSE
if(prob(catastrophicDeathProb))
for(var/mob/living/simple_animal/hostile/spaceWorm/SW in totalWormSegments)
SW.death()
@@ -294,7 +297,10 @@
/mob/living/simple_animal/hostile/spaceWorm/death(gibbed)
- ..()
+ // Only execute the below if we successfully died
+ . = ..()
+ if(!.)
+ return FALSE
if(myHead)
myHead.totalWormSegments -= src
diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/chem.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/chem.dm
index 0ed63563011..337988346ce 100644
--- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/chem.dm
+++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/chem.dm
@@ -9,25 +9,26 @@
metabolization_rate = 0.1
/datum/reagent/terror_black_toxin/on_mob_life(mob/living/M)
+ var/update_flags = STATUS_UPDATE_NONE
if(volume < 30)
// bitten once, die very slowly. Easy to survive a single bite - just go to medbay.
// total damage: 1/tick, human health 150 until crit, = 150 ticks, = 300 seconds = 5 minutes to get to medbay.
- M.adjustToxLoss(1)
+ update_flags |= M.adjustToxLoss(1, FALSE)
else if(volume < 60)
// bitten twice, die slowly. Get to medbay.
// total damage: 2/tick, human health 150 until crit, = 75 ticks, = 150 seconds = 2.5 minutes to get some medical treatment.
- M.adjustToxLoss(2)
- M.EyeBlurry(3)
+ update_flags |= M.adjustToxLoss(2, FALSE)
+ update_flags |= M.EyeBlurry(3, FALSE)
else if(volume < 90)
// bitten thrice, die quickly, severe muscle cramps make movement very difficult. Even calling for help probably won't save you.
// total damage: 4, human health 150 until crit, = 37.5 ticks, = 75s = 1m15s until death
- M.adjustToxLoss(4) // a bit worse than coiine
+ update_flags |= M.adjustToxLoss(4, FALSE) // a bit worse than coiine
+ update_flags |= M.EyeBlurry(6, FALSE)
M.Confused(6)
- M.EyeBlurry(6)
else
// bitten 4 or more times, whole body goes into shock/death
// total damage: 8, human health 150 until crit, = 18.75 ticks, = 37s until death
- M.adjustToxLoss(8)
- M.EyeBlurry(6)
- M.Paralyse(5)
- ..()
+ update_flags |= M.adjustToxLoss(8, FALSE)
+ update_flags |= M.EyeBlurry(6, FALSE)
+ update_flags |= M.Paralyse(5, FALSE)
+ return ..() | update_flags
diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/gray.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/gray.dm
index 43c0e7b0be5..59e3bebbfb3 100644
--- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/gray.dm
+++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/gray.dm
@@ -41,12 +41,12 @@
L.attack_animal(src)
/mob/living/simple_animal/hostile/poison/terror_spider/gray/adjustBruteLoss(damage)
- ..(damage)
+ . = ..(damage)
if(invisibility > 0)
GrayDeCloak()
/mob/living/simple_animal/hostile/poison/terror_spider/gray/adjustFireLoss(damage)
- ..(damage)
+ . = ..(damage)
if(invisibility > 0)
GrayDeCloak()
@@ -136,4 +136,4 @@
if(temp_vent)
if(get_dist(src,temp_vent) > 0 && get_dist(src,temp_vent) < 5)
step_to(src,temp_vent)
- // if you're bumped off your vent, try to get back to it
\ No newline at end of file
+ // if you're bumped off your vent, try to get back to it
diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/mother.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/mother.dm
index f4ab38eda93..9280b428e9e 100644
--- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/mother.dm
+++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/mother.dm
@@ -33,24 +33,25 @@
ventsmash_action.Grant(src)
/mob/living/simple_animal/hostile/poison/terror_spider/mother/death(gibbed)
- var/always_stillborn = FALSE
- if(spider_awaymission && !is_away_level(z))
- always_stillborn = TRUE
- if(canspawn)
- canspawn = 0
- for(var/i in 0 to 30)
- var/obj/structure/spider/spiderling/terror_spiderling/S = new /obj/structure/spider/spiderling/terror_spiderling(get_turf(src))
- S.grow_as = pick(/mob/living/simple_animal/hostile/poison/terror_spider/red, /mob/living/simple_animal/hostile/poison/terror_spider/gray)
- if(always_stillborn || prob(66))
- S.stillborn = 1
- else if(prob(10))
- S.grow_as = pick(/mob/living/simple_animal/hostile/poison/terror_spider/black, /mob/living/simple_animal/hostile/poison/terror_spider/green)
- S.amount_grown = 50 // double speed growth
- S.immediate_ventcrawl = 1
- visible_message("[src] breaks apart, the many spiders on its back scurrying everywhere!")
- degenerate = 1
- ..()
+ if(can_die())
+ var/always_stillborn = FALSE
+ if(spider_awaymission && !is_away_level(z))
+ always_stillborn = TRUE
+ if(canspawn)
+ canspawn = 0
+ for(var/i in 0 to 30)
+ var/obj/structure/spider/spiderling/terror_spiderling/S = new /obj/structure/spider/spiderling/terror_spiderling(get_turf(src))
+ S.grow_as = pick(/mob/living/simple_animal/hostile/poison/terror_spider/red, /mob/living/simple_animal/hostile/poison/terror_spider/gray)
+ if(always_stillborn || prob(66))
+ S.stillborn = 1
+ else if(prob(10))
+ S.grow_as = pick(/mob/living/simple_animal/hostile/poison/terror_spider/black, /mob/living/simple_animal/hostile/poison/terror_spider/green)
+ S.amount_grown = 50 // double speed growth
+ S.immediate_ventcrawl = 1
+ visible_message("[src] breaks apart, the many spiders on its back scurrying everywhere!")
+ degenerate = 1
+ return ..()
/mob/living/simple_animal/hostile/poison/terror_spider/mother/Destroy()
canspawn = 0
- return ..()
\ No newline at end of file
+ return ..()
diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/prince.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/prince.dm
index 66e88af1e1b..75cf5c7ede8 100644
--- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/prince.dm
+++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/prince.dm
@@ -36,10 +36,9 @@
thickweb_action.Grant(src)
/mob/living/simple_animal/hostile/poison/terror_spider/prince/death(gibbed)
- if(!hasdied)
- if(spider_uo71)
- UnlockBlastDoors("UO71_SciStorage")
- ..()
+ if(can_die() && !hasdied && spider_uo71)
+ UnlockBlastDoors("UO71_SciStorage")
+ return ..()
/mob/living/simple_animal/hostile/poison/terror_spider/prince/spider_specialattack(mob/living/carbon/human/L)
if(prob(15))
@@ -47,4 +46,4 @@
L.Weaken(5)
L.Stun(5)
else
- ..()
\ No newline at end of file
+ ..()
diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/purple.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/purple.dm
index 5c483b4e3e9..2c3e573c43e 100644
--- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/purple.dm
+++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/purple.dm
@@ -38,7 +38,7 @@
thickweb_action.Grant(src)
/mob/living/simple_animal/hostile/poison/terror_spider/purple/death(gibbed)
- if(spider_myqueen)
+ if(can_die() && spider_myqueen)
var/mob/living/simple_animal/hostile/poison/terror_spider/queen/Q = spider_myqueen
if(Q.stat != DEAD && !Q.ckey)
if(get_dist(src,Q) > 20)
@@ -46,7 +46,7 @@
degenerate = 1
Q.DoLayTerrorEggs(/mob/living/simple_animal/hostile/poison/terror_spider/purple,1,0)
visible_message("[src] chitters in the direction of [Q]!")
- . = ..()
+ return ..()
/mob/living/simple_animal/hostile/poison/terror_spider/purple/Life(seconds, times_fired)
. = ..()
@@ -91,4 +91,4 @@
degenerate = 1
to_chat(src,"Your link to your Queen has been broken! Your life force starts to drain away!")
melee_damage_lower = 5
- melee_damage_upper = 10
\ No newline at end of file
+ melee_damage_upper = 10
diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/queen.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/queen.dm
index 532c2b7357a..54531e62d09 100644
--- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/queen.dm
+++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/queen.dm
@@ -81,7 +81,7 @@
to_chat(src, "You have [canlay] eggs available to lay.")
/mob/living/simple_animal/hostile/poison/terror_spider/queen/death(gibbed)
- if(!hasdied)
+ if(can_die() && !hasdied)
SetHiveCommand(0, 15) // Hive becomes very aggressive.
if(spider_uo71)
UnlockBlastDoors("UO71_Caves")
@@ -91,7 +91,7 @@
P.visible_message("\The [src] writhes in pain!")
to_chat(P,"\The [src] has died. Without her hivemind link, purple terrors like yourself cannot survive more than a few minutes!")
P.degenerate = 1
- ..()
+ return ..()
/mob/living/simple_animal/hostile/poison/terror_spider/queen/Retaliate()
..()
@@ -347,4 +347,4 @@
if(L.can_inject(null, 0, "chest", 0))
L.Hallucinate(400)
if(!isterrorspider(L))
- L.adjustToxLoss(bonus_tox)
\ No newline at end of file
+ L.adjustToxLoss(bonus_tox)
diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_ai.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_ai.dm
index 62f69b20b39..8c48b9b409b 100644
--- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_ai.dm
+++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_ai.dm
@@ -162,11 +162,11 @@
..()
/mob/living/simple_animal/hostile/poison/terror_spider/adjustBruteLoss(damage)
- ..(damage)
+ . = ..(damage)
Retaliate()
/mob/living/simple_animal/hostile/poison/terror_spider/adjustFireLoss(damage)
- ..(damage)
+ . = ..(damage)
Retaliate()
/mob/living/simple_animal/hostile/poison/terror_spider/proc/Retaliate()
@@ -318,4 +318,4 @@
/mob/living/simple_animal/hostile/poison/terror_spider/proc/UnlockBlastDoors(target_id_tag)
for(var/obj/machinery/door/poddoor/P in airlocks)
if(P.density && P.id_tag == target_id_tag && P.z == z && !P.operating)
- P.open()
\ No newline at end of file
+ P.open()
diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_spiders.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_spiders.dm
index b5d0a100ae3..46b903774f3 100644
--- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_spiders.dm
+++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_spiders.dm
@@ -321,10 +321,11 @@ var/global/list/ts_spiderling_list = list()
ts_count_alive_station--
/mob/living/simple_animal/hostile/poison/terror_spider/death(gibbed)
- if(!gibbed)
- msg_terrorspiders("[src] has died in [get_area(src)].")
- handle_dying()
- ..()
+ if(can_die())
+ if(!gibbed)
+ msg_terrorspiders("[src] has died in [get_area(src)].")
+ handle_dying()
+ return ..()
/mob/living/simple_animal/hostile/poison/terror_spider/proc/spider_special_action()
return
@@ -372,4 +373,4 @@ var/global/list/ts_spiderling_list = list()
visible_message("[src] pries open the door!")
playsound(src.loc, "sparks", 100, 1)
D.open(1)
- return 1
\ No newline at end of file
+ return 1
diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/white.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/white.dm
index 973195c90a7..36378cb988e 100644
--- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/white.dm
+++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/white.dm
@@ -31,10 +31,9 @@
..()
/mob/living/simple_animal/hostile/poison/terror_spider/white/death(gibbed)
- if(!hasdied)
- if(spider_uo71)
- UnlockBlastDoors("UO71_Bridge")
- ..()
+ if(can_die() && !hasdied && spider_uo71)
+ UnlockBlastDoors("UO71_Bridge")
+ return ..(gibbed)
/mob/living/simple_animal/hostile/poison/terror_spider/white/spider_specialattack(mob/living/carbon/human/L, poisonable)
if(!poisonable)
@@ -57,4 +56,4 @@
/proc/IsTSInfected(mob/living/carbon/C) // Terror AI requires this
if(C.get_int_organ(/obj/item/organ/internal/body_egg))
return 1
- return 0
\ No newline at end of file
+ return 0
diff --git a/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm b/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm
index 57412eb5a0d..e2c9194abc5 100644
--- a/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm
+++ b/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm
@@ -32,7 +32,7 @@
/obj/effect/ebeam/vine
name = "thick vine"
- mouse_opacity = 1
+ mouse_opacity = MOUSE_OPACITY_ICON
desc = "A thick vine, painful to the touch."
diff --git a/code/modules/mob/living/simple_animal/hostile/winter_mobs.dm b/code/modules/mob/living/simple_animal/hostile/winter_mobs.dm
index 70ea0400f84..f96ebabf014 100644
--- a/code/modules/mob/living/simple_animal/hostile/winter_mobs.dm
+++ b/code/modules/mob/living/simple_animal/hostile/winter_mobs.dm
@@ -36,15 +36,14 @@
/mob/living/simple_animal/hostile/winter/snowman/death(gibbed)
- if(prob(50) && !ranged) //50% chance to drop candy cane sword on death, if it has one to drop
- loot = list(/obj/item/melee/candy_sword)
- if(prob(20)) //chance to become a stationary snowman structure instead of a corpse
- loot.Add(/obj/structure/snowman)
- deathmessage = "shimmers as its animating magic fades away!"
- del_on_death = 1
- ..() //this is just to make sure it gets properly killed before we qdel it
- else
- ..()
+ if(can_die())
+ if(prob(50) && !ranged) //50% chance to drop candy cane sword on death, if it has one to drop
+ loot = list(/obj/item/melee/candy_sword)
+ if(prob(20)) //chance to become a stationary snowman structure instead of a corpse
+ loot.Add(/obj/structure/snowman)
+ deathmessage = "shimmers as its animating magic fades away!"
+ del_on_death = 1
+ return ..()
/mob/living/simple_animal/hostile/winter/snowman/ranged
maxHealth = 50
@@ -79,7 +78,10 @@
icon_dead = "santa-dead"
/mob/living/simple_animal/hostile/winter/santa/death(gibbed)
- ..()
+ // Only execute the below if we successfully died
+ . = ..(gibbed)
+ if(!.)
+ return FALSE
if(death_message)
visible_message(death_message)
if(next_stage)
@@ -133,12 +135,16 @@
melee_damage_upper = 30 //that's gonna leave a mark, for sure
/mob/living/simple_animal/hostile/winter/santa/stage_4/death(gibbed)
- to_chat(world, "
")
- to_chat(world, "THE FAT MAN HAS FALLEN!")
- to_chat(world, "SANTA CLAUS HAS BEEN DEFEATED!")
- to_chat(world, "
")
- ..()
+ if(can_die())
+ to_chat(world, "
")
+ to_chat(world, "THE FAT MAN HAS FALLEN!")
+ to_chat(world, "SANTA CLAUS HAS BEEN DEFEATED!")
+ to_chat(world, "
")
+ // Only execute the below if we successfully died
+ . = ..()
+ if(!.)
+ return FALSE
var/obj/item/grenade/clusterbuster/xmas/X = new /obj/item/grenade/clusterbuster/xmas(get_turf(src))
var/obj/item/grenade/clusterbuster/xmas/Y = new /obj/item/grenade/clusterbuster/xmas(get_turf(src))
X.prime()
- Y.prime()
\ No newline at end of file
+ Y.prime()
diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm
index ed4c074bff0..2120925a164 100644
--- a/code/modules/mob/living/simple_animal/parrot.dm
+++ b/code/modules/mob/living/simple_animal/parrot.dm
@@ -113,11 +113,12 @@
return ..()
/mob/living/simple_animal/parrot/death(gibbed)
- if(held_item)
- held_item.loc = src.loc
- held_item = null
- walk(src,0)
- ..()
+ if(can_die())
+ if(held_item)
+ held_item.loc = src.loc
+ held_item = null
+ walk(src,0)
+ return ..()
/mob/living/simple_animal/parrot/Stat()
..()
diff --git a/code/modules/mob/living/simple_animal/posessed_object.dm b/code/modules/mob/living/simple_animal/posessed_object.dm
index 22901f4d29a..7afb3b01cbc 100644
--- a/code/modules/mob/living/simple_animal/posessed_object.dm
+++ b/code/modules/mob/living/simple_animal/posessed_object.dm
@@ -15,6 +15,7 @@
allow_spin = 0 // No spinning. Spinning breaks our floating animation.
no_spin_thrown = 1
+ del_on_death = TRUE
var/obj/item/possessed_item
@@ -39,26 +40,19 @@
var/response = alert(src, "End your possession of this object? (It will not stop you from respawning later)","Are you sure you want to ghost?","Ghost","Stay in body")
if(response != "Ghost")
return
- resting = 1
+ StartResting()
var/mob/dead/observer/ghost = ghostize(1)
ghost.timeofdeath = world.time
death(0) // Turn back into a regular object.
-
/mob/living/simple_animal/possessed_object/death(gibbed)
- var/mob/dead/observer/ghost = ghostize(1)
- ..()
-
- if(gibbed) // Leave no trace.
- ghost.timeofdeath = world.time
- qdel(src)
- return
-
- if(possessed_item.loc == src)
- possessed_item.forceMove(loc) // Put the normal item back once the EVIL SPIRIT has been vanquished from it. If it's not already in place
-
- qdel(src)
-
+ if(can_die())
+ ghostize(GHOST_CAN_REENTER)
+ // if gibbed, the item goes with the ghost
+ if(!gibbed && possessed_item.loc == src)
+ // Put the normal item back once the EVIL SPIRIT has been vanquished from it. If it's not already in place
+ possessed_item.forceMove(loc)
+ return ..()
/mob/living/simple_animal/possessed_object/Life(seconds, times_fired)
..()
@@ -160,4 +154,4 @@
pixel_y = possessed_item.pixel_y
color = possessed_item.color
overlays = possessed_item.overlays
- set_opacity(possessed_item.opacity)
\ No newline at end of file
+ set_opacity(possessed_item.opacity)
diff --git a/code/modules/mob/living/simple_animal/powers.dm b/code/modules/mob/living/simple_animal/powers.dm
index 9d1d6217415..d85557f350d 100644
--- a/code/modules/mob/living/simple_animal/powers.dm
+++ b/code/modules/mob/living/simple_animal/powers.dm
@@ -8,13 +8,7 @@
if(layer != TURF_LAYER+0.2)
layer = TURF_LAYER+0.2
- to_chat(src, text("You are now hiding."))
- for(var/mob/O in oviewers(src, null))
- if((O.client && !( O.blinded )))
- to_chat(O, text("[] scurries to the ground!", src))
+ visible_message("[src] scurries to the ground!", "You are now hiding.")
else
layer = MOB_LAYER
- to_chat(src, text("You have stopped hiding."))
- for(var/mob/O in oviewers(src, null))
- if((O.client && !( O.blinded )))
- to_chat(O, text("[] slowly peaks up from the ground...", src))
+ visible_message("[src] slowly peeks up from the ground...", "You have stopped hiding.")
diff --git a/code/modules/mob/living/simple_animal/shade.dm b/code/modules/mob/living/simple_animal/shade.dm
index 2f761c21f9c..47113341881 100644
--- a/code/modules/mob/living/simple_animal/shade.dm
+++ b/code/modules/mob/living/simple_animal/shade.dm
@@ -29,25 +29,20 @@
deathmessage = "lets out a contented sigh as their form unwinds."
- attackby(var/obj/item/O as obj, var/mob/user as mob) //Marker -Agouri
- if(istype(O, /obj/item/soulstone))
- O.transfer_soul("SHADE", src, user)
+/mob/living/simple_animal/shade/attackby(var/obj/item/O as obj, var/mob/user as mob) //Marker -Agouri
+ if(istype(O, /obj/item/soulstone))
+ O.transfer_soul("SHADE", src, user)
+ else
+ if(O.force)
+ var/damage = O.force
+ if(O.damtype == STAMINA)
+ damage = 0
+ health -= damage
+ user.visible_message("[src] has been attacked with the [O] by [user]. ")
else
- if(O.force)
- var/damage = O.force
- if(O.damtype == STAMINA)
- damage = 0
- health -= damage
- for(var/mob/M in viewers(src, null))
- if((M.client && !( M.blinded )))
- M.show_message("[src] has been attacked with the [O] by [user]. ")
- else
- to_chat(usr, "This weapon is ineffective, it does no damage.")
- for(var/mob/M in viewers(src, null))
- if((M.client && !( M.blinded )))
- M.show_message("[user] gently taps [src] with the [O]. ")
- return
+ user.visible_message("[user] gently taps [src] with the [O]. ", "This weapon is ineffective, it does no damage.")
+ return
/mob/living/simple_animal/shade/sword
universal_speak = 1
- faction = list("neutral")
\ No newline at end of file
+ faction = list("neutral")
diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index 5a88373f6f2..0015327bca7 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -105,8 +105,8 @@
client.screen += client.void
..()
-/mob/living/simple_animal/updatehealth()
- ..()
+/mob/living/simple_animal/updatehealth(reason = "none given")
+ ..(reason)
health = Clamp(health, 0, maxHealth)
med_hud_set_status()
@@ -127,12 +127,15 @@
else if(stat != DEAD)
icon_state = icon_living
-/mob/living/simple_animal/handle_regular_status_updates()
- if(..()) //alive
+/mob/living/simple_animal/update_stat(reason = "none given")
+ if(status_flags & GODMODE)
+ return
+
+ ..(reason)
+ if(stat != DEAD)
if(health < 1)
death()
- return FALSE
- return TRUE
+ create_debug_log("died of damage, trigger reason: [reason]")
/mob/living/simple_animal/proc/handle_automated_action()
return
@@ -303,6 +306,10 @@
stat(null, "Health: [round((health / maxHealth) * 100)]%")
/mob/living/simple_animal/death(gibbed)
+ // Only execute the below if we successfully died
+ . = ..()
+ if(!.)
+ return FALSE
if(nest)
nest.spawned_mobs -= src
nest = null
@@ -322,10 +329,8 @@
else
health = 0
icon_state = icon_dead
- stat = DEAD
density = 0
lying = 1
- ..()
/mob/living/simple_animal/ex_act(severity)
..()
@@ -341,35 +346,42 @@
if(3.0)
adjustBruteLoss(30)
-/mob/living/simple_animal/proc/adjustHealth(amount)
+/mob/living/simple_animal/proc/adjustHealth(amount, updating_health = TRUE)
if(status_flags & GODMODE)
return FALSE
+ var/oldbruteloss = bruteloss
bruteloss = Clamp(bruteloss + amount, 0, maxHealth)
- handle_regular_status_updates()
+ if(oldbruteloss == bruteloss)
+ updating_health = FALSE
+ . = STATUS_UPDATE_NONE
+ else
+ . = STATUS_UPDATE_HEALTH
+ if(updating_health)
+ updatehealth()
-/mob/living/simple_animal/adjustBruteLoss(amount)
+/mob/living/simple_animal/adjustBruteLoss(amount, updating_health = TRUE)
if(damage_coeff[BRUTE])
- adjustHealth(amount * damage_coeff[BRUTE])
+ return adjustHealth(amount * damage_coeff[BRUTE], updating_health)
-/mob/living/simple_animal/adjustFireLoss(amount)
+/mob/living/simple_animal/adjustFireLoss(amount, updating_health = TRUE)
if(damage_coeff[BURN])
- adjustHealth(amount * damage_coeff[BURN])
+ return adjustHealth(amount * damage_coeff[BURN], updating_health)
-/mob/living/simple_animal/adjustOxyLoss(amount)
+/mob/living/simple_animal/adjustOxyLoss(amount, updating_health = TRUE)
if(damage_coeff[OXY])
- adjustHealth(amount * damage_coeff[OXY])
+ return adjustHealth(amount * damage_coeff[OXY], updating_health)
-/mob/living/simple_animal/adjustToxLoss(amount)
+/mob/living/simple_animal/adjustToxLoss(amount, updating_health = TRUE)
if(damage_coeff[TOX])
- adjustHealth(amount * damage_coeff[TOX])
+ return adjustHealth(amount * damage_coeff[TOX], updating_health)
-/mob/living/simple_animal/adjustCloneLoss(amount)
+/mob/living/simple_animal/adjustCloneLoss(amount, updating_health = TRUE)
if(damage_coeff[CLONE])
- adjustHealth(amount * damage_coeff[CLONE])
+ return adjustHealth(amount * damage_coeff[CLONE], updating_health)
-/mob/living/simple_animal/adjustStaminaLoss(amount)
+/mob/living/simple_animal/adjustStaminaLoss(amount, updating_health = TRUE)
if(damage_coeff[STAMINA])
- return ..(amount*damage_coeff[STAMINA])
+ return ..(amount*damage_coeff[STAMINA], updating_health)
/mob/living/simple_animal/proc/CanAttack(var/atom/the_target)
if(see_invisible < the_target.invisibility)
diff --git a/code/modules/mob/living/simple_animal/tribbles.dm b/code/modules/mob/living/simple_animal/tribbles.dm
index 3e7f1722a41..0f10a9ad382 100644
--- a/code/modules/mob/living/simple_animal/tribbles.dm
+++ b/code/modules/mob/living/simple_animal/tribbles.dm
@@ -80,7 +80,10 @@ var/global/totaltribbles = 0 //global variable so it updates for all tribbles,
/mob/living/simple_animal/tribble/death(gibbed) // Gotta make sure to remove tribbles from the list on death
- ..()
+ // Only execute the below if we successfully died
+ . = ..(gibbed)
+ if(!.)
+ return FALSE
totaltribbles -= 1
@@ -195,10 +198,7 @@ var/global/totaltribbles = 0 //global variable so it updates for all tribbles,
if(src.destroyed)
return
else
- to_chat(usr, text("You kick the lab cage."))
- for(var/mob/O in oviewers())
- if((O.client && !( O.blinded )))
- to_chat(O, text("[] kicks the lab cage.", usr))
+ user.visible_message("[user] kicks the lab cage.", "You kick the lab cage.")
src.health -= 2
healthcheck()
return
diff --git a/code/modules/mob/living/stat_states.dm b/code/modules/mob/living/stat_states.dm
index 3decff7596e..c9c51e2c5ab 100644
--- a/code/modules/mob/living/stat_states.dm
+++ b/code/modules/mob/living/stat_states.dm
@@ -10,7 +10,8 @@
log_game("[key_name(src)] fell unconscious at [atom_loc_line(get_turf(src))]")
stat = UNCONSCIOUS
if(updating)
- // update_blind_effects()
+ update_sight()
+ update_blind_effects()
update_canmove()
return 1
@@ -24,7 +25,8 @@
log_game("[key_name(src)] woke up at [atom_loc_line(get_turf(src))]")
stat = CONSCIOUS
if(updating)
- // update_blind_effects()
+ update_sight()
+ update_blind_effects()
update_canmove()
return 1
@@ -47,11 +49,14 @@
stat = CONSCIOUS
dead_mob_list -= src
living_mob_list += src
+ if(mind)
+ respawnable_list -= src
timeofdeath = null
if(updating)
update_canmove()
- // update_blind_effects()
- updatehealth()
+ update_blind_effects()
+ update_sight()
+ updatehealth("update revive")
for(var/s in ownedSoullinks)
var/datum/soullink/S = s
diff --git a/code/modules/mob/living/status_procs.dm b/code/modules/mob/living/status_procs.dm
index 972a8b0d553..8fdeec94679 100644
--- a/code/modules/mob/living/status_procs.dm
+++ b/code/modules/mob/living/status_procs.dm
@@ -216,19 +216,22 @@
// DRUGGY
-/mob/living/Druggy(amount)
- SetDruggy(max(druggy, amount))
+/mob/living/Druggy(amount, updating = TRUE)
+ return SetDruggy(max(druggy, amount), updating)
-/mob/living/SetDruggy(amount)
- var/old_val = druggy
+/mob/living/SetDruggy(amount, updating = TRUE)
+ . = STATUS_UPDATE_DRUGGY
+ if((!!amount) == (!!druggy)) // We're not changing from + to 0 or vice versa
+ . = STATUS_UPDATE_NONE
+ updating = FALSE
druggy = max(amount, 0)
// We transitioned to/from 0, so update the druggy overlays
- if((old_val == 0 || druggy == 0) && (old_val != druggy))
+ if(updating)
update_druggy_effects()
-/mob/living/AdjustDruggy(amount, bound_lower = 0, bound_upper = INFINITY)
+/mob/living/AdjustDruggy(amount, bound_lower = 0, bound_upper = INFINITY, updating = TRUE)
var/new_value = directional_bounded_sum(druggy, amount, bound_lower, bound_upper)
- SetDruggy(new_value)
+ return SetDruggy(new_value, updating)
// EAR_DAMAGE
@@ -256,35 +259,41 @@
// EYE_BLIND
-/mob/living/EyeBlind(amount)
- SetEyeBlind(max(eye_blind, amount))
+/mob/living/EyeBlind(amount, updating = TRUE)
+ return SetEyeBlind(max(eye_blind, amount), updating)
-/mob/living/SetEyeBlind(amount)
- var/old_val = eye_blind
+/mob/living/SetEyeBlind(amount, updating = TRUE)
+ . = STATUS_UPDATE_BLIND
+ if((!!amount) == (!!eye_blind)) // We're not changing from + to 0 or vice versa
+ updating = FALSE
+ . = STATUS_UPDATE_NONE
eye_blind = max(amount, 0)
// We transitioned to/from 0, so update the eye blind overlays
- if((old_val == 0 || eye_blind == 0) && (old_val != eye_blind))
+ if(updating)
update_blind_effects()
-/mob/living/AdjustEyeBlind(amount, bound_lower = 0, bound_upper = INFINITY)
+/mob/living/AdjustEyeBlind(amount, bound_lower = 0, bound_upper = INFINITY, updating = TRUE)
var/new_value = directional_bounded_sum(eye_blind, amount, bound_lower, bound_upper)
- SetEyeBlind(new_value)
+ return SetEyeBlind(new_value, updating)
// EYE_BLURRY
-/mob/living/EyeBlurry(amount)
- SetEyeBlurry(max(eye_blurry, amount))
+/mob/living/EyeBlurry(amount, updating = TRUE)
+ return SetEyeBlurry(max(eye_blurry, amount), updating)
-/mob/living/SetEyeBlurry(amount)
- var/old_val = eye_blurry
+/mob/living/SetEyeBlurry(amount, updating = TRUE)
+ . = STATUS_UPDATE_BLURRY
+ if((!!amount) == (!!eye_blurry)) // We're not changing from + to 0 or vice versa
+ updating = FALSE
+ . = STATUS_UPDATE_NONE
eye_blurry = max(amount, 0)
// We transitioned to/from 0, so update the eye blur overlays
- if((old_val == 0 || eye_blurry == 0) && (old_val != eye_blurry))
+ if(updating)
update_blurry_effects()
-/mob/living/AdjustEyeBlurry(amount, bound_lower = 0, bound_upper = INFINITY)
+/mob/living/AdjustEyeBlurry(amount, bound_lower = 0, bound_upper = INFINITY, updating = TRUE)
var/new_value = directional_bounded_sum(eye_blurry, amount, bound_lower, bound_upper)
- SetEyeBlurry(new_value)
+ return SetEyeBlurry(new_value, updating)
// HALLUCINATION
@@ -327,20 +336,22 @@
// PARALYSE
/mob/living/Paralyse(amount, updating = 1, force = 0)
- SetParalysis(max(paralysis, amount), updating, force)
+ return SetParalysis(max(paralysis, amount), updating, force)
/mob/living/SetParalysis(amount, updating = 1, force = 0)
+ . = STATUS_UPDATE_STAT
if((!!amount) == (!!paralysis)) // We're not changing from + to 0 or vice versa
updating = FALSE
+ . = STATUS_UPDATE_NONE
if(status_flags & CANPARALYSE || force)
paralysis = max(amount, 0)
if(updating)
update_canmove()
- update_stat()
+ update_stat("paralysis")
/mob/living/AdjustParalysis(amount, bound_lower = 0, bound_upper = INFINITY, updating = 1, force = 0)
var/new_value = directional_bounded_sum(paralysis, amount, bound_lower, bound_upper)
- SetParalysis(new_value, updating, force)
+ return SetParalysis(new_value, updating, force)
// SILENT
@@ -357,20 +368,22 @@
// SLEEPING
/mob/living/Sleeping(amount, updating = 1, no_alert = FALSE)
- SetSleeping(max(sleeping, amount), updating, no_alert)
+ return SetSleeping(max(sleeping, amount), updating, no_alert)
/mob/living/SetSleeping(amount, updating = 1, no_alert = FALSE)
+ . = STATUS_UPDATE_STAT
if((!!amount) == (!!sleeping)) // We're not changing from + to 0 or vice versa
updating = FALSE
+ . = STATUS_UPDATE_NONE
sleeping = max(amount, 0)
if(updating)
update_sleeping_effects(no_alert)
- update_stat()
+ update_stat("sleeping")
update_canmove()
/mob/living/AdjustSleeping(amount, bound_lower = 0, bound_upper = INFINITY, updating = 1, no_alert = FALSE)
var/new_value = directional_bounded_sum(sleeping, amount, bound_lower, bound_upper)
- SetSleeping(new_value, updating, no_alert)
+ return SetSleeping(new_value, updating, no_alert)
// SLOWED
@@ -411,19 +424,24 @@
// STUN
/mob/living/Stun(amount, updating = 1, force = 0)
- SetStunned(max(stunned, amount), updating, force)
+ return SetStunned(max(stunned, amount), updating, force)
/mob/living/SetStunned(amount, updating = 1, force = 0) //if you REALLY need to set stun to a set amount without the whole "can't go below current stunned"
+ . = STATUS_UPDATE_CANMOVE
if((!!amount) == (!!stunned)) // We're not changing from + to 0 or vice versa
updating = FALSE
+ . = STATUS_UPDATE_NONE
+
if(status_flags & CANSTUN || force)
stunned = max(amount, 0)
if(updating)
update_canmove()
+ else
+ return STATUS_UPDATE_NONE
/mob/living/AdjustStunned(amount, bound_lower = 0, bound_upper = INFINITY, updating = 1, force = 0)
var/new_value = directional_bounded_sum(stunned, amount, bound_lower, bound_upper)
- SetStunned(new_value, updating, force)
+ return SetStunned(new_value, updating, force)
// STUTTERING
@@ -443,19 +461,23 @@
// WEAKEN
/mob/living/Weaken(amount, updating = 1, force = 0)
- SetWeakened(max(weakened, amount), updating, force)
+ return SetWeakened(max(weakened, amount), updating, force)
/mob/living/SetWeakened(amount, updating = 1, force = 0)
+ . = STATUS_UPDATE_CANMOVE
if((!!amount) == (!!weakened)) // We're not changing from + to 0 or vice versa
updating = FALSE
+ . = STATUS_UPDATE_NONE
if(status_flags & CANWEAKEN || force)
weakened = max(amount, 0)
if(updating)
update_canmove() //updates lying, canmove and icons
+ else
+ return STATUS_UPDATE_NONE
/mob/living/AdjustWeakened(amount, bound_lower = 0, bound_upper = INFINITY, updating = 1, force = 0)
var/new_value = directional_bounded_sum(weakened, amount, bound_lower, bound_upper)
- SetWeakened(new_value, updating, force)
+ return SetWeakened(new_value, updating, force)
//
// DISABILITIES
@@ -463,18 +485,19 @@
// Blind
-/mob/living/proc/BecomeBlind()
+/mob/living/proc/BecomeBlind(updating = TRUE)
var/val_change = !(disabilities & BLIND)
+ . = val_change ? STATUS_UPDATE_BLIND : STATUS_UPDATE_NONE
disabilities |= BLIND
- if(val_change)
+ if(val_change && updating)
update_blind_effects()
-/mob/living/proc/CureBlind()
+/mob/living/proc/CureBlind(updating = TRUE)
var/val_change = !!(disabilities & BLIND)
+ . = val_change ? STATUS_UPDATE_BLIND : STATUS_UPDATE_NONE
disabilities &= ~BLIND
- CureIfHasDisability(BLINDBLOCK)
-
- if(val_change)
+ if(val_change && updating)
+ CureIfHasDisability(BLINDBLOCK)
update_blind_effects()
// Coughing
@@ -515,17 +538,19 @@
// Nearsighted
-/mob/living/proc/BecomeNearsighted()
+/mob/living/proc/BecomeNearsighted(updating = TRUE)
var/val_change = !(disabilities & NEARSIGHTED)
+ . = val_change ? STATUS_UPDATE_NEARSIGHTED : STATUS_UPDATE_NONE
disabilities |= NEARSIGHTED
- if(val_change)
+ if(val_change && updating)
update_nearsighted_effects()
-/mob/living/proc/CureNearsighted()
+/mob/living/proc/CureNearsighted(updating = TRUE)
var/val_change = !!(disabilities & NEARSIGHTED)
+ . = val_change ? STATUS_UPDATE_NEARSIGHTED : STATUS_UPDATE_NONE
disabilities &= ~NEARSIGHTED
- CureIfHasDisability(GLASSESBLOCK)
- if(val_change)
+ if(val_change && updating)
+ CureIfHasDisability(GLASSESBLOCK)
update_nearsighted_effects()
// Nervous
diff --git a/code/modules/mob/living/update_status.dm b/code/modules/mob/living/update_status.dm
index c7f9bdd0d96..40d4cdc9cb2 100644
--- a/code/modules/mob/living/update_status.dm
+++ b/code/modules/mob/living/update_status.dm
@@ -1,5 +1,5 @@
/mob/living/update_blind_effects()
- if(!has_vision())
+ if(!has_vision(information_only=TRUE))
overlay_fullscreen("blind", /obj/screen/fullscreen/blind)
throw_alert("blind", /obj/screen/alert/blind)
return 1
@@ -44,8 +44,10 @@
return !(ear_deaf || (disabilities & DEAF))
// Whether the mob is able to see
-/mob/living/has_vision()
- return !(eye_blind || (disabilities & BLIND) || stat)
+// `information_only` is for stuff that's purely informational - like understanding nonverbal languages, or blindness overlays
+// This flag exists because certain things like angel statues expect this to be false for dead people
+/mob/living/has_vision(information_only = FALSE)
+ return (information_only && stat == DEAD) || !(eye_blind || (disabilities & BLIND) || stat)
// Whether the mob is capable of talking
/mob/living/can_speak()
@@ -104,6 +106,22 @@
/mob/living/proc/update_stamina()
return
+/mob/living/update_stat(reason = "None given")
+ if(status_flags & GODMODE)
+ return
+ if(stat != DEAD)
+ if(health <= config.health_threshold_dead)
+ death()
+ create_debug_log("died of damage, trigger reason: [reason]")
+ else if(paralysis || status_flags & FAKEDEATH)
+ if(stat == CONSCIOUS)
+ KnockOut()
+ create_debug_log("fell unconscious, trigger reason: [reason]")
+ else
+ if(stat == UNCONSCIOUS)
+ WakeUp()
+ create_debug_log("woke up, trigger reason: [reason]")
+
/mob/living/vv_edit_var(var_name, var_value)
. = ..()
switch(var_name)
@@ -126,6 +144,6 @@
if("druggy")
SetDruggy(druggy)
if("maxHealth")
- updatehealth()
+ updatehealth("var edit")
if("resize")
- update_transform()
\ No newline at end of file
+ update_transform()
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index c4f10d71452..4560e935547 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -75,7 +75,7 @@
if(!client) return
if(type)
- if(type & 1 && !has_vision())//Vision related
+ if(type & 1 && !has_vision(information_only=TRUE))//Vision related
if(!( alt ))
return
else
@@ -87,7 +87,7 @@
else
msg = alt
type = alt_type
- if(type & 1 && !has_vision())
+ if(type & 1 && !has_vision(information_only=TRUE))
return
// Added voice muffling for Issue 41.
if(stat == UNCONSCIOUS || (sleeping > 0 && stat != DEAD))
@@ -576,7 +576,7 @@ var/list/slot_equipment_priority = list( \
set name = "Examine"
set category = "IC"
- if((is_blind(src) || usr.stat) && !isobserver(src))
+ if(!has_vision(information_only = TRUE) && !isobserver(src))
to_chat(src, "Something is there but you can't see it.")
return 1
@@ -1246,13 +1246,22 @@ var/list/slot_equipment_priority = list( \
return 1
return 0
-/mob/proc/create_attack_log(var/text, var/collapse = 1)//forgive me code gods for this shitcode proc
+/mob/proc/create_attack_log(text, collapse = TRUE)
+ LAZYINITLIST(attack_log)
+ create_log_in_list(attack_log, text, collapse, last_log)
+ last_log = world.timeofday
+
+/mob/proc/create_debug_log(text, collapse = TRUE)
+ LAZYINITLIST(debug_log)
+ create_log_in_list(debug_log, text, collapse, world.timeofday)
+
+/proc/create_log_in_list(list/target, text, collapse = TRUE, last_log)//forgive me code gods for this shitcode proc
//this proc enables lovely stuff like an attack log that looks like this: "[18:20:29-18:20:45]21x John Smith attacked Andrew Jackson with a crowbar."
//That makes the logs easier to read, but because all of this is stored in strings, weird things have to be used to get it all out.
var/new_log = "\[[time_stamp()]] [text]"
- if(length(attack_log) > 0)//if there are other logs already present
- var/previous_log = attack_log[length(attack_log)]//get the latest log
+ if(target.len)//if there are other logs already present
+ var/previous_log = target[target.len]//get the latest log
var/last_log_is_range = (copytext(previous_log, 10, 11) == "-") //whether the last log is a time range or not. The "-" will be an indicator that it is.
var/x_sign_position = findtext(previous_log, "x")
@@ -1277,10 +1286,9 @@ var/list/slot_equipment_priority = list( \
rep = text2num(copytext(previous_log, 44, x_sign_position))//get whatever number is right before the 'x'
new_log = "\[[old_timestamp]-[time_stamp()]][rep?rep+1:2]x [text]"
- attack_log -= attack_log[length(attack_log)]//remove the last log
+ target -= target[target.len]//remove the last log
- attack_log += new_log
- last_log = world.timeofday
+ target += new_log
/mob/vv_get_dropdown()
. = ..()
diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm
index 57b5aeb4996..bfe9ac7484a 100644
--- a/code/modules/mob/mob_defines.dm
+++ b/code/modules/mob/mob_defines.dm
@@ -29,7 +29,8 @@
var/computer_id = null
var/lastattacker = null
var/lastattacked = null
- var/attack_log = list( )
+ var/list/attack_log = list( )
+ var/list/debug_log = null
var/last_log = 0
var/obj/machinery/machine = null
var/other_mobs = null
@@ -44,7 +45,6 @@
var/med_record = ""
var/sec_record = ""
var/gen_record = ""
- var/blinded = null
var/bhunger = 0 //Carbon
var/lying = 0
var/lying_prev = 0
@@ -199,4 +199,4 @@
var/list/tkgrabbed_objects = list() // Assoc list of items to TK grabs
- var/forced_look = null // This can either be a numerical direction or a soft object reference (UID). It makes the mob always face towards the selected thing.
\ No newline at end of file
+ var/forced_look = null // This can either be a numerical direction or a soft object reference (UID). It makes the mob always face towards the selected thing.
diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm
index 01bcb2bcc1a..c0862b31404 100644
--- a/code/modules/mob/mob_helpers.dm
+++ b/code/modules/mob/mob_helpers.dm
@@ -397,13 +397,6 @@ var/list/intents = list(INTENT_HELP,INTENT_DISARM,INTENT_GRAB,INTENT_HARM)
to_chat(src, "You are now getting up.")
StopResting()
-/proc/is_blind(A)
- if(iscarbon(A))
- var/mob/living/carbon/C = A
- if(C.disabilities & BLIND || C.blinded)
- return 1
- return 0
-
/proc/get_multitool(mob/user as mob)
// Get tool
var/obj/item/multitool/P
@@ -498,7 +491,7 @@ var/list/intents = list(INTENT_HELP,INTENT_DISARM,INTENT_GRAB,INTENT_HARM)
A.overlays += alert_overlay
/mob/proc/switch_to_camera(var/obj/machinery/camera/C)
- if(!C.can_use() || stat || (get_dist(C, src) > 1 || machine != src || blinded || !canmove))
+ if(!C.can_use() || stat || (get_dist(C, src) > 1 || machine != src || !has_vision() || !canmove))
return 0
check_eye(src)
return 1
diff --git a/code/modules/mob/update_status.dm b/code/modules/mob/update_status.dm
index 7e1df6171e7..52a6fb7769d 100644
--- a/code/modules/mob/update_status.dm
+++ b/code/modules/mob/update_status.dm
@@ -37,7 +37,7 @@
/mob/proc/can_hear()
return 1
-/mob/proc/has_vision()
+/mob/proc/has_vision(information_only = FALSE)
return 1
/mob/proc/can_speak()
diff --git a/code/modules/nano/modules/ert_manager.dm b/code/modules/nano/modules/ert_manager.dm
index d954c36ee2d..1d70157f079 100644
--- a/code/modules/nano/modules/ert_manager.dm
+++ b/code/modules/nano/modules/ert_manager.dm
@@ -50,7 +50,7 @@
cyborg_slots = text2num(href_list["set_cyb"])
if(href_list["dispatch_ert"])
- ert_request_answered = 1
+ ert_request_answered = TRUE
var/slots_list = list()
if(commander_slots > 0)
slots_list += "commander: [commander_slots]"
diff --git a/code/modules/projectiles/ammunition/ammo_casings.dm b/code/modules/projectiles/ammunition/ammo_casings.dm
index ef73d714447..f3c5db5da22 100644
--- a/code/modules/projectiles/ammunition/ammo_casings.dm
+++ b/code/modules/projectiles/ammunition/ammo_casings.dm
@@ -87,7 +87,7 @@
desc = "A .45 rubber bullet casing."
caliber = ".45"
icon_state = "r-casing"
- projectile_type = /obj/item/projectile/bullet/weakbullet4
+ projectile_type = /obj/item/projectile/bullet/midbullet_r
/obj/item/ammo_casing/c45
desc = "A .45 bullet casing."
diff --git a/code/modules/projectiles/ammunition/energy.dm b/code/modules/projectiles/ammunition/energy.dm
index 7a9441ae46c..322c0931161 100644
--- a/code/modules/projectiles/ammunition/energy.dm
+++ b/code/modules/projectiles/ammunition/energy.dm
@@ -67,6 +67,18 @@
fire_sound = 'sound/weapons/laser3.ogg'
e_cost = 125
+/obj/item/ammo_casing/energy/immolator/strong
+ projectile_type = /obj/item/projectile/beam/immolator/strong
+ e_cost = 125
+ select_name = "precise"
+
+/obj/item/ammo_casing/energy/immolator/scatter
+ projectile_type = /obj/item/projectile/beam/immolator/weak
+ e_cost = 125
+ pellets = 6
+ variance = 25
+ select_name = "scatter"
+
/obj/item/ammo_casing/energy/electrode
projectile_type = /obj/item/projectile/energy/electrode
select_name = "stun"
diff --git a/code/modules/projectiles/ammunition/magazines.dm b/code/modules/projectiles/ammunition/magazines.dm
index 24b77ee9bb5..e621b1906b4 100644
--- a/code/modules/projectiles/ammunition/magazines.dm
+++ b/code/modules/projectiles/ammunition/magazines.dm
@@ -208,12 +208,16 @@
caliber = ".45"
max_ammo = 8
multiple_sprites = 1
-/obj/item/ammo_box/magazine/m45/enforcer45
- name = "handgun magazine (.45)"
- icon_state = "enforcer"
- ammo_type = /obj/item/ammo_casing/rubber45
-/obj/item/ammo_box/magazine/m45/enforcer45/update_icon()
+/obj/item/ammo_box/magazine/enforcer
+ name = "handgun magazine (9mm)"
+ icon_state = "enforcer"
+ ammo_type = /obj/item/ammo_casing/rubber9mm
+ max_ammo = 8
+ multiple_sprites = 1
+ caliber = "9mm"
+
+/obj/item/ammo_box/magazine/enforcer/update_icon()
..()
overlays.Cut()
@@ -221,21 +225,21 @@
if(ammo && is_rubber())
overlays += image('icons/obj/ammo.dmi', icon_state = "enforcer-r")
-/obj/item/ammo_box/magazine/m45/enforcer45/examine(mob/user, var/distance)
+/obj/item/ammo_box/magazine/enforcer/examine(mob/user, var/distance)
..()
if(distance <= 2)
to_chat(user, "It seems to be loaded with [is_rubber() ? "rubber" : "lethal"] bullets.")//only can see the topmost one.
-/obj/item/ammo_box/magazine/m45/enforcer45/proc/is_rubber()//if the topmost bullet is a rubber one
+/obj/item/ammo_box/magazine/enforcer/proc/is_rubber()//if the topmost bullet is a rubber one
var/ammo = ammo_count()
if(!ammo)
return 0
- if(istype(contents[contents.len], /obj/item/ammo_casing/rubber45))
+ if(istype(contents[contents.len], /obj/item/ammo_casing/rubber9mm))
return 1
return 0
-/obj/item/ammo_box/magazine/m45/enforcer45/lethal
- ammo_type = /obj/item/ammo_casing/c45
+/obj/item/ammo_box/magazine/enforcer/lethal
+ ammo_type = /obj/item/ammo_casing/c9mm
/obj/item/ammo_box/magazine/wt550m9
name = "wt550 magazine (4.6x30mm)"
diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm
index 4be1f36cb22..75da1fdbedd 100644
--- a/code/modules/projectiles/guns/energy/laser.dm
+++ b/code/modules/projectiles/guns/energy/laser.dm
@@ -125,6 +125,19 @@
origin_tech = "combat=4;magnets=4;powerstorage=3"
shaded_charge = 1
+/obj/item/gun/energy/immolator/multi
+ name = "multi lens immolator cannon"
+ desc = "A large laser cannon, similar to the Immolator Laser, with toggleable firemodes. It is frequently used by military-like forces through Nanotrasen."
+ icon_state = "multilensimmolator"
+ ammo_type = list(/obj/item/ammo_casing/energy/immolator/strong, /obj/item/ammo_casing/energy/immolator/scatter)
+ origin_tech = "combat=5;magnets=5;powerstorage=4"
+
+/obj/item/gun/energy/immolator/multi/update_icon()
+ ..()
+ var/obj/item/ammo_casing/energy/shot = ammo_type[select]
+ var/append = shot.select_name
+ overlays += image(icon = icon, icon_state = "multilensimmolator-[append]")
+
////////Laser Tag////////////////////
/obj/item/gun/energy/laser/bluetag
diff --git a/code/modules/projectiles/guns/energy/nuclear.dm b/code/modules/projectiles/guns/energy/nuclear.dm
index 7169b3d1443..f17fe55340a 100644
--- a/code/modules/projectiles/guns/energy/nuclear.dm
+++ b/code/modules/projectiles/guns/energy/nuclear.dm
@@ -65,6 +65,11 @@
ammo_x_offset = 1
shaded_charge = 1
+/obj/item/gun/energy/gun/blueshield/pdw9
+ name = "PDW-9 taser pistol"
+ desc = "A military grade sidearm, used by many militia forces throughout the local sector."
+ icon_state = "pdw9pistol"
+
/obj/item/gun/energy/gun/turret
name = "hybrid turret gun"
desc = "A heavy hybrid energy cannon with two settings: Stun and kill."
diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm
index 40e3ab36df1..f886c5e5e53 100644
--- a/code/modules/projectiles/guns/projectile/automatic.dm
+++ b/code/modules/projectiles/guns/projectile/automatic.dm
@@ -257,7 +257,7 @@
/obj/item/gun/projectile/automatic/lasercarbine
name = "\improper IK-60 Laser Carbine"
- desc = "An experimental carbine. Uses encased laser projectors as ammunition."//we need to uncouple the toroidal resistance dejammers
+ desc = "A short, compact carbine like rifle, relying more on battery cartridges rather than a built in power cell. Utilized by the Nanotrasen Navy for combat operations."
icon_state = "lasercarbine"
item_state = "laser"
w_class = WEIGHT_CLASS_NORMAL
diff --git a/code/modules/projectiles/guns/projectile/pistol.dm b/code/modules/projectiles/guns/projectile/pistol.dm
index 7ac82f99d5c..b9fdc969a66 100644
--- a/code/modules/projectiles/guns/projectile/pistol.dm
+++ b/code/modules/projectiles/guns/projectile/pistol.dm
@@ -27,15 +27,27 @@
can_suppress = 0
/obj/item/gun/projectile/automatic/pistol/enforcer
- name = "Enforcer .45"
+ name = "Enforcer"
desc = "A pistol of modern design."
icon_state = "enforcer_grey"
force = 10
- mag_type = /obj/item/ammo_box/magazine/m45/enforcer45
+ mag_type = /obj/item/ammo_box/magazine/enforcer
can_suppress = TRUE
unique_reskin = TRUE
can_flashlight = TRUE
+/obj/item/gun/projectile/automatic/pistol/enforcer/New()
+ ..()
+ options["Grey slide"] = "enforcer_grey"
+ options["Red slide"] = "enforcer_red"
+ options["Green slide"] = "enforcer_green"
+ options["Tan slide"] = "enforcer_tan"
+ options["Black slide"] = "enforcer_black"
+ options["Green Handle"] = "enforcer_greengrip"
+ options["Tan Handle"] = "enforcer_tangrip"
+ options["Red Handle"] = "enforcer_redgrip"
+ options["Cancel"] = null
+
/obj/item/gun/projectile/automatic/pistol/enforcer/update_icon()
..()
if(current_skin)
@@ -54,17 +66,11 @@
/obj/item/gun/projectile/automatic/pistol/enforcer/ui_action_click()
toggle_gunlight()
-/obj/item/gun/projectile/automatic/pistol/enforcer/New()
+/obj/item/gun/projectile/automatic/pistol/enforcer/lethal
+
+/obj/item/gun/projectile/automatic/pistol/enforcer/lethal/New()
+ magazine = new/obj/item/ammo_box/magazine/enforcer/lethal
..()
- options["Grey slide"] = "enforcer_grey"
- options["Red slide"] = "enforcer_red"
- options["Green slide"] = "enforcer_green"
- options["Tan slide"] = "enforcer_tan"
- options["Black slide"] = "enforcer_black"
- options["Green Handle"] = "enforcer_greengrip"
- options["Tan Handle"] = "enforcer_tangrip"
- options["Red Handle"] = "enforcer_redgrip"
- options["Cancel"] = null
/obj/item/gun/projectile/automatic/pistol/deagle
name = "desert eagle"
diff --git a/code/modules/projectiles/guns/projectile/toy.dm b/code/modules/projectiles/guns/projectile/toy.dm
index 79f4509e7de..1cc35d2ce38 100644
--- a/code/modules/projectiles/guns/projectile/toy.dm
+++ b/code/modules/projectiles/guns/projectile/toy.dm
@@ -42,8 +42,8 @@
..()
/obj/item/gun/projectile/automatic/toy/pistol/enforcer
- name = "Enforcer trainer"
- desc = "A foam version of the Enforcer meant to be used for training new caddets who can't be trusted with rubber bullets."
+ name = "Foam Enforcer"
+ desc = "A foam shooting version of the Enforcer meant to be used for training new caddets who can't be trusted with rubber bullets."
icon_state = "enforcer"
mag_type = /obj/item/ammo_box/magazine/toy/enforcer
can_flashlight = TRUE
diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm
index e19cd1165b5..868317177bd 100644
--- a/code/modules/projectiles/projectile.dm
+++ b/code/modules/projectiles/projectile.dm
@@ -7,7 +7,7 @@
anchored = 1 //There's a reason this is here, Mport. God fucking damn it -Agouri. Find&Fix by Pete. The reason this is here is to stop the curving of emitter shots.
flags = ABSTRACT
pass_flags = PASSTABLE
- mouse_opacity = 0
+ mouse_opacity = MOUSE_OPACITY_TRANSPARENT
hitsound = 'sound/weapons/pierce.ogg'
var/hitsound_wall = ""
pressure_resistance = INFINITY
@@ -28,16 +28,17 @@
var/speed = 1 //Amount of deciseconds it takes for projectile to travel
var/Angle = 0
var/spread = 0 //amount (in degrees) of projectile spread
- var/legacy = 0 //legacy projectile system
+ var/legacy = FALSE //legacy projectile system
animate_movement = 0
var/damage = 10
var/damage_type = BRUTE //BRUTE, BURN, TOX, OXY, CLONE are the only things that should be in here
- var/nodamage = 0 //Determines if the projectile will skip any damage inflictions
+ var/nodamage = FALSE //Determines if the projectile will skip any damage inflictions
var/flag = "bullet" //Defines what armor to use when it hits things. Must be set to bullet, laser, energy,or bomb //Cael - bio and rad are also valid
var/projectile_type = "/obj/item/projectile"
var/range = 50 //This will de-increment every step. When 0, it will delete the projectile.
var/is_reflectable = FALSE // Can it be reflected or not?
+ var/alwayslog = FALSE // ALWAYS log this projectile on hit even if it doesn't hit a living target. Useful for AOE explosion / EMP.
//Effects
var/stun = 0
var/weaken = 0
@@ -68,6 +69,8 @@
/obj/item/projectile/proc/on_hit(atom/target, blocked = 0, hit_zone)
var/turf/target_loca = get_turf(target)
+ if(alwayslog)
+ add_attack_logs(firer, target, "Shot with a [type]")
if(!isliving(target))
return 0
var/mob/living/L = target
@@ -121,7 +124,7 @@
reagent_note += R.id + " ("
reagent_note += num2text(R.volume) + ") "
has_reagents = TRUE
- if(!log_override && firer && original)
+ if(!log_override && firer && !alwayslog)
if(has_reagents)
add_attack_logs(firer, L, "Shot with a [type] (containing [reagent_note])")
else
diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm
index 761fb50179c..3cd4e888b1f 100644
--- a/code/modules/projectiles/projectile/beams.dm
+++ b/code/modules/projectiles/projectile/beams.dm
@@ -119,6 +119,16 @@
/obj/item/projectile/beam/immolator
name = "immolation beam"
+/obj/item/projectile/beam/immolator/strong
+ name = "heavy immolation beam"
+ damage = 45
+ icon_state = "heavylaser"
+
+/obj/item/projectile/beam/immolator/weak
+ name = "light immolation beam"
+ damage = 8
+ icon_state = "scatterlaser"
+
/obj/item/projectile/beam/immolator/on_hit(var/atom/target, var/blocked = 0)
. = ..()
if(istype(target, /mob/living/carbon))
diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm
index 8e697d1e86e..6c19971a996 100644
--- a/code/modules/projectiles/projectile/bullets.dm
+++ b/code/modules/projectiles/projectile/bullets.dm
@@ -123,6 +123,10 @@
damage = 20
stamina = 65 //two rounds from the c20r knocks people down
+/obj/item/projectile/bullet/midbullet_r
+ damage = 5
+ stamina = 75 //Still two rounds to knock people down
+
/obj/item/projectile/bullet/midbullet2
damage = 25
diff --git a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm
index 2003e78b780..ef8a36f7f86 100644
--- a/code/modules/projectiles/projectile/special.dm
+++ b/code/modules/projectiles/projectile/special.dm
@@ -2,43 +2,46 @@
name = "ion bolt"
icon_state = "ion"
damage = 0
+ alwayslog = TRUE
damage_type = BURN
nodamage = 1
flag = "energy"
/obj/item/projectile/ion/on_hit(var/atom/target, var/blocked = 0)
..()
- empulse(target, 1, 1, 1)
+ empulse(target, 1, 1, 1, cause = "[type] fired by [key_name(firer)]")
return 1
/obj/item/projectile/ion/weak
/obj/item/projectile/ion/weak/on_hit(atom/target, blocked = 0)
..()
- empulse(target, 0, 0, 1)
+ empulse(target, 0, 0, 1, cause = "[type] fired by [key_name(firer)]")
return 1
/obj/item/projectile/bullet/gyro
name ="explosive bolt"
icon_state= "bolter"
damage = 50
+ alwayslog = TRUE
flag = "bullet"
/obj/item/projectile/bullet/gyro/on_hit(var/atom/target, var/blocked = 0)
..()
- explosion(target, -1, 0, 2)
+ explosion(target, -1, 0, 2, cause = "[type] fired by [key_name(firer)]")
return 1
/obj/item/projectile/bullet/a40mm
name ="40mm grenade"
desc = "USE A WEEL GUN"
icon_state= "bolter"
+ alwayslog = TRUE
damage = 60
flag = "bullet"
/obj/item/projectile/bullet/a40mm/on_hit(atom/target, blocked = 0)
..()
- explosion(target, -1, 0, 2, 1, 0, flame_range = 3)
+ explosion(target, -1, 0, 2, 1, 0, flame_range = 3, cause = "[type] fired by [key_name(firer)]")
return 1
/obj/item/projectile/temp
@@ -229,6 +232,7 @@
name ="explosive slug"
damage = 25
weaken = 5
+ alwayslog = TRUE
/obj/item/projectile/bullet/frag12/on_hit(atom/target, blocked = 0)
..()
@@ -276,6 +280,7 @@
icon_state = "bluespace"
damage = 0
nodamage = 1
+ alwayslog = TRUE
var/teleport_target = null
/obj/item/projectile/energy/teleport/New(loc, tele_target)
@@ -289,6 +294,7 @@
do_teleport(target, teleport_target, 0)//teleport what's in the tile to the beacon
else
do_teleport(target, target, 15) //Otherwise it just warps you off somewhere.
+ add_attack_logs(firer, target, "Shot with a [type] [teleport_target ? "(Destination: [teleport_target])" : ""]")
/obj/item/projectile/snowball
name = "snowball"
diff --git a/code/modules/reagents/chemistry/holder.dm b/code/modules/reagents/chemistry/holder.dm
index 73a591f9ddb..c76129fc27f 100644
--- a/code/modules/reagents/chemistry/holder.dm
+++ b/code/modules/reagents/chemistry/holder.dm
@@ -196,6 +196,9 @@ var/const/INGEST = 2
if(M)
chem_temp = M.bodytemperature
handle_reactions()
+
+ // a bitfield filled in by each reagent's `on_mob_life` to find out which states to update
+ var/update_flags = STATUS_UPDATE_NONE
for(var/A in reagent_list)
var/datum/reagent/R = A
if(!istype(R)) // How are non-reagents ending up in the reagents_list?
@@ -233,14 +236,18 @@ var/const/INGEST = 2
continue
//If you got this far, that means we can process whatever reagent this iteration is for. Handle things normally from here.
if(M && R)
- R.on_mob_life(M)
+ update_flags |= R.on_mob_life(M)
if(R.volume >= R.overdose_threshold && !R.overdosed && R.overdose_threshold > 0)
R.overdosed = TRUE
R.overdose_start(M)
if(R.volume < R.overdose_threshold && R.overdosed)
R.overdosed = FALSE
if(R.overdosed)
- R.overdose_process(M, R.volume >= R.overdose_threshold*2 ? 2 : 1)
+ var/list/overdose_results = R.overdose_process(M, R.volume >= R.overdose_threshold*2 ? 2 : 1)
+ if(overdose_results) // to protect against poorly-coded overdose procs
+ update_flags |= overdose_results[REAGENT_OVERDOSE_FLAGS]
+ else
+ log_runtime(EXCEPTION("Reagent '[R.name]' does not return an overdose info list!"))
for(var/A in addiction_list)
var/datum/reagent/R = A
@@ -250,18 +257,36 @@ var/const/INGEST = 2
R.addiction_stage++
switch(R.addiction_stage)
if(1)
- R.addiction_act_stage1(M)
+ update_flags |= R.addiction_act_stage1(M)
if(2)
- R.addiction_act_stage2(M)
+ update_flags |= R.addiction_act_stage2(M)
if(3)
- R.addiction_act_stage3(M)
+ update_flags |= R.addiction_act_stage3(M)
if(4)
- R.addiction_act_stage4(M)
+ update_flags |= R.addiction_act_stage4(M)
if(5)
- R.addiction_act_stage5(M)
+ update_flags |= R.addiction_act_stage5(M)
if(prob(20) && (world.timeofday > (R.last_addiction_dose + ADDICTION_TIME))) //Each addiction lasts 8 minutes before it can end
to_chat(M, "You no longer feel reliant on [R.name]!")
addiction_list.Remove(R)
+ if(update_flags & STATUS_UPDATE_HEALTH)
+ M.updatehealth("reagent metabolism")
+ else if(update_flags & STATUS_UPDATE_STAT)
+ // update_stat is called in updatehealth
+ M.update_stat("reagent metabolism")
+ if(update_flags & STATUS_UPDATE_CANMOVE)
+ M.update_canmove()
+ if(update_flags & STATUS_UPDATE_STAMINA)
+ M.handle_hud_icons_health()
+ M.update_stamina()
+ if(update_flags & STATUS_UPDATE_BLIND)
+ M.update_blind_effects()
+ if(update_flags & STATUS_UPDATE_BLURRY)
+ M.update_blurry_effects()
+ if(update_flags & STATUS_UPDATE_NEARSIGHTED)
+ M.update_nearsighted_effects()
+ if(update_flags & STATUS_UPDATE_DRUGGY)
+ M.update_druggy_effects()
update_total()
/datum/reagents/proc/death_metabolize(mob/living/M)
@@ -455,7 +480,8 @@ var/const/INGEST = 2
reagent_list -= A
qdel(A)
update_total()
- my_atom.on_reagent_change()
+ if(my_atom)
+ my_atom.on_reagent_change()
return 0
@@ -537,7 +563,8 @@ var/const/INGEST = 2
if(R.id == reagent)
R.volume += amount
update_total()
- my_atom.on_reagent_change()
+ if(my_atom)
+ my_atom.on_reagent_change()
R.on_merge(data)
if(!no_react)
handle_reactions()
@@ -555,7 +582,8 @@ var/const/INGEST = 2
R.on_new(data)
update_total()
- my_atom.on_reagent_change()
+ if(my_atom)
+ my_atom.on_reagent_change()
if(!no_react)
handle_reactions()
return 0
@@ -578,7 +606,8 @@ var/const/INGEST = 2
update_total()
if(!safety)//So it does not handle reactions when it need not to
handle_reactions()
- my_atom.on_reagent_change()
+ if(my_atom)
+ my_atom.on_reagent_change()
return 0
return 1
@@ -688,7 +717,7 @@ var/const/INGEST = 2
// Convenience proc to create a reagents holder for an atom
// Max vol is maximum volume of holder
-atom/proc/create_reagents(max_vol)
+/atom/proc/create_reagents(max_vol)
reagents = new/datum/reagents(max_vol)
reagents.my_atom = src
@@ -716,4 +745,4 @@ atom/proc/create_reagents(max_vol)
QDEL_LIST(reagent_list)
reagent_list = null
if(my_atom && my_atom.reagents == src)
- my_atom.reagents = null
\ No newline at end of file
+ my_atom.reagents = null
diff --git a/code/modules/reagents/chemistry/machinery/pandemic.dm b/code/modules/reagents/chemistry/machinery/pandemic.dm
index ee2ac418555..1d300767488 100644
--- a/code/modules/reagents/chemistry/machinery/pandemic.dm
+++ b/code/modules/reagents/chemistry/machinery/pandemic.dm
@@ -9,6 +9,7 @@
use_power = IDLE_POWER_USE
idle_power_usage = 20
var/temp_html = ""
+ var/printing = null
var/wait = null
var/obj/item/reagent_containers/beaker = null
@@ -162,6 +163,10 @@
for(var/datum/disease/advance/AD in active_diseases)
AD.Refresh()
updateUsrDialog()
+ else if(href_list["print_form"])
+ var/datum/disease/D = GetVirusByIndex(text2num(href_list["print_form"]))
+ D = archive_diseases[D.GetDiseaseID()]//We know it's advanced no need to check
+ print_form(D, usr)
else
@@ -172,6 +177,47 @@
add_fingerprint(usr)
return
+//Prints a nice virus release form. Props to Urbanliner for the layout
+/obj/machinery/computer/pandemic/proc/print_form(var/datum/disease/advance/D, mob/living/user)
+ D = archive_diseases[D.GetDiseaseID()]
+ if(!(printing) && D)
+ var/reason = input(user,"Enter a reason for the release", "Write", null) as message
+ reason += ""
+ var/english_symptoms = list()
+ for(var/I in D.symptoms)
+ var/datum/symptom/S = I
+ english_symptoms += S.name
+ var/symtoms = english_list(english_symptoms)
+
+
+ var/signature
+ if(alert(user,"Would you like to add your signature?",,"Yes","No") == "Yes")
+ signature = "[user ? user.real_name : "Anonymous"]"
+ else
+ signature = ""
+
+ printing = 1
+ var/obj/item/paper/P = new /obj/item/paper(loc)
+ visible_message("[src] rattles and prints out a sheet of paper.")
+ playsound(loc, 'sound/goonstation/machines/printer_dotmatrix.ogg', 50, 1)
+
+ P.info = " Releasing Virus "
+ P.info += "
"
+ P.info += "Name of the Virus: [D.name]
"
+ P.info += "Symptoms: [symtoms]
"
+ P.info += "Spreads by: [D.spread_text]
"
+ P.info += "Cured by: [D.cure_text]
"
+ P.info += "
"
+ P.info += "Reason for releasing: [reason]"
+ P.info += "
"
+ P.info += "The Virologist is responsible for any biohazards caused by the virus released.
"
+ P.info += "Virologist's sign: [signature]
"
+ P.info += "If approved, stamp below with the Chief Medical Officer's stamp, and/or the Captain's stamp if required:"
+ P.populatefields()
+ P.updateinfolinks()
+ P.name = "Releasing Virus - [D.name]"
+ printing = null
+
/obj/machinery/computer/pandemic/attack_hand(mob/user)
if(..())
return
@@ -214,8 +260,11 @@
var/datum/disease/advance/A = D
D = archive_diseases[A.GetDiseaseID()]
- if(D && D.name == "Unknown")
- dat += "Name Disease
"
+ if(D)
+ if(D.name == "Unknown")
+ dat += "Name Disease
"
+ else
+ dat += "Print release form
"
if(!D)
CRASH("We weren't able to get the advance disease from the archive.")
diff --git a/code/modules/reagents/chemistry/reagents.dm b/code/modules/reagents/chemistry/reagents.dm
index 16e4197f72c..2ae74f4a91f 100644
--- a/code/modules/reagents/chemistry/reagents.dm
+++ b/code/modules/reagents/chemistry/reagents.dm
@@ -69,6 +69,7 @@
/datum/reagent/proc/on_mob_life(mob/living/M)
current_cycle++
holder.remove_reagent(id, metabolization_rate * M.metabolism_efficiency * M.digestion_ratio) //By default it slowly disappears.
+ return STATUS_UPDATE_NONE
/datum/reagent/proc/on_mob_death(mob/living/M) //use this to have chems have a "death-triggered" effect
return
@@ -102,15 +103,16 @@
// Called if the reagent has passed the overdose threshold and is set to be triggering overdose effects
/datum/reagent/proc/overdose_process(mob/living/M, severity)
var/effect = rand(1, 100) - severity
+ var/update_flags = STATUS_UPDATE_NONE
if(effect <= 8)
- M.adjustToxLoss(severity)
- return effect
+ update_flags |= (M.adjustToxLoss(severity, FALSE) ? STATUS_UPDATE_HEALTH : STATUS_UPDATE_NONE)
+ return list(effect, update_flags)
/datum/reagent/proc/overdose_start(mob/living/M)
return
/datum/reagent/proc/addiction_act_stage1(mob/living/M)
- return
+ return STATUS_UPDATE_NONE
/datum/reagent/proc/addiction_act_stage2(mob/living/M)
if(prob(8))
@@ -119,6 +121,7 @@
M.emote("sneeze")
if(prob(4))
to_chat(M, "You feel a dull headache.")
+ return STATUS_UPDATE_NONE
/datum/reagent/proc/addiction_act_stage3(mob/living/M)
if(prob(8))
@@ -127,6 +130,7 @@
M.emote("shiver")
if(prob(4))
to_chat(M, "You begin craving [name]!")
+ return STATUS_UPDATE_NONE
/datum/reagent/proc/addiction_act_stage4(mob/living/M)
if(prob(8))
@@ -135,16 +139,19 @@
to_chat(M, "You have the strong urge for some [name]!")
if(prob(4))
to_chat(M, "You REALLY crave some [name]!")
+ return STATUS_UPDATE_NONE
/datum/reagent/proc/addiction_act_stage5(mob/living/M)
+ var/update_flags = STATUS_UPDATE_NONE
if(prob(8))
M.emote("twitch")
if(prob(6))
to_chat(M, "Your stomach lurches painfully!")
M.visible_message("[M] gags and retches!")
- M.Stun(rand(2,4))
- M.Weaken(rand(2,4))
+ update_flags |= M.Stun(rand(2,4), FALSE)
+ update_flags |= M.Weaken(rand(2,4), FALSE)
if(prob(5))
to_chat(M, "You feel like you can't live without [name]!")
if(prob(5))
to_chat(M, "You would DIE for some [name] right now!")
+ return update_flags
diff --git a/code/modules/reagents/chemistry/reagents/admin.dm b/code/modules/reagents/chemistry/reagents/admin.dm
index 785ac17a598..0856955da2b 100644
--- a/code/modules/reagents/chemistry/reagents/admin.dm
+++ b/code/modules/reagents/chemistry/reagents/admin.dm
@@ -9,42 +9,42 @@
taste_message = "admin abuse"
/datum/reagent/medicine/adminordrazine/on_mob_life(mob/living/carbon/M)
- M.setCloneLoss(0)
- M.setOxyLoss(0)
+ M.setCloneLoss(0, FALSE)
+ M.setOxyLoss(0, FALSE)
M.radiation = 0
- M.adjustBruteLoss(-5)
- M.adjustFireLoss(-5)
- M.adjustToxLoss(-5)
- M.setBrainLoss(0)
+ M.adjustBruteLoss(-5, FALSE)
+ M.adjustFireLoss(-5, FALSE)
+ M.adjustToxLoss(-5, FALSE)
+ M.setBrainLoss(0, FALSE)
if(ishuman(M))
var/mob/living/carbon/human/H = M
for(var/thing in H.internal_organs)
var/obj/item/organ/internal/I = thing
- I.receive_damage(-5)
+ I.receive_damage(-5, FALSE)
for(var/obj/item/organ/external/E in H.bodyparts)
if(E.mend_fracture())
E.perma_injury = 0
- M.SetEyeBlind(0)
- M.CureNearsighted()
- M.CureBlind()
+ M.SetEyeBlind(0, FALSE)
+ M.CureNearsighted(FALSE)
+ M.CureBlind(FALSE)
M.CureMute()
M.CureDeaf()
M.CureEpilepsy()
M.CureTourettes()
M.CureCoughing()
M.CureNervous()
- M.SetEyeBlurry(0)
- M.SetWeakened(0)
- M.SetStunned(0)
- M.SetParalysis(0)
- M.SetSilence(0)
+ M.SetEyeBlurry(0, FALSE)
+ M.SetWeakened(0, FALSE)
+ M.SetStunned(0, FALSE)
+ M.SetParalysis(0, FALSE)
+ M.SetSilence(0, FALSE)
M.SetHallucinate(0)
M.SetDizzy(0)
M.SetDrowsy(0)
M.SetStuttering(0)
M.SetSlur(0)
M.SetConfused(0)
- M.SetSleeping(0)
+ M.SetSleeping(0, FALSE)
M.SetJitter(0)
for(var/thing in M.viruses)
var/datum/disease/D = thing
@@ -52,6 +52,7 @@
continue
D.cure(0)
..()
+ return STATUS_UPDATE_ALL
/datum/reagent/medicine/adminordrazine/nanites
name = "Nanites"
diff --git a/code/modules/reagents/chemistry/reagents/alcohol.dm b/code/modules/reagents/chemistry/reagents/alcohol.dm
index 33f4ef4263c..c74e5973bf7 100644
--- a/code/modules/reagents/chemistry/reagents/alcohol.dm
+++ b/code/modules/reagents/chemistry/reagents/alcohol.dm
@@ -13,7 +13,7 @@
/datum/reagent/consumable/ethanol/on_mob_life(mob/living/M)
M.AdjustDrunk(alcohol_perc)
M.AdjustDizzy(dizzy_adj)
- ..()
+ return ..()
/datum/reagent/consumable/ethanol/reaction_obj(obj/O, volume)
if(istype(O,/obj/item/paper))
@@ -103,10 +103,12 @@
//copy paste from LSD... shoot me
/datum/reagent/consumable/ethanol/absinthe/on_mob_life(mob/living/M)
M.AdjustHallucinate(5)
- ..()
+ return ..()
/datum/reagent/consumable/ethanol/absinthe/overdose_process(mob/living/M, severity)
- M.adjustToxLoss(1)
+ var/update_flags = STATUS_UPDATE_NONE
+ update_flags |= M.adjustToxLoss(1, FALSE)
+ return list(0, update_flags)
/datum/reagent/consumable/ethanol/rum
name = "Rum"
@@ -121,7 +123,9 @@
drink_desc = "Now you want to Pray for a pirate suit, don't you?"
/datum/reagent/consumable/ethanol/rum/overdose_process(mob/living/M, severity)
- M.adjustToxLoss(1)
+ var/update_flags = STATUS_UPDATE_NONE
+ update_flags |= M.adjustToxLoss(1, FALSE)
+ return list(0, update_flags)
/datum/reagent/consumable/ethanol/mojito
name = "Mojito"
@@ -237,12 +241,13 @@
taste_message = "party"
/datum/reagent/consumable/ethanol/thirteenloko/on_mob_life(mob/living/M)
+ var/update_flags = STATUS_UPDATE_NONE
M.AdjustDrowsy(-7)
- M.AdjustSleeping(-2)
+ update_flags |= M.AdjustSleeping(-2, FALSE)
if(M.bodytemperature > 310)
M.bodytemperature = max(310, M.bodytemperature - (5 * TEMPERATURE_DAMAGE_COEFFICIENT))
M.Jitter(5)
- ..()
+ return ..() | update_flags
/////////////////////////////////////////////////////////////////cocktail entities//////////////////////////////////////////////
@@ -475,7 +480,7 @@
/datum/reagent/consumable/ethanol/toxins_special/on_mob_life(mob/living/M)
if(M.bodytemperature < 330)
M.bodytemperature = min(330, M.bodytemperature + (15 * TEMPERATURE_DAMAGE_COEFFICIENT)) //310 is the normal bodytemp. 310.055
- ..()
+ return ..()
/datum/reagent/consumable/ethanol/beepsky_smash
name = "Beepsky Smash"
@@ -491,8 +496,9 @@
taste_message = "THE LAW"
/datum/reagent/consumable/ethanol/beepsky_smash/on_mob_life(mob/living/M)
- M.Stun(1)
- ..()
+ var/update_flag = STATUS_UPDATE_NONE
+ update_flag |= M.Stun(1, FALSE)
+ return ..() | update_flag
/datum/reagent/consumable/ethanol/irish_cream
name = "Irish Cream"
@@ -640,7 +646,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 ..()
/datum/reagent/consumable/ethanol/barefoot
name = "Barefoot"
@@ -888,13 +894,14 @@
taste_message = "brain damageeeEEeee"
/datum/reagent/consumable/ethanol/neurotoxin/on_mob_life(mob/living/M)
+ var/update_flags = STATUS_UPDATE_NONE
if(current_cycle >= 13)
- M.Weaken(3)
+ update_flags |= M.Weaken(3, FALSE)
if(current_cycle >= 55)
- M.Druggy(55)
+ update_flags |= M.Druggy(55, FALSE)
if(current_cycle >= 200)
- M.adjustToxLoss(2)
- ..()
+ update_flags |= M.adjustToxLoss(2, FALSE)
+ return ..() | update_flags
/datum/reagent/consumable/ethanol/hippies_delight
name = "Hippie's Delight"
@@ -908,25 +915,29 @@
drink_desc = "A drink enjoyed by people during the 1960's."
/datum/reagent/consumable/ethanol/hippies_delight/on_mob_life(mob/living/M)
- M.Druggy(50)
+ var/update_flags = STATUS_UPDATE_NONE
+ update_flags |= M.Druggy(50, FALSE)
switch(current_cycle)
if(1 to 5)
- if(!M.stuttering) M.stuttering = 1
+ M.Stuttering(1)
M.Dizzy(10)
- if(prob(10)) M.emote(pick("twitch","giggle"))
+ if(prob(10))
+ M.emote(pick("twitch","giggle"))
if(5 to 10)
- if(!M.stuttering) M.stuttering = 1
+ M.Stuttering(1)
M.Jitter(20)
M.Dizzy(20)
- M.Druggy(45)
- if(prob(20)) M.emote(pick("twitch","giggle"))
+ update_flags |= M.Druggy(45, FALSE)
+ if(prob(20))
+ M.emote(pick("twitch","giggle"))
if(10 to INFINITY)
- if(!M.stuttering) M.stuttering = 1
+ M.Stuttering(1)
M.Jitter(40)
M.Dizzy(40)
- M.Druggy(60)
- if(prob(30)) M.emote(pick("twitch","giggle"))
- ..()
+ update_flags |= M.Druggy(60, FALSE)
+ if(prob(30))
+ M.emote(pick("twitch","giggle"))
+ return ..() | update_flags
/datum/reagent/consumable/ethanol/changelingsting
name = "Changeling Sting"
@@ -993,8 +1004,8 @@
/datum/reagent/consumable/ethanol/driestmartini/on_mob_life(mob/living/M)
if(current_cycle >= 55 && current_cycle < 115)
- M.stuttering += 10
- ..()
+ M.AdjustStuttering(10)
+ return ..()
/datum/reagent/consumable/ethanol/kahlua
name = "Kahlua"
@@ -1008,11 +1019,12 @@
taste_message = "sweet alcohol"
/datum/reagent/consumable/ethanol/kahlua/on_mob_life(mob/living/M)
+ var/update_flags = STATUS_UPDATE_NONE
M.AdjustDizzy(-5)
M.AdjustDrowsy(-3)
- M.AdjustSleeping(-2)
+ update_flags |= (M.AdjustSleeping(-2) ? STATUS_UPDATE_STAT : STATUS_UPDATE_NONE)
M.Jitter(5)
- ..()
+ return ..() | update_flags
/datum/reagent/ginsonic
name = "Gin and sonic"
@@ -1026,11 +1038,12 @@
taste_message = "SPEED"
/datum/reagent/ginsonic/on_mob_life(mob/living/M)
+ var/update_flags = STATUS_UPDATE_NONE
M.AdjustDrowsy(-5)
if(prob(25))
- M.AdjustParalysis(-1)
- M.AdjustStunned(-1)
- M.AdjustWeakened(-1)
+ update_flags |= M.AdjustParalysis(-1, FALSE)
+ update_flags |= M.AdjustStunned(-1, FALSE)
+ update_flags |= M.AdjustWeakened(-1, FALSE)
if(prob(8))
M.reagents.add_reagent("methamphetamine",1.2)
var/sonic_message = pick("Gotta go fast!", "Time to speed, keed!", "I feel a need for speed!", "Let's juice.", "Juice time.", "Way Past Cool!")
@@ -1038,7 +1051,7 @@
M.say("[sonic_message]")
else
to_chat(M, "[sonic_message ]")
- ..()
+ return ..() | update_flags
/datum/reagent/consumable/ethanol/applejack
name = "Applejack"
@@ -1101,6 +1114,7 @@
M.adjust_fire_stacks(3)
/datum/reagent/consumable/ethanol/dragons_breath/on_mob_life(mob/living/M)
+ var/update_flags = STATUS_UPDATE_NONE
if(M.reagents.has_reagent("milk"))
to_chat(M, "The milk stops the burning. Ahhh.")
M.reagents.del_reagent("milk")
@@ -1111,7 +1125,7 @@
if(prob(50))
to_chat(M, "Your throat burns terribly!")
M.emote(pick("scream","cry","choke","gasp"))
- M.Stun(1)
+ update_flags |= M.Stun(1, FALSE)
if(prob(8))
to_chat(M, "Why!? WHY!?")
if(prob(8))
@@ -1125,7 +1139,7 @@
M.visible_message("[M] is consumed in flames!")
M.dust()
return
- ..()
+ return ..() | update_flags
// ROBOT ALCOHOL PAST THIS POINT
// WOOO!
diff --git a/code/modules/reagents/chemistry/reagents/disease.dm b/code/modules/reagents/chemistry/reagents/disease.dm
index bac6f475261..a9cbbe87691 100644
--- a/code/modules/reagents/chemistry/reagents/disease.dm
+++ b/code/modules/reagents/chemistry/reagents/disease.dm
@@ -11,7 +11,7 @@
if(iscarbon(M))
if(!M.get_int_organ(/obj/item/organ/internal/body_egg))
new/obj/item/organ/internal/body_egg/spider_eggs(M) //Yes, even Xenos can fall victim to the plague that is spider infestation.
- ..()
+ return ..()
/datum/reagent/nanomachines
@@ -24,7 +24,7 @@
/datum/reagent/nanomachines/on_mob_life(mob/living/carbon/M)
if(volume > 1.5)
M.ForceContractDisease(new /datum/disease/transformation/robot(0))
- ..()
+ return ..()
/datum/reagent/xenomicrobes
@@ -37,7 +37,7 @@
/datum/reagent/xenomicrobes/on_mob_life(mob/living/carbon/M)
if(volume > 1.5)
M.ContractDisease(new /datum/disease/transformation/xeno(0))
- ..()
+ return ..()
/datum/reagent/fungalspores
name = "Tubercle bacillus Cosmosis microbes"
@@ -49,7 +49,7 @@
/datum/reagent/fungalspores/on_mob_life(mob/living/carbon/M)
if(volume > 2.5)
M.ForceContractDisease(new /datum/disease/tuberculosis(0))
- ..()
+ return ..()
/datum/reagent/jagged_crystals
name = "Jagged Crystals"
@@ -61,7 +61,7 @@
/datum/reagent/jagged_crystals/on_mob_life(mob/living/carbon/M)
M.ForceContractDisease(new /datum/disease/berserker(0))
- ..()
+ return ..()
/datum/reagent/salmonella
name = "Salmonella"
@@ -73,7 +73,7 @@
/datum/reagent/salmonella/on_mob_life(mob/living/carbon/M)
M.ForceContractDisease(new /datum/disease/food_poisoning(0))
- ..()
+ return ..()
/datum/reagent/gibbis
name = "Gibbis"
@@ -86,7 +86,7 @@
/datum/reagent/gibbis/on_mob_life(mob/living/carbon/M)
if(volume > 2.5)
M.ForceContractDisease(new /datum/disease/gbs/curable(0))
- ..()
+ return ..()
/datum/reagent/prions
name = "Prions"
@@ -99,7 +99,7 @@
/datum/reagent/prions/on_mob_life(mob/living/carbon/M)
if(volume > 4.5)
M.ForceContractDisease(new /datum/disease/kuru(0))
- ..()
+ return ..()
/datum/reagent/grave_dust
name = "Grave Dust"
@@ -112,7 +112,7 @@
/datum/reagent/grave_dust/on_mob_life(mob/living/carbon/M)
if(volume > 4.5)
M.ForceContractDisease(new /datum/disease/vampire(0))
- ..()
+ return ..()
/datum/reagent/heartworms
name = "Space heartworms"
@@ -130,7 +130,7 @@
if(ate_heart)
ate_heart.remove(H)
qdel(ate_heart)
- ..()
+ return ..()
/datum/reagent/concentrated_initro
name = "Concentrated Initropidril"
@@ -146,7 +146,7 @@
var/mob/living/carbon/human/H = M
if(!H.undergoing_cardiac_arrest())
H.set_heartattack(TRUE) // rip in pepperoni
- ..()
+ return ..()
//virus foods
diff --git a/code/modules/reagents/chemistry/reagents/drink_base.dm b/code/modules/reagents/chemistry/reagents/drink_base.dm
index a924d84349b..4f20e323049 100644
--- a/code/modules/reagents/chemistry/reagents/drink_base.dm
+++ b/code/modules/reagents/chemistry/reagents/drink_base.dm
@@ -11,16 +11,17 @@
var/adj_temp_cool = 0
/datum/reagent/consumable/drink/on_mob_life(mob/living/M)
+ var/update_flags = STATUS_UPDATE_NONE
if(adj_dizzy)
M.AdjustDizzy(adj_dizzy)
if(adj_drowsy)
M.AdjustDrowsy(adj_drowsy)
if(adj_sleepy)
- M.AdjustSleeping(adj_sleepy)
+ update_flags |= M.AdjustSleeping(adj_sleepy, FALSE)
if(adj_temp_hot)
if(M.bodytemperature < 310)//310 is the normal bodytemp. 310.055
M.bodytemperature = min(310, M.bodytemperature + (adj_temp_hot * TEMPERATURE_DAMAGE_COEFFICIENT))
if(adj_temp_cool)
if(M.bodytemperature > 310)//310 is the normal bodytemp. 310.055
M.bodytemperature = max(310, M.bodytemperature - (adj_temp_cool * TEMPERATURE_DAMAGE_COEFFICIENT))
- ..()
+ return ..() | update_flags
diff --git a/code/modules/reagents/chemistry/reagents/drink_cold.dm b/code/modules/reagents/chemistry/reagents/drink_cold.dm
index a92d8644c6b..1a7be3748b8 100644
--- a/code/modules/reagents/chemistry/reagents/drink_cold.dm
+++ b/code/modules/reagents/chemistry/reagents/drink_cold.dm
@@ -65,12 +65,13 @@
taste_message = "cola"
/datum/reagent/consumable/drink/cold/nuka_cola/on_mob_life(mob/living/M)
+ var/update_flags = STATUS_UPDATE_NONE
M.Jitter(20)
- M.Druggy(30)
+ update_flags |= M.Druggy(30, FALSE)
M.AdjustDizzy(5)
M.SetDrowsy(0)
M.status_flags |= GOTTAGOFAST
- ..()
+ return ..() | update_flags
/datum/reagent/consumable/drink/cold/nuka_cola/on_mob_delete(mob/living/M)
M.status_flags &= ~GOTTAGOFAST
@@ -172,4 +173,4 @@
/datum/reagent/consumable/drink/cold/rewriter/on_mob_life(mob/living/M)
M.Jitter(5)
- ..()
+ return ..()
diff --git a/code/modules/reagents/chemistry/reagents/drinks.dm b/code/modules/reagents/chemistry/reagents/drinks.dm
index cf73e0a5087..b6b4a27e10d 100644
--- a/code/modules/reagents/chemistry/reagents/drinks.dm
+++ b/code/modules/reagents/chemistry/reagents/drinks.dm
@@ -9,9 +9,10 @@
taste_message = "orange juice"
/datum/reagent/consumable/drink/orangejuicde/on_mob_life(mob/living/M)
- if(M.getOxyLoss() && prob(30))
- M.adjustOxyLoss(-1*REAGENTS_EFFECT_MULTIPLIER)
- ..()
+ var/update_flags = STATUS_UPDATE_NONE
+ if(prob(30))
+ update_flags |= M.adjustOxyLoss(-1*REAGENTS_EFFECT_MULTIPLIER, FALSE)
+ return ..() | update_flags
/datum/reagent/consumable/drink/tomatojuice
name = "Tomato Juice"
@@ -34,9 +35,10 @@
taste_message = "pineapple juice"
/datum/reagent/consumable/drink/tomatojuice/on_mob_life(mob/living/M)
- if(M.getFireLoss() && prob(20))
- M.adjustFireLoss(-1)
- ..()
+ var/update_flags = STATUS_UPDATE_NONE
+ if(prob(20))
+ update_flags |= M.adjustFireLoss(-1, FALSE)
+ return ..() | update_flags
/datum/reagent/consumable/drink/limejuice
name = "Lime Juice"
@@ -49,9 +51,10 @@
taste_message = "lime juice"
/datum/reagent/consumable/drink/limejuice/on_mob_life(mob/living/M)
- if(M.getToxLoss() && prob(20))
- M.adjustToxLoss(-1)
- ..()
+ var/update_flags = STATUS_UPDATE_NONE
+ if(prob(20))
+ update_flags |= M.adjustToxLoss(-1, FALSE)
+ return ..() | update_flags
/datum/reagent/consumable/drink/carrotjuice
name = "Carrot juice"
@@ -63,16 +66,17 @@
drink_desc = "It is just like a carrot but without crunching."
taste_message = "carrot juice"
-/datum/reagent/consumable/drink/carrotjuicde/on_mob_life(mob/living/M)
- M.AdjustEyeBlurry(-1)
- M.AdjustEyeBlind(-1)
+/datum/reagent/consumable/drink/carrotjuice/on_mob_life(mob/living/M)
+ var/update_flags = STATUS_UPDATE_NONE
+ update_flags |= M.AdjustEyeBlurry(-1, FALSE)
+ update_flags |= M.AdjustEyeBlind(-1, FALSE)
switch(current_cycle)
if(1 to 20)
//nothing
if(21 to INFINITY)
if(prob(current_cycle-10))
- M.disabilities &= ~NEARSIGHTED
- ..()
+ update_flags |= M.CureNearsighted(FALSE)
+ return ..() | update_flags
/datum/reagent/consumable/drink/doctor_delight
name = "The Doctor's Delight"
@@ -86,9 +90,10 @@
taste_message = "healthy dietary choices"
/datum/reagent/consumable/drink/doctors_delight/on_mob_life(mob/living/M)
- if(M.getToxLoss() && prob(20))
- M.adjustToxLoss(-1)
- ..()
+ var/update_flags = STATUS_UPDATE_NONE
+ if(prob(20))
+ update_flags |= M.adjustToxLoss(-1, FALSE)
+ return ..() | update_flags
/datum/reagent/consumable/drink/triple_citrus
name = "Triple Citrus"
@@ -126,8 +131,9 @@
taste_message = "berry juice"
/datum/reagent/consumable/drink/poisonberryjuice/on_mob_life(mob/living/M)
- M.adjustToxLoss(1)
- ..()
+ var/update_flags = STATUS_UPDATE_NONE
+ update_flags |= M.adjustToxLoss(1, FALSE)
+ return ..() | update_flags
/datum/reagent/consumable/applejuice
name = "Apple Juice"
@@ -171,10 +177,11 @@
taste_message = "banana juice"
/datum/reagent/consumable/drink/banana/on_mob_life(mob/living/M)
+ var/update_flags = STATUS_UPDATE_NONE
if((ishuman(M) && M.job in list("Clown") ) || issmall(M))
- M.adjustBruteLoss(-1)
- M.adjustFireLoss(-1)
- ..()
+ update_flags |= M.adjustBruteLoss(-1, FALSE)
+ update_flags |= M.adjustFireLoss(-1, FALSE)
+ return ..() | update_flags
/datum/reagent/consumable/drink/nothing
name = "Nothing"
@@ -186,10 +193,11 @@
taste_message = "nothing... how?"
/datum/reagent/consumable/drink/nothing/on_mob_life(mob/living/M)
+ var/update_flags = STATUS_UPDATE_NONE
if(ishuman(M) && M.job in list("Mime"))
- M.adjustBruteLoss(-1)
- M.adjustFireLoss(-1)
- ..()
+ update_flags |= M.adjustBruteLoss(-1, FALSE)
+ update_flags |= M.adjustFireLoss(-1, FALSE)
+ return ..() | update_flags
/datum/reagent/consumable/drink/potato_juice
name = "Potato Juice"
@@ -213,11 +221,12 @@
taste_message = "milk"
/datum/reagent/consumable/drink/milk/on_mob_life(mob/living/M)
- if(M.getBruteLoss() && prob(20))
- M.adjustBruteLoss(-1)
+ var/update_flags = STATUS_UPDATE_NONE
+ if(prob(20))
+ update_flags |= M.adjustBruteLoss(-1, FALSE)
if(holder.has_reagent("capsaicin"))
holder.remove_reagent("capsaicin", 2)
- ..()
+ return ..() | update_flags
/datum/reagent/consumable/drink/milk/soymilk
name = "Soy Milk"
@@ -275,13 +284,14 @@
taste_message = "coffee"
/datum/reagent/consumable/drink/coffee/on_mob_life(mob/living/M)
+ var/update_flags = STATUS_UPDATE_NONE
if(holder.has_reagent("frostoil"))
holder.remove_reagent("frostoil", 5)
if(prob(50))
- M.AdjustParalysis(-1)
- M.AdjustStunned(-1)
- M.AdjustWeakened(-1)
- ..()
+ update_flags |= M.AdjustParalysis(-1, FALSE)
+ update_flags |= M.AdjustStunned(-1, FALSE)
+ update_flags |= M.AdjustWeakened(-1, FALSE)
+ return ..() | update_flags
/datum/reagent/consumable/drink/coffee/overdose_process(mob/living/M, severity)
if(volume > 45)
@@ -311,10 +321,11 @@
drink_desc = "A nice and refrshing beverage while you are reading."
/datum/reagent/consumable/drink/coffee/soy_latte/on_mob_life(mob/living/M)
- ..()
- M.SetSleeping(0)
- if(M.getBruteLoss() && prob(20))
- M.adjustBruteLoss(-1)
+ var/update_flags = STATUS_UPDATE_NONE
+ update_flags |= M.SetSleeping(0, FALSE)
+ if(prob(20))
+ update_flags |= M.adjustBruteLoss(-1, FALSE)
+ return ..() | update_flags
/datum/reagent/consumable/drink/coffee/cafe_latte
name = "Cafe Latte"
@@ -328,10 +339,11 @@
drink_desc = "A nice, strong and refreshing beverage while you are reading."
/datum/reagent/consumable/drink/coffee/cafe_latte/on_mob_life(mob/living/M)
- ..()
- M.SetSleeping(0)
- if(M.getBruteLoss() && prob(20))
- M.adjustBruteLoss(-1)
+ var/update_flags = STATUS_UPDATE_NONE
+ update_flags |= M.SetSleeping(0, FALSE)
+ if(prob(20))
+ update_flags |= M.adjustBruteLoss(-1, FALSE)
+ return ..() | update_flags
/datum/reagent/consumable/drink/coffee/cafe_latte/cafe_mocha
name = "Cafe Mocha"
@@ -357,9 +369,10 @@
taste_message = "tea"
/datum/reagent/consumable/drink/tea/on_mob_life(mob/living/M)
- if(M.getToxLoss() && prob(20))
- M.adjustToxLoss(-1)
- ..()
+ var/update_flags = STATUS_UPDATE_NONE
+ if(prob(20))
+ update_flags |= M.adjustToxLoss(-1, FALSE)
+ return ..() | update_flags
/datum/reagent/consumable/drink/tea/icetea
name = "Iced Tea"
@@ -383,10 +396,11 @@
taste_message = "honks"
/datum/reagent/consumable/drink/bananahonk/on_mob_life(mob/living/M)
+ var/update_flags = STATUS_UPDATE_NONE
if((ishuman(M) && M.job in list("Clown") ) || issmall(M))
- M.adjustBruteLoss(-1)
- M.adjustFireLoss(-1)
- ..()
+ update_flags |= M.adjustBruteLoss(-1, FALSE)
+ update_flags |= M.adjustFireLoss(-1, FALSE)
+ return ..() | update_flags
/datum/reagent/consumable/drink/silencer
name = "Silencer"
@@ -399,10 +413,11 @@
taste_message = "mphhhh"
/datum/reagent/consumable/drink/silencer/on_mob_life(mob/living/M)
+ var/update_flags = STATUS_UPDATE_NONE
if(ishuman(M) && M.job in list("Mime"))
- M.adjustBruteLoss(-1)
- M.adjustFireLoss(-1)
- ..()
+ update_flags |= M.adjustBruteLoss(-1, FALSE)
+ update_flags |= M.adjustFireLoss(-1, FALSE)
+ return ..() | update_flags
/datum/reagent/consumable/drink/chocolatepudding
name = "Chocolate Pudding"
diff --git a/code/modules/reagents/chemistry/reagents/drugs.dm b/code/modules/reagents/chemistry/reagents/drugs.dm
index 77c4b08f359..980c6d5bf9d 100644
--- a/code/modules/reagents/chemistry/reagents/drugs.dm
+++ b/code/modules/reagents/chemistry/reagents/drugs.dm
@@ -10,7 +10,7 @@
if(ishuman(M))
if(prob(7))
M.emote(pick("twitch","drool","moan","gasp"))
- ..()
+ return ..()
/datum/reagent/lithium
@@ -24,8 +24,9 @@
if(isturf(M.loc) && !istype(M.loc, /turf/space))
if(M.canmove && !M.restrained())
step(M, pick(cardinal))
- if(prob(5)) M.emote(pick("twitch","drool","moan"))
- ..()
+ if(prob(5))
+ M.emote(pick("twitch","drool","moan"))
+ return ..()
/datum/reagent/lsd
name = "Lysergic acid diethylamide"
@@ -35,9 +36,10 @@
color = "#0000D8"
/datum/reagent/lsd/on_mob_life(mob/living/M)
- M.Druggy(15)
+ var/update_flags = STATUS_UPDATE_NONE
+ update_flags |= M.Druggy(15, FALSE)
M.AdjustHallucinate(10)
- ..()
+ return ..() | update_flags
/datum/reagent/space_drugs
name = "Space drugs"
@@ -50,12 +52,14 @@
heart_rate_decrease = 1
/datum/reagent/space_drugs/on_mob_life(mob/living/M)
- M.Druggy(15)
+ var/update_flags = STATUS_UPDATE_NONE
+ update_flags |= M.Druggy(15, FALSE)
if(isturf(M.loc) && !istype(M.loc, /turf/space))
if(M.canmove && !M.restrained())
step(M, pick(cardinal))
- if(prob(7)) M.emote(pick("twitch","drool","moan","giggle"))
- ..()
+ if(prob(7))
+ M.emote(pick("twitch","drool","moan","giggle"))
+ return ..() | update_flags
/datum/reagent/psilocybin
name = "Psilocybin"
@@ -64,25 +68,29 @@
color = "#E700E7" // rgb: 231, 0, 231
/datum/reagent/psilocybin/on_mob_life(mob/living/M)
- M.Druggy(30)
+ var/update_flags = STATUS_UPDATE_NONE
+ update_flags |= M.Druggy(30, FALSE)
switch(current_cycle)
if(1 to 5)
M.Stuttering(1)
M.Dizzy(5)
- if(prob(10)) M.emote(pick("twitch","giggle"))
+ if(prob(10))
+ M.emote(pick("twitch","giggle"))
if(5 to 10)
M.Stuttering(1)
M.Jitter(10)
M.Dizzy(10)
- M.Druggy(35)
- if(prob(20)) M.emote(pick("twitch","giggle"))
+ update_flags |= M.Druggy(35, FALSE)
+ if(prob(20))
+ M.emote(pick("twitch","giggle"))
if(10 to INFINITY)
M.Stuttering(1)
M.Jitter(20)
M.Dizzy(20)
- M.Druggy(40)
- if(prob(30)) M.emote(pick("twitch","giggle"))
- ..()
+ update_flags |= M.Druggy(40, FALSE)
+ if(prob(30))
+ M.emote(pick("twitch","giggle"))
+ return ..() | update_flags
/datum/reagent/nicotine
name = "Nicotine"
@@ -95,55 +103,59 @@
heart_rate_increase = 1
/datum/reagent/nicotine/on_mob_life(mob/living/M)
+ var/update_flags = STATUS_UPDATE_NONE
var/smoke_message = pick("You feel relaxed.", "You feel calmed.", "You feel less stressed.", "You feel more placid.", "You feel more undivided.")
if(prob(5))
to_chat(M, "[smoke_message]")
if(prob(50))
- M.AdjustParalysis(-1)
- M.AdjustStunned(-1)
- M.AdjustWeakened(-1)
- M.adjustStaminaLoss(-1*REAGENTS_EFFECT_MULTIPLIER)
- ..()
+ update_flags |= M.AdjustParalysis(-1, FALSE)
+ update_flags |= M.AdjustStunned(-1, FALSE)
+ update_flags |= M.AdjustWeakened(-1, FALSE)
+ update_flags |= M.adjustStaminaLoss(-1*REAGENTS_EFFECT_MULTIPLIER, FALSE)
+ return ..() | update_flags
/datum/reagent/nicotine/overdose_process(mob/living/M, severity)
- var/effect = ..()
+ var/list/overdose_info = ..()
+ var/effect = overdose_info[REAGENT_OVERDOSE_EFFECT]
+ var/update_flags = overdose_info[REAGENT_OVERDOSE_FLAGS]
if(severity == 1)
if(effect <= 2)
M.visible_message("[M] looks nervous!")
M.AdjustConfused(15)
- M.adjustToxLoss(2)
+ update_flags |= M.adjustToxLoss(2, FALSE)
M.Jitter(10)
M.emote("twitch_s")
else if(effect <= 4)
M.visible_message("[M] is all sweaty!")
M.bodytemperature += rand(15,30)
- M.adjustToxLoss(3)
+ update_flags |= M.adjustToxLoss(3, FALSE)
else if(effect <= 7)
- M.adjustToxLoss(4)
+ update_flags |= M.adjustToxLoss(4, FALSE)
M.emote("twitch")
M.Jitter(10)
else if(severity == 2)
if(effect <= 2)
M.emote("gasp")
to_chat(M, "You can't breathe!")
- M.adjustOxyLoss(15)
- M.adjustToxLoss(3)
- M.Stun(1)
+ update_flags |= M.adjustOxyLoss(15, FALSE)
+ update_flags |= M.adjustToxLoss(3, FALSE)
+ update_flags |= M.Stun(1, FALSE)
else if(effect <= 4)
to_chat(M, "You feel terrible!")
M.emote("drool")
M.Jitter(10)
- M.adjustToxLoss(5)
- M.Weaken(1)
+ update_flags |= M.adjustToxLoss(5, FALSE)
+ update_flags |= M.Weaken(1, FALSE)
M.AdjustConfused(33)
else if(effect <= 7)
M.emote("collapse")
to_chat(M, "Your heart is pounding!")
M << 'sound/effects/singlebeat.ogg'
- M.Paralyse(5)
+ update_flags |= M.Paralyse(5, FALSE)
M.Jitter(30)
- M.adjustToxLoss(6)
- M.adjustOxyLoss(20)
+ update_flags |= M.adjustToxLoss(6, FALSE)
+ update_flags |= M.adjustOxyLoss(20, FALSE)
+ return list(effect, update_flags)
/datum/reagent/crank
name = "Crank"
@@ -155,9 +167,10 @@
addiction_chance = 50
/datum/reagent/crank/on_mob_life(mob/living/M)
- M.AdjustParalysis(-2)
- M.AdjustStunned(-2)
- M.AdjustWeakened(-2)
+ var/update_flags = STATUS_UPDATE_NONE
+ update_flags |= M.AdjustParalysis(-2, FALSE)
+ update_flags |= M.AdjustStunned(-2, FALSE)
+ update_flags |= M.AdjustWeakened(-2, FALSE)
if(prob(15))
M.emote(pick("twitch", "twitch_s", "grumble", "laugh"))
if(prob(8))
@@ -169,13 +182,15 @@
M.bodytemperature += rand(1,10)
if(prob(4))
to_chat(M, "You feel kinda awful!")
- M.adjustToxLoss(1)
+ update_flags |= M.adjustToxLoss(1, FALSE)
M.AdjustJitter(30)
M.emote(pick("groan", "moan"))
- ..()
+ return ..() | update_flags
/datum/reagent/crank/overdose_process(mob/living/M, severity)
- var/effect = ..()
+ var/list/overdose_info = ..()
+ var/effect = overdose_info[REAGENT_OVERDOSE_EFFECT]
+ var/update_flags = overdose_info[REAGENT_OVERDOSE_FLAGS]
if(severity == 1)
if(effect <= 2)
M.visible_message("[M] looks confused!")
@@ -185,9 +200,9 @@
else if(effect <= 4)
M.visible_message("[M] is all sweaty!")
M.bodytemperature += rand(5,30)
- M.adjustBrainLoss(1)
- M.adjustToxLoss(1)
- M.Stun(2)
+ update_flags |= M.adjustBrainLoss(1, FALSE)
+ update_flags |= M.adjustToxLoss(1, FALSE)
+ update_flags |= M.Stun(2, FALSE)
else if(effect <= 7)
M.Jitter(30)
M.emote("grumble")
@@ -195,14 +210,14 @@
if(effect <= 2)
M.visible_message("[M] is sweating like a pig!")
M.bodytemperature += rand(20,100)
- M.adjustToxLoss(5)
- M.Stun(3)
+ update_flags |= M.adjustToxLoss(5, FALSE)
+ update_flags |= M.Stun(3, FALSE)
else if(effect <= 4)
M.visible_message("[M] starts tweaking the hell out!")
M.Jitter(100)
- M.adjustToxLoss(2)
- M.adjustBrainLoss(8)
- M.Weaken(3)
+ update_flags |= M.adjustToxLoss(2, FALSE)
+ update_flags |= M.adjustBrainLoss(8, FALSE)
+ update_flags |= M.Weaken(3, FALSE)
M.AdjustConfused(25)
M.emote("scream")
M.reagents.add_reagent("jagged_crystals", 5)
@@ -210,8 +225,9 @@
M.emote("scream")
M.visible_message("[M] nervously scratches at [M.p_their()] skin!")
M.Jitter(10)
- M.adjustBruteLoss(5)
+ update_flags |= M.adjustBruteLoss(5, FALSE)
M.emote("twitch_s")
+ return list(effect, update_flags)
/datum/reagent/krokodil
name = "Krokodil"
@@ -224,9 +240,10 @@
/datum/reagent/krokodil/on_mob_life(mob/living/M)
+ var/update_flags = STATUS_UPDATE_NONE
M.AdjustJitter(-40)
if(prob(25))
- M.adjustBrainLoss(1)
+ update_flags |= M.adjustBrainLoss(1, FALSE)
if(prob(15))
M.emote(pick("smile", "grin", "yawn", "laugh", "drool"))
if(prob(10))
@@ -236,49 +253,52 @@
if(prob(5))
to_chat(M, "You feel too chill!")
M.emote(pick("yawn", "drool"))
- M.Stun(1)
- M.adjustToxLoss(1)
- M.adjustBrainLoss(1)
+ update_flags |= M.Stun(1, FALSE)
+ update_flags |= M.adjustToxLoss(1, FALSE)
+ update_flags |= M.adjustBrainLoss(1, FALSE)
M.bodytemperature -= 20
if(prob(2))
to_chat(M, "Your skin feels all rough and dry.")
- M.adjustBruteLoss(2)
- ..()
+ update_flags |= M.adjustBruteLoss(2, FALSE)
+ return ..() | update_flags
/datum/reagent/krokodil/overdose_process(mob/living/M, severity)
- var/effect = ..()
+ var/list/overdose_info = ..()
+ var/effect = overdose_info[REAGENT_OVERDOSE_EFFECT]
+ var/update_flags = overdose_info[REAGENT_OVERDOSE_FLAGS]
if(severity == 1)
if(effect <= 2)
M.visible_message("[M] looks dazed!")
- M.Stun(3)
+ update_flags |= M.Stun(3, FALSE)
M.emote("drool")
else if(effect <= 4)
M.emote("shiver")
M.bodytemperature -= 40
else if(effect <= 7)
to_chat(M, "Your skin is cracking and bleeding!")
- M.adjustBruteLoss(5)
- M.adjustToxLoss(2)
- M.adjustBrainLoss(1)
+ update_flags |= M.adjustBruteLoss(5, FALSE)
+ update_flags |= M.adjustToxLoss(2, FALSE)
+ update_flags |= M.adjustBrainLoss(1, FALSE)
M.emote("cry")
else if(severity == 2)
if(effect <= 2)
M.visible_message("[M] sways and falls over!")
- M.adjustToxLoss(3)
- M.adjustBrainLoss(3)
- M.Weaken(8)
+ update_flags |= M.adjustToxLoss(3, FALSE)
+ update_flags |= M.adjustBrainLoss(3, FALSE)
+ update_flags |= M.Weaken(8, FALSE)
M.emote("faint")
else if(effect <= 4)
if(ishuman(M))
var/mob/living/carbon/human/H = M
H.visible_message("[M]'s skin is rotting away!")
- H.adjustBruteLoss(25)
+ update_flags |= H.adjustBruteLoss(25, FALSE)
H.emote("scream")
H.ChangeToHusk()
H.emote("faint")
else if(effect <= 7)
M.emote("shiver")
M.bodytemperature -= 70
+ return list(effect, update_flags)
/datum/reagent/methamphetamine
name = "Methamphetamine"
@@ -292,32 +312,35 @@
heart_rate_increase = 1
/datum/reagent/methamphetamine/on_mob_life(mob/living/M)
+ var/update_flags = STATUS_UPDATE_NONE
if(prob(5))
M.emote(pick("twitch_s","blink_r","shiver"))
if(current_cycle >= 25)
M.AdjustJitter(5)
M.AdjustDrowsy(-10)
- M.AdjustParalysis(-2.5)
- M.AdjustStunned(-2.5)
- M.AdjustWeakened(-2.5)
- M.adjustStaminaLoss(-2)
- M.SetSleeping(0)
+ update_flags |= M.AdjustParalysis(-2.5, FALSE)
+ update_flags |= M.AdjustStunned(-2.5, FALSE)
+ update_flags |= M.AdjustWeakened(-2.5, FALSE)
+ update_flags |= M.adjustStaminaLoss(-2, FALSE)
+ update_flags |= M.SetSleeping(0, FALSE)
M.status_flags |= GOTTAGOFAST_METH
if(prob(50))
- M.adjustBrainLoss(1.0)
- ..()
+ update_flags |= M.adjustBrainLoss(1, FALSE)
+ return ..() | update_flags
/datum/reagent/methamphetamine/on_mob_delete(mob/living/M)
M.status_flags &= ~GOTTAGOFAST_METH
..()
/datum/reagent/methamphetamine/overdose_process(mob/living/M, severity)
- var/effect = ..()
+ var/list/overdose_info = ..()
+ var/effect = overdose_info[REAGENT_OVERDOSE_EFFECT]
+ var/update_flags = overdose_info[REAGENT_OVERDOSE_FLAGS]
if(severity == 1)
if(effect <= 2)
M.visible_message("[M] can't seem to control [M.p_their()] legs!")
M.AdjustConfused(20)
- M.Weaken(4)
+ update_flags |= M.Weaken(4, FALSE)
else if(effect <= 4)
M.visible_message("[M]'s hands flip out and flail everywhere!")
M.drop_l_hand()
@@ -332,9 +355,10 @@
else if(effect <= 4)
M.visible_message("[M] falls to the floor and flails uncontrollably!")
M.Jitter(10)
- M.Weaken(10)
+ update_flags |= M.Weaken(10, FALSE)
else if(effect <= 7)
M.emote("laugh")
+ return list(effect, update_flags)
/datum/reagent/bath_salts
name = "Bath Salts"
@@ -348,6 +372,7 @@
/datum/reagent/bath_salts/on_mob_life(mob/living/M)
var/check = rand(0,100)
+ var/update_flags = STATUS_UPDATE_NONE
if(ishuman(M))
var/mob/living/carbon/human/H = M
var/obj/item/organ/external/head/head_organ = H.get_organ("head")
@@ -358,25 +383,25 @@
H.update_fhair()
H.visible_message("[H] has a wild look in [H.p_their()] eyes!")
if(check < 60)
- M.SetParalysis(0)
- M.SetStunned(0)
- M.SetWeakened(0)
+ update_flags |= M.SetParalysis(0, FALSE)
+ update_flags |= M.SetStunned(0, FALSE)
+ update_flags |= M.SetWeakened(0, FALSE)
if(check < 30)
M.emote(pick("twitch", "twitch_s", "scream", "drool", "grumble", "mumble"))
- M.Druggy(15)
+ update_flags |= M.Druggy(15, FALSE)
if(check < 20)
M.AdjustConfused(10)
if(check < 8)
M.reagents.add_reagent(pick("methamphetamine", "crank", "neurotoxin"), rand(1,5))
M.visible_message("[M] scratches at something under [M.p_their()] skin!")
- M.adjustBruteLoss(5)
+ update_flags |= M.adjustBruteLoss(5, FALSE)
else if(check < 16)
M.AdjustHallucinate(30)
else if(check < 24)
to_chat(M, "They're coming for you!")
else if(check < 28)
to_chat(M, "THEY'RE GONNA GET YOU!")
- ..()
+ return ..() | update_flags
/datum/reagent/bath_salts/reaction_mob(mob/living/M, method=TOUCH, volume)
if(method == INGEST)
@@ -390,7 +415,9 @@
to_chat(M, "You feel a bit more salty than usual.")
/datum/reagent/bath_salts/overdose_process(mob/living/M, severity)
- var/effect = ..()
+ var/list/overdose_info = ..()
+ var/effect = overdose_info[REAGENT_OVERDOSE_EFFECT]
+ var/update_flags = overdose_info[REAGENT_OVERDOSE_FLAGS]
if(severity == 1)
if(effect <= 2)
M.visible_message("[M] flails around like a lunatic!")
@@ -401,10 +428,10 @@
else if(effect <= 4)
M.visible_message("[M]'s eyes dilate!")
M.emote("twitch_s")
- M.adjustToxLoss(2)
- M.adjustBrainLoss(1)
- M.Stun(3)
- M.EyeBlurry(7)
+ update_flags |= M.adjustToxLoss(2, FALSE)
+ update_flags |= M.adjustBrainLoss(1, FALSE)
+ update_flags |= M.Stun(3, FALSE)
+ update_flags |= M.EyeBlurry(7, FALSE)
M.reagents.add_reagent("jagged_crystals", 5)
else if(effect <= 7)
M.emote("faint")
@@ -412,25 +439,26 @@
else if(severity == 2)
if(effect <= 2)
M.visible_message("[M]'s eyes dilate!")
- M.adjustToxLoss(2)
- M.adjustBrainLoss(1)
- M.Stun(3)
- M.EyeBlurry(7)
+ update_flags |= M.adjustToxLoss(2, FALSE)
+ update_flags |= M.adjustBrainLoss(1, FALSE)
+ update_flags |= M.Stun(3, FALSE)
+ update_flags |= M.EyeBlurry(7, FALSE)
M.reagents.add_reagent("jagged_crystals", 5)
else if(effect <= 4)
M.visible_message("[M] convulses violently and falls to the floor!")
M.Jitter(50)
- M.adjustToxLoss(2)
- M.adjustBrainLoss(1)
- M.Weaken(8)
+ update_flags |= M.adjustToxLoss(2, FALSE)
+ update_flags |= M.adjustBrainLoss(1, FALSE)
+ update_flags |= M.Weaken(8, FALSE)
M.emote("gasp")
M.reagents.add_reagent("jagged_crystals", 5)
else if(effect <= 7)
M.emote("scream")
M.visible_message("[M] tears at [M.p_their()] own skin!")
- M.adjustBruteLoss(5)
+ update_flags |= M.adjustBruteLoss(5, FALSE)
M.reagents.add_reagent("jagged_crystals", 5)
M.emote("twitch")
+ return list(effect, update_flags)
/datum/reagent/jenkem
name = "Jenkem"
@@ -442,11 +470,12 @@
taste_message = "puke... or worse"
/datum/reagent/jenkem/on_mob_life(mob/living/M)
+ var/update_flags = STATUS_UPDATE_NONE
M.Dizzy(5)
if(prob(10))
M.emote(pick("twitch_s","drool","moan"))
- M.adjustToxLoss(1)
- ..()
+ update_flags |= M.adjustToxLoss(1, FALSE)
+ return ..() | update_flags
/datum/reagent/aranesp
name = "Aranesp"
@@ -456,9 +485,10 @@
color = "#60A584" // rgb: 96, 165, 132
/datum/reagent/aranesp/on_mob_life(mob/living/M)
- M.adjustStaminaLoss(-40)
+ var/update_flags = STATUS_UPDATE_NONE
+ update_flags |= M.adjustStaminaLoss(-40, FALSE)
if(prob(90))
- M.adjustToxLoss(1)
+ update_flags |= M.adjustToxLoss(1, FALSE)
if(prob(5))
M.emote(pick("twitch", "shake", "tremble","quiver", "twitch_s"))
var/high_message = pick("really buff", "on top of the world","like you're made of steel", "energized", "invigorated", "full of energy")
@@ -466,10 +496,10 @@
to_chat(M, "[high_message]!")
if(prob(5))
to_chat(M, "You cannot breathe!")
- M.adjustOxyLoss(15)
- M.Stun(1)
- M.AdjustLoseBreath(1)
- ..()
+ update_flags |= M.adjustOxyLoss(15, FALSE)
+ update_flags |= M.Stun(1, FALSE)
+ M.AdjustLoseBreath(1, FALSE)
+ return ..() | update_flags
/datum/reagent/thc
name = "Tetrahydrocannabinol"
@@ -489,7 +519,7 @@
if(volume >= 50 && prob(25))
if(prob(10))
M.Drowsy(10)
- ..()
+ return ..()
/datum/reagent/fliptonium
name = "Fliptonium"
@@ -504,6 +534,7 @@
taste_message = "flips"
/datum/reagent/fliptonium/on_mob_life(mob/living/M)
+ var/update_flags = STATUS_UPDATE_NONE
if(current_cycle == 5)
M.SpinAnimation(speed = 11, loops = -1)
if(current_cycle == 10)
@@ -522,12 +553,12 @@
M.SpinAnimation(speed = 4, loops = -1)
M.AdjustDrowsy(-6)
- M.AdjustParalysis(-1.5)
- M.AdjustStunned(-1.5)
- M.AdjustWeakened(-1.5)
- M.adjustStaminaLoss(-1.5)
- M.SetSleeping(0)
- ..()
+ update_flags |= M.AdjustParalysis(-1.5, FALSE)
+ update_flags |= M.AdjustStunned(-1.5, FALSE)
+ update_flags |= M.AdjustWeakened(-1.5, FALSE)
+ update_flags |= M.adjustStaminaLoss(-1.5, FALSE)
+ update_flags |= M.SetSleeping(0, FALSE)
+ return ..() | update_flags
/datum/reagent/fliptonium/reaction_mob(mob/living/M, method=TOUCH, volume)
if(method == INGEST || method == TOUCH)
@@ -538,12 +569,14 @@
M.SpinAnimation(speed = 12, loops = -1)
/datum/reagent/fliptonium/overdose_process(mob/living/M, severity)
- var/effect = ..()
+ var/list/overdose_info = ..()
+ var/effect = overdose_info[REAGENT_OVERDOSE_EFFECT]
+ var/update_flags = overdose_info[REAGENT_OVERDOSE_FLAGS]
if(severity == 1)
if(effect <= 2)
M.visible_message("[M] can't seem to control [M.p_their()] legs!")
M.AdjustConfused(33)
- M.Weaken(2)
+ update_flags |= M.Weaken(2, FALSE)
else if(effect <= 4)
M.visible_message("[M]'s hands flip out and flail everywhere!")
M.drop_l_hand()
@@ -558,9 +591,10 @@
else if(effect <= 4)
M.visible_message("[M] falls to the floor and flails uncontrollably!")
M.Jitter(5)
- M.Weaken(5)
+ update_flags |= M.Weaken(5, FALSE)
else if(effect <= 7)
M.emote("laugh")
+ return list(effect, update_flags)
//////////////////////////////
// Synth-Drugs //
@@ -580,28 +614,32 @@
taste_message = "wiper fluid"
/datum/reagent/lube/ultra/on_mob_life(mob/living/M)
+ var/update_flags = STATUS_UPDATE_NONE
var/high_message = pick("You feel your servos whir!", "You feel like you need to go faster.", "You feel like you were just overclocked!")
if(prob(1))
if(prob(1))
high_message = "0100011101001111010101000101010001000001010001110100111101000110010000010101001101010100!"
if(prob(5))
to_chat(M, "[high_message]")
- M.AdjustParalysis(-2)
- M.AdjustStunned(-2)
- M.AdjustWeakened(-2)
- M.adjustStaminaLoss(-2)
+ update_flags |= M.AdjustParalysis(-2, FALSE)
+ update_flags |= M.AdjustStunned(-2, FALSE)
+ update_flags |= M.AdjustWeakened(-2, FALSE)
+ update_flags |= M.adjustStaminaLoss(-2, FALSE)
M.status_flags |= GOTTAGOFAST_METH
M.Jitter(3)
- M.adjustBrainLoss(0.5)
+ update_flags |= M.adjustBrainLoss(0.5, FALSE)
if(prob(5))
M.emote(pick("twitch", "shiver"))
- ..()
+ return ..() | update_flags
/datum/reagent/lube/ultra/on_mob_delete(mob/living/M)
M.status_flags &= ~GOTTAGOFAST_METH
..()
/datum/reagent/lube/ultra/overdose_process(mob/living/M, severity)
+ var/list/overdose_info = ..()
+ var/effect = overdose_info[REAGENT_OVERDOSE_EFFECT]
+ var/update_flags = overdose_info[REAGENT_OVERDOSE_FLAGS]
if(prob(20))
M.emote("ping")
if(prob(33))
@@ -610,9 +648,9 @@
if(I)
M.drop_item()
if(prob(50))
- M.adjustFireLoss(10)
- M.adjustBrainLoss(pick(0.5, 0.6, 0.7, 0.8, 0.9, 1))
- ..()
+ update_flags |= M.adjustFireLoss(10, FALSE)
+ update_flags |= M.adjustBrainLoss(pick(0.5, 0.6, 0.7, 0.8, 0.9, 1), FALSE)
+ return list(effect, update_flags)
//Surge: Krokodil
/datum/reagent/surge
@@ -629,19 +667,21 @@
/datum/reagent/surge/on_mob_life(mob/living/M)
- M.Druggy(15)
+ var/update_flags = STATUS_UPDATE_NONE
+ update_flags |= M.Druggy(15)
var/high_message = pick("You feel calm.", "You feel collected.", "You feel like you need to relax.")
if(prob(1))
if(prob(1))
high_message = "01010100010100100100000101001110010100110100001101000101010011100100010001000101010011100100001101000101."
if(prob(5))
to_chat(M, "[high_message]")
- ..()
+ return ..() | update_flags
/datum/reagent/surge/overdose_process(mob/living/M, severity)
+ var/update_flags = STATUS_UPDATE_NONE
//Hit them with the same effects as an electrode!
- M.Stun(5)
- M.Weaken(5)
+ update_flags |= M.Stun(5, FALSE)
+ update_flags |= M.Weaken(5, FALSE)
M.Jitter(20)
M.apply_effect(STUTTER, 5)
if(prob(10))
@@ -654,5 +694,6 @@
B.pixel_x = rand(-20, 0)
B.pixel_y = rand(-20, 0)
B.icon = I
- M.adjustFireLoss(rand(1,5)*REAGENTS_EFFECT_MULTIPLIER)
- M.adjustBruteLoss(rand(1,5)*REAGENTS_EFFECT_MULTIPLIER)
+ update_flags |= M.adjustFireLoss(rand(1,5)*REAGENTS_EFFECT_MULTIPLIER, FALSE)
+ update_flags |= M.adjustBruteLoss(rand(1,5)*REAGENTS_EFFECT_MULTIPLIER, FALSE)
+ return list(0, update_flags)
diff --git a/code/modules/reagents/chemistry/reagents/food.dm b/code/modules/reagents/chemistry/reagents/food.dm
index 7426844e292..e42b30dc296 100644
--- a/code/modules/reagents/chemistry/reagents/food.dm
+++ b/code/modules/reagents/chemistry/reagents/food.dm
@@ -14,7 +14,7 @@
var/mob/living/carbon/human/H = M
if(H.can_eat(diet_flags)) //Make sure the species has it's dietflag set, otherwise it can't digest any nutrients
H.nutrition += nutriment_factor // For hunger and fatness
- ..()
+ return ..()
/datum/reagent/consumable/nutriment // Pure nutriment, universally digestable and thus slightly less effective
name = "Nutriment"
@@ -25,16 +25,17 @@
color = "#664330" // rgb: 102, 67, 48
/datum/reagent/consumable/nutriment/on_mob_life(mob/living/M)
+ var/update_flags = STATUS_UPDATE_NONE
if(!(M.mind in ticker.mode.vampires))
if(ishuman(M))
var/mob/living/carbon/human/H = M
if(H.can_eat(diet_flags)) //Make sure the species has it's dietflag set, otherwise it can't digest any nutrients
if(prob(50))
- M.adjustBruteLoss(-1)
+ update_flags |= M.adjustBruteLoss(-1, FALSE)
if(!(NO_BLOOD in H.dna.species.species_traits))//do not restore blood on things with no blood by nature.
if(H.blood_volume < BLOOD_VOLUME_NORMAL)
H.blood_volume += 0.4
- ..()
+ return ..() | update_flags
/datum/reagent/consumable/nutriment/protein // Meat-based protein, digestable by carnivores and omnivores, worthless to herbivores
name = "Protein"
@@ -59,9 +60,10 @@
taste_message = null
/datum/reagent/consumable/vitamin/on_mob_life(mob/living/M)
+ var/update_flags = STATUS_UPDATE_NONE
if(prob(50))
- M.adjustBruteLoss(-1)
- M.adjustFireLoss(-1)
+ update_flags |= M.adjustBruteLoss(-1, FALSE)
+ update_flags |= M.adjustFireLoss(-1, FALSE)
if(M.satiety < 600)
M.satiety += 30
if(ishuman(M))
@@ -69,7 +71,7 @@
if(!(NO_BLOOD in H.dna.species.species_traits))//do not restore blood on things with no blood by nature.
if(H.blood_volume < BLOOD_VOLUME_NORMAL)
H.blood_volume += 0.5
- ..()
+ return ..() | update_flags
/datum/reagent/consumable/sugar
name = "Sugar"
@@ -82,16 +84,17 @@
taste_message = "sweetness"
/datum/reagent/consumable/sugar/on_mob_life(mob/living/M)
+ var/update_flags = STATUS_UPDATE_NONE
M.AdjustDrowsy(-5)
if(current_cycle >= 90)
M.AdjustJitter(2)
if(prob(50))
- M.AdjustParalysis(-1)
- M.AdjustStunned(-1)
- M.AdjustWeakened(-1)
+ update_flags |= M.AdjustParalysis(-1, FALSE)
+ update_flags |= M.AdjustStunned(-1, FALSE)
+ update_flags |= M.AdjustWeakened(-1, FALSE)
if(prob(4))
M.reagents.add_reagent("epinephrine", 1.2)
- ..()
+ return ..() | update_flags
/datum/reagent/consumable/sugar/overdose_start(mob/living/M)
to_chat(M, "You pass out from hyperglycemic shock!")
@@ -99,10 +102,12 @@
..()
/datum/reagent/consumable/sugar/overdose_process(mob/living/M, severity)
- M.Paralyse(3 * severity)
- M.Weaken(4 * severity)
+ var/update_flags = STATUS_UPDATE_NONE
+ update_flags |= M.Paralyse(3 * severity, FALSE)
+ update_flags |= M.Weaken(4 * severity, FALSE)
if(prob(8))
- M.adjustToxLoss(severity)
+ update_flags |= M.adjustToxLoss(severity, FALSE)
+ return list(0, update_flags)
/datum/reagent/consumable/soysauce
name = "Soysauce"
@@ -150,7 +155,7 @@
M.bodytemperature += 20 * TEMPERATURE_DAMAGE_COEFFICIENT
if(isslime(M))
M.bodytemperature += rand(20,25)
- ..()
+ return ..()
/datum/reagent/consumable/condensedcapsaicin
name = "Condensed Capsaicin"
@@ -163,7 +168,7 @@
/datum/reagent/consumable/condensedcapsaicin/on_mob_life(mob/living/M)
if(prob(5))
M.visible_message("[M] [pick("dry heaves!","coughs!","splutters!")]")
- ..()
+ return ..()
/datum/reagent/consumable/condensedcapsaicin/reaction_mob(mob/living/M, method=TOUCH, volume)
if(method == TOUCH)
@@ -253,7 +258,7 @@
M.emote("shiver")
if(isslime(M))
M.bodytemperature -= rand(20,25)
- ..()
+ return ..()
/datum/reagent/consumable/frostoil/reaction_turf(turf/T, volume)
if(volume >= 5)
@@ -270,9 +275,10 @@
taste_message = "salt"
/datum/reagent/consumable/sodiumchloride/overdose_process(mob/living/M, severity)
+ var/update_flags = STATUS_UPDATE_NONE
if(prob(70))
- M.adjustBrainLoss(1)
- ..()
+ update_flags |= M.adjustBrainLoss(1, FALSE)
+ return ..() | update_flags
/datum/reagent/consumable/blackpepper
name = "Black Pepper"
@@ -311,7 +317,7 @@
/datum/reagent/consumable/hot_coco/on_mob_life(mob/living/M)
if(M.bodytemperature < 310)//310 is the normal bodytemp. 310.055
M.bodytemperature = min(310, M.bodytemperature + (5 * TEMPERATURE_DAMAGE_COEFFICIENT))
- ..()
+ return ..()
/datum/reagent/consumable/sprinkles
name = "Sprinkles"
@@ -321,10 +327,11 @@
taste_message = "sweetness"
/datum/reagent/consumable/sprinkles/on_mob_life(mob/living/M)
+ var/update_flags = STATUS_UPDATE_NONE
if(ishuman(M) && M.job in list("Security Officer", "Security Pod Pilot", "Detective", "Warden", "Head of Security", "Brig Physician", "Internal Affairs Agent", "Magistrate"))
- M.adjustBruteLoss(-1)
- M.adjustFireLoss(-1)
- ..()
+ update_flags |= M.adjustBruteLoss(-1, FALSE)
+ update_flags |= M.adjustFireLoss(-1, FALSE)
+ return ..() | update_flags
/datum/reagent/consumable/cornoil
name = "Corn Oil"
@@ -376,7 +383,7 @@
/datum/reagent/consumable/hot_ramen/on_mob_life(mob/living/M)
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"
@@ -389,7 +396,7 @@
/datum/reagent/consumable/hell_ramen/on_mob_life(mob/living/M)
M.bodytemperature += 10 * TEMPERATURE_DAMAGE_COEFFICIENT
- ..()
+ return ..()
/datum/reagent/consumable/flour
name = "flour"
@@ -461,7 +468,7 @@
/datum/reagent/consumable/corn_syrup/on_mob_life(mob/living/M)
M.reagents.add_reagent("sugar", 1.2)
- ..()
+ return ..()
/datum/reagent/consumable/vhfcs
name = "Very-high-fructose corn syrup"
@@ -473,7 +480,7 @@
/datum/reagent/consumable/vhfcs/on_mob_life(mob/living/M)
M.reagents.add_reagent("sugar", 2.4)
- ..()
+ return ..()
/datum/reagent/consumable/honey
name = "Honey"
@@ -485,11 +492,12 @@
taste_message = "sweetness"
/datum/reagent/consumable/honey/on_mob_life(mob/living/M)
+ var/update_flags = STATUS_UPDATE_NONE
M.reagents.add_reagent("sugar", 3)
if(prob(20))
- M.adjustBruteLoss(-3)
- M.adjustFireLoss(-1)
- ..()
+ update_flags |= M.adjustBruteLoss(-3, FALSE)
+ update_flags |= M.adjustFireLoss(-1, FALSE)
+ return ..() | update_flags
/datum/reagent/consumable/onion
name = "Concentrated Onion Juice"
@@ -524,7 +532,7 @@
/datum/reagent/consumable/chocolate/on_mob_life(mob/living/M)
M.reagents.add_reagent("sugar", 0.8)
- ..()
+ return ..()
/datum/reagent/consumable/chocolate/reaction_turf(turf/T, volume)
if(volume >= 5 && !isspaceturf(T))
@@ -539,13 +547,14 @@
taste_message = "tea"
/datum/reagent/consumable/mugwort/on_mob_life(mob/living/M)
+ var/update_flags = STATUS_UPDATE_NONE
if(ishuman(M) && M.mind)
if(M.mind.special_role == SPECIAL_ROLE_WIZARD)
- M.adjustToxLoss(-1*REAGENTS_EFFECT_MULTIPLIER)
- M.adjustOxyLoss(-1*REAGENTS_EFFECT_MULTIPLIER)
- M.adjustBruteLoss(-1*REAGENTS_EFFECT_MULTIPLIER)
- M.adjustFireLoss(-1*REAGENTS_EFFECT_MULTIPLIER)
- ..()
+ update_flags |= M.adjustToxLoss(-1*REAGENTS_EFFECT_MULTIPLIER, FALSE)
+ update_flags |= M.adjustOxyLoss(-1*REAGENTS_EFFECT_MULTIPLIER, FALSE)
+ update_flags |= M.adjustBruteLoss(-1*REAGENTS_EFFECT_MULTIPLIER, FALSE)
+ update_flags |= M.adjustFireLoss(-1*REAGENTS_EFFECT_MULTIPLIER, FALSE)
+ return ..() | update_flags
/datum/reagent/consumable/porktonium
name = "Porktonium"
@@ -563,6 +572,7 @@
if(prob(8))
M.reagents.add_reagent("radium", 15)
M.reagents.add_reagent("cyanide", 10)
+ return list(0, STATUS_UPDATE_NONE)
/datum/reagent/consumable/chicken_soup
name = "Chicken soup"
@@ -585,7 +595,7 @@
/datum/reagent/consumable/cheese/on_mob_life(mob/living/M)
if(prob(3))
M.reagents.add_reagent("cholesterol", rand(1,2))
- ..()
+ return ..()
/datum/reagent/consumable/cheese/reaction_turf(turf/T, volume)
if(volume >= 5 && !isspaceturf(T))
@@ -601,9 +611,11 @@
taste_message = "cheese?"
/datum/reagent/consumable/fake_cheese/overdose_process(mob/living/M, severity)
+ var/update_flags = STATUS_UPDATE_NONE
if(prob(8))
to_chat(M, "You feel something squirming in your stomach. Your thoughts turn to cheese and you begin to sweat.")
- M.adjustToxLoss(rand(1,2))
+ update_flags |= M.adjustToxLoss(rand(1,2), FALSE)
+ return list(0, update_flags)
/datum/reagent/consumable/weird_cheese
name = "Weird cheese"
@@ -617,7 +629,7 @@
/datum/reagent/consumable/weird_cheese/on_mob_life(mob/living/M)
if(prob(5))
M.reagents.add_reagent("cholesterol", rand(1,3))
- ..()
+ return ..()
/datum/reagent/consumable/weird_cheese/reaction_turf(turf/T, volume)
if(volume >= 5 && !isspaceturf(T))
@@ -634,7 +646,7 @@
/datum/reagent/consumable/beans/on_mob_life(mob/living/M)
if(prob(10))
M.emote("fart")
- ..()
+ return ..()
/datum/reagent/consumable/bread
name = "Bread"
@@ -657,7 +669,7 @@
M.reagents.add_reagent("cholesterol", rand(1,3))
if(prob(8))
M.reagents.add_reagent("porktonium", 5)
- ..()
+ return ..()
/datum/reagent/consumable/hydrogenated_soybeanoil
name = "Partially hydrogenated space-soybean oil"
@@ -678,19 +690,21 @@
metabolization_rate = 0.4
else
metabolization_rate = 0.2
- ..()
+ return ..()
/datum/reagent/consumable/hydrogenated_soybeanoil/overdose_process(mob/living/M, severity)
+ var/update_flags = STATUS_UPDATE_NONE
if(prob(33))
to_chat(M, "You feel horribly weak.")
if(prob(10))
to_chat(M, "You cannot breathe!")
- M.adjustOxyLoss(5)
+ update_flags |= M.adjustOxyLoss(5, FALSE)
if(prob(5))
to_chat(M, "You feel a sharp pain in your chest!")
- M.adjustOxyLoss(25)
- M.Stun(5)
- M.Paralyse(10)
+ update_flags |= M.adjustOxyLoss(25, FALSE)
+ update_flags |= M.Stun(5, FALSE)
+ update_flags |= M.Paralyse(10, FALSE)
+ return list(0, update_flags)
/datum/reagent/consumable/meatslurry
name = "Meat Slurry"
@@ -703,7 +717,7 @@
/datum/reagent/consumable/meatslurry/on_mob_life(mob/living/M)
if(prob(4))
M.reagents.add_reagent("cholesterol", rand(1,3))
- ..()
+ return ..()
/datum/reagent/consumable/meatslurry/reaction_turf(turf/T, volume)
if(prob(10) && volume >= 5 && !isspaceturf(T))
@@ -742,7 +756,7 @@
else if(prob(6))
to_chat(M, "[pick("You feel ill.","Your stomach churns.","You feel queasy.","You feel sick.")]")
M.emote(pick("groan","moan"))
- ..()
+ return ..()
/datum/reagent/consumable/pepperoni
name = "Pepperoni"
@@ -786,8 +800,9 @@
/datum/reagent/questionmark/reaction_mob(mob/living/M, method=TOUCH, volume)
if(method == INGEST)
- M.Stun(2)
- M.Weaken(2)
+ M.Stun(2, FALSE)
+ M.Weaken(2, FALSE)
+ M.update_canmove()
to_chat(M, "Ugh! Eating that was a terrible idea!")
M.ForceContractDisease(new /datum/disease/food_poisoning(0))
@@ -801,13 +816,14 @@
taste_message = "excellent cuisine"
/datum/reagent/msg/on_mob_life(mob/living/M)
+ var/update_flags = STATUS_UPDATE_NONE
if(prob(5))
if(prob(10))
- M.adjustToxLoss(rand(2.4))
+ update_flags |= M.adjustToxLoss(rand(2.4), FALSE)
if(prob(7))
to_chat(M, "A horrible migraine overpowers you.")
- M.Stun(rand(2,5))
- ..()
+ update_flags |= M.Stun(rand(2,5), FALSE)
+ return ..() | update_flags
/datum/reagent/cholesterol
name = "cholesterol"
@@ -818,22 +834,23 @@
taste_message = "heart attack"
/datum/reagent/cholesterol/on_mob_life(mob/living/M)
+ var/update_flags = STATUS_UPDATE_NONE
if(volume >= 25 && prob(volume*0.15))
to_chat(M, "Your chest feels [pick("weird","uncomfortable","nasty","gross","odd","unusual","warm")]!")
- M.adjustToxLoss(rand(1,2))
+ update_flags |= M.adjustToxLoss(rand(1,2), FALSE)
else if(volume >= 45 && prob(volume*0.08))
to_chat(M, "Your chest [pick("hurts","stings","aches","burns")]!")
- M.adjustToxLoss(rand(2,4))
- M.Stun(1)
+ update_flags |= M.adjustToxLoss(rand(2,4), FALSE)
+ update_flags |= M.Stun(1, FALSE)
else if(volume >= 150 && prob(volume*0.01))
to_chat(M, "Your chest is burning with pain!")
- M.Stun(1)
- M.Weaken(1)
+ update_flags |= M.Stun(1, FALSE)
+ update_flags |= M.Weaken(1, FALSE)
if(ishuman(M))
var/mob/living/carbon/human/H = M
if(!H.undergoing_cardiac_arrest())
H.set_heartattack(TRUE)
- ..()
+ return ..() | update_flags
/datum/reagent/fungus
name = "Space fungus"
@@ -868,7 +885,7 @@
var/spooky_message = pick("You notice something moving out of the corner of your eye, but nothing is there...", "Your eyes twitch, you feel like something you can't see is here...", "You've got the heebie-jeebies.", "You feel uneasy.", "You shudder as if cold...", "You feel something gliding across your back...")
if(prob(8))
to_chat(M, "[spooky_message]")
- ..()
+ return ..()
/datum/reagent/ectoplasm/reaction_mob(mob/living/M, method=TOUCH, volume)
if(method == INGEST)
@@ -879,12 +896,12 @@
if(volume >= 10 && !isspaceturf(T))
new /obj/item/reagent_containers/food/snacks/ectoplasm(T)
-///Vomit///
-
/datum/reagent/consumable/bread/reaction_turf(turf/T, volume)
if(volume >= 5 && !isspaceturf(T))
new /obj/item/reagent_containers/food/snacks/breadslice(T)
+ ///Vomit///
+
/datum/reagent/vomit
name = "Vomit"
id = "vomit"
@@ -921,15 +938,16 @@
taste_message = "mold"
/datum/reagent/consumable/entpoly/on_mob_life(mob/living/M)
+ var/update_flags = STATUS_UPDATE_NONE
if(current_cycle >= 10)
- M.Paralyse(2)
+ update_flags |= M.Paralyse(2, FALSE)
if(prob(20))
- M.LoseBreath(4)
- M.adjustBrainLoss(2 * REAGENTS_EFFECT_MULTIPLIER)
- M.adjustToxLoss(3 * REAGENTS_EFFECT_MULTIPLIER)
- M.adjustStaminaLoss(10 * REAGENTS_EFFECT_MULTIPLIER)
- M.EyeBlurry(5)
- ..()
+ update_flags |= M.LoseBreath(4, FALSE)
+ update_flags |= M.adjustBrainLoss(2 * REAGENTS_EFFECT_MULTIPLIER, FALSE)
+ update_flags |= M.adjustToxLoss(3 * REAGENTS_EFFECT_MULTIPLIER, FALSE)
+ update_flags |= M.adjustStaminaLoss(10 * REAGENTS_EFFECT_MULTIPLIER, FALSE)
+ update_flags |= M.EyeBlurry(5, FALSE)
+ return ..() | update_flags
/datum/reagent/consumable/tinlux
name = "Tinea Luxor"
@@ -943,7 +961,7 @@
if(!light_activated)
M.set_light(2)
light_activated = 1
- ..()
+ return ..()
/datum/reagent/consumable/tinlux/on_mob_delete(mob/living/M)
M.set_light(0)
@@ -957,7 +975,8 @@
taste_message = "sweetness"
/datum/reagent/consumable/vitfro/on_mob_life(mob/living/M)
+ var/update_flags = STATUS_UPDATE_NONE
if(prob(80))
- M.adjustBruteLoss(-1 * REAGENTS_EFFECT_MULTIPLIER)
- M.adjustFireLoss(-1 * REAGENTS_EFFECT_MULTIPLIER)
- ..()
+ update_flags |= M.adjustBruteLoss(-1 * REAGENTS_EFFECT_MULTIPLIER, FALSE)
+ update_flags |= M.adjustFireLoss(-1 * REAGENTS_EFFECT_MULTIPLIER, FALSE)
+ return ..() | update_flags
diff --git a/code/modules/reagents/chemistry/reagents/medicine.dm b/code/modules/reagents/chemistry/reagents/medicine.dm
index f603d5eb0d1..bc6f8f66317 100644
--- a/code/modules/reagents/chemistry/reagents/medicine.dm
+++ b/code/modules/reagents/chemistry/reagents/medicine.dm
@@ -20,7 +20,7 @@
var/mob/living/carbon/human/H = M
if(H.traumatic_shock < 100)
H.shock_stage = 0
- ..()
+ return ..()
/datum/reagent/medicine/sterilizine
name = "Sterilizine"
@@ -49,17 +49,20 @@
overdose_threshold = 40
/datum/reagent/medicine/synaptizine/on_mob_life(mob/living/M)
+ var/update_flags = STATUS_UPDATE_NONE
M.AdjustDrowsy(-5)
- M.AdjustParalysis(-1)
- M.AdjustStunned(-1)
- M.AdjustWeakened(-1)
- M.SetSleeping(0)
+ update_flags |= M.AdjustParalysis(-1, FALSE)
+ update_flags |= M.AdjustStunned(-1, FALSE)
+ update_flags |= M.AdjustWeakened(-1, FALSE)
+ update_flags |= M.SetSleeping(0, FALSE)
if(prob(50))
- M.adjustBrainLoss(-1.0)
- ..()
+ update_flags |= M.adjustBrainLoss(-1, FALSE)
+ return ..() | update_flags
/datum/reagent/medicine/synaptizine/overdose_process(mob/living/M, severity)
- var/effect = ..()
+ var/list/overdose_info = ..()
+ var/effect = overdose_info[REAGENT_OVERDOSE_EFFECT]
+ var/update_flags = overdose_info[REAGENT_OVERDOSE_FLAGS]
if(severity == 1)
if(effect <= 1)
M.visible_message("[M] suddenly and violently vomits!")
@@ -67,7 +70,7 @@
else if(effect <= 3)
M.emote(pick("groan","moan"))
if(effect <= 8)
- M.adjustToxLoss(1)
+ update_flags |= M.adjustToxLoss(1, FALSE)
else if(severity == 2)
if(effect <= 2)
M.visible_message("[M] suddenly and violently vomits!")
@@ -75,9 +78,10 @@
else if(effect <= 5)
M.visible_message("[M] staggers and drools, [M.p_their()] eyes bloodshot!")
M.Dizzy(8)
- M.Weaken(4)
+ update_flags |= M.Weaken(4, FALSE)
if(effect <= 15)
- M.adjustToxLoss(1)
+ update_flags |= M.adjustToxLoss(1, FALSE)
+ return list(effect, update_flags)
/datum/reagent/medicine/mitocholide
name = "Mitocholide"
@@ -93,7 +97,7 @@
//Mitocholide is hard enough to get, it's probably fair to make this all internal organs
for(var/obj/item/organ/internal/I in H.internal_organs)
I.heal_internal_damage(0.4)
- ..()
+ return ..()
/datum/reagent/medicine/mitocholide/reaction_obj(obj/O, volume)
if(istype(O, /obj/item/organ))
@@ -110,18 +114,19 @@
heart_rate_decrease = 1
/datum/reagent/medicine/cryoxadone/on_mob_life(mob/living/M)
+ var/update_flags = STATUS_UPDATE_NONE
if(M.bodytemperature < 265)
- M.adjustCloneLoss(-4)
- M.adjustOxyLoss(-10)
- M.adjustToxLoss(-3)
- M.adjustBruteLoss(-12)
- M.adjustFireLoss(-12)
+ update_flags |= M.adjustCloneLoss(-4, FALSE)
+ update_flags |= M.adjustOxyLoss(-10, FALSE)
+ update_flags |= M.adjustToxLoss(-3, FALSE)
+ update_flags |= M.adjustBruteLoss(-12, FALSE)
+ update_flags |= M.adjustFireLoss(-12, FALSE)
if(ishuman(M))
var/mob/living/carbon/human/H = M
var/obj/item/organ/external/head/head = H.get_organ("head")
if(head)
head.disfigured = FALSE
- ..()
+ return ..() | update_flags
/datum/reagent/medicine/rezadone
name = "Rezadone"
@@ -132,21 +137,24 @@
overdose_threshold = 30
/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.adjustCloneLoss(-1) //What? We just set cloneloss to 0. Why? Simple; this is so external organs properly unmutate.
- M.adjustBruteLoss(-1)
- M.adjustFireLoss(-1)
+ var/update_flags = STATUS_UPDATE_NONE
+ update_flags |= M.setCloneLoss(0, FALSE) //Rezadone is almost never used in favor of cryoxadone. Hopefully this will change that.
+ update_flags |= M.adjustCloneLoss(-1, FALSE) //What? We just set cloneloss to 0. Why? Simple; this is so external organs properly unmutate. // why don't you fix the code instead
+ update_flags |= M.adjustBruteLoss(-1, FALSE)
+ update_flags |= M.adjustFireLoss(-1, FALSE)
if(ishuman(M))
var/mob/living/carbon/human/H = M
var/obj/item/organ/external/head/head = H.get_organ("head")
if(head)
head.disfigured = FALSE
- ..()
+ return ..() | update_flags
/datum/reagent/medicine/rezadone/overdose_process(mob/living/M, severity)
- M.adjustToxLoss(1)
+ var/update_flags = STATUS_UPDATE_NONE
+ update_flags |= M.adjustToxLoss(1, FALSE)
M.Dizzy(5)
M.Jitter(5)
+ return list(0, update_flags)
/datum/reagent/medicine/spaceacillin
name = "Spaceacillin"
@@ -165,8 +173,9 @@
metabolization_rate = 3
/datum/reagent/medicine/silver_sulfadiazine/on_mob_life(mob/living/M)
- M.adjustFireLoss(-2*REAGENTS_EFFECT_MULTIPLIER)
- ..()
+ var/update_flags = STATUS_UPDATE_NONE
+ update_flags |= M.adjustFireLoss(-2*REAGENTS_EFFECT_MULTIPLIER, FALSE)
+ return ..() | update_flags
/datum/reagent/medicine/silver_sulfadiazine/reaction_mob(mob/living/M, method=TOUCH, volume, show_message = 1)
if(iscarbon(M))
@@ -189,8 +198,9 @@
metabolization_rate = 3
/datum/reagent/medicine/styptic_powder/on_mob_life(mob/living/M)
- M.adjustBruteLoss(-2*REAGENTS_EFFECT_MULTIPLIER)
- ..()
+ var/update_flags = STATUS_UPDATE_NONE
+ update_flags |= M.adjustBruteLoss(-2*REAGENTS_EFFECT_MULTIPLIER, FALSE)
+ return ..() | update_flags
/datum/reagent/medicine/styptic_powder/reaction_mob(mob/living/M, method=TOUCH, volume, show_message = 1)
if(iscarbon(M))
@@ -216,15 +226,16 @@
taste_message = "salt"
/datum/reagent/medicine/salglu_solution/on_mob_life(mob/living/M)
+ var/update_flags = STATUS_UPDATE_NONE
if(prob(33))
- M.adjustBruteLoss(-2*REAGENTS_EFFECT_MULTIPLIER)
- M.adjustFireLoss(-2*REAGENTS_EFFECT_MULTIPLIER)
+ update_flags |= M.adjustBruteLoss(-2*REAGENTS_EFFECT_MULTIPLIER, FALSE)
+ update_flags |= M.adjustFireLoss(-2*REAGENTS_EFFECT_MULTIPLIER, FALSE)
if(ishuman(M) && prob(33))
var/mob/living/carbon/human/H = M
if(!(NO_BLOOD in H.dna.species.species_traits))//do not restore blood on things with no blood by nature.
if(H.blood_volume < BLOOD_VOLUME_NORMAL)
H.blood_volume += 1
- ..()
+ return ..() | update_flags
/datum/reagent/medicine/synthflesh
name = "Synthflesh"
@@ -255,12 +266,13 @@
color = "#000000"
/datum/reagent/medicine/charcoal/on_mob_life(mob/living/M)
- M.adjustToxLoss(-1.5*REAGENTS_EFFECT_MULTIPLIER)
+ var/update_flags = STATUS_UPDATE_NONE
+ update_flags |= M.adjustToxLoss(-1.5*REAGENTS_EFFECT_MULTIPLIER, FALSE)
if(prob(50))
for(var/datum/reagent/R in M.reagents.reagent_list)
if(R != src)
M.reagents.remove_reagent(R.id,1)
- ..()
+ return ..() | update_flags
/datum/reagent/medicine/omnizine
name = "Omnizine"
@@ -273,30 +285,33 @@
addiction_chance = 5
/datum/reagent/medicine/omnizine/on_mob_life(mob/living/M)
- M.adjustToxLoss(-1*REAGENTS_EFFECT_MULTIPLIER)
- M.adjustOxyLoss(-1*REAGENTS_EFFECT_MULTIPLIER)
- M.adjustBruteLoss(-2*REAGENTS_EFFECT_MULTIPLIER)
- M.adjustFireLoss(-2*REAGENTS_EFFECT_MULTIPLIER)
+ var/update_flags = STATUS_UPDATE_NONE
+ update_flags |= M.adjustToxLoss(-1*REAGENTS_EFFECT_MULTIPLIER, FALSE)
+ update_flags |= M.adjustOxyLoss(-1*REAGENTS_EFFECT_MULTIPLIER, FALSE)
+ update_flags |= M.adjustBruteLoss(-2*REAGENTS_EFFECT_MULTIPLIER, FALSE)
+ update_flags |= M.adjustFireLoss(-2*REAGENTS_EFFECT_MULTIPLIER, FALSE)
if(prob(50))
M.AdjustLoseBreath(-1)
- ..()
+ return ..() | update_flags
/datum/reagent/medicine/omnizine/overdose_process(mob/living/M, severity)
- var/effect = ..()
+ var/list/overdose_info = ..()
+ var/effect = overdose_info[REAGENT_OVERDOSE_EFFECT]
+ var/update_flags = overdose_info[REAGENT_OVERDOSE_FLAGS]
if(severity == 1) //lesser
- M.stuttering += 1
+ M.AdjustStuttering(1)
if(effect <= 1)
M.visible_message("[M] suddenly cluches [M.p_their()] gut!")
M.emote("scream")
- M.Stun(4)
- M.Weaken(4)
+ update_flags |= M.Stun(4, FALSE)
+ update_flags |= M.Weaken(4, FALSE)
else if(effect <= 3)
M.visible_message("[M] completely spaces out for a moment.")
M.AdjustConfused(15)
else if(effect <= 5)
M.visible_message("[M] stumbles and staggers.")
M.Dizzy(5)
- M.Weaken(3)
+ update_flags |= M.Weaken(3, FALSE)
else if(effect <= 7)
M.visible_message("[M] shakes uncontrollably.")
M.Jitter(30)
@@ -304,16 +319,17 @@
if(effect <= 2)
M.visible_message("[M] suddenly cluches [M.p_their()] gut!")
M.emote("scream")
- M.Stun(7)
- M.Weaken(7)
+ update_flags |= M.Stun(7, FALSE)
+ update_flags |= M.Weaken(7, FALSE)
else if(effect <= 5)
M.visible_message("[M] jerks bolt upright, then collapses!")
- M.Paralyse(5)
- M.Weaken(4)
+ update_flags |= M.Paralyse(5, FALSE)
+ update_flags |= M.Weaken(4, FALSE)
else if(effect <= 8)
M.visible_message("[M] stumbles and staggers.")
M.Dizzy(5)
- M.Weaken(3)
+ update_flags |= M.Weaken(3, FALSE)
+ return list(effect, update_flags)
/datum/reagent/medicine/calomel
name = "Calomel"
@@ -324,14 +340,15 @@
metabolization_rate = 0.8
/datum/reagent/medicine/calomel/on_mob_life(mob/living/M)
+ var/update_flags = STATUS_UPDATE_NONE
for(var/datum/reagent/R in M.reagents.reagent_list)
if(R != src)
M.reagents.remove_reagent(R.id,5)
if(M.health > 20)
- M.adjustToxLoss(5*REAGENTS_EFFECT_MULTIPLIER)
+ update_flags |= M.adjustToxLoss(5*REAGENTS_EFFECT_MULTIPLIER, FALSE)
if(prob(6))
M.fakevomit()
- ..()
+ return ..() | update_flags
/datum/reagent/medicine/potass_iodide
name = "Potassium Iodide"
@@ -343,7 +360,7 @@
/datum/reagent/medicine/potass_iodide/on_mob_life(mob/living/M)
if(prob(80))
M.radiation = max(0, M.radiation-1)
- ..()
+ return ..()
/datum/reagent/medicine/pen_acid
name = "Pentetic Acid"
@@ -353,16 +370,17 @@
color = "#C8A5DC"
/datum/reagent/medicine/pen_acid/on_mob_life(mob/living/M)
+ var/update_flags = STATUS_UPDATE_NONE
for(var/datum/reagent/R in M.reagents.reagent_list)
if(R != src)
M.reagents.remove_reagent(R.id,4)
M.radiation = max(0, M.radiation-7)
if(prob(75))
- M.adjustToxLoss(-4*REAGENTS_EFFECT_MULTIPLIER)
+ update_flags |= M.adjustToxLoss(-4*REAGENTS_EFFECT_MULTIPLIER, FALSE)
if(prob(33))
- M.adjustBruteLoss(1*REAGENTS_EFFECT_MULTIPLIER)
- M.adjustFireLoss(1*REAGENTS_EFFECT_MULTIPLIER)
- ..()
+ update_flags |= M.adjustBruteLoss(1*REAGENTS_EFFECT_MULTIPLIER, FALSE)
+ update_flags |= M.adjustFireLoss(1*REAGENTS_EFFECT_MULTIPLIER, FALSE)
+ return ..() | update_flags
/datum/reagent/medicine/sal_acid
name = "Salicylic Acid"
@@ -375,13 +393,14 @@
overdose_threshold = 25
/datum/reagent/medicine/sal_acid/on_mob_life(mob/living/M)
+ var/update_flags = STATUS_UPDATE_NONE
if(prob(55))
- M.adjustBruteLoss(-2*REAGENTS_EFFECT_MULTIPLIER)
+ update_flags |= M.adjustBruteLoss(-2*REAGENTS_EFFECT_MULTIPLIER, FALSE)
if(ishuman(M))
var/mob/living/carbon/human/H = M
if(H.traumatic_shock < 100)
H.shock_stage = 0
- ..()
+ return ..() | update_flags
/datum/reagent/medicine/salbutamol
name = "Salbutamol"
@@ -392,9 +411,10 @@
metabolization_rate = 0.2
/datum/reagent/medicine/salbutamol/on_mob_life(mob/living/M)
- M.adjustOxyLoss(-6*REAGENTS_EFFECT_MULTIPLIER)
+ var/update_flags = STATUS_UPDATE_NONE
+ update_flags |= M.adjustOxyLoss(-6*REAGENTS_EFFECT_MULTIPLIER, FALSE)
M.AdjustLoseBreath(-4)
- ..()
+ return ..() | update_flags
/datum/reagent/medicine/perfluorodecalin
name = "Perfluorodecalin"
@@ -406,14 +426,15 @@
addiction_chance = 20
/datum/reagent/medicine/perfluorodecalin/on_mob_life(mob/living/carbon/human/M)
- M.adjustOxyLoss(-25*REAGENTS_EFFECT_MULTIPLIER)
+ var/update_flags = STATUS_UPDATE_NONE
+ update_flags |= M.adjustOxyLoss(-25*REAGENTS_EFFECT_MULTIPLIER, FALSE)
if(volume >= 4)
M.LoseBreath(6)
M.Silence(6)
if(prob(33))
- M.adjustBruteLoss(-1*REAGENTS_EFFECT_MULTIPLIER)
- M.adjustFireLoss(-1*REAGENTS_EFFECT_MULTIPLIER)
- ..()
+ update_flags |= M.adjustBruteLoss(-1*REAGENTS_EFFECT_MULTIPLIER, FALSE)
+ update_flags |= M.adjustFireLoss(-1*REAGENTS_EFFECT_MULTIPLIER, FALSE)
+ return ..() | update_flags
/datum/reagent/medicine/ephedrine
name = "Ephedrine"
@@ -426,22 +447,25 @@
addiction_chance = 25
/datum/reagent/medicine/ephedrine/on_mob_life(mob/living/M)
+ var/update_flags = STATUS_UPDATE_NONE
M.AdjustDrowsy(-5)
- M.AdjustParalysis(-1)
- M.AdjustStunned(-1)
- M.AdjustWeakened(-1)
- M.adjustStaminaLoss(-1*REAGENTS_EFFECT_MULTIPLIER)
+ update_flags |= M.AdjustParalysis(-1, FALSE)
+ update_flags |= M.AdjustStunned(-1, FALSE)
+ update_flags |= M.AdjustWeakened(-1, FALSE)
+ update_flags |= M.adjustStaminaLoss(-1*REAGENTS_EFFECT_MULTIPLIER, FALSE)
M.AdjustLoseBreath(-1, bound_lower = 5)
if(M.oxyloss > 75)
- M.adjustOxyLoss(-1)
+ update_flags |= M.adjustOxyLoss(-1, FALSE)
if(M.health < 0 || M.health > 0 && prob(33))
- M.adjustToxLoss(-1)
- M.adjustBruteLoss(-1)
- M.adjustFireLoss(-1)
- ..()
+ update_flags |= M.adjustToxLoss(-1, FALSE)
+ update_flags |= M.adjustBruteLoss(-1, FALSE)
+ update_flags |= M.adjustFireLoss(-1, FALSE)
+ return ..() | update_flags
/datum/reagent/medicine/ephedrine/overdose_process(mob/living/M, severity)
- var/effect = ..()
+ var/list/overdose_info = ..()
+ var/effect = overdose_info[REAGENT_OVERDOSE_EFFECT]
+ var/update_flags = overdose_info[REAGENT_OVERDOSE_FLAGS]
if(severity == 1)
if(effect <= 1)
M.visible_message("[M] suddenly and violently vomits!")
@@ -457,9 +481,10 @@
else if(effect <= 5)
M.visible_message("[M.name] staggers and drools, [M.p_their()] eyes bloodshot!")
M.Dizzy(2)
- M.Weaken(3)
+ update_flags |= M.Weaken(3, FALSE)
if(effect <= 15)
M.emote("collapse")
+ return list(effect, update_flags)
/datum/reagent/medicine/diphenhydramine
name = "Diphenhydramine"
@@ -476,10 +501,10 @@
if(prob(7))
M.emote("yawn")
if(prob(3))
- M.Stun(2)
+
M.AdjustDrowsy(1)
M.visible_message("[M] looks a bit dazed.")
- ..()
+ return ..()
/datum/reagent/medicine/morphine
name = "Morphine"
@@ -516,19 +541,20 @@
color = "#C8A5DC"
/datum/reagent/medicine/oculine/on_mob_life(mob/living/M)
+ var/update_flags = STATUS_UPDATE_NONE
if(prob(80))
if(ishuman(M))
var/mob/living/carbon/human/H = M
var/obj/item/organ/internal/eyes/E = H.get_int_organ(/obj/item/organ/internal/eyes)
if(istype(E))
E.heal_internal_damage(1)
- M.AdjustEyeBlurry(-1)
- M.AdjustEarDamage(-1)
+ update_flags |= M.AdjustEyeBlurry(-1, FALSE)
+ update_flags |= M.AdjustEarDamage(-1, FALSE)
if(prob(50))
- M.CureNearsighted()
+ update_flags |= M.CureNearsighted(FALSE)
if(prob(30))
- M.CureBlind()
- M.SetEyeBlind(0)
+ update_flags |= M.CureBlind(FALSE)
+ update_flags |= M.SetEyeBlind(0, FALSE)
if(M.ear_damage <= 25)
if(prob(30))
M.SetEarDeaf(0)
@@ -544,21 +570,22 @@
overdose_threshold = 25
/datum/reagent/medicine/atropine/on_mob_life(mob/living/M)
+ var/update_flags = STATUS_UPDATE_NONE
M.AdjustDizzy(1)
M.Confused(5)
if(prob(4))
M.emote("collapse")
M.AdjustLoseBreath(-5, bound_lower = 5)
if(M.oxyloss > 65)
- M.adjustOxyLoss(-10*REAGENTS_EFFECT_MULTIPLIER)
+ update_flags |= M.adjustOxyLoss(-10*REAGENTS_EFFECT_MULTIPLIER, FALSE)
if(M.health < -25)
- M.adjustToxLoss(-1)
- M.adjustBruteLoss(-3*REAGENTS_EFFECT_MULTIPLIER)
- M.adjustFireLoss(-3*REAGENTS_EFFECT_MULTIPLIER)
+ update_flags |= M.adjustToxLoss(-1, FALSE)
+ update_flags |= M.adjustBruteLoss(-3*REAGENTS_EFFECT_MULTIPLIER, FALSE)
+ update_flags |= M.adjustFireLoss(-3*REAGENTS_EFFECT_MULTIPLIER, FALSE)
else if(M.health > -60)
- M.adjustToxLoss(1)
+ update_flags |= M.adjustToxLoss(1, FALSE)
M.reagents.remove_reagent("sarin", 20)
- ..()
+ return ..() | update_flags
/datum/reagent/medicine/epinephrine
name = "Epinephrine"
@@ -570,29 +597,32 @@
overdose_threshold = 20
/datum/reagent/medicine/epinephrine/on_mob_life(mob/living/M)
+ var/update_flags = STATUS_UPDATE_NONE
M.AdjustDrowsy(-5)
if(prob(20))
- M.AdjustParalysis(-1)
+ update_flags |= M.AdjustParalysis(-1, FALSE)
if(prob(20))
- M.AdjustStunned(-1)
+ update_flags |= M.AdjustStunned(-1, FALSE)
if(prob(20))
- M.AdjustWeakened(-1)
+ update_flags |= M.AdjustWeakened(-1, FALSE)
if(prob(5))
- M.SetSleeping(0)
+ update_flags |= M.SetSleeping(0, FALSE)
if(prob(5))
- M.adjustBrainLoss(-1)
+ update_flags |= M.adjustBrainLoss(-1, FALSE)
holder.remove_reagent("histamine", 15)
M.AdjustLoseBreath(-1, bound_lower = 3)
if(M.oxyloss > 35)
- M.adjustOxyLoss(-10*REAGENTS_EFFECT_MULTIPLIER)
+ update_flags |= M.adjustOxyLoss(-10*REAGENTS_EFFECT_MULTIPLIER, FALSE)
if(M.health < -10 && M.health > -65)
- M.adjustToxLoss(-1*REAGENTS_EFFECT_MULTIPLIER)
- M.adjustBruteLoss(-1*REAGENTS_EFFECT_MULTIPLIER)
- M.adjustFireLoss(-1*REAGENTS_EFFECT_MULTIPLIER)
- ..()
+ update_flags |= M.adjustToxLoss(-1*REAGENTS_EFFECT_MULTIPLIER, FALSE)
+ update_flags |= M.adjustBruteLoss(-1*REAGENTS_EFFECT_MULTIPLIER, FALSE)
+ update_flags |= M.adjustFireLoss(-1*REAGENTS_EFFECT_MULTIPLIER, FALSE)
+ return ..() | update_flags
/datum/reagent/medicine/epinephrine/overdose_process(mob/living/M, severity)
- var/effect = ..()
+ var/list/overdose_info = ..()
+ var/effect = overdose_info[REAGENT_OVERDOSE_EFFECT]
+ var/update_flags = overdose_info[REAGENT_OVERDOSE_FLAGS]
if(severity == 1)
if(effect <= 1)
M.visible_message("[M] suddenly and violently vomits!")
@@ -608,7 +638,7 @@
else if(effect <= 5)
M.visible_message("[M] staggers and drools, [M.p_their()] eyes bloodshot!")
M.Dizzy(2)
- M.Weaken(3)
+ update_flags |= M.Weaken(3, FALSE)
if(effect <= 15)
M.emote("collapse")
@@ -621,10 +651,11 @@
metabolization_rate = 0.2
/datum/reagent/medicine/strange_reagent/on_mob_life(mob/living/M)
+ var/update_flags = STATUS_UPDATE_NONE
if(prob(10))
- M.adjustBruteLoss(2*REAGENTS_EFFECT_MULTIPLIER)
- M.adjustToxLoss(2*REAGENTS_EFFECT_MULTIPLIER)
- ..()
+ update_flags |= M.adjustBruteLoss(2*REAGENTS_EFFECT_MULTIPLIER, FALSE)
+ update_flags |= M.adjustToxLoss(2*REAGENTS_EFFECT_MULTIPLIER, FALSE)
+ return ..() | update_flags
/datum/reagent/medicine/strange_reagent/reaction_mob(mob/living/M, method=TOUCH, volume)
if(volume < 1)
@@ -685,8 +716,9 @@
color = "#D1D1F1"
/datum/reagent/medicine/mannitol/on_mob_life(mob/living/M)
- M.adjustBrainLoss(-3)
- ..()
+ var/update_flags = STATUS_UPDATE_NONE
+ update_flags |= M.adjustBrainLoss(-3, FALSE)
+ return ..() | update_flags
/datum/reagent/medicine/mutadone
name = "Mutadone"
@@ -722,12 +754,13 @@
color = "#009CA8"
/datum/reagent/medicine/antihol/on_mob_life(mob/living/M)
+ var/update_flags = STATUS_UPDATE_NONE
M.SetSlur(0)
M.AdjustDrunk(-4)
M.reagents.remove_all_type(/datum/reagent/consumable/ethanol, 8, 0, 1)
if(M.toxloss <= 25)
- M.adjustToxLoss(-2.0)
- ..()
+ update_flags |= M.adjustToxLoss(-2.0, FALSE)
+ return ..() | update_flags
/datum/reagent/medicine/stimulants
name = "Stimulants"
@@ -737,26 +770,28 @@
can_synth = FALSE
/datum/reagent/medicine/stimulants/on_mob_life(mob/living/M)
+ var/update_flags = STATUS_UPDATE_NONE
if(volume > 5)
- M.adjustOxyLoss(-5*REAGENTS_EFFECT_MULTIPLIER)
- M.adjustToxLoss(-5*REAGENTS_EFFECT_MULTIPLIER)
- M.adjustBruteLoss(-10*REAGENTS_EFFECT_MULTIPLIER)
- M.adjustFireLoss(-10*REAGENTS_EFFECT_MULTIPLIER)
- M.setStaminaLoss(0)
+ update_flags |= M.adjustOxyLoss(-5*REAGENTS_EFFECT_MULTIPLIER, FALSE)
+ update_flags |= M.adjustToxLoss(-5*REAGENTS_EFFECT_MULTIPLIER, FALSE)
+ update_flags |= M.adjustBruteLoss(-10*REAGENTS_EFFECT_MULTIPLIER, FALSE)
+ update_flags |= M.adjustFireLoss(-10*REAGENTS_EFFECT_MULTIPLIER, FALSE)
+ update_flags |= M.setStaminaLoss(0, FALSE)
M.SetSlowed(0)
M.AdjustDizzy(-10)
M.AdjustDrowsy(-10)
M.SetConfused(0)
- M.SetSleeping(0)
+ update_flags |= M.SetSleeping(0, FALSE)
var/status = CANSTUN | CANWEAKEN | CANPARALYSE
M.status_flags &= ~status
else
M.status_flags |= CANSTUN | CANWEAKEN | CANPARALYSE
- M.adjustToxLoss(2)
- M.adjustBruteLoss(1)
+ update_flags |= M.adjustToxLoss(2, FALSE)
+ update_flags |= M.adjustBruteLoss(1, FALSE)
if(prob(10))
- M.Stun(3)
- ..()
+ update_flags |= M.Stun(3, FALSE)
+
+ return ..() | update_flags
/datum/reagent/medicine/stimulants/on_mob_delete(mob/living/M)
M.status_flags |= CANSTUN | CANWEAKEN | CANPARALYSE
@@ -772,27 +807,30 @@
can_synth = FALSE
/datum/reagent/medicine/stimulative_agent/on_mob_life(mob/living/M)
+ var/update_flags = STATUS_UPDATE_NONE
M.status_flags |= GOTTAGOFAST
if(M.health < 50 && M.health > 0)
- M.adjustOxyLoss(-1*REAGENTS_EFFECT_MULTIPLIER)
- M.adjustToxLoss(-1*REAGENTS_EFFECT_MULTIPLIER)
- M.adjustBruteLoss(-1*REAGENTS_EFFECT_MULTIPLIER)
- M.adjustFireLoss(-1*REAGENTS_EFFECT_MULTIPLIER)
- M.AdjustParalysis(-3)
- M.AdjustStunned(-3)
- M.AdjustWeakened(-3)
- M.adjustStaminaLoss(-5*REAGENTS_EFFECT_MULTIPLIER)
- ..()
+ update_flags |= M.adjustOxyLoss(-1*REAGENTS_EFFECT_MULTIPLIER, FALSE)
+ update_flags |= M.adjustToxLoss(-1*REAGENTS_EFFECT_MULTIPLIER, FALSE)
+ update_flags |= M.adjustBruteLoss(-1*REAGENTS_EFFECT_MULTIPLIER, FALSE)
+ update_flags |= M.adjustFireLoss(-1*REAGENTS_EFFECT_MULTIPLIER, FALSE)
+ update_flags |= M.AdjustParalysis(-3, FALSE)
+ update_flags |= M.AdjustStunned(-3, FALSE)
+ update_flags |= M.AdjustWeakened(-3, FALSE)
+ update_flags |= M.adjustStaminaLoss(-5*REAGENTS_EFFECT_MULTIPLIER, FALSE)
+ return ..() | update_flags
/datum/reagent/medicine/stimulative_agent/on_mob_delete(mob/living/M)
M.status_flags &= ~GOTTAGOFAST
..()
/datum/reagent/medicine/stimulative_agent/overdose_process(mob/living/M, severity)
+ var/update_flags = STATUS_UPDATE_NONE
if(prob(33))
- M.adjustStaminaLoss(2.5*REAGENTS_EFFECT_MULTIPLIER)
- M.adjustToxLoss(1*REAGENTS_EFFECT_MULTIPLIER)
+ update_flags |= M.adjustStaminaLoss(2.5*REAGENTS_EFFECT_MULTIPLIER, FALSE)
+ update_flags |= M.adjustToxLoss(1*REAGENTS_EFFECT_MULTIPLIER, FALSE)
M.AdjustLoseBreath(1)
+ return list(0, update_flags)
/datum/reagent/medicine/insulin
name = "Insulin"
@@ -835,6 +873,7 @@
color = "#FFDCFF"
/datum/reagent/medicine/haloperidol/on_mob_life(mob/living/M)
+ var/update_flags = STATUS_UPDATE_NONE
M.reagents.remove_reagent("crank", 5)
M.reagents.remove_reagent("methamphetamine", 5)
M.reagents.remove_reagent("space_drugs", 5)
@@ -845,7 +884,7 @@
M.reagents.remove_reagent("bath_salts", 5)
M.reagents.remove_reagent("lsd", 5)
M.reagents.remove_reagent("thc", 5)
- M.AdjustDruggy(-5)
+ update_flags |= M.AdjustDruggy(-5, FALSE)
M.AdjustHallucinate(-5)
M.AdjustJitter(-5)
if(prob(50))
@@ -853,8 +892,8 @@
if(prob(10))
M.emote("drool")
if(prob(20))
- M.adjustBrainLoss(1)
- ..()
+ update_flags |= M.adjustBrainLoss(1, FALSE)
+ return ..() | update_flags
/datum/reagent/medicine/ether
name = "Ether"
@@ -886,13 +925,14 @@
can_synth = FALSE
/datum/reagent/medicine/syndicate_nanites/on_mob_life(mob/living/M)
- M.adjustBruteLoss(-5*REAGENTS_EFFECT_MULTIPLIER) //A ton of healing - this is a 50 telecrystal investment.
- M.adjustFireLoss(-5*REAGENTS_EFFECT_MULTIPLIER)
- M.adjustOxyLoss(-15*REAGENTS_EFFECT_MULTIPLIER)
- M.adjustToxLoss(-5*REAGENTS_EFFECT_MULTIPLIER)
- M.adjustBrainLoss(-15*REAGENTS_EFFECT_MULTIPLIER)
- M.adjustCloneLoss(-3*REAGENTS_EFFECT_MULTIPLIER)
- ..()
+ var/update_flags = STATUS_UPDATE_NONE
+ update_flags |= M.adjustBruteLoss(-5*REAGENTS_EFFECT_MULTIPLIER, FALSE) //A ton of healing - this is a 50 telecrystal investment.
+ update_flags |= M.adjustFireLoss(-5*REAGENTS_EFFECT_MULTIPLIER, FALSE)
+ update_flags |= M.adjustOxyLoss(-15*REAGENTS_EFFECT_MULTIPLIER, FALSE)
+ update_flags |= M.adjustToxLoss(-5*REAGENTS_EFFECT_MULTIPLIER, FALSE)
+ update_flags |= M.adjustBrainLoss(-15*REAGENTS_EFFECT_MULTIPLIER, FALSE)
+ update_flags |= M.adjustCloneLoss(-3*REAGENTS_EFFECT_MULTIPLIER, FALSE)
+ return ..() | update_flags
/datum/reagent/medicine/omnizine_diluted
name = "Diluted Omnizine"
@@ -904,17 +944,20 @@
metabolization_rate = 0.1
/datum/reagent/medicine/omnizine_diluted/on_mob_life(mob/living/M)
- M.adjustToxLoss(-0.5*REAGENTS_EFFECT_MULTIPLIER)
- M.adjustOxyLoss(-0.5*REAGENTS_EFFECT_MULTIPLIER)
- M.adjustBruteLoss(-0.5*REAGENTS_EFFECT_MULTIPLIER)
- M.adjustFireLoss(-0.5*REAGENTS_EFFECT_MULTIPLIER)
- ..()
+ var/update_flags = STATUS_UPDATE_NONE
+ update_flags |= M.adjustToxLoss(-0.5*REAGENTS_EFFECT_MULTIPLIER, FALSE)
+ update_flags |= M.adjustOxyLoss(-0.5*REAGENTS_EFFECT_MULTIPLIER, FALSE)
+ update_flags |= M.adjustBruteLoss(-0.5*REAGENTS_EFFECT_MULTIPLIER, FALSE)
+ update_flags |= M.adjustFireLoss(-0.5*REAGENTS_EFFECT_MULTIPLIER, FALSE)
+ return ..() | update_flags
/datum/reagent/medicine/omnizine_diluted/overdose_process(mob/living/M, severity)
- M.adjustToxLoss(1.5*REAGENTS_EFFECT_MULTIPLIER)
- M.adjustOxyLoss(1.5*REAGENTS_EFFECT_MULTIPLIER)
- M.adjustBruteLoss(1.5*REAGENTS_EFFECT_MULTIPLIER)
- M.adjustFireLoss(1.5*REAGENTS_EFFECT_MULTIPLIER)
+ var/update_flags = STATUS_UPDATE_NONE
+ update_flags |= M.adjustToxLoss(1.5*REAGENTS_EFFECT_MULTIPLIER, FALSE)
+ update_flags |= M.adjustOxyLoss(1.5*REAGENTS_EFFECT_MULTIPLIER, FALSE)
+ update_flags |= M.adjustBruteLoss(1.5*REAGENTS_EFFECT_MULTIPLIER, FALSE)
+ update_flags |= M.adjustFireLoss(1.5*REAGENTS_EFFECT_MULTIPLIER, FALSE)
+ return list(0, update_flags)
//virus-specific symptom reagents
@@ -925,6 +968,7 @@
color = "#EC536D" // rgb: 236, 83, 109
/datum/reagent/medicine/synaphydramine/on_mob_life(mob/living/M)
+ var/update_flags = STATUS_UPDATE_NONE
M.AdjustDrowsy(-5)
if(holder.has_reagent("lsd"))
holder.remove_reagent("lsd", 5)
@@ -932,8 +976,8 @@
holder.remove_reagent("histamine", 5)
M.AdjustHallucinate(-10)
if(prob(30))
- M.adjustToxLoss(1)
- ..()
+ update_flags |= M.adjustToxLoss(1, FALSE)
+ return ..() | update_flags
//////////////////////////////
// Synth-Meds //
@@ -949,10 +993,11 @@
process_flags = SYNTHETIC
/datum/reagent/medicine/degreaser/on_mob_life(mob/living/M)
+ var/update_flags = STATUS_UPDATE_NONE
if(prob(50)) //Same effects as coffee, to help purge ill effects like paralysis
- M.AdjustParalysis(-1)
- M.AdjustStunned(-1)
- M.AdjustWeakened(-1)
+ update_flags |= M.AdjustParalysis(-1, FALSE)
+ update_flags |= M.AdjustStunned(-1, FALSE)
+ update_flags |= M.AdjustWeakened(-1, FALSE)
M.AdjustConfused(-5)
for(var/datum/reagent/R in M.reagents.reagent_list)
if(R != src)
@@ -961,7 +1006,7 @@
M.reagents.remove_reagent(R.id, 5)
else
M.reagents.remove_reagent(R.id,1)
- ..()
+ return ..() | update_flags
/datum/reagent/medicine/degreaser/reaction_turf(turf/simulated/T, volume)
if(volume >= 1 && istype(T))
@@ -978,8 +1023,9 @@
process_flags = SYNTHETIC
/datum/reagent/medicine/liquid_solder/on_mob_life(mob/living/M)
- M.adjustBrainLoss(-3)
- ..()
+ var/update_flags = STATUS_UPDATE_NONE
+ update_flags |= M.adjustBrainLoss(-3, FALSE)
+ return ..() | update_flags
@@ -993,11 +1039,14 @@
overdose_threshold = 30
/datum/reagent/medicine/bicaridine/on_mob_life(mob/living/M)
- M.adjustBruteLoss(-2*REAGENTS_EFFECT_MULTIPLIER)
- ..()
+ var/update_flags = STATUS_UPDATE_NONE
+ update_flags |= M.adjustBruteLoss(-2*REAGENTS_EFFECT_MULTIPLIER, FALSE)
+ return ..() | update_flags
/datum/reagent/medicine/bicaridine/overdose_process(mob/living/M)
- M.adjustBruteLoss(4*REAGENTS_EFFECT_MULTIPLIER)
+ var/update_flags = STATUS_UPDATE_NONE
+ update_flags |= M.adjustBruteLoss(4*REAGENTS_EFFECT_MULTIPLIER, FALSE)
+ return list(0, update_flags)
/datum/reagent/medicine/kelotane
name = "Kelotane"
@@ -1008,11 +1057,14 @@
overdose_threshold = 30
/datum/reagent/medicine/kelotane/on_mob_life(mob/living/M)
- M.adjustFireLoss(-2*REAGENTS_EFFECT_MULTIPLIER)
- ..()
+ var/update_flags = STATUS_UPDATE_NONE
+ update_flags |= M.adjustFireLoss(-2*REAGENTS_EFFECT_MULTIPLIER, FALSE)
+ return ..() | update_flags
/datum/reagent/medicine/kelotane/overdose_process(mob/living/M)
- M.adjustFireLoss(4*REAGENTS_EFFECT_MULTIPLIER)
+ var/update_flags = STATUS_UPDATE_NONE
+ update_flags |= M.adjustFireLoss(4*REAGENTS_EFFECT_MULTIPLIER, FALSE)
+ return ..() | update_flags
/datum/reagent/medicine/earthsblood //Created by ambrosia gaia plants
@@ -1023,20 +1075,23 @@
overdose_threshold = 25
/datum/reagent/medicine/earthsblood/on_mob_life(mob/living/M)
- M.adjustBruteLoss(-3 * REAGENTS_EFFECT_MULTIPLIER)
- M.adjustFireLoss(-3 * REAGENTS_EFFECT_MULTIPLIER)
- M.adjustOxyLoss(-15 * REAGENTS_EFFECT_MULTIPLIER)
- M.adjustToxLoss(-3 * REAGENTS_EFFECT_MULTIPLIER)
- M.adjustBrainLoss(2 * REAGENTS_EFFECT_MULTIPLIER) //This does, after all, come from ambrosia, and the most powerful ambrosia in existence, at that!
- M.adjustCloneLoss(-1 * REAGENTS_EFFECT_MULTIPLIER)
- M.adjustStaminaLoss(-30 * REAGENTS_EFFECT_MULTIPLIER)
+ var/update_flags = STATUS_UPDATE_NONE
+ update_flags |= M.adjustBruteLoss(-3 * REAGENTS_EFFECT_MULTIPLIER, FALSE)
+ update_flags |= M.adjustFireLoss(-3 * REAGENTS_EFFECT_MULTIPLIER, FALSE)
+ update_flags |= M.adjustOxyLoss(-15 * REAGENTS_EFFECT_MULTIPLIER, FALSE)
+ update_flags |= M.adjustToxLoss(-3 * REAGENTS_EFFECT_MULTIPLIER, FALSE)
+ update_flags |= M.adjustBrainLoss(2 * REAGENTS_EFFECT_MULTIPLIER, FALSE) //This does, after all, come from ambrosia, and the most powerful ambrosia in existence, at that!
+ update_flags |= M.adjustCloneLoss(-1 * REAGENTS_EFFECT_MULTIPLIER, FALSE)
+ update_flags |= M.adjustStaminaLoss(-30 * REAGENTS_EFFECT_MULTIPLIER, FALSE)
M.SetJitter(min(max(0, M.jitteriness + 3), 30))
- M.SetDruggy(min(max(0, M.druggy + 10), 15)) //See above
- ..()
+ update_flags |= M.SetDruggy(min(max(0, M.druggy + 10), 15), FALSE) //See above
+ return ..() | update_flags
/datum/reagent/medicine/earthsblood/overdose_process(mob/living/M)
+ var/update_flags = STATUS_UPDATE_NONE
M.SetHallucinate(min(max(0, M.hallucination + 10), 50))
- M.adjustToxLoss(5 * REAGENTS_EFFECT_MULTIPLIER)
+ update_flags |= M.adjustToxLoss(5 * REAGENTS_EFFECT_MULTIPLIER, FALSE)
+ return list(0, update_flags)
/datum/reagent/medicine/corazone
name = "Corazone"
@@ -1055,6 +1110,7 @@
can_synth = FALSE
/datum/reagent/medicine/nanocalcium/on_mob_life(mob/living/carbon/human/M)
+ var/update_flags = STATUS_UPDATE_NONE
switch(current_cycle)
if(1 to 19)
M.AdjustJitter(4)
@@ -1063,15 +1119,15 @@
if(20 to 43)
//If they have stimulants or stimulant drugs then just apply toxin damage instead.
if(M.reagents.has_reagent("methamphetamine") || M.reagents.has_reagent("crank") || M.reagents.has_reagent("bath_salts") || M.reagents.has_reagent("stimulative_agent") || M.reagents.has_reagent("stimulants"))
- M.adjustToxLoss(10)
+ update_flags |= M.adjustToxLoss(10, FALSE)
else //apply debilitating effects
if(prob(75))
M.AdjustConfused(5)
else
- M.AdjustWeakened(5)
+ update_flags |= M.AdjustWeakened(5, FALSE)
if(44)
to_chat(M, "Your body goes rigid, you cannot move at all!")
- M.AdjustWeakened(15)
+ update_flags |= M.AdjustWeakened(15, FALSE)
if(45 to INFINITY) // Start fixing bones | If they have stimulants or stimulant drugs in their system then the nanites won't work.
if(M.reagents.has_reagent("methamphetamine") || M.reagents.has_reagent("crank") || M.reagents.has_reagent("bath_salts") || M.reagents.has_reagent("stimulative_agent") || M.reagents.has_reagent("stimulants"))
return ..()
@@ -1082,4 +1138,4 @@
to_chat(M, "You feel a burning sensation in your [E.name] as it straightens involuntarily!")
E.rejuvenate() //Repair it completely.
break
- ..()
+ return ..() | update_flags
diff --git a/code/modules/reagents/chemistry/reagents/misc.dm b/code/modules/reagents/chemistry/reagents/misc.dm
index fdddea44bd2..c86a839c4e2 100644
--- a/code/modules/reagents/chemistry/reagents/misc.dm
+++ b/code/modules/reagents/chemistry/reagents/misc.dm
@@ -250,8 +250,9 @@
taste_message = null
/datum/reagent/acetone/on_mob_life(mob/living/M)
- M.adjustToxLoss(1.5)
- ..()
+ var/update_flags = STATUS_UPDATE_NONE
+ update_flags |= M.adjustToxLoss(1.5, FALSE)
+ return ..() | update_flags
/datum/reagent/saltpetre
name = "Saltpetre"
@@ -362,20 +363,21 @@
taste_message = "mexican cuisine"
/datum/reagent/fartonium/on_mob_life(mob/living/M)
+ var/update_flags = STATUS_UPDATE_NONE
if(prob(66))
M.emote("fart")
if(holder.has_reagent("simethicone"))
if(prob(25))
to_chat(M, "[pick("Oh god, something doesn't feel right!", "IT HURTS!", "FUCK!", "Something is seriously wrong!", "THE PAIN!", "You feel like you're gonna die!")]")
- M.adjustBruteLoss(1)
+ update_flags |= M.adjustBruteLoss(1, FALSE)
if(prob(10))
M.custom_emote(1,"strains, but nothing happens.")
- M.adjustBruteLoss(2)
+ update_flags |= M.adjustBruteLoss(2, FALSE)
if(prob(5))
M.emote("scream")
- M.adjustBruteLoss(4)
- ..()
+ update_flags |= M.adjustBruteLoss(4, FALSE)
+ return ..() | update_flags
/datum/reagent/hugs
name = "Pure hugs"
@@ -412,7 +414,7 @@
M.visible_message("[M] gives [C] a [pick("hug","warm embrace")].")
playsound(get_turf(M), 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
break
- ..()
+ return ..()
/datum/reagent/love/on_mob_delete(mob/living/M)
M.can_change_intents = 1
@@ -432,7 +434,7 @@
/datum/reagent/royal_bee_jelly/on_mob_life(mob/living/M)
if(prob(2))
M.say(pick("Bzzz...","BZZ BZZ","Bzzzzzzzzzzz..."))
- ..()
+ return ..()
/datum/reagent/growthserum
name = "Growth serum"
@@ -459,7 +461,7 @@
H.resize = newsize/current_size
current_size = newsize
H.update_transform()
- ..()
+ return ..()
/datum/reagent/growthserum/on_mob_delete(mob/living/M)
M.resize = 1/current_size
@@ -493,9 +495,10 @@
taste_message = "puke"
/datum/reagent/plantnutriment/on_mob_life(mob/living/M)
+ var/update_flags = STATUS_UPDATE_NONE
if(prob(tox_prob))
- M.adjustToxLoss(1*REAGENTS_EFFECT_MULTIPLIER)
- ..()
+ update_flags |= M.adjustToxLoss(1*REAGENTS_EFFECT_MULTIPLIER, FALSE)
+ return ..() | update_flags
/datum/reagent/plantnutriment/eznutriment
name = "E-Z-Nutrient"
diff --git a/code/modules/reagents/chemistry/reagents/paradise_pop.dm b/code/modules/reagents/chemistry/reagents/paradise_pop.dm
index edf633bcacc..08f01bdd381 100644
--- a/code/modules/reagents/chemistry/reagents/paradise_pop.dm
+++ b/code/modules/reagents/chemistry/reagents/paradise_pop.dm
@@ -43,23 +43,24 @@
taste_message = "a permaban"
/datum/reagent/consumable/drink/berry_banned/on_mob_life(mob/living/M)
+ var/update_flags = STATUS_UPDATE_NONE
if(prob(10))
var/heal_type = rand(0, 5) //still prefer the string version
switch(heal_type)
if(0)
- M.adjustBruteLoss(-0.5*REAGENTS_EFFECT_MULTIPLIER)
+ update_flags |= M.adjustBruteLoss(-0.5*REAGENTS_EFFECT_MULTIPLIER, FALSE)
if(1)
- M.adjustFireLoss(-0.5*REAGENTS_EFFECT_MULTIPLIER)
+ update_flags |= M.adjustFireLoss(-0.5*REAGENTS_EFFECT_MULTIPLIER, FALSE)
if(2)
- M.adjustToxLoss(-0.5*REAGENTS_EFFECT_MULTIPLIER)
+ update_flags |= M.adjustToxLoss(-0.5*REAGENTS_EFFECT_MULTIPLIER, FALSE)
if(3)
- M.adjustOxyLoss(-0.5*REAGENTS_EFFECT_MULTIPLIER)
+ update_flags |= M.adjustOxyLoss(-0.5*REAGENTS_EFFECT_MULTIPLIER, FALSE)
if(4)
- M.adjustCloneLoss(-0.5*REAGENTS_EFFECT_MULTIPLIER)
+ update_flags |= M.adjustCloneLoss(-0.5*REAGENTS_EFFECT_MULTIPLIER, FALSE)
if(5)
- M.adjustBrainLoss(-1*REAGENTS_EFFECT_MULTIPLIER)
+ update_flags |= M.adjustBrainLoss(-1*REAGENTS_EFFECT_MULTIPLIER, FALSE)
to_chat(M, "You feel slightly rejuvinated!")
- ..()
+ return ..() | update_flags
//Berry Banned 2: This one is tasty and toxic. Deals toxin damage and MAYBE plays the "BWOINK!" sound if it kills someone?
/datum/reagent/consumable/drink/berry_banned2
@@ -71,11 +72,12 @@
taste_message = "a permaban"
/datum/reagent/consumable/drink/berry_banned2/on_mob_life(mob/living/M)
+ var/update_flags = STATUS_UPDATE_NONE
if(prob(50))
- M.adjustToxLoss(2*REAGENTS_EFFECT_MULTIPLIER) //double strength of poison berry juice alone, because it's concentrated (this is equal to the damage of normal toxin, less often)
+ update_flags |= M.adjustToxLoss(2*REAGENTS_EFFECT_MULTIPLIER, FALSE) //double strength of poison berry juice alone, because it's concentrated (this is equal to the damage of normal toxin, less often)
if(prob(10))
to_chat(M, "You feel slightly rejuvinated!") //meta this!
- ..()
+ return ..() | update_flags
/datum/reagent/consumable/drink/berry_banned2/on_mob_death(mob/living/M)
M << sound('sound/effects/adminhelp.ogg',0,1,0,25)
@@ -103,7 +105,7 @@
"THIS DOOR WAS SHOCKED WHEN I GOT HERE",
"ANIMALS ARE NOT CREW")
M.say(pick(tider_talk))
- ..()
+ return ..()
//Grape Granade: causes the drinker to sometimes burp, has a low chance to cause a goonchem vortex that pushes things within a very small radius (1-2 tiles) away from the drinker
/datum/reagent/consumable/drink/grape_granade
@@ -122,7 +124,7 @@
to_chat(M, "You feel ready to burst! Oh wait, just a burp...")
else if(prob(25))
M.emote("burp")
- ..()
+ return ..()
//Meteor Malt: Sometimes causes screen shakes for the drinker like a meteor impact, low chance to add 1-5 units of a random mineral reagent to the drinker's blood (iron, copper, silver, gold, uranium, carbon, etc)
/datum/reagent/consumable/drink/meteor_malt
@@ -141,4 +143,4 @@
var/amount = rand(1, 5)
var/mineral = pick("copper", "iron", "gold", "carbon", "silver", "aluminum", "silicon", "sodiumchloride", "plasma")
M.reagents.add_reagent(mineral, amount)
- ..()
+ return ..()
diff --git a/code/modules/reagents/chemistry/reagents/pyrotechnic.dm b/code/modules/reagents/chemistry/reagents/pyrotechnic.dm
index f2a5e8b9e24..bc47e709823 100644
--- a/code/modules/reagents/chemistry/reagents/pyrotechnic.dm
+++ b/code/modules/reagents/chemistry/reagents/pyrotechnic.dm
@@ -24,13 +24,14 @@
taste_message = "corporate assets going to waste"
/datum/reagent/plasma/on_mob_life(mob/living/M)
- M.adjustToxLoss(1*REAGENTS_EFFECT_MULTIPLIER)
+ var/update_flags = STATUS_UPDATE_NONE
+ update_flags |= M.adjustToxLoss(1*REAGENTS_EFFECT_MULTIPLIER, FALSE)
if(holder.has_reagent("epinephrine"))
holder.remove_reagent("epinephrine", 2)
if(iscarbon(M))
var/mob/living/carbon/C = M
C.adjustPlasma(10)
- ..()
+ return ..() | update_flags
/datum/reagent/plasma/reaction_mob(mob/living/M, method=TOUCH, volume)//Splashing people with plasma is stronger than fuel!
if(method == TOUCH)
@@ -80,10 +81,11 @@
taste_message = null
/datum/reagent/clf3/on_mob_life(mob/living/M)
+ var/update_flags = STATUS_UPDATE_NONE
M.adjust_fire_stacks(2)
var/burndmg = max(0.3*M.fire_stacks, 0.3)
- M.adjustFireLoss(burndmg)
- ..()
+ update_flags |= M.adjustFireLoss(burndmg, FALSE)
+ return ..() | update_flags
/datum/reagent/clf3/reaction_turf(turf/simulated/T, volume)
if(prob(1) && istype(T, /turf/simulated/floor/plating))
@@ -167,10 +169,11 @@
process_flags = ORGANIC | SYNTHETIC
/datum/reagent/phlogiston/on_mob_life(mob/living/M)
+ var/update_flags = STATUS_UPDATE_NONE
M.adjust_fire_stacks(1)
var/burndmg = max(0.3*M.fire_stacks, 0.3)
- M.adjustFireLoss(burndmg)
- ..()
+ update_flags |= M.adjustFireLoss(burndmg, FALSE)
+ return ..() | update_flags
/datum/reagent/phlogiston/reaction_mob(mob/living/M, method=TOUCH, volume)
M.adjust_fire_stacks(1)
@@ -187,7 +190,7 @@
/datum/reagent/napalm/on_mob_life(mob/living/M)
M.adjust_fire_stacks(1)
- ..()
+ return ..()
/datum/reagent/napalm/reaction_mob(mob/living/M, method=TOUCH, volume)
if(method == TOUCH)
@@ -204,7 +207,7 @@
if(M.reagents.has_reagent("oxygen"))
M.reagents.remove_reagent("oxygen", 1)
M.bodytemperature -= 30
- ..()
+ return ..()
/datum/reagent/cryostylane/on_tick()
if(holder.has_reagent("oxygen"))
@@ -229,7 +232,7 @@
if(M.reagents.has_reagent("oxygen"))
M.reagents.remove_reagent("oxygen", 1)
M.bodytemperature += 30
- ..()
+ return ..()
/datum/reagent/pyrosium/on_tick()
if(holder.has_reagent("oxygen"))
@@ -276,11 +279,12 @@
taste_message = "corporate assets going to waste"
/datum/reagent/plasma_dust/on_mob_life(mob/living/M)
- M.adjustToxLoss(3)
+ var/update_flags = STATUS_UPDATE_NONE
+ update_flags |= M.adjustToxLoss(3, FALSE)
if(iscarbon(M))
var/mob/living/carbon/C = M
C.adjustPlasma(20)
- ..()
+ return ..() | update_flags
/datum/reagent/plasma_dust/reaction_mob(mob/living/M, method=TOUCH, volume)//Splashing people with plasma dust is stronger than fuel!
if(method == TOUCH)
diff --git a/code/modules/reagents/chemistry/reagents/toxins.dm b/code/modules/reagents/chemistry/reagents/toxins.dm
index a3fc113339e..d6813ee6f61 100644
--- a/code/modules/reagents/chemistry/reagents/toxins.dm
+++ b/code/modules/reagents/chemistry/reagents/toxins.dm
@@ -6,8 +6,9 @@
color = "#CF3600" // rgb: 207, 54, 0
/datum/reagent/toxin/on_mob_life(mob/living/M)
- M.adjustToxLoss(2)
- ..()
+ var/update_flags = STATUS_UPDATE_NONE
+ update_flags |= M.adjustToxLoss(2, FALSE)
+ return ..() | update_flags
/datum/reagent/spider_venom
name = "Spider venom"
@@ -17,8 +18,9 @@
color = "#CF3600" // rgb: 207, 54, 0
/datum/reagent/spider_venom/on_mob_life(mob/living/M)
- M.adjustToxLoss(1.5)
- ..()
+ var/update_flags = STATUS_UPDATE_NONE
+ update_flags |= M.adjustToxLoss(1.5, FALSE)
+ return ..() | update_flags
/datum/reagent/minttoxin
name = "Mint Toxin"
@@ -31,7 +33,7 @@
/datum/reagent/minttoxin/on_mob_life(mob/living/M)
if(FAT in M.mutations)
M.gib()
- ..()
+ return ..()
/datum/reagent/slimejelly
name = "Slime Jelly"
@@ -42,12 +44,13 @@
taste_message = "slimes"
/datum/reagent/slimejelly/on_mob_life(mob/living/M)
+ var/update_flags = STATUS_UPDATE_NONE
if(prob(10))
to_chat(M, "Your insides are burning!")
- M.adjustToxLoss(rand(20,60)*REAGENTS_EFFECT_MULTIPLIER)
+ update_flags |= M.adjustToxLoss(rand(20,60)*REAGENTS_EFFECT_MULTIPLIER, FALSE)
else if(prob(40))
- M.adjustBruteLoss(-5*REAGENTS_EFFECT_MULTIPLIER)
- ..()
+ update_flags |= M.adjustBruteLoss(-5*REAGENTS_EFFECT_MULTIPLIER, FALSE)
+ return ..() | update_flags
/datum/reagent/slimetoxin
name = "Mutation Toxin"
@@ -67,7 +70,7 @@
to_chat(M, "Your body reacts violently to light. However, it naturally heals in darkness.")
to_chat(M, "Aside from your new traits, you are mentally unchanged and retain your prior obligations.")
human.set_species(/datum/species/shadow)
- ..()
+ return ..()
/datum/reagent/aslimetoxin
name = "Advanced Mutation Toxin"
@@ -93,9 +96,10 @@
taste_message = "metal"
/datum/reagent/mercury/on_mob_life(mob/living/M)
+ var/update_flags = STATUS_UPDATE_NONE
if(prob(70))
M.adjustBrainLoss(1)
- ..()
+ return ..() | update_flags
/datum/reagent/chlorine
name = "Chlorine"
@@ -108,8 +112,9 @@
taste_message = "fire"
/datum/reagent/chlorine/on_mob_life(mob/living/M)
- M.adjustFireLoss(1)
- ..()
+ var/update_flags = STATUS_UPDATE_NONE
+ update_flags |= M.adjustFireLoss(1, FALSE)
+ return ..() | update_flags
/datum/reagent/fluorine
name = "Fluorine"
@@ -122,9 +127,10 @@
taste_message = "spicy freshness"
/datum/reagent/fluorine/on_mob_life(mob/living/M)
- M.adjustFireLoss(1)
- M.adjustToxLoss(1*REAGENTS_EFFECT_MULTIPLIER)
- ..()
+ var/update_flags = STATUS_UPDATE_NONE
+ update_flags |= M.adjustFireLoss(1, FALSE)
+ update_flags |= M.adjustToxLoss(1*REAGENTS_EFFECT_MULTIPLIER, FALSE)
+ return ..() | update_flags
/datum/reagent/radium
name = "Radium"
@@ -137,7 +143,7 @@
/datum/reagent/radium/on_mob_life(mob/living/M)
if(M.radiation < 80)
M.apply_effect(4, IRRADIATE, negate_armor = 1)
- ..()
+ return ..()
/datum/reagent/radium/reaction_turf(turf/T, volume)
if(volume >= 3 && !isspaceturf(T))
@@ -167,7 +173,7 @@
M.apply_effect(2*REAGENTS_EFFECT_MULTIPLIER, IRRADIATE, negate_armor = 1)
if(prob(4))
randmutb(M)
- ..()
+ return ..()
/datum/reagent/uranium
@@ -180,7 +186,7 @@
/datum/reagent/uranium/on_mob_life(mob/living/M)
M.apply_effect(2, IRRADIATE, negate_armor = 1)
- ..()
+ return ..()
/datum/reagent/uranium/reaction_turf(turf/T, volume)
if(volume >= 3 && !isspaceturf(T))
@@ -196,8 +202,9 @@
metabolization_rate = 0.2
/datum/reagent/lexorin/on_mob_life(mob/living/M)
- M.adjustToxLoss(1)
- ..()
+ var/update_flags = STATUS_UPDATE_NONE
+ update_flags |= M.adjustToxLoss(1, FALSE)
+ return ..() | update_flags
/datum/reagent/sacid
@@ -210,8 +217,9 @@
taste_message = "ACID"
/datum/reagent/sacid/on_mob_life(mob/living/M)
- M.adjustFireLoss(1)
- ..()
+ var/update_flags = STATUS_UPDATE_NONE
+ update_flags |= M.adjustFireLoss(1, FALSE)
+ return ..() | update_flags
/datum/reagent/sacid/reaction_mob(mob/living/M, method=TOUCH, volume)
if(method == TOUCH)
@@ -282,8 +290,9 @@
color = "#003333" // rgb: 0, 51, 51
/datum/reagent/carpotoxin/on_mob_life(mob/living/M)
- M.adjustToxLoss(2*REAGENTS_EFFECT_MULTIPLIER)
- ..()
+ var/update_flags = STATUS_UPDATE_NONE
+ update_flags |= M.adjustToxLoss(2*REAGENTS_EFFECT_MULTIPLIER, FALSE)
+ return ..() | update_flags
/datum/reagent/staminatoxin
name = "Tirizene"
@@ -294,9 +303,10 @@
data = 13
/datum/reagent/staminatoxin/on_mob_life(mob/living/M)
- M.adjustStaminaLoss(REAGENTS_EFFECT_MULTIPLIER * data)
+ var/update_flags = STATUS_UPDATE_NONE
+ update_flags |= M.adjustStaminaLoss(REAGENTS_EFFECT_MULTIPLIER * data, FALSE)
data = max(data - 1, 3)
- ..()
+ return ..() | update_flags
/datum/reagent/spore
@@ -306,10 +316,11 @@
color = "#9ACD32"
/datum/reagent/spores/on_mob_life(mob/living/M)
- M.adjustToxLoss(1)
+ var/update_flags = STATUS_UPDATE_NONE
+ update_flags |= M.adjustToxLoss(1, FALSE)
M.damageoverlaytemp = 60
- M.EyeBlurry(3)
- ..()
+ update_flags |= M.EyeBlurry(3)
+ return ..() | update_flags
/datum/reagent/beer2 //disguised as normal beer for use by emagged service borgs
name = "Beer"
@@ -323,13 +334,14 @@
taste_message = "beer"
/datum/reagent/beer2/on_mob_life(mob/living/M)
+ var/update_flags = STATUS_UPDATE_NONE
switch(current_cycle)
if(1 to 50)
- M.Sleeping(2)
+ update_flags |= M.Sleeping(2, FALSE)
if(51 to INFINITY)
- M.Sleeping(2)
- M.adjustToxLoss((current_cycle - 50)*REAGENTS_EFFECT_MULTIPLIER)
- ..()
+ update_flags |= M.Sleeping(2, FALSE)
+ update_flags |= M.adjustToxLoss((current_cycle - 50)*REAGENTS_EFFECT_MULTIPLIER, FALSE)
+ return ..() | update_flags
/datum/reagent/polonium
name = "Polonium"
@@ -344,7 +356,7 @@
/datum/reagent/polonium/on_mob_life(mob/living/M)
M.apply_effect(8, IRRADIATE, negate_armor = 1)
- ..()
+ return ..()
/datum/reagent/histamine
name = "Histamine"
@@ -365,60 +377,64 @@
M.emote("drool")
/datum/reagent/histamine/on_mob_life(mob/living/M)
+ var/update_flags = STATUS_UPDATE_NONE
if(prob(20))
M.emote(pick("twitch", "grumble", "sneeze", "cough"))
if(prob(10))
to_chat(M, "Your eyes itch.")
M.emote(pick("blink", "sneeze"))
- M.AdjustEyeBlurry(3)
+ update_flags |= M.AdjustEyeBlurry(3, FALSE)
if(prob(10))
M.visible_message("[M] scratches at an itch.")
- M.adjustBruteLoss(1)
+ update_flags |= M.adjustBruteLoss(1, FALSE)
M.emote("grumble")
if(prob(5))
to_chat(M, "You're getting a rash!")
- M.adjustBruteLoss(2)
- ..()
+ update_flags |= M.adjustBruteLoss(2, FALSE)
+ return ..() | update_flags
/datum/reagent/histamine/overdose_process(mob/living/M, severity)
- var/effect = ..()
+ var/list/overdose_info = ..()
+ var/effect = overdose_info[REAGENT_OVERDOSE_EFFECT]
+ var/update_flags = overdose_info[REAGENT_OVERDOSE_FLAGS]
if(severity == 1)
if(effect <= 2)
to_chat(M, "You feel mucus running down the back of your throat.")
- M.adjustToxLoss(1)
+ update_flags |= M.adjustToxLoss(1, FALSE)
M.Jitter(4)
M.emote(pick("sneeze", "cough"))
else if(effect <= 4)
- M.stuttering += rand(0,5)
+ M.AdjustStuttering(rand(0,5))
if(prob(25))
M.emote(pick("choke","gasp"))
- M.adjustOxyLoss(5)
+ update_flags |= M.adjustOxyLoss(5, FALSE)
else if(effect <= 7)
to_chat(M, "Your chest hurts!")
M.emote(pick("cough","gasp"))
- M.adjustOxyLoss(3)
+ update_flags |= M.adjustOxyLoss(3, FALSE)
else if(severity == 2)
if(effect <= 2)
M.visible_message("[M] breaks out in hives!")
- M.adjustBruteLoss(6)
+ update_flags |= M.adjustBruteLoss(6, FALSE)
else if(effect <= 4)
M.visible_message("[M] has a horrible coughing fit!")
M.Jitter(10)
- M.stuttering += rand(0,5)
+ M.AdjustStuttering(rand(0,5))
M.emote("cough")
if(prob(40))
M.emote(pick("choke","gasp"))
- M.adjustOxyLoss(6)
- M.Weaken(8)
+ update_flags |= M.adjustOxyLoss(6, FALSE)
+ update_flags |= M.Weaken(8, FALSE)
else if(effect <= 7)
to_chat(M, "Your heartbeat is pounding inside your head!")
M << 'sound/effects/singlebeat.ogg'
M.emote("collapse")
- M.adjustOxyLoss(8)
- M.adjustToxLoss(3)
- M.Weaken(3)
+ update_flags |= M.adjustOxyLoss(8, FALSE)
+ update_flags |= M.adjustToxLoss(3, FALSE)
+ update_flags |= M.Weaken(3, FALSE)
M.emote(pick("choke", "gasp"))
to_chat(M, "You feel like you're dying!")
+ return list(effect, update_flags)
/datum/reagent/formaldehyde
name = "Formaldehyde"
@@ -429,10 +445,11 @@
penetrates_skin = TRUE
/datum/reagent/formaldehyde/on_mob_life(mob/living/M)
- M.adjustToxLoss(1*REAGENTS_EFFECT_MULTIPLIER)
+ var/update_flags = STATUS_UPDATE_NONE
+ update_flags |= M.adjustToxLoss(1*REAGENTS_EFFECT_MULTIPLIER, FALSE)
if(prob(10))
M.reagents.add_reagent("histamine",rand(5,15))
- ..()
+ return ..() | update_flags
/datum/reagent/venom
name = "Venom"
@@ -445,26 +462,29 @@
can_synth = FALSE
/datum/reagent/venom/on_mob_life(mob/living/M)
+ var/update_flags = STATUS_UPDATE_NONE
if(prob(25))
M.reagents.add_reagent("histamine",rand(5,10))
if(volume < 20)
- M.adjustToxLoss(1)
- M.adjustBruteLoss(1)
+ update_flags |= M.adjustToxLoss(1, FALSE)
+ update_flags |= M.adjustBruteLoss(1, FALSE)
else if(volume < 40)
if(prob(8))
M.fakevomit()
- M.adjustToxLoss(2)
- M.adjustBruteLoss(2)
- ..()
+ update_flags |= M.adjustToxLoss(2, FALSE)
+ update_flags |= M.adjustBruteLoss(2, FALSE)
+ return ..() | update_flags
/datum/reagent/venom/overdose_process(mob/living/M)
+ var/update_flags = STATUS_UPDATE_NONE
if(volume >= 40)
if(prob(4))
M.visible_message("[M] starts convulsing violently!", "You feel as if your body is tearing itself apart!")
- M.Weaken(15)
+ update_flags |= M.Weaken(15, FALSE)
M.AdjustJitter(1000)
spawn(rand(20, 100))
M.gib()
+ return list(0, update_flags)
/datum/reagent/neurotoxin2
name = "Neurotoxin"
@@ -475,6 +495,7 @@
metabolization_rate = 1
/datum/reagent/neurotoxin2/on_mob_life(mob/living/M)
+ var/update_flags = STATUS_UPDATE_NONE
switch(current_cycle)
if(1 to 4)
current_cycle++
@@ -489,19 +510,19 @@
if(13)
M.emote("faint")
if(14 to INFINITY)
- M.Paralyse(10)
+ update_flags |= M.Paralyse(10, FALSE)
M.Drowsy(20)
M.AdjustJitter(-30)
if(M.getBrainLoss() <= 80)
- M.adjustBrainLoss(1)
+ update_flags |= M.adjustBrainLoss(1, FALSE)
else
if(prob(10))
- M.adjustBrainLoss(1)
+ update_flags |= M.adjustBrainLoss(1, FALSE)
if(prob(10))
M.emote("drool")
- M.adjustToxLoss(1)
- ..()
+ update_flags |= M.adjustToxLoss(1, FALSE)
+ return ..() | update_flags
/datum/reagent/cyanide
name = "Cyanide"
@@ -514,7 +535,8 @@
taste_message = "almonds"
/datum/reagent/cyanide/on_mob_life(mob/living/M)
- M.adjustToxLoss(1.5*REAGENTS_EFFECT_MULTIPLIER)
+ var/update_flags = STATUS_UPDATE_NONE
+ update_flags |= M.adjustToxLoss(1.5*REAGENTS_EFFECT_MULTIPLIER, FALSE)
if(prob(5))
M.emote("drool")
if(prob(10))
@@ -523,9 +545,9 @@
M.emote("gasp")
if(prob(8))
to_chat(M, "You feel horrendously weak!")
- M.Stun(2)
- M.adjustToxLoss(2)
- ..()
+ update_flags |= M.Stun(2, FALSE)
+ update_flags |= M.adjustToxLoss(2, FALSE)
+ return ..() | update_flags
/datum/reagent/itching_powder
name = "Itching Powder"
@@ -537,6 +559,7 @@
penetrates_skin = TRUE
/datum/reagent/itching_powder/on_mob_life(mob/living/M)
+ var/update_flags = STATUS_UPDATE_STAT
if(prob(25))
M.emote(pick("twitch", "laugh", "sneeze", "cry"))
if(prob(20))
@@ -544,22 +567,22 @@
M.emote(pick("laugh", "giggle"))
if(prob(15))
M.visible_message("[M] scratches at an itch.")
- M.adjustBruteLoss(1)
- M.Stun(rand(0,1))
+ update_flags |= M.adjustBruteLoss(1, FALSE)
+ update_flags |= M.Stun(rand(0,1), FALSE)
M.emote("grumble")
if(prob(10))
to_chat(M, "So itchy!")
- M.adjustBruteLoss(2)
+ update_flags |= M.adjustBruteLoss(2, FALSE)
if(prob(6))
M.reagents.add_reagent("histamine", rand(1,3))
if(prob(2))
to_chat(M, "AHHHHHH!")
- M.adjustBruteLoss(5)
- M.Weaken(5)
+ update_flags |= M.adjustBruteLoss(5, FALSE)
+ update_flags |= M.Weaken(5, FALSE)
M.AdjustJitter(6)
M.visible_message("[M] falls to the floor, scratching [M.p_them()]self violently!")
M.emote("scream")
- ..()
+ return ..() | update_flags
/datum/reagent/facid
name = "Fluorosulfuric Acid"
@@ -571,9 +594,10 @@
taste_message = "ACID"
/datum/reagent/facid/on_mob_life(mob/living/M)
- M.adjustToxLoss(1*REAGENTS_EFFECT_MULTIPLIER)
- M.adjustFireLoss(1)
- ..()
+ var/update_flags = STATUS_UPDATE_NONE
+ update_flags |= M.adjustToxLoss(1*REAGENTS_EFFECT_MULTIPLIER, FALSE)
+ update_flags |= M.adjustFireLoss(1, FALSE)
+ return ..() | update_flags
/datum/reagent/facid/reaction_mob(mob/living/M, method=TOUCH, volume)
if(method == TOUCH || method == INGEST)
@@ -635,26 +659,27 @@
taste_message = null
/datum/reagent/initropidril/on_mob_life(mob/living/M)
+ var/update_flags = STATUS_UPDATE_NONE
if(prob(33))
- M.adjustToxLoss(rand(5,25))
+ update_flags |= M.adjustToxLoss(rand(5,25), FALSE)
if(prob(33))
to_chat(M, "You feel horribly weak.")
- M.Stun(2)
+ update_flags |= M.Stun(2, FALSE)
if(prob(10))
to_chat(M, "You cannot breathe!")
- M.adjustOxyLoss(10)
+ update_flags |= M.adjustOxyLoss(10, FALSE)
M.AdjustLoseBreath(1)
if(prob(10))
to_chat(M, "Your chest is burning with pain!")
- M.adjustOxyLoss(10)
+ update_flags |= M.adjustOxyLoss(10, FALSE)
M.AdjustLoseBreath(1)
- M.Stun(3)
- M.Weaken(2)
+ update_flags |= M.Stun(3, FALSE)
+ update_flags |= M.Weaken(2, FALSE)
if(ishuman(M))
var/mob/living/carbon/human/H = M
if(!H.undergoing_cardiac_arrest())
H.set_heartattack(TRUE) // rip in pepperoni
- ..()
+ return ..() | update_flags
/datum/reagent/pancuronium
name = "Pancuronium"
@@ -666,6 +691,7 @@
taste_message = null
/datum/reagent/pancuronium/on_mob_life(mob/living/M)
+ var/update_flags = STATUS_UPDATE_NONE
switch(current_cycle)
if(1 to 5)
if(prob(10))
@@ -673,12 +699,12 @@
if(6 to 10)
if(prob(8))
to_chat(M, "You feel [pick("weak", "horribly weak", "numb", "like you can barely move", "tingly")].")
- M.Stun(1)
+ update_flags |= M.Stun(1, FALSE)
else if(prob(8))
M.emote(pick("drool", "tremble"))
if(11 to INFINITY)
- M.Stun(20)
- M.Weaken(20)
+ update_flags |= M.Stun(20, FALSE)
+ update_flags |= M.Weaken(20, FALSE)
if(prob(10))
M.emote(pick("drool", "tremble", "gasp"))
M.AdjustLoseBreath(1)
@@ -687,7 +713,7 @@
if(prob(7))
to_chat(M, "You can't breathe!")
M.AdjustLoseBreath(3)
- ..()
+ return ..() | update_flags
/datum/reagent/sodium_thiopental
name = "Sodium Thiopental"
@@ -700,6 +726,7 @@
taste_message = null
/datum/reagent/sodium_thiopental/on_mob_life(mob/living/M)
+ var/update_flags = STATUS_UPDATE_NONE
switch(current_cycle)
if(1)
M.emote("drool")
@@ -708,14 +735,14 @@
M.Drowsy(20)
if(5)
M.emote("faint")
- M.Weaken(5)
+ update_flags |= M.Weaken(5, FALSE)
if(6 to INFINITY)
- M.Paralyse(20)
+ update_flags |= M.Paralyse(20, FALSE)
M.AdjustJitter(-50)
if(prob(10))
M.emote("drool")
- M.adjustBrainLoss(1)
- ..()
+ update_flags |= M.adjustBrainLoss(1, FALSE)
+ return ..() | update_flags
/datum/reagent/ketamine
name = "Ketamine"
@@ -729,20 +756,21 @@
taste_message = null
/datum/reagent/ketamine/on_mob_life(mob/living/M)
+ var/update_flags = STATUS_UPDATE_NONE
switch(current_cycle)
if(1 to 5)
if(prob(25))
M.emote("yawn")
if(6 to 9)
- M.AdjustEyeBlurry(5)
+ update_flags |= M.AdjustEyeBlurry(5, FALSE)
if(prob(35))
M.emote("yawn")
if(10)
M.emote("faint")
- M.Weaken(5)
+ update_flags |= M.Weaken(5, FALSE)
if(11 to INFINITY)
- M.Paralyse(25)
- ..()
+ update_flags |= M.Paralyse(25, FALSE)
+ return ..() | update_flags
/datum/reagent/sulfonal
name = "Sulfonal"
@@ -753,6 +781,7 @@
metabolization_rate = 0.1
/datum/reagent/sulfonal/on_mob_life(mob/living/M)
+ var/update_flags = STATUS_UPDATE_NONE
M.AdjustJitter(-30)
switch(current_cycle)
if(1 to 10)
@@ -765,10 +794,10 @@
if(22 to INFINITY)
if(prob(20))
M.emote("faint")
- M.Paralyse(5)
+ update_flags |= M.Paralyse(5, FALSE)
M.Drowsy(20)
- M.adjustToxLoss(1)
- ..()
+ update_flags |= M.adjustToxLoss(1, FALSE)
+ return ..() | update_flags
/datum/reagent/amanitin
name = "Amanitin"
@@ -792,19 +821,20 @@
taste_message = "battery acid"
/datum/reagent/lipolicide/on_mob_life(mob/living/M)
+ var/update_flags = STATUS_UPDATE_NONE
if(!M.nutrition)
switch(rand(1,3))
if(1)
to_chat(M, "You feel hungry...")
if(2)
- M.adjustToxLoss(1)
+ update_flags |= M.adjustToxLoss(1, FALSE)
to_chat(M, "Your stomach grumbles painfully!")
else
if(prob(60))
var/fat_to_burn = max(round(M.nutrition/100,1), 5)
M.nutrition = max(0, M.nutrition-fat_to_burn)
M.overeatduration = 0
- ..()
+ return ..() | update_flags
/datum/reagent/coniine
name = "Coniine"
@@ -816,9 +846,10 @@
can_synth = FALSE
/datum/reagent/coniine/on_mob_life(mob/living/M)
- M.adjustToxLoss(2)
+ var/update_flags = STATUS_UPDATE_NONE
+ update_flags |= M.adjustToxLoss(2, FALSE)
M.AdjustLoseBreath(5)
- ..()
+ return ..() | update_flags
/datum/reagent/curare
name = "Curare"
@@ -830,28 +861,29 @@
penetrates_skin = TRUE
/datum/reagent/curare/on_mob_life(mob/living/M)
- M.adjustToxLoss(1)
- M.adjustOxyLoss(1)
+ var/update_flags = STATUS_UPDATE_NONE
+ update_flags |= M.adjustToxLoss(1, FALSE)
+ update_flags |= M.adjustOxyLoss(1, FALSE)
switch(current_cycle)
if(1 to 5)
if(prob(20))
M.emote(pick("drool", "pale", "gasp"))
if(6 to 10)
- M.AdjustEyeBlurry(5)
+ update_flags |= M.AdjustEyeBlurry(5, FALSE)
if(prob(8))
to_chat(M, "You feel [pick("weak", "horribly weak", "numb", "like you can barely move", "tingly")].")
- M.Stun(1)
+ update_flags |= M.Stun(1, FALSE)
else if(prob(8))
- M.emote(pick("drool","pale", "gasp"))
+ M.emote(pick("drool", "pale", "gasp"))
if(11 to INFINITY)
- M.Stun(30)
+ update_flags |= M.Stun(30, FALSE)
M.Drowsy(20)
if(prob(20))
M.emote(pick("drool", "faint", "pale", "gasp", "collapse"))
else if(prob(8))
to_chat(M, "You can't [pick("breathe", "move", "feel your legs", "feel your face", "feel anything")]!")
M.AdjustLoseBreath(1)
- ..()
+ return ..() | update_flags
/datum/reagent/heparin //Based on a real-life anticoagulant.
name = "Heparin"
@@ -862,11 +894,12 @@
metabolization_rate = 0.2 * REAGENTS_METABOLISM
/datum/reagent/heparin/on_mob_life(mob/living/M)
+ var/update_flags = STATUS_UPDATE_NONE
if(ishuman(M))
var/mob/living/carbon/human/H = M
H.bleed_rate = min(H.bleed_rate + 2, 8)
- H.adjustBruteLoss(1)
- ..()
+ update_flags |= H.adjustBruteLoss(1, FALSE)
+ return ..() | update_flags
/datum/reagent/sarin
name = "Sarin"
@@ -880,6 +913,7 @@
taste_message = null
/datum/reagent/sarin/on_mob_life(mob/living/M)
+ var/update_flags = STATUS_UPDATE_NONE
switch(current_cycle)
if(1 to 15)
M.AdjustJitter(20)
@@ -888,23 +922,23 @@
if(16 to 30)
if(prob(25))
M.emote(pick("twitch","twitch","drool","quiver","tremble"))
- M.AdjustEyeBlurry(5)
+ update_flags |= M.AdjustEyeBlurry(5, FALSE)
M.Stuttering(5)
if(prob(10))
M.Confused(15)
if(prob(15))
- M.Stun(1)
+ update_flags |= M.Stun(1, FALSE)
M.emote("scream")
if(30 to 60)
- M.AdjustEyeBlurry(5)
+ update_flags |= M.AdjustEyeBlurry(5, FALSE)
M.Stuttering(5)
if(prob(10))
- M.Stun(1)
+ update_flags |= M.Stun(1, FALSE)
M.emote(pick("twitch","twitch","drool","shake","tremble"))
if(prob(5))
M.emote("collapse")
if(prob(5))
- M.Weaken(3)
+ update_flags |= M.Weaken(3, FALSE)
M.visible_message("[M] has a seizure!")
M.SetJitter(1000)
if(prob(5))
@@ -915,15 +949,15 @@
if(prob(15))
M.emote(pick("gasp", "choke", "cough","twitch", "shake", "tremble","quiver","drool", "twitch","collapse"))
M.LoseBreath(5)
- M.adjustToxLoss(1)
- M.adjustBrainLoss(1)
- M.Weaken(4)
+ update_flags |= M.adjustToxLoss(1, FALSE)
+ update_flags |= M.adjustBrainLoss(1, FALSE)
+ update_flags |= M.Weaken(4, FALSE)
if(prob(8))
M.fakevomit()
- M.adjustToxLoss(1)
- M.adjustBrainLoss(1)
- M.adjustFireLoss(1)
- ..()
+ update_flags |= M.adjustToxLoss(1, FALSE)
+ update_flags |= M.adjustBrainLoss(1, FALSE)
+ update_flags |= M.adjustFireLoss(1, FALSE)
+ return ..() | update_flags
/datum/reagent/glyphosate
name = "Glyphosate"
@@ -934,8 +968,9 @@
var/lethality = 0 //Glyphosate is non-toxic to people
/datum/reagent/glyphosate/on_mob_life(mob/living/M)
- M.adjustToxLoss(lethality)
- ..()
+ var/update_flags = STATUS_UPDATE_NONE
+ update_flags |= M.adjustToxLoss(lethality, FALSE)
+ return ..() | update_flags
/datum/reagent/glyphosate/reaction_turf(turf/simulated/wall/W, volume) // Clear off wallrot fungi
if(istype(W) && W.rotting)
@@ -985,8 +1020,9 @@
color = "#4B004B" // rgb: 75, 0, 75
/datum/reagent/pestkiller/on_mob_life(mob/living/M)
- M.adjustToxLoss(1)
- ..()
+ var/update_flags = STATUS_UPDATE_NONE
+ update_flags |= M.adjustToxLoss(1, FALSE)
+ return ..() | update_flags
/datum/reagent/pestkiller/reaction_mob(mob/living/M, method=TOUCH, volume)
if(iscarbon(M))
@@ -1008,19 +1044,20 @@
taste_message = "sweetness"
/datum/reagent/capulettium/on_mob_life(mob/living/M)
+ var/update_flags = STATUS_UPDATE_NONE
switch(current_cycle)
if(1 to 5)
- M.AdjustEyeBlurry(10)
+ update_flags |= M.AdjustEyeBlurry(10, FALSE)
if(6 to 10)
M.Drowsy(10)
if(11)
- M.Paralyse(10)
+ update_flags |= M.Paralyse(10, FALSE)
M.visible_message("[M] seizes up and falls limp, [M.p_their()] eyes dead and lifeless...") //so you can't trigger deathgasp emote on people. Edge case, but necessary.
if(12 to 60)
- M.Paralyse(10)
+ update_flags |= M.Paralyse(10, FALSE)
if(61 to INFINITY)
- M.AdjustEyeBlurry(10)
- ..()
+ update_flags |= M.AdjustEyeBlurry(10, FALSE)
+ return ..() | update_flags
/datum/reagent/capulettium_plus
name = "Capulettium Plus"
@@ -1033,7 +1070,7 @@
/datum/reagent/capulettium_plus/on_mob_life(mob/living/M)
M.Silence(2)
- ..()
+ return ..()
/datum/reagent/toxic_slurry
name = "Toxic Slurry"
@@ -1043,14 +1080,15 @@
color = "#00C81E"
/datum/reagent/toxic_slurry/on_mob_life(mob/living/M)
+ var/update_flags = STATUS_UPDATE_NONE
if(prob(10))
- M.adjustToxLoss(rand(2.4))
+ update_flags |= M.adjustToxLoss(rand(2.4), FALSE)
if(prob(7))
to_chat(M, "A horrible migraine overpowers you.")
- M.Stun(rand(2,5))
+ update_flags |= M.Stun(rand(2,5), FALSE)
if(prob(7))
M.fakevomit(1)
- ..()
+ return ..() | update_flags
/datum/reagent/glowing_slurry
name = "Glowing Slurry"
@@ -1079,7 +1117,7 @@
randmutg(M)
domutcheck(M, null)
M.UpdateAppearance()
- ..()
+ return ..()
/datum/reagent/ants
name = "Ants"
@@ -1091,8 +1129,9 @@
taste_message = "ANTS OH GOD"
/datum/reagent/ants/on_mob_life(mob/living/M)
- M.adjustBruteLoss(2)
- ..()
+ var/update_flags = STATUS_UPDATE_NONE
+ update_flags |= M.adjustBruteLoss(2, FALSE)
+ return ..() | update_flags
/datum/reagent/ants/reaction_mob(mob/living/M, method=TOUCH, volume) //NOT THE ANTS
if(iscarbon(M))
@@ -1118,4 +1157,4 @@
shock_timer = 0
M.electrocute_act(rand(5,20), "Teslium in their body", 1, 1) //Override because it's caused from INSIDE of you
playsound(M, "sparks", 50, 1)
- ..()
+ return ..()
diff --git a/code/modules/reagents/chemistry/reagents/water.dm b/code/modules/reagents/chemistry/reagents/water.dm
index 7779cb91d85..cb1dfb0928e 100644
--- a/code/modules/reagents/chemistry/reagents/water.dm
+++ b/code/modules/reagents/chemistry/reagents/water.dm
@@ -316,7 +316,7 @@
M.fakevomit(1)
else
M.fakevomit(0)
- ..()
+ return ..()
/datum/reagent/fishwater/toiletwater
name = "Toilet Water"
@@ -342,6 +342,7 @@
taste_message = null
/datum/reagent/holywater/on_mob_life(mob/living/M)
+ var/update_flags = STATUS_UPDATE_NONE
M.AdjustJitter(-5)
if(current_cycle >= 30) // 12 units, 60 seconds @ metabolism 0.4 units & tick rate 2.0 sec
M.AdjustStuttering(4, bound_lower = 0, bound_upper = 20)
@@ -370,7 +371,7 @@
if(M.mind.vampire.bloodusable)
M.Stuttering(1)
M.Jitter(30)
- M.adjustStaminaLoss(5)
+ update_flags |= M.adjustStaminaLoss(5, FALSE)
if(prob(20))
M.emote("scream")
M.mind.vampire.nullified = max(5, M.mind.vampire.nullified + 2)
@@ -388,7 +389,7 @@
M.mind.vampire.nullified = max(5, M.mind.vampire.nullified + 2)
if(5 to 12)
to_chat(M, "You feel an intense burning inside of you!")
- M.adjustFireLoss(1)
+ update_flags |= M.adjustFireLoss(1, FALSE)
M.Stuttering(1)
M.Jitter(20)
if(prob(20))
@@ -400,13 +401,13 @@
O.show_message(text("[] suddenly bursts into flames!", M), 1)
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.adjustFireLoss(3) //Hence the other damages... ain't I a bastard?
+ update_flags |= M.adjustFireLoss(3, FALSE) //Hence the other damages... ain't I a bastard?
M.Stuttering(1)
M.Jitter(30)
if(prob(40))
M.emote("scream")
M.mind.vampire.nullified = max(5, M.mind.vampire.nullified + 2)
- ..()
+ return ..() | update_flags
/datum/reagent/holywater/reaction_mob(mob/living/M, method=TOUCH, volume)
@@ -442,23 +443,24 @@
taste_message = null
/datum/reagent/fuel/unholywater/on_mob_life(mob/living/M)
+ var/update_flags = STATUS_UPDATE_NONE
if(iscultist(M))
M.AdjustDrowsy(-5)
- M.AdjustParalysis(-1)
- M.AdjustStunned(-2)
- M.AdjustWeakened(-2)
- M.adjustToxLoss(-2)
- M.adjustFireLoss(-2)
- M.adjustOxyLoss(-2)
- M.adjustBruteLoss(-2)
+ update_flags |= M.AdjustParalysis(-1, FALSE)
+ update_flags |= M.AdjustStunned(-2, FALSE)
+ update_flags |= M.AdjustWeakened(-2, FALSE)
+ update_flags |= M.adjustToxLoss(-2, FALSE)
+ update_flags |= M.adjustFireLoss(-2, FALSE)
+ update_flags |= M.adjustOxyLoss(-2, FALSE)
+ update_flags |= M.adjustBruteLoss(-2, FALSE)
else
- M.adjustBrainLoss(3)
- M.adjustToxLoss(1)
- M.adjustFireLoss(2)
- M.adjustOxyLoss(2)
- M.adjustBruteLoss(2)
+ update_flags |= M.adjustBrainLoss(3, FALSE)
+ update_flags |= M.adjustToxLoss(1, FALSE)
+ update_flags |= M.adjustFireLoss(2, FALSE)
+ update_flags |= M.adjustOxyLoss(2, FALSE)
+ update_flags |= M.adjustBruteLoss(2, FALSE)
M.AdjustCultSlur(10)//CUASE WHY THE HELL NOT
- ..()
+ return ..() | update_flags
/datum/reagent/hellwater
name = "Hell Water"
@@ -470,12 +472,13 @@
taste_message = "admin abuse"
/datum/reagent/hellwater/on_mob_life(mob/living/M)
+ var/update_flags = STATUS_UPDATE_NONE
M.fire_stacks = min(5, M.fire_stacks + 3)
M.IgniteMob() //Only problem with igniting people is currently the commonly availible fire suits make you immune to being on fire
- M.adjustToxLoss(1)
- M.adjustFireLoss(1) //Hence the other damages... ain't I a bastard?
- M.adjustBrainLoss(5)
- ..()
+ update_flags |= M.adjustToxLoss(1, FALSE)
+ update_flags |= M.adjustFireLoss(1, FALSE) //Hence the other damages... ain't I a bastard?
+ update_flags |= M.adjustBrainLoss(5, FALSE)
+ return ..() | update_flags
/datum/reagent/liquidgibs
name = "Liquid gibs"
diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm
index eb588200265..4bbc25a8037 100644
--- a/code/modules/recycling/conveyor2.dm
+++ b/code/modules/recycling/conveyor2.dm
@@ -1,262 +1,261 @@
+#define DIRECTION_FORWARDS 1
+#define DIRECTION_OFF 0
+#define DIRECTION_REVERSED -1
+
+GLOBAL_LIST_INIT(conveyor_belts, list()) //Saves us having to look through the entire machines list for our things
+GLOBAL_LIST_INIT(conveyor_switches, list())
+
//conveyor2 is pretty much like the original, except it supports corners, but not diverters.
-//note that corner pieces transfer stuff clockwise when running forward, and anti-clockwise backwards.
+//Except this is pretty heavily modified so it's more like conveyor2.5
/obj/machinery/conveyor
icon = 'icons/obj/recycling.dmi'
- icon_state = "conveyor0"
+ icon_state = "conveyor_stopped_cw"
name = "conveyor belt"
- desc = "A conveyor belt."
- layer = 2 // so they appear under stuff
- anchored = 1
- var/operating = 0 // 1 if running forward, -1 if backwards, 0 if off
- var/operable = 1 // true if can operate (no broken segments in this belt run)
- var/forwards // this is the default (forward) direction, set by the map dir
- var/backwards // hopefully self-explanatory
- var/movedir // the actual direction to move stuff in
-
- var/list/affecting // the list of all items that will be moved this ptick
- var/id = "" // the control ID - must match controller ID
- var/verted = 1 // set to -1 to have the conveyour belt be inverted, so you can use the other corner icons
- speed_process = 1
-
-/obj/machinery/conveyor/centcom_auto
- id = "round_end_belt"
-
-
-// Auto conveyor is always on unless unpowered
-
-/obj/machinery/conveyor/auto/New(loc, newdir)
- ..(loc, newdir)
- operating = 1
- update_move_direction()
-
-/obj/machinery/conveyor/auto/update()
- if(stat & BROKEN)
- icon_state = "conveyor-broken"
- operating = 0
- return
- else if(!operable)
- operating = 0
- else if(stat & NOPOWER)
- operating = 0
- else
- operating = 1
- icon_state = "conveyor[operating * verted]"
+ desc = "It's a conveyor belt, commonly used to transport large numbers of items elsewhere quite quickly."
+ layer = CONVEYOR_LAYER // so they appear under stuff but not below stuff like vents
+ anchored = TRUE
+ var/operating = FALSE //NB: this can be TRUE while the belt doesn't go
+ var/forwards // The direction the conveyor sends you in
+ var/backwards // hopefully self-explanatory
+ var/clockwise = TRUE // For corner pieces - do we go clockwise or counterclockwise?
+ var/operable = TRUE // Can this belt actually go?
+ var/list/affecting // the list of all items that will be moved this ptick
+ var/reversed = FALSE // set to TRUE to have the conveyor belt be reversed
+ speed_process = TRUE //gotta go fast
+ var/id //ID of the connected lever
// create a conveyor
-/obj/machinery/conveyor/New(loc, newdir)
+/obj/machinery/conveyor/New(loc, new_dir, new_id)
..(loc)
- if(newdir)
- dir = newdir
+ GLOB.conveyor_belts += src
+ if(new_id)
+ id = new_id
+ if(new_dir)
+ dir = new_dir
update_move_direction()
+ for(var/I in GLOB.conveyor_switches)
+ var/obj/machinery/conveyor_switch/S = I
+ if(id == S.id)
+ S.conveyors += src
+
+/obj/machinery/conveyor/Destroy()
+ GLOB.conveyor_belts -= src
+ return ..()
/obj/machinery/conveyor/setDir(newdir)
. = ..()
update_move_direction()
-
-/obj/machinery/conveyor/proc/update_move_direction()
- switch(dir)
- if(NORTH)
- forwards = NORTH
- backwards = SOUTH
- if(SOUTH)
- forwards = SOUTH
- backwards = NORTH
- if(EAST)
- forwards = EAST
- backwards = WEST
- if(WEST)
- forwards = WEST
- backwards = EAST
- if(NORTHEAST)
- forwards = EAST
- backwards = SOUTH
- if(NORTHWEST)
- forwards = SOUTH
- backwards = WEST
- if(SOUTHEAST)
- forwards = NORTH
- backwards = EAST
- if(SOUTHWEST)
- forwards = WEST
- backwards = NORTH
- if(verted == -1)
- var/temp = forwards
- forwards = backwards
- backwards = temp
- if(operating == 1)
- movedir = forwards
- else
- movedir = backwards
- update()
-
-
-/obj/machinery/conveyor/proc/update()
- if(stat & BROKEN)
- icon_state = "conveyor-broken"
- operating = 0
- return
- if(!operable)
- operating = 0
- if(stat & NOPOWER)
- operating = 0
- icon_state = "conveyor[operating * verted]"
-
- // machine process
- // move items to the target location
-/obj/machinery/conveyor/process()
- if(stat & (BROKEN | NOPOWER))
- return
- if(!operating)
- return
- use_power(100)
-
- affecting = loc.contents - src // moved items will be all in loc
- sleep(1)
- for(var/atom/movable/A in affecting)
- if(!A.anchored)
- if(A.loc == loc) // prevents the object from being affected if it's not currently here.
- step(A,movedir)
- CHECK_TICK
-
-
-
// attack with item, place item on conveyor
-/obj/machinery/conveyor/attackby(obj/item/I, mob/user, params)
- if(istype(I, /obj/item/crowbar))
+/obj/machinery/conveyor/attackby(obj/item/I, mob/user)
+ if(iscrowbar(I))
if(!(stat & BROKEN))
- var/obj/item/conveyor_construct/C = new/obj/item/conveyor_construct(src.loc)
+ var/obj/item/conveyor_construct/C = new(loc)
C.id = id
transfer_fingerprints_to(C)
playsound(loc, I.usesound, 50, 1)
- to_chat(usr,"You remove the conveyor belt.")
+ to_chat(user,"You remove the conveyor belt.")
qdel(src)
-
- else if(istype(I, /obj/item/wrench))
- if(!(stat & BROKEN))
- playsound(loc, I.usesound, 50, 1)
- dir = turn(dir,-45)
- update_move_direction()
- to_chat(user, "You rotate [src].")
-
+ else if(stat & BROKEN)
+ return ..()
+ else if(iswrench(I))
+ set_rotation(user)
+ update_move_direction()
+ playsound(loc, I.usesound, 50, 1)
+ else if(istype(I, /obj/item/conveyor_switch_construct))
+ var/obj/item/conveyor_switch_construct/S = I
+ if(S.id == id)
+ return ..()
+ for(var/obj/machinery/conveyor_switch/CS in GLOB.conveyor_switches)
+ if(CS.id == id)
+ CS.conveyors -= src
+ id = S.id
+ to_chat(user, "You link [I] with [src].")
else if(user.a_intent != INTENT_HARM)
if(user.drop_item())
I.forceMove(loc)
else
return ..()
-
// attack with hand, move pulled object onto conveyor
/obj/machinery/conveyor/attack_hand(mob/user as mob)
user.Move_Pulled(src)
+/obj/machinery/conveyor/update_icon()
+ ..()
+ if(operating && can_conveyor_run())
+ icon_state = "conveyor_started_[clockwise ? "cw" : "ccw"]"
+ if(reversed)
+ icon_state += "_r"
+ else
+ icon_state = "conveyor_stopped_[clockwise ? "cw" : "ccw"]"
-// make the conveyor broken
-// also propagate inoperability to any connected conveyor with the same ID
-/obj/machinery/conveyor/proc/broken()
- stat |= BROKEN
- update()
-
- var/obj/machinery/conveyor/C = locate() in get_step(src, dir)
- if(C)
- C.set_operable(dir, id, 0)
-
- C = locate() in get_step(src, turn(dir,180))
- if(C)
- C.set_operable(turn(dir,180), id, 0)
-
-
-//set the operable var if ID matches, propagating in the given direction
-
-/obj/machinery/conveyor/proc/set_operable(stepdir, match_id, op)
-
- if(id != match_id)
+/obj/machinery/conveyor/proc/update_move_direction()
+ update_icon()
+ switch(dir)
+ if(NORTH)
+ forwards = NORTH
+ backwards = SOUTH
+ if(EAST)
+ forwards = EAST
+ backwards = WEST
+ if(SOUTH)
+ forwards = SOUTH
+ backwards = NORTH
+ if(WEST)
+ forwards = WEST
+ backwards = EAST
+ if(NORTHEAST)
+ forwards = clockwise ? EAST : NORTH
+ backwards = clockwise ? SOUTH : WEST
+ if(SOUTHEAST)
+ forwards = clockwise ? SOUTH : EAST
+ backwards = clockwise ? WEST : NORTH
+ if(SOUTHWEST)
+ forwards = clockwise ? WEST : SOUTH
+ backwards = clockwise ? NORTH : EAST
+ if(NORTHWEST)
+ forwards = clockwise ? NORTH : WEST
+ backwards = clockwise ? EAST : SOUTH
+ if(!reversed)
return
- operable = op
+ var/temporary_direction = forwards
+ forwards = backwards
+ backwards = temporary_direction
- update()
- var/obj/machinery/conveyor/C = locate() in get_step(src, stepdir)
- if(C)
- C.set_operable(stepdir, id, op)
-
-/*
-/obj/machinery/conveyor/verb/destroy()
- set src in view()
- src.broken()
-*/
+/obj/machinery/conveyor/proc/set_rotation(mob/user)
+ dir = turn(reversed ? backwards : forwards, -90) //Fuck it, let's do it this way instead of doing something clever with dir
+ var/turf/left = get_step(src, turn(dir, 90)) //We need to get conveyors to the right, left, and behind this one to be able to determine if we need to make a corner piece
+ var/turf/right = get_step(src, turn(dir, -90))
+ var/turf/back = get_step(src, turn(dir, 180))
+ to_chat(user, "You rotate [src].")
+ var/obj/machinery/conveyor/CL = locate() in left
+ var/obj/machinery/conveyor/CR = locate() in right
+ var/obj/machinery/conveyor/CB = locate() in back
+ var/link_to_left = FALSE
+ var/link_to_right = FALSE
+ var/link_to_back = FALSE
+ if(CL)
+ if(CL.id == id && get_step(CL, CL.reversed ? CL.backwards : CL.forwards) == loc)
+ link_to_left = TRUE
+ if(CR)
+ if(CR.id == id && get_step(CR, CR.reversed ? CR.backwards : CR.forwards) == loc)
+ link_to_right = TRUE
+ if(CB)
+ if(CB.id == id && get_step(CB, CB.reversed ? CB.backwards : CB.forwards) == loc)
+ link_to_back = TRUE
+ if(link_to_back) //Don't need to do anything because we can assume the conveyor carries on in a line
+ return
+ else if(!(link_to_left ^ link_to_right)) //Either no valid conveyors point here, or two point here (making a "junction" with this belt as the middle piece). Either way we don't need a corner
+ return
+ if(link_to_right)
+ dir = turn(dir, 45)
+ clockwise = TRUE
+ else if(link_to_left)
+ dir = turn(dir, -45)
+ clockwise = FALSE
/obj/machinery/conveyor/power_change()
..()
- update()
+ update_icon()
+
+/obj/machinery/conveyor/process()
+ if(!operating)
+ return
+ if(!can_conveyor_run())
+ return
+ use_power(100)
+ affecting = loc.contents - src // moved items will be all in loc
+ if(!affecting)
+ return
+ sleep(1)
+ for(var/atom/movable/A in affecting)
+ if(!A.anchored)
+ if(A.loc == loc) // prevents the object from being affected if it's not currently here.
+ step(A,forwards)
+ CHECK_TICK
+
+/obj/machinery/conveyor/proc/can_conveyor_run()
+ if(stat & BROKEN)
+ return FALSE
+ else if(stat & NOPOWER)
+ return FALSE
+ else if(!operable)
+ return FALSE
+ return TRUE
+
+// make the conveyor broken and propagate inoperability to any connected conveyor with the same conveyor datum
+/obj/machinery/conveyor/proc/make_broken()
+ stat |= BROKEN
+ operable = FALSE
+ update_icon()
+ var/obj/machinery/conveyor/C = locate() in get_step(src, forwards)
+ if(C)
+ C.set_operable(TRUE, id, FALSE)
+ C = locate() in get_step(src, backwards)
+ if(C)
+ C.set_operable(FALSE, id, FALSE)
+
+/obj/machinery/conveyor/proc/set_operable(propagate_forwards, match_id, op) //Sets a conveyor inoperable if ID matches it, and propagates forwards / backwards
+ if(id != match_id)
+ return
+ operable = op
+ update_icon()
+ var/obj/machinery/conveyor/C = locate() in get_step(src, propagate_forwards ? forwards : backwards)
+ if(C)
+ C.set_operable(propagate_forwards ? TRUE : FALSE, id, op)
// the conveyor control switch
-//
-//
/obj/machinery/conveyor_switch
-
name = "conveyor switch"
- desc = "A conveyor control switch."
+ desc = "This switch controls any and all conveyor belts it is linked to."
icon = 'icons/obj/recycling.dmi'
icon_state = "switch-off"
- var/position = 0 // 0 off, -1 reverse, 1 forward
- var/last_pos = -1 // last direction setting
- var/operated = 1 // true if just operated
- var/convdir = 0 // 0 is two way switch, 1 and -1 means one way
+ var/position = DIRECTION_OFF
+ var/reversed = TRUE
+ var/one_way = FALSE // Do we go in one direction?
+ anchored = TRUE
+ var/id
+ var/list/conveyors = list()
- var/id = "" // must match conveyor IDs to control them
-
- var/list/conveyors // the list of converyors that are controlled by this switch
- anchored = 1
- speed_process = 1
-
-
-/obj/machinery/conveyor_switch/New(newloc, newid)
+/obj/machinery/conveyor_switch/New(newloc, new_id)
..(newloc)
+ GLOB.conveyor_switches += src
if(!id)
- id = newid
- update()
-
- spawn(5)
- conveyors = list()
- for(var/obj/machinery/conveyor/C in machines)
- if(C.id == id)
- conveyors += C
+ id = new_id
+ for(var/I in GLOB.conveyor_belts)
+ var/obj/machinery/conveyor/C = I
+ if(C.id == id)
+ conveyors += C
+/obj/machinery/conveyor_switch/Destroy()
+ GLOB.conveyor_switches -= src
+ return ..()
// update the icon depending on the position
-/obj/machinery/conveyor_switch/proc/update()
- if(position<0)
- icon_state = "switch-rev"
- else if(position>0)
- icon_state = "switch-fwd"
- else
+/obj/machinery/conveyor_switch/update_icon()
+ overlays.Cut()
+ if(!position)
icon_state = "switch-off"
-
-
-// timed process
-// if the switch changed, update the linked conveyors
-
-/obj/machinery/conveyor_switch/process()
- if(!operated)
- return
- operated = 0
-
- for(var/obj/machinery/conveyor/C in conveyors)
- C.operating = position
- C.update_move_direction()
- CHECK_TICK
+ else if(position == DIRECTION_REVERSED)
+ icon_state = "switch-rev"
+ if(!(stat & NOPOWER))
+ overlays += "redlight"
+ else if(position == DIRECTION_FORWARDS)
+ icon_state = "switch-fwd"
+ if(!(stat & NOPOWER))
+ overlays += "greenlight"
/obj/machinery/conveyor_switch/oneway
- convdir = 1 //Set to 1 or -1 depending on which way you want the convayor to go. (In other words keep at 1 and set the proper dir on the belts.) - Cargo uses a reverse belt.
+ one_way = TRUE
// attack with hand, switch position
/obj/machinery/conveyor_switch/attack_hand(mob/user)
if(..())
- return 1
-
+ return TRUE
toggle(user)
/obj/machinery/conveyor_switch/attack_ghost(mob/user)
@@ -264,125 +263,215 @@
toggle(user)
/obj/machinery/conveyor_switch/proc/toggle(mob/user)
+ add_fingerprint(user)
if(!allowed(user) && !user.can_advanced_admin_interact()) //this is in Para but not TG. I don't think there's any which are set anyway.
to_chat(user, "Access denied.")
return
-
- add_fingerprint(user)
- if(position == 0)
- if(convdir) //is it a oneway switch
- position = convdir
- else
- if(last_pos < 0)
- position = 1
- last_pos = 0
- else
- position = -1
- last_pos = 0
+ if(position)
+ position = DIRECTION_OFF
else
- last_pos = position
- position = 0
-
- operated = 1
- update()
-
- // find any switches with same id as this one, and set their positions to match us
- for(var/obj/machinery/conveyor_switch/S in machines)
- if(S.id == src.id)
- S.position = position
- S.update()
+ reversed = one_way ? FALSE : !reversed
+ position = reversed ? DIRECTION_REVERSED : DIRECTION_FORWARDS
+ update_icon()
+ for(var/obj/machinery/conveyor/C in conveyors)
+ C.operating = abs(position)
+ if(C.reversed != reversed)
+ C.reversed = reversed
+ C.update_move_direction()
+ else
+ C.update_icon()
+ CHECK_TICK
+ for(var/I in GLOB.conveyor_switches) // find any switches with same id as this one, and set their positions to match us
+ var/obj/machinery/conveyor_switch/S = I
+ if(S == src || S.id != id)
+ continue
+ S.position = position
+ S.one_way = one_way //Break everything!!1!
+ S.reversed = reversed
+ S.update_icon()
CHECK_TICK
-/obj/machinery/conveyor_switch/attackby(obj/item/I, mob/user, params)
- if(istype(I, /obj/item/crowbar))
- var/obj/item/conveyor_switch_construct/C = new/obj/item/conveyor_switch_construct(src.loc)
- C.id = id
+/obj/machinery/conveyor_switch/attackby(obj/item/I, mob/user)
+ if(iscrowbar(I))
+ var/obj/item/conveyor_switch_construct/C = new(loc, id)
transfer_fingerprints_to(C)
- to_chat(user,"You deattach the conveyor switch.")
+ to_chat(user,"You detach the conveyor switch.")
qdel(src)
-
- else if(istype(I, /obj/item/multitool))
+ else if(ismultitool(I))
update_multitool_menu(user)
- return 1
-
+ else
+ return ..()
/obj/machinery/conveyor_switch/multitool_topic(var/mob/user,var/list/href_list,var/obj/O)
..()
if("toggle_logic" in href_list)
- if(convdir)
- convdir = 0
- else if(last_pos)
- convdir = last_pos
- else
- convdir = position
-
+ one_way = !one_way
+ update_multitool_menu(user)
/obj/machinery/conveyor_switch/multitool_menu(var/mob/user, var/obj/item/multitool/P)
return {"
"}
+/obj/machinery/conveyor_switch/power_change()
+ ..()
+ update_icon()
-
-//
// CONVEYOR CONSTRUCTION STARTS HERE
-//
/obj/item/conveyor_construct
icon = 'icons/obj/recycling.dmi'
- icon_state = "conveyor0"
+ icon_state = "conveyor_loose"
name = "conveyor belt assembly"
- desc = "A conveyor belt assembly."
+ desc = "A conveyor belt assembly, used for the assembly of conveyor belt systems."
w_class = WEIGHT_CLASS_BULKY
- var/id = "" //inherited by the belt
+ var/id
/obj/item/conveyor_construct/attackby(obj/item/I, mob/user, params)
..()
- if(istype(I, /obj/item/conveyor_switch_construct))
- to_chat(user, "You link the switch to the conveyor belt assembly.")
- var/obj/item/conveyor_switch_construct/C = I
- id = C.id
+ if(!istype(I, /obj/item/conveyor_switch_construct))
+ return
+ var/obj/item/conveyor_switch_construct/C = I
+ to_chat(user, "You link [src] to [C].")
+ id = C.id
-/obj/item/conveyor_construct/afterattack(atom/A, mob/user, proximity)
- if(!proximity || user.stat || !istype(A, /turf/simulated/floor) || istype(A, /area/shuttle))
+/obj/item/conveyor_construct/afterattack(turf/T, mob/user, proximity)
+ if(!proximity)
return
- var/cdir = get_dir(A, user)
- if(A == user.loc)
- to_chat(user, "You cannot place a conveyor belt under yourself.")
+ if(user.incapacitated())
return
- var/obj/machinery/conveyor/C = new/obj/machinery/conveyor(A,cdir)
- C.id = id
+ if(!istype(T, /turf/simulated/floor))
+ return
+ if(T == get_turf(user))
+ to_chat(user, "You cannot place [src] under yourself.")
+ return
+ if(locate(/obj/machinery/conveyor) in T) //Can't put conveyors beneath conveyors
+ to_chat(user, "There's already a conveyor there!")
+ return
+ var/obj/machinery/conveyor/C = new(T, user.dir, id)
transfer_fingerprints_to(C)
qdel(src)
/obj/item/conveyor_switch_construct
name = "conveyor switch assembly"
- desc = "A conveyor control switch assembly."
+ desc = "A conveyor control switch assembly. When set up, it'll control any and all conveyor belts it is linked to."
icon = 'icons/obj/recycling.dmi'
- icon_state = "switch-off"
+ icon_state = "switch"
w_class = WEIGHT_CLASS_BULKY
- var/id = "" //inherited by the switch
+ var/id
-/obj/item/conveyor_switch_construct/New()
- ..()
- id = rand() //this couldn't possibly go wrong
+/obj/item/conveyor_switch_construct/New(loc, new_id)
+ ..(loc)
+ if(new_id)
+ id = new_id
+ else
+ id = world.time + rand() //this couldn't possibly go wrong
-/obj/item/conveyor_switch_construct/afterattack(atom/A, mob/user, proximity)
- if(!proximity || user.stat || !istype(A, /turf/simulated/floor) || istype(A, /area/shuttle))
+
+/obj/item/conveyor_switch_construct/afterattack(turf/T, mob/user, proximity)
+ if(!proximity)
return
- var/found = 0
+ if(user.incapacitated())
+ return
+ if(!istype(T, /turf/simulated/floor))
+ return
+ var/found = FALSE
for(var/obj/machinery/conveyor/C in view())
- if(C.id == src.id)
- found = 1
+ if(C.id == id)
+ found = TRUE
break
if(!found)
- to_chat(usr, "[bicon(src)] The conveyor switch did not detect any linked conveyor belts in range.")
+ to_chat(user, "[src] did not detect any linked conveyor belts in range.")
return
- var/obj/machinery/conveyor_switch/NC = new/obj/machinery/conveyor_switch(A, id)
+ var/obj/machinery/conveyor_switch/NC = new(T, id)
transfer_fingerprints_to(NC)
qdel(src)
+/obj/item/conveyor_switch_construct/attackby(obj/item/I, mob/user)
+ if(!istype(I, /obj/item/conveyor_switch_construct))
+ return ..()
+ var/obj/item/conveyor_switch_construct/S = I
+ id = S.id
+ to_chat(user, "You link the two switch constructs.")
+
/obj/item/paper/conveyor
name = "paper- 'Nano-it-up U-build series, #9: Build your very own conveyor belt, in SPACE'"
- info = "Congratulations!
You are now the proud owner of the best conveyor set available for space mail order! We at Nano-it-up know you love to prepare your own structures without wasting time, so we have devised a special streamlined assembly procedure that puts all other mail-order products to shame!
Firstly, you need to link the conveyor switch assembly to each of the conveyor belt assemblies. After doing so, you simply need to install the belt assemblies onto the floor, et voila, belt built. Our special Nano-it-up smart switch will detected any linked assemblies as far as the eye can see!
Set single directional switches by using your multitool on the switch after you've installed the switch assembly.
This convenience, you can only have it when you Nano-it-up. Stay nano!
"
+ info = "Congratulations!
You are now the proud owner of the best conveyor set available for space mail order! \
+ We at Nano-it-up know you love to prepare your own structures without wasting time, so we have devised a special streamlined \
+ assembly procedure that puts all other mail-order products to shame!
\
+ Firstly, you need to link the conveyor switch assembly to each of the conveyor belt assemblies. After doing so, you simply need to install the belt \
+ assemblies onto the floor, et voila, belt built. Our special Nano-it-up smart switch will detected any linked assemblies as far as the eye can see!
\
+ Set single directional switches by using your multitool on the switch after you've installed the switch assembly.
\
+ This convenience, you can only have it when you Nano-it-up. Stay nano!
"
+
+/obj/machinery/conveyor/counterclockwise
+ clockwise = FALSE
+ icon_state = "conveyor_stopped_ccw"
+
+/obj/machinery/conveyor/auto/New(loc, newdir)
+ ..(loc, newdir)
+ operating = TRUE
+ update_icon()
+
+//Other types of conveyor, mostly for saving yourself a headache during mapping
+
+/obj/machinery/conveyor/north
+ dir = NORTH
+
+/obj/machinery/conveyor/northeast
+ dir = NORTHEAST
+
+/obj/machinery/conveyor/east
+ dir = EAST
+
+/obj/machinery/conveyor/southeast
+ dir = SOUTHEAST
+
+/obj/machinery/conveyor/south
+ dir = SOUTH
+
+/obj/machinery/conveyor/southwest
+ dir = SOUTHWEST
+
+/obj/machinery/conveyor/west
+ dir = WEST
+
+/obj/machinery/conveyor/northwest
+ dir = NORTHWEST
+
+/obj/machinery/conveyor/north/ccw
+ icon_state = "conveyor_stopped_ccw"
+ clockwise = FALSE
+
+/obj/machinery/conveyor/northeast/ccw
+ icon_state = "conveyor_stopped_ccw"
+ clockwise = FALSE
+
+/obj/machinery/conveyor/east/ccw
+ icon_state = "conveyor_stopped_ccw"
+ clockwise = FALSE
+
+/obj/machinery/conveyor/southeast/ccw
+ icon_state = "conveyor_stopped_ccw"
+ clockwise = FALSE
+
+/obj/machinery/conveyor/south/ccw
+ icon_state = "conveyor_stopped_ccw"
+ clockwise = FALSE
+
+/obj/machinery/conveyor/southwest/ccw
+ icon_state = "conveyor_stopped_ccw"
+ clockwise = FALSE
+
+/obj/machinery/conveyor/west/ccw
+ icon_state = "conveyor_stopped_ccw"
+ clockwise = FALSE
+
+/obj/machinery/conveyor/northwest/ccw
+ icon_state = "conveyor_stopped_ccw"
+ clockwise = FALSE
+
+#undef DIRECTION_FORWARDS
+#undef DIRECTION_OFF
+#undef DIRECTION_REVERSED
diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm
index 6a1f7883312..78e7ad47f57 100644
--- a/code/modules/recycling/disposal.dm
+++ b/code/modules/recycling/disposal.dm
@@ -580,7 +580,7 @@
/* if(hasmob && prob(3))
for(var/mob/living/H in src)
if(!istype(H,/mob/living/silicon/robot/drone)) //Drones use the mailing code to move through the disposal system,
- H.take_overall_damage(20, 0, "Blunt Trauma") */ //horribly maim any living creature jumping down disposals. c'est la vie
+ H.take_overall_damage(20, 0, TRUE, "Blunt Trauma") */ //horribly maim any living creature jumping down disposals. c'est la vie
if(has_fat_guy && prob(2)) // chance of becoming stuck per segment if contains a fat guy
active = 0
diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm
index 35bdb18caae..dd672e7938d 100644
--- a/code/modules/research/xenobiology/xenobiology.dm
+++ b/code/modules/research/xenobiology/xenobiology.dm
@@ -476,7 +476,7 @@
pixel_x = -64
pixel_y = -64
unacidable = 1
- mouse_opacity = 0
+ mouse_opacity = MOUSE_OPACITY_TRANSPARENT
var/mob/living/immune = list() // the one who creates the timestop is immune
var/list/stopped_atoms = list()
var/freezerange = 2
diff --git a/code/modules/response_team/ert.dm b/code/modules/response_team/ert.dm
new file mode 100644
index 00000000000..8614df8135b
--- /dev/null
+++ b/code/modules/response_team/ert.dm
@@ -0,0 +1,368 @@
+// ERTs
+
+#define ERT_TYPE_AMBER 1
+#define ERT_TYPE_RED 2
+#define ERT_TYPE_GAMMA 3
+
+/datum/game_mode
+ var/list/datum/mind/ert = list()
+
+var/list/response_team_members = list()
+var/responseteam_age = 21 // Minimum account age to play as an ERT member
+var/datum/response_team/active_team = null
+var/send_emergency_team = FALSE
+var/ert_request_answered = FALSE
+
+/client/proc/response_team()
+ set name = "Dispatch CentComm Response Team"
+ set category = "Event"
+ set desc = "Send an CentComm response team to the station."
+
+ if(!check_rights(R_EVENT))
+ return
+
+ if(!ticker)
+ to_chat(usr, "The game hasn't started yet!")
+ return
+
+ if(ticker.current_state == GAME_STATE_PREGAME)
+ to_chat(usr, "The round hasn't started yet!")
+ return
+
+ if(send_emergency_team)
+ to_chat(usr, "Central Command has already dispatched an emergency response team!")
+ return
+
+ var/datum/nano_module/ert_manager/E = new()
+ E.ui_interact(usr)
+
+
+/mob/dead/observer/proc/JoinResponseTeam()
+ if(!send_emergency_team)
+ to_chat(src, "No emergency response team is currently being sent.")
+ return 0
+
+ if(jobban_isbanned(src, ROLE_ERT))
+ to_chat(src, "You are jobbanned from playing on an emergency response team!")
+ return 0
+
+ var/player_age_check = check_client_age(client, responseteam_age)
+ if(player_age_check && config.use_age_restriction_for_antags)
+ to_chat(src, "This role is not yet available to you. You need to wait another [player_age_check] days.")
+ return 0
+
+ if(cannotPossess(src))
+ to_chat(src, "Upon using the antagHUD you forfeited the ability to join the round.")
+ return 0
+
+ if(response_team_members.len > 6)
+ to_chat(src, "The emergency response team is already full!")
+ return 0
+
+ return 1
+
+/proc/trigger_armed_response_team(var/datum/response_team/response_team_type, commander_slots, security_slots, medical_slots, engineering_slots, janitor_slots, paranormal_slots, cyborg_slots)
+ response_team_members = list()
+ active_team = response_team_type
+ active_team.setSlots(commander_slots, security_slots, medical_slots, engineering_slots, janitor_slots, paranormal_slots, cyborg_slots)
+
+ send_emergency_team = TRUE
+ var/list/ert_candidates = pollCandidates("Join the Emergency Response Team?",, responseteam_age, 600, 1, role_playtime_requirements[ROLE_ERT])
+ if(!ert_candidates.len)
+ active_team.cannot_send_team()
+ send_emergency_team = FALSE
+ return 0
+
+ // Respawnable players get first dibs
+ for(var/mob/dead/observer/M in ert_candidates)
+ if(jobban_isbanned(M, ROLE_TRAITOR) || jobban_isbanned(M, "Security Officer") || jobban_isbanned(M, "Captain") || jobban_isbanned(M, "Cyborg"))
+ continue
+ if((M in respawnable_list) && M.JoinResponseTeam())
+ response_team_members |= M
+ // If there's still open slots, non-respawnable players can fill them
+ for(var/mob/dead/observer/M in (ert_candidates - respawnable_list))
+ if(M.JoinResponseTeam())
+ response_team_members |= M
+
+ if(!response_team_members.len)
+ active_team.cannot_send_team()
+ send_emergency_team = FALSE
+ return 0
+
+ var/index = 1
+ var/ert_spawn_seconds = 120
+ spawn(ert_spawn_seconds * 10) // to account for spawn() using deciseconds
+ var/list/unspawnable_ert = list()
+ for(var/mob/M in response_team_members)
+ if(M)
+ unspawnable_ert |= M
+ if(unspawnable_ert.len)
+ message_admins("ERT SPAWN: The following ERT members could not be spawned within [ert_spawn_seconds] seconds:")
+ for(var/mob/M in unspawnable_ert)
+ message_admins("- Unspawned ERT: [ADMIN_FULLMONTY(M)]")
+ for(var/mob/M in response_team_members)
+ if(index > emergencyresponseteamspawn.len)
+ index = 1
+
+ if(!M || !M.client)
+ continue
+ var/client/C = M.client
+ var/mob/living/new_commando = C.create_response_team(emergencyresponseteamspawn[index])
+ if(!M || !new_commando)
+ continue
+ new_commando.mind.key = M.key
+ new_commando.key = M.key
+ new_commando.update_icons()
+ index++
+
+ send_emergency_team = FALSE
+ active_team.announce_team()
+ return 1
+
+/client/proc/create_response_team(var/turf/spawn_location)
+ var/class = 0
+ while(!class)
+ class = input(src, "Which loadout would you like to choose?") in active_team.get_slot_list()
+ if(!active_team.check_slot_available(class)) // Because the prompt does not update automatically when a slot gets filled.
+ class = 0
+
+ if(class == "Cyborg")
+ active_team.reduceCyborgSlots()
+ var/cyborg_unlock = active_team.getCyborgUnlock()
+ var/mob/living/silicon/robot/ert/R = new /mob/living/silicon/robot/ert(spawn_location, cyborg_unlock)
+ return R
+
+ var/mob/living/carbon/human/M = new(null)
+ var/obj/item/organ/external/head/head_organ = M.get_organ("head")
+
+ var/new_gender = alert(src, "Please select your gender.", "ERT Character Generation", "Male", "Female")
+
+ if(new_gender)
+ if(new_gender == "Male")
+ M.change_gender(MALE)
+ else
+ M.change_gender(FEMALE)
+
+ M.set_species(/datum/species/human, TRUE)
+ M.dna.ready_dna(M)
+ M.reagents.add_reagent("mutadone", 1) //No fat/blind/colourblind/epileptic/whatever ERT.
+ M.overeatduration = 0
+
+ var/hair_c = pick("#8B4513","#000000","#FF4500","#FFD700") // Brown, black, red, blonde
+ var/eye_c = pick("#000000","#8B4513","1E90FF") // Black, brown, blue
+ var/skin_tone = rand(-120, 20) // A range of skin colors
+
+ head_organ.facial_colour = hair_c
+ head_organ.sec_facial_colour = hair_c
+ head_organ.hair_colour = hair_c
+ head_organ.sec_hair_colour = hair_c
+ M.change_eye_color(eye_c)
+ M.s_tone = skin_tone
+ head_organ.h_style = random_hair_style(M.gender, head_organ.dna.species.name)
+ head_organ.f_style = random_facial_hair_style(M.gender, head_organ.dna.species.name)
+
+ M.rename_character(null, "[pick("Corporal", "Sergeant", "Staff Sergeant", "Sergeant First Class", "Master Sergeant", "Sergeant Major")] [pick(last_names)]")
+ M.age = rand(23,35)
+ M.regenerate_icons()
+ M.update_body()
+ M.update_dna()
+
+ //Creates mind stuff.
+ M.mind = new
+ M.mind.current = M
+ M.mind.original = M
+ M.mind.assigned_role = SPECIAL_ROLE_ERT
+ M.mind.special_role = SPECIAL_ROLE_ERT
+ if(!(M.mind in ticker.minds))
+ ticker.minds += M.mind //Adds them to regular mind list.
+ ticker.mode.ert += M.mind
+ M.forceMove(spawn_location)
+
+ job_master.CreateMoneyAccount(M, class, null)
+
+ active_team.equip_officer(class, M)
+
+ return M
+
+
+/datum/response_team
+ var/command_slots = 1
+ var/engineer_slots = 3
+ var/medical_slots = 3
+ var/security_slots = 3
+ var/janitor_slots = 0
+ var/paranormal_slots = 0
+ var/cyborg_slots = 0
+
+ var/command_outfit
+ var/engineering_outfit
+ var/medical_outfit
+ var/security_outfit
+ var/janitor_outfit
+ var/paranormal_outfit
+ var/cyborg_unlock = 0
+
+/datum/response_team/proc/setSlots(com, sec, med, eng, jan, par, cyb)
+ command_slots = com == null ? command_slots : com
+ security_slots = sec == null ? security_slots : sec
+ medical_slots = med == null ? medical_slots : med
+ engineer_slots = eng == null ? engineer_slots : eng
+ janitor_slots = jan == null ? janitor_slots : jan
+ paranormal_slots = par == null ? paranormal_slots : par
+ cyborg_slots = cyb == null ? cyborg_slots : cyb
+
+/datum/response_team/proc/reduceCyborgSlots()
+ cyborg_slots--
+
+/datum/response_team/proc/getCyborgUnlock()
+ return cyborg_unlock
+
+/datum/response_team/proc/get_slot_list()
+ var/list/slots_available = list()
+ if(command_slots)
+ slots_available |= "Commander"
+ if(security_slots)
+ slots_available |= "Security"
+ if(engineer_slots)
+ slots_available |= "Engineer"
+ if(medical_slots)
+ slots_available |= "Medic"
+ if(janitor_slots)
+ slots_available |= "Janitor"
+ if(paranormal_slots)
+ slots_available |= "Paranormal"
+ if(cyborg_slots)
+ slots_available |= "Cyborg"
+ return slots_available
+
+/datum/response_team/proc/check_slot_available(var/slot)
+ switch(slot)
+ if("Commander")
+ return command_slots
+ if("Security")
+ return security_slots
+ if("Engineer")
+ return engineer_slots
+ if("Medic")
+ return medical_slots
+ if("Janitor")
+ return janitor_slots
+ if("Paranormal")
+ return paranormal_slots
+ if("Cyborg")
+ return cyborg_slots
+ return 0
+
+/datum/response_team/proc/equip_officer(var/officer_type, var/mob/living/carbon/human/M)
+ switch(officer_type)
+ if("Engineer")
+ engineer_slots -= 1
+ M.equipOutfit(engineering_outfit)
+ M.job = "ERT Engineering"
+
+ if("Security")
+ security_slots -= 1
+ M.equipOutfit(security_outfit)
+ M.job = "ERT Security"
+
+ if("Medic")
+ medical_slots -= 1
+ M.equipOutfit(medical_outfit)
+ M.job = "ERT Medical"
+
+ if("Janitor")
+ janitor_slots -= 1
+ M.equipOutfit(janitor_outfit)
+ M.job = "ERT Janitor"
+
+ if("Paranormal")
+ paranormal_slots -= 1
+ M.equipOutfit(paranormal_outfit)
+ M.job = "ERT Paranormal"
+
+ if("Commander")
+ command_slots = 0
+
+ // Override name and age for the commander
+ M.rename_character(null, "[pick("Lieutenant", "Captain", "Major")] [pick(last_names)]")
+ M.age = rand(35,45)
+
+ M.equipOutfit(command_outfit)
+ M.job = "ERT Commander"
+
+/datum/response_team/proc/cannot_send_team()
+ event_announcement.Announce("[station_name()], we are unfortunately unable to send you an Emergency Response Team at this time.", "ERT Unavailable")
+
+/datum/response_team/proc/announce_team()
+ event_announcement.Announce("Attention, [station_name()]. We are sending a team of highly trained assistants to aid(?) you. Standby.", "ERT En-Route")
+
+// -- AMBER TEAM --
+
+/datum/response_team/amber
+ engineering_outfit = /datum/outfit/job/centcom/response_team/engineer/amber
+ security_outfit = /datum/outfit/job/centcom/response_team/security/amber
+ medical_outfit = /datum/outfit/job/centcom/response_team/medic/amber
+ command_outfit = /datum/outfit/job/centcom/response_team/commander/amber
+ janitor_outfit = /datum/outfit/job/centcom/response_team/janitorial/amber
+ paranormal_outfit = /datum/outfit/job/centcom/response_team/paranormal/amber
+
+/datum/response_team/amber/announce_team()
+ event_announcement.Announce("Attention, [station_name()]. We are sending a code AMBER light Emergency Response Team. Standby.", "ERT En-Route")
+
+// -- RED TEAM --
+
+/datum/response_team/red
+ engineering_outfit = /datum/outfit/job/centcom/response_team/engineer/red
+ security_outfit = /datum/outfit/job/centcom/response_team/security/red
+ medical_outfit = /datum/outfit/job/centcom/response_team/medic/red
+ command_outfit = /datum/outfit/job/centcom/response_team/commander/red
+ janitor_outfit = /datum/outfit/job/centcom/response_team/janitorial/red
+ paranormal_outfit = /datum/outfit/job/centcom/response_team/paranormal/red
+
+/datum/response_team/red/announce_team()
+ event_announcement.Announce("Attention, [station_name()]. We are sending a code RED Emergency Response Team. Standby.", "ERT En-Route")
+
+// -- GAMMA TEAM --
+
+/datum/response_team/gamma
+ engineering_outfit = /datum/outfit/job/centcom/response_team/engineer/gamma
+ security_outfit = /datum/outfit/job/centcom/response_team/security/gamma
+ medical_outfit = /datum/outfit/job/centcom/response_team/medic/gamma
+ command_outfit = /datum/outfit/job/centcom/response_team/commander/gamma
+ janitor_outfit = /datum/outfit/job/centcom/response_team/janitorial/gamma
+ paranormal_outfit = /datum/outfit/job/centcom/response_team/paranormal/gamma
+ cyborg_unlock = 1
+
+/datum/response_team/gamma/announce_team()
+ event_announcement.Announce("Attention, [station_name()]. We are sending a code GAMMA elite Emergency Response Team. Standby.", "ERT En-Route")
+
+/datum/outfit/job/centcom/response_team
+ name = "Response team"
+ var/rt_assignment = "Emergency Response Team Member"
+ var/rt_job = "This is a bug"
+ allow_backbag_choice = FALSE
+ allow_loadout = FALSE
+ pda = /obj/item/pda/heads/ert
+ id = /obj/item/card/id/ert
+ l_ear = /obj/item/radio/headset/ert/alt
+ box = /obj/item/storage/box/responseteam
+
+ implants = list(/obj/item/implant/mindshield)
+
+/obj/item/radio/centcom
+ name = "centcomm bounced radio"
+ frequency = ERT_FREQ
+ icon_state = "radio"
+
+/obj/item/storage/box/responseteam/
+ name = "boxed survival kit"
+
+/obj/item/storage/box/responseteam/New()
+ ..()
+ new /obj/item/clothing/mask/breath(src)
+ new /obj/item/tank/emergency_oxygen/engi(src)
+ new /obj/item/flashlight/flare(src)
+ new /obj/item/kitchen/knife/combat(src)
+ new /obj/item/radio/centcom(src)
+ new /obj/item/reagent_containers/food/pill/patch/synthflesh(src)
+ new /obj/item/reagent_containers/hypospray/autoinjector(src)
diff --git a/code/modules/response_team/ert_outfits.dm b/code/modules/response_team/ert_outfits.dm
new file mode 100644
index 00000000000..93227849f1f
--- /dev/null
+++ b/code/modules/response_team/ert_outfits.dm
@@ -0,0 +1,485 @@
+/* ERT OUTFIT DATUMS */
+
+/datum/outfit/job/centcom/response_team/imprint_idcard(mob/living/carbon/human/H)
+ var/obj/item/card/id/W = H.wear_id
+ if(!istype(W))
+ return
+ W.assignment = rt_assignment
+ W.rank = W.assignment
+ W.age = H.age
+ W.sex = capitalize(H.gender)
+ W.registered_name = H.real_name
+ W.name = "[H.real_name]'s ID Card ([rt_job])"
+ W.access = get_centcom_access(W.assignment)
+ W.photo = get_id_photo(H)
+ if(H.mind && H.mind.initial_account && H.mind.initial_account.account_number)
+ W.associated_account_number = H.mind.initial_account.account_number
+
+/datum/outfit/job/centcom/response_team/imprint_pda(mob/living/carbon/human/H)
+ var/obj/item/pda/PDA = H.wear_pda
+ if(istype(PDA))
+ PDA.owner = H.real_name
+ PDA.ownjob = rt_assignment
+ PDA.ownrank = rt_assignment
+ PDA.name = "PDA-[H.real_name] ([PDA.ownjob])"
+
+
+//////////////////// COMMANDER ///////////////////
+
+/datum/outfit/job/centcom/response_team/commander
+ name = "RT Commander"
+ rt_assignment = "Emergency Response Team Leader"
+ rt_job = "Emergency Response Team Leader"
+
+ uniform = /obj/item/clothing/under/rank/centcom_officer
+ back = /obj/item/storage/backpack/ert/commander
+
+ id = /obj/item/card/id/ert/commander
+
+ l_pocket = /obj/item/pinpointer
+ r_pocket = /obj/item/melee/classic_baton/telescopic
+
+/datum/outfit/job/centcom/response_team/commander/amber
+ name = "RT Commander (Amber)"
+ shoes = /obj/item/clothing/shoes/combat
+ gloves = /obj/item/clothing/gloves/color/black
+ suit = /obj/item/clothing/suit/armor/vest/ert/command
+ glasses = /obj/item/clothing/glasses/sunglasses
+
+ belt = /obj/item/gun/energy/gun
+
+ backpack_contents = list(
+ /obj/item/clothing/head/helmet/ert/command = 1,
+ /obj/item/clothing/mask/gas/sechailer = 1,
+ /obj/item/restraints/handcuffs = 1,
+ /obj/item/storage/lockbox/mindshield = 1
+ )
+
+/datum/outfit/job/centcom/response_team/commander/red
+ name = "RT Commander (Red)"
+ shoes = /obj/item/clothing/shoes/combat
+ gloves = /obj/item/clothing/gloves/combat
+ suit = /obj/item/clothing/suit/space/hardsuit/ert/commander
+ glasses = /obj/item/clothing/glasses/sunglasses
+ cybernetic_implants = list(
+ /obj/item/organ/internal/cyberimp/eyes/hud/security,
+ /obj/item/organ/internal/cyberimp/chest/nutriment
+ )
+ belt = /obj/item/gun/energy/gun/blueshield/pdw9
+
+ backpack_contents = list(
+ /obj/item/clothing/head/helmet/space/hardsuit/ert/commander = 1,
+ /obj/item/clothing/mask/gas/sechailer/swat = 1,
+ /obj/item/gun/energy/ionrifle/carbine = 1,
+ /obj/item/restraints/handcuffs = 1,
+ /obj/item/clothing/shoes/magboots = 1,
+ /obj/item/storage/lockbox/mindshield = 1
+ )
+
+/datum/outfit/job/centcom/response_team/commander/gamma
+ name = "RT Commander (Gamma)"
+ shoes = /obj/item/clothing/shoes/magboots/advance
+ gloves = /obj/item/clothing/gloves/combat
+ suit = /obj/item/clothing/suit/space/hardsuit/ert/commander/gamma
+ glasses = /obj/item/clothing/glasses/night
+ suit_store = /obj/item/gun/energy/gun/blueshield/pdw9
+ belt = /obj/item/gun/projectile/automatic/pistol/enforcer/lethal
+
+ backpack_contents = list(
+ /obj/item/clothing/head/helmet/space/hardsuit/ert/commander/gamma = 1,
+ /obj/item/clothing/mask/gas/sechailer/swat = 1,
+ /obj/item/restraints/handcuffs = 1,
+ /obj/item/storage/lockbox/mindshield = 1,
+ /obj/item/gun/energy/ionrifle/carbine = 1,
+ /obj/item/ammo_box/magazine/enforcer/lethal = 2
+ )
+
+ cybernetic_implants = list(
+ /obj/item/organ/internal/cyberimp/chest/nutriment/plus,
+ /obj/item/organ/internal/cyberimp/eyes/hud/security,
+ /obj/item/organ/internal/cyberimp/brain/anti_stun,
+ /obj/item/organ/internal/cyberimp/arm/flash
+ )
+
+//////////////////// SECURITY ///////////////////
+
+/datum/outfit/job/centcom/response_team/security
+ name = "RT Security"
+ rt_job = "Emergency Response Team Officer"
+ uniform = /obj/item/clothing/under/rank/security
+ back = /obj/item/storage/backpack/ert/security
+ belt = /obj/item/storage/belt/security/response_team
+ pda = /obj/item/pda/heads/ert/security
+ id = /obj/item/card/id/ert/security
+
+/datum/outfit/job/centcom/response_team/security/amber
+ name = "RT Security (Amber)"
+ shoes = /obj/item/clothing/shoes/combat
+ gloves = /obj/item/clothing/gloves/color/black
+ suit = /obj/item/clothing/suit/armor/vest/ert/security
+ suit_store = /obj/item/gun/energy/gun/advtaser
+ glasses = /obj/item/clothing/glasses/hud/security/sunglasses
+
+ r_hand = /obj/item/gun/energy/laser
+
+ backpack_contents = list(
+ /obj/item/clothing/head/helmet/ert/security = 1,
+ /obj/item/clothing/mask/gas/sechailer = 1,
+ /obj/item/storage/box/zipties = 1,
+ /obj/item/storage/box/teargas = 1,
+ /obj/item/flashlight/seclite = 1
+ )
+
+/datum/outfit/job/centcom/response_team/security/red
+ name = "RT Security (Red)"
+
+ shoes = /obj/item/clothing/shoes/combat
+ gloves = /obj/item/clothing/gloves/color/black
+ suit = /obj/item/clothing/suit/space/hardsuit/ert/security
+ suit_store = /obj/item/gun/energy/gun/blueshield/pdw9
+ glasses = /obj/item/clothing/glasses/sunglasses
+
+ r_hand = /obj/item/gun/projectile/automatic/lasercarbine
+
+ cybernetic_implants = list(
+ /obj/item/organ/internal/cyberimp/arm/flash,
+ /obj/item/organ/internal/cyberimp/chest/nutriment,
+ /obj/item/organ/internal/cyberimp/eyes/hud/security
+ )
+
+ backpack_contents = list(
+ /obj/item/clothing/head/helmet/space/hardsuit/ert/security = 1,
+ /obj/item/clothing/mask/gas/sechailer = 1,
+ /obj/item/clothing/shoes/magboots = 1,
+ /obj/item/storage/box/handcuffs = 1,
+ /obj/item/storage/box/teargas = 1,
+ /obj/item/grenade/flashbang = 1,
+ /obj/item/ammo_box/magazine/laser = 2
+ )
+
+/datum/outfit/job/centcom/response_team/security/gamma
+ name = "RT Security (Gamma)"
+ shoes = /obj/item/clothing/shoes/magboots/advance
+ gloves = /obj/item/clothing/gloves/combat
+ suit = /obj/item/clothing/suit/space/hardsuit/ert/security/gamma
+ belt = /obj/item/storage/belt/security/response_team_gamma
+ suit_store = /obj/item/gun/energy/gun/nuclear
+ glasses = /obj/item/clothing/glasses/night
+ l_pocket = /obj/item/restraints/legcuffs/bola/energy
+ r_pocket = /obj/item/extinguisher/mini
+
+ r_hand = /obj/item/gun/energy/immolator/multi
+
+ backpack_contents = list(
+ /obj/item/clothing/head/helmet/space/hardsuit/ert/security/gamma = 1,
+ /obj/item/clothing/mask/gas/sechailer/swat = 1,
+ /obj/item/storage/box/handcuffs = 1,
+ /obj/item/storage/box/flashbangs = 1,
+ /obj/item/whetstone = 1,
+ /obj/item/storage/lockbox/t4 = 1
+ )
+
+ cybernetic_implants = list(
+ /obj/item/organ/internal/cyberimp/chest/nutriment/plus,
+ /obj/item/organ/internal/cyberimp/eyes/hud/security,
+ /obj/item/organ/internal/cyberimp/brain/anti_stun,
+ /obj/item/organ/internal/cyberimp/arm/telebaton,
+ /obj/item/organ/internal/cyberimp/chest/reviver
+ )
+
+
+//////////////////// ENGINEER ///////////////////
+
+/datum/outfit/job/centcom/response_team/engineer
+ name = "RT Engineer"
+ rt_job = "Emergency Response Team Engineer"
+ back = /obj/item/storage/backpack/ert/engineer
+ uniform = /obj/item/clothing/under/rank/engineer
+
+ belt = /obj/item/storage/belt/utility/full/multitool
+ pda = /obj/item/pda/heads/ert/engineering
+ id = /obj/item/card/id/ert/engineering
+
+/datum/outfit/job/centcom/response_team/engineer/amber
+ name = "RT Engineer (Amber)"
+ shoes = /obj/item/clothing/shoes/magboots
+ gloves = /obj/item/clothing/gloves/color/yellow
+ suit = /obj/item/clothing/suit/space/hardsuit/ert/engineer
+ suit_store = /obj/item/tank/emergency_oxygen/engi
+ glasses = /obj/item/clothing/glasses/meson
+
+ l_pocket = /obj/item/gun/energy/gun/mini
+ r_pocket = /obj/item/melee/classic_baton/telescopic
+
+ backpack_contents = list(
+ /obj/item/clothing/head/helmet/space/hardsuit/ert/engineer = 1,
+ /obj/item/clothing/mask/gas = 1,
+ /obj/item/t_scanner = 1,
+ /obj/item/stack/sheet/glass/fifty = 1,
+ /obj/item/stack/sheet/metal/fifty = 1
+ )
+
+/datum/outfit/job/centcom/response_team/engineer/red
+ name = "RT Engineer (Red)"
+ shoes = /obj/item/clothing/shoes/magboots/advance
+ gloves = /obj/item/clothing/gloves/color/yellow
+ belt = /obj/item/storage/belt/utility/chief/full
+ suit = /obj/item/clothing/suit/space/hardsuit/ert/engineer
+ suit_store = /obj/item/tank/emergency_oxygen/engi
+ glasses = /obj/item/clothing/glasses/meson
+ cybernetic_implants = list(
+ /obj/item/organ/internal/cyberimp/eyes/shield,
+ /obj/item/organ/internal/cyberimp/chest/nutriment
+ )
+ l_pocket = /obj/item/t_scanner/extended_range
+ r_pocket = /obj/item/melee/classic_baton/telescopic
+
+ backpack_contents = list(
+ /obj/item/clothing/head/helmet/space/hardsuit/ert/engineer = 1,
+ /obj/item/clothing/mask/gas = 1,
+ /obj/item/rcd/preloaded = 1,
+ /obj/item/rcd_ammo = 3,
+ /obj/item/gun/energy/gun = 1
+ )
+
+/datum/outfit/job/centcom/response_team/engineer/gamma
+ name = "RT Engineer (Gamma)"
+ shoes = /obj/item/clothing/shoes/magboots/advance
+ gloves = /obj/item/clothing/gloves/color/yellow
+ belt = /obj/item/storage/belt/utility/chief/full
+ suit = /obj/item/clothing/suit/space/hardsuit/ert/engineer/gamma
+ suit_store = /obj/item/gun/energy/gun/blueshield/pdw9
+ glasses = /obj/item/clothing/glasses/meson/night
+
+ l_pocket = /obj/item/t_scanner/extended_range
+ r_pocket = /obj/item/melee/classic_baton/telescopic
+
+ backpack_contents = list(
+ /obj/item/clothing/head/helmet/space/hardsuit/ert/engineer/gamma = 1,
+ /obj/item/clothing/mask/gas/sechailer/swat = 1,
+ /obj/item/rcd/combat = 1,
+ /obj/item/rcd_ammo/large = 3
+ )
+
+ cybernetic_implants = list(
+ /obj/item/organ/internal/cyberimp/chest/nutriment/plus,
+ /obj/item/organ/internal/cyberimp/eyes/hud/security,
+ /obj/item/organ/internal/cyberimp/brain/anti_stun,
+ /obj/item/organ/internal/cyberimp/eyes/shield,
+ /obj/item/organ/internal/cyberimp/arm/toolset
+ )
+
+//////////////////// MEDIC ///////////////////
+
+/datum/outfit/job/centcom/response_team/medic
+ name = "RT Medic"
+ rt_job = "Emergency Response Team Medic"
+ uniform = /obj/item/clothing/under/rank/medical
+ back = /obj/item/storage/backpack/ert/medical
+ pda = /obj/item/pda/heads/ert/medical
+ id = /obj/item/card/id/ert/medic
+
+/datum/outfit/job/centcom/response_team/medic/amber
+ name = "RT Medic (Amber)"
+
+ shoes = /obj/item/clothing/shoes/white
+ gloves = /obj/item/clothing/gloves/color/latex
+ suit = /obj/item/clothing/suit/armor/vest/ert/medical
+ suit_store = /obj/item/gun/energy/gun/mini
+ glasses = /obj/item/clothing/glasses/hud/health
+
+ belt = /obj/item/storage/belt/medical/surgery/loaded
+
+ l_pocket = /obj/item/reagent_containers/hypospray/safety/ert
+ r_pocket = /obj/item/melee/classic_baton/telescopic
+
+ l_hand = /obj/item/defibrillator/loaded
+
+ backpack_contents = list(
+ /obj/item/clothing/head/helmet/ert/medical = 1,
+ /obj/item/clothing/mask/surgical = 1,
+ /obj/item/storage/firstaid/adv = 1,
+ /obj/item/storage/firstaid/regular = 1,
+ /obj/item/storage/box/autoinjectors = 1,
+ /obj/item/roller = 1,
+ /obj/item/storage/pill_bottle/ert = 1
+ )
+
+/datum/outfit/job/centcom/response_team/medic/red
+ name = "RT Medic (Red)"
+ shoes = /obj/item/clothing/shoes/white
+ gloves = /obj/item/clothing/gloves/color/latex/nitrile
+ suit = /obj/item/clothing/suit/space/hardsuit/ert/medical
+ glasses = /obj/item/clothing/glasses/hud/health/health_advanced
+ suit_store = /obj/item/gun/energy/gun
+ cybernetic_implants = list(
+ /obj/item/organ/internal/cyberimp/arm/surgery,
+ /obj/item/organ/internal/cyberimp/chest/nutriment
+ )
+ belt = /obj/item/defibrillator/compact/loaded
+
+ l_pocket = /obj/item/reagent_containers/hypospray/safety/ert
+ r_pocket = /obj/item/melee/classic_baton/telescopic
+
+ backpack_contents = list(
+ /obj/item/clothing/head/helmet/space/hardsuit/ert/medical = 1,
+ /obj/item/clothing/mask/surgical = 1,
+ /obj/item/storage/firstaid/toxin = 1,
+ /obj/item/storage/firstaid/brute = 1,
+ /obj/item/storage/firstaid/fire = 1,
+ /obj/item/storage/box/autoinjectors = 1,
+ /obj/item/roller = 1,
+ /obj/item/clothing/shoes/magboots = 1,
+ /obj/item/bodyanalyzer = 1
+ )
+
+/datum/outfit/job/centcom/response_team/medic/gamma
+ name = "RT Medic (Gamma)"
+ shoes = /obj/item/clothing/shoes/magboots/advance
+ gloves = /obj/item/clothing/gloves/combat
+ suit = /obj/item/clothing/suit/space/hardsuit/ert/medical/gamma
+ glasses = /obj/item/clothing/glasses/night
+ suit_store = /obj/item/gun/energy/gun/blueshield/pdw9
+
+ belt = /obj/item/defibrillator/compact/loaded
+
+ l_pocket = /obj/item/reagent_containers/hypospray/combat/nanites
+ r_pocket = /obj/item/reagent_containers/hypospray/autoinjector
+
+ backpack_contents = list(
+ /obj/item/clothing/head/helmet/space/hardsuit/ert/medical/gamma = 1,
+ /obj/item/clothing/mask/gas/sechailer/swat = 1,
+ /obj/item/bodyanalyzer/advanced = 1,
+ /obj/item/extinguisher/mini = 1,
+ /obj/item/storage/belt/medical/surgery/loaded = 1,
+ /obj/item/roller = 1
+ )
+
+ cybernetic_implants = list(
+ /obj/item/organ/internal/cyberimp/arm/surgery/l,
+ /obj/item/organ/internal/cyberimp/arm/medibeam,
+ /obj/item/organ/internal/cyberimp/chest/nutriment/plus,
+ /obj/item/organ/internal/cyberimp/eyes/hud/medical,
+ /obj/item/organ/internal/cyberimp/brain/anti_stun
+ )
+
+//////////////////// PARANORMAL ///////////////////
+
+/datum/outfit/job/centcom/response_team/paranormal
+ name = "RT Paranormal"
+ rt_job = "Emergency Response Team Inquisitor"
+ uniform = /obj/item/clothing/under/rank/chaplain
+ back = /obj/item/storage/backpack/ert/security
+ gloves = /obj/item/clothing/gloves/color/black
+ shoes = /obj/item/clothing/shoes/combat
+ l_ear = /obj/item/radio/headset/ert/alt
+ glasses = /obj/item/clothing/glasses/hud/security/sunglasses
+ belt = /obj/item/storage/belt/security/response_team
+ id = /obj/item/card/id/centcom
+ pda = /obj/item/pda/centcom
+ backpack_contents = list(
+ /obj/item/clothing/mask/gas/sechailer/swat = 1,
+ /obj/item/storage/box/zipties = 1,
+ /obj/item/flashlight/seclite = 1
+ )
+
+/datum/outfit/job/centcom/response_team/paranormal/amber
+ name = "RT Paranormal (Amber)"
+ suit = /obj/item/clothing/suit/armor/vest/ert/security/paranormal
+ head = /obj/item/clothing/head/helmet/ert/security/paranormal
+ suit_store = /obj/item/gun/energy/gun/advtaser
+ r_pocket = /obj/item/nullrod
+
+/datum/outfit/job/centcom/response_team/paranormal/red
+ name = "RT Paranormal (Red)"
+ suit = /obj/item/clothing/suit/space/hardsuit/ert/paranormal/inquisitor
+ head = /obj/item/clothing/head/helmet/space/hardsuit/ert/paranormal/inquisitor
+ suit_store = /obj/item/gun/energy/gun
+ r_pocket = /obj/item/nullrod
+ glasses = /obj/item/clothing/glasses/sunglasses
+
+ cybernetic_implants = list(
+ /obj/item/organ/internal/cyberimp/eyes/hud/security,
+ /obj/item/organ/internal/cyberimp/chest/nutriment
+ )
+
+/datum/outfit/job/centcom/response_team/paranormal/gamma
+ name = "RT Paranormal (Gamma)"
+ suit = /obj/item/clothing/suit/space/hardsuit/ert/paranormal/inquisitor
+ head = /obj/item/clothing/head/helmet/space/hardsuit/ert/paranormal/inquisitor
+ suit_store = /obj/item/gun/energy/gun/nuclear
+ l_pocket = /obj/item/grenade/clusterbuster/holy
+ shoes = /obj/item/clothing/shoes/magboots/advance
+ glasses = /obj/item/clothing/glasses/night
+
+ cybernetic_implants = list(
+ /obj/item/organ/internal/cyberimp/chest/nutriment/plus,
+ /obj/item/organ/internal/cyberimp/eyes/hud/security,
+ /obj/item/organ/internal/cyberimp/brain/anti_stun
+ )
+
+//////////////////// JANITORIAL ///////////////////
+
+/datum/outfit/job/centcom/response_team/janitorial
+ name = "RT Janitor"
+ rt_job = "Emergency Response Team Janitor"
+ uniform = /obj/item/clothing/under/color/purple
+ back = /obj/item/storage/backpack/ert/janitor
+ belt = /obj/item/storage/belt/janitor/full
+ gloves = /obj/item/clothing/gloves/color/yellow
+ shoes = /obj/item/clothing/shoes/galoshes
+ l_ear = /obj/item/radio/headset/ert/alt
+ id = /obj/item/card/id/centcom
+ pda = /obj/item/pda/centcom
+ l_pocket = /obj/item/melee/classic_baton/telescopic
+ backpack_contents = list(
+ /obj/item/grenade/chem_grenade/antiweed = 2,
+ /obj/item/reagent_containers/spray/cleaner = 1,
+ /obj/item/storage/bag/trash = 1,
+ /obj/item/storage/box/lights/mixed = 1,
+ /obj/item/holosign_creator = 1,
+ /obj/item/flashlight = 1)
+
+/datum/outfit/job/centcom/response_team/janitorial/amber
+ name = "RT Janitor (Amber)"
+ suit = /obj/item/clothing/suit/armor/vest/ert/janitor
+ head = /obj/item/clothing/head/helmet/ert/janitor
+ glasses = /obj/item/clothing/glasses/sunglasses
+
+ r_hand = /obj/item/gun/energy/disabler
+
+/datum/outfit/job/centcom/response_team/janitorial/red
+ name = "RT Janitor (Red)"
+ suit = /obj/item/clothing/suit/space/hardsuit/ert/janitor
+ head = /obj/item/clothing/head/helmet/space/hardsuit/ert/janitor
+ glasses = /obj/item/clothing/glasses/hud/security/sunglasses
+
+ r_pocket = /obj/item/scythe/tele
+ l_pocket = /obj/item/gun/energy/gun/mini
+
+ cybernetic_implants = list(
+ /obj/item/organ/internal/cyberimp/arm/advmop,
+ /obj/item/organ/internal/cyberimp/chest/nutriment
+ )
+
+/datum/outfit/job/centcom/response_team/janitorial/gamma
+ name = "RT Janitor (Gamma)"
+ suit = /obj/item/clothing/suit/space/hardsuit/ert/janitor/gamma
+ glasses = /obj/item/clothing/glasses/hud/security/sunglasses
+ gloves = /obj/item/clothing/gloves/combat
+ suit_store = /obj/item/gun/energy/gun
+ l_pocket = /obj/item/grenade/clusterbuster/cleaner
+ r_pocket = /obj/item/scythe/tele
+ shoes = /obj/item/clothing/shoes/magboots/advance
+
+ backpack_contents = list(
+ /obj/item/clothing/head/helmet/space/hardsuit/ert/janitor/gamma = 1,
+ /obj/item/grenade/chem_grenade/antiweed = 2,
+ /obj/item/storage/box/lights/mixed = 1,
+ /obj/item/storage/bag/trash/bluespace = 1,
+ /obj/item/reagent_containers/spray/cleaner = 1
+ )
+
+ cybernetic_implants = list(
+ /obj/item/organ/internal/cyberimp/arm/advmop
+ )
diff --git a/code/modules/scripting/Implementations/Telecomms.dm b/code/modules/scripting/Implementations/Telecomms.dm
index 8b0675d90de..e8fa2ed19b6 100644
--- a/code/modules/scripting/Implementations/Telecomms.dm
+++ b/code/modules/scripting/Implementations/Telecomms.dm
@@ -248,7 +248,7 @@
But I like HTML, so back to no sanitizing.*/
var/message = interpreter.GetVar("$content")
- var/regex/bannedTags = new ("( NUTRITION_LEVEL_WELL_FED)
to_chat(H, "You are now fully charged.")
break
- H.visible_message("[H] unplugs from \the [A].", "You unplug from \the [A].")
\ No newline at end of file
+ H.visible_message("[H] unplugs from \the [A].", "You unplug from \the [A].")
+
+/obj/item/organ/internal/cyberimp/arm/telebaton
+ name = "telebaton implant"
+ desc = "Telescopic baton implant. Does what it says on the tin" // A better description
+
+ contents = newlist(/obj/item/melee/classic_baton)
+
+/obj/item/organ/internal/cyberimp/arm/advmop
+ name = "advanced mop implant"
+ desc = "Advanced mop implant. Does what it says on the tin" // A better description
+
+ contents = newlist(/obj/item/mop/advanced)
\ No newline at end of file
diff --git a/code/modules/surgery/organs/organ_external.dm b/code/modules/surgery/organs/organ_external.dm
index 04ce880d5f5..02a6d54a073 100644
--- a/code/modules/surgery/organs/organ_external.dm
+++ b/code/modules/surgery/organs/organ_external.dm
@@ -141,7 +141,7 @@
DAMAGE PROCS
****************************************************/
-/obj/item/organ/external/receive_damage(brute, burn, sharp, used_weapon = null, list/forbidden_limbs = list(), ignore_resists = FALSE)
+/obj/item/organ/external/receive_damage(brute, burn, sharp, used_weapon = null, list/forbidden_limbs = list(), ignore_resists = FALSE, updating_health = TRUE)
if(tough && !ignore_resists)
brute = max(0, brute - 5)
burn = max(0, burn - 4)
@@ -232,14 +232,14 @@
droplimb(0, DROPLIMB_SHARP)
if(owner_old)
- owner_old.updatehealth()
+ owner_old.updatehealth("limb receive damage")
return update_icon()
#undef LIMB_SHARP_THRESH_INT_DMG
#undef LIMB_THRESH_INT_DMG
#undef LIMB_DMG_PROB
-/obj/item/organ/external/proc/heal_damage(brute, burn, internal = 0, robo_repair = 0)
+/obj/item/organ/external/proc/heal_damage(brute, burn, internal = 0, robo_repair = 0, updating_health = TRUE)
if(is_robotic() && !robo_repair)
return
@@ -250,7 +250,8 @@
status &= ~ORGAN_BROKEN
perma_injury = 0
- owner.updatehealth()
+ if(updating_health)
+ owner.updatehealth("limb heal damage")
return update_icon()
@@ -279,7 +280,7 @@ This function completely restores a damaged organ to perfect condition.
EO.rejuvenate()
if(owner)
- owner.updatehealth()
+ owner.updatehealth("limb rejuvenate")
update_icon()
if(!owner)
processing_objects |= src
@@ -497,7 +498,7 @@ Note that amputating the affected organ does in fact remove the infection from t
dir = 2
if(victim)
- victim.updatehealth()
+ victim.updatehealth("droplimb")
victim.UpdateDamageIcon()
victim.regenerate_icons()
@@ -708,6 +709,7 @@ Note that amputating the affected organ does in fact remove the infection from t
var/atom/movable/thing = O.remove(victim)
if(thing)
thing.forceMove(src)
+ victim.updatehealth("limb remove")
// Grab all the internal giblets too.
for(var/obj/item/organ/internal/organ in internal_organs)
diff --git a/code/modules/surgery/organs/vocal_cords.dm b/code/modules/surgery/organs/vocal_cords.dm
index b6de54e8046..c13c4da83f6 100644
--- a/code/modules/surgery/organs/vocal_cords.dm
+++ b/code/modules/surgery/organs/vocal_cords.dm
@@ -231,7 +231,7 @@ var/static/regex/multispin_words = regex("like a record baby")
else if((findtext(message, heal_words)))
for(var/V in listeners)
var/mob/living/L = V
- L.heal_overall_damage(10 * power_multiplier, 10 * power_multiplier, 0, 0)
+ L.heal_overall_damage(10 * power_multiplier, 10 * power_multiplier, TRUE, 0, 0)
next_command = world.time + cooldown_damage
//BRUTE DAMAGE
diff --git a/code/modules/surgery/other.dm b/code/modules/surgery/other.dm
index bcb5151d359..f959732427a 100644
--- a/code/modules/surgery/other.dm
+++ b/code/modules/surgery/other.dm
@@ -307,7 +307,7 @@
to_chat(target, "NOT LIKE THIS!")
user.visible_message("[target] suddenly slams upward and knocks down [user]!", \
"[target] suddenly bolts up and slams you with tremendous force!")
- user.resting = 0 //Remove all stuns
+ user.StopResting() //Remove all stuns
user.SetSleeping(0)
user.SetStunned(0)
user.SetWeakened(0)
diff --git a/code/modules/vehicle/ambulance.dm b/code/modules/vehicle/ambulance.dm
index ee6c775b11f..6b7b037585f 100644
--- a/code/modules/vehicle/ambulance.dm
+++ b/code/modules/vehicle/ambulance.dm
@@ -56,7 +56,10 @@
AA.Grant(M)
else
AA.Remove(M)
-
+
+/obj/vehicle/ambulance/post_unbuckle_mob(mob/living/M)
+ . = ..()
+ AA.Remove(M)
/obj/item/key/ambulance
name = "ambulance key"
@@ -99,7 +102,7 @@
anchored = FALSE
throw_pressure_limit = INFINITY //Throwing an ambulance trolley can kill the process scheduler.
-/obj/structure/stool/bed/amb_trolley/MouseDrop(obj/over_object as obj)
+/obj/structure/bed/amb_trolley/MouseDrop(obj/over_object as obj)
..()
if(istype(over_object, /obj/vehicle/ambulance))
var/obj/vehicle/ambulance/amb = over_object
diff --git a/code/modules/vr/vr_avatar.dm b/code/modules/vr/vr_avatar.dm
index 510871fb40a..4719ffc4961 100644
--- a/code/modules/vr/vr_avatar.dm
+++ b/code/modules/vr/vr_avatar.dm
@@ -16,7 +16,8 @@
..()
/mob/living/carbon/human/virtual_reality/death()
- return_to_lobby()
+ if(can_die())
+ return_to_lobby()
return ..()
/mob/living/carbon/human/virtual_reality/Destroy()
diff --git a/html/changelog.html b/html/changelog.html
index 91636b1a9b2..c7a6f4709d1 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -56,6 +56,172 @@
-->
+
10 October 2018
+
Alonefromhell updated:
+
+ - You should no longer be able to relight a burned match by using a shoe.
+
+
Birdtalon updated:
+
+ - Small runtime in tickets.dm
+
+
Citinited updated:
+
+ - Emagging a locker will keep the original description instead of telling you it was emagged twice.
+ - Examining airlocks displays the proper icon now
+ - Holopads don't work when unanchored any more.
+
+
Purpose updated:
+
+ - Fixes a few broken tiles in maintenance, by breaking those tiles properly.
+
+
Ty-Omaha updated:
+
+ - Fixes PAIs
+ - Ambulances work again
+
+
Warior4356 updated:
+
+ - added Grey sprite for psysuit, made by dumbdumb
+
+
tigercat2000 updated:
+
+ - Hovering over an inventory slot now shows an indicator for if that item can go in that slot or not. Pretty!
+ - SSOverlays has been added, but not implemented!
+
+
+
09 October 2018
+
Alonefromhell updated:
+
+ - Edited the attack text of the teleport armor.
+
+
Birdtalon , LPSpartan, Shazbot, Memager updated:
+
+ - Portable Body Analyzer for ERT
+ - Muilti Lens Immolation gun for gamma ERT
+ - PDW-9 sidearm for ERT
+ - T4 Thermite Charge for Gamma ERT security
+ - Sprites for gamma ERT suits
+ - Red ERT loadouts
+ - Gamma ERT loadouts
+
+
Citinited updated:
+
+ - Conveyor belts have received a facelift!
+ - Rotating a belt with a wrench now nicely rotates the belt for you
+ - Click a lever with a lever to link their IDs. Click a belt with a lever to link that belt to that lever.
+ - Deconstructing a syndicate console will no longer ruin it forever.
+
+
DesolateG updated:
+
+ - Refactors the timer subsystems and bugfixes
+
+
Purpose updated:
+
+ - Code improvements on mouse_opacity
+ - Plating shadow faux 3d now works properly.
+
+
Purpose & AndrewMontagne updated:
+
+ - Adds tile smoothing to plating. Plating should now be a bit more of a 3d look...
+
+
Purpose & Birdtalon updated:
+
+ - Takes Runtime out of the oven.
+
+
Squirgenheimer updated:
+
+ - fixed a potential runtime in the sentient animal event
+
+
Triiodine updated:
+
+ - Tidied up nuclear shuttle's mini-medbay to better utilize the space provided.
+ - Full Body-Scanner, surgery set, replacement limbs, bloodpacks to the nuclear shuttle's mini-medbay.
+ - One of the nuclear shuttle's sleepers.
+
+
uc_guy updated:
+
+ - Legless human mobs no longer scream non-stop when buckled into a chair.
+
+
variableundefined updated:
+
+ - Poolcontroller performance are improved dramatically. Expect slightly reduced CPU use on beach gateway map
+ - Poolcontroller will no longer work properly if you directly var-edit someone's location to inside a body of water and a decal's (However if the mob move right after it will still work)
+
+
+
08 October 2018
+
Ansari, Birdtalon updated:
+
+ - Updates resting procs, fixes getting people up from help intent.
+
+
Birdtalon updated:
+
+ - Conservation of damage mechanic for set species
+ - Changeling transform conserves damage when transforming to a different species.
+
+
Crazylemon updated:
+
+ - Fixes AIs being unable to examine due to a runtime.
+ - Fixes nearsighted glasses behavior being inverted (seeing worse with glasses).
+ - Mining mobs now update their sprites on death.
+
+
Crazylemon64 updated:
+
+ - Updates for damage on HUD elements are now instant for cyborgs and humans.
+ - When dead, you can now see your surroundings with ghost vision and examine things around you.
+
+
Farie82 updated:
+
+ - PANDEMIC can print a virus release form now. Viromancers REJOICE!
+
+
Purpose updated:
+
+ - Adds the missing turfs under windows & doors on Mech Transport Space ruin.
+ - Fixes improper turf in the shuttle crashed into one of the space ruins.
+ - Fixing improper decals & missing turfs in the Space Bar space ruin, and some tiny fixes.
+ - GasTheLizard Space Ruin now uses Decals properly.
+ - MoonOutpost19 Away Mission now uses Decals properly.
+ - Evil Santa Away Mission now uses Decals properly.
+ - Fixes the corpse spawners in Space Battle Away Mission.
+ - Space Battle Away Mission now uses Decals properly.
+ - Prettier Donate/Karma buttons!
+ - Adds new stair sprites.
+ - Blackmarket Backpackers now uses Decals properly.
+ - OneHalf Space Ruin now uses Decals properly.
+ - CentComm Away Mission now uses Decals properly.
+ - Cyberiad Z2 now uses Decals properly.
+ - Space Hotel Away Mission now uses Decals properly.
+ - Terror Spiders Away Mission now uses Decals properly.
+ - Adds plasma window spawners for mappers.
+ - Thrown stunbatons & improvised batons have a low chance to stun.
+ - You can now alt click breath masks to pull them up & down.
+ - You can no longer erroneously pull down a vox mask.
+ - TravisCI now checks all space ruins & away missions for integration.
+
+
Triiodine updated:
+
+ - Rsik's fluff katana ~~modkit~~
+
+
Ty-Omaha updated:
+
+ - Replaces Security's bomb suit with their cooler Security version
+ - Fixes runtime in world.dm;127
+
+
tigercat2000 updated:
+
+ - Made mind.dm 1/1000 less awful.
+
+
variableundefined updated:
+
+ - NPCpool (SNPC) is now a subsystem.
+ - NPCAI (For simple mob) is now a subsystem.
+ - Customising SNPC no longer results in screaming death and a naked person.
+ - Logging added to RD teleport gun, some projectile are always logged
+ - EMPulse & Explosion can optionally log a cause for administrative purpose
+ - Backend Attack logs now display coordinates of attacker & defender for forensic reconstruction.
+ - Grill shock cooldown is 1 second instead.
+
+
07 October 2018
Birdtalon updated:
@@ -84,6 +250,11 @@
- Changelings with wingdings now permanently switch to regular speech after transforming
+ variableundefined updated:
+
+ - All sharp items can cut sliceables like cheesewheel now.
+ - Putting items inside sliceables is done by alt-click now.
+
06 October 2018
Alonefromhell updated:
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index b9ec5e83e40..59761cbe975 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -7294,3 +7294,125 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
datlo:
- bugfix: Changelings with wingdings now permanently switch to regular speech after
transforming
+ variableundefined:
+ - rscadd: All sharp items can cut sliceables like cheesewheel now.
+ - tweak: Putting items inside sliceables is done by alt-click now.
+2018-10-08:
+ Ansari, Birdtalon:
+ - bugfix: Updates resting procs, fixes getting people up from help intent.
+ Birdtalon:
+ - rscadd: Conservation of damage mechanic for set species
+ - tweak: Changeling transform conserves damage when transforming to a different
+ species.
+ Crazylemon:
+ - bugfix: Fixes AIs being unable to examine due to a runtime.
+ - bugfix: Fixes nearsighted glasses behavior being inverted (seeing worse with glasses).
+ - bugfix: Mining mobs now update their sprites on death.
+ Crazylemon64:
+ - bugfix: Updates for damage on HUD elements are now instant for cyborgs and humans.
+ - rscadd: When dead, you can now see your surroundings with ghost vision and examine
+ things around you.
+ Farie82:
+ - rscadd: PANDEMIC can print a virus release form now. Viromancers REJOICE!
+ Purpose:
+ - bugfix: Adds the missing turfs under windows & doors on Mech Transport Space ruin.
+ - bugfix: Fixes improper turf in the shuttle crashed into one of the space ruins.
+ - bugfix: Fixing improper decals & missing turfs in the Space Bar space ruin, and
+ some tiny fixes.
+ - tweak: GasTheLizard Space Ruin now uses Decals properly.
+ - tweak: MoonOutpost19 Away Mission now uses Decals properly.
+ - tweak: Evil Santa Away Mission now uses Decals properly.
+ - bugfix: Fixes the corpse spawners in Space Battle Away Mission.
+ - tweak: Space Battle Away Mission now uses Decals properly.
+ - tweak: Prettier Donate/Karma buttons!
+ - rscadd: Adds new stair sprites.
+ - tweak: Blackmarket Backpackers now uses Decals properly.
+ - tweak: OneHalf Space Ruin now uses Decals properly.
+ - tweak: CentComm Away Mission now uses Decals properly.
+ - tweak: Cyberiad Z2 now uses Decals properly.
+ - tweak: Space Hotel Away Mission now uses Decals properly.
+ - tweak: Terror Spiders Away Mission now uses Decals properly.
+ - rscadd: Adds plasma window spawners for mappers.
+ - rscadd: Thrown stunbatons & improvised batons have a low chance to stun.
+ - rscadd: You can now alt click breath masks to pull them up & down.
+ - bugfix: You can no longer erroneously pull down a vox mask.
+ - bugfix: TravisCI now checks all space ruins & away missions for integration.
+ Triiodine:
+ - rscadd: Rsik's fluff katana ~~modkit~~
+ Ty-Omaha:
+ - tweak: Replaces Security's bomb suit with their cooler Security version
+ - bugfix: Fixes runtime in world.dm;127
+ tigercat2000:
+ - bugfix: Made mind.dm 1/1000 less awful.
+ variableundefined:
+ - tweak: NPCpool (SNPC) is now a subsystem.
+ - tweak: NPCAI (For simple mob) is now a subsystem.
+ - bugfix: Customising SNPC no longer results in screaming death and a naked person.
+ - tweak: Logging added to RD teleport gun, some projectile are always logged
+ - tweak: EMPulse & Explosion can optionally log a cause for administrative purpose
+ - tweak: Backend Attack logs now display coordinates of attacker & defender for
+ forensic reconstruction.
+ - tweak: Grill shock cooldown is 1 second instead.
+2018-10-09:
+ Alonefromhell:
+ - spellcheck: Edited the attack text of the teleport armor.
+ Birdtalon , LPSpartan, Shazbot, Memager:
+ - rscadd: Portable Body Analyzer for ERT
+ - rscadd: Muilti Lens Immolation gun for gamma ERT
+ - rscadd: PDW-9 sidearm for ERT
+ - rscadd: T4 Thermite Charge for Gamma ERT security
+ - rscadd: Sprites for gamma ERT suits
+ - tweak: Red ERT loadouts
+ - tweak: Gamma ERT loadouts
+ Citinited:
+ - tweak: Conveyor belts have received a facelift!
+ - tweak: Rotating a belt with a wrench now nicely rotates the belt for you
+ - tweak: Click a lever with a lever to link their IDs. Click a belt with a lever
+ to link that belt to that lever.
+ - bugfix: Deconstructing a syndicate console will no longer ruin it forever.
+ DesolateG:
+ - bugfix: Refactors the timer subsystems and bugfixes
+ Purpose:
+ - tweak: Code improvements on mouse_opacity
+ - bugfix: Plating shadow faux 3d now works properly.
+ Purpose & AndrewMontagne:
+ - rscadd: Adds tile smoothing to plating. Plating should now be a bit more of a
+ 3d look...
+ Purpose & Birdtalon:
+ - bugfix: Takes Runtime out of the oven.
+ Squirgenheimer:
+ - bugfix: fixed a potential runtime in the sentient animal event
+ Triiodine:
+ - tweak: Tidied up nuclear shuttle's mini-medbay to better utilize the space provided.
+ - rscadd: Full Body-Scanner, surgery set, replacement limbs, bloodpacks to the nuclear
+ shuttle's mini-medbay.
+ - rscdel: One of the nuclear shuttle's sleepers.
+ uc_guy:
+ - bugfix: Legless human mobs no longer scream non-stop when buckled into a chair.
+ variableundefined:
+ - tweak: Poolcontroller performance are improved dramatically. Expect slightly reduced
+ CPU use on beach gateway map
+ - tweak: Poolcontroller will no longer work properly if you directly var-edit someone's
+ location to inside a body of water and a decal's (However if the mob move right
+ after it will still work)
+2018-10-10:
+ Alonefromhell:
+ - bugfix: You should no longer be able to relight a burned match by using a shoe.
+ Birdtalon:
+ - bugfix: Small runtime in tickets.dm
+ Citinited:
+ - bugfix: Emagging a locker will keep the original description instead of telling
+ you it was emagged twice.
+ - bugfix: Examining airlocks displays the proper icon now
+ - bugfix: Holopads don't work when unanchored any more.
+ Purpose:
+ - bugfix: Fixes a few broken tiles in maintenance, by breaking those tiles properly.
+ Ty-Omaha:
+ - bugfix: Fixes PAIs
+ - bugfix: Ambulances work again
+ Warior4356:
+ - imageadd: added Grey sprite for psysuit, made by dumbdumb
+ tigercat2000:
+ - rscadd: Hovering over an inventory slot now shows an indicator for if that item
+ can go in that slot or not. Pretty!
+ - wip: SSOverlays has been added, but not implemented!
diff --git a/icons/misc/buildmode.dmi b/icons/misc/buildmode.dmi
index cc54e5aec0f..f0de428b6c5 100644
Binary files a/icons/misc/buildmode.dmi and b/icons/misc/buildmode.dmi differ
diff --git a/icons/mob/belt.dmi b/icons/mob/belt.dmi
index 93630adce9a..c833c6d66c2 100644
Binary files a/icons/mob/belt.dmi and b/icons/mob/belt.dmi differ
diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi
index 7bc8088aa86..551a7490577 100644
Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ
diff --git a/icons/mob/inhands/fluff_lefthand.dmi b/icons/mob/inhands/fluff_lefthand.dmi
index a5721f518ce..9635833f580 100644
Binary files a/icons/mob/inhands/fluff_lefthand.dmi and b/icons/mob/inhands/fluff_lefthand.dmi differ
diff --git a/icons/mob/inhands/fluff_righthand.dmi b/icons/mob/inhands/fluff_righthand.dmi
index 50435f90e0d..be5280493c9 100644
Binary files a/icons/mob/inhands/fluff_righthand.dmi and b/icons/mob/inhands/fluff_righthand.dmi differ
diff --git a/icons/mob/species/grey/uniform.dmi b/icons/mob/species/grey/uniform.dmi
index 4927b69dc97..cdaf6b25cf5 100644
Binary files a/icons/mob/species/grey/uniform.dmi and b/icons/mob/species/grey/uniform.dmi differ
diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi
index c12484b28e4..b721063fcf9 100644
Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index 3d3971cb0a3..0aa2ad1f592 100644
Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ
diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi
index 6c186e952e9..3651f3508cc 100644
Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ
diff --git a/icons/obj/custom_items.dmi b/icons/obj/custom_items.dmi
index 8aaf2291abd..0d2e22eab68 100644
Binary files a/icons/obj/custom_items.dmi and b/icons/obj/custom_items.dmi differ
diff --git a/icons/obj/device.dmi b/icons/obj/device.dmi
index 042c10b2aed..03ea5ef9684 100644
Binary files a/icons/obj/device.dmi and b/icons/obj/device.dmi differ
diff --git a/icons/obj/grenade.dmi b/icons/obj/grenade.dmi
index f33135baec6..be866dc4275 100644
Binary files a/icons/obj/grenade.dmi and b/icons/obj/grenade.dmi differ
diff --git a/icons/obj/guns/energy.dmi b/icons/obj/guns/energy.dmi
index 03b8eba0f8c..1fc59f10afd 100644
Binary files a/icons/obj/guns/energy.dmi and b/icons/obj/guns/energy.dmi differ
diff --git a/icons/obj/recycling.dmi b/icons/obj/recycling.dmi
index 2c964d60681..2a47e6817bb 100644
Binary files a/icons/obj/recycling.dmi and b/icons/obj/recycling.dmi differ
diff --git a/icons/obj/structures.dmi b/icons/obj/structures.dmi
index 838503bbda1..e1364852b9f 100644
Binary files a/icons/obj/structures.dmi and b/icons/obj/structures.dmi differ
diff --git a/icons/turf/floors.dmi b/icons/turf/floors.dmi
index 0ec60d09409..9a62da82286 100644
Binary files a/icons/turf/floors.dmi and b/icons/turf/floors.dmi differ
diff --git a/icons/turf/floors/plating.dmi b/icons/turf/floors/plating.dmi
new file mode 100644
index 00000000000..c3c480bfc6a
Binary files /dev/null and b/icons/turf/floors/plating.dmi differ
diff --git a/icons/turf/overlays.dmi b/icons/turf/overlays.dmi
index 03b0743f95d..add518c139b 100644
Binary files a/icons/turf/overlays.dmi and b/icons/turf/overlays.dmi differ
diff --git a/interface/skin.dmf b/interface/skin.dmf
index e7dec18eba4..9435f531e06 100644
--- a/interface/skin.dmf
+++ b/interface/skin.dmf
@@ -1401,11 +1401,11 @@ menu "menu"
group = ""
is-disabled = false
saved-params = "is-checked"
- elem
+ elem
name = "&Icons"
command = ""
saved-params = "is-checked"
- elem
+ elem
name = "&Size"
command = ""
category = "&Icons"
@@ -1424,7 +1424,7 @@ menu "menu"
category = "&Size"
can-check = true
group = "size"
- saved-params = "is-checked"
+ saved-params = "is-checked"
elem "icon96"
name = "&96x96 (3x)"
command = ".winset \"mapwindow.map.icon-size=96\""
@@ -1453,7 +1453,7 @@ menu "menu"
can-check = true
group = "size"
saved-params = "is-checked"
- elem
+ elem
name = "&Scaling"
command = ""
category = "&Icons"
@@ -1709,16 +1709,18 @@ window "rpane"
elem "karma"
type = BUTTON
pos = 552,0
- size = 77x16
- background-color = #ff8040
+ size = 60x16
+ background-color = #FF4500
+ text-color = #FFFFFF
font-style = bold
- text = "Karma Shop"
+ text = "Karma"
command = "karmashop"
elem "donate"
type = BUTTON
- pos = 634,0
+ pos = 617,0
size = 60x16
- background-color = #008000
+ background-color = #008000
+ text-color = #FFFFFF
font-style = bold
text = "Donate"
command = "Donate"
diff --git a/paradise.dme b/paradise.dme
index de38b9a410d..a20b8d43042 100644
--- a/paradise.dme
+++ b/paradise.dme
@@ -195,7 +195,6 @@
#include "code\controllers\Processes\fast_process.dm"
#include "code\controllers\Processes\lighting.dm"
#include "code\controllers\Processes\npcai.dm"
-#include "code\controllers\Processes\npcpool.dm"
#include "code\controllers\Processes\obj.dm"
#include "code\controllers\Processes\ticker.dm"
#include "code\controllers\ProcessScheduler\core\process.dm"
@@ -209,6 +208,9 @@
#include "code\controllers\subsystem\nano_mob_hunter.dm"
#include "code\controllers\subsystem\nanoui.dm"
#include "code\controllers\subsystem\nightshift.dm"
+#include "code\controllers\subsystem\npcai.dm"
+#include "code\controllers\subsystem\npcpool.dm"
+#include "code\controllers\subsystem\overlays.dm"
#include "code\controllers\subsystem\shuttles.dm"
#include "code\controllers\subsystem\spacedrift.dm"
#include "code\controllers\subsystem\sun.dm"
@@ -223,6 +225,7 @@
#include "code\datums\beam.dm"
#include "code\datums\browser.dm"
#include "code\datums\callback.dm"
+#include "code\datums\click_intercept.dm"
#include "code\datums\datacore.dm"
#include "code\datums\datum.dm"
#include "code\datums\datumvars.dm"
@@ -390,7 +393,6 @@
#include "code\game\atoms.dm"
#include "code\game\atoms_movable.dm"
#include "code\game\data_huds.dm"
-#include "code\game\response_team.dm"
#include "code\game\shuttle_engines.dm"
#include "code\game\sound.dm"
#include "code\game\world.dm"
@@ -1075,7 +1077,6 @@
#include "code\modules\admin\admin_verbs.dm"
#include "code\modules\admin\banappearance.dm"
#include "code\modules\admin\banjob.dm"
-#include "code\modules\admin\buildmode.dm"
#include "code\modules\admin\create_mob.dm"
#include "code\modules\admin\create_object.dm"
#include "code\modules\admin\create_poll.dm"
@@ -1206,6 +1207,22 @@
#include "code\modules\awaymissions\mission_code\stationCollision.dm"
#include "code\modules\awaymissions\mission_code\UO71-terrorspiders.dm"
#include "code\modules\awaymissions\mission_code\wildwest.dm"
+#include "code\modules\buildmode\bm_mode.dm"
+#include "code\modules\buildmode\buildmode.dm"
+#include "code\modules\buildmode\buttons.dm"
+#include "code\modules\buildmode\effects\line.dm"
+#include "code\modules\buildmode\submodes\advanced.dm"
+#include "code\modules\buildmode\submodes\area_edit.dm"
+#include "code\modules\buildmode\submodes\atmos.dm"
+#include "code\modules\buildmode\submodes\basic.dm"
+#include "code\modules\buildmode\submodes\boom.dm"
+#include "code\modules\buildmode\submodes\copy.dm"
+#include "code\modules\buildmode\submodes\fill.dm"
+#include "code\modules\buildmode\submodes\link.dm"
+#include "code\modules\buildmode\submodes\mapgen.dm"
+#include "code\modules\buildmode\submodes\save.dm"
+#include "code\modules\buildmode\submodes\throwing.dm"
+#include "code\modules\buildmode\submodes\variable_edit.dm"
#include "code\modules\busy_space\air_traffic.dm"
#include "code\modules\busy_space\loremaster.dm"
#include "code\modules\busy_space\organizations.dm"
@@ -1277,7 +1294,7 @@
#include "code\modules\clothing\spacesuits\rig\modules\vision.dm"
#include "code\modules\clothing\spacesuits\rig\suits\alien.dm"
#include "code\modules\clothing\spacesuits\rig\suits\combat.dm"
-#include "code\modules\clothing\spacesuits\rig\suits\ert.dm"
+#include "code\modules\clothing\spacesuits\rig\suits\ert_suits.dm"
#include "code\modules\clothing\spacesuits\rig\suits\light.dm"
#include "code\modules\clothing\spacesuits\rig\suits\merc.dm"
#include "code\modules\clothing\spacesuits\rig\suits\station.dm"
@@ -1626,7 +1643,6 @@
#include "code\modules\mob\living\carbon\alien\humanoid\caste\drone.dm"
#include "code\modules\mob\living\carbon\alien\humanoid\caste\hunter.dm"
#include "code\modules\mob\living\carbon\alien\humanoid\caste\sentinel.dm"
-#include "code\modules\mob\living\carbon\alien\larva\death.dm"
#include "code\modules\mob\living\carbon\alien\larva\emote.dm"
#include "code\modules\mob\living\carbon\alien\larva\inventory.dm"
#include "code\modules\mob\living\carbon\alien\larva\larva.dm"
@@ -1666,6 +1682,7 @@
#include "code\modules\mob\living\carbon\human\shock.dm"
#include "code\modules\mob\living\carbon\human\status_procs.dm"
#include "code\modules\mob\living\carbon\human\update_icons.dm"
+#include "code\modules\mob\living\carbon\human\update_stat.dm"
#include "code\modules\mob\living\carbon\human\whisper.dm"
#include "code\modules\mob\living\carbon\human\interactive\functions.dm"
#include "code\modules\mob\living\carbon\human\interactive\interactive.dm"
@@ -2150,6 +2167,8 @@
#include "code\modules\research\designs\weapon_designs.dm"
#include "code\modules\research\xenobiology\xenobio_camera.dm"
#include "code\modules\research\xenobiology\xenobiology.dm"
+#include "code\modules\response_team\ert.dm"
+#include "code\modules\response_team\ert_outfits.dm"
#include "code\modules\ruins\ruin_areas.dm"
#include "code\modules\scripting\__defines.dm"
#include "code\modules\scripting\Errors.dm"