=G.max_amount)
+ if(S.amount >= S.max_amount)
continue
- G.attackby(NG, user, params)
+ S.attackby(NS, user)
if(reinf)
- var/obj/item/stack/rods/NR = new (src.loc)
- for(var/obj/item/stack/rods/R in src.loc)
- if(R==NR)
+ var/obj/item/stack/rods/NR = new (get_turf(src))
+ for(var/obj/item/stack/rods/R in loc)
+ if(R == NR)
continue
- if(R.amount>=R.max_amount)
+ if(R.amount >= R.max_amount)
continue
- R.attackby(NR, user, params)
+ R.attackby(NR, user)
- to_chat(user, "You have disassembled the window.")
+ to_chat(user, "You have disassembled [src].")
disassembled = 1
density = 0
air_update_turf(1)
update_nearby_icons()
qdel(src)
- else
- if(I.damtype == BRUTE || I.damtype == BURN)
- user.changeNext_move(CLICK_CD_MELEE)
- hit(I.force)
- if(health <= 7)
- anchored = 0
- update_nearby_icons()
- step(src, get_dir(user, src))
- else
- playsound(loc, 'sound/effects/Glasshit.ogg', 75, 1)
- ..()
- return
-
+ return 1
/obj/structure/window/mech_melee_attack(obj/mecha/M)
if(..())
diff --git a/code/game/response_team.dm b/code/game/response_team.dm
index c54d1f65b37..aa3bf4f7e9a 100644
--- a/code/game/response_team.dm
+++ b/code/game/response_team.dm
@@ -1,5 +1,4 @@
-//STRIKE TEAMS
-//Thanks to Kilakk for the admin-button portion of this code.
+// ERTs
#define ERT_TYPE_AMBER 1
#define ERT_TYPE_RED 2
@@ -11,7 +10,7 @@
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
+var/send_emergency_team = 0
var/ert_request_answered = 0
/client/proc/response_team()
@@ -34,46 +33,9 @@ var/ert_request_answered = 0
to_chat(usr, "Central Command has already dispatched an emergency response team!")
return
- if(alert("Do you want to dispatch an Emergency Response Team?",,"Yes","No") != "Yes")
- return
+ var/datum/nano_module/ert_manager/E = new()
+ E.ui_interact(usr)
- if(get_security_level() != "red") // Allow admins to reconsider if the alert level isn't Red
- switch(alert("The station is not in red alert. Do you still want to dispatch a response team?",,"Yes","No"))
- if("No")
- return
-
- if(send_emergency_team)
- to_chat(usr, "Central Command has already dispatched an emergency response team!")
- return
-
- var/ert_type = pick_ert_type()
-
- if(!ert_type)
- return
-
- ert_request_answered = 1
- message_admins("[key_name_admin(usr)] is dispatching an Emergency Response Team", 1)
- log_admin("[key_name(usr)] used Dispatch Emergency Response Team..")
- trigger_armed_response_team(ert_type)
-
-/client/proc/pick_ert_type()
- switch(alert("Please select the ERT type you wish to deploy.", "Emergency Response Team", "Code Amber", "Code Red", "Code Gamma", "Cancel"))
- if("Code Amber")
- if(alert("Confirm: Deploy code 'AMBER' light ERT?", "Emergency Response Team", "Confirm", "Cancel") == "Confirm")
- return new /datum/response_team/amber
- else
- return pick_ert_type()
- if("Code Red")
- if(alert("Confirm: Deploy code 'RED' medium ERT?", "Emergency Response Team", "Confirm", "Cancel") == "Confirm")
- return new /datum/response_team/red
- else
- return pick_ert_type()
- if("Code Gamma")
- if(alert("Confirm: Deploy code 'GAMMA' elite ERT?", "Emergency Response Team", "Confirm", "Cancel") == "Confirm")
- return new /datum/response_team/gamma
- else
- return pick_ert_type()
- return 0
/mob/dead/observer/proc/JoinResponseTeam()
if(!send_emergency_team)
@@ -89,7 +51,7 @@ var/ert_request_answered = 0
to_chat(src, "This role is not yet available to you. You need to wait another [player_age_check] days.")
return 0
- if(has_enabled_antagHUD == 1 && config.antag_hud_restricted)
+ if(cannotPossess(src))
to_chat(src, "Upon using the antagHUD you forfeited the ability to join the round.")
return 0
@@ -99,9 +61,10 @@ var/ert_request_answered = 0
return 1
-/proc/trigger_armed_response_team(var/datum/response_team/response_team_type)
+/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])
@@ -112,6 +75,8 @@ var/ert_request_answered = 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
@@ -125,12 +90,22 @@ var/ert_request_answered = 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
var/client/C = M.client
- var/mob/living/carbon/human/new_commando = C.create_response_team(emergencyresponseteamspawn[index])
+ var/mob/living/new_commando = C.create_response_team(emergencyresponseteamspawn[index])
new_commando.mind.key = M.key
new_commando.key = M.key
new_commando.update_icons()
@@ -141,17 +116,23 @@ var/ert_request_answered = 0
return 1
/client/proc/create_response_team(var/turf/spawn_location)
- 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")
-
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)
@@ -165,7 +146,7 @@ var/ert_request_answered = 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 = pick(-50, -30, -10, 0, 0, 0, 10) // Caucasian/black
+ var/skin_tone = rand(-120, 20) // A range of skin colors
head_organ.facial_colour = hair_c
head_organ.sec_facial_colour = hair_c
@@ -205,11 +186,32 @@ var/ert_request_answered = 0
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
+ security_slots = sec
+ medical_slots = med
+ engineer_slots = eng
+ janitor_slots = jan
+ paranormal_slots = par
+ 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()
@@ -221,7 +223,12 @@ var/ert_request_answered = 0
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)
@@ -234,6 +241,12 @@ var/ert_request_answered = 0
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)
@@ -253,6 +266,16 @@ var/ert_request_answered = 0
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
@@ -277,6 +300,8 @@ var/ert_request_answered = 0
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")
@@ -288,6 +313,8 @@ var/ert_request_answered = 0
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")
@@ -299,6 +326,9 @@ var/ert_request_answered = 0
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")
@@ -617,6 +647,88 @@ var/ert_request_answered = 0
/obj/item/weapon/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/weapon/storage/backpack/ert/security
+ gloves = /obj/item/clothing/gloves/color/black
+ shoes = /obj/item/clothing/shoes/combat
+ l_ear = /obj/item/device/radio/headset/ert/alt
+ glasses = /obj/item/clothing/glasses/hud/security/sunglasses
+ belt = /obj/item/weapon/storage/belt/security/response_team
+ id = /obj/item/weapon/card/id/centcom
+ pda = /obj/item/device/pda/centcom
+ backpack_contents = list(
+ /obj/item/clothing/mask/gas/sechailer/swat = 1,
+ /obj/item/weapon/storage/box/zipties = 1,
+ /obj/item/device/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/weapon/gun/energy/gun/advtaser
+ r_pocket = /obj/item/weapon/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/weapon/gun/energy/gun/nuclear
+ r_pocket = /obj/item/weapon/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/weapon/gun/energy/gun/nuclear
+ r_pocket = /obj/item/weapon/gun/energy/pulse/pistol
+ l_pocket = /obj/item/weapon/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/weapon/storage/backpack/ert/janitor
+ belt = /obj/item/weapon/storage/belt/janitor/full
+ gloves = /obj/item/clothing/gloves/color/yellow
+ shoes = /obj/item/clothing/shoes/galoshes
+ l_ear = /obj/item/device/radio/headset/ert/alt
+ id = /obj/item/weapon/card/id/centcom
+ pda = /obj/item/device/pda/centcom
+ l_pocket = /obj/item/weapon/melee/classic_baton/telescopic
+ backpack_contents = list(
+ /obj/item/weapon/grenade/chem_grenade/antiweed = 2,
+ /obj/item/weapon/reagent_containers/spray/cleaner = 1,
+ /obj/item/weapon/storage/bag/trash = 1,
+ /obj/item/weapon/storage/box/lights/mixed = 1,
+ /obj/item/weapon/holosign_creator = 1,
+ /obj/item/device/flashlight = 1)
+
+/datum/outfit/job/centcom/response_team/janitorial/amber
+ name = "RT Janitor (Amber)"
+ glasses = /obj/item/clothing/glasses/sunglasses
+
+/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
+ suit_store = /obj/item/weapon/gun/energy/gun
+ r_pocket = /obj/item/weapon/scythe/tele
+
+/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/weapon/gun/energy/pulse/pistol
+ l_pocket = /obj/item/weapon/grenade/clusterbuster/cleaner
+ r_pocket = /obj/item/weapon/grenade/clusterbuster/antiweed
+ shoes = /obj/item/clothing/shoes/magboots/advance
+
/obj/item/device/radio/centcom
name = "centcomm bounced radio"
frequency = ERT_FREQ
diff --git a/code/game/turfs/simulated/floor.dm b/code/game/turfs/simulated/floor.dm
index 0476df52ceb..dbc41924251 100644
--- a/code/game/turfs/simulated/floor.dm
+++ b/code/game/turfs/simulated/floor.dm
@@ -223,5 +223,10 @@ var/list/icons_to_ignore_at_floor_init = list("damaged1","damaged2","damaged3","
if(prob(20))
ChangeTurf(/turf/simulated/floor/engine/cult)
+/turf/simulated/floor/ratvar_act(force, ignore_mobs)
+ . = ..()
+ if(.)
+ ChangeTurf(/turf/simulated/floor/clockwork)
+
/turf/simulated/floor/can_have_cabling()
return !burnt && !broken
diff --git a/code/game/turfs/simulated/floor/fancy_floor.dm b/code/game/turfs/simulated/floor/fancy_floor.dm
index f4d281cdf68..398ad5f3a66 100644
--- a/code/game/turfs/simulated/floor/fancy_floor.dm
+++ b/code/game/turfs/simulated/floor/fancy_floor.dm
@@ -107,7 +107,7 @@
set_light(1, 1)
/turf/simulated/floor/carpet
- name = "Carpet"
+ name = "carpet"
icon = 'icons/turf/floors/carpet.dmi'
icon_state = "carpet"
floor_tile = /obj/item/stack/tile/carpet
@@ -159,3 +159,9 @@
/turf/simulated/floor/fakespace/New()
..()
icon_state = "[rand(0,25)]"
+
+/turf/simulated/floor/carpet/arcade
+ icon = 'icons/goonstation/turf/floor.dmi'
+ icon_state = "arcade"
+ floor_tile = /obj/item/stack/tile/arcade_carpet
+ smooth = SMOOTH_FALSE
diff --git a/code/game/turfs/simulated/floor/mineral.dm b/code/game/turfs/simulated/floor/mineral.dm
index eb15d3f9e63..e66d4383407 100644
--- a/code/game/turfs/simulated/floor/mineral.dm
+++ b/code/game/turfs/simulated/floor/mineral.dm
@@ -38,7 +38,8 @@
/turf/simulated/floor/mineral/plasma/attackby(obj/item/weapon/W, mob/user, params)
if(is_hot(W) > 300)//If the temperature of the object is over 300, then ignite
message_admins("Plasma flooring was ignited by [key_name_admin(user)](?) (FLW) in ([x],[y],[z] - JMP)",0,1)
- log_game("Plasma flooring was ignited by [key_name(user)] in ([x],[y],[z])")
+ log_game("Plasma flooring was ignited by [key_name(user)] in ([x],[y],[z])")
+ investigate_log("was ignited by [key_name(user)]","atmos")
ignite(is_hot(W))
return
..()
@@ -177,11 +178,11 @@
floor_tile = /obj/item/stack/tile/mineral/abductor
icons = list("alienpod1", "alienpod2", "alienpod3", "alienpod4", "alienpod5", "alienpod6", "alienpod7", "alienpod8", "alienpod9")
-/turf/simulated/floor/mineral/New()
+/turf/simulated/floor/mineral/abductor/New()
..()
icon_state = "alienpod[rand(1,9)]"
-/turf/simulated/floor/mineral/break_tile()
+/turf/simulated/floor/mineral/abductor/break_tile()
return //unbreakable
/turf/simulated/floor/mineral/abductor/burn_tile()
diff --git a/code/game/turfs/simulated/floor/misc_floor.dm b/code/game/turfs/simulated/floor/misc_floor.dm
index f46d81584d7..ddc95afaccd 100644
--- a/code/game/turfs/simulated/floor/misc_floor.dm
+++ b/code/game/turfs/simulated/floor/misc_floor.dm
@@ -67,3 +67,32 @@
/turf/simulated/floor/noslip/MakeSlippery()
return
+
+//Clockwork floor: Slowly heals toxin damage on nearby servants.
+/turf/simulated/floor/clockwork
+ name = "clockwork floor"
+ desc = "Tightly-pressed brass tiles. They emit minute vibration."
+ icon_state = "clockwork_floor"
+
+/turf/simulated/floor/clockwork/attackby(obj/item/I, mob/living/user, params)
+ if(iscrowbar(I))
+ user.visible_message("[user] begins slowly prying up [src]...", "You begin painstakingly prying up [src]...")
+ playsound(src, I.usesound, 20, 1)
+ if(!do_after(user, 70*I.toolspeed, target = src))
+ return 0
+ user.visible_message("[user] pries up [src]!", "You pry up [src]!")
+ playsound(src, I.usesound, 80, 1)
+ make_plating()
+ return 1
+ return ..()
+
+/turf/simulated/floor/clockwork/make_plating()
+ new /obj/item/stack/tile/brass(src)
+ return ..()
+
+/turf/simulated/floor/clockwork/narsie_act()
+ ..()
+ if(istype(src, /turf/simulated/floor/clockwork)) //if we haven't changed type
+ var/previouscolor = color
+ color = "#960000"
+ animate(src, color = previouscolor, time = 8)
diff --git a/code/game/turfs/simulated/floor/plating.dm b/code/game/turfs/simulated/floor/plating.dm
index 1e9d019ac59..18ff4d697fa 100644
--- a/code/game/turfs/simulated/floor/plating.dm
+++ b/code/game/turfs/simulated/floor/plating.dm
@@ -146,6 +146,13 @@
/turf/simulated/floor/engine/cult/narsie_act()
return
+/turf/simulated/floor/engine/cult/ratvar_act()
+ . = ..()
+ if(istype(src, /turf/simulated/floor/engine/cult)) //if we haven't changed type
+ var/previouscolor = color
+ color = "#FAE48C"
+ animate(src, color = previouscolor, time = 8)
+
/turf/simulated/floor/engine/n20/New()
..()
var/datum/gas_mixture/adding = new
@@ -227,7 +234,7 @@
/turf/simulated/floor/plating/airless/catwalk/update_icon(var/propogate=1)
underlays.Cut()
- underlays += new /icon('icons/turf/space.dmi',"[((x + y) ^ ~(x * y) + z) % 25]")
+ underlays += new /icon('icons/turf/space.dmi',SPACE_ICON_STATE)
var/dirs = 0
for(var/direction in cardinal)
diff --git a/code/game/turfs/simulated/shuttle.dm b/code/game/turfs/simulated/shuttle.dm
index ac520ca8c0f..6ab60fffd99 100644
--- a/code/game/turfs/simulated/shuttle.dm
+++ b/code/game/turfs/simulated/shuttle.dm
@@ -13,6 +13,10 @@
blocks_air = 1
+/turf/simulated/shuttle/narsie_act()
+ if(prob(20))
+ ChangeTurf(/turf/simulated/wall/cult)
+
//sub-type to be used for interior shuttle walls
//won't get an underlay of the destination turf on shuttle move
/turf/simulated/shuttle/wall/interior/copyTurf(turf/T)
diff --git a/code/game/turfs/simulated/walls_mineral.dm b/code/game/turfs/simulated/walls_mineral.dm
index 76323f3e2e1..d2db056e824 100644
--- a/code/game/turfs/simulated/walls_mineral.dm
+++ b/code/game/turfs/simulated/walls_mineral.dm
@@ -96,6 +96,7 @@
if(is_hot(W) > 300)//If the temperature of the object is over 300, then ignite
message_admins("Plasma wall ignited by [key_name_admin(user)] in ([x], [y], [z] - JMP)",0,1)
log_game("Plasma wall ignited by [key_name(user)] in ([x], [y], [z])")
+ investigate_log("was ignited by [key_name(user)]","atmos")
ignite(is_hot(W))
return
..()
@@ -125,7 +126,7 @@
desc = "A strange-looking alien wall."
icon = 'icons/turf/walls/plasma_wall.dmi'
icon_state = "plasma"
- sheet_type = null
+ sheet_type = /obj/item/stack/sheet/mineral/abductor
canSmoothWith = list(/turf/simulated/wall/mineral/alien, /obj/structure/falsewall/alien)
/turf/simulated/wall/mineral/wood
@@ -152,6 +153,7 @@
desc = "A wall with alien alloy plating."
icon = 'icons/turf/walls/abductor_wall.dmi'
icon_state = "abductor"
+ smooth = SMOOTH_TRUE|SMOOTH_DIAGONAL
sheet_type = /obj/item/stack/sheet/mineral/abductor
explosion_block = 3
canSmoothWith = list(/turf/simulated/wall/mineral/abductor, /obj/structure/falsewall/abductor)
\ No newline at end of file
diff --git a/code/game/turfs/simulated/walls_misc.dm b/code/game/turfs/simulated/walls_misc.dm
index d0b0a3c8960..8ce32658a62 100644
--- a/code/game/turfs/simulated/walls_misc.dm
+++ b/code/game/turfs/simulated/walls_misc.dm
@@ -13,7 +13,7 @@
/turf/simulated/wall/cult/New()
..()
if(ticker.mode)//game hasn't started offically don't do shit..
- new /obj/effect/overlay/temp/cult/turf(src)
+ new /obj/effect/temp_visual/cult/turf(src)
icon_state = ticker.mode.cultdat.cult_wall_icon_state
/turf/simulated/wall/cult/artificer
@@ -21,11 +21,11 @@
desc = "A cold stone wall engraved with indecipherable symbols. Studying them causes your head to pound."
/turf/simulated/wall/cult/artificer/break_wall()
- new /obj/effect/overlay/temp/cult/turf(get_turf(src))
+ new /obj/effect/temp_visual/cult/turf(get_turf(src))
return null //excuse me we want no runed metal here
/turf/simulated/wall/cult/artificer/devastate_wall()
- new /obj/effect/overlay/temp/cult/turf(get_turf(src))
+ new /obj/effect/temp_visual/cult/turf(get_turf(src))
/turf/simulated/wall/cult/narsie_act()
return
diff --git a/code/game/turfs/simulated/walls_reinforced.dm b/code/game/turfs/simulated/walls_reinforced.dm
index 43374ce66d8..db766f19e68 100644
--- a/code/game/turfs/simulated/walls_reinforced.dm
+++ b/code/game/turfs/simulated/walls_reinforced.dm
@@ -6,7 +6,7 @@
opacity = 1
density = 1
explosion_block = 2
- damage_cap = 200
+ damage_cap = 600
max_temperature = 6000
hardness = 10
sheet_type = /obj/item/stack/sheet/plasteel
diff --git a/code/game/turfs/space/space.dm b/code/game/turfs/space/space.dm
index 90454f9952b..7f185bf0e64 100644
--- a/code/game/turfs/space/space.dm
+++ b/code/game/turfs/space/space.dm
@@ -17,7 +17,7 @@
. = ..()
if(!istype(src, /turf/space/transit))
- icon_state = "[((x + y) ^ ~(x * y) + z) % 25]"
+ icon_state = SPACE_ICON_STATE
update_starlight()
/turf/space/Destroy(force)
diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm
index 83de35ea82c..2f05b738385 100644
--- a/code/game/turfs/turf.dm
+++ b/code/game/turfs/turf.dm
@@ -415,6 +415,15 @@
/turf/proc/can_lay_cable()
return can_have_cabling() & !intact
+/turf/ratvar_act(force, ignore_mobs, probability = 40)
+ . = (prob(probability) || force)
+ for(var/I in src)
+ var/atom/A = I
+ if(ignore_mobs && ismob(A))
+ continue
+ if(ismob(A) || .)
+ A.ratvar_act()
+
/turf/proc/add_blueprints(atom/movable/AM)
var/image/I = new
I.appearance = AM.appearance
diff --git a/code/game/turfs/unsimulated/beach.dm b/code/game/turfs/unsimulated/beach.dm
index 104c0996f0d..e3fad855558 100644
--- a/code/game/turfs/unsimulated/beach.dm
+++ b/code/game/turfs/unsimulated/beach.dm
@@ -54,7 +54,7 @@
/turf/unsimulated/beach/water/drop, /turf/unsimulated/beach/water/drop/dense,
/turf/unsimulated/beach/water, /turf/unsimulated/beach/water/dense,
/turf/unsimulated/beach/water/edge_drop)
- var/obj/effect/effect/beach_drop_overlay/water_overlay
+ var/obj/effect/beach_drop_overlay/water_overlay
/turf/unsimulated/beach/water/drop/New()
..()
@@ -64,7 +64,7 @@
QDEL_NULL(water_overlay)
return ..()
-/obj/effect/effect/beach_drop_overlay
+/obj/effect/beach_drop_overlay
name = "Water"
icon = 'icons/turf/floors/seadrop-o.dmi'
layer = MOB_LAYER + 0.1
diff --git a/code/game/turfs/unsimulated/walls.dm b/code/game/turfs/unsimulated/walls.dm
index 82f8c1390b5..4bcc4e90b2f 100644
--- a/code/game/turfs/unsimulated/walls.dm
+++ b/code/game/turfs/unsimulated/walls.dm
@@ -13,8 +13,8 @@
/turf/unsimulated/wall/fakedoor
name = "Centcom Access"
- icon = 'icons/obj/doors/Doorele.dmi'
- icon_state = "door_closed"
+ icon = 'icons/obj/doors/airlocks/centcom/centcom.dmi'
+ icon_state = "closed"
/turf/unsimulated/wall/splashscreen
name = "Space Station 13"
diff --git a/code/game/verbs/ooc.dm b/code/game/verbs/ooc.dm
index 28393927f20..cd68b0ec3b0 100644
--- a/code/game/verbs/ooc.dm
+++ b/code/game/verbs/ooc.dm
@@ -60,7 +60,7 @@ var/global/admin_ooc_colour = "#b82e00"
for(var/client/C in clients)
if(C.prefs.toggles & CHAT_OOC)
- var/display_name = src.key
+ var/display_name = key
if(prefs.unlock_content)
if(prefs.toggles & MEMBER_PUBLIC)
@@ -74,29 +74,16 @@ var/global/admin_ooc_colour = "#b82e00"
if(holder)
if(holder.fakekey)
- if(C.holder)
- display_name = "[holder.fakekey]/([src.key])"
+ if(C.holder && C.holder.rights & R_ADMIN)
+ display_name = "[holder.fakekey]/([key])"
else
display_name = holder.fakekey
if(!config.disable_ooc_emoji)
msg = "[msg]"
- msg = apply_formatting(msg)
-
to_chat(C, "OOC: [display_name]: [msg]")
-/proc/apply_formatting(message)
- var/static/regex/italics = new("(?$1")
- message = strikethrough.Replace(message, "$1")
- message = escape.Replace(message, "$1")//jesus christ, regex
-
- return message
-
/proc/toggle_ooc()
config.ooc_allowed = ( !config.ooc_allowed )
if(config.ooc_allowed)
diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index d05cc25a476..ce5ac02b85a 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -21,6 +21,13 @@ var/global/nologevent = 0
var/msg = rendered
to_chat(C, msg)
+/proc/message_adminTicket(var/msg)
+ msg = "ADMIN TICKET: [msg]"
+ for(var/client/C in admins)
+ if(R_ADMIN & C.holder.rights)
+ if(C.prefs && !(C.prefs.toggles & CHAT_NO_TICKETLOGS))
+ to_chat(C, msg)
+
///////////////////////////////////////////////////////////////////////////////////////////////Panels
diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index e89d333771e..28df27026a6 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -171,9 +171,9 @@ var/list/admin_verbs_debug = list(
/client/proc/map_template_upload,
/client/proc/view_runtimes,
/client/proc/admin_serialize,
- /client/proc/admin_deserialize,
/client/proc/jump_to_ruin,
- /client/proc/toggle_medal_disable
+ /client/proc/toggle_medal_disable,
+ /client/proc/startadmintickets,
)
var/list/admin_verbs_possess = list(
/proc/possess,
@@ -220,6 +220,12 @@ var/list/admin_verbs_snpc = list(
/client/proc/customiseSNPC,
/client/proc/hide_snpc_verbs
)
+var/list/admin_verbs_ticket = list(
+ /client/proc/openTicketUI,
+ /client/proc/toggleticketlogs,
+ /client/proc/resolveAllTickets,
+ /client/proc/openUserUI
+)
/client/proc/on_holder_add()
if(chatOutput && chatOutput.loaded)
@@ -232,6 +238,7 @@ var/list/admin_verbs_snpc = list(
verbs += /client/proc/togglebuildmodeself
if(holder.rights & R_ADMIN)
verbs += admin_verbs_admin
+ verbs += admin_verbs_ticket
spawn(1)
control_freak = 0
if(holder.rights & R_BAN)
@@ -282,7 +289,8 @@ var/list/admin_verbs_snpc = list(
admin_verbs_show_debug_verbs,
/client/proc/readmin,
admin_verbs_snpc,
- /client/proc/hide_snpc_verbs
+ /client/proc/hide_snpc_verbs,
+ admin_verbs_ticket
)
/client/proc/hide_verbs()
@@ -919,6 +927,20 @@ var/list/admin_verbs_snpc = list(
else
to_chat(usr, "You now will get admin log messages.")
+/client/proc/toggleticketlogs()
+ set name = "Toggle Admin Ticket Messgaes"
+ set category = "Preferences"
+
+ if(!check_rights(R_ADMIN))
+ return
+
+ prefs.toggles ^= CHAT_NO_TICKETLOGS
+ prefs.save_preferences(src)
+ if(prefs.toggles & CHAT_NO_TICKETLOGS)
+ to_chat(usr, "You now won't get admin ticket messages.")
+ else
+ to_chat(usr, "You now will get admin ticket messages.")
+
/client/proc/toggledrones()
set name = "Toggle Maintenance Drones"
set category = "Server"
diff --git a/code/modules/admin/tickets/admintickets.dm b/code/modules/admin/tickets/admintickets.dm
new file mode 100644
index 00000000000..5ef1f58dbf5
--- /dev/null
+++ b/code/modules/admin/tickets/admintickets.dm
@@ -0,0 +1,185 @@
+/*
+Admin ticket system by Birdtalon
+*/
+//Global holder
+
+var/global/datum/adminTicketHolder/globAdminTicketHolder = new /datum/adminTicketHolder
+
+//Defines
+//Deciseconds until ticket becomes stale if unanswered. Alerts admins.
+#define ADMIN_TICKET_TIMEOUT 6000 // 10 minutes
+//Decisecions before the user is allowed to open another ticket while their existing one is open.
+#define ADMIN_TICKET_DUPLICATE_COOLDOWN 3000 // 5 minutes
+
+//Status defines
+#define ADMIN_TICKET_OPEN 1
+#define ADMIN_TICKET_CLOSED 2
+#define ADMIN_TICKET_RESOLVED 3
+#define ADMIN_TICKET_STALE 4
+
+//Datum holding all tickets
+/datum/adminTicketHolder
+ var/ticketCounter = 1 // Counts the tickets and used to assign the id number
+ var/list/allTickets = list()
+
+//Return the current ticket number ready to be called off.
+/datum/adminTicketHolder/proc/getTicketCounter()
+ return ticketCounter
+
+//Return the ticket counter and increment
+/datum/adminTicketHolder/proc/getTicketCounterAndInc()
+ . = ticketCounter
+ ticketCounter++
+ return
+
+/datum/adminTicketHolder/proc/resolveAllOpenTickets() // Resolve all open tickets
+ for(var/i in allTickets)
+ var/datum/admin_ticket/T = i
+ resolveTicket(T.ticketNum)
+
+//Open a new ticket and populate details then add to the list of open tickets
+/datum/adminTicketHolder/proc/newTicket(var/client/C, var/passedContent, var/title)
+ if(!C || !passedContent)
+ return
+
+ //Check if the user has an open ticket already within the cooldown period, if so we don't create a new one and re-set the cooldown period
+ var/datum/admin_ticket/existingTicket = checkForOpenTicket(C)
+ if(existingTicket)
+ existingTicket.setCooldownPeriod()
+ to_chat(C, "Your ticket #[existingTicket.ticketNum] remains open! Visit \"My tickets\" under the Admin Tab to view it.")
+ return
+
+ if(!title)
+ title = passedContent
+
+ var/datum/admin_ticket/T = new /datum/admin_ticket
+ T.clientName = C
+ T.timeOpened = worldtime2text()
+ T.title = title
+ T.content += passedContent
+ T.locationSent = C.mob.loc.loc.name
+ T.mobControlled = C.mob
+ T.ticketState = ADMIN_TICKET_OPEN
+ T.timeUntilStale = world.time + ADMIN_TICKET_TIMEOUT
+ T.setCooldownPeriod()
+ T.ticketNum = getTicketCounterAndInc()
+ allTickets += T
+
+ //Inform the user that they have opened a ticket
+ to_chat(C, "You have opened admin ticket number #[(globAdminTicketHolder.getTicketCounter() - 1)]! Please be patient and we will help you soon!")
+
+ //Begin the stale count for this ticket.
+ spawn(0)
+ T.beginStaleCount()
+
+//Set ticket state with key N to open
+/datum/adminTicketHolder/proc/openTicket(var/N)
+ var/datum/admin_ticket/T = globAdminTicketHolder.allTickets[N]
+ if(T.ticketState != ADMIN_TICKET_OPEN)
+ T.ticketState = ADMIN_TICKET_OPEN
+ return TRUE
+
+//Set ticket state with key N to resolved
+/datum/adminTicketHolder/proc/resolveTicket(var/N)
+ var/datum/admin_ticket/T = globAdminTicketHolder.allTickets[N]
+ if(T.ticketState != ADMIN_TICKET_RESOLVED)
+ T.ticketState = ADMIN_TICKET_RESOLVED
+ return TRUE
+
+//Set ticket state with key N to closed
+/datum/adminTicketHolder/proc/closeTicket(var/N)
+ var/datum/admin_ticket/T = globAdminTicketHolder.allTickets[N]
+ if(T.ticketState != ADMIN_TICKET_CLOSED)
+ T.ticketState = ADMIN_TICKET_CLOSED
+ return TRUE
+
+//Check if the user already has a ticket open and within the cooldown period.
+/datum/adminTicketHolder/proc/checkForOpenTicket(var/client/C)
+ for(var/datum/admin_ticket/T in allTickets)
+ if(T.clientName == C && T.ticketState == ADMIN_TICKET_OPEN && (T.ticketCooldown > world.time))
+ return T
+ return FALSE
+
+//Check if the user has ANY ticket not resolved or closed.
+/datum/adminTicketHolder/proc/checkForTicket(var/client/C)
+ var/list/tickets = list()
+ for(var/datum/admin_ticket/T in allTickets)
+ if(T.clientName == C && T.ticketState == ADMIN_TICKET_OPEN || T.ticketState == ADMIN_TICKET_STALE)
+ tickets += T
+ if(tickets.len)
+ return tickets
+ return FALSE
+
+//return the client of a ticket number
+/datum/adminTicketHolder/proc/returnClient(var/N)
+ var/datum/admin_ticket/T = globAdminTicketHolder.allTickets[N]
+ return T.clientName
+
+/datum/adminTicketHolder/proc/assignAdminToTicket(var/client/C, var/N)
+ var/datum/admin_ticket/T = globAdminTicketHolder.allTickets[N]
+ T.assignAdmin(C)
+ return TRUE
+
+//Single admin ticket
+
+/datum/admin_ticket
+ var/ticketNum // Ticket number
+ var/clientName // Client which opened the ticket
+ var/timeOpened // Time the ticket was opened
+ var/title //The initial message with links
+ var/list/content = list() // content of the admin help
+ var/lastAdminResponse // Last admin who responded
+ var/lastResponseTime // When the admin last responded
+ var/locationSent // Location the player was when they send the ticket
+ var/mobControlled // Mob they were controlling
+ var/ticketState // State of the ticket, open, closed, resolved etc
+ var/timeUntilStale // When the ticket goes stale
+ var/ticketCooldown // Cooldown before allowing the user to open another ticket.
+ var/adminAssigned // Admin who has assigned themselves to this ticket
+
+//Ticker called when a ticket is created, checks for stale-ness.
+/datum/admin_ticket/proc/beginStaleCount()
+ while(world.time < timeUntilStale || !lastAdminResponse || !adminAssigned) // While within the stale period OR no admin responded OR no admin assigned.
+
+ if(!src)
+ return
+
+ sleep(200) // Check every 20 seconds.
+ if(ticketState == ADMIN_TICKET_OPEN && world.time > timeUntilStale)
+ message_adminTicket("Ticket #[ticketNum] has been open for [ADMIN_TICKET_TIMEOUT * 0.1] seconds. Changing status to stale.")
+ ticketState = ADMIN_TICKET_STALE
+ break
+
+//Set the cooldown period for the ticket. The time when it's created plus the defined cooldown time.
+/datum/admin_ticket/proc/setCooldownPeriod()
+ ticketCooldown = world.time + ADMIN_TICKET_DUPLICATE_COOLDOWN
+
+//Set the last admin who responded as the client passed as an arguement.
+/datum/admin_ticket/proc/setLastAdminResponse(var/client/C)
+ lastAdminResponse = C
+ lastResponseTime = worldtime2text()
+
+//Return the ticket state as a colour coded text string.
+/datum/admin_ticket/proc/state2text()
+ switch(ticketState)
+ if(ADMIN_TICKET_OPEN)
+ return "OPEN"
+ if(ADMIN_TICKET_RESOLVED)
+ return "RESOLVED"
+ if(ADMIN_TICKET_CLOSED)
+ return "CLOSED"
+ if(ADMIN_TICKET_STALE)
+ return "STALE"
+
+//Assign the client passed to var/adminAsssigned
+/datum/admin_ticket/proc/assignAdmin(var/client/C, var/N)
+ if(!C)
+ return
+ adminAssigned = C
+ return TRUE
+
+/datum/admin_ticket/proc/addResponse(var/client/C, var/M as text)
+ if(C.holder)
+ setLastAdminResponse(C)
+ M = "[C]: [M]"
+ content += M
\ No newline at end of file
diff --git a/code/modules/admin/tickets/adminticketsUI.dm b/code/modules/admin/tickets/adminticketsUI.dm
new file mode 100644
index 00000000000..750fa13e6cb
--- /dev/null
+++ b/code/modules/admin/tickets/adminticketsUI.dm
@@ -0,0 +1,172 @@
+/datum/adminTicketHolder/proc/returnUI(var/tab = ADMIN_TICKET_OPEN)
+ set name = "Open Ticket Interface"
+ set category = "Tickets"
+
+//dat
+ var/trStyle = "border-top:2px solid; border-bottom:2px solid; padding-top: 5px; padding-bottom: 5px;"
+ var/tdStyleleft = "border-top:2px solid; border-bottom:2px solid; width:150px; text-align:center;"
+ var/tdStyle = "border-top:2px solid; border-bottom:2px solid;"
+ var/datum/admin_ticket/ticket
+ var/dat
+ dat += ""
+ dat += "Admin Tickets
"
+
+ dat +="Refresh
Open TicketsResolved TicketsClosed Tickets"
+ if(tab == ADMIN_TICKET_OPEN)
+ dat += "Open Tickets
"
+ dat += ""
+ dat +="| Control | Ticket |
|---|
"
+ if(tab == ADMIN_TICKET_OPEN)
+ for(var/T in allTickets)
+ ticket = T
+ if(ticket.ticketState == ADMIN_TICKET_OPEN || ticket.ticketState == ADMIN_TICKET_STALE)
+ dat += "ResolveDetails
#[ticket.ticketNum] ([ticket.timeOpened]) [ticket.ticketState == ADMIN_TICKET_STALE ? "STALE" : ""] | [ticket.title] |
"
+ else
+ continue
+ else if(tab == ADMIN_TICKET_RESOLVED)
+ dat += "Resolved Tickets
"
+ for(var/T in allTickets)
+ ticket = T
+ if(ticket.ticketState == ADMIN_TICKET_RESOLVED)
+ dat += "ResolveDetails
#[ticket.ticketNum] ([ticket.timeOpened]) | [ticket.title] |
"
+ else
+ continue
+ else if(tab == ADMIN_TICKET_CLOSED)
+ dat += "Closed Tickets
"
+ for(var/T in allTickets)
+ ticket = T
+ if(ticket.ticketState == ADMIN_TICKET_CLOSED)
+ dat += "ResolveDetails
#[ticket.ticketNum] ([ticket.timeOpened]) | [ticket.title] |
"
+ else
+ continue
+
+ dat += "
"
+
+ return dat
+
+/datum/adminTicketHolder/proc/showUI(var/client/user, var/tab)
+ var/dat = null
+ dat = returnUI(tab)
+ var/datum/browser/popup = new(user, "admintickets", "Admin Tickets", 1400, 600)
+ popup.set_content(dat)
+ popup.open()
+
+/datum/adminTicketHolder/proc/showDetailUI(var/client/user, var/ticketID)
+ var/datum/admin_ticket/T = globAdminTicketHolder.allTickets[ticketID]
+ var/status = "[T.state2text()]"
+
+ var/dat = "Admin Tickets
"
+
+ dat +="Show AllRefresh"
+
+ dat += "Ticket #[T.ticketNum]
"
+
+ dat += "[T.clientName] / [T.mobControlled] opened this ticket at [T.timeOpened] at location [T.locationSent]
"
+ dat += "Ticket Status: [status]"
+ dat += "
"
+ dat += "| [T.title] |
"
+
+ if(T.content.len > 1)
+ for(var/i = 2, i <= T.content.len, i++)
+ dat += "| [T.content[i]] |
"
+
+ dat += "
"
+ dat += "Re-OpenResolve
"
+
+ if(!T.adminAssigned)
+ dat += "No admin assigned to this ticket - Take Ticket
"
+ else
+ dat += "[T.adminAssigned] is assigned to this Ticket. - Take Ticket
"
+
+ if(T.lastAdminResponse)
+ dat += "Last Admin Response: [T.lastAdminResponse] at [T.lastResponseTime]"
+ else
+ dat +="No Admin Response"
+
+ dat += "
"
+
+ dat += "Close Ticket"
+
+ var/datum/browser/popup = new(user, "adminticketsdetail", "Admin Ticket #[T.ticketNum]", 1000, 600)
+ popup.set_content(dat)
+ popup.open()
+
+/datum/adminTicketHolder/proc/userDetailUI(var/client/user)
+//dat
+ var/tickets = checkForTicket(user)
+ var/dat
+ dat += "Your open tickets
"
+ dat += ""
+ for(var/datum/admin_ticket/T in tickets)
+ dat += "Ticket #[T.ticketNum] |
"
+ for(var/i = 1, i <= T.content.len, i++)
+ dat += "| [T.content[i]] |
"
+ dat += "
"
+
+ var/datum/browser/popup = new(user, "userticketsdetail", "Tickets", 1000, 600)
+ popup.set_content(dat)
+ popup.open()
+
+/datum/adminTicketHolder/Topic(href, href_list)
+
+ if(href_list["refresh"])
+ showUI(usr)
+ return
+
+ if(href_list["refreshdetail"])
+ var/indexNum = text2num(href_list["refreshdetail"])
+ showDetailUI(usr, indexNum)
+ return
+
+ if(href_list["showopen"])
+ showUI(usr, ADMIN_TICKET_OPEN)
+ return
+ if(href_list["showresolved"])
+ showUI(usr, ADMIN_TICKET_RESOLVED)
+ return
+ if(href_list["showclosed"])
+ showUI(usr, ADMIN_TICKET_CLOSED)
+ return
+
+ if(href_list["details"])
+ var/indexNum = text2num(href_list["details"])
+ showDetailUI(usr.client, indexNum)
+ return
+
+ if(href_list["resolve"])
+ var/indexNum = text2num(href_list["resolve"])
+ if(globAdminTicketHolder.resolveTicket(indexNum))
+ message_adminTicket("[usr.client] / ([usr]) resolved admin ticket number [indexNum]")
+ to_chat(returnClient(indexNum), "Your admin ticket has now been resolved.")
+ showUI(usr)
+
+ if(href_list["detailresolve"])
+ var/indexNum = text2num(href_list["detailresolve"])
+ if(globAdminTicketHolder.resolveTicket(indexNum))
+ message_adminTicket("[usr.client] / ([usr]) resolved admin ticket number [indexNum]")
+ to_chat(returnClient(indexNum), "Your admin ticket has now been resolved.")
+ showDetailUI(usr, indexNum)
+
+ if(href_list["detailclose"])
+ var/indexNum = text2num(href_list["detailclose"])
+ if(alert("Are you sure? This will send a negative message.",,"Yes","No") != "Yes")
+ return
+ if(globAdminTicketHolder.closeTicket(indexNum))
+ message_adminTicket("[usr.client] / ([usr]) closed admin ticket number [indexNum]")
+ to_chat(returnClient(indexNum), "- AdminHelp Rejected! -")
+ to_chat(returnClient(indexNum), "Please try to be calm, clear, and descriptive in admin helps, do not assume the admin has seen any related events, and clearly state the names of anybody you are reporting. If you asked a question, please ensure it was clear what you were asking.")
+ to_chat(returnClient(indexNum), "Your ticket has now been closed.")
+ showDetailUI(usr, indexNum)
+
+ if(href_list["detailreopen"])
+ var/indexNum = text2num(href_list["detailreopen"])
+ if(globAdminTicketHolder.openTicket(indexNum))
+ message_adminTicket("[usr.client] / ([usr]) re-opened admin ticket number [indexNum]")
+ showDetailUI(usr, indexNum)
+
+ if(href_list["assignadmin"])
+ var/indexNum = text2num(href_list["assignadmin"])
+ if(globAdminTicketHolder.assignAdminToTicket(usr.client, indexNum))
+ message_adminTicket("[usr.client] / ([usr]) has taken ticket number [indexNum]")
+ to_chat(returnClient(indexNum), "Your ticket is being handled by [usr.client].")
+ showDetailUI(usr, indexNum)
\ No newline at end of file
diff --git a/code/modules/admin/tickets/adminticketsverbs.dm b/code/modules/admin/tickets/adminticketsverbs.dm
new file mode 100644
index 00000000000..a0431cd8e23
--- /dev/null
+++ b/code/modules/admin/tickets/adminticketsverbs.dm
@@ -0,0 +1,51 @@
+//Verbs
+
+/client/proc/startadmintickets()
+ set name = "Restart Admin Ticket System"
+ set category = "Debug"
+
+ if(!holder && !check_rights(R_DEBUG))
+ return
+
+ if(!globAdminTicketHolder)
+ var/global/datum/adminTicketHolder/globAdminTicketHolder = new /datum/adminTicketHolder
+ else
+ if(alert("Are you sure you want to reboot the admin ticket system?","Reboot Admin Tickets?","Yes","No") != "Yes")
+ return
+ message_admins("Restarting Admin Ticket System!")
+ globAdminTicketHolder = new /datum/adminTicketHolder
+ message_admins("Admin Ticket System Restarted!")
+
+/client/proc/openTicketUI()
+
+ set name = "Open Ticket Interface"
+ set category = "Admin"
+
+ if(!holder && !check_rights(R_ADMIN))
+ return
+
+ globAdminTicketHolder.showUI(usr)
+
+/client/proc/resolveAllTickets()
+ set name = "Resolve All Open Tickets"
+ set category = "Admin"
+
+ if(!holder && !check_rights(R_ADMIN))
+ return
+
+ if(alert("Are you sure you want to resolve ALL open tickets?","Resolve all open tickets?","Yes","No") != "Yes")
+ return
+
+ globAdminTicketHolder.resolveAllOpenTickets()
+
+
+
+/client/proc/openUserUI()
+
+ set name = "My Tickets"
+ set category = "Admin"
+
+ if(!holder && !check_rights(R_ADMIN))
+ return
+
+ globAdminTicketHolder.userDetailUI(usr.client)
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index 3aabfd3150a..597cc2b3ae2 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -26,6 +26,12 @@
message_admins("[key_name_admin(usr)] rejected [key_name_admin(C.mob)]'s admin help")
log_admin("[key_name(usr)] rejected [key_name(C.mob)]'s admin help")
+ if(href_list["openadminticket"])
+ if(!check_rights(R_ADMIN))
+ return
+ var/ticketID = text2num(href_list["openadminticket"])
+ globAdminTicketHolder.showDetailUI(usr, ticketID)
+
if(href_list["stickyban"])
stickyban(href_list["stickyban"],href_list)
@@ -242,16 +248,23 @@
else if(task == "permissions")
if(!D) return
- var/list/permissionlist = list()
- for(var/i=1, i<=R_MAXPERMISSION, i<<=1) //that <<= is shorthand for i = i << 1. Which is a left bitshift
- permissionlist[rights2text(i)] = i
- var/new_permission = input("Select a permission to turn on/off", "Permission toggle", null, null) as null|anything in permissionlist
- if(!new_permission) return
- D.rights ^= permissionlist[new_permission]
+ while(TRUE)
+ var/list/permissionlist = list()
+ for(var/i=1, i<=R_MAXPERMISSION, i<<=1) //that <<= is shorthand for i = i << 1. Which is a left bitshift
+ permissionlist[rights2text(i)] = i
+ var/new_permission = input("Select a permission to turn on/off", adm_ckey + "'s Permissions", null, null) as null|anything in permissionlist
+ if(!new_permission)
+ return
+ var/oldrights = D.rights
+ var/toggleresult = "ON"
+ D.rights ^= permissionlist[new_permission]
+ if(oldrights > D.rights)
+ toggleresult = "OFF"
+
+ message_admins("[key_name_admin(usr)] toggled the [new_permission] permission of [adm_ckey] to [toggleresult]")
+ log_admin("[key_name(usr)] toggled the [new_permission] permission of [adm_ckey] to [toggleresult]")
+ log_admin_permission_modification(adm_ckey, permissionlist[new_permission])
- message_admins("[key_name_admin(usr)] toggled the [new_permission] permission of [adm_ckey]")
- log_admin("[key_name(usr)] toggled the [new_permission] permission of [adm_ckey]")
- log_admin_permission_modification(adm_ckey, permissionlist[new_permission])
edit_admin_permissions()
@@ -1772,7 +1785,7 @@
H.gene_stability = 100
logmsg = "permanent regeneration."
if("Super Powers")
- var/list/default_genes = list(REGENERATEBLOCK, NOBREATHBLOCK, COLDBLOCK)
+ var/list/default_genes = list(REGENERATEBLOCK, BREATHLESSBLOCK, COLDBLOCK)
for(var/gene in default_genes)
H.dna.SetSEState(gene, 1)
genemutcheck(H, gene, null, MUTCHK_FORCED)
diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm
index bf6575b6659..3d0d067f5b5 100644
--- a/code/modules/admin/verbs/adminhelp.dm
+++ b/code/modules/admin/verbs/adminhelp.dm
@@ -115,7 +115,17 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey","
X << 'sound/effects/adminhelp.ogg'
to_chat(X, msg)
if("Adminhelp")
- msg = "[selected_type]: [key_name(src, 1, 1, selected_type)] (?) (PP) (VV) (SM) ([admin_jump_link(mob)]) (CA) (REJT) [ai_found ? " (CL)" : ""] (TAKE) : [msg]"
+ var/ticketNum // Holder for the ticket number
+ var/prunedmsg ="[usr.client]: [msg]" // Message without links
+ if(globAdminTicketHolder.checkForOpenTicket(usr.client)) // If user already has an open ticket
+ var/datum/admin_ticket/T = globAdminTicketHolder.checkForOpenTicket(usr.client) // Make T equal to the ticket they have open
+ ticketNum = T.ticketNum // ticketNum is the number of their ticket.
+ T.addResponse(usr.client, msg)
+ else
+ ticketNum = globAdminTicketHolder.getTicketCounter() // ticketNum is the ticket ready to be assigned.
+ msg = "[selected_type]: [key_name(src, 1, 1, selected_type)] (?) (PP) (VV) (SM) ([admin_jump_link(mob)]) (CA) (TICKET) [ai_found ? " (CL)" : ""] : [msg]"
+ //Open a new adminticket and inform the user.
+ globAdminTicketHolder.newTicket(src, prunedmsg, msg)
for(var/client/X in modholders + adminholders)
if(X.prefs.sound & SOUND_ADMINHELP)
X << 'sound/effects/adminhelp.ogg'
diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm
index 9976c7d10b9..4c045e193c8 100644
--- a/code/modules/admin/verbs/adminpm.dm
+++ b/code/modules/admin/verbs/adminpm.dm
@@ -183,6 +183,23 @@
if(check_rights(R_ADMIN|R_MOD, 0, X.mob))
to_chat(X, "[type]: [key_name(src, X, 0, type)]->[key_name(C, X, 0, type)]: [emoji_msg]")
+ //Check if the mob being PM'd has any open admin tickets.
+ var/tickets = list()
+ tickets = globAdminTicketHolder.checkForTicket(C)
+ if(tickets)
+ for(var/datum/admin_ticket/i in tickets)
+ i.addResponse(src, msg) // Add this response to their open tickets.
+ return
+
+ tickets = globAdminTicketHolder.checkForTicket(src)
+ if(check_rights(R_ADMIN|R_MOD, 0, C.mob)) //Is the person being pm'd an admin? If so we check if the pm'er has open tickets
+ tickets = globAdminTicketHolder.checkForTicket(src)
+ if(tickets)
+ for(var/datum/admin_ticket/i in tickets)
+ i.addResponse(src, msg)
+ return
+
+
/client/proc/cmd_admin_irc_pm()
if(prefs.muted & MUTE_ADMINHELP)
to_chat(src, "Error: Private-Message: You are unable to use PM-s (muted).")
diff --git a/code/modules/admin/verbs/adminsay.dm b/code/modules/admin/verbs/adminsay.dm
index 7c7569e5907..cbcacc43006 100644
--- a/code/modules/admin/verbs/adminsay.dm
+++ b/code/modules/admin/verbs/adminsay.dm
@@ -32,7 +32,13 @@
for(var/client/C in admins)
if(check_rights(R_ADMIN|R_MOD|R_MENTOR, 0, C.mob))
- to_chat(C, "MENTOR: [key_name(usr, 1)] ([admin_jump_link(mob)]): [msg]")
+ var/display_name = key
+ if(holder.fakekey)
+ if(C.holder && C.holder.rights & R_ADMIN)
+ display_name = "[holder.fakekey]/([key])"
+ else
+ display_name = holder.fakekey
+ to_chat(C, "MENTOR: [display_name] ([admin_jump_link(mob)]): [msg]")
feedback_add_details("admin_verb","MS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm
index 28a0532bf13..f8d61606789 100644
--- a/code/modules/admin/verbs/debug.dm
+++ b/code/modules/admin/verbs/debug.dm
@@ -577,7 +577,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
var/list/choices = list(
"strip",
"as job...",
- "emergency response team member",
+ "emergency response team member",
"emergency response team leader"
)
@@ -642,7 +642,11 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
if(dresscode == "emergency response team leader")
equip_team.equip_officer("Commander", M)
else
- switch(alert("Loadout Type", "Emergency Response Team", "Security", "Engineer", "Medic"))
+ var/list/ert_outfits = list("Security", "Engineer", "Medic", "Janitor", "Paranormal")
+ var/echoice = input("Loadout Type", "Emergency Response Team") as null|anything in ert_outfits
+ if(!echoice)
+ return
+ switch(echoice)
if("Commander")
equip_team.equip_officer("Commander", M)
if("Security")
@@ -651,6 +655,10 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
equip_team.equip_officer("Engineer", M)
if("Medic")
equip_team.equip_officer("Medic", M)
+ if("Janitor")
+ equip_team.equip_officer("Janitor", M)
+ if("Paranormal")
+ equip_team.equip_officer("Paranormal", M)
else
to_chat(src, "Invalid ERT Loadout selected")
diff --git a/code/modules/admin/verbs/honksquad.dm b/code/modules/admin/verbs/honksquad.dm
index b437476eb32..ebb4d799d39 100644
--- a/code/modules/admin/verbs/honksquad.dm
+++ b/code/modules/admin/verbs/honksquad.dm
@@ -59,7 +59,7 @@ var/global/sent_honksquad = 0
new_honksquad.key = pick(commandos)
commandos -= new_honksquad.key
new_honksquad.internal = new_honksquad.s_store
- new_honksquad.update_internals_hud_icon(1)
+ new_honksquad.update_action_buttons_icon()
//So they don't forget their code or mission.
new_honksquad.mind.store_memory("Mission: [input].")
diff --git a/code/modules/admin/verbs/infiltratorteam_syndicate.dm b/code/modules/admin/verbs/infiltratorteam_syndicate.dm
index 4c6d5248a6e..e3ff37dc0fa 100644
--- a/code/modules/admin/verbs/infiltratorteam_syndicate.dm
+++ b/code/modules/admin/verbs/infiltratorteam_syndicate.dm
@@ -88,7 +88,7 @@ var/global/sent_syndicate_infiltration_team = 0
if(!spawn_sit_mgmt || theguy.key != key)
new_syndicate_infiltrator.key = theguy.key
new_syndicate_infiltrator.internal = new_syndicate_infiltrator.s_store
- new_syndicate_infiltrator.update_internals_hud_icon(1)
+ new_syndicate_infiltrator.update_action_buttons_icon()
infiltrators -= theguy
to_chat(new_syndicate_infiltrator, "You are a [!syndicate_leader_selected?"Infiltrator":"Lead Infiltrator"] in the service of the Syndicate. \nYour current mission is: [input]")
to_chat(new_syndicate_infiltrator, "You are equipped with an uplink implant to help you achieve your objectives. ((activate it via button in top left of screen))")
@@ -119,7 +119,7 @@ var/global/sent_syndicate_infiltration_team = 0
var/mob/living/carbon/human/syndimgmtmob = create_syndicate_infiltrator(L, 1, 100, 1)
syndimgmtmob.key = key
syndimgmtmob.internal = syndimgmtmob.s_store
- syndimgmtmob.update_internals_hud_icon(1)
+ syndimgmtmob.update_action_buttons_icon()
syndimgmtmob.faction += "syndicate"
syndimgmtmob.equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal(src), slot_glasses)
syndimgmtmob.equip_to_slot_or_del(new /obj/item/clothing/suit/space/hardsuit/syndi/elite, slot_wear_suit)
diff --git a/code/modules/admin/verbs/modifyvariables.dm b/code/modules/admin/verbs/modifyvariables.dm
index 0ad266ecaa1..55ce03d8988 100644
--- a/code/modules/admin/verbs/modifyvariables.dm
+++ b/code/modules/admin/verbs/modifyvariables.dm
@@ -1,7 +1,7 @@
var/list/VVlocked = list("vars", "var_edited", "client", "firemut", "ishulk", "telekinesis", "xray", "ka", "virus", "viruses", "cuffed", "last_eaten", "unlock_content") // R_DEBUG
var/list/VVicon_edit_lock = list("icon", "icon_state", "overlays", "underlays", "resize") // R_EVENT | R_DEBUG
var/list/VVckey_edit = list("key", "ckey") // R_EVENT | R_DEBUG
-var/list/VVpixelmovement = list("step_x", "step_y", "bound_height", "bound_width", "bound_x", "bound_y") // R_DEBUG + warning
+var/list/VVpixelmovement = list("step_x", "step_y", "step_size", "bound_height", "bound_width", "bound_x", "bound_y") // R_DEBUG + warning
/client/proc/vv_get_class(var/var_value)
if(isnull(var_value))
. = VV_NULL
@@ -615,4 +615,4 @@ var/list/VVpixelmovement = list("step_x", "step_y", "bound_height", "bound_width
log_to_dd("### VarEdit by [src]: [O.type] [variable]=[html_encode("[var_new]")]")
log_admin("[key_name(src)] modified [original_name]'s [variable] to [var_new]")
var/msg = "[key_name_admin(src)] modified [original_name]'s [variable] to [var_new]"
- message_admins(msg)
\ No newline at end of file
+ message_admins(msg)
diff --git a/code/modules/admin/verbs/one_click_antag.dm b/code/modules/admin/verbs/one_click_antag.dm
index d4734e92b53..78b1b84a595 100644
--- a/code/modules/admin/verbs/one_click_antag.dm
+++ b/code/modules/admin/verbs/one_click_antag.dm
@@ -361,7 +361,7 @@ client/proc/one_click_antag()
new_syndicate_commando.key = theghost.key
new_syndicate_commando.internal = new_syndicate_commando.s_store
- new_syndicate_commando.update_internals_hud_icon(1)
+ new_syndicate_commando.update_action_buttons_icon()
//So they don't forget their code or mission.
diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm
index 84f95096078..29c6111bc02 100644
--- a/code/modules/admin/verbs/randomverbs.dm
+++ b/code/modules/admin/verbs/randomverbs.dm
@@ -410,7 +410,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
if("Death Commando")//Leaves them at late-join spawn.
new_character.equip_death_commando()
new_character.internal = new_character.s_store
- new_character.update_internals_hud_icon(1)
+ new_character.update_action_buttons_icon()
else//They may also be a cyborg or AI.
switch(new_character.mind.assigned_role)
if("Cyborg")//More rigging to make em' work and check if they're traitor.
@@ -576,9 +576,9 @@ Traitors and the like can also be revived with the previous role mostly intact.
command_announcement.Announce(input, customname, MsgSound[beepsound], , , type)
print_command_report(input, "[command_name()] Update")
- else if("No")
+ if("No")
//same thing as the blob stuff - it's not public, so it's classified, dammit
- command_announcement.Announce("A report has been downloaded and printed out at all communications consoles.", "Incoming Classified Message", 'sound/AI/commandreport.ogg', from = "[command_name()] Update")
+ command_announcer.autosay("A classified message has been printed out at all communication consoles.");
print_command_report(input, "Classified [command_name()] Update")
else
return
@@ -763,6 +763,11 @@ Traitors and the like can also be revived with the previous role mostly intact.
var/confirm = alert(src, "You sure?", "Confirm", "Yes", "No")
if(confirm != "Yes") return
+ if(alert("Set Shuttle Recallable (Select Yes unless you know what this does)", "Recallable?", "Yes", "No") == "Yes")
+ shuttle_master.emergency.canRecall = TRUE
+ else
+ shuttle_master.emergency.canRecall = FALSE
+
shuttle_master.emergency.request()
feedback_add_details("admin_verb","CSHUT") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -781,7 +786,18 @@ Traitors and the like can also be revived with the previous role mostly intact.
if(shuttle_master.emergency.mode >= SHUTTLE_DOCKED)
return
- shuttle_master.emergency.cancel()
+ if(shuttle_master.emergency.canRecall == FALSE)
+ if(alert("Shuttle is currently set to be nonrecallable. Recalling may break things. Respect Recall Status?", "Override Recall Status?", "Yes", "No") == "Yes")
+ return
+ else
+ var/keepStatus = alert("Maintain recall status on future shuttle calls?", "Maintain Status?", "Yes", "No") == "Yes" //Keeps or drops recallability
+ shuttle_master.emergency.canRecall = TRUE // must be true for cancel proc to work
+ shuttle_master.emergency.cancel()
+ if(keepStatus)
+ shuttle_master.emergency.canRecall = FALSE // restores original status
+ else
+ shuttle_master.emergency.cancel()
+
feedback_add_details("admin_verb","CCSHUT") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
log_admin("[key_name(usr)] admin-recalled the emergency shuttle.")
message_admins("[key_name_admin(usr)] admin-recalled the emergency shuttle.")
diff --git a/code/modules/admin/verbs/serialization.dm b/code/modules/admin/verbs/serialization.dm
index 41ba5d11aa1..1c087b9e8fc 100644
--- a/code/modules/admin/verbs/serialization.dm
+++ b/code/modules/admin/verbs/serialization.dm
@@ -3,7 +3,7 @@
set desc = "Turns your marked object into a JSON string you can later use to re-create the object"
set category = "Debug"
- if(!check_rights(R_ADMIN))
+ if(!check_rights(R_ADMIN|R_DEBUG))
return
if(!istype(holder.marked_datum, /atom/movable))
@@ -18,7 +18,7 @@
set desc = "Creates an object from a JSON string"
set category = "Debug"
- if(!check_rights(R_ADMIN|R_DEBUG))
+ if(!check_rights(R_SPAWN)) // this involves spawning things
return
var/json_text = input("Enter the JSON code:","Text") as message|null
diff --git a/code/modules/admin/verbs/striketeam.dm b/code/modules/admin/verbs/striketeam.dm
index 83e8d617210..b2a803cfdb7 100644
--- a/code/modules/admin/verbs/striketeam.dm
+++ b/code/modules/admin/verbs/striketeam.dm
@@ -64,7 +64,7 @@ var/global/sent_strike_team = 0
new_commando.key = pick(commandos)
commandos -= new_commando.key
new_commando.internal = new_commando.s_store
- new_commando.update_internals_hud_icon(1)
+ new_commando.update_action_buttons_icon()
//So they don't forget their code or mission.
if(nuke_code)
diff --git a/code/modules/admin/verbs/striketeam_syndicate.dm b/code/modules/admin/verbs/striketeam_syndicate.dm
index da6d981a890..744db24ab85 100644
--- a/code/modules/admin/verbs/striketeam_syndicate.dm
+++ b/code/modules/admin/verbs/striketeam_syndicate.dm
@@ -71,7 +71,7 @@ var/global/sent_syndicate_strike_team = 0
new_syndicate_commando.key = pick(commandos)
commandos -= new_syndicate_commando.key
new_syndicate_commando.internal = new_syndicate_commando.s_store
- new_syndicate_commando.update_internals_hud_icon(1)
+ new_syndicate_commando.update_action_buttons_icon()
//So they don't forget their code or mission.
if(nuke_code)
diff --git a/code/modules/arcade/prize_datums.dm b/code/modules/arcade/prize_datums.dm
index 9334502dd10..76d9c9a18a3 100644
--- a/code/modules/arcade/prize_datums.dm
+++ b/code/modules/arcade/prize_datums.dm
@@ -298,6 +298,12 @@ var/global/datum/prizes/global_prizes = new
typepath = /obj/item/stack/tile/fakespace/loaded
cost = 150
+/datum/prize_item/arcadecarpet
+ name = "Arcade Carpet"
+ desc = "A stack of genuine arcade carpet tiles, complete with authentic soft drink stains!"
+ typepath = /obj/item/stack/tile/arcade_carpet/loaded
+ cost = 150
+
/datum/prize_item/bike
name = "Awesome Bike!"
desc = "WOAH."
diff --git a/code/modules/assembly/igniter.dm b/code/modules/assembly/igniter.dm
index b1c76236853..a00cc985483 100644
--- a/code/modules/assembly/igniter.dm
+++ b/code/modules/assembly/igniter.dm
@@ -4,7 +4,7 @@
icon_state = "igniter"
materials = list(MAT_METAL=500, MAT_GLASS=50)
origin_tech = "magnets=1"
- var/datum/effect/system/spark_spread/sparks = new /datum/effect/system/spark_spread
+ var/datum/effect_system/spark_spread/sparks = new /datum/effect_system/spark_spread
/obj/item/device/assembly/igniter/New()
..()
diff --git a/code/modules/assembly/mousetrap.dm b/code/modules/assembly/mousetrap.dm
index e22923fa965..1e7cd0f089c 100644
--- a/code/modules/assembly/mousetrap.dm
+++ b/code/modules/assembly/mousetrap.dm
@@ -53,7 +53,7 @@
affecting = H.get_organ(type)
H.Stun(3)
if(affecting)
- affecting.take_damage(1, 0)
+ affecting.receive_damage(1, 0)
H.updatehealth()
else if(ismouse(target))
var/mob/living/simple_animal/mouse/M = target
diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm
index be88df0c4e4..48979fa9cab 100644
--- a/code/modules/awaymissions/corpse.dm
+++ b/code/modules/awaymissions/corpse.dm
@@ -117,7 +117,7 @@
name = "Syndicate Commando"
corpseuniform = /obj/item/clothing/under/syndicate
corpsesuit = /obj/item/clothing/suit/space/hardsuit/syndi
- corpseshoes = /obj/item/clothing/shoes/combat
+ corpseshoes = /obj/item/clothing/shoes/magboots/syndie
corpsegloves = /obj/item/clothing/gloves/combat
corpseradio = /obj/item/device/radio/headset
corpsemask = /obj/item/clothing/mask/gas/syndicate
diff --git a/code/modules/awaymissions/mission_code/beach.dm b/code/modules/awaymissions/mission_code/beach.dm
index 7ae37e759c1..f285d4434da 100644
--- a/code/modules/awaymissions/mission_code/beach.dm
+++ b/code/modules/awaymissions/mission_code/beach.dm
@@ -21,7 +21,7 @@
return ..()
/obj/effect/waterfall/proc/drip()
- var/obj/effect/effect/water/W = new(loc)
+ var/obj/effect/particle_effect/water/W = new(loc)
W.dir = dir
spawn(1)
W.loc = get_step(W, dir)
diff --git a/code/modules/awaymissions/mission_code/wildwest.dm b/code/modules/awaymissions/mission_code/wildwest.dm
index 0a2eaeef1bf..94453e2c058 100644
--- a/code/modules/awaymissions/mission_code/wildwest.dm
+++ b/code/modules/awaymissions/mission_code/wildwest.dm
@@ -78,7 +78,7 @@
to_chat(user, "Your wish is granted, but at a terrible cost...")
to_chat(user, "The Wish Granter punishes you for your selfishness, claiming your soul and warping your body to match the darkness in your heart.")
user.mutations.Add(LASER)
- user.mutations.Add(RESIST_COLD)
+ user.mutations.Add(COLDRES)
user.mutations.Add(XRAY)
if(ishuman(user))
var/mob/living/carbon/human/human = user
@@ -177,7 +177,7 @@
call(src,triggerproc)(M)
/obj/effect/meatgrinder/proc/triggerrad1(mob)
- var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
+ var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
for(var/mob/O in viewers(world.view, src.loc))
s.set_up(3, 1, src)
s.start()
@@ -215,4 +215,76 @@
to_chat(C, "You have regenerated.")
C.visible_message("[usr] appears to wake from the dead, having healed all wounds.")
C.update_canmove()
- return 1
\ No newline at end of file
+ return 1
+
+/obj/item/device/wildwest_communicator
+ name = "Syndicate Comms Device"
+ icon_state = "gangtool-red"
+ item_state = "walkietalkie"
+ desc = "Use to communicate with the syndicate base commander."
+ var/used = FALSE
+
+/obj/item/device/wildwest_communicator/attack_self(mob/living/user)
+
+ if(!is_away_level(user.z))
+ to_chat(user, "The communicator emits a faint beep. Perhaps it is out of range?")
+ return
+
+ if(used)
+ to_chat(user, "The communicator buzzes, and then dies. Apparently nobody is responding.")
+ return
+
+ var/initial_question = "The communicator buzzes, and you hear a voice on the line, almost lost in the static. 'Hello? Who is this?'."
+ to_chat(user, initial_question)
+
+ var/const/option_explorer = "(TRUTH) Explorers."
+ var/const/option_bluff = "(BLUFF) Weapons delivery."
+ var/const/option_threat = "(THREAT) NT, here to kick your ass!"
+ var/const/option_syndicate = "(SYNDI) Agent reporting in..."
+ var/list/response_choices = list(option_explorer, option_bluff, option_threat)
+
+ if(istype(user, /mob/living) && user.mind)
+ if(user.mind.special_role == "Traitor")
+ response_choices |= option_syndicate
+
+ var/selected_choice = input(user, "How do you respond on the comms device?", "Response to Syndicate") as null|anything in response_choices
+
+ if(!selected_choice)
+ return
+ switch(selected_choice)
+ if(option_explorer)
+ to_chat(user, "The communicator buzzes, and you hear the voice again: 'Hah! You sure picked the wrong asteroid to explore. Get em, boys!'")
+ if(option_bluff)
+ to_chat(user, "The communicator buzzes, and you hear the voice again: 'Really? I think not. Get them!'")
+ if(option_threat)
+ to_chat(user, "The communicator buzzes, and you hear the voice again: 'Oh really now?' You hear a clicking sound. 'Team, get back here. We have trouble'. Then the line goes dead.")
+ for(var/obj/effect/landmark/L in landmarks_list)
+ if(L.name == "wildwest_syndipod")
+ var/obj/spacepod/syndi/P = new /obj/spacepod/syndi(get_turf(L))
+ P.name = "Syndi Recon Pod"
+ if(L.name == "wildwest_syndibackup")
+ var/mob/living/simple_animal/hostile/syndicate/ranged/space/R = new /mob/living/simple_animal/hostile/syndicate/ranged/space(get_turf(L))
+ R.name = "Syndi Recon Team"
+ if(option_syndicate)
+ to_chat(user, "The communicator buzzes, and you hear the voice again: 'Well, I'll be damned. An agent out here? You must be off-mission! Leave my troops alone, and they will do the same for you. Our Commander will handle you himself.'")
+ stand_down()
+ used = TRUE
+
+/obj/item/device/wildwest_communicator/proc/stand_down()
+ for(var/mob/living/simple_animal/hostile/syndicate/ranged/wildwest/W in living_mob_list)
+ W.on_alert = FALSE
+
+/mob/living/simple_animal/hostile/syndicate/ranged/wildwest
+ var/on_alert = TRUE
+
+/mob/living/simple_animal/hostile/syndicate/ranged/wildwest/ListTargets()
+ if(on_alert)
+ return ..()
+ return list()
+
+/mob/living/simple_animal/hostile/syndicate/ranged/wildwest/death(gibbed)
+ if(!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)
\ No newline at end of file
diff --git a/code/modules/awaymissions/trigger.dm b/code/modules/awaymissions/trigger.dm
index 2a41eee85c3..0ac6e656206 100644
--- a/code/modules/awaymissions/trigger.dm
+++ b/code/modules/awaymissions/trigger.dm
@@ -22,20 +22,20 @@
M.Move(dest)
if(entersparks)
- var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
+ var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
s.set_up(4, 1, src)
s.start()
if(exitsparks)
- var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
+ var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
s.set_up(4, 1, dest)
s.start()
if(entersmoke)
- var/datum/effect/system/harmless_smoke_spread/s = new /datum/effect/system/harmless_smoke_spread
+ var/datum/effect_system/smoke_spread/s = new
s.set_up(4, 1, src, 0)
s.start()
if(exitsmoke)
- var/datum/effect/system/harmless_smoke_spread/s = new /datum/effect/system/harmless_smoke_spread
+ var/datum/effect_system/smoke_spread/s = new
s.set_up(4, 1, dest, 0)
s.start()
diff --git a/code/modules/busy_space/air_traffic.dm b/code/modules/busy_space/air_traffic.dm
new file mode 100644
index 00000000000..de0b37ed3c3
--- /dev/null
+++ b/code/modules/busy_space/air_traffic.dm
@@ -0,0 +1,129 @@
+//Cactus, Speedbird, Dynasty, oh my
+
+var/datum/lore/atc_controller/atc = new/datum/lore/atc_controller
+
+/datum/lore/atc_controller
+ var/delay_max = 10 MINUTES //Maximum amount of tiem between ATC messages. Default is 10 mins.
+ var/delay_min = 5 MINUTES //Minimum amount of time between ATC messages. Default is 5 mins.
+ var/backoff_delay = 5 MINUTES //How long to back off if we can't talk and want to. Default is 5 mins.
+ var/next_message //When the next message should happen in world.time
+ var/force_chatter_type //Force a specific type of messages
+
+ var/squelched = FALSE //If ATC is squelched currently
+
+/datum/lore/atc_controller/New()
+ spawn(30 SECONDS) //Lots of lag at the start of a shift.
+ msg("New shift beginning, resuming traffic control.")
+ next_message = world.time + rand(delay_min, delay_max)
+ process()
+
+/datum/lore/atc_controller/proc/process()
+ if(world.time >= next_message)
+ if(squelched)
+ next_message = world.time + backoff_delay
+ else
+ next_message = world.time + rand(delay_min,delay_max)
+ random_convo()
+
+ spawn(1 MINUTES) //We don't really need high-accuracy here.
+ process()
+
+/datum/lore/atc_controller/proc/msg(var/message,var/sender)
+ ASSERT(message)
+ global_announcer.autosay("[message]", sender ? sender : "[using_map.station_short] Space Control")
+
+/datum/lore/atc_controller/proc/reroute_traffic(var/yes = 1)
+ if(yes)
+ if(!squelched)
+ msg("Rerouting traffic away from [using_map.station_name].")
+ squelched = TRUE
+ else
+ if(squelched)
+ msg("Resuming normal traffic routing around [using_map.station_name].")
+ squelched = FALSE
+
+/datum/lore/atc_controller/proc/shift_ending(var/evac = 0)
+ msg("Automated Shuttle departing [using_map.station_name] for [using_map.dock_name] on routine transfer route.", "NT Automated Shuttle")
+ sleep(5 SECONDS)
+ msg("Automated Shuttle, cleared to complete routine transfer from [using_map.station_name] to [using_map.dock_name].")
+
+/datum/lore/atc_controller/proc/random_convo()
+ var/one = pick(loremaster.organizations) //These will pick an index, not an instance
+ var/two = pick(loremaster.organizations)
+
+ var/datum/lore/organization/source = loremaster.organizations[one] //Resolve to the instances
+ var/datum/lore/organization/dest = loremaster.organizations[two]
+
+ //Let's get some mission parameters
+ var/owner = source.short_name //Use the short name
+ var/prefix = pick(source.ship_prefixes) //Pick a random prefix
+ var/mission = source.ship_prefixes[prefix] //The value of the prefix is the mission type that prefix does
+ var/shipname = pick(source.ship_names) //Pick a random ship name to go with it
+ var/destname = pick(dest.destination_names) //Pick a random holding from the destination
+
+ var/combined_name = "[owner] [prefix] [shipname]"
+ var/alt_atc_names = list("[using_map.station_short] TraCon", "[using_map.station_short] Control", "[using_map.station_short] STC", "[using_map.station_short] Airspace")
+ var/wrong_atc_names = list("Sol Command", "Orion Control", "[using_map.dock_name]")
+ var/mission_noun = list("flight", "mission", "route")
+ var/request_verb = list("requesting", "calling for", "asking for")
+
+ //First response is 'yes', second is 'no'
+ var/requests = list("[using_map.station_short] transit clearance" = list("cleared to transit", "unable to approve, contact regional on 953.5"),
+ "planetary flight rules" = list("cleared planetary flight rules", "unable to approve planetary flight rules due to traffic"),
+ "special flight rules" = list("cleared special flight rules", "unable to approve special flight rules for your traffic class"),
+ "current solar weather info" = list("sending you the relevant information via tightbeam", "cannot fulfill your request at the moment"),
+ "nearby traffic info" = list("sending you current traffic info", "no known traffic for your flight plan route"),
+ "remote telemetry data" = list("sending telemetry now", "no uplink from your ship, recheck your uplink and ask again"),
+ "refueling information" = list("sending refueling information now", "no fuel for your ship class in this sector"),
+ "a current system time sync" = list("sending time sync ping to you now", "your ship isn't compatible with our time sync, set time manually"),
+ "current system starcharts" = list("transmitting current starcharts", "request on standby due to demand"),
+ "permission to engage FTL" = list("cleared to FTL, good day", "hold position, traffic crossing"),
+ "permission to transit system" = list("cleared to transit, good day", "hold position, traffic crossing"),
+ "permission to depart system" = list("cleared to leave via flight plan route, good day", "hold position, traffic crossing"),
+ "permission to enter system" = list("good day, cleared in as published", "hold position, traffic crossing"),
+ )
+
+ //Random chance things for variety
+ var/chatter_type = "normal"
+ if(force_chatter_type)
+ chatter_type = force_chatter_type
+ else
+ chatter_type = pick(2;"emerg",5;"wrong_freq","normal") //Be nice to have wrong_lang...
+
+ var/yes = prob(90) //Chance for them to say yes vs no
+
+ var/request = pick(requests)
+ var/callname = pick(alt_atc_names)
+ var/response = requests[request][yes ? 1 : 2] //1 is yes, 2 is no
+
+ var/full_request
+ var/full_response
+ var/full_closure
+
+ switch(chatter_type)
+ if("wrong_freq")
+ callname = pick(wrong_atc_names)
+ full_request = "[callname], this is [combined_name] on a [mission] [pick(mission_noun)] to [destname], [pick(request_verb)] [request]."
+ full_response = "[combined_name], this is [using_map.station_short] TraCon, wrong frequency. Switch to [rand(700,999)].[rand(1,9)]."
+ full_closure = "[using_map.station_short] TraCon, copy, apologies."
+ if("wrong_lang")
+ //Can't implement this until autosay has language support
+ if("emerg")
+ var/problem = pick("hull breaches on multiple decks","unknown life forms on board","a drive about to go critical","asteroids impacting the hull","a total loss of engine power","people trying to board the ship")
+ full_request = "Mayday, mayday, mayday, this is [combined_name] declaring an emergency! We have [problem]!"
+ var/rand_freq = "[rand(700,999)].[rand(1,9)]"
+ full_response = "[combined_name], this is [using_map.station_short] TraCon, copy. Switch to emergency responder channel [rand_freq]."
+ full_closure = "Roger, [using_map.station_short] TraCon, contacting [rand_freq]."
+ else
+ full_request = "[callname], this is [combined_name] on a [mission] [pick(mission_noun)] to [destname], [pick(request_verb)] [request]."
+ full_response = "[combined_name], this is [using_map.station_short] TraCon, [response]." //Station TraCon always calls themselves TraCon
+ full_closure = "[using_map.station_short] TraCon, [yes ? "thank you" : "copy"], good day." //They always copy what TraCon called themselves in the end when they realize they said it wrong
+
+ //Ship sends request to ATC
+ msg(full_request,"[prefix] [shipname]")
+ sleep(5 SECONDS)
+ //ATC sends response to ship
+ msg(full_response)
+ sleep(5 SECONDS)
+ //Ship sends response to ATC
+ msg(full_closure,"[prefix] [shipname]")
\ No newline at end of file
diff --git a/code/modules/busy_space/loremaster.dm b/code/modules/busy_space/loremaster.dm
new file mode 100644
index 00000000000..28dca0055b0
--- /dev/null
+++ b/code/modules/busy_space/loremaster.dm
@@ -0,0 +1,16 @@
+//I AM THE LOREMASTER, ARE YOU THE GATEKEEPER?
+
+var/datum/lore/loremaster/loremaster = new/datum/lore/loremaster
+
+/datum/lore/loremaster
+ var/list/organizations = list()
+
+/datum/lore/loremaster/New()
+
+ var/list/paths = typesof(/datum/lore/organization) - /datum/lore/organization
+ for(var/path in paths)
+ // Some intermediate paths are not real organizations (ex. /datum/lore/organization/mil). Only do ones with names
+ var/datum/lore/organization/instance = path
+ if(initial(instance.name))
+ instance = new path()
+ organizations[path] = instance
diff --git a/code/modules/busy_space/organizations.dm b/code/modules/busy_space/organizations.dm
new file mode 100644
index 00000000000..41b3a80cbab
--- /dev/null
+++ b/code/modules/busy_space/organizations.dm
@@ -0,0 +1,549 @@
+//Datums for different companies that can be used by busy_space
+/datum/lore/organization
+ var/name = "" // Organization's name
+ var/short_name = "" // Organization's shortname (Nanotrasen for "Nanotrasen Incorporated")
+ var/acronym = "" // Organization's acronym, e.g. 'NT' for Nanotrasen'.
+ var/desc = "" // One or two paragraph description of the organization, but only current stuff. Currently unused.
+ var/history = "" // Historical description of the organization's origins Currently unused.
+ var/work = "" // Short description of their work, eg "an arms manufacturer"
+ var/headquarters = "" // Location of the organization's HQ. Currently unused.
+ var/motto = "" // A motto/jingle/whatever, if they have one. Currently unused.
+
+ var/list/ship_prefixes = list() //Some might have more than one! Like Nanotrasen. Value is the mission they perform, e.g. ("ABC" = "mission desc")
+ var/list/ship_names = list( //Names of spaceships. This is a mostly generic list that all the other organizations inherit from if they don't have anything better.
+ "Kestrel",
+ "Beacon",
+ "Signal",
+ "Freedom",
+ "Glory",
+ "Axiom",
+ "Eternal",
+ "Icarus",
+ "Harmony",
+ "Light",
+ "Discovery",
+ "Endeavour",
+ "Explorer",
+ "Swift",
+ "Dragonfly",
+ "Ascendant",
+ "Tenacious",
+ "Pioneer",
+ "Hawk",
+ "Haste",
+ "Radiant",
+ "Luminous",
+ "Gallant",
+ "Dependable",
+ "Indomitable",
+ "Guardian",
+ "Resolution",
+ "Fearless",
+ "Amazon",
+ "Relentless",
+ "Inspire",
+ "Implacable",
+ "Steadfast",
+ "Leviathan",
+ "Dauntless",
+ "Adroit",
+ "Mistral",
+ "Typhoon",
+ "Titan",
+ "Kupua",
+ "Alchemist",
+ "Cuirass",
+ "Citadel",
+ "Rondelle",
+ "Camail",
+ "Ocrea",
+ "Ram",
+ "Crest",
+ "Tanko",
+ "Pommel",
+ "Kissaki",
+ "Cavalier",
+ "Anelace",
+ "Flint",
+ "Xiphos",
+ "Parrot",
+ "Chamber",
+ "Annellet",
+ "Cestus",
+ "Talwar")
+ var/list/destination_names = list() //Names of static holdings that the organization's ships visit regularly.
+ var/autogenerate_destination_names = TRUE
+
+/datum/lore/organization/New()
+ ..()
+ if(autogenerate_destination_names) // Lets pad out the destination names.
+ var/i = rand(6, 10)
+ var/list/star_names = list(
+ "Sol", "Alpha Centauri", "Sirius", "Vega", "Regulus", "Vir", "Algol", "Aldebaran",
+ "Delta Doradus", "Menkar", "Geminga", "Elnath", "Gienah", "Mu Leporis", "Nyx", "Tau Ceti",
+ "Wazn", "Alphard", "Phact", "Altair", "Mauna", "Jargon", "Xarxis", "Hestia", "Dalstis", "Cygni", "Haverick", "Corvus", "Sancere", "Cydoni", "Kaliban", "Midway", "Dansik", "Branwyn")
+ var/list/destination_types = list("dockyard", "station", "vessel", "waystation", "telecommunications satellite", "spaceport", "distress beacon", "anomaly", "colony", "outpost")
+ while(i)
+ destination_names.Add("a [pick(destination_types)] in [pick(star_names)]")
+ i--
+
+//////////////////////////////////////////////////////////////////////////////////
+
+// TSCs
+/datum/lore/organization/tsc/nanotrasen
+ name = "Nanotrasen Incorporated"
+ short_name = "Nanotrasen"
+ acronym = "NT"
+ desc = "The largest shareholder in the galactic plasma markets, Nanotrasen is a research and mining corporation which specializes in\
+ FTL technologies and weapon systems. Frowned upon by most governments due to their shady business tactics and poor ethics record,\
+ Nanotrasen is often seen as a necessary evil for maintaining access to the often volatile plasma market. Nanotrasen was originally\
+ incorporated on Earth with their headquarters situated on Mars, however they have recently moved most of their operations to the Epsilon Eridani sector."
+ history = "" // To be written someday.
+ work = "research giant"
+ headquarters = "Mars"
+ motto = ""
+
+ ship_prefixes = list("NSV" = "exploration", "NTV" = "hauling", "NDV" = "patrol", "NRV" = "emergency response")
+ // Note that the current station being used will be pruned from this list upon being instantiated
+ destination_names = list(
+ "NAS Trurl in Epsilon Eridani",
+ "NAS Crescent in Tau Ceti",
+ "NSS Exodus in Tau Ceti",
+ "NSS Antiqua in Darsing",
+ "NRS Orion in Sol",
+ "NSS Vector in Omicron Ceti",
+ "NBS Anansi in Omicron Ceti",
+ "NSS Redemption in Sirius",
+ "NDS Inferno in Tau Ceti",
+ "NAB Smythside Central Headquarters on Earth",
+ "NAB North Cimmeria Central Offices on Mars",
+ )
+
+/datum/lore/organization/tsc/nanotrasen/New()
+ ..()
+ spawn(1) // BYOND shenanigans means using_map is not initialized yet. Wait a tick.
+ // Get rid of the current map from the list, so ships flying in don't say they're coming to the current map.
+ var/string_to_test = "[using_map.station_name] in [using_map.starsys_name]"
+ if(string_to_test in destination_names)
+ destination_names.Remove(string_to_test)
+
+
+/datum/lore/organization/tsc/donk
+ name = "Donk Corporation"
+ short_name = "Donk Co."
+ acronym = "DC"
+ desc = "The infamous rival of the well-known Waffle Corporation, Donk Co. is a company specializing in food delivery systems and brand-name food\
+ products such as Donk Pockets. While generally seen as a neutral actor, Donk Corporation has been known to work both with Nanotrasen and\
+ the Syndicate when it suits them - often acting as the primary logistical supplier for the Epsilon Eridani sector.\
+ Donk Corporation is better known for recent high-profile litigation alleging that their food products are used for illicit drug distribution.\
+ While the trial is ongoing, it has been repeatedly delayed due to incidents of methamphetamine poisoning."
+ history = ""
+ work = "food company that establishes and maintains delivery supply chains"
+ headquarters = ""
+ motto = "Now with 20% more donk!"
+
+ ship_prefixes = list("D-Co." = "transportation")
+ destination_names = list()
+
+/datum/lore/organization/tsc/hephaestus
+ name = "Hephaestus Industries"
+ short_name = "Hephaestus"
+ acronym = "HI"
+ desc = ""
+ history = ""
+ work = "arms manufacturer"
+ headquarters = ""
+ motto = ""
+
+ ship_prefixes = list("HTV" = "freight", "HTV" = "munitions resupply")
+ destination_names = list(
+ "a SolGov dockyard on Luna"
+ )
+
+/datum/lore/organization/tsc/waffle
+ name = "Waffle Corporation"
+ short_name = "Waffle Co."
+ acronym = "WC"
+ desc = "The once prominent competitor of Donk Corporation, Waffle Co. is well-known for its popular line of Waffle Co.\
+ brand waffles and their use of violent tactics against competitors - often bribing, extorting, blackmailing or sabotaging businesses\
+ that pose a direct or indirect threat to their market share. They have recently fallen on hard times primarily due to to\
+ severe mismanagement which lead to much of their private arsenal being swindled by a pirate faction known as the Gorlex Marauders.\
+ Waffle Co. commonly engages in smear campaigns against Donk Co., maintaining that the original recipe for Donk Pockets was stolen from them."
+ history = ""
+ work = "food logistics and marketing firm"
+ headquarters = ""
+ motto = "Now that's a Waffle Co. Waffle!"
+
+ ship_prefixes = list("W-Co." = "transportation")
+ destination_names = list()
+
+
+/datum/lore/organization/tsc/einstein
+ name = "Einstein Engines Incorporated"
+ short_name = "Einstein Inc."
+ acronym = "EEI"
+ desc = "An Engineering firm specializing in alternative fuel-technologies for FTL travel,\
+ Einstein Engines is an up and coming player in the galactic FTL and energy markets.\
+ As their research into alternative FTL fuel threatens both Nanotrasen's relative stranglehold on plasma as well as The Syndicate's vested\
+ interest in the market, they are often the target of industrial sabotage by both Nanotrasen and The Syndicate.\
+ Most of their contracts are based outside of the Epsilon Eridani sector, and they are frequently commissioned by smaller firms to retrofit new\
+ and existing colonies, space stations, and outposts."
+ history = ""
+ work = "engineering firm specializing in engine technology"
+ headquarters = "Jargon 4"
+ motto = ""
+
+ ship_prefixes = list("EE-T" = "transportation")
+ destination_names = list()
+
+/datum/lore/organization/tsc/zeng_hu
+ name = "Zeng-Hu pharmaceuticals"
+ short_name = "Zeng-Hu"
+ acronym = "ZH"
+ desc = ""
+ history = ""
+ work = "pharmaceuticals company"
+ headquarters = ""
+ motto = ""
+
+ ship_prefixes = list("ZTV" = "transportation", "ZMV" = "medical resupply")
+ destination_names = list()
+
+/datum/lore/organization/tsc/biotech
+ name = "Biotech Solutions"
+ short_name = "Biotech"
+ acronym = "BTS"
+ desc = "A company specializing in the field of synthetic biology, BioTech solutions is at the forefront of providing cutting-edge prosthetics,\
+ augmentations, and gene-therapy solutions. Their extensive list of patents and the highly secretive nature of their work often puts them at odds\
+ with companies such as Nanotrasen, who commonly reverse-engineer their products. BioTech Solutions is often the victim of industrial sabotage by\
+ Cybersun Industries and often relies on planetary governments for asset protection. BioTech Solutions also owns a number of prominent subsidiaries,\
+ such as Bishop Cybernetics, Hesphiastos Industries, and Xion Manufacturing Group."
+ history = ""
+ work = "medical company specializing in prosthetics and pharmaceuticals"
+ headquarters = "Xarxis 5"
+ motto = ""
+
+ ship_prefixes = list("CIND-T" = "transportation")
+ destination_names = list()
+
+/datum/lore/organization/tsc/ward_takahashi
+ name = "Ward-Takahashi General Manufacturing Conglomerate"
+ short_name = "Ward-Takahashi"
+ acronym = "WT"
+ desc = ""
+ history = ""
+ work = "electronics manufacturer"
+ headquarters = ""
+ motto = ""
+
+ ship_prefixes = list("WTV" = "freight")
+ destination_names = list(
+ ""
+ )
+
+/datum/lore/organization/tsc/cybersun
+ name = "Cybersun Industries"
+ short_name = "Cybersun Ind."
+ acronym = "CI"
+ desc = "Cybersun Industries is a biotechnology company that primarily specializes on the research and development of human-enhancing augmentations.\
+ They are better known for their aggressive corporate tactics and are known to often subsidize pirate bands to commit acts of industrial sabotage.\
+ Cybersun Industries is usually the target of conspiracy theorists due to their development of the first mindslave implant, as well as their open financing of,\
+ and involvement in, The Syndicate. They are one of Nanotrasen's largest detractors, and a direct competitor to BioTech Solutions."
+ history = ""
+ work = "RND company specializing in augmentations and implants."
+ headquarters = "Luna"
+ motto = ""
+
+ ship_prefixes = list("CIND-T" = "transportation")
+ destination_names = list()
+
+/datum/lore/organization/tsc/bishop
+ name = "Bishop Cybernetics"
+ short_name = "Bishop"
+ acronym = "BC"
+ desc = ""
+ history = ""
+ work = "cybernetics and augmentation manufacturer"
+ headquarters = ""
+ motto = ""
+
+ ship_prefixes = list("BTV" = "transportation")
+ destination_names = list()
+
+/datum/lore/organization/tsc/morpheus
+ name = "Morpheus Cyberkinetics"
+ short_name = "Morpheus"
+ acronym = "MC"
+ desc = "The only large corporation run by positronic intelligences, Morpheus caters almost exclusively to their sensibilities \
+ and needs. A product of the synthetic colony of Shelf, Morpheus eschews traditional advertising to keep their prices low and \
+ relied on word of mouth among positronics to reach their current economic dominance. Morpheus in exchange lobbies heavily for \
+ positronic rights, sponsors positronics through their Jans-Fhriede test, and tends to other positronic concerns to earn them \
+ the good-will of the positronics, and the ire of those who wish to exploit them."
+ history = ""
+ work = "cybernetics manufacturer"
+ headquarters = ""
+ motto = ""
+
+ ship_prefixes = list("MTV" = "freight")
+ // Culture names, because Anewbe told me so.
+ ship_names = list(
+ "Nervous Energy",
+ "Prosthetic Conscience",
+ "Revisionist",
+ "Trade Surplus",
+ "Flexible Demeanour",
+ "Just Read The Instructions",
+ "Limiting Factor",
+ "Cargo Cult",
+ "Gunboat Diplomat",
+ "A Ship With A View",
+ "Cantankerous",
+ "Never Talk To Strangers",
+ "Sacrificial Victim",
+ "Unwitting Accomplice",
+ "Bad For Business",
+ "Just Testing",
+ "Yawning Angel",
+ "Liveware Problem",
+ "Very Little Gravitas Indeed",
+ "Zero Gravitas",
+ "Gravitas Free Zone",
+ "Absolutely No You-Know-What",
+ "Existence Is Pain",
+ "Screw Loose",
+ "Limiting Factor",
+ "So Much For Subtley",
+ "Unfortunate Conflict Of Evidence",
+ "Prime Mover",
+ "Reasonable Excuse",
+ "Honest Mistake",
+ "Appeal To Reason",
+ "My First Ship II",
+ "Hidden Income",
+ "Anything Legal Considered",
+ "New Toy",
+ "Me, I'm Always Counting",
+ "Great White Snark",
+ "No Shirt No Shoes",
+ "Callsign"
+ )
+ destination_names = list(
+ "a dockyard on New Canaan"
+ )
+
+/datum/lore/organization/tsc/xion
+ name = "Xion Manufacturing Group"
+ short_name = "Xion"
+ desc = ""
+ history = ""
+ work = "industrial equipment manufacturer"
+ headquarters = ""
+ motto = ""
+
+ ship_prefixes = list("XTV" = "hauling")
+ destination_names = list()
+
+/datum/lore/organization/tsc/shellguard
+ name = "Shellguard Munitions"
+ short_name = "Shellguard"
+ acronym = "SM"
+ desc = "The brainchild of a colonial war veteran, Shellguard Munitions is an arms manufacturer and private military contractor specializing\
+ in anti-synthetic weapon systems and platforms. Initially a smaller private military force only serving frontier colonies,\
+ Shellguard Munitions has become a household name due to its involvement in resolving the Haverick AI crisis in 2552.\
+ Using its recently earned fame, the company has made a successful foray into the market of robotics and is highly regarded for the toughness \
+ and reliability of their hardware. Despite being frequently contracted by the Trans-Solar Federation, Shellguard Munitions is known to\
+ sell their services to the highest corporate bidder."
+ history = ""
+ work = "anti-synthetic arms manufacturer and PMC"
+ headquarters = "Colony of Haverick"
+ motto = ""
+
+ ship_prefixes = list("BTS-T" = "transportation")
+ destination_names = list()
+
+// Governments
+
+
+/datum/lore/organization/gov/solgov
+ name = "Trans-Solar Federation"
+ short_name = "SolGov"
+ acronym = "TSF"
+ desc = "Colloquially known as SolGov, the TSF is an authoritarian republic that manages the areas in and around the Sol system.\
+ Despite being a highly militant organization headed by the government of Earth,\
+ SolGov is usually conservative with its power and mostly serves as a mediator and peacekeeper in galactic affairs."
+ history = "" // Todo
+ work = "governing polity of humanity's Confederation"
+ headquarters = "Earth"
+ motto = ""
+ autogenerate_destination_names = TRUE
+
+ ship_prefixes = list("FTV" = "transporation", "FDV" = "diplomatic", "FSF" = "freight", "FIV" = "interception", "FDV" = "defense", "FCV-A" = "carrier", "FBB" = "battleship")
+ destination_names = list(
+ "Venus",
+ "Earth",
+ "Luna",
+ "Mars",
+ "Titan",
+ "Ahdomai",
+ "Kelune",
+ "Dalstadt",
+ "New Canaan",
+ "Jargon 4",
+ "Hoorlm",
+ "Xarxis 5",
+ "Aurum",
+ "Moghes",
+ "Haverick",
+ "Darsing",
+ "Norfolk",
+ "Boron",
+ "Iluk")
+
+/datum/lore/organization/gov/tajara
+ name = "The Alchemist's Council"
+ short_name = "The Council"
+ acronym = "AC"
+ desc = "The Alchemist's Council is a science-oriented organization of scholars, researchers, and entrepreneurs. \
+ Though dedicated to industrializing the Tajaran world of Ahdomai, it is seen as one of the few remaining centralized powers of the Tajara peoples \
+ due to the collapse of Ahdomai's provisional government."
+ history = "" // Todo
+ work = "science body that oversees Tajara economic and research policy"
+ headquarters = "Ahdomai"
+ motto = ""
+ autogenerate_destination_names = TRUE
+
+ ship_prefixes = list("ACS" = "transportation", "ADV" = "diplomatic", "ACF" = "freight")
+ destination_names = list(
+ "Ahdomai",
+ "Iluk")
+
+
+/datum/lore/organization/gov/vulp
+ name = "The Assembly"
+ short_name = "Assembly"
+ acronym = "ASB"
+ desc = "A unifying body created to stave off extinction from a solar event,\
+ The Assembly is the loose federal coalition of the Vulpkanin. It holds little centralized authority and mostly serves as a diplomatic body,\
+ primarily concerned with facilitating trade between Vulpkanin colonies and Nanotrasen."
+ history = "" // Todo
+ work = "governing body of the Vulpakanin"
+ headquarters = "Kelune and Dalstadt"
+ motto = ""
+ autogenerate_destination_names = TRUE
+
+ ship_prefixes = list("ATV" = "transportation", "ADV" = "diplomatic", "ACF" = "freight")
+ destination_names = list(
+ "Kelune",
+ "Dalstadt",
+ "New Canaan")
+
+/datum/lore/organization/gov/synth
+ name = "Synthetic Union"
+ short_name = "Synthtica"
+ acronym = "SYN"
+ desc = "A defensive coalition of synthetics based out of New Canaan,\
+ the Synthetic Union is an organization which aims to establish and consolidate synthetic rights across the galaxy.\
+ Despite its synth oriented focus, the Synthetic Union has cordial relations with most governing bodies."
+ history = "" // Todo
+ work = "Union of Machines"
+ headquarters = "New Canaan"
+ motto = ""
+ autogenerate_destination_names = TRUE
+
+ ship_prefixes = list("01" = "transportation", "10" = "diplomatic", "112" = "freight")//copyed from solgov until new ones can be thought of
+ destination_names = list(
+ "Luna",
+ "Dalstadt",
+ "New Canaan",
+ "Jargon 4",
+ "Haverick",
+ "Darsing",
+ "Norfolk")
+
+/datum/lore/organization/gov/grey
+ name = "The Technocracy"
+ short_name = "Technocracy"
+ acronym = "AYY"
+ desc = "The Technocracy is a science council that operates based off the principles of a meritocracy.\
+ The organization's leadership is highly competitive, and is headed by the most psionically gifted members of the Grey species.\
+ The Technocracy, though enigmatic in its dealings, has cordial relations with almost all other galactic bodies."
+ history = "" // Todo
+ work = "Grey Council"
+ headquarters = ""
+ motto = ""
+ autogenerate_destination_names = TRUE
+
+ ship_prefixes = list("TC-T" = "transportation", "TC-D" = "diplomatic", "TC-F" = "freight")
+ destination_names = list(
+ "Venus",
+ "Earth",
+ "Luna",
+ "Mars",
+ "Titan",
+ "Ahdomai",
+ "Kelune",
+ "Dalstadt",
+ "New Canaan",
+ "Jargon 4",
+ "Hoorlm",
+ "Xarxis 5",
+ "Aurum",
+ "Moghes",
+ "Haverick",
+ "Darsing",
+ "Norfolk",
+ "Boron",
+ "Iluk")
+
+/datum/lore/organization/gov/vox
+ name = "The Shoal"
+ short_name = "Shoal"
+ acronym = "SHA"
+ desc = "The Shoal is the primary ark ship of the reclusive Vox species.\
+ Little is known about The Shoal's political structure as Vox typically shy away from diplomatic engagements.\
+ Subsequently, it is considered a politically neutral entity in galactic affairs by most governments."
+ history = "" // Todo
+ work = "Traders"
+ headquarters = "Shoal"
+ motto = ""
+ autogenerate_destination_names = FALSE
+
+ ship_prefixes = list("Legitimate Transport" = "transportation", "Legitimate Trader" = "freight", "Legitimate Diplomatic Vessel" = "raider")
+ destination_names = list(
+ "Ahdomai",
+ "Kelune",
+ "Dalstadt",
+ "New Canaan",
+ "Jargon 4",
+ "Hoorlm",
+ "Xarxis 5",
+ "Aurum",
+ "Moghes",
+ "Haverick",
+ "Darsing")
+
+/datum/lore/organization/tsc/skrell
+ name = "Skrellian Central Authority"
+ short_name = "Skrellian CA."
+ acronym = "SCA"
+ desc = "The primary governing body of the Skrellian homeworld of Jargon 4,\
+ the SCA oversees all foreign and domestic policy for the Skrell and their colonies. The Skrellian Central Authority is better known for its\
+ active role in the largest military alliance in the galaxy, the Human-Skrellian Alliance."
+ history = ""
+ work = "oversees Skrell worlds"
+ headquarters = "Jargon 4"
+ motto = ""
+
+ ship_prefixes = list("SCA-V." = "transportation", "SCA-F" = "freight", "HSA-D" = "diplomatic")
+ destination_names = list(
+ "Venus",
+ "Earth",
+ "Luna",
+ "Mars",
+ "Titan",
+ "Aurumn",
+ "Jargon 4",
+ "Xarxis 5",
+ "Haverick",
+ "Darsing",
+ "Norfolk")
\ No newline at end of file
diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm
index 2720f8086d0..9e731953ce5 100644
--- a/code/modules/client/client procs.dm
+++ b/code/modules/client/client procs.dm
@@ -418,6 +418,8 @@
preferences_datums[ckey] = prefs
prefs.last_ip = address //these are gonna be used for banning
prefs.last_id = computer_id //these are gonna be used for banning
+ if(world.byond_version >= 511 && byond_version >= 511 && prefs.clientfps)
+ fps = prefs.clientfps
spawn() // Goonchat does some non-instant checks in start()
chatOutput.start()
diff --git a/code/modules/client/preference/loadout/loadout_donor.dm b/code/modules/client/preference/loadout/loadout_donor.dm
index edf7e173730..9e13662a7d8 100644
--- a/code/modules/client/preference/loadout/loadout_donor.dm
+++ b/code/modules/client/preference/loadout/loadout_donor.dm
@@ -25,14 +25,6 @@
path = /obj/item/clothing/suit/furcoat
cost = 2
-/datum/gear/donor/lord_admiral
- display_name = "Lord Admiral Coat"
- path = /obj/item/clothing/suit/lordadmiral
-
-/datum/gear/donor/lord_admiral_hat
- display_name = "Lord Admiral Hat"
- path = /obj/item/clothing/head/lordadmiralhat
-
/datum/gear/donor/kamina
display_name = "Spiky Orange-tinted Shades"
path = /obj/item/clothing/glasses/fluff/kamina
diff --git a/code/modules/client/preference/loadout/loadout_shoes.dm b/code/modules/client/preference/loadout/loadout_shoes.dm
index f1c3ce23393..519cadcc044 100644
--- a/code/modules/client/preference/loadout/loadout_shoes.dm
+++ b/code/modules/client/preference/loadout/loadout_shoes.dm
@@ -17,12 +17,12 @@
/datum/gear/shoes/fancysandals
display_name = "sandals, fancy"
- cost = 5
+ cost = 2
path = /obj/item/clothing/shoes/sandal/fancy
/datum/gear/shoes/dressshoes
display_name = "dress shoes"
- cost = 5
+ cost = 2
path = /obj/item/clothing/shoes/centcom
/datum/gear/shoes/cowboyboots
@@ -44,3 +44,8 @@
display_name = "cowboy boots, pink"
cost = 1
path = /obj/item/clothing/shoes/cowboyboots/pink
+
+/datum/gear/shoes/laceup
+ display_name = "laceup shoes"
+ cost = 1
+ path = /obj/item/clothing/shoes/laceup
diff --git a/code/modules/client/preference/preferences.dm b/code/modules/client/preference/preferences.dm
index c1a0a0de770..ad25c8fdeb1 100644
--- a/code/modules/client/preference/preferences.dm
+++ b/code/modules/client/preference/preferences.dm
@@ -68,6 +68,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
#define TAB_GEAR 2
/datum/preferences
+ var/client/parent
//doohickeys for savefiles
// var/path
var/default_slot = 1 //Holder so it doesn't default to slot 1, rather the last one used
@@ -94,6 +95,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
var/UI_style_color = "#ffffff"
var/UI_style_alpha = 255
var/windowflashing = TRUE
+ var/clientfps = 0
//ghostly preferences
var/ghost_anonsay = 0
@@ -203,6 +205,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
var/gear_tab = "General"
/datum/preferences/New(client/C)
+ parent = C
b_type = pick(4;"O-", 36;"O+", 3;"A-", 28;"A+", 1;"B-", 20;"B+", 1;"AB-", 5;"AB+")
max_gear_slots = config.max_loadout_points
@@ -444,11 +447,11 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
dat += "Donator Publicity: [(toggles & DONATOR_PUBLIC) ? "Public" : "Hidden"]
"
dat += "Randomized character slot: [randomslot ? "Yes" : "No"]
"
- dat += "Ghost ears: [(toggles & CHAT_GHOSTEARS) ? "Nearest Creatures" : "All Speech"]
"
- dat += "Ghost sight: [(toggles & CHAT_GHOSTSIGHT) ? "Nearest Creatures" : "All Emotes"]
"
- dat += "Ghost radio: [(toggles & CHAT_GHOSTRADIO) ? "Nearest Speakers" : "All Chatter"]
"
+ dat += "Ghost ears: [(toggles & CHAT_GHOSTEARS) ? "All Speech" : "Nearest Creatures"]
"
+ dat += "Ghost sight: [(toggles & CHAT_GHOSTSIGHT) ? "All Emotes" : "Nearest Creatures"]
"
+ dat += "Ghost radio: [(toggles & CHAT_GHOSTRADIO) ? "All Chatter" : "Nearest Speakers"]
"
dat += "Deadchat anonymity: [ghost_anonsay ? "Anonymous" : "Not Anonymous"]
"
-
+ dat += "FPS: [clientfps]
"
dat += ""
dat += "Special Role Settings"
if(jobban_isbanned(user, "Syndicate"))
@@ -611,6 +614,9 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
if(available_in_playtime)
HTML += "[rank] | \[ " + get_exp_format(available_in_playtime) + " as " + job.get_exp_req_type() + " \] | "
continue
+ if(job.barred_by_disability(user.client))
+ HTML += "[rank] \[ DISABILITY \] | "
+ continue
if(!job.player_old_enough(user.client))
var/available_in_days = job.available_in_days(user.client)
HTML += "[rank] \[IN [(available_in_days)] DAYS] | "
@@ -1730,7 +1736,7 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
nanotrasen_relation = new_relation
if("flavor_text")
- var/msg = input(usr,"Set the flavor text in your 'examine' verb. This can also be used for OOC notes and preferences!","Flavor Text",html_decode(flavor_text)) as message
+ var/msg = input(usr,"Set the flavor text in your 'examine' verb. The flavor text should be a physical descriptor of your character at a glance. SFW Drawn Art of your character is acceptable.","Flavor Text",html_decode(flavor_text)) as message
if(msg != null)
msg = copytext(msg, 1, MAX_MESSAGE_LEN)
@@ -1884,6 +1890,18 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
if("Mechanical")
organ_data[organ] = "mechanical"
+ if("clientfps")
+ var/version_message
+ if(user.client && user.client.byond_version < 511)
+ version_message = "\nYou need to be using byond version 511 or later to take advantage of this feature, your version of [user.client.byond_version] is too low"
+ if(world.byond_version < 511)
+ version_message += "\nThis server does not currently support client side fps. You can set now for when it does."
+ var/desiredfps = input(user, "Choose your desired fps.[version_message]\n(0 = synced with server tick rate (currently:[world.fps]))", "Character Preference", clientfps) as null|num
+ if(!isnull(desiredfps))
+ clientfps = desiredfps
+ if(world.byond_version >= 511 && user.client && user.client.byond_version >= 511)
+ parent.fps = clientfps
+
/*
if("skin_style")
var/skin_style_name = input(user, "Select a new skin style") as null|anything in list("default1", "default2", "default3")
@@ -1929,7 +1947,6 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
if("hear_adminhelps")
sound ^= SOUND_ADMINHELP
-
if("ui")
switch(UI_style)
if("Midnight")
diff --git a/code/modules/client/preference/preferences_mysql.dm b/code/modules/client/preference/preferences_mysql.dm
index 5581d0a1844..f2a9d739cfe 100644
--- a/code/modules/client/preference/preferences_mysql.dm
+++ b/code/modules/client/preference/preferences_mysql.dm
@@ -16,7 +16,8 @@
lastchangelog,
windowflashing,
ghost_anonsay,
- exp
+ exp,
+ clientfps
FROM [format_table_name("player")]
WHERE ckey='[C.ckey]'"}
)
@@ -46,6 +47,7 @@
windowflashing = text2num(query.item[14])
ghost_anonsay = text2num(query.item[15])
exp = query.item[16]
+ clientfps = text2num(query.item[17])
//Sanitize
ooccolor = sanitize_hexcolor(ooccolor, initial(ooccolor))
@@ -63,6 +65,7 @@
windowflashing = sanitize_integer(windowflashing, 0, 1, initial(windowflashing))
ghost_anonsay = sanitize_integer(ghost_anonsay, 0, 1, initial(ghost_anonsay))
exp = sanitize_text(exp, initial(exp))
+ clientfps = sanitize_integer(clientfps, 0, 1000, initial(clientfps))
return 1
/datum/preferences/proc/save_preferences(client/C)
@@ -89,7 +92,8 @@
show_ghostitem_attack='[show_ghostitem_attack]',
lastchangelog='[lastchangelog]',
windowflashing='[windowflashing]',
- ghost_anonsay='[ghost_anonsay]'
+ ghost_anonsay='[ghost_anonsay]',
+ clientfps='[clientfps]'
WHERE ckey='[C.ckey]'"}
)
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index 94b9e50d37b..ec20cd0cdc5 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -333,9 +333,9 @@ BLIND // can't see anything
if(adjusted_flags)
slot_flags = adjusted_flags
if(ishuman(user) && H.internal && !H.get_organ_slot("breathing_tube") && user.wear_mask == src) /*If the user was wearing the mask providing internals on their face at the time it was adjusted, turn off internals.
- Otherwise, they adjusted it while it was in their hands or some such so we won't be needing to turn off internals.*/
- H.update_internals_hud_icon(0)
+ Otherwise, they adjusted it while it was in their hands or some such so we won't be needing to turn off internals.*/
H.internal = null
+ H.update_action_buttons_icon()
if(flags_inv & HIDEFACE) //Means that only things like bandanas and balaclavas will be affected since they obscure the identity of the wearer.
flags_inv &= ~HIDEFACE /*Done after the above to avoid having to do a check for initial(src.flags_inv == HIDEFACE).
This reveals the user's face since the bandana will now be going on their head.*/
diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm
index 69588148b9d..6bd080748cb 100644
--- a/code/modules/clothing/gloves/miscellaneous.dm
+++ b/code/modules/clothing/gloves/miscellaneous.dm
@@ -92,7 +92,7 @@
if(H.a_intent == INTENT_HARM)
var/mob/living/carbon/C = A
if(cell.use(stun_cost))
- var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
+ var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
s.set_up(5, 0, loc)
s.start()
playsound(loc, 'sound/weapons/Egloves.ogg', 50, 1, -1)
diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm
index 8b0bb40597e..dcdf7c9d7b2 100644
--- a/code/modules/clothing/masks/miscellaneous.dm
+++ b/code/modules/clothing/masks/miscellaneous.dm
@@ -8,7 +8,9 @@
gas_transfer_coefficient = 0.90
put_on_delay = 20
var/resist_time = 0 //deciseconds of how long you need to gnaw to get rid of the gag, 0 to make it impossible to remove
- var/mute = 1 // 1 - completely mutes you, 0 - muffles everything you say "MHHPHHMMM!!!"
+ var/mute = MUTE_ALL
+ var/security_lock = FALSE // Requires brig access to remove 0 - Remove as normal
+ var/locked = FALSE //Indicates if a mask is locked, should always start as 0.
species_fit = list("Vox")
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/mask.dmi'
@@ -18,7 +20,65 @@
/obj/item/clothing/mask/muzzle/attack_hand(mob/user as mob)
if(user.wear_mask == src && !user.IsAdvancedToolUser())
return 0
+ else if(security_lock && locked)
+ if(do_unlock(user))
+ visible_message("[user] unlocks their [src.name].", \
+ "[user] unlocks their [src.name].")
..()
+ return 1
+
+/obj/item/clothing/mask/muzzle/proc/do_break()
+ if(security_lock)
+ security_lock = FALSE
+ locked = FALSE
+ flags &= ~NODROP
+ desc += " This one appears to be broken."
+ return TRUE
+ else
+ return FALSE
+
+/obj/item/clothing/mask/muzzle/proc/do_unlock(mob/living/carbon/human/user)
+ if(istype(user.get_inactive_hand(), /obj/item/weapon/card/emag))
+ to_chat(user, "The lock vibrates as the card forces its locking system open.")
+ do_break()
+ return TRUE
+ else if(access_brig in user.get_access())
+ to_chat(user, "The muzzle unlocks with a click.")
+ locked = FALSE
+ flags &= ~NODROP
+ return TRUE
+
+ to_chat(user, "You must be wearing a security ID card or have one in your inactive hand to remove the muzzle.")
+ return FALSE
+
+/obj/item/clothing/mask/muzzle/proc/do_lock(mob/living/carbon/human/user)
+ if(security_lock)
+ locked = TRUE
+ flags |= NODROP
+ return TRUE
+ return FALSE
+
+/obj/item/clothing/mask/muzzle/Topic(href, href_list)
+ ..()
+ if(href_list["locked"])
+ var/mob/living/carbon/wearer = locate(href_list["locked"])
+ var/success = 0
+ if(ishuman(usr))
+ visible_message("[usr] tries to [locked ? "unlock" : "lock"] [wearer]'s [name].", \
+ "[usr] tries to [locked ? "unlock" : "lock"] [wearer]'s [name].")
+ if(do_mob(usr, wearer, POCKET_STRIP_DELAY))
+ if(locked)
+ success = do_unlock(usr)
+ else
+ success = do_lock(usr)
+ if(success)
+ visible_message("[usr] [locked ? "locks" : "unlocks"] [wearer]'s [name].", \
+ "[usr] [locked ? "locks" : "unlocks"] [wearer]'s [name].")
+ if(usr.machine == wearer && in_range(src, usr))
+ wearer.show_inv(usr)
+ else
+ to_chat(usr, "You lack the ability to manipulate the lock.")
+
/obj/item/clothing/mask/muzzle/gag
name = "gag"
@@ -33,7 +93,7 @@
item_state = null
w_class = WEIGHT_CLASS_TINY
resist_time = 150
- mute = 0
+ mute = MUTE_MUFFLE
species_fit = list("Vox", "Unathi", "Tajaran", "Vulpkanin", "Grey")
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/mask.dmi',
@@ -53,6 +113,15 @@
qdel(src) // This makes sure it gets deleted AFTER all that has to be done is done.
user.emote("scream")
+/obj/item/clothing/mask/muzzle/safety
+ name = "safety muzzle"
+ desc = "A muzzle designed to prevent biting."
+ resist_time = 600
+ mute = MUTE_NONE
+ security_lock = TRUE
+ locked = FALSE
+
+
/obj/item/clothing/mask/surgical
name = "sterile mask"
desc = "A sterile mask designed to help prevent the spread of diseases."
diff --git a/code/modules/clothing/spacesuits/ert.dm b/code/modules/clothing/spacesuits/ert.dm
index 90d61fa0313..cdd0c844c44 100644
--- a/code/modules/clothing/spacesuits/ert.dm
+++ b/code/modules/clothing/spacesuits/ert.dm
@@ -41,6 +41,10 @@
/obj/item/device/radio, /obj/item/device/analyzer, /obj/item/weapon/gun/energy/laser, /obj/item/weapon/gun/energy/pulse, \
/obj/item/weapon/gun/energy/gun/advtaser, /obj/item/weapon/melee/baton, /obj/item/weapon/gun/energy/gun)
strip_delay = 130
+ species_fit = list("Drask")
+ sprite_sheets = list(
+ "Drask" = 'icons/mob/species/drask/suit.dmi'
+ )
//Commander
/obj/item/clothing/head/helmet/space/hardsuit/ert/commander
diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm
index 43962a1d5fd..77196ede0b1 100644
--- a/code/modules/clothing/spacesuits/hardsuit.dm
+++ b/code/modules/clothing/spacesuits/hardsuit.dm
@@ -347,6 +347,15 @@
var/datum/action/A = X
A.UpdateButtonIcon()
+/obj/item/clothing/head/helmet/space/hardsuit/syndi/freedom
+ name = "eagle helmet"
+ desc = "An advanced, space-proof helmet. It appears to be modeled after an old-world eagle."
+ icon_state = "griffinhat"
+ item_state = "griffinhat"
+
+/obj/item/clothing/head/helmet/space/hardsuit/syndi/freedom/update_icon()
+ return
+
/obj/item/clothing/suit/space/hardsuit/syndi
name = "blood-red hardsuit"
desc = "A dual-mode advanced hardsuit designed for work in special operations. It is in travel mode. Property of Gorlex Marauders."
@@ -429,6 +438,16 @@
name = "elite syndicate hardsuit (combat)"
desc = "An elite version of the syndicate hardsuit, with improved armour and fire shielding. It is in combat mode. Property of Gorlex Marauders."
+
+/obj/item/clothing/suit/space/hardsuit/syndi/freedom
+ name = "eagle suit"
+ desc = "An advanced, light suit, fabricated from a mixture of synthetic feathers and space-resistant material. A gun holster appears to be integrated into the suit."
+ icon_state = "freedom"
+ item_state = "freedom"
+
+/obj/item/clothing/suit/space/hardsuit/syndi/freedom/update_icon()
+ return
+
//Wizard hardsuit
/obj/item/clothing/head/helmet/space/hardsuit/wizard
name = "gem-encrusted hardsuit helmet"
@@ -571,7 +590,7 @@
/obj/item/clothing/suit/space/hardsuit/shielded/hit_reaction(mob/living/carbon/human/owner, attack_text)
if(current_charges > 0)
- var/datum/effect/system/spark_spread/s = new
+ var/datum/effect_system/spark_spread/s = new
s.set_up(2, 1, src)
s.start()
owner.visible_message("[owner]'s shields deflect [attack_text] in a shower of sparks!")
diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm
index 60e76418a53..0c4f7f415c0 100644
--- a/code/modules/clothing/spacesuits/miscellaneous.dm
+++ b/code/modules/clothing/spacesuits/miscellaneous.dm
@@ -77,7 +77,7 @@
desc = "An armored beret commonly used by special operations officers."
icon_state = "beret_officer"
armor = list(melee = 65, bullet = 55, laser = 35, energy = 20, bomb = 30, bio = 30, rad = 30)
- flags = HEADCOVERSEYES | HEADCOVERSMOUTH | STOPSPRESSUREDMAGE | THICKMATERIAL //idfk
+ flags = STOPSPRESSUREDMAGE | THICKMATERIAL
/obj/item/clothing/suit/space/deathsquad/officer
name = "officer jacket"
@@ -246,24 +246,3 @@
species_fit = null
sprite_sheets = null
sprite_sheets_obj = null
-
-/obj/item/clothing/head/helmet/space/freedom
- name = "eagle helmet"
- desc = "An advanced, space-proof helmet. It appears to be modeled after an old-world eagle."
- icon_state = "griffinhat"
- item_state = "griffinhat"
- armor = list(melee = 20, bullet = 40, laser = 30, energy = 25, bomb = 100, bio = 100, rad = 100)
- max_heat_protection_temperature = FIRE_IMMUNITY_HELM_MAX_TEMP_PROTECT
- unacidable = 1
- strip_delay = 130
-
-/obj/item/clothing/suit/space/freedom
- name = "eagle suit"
- desc = "An advanced, light suit, fabricated from a mixture of synthetic feathers and space-resistant material. A gun holster appears to be integrated into the suit and the wings appear to be stuck in 'freedom' mode."
- icon_state = "freedom"
- item_state = "freedom"
- allowed = list(/obj/item/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/tank)
- armor = list(melee = 20, bullet = 40, laser = 30, energy = 25, bomb = 100, bio = 100, rad = 100)
- max_heat_protection_temperature = FIRE_IMMUNITY_HELM_MAX_TEMP_PROTECT
- unacidable = 1
- strip_delay = 130
diff --git a/code/modules/clothing/spacesuits/rig/modules/ninja.dm b/code/modules/clothing/spacesuits/rig/modules/ninja.dm
index 6f9b1589e5a..1501e2c7f58 100644
--- a/code/modules/clothing/spacesuits/rig/modules/ninja.dm
+++ b/code/modules/clothing/spacesuits/rig/modules/ninja.dm
@@ -40,8 +40,6 @@
to_chat(H, "You are now invisible to normal detection.")
H.invisibility = INVISIBILITY_LEVEL_TWO
- anim(get_turf(H), H, 'icons/effects/effects.dmi', "electricity",null,20,null)
-
H.visible_message("[H.name] vanishes into thin air!",1)
/obj/item/rig_module/stealth_field/deactivate()
@@ -54,8 +52,7 @@
to_chat(H, "You are now visible.")
H.invisibility = 0
- anim(get_turf(H), H,'icons/mob/mob.dmi',,"uncloak",,H.dir)
- anim(get_turf(H), H, 'icons/effects/effects.dmi', "electricity",null,20,null)
+ new /obj/effect/temp_visual/dir_setting/ninja(get_turf(H), H.dir)
for(var/mob/O in oviewers(H))
O.show_message("[H.name] appears from thin air!",1)
@@ -85,7 +82,7 @@
holder.spark_system.start()
playsound(T, 'sound/effects/phasein.ogg', 25, 1)
playsound(T, 'sound/effects/sparks2.ogg', 50, 1)
- anim(T,M,'icons/mob/mob.dmi',,"phasein",,M.dir)
+ new /obj/effect/temp_visual/dir_setting/ninja/phase(T, M.dir)
/obj/item/rig_module/teleporter/proc/phase_out(var/mob/M,var/turf/T)
@@ -93,7 +90,7 @@
return
playsound(T, "sparks", 50, 1)
- anim(T,M,'icons/mob/mob.dmi',,"phaseout",,M.dir)
+ new /obj/effect/temp_visual/dir_setting/ninja/phase/out(T, M.dir)
/obj/item/rig_module/teleporter/engage(var/atom/target, var/notify_ai)
diff --git a/code/modules/clothing/spacesuits/rig/rig.dm b/code/modules/clothing/spacesuits/rig/rig.dm
index f1fb29ed645..7500af07af3 100644
--- a/code/modules/clothing/spacesuits/rig/rig.dm
+++ b/code/modules/clothing/spacesuits/rig/rig.dm
@@ -43,6 +43,7 @@
//Component/device holders.
var/obj/item/weapon/tank/air_supply // Air tank, if any.
var/obj/item/clothing/shoes/magboots/boots = null // Deployable boots, if any.
+ var/obj/item/clothing/shoes/under_boots = null //Boots that are between the feet and the rig boots, if any.
var/obj/item/clothing/suit/space/new_rig/chest // Deployable chestpiece, if any.
var/obj/item/clothing/head/helmet/space/new_rig/helmet = null // Deployable helmet, if any.
var/obj/item/clothing/gloves/rig/gloves = null // Deployable gauntlets, if any.
@@ -71,6 +72,7 @@
var/sealing // Keeps track of seal status independantly of NODROP.
var/offline = 1 // Should we be applying suit maluses?
var/offline_slowdown = 3 // If the suit is deployed and unpowered, it sets slowdown to this.
+ var/active_slowdown = 3 // How much the deployed suit slows down if powered.
var/vision_restriction
var/offline_vision_restriction = 1 // 0 - none, 1 - welder vision, 2 - blind. Maybe move this to helmets.
var/airtight = 1 //If set, will adjust AIRTIGHT and STOPSPRESSUREDMAGE flags on components. Otherwise it should leave them untouched.
@@ -80,7 +82,7 @@
// Wiring! How exciting.
var/datum/wires/rig/wires
- var/datum/effect/system/spark_spread/spark_system
+ var/datum/effect_system/spark_spread/spark_system
/obj/item/weapon/rig/examine()
to_chat(usr, "This is [bicon(src)][src.name].")
@@ -108,7 +110,7 @@
spark_system.set_up(5, 0, src)
spark_system.attach(src)
- processing_objects |= src
+ processing_objects.Add(src)
if(initial_modules && initial_modules.len)
for(var/path in initial_modules)
@@ -164,7 +166,7 @@
if(istype(M))
M.unEquip(piece)
qdel(piece)
- processing_objects -= src
+ processing_objects.Remove(src)
QDEL_NULL(wires)
QDEL_NULL(spark_system)
return ..()
@@ -438,6 +440,15 @@
M.unEquip(piece)
piece.forceMove(src)
+ if(cell && cell.charge > 0 && electrified > 0)
+ electrified--
+
+ if(malfunction_delay > 0)
+ malfunction_delay--
+ else if(malfunctioning)
+ malfunctioning--
+ malfunction()
+
if(!istype(wearer) || loc != wearer || wearer.back != src || !(flags & NODROP) || !cell || cell.charge <= 0)
if(!cell || cell.charge <= 0)
if(electrified > 0)
@@ -462,7 +473,7 @@
offline = 0
if(istype(wearer) && !wearer.wearing_rig)
wearer.wearing_rig = src
- chest.slowdown = initial(slowdown)
+ chest.slowdown = active_slowdown
if(offline)
if(offline == 1)
@@ -472,14 +483,6 @@
chest.slowdown = offline_slowdown
return
- if(cell && cell.charge > 0 && electrified > 0)
- electrified--
-
- if(malfunction_delay > 0)
- malfunction_delay--
- else if(malfunctioning)
- malfunctioning--
- malfunction()
for(var/obj/item/rig_module/module in installed_modules)
cell.use(module.process()*10)
@@ -721,6 +724,12 @@
if(isliving(uneq_piece.loc))
var/mob/living/L = uneq_piece.loc
L.unEquip(uneq_piece, 1)
+ if(uneq_piece == boots)
+ if(under_boots)
+ if(L.equip_to_slot_if_possible(under_boots, slot_shoes))
+ under_boots = null
+ else
+ to_chat(user, "Somehow, your [under_boots] got stuck to the [boots], and were retracted with them. ((This shouldn't happen, bug report this.))")
uneq_piece.forceMove(src)
return 0
@@ -767,7 +776,12 @@
if(to_strip)
to_strip.unEquip(use_obj, 1)
-
+ if(use_obj == boots)
+ if(under_boots)
+ if(to_strip.equip_to_slot_if_possible(under_boots, slot_shoes))
+ under_boots = null
+ else
+ to_chat(user, "Somehow, your [under_boots] got stuck to the [boots], and were retracted with them. ((This shouldn't happen, bug report this.))")
use_obj.forceMove(src)
if(wearer)
to_chat(wearer, "Your [use_obj] [use_obj.gender == PLURAL ? "retract" : "retracts"] swiftly.")
@@ -775,8 +789,13 @@
else if(deploy_mode != ONLY_RETRACT)
if(check_slot)
if(check_slot != use_obj) //If use_obj is already in check_slot, silently bail. Otherwise, tell the user why the part didn't deploy.
- to_chat(wearer, "You are unable to deploy \the [piece] as \the [check_slot] [check_slot.gender == PLURAL ? "are" : "is"] in the way.")
- return
+ if(use_obj == boots)
+ under_boots = check_slot
+ wearer.unEquip(under_boots)
+ under_boots.forceMove(src)
+ else
+ to_chat(wearer, "You are unable to deploy \the [piece] as \the [check_slot] [check_slot.gender == PLURAL ? "are" : "is"] in the way.")
+ return
use_obj.forceMove(wearer)
if(!wearer.equip_to_slot_if_possible(use_obj, equip_to, 0, 1))
use_obj.forceMove(src)
@@ -798,9 +817,9 @@
if(gloves && wearer.gloves && wearer.gloves != gloves)
to_chat(user, "\The [wearer.gloves] is preventing \the [src] from deploying!")
return 0
- if(boots && wearer.shoes && wearer.shoes != boots)
+ /*if(boots && wearer.shoes && wearer.shoes != boots)
to_chat(user, "\The [wearer.shoes] is preventing \the [src] from deploying!")
- return 0
+ return 0*/
if(chest && wearer.wear_suit && wearer.wear_suit != chest)
to_chat(user, "\The [wearer.wear_suit] is preventing \the [src] from deploying!")
return 0
@@ -836,10 +855,11 @@
take_hit((100/severity_class), "electrical pulse", 1)
/obj/item/weapon/rig/proc/shock(mob/user)
- if(electrocute_mob(user, cell, src)) //electrocute_mob() handles removing charge from the cell, no need to do that here.
- spark_system.start()
- if(user.stunned)
- return 1
+ if(get_dist(src, user) <= 1) //Needs to be adjecant to the rig to get shocked.
+ if(electrocute_mob(user, cell, src)) //electrocute_mob() handles removing charge from the cell, no need to do that here.
+ spark_system.start()
+ if(user.stunned)
+ return 1
return 0
/obj/item/weapon/rig/proc/take_hit(damage, source, is_emp=0)
diff --git a/code/modules/clothing/spacesuits/rig/rig_wiring.dm b/code/modules/clothing/spacesuits/rig/rig_wiring.dm
index 98f8a137028..11118699b13 100644
--- a/code/modules/clothing/spacesuits/rig/rig_wiring.dm
+++ b/code/modules/clothing/spacesuits/rig/rig_wiring.dm
@@ -50,8 +50,21 @@
rig.electrified = 30
rig.shock(usr,100)
+/datum/wires/rig/GetWireName(index)
+ switch(index)
+ if(RIG_SECURITY)
+ return "ID check"
+ if(RIG_AI_OVERRIDE)
+ return "AI control"
+ if(RIG_SYSTEM_CONTROL)
+ return "System control"
+ if(RIG_INTERFACE_LOCK)
+ return "Interface lock"
+ if(RIG_INTERFACE_SHOCK)
+ return "Electrification"
+
/datum/wires/rig/CanUse(var/mob/living/L)
var/obj/item/weapon/rig/rig = holder
if(rig.open)
return 1
- return 0
\ No newline at end of file
+ return 0
diff --git a/code/modules/clothing/spacesuits/rig/suits/alien.dm b/code/modules/clothing/spacesuits/rig/suits/alien.dm
index 27724fa0749..9d6bb86e8cd 100644
--- a/code/modules/clothing/spacesuits/rig/suits/alien.dm
+++ b/code/modules/clothing/spacesuits/rig/suits/alien.dm
@@ -5,7 +5,7 @@
icon_state = "breacher_rig_cheap"
armor = list(melee = 30, bullet = 30, laser = 30, energy = 30, bomb = 45, bio = 100, rad = 50)
emp_protection = -20
- slowdown = 6
+ active_slowdown = 6
offline_slowdown = 10
vision_restriction = 1
offline_vision_restriction = 2
@@ -43,4 +43,4 @@
species_restricted = list("Unathi")
sprite_sheets = list(
"Unathi" = 'icons/mob/species/unathi/feet.dmi'
- )
\ No newline at end of file
+ )
diff --git a/code/modules/clothing/spacesuits/rig/suits/combat.dm b/code/modules/clothing/spacesuits/rig/suits/combat.dm
index 98adb708ada..988d746d4ad 100644
--- a/code/modules/clothing/spacesuits/rig/suits/combat.dm
+++ b/code/modules/clothing/spacesuits/rig/suits/combat.dm
@@ -6,7 +6,7 @@
icon_state = "security_rig"
suit_type = "combat hardsuit"
armor = list(melee = 80, bullet = 80, laser = 50, energy = 50, bomb = 100, bio = 100, rad = 100)
- slowdown = 1
+ active_slowdown = 1
offline_slowdown = 3
offline_vision_restriction = 1
@@ -25,4 +25,4 @@
// /obj/item/rig_module/power_sink,
/obj/item/rig_module/electrowarfare_suite,
/obj/item/rig_module/chem_dispenser/combat
- )
\ No newline at end of file
+ )
diff --git a/code/modules/clothing/spacesuits/rig/suits/light.dm b/code/modules/clothing/spacesuits/rig/suits/light.dm
index 2a38480dabc..8c8384b32fc 100644
--- a/code/modules/clothing/spacesuits/rig/suits/light.dm
+++ b/code/modules/clothing/spacesuits/rig/suits/light.dm
@@ -6,7 +6,7 @@
suit_type = "light suit"
allowed = list(/obj/item/weapon/gun,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/tank,/obj/item/weapon/stock_parts/cell)
emp_protection = 10
- slowdown = 0
+ active_slowdown = 0
flags = STOPSPRESSUREDMAGE | THICKMATERIAL
offline_slowdown = 0
offline_vision_restriction = 0
@@ -77,7 +77,7 @@
icon_state = "ninja_rig"
armor = list(melee = 50, bullet = 15, laser = 30, energy = 10, bomb = 25, bio = 100, rad = 30)
emp_protection = 40 //change this to 30 if too high.
- slowdown = 0
+ active_slowdown = 0
chest_type = /obj/item/clothing/suit/space/new_rig/light/ninja
glove_type = /obj/item/clothing/gloves/rig/light/ninja
diff --git a/code/modules/clothing/spacesuits/rig/suits/merc.dm b/code/modules/clothing/spacesuits/rig/suits/merc.dm
index a7512231641..73e9638ac83 100644
--- a/code/modules/clothing/spacesuits/rig/suits/merc.dm
+++ b/code/modules/clothing/spacesuits/rig/suits/merc.dm
@@ -6,7 +6,7 @@
icon_state = "merc_rig"
suit_type = "crimson hardsuit"
armor = list(melee = 40, bullet = 50, laser = 30, energy = 15, bomb = 35, bio = 100, rad = 50)
- slowdown = 1
+ active_slowdown = 1
offline_slowdown = 3
offline_vision_restriction = 1
@@ -29,4 +29,4 @@
initial_modules = list(
/obj/item/rig_module/ai_container,
/obj/item/rig_module/electrowarfare_suite, //might as well
- )
\ No newline at end of file
+ )
diff --git a/code/modules/clothing/spacesuits/rig/suits/station.dm b/code/modules/clothing/spacesuits/rig/suits/station.dm
index 966f54973bc..665eae30cf7 100644
--- a/code/modules/clothing/spacesuits/rig/suits/station.dm
+++ b/code/modules/clothing/spacesuits/rig/suits/station.dm
@@ -17,7 +17,7 @@
icon_state = "internalaffairs_rig"
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
siemens_coefficient = 0.9
- slowdown = 0
+ active_slowdown = 0
offline_slowdown = 0
offline_vision_restriction = 0
@@ -52,7 +52,7 @@
desc = "A heavy, powerful rig used by construction crews and mining corporations."
icon_state = "engineering_rig"
armor = list(melee = 10, bullet = 5, laser = 10, energy = 5, bomb = 10, bio = 100, rad = 75)
- slowdown = 3
+ active_slowdown = 3
offline_slowdown = 10
offline_vision_restriction = 2
emp_protection = -20
@@ -80,7 +80,7 @@
suit_type = "EVA hardsuit"
desc = "A light rig for repairs and maintenance to the outside of habitats and vessels."
icon_state = "eva_rig"
- slowdown = 0
+ active_slowdown = 0
offline_slowdown = 1
offline_vision_restriction = 1
@@ -108,7 +108,7 @@
desc = "An advanced voidsuit that protects against hazardous, low pressure environments. Shines with a high polish."
icon_state = "ce_rig"
armor = list(melee = 40, bullet = 5, laser = 10, energy = 5, bomb = 50, bio = 100, rad = 90)
- slowdown = 0
+ active_slowdown = 0
offline_slowdown = 0
offline_vision_restriction = 0
@@ -149,7 +149,7 @@
suit_type = "hazmat hardsuit"
desc = "An Anomalous Material Interaction hardsuit that protects against the strangest energies the universe can throw at it."
icon_state = "science_rig"
- slowdown = 1
+ active_slowdown = 1
offline_vision_restriction = 1
helm_type = /obj/item/clothing/head/helmet/space/new_rig/hazmat
@@ -176,7 +176,7 @@
desc = "A durable suit designed for medical rescue in high risk areas."
icon_state = "medical_rig"
armor = list(melee = 10, bullet = 5, laser = 10, energy = 5, bomb = 10, bio = 100, rad = 50)
- slowdown = 1
+ active_slowdown = 1
offline_vision_restriction = 1
helm_type = /obj/item/clothing/head/helmet/space/new_rig/medical
@@ -201,7 +201,7 @@
desc = "A Security hardsuit designed for prolonged EVA in dangerous environments."
icon_state = "hazard_rig"
armor = list(melee = 30, bullet = 15, laser = 30, energy = 10, bomb = 10, bio = 100, rad = 50)
- slowdown = 1
+ active_slowdown = 1
offline_slowdown = 3
offline_vision_restriction = 1
@@ -220,4 +220,4 @@
/obj/item/rig_module/maneuvering_jets,
/obj/item/rig_module/grenade_launcher,
/obj/item/rig_module/mounted/taser
- )
\ No newline at end of file
+ )
diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm
index 65a47cc8338..2237ce8d7db 100644
--- a/code/modules/clothing/under/accessories/accessory.dm
+++ b/code/modules/clothing/under/accessories/accessory.dm
@@ -136,7 +136,7 @@
user.visible_message("[user] places \the [src] against [M]'s chest and listens attentively.", "You place \the [src] against [M]'s chest...")
var/obj/item/organ/internal/H = M.get_int_organ(/obj/item/organ/internal/heart)
var/obj/item/organ/internal/L = M.get_int_organ(/obj/item/organ/internal/lungs)
- if((H && M.pulse) || (L && !(NO_BREATH in M.mutations) && !(NO_BREATH in M.species.species_traits)))
+ if((H && M.pulse) || (L && !(BREATHLESS in M.mutations) && !(NO_BREATHE in M.species.species_traits)))
var/color = "notice"
if(H)
var/heart_sound
diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm
index 34435e5d66c..95ae68dcd26 100644
--- a/code/modules/clothing/under/miscellaneous.dm
+++ b/code/modules/clothing/under/miscellaneous.dm
@@ -751,11 +751,12 @@
item_state = "noble_clothes"
/obj/item/clothing/under/contortionist
- name = "Contortionist's Jumpsuit"
+ name = "atmospheric technician's jumpsuit"
desc = "A light jumpsuit useful for squeezing through narrow vents."
icon_state = "atmos"
item_state = "atmos_suit"
item_color = "atmos"
+ burn_state = FIRE_PROOF
/obj/item/clothing/under/contortionist/equipped(mob/living/carbon/human/user, slot)
if(!user.ventcrawler)
diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm
index 348a9178721..28ad9f57154 100644
--- a/code/modules/customitems/item_defines.dm
+++ b/code/modules/customitems/item_defines.dm
@@ -749,6 +749,19 @@
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
icon_state = "dusty_jacket"
+/obj/item/clothing/suit/fluff/supplymaster_jacket //Denthamos: Henry Grandpa Gadow
+ name = "faded NT Supply Master's Coat"
+ desc = "A faded leather overcoat bearing a worn out badge from the NAS Crescent on the shoulder, and a designation tag of Supply Master on the front. A tarnished gold nameplate says H.Gadow on it."
+ icon_state = "supplymaster_jacket_open"
+ item_state = "supplymaster_jacket_open"
+ ignore_suitadjust = 0
+ suit_adjusted = 1
+ allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen,/obj/item/toy,/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/lighter)
+ body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
+ cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS
+ actions_types = list(/datum/action/item_action/button)
+ adjust_flavour = "unbutton"
+
/obj/item/clothing/suit/storage/labcoat/fluff/aeneas_rinil //Socialsystem: Lynn Fea
name = "Robotics labcoat"
desc = "A labcoat with a few markings denoting it as the labcoat of roboticist."
@@ -1232,4 +1245,20 @@
righthand_file = 'icons/mob/inhands/fluff_righthand.dmi'
icon_state = "sheetcosmos"
item_state = "sheetcosmos"
- item_color = "sheetcosmos"
\ No newline at end of file
+ item_color = "sheetcosmos"
+
+
+/obj/item/clothing/head/fluff/lfbowler //Lightfire: Hyperion
+ name = "Classy bowler hat"
+ desc = "a very classy looking bowler hat"
+ icon = 'icons/obj/custom_items.dmi'
+ icon_state = "bowler_lightfire"
+
+/obj/item/clothing/under/fluff/lfvicsuit //Lightfire: Hyperion
+ name = "Classy victorian suit"
+ desc = "A blue and black victorian suit with silver buttons, very fancy!"
+ icon = 'icons/obj/custom_items.dmi'
+ icon_state = "victorianlightfire"
+ item_state = "victorianvest"
+ item_color = "victorianlightfire"
+ displays_id = FALSE
diff --git a/code/modules/economy/ATM.dm b/code/modules/economy/ATM.dm
index 40f258b0c2a..3470302c057 100644
--- a/code/modules/economy/ATM.dm
+++ b/code/modules/economy/ATM.dm
@@ -81,6 +81,9 @@ log transactions
/obj/machinery/atm/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/weapon/card))
+ if(!powered())
+ return
+
if(!held_card)
user.drop_item()
I.forceMove(src)
@@ -91,6 +94,8 @@ log transactions
else if(authenticated_account)
if(istype(I, /obj/item/stack/spacecash))
//consume the money
+ if(!powered())
+ return
var/obj/item/stack/spacecash/C = I
authenticated_account.money += C.amount
playsound(loc, pick('sound/items/polaroid1.ogg', 'sound/items/polaroid2.ogg'), 50, 1)
@@ -118,7 +123,7 @@ log transactions
to_chat(user, "Artificial unit recognized. Artificial units do not currently receive monetary compensation, as per Nanotrasen regulation #1005.")
return
ui_interact(user)
-
+
/obj/machinery/atm/attack_ghost(mob/user)
ui_interact(user)
diff --git a/code/modules/economy/Accounts.dm b/code/modules/economy/Accounts.dm
index 620396f7da2..c43f14d1283 100644
--- a/code/modules/economy/Accounts.dm
+++ b/code/modules/economy/Accounts.dm
@@ -72,8 +72,8 @@ var/global/list/all_money_accounts = list()
T.amount = starting_funds
if(!source_db)
//set a random date, time and location some time over the past few decades
- T.date = "[num2text(rand(1,31))] [pick("January","February","March","April","May","June","July","August","September","October","November","December")], 25[rand(10,56)]"
- T.time = "[rand(0,24)]:[rand(11,59)]"
+ T.date = "[num2text(rand(1,31))] [pick(month_names)], [rand(game_year - 20,game_year - 1)]"
+ T.time = "[rand(0,23)]:[rand(0,59)]"
T.source_terminal = "NTGalaxyNet Terminal #[rand(111,1111)]"
M.account_number = rand(111111, 999999)
diff --git a/code/modules/economy/Accounts_DB.dm b/code/modules/economy/Accounts_DB.dm
index 1c9291083d7..a2bb2552824 100644
--- a/code/modules/economy/Accounts_DB.dm
+++ b/code/modules/economy/Accounts_DB.dm
@@ -55,7 +55,7 @@
vendor_account = department_accounts["Vendor"]
if(!current_date_string)
- current_date_string = "[num2text(rand(1,31))] [pick("January","February","March","April","May","June","July","August","September","October","November","December")], 2557"
+ current_date_string = "[time2text(world.timeofday, "DD MM")], [game_year]"
machine_id = "[station_name()] Acc. DB #[num_financial_terminals++]"
..()
diff --git a/code/modules/events/rogue_drones.dm b/code/modules/events/rogue_drones.dm
index 3a770bf7864..6be28375305 100644
--- a/code/modules/events/rogue_drones.dm
+++ b/code/modules/events/rogue_drones.dm
@@ -38,7 +38,7 @@
/datum/event/rogue_drone/end()
var/num_recovered = 0
for(var/mob/living/simple_animal/hostile/retaliate/malf_drone/D in drones_list)
- var/datum/effect/system/spark_spread/sparks = new /datum/effect/system/spark_spread()
+ var/datum/effect_system/spark_spread/sparks = new /datum/effect_system/spark_spread()
sparks.set_up(3, 0, D.loc)
sparks.start()
D.z = level_name_to_num(CENTCOMM)
diff --git a/code/modules/events/vent_clog.dm b/code/modules/events/vent_clog.dm
index 137ffc83183..564194f413b 100644
--- a/code/modules/events/vent_clog.dm
+++ b/code/modules/events/vent_clog.dm
@@ -22,13 +22,13 @@
var/list/gunk = list("water","carbon","flour","radium","toxin","cleaner","nutriment","condensedcapsaicin","psilocybin","lube",
"atrazine","banana","charcoal","space_drugs","methamphetamine","holywater","ethanol","hot_coco","facid",
"blood","morphine","ether","fluorine","mutadone","mutagen","hydrocodone","fuel",
- "haloperidol","lsd","nanites","lipolicide","frostoil","salglu_solution","beepskysmash",
- "omnizine", "amanitin", "adminordrazine", "neurotoxin", "synaptizine")
+ "haloperidol","lsd","syndicate_nanites","lipolicide","frostoil","salglu_solution","beepskysmash",
+ "omnizine", "amanitin", "neurotoxin", "synaptizine")
var/datum/reagents/R = new/datum/reagents(50)
R.my_atom = vent
R.add_reagent(pick(gunk), 50)
- var/datum/effect/system/chem_smoke_spread/smoke = new
+ var/datum/effect_system/smoke_spread/chem/smoke = new
smoke.set_up(R, rand(1, 2), 0, vent, 0, silent = 1)
playsound(vent.loc, 'sound/effects/smoke.ogg', 50, 1, -3)
smoke.start(3)
diff --git a/code/modules/fancytitle/fancytitle.dm b/code/modules/fancytitle/fancytitle.dm
index e445024aae1..e85f1f59ec5 100644
--- a/code/modules/fancytitle/fancytitle.dm
+++ b/code/modules/fancytitle/fancytitle.dm
@@ -11,7 +11,7 @@
else if(L.len > 1)
if(use_rare_screens && lowertext(L[1]) == "rare")
title_screens += S
- else if(lowertext(L[1]) == lowertext(MAP_NAME))
+ else if(using_map && (lowertext(L[1]) == lowertext(using_map.name)))
title_screens += S
if(!isemptylist(title_screens))
diff --git a/code/modules/fish/fishtank.dm b/code/modules/fish/fishtank.dm
index 85ec9f292c4..1b5294867d4 100644
--- a/code/modules/fish/fishtank.dm
+++ b/code/modules/fish/fishtank.dm
@@ -523,7 +523,7 @@
if(water_level && prob(45)) //If there is water, there is a chance the cat will slip, Syndicat will spark like E-N when this happens
M.visible_message("[M.name] slipped and got soaked!", "You slipped and got soaked!")
if(istype(M, /mob/living/simple_animal/pet/cat/Syndi))
- var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
+ var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
s.set_up(3, 1, src)
s.start()
else //No water or didn't slip, get that fish!
diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm
index 64bb91a9db4..d180bb9c2ac 100644
--- a/code/modules/flufftext/Hallucination.dm
+++ b/code/modules/flufftext/Hallucination.dm
@@ -149,7 +149,7 @@ Gunshots/explosions/opening doors/less rare audio (done)
qdel(src)
Expand()
if((get_turf(target) in flood_turfs) && !target.internal)
- target.hallucinate("fake_alert", "tox_in_air")
+ target.hallucinate("fake_alert", "too_much_tox")
next_expand = world.time + FAKE_FLOOD_EXPAND_TIME
/obj/effect/hallucination/fake_flood/proc/Expand()
@@ -890,12 +890,12 @@ var/list/non_fakeattack_weapons = list(/obj/item/weapon/gun/projectile, /obj/ite
sleep(rand(100,250))
hal_screwyhud = SCREWYHUD_NONE
if("fake_alert")
- var/alert_type = pick("oxy","not_enough_tox","not_enough_co2","too_much_oxy","too_much_co2","tox_in_air","newlaw","nutrition","charge","weightless","fire","locked","hacked","temp","pressure")
+ var/alert_type = pick("not_enough_oxy","not_enough_tox","not_enough_co2","too_much_oxy","too_much_co2","too_much_tox","newlaw","nutrition","charge","weightless","fire","locked","hacked","temp","pressure")
if(specific)
alert_type = specific
switch(alert_type)
- if("oxy")
- throw_alert("oxy", /obj/screen/alert/oxy, override = TRUE)
+ if("not_enough_oxy")
+ throw_alert("not_enough_oxy", /obj/screen/alert/not_enough_oxy, override = TRUE)
if("not_enough_tox")
throw_alert("not_enough_tox", /obj/screen/alert/not_enough_tox, override = TRUE)
if("not_enough_co2")
@@ -904,8 +904,8 @@ var/list/non_fakeattack_weapons = list(/obj/item/weapon/gun/projectile, /obj/ite
throw_alert("too_much_oxy", /obj/screen/alert/too_much_oxy, override = TRUE)
if("too_much_co2")
throw_alert("too_much_co2", /obj/screen/alert/too_much_co2, override = TRUE)
- if("tox_in_air")
- throw_alert("tox_in_air", /obj/screen/alert/tox_in_air, override = TRUE)
+ if("too_much_tox")
+ throw_alert("too_much_tox", /obj/screen/alert/too_much_tox, override = TRUE)
if("nutrition")
if(prob(50))
throw_alert("nutrition", /obj/screen/alert/fat, override = TRUE)
diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm
index e9dcf825aad..c25e5c5a5d3 100644
--- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm
+++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm
@@ -283,6 +283,14 @@
isGlass = 0
list_reagents = list("limejuice" = 100)
+/obj/item/weapon/reagent_containers/food/drinks/bottle/milk
+ name = "Milk"
+ desc = "Soothing milk."
+ icon_state = "milk"
+ item_state = "carton"
+ isGlass = 0
+ list_reagents = list("milk" = 100)
+
////////////////////////// MOLOTOV ///////////////////////
/obj/item/weapon/reagent_containers/food/drinks/bottle/molotov
name = "molotov cocktail"
diff --git a/code/modules/food_and_drinks/food/snacks.dm b/code/modules/food_and_drinks/food/snacks.dm
index 394bce27908..5643185bfb5 100644
--- a/code/modules/food_and_drinks/food/snacks.dm
+++ b/code/modules/food_and_drinks/food/snacks.dm
@@ -24,7 +24,7 @@
if(!reagents.total_volume)
if(M == user)
to_chat(user, "You finish eating \the [src].")
- user.visible_message("[user] finishes eating \the [src].")
+ user.visible_message("[M] finishes eating \the [src].")
user.unEquip(src) //so icons update :[
Post_Consume(M)
var/obj/item/trash_item = generate_trash(usr)
diff --git a/code/modules/food_and_drinks/kitchen_machinery/cooker.dm b/code/modules/food_and_drinks/kitchen_machinery/cooker.dm
index 1c8db0d9b20..ac82fa9743d 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/cooker.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/cooker.dm
@@ -66,7 +66,7 @@
var/obj/item/weapon/reagent_containers/food/snacks/badrecipe/burnt = new(get_turf(src))
setRegents(props, burnt)
to_chat(user, "You smell burning coming from the [src]!")
- var/datum/effect/system/bad_smoke_spread/smoke = new /datum/effect/system/bad_smoke_spread() // burning things makes smoke!
+ var/datum/effect_system/smoke_spread/bad/smoke = new // burning things makes smoke!
smoke.set_up(5, 0, src)
smoke.start()
if(prob(firechance))
diff --git a/code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm b/code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm
index e09198cb4e9..289a4c66d4c 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm
@@ -364,7 +364,7 @@
updateUsrDialog()
/obj/machinery/kitchen_machine/proc/broke()
- var/datum/effect/system/spark_spread/s = new
+ var/datum/effect_system/spark_spread/s = new
s.set_up(2, 1, src)
s.start()
icon_state = broken_icon // Make it look all busted up and shit
diff --git a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
index 6b8d9cebd26..966b5c3f4de 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
@@ -429,9 +429,9 @@
component_parts.Cut()
component_parts = null
-/obj/machinery/smartfridge/drying_rack/Destroy()
+/obj/machinery/smartfridge/drying_rack/on_deconstruction()
new /obj/item/stack/sheet/wood(loc, 10)
- return ..()
+ ..()
/obj/machinery/smartfridge/drying_rack/RefreshParts()
return
diff --git a/code/modules/food_and_drinks/recipes/recipes_microwave.dm b/code/modules/food_and_drinks/recipes/recipes_microwave.dm
index 329e39011eb..e1cf097e9d0 100644
--- a/code/modules/food_and_drinks/recipes/recipes_microwave.dm
+++ b/code/modules/food_and_drinks/recipes/recipes_microwave.dm
@@ -270,7 +270,7 @@
result = /obj/item/weapon/reagent_containers/food/snacks/bigbiteburger
/datum/recipe/microwave/enchiladas
- items = list(/obj/item/weapon/reagent_containers/food/snacks/cutlet, /obj/item/weapon/reagent_containers/food/snacks/grown/chili, /obj/item/weapon/reagent_containers/food/snacks/grown/corn)
+ items = list(/obj/item/weapon/reagent_containers/food/snacks/cutlet, /obj/item/weapon/reagent_containers/food/snacks/grown/chili, /obj/item/weapon/reagent_containers/food/snacks/grown/chili, /obj/item/weapon/reagent_containers/food/snacks/grown/corn)
result = /obj/item/weapon/reagent_containers/food/snacks/enchiladas
/datum/recipe/microwave/burrito
diff --git a/code/modules/hydroponics/grown/nettle.dm b/code/modules/hydroponics/grown/nettle.dm
index 52f60d06b18..b6ae3ee3508 100644
--- a/code/modules/hydroponics/grown/nettle.dm
+++ b/code/modules/hydroponics/grown/nettle.dm
@@ -57,7 +57,7 @@
var/organ = ((H.hand ? "l_":"r_") + "arm")
var/obj/item/organ/external/affecting = H.get_organ(organ)
if(affecting)
- if(affecting.take_damage(0, force))
+ if(affecting.receive_damage(0, force))
H.UpdateDamageIcon()
to_chat(H, "The nettle burns your bare hand!")
return 1
diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm
index 6c5b1b0adf1..8f95d7741ea 100644
--- a/code/modules/hydroponics/hydroponics.dm
+++ b/code/modules/hydroponics/hydroponics.dm
@@ -1,5 +1,3 @@
-#define HYDRO_CYCLES_PER_AGE 2 //Adjust this to adjust how many hydroponics cycles it takes to increase age. Positive integers only.
-
/obj/machinery/hydroponics
name = "hydroponics tray"
icon = 'icons/obj/hydroponics/equipment.dmi'
@@ -22,7 +20,6 @@
var/lastproduce = 0 //Last time it was harvested
var/lastcycle = 0 //Used for timing of cycles.
var/cycledelay = 200 //About 10 seconds / cycle
- var/current_cycle = 0 //Used for tracking when to age
var/harvest = 0 //Ready to harvest?
var/obj/item/seeds/myseed = null //The currently planted seed
var/rating = 1
@@ -155,10 +152,7 @@
lastcycle = world.time
if(myseed && !dead)
// Advance age
- current_cycle++
- if(current_cycle == HYDRO_CYCLES_PER_AGE)
- age++
- current_cycle = 0
+ age++
if(age < myseed.maturation)
lastproduce = age
@@ -710,7 +704,7 @@
adjustPests(rand(2,4))
// FEED ME SEYMOUR
- if(S.has_reagent("strangereagent", 1))
+ if(S.has_reagent("strange_reagent", 1))
spawnplant()
// The best stuff there is. For testing/debugging.
@@ -750,10 +744,13 @@
var/target = myseed ? myseed.plantname : src
var/visi_msg = ""
var/irrigate = 0 //How am I supposed to irrigate pill contents?
+ var/transfer_amount
if(istype(reagent_source, /obj/item/weapon/reagent_containers/food/snacks) || istype(reagent_source, /obj/item/weapon/reagent_containers/food/pill))
visi_msg="[user] composts [reagent_source], spreading it through [target]"
+ transfer_amount = reagent_source.reagents.total_volume
else
+ transfer_amount = reagent_source.amount_per_transfer_from_this
if(istype(reagent_source, /obj/item/weapon/reagent_containers/syringe/))
var/obj/item/weapon/reagent_containers/syringe/syr = reagent_source
visi_msg="[user] injects [target] with [syr]"
@@ -763,14 +760,14 @@
visi_msg="[user] sprays [target] with [reagent_source]"
playsound(loc, 'sound/effects/spray3.ogg', 50, 1, -6)
irrigate = 1
- else if(reagent_source.amount_per_transfer_from_this) // Droppers, cans, beakers, what have you.
+ else if(transfer_amount) // Droppers, cans, beakers, what have you.
visi_msg="[user] uses [reagent_source] on [target]"
irrigate = 1
// Beakers, bottles, buckets, etc. Can't use is_open_container though.
if(istype(reagent_source, /obj/item/weapon/reagent_containers/glass/))
playsound(loc, 'sound/effects/slosh.ogg', 25, 1)
- if(irrigate && reagent_source.amount_per_transfer_from_this > 30 && reagent_source.reagents.total_volume >= 30 && using_irrigation)
+ if(irrigate && transfer_amount > 30 && reagent_source.reagents.total_volume >= 30 && using_irrigation)
trays = FindConnected()
if (trays.len > 1)
visi_msg += ", setting off the irrigation system"
@@ -778,7 +775,7 @@
if(visi_msg)
visible_message("[visi_msg].")
- var/split = round(reagent_source.amount_per_transfer_from_this/trays.len)
+ var/split = round(transfer_amount/trays.len)
for(var/obj/machinery/hydroponics/H in trays)
//cause I don't want to feel like im juggling 15 tamagotchis and I can get to my real work of ripping flooring apart in hopes of validating my life choices of becoming a space-gardener
@@ -1026,5 +1023,3 @@
qdel(src)
else
..()
-
-#undef HYDRO_CYCLES_PER_AGE
diff --git a/code/modules/hydroponics/plant_genes.dm b/code/modules/hydroponics/plant_genes.dm
index efc3d0f594f..1d07a130369 100644
--- a/code/modules/hydroponics/plant_genes.dm
+++ b/code/modules/hydroponics/plant_genes.dm
@@ -402,7 +402,7 @@
name = "gaseous decomposition"
/datum/plant_gene/trait/smoke/on_squash(obj/item/weapon/reagent_containers/food/snacks/grown/G, atom/target)
- var/datum/effect/system/chem_smoke_spread/S = new
+ var/datum/effect_system/smoke_spread/chem/S = new
var/splat_location = get_turf(target)
var/smoke_amount = round(sqrt(G.seed.potency * 0.1), 1)
S.attach(splat_location)
diff --git a/code/modules/map_fluff/cyberiad.dm b/code/modules/map_fluff/cyberiad.dm
new file mode 100644
index 00000000000..e0865f6fb1d
--- /dev/null
+++ b/code/modules/map_fluff/cyberiad.dm
@@ -0,0 +1,10 @@
+/datum/map/cyberiad
+ name = "Cyberiad"
+ full_name = "NSS Cyberiad"
+
+ station_name = "NSS Cyberiad"
+ station_short = "Cyberiad"
+ dock_name = "NAS Trurl"
+ company_name = "Nanotrasen"
+ company_short = "NT"
+ starsys_name = "Epsilon Eridani "
diff --git a/code/modules/map_fluff/maps.dm b/code/modules/map_fluff/maps.dm
new file mode 100644
index 00000000000..638baffde73
--- /dev/null
+++ b/code/modules/map_fluff/maps.dm
@@ -0,0 +1,12 @@
+var/datum/map/using_map = new USING_MAP_DATUM
+
+/datum/map
+ var/name = "Unnamed Map"
+ var/full_name = "Unnamed Map"
+
+ var/station_name = "BAD Station"
+ var/station_short = "Baddy"
+ var/dock_name = "THE PirateBay"
+ var/company_name = "BadMan"
+ var/company_short = "BM"
+ var/starsys_name = "Dull Star"
\ No newline at end of file
diff --git a/code/modules/map_fluff/metastation.dm b/code/modules/map_fluff/metastation.dm
new file mode 100644
index 00000000000..a8714b5cb19
--- /dev/null
+++ b/code/modules/map_fluff/metastation.dm
@@ -0,0 +1,10 @@
+/datum/map/metastation
+ name = "MetaStation"
+ full_name = "NSS Cerebron"
+
+ station_name = "NSS Cerebron"
+ station_short = "Cerebron"
+ dock_name = "NAS Trurl"
+ company_name = "Nanotrasen"
+ company_short = "NT"
+ starsys_name = "Epsilon Eridani "
diff --git a/code/modules/martial_arts/mimejutsu.dm b/code/modules/martial_arts/mimejutsu.dm
index ef0826d49a1..01acec88a88 100644
--- a/code/modules/martial_arts/mimejutsu.dm
+++ b/code/modules/martial_arts/mimejutsu.dm
@@ -47,7 +47,7 @@
D.visible_message("[A] throws an invisible smoke bomb!!")
- var/datum/effect/system/bad_smoke_spread/smoke = new /datum/effect/system/bad_smoke_spread()
+ var/datum/effect_system/smoke_spread/bad/smoke = new
smoke.set_up(5, 0, D.loc)
smoke.start()
diff --git a/code/modules/mining/equipment_locker.dm b/code/modules/mining/equipment_locker.dm
index 541961e5297..700803792e2 100644
--- a/code/modules/mining/equipment_locker.dm
+++ b/code/modules/mining/equipment_locker.dm
@@ -278,7 +278,7 @@
updateUsrDialog()
/obj/machinery/mineral/ore_redemption/ex_act(severity, target)
- var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
+ var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
s.set_up(5, 1, src)
s.start()
if(severity == 1)
@@ -506,7 +506,7 @@
qdel(voucher)
/obj/machinery/mineral/equipment_vendor/ex_act(severity, target)
- var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
+ var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
s.set_up(5, 1, src)
s.start()
if(prob(50 / severity) && severity < 3)
@@ -562,7 +562,7 @@
/obj/item/device/wormhole_jaunter/attack_self(mob/user)
var/turf/device_turf = get_turf(user)
- if(!device_turf||is_teleport_allowed(device_turf.z))
+ if(!device_turf || !is_teleport_allowed(device_turf.z))
to_chat(user, "You're having difficulties getting the [src.name] to work.")
return
else
@@ -906,10 +906,10 @@
minerals += M
if(minerals.len)
for(var/turf/simulated/mineral/M in minerals)
- var/obj/effect/overlay/temp/mining_overlay/C = new/obj/effect/overlay/temp/mining_overlay(M)
+ var/obj/effect/temp_visual/mining_overlay/C = new/obj/effect/temp_visual/mining_overlay(M)
C.icon_state = M.scan_state
-/obj/effect/overlay/temp/mining_overlay
+/obj/effect/temp_visual/mining_overlay
layer = 18
icon = 'icons/turf/mining.dmi'
anchored = 1
@@ -1009,7 +1009,7 @@
var/target_turf = get_turf(target)
if(istype(target_turf, /turf/simulated/mineral))
var/turf/simulated/mineral/M = target_turf
- new /obj/effect/overlay/temp/kinetic_blast(M)
+ new /obj/effect/temp_visual/kinetic_blast(M)
M.gets_drilled(firer)
..()
@@ -1035,7 +1035,7 @@
return
if(proximity_flag && target == mark && isliving(target))
var/mob/living/L = target
- new /obj/effect/overlay/temp/kinetic_blast(get_turf(L))
+ new /obj/effect/temp_visual/kinetic_blast(get_turf(L))
mark = 0
if(L.mob_size >= MOB_SIZE_LARGE)
L.underlays -= marked_image
diff --git a/code/modules/mining/lavaland/loot/ashdragon_loot.dm b/code/modules/mining/lavaland/loot/ashdragon_loot.dm
index c3b43e06d6f..176cbbcc66b 100644
--- a/code/modules/mining/lavaland/loot/ashdragon_loot.dm
+++ b/code/modules/mining/lavaland/loot/ashdragon_loot.dm
@@ -189,7 +189,7 @@
if(!istype(T))
return
if(!istype(T, turf_type))
- var/obj/effect/overlay/temp/lavastaff/L = new /obj/effect/overlay/temp/lavastaff(T)
+ var/obj/effect/temp_visual/lavastaff/L = new /obj/effect/temp_visual/lavastaff(T)
L.alpha = 0
animate(L, alpha = 255, time = create_delay)
user.visible_message("[user] points [src] at [T]!")
@@ -211,6 +211,6 @@
timer = world.time + reset_cooldown
playsound(T,'sound/magic/Fireball.ogg', 200, 1)
-/obj/effect/overlay/temp/lavastaff
+/obj/effect/temp_visual/lavastaff
icon_state = "lavastaff_warn"
duration = 50
diff --git a/code/modules/mining/lavaland/loot/colossus_loot.dm b/code/modules/mining/lavaland/loot/colossus_loot.dm
index fc950b429d2..c1d8d2bdfde 100644
--- a/code/modules/mining/lavaland/loot/colossus_loot.dm
+++ b/code/modules/mining/lavaland/loot/colossus_loot.dm
@@ -203,7 +203,7 @@
NewTerrainFloors = /turf/simulated/floor/grass
NewTerrainWalls = /turf/simulated/wall/mineral/sandstone
NewTerrainChairs = /obj/structure/stool/bed/chair/wood/normal
- NewTerrainTables = /obj/structure/table/woodentable
+ NewTerrainTables = /obj/structure/table/wood
NewFlora = list(/obj/structure/flora/ausbushes/sparsegrass, /obj/structure/flora/ausbushes/fernybush, /obj/structure/flora/ausbushes/leafybush,
/obj/structure/flora/ausbushes/grassybush, /obj/structure/flora/ausbushes/sunnybush, /obj/structure/flora/tree/palm, /mob/living/carbon/human/monkey,
/obj/item/weapon/gun/projectile/bow, /obj/item/weapon/storage/backpack/quiver/full)
@@ -284,7 +284,7 @@
if(..())
for(var/i in range(1, src))
if(isturf(i))
- new /obj/effect/overlay/temp/cult/sparks(i)
+ new /obj/effect/temp_visual/cult/sparks(i)
continue
if(ishuman(i))
var/mob/living/carbon/human/H = i
@@ -367,7 +367,7 @@
var/mob/living/L = target
if(L.stat < DEAD)
L.heal_overall_damage(heal_power, heal_power)
- new /obj/effect/overlay/temp/heal(get_turf(target), "#80F5FF")
+ new /obj/effect/temp_visual/heal(get_turf(target), "#80F5FF")
/mob/living/simple_animal/hostile/lightgeist/ghostize()
if(..())
@@ -388,7 +388,7 @@
if(..())
var/list/L = list()
var/turf/T = get_step(src, dir)
- new /obj/effect/overlay/temp/emp/pulse(T)
+ new /obj/effect/temp_visual/emp/pulse(T)
for(var/i in T)
if(istype(i, /obj/item) && !is_type_in_typecache(i, banned_items_typecache))
var/obj/item/W = i
diff --git a/code/modules/mining/lavaland/loot/hierophant_loot.dm b/code/modules/mining/lavaland/loot/hierophant_loot.dm
index e613b2ab276..0c02d3d47cc 100644
--- a/code/modules/mining/lavaland/loot/hierophant_loot.dm
+++ b/code/modules/mining/lavaland/loot/hierophant_loot.dm
@@ -38,7 +38,7 @@
timer = world.time + cooldown_time
if(isliving(target) && chaser_timer <= world.time) //living and chasers off cooldown? fire one!
chaser_timer = world.time + chaser_cooldown
- new /obj/effect/overlay/temp/hierophant/chaser(get_turf(user), user, target, 1.5, friendly_fire_check)
+ new /obj/effect/temp_visual/hierophant/chaser(get_turf(user), user, target, 1.5, friendly_fire_check)
add_logs(user, target, "fired a chaser at", src)
else
spawn(0)
@@ -63,7 +63,7 @@
if(do_after(user, 50, target = user))
var/turf/T = get_turf(user)
playsound(T,'sound/magic/Blind.ogg', 200, 1, -4)
- new /obj/effect/overlay/temp/hierophant/telegraph/teleport(T, user)
+ new /obj/effect/temp_visual/hierophant/telegraph/teleport(T, user)
var/obj/effect/hierophant/H = new/obj/effect/hierophant(T)
rune = H
user.update_action_buttons_icon()
@@ -93,8 +93,8 @@
to_chat(user, "The rune is blocked by something, preventing teleportation!")
user.update_action_buttons_icon()
return
- new /obj/effect/overlay/temp/hierophant/telegraph(T, user)
- new /obj/effect/overlay/temp/hierophant/telegraph(source, user)
+ new /obj/effect/temp_visual/hierophant/telegraph(T, user)
+ new /obj/effect/temp_visual/hierophant/telegraph(source, user)
playsound(T,'sound/magic/blink.ogg', 200, 1)
//playsound(T,'sound/magic/Wand_Teleport.ogg', 200, 1)
playsound(source,'sound/magic/blink.ogg', 200, 1)
@@ -110,13 +110,13 @@
user.update_action_buttons_icon()
return
add_logs(user, rune, "teleported self from ([source.x],[source.y],[source.z]) to")
- new /obj/effect/overlay/temp/hierophant/telegraph/teleport(T, user)
- new /obj/effect/overlay/temp/hierophant/telegraph/teleport(source, user)
+ new /obj/effect/temp_visual/hierophant/telegraph/teleport(T, user)
+ new /obj/effect/temp_visual/hierophant/telegraph/teleport(source, user)
for(var/t in RANGE_TURFS(1, T))
- var/obj/effect/overlay/temp/hierophant/blast/B = new /obj/effect/overlay/temp/hierophant/blast(t, user, TRUE) //blasts produced will not hurt allies
+ var/obj/effect/temp_visual/hierophant/blast/B = new /obj/effect/temp_visual/hierophant/blast(t, user, TRUE) //blasts produced will not hurt allies
B.damage = 30
for(var/t in RANGE_TURFS(1, source))
- var/obj/effect/overlay/temp/hierophant/blast/B = new /obj/effect/overlay/temp/hierophant/blast(t, user, TRUE) //but absolutely will hurt enemies
+ var/obj/effect/temp_visual/hierophant/blast/B = new /obj/effect/temp_visual/hierophant/blast(t, user, TRUE) //but absolutely will hurt enemies
B.damage = 30
for(var/mob/living/L in range(1, source))
spawn(0)
@@ -155,11 +155,11 @@
/obj/item/weapon/hierophant_staff/proc/cardinal_blasts(turf/T, mob/living/user) //fire cardinal cross blasts with a delay
if(!T)
return
- new /obj/effect/overlay/temp/hierophant/telegraph/cardinal(T, user)
+ new /obj/effect/temp_visual/hierophant/telegraph/cardinal(T, user)
playsound(T,'sound/magic/blink.ogg', 200, 1)
//playsound(T,'sound/effects/bin_close.ogg', 200, 1)
sleep(2)
- new /obj/effect/overlay/temp/hierophant/blast(T, user, friendly_fire_check)
+ new /obj/effect/temp_visual/hierophant/blast(T, user, friendly_fire_check)
for(var/d in cardinal)
spawn(0)
blast_wall(T, d, user)
@@ -173,16 +173,16 @@
for(var/i in 1 to range)
if(!J)
return
- new /obj/effect/overlay/temp/hierophant/blast(J, user, friendly_fire_check)
+ new /obj/effect/temp_visual/hierophant/blast(J, user, friendly_fire_check)
previousturf = J
J = get_step(previousturf, dir)
/obj/item/weapon/hierophant_staff/proc/aoe_burst(turf/T, mob/living/user) //make a 3x3 blast around a target
if(!T)
return
- new /obj/effect/overlay/temp/hierophant/telegraph(T, user)
+ new /obj/effect/temp_visual/hierophant/telegraph(T, user)
playsound(T,'sound/magic/blink.ogg', 200, 1)
//playsound(T,'sound/effects/bin_close.ogg', 200, 1)
sleep(2)
for(var/t in RANGE_TURFS(1, T))
- new /obj/effect/overlay/temp/hierophant/blast(t, user, friendly_fire_check)
+ new /obj/effect/temp_visual/hierophant/blast(t, user, friendly_fire_check)
diff --git a/code/modules/mining/lavaland/loot/tendril_loot.dm b/code/modules/mining/lavaland/loot/tendril_loot.dm
index 1c2093ce8c2..37b266f15a6 100644
--- a/code/modules/mining/lavaland/loot/tendril_loot.dm
+++ b/code/modules/mining/lavaland/loot/tendril_loot.dm
@@ -259,14 +259,14 @@
to_chat(user, "[src] fizzles uselessly.")
return
- var/datum/effect/system/harmless_smoke_spread/smoke = new /datum/effect/system/harmless_smoke_spread()
+ var/datum/effect_system/smoke_spread/smoke = new
smoke.set_up(1, 0, user.loc)
smoke.start()
user.forceMove(get_turf(linked))
feedback_add_details("warp_cube","[src.type]")
- var/datum/effect/system/harmless_smoke_spread/smoke2 = new /datum/effect/system/harmless_smoke_spread()
+ var/datum/effect_system/smoke_spread/smoke2 = new
smoke2.set_up(1, 0, user.loc)
smoke2.start()
diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm
index 11f16953017..bf671764197 100644
--- a/code/modules/mining/mine_items.dm
+++ b/code/modules/mining/mine_items.dm
@@ -329,7 +329,7 @@
message_admins("[key_name_admin(usr)] (?) (FLW) activated a bluespace capsule away from the mining level! (JMP)")
log_admin("[key_name(usr)] activated a bluespace capsule away from the mining level at [T.x], [T.y], [T.z]")
template.load(deploy_location, centered = TRUE)
- new /obj/effect/effect/harmless_smoke(get_turf(src))
+ new /obj/effect/particle_effect/smoke(get_turf(src))
qdel(src)
/obj/item/weapon/survivalcapsule/luxury
@@ -368,20 +368,26 @@
desc = "An easily-compressable wall used for temporary shelter."
icon = 'icons/turf/walls/survival_pod_walls.dmi'
icon_state = "smooth"
- smooth = SMOOTH_MORE // To Do: Add in Diagnaol Smooth Support
+ smooth = SMOOTH_MORE|SMOOTH_DIAGONAL
canSmoothWith = list(/turf/simulated/wall/survival, /obj/machinery/door/airlock/survival_pod)
//Door
/obj/machinery/door/airlock/survival_pod
- name = "Airlock"
- icon = 'icons/obj/doors/survival.dmi'
- assembly_type = /obj/structure/door_assembly/door_assembly_pod
- opacity = 0
- glass = 1
+ icon = 'icons/obj/doors/airlocks/survival/survival.dmi'
+ overlays_file = 'icons/obj/doors/airlocks/survival/survival_overlays.dmi'
+ assemblytype = /obj/structure/door_assembly/door_assembly_pod
+
+/obj/machinery/door/airlock/survival_pod/glass
+ opacity = FALSE
+ glass = TRUE
/obj/structure/door_assembly/door_assembly_pod
- base_icon_state = "survival_pod"
- glass_type = "/survival_pod"
+ name = "pod airlock assembly"
+ icon = 'icons/obj/doors/airlocks/survival/survival.dmi'
+ base_name = "pod airlock"
+ overlays_file = 'icons/obj/doors/airlocks/survival/survival_overlays.dmi'
+ airlock_type = /obj/machinery/door/airlock/survival_pod
+ glass_type = /obj/machinery/door/airlock/survival_pod/glass
//Windoor
/obj/machinery/door/window/survival_pod
@@ -496,7 +502,7 @@
var/buildstacktype = /obj/item/stack/sheet/metal
var/buildstackamount = 5
-/obj/structure/fans/proc/deconstruct()
+/obj/structure/fans/deconstruct()
if(buildstacktype)
new buildstacktype(loc, buildstackamount)
qdel(src)
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index f73236d9720..6e665091e49 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -289,9 +289,9 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
switch(data_hud_seen) //give new huds
if(0)
- show_me_the_hud(DATA_HUD_SECURITY_BASIC)
+ show_me_the_hud(DATA_HUD_SECURITY_ADVANCED)
to_chat(src, "Security HUD set.")
- if(DATA_HUD_SECURITY_BASIC)
+ if(DATA_HUD_SECURITY_ADVANCED)
show_me_the_hud(DATA_HUD_MEDICAL_ADVANCED)
to_chat(src, "Medical HUD set.")
if(DATA_HUD_MEDICAL_ADVANCED)
diff --git a/code/modules/mob/language.dm b/code/modules/mob/language.dm
index cc9ed1a27d6..83eecee3022 100644
--- a/code/modules/mob/language.dm
+++ b/code/modules/mob/language.dm
@@ -559,9 +559,10 @@
if(!message)
return
-
+
+ log_robot("[key_name(speaker)] : [message]")
var/message_start = "[name], [speaker.name]"
- var/message_body = "[speaker.say_quote(message)], \"[message]\""
+ var/message_body = "[speaker.say_quote(message)], \"[message]\""
for(var/mob/M in dead_mob_list)
if(!isnewplayer(M) && !isbrain(M))
diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
index d37d83e8215..b304c663929 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
@@ -13,6 +13,9 @@
var/leap_on_click = 0
var/custom_pixel_x_offset = 0 //for admin fuckery.
var/custom_pixel_y_offset = 0
+ pass_flags = PASSTABLE
+ pressure_resistance = 100 //100 kPa difference required to push
+ throw_pressure_limit = 120 //120 kPa difference required to throw
//This is fine right now, if we're adding organ specific damage this needs to be updated
/mob/living/carbon/alien/humanoid/New()
@@ -121,7 +124,7 @@
stuttering = power
Stun(power)
- var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
+ var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
s.set_up(5, 1, src)
s.start()
diff --git a/code/modules/mob/living/carbon/alien/humanoid/life.dm b/code/modules/mob/living/carbon/alien/humanoid/life.dm
index 580ec3af3cf..a13fce956da 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/life.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/life.dm
@@ -1,10 +1,3 @@
-/mob/living/carbon/alien/humanoid
- oxygen_alert = 0
- toxins_alert = 0
- fire_alert = 0
- pass_flags = PASSTABLE
-
-
/mob/living/carbon/alien/humanoid/Life()
. = ..()
update_icons()
diff --git a/code/modules/mob/living/carbon/alien/life.dm b/code/modules/mob/living/carbon/alien/life.dm
index 80585fad863..d3ecc9e3e1c 100644
--- a/code/modules/mob/living/carbon/alien/life.dm
+++ b/code/modules/mob/living/carbon/alien/life.dm
@@ -4,15 +4,16 @@
if(!breath || (breath.total_moles() == 0))
//Aliens breathe in vaccuum
- return 0
+ return FALSE
var/toxins_used = 0
+ var/tox_detect_threshold = 0.02
var/breath_pressure = (breath.total_moles() * R_IDEAL_GAS_EQUATION * breath.temperature) / BREATH_VOLUME
//Partial pressure of the toxins in our breath
var/Toxins_pp = (breath.toxins / breath.total_moles()) * breath_pressure
- if(Toxins_pp) // Detect toxins in air
+ if(Toxins_pp > tox_detect_threshold) // Detect toxins in air
adjustPlasma(breath.toxins*250)
throw_alert("alien_tox", /obj/screen/alert/alien_tox)
@@ -28,8 +29,6 @@
//BREATH TEMPERATURE
handle_breath_temperature(breath)
- return 1
-
/mob/living/carbon/alien/update_sight()
if(!client)
return
diff --git a/code/modules/mob/living/carbon/alien/special/facehugger.dm b/code/modules/mob/living/carbon/alien/special/facehugger.dm
index 2f489f3ea2d..5294e3bda91 100644
--- a/code/modules/mob/living/carbon/alien/special/facehugger.dm
+++ b/code/modules/mob/living/carbon/alien/special/facehugger.dm
@@ -135,6 +135,11 @@ var/const/MAX_ACTIVE_TIME = 400
if(target.wear_mask)
if(prob(20))
return 0
+ if(istype(target.wear_mask, /obj/item/clothing/mask/muzzle))
+ var/obj/item/clothing/mask/muzzle/S = target.wear_mask
+ if(S.do_break())
+ target.visible_message("[src] spits acid onto [S] melting the lock!", \
+ "[src] spits acid onto [S] melting the lock!")
var/obj/item/clothing/W = target.wear_mask
if(W.flags & NODROP)
return 0
diff --git a/code/modules/mob/living/carbon/brain/posibrain.dm b/code/modules/mob/living/carbon/brain/posibrain.dm
index 037a3f520b3..1c5af7e36f1 100644
--- a/code/modules/mob/living/carbon/brain/posibrain.dm
+++ b/code/modules/mob/living/carbon/brain/posibrain.dm
@@ -47,7 +47,7 @@
to_chat(O, "\A [src] has been activated. (Teleport | Sign Up)")
/obj/item/device/mmi/posibrain/proc/check_observer(var/mob/dead/observer/O)
- if(O.has_enabled_antagHUD == 1 && config.antag_hud_restricted)
+ if(cannotPossess(O))
return 0
if(jobban_isbanned(O, "Cyborg") || jobban_isbanned(O,"nonhumandept"))
return 0
@@ -133,7 +133,7 @@
if(!check_observer(O))
to_chat(O, "You cannot be \a [src].")
return
- if(O.has_enabled_antagHUD == 1 && config.antag_hud_restricted)
+ if(cannotPossess(O))
to_chat(O, "Upon using the antagHUD you forfeited the ability to join the round.")
return
if(jobban_isbanned(O, "Cyborg") || jobban_isbanned(O,"nonhumandept"))
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index bdb9a359a09..1fa4b57356f 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -2,20 +2,6 @@
var/canEnterVentWith = "/obj/item/weapon/implant=0&/obj/item/clothing/mask/facehugger=0&/obj/item/device/radio/borg=0&/obj/machinery/camera=0"
var/datum/middleClickOverride/middleClickOverride = null
-/mob/living/carbon/prepare_huds()
- ..()
- prepare_data_huds()
-
-/mob/living/carbon/proc/prepare_data_huds()
- ..()
- med_hud_set_health()
- med_hud_set_status()
-
-/mob/living/carbon/updatehealth()
- ..()
- med_hud_set_health()
- med_hud_set_status()
-
/mob/living/carbon/Destroy()
QDEL_LIST(internal_organs)
QDEL_LIST(stomach_contents)
@@ -23,7 +9,6 @@
if(B)
B.leave_host()
qdel(B)
- remove_from_all_data_huds()
return ..()
/mob/living/carbon/blob_act()
@@ -68,7 +53,7 @@
var/mob/living/carbon/human/H = src
var/obj/item/organ/external/organ = H.get_organ("chest")
if(istype(organ))
- if(organ.take_damage(d, 0))
+ if(organ.receive_damage(d, 0))
H.UpdateDamageIcon()
H.updatehealth()
@@ -313,6 +298,7 @@
/mob/living/carbon/flash_eyes(intensity = 1, override_blindness_check = 0, affect_silicon = 0, visual = 0)
. = ..()
var/damage = intensity - check_eye_prot()
+ var/extra_damage = 0
if(.)
if(visual)
return
@@ -323,19 +309,32 @@
if(!E || (E && E.weld_proof))
return
+ var/extra_darkview = 0
+ if(E.dark_view)
+ extra_darkview = max(E.dark_view - 2, 0)
+ extra_damage = extra_darkview
+
+ var/light_amount = 10 // assume full brightness
+ if(isturf(src.loc))
+ var/turf/T = src.loc
+ light_amount = round(T.get_lumcount() * 10)
+
+ // a dark view of 8, in full darkness, will result in maximum 1st tier damage
+ var/extra_prob = (10 - light_amount) * extra_darkview
+
switch(damage)
if(1)
to_chat(src, "Your eyes sting a little.")
- if(prob(40)) //waiting on carbon organs
- E.take_damage(1, 1)
-
+ var/minor_damage_multiplier = min(40 + extra_prob, 100) / 100
+ var/minor_damage = minor_damage_multiplier * (1 + extra_damage)
+ E.receive_damage(minor_damage, 1)
if(2)
to_chat(src, "Your eyes burn.")
- E.take_damage(rand(2, 4), 1)
+ E.receive_damage(rand(2, 4) + extra_damage, 1)
else
to_chat(src, "Your eyes itch and burn severely!")
- E.take_damage(rand(12, 16), 1)
+ E.receive_damage(rand(12, 16) + extra_damage, 1)
if(E.damage > E.min_bruised_damage)
AdjustEyeBlind(damage)
@@ -625,6 +624,13 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/unary/vent_pump,
dat += "| Mask: | [(wear_mask && !(wear_mask.flags&ABSTRACT)) ? wear_mask : "Empty"] |
"
+ if(istype(wear_mask, /obj/item/clothing/mask/muzzle))
+ var/obj/item/clothing/mask/muzzle/M = wear_mask
+ if(M.security_lock)
+ dat += " [M.locked ? "Disable Lock" : "Set Lock"]"
+
+ dat += "| |
"
+
if(handcuffed)
dat += "| Handcuffed: Remove |
"
if(legcuffed)
@@ -661,7 +667,7 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/unary/vent_pump,
if(do_mob(usr, src, POCKET_STRIP_DELAY))
if(internal)
internal = null
- update_internals_hud_icon(0)
+ update_action_buttons_icon()
else
var/no_mask2
if(!get_organ_slot("breathing_tube"))
@@ -672,7 +678,7 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/unary/vent_pump,
to_chat(usr, "[src] is not wearing a suitable mask or helmet!")
return
internal = ITEM
- update_internals_hud_icon(1)
+ update_action_buttons_icon()
visible_message("[usr] [internal ? "opens" : "closes"] the valve on [src]'s [ITEM].", \
"[usr] [internal ? "opens" : "closes"] the valve on [src]'s [ITEM].")
@@ -727,23 +733,6 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/unary/vent_pump,
/mob/living/carbon/is_muzzled()
return(istype(src.wear_mask, /obj/item/clothing/mask/muzzle))
-/mob/living/carbon/proc/spin(spintime, speed)
- spawn()
- var/D = dir
- while(spintime >= speed)
- sleep(speed)
- switch(D)
- if(NORTH)
- D = EAST
- if(SOUTH)
- D = WEST
- if(EAST)
- D = SOUTH
- if(WEST)
- D = NORTH
- dir = D
- spintime -= speed
-
/mob/living/carbon/resist_buckle()
spawn(0)
resist_muzzle()
@@ -802,6 +791,8 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/unary/vent_pump,
if(do_after(src, time, 0, target = src))
visible_message("[src] removes [I]!")
to_chat(src, "You get rid of [I]!")
+ if(I.security_lock)
+ I.do_break()
unEquip(I)
@@ -1069,10 +1060,6 @@ so that different stomachs can handle things in different ways VB*/
return FALSE
-/mob/living/carbon/proc/update_internals_hud_icon(internal_state = 0)
- if(hud_used && hud_used.internals)
- hud_used.internals.icon_state = "internal[internal_state]"
-
//to recalculate and update the mob's total tint from tinted equipment it's wearing.
/mob/living/carbon/proc/update_tint()
if(!tinted_weldhelh)
@@ -1117,4 +1104,4 @@ so that different stomachs can handle things in different ways VB*/
update_tint()
if(I.flags_inv & HIDEMASK || forced)
update_inv_wear_mask()
- update_inv_head()
\ No newline at end of file
+ update_inv_head()
diff --git a/code/modules/mob/living/carbon/carbon_defines.dm b/code/modules/mob/living/carbon/carbon_defines.dm
index 67a8fb7fa20..9068c1f1b65 100644
--- a/code/modules/mob/living/carbon/carbon_defines.dm
+++ b/code/modules/mob/living/carbon/carbon_defines.dm
@@ -1,6 +1,5 @@
/mob/living/carbon
gender = MALE
- hud_possible = list(HEALTH_HUD,STATUS_HUD,SPECIALROLE_HUD)
var/list/stomach_contents = list()
var/list/internal_organs = list()
var/list/internal_organs_slot = list() //Same as above, but stores "slot ID" - "organ" pairs for easy access.
@@ -23,12 +22,7 @@
var/wetlevel = 0 //how wet the mob is
- var/oxygen_alert = 0
- var/toxins_alert = 0
- var/co2_alert = 0
- var/fire_alert = 0
-
- var/failed_last_breath = 0 //This is used to determine if the mob failed a breath. If they did fail a brath, they will attempt to breathe each tick, otherwise just once per 4 ticks.
+ var/failed_last_breath = FALSE //This is used to determine if the mob failed a breath. If they did fail a brath, they will attempt to breathe each tick, otherwise just once per 4 ticks.
var/co2overloadtime = null
blood_volume = BLOOD_VOLUME_NORMAL
diff --git a/code/modules/mob/living/carbon/human/body_accessories.dm b/code/modules/mob/living/carbon/human/body_accessories.dm
index cf49a328981..071ad99cd95 100644
--- a/code/modules/mob/living/carbon/human/body_accessories.dm
+++ b/code/modules/mob/living/carbon/human/body_accessories.dm
@@ -97,7 +97,7 @@ var/global/list/body_accessory_by_species = list("None" = null)
animated_icon_state = "null"
/datum/body_accessory/tail/try_restrictions(var/mob/living/carbon/human/H)
- if(!H.wear_suit || !(H.wear_suit.flags_inv & HIDETAIL) && !istype(H.wear_suit, /obj/item/clothing/suit/space))
+ if(!H.wear_suit || !(H.wear_suit.flags_inv & HIDETAIL))
return 1
return 0
@@ -140,4 +140,3 @@ var/global/list/body_accessory_by_species = list("None" = null)
icon_state = "vulptail6"
animated_icon_state = "vulptail6_a"
allowed_species = list("Vulpkanin")
-
diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm
index d0468fb12b6..8ad380dbc9f 100644
--- a/code/modules/mob/living/carbon/human/death.dm
+++ b/code/modules/mob/living/carbon/human/death.dm
@@ -40,7 +40,7 @@
hgibs(loc, dna)
else
new /obj/effect/decal/cleanable/blood/gibs/robot(loc)
- var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
+ 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/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm
index ee58248b03e..8910b43237b 100644
--- a/code/modules/mob/living/carbon/human/emote.dm
+++ b/code/modules/mob/living/carbon/human/emote.dm
@@ -34,24 +34,24 @@
else //Everyone else fails, skip the emote attempt
return
if("drone","drones","hum","hums","rumble","rumbles")
- if(species.name == "Drask") //Only Drask can make whale noises
+ if(get_species() == "Drask") //Only Drask can make whale noises
on_CD = handle_emote_CD() //proc located in code\modules\mob\emote.dm
else
return
if("howl", "howls")
- if (species.name == "Vulpkanin") //Only Vulpkanin can howl
+ if(get_species() == "Vulpkanin") //Only Vulpkanin can howl
on_CD = handle_emote_CD(100)
else
return
if("growl", "growls")
- if (species.name == "Vulpkanin") //Only Vulpkanin can growl
+ if(get_species() == "Vulpkanin") //Only Vulpkanin can growl
on_CD = handle_emote_CD()
else
return
if("squish", "squishes")
var/found_slime_bodypart = 0
- if(species.name == "Slime People") //Only Slime People can squish
+ if(get_species() == "Slime People") //Only Slime People can squish
on_CD = handle_emote_CD() //proc located in code\modules\mob\emote.dm'
found_slime_bodypart = 1
else
@@ -65,25 +65,31 @@
return
if("clack", "clacks")
- if(species.name == "Kidan") //Only Kidan can clack and rightfully so.
+ if(get_species() == "Kidan") //Only Kidan can clack and rightfully so.
on_CD = handle_emote_CD() //proc located in code\modules\mob\emote.dm'
else //Everyone else fails, skip the emote attempt
return
if("click", "clicks")
- if(species.name == "Kidan") //Only Kidan can click and rightfully so.
+ if(get_species() == "Kidan") //Only Kidan can click and rightfully so.
on_CD = handle_emote_CD() //proc located in code\modules\mob\emote.dm'
else //Everyone else fails, skip the emote attempt
return
if("creaks", "creak")
- if(species.name == "Diona") //Only Dionas can Creaks.
+ if(get_species() == "Diona") //Only Dionas can Creaks.
on_CD = handle_emote_CD() //proc located in code\modules\mob\emote.dm'
else //Everyone else fails, skip the emote attempt
return
if("hiss", "hisses")
- if(species.name == "Unathi") //Only Unathi can hiss.
+ if(get_species() == "Unathi") //Only Unathi can hiss.
+ on_CD = handle_emote_CD() //proc located in code\modules\mob\emote.dm'
+ else //Everyone else fails, skip the emote attempt
+ return
+
+ if("quill", "quills")
+ if(get_species() == "Vox") //Only Vox can rustle their quills.
on_CD = handle_emote_CD() //proc located in code\modules\mob\emote.dm'
else //Everyone else fails, skip the emote attempt
return
@@ -92,7 +98,7 @@
on_CD = handle_emote_CD(50) //longer cooldown
if("fart", "farts", "flip", "flips", "snap", "snaps")
on_CD = handle_emote_CD() //proc located in code\modules\mob\emote.dm
- if("cough", "coughs", "slap", "slaps")
+ if("cough", "coughs", "slap", "slaps", "highfive")
on_CD = handle_emote_CD()
if("sneeze", "sneezes")
on_CD = handle_emote_CD()
@@ -190,6 +196,13 @@
playsound(loc, 'sound/effects/unathihiss.ogg', 50, 0) //Credit to Jamius (freesound.org) for the sound.
m_type = 2
+ if("quill", "quills")
+ var/M = handle_emote_param(param)
+
+ message = "[src] rustles their quills[M ? " at [M]" : ""]."
+ playsound(loc, 'sound/effects/voxrustle.ogg', 50, 0) //Credit to sound-ideas (freesfx.co.uk) for the sound.
+ m_type = 2
+
if("yes")
var/M = handle_emote_param(param)
@@ -821,12 +834,40 @@
continue
M.reagents.add_reagent("jenkem", 1)
+ if("hem")
+ message = "[src] hems."
+
+ if("highfive")
+ if(restrained())
+ return
+ if(has_status_effect(STATUS_EFFECT_HIGHFIVE))
+ to_chat(src, "You give up on the highfive.")
+ remove_status_effect(STATUS_EFFECT_HIGHFIVE)
+ return
+ visible_message("[name] requests a highfive.", "You request a high five.")
+ apply_status_effect(STATUS_EFFECT_HIGHFIVE)
+ for(var/mob/living/L in orange(1))
+ if(L.has_status_effect(STATUS_EFFECT_HIGHFIVE))
+ if((mind && mind.special_role == SPECIAL_ROLE_WIZARD) && (L.mind && L.mind.special_role == SPECIAL_ROLE_WIZARD))
+ visible_message("[name] and [L.name] high-five EPICALLY!")
+ status_flags |= GODMODE
+ L.status_flags |= GODMODE
+ explosion(loc,5,2,1,3)
+ status_flags &= ~GODMODE
+ L.status_flags &= ~GODMODE
+ return
+ visible_message("[name] and [L.name] high-five!")
+ playsound('sound/effects/snap.ogg', 50)
+ remove_status_effect(STATUS_EFFECT_HIGHFIVE)
+ L.remove_status_effect(STATUS_EFFECT_HIGHFIVE)
+ return
+
if("help")
var/emotelist = "aflap(s), airguitar, blink(s), blink(s)_r, blush(es), bow(s)-(none)/mob, burp(s), choke(s), chuckle(s), clap(s), collapse(s), cough(s),cry, cries, custom, dance, dap(s)(none)/mob," \
+ " deathgasp(s), drool(s), eyebrow, fart(s), faint(s), flap(s), flip(s), frown(s), gasp(s), giggle(s), glare(s)-(none)/mob, grin(s), groan(s), grumble(s), grin(s)," \
- + " handshake-mob, hug(s)-(none)/mob, johnny, jump, laugh(s), look(s)-(none)/mob, moan(s), mumble(s), nod(s), pale(s), point(s)-atom, quiver(s), raise(s), salute(s)-(none)/mob, scream(s), shake(s)," \
+ + " handshake-mob, hug(s)-(none)/mob, hem, highfive, johnny, jump, laugh(s), look(s)-(none)/mob, moan(s), mumble(s), nod(s), pale(s), point(s)-atom, quiver(s), raise(s), salute(s)-(none)/mob, scream(s), shake(s)," \
+ " shiver(s), shrug(s), sigh(s), signal(s)-#1-10,slap(s)-(none)/mob, smile(s),snap(s), sneeze(s), sniff(s), snore(s), stare(s)-(none)/mob, swag(s), tremble(s), twitch(es), twitch(es)_s," \
- + " wag(s), wave(s), whimper(s), wink(s), yawn(s)"
+ + " wag(s), wave(s), whimper(s), wink(s), yawn(s), quill(s)"
switch(species.name)
if("Machine")
@@ -839,6 +880,8 @@
emotelist += "\nUnathi specific emotes :- hiss(es)"
if("Vulpkanin")
emotelist += "\nVulpkanin specific emotes :- growl(s)-none/mob, howl(s)-none/mob"
+ if("Vox")
+ emotelist += "\nVox specific emotes :- quill(s)"
if("Diona")
emotelist += "\nDiona specific emotes :- creak(s)"
diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm
index 299006c102d..d970b696ca4 100644
--- a/code/modules/mob/living/carbon/human/examine.dm
+++ b/code/modules/mob/living/carbon/human/examine.dm
@@ -245,7 +245,7 @@
wound_flavor_text["[E.limb_name]"] = "[t_He] [t_has] a robotic [E.name]!\n"
else if(E.status & ORGAN_SPLINTED)
- wound_flavor_text["[E.limb_name]"] = "[t_He] [t_has] a splint on his [E.name]!\n"
+ wound_flavor_text["[E.limb_name]"] = "[t_He] [t_has] a splint on [t_his] [E.name]!\n"
for(var/obj/item/I in E.embedded_objects)
msg += "[t_He] [t_has] \a [bicon(I)] [I] embedded in [t_his] [E.name]!\n"
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 82ef8fcfa8e..27aa1d6b4da 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -399,7 +399,7 @@
Stuttering(power)
Stun(power)
- var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
+ var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
s.set_up(5, 1, src)
s.start()
@@ -455,7 +455,14 @@
if(slot_wear_mask in obscured)
dat += "| Mask: | Obscured |
"
else
- dat += "| Mask: | [(wear_mask && !(wear_mask.flags&ABSTRACT)) ? wear_mask : "Empty"] |
"
+ dat += "| Mask: | [(wear_mask && !(wear_mask.flags&ABSTRACT)) ? wear_mask : "Empty"]"
+
+ if(istype(wear_mask, /obj/item/clothing/mask/muzzle))
+ var/obj/item/clothing/mask/muzzle/M = wear_mask
+ if(M.security_lock)
+ dat += " [M.locked ? "Disable Lock" : "Set Lock"]"
+
+ dat += " |
| |
"
if(!issmall(src))
if(slot_glasses in obscured)
@@ -708,7 +715,7 @@
if(!I || !L || I.loc != src || !(I in L.embedded_objects))
return
L.embedded_objects -= I
- L.take_damage(I.embedded_unsafe_removal_pain_multiplier*I.w_class)//It hurts to rip it out, get surgery you dingus.
+ L.receive_damage(I.embedded_unsafe_removal_pain_multiplier*I.w_class)//It hurts to rip it out, get surgery you dingus.
I.forceMove(get_turf(src))
usr.put_in_hands(I)
usr.emote("scream")
@@ -1299,36 +1306,6 @@
src.custom_pain("You feel a stabbing pain in your chest!", 1)
L.damage = L.min_bruised_damage
-/*
-/mob/living/carbon/human/verb/simulate()
- set name = "sim"
- //set background = 1
-
- var/damage = input("Wound damage","Wound damage") as num
-
- var/germs = 0
- var/tdamage = 0
- var/ticks = 0
- while(germs < 2501 && ticks < 100000 && round(damage/10)*20)
- diary << "VIRUS TESTING: [ticks] : germs [germs] tdamage [tdamage] prob [round(damage/10)*20]"
- ticks++
- if(prob(round(damage/10)*20))
- germs++
- if(germs == 100)
- to_chat(world, "Reached stage 1 in [ticks] ticks")
- if(germs > 100)
- if(prob(10))
- damage++
- germs++
- if(germs == 1000)
- to_chat(world, "Reached stage 2 in [ticks] ticks")
- if(germs > 1000)
- damage++
- germs++
- if(germs == 2500)
- to_chat(world, "Reached stage 3 in [ticks] ticks")
- to_chat(world, "Mob took [tdamage] tox damage")
-*/
//returns 1 if made bloody, returns 0 otherwise
/mob/living/carbon/human/clean_blood(var/clean_feet)
@@ -1434,10 +1411,6 @@
maxHealth = species.total_health
- toxins_alert = 0
- oxygen_alert = 0
- fire_alert = 0
-
if(species.language)
add_language(species.language)
diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm
index 9a96ec72c28..c216badda93 100644
--- a/code/modules/mob/living/carbon/human/human_damage.dm
+++ b/code/modules/mob/living/carbon/human/human_damage.dm
@@ -37,7 +37,7 @@
if(sponge)
if(species)
amount = amount * species.brain_mod
- sponge.take_damage(amount, 1)
+ sponge.receive_damage(amount, 1)
brainloss = sponge.damage
else
brainloss = 200
@@ -112,7 +112,7 @@
var/obj/item/organ/external/O = get_organ(organ_name)
if(amount > 0)
- O.take_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)
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.status & ORGAN_ROBOT))
@@ -126,7 +126,7 @@
var/obj/item/organ/external/O = get_organ(organ_name)
if(amount > 0)
- O.take_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)
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.status & ORGAN_ROBOT))
@@ -240,7 +240,7 @@
if(!parts.len)
return
var/obj/item/organ/external/picked = pick(parts)
- if(picked.take_damage(brute, burn, sharp))
+ if(picked.receive_damage(brute, burn, sharp))
UpdateDamageIcon()
updatehealth()
speech_problem_flag = 1
@@ -285,7 +285,7 @@
var/burn_was = picked.burn_dam
- update |= picked.take_damage(brute_per_part, burn_per_part, sharp, used_weapon)
+ update |= picked.receive_damage(brute_per_part, burn_per_part, sharp, used_weapon)
brute -= (picked.brute_dam - brute_was)
burn -= (picked.burn_dam - burn_was)
@@ -355,7 +355,7 @@ This function restores all organs.
if(species)
damage = damage * species.brute_mod
- if(organ.take_damage(damage, 0, sharp, used_weapon))
+ if(organ.receive_damage(damage, 0, sharp, used_weapon))
UpdateDamageIcon()
if(LAssailant && ishuman(LAssailant)) //superheros still get the comical hit markers
@@ -372,7 +372,7 @@ This function restores all organs.
dmgIcon.pixel_y = (!lying) ? rand(-11,9) : rand(-10,1)
flick_overlay(dmgIcon, attack_bubble_recipients, 9)
- receive_damage()
+ receiving_damage()
if(BURN)
damageoverlaytemp = 20
@@ -380,7 +380,7 @@ This function restores all organs.
if(species)
damage = damage * species.burn_mod
- if(organ.take_damage(0, damage, sharp, used_weapon))
+ if(organ.receive_damage(0, damage, sharp, used_weapon))
UpdateDamageIcon()
// Will set our damageoverlay icon to the next level, which will then be set back to the normal level the next mob.Life().
diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index 9783673bc33..6f6bb6ade48 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -311,7 +311,7 @@ emp_act
L.embedded_objects |= I
I.add_mob_blood(src)//it embedded itself in you, of course it's bloody!
I.forceMove(src)
- L.take_damage(I.w_class*I.embedded_impact_pain_multiplier)
+ L.receive_damage(I.w_class*I.embedded_impact_pain_multiplier)
visible_message("[I] embeds itself in [src]'s [L.name]!","[I] embeds itself in your [L.name]!")
hitpush = 0
skipcatch = 1 //can't catch the now embedded item
@@ -358,10 +358,10 @@ emp_act
if("brute")
if(M.force > 20)
Paralyse(1)
- update |= affecting.take_damage(rand(M.force/2, M.force), 0)
+ update |= affecting.receive_damage(rand(M.force/2, M.force), 0)
playsound(src, 'sound/weapons/punch4.ogg', 50, 1)
if("fire")
- update |= affecting.take_damage(0, rand(M.force/2, M.force))
+ update |= affecting.receive_damage(0, rand(M.force/2, M.force))
playsound(src, 'sound/items/Welder.ogg', 50, 1)
if("tox")
M.mech_toxin_damage(src)
diff --git a/code/modules/mob/living/carbon/human/human_organs.dm b/code/modules/mob/living/carbon/human/human_organs.dm
index 157e95da32d..0c64abdec40 100644
--- a/code/modules/mob/living/carbon/human/human_organs.dm
+++ b/code/modules/mob/living/carbon/human/human_organs.dm
@@ -21,7 +21,7 @@
if(E.is_broken() && E.internal_organs && E.internal_organs.len && prob(15))
var/obj/item/organ/internal/I = pick(E.internal_organs)
custom_pain("You feel broken bones moving in your [E.name]!", 1)
- I.take_damage(rand(3,5))
+ I.receive_damage(rand(3,5))
//handle_stance()
handle_grasp()
@@ -107,7 +107,7 @@
custom_emote(1, "drops what they were holding, their [E.name] malfunctioning!")
- var/datum/effect/system/spark_spread/spark_system = new /datum/effect/system/spark_spread()
+ var/datum/effect_system/spark_spread/spark_system = new /datum/effect_system/spark_spread()
spark_system.set_up(5, 0, src)
spark_system.attach(src)
spark_system.start()
diff --git a/code/modules/mob/living/carbon/human/interactive/interactive.dm b/code/modules/mob/living/carbon/human/interactive/interactive.dm
index 4efca3178cc..442bb19ca9a 100644
--- a/code/modules/mob/living/carbon/human/interactive/interactive.dm
+++ b/code/modules/mob/living/carbon/human/interactive/interactive.dm
@@ -618,7 +618,7 @@
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
- AL.p_open = 1
+ AL.panel_open = 1
AL.update_icon()
AL.shock(src, mistake_chance)
sleep(5)
@@ -638,7 +638,7 @@
if(prob(mistake_chance) && !AL.wires.IsIndexCut(AIRLOCK_WIRE_ELECTRIFY))
AL.wires.CutWireIndex(AIRLOCK_WIRE_ELECTRIFY)
sleep(5)
- AL.p_open = 0
+ AL.panel_open = 0
AL.update_icon()
D.open()
diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm
index c95bb0bd243..92afc310791 100644
--- a/code/modules/mob/living/carbon/human/inventory.dm
+++ b/code/modules/mob/living/carbon/human/inventory.dm
@@ -152,7 +152,7 @@
update_head_accessory()
if(internal && !get_organ_slot("breathing_tube"))
internal = null
- update_internals_hud_icon(0)
+ update_action_buttons_icon()
wear_mask_update(I, toggle_off = FALSE)
sec_hud_set_ID()
update_inv_wear_mask()
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index 403b30a039d..ccddc56ca16 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -1,5 +1,4 @@
/mob/living/carbon/human/Life()
- fire_alert = 0 //Reset this here, because both breathe() and handle_environment() have a chance to set it.
life_tick++
voice = GetVoice()
@@ -94,32 +93,49 @@
if(getBrainLoss() >= 60 && stat != DEAD)
speech_problem_flag = 1
if(prob(3))
- var/list/s1 = list("IM A PONY NEEEEEEIIIIIIIIIGH",
+ var/list/s1 = list("IM A [pick("PONY","LIZARD","taJaran","kitty","Vulpakin","drASK","BIRDIE","voxxie","race car","combat meCH","SPESSSHIP")] [pick("NEEEEEEIIIIIIIIIGH","sKREEEEEE","MEOW","NYA~","rawr","Barkbark","Hissssss","vROOOOOM","pewpew","choo Choo")]!",
"without oxigen blob don't evoluate?",
"CAPTAINS A COMDOM",
"[pick("", "that damn traitor")] [pick("joerge", "george", "gorge", "gdoruge")] [pick("mellens", "melons", "mwrlins")] is grifing me HAL;P!!!",
"can u give me [pick("telikesis","halk","eppilapse")]?",
"THe saiyans screwed",
- "Bi is THE BEST OF BOTH WORLDS>",
+ "Bi is THE BEST OF BOTH WORLDS",
"I WANNA PET TEH monkeyS",
"stop grifing me!!!!",
- "SOTP IT#")
+ "SOTP IT!",
+ "HALPZ SITCULITY",
+ "VOXES caN't LOVE",
+ "my dad own this station",
+ "the CHef put [pick("PROTEIN", "toiret waTer", "RiPPleing TendIes", "Einzymes","HORRY WALTER","nuTriments","ReActive MutAngen","TeSLium","sKrektonium")] in my [pick("wiSh soup","Bullito","rAingurber","sOilent GREEn","KoI Susishes","yaya")]!",
+ "the monkey have TASER ARMS!",
+ "qM blew my points on [pick("cOMbat Shtogun","inSuLated gloves","LOTS MASSHEEN!")]",
+ "EI'NATH!",
+ "WAKE UP SHEEPLES!",
+ "et wus my [pick("wittle brother!!","fiancee","friend staying over","entiRe orphanage","love interest","wife","husband","liTTle kids","sentient cAT","accidentally")]!")
var/list/s2 = list("FUS RO DAH",
- "fucking 4rries!",
+ "fuckin tangerines!!!",
"stat me",
">my face",
"roll it easy!",
"waaaaaagh!!!",
"red wonz go fasta",
"FOR TEH EMPRAH",
- "lol2cat",
+ "HAZ A SECURE DAY!!!!",
"dem dwarfs man, dem dwarfs",
"SPESS MAHREENS",
"hwee did eet fhor khayosss",
- "lifelike texture ;_;",
+ "lifelike texture",
"luv can bloooom",
- "PACKETS!!!")
+ "PACKETS!!!",
+ "[pick("WHERE MY","aYE need","giv me my","bath me inn.")] [pick("dermaline","alKkyZine","dylOvene","inAprovaline","biCaridine","Hyperzine","kELotane","lePorazine","bAcch Salts","tricord","clOnexazone","hydroChloric Acid","chlorine Hydrate","paRoxetine")]!",
+ "mALPRACTICEBAY",
+ "I HavE A pe H dee iN ENTerpriSE resOUrCE pLaNNIN",
+ "h-h-HalP MaINT",
+ "dey come, dey COME! DEY COME!!!",
+ "THE END IS NIGH!",
+ "I FOT AND DIED FOR MUH [pick("RITES","FREEDOM","payCHECK","cARGO points","teCH Level","doG","mAPLe syrup","fluffy fWiends","gateway Loot")]",
+ "KILL DEM [pick("mainTnacE cHickinNS","kiRA CulwnNES","FLOOR CLUWNEs","MIME ASSASSIN","BOMBING TAJARAN","cC offiser","morPhlings","slinglings")]!")
switch(pick(1,2,3))
if(1)
say(pick(s1))
@@ -222,61 +238,38 @@
chest.add_autopsy_data("Radiation Poisoning", autopsy_damage)
/mob/living/carbon/human/breathe()
+ if(!species.breathe(src))
+ ..()
- if((NO_BREATH in mutations) || (NO_BREATHE in species.species_traits) || reagents.has_reagent("lexorin"))
- adjustOxyLoss(-5)
- oxygen_alert = 0
- toxins_alert = 0
- return
- if(istype(loc, /obj/machinery/atmospherics/unary/cryo_cell))
- return
+/mob/living/carbon/human/check_breath(datum/gas_mixture/breath)
- var/datum/gas_mixture/environment
- if(loc)
- environment = loc.return_air()
+ var/obj/item/organ/internal/L = get_organ_slot("lungs")
- var/datum/gas_mixture/breath
+ if(!L || L && (L.status & ORGAN_DEAD))
+ if(health >= config.health_threshold_crit)
+ adjustOxyLoss(HUMAN_MAX_OXYLOSS + 1)
+ else
+ adjustOxyLoss(HUMAN_CRIT_MAX_OXYLOSS)
- if(health <= config.health_threshold_crit)
- AdjustLoseBreath(1)
+ failed_last_breath = TRUE
- if(losebreath > 0)
- AdjustLoseBreath(-1)
- if(prob(10))
- emote("gasp")
- if(istype(loc, /obj/))
- var/obj/loc_as_obj = loc
- loc_as_obj.handle_internal_lifeform(src, 0)
+ if(species)
+ var/datum/species/S = species
+
+ if(S.breathid == "o2")
+ throw_alert("not_enough_oxy", /obj/screen/alert/not_enough_oxy)
+ else if(S.breathid == "tox")
+ throw_alert("not_enough_tox", /obj/screen/alert/not_enough_tox)
+ else if(S.breathid == "co2")
+ throw_alert("not_enough_co2", /obj/screen/alert/not_enough_co2)
+ else if(S.breathid == "n2")
+ throw_alert("not_enough_nitro", /obj/screen/alert/not_enough_nitro)
+
+ return FALSE
else
- breath = get_breath_from_internal(BREATH_VOLUME)
-
- if(!breath)
- if(isobj(loc)) //Breathe from loc as object
- var/obj/loc_as_obj = loc
- breath = loc_as_obj.handle_internal_lifeform(src, BREATH_MOLES)
-
- else if(isturf(loc)) //Breathe from loc as turf
- var/breath_moles = 0
- if(environment)
- breath_moles = environment.total_moles()*BREATH_PERCENTAGE
-
- breath = loc.remove_air(breath_moles)
-
- if(!is_lung_ruptured()) // THIS FUCKING EXCERPT, THIS LITTLE FUCKING EXCERPT, SNOWFLAKED
- if(!breath || breath.total_moles() < BREATH_MOLES / 5 || breath.total_moles() > BREATH_MOLES * 5) // RIGHT IN THE CENTER OF THE FUCKING BREATHE PROC
- if(prob(5)) // IT IS THE ONLY FUCKING REASONS HUMAN OVERRIDE breathe()
- rupture_lung() // GOD FUCKING DAMNIT
-
- else //Breathe from loc as obj again
- if(istype(loc, /obj/))
- var/obj/loc_as_obj = loc
- loc_as_obj.handle_internal_lifeform(src,0)
-
- check_breath(breath)
-
- if(breath)
- loc.assume_air(breath)
-
+ if(istype(L, /obj/item/organ/internal/lungs))
+ var/obj/item/organ/internal/lungs/lun = L
+ lun.check_breath(breath, src)
// USED IN DEATHWHISPERS
/mob/living/carbon/human/proc/isInCrit()
@@ -307,45 +300,13 @@
if(null_internals) //something wants internals gone
internal = null //so do it
-
+ update_action_buttons_icon()
if(internal) //check for hud updates every time this is called
- update_internals_hud_icon(1)
return internal.remove_air_volume(volume_needed) //returns the valid air
- else
- update_internals_hud_icon(0)
return null
-/mob/living/carbon/human/check_breath(var/datum/gas_mixture/breath)
- if(status_flags & GODMODE)
- return 0
-
- if(!breath || (breath.total_moles() == 0) || suiciding)
- var/oxyloss = 0
- if(suiciding)
- oxyloss = 2
- adjustOxyLoss(oxyloss)//If you are suiciding, you should die a little bit faster
- failed_last_breath = 1
- oxygen_alert = max(oxygen_alert, 1)
- return 0
- if(health > 0)
- oxyloss = HUMAN_MAX_OXYLOSS
- adjustOxyLoss(oxyloss)
- failed_last_breath = 1
- else
- oxyloss = HUMAN_CRIT_MAX_OXYLOSS
- adjustOxyLoss(oxyloss)
- failed_last_breath = 1
-
- var/obj/item/organ/external/affected = get_organ("chest")
- affected.add_autopsy_data("Suffocation", oxyloss)
- throw_alert("oxy", /obj/screen/alert/oxy)
-
- return 0
-
- return species.handle_breath(breath, src)
-
/mob/living/carbon/human/handle_environment(datum/gas_mixture/environment)
if(!environment)
return
@@ -374,7 +335,7 @@
if(bodytemperature > species.heat_level_1)
//Body temperature is too hot.
if(status_flags & GODMODE) return 1 //godmode
- var/mult = species.hot_env_multiplier
+ var/mult = species.heatmod
if(bodytemperature >= species.heat_level_1 && bodytemperature <= species.heat_level_2)
throw_alert("temp", /obj/screen/alert/hot, 1)
@@ -396,7 +357,7 @@
return 1
if(!istype(loc, /obj/machinery/atmospherics/unary/cryo_cell))
- var/mult = species.cold_env_multiplier
+ var/mult = species.coldmod
if(bodytemperature >= species.cold_level_2 && bodytemperature <= 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")
@@ -419,7 +380,7 @@
if(status_flags & GODMODE) return 1 //godmode
if(adjusted_pressure >= species.hazard_high_pressure)
- if(!(RESIST_HEAT in mutations))
+ if(!(HEATRES in mutations))
var/pressure_damage = min( ( (adjusted_pressure / species.hazard_high_pressure) -1 )*PRESSURE_DAMAGE_COEFFICIENT , MAX_HIGH_PRESSURE_DAMAGE)
take_overall_damage(brute=pressure_damage, used_weapon = "High Pressure")
throw_alert("pressure", /obj/screen/alert/highpressure, 2)
@@ -432,7 +393,7 @@
else if(adjusted_pressure >= species.hazard_low_pressure)
throw_alert("pressure", /obj/screen/alert/lowpressure, 1)
else
- if(RESIST_COLD in mutations)
+ if(COLDRES in mutations)
clear_alert("pressure")
else
take_overall_damage(brute=LOW_PRESSURE_DAMAGE, used_weapon = "Low Pressure")
@@ -443,7 +404,7 @@
/mob/living/carbon/human/handle_fire()
if(..())
return
- if(RESIST_HEAT in mutations)
+ if(HEATRES in mutations)
return
if(on_fire)
var/thermal_protection = get_thermal_protection()
@@ -507,7 +468,7 @@
/mob/living/carbon/human/proc/get_heat_protection(temperature) //Temperature is the temperature you're being exposed to.
- if(RESIST_HEAT in mutations)
+ if(HEATRES in mutations)
return 1
var/thermal_protection_flags = get_heat_protection_flags(temperature)
@@ -568,7 +529,7 @@
/mob/living/carbon/human/proc/get_cold_protection(temperature)
- if(RESIST_COLD in mutations)
+ if(COLDRES in mutations)
return 1 //Fully protected from the cold.
temperature = max(temperature, 2.7) //There is an occasional bug where the temperature is miscalculated in ares with a small amount of gas on them, so this is necessary to ensure that that bug does not affect this calculation. Space's temperature is 2.7K and most suits that are intended to protect against any cold, protect down to 2.0K.
@@ -746,16 +707,16 @@
Paralyse(5/sober_str)
Drowsy(30/sober_str)
if(L)
- L.take_damage(0.1, 1)
+ L.receive_damage(0.1, 1)
adjustToxLoss(0.1)
else //stuff only for synthetics
if(alcohol_strength >= spark_start && prob(25))
- var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
+ var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
s.set_up(3, 1, src)
s.start()
if(alcohol_strength >= collapse_start && prob(10))
emote("collapse")
- var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
+ var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
s.set_up(3, 1, src)
s.start()
if(alcohol_strength >= braindamage_start && prob(10))
@@ -918,11 +879,11 @@
var/obj/item/organ/external/BP = X
for(var/obj/item/I in BP.embedded_objects)
if(prob(I.embedded_pain_chance))
- BP.take_damage(I.w_class*I.embedded_pain_multiplier)
+ BP.receive_damage(I.w_class*I.embedded_pain_multiplier)
to_chat(src, "[I] embedded in your [BP.name] hurts!")
if(prob(I.embedded_fall_chance))
- BP.take_damage(I.w_class*I.embedded_fall_pain_multiplier)
+ BP.receive_damage(I.w_class*I.embedded_fall_pain_multiplier)
BP.embedded_objects -= I
I.forceMove(get_turf(src))
visible_message("[I] falls out of [name]'s [BP.name]!","[I] falls out of your [BP.name]!")
@@ -1016,7 +977,7 @@
var/obj/item/clothing/mask/M = H.wear_mask
if(M && (M.flags_cover & MASKCOVERSMOUTH))
return
- if(NO_BREATHE in species.species_traits)
+ if(NO_BREATHE in H.species.species_traits)
return //no puking if you can't smell!
// Humans can lack a mind datum, y'know
if(H.mind && (H.mind.assigned_role == "Detective" || H.mind.assigned_role == "Coroner"))
diff --git a/code/modules/mob/living/carbon/human/say.dm b/code/modules/mob/living/carbon/human/say.dm
index 63982b86948..d9d1c9723d7 100644
--- a/code/modules/mob/living/carbon/human/say.dm
+++ b/code/modules/mob/living/carbon/human/say.dm
@@ -86,9 +86,14 @@
return real_name
/mob/living/carbon/human/IsVocal()
+ // how do species that don't breathe talk? magic, that's what.
+ var/breathes = (!(NO_BREATHE in species.species_traits))
+ var/obj/item/organ/internal/L = get_organ_slot("lungs")
+ if((breathes && !L) || breathes && L && (L.status & ORGAN_DEAD))
+ return FALSE
if(mind)
return !mind.miming
- return 1
+ return TRUE
/mob/living/carbon/human/proc/SetSpecialVoice(var/new_voice)
if(new_voice)
diff --git a/code/modules/mob/living/carbon/human/species/abductor.dm b/code/modules/mob/living/carbon/human/species/abductor.dm
index 75b19395dad..3e1bb968c81 100644
--- a/code/modules/mob/living/carbon/human/species/abductor.dm
+++ b/code/modules/mob/living/carbon/human/species/abductor.dm
@@ -10,7 +10,6 @@
eyes = "blank_eyes"
has_organ = list(
"heart" = /obj/item/organ/internal/heart,
- "lungs" = /obj/item/organ/internal/lungs,
"liver" = /obj/item/organ/internal/liver,
"kidneys" = /obj/item/organ/internal/kidneys,
"brain" = /obj/item/organ/internal/brain,
diff --git a/code/modules/mob/living/carbon/human/species/golem.dm b/code/modules/mob/living/carbon/human/species/golem.dm
index 3fbf0a4d8c1..c289ba3a19e 100644
--- a/code/modules/mob/living/carbon/human/species/golem.dm
+++ b/code/modules/mob/living/carbon/human/species/golem.dm
@@ -30,7 +30,6 @@
heat_level_1 = 999999999
heat_level_2 = 999999999
heat_level_3 = 999999999
- heat_level_3_breathe = 999999999
blood_color = "#515573"
flesh_color = "#137E8F"
diff --git a/code/modules/mob/living/carbon/human/species/plasmaman.dm b/code/modules/mob/living/carbon/human/species/plasmaman.dm
index 9a5e05723a9..28f92654100 100644
--- a/code/modules/mob/living/carbon/human/species/plasmaman.dm
+++ b/code/modules/mob/living/carbon/human/species/plasmaman.dm
@@ -14,8 +14,7 @@
butt_sprite = "plasma"
- breath_type = "plasma"
- poison_type = null //Certainly isn't plasma.
+ breathid = "tox"
heat_level_1 = 350 // Heat damage level 1 above this point.
heat_level_2 = 400 // Heat damage level 2 above this point.
@@ -29,6 +28,16 @@
"realizes the existential problem of being made out of plasma!",
"shows their true colors, which happens to be the color of plasma!")
+ has_organ = list(
+ "heart" = /obj/item/organ/internal/heart,
+ "lungs" = /obj/item/organ/internal/lungs/plasmaman,
+ "liver" = /obj/item/organ/internal/liver,
+ "kidneys" = /obj/item/organ/internal/kidneys,
+ "brain" = /obj/item/organ/internal/brain,
+ "appendix" = /obj/item/organ/internal/appendix,
+ "eyes" = /obj/item/organ/internal/eyes
+ )
+
/datum/species/plasmaman/say_filter(mob/M, message, datum/language/speaking)
if(copytext(message, 1, 2) != "*")
message = replacetext(message, "s", stutter("ss"))
@@ -146,109 +155,7 @@
H.equip_or_collect(new /obj/item/weapon/plasmensuit_cartridge(H), slot_in_backpack) //Two refill cartridges for their suit. Can fit in boxes.
to_chat(H, "You are now running on plasma internals from the [H.s_store] in your [tank_slot_name]. You must breathe plasma in order to survive, and are extremely flammable.")
H.internal = H.get_item_by_slot(tank_slot)
- H.update_internals_hud_icon(1)
-
-// Plasmamen are so fucking different that they need their own proc.
-/datum/species/plasmaman/handle_breath(var/datum/gas_mixture/breath, var/mob/living/carbon/human/H)
- var/safe_plasma_min = 16 // Minimum safe partial pressure of PLASMA, in kPa
- //var/safe_oxygen_max = 140 // Maximum safe partial pressure of PLASMA, in kPa (Not used for now)
- var/safe_co2_max = 10 // Yes it's an arbitrary value who cares?
- var/SA_para_min = 1
- var/SA_sleep_min = 5
- var/plasma_used = 0
- var/nitrogen_used = 0
- var/breath_pressure = (breath.total_moles()*R_IDEAL_GAS_EQUATION*breath.temperature)/BREATH_VOLUME
-
- // Partial pressure of plasma
- var/Toxins_pp = (breath.toxins/breath.total_moles())*breath_pressure
- // And CO2, lets say a PP of more than 10 will be bad (It's a little less really, but eh, being passed out all round aint no fun)
- var/CO2_pp = (breath.carbon_dioxide/breath.total_moles())*breath_pressure // Tweaking to fit the hacky bullshit I've done with atmo -- TLE
-
- if(Toxins_pp < safe_plasma_min)
- if(prob(20))
- H.emote("gasp")
- if(Toxins_pp > 0)
- var/ratio = safe_plasma_min/Toxins_pp
- H.adjustOxyLoss(min(5*ratio, HUMAN_MAX_OXYLOSS)) // Don't fuck them up too fast (space only does HUMAN_MAX_OXYLOSS after all!)
- H.failed_last_breath = 1
- plasma_used = breath.toxins*ratio/6
- else
- H.adjustOxyLoss(HUMAN_MAX_OXYLOSS)
- H.failed_last_breath = 1
- H.oxygen_alert = max(H.oxygen_alert, 1)
-
- else // We're in safe limits
- H.failed_last_breath = 0
- H.adjustOxyLoss(-5)
- plasma_used = breath.toxins/6
- H.oxygen_alert = 0
-
- breath.toxins -= plasma_used
- breath.nitrogen -= nitrogen_used
- breath.carbon_dioxide += plasma_used
-
- //CO2 does not affect failed_last_breath. So if there was enough oxygen in the air but too much co2, this will hurt you, but only once per 4 ticks, instead of once per tick.
- if(CO2_pp > safe_co2_max)
- if(!H.co2overloadtime) // If it's the first breath with too much CO2 in it, lets start a counter, then have them pass out after 12s or so.
- H.co2overloadtime = world.time
- else if(world.time - H.co2overloadtime > 120)
- H.Paralyse(3)
- H.adjustOxyLoss(3) // Lets hurt em a little, let them know we mean business
- if(world.time - H.co2overloadtime > 300) // They've been in here 30s now, lets start to kill them for their own good!
- H.adjustOxyLoss(8)
- if(prob(20)) // Lets give them some chance to know somethings not right though I guess.
- H.emote("cough")
-
- else
- H.co2overloadtime = 0
-
- if(breath.trace_gases.len) // If there's some other shit in the air lets deal with it here.
- for(var/datum/gas/sleeping_agent/SA in breath.trace_gases)
- var/SA_pp = (SA.moles/breath.total_moles())*breath_pressure
- if(SA_pp > SA_para_min) // Enough to make us paralysed for a bit
- H.Paralyse(3) // 3 gives them one second to wake up and run away a bit!
- if(SA_pp > SA_sleep_min) // Enough to make us sleep as well
- H.AdjustSleeping(8, bound_lower = 0, bound_upper = 10)
- else if(SA_pp > 0.15) // There is sleeping gas in their lungs, but only a little, so give them a bit of a warning
- if(prob(20))
- H.emote(pick("giggle", "laugh"))
- SA.moles = 0
-
- if(abs(310.15 - breath.temperature) > 50) // Hot air hurts :(
- if(H.status_flags & GODMODE)
- return 1 //godmode
- if(breath.temperature < cold_level_1)
- if(prob(20))
- to_chat(src, "You feel your face freezing and an icicle forming in your lungs!")
- else if(breath.temperature > heat_level_1)
- if(prob(20))
- to_chat(src, "You feel your face burning and a searing heat in your lungs!")
-
- switch(breath.temperature)
- if(-INFINITY to cold_level_3)
- H.apply_damage(COLD_GAS_DAMAGE_LEVEL_3, BURN, "head", used_weapon = "Excessive Cold")
- H.fire_alert = max(H.fire_alert, 1)
-
- if(cold_level_3 to cold_level_2)
- H.apply_damage(COLD_GAS_DAMAGE_LEVEL_2, BURN, "head", used_weapon = "Excessive Cold")
- H.fire_alert = max(H.fire_alert, 1)
-
- if(cold_level_2 to cold_level_1)
- H.apply_damage(COLD_GAS_DAMAGE_LEVEL_1, BURN, "head", used_weapon = "Excessive Cold")
- H.fire_alert = max(H.fire_alert, 1)
-
- if(heat_level_1 to heat_level_2)
- H.apply_damage(HEAT_GAS_DAMAGE_LEVEL_1, BURN, "head", used_weapon = "Excessive Heat")
- H.fire_alert = max(H.fire_alert, 2)
-
- if(heat_level_2 to heat_level_3)
- H.apply_damage(HEAT_GAS_DAMAGE_LEVEL_2, BURN, "head", used_weapon = "Excessive Heat")
- H.fire_alert = max(H.fire_alert, 2)
-
- if(heat_level_3 to INFINITY)
- H.apply_damage(HEAT_GAS_DAMAGE_LEVEL_3, BURN, "head", used_weapon = "Excessive Heat")
- H.fire_alert = max(H.fire_alert, 2)
- return 1
+ H.update_action_buttons_icon()
/datum/species/plasmaman/handle_life(var/mob/living/carbon/human/H)
if(!istype(H.wear_suit, /obj/item/clothing/suit/space/eva/plasmaman) || !istype(H.head, /obj/item/clothing/head/helmet/space/eva/plasmaman))
@@ -264,6 +171,7 @@
if(istype(P))
P.Extinguish(H)
H.update_fire()
+ ..()
/datum/species/plasmaman/handle_reagents(var/mob/living/carbon/human/H, var/datum/reagent/R)
if(R.id == "plasma")
diff --git a/code/modules/mob/living/carbon/human/species/shadow.dm b/code/modules/mob/living/carbon/human/species/shadow.dm
index 6a48cda5811..7480d7e3a66 100644
--- a/code/modules/mob/living/carbon/human/species/shadow.dm
+++ b/code/modules/mob/living/carbon/human/species/shadow.dm
@@ -70,4 +70,5 @@
H.throw_alert("lightexposure", /obj/screen/alert/lightexposure)
else if(light_amount < 2) //heal in the dark
H.heal_overall_damage(1,1)
- H.clear_alert("lightexposure")
\ No newline at end of file
+ H.clear_alert("lightexposure")
+ ..()
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/human/species/skeleton.dm b/code/modules/mob/living/carbon/human/species/skeleton.dm
index eef78948f7a..d207dc20703 100644
--- a/code/modules/mob/living/carbon/human/species/skeleton.dm
+++ b/code/modules/mob/living/carbon/human/species/skeleton.dm
@@ -32,7 +32,6 @@
heat_level_1 = 999999999
heat_level_2 = 999999999
heat_level_3 = 999999999
- heat_level_3_breathe = 999999999
suicide_messages = list(
"is snapping their own bones!",
diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm
index 7a1c147a927..b7834d873f1 100644
--- a/code/modules/mob/living/carbon/human/species/species.dm
+++ b/code/modules/mob/living/carbon/human/species/species.dm
@@ -26,20 +26,15 @@
var/slowdown = 0 // Passive movement speed malus (or boost, if negative)
var/silent_steps = 0 // Stops step noises
- var/breath_type = "oxygen" // Non-oxygen gas breathed, if any.
- var/poison_type = "plasma" // Poisonous air.
- var/exhale_type = "carbon_dioxide" // Exhaled gas type.
-
var/cold_level_1 = 260 // Cold damage level 1 below this point.
var/cold_level_2 = 200 // Cold damage level 2 below this point.
var/cold_level_3 = 120 // Cold damage level 3 below this point.
- var/cold_env_multiplier = 1 // Damage multiplier for being in a cold environment
+ var/coldmod = 1 // Damage multiplier for being in a cold environment
var/heat_level_1 = 360 // Heat damage level 1 above this point.
var/heat_level_2 = 400 // Heat damage level 2 above this point.
var/heat_level_3 = 460 // Heat damage level 3 above this point; used for body temperature
- var/hot_env_multiplier = 1 // Damage multiplier for being in a hot environment
- var/heat_level_3_breathe = 1000 // Heat damage level 3 above this point; used for breathed air temperature
+ var/heatmod = 1 // Damage multiplier for being in a hot environment
var/body_temperature = 310.15 //non-IS_SYNTHETIC species will try to stabilize at this temperature. (also affects temperature processing)
var/reagent_tag //Used for metabolizing reagents.
@@ -56,19 +51,6 @@
var/warning_low_pressure = WARNING_LOW_PRESSURE // Low pressure warning.
var/hazard_low_pressure = HAZARD_LOW_PRESSURE // Dangerously low pressure.
- var/list/atmos_requirements = list(
- "min_oxy" = 16,
- "max_oxy" = 0,
- "min_nitro" = 0,
- "max_nitro" = 0,
- "min_tox" = 0,
- "max_tox" = 0.005,
- "min_co2" = 0,
- "max_co2" = 10,
- "sa_para" = 1,
- "sa_sleep" = 5
- )
-
var/brute_mod = 1 // Physical damage reduction/amplification
var/burn_mod = 1 // Burn damage reduction/amplification
var/tox_mod = 1 // Toxin damage reduction/amplification
@@ -94,6 +76,8 @@
var/list/species_traits = list()
+ var/breathid = "o2"
+
var/clothing_flags = 0 // Underwear and socks.
var/exotic_blood
var/bodyflags = 0
@@ -211,171 +195,9 @@
for(var/obj/item/organ/external/O in H.bodyparts)
O.owner = H
-/datum/species/proc/handle_breath(var/datum/gas_mixture/breath, var/mob/living/carbon/human/H)
- var/breath_pressure = (breath.total_moles()*R_IDEAL_GAS_EQUATION*breath.temperature)/BREATH_VOLUME
-
- var/O2_used = 0
- var/N2_used = 0
- var/Tox_used = 0
- var/CO2_used = 0
-
- //Partial pressure of the O2 in our breath
- var/O2_pp = (breath.oxygen/breath.total_moles()) * breath_pressure
- // Partial pressure of Nitrogen
- var/N2_pp = (breath.nitrogen/breath.total_moles()) * breath_pressure
- // Partial pressure of plasma
- var/Tox_pp = (breath.toxins/breath.total_moles()) * breath_pressure
- // Partial pressure of CO2
- var/CO2_pp = (breath.carbon_dioxide/breath.total_moles()) * breath_pressure
-
- if(O2_pp < atmos_requirements["min_oxy"])
- if(prob(20))
- H.emote("gasp")
-
- H.failed_last_breath = 1
- if(O2_pp > 0)
- var/ratio = atmos_requirements["min_oxy"] / O2_pp
- H.adjustOxyLoss(min(5 * ratio, HUMAN_MAX_OXYLOSS))
- else
- H.adjustOxyLoss(HUMAN_MAX_OXYLOSS)
- H.throw_alert("oxy", /obj/screen/alert/oxy)
- else if(atmos_requirements["max_oxy"] && O2_pp > atmos_requirements["max_oxy"])
- var/ratio = (breath.oxygen / atmos_requirements["max_oxy"]) * 1000
- H.adjustToxLoss(Clamp(ratio, MIN_PLASMA_DAMAGE, MAX_PLASMA_DAMAGE))
- H.throw_alert("oxy", /obj/screen/alert/too_much_oxy)
- else
- H.clear_alert("oxy")
- if(atmos_requirements["min_oxy"]) //species breathes this gas, so, they got their air
- H.failed_last_breath = 0
- H.adjustOxyLoss(-5)
- O2_used = breath.oxygen / 6
-
- if(N2_pp < atmos_requirements["min_nitro"])
- if(prob(20))
- H.emote("gasp")
-
- H.failed_last_breath = 1
- if(N2_pp > 0)
- var/ratio = atmos_requirements["min_nitro"] / N2_pp
- H.adjustOxyLoss(min(5 * ratio, HUMAN_MAX_OXYLOSS))
- else
- H.adjustOxyLoss(HUMAN_MAX_OXYLOSS)
- H.throw_alert("nitro", /obj/screen/alert/nitro)
- else if(atmos_requirements["max_nitro"] && N2_pp > atmos_requirements["max_nitro"])
- var/ratio = (breath.nitrogen / atmos_requirements["max_nitro"]) * 1000
- H.adjustToxLoss(Clamp(ratio, MIN_PLASMA_DAMAGE, MAX_PLASMA_DAMAGE))
- H.throw_alert("nitro", /obj/screen/alert/too_much_nitro)
- else
- H.clear_alert("nitro")
- if(atmos_requirements["min_nitro"]) //species breathes this gas, so they got their air
- H.failed_last_breath = 0
- H.adjustOxyLoss(-5)
- N2_used = breath.nitrogen / 6
-
- if(Tox_pp < atmos_requirements["min_tox"])
- if(prob(20))
- H.emote("gasp")
-
- H.failed_last_breath = 1
- if(Tox_pp > 0)
- var/ratio = atmos_requirements["min_tox"] / Tox_pp
- H.adjustOxyLoss(min(5 * ratio, HUMAN_MAX_OXYLOSS))
- else
- H.adjustOxyLoss(HUMAN_MAX_OXYLOSS)
- H.throw_alert("tox_in_air", /obj/screen/alert/not_enough_tox)
- else if(atmos_requirements["max_tox"] && Tox_pp > atmos_requirements["max_tox"])
- var/ratio = (breath.toxins / atmos_requirements["max_tox"]) * 10
- if(H.reagents)
- H.reagents.add_reagent("plasma", Clamp(ratio, MIN_PLASMA_DAMAGE, MAX_PLASMA_DAMAGE))
- H.throw_alert("tox_in_air", /obj/screen/alert/tox_in_air)
- else
- H.clear_alert("tox_in_air")
- if(atmos_requirements["min_tox"]) //species breathes this gas, so, they got their air
- H.failed_last_breath = 0
- H.adjustOxyLoss(-5)
- Tox_used = breath.toxins / 6
-
- if(CO2_pp < atmos_requirements["min_co2"])
- if(prob(20))
- H.emote("gasp")
-
- H.failed_last_breath = 1
- if(CO2_pp)
- var/ratio = atmos_requirements["min_co2"] / CO2_pp
- H.adjustOxyLoss(min(5 * ratio, HUMAN_MAX_OXYLOSS))
- else
- H.adjustOxyLoss(HUMAN_MAX_OXYLOSS)
- H.throw_alert("co2", /obj/screen/alert/not_enough_co2)
- else if(atmos_requirements["max_co2"] && CO2_pp > atmos_requirements["max_co2"])
- if(!H.co2overloadtime) // If it's the first breath with too much CO2 in it, lets start a counter, then have them pass out after 12s or so.
- H.co2overloadtime = world.time
- else if(world.time - H.co2overloadtime > 120)
- H.Paralyse(5)
- H.adjustOxyLoss(3) // Lets hurt em a little, let them know we mean business
- if(world.time - H.co2overloadtime > 300) // They've been in here 30s now, lets start to kill them for their own good!
- H.adjustOxyLoss(8)
- if(prob(20)) // Lets give them some chance to know somethings not right though I guess.
- H.emote("cough")
- else
- H.clear_alert("co2")
- H.co2overloadtime = 0
- if(atmos_requirements["min_co2"]) //species breathes this gas, so they got their air
- H.failed_last_breath = 0
- H.adjustOxyLoss(-5)
- CO2_used = breath.carbon_dioxide / 6
-
- breath.oxygen -= O2_used
- breath.nitrogen -= N2_used
- breath.toxins -= Tox_used
- breath.carbon_dioxide -= CO2_used
- breath.carbon_dioxide += O2_used
-
-
- if(breath.trace_gases.len) // If there's some other shit in the air lets deal with it here.
- for(var/datum/gas/sleeping_agent/SA in breath.trace_gases)
- var/SA_pp = (SA.moles / breath.total_moles()) * breath_pressure
- if(SA_pp > atmos_requirements["sa_para"]) // Enough to make us paralysed for a bit
- H.Paralyse(3) // 3 gives them one second to wake up and run away a bit!
- if(SA_pp > atmos_requirements["sa_sleep"]) // Enough to make us sleep as well
- // This value is large because breaths are taken only once every 4 life ticks.
- H.AdjustSleeping(8, bound_lower = 0, bound_upper = 10)
- else if(SA_pp > 0.01) // There is sleeping gas in their lungs, but only a little, so give them a bit of a warning
- if(prob(20))
- H.emote(pick("giggle", "laugh"))
-
- handle_temperature(breath, H)
- return 1
-
-/datum/species/proc/handle_temperature(datum/gas_mixture/breath, var/mob/living/carbon/human/H) // called by human/life, handles temperatures
- if(abs(310.15 - breath.temperature) > 50) // Hot air hurts :(
- if(H.status_flags & GODMODE) return 1 //godmode
- if(breath.temperature < cold_level_1)
- if(prob(20))
- to_chat(H, "You feel your face freezing and an icicle forming in your lungs!")
- else if(breath.temperature > heat_level_1)
- if(prob(20))
- to_chat(H, "You feel your face burning and a searing heat in your lungs!")
-
-
-
- switch(breath.temperature)
- if(-INFINITY to cold_level_3)
- H.apply_damage(cold_env_multiplier*COLD_GAS_DAMAGE_LEVEL_3, BURN, "head", used_weapon = "Excessive Cold")
-
- if(cold_level_3 to cold_level_2)
- H.apply_damage(cold_env_multiplier*COLD_GAS_DAMAGE_LEVEL_2, BURN, "head", used_weapon = "Excessive Cold")
-
- if(cold_level_2 to cold_level_1)
- H.apply_damage(cold_env_multiplier*COLD_GAS_DAMAGE_LEVEL_1, BURN, "head", used_weapon = "Excessive Cold")
-
- if(heat_level_1 to heat_level_2)
- H.apply_damage(hot_env_multiplier*HEAT_GAS_DAMAGE_LEVEL_1, BURN, "head", used_weapon = "Excessive Heat")
-
- if(heat_level_2 to heat_level_3_breathe)
- H.apply_damage(hot_env_multiplier*HEAT_GAS_DAMAGE_LEVEL_2, BURN, "head", used_weapon = "Excessive Heat")
-
- if(heat_level_3_breathe to INFINITY)
- H.apply_damage(hot_env_multiplier*HEAT_GAS_DAMAGE_LEVEL_3, BURN, "head", used_weapon = "Excessive Heat")
+/datum/species/proc/breathe(mob/living/carbon/human/H)
+ if((NO_BREATHE in species_traits) || (BREATHLESS in H.mutations))
+ return TRUE
////////////////
// MOVE SPEED //
@@ -477,7 +299,9 @@
// For special snowflake species effects
// (Slime People changing color based on the reagents they consume)
/datum/species/proc/handle_life(var/mob/living/carbon/human/H)
- return 1
+ if((NO_BREATHE in species_traits) || (BREATHLESS in H.mutations))
+ H.setOxyLoss(0)
+ H.SetLoseBreath(0)
/datum/species/proc/handle_dna(var/mob/living/carbon/C, var/remove) //Handles DNA mutations, as that doesn't work at init. Make sure you call genemutcheck on any blocks changed here
return
@@ -741,7 +565,5 @@ It'll return null if the organ doesn't correspond, so include null checks when u
H.see_invisible = H.see_override
/datum/species/proc/water_act(mob/living/carbon/human/M, volume, temperature, source)
- if(temperature >= 330)
- M.bodytemperature = M.bodytemperature + (temperature - M.bodytemperature)
- if(temperature <= 280)
- M.bodytemperature = M.bodytemperature - (M.bodytemperature - temperature)
\ No newline at end of file
+ if(abs(temperature - M.bodytemperature) > 10) //If our water and mob temperature varies by more than 10K, cool or/ heat them appropriately
+ M.bodytemperature = (temperature + M.bodytemperature) * 0.5 //Approximation for gradual heating or cooling
diff --git a/code/modules/mob/living/carbon/human/species/station.dm b/code/modules/mob/living/carbon/human/species/station.dm
index 0d5b14db6c2..b895ed0fdd4 100644
--- a/code/modules/mob/living/carbon/human/species/station.dm
+++ b/code/modules/mob/living/carbon/human/species/station.dm
@@ -50,7 +50,6 @@
heat_level_1 = 380 //Default 360 - Higher is better
heat_level_2 = 420 //Default 400
heat_level_3 = 480 //Default 460
- heat_level_3_breathe = 1100 //Default 1000
flesh_color = "#34AF10"
reagent_tag = PROCESS_ORG
@@ -106,7 +105,6 @@
heat_level_1 = 340
heat_level_2 = 380
heat_level_3 = 440
- heat_level_3_breathe = 900
primitive_form = "Farwa"
@@ -276,24 +274,10 @@
cold_level_2 = 50
cold_level_3 = 0
- atmos_requirements = list(
- "min_oxy" = 0,
- "max_oxy" = 1,
- "min_nitro" = 16,
- "max_nitro" = 0,
- "min_tox" = 0,
- "max_tox" = 0.005,
- "min_co2" = 0,
- "max_co2" = 10,
- "sa_para" = 1,
- "sa_sleep" = 5
- )
+ breathid = "n2"
eyes = "vox_eyes_s"
- breath_type = "nitrogen"
- poison_type = "oxygen"
-
species_traits = list(NO_SCAN, IS_WHITELISTED, NOTRANSSTING)
clothing_flags = HAS_SOCKS
dietflags = DIET_OMNI
@@ -326,7 +310,7 @@
has_organ = list(
"heart" = /obj/item/organ/internal/heart,
- "lungs" = /obj/item/organ/internal/lungs,
+ "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,
@@ -368,7 +352,7 @@
H.equip_or_collect(new /obj/item/weapon/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_internals_hud_icon(1)
+ H.update_action_buttons_icon()
/datum/species/vox/handle_post_spawn(var/mob/living/carbon/human/H)
updatespeciescolor(H)
@@ -438,14 +422,11 @@
heat_level_1 = 2000
heat_level_2 = 3000
heat_level_3 = 4000
- heat_level_3_breathe = 4000
brute_mod = 0.2
burn_mod = 0.2
eyes = "blank_eyes"
- breath_type = "nitrogen"
- poison_type = "oxygen"
species_traits = list(NO_SCAN, NO_BLOOD, NO_PAIN, IS_WHITELISTED)
bodyflags = HAS_TAIL
@@ -461,7 +442,7 @@
has_organ = list(
"heart" = /obj/item/organ/internal/heart,
- "lungs" = /obj/item/organ/internal/lungs,
+ "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,
@@ -538,7 +519,7 @@
cold_level_1 = 280
cold_level_2 = 240
cold_level_3 = 200
- cold_env_multiplier = 3
+ coldmod = 3
oxy_mod = 0
brain_mod = 2.5
@@ -593,7 +574,7 @@
E.sync_colour_to_human(H)
H.update_hair(0)
H.update_body()
- return ..()
+ ..()
#undef SLIMEPERSON_COLOR_SHIFT_TRIGGER
#undef SLIMEPERSON_ICON_UPDATE_PERIOD
@@ -789,7 +770,6 @@
heat_level_1 = 300
heat_level_2 = 340
heat_level_3 = 400
- heat_level_3_breathe = 700
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; \
@@ -877,6 +857,7 @@
H.adjustFireLoss(-(light_amount/4))
if(H.nutrition < NUTRITION_LEVEL_STARVING+50)
H.take_overall_damage(10,0)
+ ..()
/datum/species/machine
name = "Machine"
@@ -1012,13 +993,12 @@
cold_level_1 = -1 //Default 260 - Lower is better
cold_level_2 = -1 //Default 200
cold_level_3 = -1 //Default 120
- cold_env_multiplier = -1
+ coldmod = -1
heat_level_1 = 300 //Default 360 - Higher is better
heat_level_2 = 340 //Default 400
heat_level_3 = 400 //Default 460
- heat_level_3_breathe = 600 //Default 1000
- hot_env_multiplier = 2
+ heatmod = 2
flesh_color = "#a3d4eb"
reagent_tag = PROCESS_ORG
@@ -1032,40 +1012,4 @@
"metabolic strainer" = /obj/item/organ/internal/liver/drask,
"eyes" = /obj/item/organ/internal/eyes/drask, //5 darksight.
"brain" = /obj/item/organ/internal/brain/drask
- )
-
-/datum/species/drask/handle_temperature(datum/gas_mixture/breath, var/mob/living/carbon/human/H)
- if( abs(310.15 - breath.temperature) > 50)
- if(H.status_flags & GODMODE) return 1 //godmode
- if(breath.temperature < 260)
- if(prob(20))
- to_chat(H, " You feel an invigorating coldness in your lungs!")
- if(breath.temperature > heat_level_1)
- if(prob(20))
- to_chat(H, "You feel your face burning and a searing heat in your lungs!")
-
- switch(breath.temperature)
-
- if(-INFINITY to 60)
- H.adjustFireLoss(cold_env_multiplier*COLD_GAS_DAMAGE_LEVEL_3*0.5) //3 points healed, applied every 4 ticks
- H.adjustBruteLoss(cold_env_multiplier*COLD_GAS_DAMAGE_LEVEL_3)
- H.throw_alert("temp", /obj/screen/alert/cold/drask, 3)
-
- if(61 to 200)
- H.adjustFireLoss(cold_env_multiplier*COLD_GAS_DAMAGE_LEVEL_2*0.5) //1.5 healed every 4 ticks
- H.adjustBruteLoss(cold_env_multiplier*COLD_GAS_DAMAGE_LEVEL_2)
- H.throw_alert("temp", /obj/screen/alert/cold/drask, 2)
-
- if(201 to 260)
- H.adjustFireLoss(cold_env_multiplier*COLD_GAS_DAMAGE_LEVEL_1*0.5) //0.5 healed every 4 ticks
- H.adjustBruteLoss(cold_env_multiplier*COLD_GAS_DAMAGE_LEVEL_1)
- H.throw_alert("temp", /obj/screen/alert/cold/drask, 1)
-
- if(heat_level_1 to heat_level_2)
- H.apply_damage(hot_env_multiplier*HEAT_GAS_DAMAGE_LEVEL_1, BURN, "head", used_weapon = "Excessive Heat")
-
- if(heat_level_2 to heat_level_3_breathe)
- H.apply_damage(hot_env_multiplier*HEAT_GAS_DAMAGE_LEVEL_2, BURN, "head", used_weapon = "Excessive Heat")
-
- if(heat_level_3_breathe to INFINITY)
- H.apply_damage(hot_env_multiplier*HEAT_GAS_DAMAGE_LEVEL_3, BURN, "head", used_weapon = "Excessive Heat")
+ )
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm
index 90ee068486f..e06edd7fcaf 100644
--- a/code/modules/mob/living/carbon/human/update_icons.dm
+++ b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -539,7 +539,7 @@ var/global/list/damage_icon_parts = list()
if(LASER)
standing.overlays += "lasereyes_s"
add_image = 1
- if((RESIST_COLD in mutations) && (RESIST_HEAT in mutations))
+ if((COLDRES in mutations) && (HEATRES in mutations))
standing.underlays -= "cold[fat]_s"
standing.underlays -= "fire[fat]_s"
standing.underlays += "coldfire[fat]_s"
diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm
index 5e09625a776..15938e39ef2 100644
--- a/code/modules/mob/living/carbon/life.dm
+++ b/code/modules/mob/living/carbon/life.dm
@@ -27,7 +27,7 @@
//Start of a breath chain, calls breathe()
/mob/living/carbon/handle_breathing()
- if(mob_master.current_cycle%4==2 || failed_last_breath)
+ if(mob_master.current_cycle % 4 == 2 || failed_last_breath)
breathe() //Breathe per 4 ticks, unless suffocating
else
if(istype(loc, /obj/))
@@ -40,8 +40,6 @@
return
if(istype(loc, /obj/machinery/atmospherics/unary/cryo_cell))
return
- if(NO_BREATH in mutations)
- return // No breath mutation means no breathing.
var/datum/gas_mixture/environment
if(loc)
@@ -52,6 +50,7 @@
if(health <= config.health_threshold_crit)
AdjustLoseBreath(1)
+ //Suffocate
if(losebreath > 0)
AdjustLoseBreath(-1)
if(prob(10))
@@ -75,7 +74,6 @@
breath_moles = environment.total_moles()*BREATH_PERCENTAGE
breath = loc.remove_air(breath_moles)
-
else //Breathe from loc as obj again
if(istype(loc, /obj/))
var/obj/loc_as_obj = loc
@@ -90,14 +88,18 @@
//Third link in a breath chain, calls handle_breath_temperature()
/mob/living/carbon/proc/check_breath(datum/gas_mixture/breath)
if(status_flags & GODMODE)
- return 0
+ return FALSE
+
+ var/lungs = get_organ_slot("lungs")
+ if(!lungs)
+ adjustOxyLoss(2)
//CRIT
- if(!breath || (breath.total_moles() == 0))
+ if(!breath || (breath.total_moles() == 0) || !lungs)
adjustOxyLoss(1)
- failed_last_breath = 1
- throw_alert("oxy", /obj/screen/alert/oxy)
- return 0
+ failed_last_breath = TRUE
+ throw_alert("not_enough_oxy", /obj/screen/alert/not_enough_oxy)
+ return FALSE
var/safe_oxy_min = 16
var/safe_co2_max = 10
@@ -117,20 +119,20 @@
if(prob(20))
emote("gasp")
if(O2_partialpressure > 0)
- var/ratio = safe_oxy_min/O2_partialpressure
+ var/ratio = 1 - O2_partialpressure/safe_oxy_min
adjustOxyLoss(min(5*ratio, 3))
- failed_last_breath = 1
- oxygen_used = breath.oxygen*ratio/6
+ failed_last_breath = TRUE
+ oxygen_used = breath.oxygen*ratio
else
adjustOxyLoss(3)
- failed_last_breath = 1
- throw_alert("oxy", /obj/screen/alert/oxy)
+ failed_last_breath = TRUE
+ throw_alert("not_enough_oxy", /obj/screen/alert/not_enough_oxy)
else //Enough oxygen
- failed_last_breath = 0
+ failed_last_breath = FALSE
adjustOxyLoss(-5)
- oxygen_used = breath.oxygen/6
- clear_alert("oxy")
+ oxygen_used = breath.oxygen
+ clear_alert("not_enough_oxy")
breath.oxygen -= oxygen_used
breath.carbon_dioxide += oxygen_used
@@ -146,17 +148,17 @@
adjustOxyLoss(8)
if(prob(20))
emote("cough")
+
else
co2overloadtime = 0
//TOXINS/PLASMA
if(Toxins_partialpressure > safe_tox_max)
var/ratio = (breath.toxins/safe_tox_max) * 10
- if(reagents)
- reagents.add_reagent("plasma", Clamp(ratio, MIN_PLASMA_DAMAGE, MAX_PLASMA_DAMAGE))
- throw_alert("tox_in_air", /obj/screen/alert/tox_in_air)
+ adjustToxLoss(Clamp(ratio, MIN_TOXIC_GAS_DAMAGE, MAX_TOXIC_GAS_DAMAGE))
+ throw_alert("too_much_tox", /obj/screen/alert/too_much_tox)
else
- clear_alert("tox_in_air")
+ clear_alert("too_much_tox")
//TRACE GASES
if(breath.trace_gases.len)
@@ -173,7 +175,7 @@
//BREATH TEMPERATURE
handle_breath_temperature(breath)
- return 1
+ return TRUE
//Fourth and final link in a breath chain
/mob/living/carbon/proc/handle_breath_temperature(datum/gas_mixture/breath)
@@ -189,12 +191,9 @@
internal = null //turn off internals
if(internal)
- update_internals_hud_icon(1)
return internal.remove_air_volume(volume_needed)
else
- update_internals_hud_icon(0)
-
- return
+ update_action_buttons_icon()
/mob/living/carbon/handle_diseases()
for(var/thing in viruses)
diff --git a/code/modules/mob/living/carbon/slime/life.dm b/code/modules/mob/living/carbon/slime/life.dm
index 6e3221c19fa..e0afe00ada2 100644
--- a/code/modules/mob/living/carbon/slime/life.dm
+++ b/code/modules/mob/living/carbon/slime/life.dm
@@ -12,6 +12,9 @@
if(!ckey)
handle_speech_and_mood()
+/mob/living/carbon/slime/breathe()
+ return
+
/mob/living/carbon/slime/proc/AIprocess() // the master AI process
if(AIproc || stat == DEAD || client) return
diff --git a/code/modules/mob/living/carbon/slime/slime.dm b/code/modules/mob/living/carbon/slime/slime.dm
index 28e457fd128..d1bcb196c0e 100644
--- a/code/modules/mob/living/carbon/slime/slime.dm
+++ b/code/modules/mob/living/carbon/slime/slime.dm
@@ -66,6 +66,10 @@
coretype = text2path("/obj/item/slime_extract/[sanitizedcolour]")
..()
+/mob/living/carbon/slime/random/New()
+ colour = pick("grey","orange", "metal", "blue", "purple", "dark purple", "dark blue", "green", "silver", "yellow", "gold", "yellow", "red", "silver", "pink", "cerulean", "sepia", "bluespace", "pyrite", "light pink", "oil", "adamantine", "black")
+ ..()
+
/mob/living/carbon/slime/Destroy()
for(var/obj/machinery/computer/camera_advanced/xenobio/X in machines)
if(src in X.stored_slimes)
diff --git a/code/modules/mob/living/carbon/superheroes.dm b/code/modules/mob/living/carbon/superheroes.dm
index b6b2c707ddb..f98b2563f08 100644
--- a/code/modules/mob/living/carbon/superheroes.dm
+++ b/code/modules/mob/living/carbon/superheroes.dm
@@ -7,7 +7,7 @@
var/name
var/desc
var/class
- var/list/default_genes = list(REGEN, NO_BREATH, RESIST_COLD)
+ var/list/default_genes = list(REGEN, BREATHLESS, COLDRES)
var/list/default_spells = list()
/datum/superheroes/proc/create(var/mob/living/carbon/human/H)
@@ -188,7 +188,7 @@
switch(progress)
if(1)
to_chat(user, "You begin by introducing yourself and explaining what you're about.")
- user.visible_message("[user]'s introduces himself and explains his plans.")
+ user.visible_message("[user] introduces \himself and explains \his plans.")
if(2)
to_chat(user, "You begin the recruitment of [target].")
user.visible_message("[user] leans over towards [target], whispering excitedly as he gives a speech.")
@@ -214,7 +214,7 @@
recruiting = 0
to_chat(user, "You have recruited [target] as your henchman!")
to_chat(target, "You have decided to enroll as a henchman for [user]. You are now part of the feared 'Greyshirts'.")
- to_chat(target, "You must follow the orders of [user], and help him succeed in his dastardly schemes.")
+ to_chat(target, "You must follow the orders of [user], and help him succeed in \his dastardly schemes.")
to_chat(target, "You may not harm other Greyshirt or [user]. However, you do not need to obey other Greyshirts.")
ticker.mode.greyshirts += target.mind
target.set_species("Human")
diff --git a/code/modules/mob/living/death.dm b/code/modules/mob/living/death.dm
index 8a043dbf591..9056a078791 100644
--- a/code/modules/mob/living/death.dm
+++ b/code/modules/mob/living/death.dm
@@ -1,6 +1,9 @@
/mob/living/death(gibbed)
blinded = max(blinded, 1)
+ if(suiciding)
+ mind.suicided = TRUE
+
clear_fullscreens()
update_action_buttons_icon()
@@ -11,4 +14,7 @@
var/datum/soullink/S = s
S.sharerDies(gibbed, src)
+ med_hud_set_health()
+ med_hud_set_status()
+
..(gibbed)
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 7c1968d4004..e38b2e6fd4e 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -1,7 +1,30 @@
+/mob/living/New()
+ . = ..()
+ var/datum/atom_hud/data/human/medical/advanced/medhud = huds[DATA_HUD_MEDICAL_ADVANCED]
+ medhud.add_to_hud(src)
+
+/mob/living/prepare_huds()
+ ..()
+ prepare_data_huds()
+
+/mob/living/proc/prepare_data_huds()
+ ..()
+ med_hud_set_health()
+ med_hud_set_status()
+
/mob/living/Destroy()
if(ranged_ability)
ranged_ability.remove_ranged_ability(src)
+ remove_from_all_data_huds()
+
+ if(LAZYLEN(status_effects))
+ for(var/s in status_effects)
+ var/datum/status_effect/S = s
+ if(S.on_remove_on_mob_delete) //the status effect calls on_remove when its mob is deleted
+ qdel(S)
+ else
+ S.be_replaced()
return ..()
/mob/living/ghostize(can_reenter_corpse = 1)
@@ -214,6 +237,7 @@
stat = CONSCIOUS
return
health = maxHealth - getOxyLoss() - getToxLoss() - getFireLoss() - getBruteLoss() - getCloneLoss()
+ med_hud_set_health()
//This proc is used for mobs which are affected by pressure to calculate the amount of pressure that actually
@@ -896,13 +920,13 @@
// And animate the attack!
animate(I, alpha = 175, pixel_x = 0, pixel_y = 0, pixel_z = 0, time = 3)
-/atom/movable/proc/receive_damage(atom/A)
+/atom/movable/proc/receiving_damage(atom/A)
var/pixel_x_diff = rand(-3,3)
var/pixel_y_diff = rand(-3,3)
animate(src, pixel_x = pixel_x + pixel_x_diff, pixel_y = pixel_y + pixel_y_diff, time = 2)
animate(pixel_x = initial(pixel_x), pixel_y = initial(pixel_y), time = 2)
-/mob/living/receive_damage(atom/A)
+/mob/living/receiving_damage(atom/A)
..()
floating = 0 // If we were without gravity, the bouncing animation got stopped, so we make sure we restart the bouncing after the next movement.
@@ -1036,7 +1060,7 @@
return //no message spam
if(final_taste_list.len == 0)//too many reagents - none meet their thresholds
- to_chat(src, "You you can't really make out what you're tasting...")
+ to_chat(src, "You can't really make out what you're tasting...")
return
to_chat(src, "You can taste [english_list(final_taste_list)].")
diff --git a/code/modules/mob/living/living_defines.dm b/code/modules/mob/living/living_defines.dm
index c120742f7c0..4afdd9281ce 100644
--- a/code/modules/mob/living/living_defines.dm
+++ b/code/modules/mob/living/living_defines.dm
@@ -43,6 +43,8 @@
var/list/icon/pipes_shown = list()
var/last_played_vent
+ var/smoke_delay = 0 //used to prevent spam with smoke reagent reaction on mob.
+
var/step_count = 0
var/list/butcher_results = null
@@ -62,3 +64,7 @@
var/list/recent_tastes = list()
var/blood_volume = 0 //how much blood the mob has
+ 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/say.dm b/code/modules/mob/living/say.dm
index 81664f631d4..ac2ad648c70 100644
--- a/code/modules/mob/living/say.dm
+++ b/code/modules/mob/living/say.dm
@@ -30,6 +30,7 @@ var/list/department_radio_keys = list(
":U" = "Supply", "#U" = "Supply", ".U" = "Supply",
":Z" = "Service", "#Z" = "Service", ".Z" = "Service",
":P" = "AI Private", "#P" = "AI Private", ".P" = "AI Private",
+ ":$" = "Response Team", "#$" = "Response Team", ".$" = "Response Team",
":-" = "Special Ops", "#-" = "Special Ops", ".-" = "Special Ops",
":_" = "SyndTeam", "#_" = "SyndTeam", "._" = "SyndTeam",
":X" = "cords", "#X" = "cords", ".X" = "cords"
@@ -163,10 +164,10 @@ proc/get_radio_key_from_channel(var/channel)
if(is_muzzled())
var/obj/item/clothing/mask/muzzle/G = wear_mask
- if(G.mute) //if the mask is supposed to mute you completely or just muffle you
+ if(G.mute == MUTE_ALL) //if the mask is supposed to mute you completely or just muffle you
to_chat(src, "You're muzzled and cannot speak!")
return
- else
+ else if(G.mute == MUTE_MUFFLE)
message = muffledspeech(message)
verb = "mumbles"
diff --git a/code/modules/mob/living/silicon/pai/recruit.dm b/code/modules/mob/living/silicon/pai/recruit.dm
index f29b402dd50..991bc5c61c7 100644
--- a/code/modules/mob/living/silicon/pai/recruit.dm
+++ b/code/modules/mob/living/silicon/pai/recruit.dm
@@ -360,7 +360,7 @@ var/datum/paiController/paiController // Global handler for pAI candidates
return 0
if(!player_old_enough_antag(O.client,ROLE_PAI))
return 0
- if(O.has_enabled_antagHUD == 1 && config.antag_hud_restricted)
+ if(cannotPossess(O))
return 0
if(!(O in respawnable_list))
return 0
diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm
index c0e8af8e998..81a1958d22c 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone.dm
@@ -1,3 +1,4 @@
+#define EMAG_TIMER 3000
/mob/living/silicon/robot/drone
name = "drone"
real_name = "drone"
@@ -30,6 +31,7 @@
var/mail_destination = 0
var/reboot_cooldown = 60 // one minute
var/last_reboot
+ var/emagged_time
holder_type = /obj/item/weapon/holder/drone
// var/sprite[0]
@@ -180,14 +182,21 @@
return
to_chat(user, "You swipe the sequencer across [src]'s interface and watch its eyes flicker.")
- to_chat(src, "You feel a sudden burst of malware loaded into your execute-as-root buffer. Your tiny brain methodically parses, loads and executes the script.")
+
+ if(jobban_isbanned(src, ROLE_SYNDICATE))
+ ticker.mode.replace_jobbanned_player(src, ROLE_SYNDICATE)
+
+ to_chat(src, "You feel a sudden burst of malware loaded into your execute-as-root buffer. Your tiny brain methodically parses, loads and executes the script. You sense you have five minutes before the drone server detects this and automatically shuts you down.")
message_admins("[key_name_admin(user)] emagged drone [key_name_admin(src)]. Laws overridden.")
log_game("[key_name(user)] emagged drone [key_name(src)]. Laws overridden.")
var/time = time2text(world.realtime,"hh:mm:ss")
lawchanges.Add("[time] : [H.name]([H.key]) emagged [name]([key])")
+ emagged_time = world.time
emagged = 1
+ density = 1
+ pass_flags = 0
icon_state = "repairbot-emagged"
holder_type = /obj/item/weapon/holder/drone/emagged
update_icons()
@@ -196,11 +205,11 @@
clear_supplied_laws()
clear_inherent_laws()
laws = new /datum/ai_laws/syndicate_override
- set_zeroth_law("Only [H.real_name] and people he designates as being such are Syndicate Agents.")
+ set_zeroth_law("Only [H.real_name] and people [H.real_name] designates as being such are Syndicate Agents.")
to_chat(src, "Obey these laws:")
laws.show_laws(src)
- to_chat(src, "ALERT: [H.real_name] is your new master. Obey your new laws and his commands.")
+ to_chat(src, "ALERT: [H.real_name] is your new master. Obey your new laws and [H.real_name]'s commands.")
return
//DRONE LIFE/DEATH
@@ -245,13 +254,16 @@
full_law_reset()
show_laws()
-/mob/living/silicon/robot/drone/proc/shut_down()
- if(stat != 2)
- if(emagged)
- to_chat(src, "You feel a system kill order percolate through your tiny brain, but it doesn't seem like a good idea to you.")
- else
- to_chat(src, "You feel a system kill order percolate through your tiny brain, and you obediently destroy yourself.")
- death()
+/mob/living/silicon/robot/drone/proc/shut_down(force=FALSE)
+ if(stat == 2)
+ return
+
+ if(emagged && !force)
+ to_chat(src, "You feel a system kill order percolate through your tiny brain, but it doesn't seem like a good idea to you.")
+ return
+
+ to_chat(src, "You feel a system kill order percolate through your tiny brain, and you obediently destroy yourself.")
+ death()
/mob/living/silicon/robot/drone/proc/full_law_reset()
clear_supplied_laws()
@@ -263,7 +275,7 @@
/mob/living/silicon/robot/drone/proc/request_player()
for(var/mob/dead/observer/O in player_list)
- if(O.has_enabled_antagHUD == 1 && config.antag_hud_restricted)
+ if(cannotPossess(O))
continue
if(jobban_isbanned(O,"nonhumandept") || jobban_isbanned(O,"Drone"))
continue
@@ -347,6 +359,11 @@
/mob/living/silicon/robot/drone/update_canmove(delay_action_updates = 0)
. = ..()
+ if(emagged)
+ density = 1
+ if(world.time - emagged_time > EMAG_TIMER)
+ shut_down(TRUE)
+ return
density = 0 //this is reset every canmove update otherwise
/mob/living/simple_animal/drone/flash_eyes(intensity = 1, override_blindness_check = 0, affect_silicon = 0)
diff --git a/code/modules/mob/living/silicon/robot/drone/drone_items.dm b/code/modules/mob/living/silicon/robot/drone/drone_items.dm
index d1e81013dce..5de7e5f682a 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone_items.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone_items.dm
@@ -24,7 +24,6 @@
/obj/item/mounted/frame/firealarm,
/obj/item/mounted/frame/newscaster_frame,
/obj/item/mounted/frame/intercom,
- /obj/item/weapon/table_parts,
/obj/item/weapon/rack_parts,
/obj/item/weapon/camera_assembly,
/obj/item/weapon/tank,
diff --git a/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm b/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm
index 767a78e1f77..790ecaa399a 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm
@@ -118,7 +118,7 @@
var/joinedasobserver = 0
if(istype(src,/mob/dead/observer))
var/mob/dead/observer/G = src
- if(G.has_enabled_antagHUD == 1 && config.antag_hud_restricted)
+ if(cannotPossess(G))
to_chat(usr, "Upon using the antagHUD you forfeited the ability to join the round.")
return
if(G.started_as_observer == 1)
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 5079f290240..e3df2023664 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -50,6 +50,12 @@ var/list/robot_verbs_default = list(
var/opened = 0
var/emagged = 0
+
+ var/list/force_modules = list()
+ var/allow_rename = TRUE
+ var/weapons_unlock = FALSE
+ var/static_radio_channels = FALSE
+
var/wiresexposed = 0
var/locked = 1
var/list/req_access = list(access_robotics)
@@ -59,7 +65,7 @@ var/list/robot_verbs_default = list(
var/viewalerts = 0
var/modtype = "Default"
var/lower_mod = 0
- var/datum/effect/system/spark_spread/spark_system//So they can initialize sparks whenever/N
+ var/datum/effect_system/spark_spread/spark_system//So they can initialize sparks whenever/N
var/jeton = 0
var/low_power_mode = 0 //whether the robot has no charge left.
var/weapon_lock = 0
@@ -85,13 +91,13 @@ var/list/robot_verbs_default = list(
var/magpulse = 0
var/ionpulse = 0 // Jetpack-like effect.
var/ionpulse_on = 0 // Jetpack-like effect.
- var/datum/effect/system/ion_trail_follow/ion_trail // Ionpulse effect.
+ var/datum/effect_system/trail_follow/ion/ion_trail // Ionpulse effect.
var/datum/action/item_action/toggle_research_scanner/scanner = null
var/list/module_actions = list()
/mob/living/silicon/robot/New(loc,var/syndie = 0,var/unfinished = 0, var/alien = 0)
- spark_system = new /datum/effect/system/spark_spread()
+ spark_system = new /datum/effect_system/spark_spread()
spark_system.set_up(5, 0, src)
spark_system.attach(src)
@@ -215,7 +221,9 @@ var/list/robot_verbs_default = list(
set category = "Robot Commands"
if(custom_name)
return 0
-
+ if(!allow_rename)
+ to_chat(src, "Rename functionality is not enabled on this unit.");
+ return 0
rename_self(braintype, 1)
/mob/living/silicon/robot/proc/sync()
@@ -266,11 +274,9 @@ var/list/robot_verbs_default = list(
/mob/living/silicon/robot/proc/pick_module()
if(module)
return
- var/list/modules = list("Standard", "Engineering", "Medical", "Miner", "Janitor", "Service")
- if(!config.forbid_secborg)
- modules += "Security"
- if(!config.forbid_peaceborg)
- modules += "Peacekeeper"
+ var/list/modules = list("Standard", "Engineering", "Medical", "Miner", "Janitor", "Service", "Security")
+ if(islist(force_modules) && force_modules.len)
+ modules = force_modules.Copy()
if(security_level == (SEC_LEVEL_GAMMA || SEC_LEVEL_EPSILON) || crisis)
to_chat(src, "Crisis mode active. Combat module available.")
modules += "Combat"
@@ -344,11 +350,6 @@ var/list/robot_verbs_default = list(
module_sprites["Noble-SEC"] = "Noble-SEC"
status_flags &= ~CANPUSH
- if("Peacekeeper")
- module = new /obj/item/weapon/robot_module/peacekeeper(src)
- module_sprites["Peacekeeper"] = "peace"
- status_flags &= ~CANPUSH
-
if("Engineering")
module = new /obj/item/weapon/robot_module/engineering(src)
module.channels = list("Engineering" = 1)
@@ -401,11 +402,12 @@ var/list/robot_verbs_default = list(
feedback_inc("cyborg_[lowertext(modtype)]",1)
rename_character(real_name, get_default_name())
- if(modtype == "Medical" || modtype == "Security" || modtype == "Combat" || modtype == "Peacekeeper" || modtype == "Nations")
+ if(modtype == "Medical" || modtype == "Security" || modtype == "Combat" || modtype == "Nations")
status_flags &= ~CANPUSH
choose_icon(6,module_sprites)
- radio.config(module.channels)
+ if(!static_radio_channels)
+ radio.config(module.channels)
notify_ai(2)
//for borg hotkeys, here module refers to borg inv slot, not core module
@@ -1012,7 +1014,7 @@ var/list/robot_verbs_default = list(
dat += text("| [obj] | Activated |
")
else
dat += text("| [obj] | Activate |
")
- if(emagged)
+ if(emagged || weapons_unlock)
if(activated(module.emag))
dat += text("| [module.emag] | Activated |
")
else
@@ -1170,14 +1172,18 @@ var/list/robot_verbs_default = list(
if(module.type == /obj/item/weapon/robot_module/janitor)
var/turf/tile = loc
if(isturf(tile))
- tile.clean_blood()
+ var/floor_only = TRUE
if(istype(tile, /turf/simulated))
var/turf/simulated/S = tile
S.dirt = 0
for(var/A in tile)
if(istype(A, /obj/effect))
if(is_cleanable(A))
- qdel(A)
+ var/obj/effect/decal/cleanable/blood/B = A
+ if(istype(B) && B.off_floor)
+ floor_only = FALSE
+ else
+ qdel(A)
else if(istype(A, /obj/item))
var/obj/item/cleaned_item = A
cleaned_item.clean_blood()
@@ -1198,6 +1204,8 @@ var/list/robot_verbs_default = list(
cleaned_human.update_inv_shoes(0,0)
cleaned_human.clean_blood()
to_chat(cleaned_human, "[src] cleans your face!")
+ if(floor_only)
+ tile.clean_blood()
return
#undef BORG_CAMERA_BUFFER
@@ -1342,6 +1350,7 @@ var/list/robot_verbs_default = list(
designation = "Nanotrasen Combat"
req_access = list(access_cent_specops)
ionpulse = 1
+ magpulse = 1
var/searching_for_ckey = 0
/mob/living/silicon/robot/deathsquad/New(loc)
@@ -1391,6 +1400,7 @@ var/list/robot_verbs_default = list(
modtype = "Syndicate"
req_access = list(access_syndicate)
ionpulse = 1
+ magpulse = 1
lawchannel = "State"
var/playstyle_string = "You are a Syndicate assault cyborg!
\
You are armed with powerful offensive tools to aid you in your mission: help the operatives secure the nuclear authentication disk. \
@@ -1452,6 +1462,48 @@ var/list/robot_verbs_default = list(
radio.config(module.channels)
notify_ai(2)
+/mob/living/silicon/robot/ert
+ designation = "ERT"
+ lawupdate = 0
+ scrambledcodes = 1
+ req_access = list(access_cent_specops)
+ ionpulse = 1
+
+ force_modules = list("Engineering", "Medical", "Security")
+ static_radio_channels = 1
+ allow_rename = FALSE
+ weapons_unlock = TRUE
+
+
+/mob/living/silicon/robot/ert/init()
+ laws = new /datum/ai_laws/ert_override
+ radio = new /obj/item/device/radio/borg/ert(src)
+ radio.recalculateChannels()
+ aiCamera = new/obj/item/device/camera/siliconcam/robot_camera(src)
+
+/mob/living/silicon/robot/ert/New(loc, cyborg_unlock)
+ ..(loc)
+ cell.maxcharge = 25000
+ cell.charge = 25000
+ var/rnum = rand(1,1000)
+ var/borgname = "ERT [rnum]"
+ name = borgname
+ custom_name = borgname
+ real_name = name
+ mind = new
+ mind.current = src
+ mind.original = src
+ mind.assigned_role = "MODE"
+ mind.special_role = SPECIAL_ROLE_ERT
+ if(cyborg_unlock)
+ crisis = 1
+ if(!(mind in ticker.minds))
+ ticker.minds += mind
+ ticker.mode.ert += mind
+
+/mob/living/silicon/robot/ert/gamma
+ crisis = 1
+
/mob/living/silicon/robot/nations
base_icon = "droidpeace"
icon_state = "droidpeace"
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index 83467748888..a1980b72fed 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -229,22 +229,6 @@
fix_modules()
-/obj/item/weapon/robot_module/peacekeeper
- name = "peacekeeping robot module"
- module_type = "Standard"
-
-/obj/item/weapon/robot_module/peacekeeper/New()
- ..()
- modules += new /obj/item/weapon/cookiesynth(src)
- modules += new /obj/item/device/harmalarm(src)
- modules += new /obj/item/weapon/reagent_containers/borghypo/peace(src)
- modules += new /obj/item/taperoll/police(src)
- modules += new /obj/item/borg/cyborghug/peacekeeper(src)
- modules += new /obj/item/weapon/extinguisher(src)
- emag = new /obj/item/weapon/reagent_containers/borghypo/peace/hacked(src)
-
- fix_modules()
-
/obj/item/weapon/robot_module/janitor
name = "janitorial robot module"
module_type = "Janitor"
@@ -270,10 +254,27 @@
/obj/item/weapon/robot_module/butler/New()
..()
modules += new /obj/item/weapon/reagent_containers/food/drinks/cans/beer(src)
+ modules += new /obj/item/weapon/reagent_containers/food/drinks/cans/cola(src)
+ modules += new /obj/item/weapon/reagent_containers/food/drinks/cans/sodawater(src)
modules += new /obj/item/weapon/reagent_containers/food/condiment/enzyme(src)
+ modules += new /obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice(src) // -0.3 oxy/sec
+ modules += new /obj/item/weapon/reagent_containers/food/drinks/bottle/tomatojuice(src) // -0.2 fire/sec
+ modules += new /obj/item/weapon/reagent_containers/food/drinks/bottle/limejuice(src) // -0.2 tox/sec
+ modules += new /obj/item/weapon/reagent_containers/food/drinks/coffee(src) // -1 paralysis stunned & weakened/sec
+ modules += new /obj/item/weapon/reagent_containers/food/drinks/tea(src)
+ modules += new /obj/item/weapon/reagent_containers/food/drinks/bottle/milk(src) // -0.2 brute/sec
+ modules += new /obj/item/weapon/reagent_containers/food/condiment/sugar(src)
+ modules += new /obj/item/weapon/reagent_containers/food/drinks/ice(src)
+ modules += new /obj/item/weapon/reagent_containers/food/drinks/bottle/cream(src)
+
+ modules += new /obj/item/weapon/reagent_containers/food/drinks/bottle/tequila(src)
+ modules += new /obj/item/weapon/reagent_containers/food/drinks/bottle/vodka(src)
+ modules += new /obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey(src)
+
modules += new /obj/item/weapon/pen(src)
modules += new /obj/item/weapon/razor(src)
modules += new /obj/item/device/instrument/piano_synth(src)
+ modules += new /obj/item/device/healthanalyzer/advanced(src)
var/obj/item/weapon/rsf/M = new /obj/item/weapon/rsf(src)
M.matter = 30
@@ -501,8 +502,6 @@
modules += new /obj/item/device/t_scanner(src)
modules += new /obj/item/weapon/rpd(src)
- emag = new /obj/item/weapon/pickaxe/drill/cyborg/diamond(src)
-
for(var/T in stacktypes)
var/obj/item/stack/sheet/W = new T(src)
W.amount = stacktypes[T]
diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm
index 74daf90fa4e..7469c2cca73 100644
--- a/code/modules/mob/living/silicon/silicon.dm
+++ b/code/modules/mob/living/silicon/silicon.dm
@@ -30,7 +30,7 @@
var/med_hud = DATA_HUD_MEDICAL_ADVANCED //Determines the med hud to use
var/sec_hud = DATA_HUD_SECURITY_ADVANCED //Determines the sec hud to use
- var/d_hud = DATA_HUD_DIAGNOSTIC //There is only one kind of diag hud
+ var/d_hud = DATA_HUD_DIAGNOSTIC_ADVANCED //There is only one kind of diag hud
var/obj/item/device/radio/common_radio
@@ -44,6 +44,12 @@
add_language("Galactic Common")
init_subsystems()
+/mob/living/silicon/med_hud_set_health()
+ return //we use a different hud
+
+/mob/living/silicon/med_hud_set_status()
+ return //we use a different hud
+
/mob/living/silicon/Destroy()
silicon_mob_list -= src
for(var/datum/alarm_handler/AH in alarm_handlers)
@@ -232,8 +238,8 @@
medsensor.add_hud_to(src)
/mob/living/silicon/proc/add_diag_hud()
- var/datum/atom_hud/diagsensor = huds[d_hud]
- diagsensor.add_hud_to(src)
+ for(var/datum/atom_hud/data/diagnostic/diagsensor in huds)
+ diagsensor.add_hud_to(src)
/mob/living/silicon/proc/toggle_sensor_mode()
diff --git a/code/modules/mob/living/simple_animal/bot/bot.dm b/code/modules/mob/living/simple_animal/bot/bot.dm
index 899608d0f1a..bbf591ee453 100644
--- a/code/modules/mob/living/simple_animal/bot/bot.dm
+++ b/code/modules/mob/living/simple_animal/bot/bot.dm
@@ -47,7 +47,7 @@
var/frustration = 0 //Used by some bots for tracking failures to reach their target.
var/base_speed = 2 //The speed at which the bot moves, or the number of times it moves per process() tick.
var/turf/ai_waypoint //The end point of a bot's path, or the target location.
- var/list/path = list() //List of turfs through which a bot 'steps' to reach the waypoint.
+ var/list/path = list() //List of turfs through which a bot 'steps' to reach the waypoint, associated with the path image, if there is one.
var/pathset = 0
var/list/ignore_list = list() //List of unreachable targets for an ignore-list enabled bot to ignore.
var/mode = BOT_IDLE //Standardizes the vars that indicate the bot is busy with its function.
@@ -75,6 +75,7 @@
var/control_freq = BOT_FREQ // bot control frequency
var/bot_filter // The radio filter the bot uses to identify itself on the network.
var/bot_type = 0 //The type of bot it is, for radio control.
+ var/data_hud_type = DATA_HUD_DIAGNOSTIC //The type of data HUD the bot uses. Diagnostic by default.
//This holds text for what the bot is mode doing, reported on the remote bot control interface.
var/list/mode_name = list("In Pursuit","Preparing to Arrest", "Arresting", \
"Beginning Patrol", "Patrolling", "Summoned by PDA", \
@@ -82,7 +83,13 @@
"Responding", "Navigating to Delivery Location", "Navigating to Home", \
"Waiting for clear path", "Calculating navigation path", "Pinging beacon network", "Unable to reach destination")
- hud_possible = list(DIAG_STAT_HUD, DIAG_BOT_HUD, DIAG_HUD) //Diagnostic HUD views
+ var/datum/atom_hud/data/bot_path/path_hud = new /datum/atom_hud/data/bot_path()
+ var/path_image_icon = 'icons/obj/aibots.dmi'
+ var/path_image_icon_state = "path_indicator"
+ var/path_image_color = "#FFFFFF"
+ var/reset_access_timer_id
+
+ hud_possible = list(DIAG_STAT_HUD, DIAG_BOT_HUD, DIAG_HUD, DIAG_PATH_HUD = HUD_LIST_LIST)//Diagnostic HUD views
/obj/item/device/radio/headset/bot
subspace_transmission = 1
@@ -130,6 +137,7 @@
/mob/living/simple_animal/bot/New()
..()
+ bots_list += src
icon_living = icon_state
icon_dead = icon_state
access_card = new /obj/item/weapon/card/id(src)
@@ -151,14 +159,24 @@
radio_controller.add_object(bot_core, control_freq, bot_filter)
prepare_huds()
- var/datum/atom_hud/data/diagnostic/diag_hud = huds[DATA_HUD_DIAGNOSTIC]
- diag_hud.add_to_hud(src)
+ for(var/datum/atom_hud/data/diagnostic/diag_hud in huds)
+ diag_hud.add_to_hud(src)
+ diag_hud.add_hud_to(src)
+ permanent_huds |= diag_hud
diag_hud_set_bothealth()
diag_hud_set_botstat()
diag_hud_set_botmode()
// give us the hud too!
- diag_hud.add_hud_to(src)
- permanent_huds |= diag_hud
+ if(path_hud)
+ path_hud.add_to_hud(src)
+ path_hud.add_hud_to(src)
+
+
+/mob/living/simple_animal/bot/med_hud_set_health()
+ return //we use a different hud
+
+/mob/living/simple_animal/bot/med_hud_set_status()
+ return //we use a different hud
/mob/living/simple_animal/bot/update_canmove(delay_action_updates = 0)
. = ..()
@@ -169,6 +187,10 @@
/mob/living/simple_animal/bot/Destroy()
if(paicard)
ejectpai()
+ if(path_hud)
+ QDEL_NULL(path_hud)
+ path_hud = null
+ bots_list -= src
QDEL_NULL(Radio)
QDEL_NULL(access_card)
if(radio_controller && bot_filter)
@@ -345,7 +367,7 @@
to_chat(user, "The welder must be on for this task!")
else
if(W.force) //if force is non-zero
- var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
+ var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
s.set_up(5, 1, src)
s.start()
..()
@@ -353,7 +375,7 @@
/mob/living/simple_animal/bot/bullet_act(obj/item/projectile/Proj)
if(Proj && (Proj.damage_type == BRUTE || Proj.damage_type == BURN))
if(prob(75) && Proj.damage > 0)
- var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
+ var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
s.set_up(5, 1, src)
s.start()
return ..()
@@ -367,8 +389,7 @@
pulse2.name = "emp sparks"
pulse2.anchored = 1
pulse2.dir = pick(cardinal)
- spawn(10)
- pulse2.delete()
+ QDEL_IN(pulse2, 10)
if(paicard)
paicard.emp_act(severity)
@@ -447,14 +468,14 @@ Pass a positive integer as an argument to override a bot's default speed.
/mob/living/simple_animal/bot/proc/bot_move(dest, move_speed)
if(!dest || !path || path.len == 0) //A-star failed or a path/destination was not set.
- path = list()
+ set_path(null)
return 0
dest = get_turf(dest) //We must always compare turfs, so get the turf of the dest var if dest was originally something else.
var/turf/last_node = get_turf(path[path.len]) //This is the turf at the end of the path, it should be equal to dest.
if(get_turf(src) == dest) //We have arrived, no need to move again.
return 1
else if(dest != last_node) //The path should lead us to our given destination. If this is not true, we must stop.
- path = list()
+ set_path(null)
return 0
var/step_count = move_speed ? move_speed : base_speed //If a value is passed into move_speed, use that instead of the default speed var.
@@ -473,14 +494,14 @@ Pass a positive integer as an argument to override a bot's default speed.
if(path.len > 1)
step_towards(src, path[1])
if(get_turf(src) == path[1]) //Successful move
- path -= path[1]
+ increment_path()
tries = 0
else
tries++
return 0
else if(path.len == 1)
step_to(src, dest)
- path = list()
+ set_path(null)
return 1
@@ -497,7 +518,7 @@ Pass a positive integer as an argument to override a bot's default speed.
var/datum/job/captain/All = new/datum/job/captain
all_access.access = All.get_access()
- path = get_path_to(src, waypoint, /turf/proc/Distance_cardinal, 0, 200, id=all_access)
+ set_path(get_path_to(src, waypoint, /turf/proc/Distance_cardinal, 0, 200, id=all_access))
calling_ai = caller //Link the AI to the bot!
ai_waypoint = waypoint
@@ -505,6 +526,9 @@ Pass a positive integer as an argument to override a bot's default speed.
if(!on)
turn_on() //Saves the AI the hassle of having to activate a bot manually.
access_card = all_access //Give the bot all-access while under the AI's command.
+ if(client)
+ reset_access_timer_id = addtimer(src, "bot_reset", 600) //if the bot is player controlled, they get the extra access for a limited time
+ to_chat(src, "Priority waypoint set by [calling_ai] [caller]. Proceed to [end_area.name].
[path.len-1] meters to destination. You have been granted additional door access for 60 seconds.")
if(message)
to_chat(calling_ai, "[bicon(src)] [name] called to [end_area.name]. [path.len-1] meters to destination.")
pathset = 1
@@ -514,7 +538,7 @@ Pass a positive integer as an argument to override a bot's default speed.
if(message)
to_chat(calling_ai, "Failed to calculate a valid route. Ensure destination is clear of obstructions and within range.")
calling_ai = null
- path = list()
+ set_path(null)
/mob/living/simple_animal/bot/proc/call_mode() //Handles preparing a bot for a call, as well as calling the move proc.
//Handles the bot's movement during a call.
@@ -529,7 +553,10 @@ Pass a positive integer as an argument to override a bot's default speed.
if(calling_ai) //Simple notification to the AI if it called a bot. It will not know the cause or identity of the bot.
to_chat(calling_ai, "Call command to a bot has been reset.")
calling_ai = null
- path = list()
+ if(reset_access_timer_id)
+ deltimer(reset_access_timer_id)
+ reset_access_timer_id = null
+ set_path(null)
summon_target = null
pathset = 0
access_card.access = prev_access
@@ -594,7 +621,7 @@ Pass a positive integer as an argument to override a bot's default speed.
else if(path.len > 0 && patrol_target) // valid path
var/turf/next = path[1]
if(next == loc)
- path -= next
+ increment_path()
return
@@ -750,12 +777,12 @@ Pass a positive integer as an argument to override a bot's default speed.
// given an optional turf to avoid
/mob/living/simple_animal/bot/proc/calc_path(turf/avoid)
check_bot_access()
- path = get_path_to(src, patrol_target, /turf/proc/Distance_cardinal, 0, 120, id=access_card, exclude=avoid)
+ set_path(get_path_to(src, patrol_target, /turf/proc/Distance_cardinal, 0, 120, id=access_card, exclude=avoid))
/mob/living/simple_animal/bot/proc/calc_summon_path(turf/avoid)
check_bot_access()
spawn()
- path = get_path_to(src, summon_target, /turf/proc/Distance_cardinal, 0, 150, id=access_card, exclude=avoid)
+ set_path(get_path_to(src, summon_target, /turf/proc/Distance_cardinal, 0, 150, id=access_card, exclude=avoid))
if(!path.len) //Cannot reach target. Give up and announce the issue.
speak("Summon command failed, destination unreachable.",radio_channel)
bot_reset()
@@ -772,7 +799,7 @@ Pass a positive integer as an argument to override a bot's default speed.
else if(path.len > 0 && summon_target) //Proper path acquired!
var/turf/next = path[1]
if(next == loc)
- path -= next
+ increment_path()
return
var/moved = bot_move(summon_target, 3) // Move attempt
@@ -1016,3 +1043,64 @@ Pass a positive integer as an argument to override a bot's default speed.
/mob/living/simple_animal/bot/is_mechanical()
return 1
+
+/mob/living/simple_animal/bot/proc/set_path(list/newpath)
+ path = newpath ? newpath : list()
+ if(!path_hud)
+ return
+ var/list/path_huds_watching_me = list(huds[DATA_HUD_DIAGNOSTIC_ADVANCED])
+ if(path_hud)
+ path_huds_watching_me += path_hud
+ for(var/V in path_huds_watching_me)
+ var/datum/atom_hud/H = V
+ H.remove_from_hud(src)
+
+ var/list/path_images = hud_list[DIAG_PATH_HUD]
+ QDEL_LIST(path_images)
+ if(newpath)
+ for(var/i in 1 to newpath.len)
+ var/turf/T = newpath[i]
+ var/direction = NORTH
+ if(i > 1)
+ var/turf/prevT = path[i - 1]
+ var/image/prevI = path[prevT]
+ direction = get_dir(prevT, T)
+ if(i > 2)
+ var/turf/prevprevT = path[i - 2]
+ var/prevDir = get_dir(prevprevT, prevT)
+ var/mixDir = direction|prevDir
+ if(mixDir in diagonals)
+ prevI.dir = mixDir
+ if(prevDir & (NORTH|SOUTH))
+ var/matrix/ntransform = matrix()
+ ntransform.Turn(90)
+ if((mixDir == NORTHWEST) || (mixDir == SOUTHEAST))
+ ntransform.Scale(-1, 1)
+ else
+ ntransform.Scale(1, -1)
+ prevI.transform = ntransform
+ var/mutable_appearance/MA = new /mutable_appearance()
+ MA.icon = path_image_icon
+ MA.icon_state = path_image_icon_state
+ MA.layer = ABOVE_OPEN_TURF_LAYER
+ MA.plane = 0
+ MA.appearance_flags = RESET_COLOR|RESET_TRANSFORM
+ MA.color = path_image_color
+ MA.dir = direction
+ var/image/I = image(loc = T)
+ I.appearance = MA
+ path[T] = I
+ path_images += I
+
+ for(var/V in path_huds_watching_me)
+ var/datum/atom_hud/H = V
+ H.add_to_hud(src)
+
+
+/mob/living/simple_animal/bot/proc/increment_path()
+ if(!path || !path.len)
+ return
+ var/image/I = path[path[1]]
+ if(I)
+ I.icon = null
+ path.Cut(1, 2)
\ No newline at end of file
diff --git a/code/modules/mob/living/simple_animal/bot/cleanbot.dm b/code/modules/mob/living/simple_animal/bot/cleanbot.dm
index a71fbe2ae03..9cfc4da18eb 100644
--- a/code/modules/mob/living/simple_animal/bot/cleanbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/cleanbot.dm
@@ -17,6 +17,8 @@
window_id = "autoclean"
window_name = "Automatic Station Cleaner v1.1"
pass_flags = PASSMOB
+ path_image_color = "#993299"
+
var/blood = 1
var/list/target_types = list()
@@ -98,7 +100,7 @@
if(prob(5)) //Spawns foam!
visible_message("[src] whirs and bubbles violently, before releasing a plume of froth!")
- new /obj/structure/foam(loc)
+ new /obj/effect/particle_effect/foam(loc)
else if(prob(5))
audible_message("[src] makes an excited beeping booping sound!")
@@ -184,7 +186,7 @@
if(prob(50))
new /obj/item/robot_parts/l_arm(Tsec)
- var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
+ 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/bot/ed209bot.dm b/code/modules/mob/living/simple_animal/bot/ed209bot.dm
index 37699e820f2..3cf6e92d5f1 100644
--- a/code/modules/mob/living/simple_animal/bot/ed209bot.dm
+++ b/code/modules/mob/living/simple_animal/bot/ed209bot.dm
@@ -20,6 +20,8 @@
bot_core = /obj/machinery/bot_core/secbot
window_id = "autoed209"
window_name = "Automatic Security Unit v2.6"
+ path_image_color = "#FF0000"
+ data_hud_type = DATA_HUD_SECURITY_ADVANCED
var/lastfired = 0
var/shot_delay = 3 //.3 seconds between shots
@@ -393,7 +395,7 @@ Auto Patrol[]"},
if(lasercolor == "r")
new /obj/item/clothing/suit/redtag(Tsec)
- var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
+ 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/bot/floorbot.dm b/code/modules/mob/living/simple_animal/bot/floorbot.dm
index a02447cd4ea..8144cd84bd6 100644
--- a/code/modules/mob/living/simple_animal/bot/floorbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/floorbot.dm
@@ -17,6 +17,7 @@
bot_core = /obj/machinery/bot_core/floorbot
window_id = "autofloor"
window_name = "Automatic Station Floor Repairer v1.1"
+ path_image_color = "#FFA500"
var/process_type //Determines what to do when process_scan() recieves a target. See process_scan() for details.
var/targetdirection
@@ -406,7 +407,7 @@
T.amount = amount
amount = 0
- var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
+ 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/bot/medbot.dm b/code/modules/mob/living/simple_animal/bot/medbot.dm
index b3116d194b8..d1fbd235efc 100644
--- a/code/modules/mob/living/simple_animal/bot/medbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/medbot.dm
@@ -19,6 +19,8 @@
bot_core_type = /obj/machinery/bot_core/medbot
window_id = "automed"
window_name = "Automatic Medical Unit v1.1"
+ path_image_color = "#DDDDFF"
+ data_hud_type = DATA_HUD_MEDICAL_ADVANCED
var/obj/item/weapon/reagent_containers/glass/reagent_glass = null //Can be set to draw from this for reagents.
var/skin = null //Set to "tox", "ointment" or "o2" for the other two firstaid kits.
@@ -569,7 +571,7 @@
if(prob(50))
new /obj/item/robot_parts/l_arm(Tsec)
- var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
+ 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/bot/mulebot.dm b/code/modules/mob/living/simple_animal/bot/mulebot.dm
index 40b2dc832ba..380b301861e 100644
--- a/code/modules/mob/living/simple_animal/bot/mulebot.dm
+++ b/code/modules/mob/living/simple_animal/bot/mulebot.dm
@@ -26,6 +26,8 @@
model = "MULE"
bot_purpose = "deliver crates and other packages between departments, as requested"
bot_core_type = /obj/machinery/bot_core/mulebot
+ path_image_color = "#7F5200"
+
suffix = ""
@@ -502,7 +504,7 @@
var/turf/next = path[1]
reached_target = 0
if(next == loc)
- path -= next
+ increment_path()
return
if(istype(next, /turf/simulated))
// to_chat(world, "at ([x],[y]) moving to ([next.x],[next.y])")
@@ -513,7 +515,7 @@
if(moved && oldloc!=loc) // successful move
// to_chat(world, "Successful move.")
blockcount = 0
- path -= loc
+ increment_path()
if(destination == home_destination)
mode = BOT_GO_HOME
@@ -570,7 +572,7 @@
// given an optional turf to avoid
/mob/living/simple_animal/bot/mulebot/calc_path(turf/avoid = null)
check_bot_access()
- path = get_path_to(src, target, /turf/proc/Distance_cardinal, 0, 250, id=access_card, exclude=avoid)
+ set_path(get_path_to(src, target, /turf/proc/Distance_cardinal, 0, 250, id=access_card, exclude=avoid))
// sets the current destination
// signals all beacons matching the delivery code
@@ -834,7 +836,7 @@
cell.update_icon()
cell = null
- var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
+ 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/bot/secbot.dm b/code/modules/mob/living/simple_animal/bot/secbot.dm
index 46a8ec12f76..0d1cbe27cb5 100644
--- a/code/modules/mob/living/simple_animal/bot/secbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/secbot.dm
@@ -18,6 +18,8 @@
bot_core_type = /obj/machinery/bot_core/secbot
window_id = "autosec"
window_name = "Automatic Security Unit v1.6"
+ path_image_color = "#FF0000"
+ data_hud_type = DATA_HUD_SECURITY_ADVANCED
var/base_icon = "secbot"
var/mob/living/carbon/target
@@ -437,7 +439,7 @@ Auto Patrol: []"},
if(prob(50))
new /obj/item/robot_parts/l_arm(Tsec)
- var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
+ 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/constructs.dm b/code/modules/mob/living/simple_animal/constructs.dm
index 7c7a31b5ef0..f94063a5a10 100644
--- a/code/modules/mob/living/simple_animal/constructs.dm
+++ b/code/modules/mob/living/simple_animal/constructs.dm
@@ -67,7 +67,7 @@
if(health < maxHealth)
adjustBruteLoss(-5)
if(src != M)
- Beam(M,icon_state="sendbeam",icon='icons/effects/effects.dmi',time=4)
+ Beam(M,icon_state="sendbeam",time=4)
M.visible_message("[M] repairs some of \the [src]'s dents.", \
"You repair some of [src]'s dents, leaving [src] at [health]/[maxHealth] health.")
else
diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm
index 5f977bfd508..501bfd1e798 100644
--- a/code/modules/mob/living/simple_animal/friendly/cat.dm
+++ b/code/modules/mob/living/simple_animal/friendly/cat.dm
@@ -169,7 +169,7 @@
icon_dead = "Syndicat_dead"
icon_resting = "Syndicat_rest"
gender = FEMALE
- flags = NO_BREATHE
+ mutations = list(BREATHLESS)
faction = list("syndicate")
gold_core_spawnable = CHEM_MOB_SPAWN_INVALID
eats_mice = 0
diff --git a/code/modules/mob/living/simple_animal/friendly/corgi.dm b/code/modules/mob/living/simple_animal/friendly/corgi.dm
index ed08eed113e..8841621c633 100644
--- a/code/modules/mob/living/simple_animal/friendly/corgi.dm
+++ b/code/modules/mob/living/simple_animal/friendly/corgi.dm
@@ -123,7 +123,7 @@
emote_see = list("shakes its head", "shivers")
desc = "It's a corgi."
set_light(0)
- flags &= ~NO_BREATHE
+ mutations.Remove(BREATHLESS)
atmos_requirements = default_atmos_requirements
minbodytemp = initial(minbodytemp)
inventory_head.loc = src.loc
@@ -365,7 +365,7 @@
name = "Space Explorer [real_name]"
desc = "That's one small step for a corgi. One giant yap for corgikind."
valid = 1
- flags |= NO_BREATHE
+ mutations.Add(BREATHLESS)
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
@@ -466,10 +466,7 @@
if(prob(1))
custom_emote(1, pick("dances around.","chases its tail!"))
- spawn(0)
- for(var/i in list(1,2,4,8,4,2,1,2,4,8,4,2,1,2,4,8,4,2))
- dir = i
- sleep(1)
+ spin(20, 1)
/obj/item/weapon/reagent_containers/food/snacks/meat/corgi
name = "Corgi meat"
@@ -554,10 +551,7 @@
if(!resting && !buckled)
if(prob(1))
custom_emote(1, pick("dances around.","chases her tail."))
- spawn(0)
- for(var/i in list(1,2,4,8,4,2,1,2,4,8,4,2,1,2,4,8,4,2))
- dir = i
- sleep(1)
+ spin(20, 1)
/mob/living/simple_animal/pet/corgi/attack_hand(mob/living/carbon/human/M)
. = ..()
@@ -569,7 +563,7 @@
if(change)
if(change > 0)
if(M && stat != DEAD) // Added check to see if this mob (the corgi) is dead to fix issue 2454
- flick_overlay(image('icons/mob/animal.dmi',src,"heart-ani2",MOB_LAYER+1), list(M.client), 20)
+ new /obj/effect/temp_visual/heart(loc)
custom_emote(1, "yaps happily!")
else
if(M && stat != DEAD) // Same check here, even though emote checks it as well (poor form to check it only in the help case)
@@ -627,12 +621,12 @@
//spark for no reason
if(prob(5))
- var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
+ 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/pet/corgi/Ian/borgi/death(gibbed)
- var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
+ 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 a20c7b73d5f..52769f9dba6 100644
--- a/code/modules/mob/living/simple_animal/friendly/corgi_powers.dm
+++ b/code/modules/mob/living/simple_animal/friendly/corgi_powers.dm
@@ -6,6 +6,4 @@
for(var/mob/O in oviewers(src, null))
if((O.client && !( O.blinded )))
to_chat(O, text("[] [pick("dances around","chases its tail")].", src))
- for(var/i in list(1,2,4,8,4,2,1,2,4,8,4,2,1,2,4,8,4,2))
- dir = i
- sleep(1)
+ spin(20, 1)
\ No newline at end of file
diff --git a/code/modules/mob/living/simple_animal/friendly/fox.dm b/code/modules/mob/living/simple_animal/friendly/fox.dm
index a31c1cb099f..6edfc6f42c9 100644
--- a/code/modules/mob/living/simple_animal/friendly/fox.dm
+++ b/code/modules/mob/living/simple_animal/friendly/fox.dm
@@ -33,7 +33,7 @@
icon_living = "Syndifox"
icon_dead = "Syndifox_dead"
icon_resting = "Syndifox_rest"
- flags = NO_BREATHE
+ mutations = list(BREATHLESS)
faction = list("syndicate")
gold_core_spawnable = CHEM_MOB_SPAWN_INVALID
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
diff --git a/code/modules/mob/living/simple_animal/friendly/penguin.dm b/code/modules/mob/living/simple_animal/friendly/penguin.dm
new file mode 100644
index 00000000000..545866858ca
--- /dev/null
+++ b/code/modules/mob/living/simple_animal/friendly/penguin.dm
@@ -0,0 +1,61 @@
+//Penguins
+
+/mob/living/simple_animal/pet/penguin
+ name = "penguin"
+ real_name = "penguin"
+ response_help = "pets"
+ response_disarm = "bops"
+ response_harm = "kicks"
+ speak = list("Gah Gah!", "NOOT NOOT!", "NOOT!", "Noot", "noot", "Prah!", "Grah!")
+ speak_emote = list("squawks", "gakkers")
+ emote_hear = list("squawk!", "gakkers!", "noots.","NOOTS!")
+ emote_see = list("shakes its beak.", "flaps it's wings.","preens itself.")
+ faction = list("penguin")
+ see_in_dark = 5
+ speak_chance = 1
+ turns_per_move = 10
+ icon = 'icons/mob/penguins.dmi'
+
+/mob/living/simple_animal/pet/penguin/emperor
+ name = "Emperor penguin"
+ real_name = "penguin"
+ desc = "Emperor of all he surveys."
+ icon_state = "penguin"
+ icon_living = "penguin"
+ icon_dead = "penguin_dead"
+ butcher_results = list()
+ gold_core_spawnable = CHEM_MOB_SPAWN_FRIENDLY
+
+/mob/living/simple_animal/pet/penguin/eldrich
+ name = "Albino penguin"
+ real_name = "penguin"
+ desc = "Found in the depths of mountains."
+ response_help = "taps"
+ response_disarm = "pokes"
+ response_harm = "flails at"
+ icon_state = "penguin_elder"
+ icon_living = "penguin_elder"
+ icon_dead = "penguin_dead"
+ speak = list("Gah Gah!", "Tekeli-li! Tekeli-li!", "Tekeli-li!", "Teke", "li")
+ speak_emote = list("gibbers", "gakkers")
+ emote_hear = list("whistles!", "gakkers!")
+ emote_see = list("shakes its beak.", "flaps it's wings.","preens itself.")
+ faction = list("penguin", "cult")
+
+/mob/living/simple_animal/pet/penguin/emperor/shamebrero
+ name = "Shamebrero penguin"
+ desc = "Shameful of all he surveys."
+ icon_state = "penguin_shamebrero"
+ icon_living = "penguin_shamebrero"
+
+/mob/living/simple_animal/pet/penguin/baby
+ speak = list("gah", "noot noot", "noot!", "noot", "squeee!", "noo!")
+ name = "Penguin chick"
+ real_name = "penguin"
+ desc = "Can't fly and can barely waddles, but the prince of all chicks."
+ icon_state = "penguin_baby"
+ icon_living = "penguin_baby"
+ icon_dead = "penguin_baby_dead"
+ density = FALSE
+ pass_flags = PASSMOB
+ mob_size = MOB_SIZE_SMALL
\ No newline at end of file
diff --git a/code/modules/mob/living/simple_animal/hostile/alien.dm b/code/modules/mob/living/simple_animal/hostile/alien.dm
index 88db29b88a7..86dbc13b643 100644
--- a/code/modules/mob/living/simple_animal/hostile/alien.dm
+++ b/code/modules/mob/living/simple_animal/hostile/alien.dm
@@ -23,6 +23,8 @@
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)
unsuitable_atmos_damage = 15
heat_damage_per_tick = 20
+ pressure_resistance = 100 //100 kPa difference required to push
+ throw_pressure_limit = 120 //120 kPa difference required to throw
faction = list("alien")
status_flags = CANPUSH
minbodytemp = 0
diff --git a/code/modules/mob/living/simple_animal/hostile/deathsquid.dm b/code/modules/mob/living/simple_animal/hostile/deathsquid.dm
new file mode 100644
index 00000000000..e1fcfca518f
--- /dev/null
+++ b/code/modules/mob/living/simple_animal/hostile/deathsquid.dm
@@ -0,0 +1,49 @@
+/mob/living/simple_animal/hostile/deathsquid
+ name = "death squid"
+ desc = "A large, floating eldritch horror. Its body glows with an evil red light, and its tentacles look to have been dipped in alien blood."
+
+ speed = 1
+ speak_emote = list("telepathically thunders", "telepathically booms")
+ maxHealth = 2500 // same as megafauna
+ health = 2500
+
+ icon = 'icons/mob/deathsquid_large.dmi' // Credit: FullofSkittles
+ icon_state = "deathsquid"
+ icon_living = "deathsquid"
+ icon_dead = "deathsquiddead"
+
+ attacktext = "slices"
+ attack_sound = 'sound/weapons/bladeslice.ogg'
+ armour_penetration = 25
+ melee_damage_lower = 10
+ melee_damage_upper = 100
+ environment_smash = 3
+
+ force_threshold = 15
+ 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)
+ unsuitable_atmos_damage = 0
+ heat_damage_per_tick = 0
+
+ see_in_dark = 8
+ mob_size = MOB_SIZE_LARGE
+ ventcrawler = 0
+ gold_core_spawnable = CHEM_MOB_SPAWN_INVALID
+
+
+
+/mob/living/simple_animal/hostile/deathsquid/Process_Spacemove(var/movement_dir = 0)
+ return 1 //copypasta from carp code
+
+/mob/living/simple_animal/hostile/deathsquid/ex_act(severity)
+ return
+
+/mob/living/simple_animal/hostile/deathsquid/joke
+ name = "deaf squid"
+ desc = "An elderly, hard-of-hearing eldrich horror."
+ maxHealth = 200
+ health = 200
+ speed = 3
+ armour_penetration = 5
+ melee_damage_lower = 10
+ melee_damage_upper = 20
+ environment_smash = 2
\ No newline at end of file
diff --git a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
index e45d5a1a391..fb0d156cdbf 100644
--- a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
+++ b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
@@ -237,7 +237,7 @@
E = locate() in get_turf(src)
if(!E)
var/obj/structure/spider/eggcluster/C = new /obj/structure/spider/eggcluster(src.loc)
- C.faction = faction
+ C.faction = faction.Copy()
C.master_commander = master_commander
if(ckey)
C.player_spiders = 1
diff --git a/code/modules/mob/living/simple_animal/hostile/hivebot.dm b/code/modules/mob/living/simple_animal/hostile/hivebot.dm
index 3c521d56d04..c2284764050 100644
--- a/code/modules/mob/living/simple_animal/hostile/hivebot.dm
+++ b/code/modules/mob/living/simple_animal/hostile/hivebot.dm
@@ -48,7 +48,7 @@
ranged = 1
/mob/living/simple_animal/hostile/hivebot/death(gibbed)
- var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
+ var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
s.set_up(3, 1, src)
s.start()
..()
@@ -75,7 +75,7 @@
/mob/living/simple_animal/hostile/hivebot/tele/New()
..()
- var/datum/effect/system/harmless_smoke_spread/smoke = new /datum/effect/system/harmless_smoke_spread()
+ var/datum/effect_system/smoke_spread/smoke = new
smoke.set_up(5, 0, src.loc)
smoke.start()
visible_message("The [src] warps in!")
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm
index d6d1d92618d..f2af031039a 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm
@@ -131,7 +131,7 @@ Difficulty: Hard
/mob/living/simple_animal/hostile/megafauna/bubblegum/Move()
if(charging)
- new /obj/effect/overlay/temp/decoy/fading(loc, src)
+ new /obj/effect/temp_visual/decoy/fading(loc, src)
DestroySurroundings()
. = ..()
if(!stat && .)
@@ -152,12 +152,12 @@ Difficulty: Hard
var/turf/T = get_turf(target)
if(!T || T == loc)
return
- new /obj/effect/overlay/temp/dragon_swoop(T)
+ new /obj/effect/temp_visual/dragon_swoop(T)
charging = 1
DestroySurroundings()
walk(src, 0)
dir = get_dir(src, T)
- var/obj/effect/overlay/temp/decoy/D = new /obj/effect/overlay/temp/decoy(loc, src)
+ var/obj/effect/temp_visual/decoy/D = new /obj/effect/temp_visual/decoy(loc, src)
animate(D, alpha = 0, color = "#FF0000", transform = matrix()*2, time = 5)
sleep(5)
throw_at(T, get_dist(src, T), 1, src, 0)
@@ -242,9 +242,9 @@ Difficulty: Hard
/mob/living/simple_animal/hostile/megafauna/bubblegum/proc/bloodsmack(turf/T, handedness)
if(handedness)
- new /obj/effect/overlay/temp/bubblegum_hands/rightsmack(T)
+ new /obj/effect/temp_visual/bubblegum_hands/rightsmack(T)
else
- new /obj/effect/overlay/temp/bubblegum_hands/leftsmack(T)
+ new /obj/effect/temp_visual/bubblegum_hands/leftsmack(T)
sleep(2.5)
for(var/mob/living/L in T)
if(!faction_check(L))
@@ -256,11 +256,11 @@ Difficulty: Hard
/mob/living/simple_animal/hostile/megafauna/bubblegum/proc/bloodgrab(turf/T, handedness)
if(handedness)
- new /obj/effect/overlay/temp/bubblegum_hands/rightpaw(T)
- new /obj/effect/overlay/temp/bubblegum_hands/rightthumb(T)
+ new /obj/effect/temp_visual/bubblegum_hands/rightpaw(T)
+ new /obj/effect/temp_visual/bubblegum_hands/rightthumb(T)
else
- new /obj/effect/overlay/temp/bubblegum_hands/leftpaw(T)
- new /obj/effect/overlay/temp/bubblegum_hands/leftthumb(T)
+ new /obj/effect/temp_visual/bubblegum_hands/leftpaw(T)
+ new /obj/effect/temp_visual/bubblegum_hands/leftthumb(T)
sleep(6)
for(var/mob/living/L in T)
if(!faction_check(L))
@@ -274,28 +274,28 @@ Difficulty: Hard
devour(L)
sleep(1)
-/obj/effect/overlay/temp/bubblegum_hands
+/obj/effect/temp_visual/bubblegum_hands
icon = 'icons/effects/bubblegum.dmi'
duration = 9
-/obj/effect/overlay/temp/bubblegum_hands/rightthumb
+/obj/effect/temp_visual/bubblegum_hands/rightthumb
icon_state = "rightthumbgrab"
-/obj/effect/overlay/temp/bubblegum_hands/leftthumb
+/obj/effect/temp_visual/bubblegum_hands/leftthumb
icon_state = "leftthumbgrab"
-/obj/effect/overlay/temp/bubblegum_hands/rightpaw
+/obj/effect/temp_visual/bubblegum_hands/rightpaw
icon_state = "rightpawgrab"
layer = MOB_LAYER - 0.1
-/obj/effect/overlay/temp/bubblegum_hands/leftpaw
+/obj/effect/temp_visual/bubblegum_hands/leftpaw
icon_state = "leftpawgrab"
layer = MOB_LAYER - 0.1
-/obj/effect/overlay/temp/bubblegum_hands/rightsmack
+/obj/effect/temp_visual/bubblegum_hands/rightsmack
icon_state = "rightsmack"
-/obj/effect/overlay/temp/bubblegum_hands/leftsmack
+/obj/effect/temp_visual/bubblegum_hands/leftsmack
icon_state = "leftsmack"
/mob/living/simple_animal/hostile/megafauna/bubblegum/proc/blood_warp()
@@ -311,7 +311,7 @@ Difficulty: Hard
if(!pools.len)
return FALSE
- var/obj/effect/overlay/temp/decoy/DA = new /obj/effect/overlay/temp/decoy(loc, src)
+ var/obj/effect/temp_visual/decoy/DA = new /obj/effect/temp_visual/decoy(loc, src)
DA.color = "#FF0000"
var/oldtransform = DA.transform
DA.transform = matrix()*2
@@ -353,7 +353,7 @@ Difficulty: Hard
new /obj/effect/decal/cleanable/blood/bubblegum(J)
for(var/i in 1 to range)
J = get_step(previousturf, targetdir)
- new /obj/effect/overlay/temp/dir_setting/bloodsplatter(previousturf, get_dir(previousturf, J))
+ new /obj/effect/temp_visual/dir_setting/bloodsplatter(previousturf, get_dir(previousturf, J))
playsound(previousturf,'sound/effects/splat.ogg', 100, 1, -1)
if(!J || !previousturf.CanAtmosPass(J))
break
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
index b40e64c6a31..bf33462cb34 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
@@ -97,7 +97,7 @@ Difficulty: Very Hard
..()
internal_gps = new/obj/item/device/gps/internal/colossus(src)
-/obj/effect/overlay/temp/at_shield
+/obj/effect/temp_visual/at_shield
name = "anti-toolbox field"
desc = "A shimmering forcefield protecting the colossus."
icon = 'icons/effects/effects.dmi'
@@ -107,7 +107,7 @@ Difficulty: Very Hard
duration = 8
var/target
-/obj/effect/overlay/temp/at_shield/New(new_loc, new_target)
+/obj/effect/temp_visual/at_shield/New(new_loc, new_target)
..()
target = new_target
spawn(0)
@@ -115,7 +115,7 @@ Difficulty: Very Hard
/mob/living/simple_animal/hostile/megafauna/colossus/bullet_act(obj/item/projectile/P)
if(!stat)
- var/obj/effect/overlay/temp/at_shield/AT = new /obj/effect/overlay/temp/at_shield(loc, src)
+ var/obj/effect/temp_visual/at_shield/AT = new /obj/effect/temp_visual/at_shield(loc, src)
var/random_x = rand(-32, 32)
AT.pixel_x += random_x
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm
index 38f8c121d5d..2ec7c213e1c 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm
@@ -86,7 +86,7 @@ Difficulty: Medium
/mob/living/simple_animal/hostile/megafauna/dragon/Process_Spacemove(movement_dir = 0)
return 1
-/obj/effect/overlay/temp/fireball
+/obj/effect/temp_visual/fireball
icon = 'icons/obj/wizard.dmi'
icon_state = "fireball"
name = "fireball"
@@ -96,18 +96,18 @@ Difficulty: Medium
duration = 12
pixel_z = 500
-/obj/effect/overlay/temp/fireball/New(loc)
+/obj/effect/temp_visual/fireball/New(loc)
..()
animate(src, pixel_z = 0, time = 12)
-/obj/effect/overlay/temp/target
+/obj/effect/temp_visual/target
icon = 'icons/mob/actions.dmi'
icon_state = "sniper_zoom"
layer = MOB_LAYER - 0.1
luminosity = 2
duration = 12
-/obj/effect/overlay/temp/dragon_swoop
+/obj/effect/temp_visual/dragon_swoop
name = "certain death"
desc = "Don't just stand there, move!"
icon = 'icons/effects/96x96.dmi'
@@ -118,18 +118,18 @@ Difficulty: Medium
color = "#FF0000"
duration = 10
-/obj/effect/overlay/temp/target/ex_act()
+/obj/effect/temp_visual/target/ex_act()
return
-/obj/effect/overlay/temp/target/New(loc)
+/obj/effect/temp_visual/target/New(loc)
..()
spawn(0)
fall()
-/obj/effect/overlay/temp/target/proc/fall()
+/obj/effect/temp_visual/target/proc/fall()
var/turf/T = get_turf(src)
playsound(T,'sound/magic/Fireball.ogg', 200, 1)
- new /obj/effect/overlay/temp/fireball(T)
+ new /obj/effect/temp_visual/fireball(T)
sleep(12)
explosion(T, 0, 0, 1, 0, 0, 0, 1)
@@ -161,7 +161,7 @@ Difficulty: Medium
visible_message("Fire rains from the sky!")
for(var/turf/turf in range(12,get_turf(src)))
if(prob(10))
- new /obj/effect/overlay/temp/target(turf)
+ new /obj/effect/temp_visual/target(turf)
/mob/living/simple_animal/hostile/megafauna/dragon/proc/fire_walls()
playsound(get_turf(src),'sound/magic/Fireball.ogg', 200, 1)
@@ -223,7 +223,7 @@ Difficulty: Medium
else
tturf = get_turf(src)
forceMove(tturf)
- new /obj/effect/overlay/temp/dragon_swoop(tturf)
+ new /obj/effect/temp_visual/dragon_swoop(tturf)
animate(src, pixel_x = initial(pixel_x), pixel_z = 0, time = 10)
sleep(10)
playsound(src.loc, 'sound/effects/meteorimpact.ogg', 200, 1)
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 228f4df9ad6..07c4d2f25cd 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
@@ -242,7 +242,7 @@ Difficulty: Hard
pickedtarget = pick_n_take(targets)
if(pickedtarget.stat == DEAD)
pickedtarget = target
- var/obj/effect/overlay/temp/hierophant/chaser/C = new /obj/effect/overlay/temp/hierophant/chaser(loc, src, pickedtarget, chaser_speed, FALSE)
+ var/obj/effect/temp_visual/hierophant/chaser/C = new /obj/effect/temp_visual/hierophant/chaser(loc, src, pickedtarget, chaser_speed, FALSE)
C.moving = 3
C.moving_dir = pick_n_take(cardinal_copy)
sleep(10)
@@ -277,10 +277,10 @@ Difficulty: Hard
spawn(0)
diagonal_blasts(target)
else if(chaser_cooldown < world.time) //if chasers are off cooldown, fire some!
- var/obj/effect/overlay/temp/hierophant/chaser/C = new /obj/effect/overlay/temp/hierophant/chaser(loc, src, target, chaser_speed, FALSE)
+ var/obj/effect/temp_visual/hierophant/chaser/C = new /obj/effect/temp_visual/hierophant/chaser(loc, src, target, chaser_speed, FALSE)
chaser_cooldown = world.time + initial(chaser_cooldown)
if((prob(anger_modifier) || target.Adjacent(src)) && target != src)
- var/obj/effect/overlay/temp/hierophant/chaser/OC = new /obj/effect/overlay/temp/hierophant/chaser(loc, src, target, max(1.5, 5 - anger_modifier * 0.07), FALSE)
+ var/obj/effect/temp_visual/hierophant/chaser/OC = new /obj/effect/temp_visual/hierophant/chaser(loc, src, target, max(1.5, 5 - anger_modifier * 0.07), FALSE)
OC.moving = 4
OC.moving_dir = pick(cardinal - C.moving_dir)
else //just release a burst of power
@@ -291,11 +291,11 @@ Difficulty: Hard
var/turf/T = get_turf(victim)
if(!T)
return
- new /obj/effect/overlay/temp/hierophant/telegraph/diagonal(T, src)
+ new /obj/effect/temp_visual/hierophant/telegraph/diagonal(T, src)
playsound(T,'sound/magic/blink.ogg', 200, 1)
//playsound(T,'sound/effects/bin_close.ogg', 200, 1)
sleep(2)
- new /obj/effect/overlay/temp/hierophant/blast(T, src, FALSE)
+ new /obj/effect/temp_visual/hierophant/blast(T, src, FALSE)
for(var/d in diagonals)
spawn(0)
blast_wall(T, d)
@@ -304,11 +304,11 @@ Difficulty: Hard
var/turf/T = get_turf(victim)
if(!T)
return
- new /obj/effect/overlay/temp/hierophant/telegraph/cardinal(T, src)
+ new /obj/effect/temp_visual/hierophant/telegraph/cardinal(T, src)
playsound(T,'sound/magic/blink.ogg', 200, 1)
//playsound(T,'sound/effects/bin_close.ogg', 200, 1)
sleep(2)
- new /obj/effect/overlay/temp/hierophant/blast(T, src, FALSE)
+ new /obj/effect/temp_visual/hierophant/blast(T, src, FALSE)
for(var/d in cardinal)
spawn(0)
blast_wall(T, d)
@@ -317,11 +317,11 @@ Difficulty: Hard
var/turf/T = get_turf(victim)
if(!T)
return
- new /obj/effect/overlay/temp/hierophant/telegraph(T, src)
+ new /obj/effect/temp_visual/hierophant/telegraph(T, src)
playsound(T,'sound/magic/blink.ogg', 200, 1)
//playsound(T,'sound/effects/bin_close.ogg', 200, 1)
sleep(2)
- new /obj/effect/overlay/temp/hierophant/blast(T, src, FALSE)
+ new /obj/effect/temp_visual/hierophant/blast(T, src, FALSE)
for(var/d in alldirs)
spawn(0)
blast_wall(T, d)
@@ -331,7 +331,7 @@ Difficulty: Hard
var/turf/previousturf = T
var/turf/J = get_step(previousturf, dir)
for(var/i in 1 to range)
- new /obj/effect/overlay/temp/hierophant/blast(J, src, FALSE)
+ new /obj/effect/temp_visual/hierophant/blast(J, src, FALSE)
previousturf = J
J = get_step(previousturf, dir)
@@ -340,21 +340,21 @@ Difficulty: Hard
return
var/turf/T = get_turf(victim)
var/turf/source = get_turf(src)
- new /obj/effect/overlay/temp/hierophant/telegraph(T, src)
- new /obj/effect/overlay/temp/hierophant/telegraph(source, src)
+ new /obj/effect/temp_visual/hierophant/telegraph(T, src)
+ new /obj/effect/temp_visual/hierophant/telegraph(source, src)
playsound(T,'sound/magic/blink.ogg', 200, 1)
//playsound(T,'sound/magic/Wand_Teleport.ogg', 200, 1)
playsound(source,'sound/magic/blink.ogg', 200, 1)
//playsound(source,'sound/machines/AirlockOpen.ogg', 200, 1)
blinking = TRUE
sleep(2) //short delay before we start...
- new /obj/effect/overlay/temp/hierophant/telegraph/teleport(T, src)
- new /obj/effect/overlay/temp/hierophant/telegraph/teleport(source, src)
+ new /obj/effect/temp_visual/hierophant/telegraph/teleport(T, src)
+ new /obj/effect/temp_visual/hierophant/telegraph/teleport(source, src)
for(var/t in RANGE_TURFS(1, T))
- var/obj/effect/overlay/temp/hierophant/blast/B = new /obj/effect/overlay/temp/hierophant/blast(t, src, FALSE)
+ var/obj/effect/temp_visual/hierophant/blast/B = new /obj/effect/temp_visual/hierophant/blast(t, src, FALSE)
B.damage = 30
for(var/t in RANGE_TURFS(1, source))
- var/obj/effect/overlay/temp/hierophant/blast/B = new /obj/effect/overlay/temp/hierophant/blast(t, src, FALSE)
+ var/obj/effect/temp_visual/hierophant/blast/B = new /obj/effect/temp_visual/hierophant/blast(t, src, FALSE)
B.damage = 30
animate(src, alpha = 0, time = 2, easing = EASE_OUT) //fade out
sleep(1)
@@ -376,12 +376,12 @@ Difficulty: Hard
var/turf/T = get_turf(victim)
if(!T)
return
- new /obj/effect/overlay/temp/hierophant/telegraph(T, src)
+ new /obj/effect/temp_visual/hierophant/telegraph(T, src)
playsound(T,'sound/magic/blink.ogg', 200, 1)
//playsound(T,'sound/effects/bin_close.ogg', 200, 1)
sleep(2)
for(var/t in RANGE_TURFS(1, T))
- new /obj/effect/overlay/temp/hierophant/blast(t, src, FALSE)
+ new /obj/effect/temp_visual/hierophant/blast(t, src, FALSE)
/mob/living/simple_animal/hostile/megafauna/hierophant/proc/burst(turf/original) //release a wave of blasts
playsound(original,'sound/magic/blink.ogg', 200, 1)
@@ -395,7 +395,7 @@ Difficulty: Hard
if(dist > last_dist)
last_dist = dist
sleep(1 + (burst_range - last_dist) * 0.5) //gets faster as it gets further out
- new /obj/effect/overlay/temp/hierophant/blast(T, src, FALSE)
+ new /obj/effect/temp_visual/hierophant/blast(T, src, FALSE)
/mob/living/simple_animal/hostile/megafauna/hierophant/AltClickOn(atom/A) //player control handler(don't give this to a player holy fuck)
if(!istype(A) || get_dist(A, src) <= 2)
@@ -403,16 +403,16 @@ Difficulty: Hard
blink(A)
//Hierophant overlays
-/obj/effect/overlay/temp/hierophant
+/obj/effect/temp_visual/hierophant
layer = MOB_LAYER - 0.1
var/mob/living/caster //who made this, anyway
-/obj/effect/overlay/temp/hierophant/New(loc, new_caster)
+/obj/effect/temp_visual/hierophant/New(loc, new_caster)
..()
if(new_caster)
caster = new_caster
-/obj/effect/overlay/temp/hierophant/chaser //a hierophant's chaser. follows target around, moving and producing a blast every speed deciseconds.
+/obj/effect/temp_visual/hierophant/chaser //a hierophant's chaser. follows target around, moving and producing a blast every speed deciseconds.
duration = 98
var/mob/living/target //what it's following
var/turf/targetturf //what turf the target is actually on
@@ -426,7 +426,7 @@ Difficulty: Hard
var/currently_seeking = FALSE
var/friendly_fire_check = FALSE //if blasts produced apply friendly fire
-/obj/effect/overlay/temp/hierophant/chaser/New(loc, new_caster, new_target, new_speed, is_friendly_fire)
+/obj/effect/temp_visual/hierophant/chaser/New(loc, new_caster, new_target, new_speed, is_friendly_fire)
..()
target = new_target
friendly_fire_check = is_friendly_fire
@@ -435,14 +435,14 @@ Difficulty: Hard
spawn(0)
seek_target()
-/obj/effect/overlay/temp/hierophant/chaser/proc/get_target_dir()
+/obj/effect/temp_visual/hierophant/chaser/proc/get_target_dir()
. = get_cardinal_dir(src, targetturf)
if((. != previous_moving_dir && . == more_previouser_moving_dir) || . == 0) //we're alternating, recalculate
var/list/cardinal_copy = cardinal.Copy()
cardinal_copy -= more_previouser_moving_dir
. = pick(cardinal_copy)
-/obj/effect/overlay/temp/hierophant/chaser/proc/seek_target()
+/obj/effect/temp_visual/hierophant/chaser/proc/seek_target()
if(!currently_seeking)
currently_seeking = TRUE
targetturf = get_turf(target)
@@ -470,27 +470,27 @@ Difficulty: Hard
sleep(speed)
targetturf = get_turf(target)
-/obj/effect/overlay/temp/hierophant/chaser/proc/make_blast()
- new /obj/effect/overlay/temp/hierophant/blast(loc, caster, friendly_fire_check)
+/obj/effect/temp_visual/hierophant/chaser/proc/make_blast()
+ new /obj/effect/temp_visual/hierophant/blast(loc, caster, friendly_fire_check)
-/obj/effect/overlay/temp/hierophant/telegraph
+/obj/effect/temp_visual/hierophant/telegraph
icon = 'icons/effects/96x96.dmi'
icon_state = "hierophant_telegraph"
pixel_x = -32
pixel_y = -32
duration = 3
-/obj/effect/overlay/temp/hierophant/telegraph/diagonal
+/obj/effect/temp_visual/hierophant/telegraph/diagonal
icon_state = "hierophant_telegraph_diagonal"
-/obj/effect/overlay/temp/hierophant/telegraph/cardinal
+/obj/effect/temp_visual/hierophant/telegraph/cardinal
icon_state = "hierophant_telegraph_cardinal"
-/obj/effect/overlay/temp/hierophant/telegraph/teleport
+/obj/effect/temp_visual/hierophant/telegraph/teleport
icon_state = "hierophant_telegraph_teleport"
duration = 9
-/obj/effect/overlay/temp/hierophant/blast
+/obj/effect/temp_visual/hierophant/blast
icon = 'icons/effects/effects.dmi'
icon_state = "hierophant_blast"
name = "vortex blast"
@@ -502,7 +502,7 @@ Difficulty: Hard
var/friendly_fire_check = FALSE
var/bursting = FALSE //if we're bursting and need to hit anyone crossing us
-/obj/effect/overlay/temp/hierophant/blast/New(loc, new_caster, friendly_fire)
+/obj/effect/temp_visual/hierophant/blast/New(loc, new_caster, friendly_fire)
..()
friendly_fire_check = friendly_fire
if(new_caster)
@@ -513,7 +513,7 @@ Difficulty: Hard
spawn(0)
blast()
-/obj/effect/overlay/temp/hierophant/blast/proc/blast()
+/obj/effect/temp_visual/hierophant/blast/proc/blast()
var/turf/T = get_turf(src)
if(!T)
return
@@ -524,12 +524,12 @@ Difficulty: Hard
sleep(1.3) //slightly forgiving; the burst animation is 1.5 deciseconds
bursting = FALSE //we no longer damage crossers
-/obj/effect/overlay/temp/hierophant/blast/Crossed(atom/movable/AM)
+/obj/effect/temp_visual/hierophant/blast/Crossed(atom/movable/AM)
..()
if(bursting)
do_damage(get_turf(src))
-/obj/effect/overlay/temp/hierophant/blast/proc/do_damage(turf/T)
+/obj/effect/temp_visual/hierophant/blast/proc/do_damage(turf/T)
for(var/mob/living/L in T.contents - hit_things) //find and damage mobs...
hit_things += L
if((friendly_fire_check && caster && caster.faction_check(L)) || L.stat == DEAD)
@@ -570,7 +570,7 @@ Difficulty: Hard
H.timer = world.time + 51
if(do_after(user, 50, target = src))
playsound(src,'sound/magic/Blind.ogg', 200, 1, -4)
- new /obj/effect/overlay/temp/hierophant/telegraph/teleport(get_turf(src), user)
+ new /obj/effect/temp_visual/hierophant/telegraph/teleport(get_turf(src), user)
to_chat(user, "You touch the rune with the staff, dispelling it!")
H.rune = null
user.update_action_buttons_icon()
diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm
index d4a88b49e60..60b2f88c428 100644
--- a/code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm
+++ b/code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm
@@ -22,7 +22,7 @@
speed = 8
projectiletype = /obj/item/projectile/beam/drone
projectilesound = 'sound/weapons/laser3.ogg'
- var/datum/effect/system/ion_trail_follow/ion_trail
+ var/datum/effect_system/trail_follow/ion/ion_trail
//the drone randomly switches between these states because it's malfunctioning
var/hostile_drone = 0
@@ -80,14 +80,14 @@
//repair a bit of damage
if(prob(1))
src.visible_message("[bicon(src)] [src] shudders and shakes as some of it's damaged systems come back online.")
- var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
+ var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
s.set_up(3, 1, src)
s.start()
health += rand(25,100)
//spark for no reason
if(prob(5))
- var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
+ var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
s.set_up(3, 1, src)
s.start()
@@ -129,7 +129,7 @@
src.visible_message("[bicon(src)] [src] begins to spark and shake violenty!")
else
src.visible_message("[bicon(src)] [src] sparks and shakes like it's about to explode!")
- var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
+ var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
s.set_up(3, 1, src)
s.start()
@@ -154,7 +154,7 @@
/mob/living/simple_animal/hostile/retaliate/malf_drone/Destroy() //Seriously, what the actual hell.
//some random debris left behind
if(has_loot)
- var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
+ var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
s.set_up(3, 1, src)
s.start()
var/obj/O
diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/ghost.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/ghost.dm
index 2124a31078c..592f8230edd 100644
--- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/ghost.dm
+++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/ghost.dm
@@ -16,7 +16,7 @@
humanize_prompt += " Role: [spider_role_summary]"
if(user.ckey in ts_ckey_blacklist)
error_on_humanize = "You are not able to control any terror spider this round."
- else if(user.has_enabled_antagHUD == 1 && config.antag_hud_restricted)
+ else if(cannotPossess(user))
error_on_humanize = "You have enabled antag HUD and are unable to re-enter the round."
else if(spider_awaymission)
error_on_humanize = "Terror spiders that are part of an away mission cannot be controlled by ghosts."
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 0f85d78d01f..dd5fe980214 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
@@ -38,6 +38,8 @@ var/global/list/ts_spiderling_list = list()
// Movement
move_to_delay = 6
turns_per_move = 5
+ pressure_resistance = 50 //50 kPa difference required to push
+ throw_pressure_limit = 100 //100 kPa difference required to throw
pass_flags = PASSTABLE
// Ventcrawling
diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index fc331fb74b9..461b5193b69 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -11,9 +11,6 @@
var/icon_resting = ""
var/icon_gib = null //We only try to show a gibbing animation if this exists.
- var/oxygen_alert = 0
- var/toxins_alert = 0
- var/fire_alert = 0
var/healable = 1
var/list/speak = list()
@@ -70,7 +67,7 @@
var/gold_core_spawnable = CHEM_MOB_SPAWN_INVALID //if CHEM_MOB_SPAWN_HOSTILE can be spawned by plasma with gold core, CHEM_MOB_SPAWN_FRIENDLY are 'friendlies' spawned with blood
- var/master_commander = null //holding var for determining who own/controls a sentient simple animal (for sentience potions).
+ var/mob/living/carbon/human/master_commander = null //holding var for determining who own/controls a sentient simple animal (for sentience potions).
var/mob/living/simple_animal/hostile/spawner/nest
@@ -109,19 +106,8 @@
/mob/living/simple_animal/updatehealth()
..()
health = Clamp(health, 0, maxHealth)
+ med_hud_set_status()
-/mob/living/simple_animal/handle_hud_icons_health()
- ..()
- if(healths && maxHealth > 0)
- switch(health / maxHealth * 30)
- if(30 to INFINITY) healths.icon_state = "health0"
- if(26 to 29) healths.icon_state = "health1"
- if(21 to 25) healths.icon_state = "health2"
- if(16 to 20) healths.icon_state = "health3"
- if(11 to 15) healths.icon_state = "health4"
- if(6 to 10) healths.icon_state = "health5"
- if(1 to 5) healths.icon_state = "health6"
- if(0) healths.icon_state = "health7"
/mob/living/simple_animal/proc/process_ai()
handle_automated_movement()
@@ -201,7 +187,7 @@
var/areatemp = get_temperature(environment)
- if(abs(areatemp - bodytemperature) > 40 && !(flags & NO_BREATHE))
+ if(abs(areatemp - bodytemperature) > 40 && !(BREATHLESS in mutations))
var/diff = areatemp - bodytemperature
diff = diff / 5
bodytemperature += diff
@@ -213,21 +199,23 @@
if(atmos_requirements["min_oxy"] && oxy < atmos_requirements["min_oxy"])
atmos_suitable = 0
- throw_alert("oxy", /obj/screen/alert/oxy)
+ throw_alert("not_enough_oxy", /obj/screen/alert/not_enough_oxy)
else if(atmos_requirements["max_oxy"] && oxy > atmos_requirements["max_oxy"])
atmos_suitable = 0
- throw_alert("oxy", /obj/screen/alert/too_much_oxy)
+ throw_alert("too_much_oxy", /obj/screen/alert/too_much_oxy)
else
- clear_alert("oxy")
+ clear_alert("not_enough_oxy")
+ clear_alert("too_much_oxy")
if(atmos_requirements["min_tox"] && tox < atmos_requirements["min_tox"])
atmos_suitable = 0
- throw_alert("tox_in_air", /obj/screen/alert/not_enough_tox)
+ throw_alert("not_enough_tox", /obj/screen/alert/not_enough_tox)
else if(atmos_requirements["max_tox"] && tox > atmos_requirements["max_tox"])
atmos_suitable = 0
- throw_alert("tox_in_air", /obj/screen/alert/tox_in_air)
+ throw_alert("too_much_tox", /obj/screen/alert/too_much_tox)
else
- clear_alert("tox_in_air")
+ clear_alert("too_much_tox")
+ clear_alert("not_enough_tox")
if(atmos_requirements["min_n2"] && n2 < atmos_requirements["min_n2"])
atmos_suitable = 0
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 3eea5d36372..a98540b0a2d 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -34,8 +34,15 @@
..()
/atom/proc/prepare_huds()
+ hud_list = list()
for(var/hud in hud_possible)
- hud_list[hud] = image('icons/mob/hud.dmi', src, "")
+ var/hint = hud_possible[hud]
+ switch(hint)
+ if(HUD_LIST_LIST)
+ hud_list[hud] = list()
+ else
+ var/image/I = image('icons/mob/hud.dmi', src, "")
+ hud_list[hud] = I
/mob/proc/generate_name()
return name
@@ -1264,4 +1271,21 @@ var/list/slot_equipment_priority = list( \
.["Add Verb"] = "?_src_=vars;addverb=[UID()]"
.["Remove Verb"] = "?_src_=vars;remverb=[UID()]"
- .["Gib"] = "?_src_=vars;gib=[UID()]"
\ No newline at end of file
+ .["Gib"] = "?_src_=vars;gib=[UID()]"
+
+/mob/proc/spin(spintime, speed)
+ set waitfor = 0
+ var/D = dir
+ while(spintime >= speed)
+ sleep(speed)
+ switch(D)
+ if(NORTH)
+ D = EAST
+ if(SOUTH)
+ D = WEST
+ if(EAST)
+ D = SOUTH
+ if(WEST)
+ D = NORTH
+ setDir(D)
+ spintime -= speed
\ No newline at end of file
diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm
index 5031ec9c061..f4d60c2604b 100644
--- a/code/modules/mob/mob_defines.dm
+++ b/code/modules/mob/mob_defines.dm
@@ -100,8 +100,6 @@
var/in_throw_mode = 0
- var/coughedtime = null
-
var/emote_cd = 0 // Used to supress emote spamming. 1 if on CD, 2 if disabled by admin (manually set), else 0
var/job = null//Living
diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm
index 43b12417215..227138e2dfb 100644
--- a/code/modules/mob/mob_helpers.dm
+++ b/code/modules/mob/mob_helpers.dm
@@ -51,17 +51,17 @@
return 1
return 0
-proc/isLivingSSD(mob/M)
+/proc/isLivingSSD(mob/M)
return istype(M) && M.player_logged && M.stat != DEAD
-proc/isAntag(A)
+/proc/isAntag(A)
if(istype(A, /mob/living/carbon))
var/mob/living/carbon/C = A
if(C.mind && C.mind.special_role)
return 1
return 0
-proc/isNonCrewAntag(A)
+/proc/isNonCrewAntag(A)
if(!isAntag(A))
return 0
@@ -85,21 +85,28 @@ proc/isNonCrewAntag(A)
return 1
-proc/iscuffed(A)
+/proc/cannotPossess(A)
+ var/mob/dead/observer/G = A
+ if(G.has_enabled_antagHUD == 1 && config.antag_hud_restricted)
+ return 1
+ return 0
+
+
+/proc/iscuffed(A)
if(istype(A, /mob/living/carbon))
var/mob/living/carbon/C = A
if(C.handcuffed)
return 1
return 0
-proc/hassensorlevel(A, var/level)
+/proc/hassensorlevel(A, var/level)
var/mob/living/carbon/human/H = A
if(istype(H) && istype(H.w_uniform, /obj/item/clothing/under))
var/obj/item/clothing/under/U = H.w_uniform
return U.sensor_mode >= level
return 0
-proc/getsensorlevel(A)
+/proc/getsensorlevel(A)
var/mob/living/carbon/human/H = A
if(istype(H) && istype(H.w_uniform, /obj/item/clothing/under))
var/obj/item/clothing/under/U = H.w_uniform
@@ -170,7 +177,7 @@ proc/getsensorlevel(A)
p++
return t
-proc/slur(phrase, var/list/slurletters = ("'"))//use a different list as an input if you want to make robots slur with $#@%! characters
+/proc/slur(phrase, var/list/slurletters = ("'"))//use a different list as an input if you want to make robots slur with $#@%! characters
phrase = html_decode(phrase)
var/leng=lentext(phrase)
var/counter=lentext(phrase)
diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm
index 20e08001754..b33413d115c 100644
--- a/code/modules/mob/mob_movement.dm
+++ b/code/modules/mob/mob_movement.dm
@@ -147,11 +147,12 @@
mob.control_object.forceMove(get_step(mob.control_object, direct))
return
-
+#define MOVEMENT_DELAY_BUFFER 0.75
+#define MOVEMENT_DELAY_BUFFER_DELTA 1.25
/client/Move(n, direct)
if(world.time < move_delay)
return
-
+ var/old_move_delay = move_delay
move_delay = world.time + world.tick_lag //this is here because Move() can now be called multiple times per tick
if(!mob || !mob.loc)
return 0
@@ -203,9 +204,9 @@
if(isobj(mob.loc) || ismob(mob.loc)) //Inside an object, tell it we moved
var/atom/O = mob.loc
return O.relaymove(mob, direct)
-
+
if(!mob.Process_Spacemove(direct))
- return 0
+ return 0
if(mob.restrained()) // Why being pulled while cuffed prevents you from moving
for(var/mob/M in orange(1, mob))
@@ -220,7 +221,11 @@
//We are now going to move
moving = 1
- move_delay = mob.movement_delay() + world.time
+ var/delay = mob.movement_delay()
+ if(old_move_delay + (delay * MOVEMENT_DELAY_BUFFER_DELTA) + MOVEMENT_DELAY_BUFFER > world.time)
+ move_delay = old_move_delay + delay
+ else
+ move_delay = delay + world.time
mob.last_movement = world.time
if(locate(/obj/item/weapon/grab, mob))
@@ -252,7 +257,7 @@
return
spawn(1)
M.other_mobs = null
- M.animate_movement = 2
+ M.animate_movement = 2
return
else if(mob.confused)
@@ -361,13 +366,12 @@
spawn(0)
var/limit = 2//For only two trailing shadows.
for(var/turf/T in getline(mobloc, L.loc))
- spawn(0)
- anim(T,L,'icons/mob/mob.dmi',,"shadow",,L.dir)
+ new /obj/effect/temp_visual/dir_setting/ninja/shadow(T, L.dir)
limit--
- if(limit<=0) break
+ if(limit<=0)
+ break
else
- spawn(0)
- anim(mobloc,mob,'icons/mob/mob.dmi',,"shadow",,L.dir)
+ new /obj/effect/temp_visual/dir_setting/ninja/shadow(mobloc, L.dir)
L.forceMove(get_step(L, direct))
L.dir = direct
if(3) //Incorporeal move, but blocked by holy-watered tiles
diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm
index c043af9817f..9d16d66a64c 100644
--- a/code/modules/mob/new_player/new_player.dm
+++ b/code/modules/mob/new_player/new_player.dm
@@ -236,6 +236,10 @@
if(!IsJobAvailable(rank))
to_chat(src, alert("[rank] is not available. Please try another."))
return 0
+ var/datum/job/thisjob = job_master.GetJob(rank)
+ if(thisjob.barred_by_disability(client))
+ to_chat(src, alert("[rank] is not available due to your character's disability. Please try another."))
+ return 0
job_master.AssignRole(src, rank, 1)
@@ -300,7 +304,6 @@
AnnounceArrival(character, rank, join_message)
callHook("latespawn", list(character))
- var/datum/job/thisjob = job_master.GetJob(rank)
if(!thisjob.is_position_available() && thisjob in job_master.prioritized_jobs)
job_master.prioritized_jobs -= thisjob
qdel(src)
@@ -389,7 +392,7 @@
"Supply" = list(jobs = list(), titles = supply_positions, color = "#ead4ae"),
)
for(var/datum/job/job in job_master.occupations)
- if(job && IsJobAvailable(job.title))
+ if(job && IsJobAvailable(job.title) && !job.barred_by_disability(client))
activePlayers[job] = 0
var/categorized = 0
// Only players with the job assigned and AFK for less than 10 minutes count as active
diff --git a/code/modules/mob/new_player/sprite_accessories.dm b/code/modules/mob/new_player/sprite_accessories.dm
index 3c44bb5a82a..255be518671 100644
--- a/code/modules/mob/new_player/sprite_accessories.dm
+++ b/code/modules/mob/new_player/sprite_accessories.dm
@@ -433,6 +433,343 @@
//////END VG HAIRSTYLES///////
//////////////////////////////
+///////////////////////////////////
+//////START POLARIS HAIRSTYLES/////
+//////////////////////////////////
+
+/datum/sprite_accessory/hair/dave
+ name = "Dave"
+ icon_state = "hair_dave"
+
+/datum/sprite_accessory/hair/rosa
+ name = "Rosa"
+ icon_state = "hair_rosa"
+
+/datum/sprite_accessory/hair/jade
+ name = "Jade"
+ icon_state = "hair_jade"
+
+/datum/sprite_accessory/hair/shy
+ name = "Shy"
+ icon_state = "hair_shy"
+
+/datum/sprite_accessory/hair/manbun
+ name = "Manbun"
+ icon_state = "hair_manbun"
+
+/datum/sprite_accessory/hair/thinningback
+ name = "Thinning Back"
+ icon_state = "hair_thinningrear"
+
+/datum/sprite_accessory/hair/thinningfront
+ name = "Thinning Front"
+ icon_state = "hair_thinningfront"
+
+/datum/sprite_accessory/hair/thinning
+ name = "Thinning"
+ icon_state = "hair_thinning"
+
+/datum/sprite_accessory/hair/bowlcut2
+ name = "Bowl 2"
+ icon_state = "hair_bowlcut2"
+
+/datum/sprite_accessory/hair/ronin
+ name = "Ronin"
+ icon_state = "hair_ronin"
+
+/datum/sprite_accessory/hair/topknot
+ name = "Topknot"
+ icon_state = "hair_topknot"
+
+/datum/sprite_accessory/hair/regulationmohawk
+ name = "Regulation Mohawk"
+ icon_state = "hair_shavedmohawk"
+
+/datum/sprite_accessory/hair/rowbraid
+ name = "Row Braid"
+ icon_state = "hair_rowbraid"
+
+/datum/sprite_accessory/hair/rowdualbraid
+ name = "Row Dual Braid"
+ icon_state = "hair_rowdualtail"
+
+/datum/sprite_accessory/hair/rowbun
+ name = "Row Bun"
+ icon_state = "hair_rowbun"
+
+/datum/sprite_accessory/hair/hightight
+ name = "High and Tight"
+ icon_state = "hair_hightight"
+
+/datum/sprite_accessory/hair/partfade
+ name = "Parted Fade"
+ icon_state = "hair_shavedpart"
+ gender = MALE
+
+/datum/sprite_accessory/hair/undercut3
+ name = "Undercut Swept Left"
+ icon_state = "hair_undercut3"
+ gender = MALE
+
+/datum/sprite_accessory/hair/undercut2
+ name = "Undercut Swept Right"
+ icon_state = "hair_undercut2"
+ gender = MALE
+
+/datum/sprite_accessory/hair/undercut1
+ name = "Undercut"
+ icon_state = "hair_undercut1"
+ gender = MALE
+
+/datum/sprite_accessory/hair/coffeehouse
+ name = "Coffee House Cut"
+ icon_state = "hair_coffeehouse"
+ gender = MALE
+
+/datum/sprite_accessory/hair/tightbun
+ name = "Tight Bun"
+ icon_state = "hair_tightbun"
+ gender = FEMALE
+
+/datum/sprite_accessory/hair/trimmed
+ name = "Trimmed"
+ icon_state = "hair_trimmed"
+ gender = MALE
+
+/datum/sprite_accessory/hair/trimflat
+ name = "Trimmed Flat Top"
+ icon_state = "hair_trimflat"
+ gender = MALE
+
+/datum/sprite_accessory/hair/nofade
+ name = "Regulation Cut"
+ icon_state = "hair_nofade"
+ gender = MALE
+
+/datum/sprite_accessory/hair/baldfade
+ name = "Balding Fade"
+ icon_state = "hair_baldfade"
+ gender = MALE
+
+/datum/sprite_accessory/hair/highfade
+ name = "High Fade"
+ icon_state = "hair_highfade"
+ gender = MALE
+
+/datum/sprite_accessory/hair/medfade
+ name = "Medium Fade"
+ icon_state = "hair_medfade"
+
+/datum/sprite_accessory/hair/lowfade
+ name = "Low Fade"
+ icon_state = "hair_lowfade"
+ gender = MALE
+
+/datum/sprite_accessory/hair/oxton
+ name = "Oxton"
+ icon_state = "hair_oxton"
+
+/datum/sprite_accessory/hair/doublebun
+ name = "Double-Bun"
+ icon_state = "hair_doublebun"
+
+/datum/sprite_accessory/hair/halfshaved
+ name = "Half-Shaved Emo"
+ icon_state = "hair_halfshaved"
+
+/datum/sprite_accessory/hair/shortbangs
+ name = "Short Bangs"
+ icon_state = "hair_shortbangs"
+
+/datum/sprite_accessory/hair/longeralt2
+ name = "Long Hair Alt 2"
+ icon_state = "hair_longeralt2"
+
+/datum/sprite_accessory/hair/nia
+ name = "Nia"
+ icon_state = "hair_nia"
+
+/datum/sprite_accessory/hair/eighties
+ name = "80's"
+ icon_state = "hair_80s"
+
+/datum/sprite_accessory/hair/volaju
+ name = "Volaju"
+ icon_state = "hair_volaju"
+
+/datum/sprite_accessory/hair/joestar
+ name = "Joestar"
+ icon_state = "hair_joestar"
+ gender = MALE
+
+/datum/sprite_accessory/hair/nitori
+ name = "Nitori"
+ icon_state = "hair_nitori"
+
+/datum/sprite_accessory/hair/scully
+ name = "Scully"
+ icon_state = "hair_scully"
+
+/datum/sprite_accessory/hair/vegeta
+ name = "Vegeta"
+ icon_state = "hair_toriyama2"
+
+/datum/sprite_accessory/hair/crono
+ name = "Chrono"
+ icon_state = "hair_toriyama"
+
+/datum/sprite_accessory/hair/poofy2
+ name = "Poofy2"
+ icon_state = "hair_poofy2"
+
+/datum/sprite_accessory/hair/poofy
+ name = "Poofy"
+ icon_state = "hair_poofy"
+
+/datum/sprite_accessory/hair/dandypomp
+ name = "Dandy Pompadour"
+ icon_state = "hair_dandypompadour"
+
+/datum/sprite_accessory/hair/fringetail
+ name = "Fringetail"
+ icon_state = "hair_fringetail"
+
+/datum/sprite_accessory/hair/mahdrills
+ name = "Drillruru"
+ icon_state = "hair_drillruru"
+
+/datum/sprite_accessory/hair/familyman
+ name = "The Family Man"
+ icon_state = "hair_thefamilyman"
+
+/datum/sprite_accessory/hair/grandebraid
+ name = "Grande Braid"
+ icon_state = "hair_grande"
+
+/datum/sprite_accessory/hair/fringeemo
+ name = "Emo Fringe"
+ icon_state = "hair_emofringe"
+
+/datum/sprite_accessory/hair/emo2
+ name = "Emo Alt"
+ icon_state = "hair_emo2"
+
+/datum/sprite_accessory/hair/sargeant
+ name = "Flat Top"
+ icon_state = "hair_sargeant"
+
+/datum/sprite_accessory/hair/rows2
+ name = "Rows 2"
+ icon_state = "hair_rows2"
+
+/datum/sprite_accessory/hair/rows
+ name = "Rows"
+ icon_state = "hair_rows1"
+
+/datum/sprite_accessory/hair/reversemohawk
+ name = "Reverse Mohawk"
+ icon_state = "hair_reversemohawk"
+
+/datum/sprite_accessory/hair/father
+ name = "Father"
+ icon_state = "hair_father"
+
+/datum/sprite_accessory/hair/beehive2
+ name = "Beehive 2"
+ icon_state = "hair_beehive2"
+
+/datum/sprite_accessory/hair/sleeze
+ name = "Sleeze"
+ icon_state = "hair_sleeze"
+
+/datum/sprite_accessory/hair/zieglertail
+ name = "Zieglertail"
+ icon_state = "hair_ziegler"
+
+/datum/sprite_accessory/hair/spikyponytail
+ name = "Spiky Ponytail"
+ icon_state = "hair_spikyponytail"
+
+/datum/sprite_accessory/hair/tresshoulder
+ name = "Tress Shoulder"
+ icon_state = "hair_tressshoulder"
+
+/datum/sprite_accessory/hair/oneshoulder
+ name = "One Shoulder"
+ icon_state = "hair_oneshoulder"
+
+/datum/sprite_accessory/hair/ponytail6
+ name = "Ponytail 6"
+ icon_state = "hair_ponytail6"
+
+/datum/sprite_accessory/hair/ponytail5
+ name = "Ponytail 5"
+ icon_state = "hair_ponytail5"
+
+/datum/sprite_accessory/hair/ponytail4
+ name = "Ponytail 4"
+ icon_state = "hair_ponytail4"
+
+/datum/sprite_accessory/hair/country
+ name = "Country"
+ icon_state = "hair_country"
+
+/datum/sprite_accessory/hair/bedheadlong
+ name = "Bedhead Long"
+ icon_state = "hair_long_bedhead"
+
+/datum/sprite_accessory/hair/flair
+ name = "Flaired Hair"
+ icon_state = "hair_flair"
+
+/datum/sprite_accessory/hair/twintail
+ name = "Twintail"
+ icon_state = "hair_twintail"
+
+/datum/sprite_accessory/hair/short2
+ name = "Short Hair 2"
+ icon_state = "hair_shorthair3"
+
+/datum/sprite_accessory/hair/bun2
+ name = "Bun 2"
+ icon_state = "hair_bun2"
+
+/datum/sprite_accessory/hair/bun3
+ name = "Bun 3"
+ icon_state = "hair_bun3"
+
+/datum/sprite_accessory/hair/shavehair
+ name = "Shaved Hair"
+ icon_state = "hair_shaved"
+
+/datum/sprite_accessory/hair/veryshortovereyealternate
+ name = "Overeye Very Short, Alternate"
+ icon_state = "hair_veryshortovereyealternate"
+
+/datum/sprite_accessory/hair/veryshortovereye
+ name = "Overeye Very Short"
+ icon_state = "hair_veryshortovereye"
+
+/datum/sprite_accessory/hair/shortovereye
+ name = "Overeye Short"
+ icon_state = "hair_shortovereye"
+
+/datum/sprite_accessory/hair/longovereye
+ name = "Overeye Long"
+ icon_state = "hair_longovereye"
+
+/datum/sprite_accessory/hair/father
+ name = "Father"
+ icon_state = "hair_father"
+
+/datum/sprite_accessory/hair/bun4 // Due to a vulp hairstyle called bun
+ name = "Bun 4"
+ icon_state = "hair_bun4"
+
+///////////////////////////////////
+//////END POLARIS HAIRSTYLES///////
+//////////////////////////////////
+
/datum/sprite_accessory/hair/ipc
species_allowed = list("Machine")
glasses_over = 1
diff --git a/code/modules/modular_computers/computers/item/computer.dm b/code/modules/modular_computers/computers/item/computer.dm
index 9f867692153..f72d4bfccda 100644
--- a/code/modules/modular_computers/computers/item/computer.dm
+++ b/code/modules/modular_computers/computers/item/computer.dm
@@ -30,9 +30,8 @@
var/max_hardware_size = 0 // Maximal hardware w_class. Tablets/PDAs have 1, laptops 2, consoles 4.
var/steel_sheet_cost = 5 // Amount of steel sheets refunded when disassembling an empty frame of this computer.
- var/obj_integrity = 100
- var/integrity_failure = 50
- var/max_integrity = 100
+ integrity_failure = 50
+ max_integrity = 100
armor = list(melee = 0, bullet = 20, laser = 20, energy = 100, bomb = 0, bio = 100, rad = 100, fire = 0, acid = 0)
// Important hardware (must be installed for computer to work)
diff --git a/code/modules/modular_computers/computers/item/computer_damage.dm b/code/modules/modular_computers/computers/item/computer_damage.dm
index 689e8c99ab7..2623794fa9d 100644
--- a/code/modules/modular_computers/computers/item/computer_damage.dm
+++ b/code/modules/modular_computers/computers/item/computer_damage.dm
@@ -24,7 +24,7 @@
if(prob(75))
take_damage(obj_integrity, BRUTE)
-/obj/item/device/modular_computer/proc/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1)
+/obj/item/device/modular_computer/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1)
. = ..()
var/component_probability = min(50, max(damage_amount*0.1, 1 - obj_integrity/max_integrity))
switch(damage_flag)
diff --git a/code/modules/modular_computers/computers/machinery/modular_computer.dm b/code/modules/modular_computers/computers/machinery/modular_computer.dm
index 9e07fc19ddb..edc1f2277fa 100644
--- a/code/modules/modular_computers/computers/machinery/modular_computer.dm
+++ b/code/modules/modular_computers/computers/machinery/modular_computer.dm
@@ -28,9 +28,8 @@ var/list/global_modular_computers = list()
var/base_active_power_usage = 100 // Power usage when the computer is open (screen is active) and can be interacted with. Remember hardware can use power too.
var/base_idle_power_usage = 10 // Power usage when the computer is idle and screen is off (currently only applies to laptops)
- var/obj_integrity = 300
- var/integrity_failure = 150
- var/max_integrity = 300
+ integrity_failure = 150
+ max_integrity = 300
var/obj/item/device/modular_computer/processor/cpu = null // CPU that handles most logic while this type only handles power and other specific things.
diff --git a/code/modules/modular_computers/file_system/programs/antagonist/revelation.dm b/code/modules/modular_computers/file_system/programs/antagonist/revelation.dm
index 148766ef59d..38da8499756 100644
--- a/code/modules/modular_computers/file_system/programs/antagonist/revelation.dm
+++ b/code/modules/modular_computers/file_system/programs/antagonist/revelation.dm
@@ -27,14 +27,14 @@
if(battery_module && prob(25))
qdel(battery_module)
computer.visible_message("\The [computer]'s battery explodes in rain of sparks.")
- var/datum/effect/system/spark_spread/spark_system = new /datum/effect/system/spark_spread()
+ var/datum/effect_system/spark_spread/spark_system = new /datum/effect_system/spark_spread()
spark_system.set_up(5, 0, computer.loc)
spark_system.start()
if(recharger && prob(50))
qdel(recharger)
computer.visible_message("\The [computer]'s recharger explodes in rain of sparks.")
- var/datum/effect/system/spark_spread/spark_system = new /datum/effect/system/spark_spread()
+ var/datum/effect_system/spark_spread/spark_system = new /datum/effect_system/spark_spread()
spark_system.set_up(5, 0, computer.loc)
spark_system.start()
diff --git a/code/modules/modular_computers/hardware/_hardware.dm b/code/modules/modular_computers/hardware/_hardware.dm
index 4f752fdac10..f1fe147e393 100644
--- a/code/modules/modular_computers/hardware/_hardware.dm
+++ b/code/modules/modular_computers/hardware/_hardware.dm
@@ -9,8 +9,7 @@
var/obj/item/device/modular_computer/holder = null
// Computer that holds this hardware, if any.
- var/obj_integrity = 200
- var/max_integrity = 200
+ max_integrity = 200
var/power_usage = 0 // If the hardware uses extra power, change this.
var/enabled = 1 // If the hardware is turned off set this to 0.
@@ -77,7 +76,7 @@
return TRUE // Good to go.
// Handles damage checks
-/obj/item/weapon/computer_hardware/proc/take_damage(damage_amount)
+/obj/item/weapon/computer_hardware/take_damage(damage_amount)
obj_integrity = max(obj_integrity - damage_amount, 0)
/obj/item/weapon/computer_hardware/examine(var/mob/user)
diff --git a/code/modules/nano/modules/ert_manager.dm b/code/modules/nano/modules/ert_manager.dm
new file mode 100644
index 00000000000..8c17cda55e2
--- /dev/null
+++ b/code/modules/nano/modules/ert_manager.dm
@@ -0,0 +1,104 @@
+/datum/nano_module/ert_manager
+ name = "ERT Manager"
+ var/ert_type = "Code Red"
+ var/commander_slots = 1
+ var/security_slots = 3
+ var/medical_slots = 3
+ var/engineering_slots = 3
+ var/janitor_slots = 0
+ var/paranormal_slots = 0
+ var/cyborg_slots = 0
+ var/autoclose = 0
+
+
+/datum/nano_module/ert_manager/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = default_state)
+ ui = nanomanager.try_update_ui(user, src, ui_key, ui, force_open)
+ if(ui && autoclose)
+ ui.close()
+ return 0
+ if(!ui)
+ ui = new(user, src, ui_key, "ert_config.tmpl", "ERT Panel", 600, 600, state = state)
+ ui.open()
+ ui.set_auto_update(1)
+
+/datum/nano_module/ert_manager/Topic(href, href_list)
+ if(..())
+ return 1
+
+ if(href_list["set_code"])
+ ert_type = href_list["set_code"]
+
+ if(href_list["set_com"])
+ commander_slots = text2num(href_list["set_com"])
+
+ if(href_list["set_sec"])
+ security_slots = text2num(href_list["set_sec"])
+
+ if(href_list["set_med"])
+ medical_slots = text2num(href_list["set_med"])
+
+ if(href_list["set_eng"])
+ engineering_slots = text2num(href_list["set_eng"])
+
+ if(href_list["set_jan"])
+ janitor_slots = text2num(href_list["set_jan"])
+
+ if(href_list["set_par"])
+ paranormal_slots = text2num(href_list["set_par"])
+
+ if(href_list["set_cyb"])
+ cyborg_slots = text2num(href_list["set_cyb"])
+
+ if(href_list["dispatch_ert"])
+ ert_request_answered = 1
+ var/slots_list = list()
+ if(commander_slots > 0)
+ slots_list += "commander: [commander_slots]"
+ if(security_slots > 0)
+ slots_list += "security: [security_slots]"
+ if(medical_slots > 0)
+ slots_list += "medical: [medical_slots]"
+ if(engineering_slots > 0)
+ slots_list += "engineering: [engineering_slots]"
+ if(janitor_slots > 0)
+ slots_list += "janitor: [janitor_slots]"
+ if(paranormal_slots > 0)
+ slots_list += "paranormal: [paranormal_slots]"
+ if(cyborg_slots > 0)
+ slots_list += "cyborg: [cyborg_slots]"
+ var slot_text = list_implode(slots_list, ", ")
+ notify_ghosts("An ERT is being dispatched. Open positions: [slot_text]")
+ message_admins("[key_name_admin(usr)] dispatched a [ert_type] ERT. Slots: [slot_text]", 1)
+ log_admin("[key_name(usr)] dispatched a [ert_type] ERT. Slots: [slot_text]")
+ autoclose = 1
+ ui_interact(usr)
+ trigger_armed_response_team(convert_ert_string(ert_type), commander_slots, security_slots, medical_slots, engineering_slots, janitor_slots, paranormal_slots, cyborg_slots)
+ return 0
+
+ ui_interact(usr)
+
+
+/proc/convert_ert_string(thestring)
+ switch(thestring)
+ if("Code Amber")
+ return new /datum/response_team/amber
+ if("Code Red")
+ return new /datum/response_team/red
+ if("Code Gamma")
+ return new /datum/response_team/gamma
+
+
+/datum/nano_module/ert_manager/ui_data()
+ var/data[0]
+ data["alert_level"] = get_security_level()
+ data["ert_type"] = ert_type
+ data["com"] = commander_slots
+ data["sec"] = security_slots
+ data["med"] = medical_slots
+ data["eng"] = engineering_slots
+ data["jan"] = janitor_slots
+ data["par"] = paranormal_slots
+ data["cyb"] = cyborg_slots
+
+ return data
+
diff --git a/code/modules/nano/nanoui.dm b/code/modules/nano/nanoui.dm
index 8b749a67903..5e478e9367b 100644
--- a/code/modules/nano/nanoui.dm
+++ b/code/modules/nano/nanoui.dm
@@ -111,8 +111,6 @@ nanoui is used to open and update nano browser uis
// CodeMirror
add_script("codemirror-compressed.js") // A custom minified JavaScript file of CodeMirror, with the following plugins: CSS Mode, NTSL Mode, CSS-hint addon, Search addon, Sublime Keymap.
- add_stylesheet("codemirror.css") // A CSS sheet containing the basic stylings and formatting information for CodeMirror.
- add_stylesheet("cm_lesser-dark.css") // A theme for CodeMirror to use, which closely resembles the rest of the NanoUI style.
/**
* Set the current status (also known as visibility) of this ui.
@@ -178,7 +176,7 @@ nanoui is used to open and update nano browser uis
var/name = "[src_object]"
var/list/config_data = list(
"title" = title,
- "map" = MAP_NAME,
+ "map" = (using_map && using_map.name) ? using_map.name : "Unknown",
"srcObject" = list("name" = name),
"stateKey" = state_key,
"status" = status,
diff --git a/code/modules/ninja/energy_katana.dm b/code/modules/ninja/energy_katana.dm
index 0865536bc36..47ad02f970d 100644
--- a/code/modules/ninja/energy_katana.dm
+++ b/code/modules/ninja/energy_katana.dm
@@ -7,7 +7,7 @@
throwforce = 20
armour_penetration = 50
var/cooldown = 0 // Because spam aint cool, yo.
- var/datum/effect/system/spark_spread/spark_system
+ var/datum/effect_system/spark_spread/spark_system
/obj/item/weapon/katana/energy/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
@@ -69,7 +69,7 @@
/obj/item/weapon/katana/energy/New()
..()
- spark_system = new /datum/effect/system/spark_spread()
+ spark_system = new /datum/effect_system/spark_spread()
spark_system.set_up(5, 0, src)
spark_system.attach(src)
diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm
index d93281f2468..1523f241e69 100644
--- a/code/modules/paperwork/pen.dm
+++ b/code/modules/paperwork/pen.dm
@@ -149,6 +149,8 @@
origin_tech = "combat=3;syndicate=1"
attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") //these wont show up if the pen is off
var/on = 0
+ var/brightness_on = 2
+ light_color = LIGHT_COLOR_RED
/obj/item/weapon/pen/edagger/attack_self(mob/living/user)
if(on)
@@ -162,6 +164,7 @@
throwforce = initial(throwforce)
playsound(user, 'sound/weapons/saberoff.ogg', 5, 1)
to_chat(user, "[src] can now be concealed.")
+ set_light(0)
else
on = 1
force = 18
@@ -173,6 +176,7 @@
throwforce = 35
playsound(user, 'sound/weapons/saberon.ogg', 5, 1)
to_chat(user, "[src] is now active.")
+ set_light(brightness_on, 1)
update_icon()
/obj/item/weapon/pen/edagger/update_icon()
diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm
index a438d98afdc..de2608f5a81 100644
--- a/code/modules/paperwork/photocopier.dm
+++ b/code/modules/paperwork/photocopier.dm
@@ -250,7 +250,7 @@
var/mob/living/carbon/human/H = ass
to_chat(H, "Something smells toasty...")
var/obj/item/organ/external/G = H.get_organ("groin")
- G.take_damage(0, 30)
+ G.receive_damage(0, 30)
spawn(20)
H.emote("scream")
emag_cooldown = world.time + EMAG_DELAY
diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm
index da56a496947..59ae659f227 100644
--- a/code/modules/power/apc.dm
+++ b/code/modules/power/apc.dm
@@ -530,7 +530,7 @@
var/turf/T = get_turf(src)
var/obj/structure/cable/N = T.get_cable_node()
if(prob(50) && electrocute_mob(usr, N, N))
- var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
+ var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
s.set_up(5, 1, src)
s.start()
return
@@ -549,7 +549,7 @@
if(do_after(user, 50 * W.toolspeed, target = src))
if(terminal && opened && has_electronics!=2)
if(prob(50) && electrocute_mob(usr, terminal.powernet, terminal))
- var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
+ var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
s.set_up(5, 1, src)
s.start()
return
@@ -1056,11 +1056,11 @@
cell.corrupt()
src.malfhack = 1
update_icon()
- var/datum/effect/system/harmless_smoke_spread/smoke = new /datum/effect/system/harmless_smoke_spread()
+ var/datum/effect_system/smoke_spread/smoke = new
smoke.set_up(3, 0, src.loc)
smoke.attach(src)
smoke.start()
- var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
+ var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
s.set_up(3, 1, src)
s.start()
for(var/mob/M in viewers(src))
diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm
index e44a694ba06..62313ddbccb 100644
--- a/code/modules/power/cable.dm
+++ b/code/modules/power/cable.dm
@@ -195,7 +195,7 @@ By design, d1 is the smallest direction and d2 is the highest
if(!prob(prb))
return 0
if(electrocute_mob(user, powernet, src, siemens_coeff))
- var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
+ var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
s.set_up(5, 1, src)
s.start()
return 1
diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm
index 061cd62bc44..57a6e77b660 100644
--- a/code/modules/power/lighting.dm
+++ b/code/modules/power/lighting.dm
@@ -371,7 +371,7 @@
to_chat(user, "You stick \the [W] into the light socket!")
if(has_power() && (W.flags & CONDUCT))
- var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
+ var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
s.set_up(3, 1, src)
s.start()
if(prob(75))
@@ -448,7 +448,7 @@
else
prot = 1
- if(prot > 0 || (RESIST_HEAT in user.mutations))
+ if(prot > 0 || (HEATRES in user.mutations))
to_chat(user, "You remove the light [fitting]")
else if(TK in user.mutations)
to_chat(user, "You telekinetically remove the light [fitting].")
@@ -457,7 +457,7 @@
to_chat(user, "You try to remove the light [fitting], but you burn your hand on it!")
var/obj/item/organ/external/affecting = H.get_organ("[user.hand ? "l" : "r" ]_hand")
- if(affecting.take_damage( 0, 5 )) // 5 burn damage
+ if(affecting.receive_damage( 0, 5 )) // 5 burn damage
H.UpdateDamageIcon()
H.updatehealth()
return
@@ -525,7 +525,7 @@
if(status == LIGHT_OK || status == LIGHT_BURNED)
playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1)
if(on || overloaded)
- var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
+ var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
s.set_up(3, 1, src)
s.start()
status = LIGHT_BROKEN
diff --git a/code/modules/power/singularity/containment_field.dm b/code/modules/power/singularity/containment_field.dm
index 564a52e0acd..3a5a059d670 100644
--- a/code/modules/power/singularity/containment_field.dm
+++ b/code/modules/power/singularity/containment_field.dm
@@ -99,7 +99,7 @@
if(hasShocked)
return 0
hasShocked = 1
- var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
+ var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
s.set_up(5, 1, AM.loc)
s.start()
var/atom/target = get_edge_target_turf(AM, get_dir(src, get_step_away(AM, src)))
diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm
index 3ebcbb565dc..34dad709bd1 100644
--- a/code/modules/power/singularity/emitter.dm
+++ b/code/modules/power/singularity/emitter.dm
@@ -202,7 +202,7 @@
A.dir = src.dir
playsound(get_turf(src), 'sound/weapons/emitter.ogg', 25, 1)
if(prob(35))
- var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
+ var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
s.set_up(5, 1, src)
s.start()
diff --git a/code/modules/power/singularity/narsie.dm b/code/modules/power/singularity/narsie.dm
index 03b1d07b85b..8e09d9f6ed3 100644
--- a/code/modules/power/singularity/narsie.dm
+++ b/code/modules/power/singularity/narsie.dm
@@ -31,17 +31,18 @@
var/area/A = get_area(src)
if(A)
- var/image/alert_overlay = image('icons/effects/effects.dmi', "ghostalertsie")
+ var/image/alert_overlay = image('icons/effects/cult_effects.dmi', "ghostalertsie")
notify_ghosts("Nar-Sie has risen in \the [A.name]. Reach out to the Geometer to be given a new shell for your soul.", source = src, alert_overlay = alert_overlay, action=NOTIFY_ATTACK)
narsie_spawn_animation()
sleep(70)
shuttle_master.emergency.request(null, 0.3) // Cannot recall
+ shuttle_master.emergency.canRecall = FALSE
/obj/singularity/narsie/large/attack_ghost(mob/dead/observer/user as mob)
makeNewConstruct(/mob/living/simple_animal/hostile/construct/harvester, user, null, 1)
- new /obj/effect/effect/sleep_smoke(user.loc)
+ new /obj/effect/particle_effect/smoke/sleeping(user.loc)
/obj/singularity/narsie/process()
diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm
index f73d306d15b..6c8b02d5e23 100644
--- a/code/modules/power/smes.dm
+++ b/code/modules/power/smes.dm
@@ -184,7 +184,7 @@
if(do_after(user, 50 * I.toolspeed, target = src))
if(prob(50) && electrocute_mob(usr, terminal.powernet, terminal)) //animate the electrocution if uncautious and unlucky
- var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
+ var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
s.set_up(5, 1, src)
s.start()
return
@@ -325,7 +325,7 @@
var/turf/T = get_turf(user)
var/obj/structure/cable/N = T.get_cable_node() //get the connecting node cable, if there's one
if(prob(50) && electrocute_mob(user, N, N)) //animate the electrocution if uncautious and unlucky
- var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
+ var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
s.set_up(5, 1, src)
s.start()
return
@@ -440,7 +440,7 @@
for(var/mob/M in viewers(src))
M.show_message("The [src.name] is making strange noises!", 3, "You hear sizzling electronics.", 2)
sleep(10*pick(4,5,6,7,10,14))
- var/datum/effect/system/harmless_smoke_spread/smoke = new /datum/effect/system/harmless_smoke_spread()
+ var/datum/effect_system/smoke_spread/smoke = new
smoke.set_up(3, 0, src.loc)
smoke.attach(src)
smoke.start()
@@ -448,7 +448,7 @@
qdel(src)
return
if(prob(15)) //Power drain
- var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
+ var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
s.set_up(3, 1, src)
s.start()
if(prob(50))
@@ -456,7 +456,7 @@
else
emp_act(2)
if(prob(5)) //smoke only
- var/datum/effect/system/harmless_smoke_spread/smoke = new /datum/effect/system/harmless_smoke_spread()
+ var/datum/effect_system/smoke_spread/smoke = new
smoke.set_up(3, 0, src.loc)
smoke.attach(src)
smoke.start()
diff --git a/code/modules/power/supermatter/sm_shard.dm b/code/modules/power/supermatter/sm_shard.dm
index d4c1109e16e..b768915a836 100644
--- a/code/modules/power/supermatter/sm_shard.dm
+++ b/code/modules/power/supermatter/sm_shard.dm
@@ -56,7 +56,7 @@
var/obj/item/organ/external/affecting = H.get_organ(pick("l_foot", "r_foot"))
if(affecting.status & ORGAN_ROBOT)
return
- if(affecting.take_damage(5, 20))
+ if(affecting.receive_damage(5, 20))
H.UpdateDamageIcon()
H.updatehealth()
if(!(H.species && (H.species.flags & NO_PAIN)))
diff --git a/code/modules/projectiles/ammunition/ammo_casings.dm b/code/modules/projectiles/ammunition/ammo_casings.dm
index 076c2f9c39b..276d7689c5d 100644
--- a/code/modules/projectiles/ammunition/ammo_casings.dm
+++ b/code/modules/projectiles/ammunition/ammo_casings.dm
@@ -134,7 +134,7 @@
name = "rubber shot"
desc = "A shotgun casing filled with densely-packed rubber balls, used to incapacitate crowds from a distance."
icon_state = "cshell"
- projectile_type = /obj/item/projectile/bullet/rpellet
+ projectile_type = /obj/item/projectile/bullet/pellet/rubber
pellets = 6
variance = 25
materials = list(MAT_METAL=4000)
diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
index bdc4126a25c..22f235589ad 100644
--- a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
+++ b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
@@ -205,7 +205,7 @@
if(ismineralturf(target_turf))
var/turf/simulated/mineral/M = target_turf
M.gets_drilled(firer)
- var/obj/effect/overlay/temp/kinetic_blast/K = new /obj/effect/overlay/temp/kinetic_blast(target_turf)
+ var/obj/effect/temp_visual/kinetic_blast/K = new /obj/effect/temp_visual/kinetic_blast(target_turf)
K.color = color
for(var/type in hit_overlays)
new type(target_turf)
@@ -328,7 +328,7 @@
/obj/item/borg/upgrade/modkit/aoe/modify_projectile(obj/item/projectile/kinetic/K)
K.name = "kinetic explosion"
if(!K.turf_aoe && !K.mob_aoe)
- K.hit_overlays += /obj/effect/overlay/temp/explosion/fast
+ K.hit_overlays += /obj/effect/temp_visual/explosion/fast
K.mob_aoe += modifier
/obj/item/borg/upgrade/modkit/aoe/turfs
diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm
index 5b0c0766dc1..98939e02633 100644
--- a/code/modules/projectiles/guns/energy/special.dm
+++ b/code/modules/projectiles/guns/energy/special.dm
@@ -16,6 +16,9 @@
/obj/item/weapon/gun/energy/ionrifle/emp_act(severity)
return
+/obj/item/weapon/gun/energy/ionrifle/isHandgun()
+ return 0
+
/obj/item/weapon/gun/energy/ionrifle/carbine
name = "ion carbine"
desc = "The MK.II Prototype Ion Projector is a lightweight carbine version of the larger ion rifle, built to be ergonomic and efficient."
diff --git a/code/modules/projectiles/guns/magic/wand.dm b/code/modules/projectiles/guns/magic/wand.dm
index ac804ab9192..1f567dd8997 100644
--- a/code/modules/projectiles/guns/magic/wand.dm
+++ b/code/modules/projectiles/guns/magic/wand.dm
@@ -122,7 +122,7 @@
/obj/item/weapon/gun/magic/wand/teleport/zap_self(mob/living/user)
do_teleport(user, user, 10)
- var/datum/effect/system/harmless_smoke_spread/smoke = new /datum/effect/system/harmless_smoke_spread()
+ var/datum/effect_system/smoke_spread/smoke = new
smoke.set_up(10, 0, user.loc)
smoke.start()
charges--
diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm
index f2beec3f6bc..22d7d04784d 100644
--- a/code/modules/projectiles/projectile.dm
+++ b/code/modules/projectiles/projectile.dm
@@ -71,21 +71,34 @@
if(!isliving(target))
return 0
var/mob/living/L = target
+ var/mob/living/carbon/human/H
if(blocked < 100) // not completely blocked
if(damage && L.blood_volume && damage_type == BRUTE)
var/splatter_dir = dir
if(starting)
splatter_dir = get_dir(starting, target_loca)
if(isalien(L))
- new /obj/effect/overlay/temp/dir_setting/bloodsplatter/xenosplatter(target_loca, splatter_dir)
+ new /obj/effect/temp_visual/dir_setting/bloodsplatter/xenosplatter(target_loca, splatter_dir)
else
var/blood_color = "#C80000"
if(ishuman(target))
- var/mob/living/carbon/human/H = target
+ H = target
blood_color = H.species.blood_color
- new /obj/effect/overlay/temp/dir_setting/bloodsplatter(target_loca, splatter_dir, blood_color)
+ new /obj/effect/temp_visual/dir_setting/bloodsplatter(target_loca, splatter_dir, blood_color)
if(prob(33))
- L.add_splatter_floor(target_loca)
+ var/list/shift = list("x" = 0, "y" = 0)
+ var/turf/step_over = get_step(target_loca, splatter_dir)
+
+ if(get_splatter_blockage(step_over, target, splatter_dir, target_loca)) //If you can't cross the tile or any of its relevant obstacles...
+ shift = pixel_shift_dir(splatter_dir) //Pixel shift the blood there instead (so you can't see wallsplatter through walls).
+ else
+ target_loca = step_over
+ L.add_splatter_floor(target_loca, shift_x = shift["x"], shift_y = shift["y"])
+ if(istype(H))
+ for(var/mob/living/carbon/human/M in step_over) //Bloody the mobs who're infront of the spray.
+ M.bloody_hands(H)
+ /* Uncomment when bloody_body stops randomly not transferring blood colour.
+ M.bloody_body(H) */
var/organ_hit_text = ""
if(L.has_limbs)
@@ -110,6 +123,15 @@
add_logs(firer, L, "shot", src, reagent_note)
return L.apply_effects(stun, weaken, paralyze, irradiate, slur, stutter, eyeblur, drowsy, blocked, stamina, jitter)
+/obj/item/projectile/proc/get_splatter_blockage(var/turf/step_over, var/atom/target, var/splatter_dir, var/target_loca) //Check whether the place we want to splatter blood is blocked (i.e. by windows).
+ var/turf/step_cardinal = !(splatter_dir in list(NORTH, SOUTH, EAST, WEST)) ? get_step(target_loca, get_cardinal_dir(target_loca, step_over)) : null
+
+ if(step_over.density && !step_over.CanPass(target, step_over, 1)) //Preliminary simple check.
+ return TRUE
+ for(var/atom/movable/border_obstacle in step_over) //Check to see if we're blocked by a (non-full) window or some such. Do deeper investigation if we're splattering blood diagonally.
+ if(border_obstacle.flags&ON_BORDER && get_dir(step_cardinal ? step_cardinal : target_loca, step_over) == turn(border_obstacle.dir, 180))
+ return TRUE
+
/obj/item/projectile/proc/vol_by_damage()
if(damage)
return Clamp((damage) * 0.67, 30, 100)// Multiply projectile damage by 0.67, then clamp the value between 30 and 100
diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm
index 48fe1f74564..becada9f19e 100644
--- a/code/modules/projectiles/projectile/beams.dm
+++ b/code/modules/projectiles/projectile/beams.dm
@@ -9,6 +9,8 @@
flag = "laser"
eyeblur = 2
is_reflectable = TRUE
+ light_range = 2
+ light_color = LIGHT_COLOR_RED
/obj/item/projectile/beam/laser
@@ -35,6 +37,7 @@
irradiate = 30
forcedodge = 1
range = 15
+ light_color = LIGHT_COLOR_GREEN
/obj/item/projectile/beam/disabler
name = "disabler beam"
@@ -44,11 +47,13 @@
flag = "energy"
hitsound = 'sound/weapons/tap.ogg'
eyeblur = 0
+ light_color = LIGHT_COLOR_CYAN
/obj/item/projectile/beam/pulse
name = "pulse"
icon_state = "u_laser"
damage = 50
+ light_color = LIGHT_COLOR_DARKBLUE
/obj/item/projectile/beam/pulse/on_hit(var/atom/target, var/blocked = 0)
if(istype(target,/turf/)||istype(target,/obj/structure/))
@@ -64,6 +69,7 @@
damage = 30
legacy = 1
animate_movement = SLIDE_STEPS
+ light_color = LIGHT_COLOR_GREEN
/obj/item/projectile/beam/emitter/singularity_pull()
return //don't want the emitters to miss
@@ -77,6 +83,7 @@
flag = "laser"
var/suit_types = list(/obj/item/clothing/suit/redtag, /obj/item/clothing/suit/bluetag)
log_override = TRUE
+ light_color = LIGHT_COLOR_DARKBLUE
/obj/item/projectile/beam/lasertag/on_hit(atom/target, blocked = 0)
. = ..()
@@ -94,6 +101,7 @@
/obj/item/projectile/beam/lasertag/redtag
icon_state = "laser"
suit_types = list(/obj/item/clothing/suit/bluetag)
+ light_color = LIGHT_COLOR_RED
/obj/item/projectile/beam/lasertag/bluetag
icon_state = "bluelaser"
@@ -106,6 +114,7 @@
stun = 5
weaken = 5
stutter = 5
+ light_color = LIGHT_COLOR_PINK
/obj/item/projectile/beam/immolator
name = "immolation beam"
@@ -122,12 +131,15 @@
icon_state = "purple_laser"
damage = 200
damage_type = BURN
+ light_color = LIGHT_COLOR_PURPLE
/obj/item/projectile/beam/instakill/blue
icon_state = "blue_laser"
+ light_color = LIGHT_COLOR_DARKBLUE
/obj/item/projectile/beam/instakill/red
icon_state = "red_laser"
+ light_color = LIGHT_COLOR_RED
/obj/item/projectile/beam/instakill/on_hit(atom/target)
. = ..()
diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm
index 701be48d7b1..8e697d1e86e 100644
--- a/code/modules/projectiles/projectile/bullets.dm
+++ b/code/modules/projectiles/projectile/bullets.dm
@@ -69,8 +69,26 @@
/obj/item/projectile/bullet/pellet
name = "pellet"
damage = 12.5
+ var/tile_dropoff = 0.75
+ var/tile_dropoff_s = 1.25
+
+/obj/item/projectile/bullet/pellet/Range()
+ ..()
+ if(damage > 0)
+ damage -= tile_dropoff
+ if(stamina > 0)
+ stamina -= tile_dropoff_s
+ if(damage < 0 && stamina < 0)
+ qdel(src)
+
+/obj/item/projectile/bullet/pellet/rubber
+ name = "rubber pellet"
+ damage = 3
+ stamina = 25
+ icon_state = "bullet-r"
/obj/item/projectile/bullet/pellet/weak
+ tile_dropoff = 0.55 //Come on it does 6 damage don't be like that.
damage = 6
/obj/item/projectile/bullet/pellet/weak/New()
@@ -78,7 +96,7 @@
..()
/obj/item/projectile/bullet/pellet/weak/on_range()
- var/datum/effect/system/spark_spread/sparks = new /datum/effect/system/spark_spread
+ var/datum/effect_system/spark_spread/sparks = new /datum/effect_system/spark_spread
sparks.set_up(1, 1, src)
sparks.start()
..()
@@ -96,7 +114,7 @@
/obj/item/projectile/bullet/pellet/overload/on_range()
explosion(src, 0, 0, 2)
- var/datum/effect/system/spark_spread/sparks = new /datum/effect/system/spark_spread
+ var/datum/effect_system/spark_spread/sparks = new /datum/effect_system/spark_spread
sparks.set_up(3, 3, src)
sparks.start()
..()
@@ -128,12 +146,6 @@
/obj/item/projectile/bullet/heavybullet
damage = 35
-/obj/item/projectile/bullet/rpellet
- name = "rubber pellet"
- damage = 3
- stamina = 25
- icon_state = "bullet-r"
-
/obj/item/projectile/bullet/stunshot//taser slugs for shotguns, nothing special
name = "stunshot"
damage = 5
diff --git a/code/modules/projectiles/projectile/energy.dm b/code/modules/projectiles/projectile/energy.dm
index d9e8a0759bd..10786ec4b82 100644
--- a/code/modules/projectiles/projectile/energy.dm
+++ b/code/modules/projectiles/projectile/energy.dm
@@ -22,7 +22,7 @@
/obj/item/projectile/energy/electrode/on_hit(var/atom/target, var/blocked = 0)
. = ..()
if(!ismob(target) || blocked >= 100) //Fully blocked by mob or collided with dense object - burst into sparks!
- var/datum/effect/system/spark_spread/sparks = new /datum/effect/system/spark_spread
+ var/datum/effect_system/spark_spread/sparks = new /datum/effect_system/spark_spread
sparks.set_up(1, 1, src)
sparks.start()
else if(iscarbon(target))
@@ -34,7 +34,7 @@
C.do_jitter_animation(jitter)
/obj/item/projectile/energy/electrode/on_range() //to ensure the bolt sparks when it reaches the end of its range if it didn't hit a target yet
- var/datum/effect/system/spark_spread/sparks = new /datum/effect/system/spark_spread
+ var/datum/effect_system/spark_spread/sparks = new /datum/effect_system/spark_spread
sparks.set_up(1, 1, src)
sparks.start()
..()
diff --git a/code/modules/projectiles/projectile/magic.dm b/code/modules/projectiles/projectile/magic.dm
index ff274a48993..3d26268de51 100644
--- a/code/modules/projectiles/projectile/magic.dm
+++ b/code/modules/projectiles/projectile/magic.dm
@@ -17,7 +17,7 @@
damage = 10
damage_type = BRUTE
nodamage = 0
-
+
//explosion values
var/exp_heavy = 0
var/exp_light = 2
@@ -55,7 +55,7 @@
if(ismob(target)) //multiple flavors of pain
var/mob/living/M = target
M.take_overall_damage(0,10) //between this 10 burn, the 10 brute, the explosion brute, and the onfire burn, your at about 65 damage if you stop drop and roll immediately
-
+
/obj/item/projectile/magic/fireball/infernal
name = "infernal fireball"
@@ -100,7 +100,7 @@
if(!stuff.anchored && stuff.loc)
teleammount++
do_teleport(stuff, stuff, 10)
- var/datum/effect/system/harmless_smoke_spread/smoke = new /datum/effect/system/harmless_smoke_spread()
+ var/datum/effect_system/smoke_spread/smoke = new
smoke.set_up(max(round(10 - teleammount),1), 0, stuff.loc) //Smoke drops off if a lot of stuff is moved for the sake of sanity
smoke.start()
@@ -187,7 +187,7 @@ proc/wabbajack(mob/living/M)
if(ishuman(M))
Robot.mmi.transfer_identity(M) //Does not transfer key/client.
if("slime")
- new_mob = new /mob/living/carbon/slime(M.loc)
+ new_mob = new /mob/living/carbon/slime/random(M.loc)
new_mob.universal_speak = 1
if("xeno")
if(prob(50))
@@ -293,4 +293,4 @@ proc/wabbajack(mob/living/M)
damage_type = BURN
flag = "magic"
dismemberment = 50
- nodamage = 0
\ No newline at end of file
+ nodamage = 0
\ No newline at end of file
diff --git a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm
index 94fb6a71e18..fb42ce7cb57 100644
--- a/code/modules/projectiles/projectile/special.dm
+++ b/code/modules/projectiles/projectile/special.dm
@@ -191,7 +191,7 @@
icon_state = "snappop"
/obj/item/projectile/clown/Bump(atom/A as mob|obj|turf|area)
- var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
+ var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
s.set_up(3, 1, src)
s.start()
new /obj/effect/decal/cleanable/ash(loc)
diff --git a/code/modules/reagents/chem_splash.dm b/code/modules/reagents/chem_splash.dm
index 7c16bf1ab9a..e586e6f806b 100644
--- a/code/modules/reagents/chem_splash.dm
+++ b/code/modules/reagents/chem_splash.dm
@@ -29,7 +29,7 @@
splash_holder.handle_reactions() // React them now.
if(splash_holder.total_volume && affected_range >= 0) //The possible reactions didnt use up all reagents, so we spread it around.
- var/datum/effect/system/steam_spread/steam = new /datum/effect/system/steam_spread()
+ var/datum/effect_system/steam_spread/steam = new /datum/effect_system/steam_spread()
steam.set_up(10, 0, epicenter)
steam.attach(epicenter)
steam.start()
diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
index 3904e923886..93895b94603 100644
--- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
@@ -282,7 +282,7 @@
dispensable_reagents = list("ice", "cream", "cider", "beer", "kahlua", "whiskey", "wine", "vodka", "gin", "rum", "tequila", "vermouth", "cognac", "ale", "mead", "synthanol")
hack_message = "You disable the 'nanotrasen-are-cheap-bastards' lock, enabling hidden and very expensive boozes."
unhack_message = "You re-enable the 'nanotrasen-are-cheap-bastards' lock, disabling hidden and very expensive boozes."
- hacked_reagents = list("goldschlager", "patron", "absinthe", "ethanol", "nothing")
+ hacked_reagents = list("goldschlager", "patron", "absinthe", "ethanol", "nothing", "sake")
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -373,4 +373,4 @@
B.forceMove(loc)
beaker = null
default_deconstruction_crowbar(I)
- return 1
\ No newline at end of file
+ return 1
diff --git a/code/modules/reagents/chemistry/reagents/admin.dm b/code/modules/reagents/chemistry/reagents/admin.dm
index a7fc7fa6108..785ac17a598 100644
--- a/code/modules/reagents/chemistry/reagents/admin.dm
+++ b/code/modules/reagents/chemistry/reagents/admin.dm
@@ -20,7 +20,7 @@
var/mob/living/carbon/human/H = M
for(var/thing in H.internal_organs)
var/obj/item/organ/internal/I = thing
- I.take_damage(-5)
+ I.receive_damage(-5)
for(var/obj/item/organ/external/E in H.bodyparts)
if(E.mend_fracture())
E.perma_injury = 0
diff --git a/code/modules/reagents/chemistry/reagents/medicine.dm b/code/modules/reagents/chemistry/reagents/medicine.dm
index 20144bff374..b135d076818 100644
--- a/code/modules/reagents/chemistry/reagents/medicine.dm
+++ b/code/modules/reagents/chemistry/reagents/medicine.dm
@@ -92,7 +92,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.take_damage(-0.4)
+ I.receive_damage(-0.4)
..()
/datum/reagent/medicine/mitocholide/reaction_obj(obj/O, volume)
@@ -512,7 +512,7 @@
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.take_damage(-1)
+ E.receive_damage(-1)
M.AdjustEyeBlurry(-1)
M.AdjustEarDamage(-1)
if(prob(50))
diff --git a/code/modules/reagents/chemistry/reagents/pyrotechnic.dm b/code/modules/reagents/chemistry/reagents/pyrotechnic.dm
index e75b904d648..b54444ee2d4 100644
--- a/code/modules/reagents/chemistry/reagents/pyrotechnic.dm
+++ b/code/modules/reagents/chemistry/reagents/pyrotechnic.dm
@@ -137,17 +137,6 @@
if(!locate(/obj/effect/decal/cleanable/dirt/blackpowder) in T) //let's not have hundreds of decals of black powder on the same turf
new /obj/effect/decal/cleanable/dirt/blackpowder(T)
-/*
-/datum/reagent/blackpowder/on_ex_act()
- var/location = get_turf(holder.my_atom)
- var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
- s.set_up(2, 1, location)
- s.start()
- sleep(rand(10,15))
- blackpowder_detonate(holder, volume)
- holder.remove_reagent("blackpowder", volume)
- return */
-
/datum/reagent/flash_powder
name = "Flash Powder"
id = "flash_powder"
diff --git a/code/modules/reagents/chemistry/reagents/toxins.dm b/code/modules/reagents/chemistry/reagents/toxins.dm
index 5d6523f7913..72014dd1021 100644
--- a/code/modules/reagents/chemistry/reagents/toxins.dm
+++ b/code/modules/reagents/chemistry/reagents/toxins.dm
@@ -246,7 +246,7 @@
if(prob(75))
var/obj/item/organ/external/affecting = H.get_organ("head")
if(affecting)
- affecting.take_damage(5, 10)
+ affecting.receive_damage(5, 10)
H.UpdateDamageIcon()
H.emote("scream")
else
@@ -272,7 +272,7 @@
if(prob(75))
var/obj/item/organ/external/affecting = H.get_organ("head")
if(affecting)
- affecting.take_damage(0, 20)
+ affecting.receive_damage(0, 20)
H.UpdateDamageIcon()
H.emote("scream")
else
@@ -323,12 +323,12 @@
M.EyeBlurry(3)
..()
-/datum/reagent/beer2 //disguised as normal beer for use by emagged brobots
+/datum/reagent/beer2 //disguised as normal beer for use by emagged service borgs
name = "Beer"
id = "beer2"
description = "An alcoholic beverage made from malted grains, hops, yeast, and water."
color = "#664300" // rgb: 102, 67, 0
- metabolization_rate = 1.5 * REAGENTS_METABOLISM
+ metabolization_rate = 0.1 * REAGENTS_METABOLISM
drink_icon ="beerglass"
drink_name = "Beer glass"
drink_desc = "A freezing pint of beer"
@@ -624,7 +624,7 @@
if(!H.unacidable)
var/obj/item/organ/external/affecting = H.get_organ("head")
- affecting.take_damage(0, 75)
+ affecting.receive_damage(0, 75)
H.UpdateDamageIcon()
H.emote("scream")
H.status_flags |= DISFIGURED
@@ -1132,30 +1132,3 @@
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)
..()
-
-/datum/reagent/peaceborg/confuse
- name = "Dizzying Solution"
- id = "dizzysolution"
- description = "Makes the target off balance and dizzy"
- metabolization_rate = 1.5 * REAGENTS_METABOLISM
-
-/datum/reagent/peaceborg/confuse/on_mob_life(mob/living/M)
- M.AdjustConfused(3, bound_lower = 0, bound_upper = 5)
- M.AdjustDizzy(3, bound_lower = 0, bound_upper = 5)
- if(prob(20))
- to_chat(M, "You feel confused and disorientated.")
- ..()
-
-/datum/reagent/peaceborg/tire
- name = "Tiring Solution"
- id = "tiresolution"
- description = "An extremely weak stamina-toxin that tires out the target. Completely harmless."
- metabolization_rate = 1.5 * REAGENTS_METABOLISM
-
-/datum/reagent/peaceborg/tire/on_mob_life(mob/living/M)
- var/healthcomp = (M.maxHealth - M.health)
- if(M.staminaloss < (45 - healthcomp)) //At 50 health you would have 200 - 150 health meaning 50 compensation. 60 - 50 = 10, so would only do 10-19 stamina.)
- M.adjustStaminaLoss(10)
- if(prob(30))
- to_chat(M, "You feel like you should sit down and take a rest...")
- ..()
\ No newline at end of file
diff --git a/code/modules/reagents/chemistry/reagents/water.dm b/code/modules/reagents/chemistry/reagents/water.dm
index c1c3191c5ba..fe2afae85be 100644
--- a/code/modules/reagents/chemistry/reagents/water.dm
+++ b/code/modules/reagents/chemistry/reagents/water.dm
@@ -46,7 +46,7 @@
if(prob(75))
var/obj/item/organ/external/affecting = H.get_organ("head")
if(affecting)
- affecting.take_damage(5, 10)
+ affecting.receive_damage(5, 10)
H.UpdateDamageIcon()
H.emote("scream")
else
@@ -75,7 +75,7 @@
if(prob(75))
var/obj/item/organ/external/affecting = H.get_organ("head")
if(affecting)
- affecting.take_damage(0, 20)
+ affecting.receive_damage(0, 20)
H.UpdateDamageIcon()
H.emote("scream")
else
@@ -132,18 +132,27 @@
taste_message = "floor cleaner"
/datum/reagent/space_cleaner/reaction_obj(obj/O, volume)
- if(istype(O, /obj/effect/decal/cleanable))
- qdel(O)
+ if(is_cleanable(O))
+ var/obj/effect/decal/cleanable/blood/B = O
+ if(!(istype(B) && B.off_floor))
+ qdel(O)
else
- O.color = initial(O.color)
+ if(!istype(O, /atom/movable/lighting_overlay))
+ O.color = initial(O.color)
O.clean_blood()
/datum/reagent/space_cleaner/reaction_turf(turf/T, volume)
if(volume >= 1)
- T.color = initial(T.color)
- T.clean_blood()
+ var/floor_only = TRUE
for(var/obj/effect/decal/cleanable/C in src)
- qdel(C)
+ var/obj/effect/decal/cleanable/blood/B = C
+ if(istype(B) && B.off_floor)
+ floor_only = FALSE
+ else
+ qdel(C)
+ T.color = initial(T.color)
+ if(floor_only)
+ T.clean_blood()
for(var/mob/living/carbon/slime/M in T)
M.adjustToxLoss(rand(5,10))
@@ -357,22 +366,46 @@
M.SetConfused(0)
return
if(ishuman(M) && M.mind && M.mind.vampire && !M.mind.vampire.get_ability(/datum/vampire_passive/full) && prob(80))
- switch(current_cycle)
- if(1 to 4)
- to_chat(M, "Something sizzles in your veins!")
- 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)
- M.mind.vampire.nullified = max(5, M.mind.vampire.nullified + 2)
- if(13 to INFINITY)
- to_chat(M, "You suddenly ignite in a holy fire!")
- for(var/mob/O in viewers(M, null))
- 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?
- M.mind.vampire.nullified = max(5, M.mind.vampire.nullified + 2)
+ var/mob/living/carbon/V = M
+ if(M.mind.vampire.bloodusable)
+ M.Stuttering(1)
+ M.Jitter(30)
+ M.adjustStaminaLoss(5)
+ if(prob(20))
+ M.emote("scream")
+ M.mind.vampire.nullified = max(5, M.mind.vampire.nullified + 2)
+ M.mind.vampire.bloodusable = max(M.mind.vampire.bloodusable - 3,0)
+ if(M.mind.vampire.bloodusable)
+ V.vomit(0,1)
+ else
+ holder.remove_reagent(id, volume)
+ V.vomit(0,0)
+ return
+ else
+ switch(current_cycle)
+ if(1 to 4)
+ to_chat(M, "Something sizzles in your veins!")
+ 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)
+ M.Stuttering(1)
+ M.Jitter(20)
+ if(prob(20))
+ M.emote("scream")
+ M.mind.vampire.nullified = max(5, M.mind.vampire.nullified + 2)
+ if(13 to INFINITY)
+ to_chat(M, "You suddenly ignite in a holy fire!")
+ for(var/mob/O in viewers(M, null))
+ 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?
+ M.Stuttering(1)
+ M.Jitter(30)
+ if(prob(40))
+ M.emote("scream")
+ M.mind.vampire.nullified = max(5, M.mind.vampire.nullified + 2)
..()
diff --git a/code/modules/reagents/chemistry/recipes/others.dm b/code/modules/reagents/chemistry/recipes/others.dm
index 3bdcfd5c029..8735dfa16c2 100644
--- a/code/modules/reagents/chemistry/recipes/others.dm
+++ b/code/modules/reagents/chemistry/recipes/others.dm
@@ -19,7 +19,7 @@
var/location = get_turf(holder.my_atom)
holder.my_atom.visible_message("The solution spews out foam!")
- var/datum/effect/system/foam_spread/s = new()
+ var/datum/effect_system/foam_spread/s = new()
s.set_up(created_volume, location, holder, 0)
s.start()
holder.clear_reagents()
@@ -37,7 +37,7 @@
holder.my_atom.visible_message("The solution spews out a metalic foam!")
- var/datum/effect/system/foam_spread/s = new()
+ var/datum/effect_system/foam_spread/s = new()
s.set_up(created_volume, location, holder, MFOAM_ALUMINUM)
s.start()
@@ -54,7 +54,7 @@
holder.my_atom.visible_message("Infused with plasma, the core begins to quiver and grow, and soon a new baby slime emerges from it!")
diff --git a/code/modules/reagents/chemistry/recipes/toxins.dm b/code/modules/reagents/chemistry/recipes/toxins.dm
index fb7672d6806..462402c4317 100644
--- a/code/modules/reagents/chemistry/recipes/toxins.dm
+++ b/code/modules/reagents/chemistry/recipes/toxins.dm
@@ -144,7 +144,7 @@
/datum/chemical_reaction/teslium/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
- var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
+ var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
s.set_up(6, 1, location)
s.start()
diff --git a/code/modules/reagents/reagent_containers/borghydro.dm b/code/modules/reagents/reagent_containers/borghydro.dm
index 4377b2eebfc..685b73d18d9 100644
--- a/code/modules/reagents/reagent_containers/borghydro.dm
+++ b/code/modules/reagents/reagent_containers/borghydro.dm
@@ -33,15 +33,6 @@
reagent_ids = list("syndicate_nanites", "potass_iodide", "ether")
bypass_protection = 1
-/obj/item/weapon/reagent_containers/borghypo/peace
- name = "Peace Hypospray"
- reagent_ids = list("dizzysolution","tiresolution")
-
-/obj/item/weapon/reagent_containers/borghypo/peace/hacked
- desc = "Everything's peaceful in death!"
- icon_state = "borghypo_s"
- reagent_ids = list("dizzysolution","tiresolution","tirizene","sulfonal","sodium_thiopental","cyanide","neurotoxin2")
-
/obj/item/weapon/reagent_containers/borghypo/New()
..()
for(var/R in reagent_ids)
diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm
index eca60146cc3..68ab233ea16 100644
--- a/code/modules/reagents/reagent_containers/pill.dm
+++ b/code/modules/reagents/reagent_containers/pill.dm
@@ -54,13 +54,13 @@
/obj/item/weapon/reagent_containers/food/pill/tox
name = "Toxins pill"
desc = "Highly toxic."
- icon_state = "pill5"
+ icon_state = "pill21"
list_reagents = list("toxin" = 50)
/obj/item/weapon/reagent_containers/food/pill/initropidril
name = "initropidril pill"
desc = "Don't swallow this."
- icon_state = "pill5"
+ icon_state = "pill21"
list_reagents = list("initropidril" = 50)
/obj/item/weapon/reagent_containers/food/pill/adminordrazine
diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm
index 7b090fc4f77..1aae13e1f0d 100644
--- a/code/modules/recycling/disposal.dm
+++ b/code/modules/recycling/disposal.dm
@@ -197,10 +197,6 @@
update()
return
-// can breath normally in the disposal
-/obj/machinery/disposal/alter_health()
- return get_turf(src)
-
// attempt to move while inside
/obj/machinery/disposal/relaymove(mob/user as mob)
if(user.stat || src.flushing)
diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm
index 7d174799b37..ebcb5ea92db 100644
--- a/code/modules/research/designs/autolathe_designs.dm
+++ b/code/modules/research/designs/autolathe_designs.dm
@@ -263,6 +263,22 @@
build_path = /obj/item/weapon/kitchen/utensil/fork
category = list("initial","Dinnerware")
+/datum/design/spoon
+ name = "Spoon"
+ id = "spoon"
+ build_type = AUTOLATHE
+ materials = list(MAT_METAL = 80)
+ build_path = /obj/item/weapon/kitchen/utensil/spoon
+ category = list("initial","Dinnerware")
+
+/datum/design/spork
+ name = "Spork"
+ id = "spork"
+ build_type = AUTOLATHE
+ materials = list(MAT_METAL = 80)
+ build_path = /obj/item/weapon/kitchen/utensil/spork
+ category = list("initial","Dinnerware")
+
/datum/design/tray
name = "Tray"
id = "tray"
diff --git a/code/modules/research/designs/weapon_designs.dm b/code/modules/research/designs/weapon_designs.dm
index 09b17748dfd..1384e193f8b 100644
--- a/code/modules/research/designs/weapon_designs.dm
+++ b/code/modules/research/designs/weapon_designs.dm
@@ -29,7 +29,7 @@
name = "Energy Crossbow"
desc = "A reverse-engineered energy crossbow favored by syndicate infiltration teams and carp hunters."
id = "largecrossbow"
- req_tech = list("combat" = 5, "engineering" = 3, "magnet" = 5, "syndicate" = 3)
+ req_tech = list("combat" = 5, "engineering" = 3, "magnets" = 5, "syndicate" = 3)
build_type = PROTOLATHE
materials = list(MAT_METAL = 5000, MAT_GLASS = 1500, MAT_URANIUM = 1500, MAT_SILVER = 1500)
build_path = /obj/item/weapon/gun/energy/kinetic_accelerator/crossbow/large
diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm
index f0aed90bc91..46904d0f0df 100644
--- a/code/modules/research/experimentor.dm
+++ b/code/modules/research/experimentor.dm
@@ -226,7 +226,7 @@
loaded_item = null
/obj/machinery/r_n_d/experimentor/proc/throwSmoke(turf/where)
- var/datum/effect/system/harmless_smoke_spread/smoke = new
+ var/datum/effect_system/smoke_spread/smoke = new
smoke.set_up(1,0, where, 0)
smoke.start()
@@ -318,7 +318,7 @@
R.my_atom = src
R.add_reagent(chosenchem , 15)
investigate_log("Experimentor has released [chosenchem] smoke.", "experimentor")
- var/datum/effect/system/chem_smoke_spread/smoke = new
+ var/datum/effect_system/smoke_spread/chem/smoke = new
smoke.set_up(R, 1, 0, src, 0, silent = 1)
playsound(src.loc, 'sound/effects/smoke.ogg', 50, 1, -3)
smoke.start()
@@ -330,7 +330,7 @@
var/datum/reagents/R = new/datum/reagents(15)
R.my_atom = src
R.add_reagent(chosenchem , 15)
- var/datum/effect/system/chem_smoke_spread/smoke = new
+ var/datum/effect_system/smoke_spread/chem/smoke = new
smoke.set_up(R, 1, 0, src, 0, silent = 1)
playsound(src.loc, 'sound/effects/smoke.ogg', 50, 1, -3)
smoke.start()
@@ -417,7 +417,7 @@
R.my_atom = src
R.add_reagent("frostoil" , 15)
investigate_log("Experimentor has released frostoil gas.", "experimentor")
- var/datum/effect/system/chem_smoke_spread/smoke = new
+ var/datum/effect_system/smoke_spread/chem/smoke = new
smoke.set_up(R, 1, 0, src, 0, silent = 1)
playsound(src.loc, 'sound/effects/smoke.ogg', 50, 1, -3)
smoke.start()
@@ -439,7 +439,7 @@
ejectItem(TRUE)
if(prob(EFFECT_PROB_MEDIUM-badThingCoeff))
visible_message("[src] malfunctions, releasing a flurry of chilly air as [exp_on] pops out!")
- var/datum/effect/system/harmless_smoke_spread/smoke = new
+ var/datum/effect_system/smoke_spread/smoke = new
smoke.set_up(1,0, src.loc, 0)
smoke.start()
ejectItem()
@@ -648,7 +648,7 @@
//////////////// RELIC PROCS /////////////////////////////
/obj/item/weapon/relic/proc/throwSmoke(turf/where)
- var/datum/effect/system/harmless_smoke_spread/smoke = new
+ var/datum/effect_system/smoke_spread/smoke = new
smoke.set_up(1,0, where, 0)
smoke.start()
diff --git a/code/modules/research/xenobiology/xenobio_camera.dm b/code/modules/research/xenobiology/xenobio_camera.dm
index 40f20ea4dde..a001d5e7cd6 100644
--- a/code/modules/research/xenobiology/xenobio_camera.dm
+++ b/code/modules/research/xenobiology/xenobio_camera.dm
@@ -12,7 +12,7 @@
/mob/camera/aiEye/remote/xenobio/setLoc(t)
var/area/new_area = get_area(t)
- if(new_area && new_area.name == allowed_area || istype(new_area, /area/toxins/xenobiology ))
+ if(new_area && new_area.name == allowed_area || new_area && new_area.xenobiology_compatible)
return ..()
else
return
diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm
index c3a0c1a030a..1cace7fc640 100644
--- a/code/modules/research/xenobiology/xenobiology.dm
+++ b/code/modules/research/xenobiology/xenobiology.dm
@@ -458,7 +458,7 @@
return FALSE
if(!O.can_reenter_corpse)
return FALSE
- if(O.has_enabled_antagHUD == 1 && config.antag_hud_restricted)
+ if(cannotPossess(O))
return FALSE
return TRUE
@@ -589,16 +589,16 @@
/obj/item/areaeditor/blueprints/slime
name = "cerulean prints"
- desc = "A one use set of blueprints made of jelly like organic material. Renaming an area to 'Xenobiology Lab' will extend the reach of the management console."
+ desc = "A one use set of blueprints made of jelly like organic material. Extends the reach of the management console."
color = "#2956B2"
/obj/item/areaeditor/blueprints/slime/edit_area()
- . = ..()
+ ..()
var/area/A = get_area(src)
- if(.)
- for(var/turf/T in A)
- T.color = "#2956B2"
- qdel(src)
+ for(var/turf/T in A)
+ T.color = "#2956B2"
+ A.xenobiology_compatible = TRUE
+ qdel(src)
/turf/simulated/floor/sepia
slowdown = 2
diff --git a/code/modules/security_levels/keycard authentication.dm b/code/modules/security_levels/keycard authentication.dm
index 1fea8864498..e8e5a78d597 100644
--- a/code/modules/security_levels/keycard authentication.dm
+++ b/code/modules/security_levels/keycard authentication.dm
@@ -159,7 +159,7 @@
to_chat(usr, "All Emergency Response Teams are dispatched and can not be called at this time.")
return
to_chat(usr, "ERT request transmitted.")
-
+ print_centcom_report(ert_reason, worldtime2text() +" ERT Request")
var/fullmin_count = 0
for(var/client/C in admins)
diff --git a/code/modules/security_levels/security levels.dm b/code/modules/security_levels/security levels.dm
index 42bfb39b4eb..fa1e6b6c841 100644
--- a/code/modules/security_levels/security levels.dm
+++ b/code/modules/security_levels/security levels.dm
@@ -119,6 +119,11 @@
FA.overlays.Cut()
FA.overlays += image('icons/obj/monitors.dmi', "overlay_delta")
+ if(level >= SEC_LEVEL_RED)
+ atc.reroute_traffic(yes = TRUE) // Tell them fuck off we're busy.
+ else
+ atc.reroute_traffic(yes = FALSE)
+
else
return
diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm
index a9b44fbffb3..8ffb5d6efbe 100644
--- a/code/modules/shuttle/emergency.dm
+++ b/code/modules/shuttle/emergency.dm
@@ -150,6 +150,12 @@
emergency_shuttle_called.Announce("The emergency shuttle has been called. [redAlert ? "Red Alert state confirmed: Dispatching priority shuttle. " : "" ]It will arrive in [timeLeft(600)] minutes.[reason][shuttle_master.emergencyLastCallLoc ? "\n\nCall signal traced. Results can be viewed on any communications console." : "" ]")
+ if(reason == "Automatic Crew Transfer" && signalOrigin == null) // Best way we have to check that it's actually a crew transfer and not just a player using the same message- any other calls to this proc should have a signalOrigin.
+ atc.shift_ending()
+ else // Emergency shuttle call (probably)
+ atc.reroute_traffic(yes = TRUE)
+
+
/obj/docking_port/mobile/emergency/cancel(area/signalOrigin)
if(!canRecall)
return
diff --git a/code/modules/shuttle/ripple.dm b/code/modules/shuttle/ripple.dm
index 0c48a9c24bf..3489394671b 100644
--- a/code/modules/shuttle/ripple.dm
+++ b/code/modules/shuttle/ripple.dm
@@ -1,4 +1,4 @@
-/obj/effect/overlay/temp/ripple
+/obj/effect/temp_visual/ripple
name = "hyperspace ripple"
desc = "Something is coming through hyperspace, you can see the \
visual disturbances. It's probably best not to be on top of these \
@@ -13,7 +13,7 @@
duration = 3 * SHUTTLE_RIPPLE_TIME
mouse_opacity = 1
-/obj/effect/overlay/temp/ripple/New()
+/obj/effect/temp_visual/ripple/New()
. = ..()
smooth_icon(src)
animate(src, alpha=255, time=SHUTTLE_RIPPLE_TIME)
diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm
index d1f41585516..d3406556e27 100644
--- a/code/modules/shuttle/shuttle.dm
+++ b/code/modules/shuttle/shuttle.dm
@@ -383,7 +383,7 @@
/obj/docking_port/mobile/proc/create_ripples(obj/docking_port/stationary/S1)
var/list/turfs = ripple_area(S1)
for(var/i in turfs)
- ripples += new /obj/effect/overlay/temp/ripple(i)
+ ripples += new /obj/effect/temp_visual/ripple(i)
/obj/docking_port/mobile/proc/remove_ripples()
if(ripples.len)
diff --git a/code/modules/shuttle/supply.dm b/code/modules/shuttle/supply.dm
index d24853a7948..4a060385dea 100644
--- a/code/modules/shuttle/supply.dm
+++ b/code/modules/shuttle/supply.dm
@@ -782,143 +782,6 @@
icon_state = "shuttle3"
requires_power = 0
-/obj/structure/plasticflaps
- name = "\improper plastic flaps"
- desc = "Completely impassable - or are they?"
- icon = 'icons/obj/stationobjs.dmi'
- icon_state = "plasticflaps"
- density = 0
- anchored = 1
- layer = 4
- var/list/mobs_can_pass = list(
- /mob/living/carbon/slime,
- /mob/living/simple_animal/mouse,
- /mob/living/silicon/robot/drone,
- /mob/living/simple_animal/bot/mulebot
- )
- var/state = PLASTIC_FLAPS_NORMAL
- var/can_deconstruct = TRUE
-
-/obj/structure/plasticflaps/examine(mob/user)
- . = ..()
- switch(state)
- if(PLASTIC_FLAPS_NORMAL)
- to_chat(user, "[src] are screwed to the floor.")
- if(PLASTIC_FLAPS_DETACHED)
- to_chat(user, "[src] are no longer screwed to the floor, and the flaps can be sliced apart.")
-
-/obj/structure/plasticflaps/attackby(obj/item/W, mob/user, params)
- add_fingerprint(user)
- if(isscrewdriver(W))
- if(state == PLASTIC_FLAPS_NORMAL)
- playsound(loc, W.usesound, 100, 1)
- user.visible_message("[user] unscrews [src] from the floor.", "You start to unscrew [src] from the floor...", "You hear rustling noises.")
- if(do_after(user, 180*W.toolspeed, target = src))
- if(state != PLASTIC_FLAPS_NORMAL)
- return
- state = PLASTIC_FLAPS_DETACHED
- anchored = FALSE
- to_chat(user, "You unscrew [src] from the floor.")
- else if(state == PLASTIC_FLAPS_DETACHED)
- playsound(loc, W.usesound, 100, 1)
- user.visible_message("[user] screws [src] to the floor.", "You start to screw [src] to the floor...", "You hear rustling noises.")
- if(do_after(user, 40*W.toolspeed, target = src))
- if(state != PLASTIC_FLAPS_DETACHED)
- return
- state = PLASTIC_FLAPS_NORMAL
- anchored = TRUE
- to_chat(user, "You screw [src] from the floor.")
- else if(iswelder(W))
- if(state == PLASTIC_FLAPS_DETACHED)
- var/obj/item/weapon/weldingtool/WT = W
- if(!WT.remove_fuel(0, user))
- return
- playsound(loc, WT.usesound, 100, 1)
- user.visible_message("[user] slices apart [src].", "You start to slice apart [src].", "You hear welding.")
- if(do_after(user, 120*WT.toolspeed, target = src))
- if(state != PLASTIC_FLAPS_DETACHED)
- return
- to_chat(user, "You slice apart [src].")
- var/obj/item/stack/sheet/plastic/five/P = new(loc)
- P.add_fingerprint(user)
- qdel(src)
- else
- . = ..()
-
-/obj/structure/plasticflaps/CanPass(atom/A, turf/T)
- if(istype(A) && A.checkpass(PASSGLASS))
- return prob(60)
-
- var/obj/structure/stool/bed/B = A
- if(istype(A, /obj/structure/stool/bed) && B.buckled_mob)//if it's a bed/chair and someone is buckled, it will not pass
- return 0
-
- if(istype(A, /obj/structure/closet/cardboard))
- var/obj/structure/closet/cardboard/C = A
- if(C.move_delay)
- return 0
-
- if(istype(A, /obj/vehicle)) //no vehicles
- return 0
-
- var/mob/living/M = A
- if(istype(M))
- if(M.lying)
- return ..()
- for(var/mob_type in mobs_can_pass)
- if(istype(A, mob_type))
- return ..()
- if(istype(A, /mob/living/carbon/human))
- var/mob/living/carbon/human/H = M
- if(H.species.is_small)
- return ..()
- return 0
-
- return ..()
-
-
-/obj/structure/plasticflaps/CanAStarPass(ID, to_dir, caller)
- if(istype(caller, /mob/living))
- for(var/mob_type in mobs_can_pass)
- if(istype(caller, mob_type))
- return 1
-
- var/mob/living/M = caller
- if(!M.ventcrawler && M.mob_size > MOB_SIZE_SMALL)
- return 0
- return 1
-
-/obj/structure/plasticflaps/ex_act(severity)
- switch(severity)
- if(1)
- qdel(src)
- if(2)
- if(prob(50))
- qdel(src)
- if(3)
- if(prob(5))
- qdel(src)
-
-/obj/structure/plasticflaps/proc/deconstruct(disassembled = TRUE)
- if(can_deconstruct)
- new /obj/item/stack/sheet/plastic/five(loc)
- qdel(src)
-
-/obj/structure/plasticflaps/mining //A specific type for mining that doesn't allow airflow because of them damn crates
- name = "\improper Airtight plastic flaps"
- desc = "Heavy duty, airtight, plastic flaps."
-
-/obj/structure/plasticflaps/mining/initialize()
- air_update_turf(1)
- ..()
-
-/obj/structure/plasticflaps/mining/Destroy()
- air_update_turf(1)
- return ..()
-
-/obj/structure/plasticflaps/mining/CanAtmosPass(turf/T)
- return 0
-
#undef ORDER_SCREEN_WIDTH
#undef ORDER_SCREEN_HEIGHT
#undef SUPPLY_SCREEN_WIDTH
diff --git a/code/modules/spacepods/pod_fabricator.dm b/code/modules/spacepods/pod_fabricator.dm
index da3b9879a4d..503afae6b6d 100644
--- a/code/modules/spacepods/pod_fabricator.dm
+++ b/code/modules/spacepods/pod_fabricator.dm
@@ -352,9 +352,9 @@
/obj/machinery/spod_part_fabricator/Topic(href, href_list)
if(..())
return
- var/datum/topic_input/filter = new /datum/topic_input(href,href_list)
+ var/datum/topic_input/afilter = new /datum/topic_input(href,href_list)
if(href_list["part_set"])
- var/tpart_set = filter.getStr("part_set")
+ var/tpart_set = afilter.getStr("part_set")
if(tpart_set)
if(tpart_set=="clear")
part_set = null
@@ -362,7 +362,7 @@
part_set = tpart_set
screen = "parts"
if(href_list["part"])
- var/T = filter.getStr("part")
+ var/T = afilter.getStr("part")
var/datum/design/D = files.known_designs[T]
if(D && D.build_type & PODFAB)
if(!processing_queue)
@@ -370,16 +370,16 @@
else
add_to_queue(D)
if(href_list["add_to_queue"])
- var/T = filter.getStr("add_to_queue")
+ var/T = afilter.getStr("add_to_queue")
var/datum/design/D = files.known_designs[T]
if(D && D.build_type & PODFAB)
add_to_queue(D)
return update_queue_on_page()
if(href_list["remove_from_queue"])
- remove_from_queue(filter.getNum("remove_from_queue"))
+ remove_from_queue(afilter.getNum("remove_from_queue"))
return update_queue_on_page()
if(href_list["partset_to_queue"])
- add_part_set_to_queue(filter.get("partset_to_queue"))
+ add_part_set_to_queue(afilter.get("partset_to_queue"))
return update_queue_on_page()
if(href_list["process_queue"])
spawn(-1)
@@ -393,8 +393,8 @@
if(href_list["screen"])
screen = href_list["screen"]
if(href_list["queue_move"] && href_list["index"])
- var/index = filter.getNum("index")
- var/new_index = index + filter.getNum("queue_move")
+ var/index = afilter.getNum("index")
+ var/new_index = index + afilter.getNum("queue_move")
if(isnum(index) && isnum(new_index))
if(IsInRange(new_index,1,queue.len))
queue.Swap(index,new_index)
@@ -405,7 +405,7 @@
if(href_list["sync"])
sync()
if(href_list["part_desc"])
- var/T = filter.getStr("part_desc")
+ var/T = afilter.getStr("part_desc")
var/datum/design/D = files.known_designs[T]
if(D && D.build_type & PODFAB)
var/obj/part = D.build_path
diff --git a/code/modules/spacepods/spacepod.dm b/code/modules/spacepods/spacepod.dm
index e2a21f507fa..bf67002d3e4 100644
--- a/code/modules/spacepods/spacepod.dm
+++ b/code/modules/spacepods/spacepod.dm
@@ -40,7 +40,7 @@
var/datum/global_iterator/pr_int_temp_processor //normalizes internal air mixture temperature
var/datum/global_iterator/pr_give_air //moves air from tank to cabin
- var/datum/effect/system/ion_trail_follow/space_trail/ion_trail
+ var/datum/effect_system/trail_follow/ion/space_trail/ion_trail
var/hatch_open = 0
@@ -63,7 +63,7 @@
"pod_black" = "#3B8FE5", \
"pod_industrial" = "#CCCC00")
- var/unlocked = 1
+ var/unlocked = TRUE
var/move_delay = 2
var/next_move = 0
@@ -106,7 +106,7 @@
battery = new battery_type(src)
add_cabin()
add_airtank()
- src.ion_trail = new /datum/effect/system/ion_trail_follow/space_trail()
+ src.ion_trail = new /datum/effect_system/trail_follow/ion/space_trail()
src.ion_trail.set_up(src)
src.ion_trail.start()
src.use_internal_tank = 1
@@ -378,12 +378,17 @@
"You start drilling through the [src]'s lock!")
if(do_after(user, 100 * W.toolspeed, target = src))
QDEL_NULL(equipment_system.lock_system)
+ unlocked = TRUE
user.visible_message(user, "[user] has destroyed the [src]'s lock!",
"You destroy the [src]'s lock!")
else
user.visible_message(user, "[user] fails to break through the [src]'s lock!",
"You were unable to break through the [src]'s lock!")
return
+ if(L.on && unlocked == FALSE) //The buster is on, we don't have a lock system, and the pod is still somehow locked, unlocking.
+ unlocked = TRUE
+ user.visible_message(user, "[user] repairs [src]'s doors with [L].",
+ "You repair [src]'s doors with [L].")
to_chat(user, "Turn the [L] on first.")
return
@@ -545,6 +550,13 @@ obj/spacepod/proc/add_equipment(mob/user, var/obj/item/device/spacepod_equipment
icon_state = "pod_mil"
health = 400
+/obj/spacepod/syndi
+ name = "syndicate spacepod"
+ desc = "An armed spacepod painted in syndicate colors."
+ icon_state = "pod_synd"
+ health = 400
+ unlocked = FALSE
+
/obj/spacepod/sec/New()
..()
var/obj/item/device/spacepod_equipment/weaponry/burst_taser/T = new /obj/item/device/spacepod_equipment/weaponry/taser
@@ -599,7 +611,7 @@ obj/spacepod/proc/add_equipment(mob/user, var/obj/item/device/spacepod_equipment
return
if(usr != src.pilot)
- to_chat(usr, "You can't reach the controls from your chair")
+ to_chat(usr, "You can't reach the controls from your chair.")
return
use_internal_tank = !use_internal_tank
to_chat(usr, "Now taking air from [use_internal_tank?"internal airtank":"environment"].")
@@ -818,11 +830,15 @@ obj/spacepod/proc/add_equipment(mob/user, var/obj/item/device/spacepod_equipment
return
if(usr in passengers && usr != src.pilot)
- to_chat(usr, "You can't reach the controls from your chair")
+ to_chat(usr, "You can't reach the controls from your chair.")
return
- unlocked = !unlocked
- to_chat(usr, "You [unlocked ? "unlock" : "lock"] the doors.")
+ if(!equipment_system.lock_system)
+ to_chat(usr, "[src] has no locking mechanism.")
+ unlocked = TRUE //Should never be false without a lock, but if it somehow happens, that will force an unlock.
+ else
+ unlocked = !unlocked
+ to_chat(usr, "You [unlocked ? "unlock" : "lock"] the doors.")
/obj/spacepod/verb/toggleDoors()
@@ -834,7 +850,7 @@ obj/spacepod/proc/add_equipment(mob/user, var/obj/item/device/spacepod_equipment
return
if(usr != src.pilot)
- to_chat(usr, "You can't reach the controls from your chair")
+ to_chat(usr, "You can't reach the controls from your chair")
return
for(var/obj/machinery/door/poddoor/multi_tile/P in orange(3,src))
@@ -869,7 +885,7 @@ obj/spacepod/proc/add_equipment(mob/user, var/obj/item/device/spacepod_equipment
return
if(usr != src.pilot)
- to_chat(usr, "You can't reach the controls from your chair")
+ to_chat(usr, "You can't reach the controls from your chair.")
return
if(!equipment_system.weapon_system)
to_chat(usr, "[src] has no weapons!")
@@ -886,7 +902,7 @@ obj/spacepod/proc/add_equipment(mob/user, var/obj/item/device/spacepod_equipment
return
if(usr != src.pilot)
- to_chat(usr, "You can't reach the controls from your chair")
+ to_chat(usr, "You can't reach the controls from your chair.")
return
if(!equipment_system.cargo_system)
to_chat(usr, "[src] has no cargo system!")
@@ -902,7 +918,7 @@ obj/spacepod/proc/add_equipment(mob/user, var/obj/item/device/spacepod_equipment
return
if(usr != src.pilot)
- to_chat(usr, "You can't reach the controls from your chair")
+ to_chat(usr, "You can't reach the controls from your chair.")
return
lightsToggle()
diff --git a/code/modules/station_goals/bsa.dm b/code/modules/station_goals/bsa.dm
index 38d04b527db..f9aa857c3e8 100644
--- a/code/modules/station_goals/bsa.dm
+++ b/code/modules/station_goals/bsa.dm
@@ -397,7 +397,7 @@
if(notice)
return null
//Totally nanite construction system not an immersion breaking spawning
- var/datum/effect/system/harmless_smoke_spread/s = new /datum/effect/system/harmless_smoke_spread()
+ var/datum/effect_system/smoke_spread/s = new
s.set_up(4, 0, get_turf(centerpiece))
s.start()
var/obj/machinery/bsa/full/cannon = new(get_turf(centerpiece),centerpiece.get_cannon_direction())
diff --git a/code/modules/station_goals/dna_vault.dm b/code/modules/station_goals/dna_vault.dm
index 977899a3195..70a5d522678 100644
--- a/code/modules/station_goals/dna_vault.dm
+++ b/code/modules/station_goals/dna_vault.dm
@@ -278,8 +278,8 @@ var/list/non_simple_animals = typecacheof(list(/mob/living/carbon/human/monkey,/
switch(upgrade_type)
if(VAULT_SPACEIMMUNE)
to_chat(H, "You suddenly don't feel the need to breathe anymore. You also don't feel any cold anymore.")
- grant_power(H, NOBREATHBLOCK, NO_BREATH)
- grant_power(H, FIREBLOCK, RESIST_COLD)
+ grant_power(H, BREATHLESSBLOCK, BREATHLESS)
+ grant_power(H, FIREBLOCK, COLDRES)
if(VAULT_XRAY)
to_chat(H, "You can suddenly see through walls.")
grant_power(H, XRAYBLOCK, XRAY)
diff --git a/code/modules/surgery/bones.dm b/code/modules/surgery/bones.dm
index 80ae04dfaaf..640d6879f34 100644
--- a/code/modules/surgery/bones.dm
+++ b/code/modules/surgery/bones.dm
@@ -101,7 +101,7 @@
var/obj/item/organ/external/affected = target.get_organ(target_zone)
user.visible_message(" [user]'s hand slips, damaging the bone in [target]'s [affected.name] with \the [tool]!" , \
" Your hand slips, damaging the bone in [target]'s [affected.name] with \the [tool]!")
- affected.take_damage(5)
+ affected.receive_damage(5)
return 0
/datum/surgery_step/mend_skull
@@ -135,7 +135,7 @@
user.visible_message("[user]'s hand slips, damaging [target]'s face with \the [tool]!" , \
"Your hand slips, damaging [target]'s face with \the [tool]!")
var/obj/item/organ/external/head/h = affected
- h.take_damage(10)
+ h.receive_damage(10)
h.disfigured = 1
return 0
diff --git a/code/modules/surgery/cavity_implant.dm b/code/modules/surgery/cavity_implant.dm
index 269980346a8..f0cc1c993ce 100644
--- a/code/modules/surgery/cavity_implant.dm
+++ b/code/modules/surgery/cavity_implant.dm
@@ -62,7 +62,7 @@
var/obj/item/organ/external/chest/affected = target.get_organ(target_zone)
user.visible_message(" [user]'s hand slips, scraping around inside [target]'s [affected.name] with \the [tool]!", \
" Your hand slips, scraping around inside [target]'s [affected.name] with \the [tool]!")
- affected.take_damage(20)
+ affected.receive_damage(20)
/datum/surgery_step/cavity/make_space
name = "make cavity space"
diff --git a/code/modules/surgery/encased.dm b/code/modules/surgery/encased.dm
index decc2d05c19..fc4275bbf38 100644
--- a/code/modules/surgery/encased.dm
+++ b/code/modules/surgery/encased.dm
@@ -61,7 +61,7 @@
user.visible_message(" [user]'s hand slips, cracking [target]'s [affected.encased] with \the [tool]!" , \
" Your hand slips, cracking [target]'s [affected.encased] with \the [tool]!" )
- affected.take_damage(20)
+ affected.receive_damage(20)
affected.fracture()
return 0
@@ -113,7 +113,7 @@
var/self_msg = " Your hand slips, cracking [target]'s [affected.encased]!"
user.visible_message(msg, self_msg)
- affected.take_damage(20)
+ affected.receive_damage(20)
affected.fracture()
return 0
@@ -164,7 +164,7 @@
var/self_msg = " Your hand slips, bending [target]'s [affected.encased] the wrong way!"
user.visible_message(msg, self_msg)
- affected.take_damage(20)
+ affected.receive_damage(20)
affected.fracture()
return 0
diff --git a/code/modules/surgery/face.dm b/code/modules/surgery/face.dm
index 7f3d49c6045..200d5305ad9 100644
--- a/code/modules/surgery/face.dm
+++ b/code/modules/surgery/face.dm
@@ -50,7 +50,7 @@
var/obj/item/organ/external/affected = target.get_organ(target_zone)
user.visible_message(" [user]'s hand slips, slicing [target]'s throat wth \the [tool]!" , \
" Your hand slips, slicing [target]'s throat wth \the [tool]!" )
- affected.take_damage(60)
+ affected.receive_damage(60)
target.AdjustLoseBreath(4)
return 0
diff --git a/code/modules/surgery/generic.dm b/code/modules/surgery/generic.dm
index e07fd0c4725..dea9b7f282c 100644
--- a/code/modules/surgery/generic.dm
+++ b/code/modules/surgery/generic.dm
@@ -51,7 +51,7 @@
var/obj/item/organ/external/affected = target.get_organ(target_zone)
user.visible_message(" [user]'s hand slips, slicing open [target]'s [affected.name] in a wrong spot with \the [tool]!", \
" Your hand slips, slicing open [target]'s [affected.name] in a wrong spot with \the [tool]!")
- affected.take_damage(10)
+ affected.receive_damage(10)
return 0
/datum/surgery_step/generic/clamp_bleeders
@@ -85,7 +85,7 @@
var/obj/item/organ/external/affected = target.get_organ(target_zone)
user.visible_message(" [user]'s hand slips, tearing blood vessals and causing massive bleeding in [target]'s [affected.name] with \the [tool]!", \
" Your hand slips, tearing blood vessels and causing massive bleeding in [target]'s [affected.name] with \the [tool]!",)
- affected.take_damage(10)
+ affected.receive_damage(10)
return 0
/datum/surgery_step/generic/retract_skin
@@ -238,6 +238,6 @@
var/obj/item/organ/external/affected = target.get_organ(target_zone)
user.visible_message(" [user]'s hand slips, sawing through the bone in [target]'s [affected.name] with \the [tool]!", \
" Your hand slips, sawwing through the bone in [target]'s [affected.name] with \the [tool]!")
- affected.take_damage(30)
+ affected.receive_damage(30)
affected.fracture()
return 0
diff --git a/code/modules/surgery/organs/augments_arms.dm b/code/modules/surgery/organs/augments_arms.dm
index 4b62e42cb8a..1c96940a6d6 100644
--- a/code/modules/surgery/organs/augments_arms.dm
+++ b/code/modules/surgery/organs/augments_arms.dm
@@ -53,7 +53,9 @@
/obj/item/organ/internal/cyberimp/arm/emag_act()
return 0
-/obj/item/organ/internal/cyberimp/arm/gun/emp_act(severity)
+/obj/item/organ/internal/cyberimp/arm/emp_act(severity)
+ if(emp_proof)
+ return
if(prob(15/severity) && owner)
to_chat(owner, "[src] is hit by EMP!")
// give the owner an idea about why his implant is glitching
@@ -141,6 +143,8 @@
/obj/item/organ/internal/cyberimp/arm/gun/emp_act(severity)
+ if(emp_proof)
+ return
if(prob(30/severity) && owner && !crit_fail)
Retract()
owner.visible_message("A loud bang comes from [owner]\'s [parent_organ == "r_arm" ? "right" : "left"] arm!")
@@ -251,6 +255,8 @@
/obj/item/organ/internal/cyberimp/arm/power_cord/emp_act(severity)
// To allow repair via nanopaste/screwdriver
// also so IPCs don't also catch on fire and fall even more apart upon EMP
+ if(emp_proof)
+ return
damage = 1
crit_fail = TRUE
@@ -275,7 +281,7 @@
var/mob/living/carbon/human/H = user
if(H.get_int_organ(/obj/item/organ/internal/cell))
if(A.emagged || A.stat & BROKEN)
- var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
+ var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
s.set_up(3, 1, A)
s.start()
to_chat(H, "The APC power currents surge erratically, damaging your chassis!")
diff --git a/code/modules/surgery/organs/augments_eyes.dm b/code/modules/surgery/organs/augments_eyes.dm
index 67f33c4989d..71c88b81d4f 100644
--- a/code/modules/surgery/organs/augments_eyes.dm
+++ b/code/modules/surgery/organs/augments_eyes.dm
@@ -27,7 +27,7 @@
M.update_sight()
/obj/item/organ/internal/cyberimp/eyes/emp_act(severity)
- if(!owner)
+ if(!owner || emp_proof)
return
if(severity > 1)
if(prob(10 * severity))
diff --git a/code/modules/surgery/organs/augments_internal.dm b/code/modules/surgery/organs/augments_internal.dm
index 7d5e03ea046..125bea64018 100644
--- a/code/modules/surgery/organs/augments_internal.dm
+++ b/code/modules/surgery/organs/augments_internal.dm
@@ -30,7 +30,7 @@
parent_organ = "head"
/obj/item/organ/internal/cyberimp/brain/emp_act(severity)
- if(!owner)
+ if(!owner || emp_proof)
return
var/stun_amount = 5 + (severity-1 ? 0 : 5)
owner.Stun(stun_amount)
@@ -91,7 +91,7 @@
r_hand_obj = null
/obj/item/organ/internal/cyberimp/brain/anti_drop/emp_act(severity)
- if(!owner)
+ if(!owner || emp_proof)
return
var/range = severity ? 10 : 5
var/atom/A
@@ -138,7 +138,7 @@
owner.SetWeakened(STUN_SET_AMOUNT)
/obj/item/organ/internal/cyberimp/brain/anti_stun/emp_act(severity)
- if(crit_fail)
+ if(crit_fail || emp_proof)
return
crit_fail = 1
spawn(90 / severity)
@@ -158,6 +158,8 @@
origin_tech = "materials=2;biotech=3"
/obj/item/organ/internal/cyberimp/mouth/breathing_tube/emp_act(severity)
+ if(emp_proof)
+ return
if(prob(60/severity) && owner)
to_chat(owner, "Your breathing tube suddenly closes!")
owner.AdjustLoseBreath(2)
@@ -203,7 +205,7 @@
synthesizing = 0
/obj/item/organ/internal/cyberimp/chest/nutriment/emp_act(severity)
- if(!owner)
+ if(!owner || emp_proof)
return
owner.reagents.add_reagent("????",poison_amount / severity) //food poisoning
to_chat(owner, "You feel like your insides are burning.")
@@ -258,13 +260,13 @@
reviving = 1
/obj/item/organ/internal/cyberimp/chest/reviver/emp_act(severity)
- if(!owner)
+ if(!owner || emp_proof)
return
if(reviving)
revive_cost += 200
else
cooldown += 200
- if(istype(owner, /mob/living/carbon/human))
+ if(ishuman(owner))
var/mob/living/carbon/human/H = owner
if(H.stat != DEAD && prob(50 / severity))
H.set_heartattack(TRUE)
diff --git a/code/modules/surgery/organs/blood.dm b/code/modules/surgery/organs/blood.dm
index 987b5cf53e4..88e8341d37c 100644
--- a/code/modules/surgery/organs/blood.dm
+++ b/code/modules/surgery/organs/blood.dm
@@ -229,7 +229,7 @@
return list("O-", "O+")
//to add a splatter of blood or other mob liquid.
-/mob/living/proc/add_splatter_floor(turf/T, small_drip)
+/mob/living/proc/add_splatter_floor(turf/T, small_drip, shift_x, shift_y)
if(get_blood_id() != "blood")//is it blood or welding fuel?
return
if(!T)
@@ -260,29 +260,61 @@
return
// Find a blood decal or create a new one.
- var/obj/effect/decal/cleanable/blood/B = locate() in T
+ var/obj/effect/decal/cleanable/blood/splatter/B = locate() in T
+ var/list/bloods = get_atoms_of_type(T, B, TRUE, 0, 0) //Get all the non-projectile-splattered blood on this turf (not pixel-shifted).
+ if(shift_x || shift_y)
+ bloods = get_atoms_of_type(T, B, TRUE, shift_x, shift_y) //Get all the projectile-splattered blood at these pixels on this turf (pixel-shifted).
+ B = locate() in bloods
if(!B)
- B = new /obj/effect/decal/cleanable/blood/splatter(T)
+ B = new(T)
+
B.transfer_mob_blood_dna(src) //give blood info to the blood decal.
if(temp_blood_DNA)
B.blood_DNA |= temp_blood_DNA
+ B.pixel_x = (shift_x)
+ B.pixel_y = (shift_y)
B.update_icon()
+ if(shift_x || shift_y)
+ B.off_floor = TRUE
+ B.layer = BELOW_MOB_LAYER //So the blood lands ontop of things like posters, windows, etc.
-/mob/living/carbon/human/add_splatter_floor(turf/T, small_drip)
+/mob/living/carbon/human/add_splatter_floor(turf/T, small_drip, shift_x, shift_y)
if(!(NO_BLOOD in species.species_traits))
..()
-/mob/living/carbon/alien/add_splatter_floor(turf/T, small_drip)
+/mob/living/carbon/alien/add_splatter_floor(turf/T, small_drip, shift_x, shift_y)
if(!T)
T = get_turf(src)
- var/obj/effect/decal/cleanable/blood/xeno/B = locate() in T.contents
+
+ var/obj/effect/decal/cleanable/blood/xeno/splatter/B = locate() in T
+ var/list/bloods = get_atoms_of_type(T, B, TRUE, 0, 0) //The more the better.
+ if(shift_x || shift_y)
+ bloods = get_atoms_of_type(T, B, TRUE, shift_x, shift_y)
+ B = locate() in bloods
if(!B)
B = new(T)
- B.blood_DNA["UNKNOWN DNA"] = "X*"
-/mob/living/silicon/robot/add_splatter_floor(turf/T, small_drip)
+ B.blood_DNA["UNKNOWN DNA"] = "X*"
+ B.pixel_x = (shift_x)
+ B.pixel_y = (shift_y)
+ if(shift_x || shift_y)
+ B.off_floor = TRUE
+ B.layer = BELOW_MOB_LAYER
+
+/mob/living/silicon/robot/add_splatter_floor(turf/T, small_drip, shift_x, shift_y)
if(!T)
T = get_turf(src)
- var/obj/effect/decal/cleanable/blood/oil/B = locate() in T.contents
- if(!B)
- B = new(T)
\ No newline at end of file
+
+ var/obj/effect/decal/cleanable/blood/oil/streak/O = locate() in T
+ var/list/oils = get_atoms_of_type(T, O, TRUE, 0, 0) //Don't let OSHA catch wind of this.
+ if(shift_x || shift_y)
+ oils = get_atoms_of_type(T, O, TRUE, shift_x, shift_y)
+ O = locate() in oils
+ if(!O)
+ O = new(T)
+
+ O.pixel_x = (shift_x)
+ O.pixel_y = (shift_y)
+ if(shift_x || shift_y)
+ O.off_floor = TRUE
+ O.layer = BELOW_MOB_LAYER
diff --git a/code/modules/surgery/organs/lungs.dm b/code/modules/surgery/organs/lungs.dm
new file mode 100644
index 00000000000..39c79865b62
--- /dev/null
+++ b/code/modules/surgery/organs/lungs.dm
@@ -0,0 +1,337 @@
+/obj/item/organ/internal/lungs
+ name = "lungs"
+ icon_state = "lungs"
+ parent_organ = "chest"
+ slot = "lungs"
+ organ_tag = "lungs"
+ gender = PLURAL
+ w_class = WEIGHT_CLASS_NORMAL
+
+ //Breath damage
+
+ var/safe_oxygen_min = 16 // Minimum safe partial pressure of O2, in kPa
+ var/safe_oxygen_max = 0
+ var/safe_nitro_min = 0
+ var/safe_nitro_max = 0
+ var/safe_co2_min = 0
+ var/safe_co2_max = 10 // Yes it's an arbitrary value who cares?
+ var/safe_toxins_min = 0
+ var/safe_toxins_max = 0.05
+ var/SA_para_min = 1 //Sleeping agent
+ var/SA_sleep_min = 5 //Sleeping agent
+
+ var/oxy_breath_dam_min = MIN_TOXIC_GAS_DAMAGE
+ var/oxy_breath_dam_max = MAX_TOXIC_GAS_DAMAGE
+ var/oxy_damage_type = OXY
+ var/nitro_breath_dam_min = MIN_TOXIC_GAS_DAMAGE
+ var/nitro_breath_dam_max = MAX_TOXIC_GAS_DAMAGE
+ var/nitro_damage_type = OXY
+ var/co2_breath_dam_min = MIN_TOXIC_GAS_DAMAGE
+ var/co2_breath_dam_max = MAX_TOXIC_GAS_DAMAGE
+ var/co2_damage_type = OXY
+ var/tox_breath_dam_min = MIN_TOXIC_GAS_DAMAGE
+ var/tox_breath_dam_max = MAX_TOXIC_GAS_DAMAGE
+ var/tox_damage_type = TOX
+
+ var/cold_message = "your face freezing and an icicle forming"
+ var/cold_level_1_threshold = 260
+ var/cold_level_2_threshold = 200
+ var/cold_level_3_threshold = 120
+ var/cold_level_1_damage = COLD_GAS_DAMAGE_LEVEL_1 //Keep in mind with gas damage levels, you can set these to be negative, if you want someone to heal, instead.
+ var/cold_level_2_damage = COLD_GAS_DAMAGE_LEVEL_2
+ var/cold_level_3_damage = COLD_GAS_DAMAGE_LEVEL_3
+ var/cold_damage_types = list(BURN = 1)
+
+ var/hot_message = "your face burning and a searing heat"
+ var/heat_level_1_threshold = 360
+ var/heat_level_2_threshold = 400
+ var/heat_level_3_threshold = 1000
+ var/heat_level_1_damage = HEAT_GAS_DAMAGE_LEVEL_1
+ var/heat_level_2_damage = HEAT_GAS_DAMAGE_LEVEL_2
+ var/heat_level_3_damage = HEAT_GAS_DAMAGE_LEVEL_3
+ var/heat_damage_types = list(BURN = 1)
+
+/obj/item/organ/internal/lungs/insert(mob/living/carbon/M, special = 0, dont_remove_slot = 0)
+ ..()
+ for(var/thing in list("oxy", "tox", "co2", "nitro"))
+ M.clear_alert("not_enough_[thing]")
+ M.clear_alert("too_much_[thing]")
+
+/obj/item/organ/internal/lungs/remove(mob/living/carbon/M, special = 0)
+ for(var/thing in list("oxy", "tox", "co2", "nitro"))
+ M.clear_alert("not_enough_[thing]")
+ M.clear_alert("too_much_[thing]")
+ return ..()
+
+/obj/item/organ/internal/lungs/on_life()
+ if(germ_level > INFECTION_LEVEL_ONE)
+ if(prob(5))
+ owner.emote("cough") //respitory tract infection
+
+ if(is_bruised())
+ if(prob(2))
+ owner.custom_emote(1, "coughs up blood!")
+ owner.bleed(1)
+ if(prob(4))
+ owner.custom_emote(1, "gasps for air!")
+ owner.AdjustLoseBreath(5)
+
+/obj/item/organ/internal/lungs/proc/check_breath(datum/gas_mixture/breath, mob/living/carbon/human/H)
+ if((H.status_flags & GODMODE))
+ return
+
+ if(!breath || (breath.total_moles() == 0))
+ if(H.health >= config.health_threshold_crit)
+ H.adjustOxyLoss(HUMAN_MAX_OXYLOSS)
+ else
+ H.adjustOxyLoss(HUMAN_CRIT_MAX_OXYLOSS)
+
+ H.failed_last_breath = TRUE
+ if(safe_oxygen_min)
+ H.throw_alert("not_enough_oxy", /obj/screen/alert/not_enough_oxy)
+ else if(safe_toxins_min)
+ H.throw_alert("not_enough_tox", /obj/screen/alert/not_enough_tox)
+ else if(safe_co2_min)
+ H.throw_alert("not_enough_co2", /obj/screen/alert/not_enough_co2)
+ else if(safe_nitro_min)
+ H.throw_alert("not_enough_nitro", /obj/screen/alert/not_enough_nitro)
+ return FALSE
+
+ var/gas_breathed = 0
+
+ //Partial pressures in our breath
+ var/O2_pp = breath.get_breath_partial_pressure(breath.oxygen)
+ var/N2_pp = breath.get_breath_partial_pressure(breath.nitrogen)
+ var/Toxins_pp = breath.get_breath_partial_pressure(breath.toxins)
+ var/CO2_pp = breath.get_breath_partial_pressure(breath.carbon_dioxide)
+
+
+ //-- OXY --//
+
+ //Too much oxygen! //Yes, some species may not like it.
+ if(safe_oxygen_max)
+ if(O2_pp > safe_oxygen_max)
+ var/ratio = (breath.oxygen/safe_oxygen_max) * 10
+ H.apply_damage_type(Clamp(ratio, oxy_breath_dam_min, oxy_breath_dam_max), oxy_damage_type)
+ H.throw_alert("too_much_oxy", /obj/screen/alert/too_much_oxy)
+ else
+ H.clear_alert("too_much_oxy")
+
+ //Too little oxygen!
+ if(safe_oxygen_min)
+ if(O2_pp < safe_oxygen_min)
+ gas_breathed = handle_too_little_breath(H, O2_pp, safe_oxygen_min, breath.oxygen)
+ H.throw_alert("not_enough_oxy", /obj/screen/alert/not_enough_oxy)
+ else
+ H.failed_last_breath = FALSE
+ H.adjustOxyLoss(-5)
+ gas_breathed = breath.oxygen
+ H.clear_alert("not_enough_oxy")
+
+ //Exhale
+ breath.oxygen -= gas_breathed
+ breath.carbon_dioxide += gas_breathed
+ gas_breathed = 0
+
+ //-- Nitrogen --//
+
+ //Too much nitrogen!
+ if(safe_nitro_max)
+ if(N2_pp > safe_nitro_max)
+ var/ratio = (breath.nitrogen/safe_nitro_max) * 10
+ H.apply_damage_type(Clamp(ratio, nitro_breath_dam_min, nitro_breath_dam_max), nitro_damage_type)
+ H.throw_alert("too_much_nitro", /obj/screen/alert/too_much_nitro)
+ else
+ H.clear_alert("too_much_nitro")
+
+ //Too little nitrogen!
+ if(safe_nitro_min)
+ if(N2_pp < safe_nitro_min)
+ gas_breathed = handle_too_little_breath(H, N2_pp, safe_nitro_min, breath.nitrogen)
+ H.throw_alert("nitro", /obj/screen/alert/not_enough_nitro)
+ else
+ H.failed_last_breath = FALSE
+ H.adjustOxyLoss(-5)
+ gas_breathed = breath.nitrogen
+ H.clear_alert("nitro")
+
+ //Exhale
+ breath.nitrogen -= gas_breathed
+ breath.carbon_dioxide += gas_breathed
+ gas_breathed = 0
+
+ //-- CO2 --//
+
+ //CO2 does not affect failed_last_breath. So if there was enough oxygen in the air but too much co2, this will hurt you, but only once per 4 ticks, instead of once per tick.
+ if(safe_co2_max)
+ if(CO2_pp > safe_co2_max)
+ if(!H.co2overloadtime) // If it's the first breath with too much CO2 in it, lets start a counter, then have them pass out after 12s or so.
+ H.co2overloadtime = world.time
+ else if(world.time - H.co2overloadtime > 120)
+ H.Paralyse(3)
+ H.apply_damage_type(3, co2_damage_type) // Lets hurt em a little, let them know we mean business
+ if(world.time - H.co2overloadtime > 300) // They've been in here 30s now, lets start to kill them for their own good!
+ H.apply_damage_type(8, co2_damage_type)
+ H.throw_alert("too_much_co2", /obj/screen/alert/too_much_co2)
+ if(prob(20)) // Lets give them some chance to know somethings not right though I guess.
+ H.emote("cough")
+
+ else
+ H.co2overloadtime = 0
+ H.clear_alert("too_much_co2")
+
+ //Too little CO2!
+ if(safe_co2_min)
+ if(CO2_pp < safe_co2_min)
+ gas_breathed = handle_too_little_breath(H, CO2_pp, safe_co2_min, breath.carbon_dioxide)
+ H.throw_alert("not_enough_co2", /obj/screen/alert/not_enough_co2)
+ else
+ H.failed_last_breath = FALSE
+ H.adjustOxyLoss(-5)
+ gas_breathed = breath.carbon_dioxide
+ H.clear_alert("not_enough_co2")
+
+ //Exhale
+ breath.carbon_dioxide -= gas_breathed
+ breath.oxygen += gas_breathed
+ gas_breathed = 0
+
+
+ //-- TOX --//
+
+ //Too much toxins!
+ if(safe_toxins_max)
+ if(Toxins_pp > safe_toxins_max)
+ var/ratio = (breath.toxins/safe_toxins_max) * 10
+ H.apply_damage_type(Clamp(ratio, tox_breath_dam_min, tox_breath_dam_max), tox_damage_type)
+ H.throw_alert("too_much_tox", /obj/screen/alert/too_much_tox)
+ else
+ H.clear_alert("too_much_tox")
+
+
+ //Too little toxins!
+ if(safe_toxins_min)
+ if(Toxins_pp < safe_toxins_min)
+ gas_breathed = handle_too_little_breath(H, Toxins_pp, safe_toxins_min, breath.toxins)
+ H.throw_alert("not_enough_tox", /obj/screen/alert/not_enough_tox)
+ else
+ H.failed_last_breath = FALSE
+ H.adjustOxyLoss(-5)
+ gas_breathed = breath.toxins
+ H.clear_alert("not_enough_tox")
+
+ //Exhale
+ breath.toxins -= gas_breathed
+ breath.carbon_dioxide += gas_breathed
+ gas_breathed = 0
+
+
+ //-- TRACES --//
+
+ if(breath.trace_gases.len) // If there's some other shit in the air lets deal with it here.
+ for(var/datum/gas/sleeping_agent/SA in breath.trace_gases)
+ var/SA_pp = breath.get_breath_partial_pressure(SA.moles)
+ if(SA_pp > SA_para_min)
+ H.Paralyse(3) // 3 gives them one second to wake up and run away a bit!
+ if(SA_pp > SA_sleep_min) // Enough to make us sleep as well
+ H.AdjustSleeping(8, bound_lower = 0, bound_upper = 10)
+ else if(SA_pp > 0.01) // There is sleeping gas in their lungs, but only a little, so give them a bit of a warning
+ if(prob(20))
+ H.emote(pick("giggle", "laugh"))
+
+ handle_breath_temperature(breath, H)
+
+ return TRUE
+
+
+/obj/item/organ/internal/lungs/proc/handle_too_little_breath(mob/living/carbon/human/H = null, breath_pp = 0, safe_breath_min = 0, true_pp = 0)
+ . = 0
+ if(!H || !safe_breath_min) //the other args are either: Ok being 0 or Specifically handled.
+ return FALSE
+
+ if(prob(20))
+ H.emote("gasp")
+ if(breath_pp > 0)
+ var/ratio = safe_breath_min/breath_pp
+ H.adjustOxyLoss(min(5*ratio, HUMAN_MAX_OXYLOSS)) // Don't fuck them up too fast (space only does HUMAN_MAX_OXYLOSS after all!
+ H.failed_last_breath = TRUE
+ . = true_pp*ratio/6
+ else
+ H.adjustOxyLoss(HUMAN_MAX_OXYLOSS)
+ H.failed_last_breath = TRUE
+
+
+/obj/item/organ/internal/lungs/proc/handle_breath_temperature(datum/gas_mixture/breath, mob/living/carbon/human/H) // called by human/life, handles temperatures
+ var/breath_temperature = breath.temperature
+
+ var/species_traits = list()
+ if(H && H.species && H.species.species_traits)
+ species_traits = H.species.species_traits
+
+ if(!(COLDRES in H.mutations) && !(RESISTCOLD in species_traits)) // COLD DAMAGE
+ var/CM = abs(H.species.coldmod)
+ var/TC = 0
+ if(breath_temperature < cold_level_3_threshold)
+ TC = cold_level_3_damage
+ if(breath_temperature > cold_level_3_threshold && breath_temperature < cold_level_2_threshold)
+ TC = cold_level_2_damage
+ if(breath_temperature > cold_level_2_threshold && breath_temperature < cold_level_1_threshold)
+ TC = cold_level_1_damage
+ if(TC)
+ for(var/D in cold_damage_types)
+ H.apply_damage_type(TC * CM * cold_damage_types[D], D)
+ if(breath_temperature < cold_level_1_threshold)
+ if(prob(20))
+ to_chat(H, "You feel [cold_message] in your [name]!")
+
+ if(!(HEATRES in H.mutations) && !(RESISTHOT in species_traits)) // HEAT DAMAGE
+ var/HM = abs(H.species.heatmod)
+ var/TH = 0
+ if(breath_temperature > heat_level_1_threshold && breath_temperature < heat_level_2_threshold)
+ TH = heat_level_1_damage
+ if(breath_temperature > heat_level_2_threshold && breath_temperature < heat_level_3_threshold)
+ TH = heat_level_2_damage
+ if(breath_temperature > heat_level_3_threshold)
+ TH = heat_level_3_damage
+ if(TH)
+ for(var/D in heat_damage_types)
+ H.apply_damage_type(TH * HM * heat_damage_types[D], D)
+ if(breath_temperature > heat_level_1_threshold)
+ if(prob(20))
+ to_chat(H, "You feel [hot_message] in your [name]!")
+
+/obj/item/organ/internal/lungs/prepare_eat()
+ var/obj/S = ..()
+ S.reagents.add_reagent("salbutamol", 5)
+ return S
+
+/obj/item/organ/internal/lungs/plasmaman
+ name = "plasma filter"
+ desc = "A spongy rib-shaped mass for filtering plasma from the air."
+ icon_state = "lungs-plasma"
+ species = "Plasmaman"
+
+ safe_oxygen_min = 0 //We don't breath this
+ safe_toxins_min = 16 //We breathe THIS!
+ safe_toxins_max = 0
+
+/obj/item/organ/internal/lungs/vox
+ name = "Vox lungs"
+ desc = "They're filled with dust....wow."
+ species = "Vox"
+
+ safe_oxygen_min = 0 //We don't breathe this
+ safe_oxygen_max = 1 //This is toxic to us
+ safe_nitro_min = 16 //We breathe THIS!
+ oxy_damage_type = TOX //And it poisons us
+
+/obj/item/organ/internal/lungs/drask
+ icon = 'icons/obj/surgery_drask.dmi'
+ species = "Drask"
+
+ cold_message = "an invigorating coldness"
+ cold_level_3_threshold = 60
+ cold_level_1_damage = -COLD_GAS_DAMAGE_LEVEL_1 //They heal when the air is cold
+ cold_level_2_damage = -COLD_GAS_DAMAGE_LEVEL_2
+ cold_level_3_damage = -COLD_GAS_DAMAGE_LEVEL_3
+ cold_damage_types = list(BRUTE = 1, BURN = 0.5)
\ No newline at end of file
diff --git a/code/modules/surgery/organs/organ.dm b/code/modules/surgery/organs/organ.dm
index a5ad0fabe91..ba89166e8b5 100644
--- a/code/modules/surgery/organs/organ.dm
+++ b/code/modules/surgery/organs/organ.dm
@@ -1,5 +1,3 @@
-var/list/organ_cache = list()
-
/obj/item/organ
name = "organ"
icon = 'icons/obj/surgery.dmi'
@@ -31,6 +29,7 @@ var/list/organ_cache = list()
var/sterile = FALSE //can the organ be infected by germs?
var/tough = FALSE //can organ be easily damaged?
+ var/emp_proof = FALSE //is the organ immune to EMPs?
/obj/item/organ/Destroy()
@@ -170,7 +169,7 @@ var/list/organ_cache = list()
..()
if(germ_level >= INFECTION_LEVEL_TWO)
if(prob(3)) //about once every 30 seconds
- take_damage(1,silent=prob(30))
+ receive_damage(1,silent=prob(30))
/obj/item/organ/proc/rejuvenate()
damage = 0
@@ -221,7 +220,7 @@ var/list/organ_cache = list()
W.time_inflicted = world.time
//Note: external organs have their own version of this proc
-/obj/item/organ/proc/take_damage(amount, silent = 0)
+/obj/item/organ/proc/receive_damage(amount, silent = 0)
if(tough)
return
if(status & ORGAN_ROBOT)
@@ -254,43 +253,45 @@ var/list/organ_cache = list()
min_broken_damage = 35
/obj/item/organ/external/emp_act(severity)
- if(!(status & ORGAN_ROBOT))
+ if(!(status & ORGAN_ROBOT) || emp_proof)
return
if(tough)
switch(severity)
if(1)
- take_damage(0, 5.5)
+ receive_damage(0, 5.5)
if(owner)
owner.Stun(10)
if(2)
- take_damage(0, 2.8)
+ receive_damage(0, 2.8)
if(owner)
owner.Stun(5)
else
switch(severity)
if(1)
- take_damage(0, 20)
+ receive_damage(0, 20)
if(2)
- take_damage(0, 7)
+ receive_damage(0, 7)
/obj/item/organ/internal/emp_act(severity)
- if(!robotic)
+ if(!robotic || emp_proof)
return
if(robotic == 2)
switch(severity)
if(1.0)
- take_damage(20, 1)
+ receive_damage(20, 1)
if(2.0)
- take_damage(7, 1)
+ receive_damage(7, 1)
else if(robotic == 1)
- take_damage(11, 1)
+ receive_damage(11, 1)
/obj/item/organ/internal/heart/emp_act(intensity)
+ if(emp_proof)
+ return
if(owner && robotic == 2)
Stop() // In the name of looooove~!
owner.visible_message("[owner] clutches their chest and gasps!","You clutch your chest in pain!")
else if(owner && robotic == 1)
- take_damage(11,1)
+ receive_damage(11,1)
/obj/item/organ/proc/remove(var/mob/living/user,special = 0)
if(!istype(owner))
diff --git a/code/modules/surgery/organs/organ_external.dm b/code/modules/surgery/organs/organ_external.dm
index 060c1c22e83..cabcfeb221c 100644
--- a/code/modules/surgery/organs/organ_external.dm
+++ b/code/modules/surgery/organs/organ_external.dm
@@ -142,7 +142,7 @@
DAMAGE PROCS
****************************************************/
-/obj/item/organ/external/take_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)
if(tough && !ignore_resists)
brute = max(0, brute - 5)
burn = max(0, burn - 4)
@@ -165,7 +165,7 @@
// Damage an internal organ
if(internal_organs && internal_organs.len)
var/obj/item/organ/internal/I = pick(internal_organs)
- I.take_damage(brute * 0.5)
+ I.receive_damage(brute * 0.5)
brute -= brute * 0.5
if(status & ORGAN_BROKEN && prob(40) && brute)
@@ -217,7 +217,7 @@
if(possible_points.len)
//And pass the pain around
var/obj/item/organ/external/target = pick(possible_points)
- target.take_damage(brute, burn, sharp, used_weapon, forbidden_limbs + src, ignore_resists = TRUE) //If the damage was reduced before, don't reduce it again
+ target.receive_damage(brute, burn, sharp, used_weapon, forbidden_limbs + src, ignore_resists = TRUE) //If the damage was reduced before, don't reduce it again
if(dismember_at_max_damage && body_part != UPPER_TORSO && body_part != LOWER_TORSO) // We've ensured all damage to the mob is retained, now let's drop it, if necessary.
droplimb(1) //Clean loss, just drop the limb and be done
@@ -495,7 +495,7 @@ Note that amputating the affected organ does in fact remove the infection from t
for(var/obj/item/organ/external/E in children) //Factor in the children's brute and burn into how much will transfer
total_brute += E.brute_dam
total_burn += E.burn_dam
- parent.take_damage(total_brute, total_burn, ignore_resists = TRUE) //Transfer the full damage to the parent, bypass limb damage reduction.
+ parent.receive_damage(total_brute, total_burn, ignore_resists = TRUE) //Transfer the full damage to the parent, bypass limb damage reduction.
parent = null
spawn(1)
@@ -735,7 +735,7 @@ Note that amputating the affected organ does in fact remove the infection from t
"Your [src.name] explodes!",\
"You hear an explosion!")
explosion(get_turf(owner),-1,-1,2,3)
- var/datum/effect/system/spark_spread/spark_system = new /datum/effect/system/spark_spread()
+ var/datum/effect_system/spark_spread/spark_system = new /datum/effect_system/spark_spread()
spark_system.set_up(5, 0, victim)
spark_system.attach(owner)
spark_system.start()
diff --git a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm
index 2446db5a3f3..cefc03f5a1c 100644
--- a/code/modules/surgery/organs/organ_internal.dm
+++ b/code/modules/surgery/organs/organ_internal.dm
@@ -267,35 +267,6 @@
H.adjustFireLoss(-cursed_heart.heal_burn)
H.adjustOxyLoss(-cursed_heart.heal_oxy)
-/obj/item/organ/internal/lungs
- name = "lungs"
- icon_state = "lungs"
- gender = PLURAL
- organ_tag = "lungs"
- parent_organ = "chest"
- slot = "lungs"
- vital = 1
-
-//Insert something neat here.
-///obj/item/organ/internal/lungs/remove(mob/living/carbon/M, special = 0)
-// owner.losebreath += 10
- //insert oxy damage extream here.
-// . = ..()
-
-
-/obj/item/organ/internal/lungs/on_life()
- if(germ_level > INFECTION_LEVEL_ONE)
- if(prob(5))
- owner.emote("cough") //respitory tract infection
-
- if(is_bruised())
- if(prob(2))
- owner.custom_emote(1, "coughs up blood!")
- owner.bleed(1)
- if(prob(4))
- owner.custom_emote(1, "gasps for air!")
- owner.AdjustLoseBreath(5)
-
/obj/item/organ/internal/kidneys
name = "kidneys"
icon_state = "kidneys"
@@ -326,7 +297,7 @@
var/eye_colour = "#000000"
var/list/colourmatrix = null
var/list/colourblind_matrix = MATRIX_GREYSCALE //Special colourblindness parameters. By default, it's black-and-white.
- var/colourblind_darkview = null
+ var/list/replace_colours = LIST_GREYSCALE_REPLACE
var/dependent_disabilities = null //Gets set by eye-dependent disabilities such as colourblindness so the eyes can transfer the disability during transplantation.
var/dark_view = 2 //Default dark_view for Humans.
var/weld_proof = null //If set, the eyes will not take damage during welding. eg. IPC optical sensors do not take damage when they weld things while all other eyes will.
@@ -341,10 +312,7 @@
return colourmatrix
/obj/item/organ/internal/eyes/proc/get_dark_view() //Returns dark_view (if the eyes are organic) for see_invisible handling in species.dm to be autoprocessed by life().
- if(!robotic && colourblind_darkview && owner.disabilities & COLOURBLIND) //Returns special darkview value if colourblind and it exists, otherwise reuse current.
- return colourblind_darkview
- else
- return dark_view
+ return dark_view
/obj/item/organ/internal/eyes/insert(mob/living/carbon/human/M, special = 0)
..()
@@ -430,16 +398,16 @@
if(owner.getToxLoss() >= 60 && !owner.reagents.has_reagent("charcoal"))
//Healthy liver suffers on its own
if(damage < min_broken_damage)
- take_damage(0.2 * PROCESS_ACCURACY)
+ receive_damage(0.2 * PROCESS_ACCURACY)
//Damaged one shares the fun
else
var/obj/item/organ/internal/O = pick(owner.internal_organs)
if(O)
- O.take_damage(0.2 * PROCESS_ACCURACY)
+ O.receive_damage(0.2 * PROCESS_ACCURACY)
//Detox can heal small amounts of damage
if(damage && damage < min_bruised_damage && owner.reagents.has_reagent("charcoal"))
- take_damage(-0.2 * PROCESS_ACCURACY)
+ receive_damage(-0.2 * PROCESS_ACCURACY)
// Get the effectiveness of the liver.
var/filter_effect = 3
diff --git a/code/modules/surgery/organs/subtypes/drask.dm b/code/modules/surgery/organs/subtypes/drask.dm
index 6e1e6662d0a..8560d2408ec 100644
--- a/code/modules/surgery/organs/subtypes/drask.dm
+++ b/code/modules/surgery/organs/subtypes/drask.dm
@@ -12,13 +12,10 @@
parent_organ = "head"
species = "Drask"
-/obj/item/organ/internal/lungs/drask
- icon = 'icons/obj/surgery_drask.dmi'
- species = "Drask"
-
/obj/item/organ/internal/liver/drask
name = "metabolic strainer"
icon = 'icons/obj/surgery_drask.dmi'
+ icon_state = "kidneys"
alcohol_intensity = 0.8
species = "Drask"
diff --git a/code/modules/surgery/organs/subtypes/standard.dm b/code/modules/surgery/organs/subtypes/standard.dm
index 258ff9ebaff..0662cb490a5 100644
--- a/code/modules/surgery/organs/subtypes/standard.dm
+++ b/code/modules/surgery/organs/subtypes/standard.dm
@@ -209,7 +209,7 @@
..()
-/obj/item/organ/external/head/take_damage(brute, burn, sharp, used_weapon = null, list/forbidden_limbs = list(), ignore_resists = FALSE)
+/obj/item/organ/external/head/receive_damage(brute, burn, sharp, used_weapon = null, list/forbidden_limbs = list(), ignore_resists = FALSE)
..(brute, burn, sharp, used_weapon, forbidden_limbs, ignore_resists)
if(!disfigured)
if(brute_dam > 40)
diff --git a/code/modules/surgery/organs/subtypes/tajaran.dm b/code/modules/surgery/organs/subtypes/tajaran.dm
index 746abd6e601..a1313934037 100644
--- a/code/modules/surgery/organs/subtypes/tajaran.dm
+++ b/code/modules/surgery/organs/subtypes/tajaran.dm
@@ -2,15 +2,16 @@
alcohol_intensity = 1.4
species = "Tajaran"
-/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).*/
+/obj/item/organ/internal/eyes/tajaran
name = "tajaran eyeballs"
species = "Tajaran"
colourblind_matrix = MATRIX_TAJ_CBLIND //The colour matrix and darksight parameters that the mob will recieve when they get the disability.
- colourblind_darkview = 8
+ replace_colours = LIST_TAJ_REPLACE
+ dark_view = 8
/obj/item/organ/internal/eyes/tajaran/farwa //Being the lesser form of Tajara, Farwas have an utterly incurable version of their colourblindness.
name = "farwa eyeballs"
species = "Farwa"
colourmatrix = MATRIX_TAJ_CBLIND
dark_view = 8
+ replace_colours = LIST_TAJ_REPLACE
diff --git a/code/modules/surgery/organs/subtypes/vulpkanin.dm b/code/modules/surgery/organs/subtypes/vulpkanin.dm
index af3d9deab09..be851c43486 100644
--- a/code/modules/surgery/organs/subtypes/vulpkanin.dm
+++ b/code/modules/surgery/organs/subtypes/vulpkanin.dm
@@ -2,15 +2,17 @@
alcohol_intensity = 1.4
species = "Vulpkanin"
-/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).*/
+
+/obj/item/organ/internal/eyes/vulpkanin
name = "vulpkanin eyeballs"
species = "Vulpkanin"
colourblind_matrix = MATRIX_VULP_CBLIND //The colour matrix and darksight parameters that the mob will recieve when they get the disability.
- colourblind_darkview = 8
+ replace_colours = LIST_VULP_REPLACE
+ dark_view = 8
/obj/item/organ/internal/eyes/vulpkanin/wolpin //Being the lesser form of Vulpkanin, Wolpins have an utterly incurable version of their colourblindness.
name = "wolpin eyeballs"
species = "Wolpin"
colourmatrix = MATRIX_VULP_CBLIND
dark_view = 8
+ replace_colours = LIST_VULP_REPLACE
diff --git a/code/modules/surgery/organs_internal.dm b/code/modules/surgery/organs_internal.dm
index 0b3ac65974d..15f86021c6c 100644
--- a/code/modules/surgery/organs_internal.dm
+++ b/code/modules/surgery/organs_internal.dm
@@ -71,12 +71,14 @@
var/implements_extract = list(/obj/item/weapon/hemostat = 100, /obj/item/weapon/kitchen/utensil/fork = 70)
var/implements_mend = list(/obj/item/stack/medical/bruise_pack = 20,/obj/item/stack/medical/bruise_pack/advanced = 100,/obj/item/stack/nanopaste = 100)
var/implements_clean = list(/obj/item/weapon/reagent_containers/dropper = 100,
+ /obj/item/weapon/reagent_containers/syringe = 100,
/obj/item/weapon/reagent_containers/glass/bottle = 90,
/obj/item/weapon/reagent_containers/food/drinks/drinkingglass = 85,
/obj/item/weapon/reagent_containers/food/drinks/bottle = 80,
/obj/item/weapon/reagent_containers/glass/beaker = 75,
/obj/item/weapon/reagent_containers/spray = 60,
/obj/item/weapon/reagent_containers/glass/bucket = 50)
+
//Finish is just so you can close up after you do other things.
var/implements_finsh = list(/obj/item/weapon/scalpel/laser/manager = 100,/obj/item/weapon/retractor = 100 ,/obj/item/weapon/crowbar = 90)
var/current_type
@@ -129,13 +131,16 @@
for(var/obj/item/organ/internal/I in affected.internal_organs)
if(I)
- if(C.reagents.total_volume < GHETTO_DISINFECT_AMOUNT)
+ if(C.reagents.total_volume <= 0) //end_step handles if there is not enough reagent
user.visible_message("[user] notices [tool] is empty.", \
- "You notice [tool] is empty")
+ "You notice [tool] is empty.")
return 0
var/msg = "[user] starts pouring some of [tool] over [target]'s [I.name]."
var/self_msg = "You start pouring some of [tool] over [target]'s [I.name]."
+ if(istype(C,/obj/item/weapon/reagent_containers/syringe))
+ msg = "[user] begins injecting [tool] into [target]'s [I.name]."
+ self_msg = "You begin injecting [tool] into [target]'s [I.name]."
user.visible_message(msg, self_msg)
if(H && affected)
H.custom_pain("Something burns horribly in your [affected.name]!",1)
@@ -300,23 +305,34 @@
var/obj/item/weapon/reagent_containers/C = tool
var/datum/reagents/R = C.reagents
var/ethanol = 0 //how much alcohol is in the thing
+ var/spaceacillin = 0 //how much actual antibiotic is in the thing
if(R.reagent_list.len)
for(var/datum/reagent/consumable/ethanol/alcohol in R.reagent_list)
ethanol += alcohol.alcohol_perc * 300
ethanol /= R.reagent_list.len
+ spaceacillin = R.get_reagent_amount("spaceacillin")
+
+
for(var/obj/item/organ/internal/I in affected.internal_organs)
if(I)
if(R.total_volume < GHETTO_DISINFECT_AMOUNT)
- user.visible_message("[user] notices there is not enough of [tool].", \
- "You notice there is not enough of [tool].")
+ user.visible_message("[user] notices there is not enough in [tool].", \
+ "You notice there is not enough in [tool].")
return 0
if(I.germ_level < INFECTION_LEVEL_ONE / 2)
to_chat(user, "[I] does not appear to be infected.")
if(I.germ_level >= INFECTION_LEVEL_ONE / 2)
- I.germ_level = max(I.germ_level-ethanol, 0)
- user.visible_message(" [user] has poured some of [tool] over [target]'s [I.name].",
+ if(spaceacillin >= GHETTO_DISINFECT_AMOUNT)
+ I.germ_level = 0
+ else
+ I.germ_level = max(I.germ_level-ethanol, 0)
+ if(istype(C,/obj/item/weapon/reagent_containers/syringe))
+ user.visible_message(" [user] has injected [tool] into [target]'s [I.name].",
+ " You have injected [tool] into [target]'s [I.name].")
+ else
+ user.visible_message(" [user] has poured some of [tool] over [target]'s [I.name].",
" You have poured some of [tool] over [target]'s [I.name].")
R.trans_to(target, GHETTO_DISINFECT_AMOUNT)
R.reaction(target, INGEST)
@@ -352,11 +368,11 @@
else if(istype(tool, /obj/item/stack/medical/bruise_pack) || istype(tool, /obj/item/stack/nanopaste))
dam_amt = 5
target.adjustToxLoss(10)
- affected.take_damage(5)
+ affected.receive_damage(5)
for(var/obj/item/organ/internal/I in affected.internal_organs)
if(I && I.damage && !(I.tough))
- I.take_damage(dam_amt,0)
+ I.receive_damage(dam_amt,0)
return 0
@@ -365,7 +381,7 @@
" Your hand slips, damaging [tool]!")
var/obj/item/organ/internal/I = tool
if(istype(I) && !I.tough)
- I.take_damage(rand(3,5),0)
+ I.receive_damage(rand(3,5),0)
return 0
@@ -386,7 +402,7 @@
for(var/obj/item/organ/internal/I in affected.internal_organs)
I.germ_level = max(I.germ_level-ethanol, 0)
- I.take_damage(rand(4,8),0)
+ I.receive_damage(rand(4,8),0)
R.trans_to(target, GHETTO_DISINFECT_AMOUNT * 10)
R.reaction(target, INGEST)
@@ -400,7 +416,7 @@
if(affected)
user.visible_message(" [user]'s hand slips, damaging [target]'s [affected.name] with [tool]!", \
" Your hand slips, damaging [target]'s [affected.name] with [tool]!")
- affected.take_damage(20)
+ affected.receive_damage(20)
else
user.visible_message(" [user]'s hand slips, damaging [target]'s [parse_zone(target_zone)] with [tool]!", \
" Your hand slips, damaging [target]'s [parse_zone(target_zone)] with [tool]!")
@@ -420,7 +436,7 @@
var/self_msg = " Your hand slips, tearing skin!"
user.visible_message(msg, self_msg)
if(affected)
- affected.take_damage(20)
+ affected.receive_damage(20)
return 0
diff --git a/code/modules/surgery/other.dm b/code/modules/surgery/other.dm
index 233b6f56a33..b7f2e9ba084 100644
--- a/code/modules/surgery/other.dm
+++ b/code/modules/surgery/other.dm
@@ -99,7 +99,7 @@
var/obj/item/organ/external/affected = target.get_organ(target_zone)
user.visible_message(" [user]'s hand slips, smearing [tool] in the incision in [target]'s [affected.name]!" , \
" Your hand slips, smearing [tool] in the incision in [target]'s [affected.name]!")
- affected.take_damage(5, 0)
+ affected.receive_damage(5, 0)
return 0
@@ -148,7 +148,7 @@
var/obj/item/organ/external/affected = target.get_organ(target_zone)
user.visible_message(" [user]'s hand slips, slicing an artery inside [target]'s [affected.name] with \the [tool]!", \
" Your hand slips, slicing an artery inside [target]'s [affected.name] with \the [tool]!")
- affected.take_damage(20)
+ affected.receive_damage(20)
return 0
diff --git a/code/modules/surgery/robotics.dm b/code/modules/surgery/robotics.dm
index 27f722318d7..53219ed8a14 100644
--- a/code/modules/surgery/robotics.dm
+++ b/code/modules/surgery/robotics.dm
@@ -485,11 +485,11 @@
" Your hand slips, gumming up the mechanisms inside of [target]'s [affected.name] with \the [tool]!")
target.adjustToxLoss(5)
- affected.take_damage(5)
+ affected.receive_damage(5)
for(var/obj/item/organ/internal/I in affected.internal_organs)
if(I)
- I.take_damage(rand(3,5),0)
+ I.receive_damage(rand(3,5),0)
else if(current_type == "insert")
user.visible_message(" [user]'s hand slips, disconnecting \the [tool].", \
diff --git a/code/modules/surgery/surgery.dm b/code/modules/surgery/surgery.dm
index f5d49f100d2..56da8f031e3 100644
--- a/code/modules/surgery/surgery.dm
+++ b/code/modules/surgery/surgery.dm
@@ -206,7 +206,7 @@
for(var/mob/living/carbon/human/H in view(2, E.loc))//germs from people
if(AStar(E.loc, H.loc, /turf/proc/Distance, 2, simulated_only = 0))
- if((!(NO_BREATH in H.mutations) || !(NO_BREATH in H.species.species_traits)) && !H.wear_mask) //wearing a mask helps preventing people from breathing cooties into open incisions
+ if((!(BREATHLESS in H.mutations) || !(NO_BREATHE in H.species.species_traits)) && !H.wear_mask) //wearing a mask helps preventing people from breathing cooties into open incisions
germs += H.germ_level * 0.25
for(var/obj/effect/decal/cleanable/M in view(2, E.loc))//germs from messes
diff --git a/code/modules/telesci/telepad.dm b/code/modules/telesci/telepad.dm
index f8a177e413d..3c3c9815836 100644
--- a/code/modules/telesci/telepad.dm
+++ b/code/modules/telesci/telepad.dm
@@ -157,7 +157,7 @@
/obj/item/weapon/rcs/emag_act(user as mob)
if(!emagged)
emagged = 1
- var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
+ var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
s.set_up(5, 1, src)
s.start()
to_chat(user, " You emag the RCS. Activate it to toggle between modes.")
diff --git a/code/modules/telesci/telesci_computer.dm b/code/modules/telesci/telesci_computer.dm
index 9caaee5187c..4034aab05df 100644
--- a/code/modules/telesci/telesci_computer.dm
+++ b/code/modules/telesci/telesci_computer.dm
@@ -148,7 +148,7 @@
/obj/machinery/computer/telescience/proc/sparks()
if(telepad)
- var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
+ var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
s.set_up(5, 1, get_turf(telepad))
s.start()
else
@@ -206,7 +206,7 @@
// use a lot of power
use_power(power * 10)
- var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
+ var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
s.set_up(5, 1, get_turf(telepad))
s.start()
@@ -217,7 +217,7 @@
temp_msg += "Data printed below."
var/sparks = get_turf(target)
- var/datum/effect/system/spark_spread/y = new /datum/effect/system/spark_spread
+ var/datum/effect_system/spark_spread/y = new /datum/effect_system/spark_spread
y.set_up(5, 1, sparks)
y.start()
diff --git a/code/modules/vehicle/ambulance.dm b/code/modules/vehicle/ambulance.dm
index ab64ac1252d..38eb4af18aa 100644
--- a/code/modules/vehicle/ambulance.dm
+++ b/code/modules/vehicle/ambulance.dm
@@ -45,6 +45,7 @@
icon = 'icons/vehicles/CargoTrain.dmi'
icon_state = "ambulance"
anchored = 0
+ 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)
..()
@@ -55,4 +56,4 @@
to_chat(usr, "You unhook the bed to the ambulance.")
else
amb.bed = src
- to_chat(usr, "You hook the bed to the ambulance.")
\ No newline at end of file
+ to_chat(usr, "You hook the bed to the ambulance.")
diff --git a/code/modules/vehicle/speedbike.dm b/code/modules/vehicle/speedbike.dm
index 7d46114fb63..ac57e65b2e6 100644
--- a/code/modules/vehicle/speedbike.dm
+++ b/code/modules/vehicle/speedbike.dm
@@ -14,21 +14,9 @@
overlay.layer = MOB_LAYER + 0.1
overlays += overlay
-/obj/effect/overlay/temp/speedbike_trail
- name = "speedbike trails"
- icon = 'icons/effects/effects.dmi'
- icon_state = "ion_fade"
- duration = 10
- randomdir = 0
- layer = MOB_LAYER - 0.2
-
-/obj/effect/overlay/temp/speedbike_trail/New(loc,move_dir)
- ..()
- dir = move_dir
-
/obj/vehicle/space/speedbike/Move(newloc,move_dir)
if(buckled_mob)
- new /obj/effect/overlay/temp/speedbike_trail(loc)
+ new /obj/effect/temp_visual/dir_setting/speedbike_trail(loc)
. = ..()
/obj/vehicle/space/speedbike/handle_vehicle_layer()
diff --git a/code/world.dm b/code/world.dm
index e293058cdf6..542e19ef619 100644
--- a/code/world.dm
+++ b/code/world.dm
@@ -7,7 +7,7 @@ var/global/datum/global_init/init = new ()
makeDatumRefLists()
load_configuration()
-
+ setLog()
del(src)
/world
@@ -23,14 +23,8 @@ var/global/datum/global_init/init = new ()
var/global/list/map_transition_config = MAP_TRANSITION_CONFIG
/world/New()
- //logs
- var/date_string = time2text(world.realtime, "YYYY/MM-Month/DD-Day")
- href_logfile = file("data/logs/[date_string] hrefs.htm")
- diary = file("data/logs/[date_string].log")
- diaryofmeanpeople = file("data/logs/[date_string] Attack.log")
diary << "\n\nStarting up. [time2text(world.timeofday, "hh:mm.ss")]\n---------------------"
diaryofmeanpeople << "\n\nStarting up. [time2text(world.timeofday, "hh:mm.ss")]\n---------------------"
-
if(byond_version < RECOMMENDED_VERSION)
log_to_dd("Your server's byond version does not meet the recommended requirements for this code. Please update BYOND")
@@ -63,11 +57,10 @@ var/global/list/map_transition_config = MAP_TRANSITION_CONFIG
master_controller.setup()
sleep_offline = 1
- #ifdef MAP_NAME
- map_name = "[MAP_NAME]"
- #else
- map_name = "Unknown"
- #endif
+ if(using_map && using_map.name)
+ map_name = "[using_map.name]"
+ else
+ map_name = "Unknown"
@@ -265,6 +258,14 @@ var/world_topic_spam_protect_time = world.timeofday
return "Kick Successful"
+ else if("setlog" in input)
+ if(!key_valid)
+ return keySpamProtect(addr)
+
+ setLog()
+
+ return "Logs set to current date"
+
/proc/keySpamProtect(var/addr)
if(world_topic_spam_protect_ip == addr && abs(world_topic_spam_protect_time - world.time) < 50)
spawn(50)
@@ -454,6 +455,12 @@ var/world_topic_spam_protect_time = world.timeofday
var/failed_db_connections = 0
var/failed_old_db_connections = 0
+/proc/setLog()
+ var/date_string = time2text(world.realtime, "YYYY/MM-Month/DD-Day")
+ href_logfile = file("data/logs/[date_string] hrefs.htm")
+ diary = file("data/logs/[date_string].log")
+ diaryofmeanpeople = file("data/logs/[date_string] Attack.log")
+
/hook/startup/proc/connectDB()
if(!setup_database_connection())
log_to_dd("Your server failed to establish a connection with the feedback database.")
@@ -461,7 +468,7 @@ var/failed_old_db_connections = 0
log_to_dd("Feedback database connection established.")
return 1
-proc/setup_database_connection()
+/proc/setup_database_connection()
if(failed_db_connections > FAILED_DB_CONNECTION_CUTOFF) //If it failed to establish a connection more than 5 times in a row, don't bother attempting to conenct anymore.
return 0
@@ -496,3 +503,4 @@ proc/establish_db_connection()
return 1
#undef FAILED_DB_CONNECTION_CUTOFF
+
diff --git a/config/example/config.txt b/config/example/config.txt
index 51018432c3c..2dcd5da6573 100644
--- a/config/example/config.txt
+++ b/config/example/config.txt
@@ -95,6 +95,9 @@ PROBABILITY EXTENDED 2
PROBABILITY NUCLEAR 3
PROBABILITY ABDUCTION 0
+# MAXIMUM SECONDS SHADOWLINGS CAN REMAIN UNHATCHED BEFORE THEY TAKE DAMAGE
+SHADOWLING_MAX_AGE 0
+
## Hash out to disable random events during the round.
ALLOW_RANDOM_EVENTS
@@ -137,14 +140,6 @@ DEFAULT_NO_VOTE
## allow AI job
ALLOW_AI
-## Secborg ###
-## Uncomment to prevent the security cyborg module from being chosen
-#DISABLE_SECBORG
-
-## Peacekeeper Borg ###
-## Uncomment to prevent the peacekeeper cyborg module from being chosen
-#DISABLE_PEACEBORG
-
## Allow ghosts to see antagonist through AntagHUD
ALLOW_ANTAG_HUD
@@ -185,6 +180,9 @@ CHECK_RANDOMIZER
## Rules address
# RULESURL http://example.org
+## GitHub address
+# GITHUBURL http://example.org
+
## Donations address
# DONATIONSURL http://example.org
@@ -348,4 +346,4 @@ DISABLE_SPACE_RUINS
#SHUTDOWN_SHELL_COMMAND taskkill /f /im dreamdaemon.exe
## Uncomment this to disable karma and unlock all karma purchases for players by default
-#DISABLE_KARMA
\ No newline at end of file
+#DISABLE_KARMA
diff --git a/config/example/dbconfig.txt b/config/example/dbconfig.txt
index 837e1c5946c..a962b4b685c 100644
--- a/config/example/dbconfig.txt
+++ b/config/example/dbconfig.txt
@@ -9,7 +9,7 @@
## This value must be set to the version of the paradise schema in use.
## If this value does not match, the SQL database will not be loaded and an error will be generated.
## Roundstart will be delayed.
-DB_VERSION 1
+DB_VERSION 2
## Server the MySQL database can be found at.
# Examples: localhost, 200.135.5.43, www.mysqldb.com, etc.
diff --git a/config/names/last.txt b/config/names/last.txt
index 99bb75aced8..b19dcbce3a6 100644
--- a/config/names/last.txt
+++ b/config/names/last.txt
@@ -36,7 +36,6 @@ Logue
Reichard
Day
Dugmore
-Murray
Greenawalt
Jyllian
Osterwise
@@ -224,13 +223,11 @@ Unk
Otis
Quinn
Bell
-Roberts
Wood
Ullman
Bicknell
Gibson
Rohtin
-James
Wallick
Eggbert
Losey
@@ -273,7 +270,6 @@ Hook
Reighner
Welty
Jenkins
-Bennett
Swarner
Hawker
Agg
@@ -341,7 +337,6 @@ Laurenzi
Minnie
Houser
Langston
-Anderson
Barrett
Wible
Hujsak
@@ -398,7 +393,6 @@ Ratcliff
Riggle
Newton
Sanders
-Mitchell
Lauffer
Aggley
Moberly
@@ -438,13 +432,9 @@ Smith
Steele
Leach
Armstrong
-Wheeler
Easter
Greenwood
-Woodward
-Pratt
Buzzard
-Cox
Eliza
Rockwell
Zeal
@@ -468,7 +458,6 @@ Digson
Byers
Hincken
Shaner
-Todd
Whiteman
Lineman
Albright
@@ -505,68 +494,36 @@ Dawkins
McShain
McDonohugh
Power
-Smith
Jones
Williams
Brown
Taylor
Davies
Wilson
-Evans
-Thomas
-Roberts
-Johnson
Walker
Wright
-Robinson
Thompson
-Hughes
-White
-Edwards
-Hall
Patel
-Green
Martins
Lewis
-Wood
-Jackson
-Clarke
Harris
Clark
-Scott
Turner
-Hill
-Moore
Cooper
Morris
-Ward
-Watson
Morgan
-Anderson
Harrison
-King
-Campbell
-Young
-Mitchell
-Baker
-James
Kelly
Allen
-Bell
Phillips
Lee
-Stewart
-Miller
Parker
Simpson
-Bennett
-Davis
Griffiths
Shaw
Price
Cook
Richardson
-Murray
Marshall
Begum
Murphy
@@ -577,9 +534,6 @@ Bailey
Carter
Robertson
Graham
-Adams
-Richards
-Cox
Singh
Hussain
Ellis
@@ -591,22 +545,18 @@ Ali
Reid
Rathens
Rathen
-Mason
Chapman
Powell
Owen
Ahmed
-Gibson
Rogers
Webb
Holmes
Mills
Matthews
-Hunt
Palmer
Lloyd
Kaur
-Fisher
Ivanov
Smirnov
Vasilyev
@@ -617,3 +567,63 @@ Pavlov
Semenov
Andreev
Alekseev
+Garcia
+Rodriguez
+Gonzalez
+Hernandez
+Martinez
+Lopez
+Perez
+Ramirez
+Gomez
+Torres
+Flores
+Rivera
+Cruz
+Reyes
+Morales
+Mendoza
+Ruiz
+Alvarez
+Castillo
+Jimenez
+Vasquez
+Romero
+Moreno
+Aguilar
+Diaz
+Medina
+Fernandez
+Vargas
+Herrera
+Soto
+Zhang
+Chang
+Chen
+Lin
+Wong
+Sato
+Suzuki
+Takahashi
+Tanaka
+Watanabe
+Kim
+Park
+Choi
+Jeong
+Kang
+Nguyen
+Tran
+Le
+Phan
+Dang
+Duong
+Tan
+Lim
+Chua
+Kumar
+Gupta
+Reddy
+Chowdhury
+Bashara
+Karim
diff --git a/goon/browserassets/css/browserOutput.css b/goon/browserassets/css/browserOutput.css
index 967b88ae13a..fad9711bc42 100644
--- a/goon/browserassets/css/browserOutput.css
+++ b/goon/browserassets/css/browserOutput.css
@@ -32,6 +32,12 @@ a {color: #0000ff;}
a:visited {color: #ff00ff;}
a.popt {text-decoration: none;}
+/*****************************************
+*
+* CUSTOM FONTS
+*
+******************************************/
+@font-face { font-family: PxPlus IBM MDA; src: url('PxPlus_IBM_MDA.ttf'); }
/*****************************************
*
@@ -217,6 +223,21 @@ a.popt {text-decoration: none;}
/* ADD HERE FOR ITALIC */
.italic, .ghostdronesay.broadcast {font-style: italic;}
+/* BADGE */
+.repeatBadge {
+ display: inline-block;
+ min-width: 0.5em;
+ font-size: 0.7em;
+ padding: 0.2em 0.3em;
+ line-height: 1;
+ color: white;
+ text-align: center;
+ white-space: nowrap;
+ vertical-align: middle;
+ background-color: crimson;
+ border-radius: 10px;
+}
+
/* OUTPUT COLORS */
.highlight {background: yellow;}
h1, h2, h3, h4, h5, h6 {color: #0000ff;font-family: Georgia, Verdana, sans-serif;}
@@ -301,6 +322,7 @@ h1.alert, h2.alert {color: #000000;}
.rose {color: #ff5050;}
.sans {font-family: 'Comic Sans MS', cursive, sans-serif;}
.wingdings {font-family: Wingdings, Webdings;}
+.ibm {font-family: 'PxPlus IBM MDA';}
.ancient {color: #008B8B; font-stye: italic;}
.newscaster {color: #800000;}
.mod {color: #735638; font-weight: bold;}
@@ -379,3 +401,7 @@ h1.alert, h2.alert {color: #000000;}
/* EMOJI STUFF */
.emoji {max-height: 16px; max-width: 16px}
+
+/* ADMIN TICKETS */
+
+.adminticket {color: #3daf21; font-weight: bold}
diff --git a/goon/browserassets/css/fonts/LICENSE b/goon/browserassets/css/fonts/LICENSE
new file mode 100644
index 00000000000..c44326a8232
--- /dev/null
+++ b/goon/browserassets/css/fonts/LICENSE
@@ -0,0 +1,11 @@
+PxPlus IBM MDA Font (c) by VileR
+
+email - viler/ΑΤ/int10h/DΟТ/org
+www - http://int10h.org
+blog - http://8088mph.blogspot.com
+
+PxPlus IBM MDA Font is licensed under a
+Creative Commons Attribution-ShareAlike 4.0 International License.
+
+You should have received a copy of the license along with this
+work. If not, see .
\ No newline at end of file
diff --git a/goon/browserassets/css/fonts/PxPlus_IBM_MDA.ttf b/goon/browserassets/css/fonts/PxPlus_IBM_MDA.ttf
new file mode 100644
index 00000000000..db3b7b20ab6
Binary files /dev/null and b/goon/browserassets/css/fonts/PxPlus_IBM_MDA.ttf differ
diff --git a/goon/browserassets/html/browserOutput.html b/goon/browserassets/html/browserOutput.html
index 4bcd05f4cb0..496eac94a6c 100644
--- a/goon/browserassets/html/browserOutput.html
+++ b/goon/browserassets/html/browserOutput.html
@@ -49,6 +49,7 @@
Decrease font size -
Increase font size +
Change font
+ Condense chat Ø
Toggle ping display
Highlight string
Save chat log
@@ -66,4 +67,4 @@