"
/mob/living/simple_animal/hostile/guardian/adjustHealth(amount, updating_health = TRUE) //The spirit is invincible, but passes on damage to the summoner
var/damage = amount * damage_transfer
diff --git a/code/game/gamemodes/miniantags/guardian/types/bomb.dm b/code/game/gamemodes/miniantags/guardian/types/bomb.dm
index bc2e19e6878..591a5a7e026 100644
--- a/code/game/gamemodes/miniantags/guardian/types/bomb.dm
+++ b/code/game/gamemodes/miniantags/guardian/types/bomb.dm
@@ -25,6 +25,7 @@
if(istype(A, /obj/))
if(bomb_cooldown <= world.time && !stat)
var/obj/item/guardian_bomb/B = new /obj/item/guardian_bomb(get_turf(A))
+ add_attack_logs(src, A, "booby trapped (summoner: [summoner])")
to_chat(src, "Success! Bomb on [A] armed!")
if(summoner)
to_chat(summoner, "Your guardian has primed [A] to explode!")
@@ -53,6 +54,7 @@
addtimer(CALLBACK(src, .proc/disable), 600)
/obj/item/guardian_bomb/proc/disable()
+ add_attack_logs(null, stored_obj, "booby trap expired")
stored_obj.forceMove(get_turf(src))
if(spawner)
to_chat(spawner, "Failure! Your trap on [stored_obj] didn't catch anyone this time.")
@@ -65,10 +67,12 @@
if(istype(spawner, /mob/living/simple_animal/hostile/guardian))
var/mob/living/simple_animal/hostile/guardian/G = spawner
if(user == G.summoner)
+ add_attack_logs(user, stored_obj, "booby trap defused")
to_chat(user, "You knew this because of your link with your guardian, so you smartly defuse the bomb.")
stored_obj.forceMove(get_turf(loc))
qdel(src)
return
+ add_attack_logs(user, stored_obj, "booby trap TRIGGERED (spawner: [spawner])")
to_chat(spawner, "Success! Your trap on [src] caught [user]!")
stored_obj.forceMove(get_turf(loc))
playsound(get_turf(src),'sound/effects/explosion2.ogg', 200, 1)
diff --git a/code/game/gamemodes/miniantags/guardian/types/lightning.dm b/code/game/gamemodes/miniantags/guardian/types/lightning.dm
index e2ab6360ae5..901ba9162d0 100644
--- a/code/game/gamemodes/miniantags/guardian/types/lightning.dm
+++ b/code/game/gamemodes/miniantags/guardian/types/lightning.dm
@@ -25,7 +25,7 @@
if(!(NO_SHOCK in summoner.mutations))
summoner.mutations.Add(NO_SHOCK)
-/mob/living/simple_animal/hostile/guardian/beam/electrocute_act(shock_damage, obj/source, siemens_coeff = 1, safety = FALSE, override = FALSE, tesla_shock = FALSE, illusion = FALSE, stun = TRUE)
+/mob/living/simple_animal/hostile/guardian/beam/electrocute_act(shock_damage, source, siemens_coeff = 1, flags = NONE)
return FALSE //You are lightning, you should not be hurt by such things.
/mob/living/simple_animal/hostile/guardian/beam/AttackingTarget()
diff --git a/code/game/gamemodes/miniantags/revenant/revenant.dm b/code/game/gamemodes/miniantags/revenant/revenant.dm
index 62739b030e1..6121a3df808 100644
--- a/code/game/gamemodes/miniantags/revenant/revenant.dm
+++ b/code/game/gamemodes/miniantags/revenant/revenant.dm
@@ -87,7 +87,7 @@
return //most humans will now be either bones or harvesters, but we're still un-alive.
-/mob/living/simple_animal/revenant/electrocute_act(shock_damage, obj/source, siemens_coeff = 1, safety = FALSE, override = FALSE, tesla_shock = FALSE, illusion = FALSE, stun = TRUE)
+/mob/living/simple_animal/revenant/electrocute_act(shock_damage, source, siemens_coeff = 1, flags = NONE)
return FALSE //You are a ghost, atmos and grill makes sparks, and you make your own shocks with lights.
/mob/living/simple_animal/revenant/adjustHealth(amount, updating_health = TRUE)
@@ -118,7 +118,7 @@
/mob/living/simple_animal/revenant/New()
..()
-
+ flags_2 |= RAD_NO_CONTAMINATE_2
remove_from_all_data_huds()
random_revenant_name()
diff --git a/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm b/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm
index 47e5e759c77..fc49a534f2c 100644
--- a/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm
+++ b/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm
@@ -217,7 +217,7 @@
if(M == user)
return
M.Beam(L,icon_state="purple_lightning",icon='icons/effects/effects.dmi',time=5)
- M.electrocute_act(shock_damage, L, safety = TRUE)
+ M.electrocute_act(shock_damage, L, flags = SHOCK_NOGLOVES)
do_sparks(4, 0, M)
playsound(M, 'sound/machines/defib_zap.ogg', 50, 1, -1)
@@ -250,7 +250,7 @@
human.adjustToxLoss(toxdamage)
human.AdjustConfused(confusion, bound_lower = 0, bound_upper = maxconfusion)
new/obj/effect/temp_visual/revenant(human.loc)
- if(!istype(T, /turf/simulated/shuttle) && !istype(T, /turf/simulated/wall/rust) && !istype(T, /turf/simulated/wall/r_wall) && istype(T, /turf/simulated/wall) && prob(15))
+ if(!istype(T, /turf/simulated/wall/rust) && !istype(T, /turf/simulated/wall/r_wall) && istype(T, /turf/simulated/wall) && prob(15))
new/obj/effect/temp_visual/revenant(T)
T.ChangeTurf(/turf/simulated/wall/rust)
if(!istype(T, /turf/simulated/wall/r_wall/rust) && istype(T, /turf/simulated/wall/r_wall) && prob(15))
diff --git a/code/game/gamemodes/miniantags/slaughter/slaughter.dm b/code/game/gamemodes/miniantags/slaughter/slaughter.dm
index 244ff1a7beb..7707449df4f 100644
--- a/code/game/gamemodes/miniantags/slaughter/slaughter.dm
+++ b/code/game/gamemodes/miniantags/slaughter/slaughter.dm
@@ -302,6 +302,11 @@
health = 175
melee_damage_lower = 25
melee_damage_upper = 25
+ playstyle_string = "You are the Laughter Demon, an adorable creature from another existence. You have a single desire: to hug and tickle. \
+ You may use the blood crawl icon when on blood pools to travel through them, appearing and dissapearing from the station at will. \
+ Pulling a dead or critical mob while you enter a pool will pull them in with you, allowing you to hug them. \
+ You move quickly upon leaving a pool of blood, but the material world will soon sap your strength and leave you sluggish. \
+ (You should be attacking people on harm intent, and not nuzzling them.)"
attack_sound = 'sound/items/bikehorn.ogg'
feast_sound = 'sound/spookoween/scary_horn2.ogg'
diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm
index 7c2071f8e58..fcfbe682b41 100644
--- a/code/game/gamemodes/nuclear/nuclear.dm
+++ b/code/game/gamemodes/nuclear/nuclear.dm
@@ -286,13 +286,13 @@
switch(race)
if("Vox" || "Vox Armalis")
synd_mob.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/syndicate(synd_mob), slot_wear_mask)
- synd_mob.equip_to_slot_or_del(new /obj/item/tank/emergency_oxygen/vox(synd_mob), slot_l_hand)
+ synd_mob.equip_to_slot_or_del(new /obj/item/tank/internals/emergency_oxygen/double/vox(synd_mob), slot_l_hand)
synd_mob.internal = synd_mob.l_hand
synd_mob.update_action_buttons_icon()
if("Plasmaman")
synd_mob.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/syndicate(synd_mob), slot_wear_mask)
- synd_mob.equip_or_collect(new /obj/item/tank/plasma/plasmaman(synd_mob), slot_s_store)
+ synd_mob.equip_or_collect(new /obj/item/tank/internals/plasmaman(synd_mob), slot_s_store)
synd_mob.equip_or_collect(new /obj/item/extinguisher_refill(synd_mob), slot_in_backpack)
synd_mob.equip_or_collect(new /obj/item/extinguisher_refill(synd_mob), slot_in_backpack)
synd_mob.internal = synd_mob.get_item_by_slot(slot_s_store)
diff --git a/code/game/gamemodes/nuclear/nuclearbomb.dm b/code/game/gamemodes/nuclear/nuclearbomb.dm
index 99e9dfaeb35..f57da2eabaf 100644
--- a/code/game/gamemodes/nuclear/nuclearbomb.dm
+++ b/code/game/gamemodes/nuclear/nuclearbomb.dm
@@ -330,9 +330,9 @@ GLOBAL_VAR(bomb_set)
return
qdel(src)
-/obj/machinery/nuclearbomb/tesla_act(power, explosive)
- ..()
- if(explosive)
+/obj/machinery/nuclearbomb/zap_act(power, zap_flags)
+ . = ..()
+ if(zap_flags & ZAP_MACHINE_EXPLOSIVE)
qdel(src)//like the singulo, tesla deletes it. stops it from exploding over and over
#define NUKERANGE 80
@@ -425,7 +425,7 @@ GLOBAL_VAR(bomb_set)
to_chat(holder, "You can't help but feel that you just lost something back there...")
qdel(src)
- //station disk is allowed on z1, escape shuttle/pods, CC, and syndicate shuttles/base, reset otherwise
+ //station disk is allowed on the station level, escape shuttle/pods, CC, and syndicate shuttles/base, reset otherwise
/obj/item/disk/nuclear/proc/check_disk_loc()
var/turf/T = get_turf(src)
var/area/A = get_area(src)
diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm
index dc7fd5e6239..d1622aabd3c 100644
--- a/code/game/gamemodes/objective.dm
+++ b/code/game/gamemodes/objective.dm
@@ -243,7 +243,7 @@ GLOBAL_LIST_INIT(potential_theft_objectives, (subtypesof(/datum/theft_objective)
if(issilicon(player))
continue
if(get_area(player) == A)
- if(player.real_name != owner.current.real_name && !istype(get_turf(player.mind.current), /turf/simulated/shuttle/floor4))
+ if(player.real_name != owner.current.real_name && !istype(get_turf(player.mind.current), /turf/simulated/floor/mineral/plastitanium/red/brig))
return 0
for(var/mob/living/player in GLOB.player_list) //Make sure at least one of you is onboard
@@ -252,7 +252,7 @@ GLOBAL_LIST_INIT(potential_theft_objectives, (subtypesof(/datum/theft_objective)
if(issilicon(player))
continue
if(get_area(player) == A)
- if(player.real_name == owner.current.real_name && !istype(get_turf(player.mind.current), /turf/simulated/shuttle/floor4))
+ if(player.real_name == owner.current.real_name && !istype(get_turf(player.mind.current), /turf/simulated/floor/mineral/plastitanium/red/brig))
return 1
return 0
@@ -300,7 +300,7 @@ GLOBAL_LIST_INIT(potential_theft_objectives, (subtypesof(/datum/theft_objective)
if(!location)
return 0
- if(istype(location, /turf/simulated/shuttle/floor4) || istype(location, /turf/simulated/floor/mineral/plastitanium/red/brig)) // Fails traitors if they are in the shuttle brig -- Polymorph
+ if(istype(location, /turf/simulated/floor/mineral/plastitanium/red/brig)) // Fails traitors if they are in the shuttle brig -- Polymorph
return 0
if(location.onCentcom() || location.onSyndieBase())
@@ -371,36 +371,27 @@ GLOBAL_LIST_INIT(potential_theft_objectives, (subtypesof(/datum/theft_objective)
var/theft_area
/datum/objective/steal/proc/get_location()
- if(steal_target.location_override)
- return steal_target.location_override
- var/list/obj/item/steal_candidates = get_all_of_type(steal_target.typepath, subtypes = TRUE)
- for(var/obj/item/candidate in steal_candidates)
- if(!is_admin_level(candidate.loc.z))
- theft_area = get_area(candidate.loc)
- return "[theft_area]"
- return "an unknown area"
+ return steal_target.location_override || "an unknown area"
/datum/objective/steal/find_target()
- var/loop=50
- while(!steal_target && loop > 0)
- loop--
- var/thefttype = pick(GLOB.potential_theft_objectives)
+ var/potential = GLOB.potential_theft_objectives.Copy()
+ while(!steal_target && length(potential))
+ var/thefttype = pick_n_take(potential)
var/datum/theft_objective/O = new thefttype
if(owner.assigned_role in O.protected_jobs)
continue
if(O in owner.targets)
continue
- if(O.flags & 2)
+ if(O.flags & 2) // THEFT_FLAG_UNIQUE
continue
- steal_target = O
+ steal_target = O
explanation_text = "Steal [steal_target]. One was last seen in [get_location()]. "
- if(islist(O.protected_jobs) && O.protected_jobs.len)
- explanation_text += "It may also be in the possession of the [jointext(O.protected_jobs, ", ")]."
+ if(length(O.protected_jobs))
+ explanation_text += "It may also be in the possession of the [english_list(O.protected_jobs, and_text = " or ")]."
return
explanation_text = "Free Objective."
-
/datum/objective/steal/proc/select_target()
var/list/possible_items_all = GLOB.potential_theft_objectives+"custom"
var/new_target = input("Select target:", "Objective target", null) as null|anything in possible_items_all
diff --git a/code/game/gamemodes/steal_items.dm b/code/game/gamemodes/steal_items.dm
index edbe51fd66f..7e15147e885 100644
--- a/code/game/gamemodes/steal_items.dm
+++ b/code/game/gamemodes/steal_items.dm
@@ -31,26 +31,31 @@
name = "the captain's antique laser gun"
typepath = /obj/item/gun/energy/laser/captain
protected_jobs = list("Captain")
+ location_override = "the Captain's Office"
/datum/theft_objective/captains_jetpack
name = "the captain's deluxe jetpack"
typepath = /obj/item/tank/jetpack/oxygen/captain
protected_jobs = list("Captain")
+ location_override = "the Captain's Office"
/datum/theft_objective/captains_rapier
name = "the captain's rapier"
typepath = /obj/item/melee/rapier
protected_jobs = list("Captain")
+ location_override = "the Captain's Office"
/datum/theft_objective/hoslaser
name = "the head of security's X-01 multiphase energy gun"
typepath = /obj/item/gun/energy/gun/hos
protected_jobs = list("Head Of Security")
+ location_override = "the Head of Security's Office"
/datum/theft_objective/hand_tele
name = "a hand teleporter"
typepath = /obj/item/hand_tele
protected_jobs = list("Captain", "Research Director", "Chief Engineer")
+ location_override = "Teleporter"
/datum/theft_objective/ai
name = "a functional AI"
@@ -68,17 +73,20 @@
name = "a compact defibrillator"
typepath = /obj/item/defibrillator/compact
protected_jobs = list("Chief Medical Officer", "Paramedic")
+ location_override = "the Chief Medical Officer's Office"
/datum/theft_objective/magboots
name = "the chief engineer's advanced magnetic boots"
typepath = /obj/item/clothing/shoes/magboots/advance
protected_jobs = list("Chief Engineer")
+ location_override = "the Chief Engineer's Office"
/datum/theft_objective/blueprints
name = "the station blueprints"
typepath = /obj/item/areaeditor/blueprints/ce
protected_jobs = list("Chief Engineer")
altitems = list(/obj/item/photo)
+ location_override = "the Chief Engineer's Office"
/datum/objective_item/steal/blueprints/check_special_completion(obj/item/I)
if(istype(I, /obj/item/areaeditor/blueprints/ce))
@@ -93,35 +101,42 @@
name = "the medal of captaincy"
typepath = /obj/item/clothing/accessory/medal/gold/captain
protected_jobs = list("Captain")
+ location_override = "the Captain's Office"
/datum/theft_objective/nukedisc
name = "the nuclear authentication disk"
typepath = /obj/item/disk/nuclear
protected_jobs = list("Captain")
+ location_override = "the Captain's Office"
/datum/theft_objective/reactive
name = "the reactive teleport armor"
typepath = /obj/item/clothing/suit/armor/reactive/teleport
protected_jobs = list("Research Director")
+ location_override = "the Research Director's Office"
/datum/theft_objective/steal/documents
name = "any set of secret documents of any organization"
typepath = /obj/item/documents //Any set of secret documents. Doesn't have to be NT's
+ location_override = "the Vault"
/datum/theft_objective/hypospray
name = "the Chief Medical Officer's hypospray"
typepath = /obj/item/reagent_containers/hypospray/CMO
protected_jobs = list("Chief Medical Officer")
+ location_override = "the Chief Medical Officer's Office"
/datum/theft_objective/ablative
name = "an ablative armor vest"
typepath = /obj/item/clothing/suit/armor/laserproof
protected_jobs = list("Head of Security", "Warden")
+ location_override = "the Armory"
/datum/theft_objective/krav
name = "the warden's krav maga martial arts gloves"
typepath = /obj/item/clothing/gloves/color/black/krav_maga/sec
protected_jobs = list("Head Of Security", "Warden")
+ location_override = "the Warden's Office"
/datum/theft_objective/number
var/min=0
@@ -160,7 +175,9 @@
/datum/theft_objective/unique/docs_red
name = "the \"Red\" secret documents"
typepath = /obj/item/documents/syndicate/red
+ location_override = "a Syndicate agent's possession"
/datum/theft_objective/unique/docs_blue
name = "the \"Blue\" secret documents"
typepath = /obj/item/documents/syndicate/blue
+ location_override = "a Syndicate agent's possession"
diff --git a/code/game/gamemodes/traitor/traitor.dm b/code/game/gamemodes/traitor/traitor.dm
index bb65e4b0874..f247f860400 100644
--- a/code/game/gamemodes/traitor/traitor.dm
+++ b/code/game/gamemodes/traitor/traitor.dm
@@ -20,14 +20,6 @@
var/traitors_possible = 4 //hard limit on traitors if scaling is turned off
var/const/traitor_scaling_coeff = 5.0 //how much does the amount of players get divided by to determine traitors
var/antag_datum = /datum/antagonist/traitor //what type of antag to create
- // Contractor related
- /// Minimum number of possible contractors regardless of the number of traitors.
- var/min_contractors = 1
- /// How many contractors there are in proportion to traitors.
- /// Calculated as: num_contractors = max(min_contractors, CEILING(num_traitors * contractor_traitor_ratio, 1))
- var/contractor_traitor_ratio = 0.25
- /// List of traitors who are eligible to become a contractor.
- var/list/datum/mind/selected_contractors = list()
/datum/game_mode/traitor/announce()
to_chat(world, "The current game mode is - Traitor!")
@@ -52,8 +44,6 @@
else
num_traitors = max(1, min(num_players(), traitors_possible))
- var/num_contractors = max(min_contractors, CEILING(num_traitors * contractor_traitor_ratio, 1))
-
for(var/j = 0, j < num_traitors, j++)
if(!possible_traitors.len)
break
@@ -62,8 +52,6 @@
traitor.special_role = SPECIAL_ROLE_TRAITOR
traitor.restricted_roles = restricted_jobs
possible_traitors.Remove(traitor)
- if(num_contractors-- > 0)
- selected_contractors += traitor
if(!pre_traitors.len)
return 0
@@ -73,7 +61,6 @@
/datum/game_mode/traitor/post_setup()
for(var/datum/mind/traitor in pre_traitors)
var/datum/antagonist/traitor/new_antag = new antag_datum()
- new_antag.is_contractor = (traitor in selected_contractors)
addtimer(CALLBACK(traitor, /datum/mind.proc/add_antag_datum, new_antag), rand(10,100))
if(!exchange_blue)
exchange_blue = -1 //Block latejoiners from getting exchange objectives
@@ -130,11 +117,11 @@
else
special_role_text = "antagonist"
- var/datum/antagonist/traitor/contractor/contractor = traitor.has_antag_datum(/datum/antagonist/traitor/contractor)
- if(istype(contractor) && contractor.contractor_uplink)
+ var/datum/contractor_hub/H = LAZYACCESS(GLOB.contractors, traitor)
+ if(H)
var/count = 1
- var/earned_tc = contractor.contractor_uplink.hub.reward_tc_paid_out
- for(var/c in contractor.contractor_uplink.hub.contracts)
+ var/earned_tc = H.reward_tc_paid_out
+ for(var/c in H.contracts)
var/datum/syndicate_contract/C = c
// Locations
var/locations = list()
diff --git a/code/game/gamemodes/vampire/vampire.dm b/code/game/gamemodes/vampire/vampire.dm
index a7bd5852f77..141ce7a1ef9 100644
--- a/code/game/gamemodes/vampire/vampire.dm
+++ b/code/game/gamemodes/vampire/vampire.dm
@@ -433,7 +433,7 @@ You are weak to holy things and starlight. Don't go into space and avoid the Cha
hud.vampire_blood_display.screen_loc = "WEST:6,CENTER-1:15"
hud.static_inventory += hud.vampire_blood_display
hud.show_hud(hud.hud_version)
- hud.vampire_blood_display.maptext = "
[bloodusable]
"
+ hud.vampire_blood_display.maptext = "
[bloodusable]
"
handle_vampire_cloak()
if(istype(owner.loc, /turf/space))
check_sun()
diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm
index 6f4eb3759de..3bf9ccc50eb 100644
--- a/code/game/jobs/job/security.dm
+++ b/code/game/jobs/job/security.dm
@@ -213,7 +213,7 @@
uniform = /obj/item/clothing/under/rank/security/brigphys
suit = /obj/item/clothing/suit/storage/fr_jacket
shoes = /obj/item/clothing/shoes/white
- l_ear = /obj/item/radio/headset/headset_sec/alt
+ l_ear = /obj/item/radio/headset/headset_sec/alt/brig_phys
glasses = /obj/item/clothing/glasses/hud/health/sunglasses
id = /obj/item/card/id/security
suit_store = /obj/item/flashlight/pen
diff --git a/code/game/jobs/job/support.dm b/code/game/jobs/job/support.dm
index 5d8c630cf7b..b4af01cd417 100644
--- a/code/game/jobs/job/support.dm
+++ b/code/game/jobs/job/support.dm
@@ -211,7 +211,7 @@
suit = /obj/item/clothing/suit/hooded/explorer
mask = /obj/item/clothing/mask/gas/explorer
glasses = /obj/item/clothing/glasses/meson
- suit_store = /obj/item/tank/emergency_oxygen
+ suit_store = /obj/item/tank/internals/emergency_oxygen
internals_slot = slot_s_store
backpack_contents = list(
/obj/item/flashlight/seclite=1,\
diff --git a/code/game/jobs/job_exp.dm b/code/game/jobs/job_exp.dm
index 54b5201baa0..0e281606124 100644
--- a/code/game/jobs/job_exp.dm
+++ b/code/game/jobs/job_exp.dm
@@ -11,30 +11,30 @@ GLOBAL_LIST_INIT(role_playtime_requirements, list(
ROLE_DRONE = 10, // High, because they're like mini engineering cyborgs that can ignore the AI, ventcrawl, and respawn themselves
// SOLO ANTAGS
- ROLE_TRAITOR = 3,
- ROLE_CHANGELING = 3,
- ROLE_WIZARD = 3,
- ROLE_VAMPIRE = 3,
- ROLE_BLOB = 3,
+ ROLE_TRAITOR = 5,
+ ROLE_CHANGELING = 5,
+ ROLE_WIZARD = 20,
+ ROLE_VAMPIRE = 5,
+ ROLE_BLOB = 20,
ROLE_REVENANT = 3,
ROLE_BORER = 3,
- ROLE_NINJA = 3,
- ROLE_MORPH = 3,
- ROLE_DEMON = 3,
+ ROLE_NINJA = 20,
+ ROLE_MORPH = 5,
+ ROLE_DEMON = 5,
// DUO ANTAGS
- ROLE_GUARDIAN = 5,
+ ROLE_GUARDIAN = 20,
ROLE_GSPIDER = 5,
// TEAM ANTAGS
// Higher numbers here, because they require more experience to be played correctly
- ROLE_SHADOWLING = 10,
+ ROLE_SHADOWLING = 20,
ROLE_REV = 10,
- ROLE_OPERATIVE = 10,
- ROLE_CULTIST = 10,
+ ROLE_OPERATIVE = 20,
+ ROLE_CULTIST = 20,
ROLE_RAIDER = 10,
ROLE_ALIEN = 10,
- ROLE_ABDUCTOR = 10,
+ ROLE_ABDUCTOR = 20,
))
// Client Verbs
diff --git a/code/game/machinery/Beacon.dm b/code/game/machinery/Beacon.dm
index d3b2114f801..1f626f0656b 100644
--- a/code/game/machinery/Beacon.dm
+++ b/code/game/machinery/Beacon.dm
@@ -40,7 +40,7 @@
return ..()
/obj/machinery/bluespace_beacon/hide(var/intact)
- invisibility = intact ? 101 : 0
+ invisibility = intact ? INVISIBILITY_MAXIMUM : 0
update_icon()
// update the icon_state
diff --git a/code/game/machinery/Freezer.dm b/code/game/machinery/Freezer.dm
deleted file mode 100644
index 66b970e3806..00000000000
--- a/code/game/machinery/Freezer.dm
+++ /dev/null
@@ -1,330 +0,0 @@
-/obj/machinery/atmospherics/unary/cold_sink/freezer
- name = "freezer"
- icon = 'icons/obj/cryogenic2.dmi'
- icon_state = "freezer"
- density = 1
- var/min_temperature = 0
- anchored = 1.0
- use_power = IDLE_POWER_USE
- active_power_usage = 5000 //cooling down massive amounts of air's not cheap. This is still very low considering everything
- power_channel = EQUIP
- current_heat_capacity = 1000
- layer = 3
- plane = GAME_PLANE
- max_integrity = 300
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 100, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 80, "acid" = 30)
-
-/obj/machinery/atmospherics/unary/cold_sink/freezer/New()
- ..()
- initialize_directions = dir
- component_parts = list()
- component_parts += new /obj/item/circuitboard/thermomachine(null)
- component_parts += new /obj/item/stock_parts/matter_bin(null)
- component_parts += new /obj/item/stock_parts/matter_bin(null)
- component_parts += new /obj/item/stock_parts/micro_laser(null)
- component_parts += new /obj/item/stock_parts/micro_laser(null)
- component_parts += new /obj/item/stack/sheet/glass(null)
- component_parts += new /obj/item/stack/cable_coil(null, 1)
- RefreshParts()
-
-/obj/machinery/atmospherics/unary/cold_sink/freezer/upgraded/New()
- ..()
- component_parts = list()
- component_parts += new /obj/item/circuitboard/thermomachine(null)
- component_parts += new /obj/item/stock_parts/matter_bin/super(null)
- component_parts += new /obj/item/stock_parts/matter_bin/super(null)
- component_parts += new /obj/item/stock_parts/micro_laser/ultra(null)
- component_parts += new /obj/item/stock_parts/micro_laser/ultra(null)
- component_parts += new /obj/item/stack/sheet/glass(null)
- component_parts += new /obj/item/stack/cable_coil(null, 1)
- RefreshParts()
-
-/obj/machinery/atmospherics/unary/cold_sink/freezer/RefreshParts()
- var/H
- var/T
- for(var/obj/item/stock_parts/matter_bin/M in component_parts)
- H += M.rating
- for(var/obj/item/stock_parts/micro_laser/M in component_parts)
- T += M.rating
- min_temperature = max(0,T0C - (170 + (T*15)))
- current_heat_capacity = 1000 * ((H - 1) ** 2)
-
-/obj/machinery/atmospherics/unary/cold_sink/freezer/on_construction()
- ..(dir,dir)
-
-/obj/machinery/atmospherics/unary/cold_sink/freezer/process()
- return // need to overwrite the parent or it returns PROCESS_KILL and it stops processing/using power
-
-/obj/machinery/atmospherics/unary/cold_sink/freezer/attackby(obj/item/I, mob/user, params)
- if(exchange_parts(user, I))
- return
- return ..()
-
-/obj/machinery/atmospherics/unary/cold_sink/freezer/crowbar_act(mob/user, obj/item/I)
- if(default_deconstruction_crowbar(user, I))
- return TRUE
-
-/obj/machinery/atmospherics/unary/cold_sink/freezer/screwdriver_act(mob/user, obj/item/I)
- if(default_deconstruction_screwdriver(user, "freezer-o", "freezer", I))
- on = FALSE
- use_power = IDLE_POWER_USE
- update_icon()
- return TRUE
-
-/obj/machinery/atmospherics/unary/cold_sink/freezer/wrench_act(mob/user, obj/item/I)
- . = TRUE
- if(!I.use_tool(src, user, 0, volume = I.tool_volume))
- return
- if(!panel_open)
- to_chat(user, "Open the maintenance panel first.")
- return
- var/list/choices = list("West" = WEST, "East" = EAST, "South" = SOUTH, "North" = NORTH)
- var/selected = input(user,"Select a direction for the connector.", "Connector Direction") in choices
- dir = choices[selected]
- var/node_connect = dir
- initialize_directions = dir
- for(var/obj/machinery/atmospherics/target in get_step(src,node_connect))
- if(target.initialize_directions & get_dir(target,src))
- node = target
- break
- build_network()
- update_icon()
-
-/obj/machinery/atmospherics/unary/cold_sink/freezer/update_icon()
- if(panel_open)
- icon_state = "freezer-o"
- else if(src.on)
- icon_state = "freezer_1"
- else
- icon_state = "freezer"
- return
-
-/obj/machinery/atmospherics/unary/cold_sink/freezer/attack_ai(mob/user as mob)
- attack_hand(user)
-
-/obj/machinery/atmospherics/unary/cold_sink/freezer/attack_ghost(mob/user as mob)
- attack_hand(user)
-
-/obj/machinery/atmospherics/unary/cold_sink/freezer/attack_hand(mob/user as mob)
- if(panel_open)
- to_chat(user, "Close the maintenance panel first.")
- return
-
- ui_interact(user)
-
-/obj/machinery/atmospherics/unary/cold_sink/freezer/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
- if(!ui)
- ui = new(user, src, ui_key, "GasFreezer", "Gas Cooling System", 540, 200)
- ui.open()
-
-/obj/machinery/atmospherics/unary/cold_sink/freezer/ui_data(mob/user)
- var/list/data = list()
- data["on"] = on
- data["pressure"] = round(air_contents.return_pressure())
- data["temperature"] = round(air_contents.temperature)
- data["temperatureCelsius"] = round(air_contents.temperature - T0C, 1)
- if(air_contents.total_moles() == 0 && air_contents.temperature == 0)
- data["temperatureCelsius"] = 0
- data["min"] = round(min_temperature)
- data["max"] = round(T20C)
- data["target"] = round(current_temperature)
- data["targetCelsius"] = round(current_temperature - T0C, 1)
- return data
-
-/obj/machinery/atmospherics/unary/cold_sink/freezer/ui_act(action, params)
- if(..())
- return
- add_fingerprint(usr)
- . = TRUE
-
- switch(action)
- if("power")
- on = !on
- if(on)
- use_power = ACTIVE_POWER_USE
- else
- use_power = IDLE_POWER_USE
- update_icon()
- if("minimum")
- current_temperature = min_temperature
- if("maximum")
- current_temperature = T20C
- if("temp")
- var/amount = params["temp"]
- amount = text2num(amount)
- current_temperature = clamp(amount, T20C, min_temperature)
-
-/obj/machinery/atmospherics/unary/cold_sink/freezer/power_change()
- ..()
- if(stat & NOPOWER)
- on = 0
- use_power = IDLE_POWER_USE
- update_icon()
-
-/obj/machinery/atmospherics/unary/heat_reservoir/heater/
- name = "heater"
- icon = 'icons/obj/cryogenic2.dmi'
- icon_state = "heater"
- density = 1
- var/max_temperature = 0
- anchored = 1.0
- layer = 3
- current_heat_capacity = 1000
- active_power_usage = 5000
- power_channel = EQUIP
- max_integrity = 300
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 100, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 80, "acid" = 30)
-
-/obj/machinery/atmospherics/unary/heat_reservoir/heater/New()
- ..()
- initialize_directions = dir
- var/obj/item/circuitboard/thermomachine/H = new /obj/item/circuitboard/thermomachine(null)
- H.build_path = /obj/machinery/atmospherics/unary/heat_reservoir/heater
- H.name = "circuit board (Heater)"
- component_parts = list()
- component_parts += H
- component_parts += new /obj/item/stock_parts/matter_bin(src)
- component_parts += new /obj/item/stock_parts/matter_bin(src)
- component_parts += new /obj/item/stock_parts/micro_laser(src)
- component_parts += new /obj/item/stock_parts/micro_laser(src)
- component_parts += new /obj/item/stack/sheet/glass(src)
- component_parts += new /obj/item/stack/cable_coil(src, 1)
- RefreshParts()
-
-/obj/machinery/atmospherics/unary/heat_reservoir/heater/upgraded/New()
- ..()
- var/obj/item/circuitboard/thermomachine/H = new /obj/item/circuitboard/thermomachine(null)
- H.build_path = /obj/machinery/atmospherics/unary/heat_reservoir/heater
- H.name = "circuit board (Heater)"
- component_parts = list()
- component_parts += H
- component_parts += new /obj/item/stock_parts/matter_bin/super(src)
- component_parts += new /obj/item/stock_parts/matter_bin/super(src)
- component_parts += new /obj/item/stock_parts/micro_laser/ultra(src)
- component_parts += new /obj/item/stock_parts/micro_laser/ultra(src)
- component_parts += new /obj/item/stack/sheet/glass(src)
- component_parts += new /obj/item/stack/cable_coil(src, 1)
- RefreshParts()
-
-/obj/machinery/atmospherics/unary/heat_reservoir/heater/on_construction()
- ..(dir,dir)
-
-/obj/machinery/atmospherics/unary/heat_reservoir/heater/process()
- return // need to override the parent or it stops processing, meaning it stops using power.
-
-/obj/machinery/atmospherics/unary/heat_reservoir/heater/RefreshParts()
- var/H
- var/T
- for(var/obj/item/stock_parts/matter_bin/M in component_parts)
- H += M.rating
- for(var/obj/item/stock_parts/micro_laser/M in component_parts)
- T += M.rating
- max_temperature = T20C + (140 * T)
- current_heat_capacity = 1000 * ((H - 1) ** 2)
-
-/obj/machinery/atmospherics/unary/heat_reservoir/heater/attackby(obj/item/I, mob/user, params)
- if(exchange_parts(user, I))
- return
- return ..()
-
-/obj/machinery/atmospherics/unary/heat_reservoir/heater/crowbar_act(mob/user, obj/item/I)
- if(default_deconstruction_crowbar(user, I))
- return TRUE
-
-/obj/machinery/atmospherics/unary/heat_reservoir/heater/screwdriver_act(mob/user, obj/item/I)
- if(default_deconstruction_screwdriver(user, "heater-o", "heater", I))
- on = 0
- use_power = IDLE_POWER_USE
- update_icon()
- return TRUE
-
-/obj/machinery/atmospherics/unary/heat_reservoir/heater/wrench_act(mob/user, obj/item/I)
- . = TRUE
- if(!I.use_tool(src, user, 0, volume = I.tool_volume))
- return
- if(!panel_open)
- to_chat(user, "Open the maintenance panel first.")
- return
- var/list/choices = list("West" = WEST, "East" = EAST, "South" = SOUTH, "North" = NORTH)
- var/selected = input(user,"Select a direction for the connector.", "Connector Direction") in choices
- dir = choices[selected]
- var/node_connect = dir
- initialize_directions = dir
- for(var/obj/machinery/atmospherics/target in get_step(src,node_connect))
- if(target.initialize_directions & get_dir(target,src))
- node = target
- break
- build_network()
- update_icon()
-
-/obj/machinery/atmospherics/unary/heat_reservoir/heater/update_icon()
- if(panel_open)
- icon_state = "heater-o"
- else if(src.on)
- icon_state = "heater_1"
- else
- icon_state = "heater"
- return
-
-/obj/machinery/atmospherics/unary/heat_reservoir/heater/attack_ai(mob/user as mob)
- attack_hand(user)
-
-/obj/machinery/atmospherics/unary/heat_reservoir/heater/attack_ghost(mob/user as mob)
- src.attack_hand(user)
-
-/obj/machinery/atmospherics/unary/heat_reservoir/heater/attack_hand(mob/user as mob)
- if(panel_open)
- to_chat(user, "Close the maintenance panel first.")
- return
- ui_interact(user)
-
-/obj/machinery/atmospherics/unary/heat_reservoir/heater/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
- ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
- if(!ui)
- ui = new(user, src, ui_key, "GasFreezer", "Gas Heating System", 540, 200)
- ui.open()
-
-/obj/machinery/atmospherics/unary/heat_reservoir/heater/ui_data(mob/user)
- var/list/data = list()
- data["on"] = on
- data["pressure"] = round(air_contents.return_pressure())
- data["temperature"] = round(air_contents.temperature)
- data["temperatureCelsius"] = round(air_contents.temperature - T0C, 1)
- if(air_contents.total_moles() == 0 && air_contents.temperature == 0)
- data["temperatureCelsius"] = 0
- data["min"] = round(T20C)
- data["max"] = round(T20C + max_temperature)
- data["target"] = round(current_temperature)
- data["targetCelsius"] = round(current_temperature - T0C, 1)
- return data
-
-/obj/machinery/atmospherics/unary/heat_reservoir/heater/ui_act(action, params)
- if(..())
- return
- add_fingerprint(usr)
- . = TRUE
-
- switch(action)
- if("power")
- on = !on
- if(on)
- use_power = ACTIVE_POWER_USE
- else
- use_power = IDLE_POWER_USE
- update_icon()
- if("minimum")
- current_temperature = T20C
- if("maximum")
- current_temperature = max_temperature + T20C
- if("temp")
- var/amount = params["temp"]
- amount = text2num(amount)
- current_temperature = clamp(amount, T20C, T20C + max_temperature)
-
-/obj/machinery/atmospherics/unary/heat_reservoir/heater/power_change()
- ..()
- if(stat & NOPOWER)
- on = 0
- use_power = IDLE_POWER_USE
- update_icon()
diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm
index 5231d44d4c7..c3c901da845 100644
--- a/code/game/machinery/alarm.dm
+++ b/code/game/machinery/alarm.dm
@@ -120,6 +120,12 @@
/obj/machinery/alarm/monitor
report_danger_level = FALSE
+/obj/machinery/alarm/engine
+ name = "engine air alarm"
+ locked = FALSE
+ req_access = null
+ req_one_access = list(ACCESS_ATMOSPHERICS, ACCESS_ENGINE)
+
/obj/machinery/alarm/syndicate //general syndicate access
report_danger_level = FALSE
remote_control = FALSE
@@ -418,110 +424,109 @@
if(AALARM_MODE_SCRUBBING)
for(var/device_id in alarm_area.air_scrub_names)
send_signal(device_id, list(
- "power"= 1,
- "o2_scrub" = (preset==AALARM_PRESET_VOX),
- "n2_scrub" = 0,
- "co2_scrub"= 1,
- "scrubbing"= 1,
- "widenet"= 0,
+ "power" = TRUE,
+ "o2_scrub" = (preset == AALARM_PRESET_VOX),
+ "n2_scrub" = FALSE,
+ "co2_scrub" = TRUE,
+ "tox_scrub" = FALSE,
+ "n2o_scrub" = FALSE,
+ "scrubbing" = TRUE,
+ "widenet" = FALSE,
))
for(var/device_id in alarm_area.air_vent_names)
send_signal(device_id, list(
- "power"= 1,
- "checks"= 1,
- "set_external_pressure"= ONE_ATMOSPHERE
+ "power" = TRUE,
+ "checks" = TRUE,
+ "set_external_pressure" = ONE_ATMOSPHERE
))
if(AALARM_MODE_CONTAMINATED)
for(var/device_id in alarm_area.air_scrub_names)
send_signal(device_id, list(
- "power"= 1,
- "co2_scrub"= 1,
- "tox_scrub"= 1,
- "n2o_scrub"= 1,
- "scrubbing"= 1,
- "widenet"= 1,
+ "power" = TRUE,
+ "co2_scrub" = TRUE,
+ "tox_scrub" = TRUE,
+ "n2o_scrub" = TRUE,
+ "scrubbing" = TRUE,
+ "widenet" = TRUE,
))
for(var/device_id in alarm_area.air_vent_names)
send_signal(device_id, list(
- "power"= 1,
- "checks"= 1,
- "set_external_pressure"= ONE_ATMOSPHERE
+ "power" = TRUE,
+ "checks" = TRUE,
+ "set_external_pressure" = ONE_ATMOSPHERE
))
if(AALARM_MODE_VENTING)
for(var/device_id in alarm_area.air_scrub_names)
send_signal(device_id, list(
- "power"= 1,
- "widenet"= 0,
- "scrubbing"= 0
+ "power" = TRUE,
+ "widenet" = FALSE,
+ "scrubbing" = FALSE
))
for(var/device_id in alarm_area.air_vent_names)
send_signal(device_id, list(
- "power"= 1,
- "checks"= 1,
- "set_external_pressure" = ONE_ATMOSPHERE*2
+ "power" = TRUE,
+ "checks" = TRUE,
+ "set_external_pressure" = ONE_ATMOSPHERE * 2
))
if(AALARM_MODE_REFILL)
for(var/device_id in alarm_area.air_scrub_names)
send_signal(device_id, list(
- "power"= 1,
- "co2_scrub"= 1,
- "tox_scrub"= 0,
- "n2o_scrub"= 0,
- "scrubbing"= 1,
- "widenet"= 0,
+ "power" = TRUE,
+ "co2_scrub" = TRUE,
+ "tox_scrub" = FALSE,
+ "n2o_scrub" = FALSE,
+ "scrubbing" = TRUE,
+ "widenet" = FALSE,
))
for(var/device_id in alarm_area.air_vent_names)
send_signal(device_id, list(
- "power"= 1,
- "checks"= 1,
- "set_external_pressure" = ONE_ATMOSPHERE*3
+ "power" = TRUE,
+ "checks" = TRUE,
+ "set_external_pressure" = ONE_ATMOSPHERE * 3
))
- if(
- AALARM_MODE_PANIC,
- AALARM_MODE_REPLACEMENT
- )
+ if(AALARM_MODE_PANIC,
+ AALARM_MODE_REPLACEMENT)
for(var/device_id in alarm_area.air_scrub_names)
send_signal(device_id, list(
- "power"= 1,
- "widenet"= 1,
- "scrubbing"= 0
+ "power" = TRUE,
+ "widenet" = TRUE,
+ "scrubbing" = FALSE
))
for(var/device_id in alarm_area.air_vent_names)
send_signal(device_id, list(
- "power"= 0
+ "power" = FALSE
))
- if(
- AALARM_MODE_SIPHON
- )
+ if(AALARM_MODE_SIPHON)
for(var/device_id in alarm_area.air_scrub_names)
send_signal(device_id, list(
- "power"= 1,
- "widenet"= 0,
- "scrubbing"= 0
+ "power" = TRUE,
+ "widenet" = FALSE,
+ "scrubbing" = FALSE
))
for(var/device_id in alarm_area.air_vent_names)
send_signal(device_id, list(
- "power"= 0
+ "power" = FALSE
))
if(AALARM_MODE_OFF)
for(var/device_id in alarm_area.air_scrub_names)
send_signal(device_id, list(
- "power"= 0
+ "power" = FALSE
))
for(var/device_id in alarm_area.air_vent_names)
send_signal(device_id, list(
- "power"= 0
+ "power" = FALSE
))
if(AALARM_MODE_FLOOD)
for(var/device_id in alarm_area.air_scrub_names)
send_signal(device_id, list(
- "power"=0
+ "power" = FALSE
))
for(var/device_id in alarm_area.air_vent_names)
send_signal(device_id, list(
- "power"= 1,
- "checks"= 0,
+ "power" = TRUE,
+ "checks" = 2,
+ "set_internal_pressure" = FALSE
))
/obj/machinery/alarm/proc/apply_danger_level()
diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm
index e174bd5fca8..1d4b59acdf9 100644
--- a/code/game/machinery/camera/camera.dm
+++ b/code/game/machinery/camera/camera.dm
@@ -104,12 +104,6 @@
to_chat(M, "The screen bursts into static.")
..()
-/obj/machinery/camera/tesla_act(power)//EMP proof upgrade also makes it tesla immune
- if(isEmpProof())
- return
- ..()
- qdel(src)//to prevent bomb testing camera from exploding over and over forever
-
/obj/machinery/camera/ex_act(severity)
if(invuln)
return
diff --git a/code/game/machinery/computer/HolodeckControl.dm b/code/game/machinery/computer/HolodeckControl.dm
index 3bdcf8766af..4141af84ca1 100644
--- a/code/game/machinery/computer/HolodeckControl.dm
+++ b/code/game/machinery/computer/HolodeckControl.dm
@@ -332,10 +332,9 @@
icon_state = "grass1"
floor_tile = /obj/item/stack/tile/grass
-/turf/simulated/floor/holofloor/grass/New()
- ..()
- spawn(1)
- update_icon()
+/turf/simulated/floor/holofloor/grass/Initialize(mapload)
+ . = ..()
+ update_icon()
/turf/simulated/floor/holofloor/grass/update_icon()
..()
diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm
index 01e8a26cb31..eb8c996d9b0 100644
--- a/code/game/machinery/computer/card.dm
+++ b/code/game/machinery/computer/card.dm
@@ -97,12 +97,12 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
return formatted
-/obj/machinery/computer/card/proc/format_job_slots()
+/obj/machinery/computer/card/proc/format_job_slots(check_department, is_admin)
var/list/formatted = list()
for(var/datum/job/job in SSjobs.occupations)
if(job_blacklisted_full(job))
continue
- if(!job_in_department(job))
+ if(check_department && !job_in_department(job))
continue
formatted.Add(list(list(
"title" = job.title,
@@ -110,7 +110,8 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
"total_positions" = job.total_positions,
"can_open" = can_open_job(job),
"can_close" = can_close_job(job),
- "can_prioritize" = can_prioritize_job(job)
+ "can_prioritize" = can_prioritize_job(job, is_admin),
+ "is_priority" = (job in SSjobs.prioritized_jobs)
)))
return formatted
@@ -212,11 +213,11 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
return TRUE
return FALSE
-/obj/machinery/computer/card/proc/can_prioritize_job(datum/job/job)
+/obj/machinery/computer/card/proc/can_prioritize_job(datum/job/job, is_admin)
if(job)
if(job_blacklisted_full(job))
return FALSE
- if(!job_in_department(job, FALSE))
+ if(!is_admin && !job_in_department(job, FALSE))
return FALSE
if(job in SSjobs.prioritized_jobs)
return TRUE // because this also lets us un-prioritize the job
@@ -319,8 +320,10 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
data["scan_rank"] = scan ? scan.rank : FALSE
data["authenticated"] = is_authenticated(user) ? TRUE : FALSE
+ data["auth_or_ghost"] = data["authenticated"] || isobserver(user)
data["target_dept"] = target_dept
data["iscentcom"] = is_centcom() ? TRUE : FALSE
+ data["isadmin"] = user.can_admin_interact()
switch(mode)
if(IDCOMPUTER_SCREEN_TRANSFER) // JOB TRANSFER
@@ -348,7 +351,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
data["all_centcom_skins"] = is_centcom() ? format_card_skins(get_centcom_card_skins()) : FALSE
if(IDCOMPUTER_SCREEN_SLOTS) // JOB SLOTS
- data["job_slots"] = format_job_slots()
+ data["job_slots"] = format_job_slots(!isobserver(user), data["isadmin"])
data["priority_jobs"] = list()
for(var/datum/job/a in SSjobs.prioritized_jobs)
data["priority_jobs"] += a.title
@@ -690,17 +693,15 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
var/datum/job/j = SSjobs.GetJob(priority_target)
if(!j)
return FALSE
- if(!job_in_department(j))
+ if(!can_prioritize_job(j, usr.can_admin_interact()))
return FALSE
var/priority = TRUE
if(j in SSjobs.prioritized_jobs)
SSjobs.prioritized_jobs -= j
priority = FALSE
- else if(SSjobs.prioritized_jobs.len < 3)
- SSjobs.prioritized_jobs += j
else
- return FALSE
- log_game("[key_name(usr)] ([scan.assignment]) [priority ? "prioritized" : "unprioritized"] the job \"[j.title]\".")
+ SSjobs.prioritized_jobs += j
+ log_game("[key_name(usr)] ([scan ? scan.assignment : "ADMIN"]) [priority ? "prioritized" : "unprioritized"] the job \"[j.title]\".")
playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
return
diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm
index 2cceb39b778..d250cc60319 100644
--- a/code/game/machinery/computer/communications.dm
+++ b/code/game/machinery/computer/communications.dm
@@ -3,8 +3,9 @@
#define COMM_SCREEN_MESSAGES 3
#define COMM_AUTHENTICATION_NONE 0
-#define COMM_AUTHENTICATION_MIN 1
-#define COMM_AUTHENTICATION_MAX 2
+#define COMM_AUTHENTICATION_HEAD 1
+#define COMM_AUTHENTICATION_CAPT 2
+#define COMM_AUTHENTICATION_AGHOST 3
#define COMM_MSGLEN_MINIMUM 6
#define COMM_CCMSGLEN_MINIMUM 20
@@ -45,16 +46,15 @@
crew_announcement.newscast = 0
/obj/machinery/computer/communications/proc/is_authenticated(var/mob/user, var/message = 1)
- if(authenticated == COMM_AUTHENTICATION_MAX)
- return COMM_AUTHENTICATION_MAX
- else if(user.can_admin_interact())
- return COMM_AUTHENTICATION_MAX
- else if(authenticated)
- return COMM_AUTHENTICATION_MIN
- else
- if(message)
- to_chat(user, "Access denied.")
- return COMM_AUTHENTICATION_NONE
+ if(user.can_admin_interact())
+ return COMM_AUTHENTICATION_AGHOST
+ if(authenticated == COMM_AUTHENTICATION_CAPT)
+ return COMM_AUTHENTICATION_CAPT
+ if(authenticated)
+ return COMM_AUTHENTICATION_HEAD
+ if(message)
+ to_chat(user, "Access denied.")
+ return COMM_AUTHENTICATION_NONE
/obj/machinery/computer/communications/proc/change_security_level(var/new_level)
tmp_alertlevel = new_level
@@ -80,7 +80,7 @@
if(action == "auth")
if(!ishuman(usr))
- to_chat(usr, "Access denied.")
+ to_chat(usr, "Access denied, no humanoid lifesign detected.")
return FALSE
// Logout function.
if(authenticated != COMM_AUTHENTICATION_NONE)
@@ -91,15 +91,15 @@
// Login function.
var/list/access = usr.get_access()
if(allowed(usr))
- authenticated = COMM_AUTHENTICATION_MIN
+ authenticated = COMM_AUTHENTICATION_HEAD
if(ACCESS_CAPTAIN in access)
- authenticated = COMM_AUTHENTICATION_MAX
+ authenticated = COMM_AUTHENTICATION_CAPT
var/mob/living/carbon/human/H = usr
var/obj/item/card/id = H.get_idcard(TRUE)
if(istype(id))
crew_announcement.announcer = GetNameAndAssignmentFromId(id)
if(authenticated == COMM_AUTHENTICATION_NONE)
- to_chat(usr, "You need to wear your ID.")
+ to_chat(usr, "You need to wear a command or Captain-level ID.")
return
// All functions below this point require authentication.
@@ -133,12 +133,12 @@
to_chat(usr, "You need to wear your ID.")
if("announce")
- if(is_authenticated(usr) == COMM_AUTHENTICATION_MAX)
+ if(is_authenticated(usr) >= COMM_AUTHENTICATION_CAPT)
if(message_cooldown > world.time)
to_chat(usr, "Please allow at least one minute to pass between announcements.")
return
var/input = input(usr, "Please write a message to announce to the station crew.", "Priority Announcement")
- if(!input || message_cooldown > world.time || ..() || !(is_authenticated(usr) == COMM_AUTHENTICATION_MAX))
+ if(!input || message_cooldown > world.time || ..() || !(is_authenticated(usr) >= COMM_AUTHENTICATION_CAPT))
return
if(length(input) < COMM_MSGLEN_MINIMUM)
to_chat(usr, "Message '[input]' is too short. [COMM_MSGLEN_MINIMUM] character minimum.")
@@ -217,12 +217,12 @@
setMenuState(usr, COMM_SCREEN_STAT)
if("nukerequest")
- if(is_authenticated(usr) == COMM_AUTHENTICATION_MAX)
+ if(is_authenticated(usr) >= COMM_AUTHENTICATION_CAPT)
if(centcomm_message_cooldown > world.time)
to_chat(usr, "Arrays recycling. Please stand by.")
return
var/input = stripped_input(usr, "Please enter the reason for requesting the nuclear self-destruct codes. Misuse of the nuclear request system will not be tolerated under any circumstances. Transmission does not guarantee a response.", "Self Destruct Code Request.","")
- if(!input || ..() || !(is_authenticated(usr) == COMM_AUTHENTICATION_MAX))
+ if(!input || ..() || !(is_authenticated(usr) >= COMM_AUTHENTICATION_CAPT))
return
if(length(input) < COMM_CCMSGLEN_MINIMUM)
to_chat(usr, "Message '[input]' is too short. [COMM_CCMSGLEN_MINIMUM] character minimum.")
@@ -235,12 +235,12 @@
setMenuState(usr, COMM_SCREEN_MAIN)
if("MessageCentcomm")
- if(is_authenticated(usr) == COMM_AUTHENTICATION_MAX)
+ if(is_authenticated(usr) >= COMM_AUTHENTICATION_CAPT)
if(centcomm_message_cooldown > world.time)
to_chat(usr, "Arrays recycling. Please stand by.")
return
var/input = stripped_input(usr, "Please choose a message to transmit to Centcomm via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response.", "To abort, send an empty message.", "")
- if(!input || ..() || !(is_authenticated(usr) == COMM_AUTHENTICATION_MAX))
+ if(!input || ..() || !(is_authenticated(usr) >= COMM_AUTHENTICATION_CAPT))
return
if(length(input) < COMM_CCMSGLEN_MINIMUM)
to_chat(usr, "Message '[input]' is too short. [COMM_CCMSGLEN_MINIMUM] character minimum.")
@@ -254,12 +254,12 @@
// OMG SYNDICATE ...LETTERHEAD
if("MessageSyndicate")
- if((is_authenticated(usr) == COMM_AUTHENTICATION_MAX) && (src.emagged))
+ if((is_authenticated(usr) >= COMM_AUTHENTICATION_CAPT) && (src.emagged))
if(centcomm_message_cooldown > world.time)
to_chat(usr, "Arrays recycling. Please stand by.")
return
var/input = stripped_input(usr, "Please choose a message to transmit to \[ABNORMAL ROUTING CORDINATES\] via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response.", "To abort, send an empty message.", "")
- if(!input || ..() || !(is_authenticated(usr) == COMM_AUTHENTICATION_MAX))
+ if(!input || ..() || !(is_authenticated(usr) >= COMM_AUTHENTICATION_CAPT))
return
if(length(input) < COMM_CCMSGLEN_MINIMUM)
to_chat(usr, "Message '[input]' is too short. [COMM_CCMSGLEN_MINIMUM] character minimum.")
@@ -320,10 +320,12 @@
/obj/machinery/computer/communications/ui_data(mob/user)
var/list/data = list()
data["is_ai"] = isAI(user) || isrobot(user)
+ data["noauthbutton"] = !ishuman(user)
data["menu_state"] = data["is_ai"] ? ai_menu_state : menu_state
data["emagged"] = emagged
data["authenticated"] = is_authenticated(user, 0)
- data["authmax"] = data["authenticated"] == COMM_AUTHENTICATION_MAX ? TRUE : FALSE
+ data["authhead"] = data["authenticated"] >= COMM_AUTHENTICATION_HEAD && (data["authenticated"] == COMM_AUTHENTICATION_AGHOST || !isobserver(user))
+ data["authcapt"] = data["authenticated"] >= COMM_AUTHENTICATION_CAPT && (data["authenticated"] == COMM_AUTHENTICATION_AGHOST || !isobserver(user))
data["stat_display"] = list(
"type" = display_type,
diff --git a/code/game/machinery/computer/sm_monitor.dm b/code/game/machinery/computer/sm_monitor.dm
index 01cd72549f3..2a63d23e82a 100644
--- a/code/game/machinery/computer/sm_monitor.dm
+++ b/code/game/machinery/computer/sm_monitor.dm
@@ -10,7 +10,7 @@
/// Last status of the active supermatter for caching purposes
var/last_status
/// Reference to the active shard
- var/obj/machinery/power/supermatter_shard/active
+ var/obj/machinery/power/supermatter_crystal/active
/obj/machinery/computer/sm_monitor/Destroy()
active = null
@@ -28,7 +28,7 @@
/obj/machinery/computer/sm_monitor/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
- ui = new(user, src, ui_key, "SupermatterMonitor", name, 600, 325, master_ui, state)
+ ui = new(user, src, ui_key, "SupermatterMonitor", name, 600, 350, master_ui, state)
ui.open()
/obj/machinery/computer/sm_monitor/ui_data(mob/user)
@@ -52,27 +52,27 @@
data["SM_ambienttemp"] = air.temperature
data["SM_ambientpressure"] = air.return_pressure()
//data["SM_EPR"] = round((air.total_moles / air.group_multiplier) / 23.1, 0.01)
- var/other_moles = air.total_trace_moles()
+ var/list/gasdata = list()
var/TM = air.total_moles()
if(TM)
- data["SM_gas_O2"] = round(100*air.oxygen/TM, 0.01)
- data["SM_gas_CO2"] = round(100*air.carbon_dioxide/TM, 0.01)
- data["SM_gas_N2"] = round(100*air.nitrogen/TM, 0.01)
- data["SM_gas_PL"] = round(100*air.toxins/TM, 0.01)
- if(other_moles)
- data["SM_gas_OTHER"] = round(100 * other_moles / TM, 0.01)
- else
- data["SM_gas_OTHER"] = 0
+ gasdata.Add(list(list("name"= "Oxygen", "amount" = round(100 * air.oxygen / TM, 0.01))))
+ gasdata.Add(list(list("name"= "Carbon Dioxide", "amount" = round(100 * air.carbon_dioxide / TM, 0.01))))
+ gasdata.Add(list(list("name"= "Nitrogen", "amount" = round(100 * air.nitrogen / TM, 0.01))))
+ gasdata.Add(list(list("name"= "Plasma", "amount" = round(100 * air.toxins / TM, 0.01))))
+ gasdata.Add(list(list("name"= "Nitrous Oxide", "amount" = round(100 * air.sleeping_agent / TM, 0.01))))
+ gasdata.Add(list(list("name"= "Agent B", "amount" = round(100 * air.agent_b / TM, 0.01))))
else
- data["SM_gas_O2"] = 0
- data["SM_gas_CO2"] = 0
- data["SM_gas_N2"] = 0
- data["SM_gas_PH"] = 0
- data["SM_gas_OTHER"] = 0
+ gasdata.Add(list(list("name"= "Oxygen", "amount" = 0)))
+ gasdata.Add(list(list("name"= "Carbon Dioxide", "amount" = 0)))
+ gasdata.Add(list(list("name"= "Nitrogen", "amount" = 0)))
+ gasdata.Add(list(list("name"= "Plasma", "amount" = 0)))
+ gasdata.Add(list(list("name"= "Nitrous Oxide", "amount" = 0)))
+ gasdata.Add(list(list("name"= "Agent B", "amount" = 0)))
+ data["gases"] = gasdata
else
var/list/SMS = list()
for(var/I in supermatters)
- var/obj/machinery/power/supermatter_shard/S = I
+ var/obj/machinery/power/supermatter_crystal/S = I
var/area/A = get_area(S)
if(!A)
continue
@@ -80,7 +80,7 @@
SMS.Add(list(list(
"area_name" = A.name,
"integrity" = S.get_integrity(),
- "uid" = S.UID()
+ "supermatter_id" = S.supermatter_id
)))
data["active"] = FALSE
@@ -98,7 +98,7 @@
var/turf/T = get_turf(ui_host()) // Get the UI host incase this ever turned into a supermatter monitoring module for AIs to use or something
if(!T)
return
- for(var/obj/machinery/power/supermatter_shard/S in SSair.atmos_machinery)
+ for(var/obj/machinery/power/supermatter_crystal/S in SSair.atmos_machinery)
// Delaminating, not within coverage, not on a tile.
if(!(is_station_level(S.z) || is_mining_level(S.z) || atoms_share_level(S, T) || !istype(S.loc, /turf/simulated/)))
continue
@@ -136,9 +136,9 @@
refresh()
if("view")
- var/newuid = params["view"]
- for(var/obj/machinery/power/supermatter_shard/S in supermatters)
- if(S.UID() == newuid)
+ var/newuid = text2num(params["view"])
+ for(var/obj/machinery/power/supermatter_crystal/S in supermatters)
+ if(S.supermatter_id == newuid)
active = S
break
diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm
index bea325f9d33..b90b2ed5f26 100644
--- a/code/game/machinery/constructable_frame.dm
+++ b/code/game/machinery/constructable_frame.dm
@@ -314,9 +314,8 @@ to destroy them and players will be able to make replacements.
/obj/item/stock_parts/capacitor = 6)
/obj/item/circuitboard/thermomachine
- name = "circuit board (Freezer)"
- desc = "Use screwdriver to switch between heating and cooling modes."
- build_path = /obj/machinery/atmospherics/unary/cold_sink/freezer
+ name = "Thermomachine (Machine Board)"
+ build_path = /obj/machinery/atmospherics/unary/thermomachine
board_type = "machine"
origin_tech = "programming=3;plasmatech=3"
req_components = list(
@@ -325,19 +324,6 @@ to destroy them and players will be able to make replacements.
/obj/item/stack/cable_coil = 1,
/obj/item/stack/sheet/glass = 1)
-/obj/item/circuitboard/thermomachine/attackby(obj/item/I, mob/user, params)
- if(istype(I, /obj/item/screwdriver))
- if(build_path == /obj/machinery/atmospherics/unary/cold_sink/freezer)
- build_path = /obj/machinery/atmospherics/unary/heat_reservoir/heater
- name = "circuit board (Heater)"
- to_chat(user, "You set the board to heating.")
- else
- build_path = /obj/machinery/atmospherics/unary/cold_sink/freezer
- name = "circuit board (Freezer)"
- to_chat(user, "You set the board to cooling.")
- return
- return ..()
-
/obj/item/circuitboard/recharger
name = "circuit board (Recharger)"
build_path = /obj/machinery/recharger
diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm
index af7df2af9c0..7b7544d86fe 100644
--- a/code/game/machinery/cryopod.dm
+++ b/code/game/machinery/cryopod.dm
@@ -249,7 +249,10 @@
/obj/item/clothing/gloves/color/black/krav_maga/sec,
/obj/item/spacepod_key,
/obj/item/nullrod,
- /obj/item/key
+ /obj/item/key,
+ /obj/item/door_remote,
+ /obj/item/autopsy_scanner,
+ /obj/item/holosign_creator/atmos
)
// These items will NOT be preserved
var/list/do_not_preserve_items = list (
@@ -427,28 +430,28 @@
//Make an announcement and log the person entering storage.
control_computer.frozen_crew += "[occupant.real_name]"
- var/ailist[] = list()
- for(var/mob/living/silicon/ai/A in GLOB.alive_mob_list)
+ var/list/ailist = list()
+ for(var/mob/living/silicon/ai/A in GLOB.silicon_mob_list)
ailist += A
- if(ailist.len)
+ if(length(ailist))
var/mob/living/silicon/ai/announcer = pick(ailist)
- if (announce_rank)
- announcer.say(";[occupant.real_name] ([announce_rank]) [on_store_message]")
+ if(announce_rank)
+ announcer.say(";[occupant.real_name] ([announce_rank]) [on_store_message]", ignore_languages = TRUE)
else
- announcer.say(";[occupant.real_name] [on_store_message]")
+ announcer.say(";[occupant.real_name] [on_store_message]", ignore_languages = TRUE)
else
- if (announce_rank)
+ if(announce_rank)
announce.autosay("[occupant.real_name] ([announce_rank]) [on_store_message]", "[on_store_name]")
else
announce.autosay("[occupant.real_name] [on_store_message]", "[on_store_name]")
- visible_message("\The [src] hums and hisses as it moves [occupant.real_name] into storage.")
+ visible_message("[src] hums and hisses as it moves [occupant.real_name] into storage.")
// Ghost and delete the mob.
- if(!occupant.get_ghost(1))
+ if(!occupant.get_ghost(TRUE))
if(TOO_EARLY_TO_GHOST)
- occupant.ghostize(0) // Players despawned too early may not re-enter the game
+ occupant.ghostize(FALSE) // Players despawned too early may not re-enter the game
else
- occupant.ghostize(1)
+ occupant.ghostize(TRUE)
QDEL_NULL(occupant)
name = initial(name)
diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index d670c42e5a8..3d3b1eec098 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -57,6 +57,8 @@ GLOBAL_LIST_EMPTY(airlock_overlays)
explosion_block = 1
assemblytype = /obj/structure/door_assembly
siemens_strength = 1
+ flags_2 = RAD_PROTECT_CONTENTS_2 | RAD_NO_CONTAMINATE_2
+ rad_insulation = RAD_MEDIUM_INSULATION
var/security_level = 0 //How much are wires secured
var/aiControlDisabled = AICONTROLDISABLED_OFF
var/hackProof = FALSE // if TRUE, this door can't be hacked by the AI
@@ -190,7 +192,7 @@ About the new airlock wires panel:
else
return
else if(user.hallucination > 50 && prob(10) && !operating)
- if(user.electrocute_act(50, src, 1, illusion = TRUE)) // We'll just go with a flat 50 damage, instead of doing powernet checks
+ if(user.electrocute_act(50, src, flags = SHOCK_ILLUSION)) // We'll just go with a flat 50 damage, instead of doing powernet checks
return
..(user)
diff --git a/code/game/machinery/doors/airlock_control.dm b/code/game/machinery/doors/airlock_control.dm
index 47e6e4dc85b..3820c11adf0 100644
--- a/code/game/machinery/doors/airlock_control.dm
+++ b/code/game/machinery/doors/airlock_control.dm
@@ -146,6 +146,7 @@
/obj/machinery/airlock_sensor
icon = 'icons/obj/airlock_machines.dmi'
icon_state = "airlock_sensor_off"
+ layer = ABOVE_WINDOW_LAYER
name = "airlock sensor"
anchored = 1
resistance_flags = FIRE_PROOF
@@ -228,9 +229,9 @@
icon = 'icons/obj/airlock_machines.dmi'
icon_state = "access_button_standby"
name = "access button"
+ layer = ABOVE_WINDOW_LAYER
anchored = 1
power_channel = ENVIRON
-
var/master_tag
frequency = AIRLOCK_FREQ
var/command = "cycle"
diff --git a/code/game/machinery/doors/airlock_types.dm b/code/game/machinery/doors/airlock_types.dm
index 9f99b45afa4..9b913dbf148 100644
--- a/code/game/machinery/doors/airlock_types.dm
+++ b/code/game/machinery/doors/airlock_types.dm
@@ -150,18 +150,17 @@
icon = 'icons/obj/doors/airlocks/station/uranium.dmi'
assemblytype = /obj/structure/door_assembly/door_assembly_uranium
paintable = FALSE
- var/event_step = 20
+ var/last_event = 0
-/obj/machinery/door/airlock/uranium/New()
+/obj/machinery/door/airlock/uranium/process()
+ if(world.time > last_event + 20)
+ if(prob(50))
+ radiate()
+ last_event = world.time
..()
- addtimer(CALLBACK(src, .proc/radiate), event_step)
-
/obj/machinery/door/airlock/uranium/proc/radiate()
- if(prob(50))
- for(var/mob/living/L in range (3,src))
- L.apply_effect(15,IRRADIATE,0)
- addtimer(CALLBACK(src, .proc/radiate), event_step)
+ radiation_pulse(get_turf(src), 150)
/obj/machinery/door/airlock/uranium/glass
@@ -460,23 +459,6 @@
"You hear welding.")
update_icon()
-
-//////////////////////////////////
-/*
- Shuttle Airlocks
-*/
-
-/obj/machinery/door/airlock/shuttle
- name = "shuttle airlock"
- icon = 'icons/obj/doors/airlocks/shuttle/shuttle.dmi'
- overlays_file = 'icons/obj/doors/airlocks/shuttle/overlays.dmi'
- assemblytype = /obj/structure/door_assembly/door_assembly_shuttle
- paintable = FALSE
-
-/obj/machinery/door/airlock/shuttle/glass
- opacity = 0
- glass = TRUE
-
/obj/machinery/door/airlock/abductor
name = "alien airlock"
desc = "With humanity's current technological level, it could take years to hack this advanced airlock... or maybe we should give a screwdriver a try?"
diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm
index d9568f69ac1..c1f4fd22044 100644
--- a/code/game/machinery/doors/door.dm
+++ b/code/game/machinery/doors/door.dm
@@ -383,3 +383,7 @@
/obj/machinery/door/GetExplosionBlock()
return density ? real_explosion_block : 0
+
+/obj/machinery/door/zap_act(power, zap_flags)
+ zap_flags &= ~ZAP_OBJ_DAMAGE
+ . = ..()
diff --git a/code/game/machinery/doors/shutters.dm b/code/game/machinery/doors/shutters.dm
index 457b056b7f9..c2914262d15 100644
--- a/code/game/machinery/doors/shutters.dm
+++ b/code/game/machinery/doors/shutters.dm
@@ -12,3 +12,24 @@
icon_state = "open"
density = FALSE
opacity = 0
+
+/obj/machinery/door/poddoor/shutters/radiation
+ name = "radiation shutters"
+ desc = "Lead-lined shutters with a radiation hazard symbol. Whilst this won't stop you getting irradiated, especially by a supermatter crystal, it will stop radiation travelling as far."
+ icon = 'icons/obj/doors/shutters_radiation.dmi'
+ icon_state = "closed"
+ rad_insulation = RAD_EXTREME_INSULATION
+
+/obj/machinery/door/poddoor/shutters/radiation/preopen
+ icon_state = "open"
+ density = FALSE
+ opacity = FALSE
+ rad_insulation = RAD_NO_INSULATION
+
+/obj/machinery/door/poddoor/shutters/radiation/open()
+ . = ..()
+ rad_insulation = RAD_NO_INSULATION
+
+/obj/machinery/door/poddoor/shutters/radiation/close()
+ . = ..()
+ rad_insulation = RAD_EXTREME_INSULATION
diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm
index dcb78253f35..e1a9f895ea5 100644
--- a/code/game/machinery/doors/windowdoor.dm
+++ b/code/game/machinery/doors/windowdoor.dm
@@ -16,11 +16,9 @@
var/obj/item/airlock_electronics/electronics
var/base_state = "left"
var/reinf = 0
- var/cancolor = TRUE
var/shards = 2
var/rods = 2
var/cable = 1
- var/list/debris = list()
/obj/machinery/door/window/New(loc, set_dir)
..()
@@ -29,18 +27,9 @@
if(req_access && req_access.len)
icon_state = "[icon_state]"
base_state = icon_state
- if(!color && cancolor)
- color = color_windows(src)
- for(var/i in 1 to shards)
- debris += new /obj/item/shard(src)
- if(rods)
- debris += new /obj/item/stack/rods(src, rods)
- if(cable)
- debris += new /obj/item/stack/cable_coil(src, cable)
/obj/machinery/door/window/Destroy()
density = FALSE
- QDEL_LIST(debris)
if(obj_integrity == 0)
playsound(src, "shatter", 70, 1)
QDEL_NULL(electronics)
@@ -190,12 +179,19 @@
/obj/machinery/door/window/deconstruct(disassembled = TRUE)
if(!(flags & NODECONSTRUCT) && !disassembled)
- for(var/obj/fragment in debris)
- fragment.forceMove(get_turf(src))
- transfer_fingerprints_to(fragment)
- debris -= fragment
+ for(var/obj/item/shard/debris in spawnDebris(drop_location()))
+ transfer_fingerprints_to(debris) // transfer fingerprints to shards only
qdel(src)
+/obj/machinery/door/window/proc/spawnDebris(location)
+ . = list()
+ for(var/i in 1 to shards)
+ . += new /obj/item/shard(location)
+ if(rods)
+ . += new /obj/item/stack/rods(location, rods)
+ if(cable)
+ . += new /obj/item/stack/cable_coil(location, cable)
+
/obj/machinery/door/window/narsie_act()
color = NARSIE_WINDOW_COLOUR
@@ -349,12 +345,11 @@
shards = 0
rods = 0
resistance_flags = ACID_PROOF | FIRE_PROOF
- cancolor = FALSE
var/made_glow = FALSE
-/obj/machinery/door/window/clockwork/New(loc, set_dir)
- ..()
- debris += new/obj/item/stack/tile/brass(src, 2)
+/obj/machinery/door/window/clockwork/spawnDebris(location)
+ . = ..()
+ . = new /obj/item/stack/tile/brass(location, 2)
/obj/machinery/door/window/clockwork/setDir(direct)
if(!made_glow)
diff --git a/code/game/machinery/embedded_controller/airlock_controllers.dm b/code/game/machinery/embedded_controller/airlock_controllers.dm
index 3cf506d96ba..8766864bdc1 100644
--- a/code/game/machinery/embedded_controller/airlock_controllers.dm
+++ b/code/game/machinery/embedded_controller/airlock_controllers.dm
@@ -1,5 +1,6 @@
//base type for controllers of two-door systems
/obj/machinery/embedded_controller/radio/airlock
+ layer = ABOVE_WINDOW_LAYER
// Setup parameters only
radio_filter = RADIO_AIRLOCK
var/tag_exterior_door
diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm
index 5358a1206b8..b7d961cc35d 100644
--- a/code/game/machinery/machinery.dm
+++ b/code/game/machinery/machinery.dm
@@ -102,7 +102,6 @@ Class Procs:
max_integrity = 200
layer = BELOW_OBJ_LAYER
var/stat = 0
- var/emagged = 0
var/use_power = IDLE_POWER_USE
//0 = dont run the auto
//1 = run auto, use idle
@@ -637,14 +636,15 @@ Class Procs:
/obj/machinery/proc/can_be_overridden()
. = 1
-/obj/machinery/tesla_act(power, explosive = FALSE)
- ..()
- if(prob(85) && explosive)
- explosion(loc, 1, 2, 4, flame_range = 2, adminlog = 0, smoke = 0)
- else if(prob(50))
- emp_act(EMP_LIGHT)
- else
- ex_act(EXPLODE_HEAVY)
+/obj/machinery/zap_act(power, zap_flags)
+ if(prob(85) && (zap_flags & ZAP_MACHINE_EXPLOSIVE) && !(resistance_flags & INDESTRUCTIBLE))
+ explosion(src, 1, 2, 4, flame_range = 2, adminlog = FALSE, smoke = FALSE)
+ else if(zap_flags & ZAP_OBJ_DAMAGE)
+ take_damage(power * 0.0005, BURN, "energy")
+ if(prob(40))
+ emp_act(EMP_LIGHT)
+ power -= power * 0.0005
+ return ..()
/obj/machinery/proc/adjust_item_drop_location(atom/movable/AM) // Adjust item drop location to a 3x3 grid inside the tile, returns slot id from 0 to 8
var/md5 = md5(AM.name) // Oh, and it's deterministic too. A specific item will always drop from the same slot.
diff --git a/code/game/machinery/magnet.dm b/code/game/machinery/magnet.dm
index dd2ef029d57..9963cfbda93 100644
--- a/code/game/machinery/magnet.dm
+++ b/code/game/machinery/magnet.dm
@@ -44,7 +44,7 @@
// update the invisibility and icon
/obj/machinery/magnetic_module/hide(intact)
- invisibility = intact ? 101 : 0
+ invisibility = intact ? INVISIBILITY_MAXIMUM : 0
updateicon()
// update the icon_state
diff --git a/code/game/machinery/overview.dm b/code/game/machinery/overview.dm
index 7d8910d6ef5..bd34b71d165 100644
--- a/code/game/machinery/overview.dm
+++ b/code/game/machinery/overview.dm
@@ -73,7 +73,7 @@
if("/turf/unsimulated/floor")
colour = rgb(240,240,240)
- if("/turf/unsimulated/wall", "/turf/unsimulated/wall/other")
+ if("/turf/unsimulated/wall")
colour = rgb(140,140,140)
else
@@ -229,7 +229,7 @@
if("/turf/unsimulated/floor")
colour = rgb(240,240,240)
- if("/turf/unsimulated/wall", "/turf/unsimulated/wall/other")
+ if("/turf/unsimulated/wall")
colour = rgb(140,140,140)
else
diff --git a/code/game/machinery/poolcontroller.dm b/code/game/machinery/poolcontroller.dm
index 5673ba8d204..8f4aec27ff7 100644
--- a/code/game/machinery/poolcontroller.dm
+++ b/code/game/machinery/poolcontroller.dm
@@ -39,8 +39,8 @@
var/turf/simulated/floor/beach/water/W = T
W.linkedcontroller = src
linkedturfs += T
- else if(istype(T, /turf/unsimulated/beach/water))
- var/turf/unsimulated/beach/water/W = T
+ else if(istype(T, /turf/simulated/floor/beach/away/water))
+ var/turf/simulated/floor/beach/away/water/W = T
W.linkedcontroller = src
linkedturfs += T
@@ -76,7 +76,7 @@
/obj/machinery/poolcontroller/proc/processMob()
for(var/M in mobinpool) //They're already typecasted when entering the turf
// Following two are sanity check. If the mob is no longer in the pool for whatever reason (Looking at you teleport), remove them
- if(!istype(get_turf(M), /turf/simulated/floor/beach/water) && !istype(get_turf(M), /turf/unsimulated/beach/water)) // Water component when?
+ if(!istype(get_turf(M), /turf/simulated/floor/beach/water) && !istype(get_turf(M), /turf/simulated/floor/beach/away/water)) // Water component when?
mobinpool -= M
continue
handleTemp(M) //handles pool temp effects on the swimmers
diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm
index 351366c1501..2d04d04644a 100644
--- a/code/game/machinery/requests_console.dm
+++ b/code/game/machinery/requests_console.dm
@@ -235,7 +235,7 @@ GLOBAL_LIST_EMPTY(allRequestConsoles)
radiochannel = "AI Private"
else if(recipient == "Cargo Bay")
radiochannel = "Supply"
- message_log += "Message sent to [recipient] at [station_time_timestamp()] - [message]"
+ message_log.Add(list(list("Message sent to [recipient] at [station_time_timestamp()]", "[message]")))
Radio.autosay("Alert; a new requests console message received for [recipient] from [department]", null, "[radiochannel]")
else
atom_say("No server detected!")
@@ -273,7 +273,7 @@ GLOBAL_LIST_EMPTY(allRequestConsoles)
atom_say("[error_message]")
return
print_label(ship_tag_name, ship_tag_index)
- shipping_log += "Shipping Label printed for [ship_tag_name] - [msgVerified]"
+ shipping_log.Add(list(list("Shipping Label printed for [ship_tag_name]", "[msgVerified]"))) // List in a list for passing into TGUI
reset_message(TRUE)
//Handle silencing the console
@@ -343,9 +343,9 @@ GLOBAL_LIST_EMPTY(allRequestConsoles)
switch(priority)
if(RQ_HIGHPRIORITY) // High
- message_log += "High Priority - From: [linkedSender] - [message]"
+ message_log.Add(list(list("High Priority - From: [linkedSender]") + message)) // List in a list for passing into TGUI
else // Normal
- message_log += "From: [linkedSender] - [message]"
+ message_log.Add(list(list("From: [linkedSender]") + message)) // List in a list for passing into TGUI
set_light(2)
/obj/machinery/requests_console/proc/print_label(tag_name, tag_index)
diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm
index b307c91b5df..ae216a48399 100644
--- a/code/game/machinery/suit_storage_unit.dm
+++ b/code/game/machinery/suit_storage_unit.dm
@@ -165,7 +165,7 @@
/obj/machinery/suit_storage_unit/ert/command
suit_type = /obj/item/clothing/suit/space/hardsuit/ert/commander
mask_type = /obj/item/clothing/mask/breath
- storage_type = /obj/item/tank/emergency_oxygen/double
+ storage_type = /obj/item/tank/internals/emergency_oxygen/double
/obj/machinery/suit_storage_unit/ert/command/secure
secure = TRUE
@@ -173,7 +173,7 @@
/obj/machinery/suit_storage_unit/ert/security
suit_type = /obj/item/clothing/suit/space/hardsuit/ert/security
mask_type = /obj/item/clothing/mask/breath
- storage_type = /obj/item/tank/emergency_oxygen/double
+ storage_type = /obj/item/tank/internals/emergency_oxygen/double
/obj/machinery/suit_storage_unit/ert/security/secure
secure = TRUE
@@ -181,7 +181,7 @@
/obj/machinery/suit_storage_unit/ert/engineer
suit_type = /obj/item/clothing/suit/space/hardsuit/ert/engineer
mask_type = /obj/item/clothing/mask/breath
- storage_type = /obj/item/tank/emergency_oxygen/double
+ storage_type = /obj/item/tank/internals/emergency_oxygen/double
/obj/machinery/suit_storage_unit/ert/engineer/secure
secure = TRUE
@@ -189,7 +189,7 @@
/obj/machinery/suit_storage_unit/ert/medical
suit_type = /obj/item/clothing/suit/space/hardsuit/ert/medical
mask_type = /obj/item/clothing/mask/breath
- storage_type = /obj/item/tank/emergency_oxygen/double
+ storage_type = /obj/item/tank/internals/emergency_oxygen/double
/obj/machinery/suit_storage_unit/ert/medical/secure
secure = TRUE
@@ -207,6 +207,7 @@
name = "radiation suit storage unit"
suit_type = /obj/item/clothing/suit/radiation
helmet_type = /obj/item/clothing/head/radiation
+ storage_type = /obj/item/geiger_counter
//copied from /obj/effect/nasavoidsuitspawner
/obj/machinery/suit_storage_unit/telecoms/Initialize()
@@ -413,6 +414,9 @@
uv_cycles = initial(uv_cycles)
uv = FALSE
locked = FALSE
+ for(var/atom/A in contents)
+ A.clean_blood(radiation_clean = FALSE) // we invoke the radiation cleaning proc directly
+ A.clean_radiation(12) // instead of letting clean_blood do it
if(uv_super)
visible_message("[src]'s door creaks open with a loud whining noise. A cloud of foul black smoke escapes from its chamber.")
playsound(src, 'sound/machines/airlock_alien_prying.ogg', 50, 1)
diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm
index cc3d7f1a409..932d46b6c0c 100644
--- a/code/game/machinery/teleporter.dm
+++ b/code/game/machinery/teleporter.dm
@@ -319,7 +319,7 @@
active_power_usage = 2000
var/obj/machinery/teleport/station/power_station
var/calibrated //Calibration prevents mutation
- var/admin_usage = FALSE // if 1, works on z2. If 0, doesn't. Used for admin room teleport.
+ var/admin_usage = FALSE // if 1, works on CC level. If 0, doesn't. Used for admin room teleport.
/obj/machinery/teleport/hub/New()
..()
diff --git a/code/game/machinery/transformer.dm b/code/game/machinery/transformer.dm
index 18abeba7400..3b26877e4b2 100644
--- a/code/game/machinery/transformer.dm
+++ b/code/game/machinery/transformer.dm
@@ -201,7 +201,7 @@
flick("separator-AO0",src)
playsound(loc, 'sound/effects/alert.ogg', 50, 0)
sleep(5)
- H.apply_effect((rand(150,200)),IRRADIATE,0)
+ H.rad_act(rand(150, 200))
if(prob(5))
if(prob(75))
randmutb(H) // Applies bad mutation
diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm
index e42b8a1460b..acd109b42f7 100644
--- a/code/game/machinery/vending.dm
+++ b/code/game/machinery/vending.dm
@@ -510,6 +510,10 @@
if(ishuman(user))
H = user
C = H.get_idcard(TRUE)
+ if(!C && istype(H.wear_pda, /obj/item/pda))
+ var/obj/item/pda/P = H.wear_pda
+ if(istype(P.id, /obj/item/card/id))
+ C = P.id
var/obj/item/stack/spacecash/S = H.get_active_hand()
if(istype(S))
data["userMoney"] = S.amount
@@ -1359,6 +1363,7 @@
/obj/item/seeds/grass = 3,
/obj/item/seeds/lemon = 3,
/obj/item/seeds/lime = 3,
+ /obj/item/seeds/mint = 3,
/obj/item/seeds/onion = 3,
/obj/item/seeds/orange = 3,
/obj/item/seeds/peanuts = 3,
@@ -1638,7 +1643,7 @@
icon_state = "engivend"
icon_deny = "engivend-deny"
req_one_access_txt = "11;24" // Engineers and atmos techs can use this
- products = list(/obj/item/clothing/glasses/meson = 2,/obj/item/multitool = 4,/obj/item/airlock_electronics = 10,/obj/item/firelock_electronics = 10,/obj/item/firealarm_electronics = 10,/obj/item/apc_electronics = 10,/obj/item/airalarm_electronics = 10,/obj/item/stock_parts/cell/high = 10,/obj/item/camera_assembly = 10)
+ products = list(/obj/item/clothing/glasses/meson/engine = 2,/obj/item/multitool = 4, /obj/item/geiger_counter = 5, /obj/item/airlock_electronics = 10,/obj/item/firelock_electronics = 10,/obj/item/firealarm_electronics = 10,/obj/item/apc_electronics = 10,/obj/item/airalarm_electronics = 10,/obj/item/stock_parts/cell/high = 10,/obj/item/camera_assembly = 10)
contraband = list(/obj/item/stock_parts/cell/potato = 3)
premium = list(/obj/item/storage/belt/utility = 3)
refill_canister = /obj/item/vending_refill/engivend
@@ -1659,7 +1664,7 @@
icon_deny = "engi-deny"
req_access_txt = "11"
products = list(/obj/item/clothing/under/rank/chief_engineer = 4,/obj/item/clothing/under/rank/engineer = 4,/obj/item/clothing/shoes/workboots = 4,/obj/item/clothing/head/hardhat = 4,
- /obj/item/storage/belt/utility = 4,/obj/item/clothing/glasses/meson = 4,/obj/item/clothing/gloves/color/yellow = 4, /obj/item/screwdriver = 12,
+ /obj/item/storage/belt/utility = 4,/obj/item/clothing/glasses/meson/engine = 4,/obj/item/clothing/gloves/color/yellow = 4, /obj/item/screwdriver = 12,
/obj/item/crowbar = 12,/obj/item/wirecutters = 12,/obj/item/multitool = 12,/obj/item/wrench = 12,/obj/item/t_scanner = 12,
/obj/item/stack/cable_coil/heavyduty = 8, /obj/item/stock_parts/cell = 8, /obj/item/weldingtool = 8,/obj/item/clothing/head/welding = 8,
/obj/item/light/tube = 10,/obj/item/clothing/suit/fire = 4, /obj/item/stock_parts/scanning_module = 5,/obj/item/stock_parts/micro_laser = 5,
@@ -1683,7 +1688,7 @@
req_access_txt = "29"
products = list(/obj/item/clothing/suit/storage/labcoat = 4,/obj/item/clothing/under/rank/roboticist = 4,/obj/item/stack/cable_coil = 4,/obj/item/flash = 4,
/obj/item/stock_parts/cell/high = 12, /obj/item/assembly/prox_sensor = 3,/obj/item/assembly/signaler = 3,/obj/item/healthanalyzer = 3,
- /obj/item/scalpel = 2,/obj/item/circular_saw = 2,/obj/item/tank/anesthetic = 2,/obj/item/clothing/mask/breath/medical = 5,
+ /obj/item/scalpel = 2,/obj/item/circular_saw = 2,/obj/item/tank/internals/anesthetic = 2,/obj/item/clothing/mask/breath/medical = 5,
/obj/item/screwdriver = 5,/obj/item/crowbar = 5)
refill_canister = /obj/item/vending_refill/robotics
@@ -1707,7 +1712,7 @@
/obj/item/reagent_containers/food/snacks/candy/candy_corn = 6)
contraband = list(/obj/item/kitchen/knife = 6,
/obj/item/reagent_containers/food/drinks/coffee = 12,
- /obj/item/tank/emergency_oxygen = 6,
+ /obj/item/tank/internals/emergency_oxygen = 6,
/obj/item/clothing/mask/breath = 6)
refill_canister = /obj/item/vending_refill/sustenance
diff --git a/code/game/mecha/equipment/tools/other_tools.dm b/code/game/mecha/equipment/tools/other_tools.dm
index 8fdbf0880df..e33a748354c 100644
--- a/code/game/mecha/equipment/tools/other_tools.dm
+++ b/code/game/mecha/equipment/tools/other_tools.dm
@@ -489,12 +489,11 @@
fuel_per_cycle_idle = 10
fuel_per_cycle_active = 30
power_per_cycle = 50
- var/rad_per_cycle = 0.3
+ var/rad_per_cycle = 30
/obj/item/mecha_parts/mecha_equipment/generator/nuclear/critfail()
return
/obj/item/mecha_parts/mecha_equipment/generator/nuclear/process()
if(..())
- for(var/mob/living/carbon/M in view(chassis))
- M.apply_effect((rad_per_cycle * 3),IRRADIATE,0)
+ radiation_pulse(get_turf(src), rad_per_cycle)
diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm
index d01f8fd856b..594b318750c 100644
--- a/code/game/mecha/mecha.dm
+++ b/code/game/mecha/mecha.dm
@@ -37,7 +37,6 @@
var/datum/effect_system/spark_spread/spark_system = new
var/lights = 0
var/lights_power = 6
- var/emagged = FALSE
var/frozen = FALSE
var/repairing = FALSE
diff --git a/code/game/objects/effects/anomalies.dm b/code/game/objects/effects/anomalies.dm
index a1211ec9aa1..ba1d107c94e 100644
--- a/code/game/objects/effects/anomalies.dm
+++ b/code/game/objects/effects/anomalies.dm
@@ -168,7 +168,7 @@
/obj/effect/anomaly/flux/proc/mobShock(mob/living/M)
if(canshock && istype(M))
canshock = FALSE //Just so you don't instakill yourself if you slam into the anomaly five times in a second.
- M.electrocute_act(shockdamage, "[name]", safety = TRUE)
+ M.electrocute_act(shockdamage, name, flags = SHOCK_NOGLOVES)
/obj/effect/anomaly/flux/detonate()
if(explosive)
diff --git a/code/game/objects/effects/decals/Cleanable/misc.dm b/code/game/objects/effects/decals/Cleanable/misc.dm
index a8510ddc102..721b28d09fd 100644
--- a/code/game/objects/effects/decals/Cleanable/misc.dm
+++ b/code/game/objects/effects/decals/Cleanable/misc.dm
@@ -18,6 +18,22 @@
scoop_reagents = list("ash" = 10)
mergeable_decal = FALSE
+/obj/effect/decal/cleanable/glass
+ name = "tiny shards"
+ desc = "Back to sand."
+ icon = 'icons/obj/shards.dmi'
+ icon_state = "tiny"
+
+/obj/effect/decal/cleanable/glass/Initialize(mapload)
+ . = ..()
+ setDir(pick(GLOB.cardinal))
+
+/obj/effect/decal/cleanable/glass/ex_act()
+ qdel(src)
+
+/obj/effect/decal/cleanable/glass/plasma
+ icon_state = "plasmatiny"
+
/obj/effect/decal/cleanable/dirt
name = "dirt"
desc = "Someone should clean that up."
diff --git a/code/game/objects/effects/effects.dm b/code/game/objects/effects/effects.dm
index 625d2ad8fd9..9053786e554 100644
--- a/code/game/objects/effects/effects.dm
+++ b/code/game/objects/effects/effects.dm
@@ -69,9 +69,6 @@
/obj/effect/abstract/decompile_act(obj/item/matter_decompiler/C, mob/user)
return
-/obj/effect/abstract/tesla_act(power)
- return
-
/obj/effect/abstract/singularity_act()
return
diff --git a/code/game/objects/effects/mines.dm b/code/game/objects/effects/mines.dm
index f671fcfcf23..f1c3ae63c1f 100644
--- a/code/game/objects/effects/mines.dm
+++ b/code/game/objects/effects/mines.dm
@@ -67,7 +67,7 @@
var/radiation_amount
/obj/effect/mine/dnascramble/mineEffect(mob/living/victim)
- victim.apply_effect(radiation_amount, IRRADIATE, 0)
+ victim.rad_act(radiation_amount)
if(ishuman(victim))
var/mob/living/carbon/human/V = victim
if(NO_DNA in V.dna.species.species_traits)
diff --git a/code/game/objects/effects/spawners/bombspawner.dm b/code/game/objects/effects/spawners/bombspawner.dm
index 9b62faa5252..10600cb1fee 100644
--- a/code/game/objects/effects/spawners/bombspawner.dm
+++ b/code/game/objects/effects/spawners/bombspawner.dm
@@ -24,8 +24,8 @@
..()
var/obj/item/transfer_valve/V = new(src.loc)
- var/obj/item/tank/plasma/PT = new(V)
- var/obj/item/tank/oxygen/OT = new(V)
+ var/obj/item/tank/internals/plasma/PT = new(V)
+ var/obj/item/tank/internals/oxygen/OT = new(V)
V.tank_one = PT
V.tank_two = OT
diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm
index dcdcff81313..7e24cfab25c 100644
--- a/code/game/objects/effects/spawners/lootdrop.dm
+++ b/code/game/objects/effects/spawners/lootdrop.dm
@@ -94,6 +94,7 @@
/obj/item/book/manual/engineering_construction = 10,
/obj/item/book/manual/engineering_hacking = 10,
/obj/item/clothing/head/cone = 10,
+ /obj/item/geiger_counter = 30,
/obj/item/coin/silver = 10,
/obj/item/coin/twoheaded = 10,
/obj/item/poster/random_contraband = 10,
@@ -116,8 +117,8 @@
/obj/item/storage/fancy/cigarettes/dromedaryco = 10,
/obj/item/storage/toolbox/mechanical = 10,
/obj/item/screwdriver = 30,
- /obj/item/tank/emergency_oxygen = 20,
- /obj/item/tank/emergency_oxygen/engi = 10,
+ /obj/item/tank/internals/emergency_oxygen = 20,
+ /obj/item/tank/internals/emergency_oxygen/engi = 10,
/obj/item/vending_refill/cola = 10,
/obj/item/weldingtool = 30,
/obj/item/wirecutters = 10,
@@ -319,7 +320,7 @@
/obj/item/storage/belt/utility/chief/full = 25,
/obj/item/rcd/combat = 25,
/obj/item/rpd/bluespace = 25,
- /obj/item/tank/emergency_oxygen/double/full = 25,
+ /obj/item/tank/internals/emergency_oxygen/double = 25,
/obj/item/slimepotion/speed = 25,
/obj/item/storage/backpack/holding = 25,
/obj/item/clothing/glasses/meson/night = 25, // NV mesons
diff --git a/code/game/objects/effects/spawners/windowspawner.dm b/code/game/objects/effects/spawners/windowspawner.dm
index cf29d86a450..1d498888588 100644
--- a/code/game/objects/effects/spawners/windowspawner.dm
+++ b/code/game/objects/effects/spawners/windowspawner.dm
@@ -2,12 +2,13 @@
name = "window spawner"
icon = 'icons/obj/structures.dmi'
icon_state = "window_spawner"
- var/useFull = 0
- var/useGrille = 1
- var/windowtospawn = /obj/structure/window/basic
- anchored = 1 // No sliding out while you prime
+ var/useFull = TRUE
+ var/useGrille = TRUE
+ var/window_to_spawn_regular = /obj/structure/window/basic
+ var/window_to_spawn_full = /obj/structure/window/full/basic
+ anchored = TRUE // No sliding out while you prime
-/obj/effect/spawner/window/Initialize()
+/obj/effect/spawner/window/Initialize(mapload)
. = ..()
var/turf/T = get_turf(src)
for(var/obj/structure/grille/G in get_turf(src))
@@ -20,35 +21,60 @@
for(var/obj/effect/spawner/window/WS in get_step(src,cdir))
cdir = null
break
- if(!cdir) continue
- var/obj/structure/window/WI = new windowtospawn(get_turf(src))
+ if(!cdir)
+ continue
+ var/obj/structure/window/WI = new window_to_spawn_regular(get_turf(src))
WI.dir = cdir
else
- var/obj/structure/window/W = new windowtospawn(get_turf(src))
- W.dir = SOUTHWEST
+ new window_to_spawn_full(get_turf(src))
if(useGrille)
new /obj/structure/grille(get_turf(src))
- src.air_update_turf(1) //atmos can pass otherwise
- // Give some time for nearby window spawners to initialize
- spawn(10)
- qdel(src)
- // why is this line a no-op
- // QDEL_IN(src, 10)
+ air_update_turf(TRUE) //atmos can pass otherwise
+ return INITIALIZE_HINT_QDEL
/obj/effect/spawner/window/reinforced
name = "reinforced window spawner"
icon_state = "rwindow_spawner"
- windowtospawn = /obj/structure/window/reinforced
+ window_to_spawn_regular = /obj/structure/window/reinforced
+ window_to_spawn_full = /obj/structure/window/full/reinforced
+
+/obj/effect/spawner/window/plasma
+ name = "plasma window spawner"
+ icon_state = "pwindow_spawner"
+ window_to_spawn_regular = /obj/structure/window/plasmabasic
+ window_to_spawn_full = /obj/structure/window/full/plasmabasic
/obj/effect/spawner/window/reinforced/plasma
name = "reinforced plasma window spawner"
- icon_state = "pwindow_spawner"
- windowtospawn = /obj/structure/window/plasmareinforced
+ icon_state = "prwindow_spawner"
+ window_to_spawn_regular = /obj/structure/window/plasmareinforced
+ window_to_spawn_full = /obj/structure/window/full/plasmareinforced
+
+/obj/effect/spawner/window/reinforced/tinted
+ name = "tinted reinforced window spawner"
+ icon_state = "twindow_spawner"
+ window_to_spawn_regular = /obj/structure/window/reinforced/tinted
+ window_to_spawn_full = /obj/structure/window/full/reinforced/tinted
/obj/effect/spawner/window/shuttle
name = "shuttle window spawner"
icon_state = "swindow_spawner"
- windowtospawn = /obj/structure/window/shuttle
+ window_to_spawn_full = /obj/structure/window/full/shuttle
+
+/obj/effect/spawner/window/shuttle/survival_pod
+ name = "pod window spawner"
+ icon_state = "podwindow_spawner"
+ window_to_spawn_full = /obj/structure/window/full/shuttle/survival_pod
+
+/obj/effect/spawner/window/plastitanium
+ name = "plastitanium window spawner"
+ icon_state = "plastitaniumwindow_spawner"
+ window_to_spawn_full = /obj/structure/window/full/plastitanium
+
+/obj/effect/spawner/window/ice
+ name = "ice window spawner"
+ icon_state = "icewindow_spawner"
+ window_to_spawn_full = /obj/structure/window/full/reinforced/ice
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index 5052874f5cc..138d156040a 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -21,9 +21,9 @@ GLOBAL_DATUM_INIT(fire_overlay, /image, image("icon" = 'icons/goonstation/effect
can_be_hit = FALSE
suicidal_hands = TRUE
- var/list/attack_verb //Used in attackby() to say how something was attacked "[x] has been [z.attack_verb] by [y] with [z]"
var/hitsound = null
var/usesound = null
+ var/list/attack_verb //Used in attackby() to say how something was attacked "[x] has been [z.attack_verb] by [y] with [z]"
var/throwhitsound
var/w_class = WEIGHT_CLASS_NORMAL
var/slot_flags = 0 //This is used to determine on which slots an item can fit.
@@ -115,6 +115,7 @@ GLOBAL_DATUM_INIT(fire_overlay, /image, image("icon" = 'icons/goonstation/effect
hitsound = 'sound/items/welder.ogg'
if(damtype == "brute")
hitsound = "swing_hit"
+ LAZYINITLIST(attack_verb)
if(!move_resist)
determine_move_resist()
diff --git a/code/game/objects/items/blueprints.dm b/code/game/objects/items/blueprints.dm
index 97e46e3abb5..a8c0165e111 100644
--- a/code/game/objects/items/blueprints.dm
+++ b/code/game/objects/items/blueprints.dm
@@ -269,8 +269,6 @@
/obj/item/areaeditor/proc/check_tile_is_border(var/turf/T2,var/dir)
if(istype(T2, /turf/space))
return BORDER_SPACE //omg hull breach we all going to die here
- if(istype(T2, /turf/simulated/shuttle))
- return BORDER_SPACE
if(get_area_type(T2.loc)!=AREA_SPACE)
return BORDER_BETWEEN
if(istype(T2, /turf/simulated/wall))
diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm
index 0c02a2125a6..515e447df69 100644
--- a/code/game/objects/items/bodybag.dm
+++ b/code/game/objects/items/bodybag.dm
@@ -19,46 +19,48 @@
icon_state = "bodybag_closed"
icon_closed = "bodybag_closed"
icon_opened = "bodybag_open"
+ density = FALSE
+ integrity_failure = 0
sound = 'sound/items/zip.ogg'
var/item_path = /obj/item/bodybag
- density = 0
- integrity_failure = 0
-/obj/structure/closet/body_bag/attackby(W as obj, mob/user as mob, params)
- if(istype(W, /obj/item/pen))
- var/t = rename_interactive(user, W)
+/obj/structure/closet/body_bag/attackby(obj/item/I, mob/user, params)
+ if(istype(I, /obj/item/pen))
+ var/t = rename_interactive(user, I)
if(isnull(t))
return
cut_overlays()
if(t)
add_overlay(image(icon, "bodybag_label"))
return
- if(istype(W, /obj/item/wirecutters))
- to_chat(user, "You cut the tag off the bodybag")
- name = "body bag"
+ if(istype(I, /obj/item/wirecutters))
+ to_chat(user, "You cut the tag off the bodybag.")
+ name = initial(name)
cut_overlays()
return
return ..()
+/obj/structure/closet/body_bag/welder_act(mob/user, obj/item/I)
+ return // Can't weld a body bag shut
/obj/structure/closet/body_bag/close()
if(..())
density = 0
- return 1
- return 0
+ return TRUE
+ return FALSE
/obj/structure/closet/body_bag/MouseDrop(over_object, src_location, over_location)
. = ..()
- if((over_object == usr && (in_range(src, usr) || usr.contents.Find(src))))
+ if(over_object == usr && (in_range(src, usr) || usr.contents.Find(src)))
if(!ishuman(usr) || opened || length(contents))
return FALSE
visible_message("[usr] folds up the [name]")
new item_path(get_turf(src))
qdel(src)
-/obj/structure/closet/body_bag/relaymove(mob/user as mob)
+/obj/structure/closet/body_bag/relaymove(mob/user)
if(user.stat)
return
diff --git a/code/game/objects/items/devices/chameleonproj.dm b/code/game/objects/items/devices/chameleonproj.dm
index 95b36194f56..abb86e2cd14 100644
--- a/code/game/objects/items/devices/chameleonproj.dm
+++ b/code/game/objects/items/devices/chameleonproj.dm
@@ -199,23 +199,7 @@
deactivate(user)
else
to_chat(user, "You activate [src].")
- var/start = user.filters.len
- var/X
- var/Y
- var/rsq
- var/i
- var/f
- for(i in 1 to 7)
- do
- X = 60 * rand() - 30
- Y = 60 * rand() - 30
- rsq = X * X + Y * Y
- while(rsq < 100 || rsq > 900)
- user.filters += filter(type = "wave", x = X, y = Y, size = rand() * 2.5 + 0.5, offset = rand())
- for(i in 1 to 7)
- f = user.filters[start+i]
- animate(f, offset = f:offset, time = 0, loop = 3, flags = ANIMATION_PARALLEL)
- animate(offset = f:offset - 1, time = rand() * 20 + 10)
+ apply_wibbly_filters(user)
if(do_after(user, 50, target = user) && user.cell.use(activationCost))
playsound(src, 'sound/effects/bamf.ogg', 100, 1, -6)
to_chat(user, "You are now disguised as a Nanotrasen engineering cyborg.")
@@ -223,10 +207,7 @@
else
to_chat(user, "The chameleon field fizzles.")
do_sparks(3, FALSE, user)
- for(i in 1 to min(7, user.filters.len)) // removing filters that are animating does nothing, we gotta stop the animations first
- f = user.filters[start + i]
- animate(f)
- user.filters = null
+ remove_wibbly_filters(user)
/obj/item/borg_chameleon/process()
if(S)
diff --git a/code/game/objects/items/devices/geiger_counter.dm b/code/game/objects/items/devices/geiger_counter.dm
new file mode 100644
index 00000000000..c24d92e7a96
--- /dev/null
+++ b/code/game/objects/items/devices/geiger_counter.dm
@@ -0,0 +1,211 @@
+#define RAD_LEVEL_NORMAL 9
+#define RAD_LEVEL_MODERATE 100
+#define RAD_LEVEL_HIGH 400
+#define RAD_LEVEL_VERY_HIGH 800
+#define RAD_LEVEL_CRITICAL 1500
+
+/obj/item/geiger_counter //DISCLAIMER: I know nothing about how real-life Geiger counters work. This will not be realistic. ~Xhuis
+ name = "\improper Geiger counter"
+ desc = "A handheld device used for detecting and measuring radiation pulses."
+ icon = 'icons/obj/device.dmi'
+ icon_state = "geiger_off"
+ item_state = "multitool"
+ w_class = WEIGHT_CLASS_SMALL
+ slot_flags = SLOT_BELT
+ flags = NOBLUDGEON
+ materials = list(MAT_METAL = 150, MAT_GLASS = 150)
+
+ var/grace = RAD_GEIGER_GRACE_PERIOD
+ var/datum/looping_sound/geiger/soundloop
+
+ var/scanning = FALSE
+ var/radiation_count = 0
+ var/current_tick_amount = 0
+ var/last_tick_amount = 0
+ var/fail_to_receive = 0
+ var/current_warning = 1
+
+/obj/item/geiger_counter/Initialize(mapload)
+ . = ..()
+ START_PROCESSING(SSobj, src)
+
+ soundloop = new(list(src), FALSE)
+
+/obj/item/geiger_counter/Destroy()
+ STOP_PROCESSING(SSobj, src)
+ QDEL_NULL(soundloop)
+ return ..()
+
+
+/obj/item/geiger_counter/process()
+ if(scanning)
+ radiation_count -= radiation_count / RAD_GEIGER_MEASURE_SMOOTHING
+ radiation_count += current_tick_amount / RAD_GEIGER_MEASURE_SMOOTHING
+
+ if(current_tick_amount)
+ grace = RAD_GEIGER_GRACE_PERIOD
+ last_tick_amount = current_tick_amount
+
+ else if(!emagged)
+ grace--
+ if(grace <= 0)
+ radiation_count = 0
+
+ current_tick_amount = 0
+
+ update_icon()
+ update_sound()
+
+/obj/item/geiger_counter/examine(mob/user)
+ . = ..()
+ if(!scanning)
+ return
+ . += "Alt-click it to clear stored radiation levels."
+ if(emagged)
+ . += "The display seems to be incomprehensible."
+ return
+ switch(radiation_count)
+ if(-INFINITY to RAD_LEVEL_NORMAL)
+ . += "Ambient radiation level count reports that all is well."
+ if(RAD_LEVEL_NORMAL + 1 to RAD_LEVEL_MODERATE)
+ . += "Ambient radiation levels slightly above average."
+ if(RAD_LEVEL_MODERATE + 1 to RAD_LEVEL_HIGH)
+ . += "Ambient radiation levels above average."
+ if(RAD_LEVEL_HIGH + 1 to RAD_LEVEL_VERY_HIGH)
+ . += "Ambient radiation levels highly above average."
+ if(RAD_LEVEL_VERY_HIGH + 1 to RAD_LEVEL_CRITICAL)
+ . += "Ambient radiation levels nearing critical level."
+ if(RAD_LEVEL_CRITICAL + 1 to INFINITY)
+ . += "Ambient radiation levels above critical level!"
+
+ . += "The last radiation amount detected was [last_tick_amount]"
+
+/obj/item/geiger_counter/update_icon()
+ if(!scanning)
+ icon_state = "geiger_off"
+ else if(emagged)
+ icon_state = "geiger_on_emag"
+ else
+ switch(radiation_count)
+ if(-INFINITY to RAD_LEVEL_NORMAL)
+ icon_state = "geiger_on_1"
+ if(RAD_LEVEL_NORMAL + 1 to RAD_LEVEL_MODERATE)
+ icon_state = "geiger_on_2"
+ if(RAD_LEVEL_MODERATE + 1 to RAD_LEVEL_HIGH)
+ icon_state = "geiger_on_3"
+ if(RAD_LEVEL_HIGH + 1 to RAD_LEVEL_VERY_HIGH)
+ icon_state = "geiger_on_4"
+ if(RAD_LEVEL_VERY_HIGH + 1 to RAD_LEVEL_CRITICAL)
+ icon_state = "geiger_on_4"
+ if(RAD_LEVEL_CRITICAL + 1 to INFINITY)
+ icon_state = "geiger_on_5"
+
+/obj/item/geiger_counter/proc/update_sound()
+ var/datum/looping_sound/geiger/loop = soundloop
+ if(!scanning || !radiation_count)
+ loop.stop()
+ return
+ loop.last_radiation = radiation_count
+ loop.start()
+
+/obj/item/geiger_counter/rad_act(amount)
+ . = ..()
+ if(amount <= RAD_BACKGROUND_RADIATION || !scanning)
+ return
+ current_tick_amount += amount
+ update_icon()
+
+/obj/item/geiger_counter/attack_self(mob/user)
+ scanning = !scanning
+ update_icon()
+ to_chat(user, "[bicon(src)] You switch [scanning ? "on" : "off"] [src].")
+
+/obj/item/geiger_counter/afterattack(atom/target, mob/user)
+ . = ..()
+ if(user.a_intent == INTENT_HELP)
+ if(!emagged)
+ user.visible_message("[user] scans [target] with [src].", "You scan [target]'s radiation levels with [src]...")
+ addtimer(CALLBACK(src, .proc/scan, target, user), 20, TIMER_UNIQUE) // Let's not have spamming GetAllContents
+ else
+ user.visible_message("[user] scans [target] with [src].", "You project [src]'s stored radiation into [target]!")
+ target.rad_act(radiation_count)
+ radiation_count = 0
+ return TRUE
+
+/obj/item/geiger_counter/proc/scan(atom/A, mob/user)
+ var/rad_strength = get_rad_contamination(A)
+
+ if(isliving(A))
+ var/mob/living/M = A
+ if(!M.radiation)
+ to_chat(user, "[bicon(src)] Radiation levels within normal boundaries.")
+ else
+ to_chat(user, "[bicon(src)] Subject is irradiated. Radiation levels: [M.radiation].")
+
+ if(rad_strength)
+ to_chat(user, "[bicon(src)] Target contains radioactive contamination. Radioactive strength: [rad_strength]")
+ else
+ to_chat(user, "[bicon(src)] Target is free of radioactive contamination.")
+
+/obj/item/geiger_counter/attackby(obj/item/I, mob/user, params)
+ if(I.tool_behaviour == TOOL_SCREWDRIVER && emagged)
+ if(scanning)
+ to_chat(user, "Turn off [src] before you perform this action!")
+ return FALSE
+ user.visible_message("[user] unscrews [src]'s maintenance panel and begins fiddling with its innards...", "You begin resetting [src]...")
+ if(!I.use_tool(src, user, 40, volume = 50))
+ return FALSE
+ user.visible_message("[user] refastens [src]'s maintenance panel!", "You reset [src] to its factory settings!")
+ emagged = FALSE
+ radiation_count = 0
+ update_icon()
+ return TRUE
+ else
+ return ..()
+
+/obj/item/geiger_counter/AltClick(mob/living/user)
+ if(!istype(user) || !user.Adjacent(src))
+ return ..()
+ if(!scanning)
+ to_chat(user, "[src] must be on to reset its radiation level!")
+ return
+ radiation_count = 0
+ to_chat(user, "You flush [src]'s radiation counts, resetting it to normal.")
+ update_icon()
+
+/obj/item/geiger_counter/emag_act(mob/user)
+ if(emagged)
+ return
+ if(scanning)
+ to_chat(user, "Turn off [src] before you perform this action!")
+ return
+ to_chat(user, "You override [src]'s radiation storing protocols. It will now generate small doses of radiation, and stored rads are now projected into creatures you scan.")
+ emagged = TRUE
+
+
+
+/obj/item/geiger_counter/cyborg
+ var/mob/listeningTo
+
+/obj/item/geiger_counter/cyborg/equipped(mob/user)
+ . = ..()
+ if(listeningTo == user)
+ return
+ if(listeningTo)
+ UnregisterSignal(listeningTo, COMSIG_ATOM_RAD_ACT)
+ RegisterSignal(user, COMSIG_ATOM_RAD_ACT, .proc/redirect_rad_act)
+ listeningTo = user
+
+/obj/item/geiger_counter/cyborg/proc/redirect_rad_act(datum/source, amount)
+ rad_act(amount)
+
+/obj/item/geiger_counter/cyborg/dropped()
+ . = ..()
+ if(listeningTo)
+ UnregisterSignal(listeningTo, COMSIG_ATOM_RAD_ACT)
+
+#undef RAD_LEVEL_NORMAL
+#undef RAD_LEVEL_MODERATE
+#undef RAD_LEVEL_HIGH
+#undef RAD_LEVEL_VERY_HIGH
+#undef RAD_LEVEL_CRITICAL
diff --git a/code/game/objects/items/devices/handheld_defib.dm b/code/game/objects/items/devices/handheld_defib.dm
index 9dd159ca91b..ed05732d760 100644
--- a/code/game/objects/items/devices/handheld_defib.dm
+++ b/code/game/objects/items/devices/handheld_defib.dm
@@ -10,7 +10,6 @@
var/icon_base = "defib"
var/cooldown = FALSE
var/charge_time = 100
- var/emagged = FALSE
/obj/item/handheld_defibrillator/emag_act(mob/user)
if(!emagged)
diff --git a/code/game/objects/items/devices/lightreplacer.dm b/code/game/objects/items/devices/lightreplacer.dm
index e96fceb8b6c..63058d9442b 100644
--- a/code/game/objects/items/devices/lightreplacer.dm
+++ b/code/game/objects/items/devices/lightreplacer.dm
@@ -52,7 +52,6 @@
origin_tech = "magnets=3;engineering=4"
force = 8
- var/emagged = FALSE
var/max_uses = 20
var/uses = 10
// How much to increase per each glass?
diff --git a/code/game/objects/items/devices/megaphone.dm b/code/game/objects/items/devices/megaphone.dm
index 5bc16ac2838..9e2e8a085f7 100644
--- a/code/game/objects/items/devices/megaphone.dm
+++ b/code/game/objects/items/devices/megaphone.dm
@@ -8,7 +8,6 @@
flags = CONDUCT
var/spamcheck = 0
- var/emagged = 0
var/insults = 0
var/span = ""
var/list/insultmsg = list("FUCK EVERYONE!", "I'M A TATER!", "ALL SECURITY TO SHOOT ME ON SIGHT!", "I HAVE A BOMB!", "CAPTAIN IS A COMDOM!", "FOR THE SYNDICATE!")
diff --git a/code/game/objects/items/devices/radio/beacon.dm b/code/game/objects/items/devices/radio/beacon.dm
index 487a582a3ab..5027676e1d3 100644
--- a/code/game/objects/items/devices/radio/beacon.dm
+++ b/code/game/objects/items/devices/radio/beacon.dm
@@ -5,7 +5,6 @@
item_state = "signaler"
var/code = "Beacon"
origin_tech = "bluespace=1"
- var/emagged = 0
var/syndicate = 0
var/area_bypass = FALSE
var/cc_beacon = FALSE //set if allowed to teleport to even if on zlevel2
diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm
index b76accb4561..db337d0a188 100644
--- a/code/game/objects/items/devices/radio/headset.dm
+++ b/code/game/objects/items/devices/radio/headset.dm
@@ -128,6 +128,10 @@
icon_state = "sec_headset_alt"
item_state = "sec_headset_alt"
+/obj/item/radio/headset/headset_sec/alt/brig_phys
+ name = "brig physician bowman headset"
+ ks1type = /obj/item/encryptionkey/headset_med
+
/obj/item/radio/headset/headset_iaa
name = "internal affairs bowman headset"
desc = "This is used by your elite legal team. Protects ears from flashbangs."
diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm
index a41d6a8b51b..7872120b96c 100644
--- a/code/game/objects/items/devices/scanners.dm
+++ b/code/game/objects/items/devices/scanners.dm
@@ -12,39 +12,28 @@ REAGENT SCANNER
desc = "A terahertz-ray emitter and scanner used to detect underfloor objects such as cables and pipes."
icon = 'icons/obj/device.dmi'
icon_state = "t-ray0"
- var/on = 0
+ var/on = FALSE
slot_flags = SLOT_BELT
- w_class = 2
w_class = WEIGHT_CLASS_SMALL
item_state = "electronic"
materials = list(MAT_METAL=150)
origin_tech = "magnets=1;engineering=1"
- var/scan_range = 1
- var/pulse_duration = 10
-
-/obj/item/t_scanner/longer_pulse
- pulse_duration = 50
-
-/obj/item/t_scanner/extended_range
- scan_range = 3
-
-/obj/item/t_scanner/extended_range/longer_pulse
- scan_range = 3
- pulse_duration = 50
/obj/item/t_scanner/Destroy()
if(on)
STOP_PROCESSING(SSobj, src)
return ..()
-/obj/item/t_scanner/attack_self(mob/user)
-
+/obj/item/t_scanner/proc/toggle_on()
on = !on
- icon_state = copytext(icon_state, 1, length(icon_state))+"[on]"
-
+ icon_state = copytext_char(icon_state, 1, -1) + "[on]"
if(on)
START_PROCESSING(SSobj, src)
+ else
+ STOP_PROCESSING(SSobj, src)
+/obj/item/t_scanner/attack_self(mob/user)
+ toggle_on()
/obj/item/t_scanner/process()
if(!on)
@@ -53,41 +42,25 @@ REAGENT SCANNER
scan()
/obj/item/t_scanner/proc/scan()
+ t_ray_scan(loc)
- for(var/turf/T in range(scan_range, src.loc) )
-
- if(!T.intact)
+/proc/t_ray_scan(mob/viewer, flick_time = 8, distance = 3)
+ if(!ismob(viewer) || !viewer.client)
+ return
+ var/list/t_ray_images = list()
+ for(var/obj/O in orange(distance, viewer))
+ if(O.level != 1)
continue
- for(var/obj/O in T.contents)
-
- if(O.level != 1)
- continue
-
- if(O.invisibility == 101)
- O.invisibility = 0
- O.alpha = 128
- spawn(pulse_duration)
- if(O)
- var/turf/U = O.loc
- if(U && U.intact)
- O.invisibility = 101
- O.alpha = 255
- for(var/mob/living/M in T.contents)
- var/oldalpha = M.alpha
- if(M.alpha < 255 && istype(M))
- M.alpha = 255
- spawn(10)
- if(M)
- M.alpha = oldalpha
-
- var/mob/living/M = locate() in T
-
- if(M && M.invisibility == 2)
- M.invisibility = 0
- spawn(2)
- if(M)
- M.invisibility = INVISIBILITY_LEVEL_TWO
+ if(O.invisibility == INVISIBILITY_MAXIMUM)
+ var/image/I = new(loc = get_turf(O))
+ var/mutable_appearance/MA = new(O)
+ MA.alpha = 128
+ MA.dir = O.dir
+ I.appearance = MA
+ t_ray_images += I
+ if(length(t_ray_images))
+ flick_overlay(t_ray_images, list(viewer.client), flick_time)
/proc/chemscan(mob/living/user, mob/living/M)
diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm
index d6c73461e76..c4f14c8140e 100644
--- a/code/game/objects/items/devices/traitordevices.dm
+++ b/code/game/objects/items/devices/traitordevices.dm
@@ -102,7 +102,7 @@ effective or pretty fucking useless.
if(M)
if(intensity >= 5)
M.apply_effect(round(intensity/1.5), PARALYZE)
- M.apply_effect(intensity*10, IRRADIATE)
+ M.rad_act(intensity * 10)
else
to_chat(user, "The radioactive microlaser is still recharging.")
@@ -267,7 +267,7 @@ effective or pretty fucking useless.
to_chat(C, "The [src] will not work here!")
/obj/item/teleporter/proc/tile_check(turf/T)
- if(istype(T, /turf/simulated/floor) || istype(T, /turf/space) || istype(T, /turf/simulated/shuttle/floor) || istype(T, /turf/simulated/shuttle/floor4) || istype(T, /turf/simulated/shuttle/plating))
+ if(istype(T, /turf/simulated/floor) || istype(T, /turf/space))
return TRUE
/obj/item/teleporter/proc/dir_correction(mob/user) //Direction movement, screws with teleport distance and saving throw, and thus must be removed first
diff --git a/code/game/objects/items/devices/uplinks.dm b/code/game/objects/items/devices/uplinks.dm
index 60abf1774cd..5253a98c6a5 100644
--- a/code/game/objects/items/devices/uplinks.dm
+++ b/code/game/objects/items/devices/uplinks.dm
@@ -23,8 +23,6 @@ GLOBAL_LIST_EMPTY(world_uplinks)
var/job = null
var/temp_category
var/uplink_type = "traitor"
- /// If set, the uplink will show the option to become a contractor through this variable.
- var/datum/antagonist/traitor/contractor/contractor = null
/// Whether the uplink is jammed and cannot be used to order items.
var/is_jammed = FALSE
@@ -170,16 +168,6 @@ GLOBAL_LIST_EMPTY(world_uplinks)
var/list/data = list()
data["crystals"] = uses
- data["modal"] = ui_modal_data(src)
-
- if(contractor)
- var/list/contractor_data = list(
- available = uses >= contractor.tc_cost && world.time < contractor.offer_deadline,
- affordable = uses >= contractor.tc_cost,
- accepted = !isnull(contractor.contractor_uplink),
- time_left = contractor.offer_deadline - world.time,
- )
- data["contractor"] = contractor_data
return data
@@ -218,9 +206,6 @@ GLOBAL_LIST_EMPTY(world_uplinks)
return
. = TRUE
- if(tgui_act_modal(action, params))
- return
-
switch(action)
if("lock")
toggle()
@@ -239,29 +224,6 @@ GLOBAL_LIST_EMPTY(world_uplinks)
var/datum/uplink_item/UI = uplink_items[params["item"]]
return buy(UI, UI ? UI.reference : "")
-/**
- * Called in tgui_act() to process modal actions
- *
- * Arguments:
- * * action - The action passed by tgui
- * * params - The params passed by tgui
- */
-/obj/item/uplink/hidden/proc/tgui_act_modal(action, list/params)
- . = TRUE
- var/id = params["id"]
- switch(ui_modal_act(src, action, params))
- if(UI_MODAL_OPEN)
- if(id == "become_contractor")
- ui_modal_boolean(src, id, "")
- return
- if(UI_MODAL_ANSWER)
- if(id == "become_contractor")
- if(text2num(params["answer"]))
- var/datum/antagonist/traitor/contractor/C = usr.mind.has_antag_datum(/datum/antagonist/traitor/contractor)
- C?.become_contractor(usr, src)
- return
- return FALSE
-
// I placed this here because of how relevant it is.
// You place this in your uplinkable item to check if an uplink is active or not.
// If it is, it will display the uplink menu and return 1, else it'll return false.
diff --git a/code/game/objects/items/devices/whistle.dm b/code/game/objects/items/devices/whistle.dm
index b4ebe4465fd..754c0676b71 100644
--- a/code/game/objects/items/devices/whistle.dm
+++ b/code/game/objects/items/devices/whistle.dm
@@ -8,7 +8,6 @@
flags = CONDUCT
var/spamcheck = 0
- var/emagged = 0
/obj/item/hailer/attack_self(mob/living/carbon/user as mob)
if(spamcheck)
diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm
index 000ad2d225f..0e0bb55df85 100644
--- a/code/game/objects/items/stacks/sheets/glass.dm
+++ b/code/game/objects/items/stacks/sheets/glass.dm
@@ -191,7 +191,7 @@ GLOBAL_LIST_INIT(titaniumglass_recipes, list(
..()
GLOBAL_LIST_INIT(plastitaniumglass_recipes, list(
- new/datum/stack_recipe/window("plastitanium window", /obj/structure/window/plastitanium, 2, time = 0, on_floor = TRUE, window_checks = TRUE)
+ new/datum/stack_recipe/window("plastitanium window", /obj/structure/window/full/plastitanium, 2, time = 0, on_floor = TRUE, window_checks = TRUE)
))
/obj/item/stack/sheet/plastitaniumglass
@@ -204,7 +204,7 @@ GLOBAL_LIST_INIT(plastitaniumglass_recipes, list(
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 100)
resistance_flags = ACID_PROOF
merge_type = /obj/item/stack/sheet/plastitaniumglass
- full_window = /obj/structure/window/plastitanium
+ full_window = /obj/structure/window/full/plastitanium
/obj/item/stack/sheet/plastitaniumglass/New(loc, amount)
recipes = GLOB.plastitaniumglass_recipes
diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm
index c65410b5129..92d13337766 100644
--- a/code/game/objects/items/weapons/RCD.dm
+++ b/code/game/objects/items/weapons/RCD.dm
@@ -492,17 +492,6 @@
QDEL_NULL(A)
for(var/obj/structure/window/W in T1.contents)
qdel(W)
- for(var/cdir in GLOB.cardinal)
- var/turf/T2 = get_step(T1, cdir)
- if(locate(/obj/structure/window/full/shuttle) in T2)
- continue // Shuttle windows? Nah. We don't need extra windows there.
- if(!(locate(/obj/structure/grille) in T2))
- continue
- for(var/obj/structure/window/W in T2)
- if(W.dir == turn(cdir, 180))
- qdel(W)
- var/obj/structure/window/reinforced/W = new(T2)
- W.dir = turn(cdir, 180)
return TRUE
return FALSE
@@ -535,15 +524,7 @@
new /obj/structure/grille(A)
for(var/obj/structure/window/W in A)
qdel(W)
- for(var/cdir in GLOB.cardinal)
- var/turf/T = get_step(A, cdir)
- if(locate(/obj/structure/grille) in T)
- for(var/obj/structure/window/W in T)
- if(W.dir == turn(cdir, 180))
- qdel(W)
- else // Build a window!
- var/obj/structure/window/reinforced/W = new(A)
- W.dir = cdir
+ new /obj/structure/window/full/reinforced(A)
var/turf/AT = A
AT.ChangeTurf(/turf/simulated/floor/plating) // Platings go under windows.
return TRUE
diff --git a/code/game/objects/items/weapons/cigs.dm b/code/game/objects/items/weapons/cigs.dm
index bd80e43140f..e4433fdb270 100644
--- a/code/game/objects/items/weapons/cigs.dm
+++ b/code/game/objects/items/weapons/cigs.dm
@@ -18,7 +18,7 @@ LIGHTERS ARE IN LIGHTERS.DM
icon_state = "cigoff"
throw_speed = 0.5
item_state = "cigoff"
- slot_flags = SLOT_EARS|SLOT_MASK
+ slot_flags = SLOT_MASK
w_class = WEIGHT_CLASS_TINY
body_parts_covered = null
attack_verb = null
diff --git a/code/game/objects/items/weapons/dna_injector.dm b/code/game/objects/items/weapons/dna_injector.dm
index 45047e97156..5f635b1eb73 100644
--- a/code/game/objects/items/weapons/dna_injector.dm
+++ b/code/game/objects/items/weapons/dna_injector.dm
@@ -70,7 +70,7 @@
if(used)
return
if(istype(M,/mob/living))
- M.apply_effect(rand(20 / (damage_coeff ** 2), 50 / (damage_coeff ** 2)), IRRADIATE, 0, 1)
+ M.apply_effect(rand(20 / (damage_coeff ** 2), 50 / (damage_coeff ** 2)), IRRADIATE)
var/mob/living/carbon/human/H
if(istype(M, /mob/living/carbon/human))
H = M
diff --git a/code/game/objects/items/weapons/flamethrower.dm b/code/game/objects/items/weapons/flamethrower.dm
index b18ec5ee0b6..60239b0e6fd 100644
--- a/code/game/objects/items/weapons/flamethrower.dm
+++ b/code/game/objects/items/weapons/flamethrower.dm
@@ -20,7 +20,7 @@
var/operating = FALSE//cooldown
var/obj/item/weldingtool/weldtool = null
var/obj/item/assembly/igniter/igniter = null
- var/obj/item/tank/plasma/ptank = null
+ var/obj/item/tank/internals/plasma/ptank = null
var/warned_admins = FALSE //for the message_admins() when lit
//variables for prebuilt flamethrowers
var/create_full = FALSE
@@ -89,7 +89,7 @@
update_icon()
return
- else if(istype(I, /obj/item/tank/plasma))
+ else if(istype(I, /obj/item/tank/internals/plasma))
if(ptank)
if(user.drop_item())
I.forceMove(src)
@@ -227,7 +227,7 @@
igniter.secured = FALSE
status = TRUE
if(create_with_tank)
- ptank = new /obj/item/tank/plasma/full(src)
+ ptank = new /obj/item/tank/internals/plasma/full(src)
update_icon()
/obj/item/flamethrower/full
diff --git a/code/game/objects/items/weapons/grenades/atmosgrenade.dm b/code/game/objects/items/weapons/grenades/atmosgrenade.dm
index 6ba46d3442e..536e1ddd1b0 100644
--- a/code/game/objects/items/weapons/grenades/atmosgrenade.dm
+++ b/code/game/objects/items/weapons/grenades/atmosgrenade.dm
@@ -36,19 +36,19 @@
icon = 'icons/obj/grenade.dmi'
icon_state = "gluon"
item_state = "flashbang"
- var/range = 4
- var/rad_damage = 60
+ var/freeze_range = 4
+ var/rad_damage = 350
var/stamina_damage = 30
/obj/item/grenade/gluon/prime()
update_mob()
playsound(loc, 'sound/effects/empulse.ogg', 50, 1)
- for(var/turf/T in view(range, loc))
+ radiation_pulse(src, rad_damage)
+ for(var/turf/T in view(freeze_range, loc))
if(isfloorturf(T))
var/turf/simulated/F = T
F.MakeSlippery(TURF_WET_PERMAFROST)
for(var/mob/living/carbon/L in T)
L.adjustStaminaLoss(stamina_damage)
- L.apply_effect(rad_damage, IRRADIATE)
L.adjust_bodytemperature(-230)
qdel(src)
diff --git a/code/game/objects/items/weapons/misc.dm b/code/game/objects/items/weapons/misc.dm
index 147f4dc3183..09ed31ac65d 100644
--- a/code/game/objects/items/weapons/misc.dm
+++ b/code/game/objects/items/weapons/misc.dm
@@ -120,11 +120,10 @@
desc = "A device bored paper pushers use to remind themselves that time did not stop yet. Contains gravity."
/obj/item/pai_cable
- desc = "A flexible coated cable with a universal jack on one end."
name = "data cable"
+ desc = "A flexible coated cable with a universal jack on one end."
icon = 'icons/obj/power.dmi'
icon_state = "wire1"
-
var/obj/machinery/machine
/obj/item/phone
diff --git a/code/game/objects/items/weapons/pneumaticCannon.dm b/code/game/objects/items/weapons/pneumaticCannon.dm
index 21127f6869f..93f5afea391 100644
--- a/code/game/objects/items/weapons/pneumaticCannon.dm
+++ b/code/game/objects/items/weapons/pneumaticCannon.dm
@@ -12,7 +12,7 @@
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 60, "acid" = 50)
var/maxWeightClass = 20 //The max weight of items that can fit into the cannon
var/loadedWeightClass = 0 //The weight of items currently in the cannon
- var/obj/item/tank/tank = null //The gas tank that is drawn from to fire things
+ var/obj/item/tank/internals/tank = null //The gas tank that is drawn from to fire things
var/gasPerThrow = 3 //How much gas is drawn from a tank's pressure to fire
var/list/loadedItems = list() //The items loaded into the cannon that will be fired out
var/pressureSetting = 1 //How powerful the cannon is - higher pressure = more gas but more powerful throws
@@ -34,8 +34,8 @@
/obj/item/pneumatic_cannon/attackby(obj/item/W, mob/user, params)
..()
- if(istype(W, /obj/item/tank/) && !tank)
- if(istype(W, /obj/item/tank/emergency_oxygen))
+ if(istype(W, /obj/item/tank/internals/) && !tank)
+ if(istype(W, /obj/item/tank/internals/emergency_oxygen))
to_chat(user, "\The [W] is too small for \the [src].")
return
updateTank(W, 0, user)
diff --git a/code/game/objects/items/weapons/powerfist.dm b/code/game/objects/items/weapons/powerfist.dm
index 217cb963719..fe1f549e8ef 100644
--- a/code/game/objects/items/weapons/powerfist.dm
+++ b/code/game/objects/items/weapons/powerfist.dm
@@ -15,7 +15,7 @@
var/click_delay = 1.5
var/fisto_setting = 1
var/gasperfist = 3
- var/obj/item/tank/tank = null //Tank used for the gauntlet's piston-ram.
+ var/obj/item/tank/internals/tank = null //Tank used for the gauntlet's piston-ram.
/obj/item/melee/powerfist/Destroy()
@@ -30,9 +30,9 @@
. += "[bicon(tank)] It has [tank] mounted onto it."
/obj/item/melee/powerfist/attackby(obj/item/W, mob/user, params)
- if(istype(W, /obj/item/tank))
+ if(istype(W, /obj/item/tank/internals))
if(!tank)
- var/obj/item/tank/IT = W
+ var/obj/item/tank/internals/IT = W
if(IT.volume <= 3)
to_chat(user, "[IT] is too small for [src].")
return
diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm
index 5f668316126..9caa87d8a4b 100644
--- a/code/game/objects/items/weapons/storage/backpack.dm
+++ b/code/game/objects/items/weapons/storage/backpack.dm
@@ -315,7 +315,7 @@
/obj/item/storage/backpack/satchel_flat/hide(var/intact)
if(intact)
- invisibility = 101
+ invisibility = INVISIBILITY_MAXIMUM
anchored = 1 //otherwise you can start pulling, cover it, and drag around an invisible backpack.
icon_state = "[initial(icon_state)]2"
else
diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm
index 172a95d3cd0..ab52435ffcb 100644
--- a/code/game/objects/items/weapons/storage/belt.dm
+++ b/code/game/objects/items/weapons/storage/belt.dm
@@ -58,6 +58,7 @@
/obj/item/stack/cable_coil,
/obj/item/t_scanner,
/obj/item/analyzer,
+ /obj/item/geiger_counter,
/obj/item/extinguisher/mini,
/obj/item/holosign_creator)
@@ -135,7 +136,8 @@
/obj/item/sensor_device,
/obj/item/wrench/medical,
/obj/item/handheld_defibrillator,
- /obj/item/reagent_containers/applicator
+ /obj/item/reagent_containers/applicator,
+ /obj/item/geiger_counter
)
/obj/item/storage/belt/medical/surgery
diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm
index 03db813b24e..2f3d6a3e7cd 100644
--- a/code/game/objects/items/weapons/storage/boxes.dm
+++ b/code/game/objects/items/weapons/storage/boxes.dm
@@ -44,7 +44,7 @@
..()
contents = list()
new /obj/item/clothing/mask/breath( src )
- new /obj/item/tank/emergency_oxygen( src )
+ new /obj/item/tank/internals/emergency_oxygen( src )
new /obj/item/reagent_containers/hypospray/autoinjector( src )
new /obj/item/flashlight/flare/glowstick/emergency( src )
return
@@ -56,7 +56,7 @@
..()
contents = list()
new /obj/item/clothing/mask/breath/vox(src)
- new /obj/item/tank/emergency_oxygen/nitrogen(src)
+ new /obj/item/tank/internals/emergency_oxygen/nitrogen(src)
new /obj/item/reagent_containers/hypospray/autoinjector(src)
new /obj/item/flashlight/flare/glowstick/emergency(src)
@@ -67,7 +67,7 @@
..()
contents = list()
new /obj/item/clothing/mask/breath(src)
- new /obj/item/tank/emergency_oxygen/plasma(src)
+ new /obj/item/tank/internals/emergency_oxygen/plasma(src)
new /obj/item/reagent_containers/hypospray/autoinjector(src)
new /obj/item/flashlight/flare/glowstick/emergency(src)
@@ -78,7 +78,7 @@
..()
contents = list()
new /obj/item/clothing/mask/breath( src )
- new /obj/item/tank/emergency_oxygen/engi( src )
+ new /obj/item/tank/internals/emergency_oxygen/engi( src )
new /obj/item/reagent_containers/hypospray/autoinjector( src )
new /obj/item/flashlight/flare/glowstick/emergency( src )
return
@@ -90,7 +90,7 @@
..()
contents = list()
new /obj/item/clothing/mask/gas/explorer(src)
- new /obj/item/tank/emergency_oxygen/engi(src)
+ new /obj/item/tank/internals/emergency_oxygen/engi(src)
new /obj/item/crowbar/red(src)
new /obj/item/reagent_containers/hypospray/autoinjector(src)
new /obj/item/flashlight/flare/glowstick/emergency(src)
@@ -102,7 +102,7 @@
..()
contents = list()
new /obj/item/clothing/mask/gas/syndicate(src)
- new /obj/item/tank/emergency_oxygen/syndi(src)
+ new /obj/item/tank/internals/emergency_oxygen/engi/syndi(src)
new /obj/item/reagent_containers/hypospray/autoinjector(src)
new /obj/item/reagent_containers/food/pill/initropidril(src)
new /obj/item/flashlight/flare/glowstick/red(src)
@@ -1006,7 +1006,7 @@
..()
contents = list()
new /obj/item/clothing/mask/breath(src)
- new /obj/item/tank/emergency_oxygen/double/full(src)
+ new /obj/item/tank/internals/emergency_oxygen/double(src)
new /obj/item/flashlight/seclite(src)
new /obj/item/kitchen/knife/combat(src)
@@ -1025,7 +1025,7 @@
/obj/item/storage/box/responseteam/New()
..()
new /obj/item/clothing/mask/breath(src)
- new /obj/item/tank/emergency_oxygen/engi/full(src)
+ new /obj/item/tank/internals/emergency_oxygen/engi(src)
new /obj/item/flashlight/flare(src)
new /obj/item/crowbar/red(src)
new /obj/item/kitchen/knife/combat(src)
diff --git a/code/game/objects/items/weapons/storage/secure.dm b/code/game/objects/items/weapons/storage/secure.dm
index 357cb043ca4..57ddb8b78ad 100644
--- a/code/game/objects/items/weapons/storage/secure.dm
+++ b/code/game/objects/items/weapons/storage/secure.dm
@@ -21,7 +21,6 @@
var/l_set = 0
var/l_setshort = 0
var/l_hacking = 0
- var/emagged = 0
var/open = 0
w_class = WEIGHT_CLASS_NORMAL
max_w_class = WEIGHT_CLASS_SMALL
diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm
index 099b3aed522..ae8bd6ca3dc 100644
--- a/code/game/objects/items/weapons/storage/uplink_kits.dm
+++ b/code/game/objects/items/weapons/storage/uplink_kits.dm
@@ -126,7 +126,7 @@
/obj/item/storage/box/syndie_kit/space
name = "Boxed Space Suit and Helmet"
- can_hold = list(/obj/item/clothing/suit/space/syndicate/black/red, /obj/item/clothing/head/helmet/space/syndicate/black/red, /obj/item/tank/emergency_oxygen/syndi, /obj/item/clothing/mask/gas/syndicate)
+ can_hold = list(/obj/item/clothing/suit/space/syndicate/black/red, /obj/item/clothing/head/helmet/space/syndicate/black/red, /obj/item/tank/internals/emergency_oxygen/engi/syndi, /obj/item/clothing/mask/gas/syndicate)
max_w_class = WEIGHT_CLASS_NORMAL
/obj/item/storage/box/syndie_kit/space/New()
@@ -134,19 +134,19 @@
new /obj/item/clothing/suit/space/syndicate/black/red(src)
new /obj/item/clothing/head/helmet/space/syndicate/black/red(src)
new /obj/item/clothing/mask/gas/syndicate(src)
- new /obj/item/tank/emergency_oxygen/syndi(src)
+ new /obj/item/tank/internals/emergency_oxygen/engi/syndi(src)
return
/obj/item/storage/box/syndie_kit/hardsuit
name = "Boxed Blood Red Suit and Helmet"
- can_hold = list(/obj/item/clothing/suit/space/hardsuit/syndi, /obj/item/tank/emergency_oxygen/syndi, /obj/item/clothing/mask/gas/syndicate)
+ can_hold = list(/obj/item/clothing/suit/space/hardsuit/syndi, /obj/item/tank/internals/emergency_oxygen/engi/syndi, /obj/item/clothing/mask/gas/syndicate)
max_w_class = WEIGHT_CLASS_NORMAL
/obj/item/storage/box/syndie_kit/hardsuit/New()
..()
new /obj/item/clothing/suit/space/hardsuit/syndi(src)
new /obj/item/clothing/mask/gas/syndicate(src)
- new /obj/item/tank/emergency_oxygen/syndi(src)
+ new /obj/item/tank/internals/emergency_oxygen/engi/syndi(src)
/obj/item/storage/box/syndie_kit/conversion
name = "box (CK)"
diff --git a/code/game/objects/items/weapons/tanks/jetpack.dm b/code/game/objects/items/weapons/tanks/jetpack.dm
index 1f7304a7128..b7ecfc6761e 100644
--- a/code/game/objects/items/weapons/tanks/jetpack.dm
+++ b/code/game/objects/items/weapons/tanks/jetpack.dm
@@ -4,12 +4,21 @@
icon_state = "jetpack"
w_class = WEIGHT_CLASS_BULKY
item_state = "jetpack"
- distribute_pressure = ONE_ATMOSPHERE*O2STANDARD
+ distribute_pressure = ONE_ATMOSPHERE * O2STANDARD
actions_types = list(/datum/action/item_action/set_internals, /datum/action/item_action/toggle_jetpack, /datum/action/item_action/jetpack_stabilization)
+ var/gas_type = "oxygen"
var/on = 0
var/stabilizers = 0
var/volume_rate = 500 //Needed for borg jetpack transfer
+/obj/item/tank/jetpack/populate_gas()
+ if(gas_type)
+ switch(gas_type)
+ if("oxygen")
+ air_contents.oxygen = ((6 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C))
+ if("carbon dioxide")
+ air_contents.carbon_dioxide = ((6 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C))
+
/obj/item/tank/jetpack/on_mob_move(direction, mob/user)
if(on)
var/turf/T = get_step(src, GetOppositeDir(direction))
@@ -29,14 +38,6 @@
stabilizers = !stabilizers
to_chat(user, "You turn [src]'s stabilization [stabilizers ? "on" : "off"].")
-
-/obj/item/tank/jetpack/examine(mob/user)
- . = ..()
- if(get_dist(user, src) <= 0 && air_contents.oxygen < 10)
- . += "The meter on [src] indicates you are almost out of air!"
- playsound(user, 'sound/effects/alert.ogg', 50, 1)
-
-
/obj/item/tank/jetpack/proc/cycle(mob/user)
if(user.incapacitated())
return
@@ -77,16 +78,27 @@
T.assume_air(removed)
return 1
+/obj/item/tank/jetpack/improvised
+ name = "improvised jetpack"
+ desc = "A jetpack made from two air tanks, a fire extinguisher and some atmospherics equipment. It doesn't look like it can hold much."
+ icon_state = "jetpack-improvised"
+ item_state = "jetpack-improvised"
+ volume = 20 //normal jetpacks have 70 volume
+ gas_type = null //it starts empty
+
+/obj/item/tank/jetpack/improvised/allow_thrust(num, mob/living/user)
+ if(rand(0, 250) == 0)
+ to_chat(user, "You feel your jetpack's engines cut out.")
+ turn_off(user)
+ return
+ return ..()
+
/obj/item/tank/jetpack/void
name = "Void Jetpack (Oxygen)"
desc = "It works well in a void."
icon_state = "jetpack-void"
item_state = "jetpack-void"
-/obj/item/tank/jetpack/void/New()
- ..()
- air_contents.oxygen = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
-
/obj/item/tank/jetpack/void/grey
name = "Void Jetpack (Oxygen)"
icon_state = "jetpack-void-grey"
@@ -95,16 +107,20 @@
name = "Retro Jetpack (Oxygen)"
icon_state = "jetpack-void-gold"
-
/obj/item/tank/jetpack/oxygen
name = "Jetpack (Oxygen)"
desc = "A tank of compressed oxygen for use as propulsion in zero-gravity areas. Use with caution."
icon_state = "jetpack"
item_state = "jetpack"
-/obj/item/tank/jetpack/oxygen/New()
- ..()
- air_contents.oxygen = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
+/obj/item/tank/jetpack/oxygen/harness
+ name = "jet harness (oxygen)"
+ desc = "A lightweight tactical harness, used by those who don't want to be weighed down by traditional jetpacks."
+ icon_state = "jetpack-mini"
+ item_state = "jetpack-mini"
+ volume = 40
+ throw_range = 7
+ w_class = WEIGHT_CLASS_NORMAL
/obj/item/tank/jetpack/oxygen/captain
name = "Captain's jetpack"
@@ -115,24 +131,11 @@
w_class = WEIGHT_CLASS_NORMAL
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF //steal objective items are hard to destroy.
-/obj/item/tank/jetpack/oxygen/harness
- name = "jet harness (oxygen)"
- desc = "A lightweight tactical harness, used by those who don't want to be weighed down by traditional jetpacks."
- icon_state = "jetpack-mini"
- item_state = "jetpack-mini"
- volume = 40
- throw_range = 8
- w_class = WEIGHT_CLASS_NORMAL
-
-/obj/item/tank/jetpack/oxygenblack
- name = "Jetpack (Oxygen)"
- desc = "A black tank of compressed oxygen for use as propulsion in zero-gravity areas. Use with caution."
- icon_state = "jetpack-black"
- item_state = "jetpack-black"
-
-/obj/item/tank/jetpack/oxygenblack/New()
- ..()
- air_contents.oxygen = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
+/obj/item/tank/jetpack/oxygen/security
+ name = "security jetpack (oxygen)"
+ desc = "A tank of compressed oxygen for use as propulsion in zero-gravity areas by security forces."
+ icon_state = "jetpack-sec"
+ item_state = "jetpack-sec"
/obj/item/tank/jetpack/carbondioxide
name = "Jetpack (Carbon Dioxide)"
@@ -140,16 +143,7 @@
distribute_pressure = 0
icon_state = "jetpack-black"
item_state = "jetpack-black"
-
-/obj/item/tank/jetpack/carbondioxide/New()
- ..()
- air_contents.carbon_dioxide = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
-
-/obj/item/tank/jetpack/carbondioxide/examine(mob/user)
- . = ..()
- if(get_dist(user, src) <= 0 && air_contents.carbon_dioxide < 10)
- . += "The meter on [src] indicates you are almost out of air!"
- playsound(user, 'sound/effects/alert.ogg', 50, 1)
+ gas_type = "carbon dioxide"
/obj/item/tank/jetpack/suit
name = "hardsuit jetpack upgrade"
@@ -161,8 +155,9 @@
actions_types = list(/datum/action/item_action/toggle_jetpack, /datum/action/item_action/jetpack_stabilization)
volume = 1
slot_flags = null
+ gas_type = null
var/datum/gas_mixture/temp_air_contents
- var/obj/item/tank/tank = null
+ var/obj/item/tank/internals/tank = null
var/mob/living/carbon/human/cur_user
/obj/item/tank/jetpack/suit/New()
diff --git a/code/game/objects/items/weapons/tanks/tank_types.dm b/code/game/objects/items/weapons/tanks/tank_types.dm
index 8a5255a01b8..2964c960501 100644
--- a/code/game/objects/items/weapons/tanks/tank_types.dm
+++ b/code/game/objects/items/weapons/tanks/tank_types.dm
@@ -1,250 +1,224 @@
/* Types of tanks!
* Contains:
* Oxygen
- * Nitrogen
- * Plasma
- * Air Mix
* Anesthetic
+ * Air
+ * Plasma
+ * Emergency Oxygen
+ * Generic
*/
/*
* Oxygen
*/
-/obj/item/tank/oxygen
+/obj/item/tank/internals/oxygen
name = "oxygen tank"
- desc = "A tank of oxygen."
+ desc = "A tank of oxygen, this one is blue."
icon_state = "oxygen"
+ distribute_pressure = TANK_DEFAULT_RELEASE_PRESSURE
+ force = 10
dog_fashion = /datum/dog_fashion/back
-/obj/item/tank/oxygen/New()
- ..()
- air_contents.oxygen = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
+/obj/item/tank/internals/oxygen/populate_gas()
+ air_contents.oxygen = (6 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C)
-/obj/item/tank/oxygen/examine(mob/user)
- . = ..()
- if(get_dist(user, src) <= 0 && air_contents.oxygen < 10)
- . += "The meter on [src] indicates you are almost out of air!"
-
-/obj/item/tank/oxygen/empty/New()
- ..()
- air_contents.oxygen = null
-
-/obj/item/tank/oxygen/yellow
+/obj/item/tank/internals/oxygen/yellow
desc = "A tank of oxygen, this one is yellow."
icon_state = "oxygen_f"
dog_fashion = null
-/obj/item/tank/oxygen/red
+/obj/item/tank/internals/oxygen/red
desc = "A tank of oxygen, this one is red."
icon_state = "oxygen_fr"
dog_fashion = null
-/obj/item/tank/emergency_oxygen
+/obj/item/tank/internals/oxygen/empty/populate_gas()
+ return
+
+/*
+ * Anesthetic
+ */
+/obj/item/tank/internals/anesthetic
+ name = "anesthetic tank"
+ desc = "A tank with an N2O/O2 gas mix."
+ icon_state = "anesthetic"
+ item_state = "an_tank"
+ force = 10
+
+/obj/item/tank/internals/anesthetic/populate_gas()
+ air_contents.oxygen = (3 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C) * O2STANDARD
+ air_contents.sleeping_agent = (3 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C) * N2STANDARD
+
+/*
+ * Plasma
+ */
+/obj/item/tank/internals/plasma
+ name = "plasma tank"
+ desc = "Contains dangerous plasma. Do not inhale. Warning: extremely flammable."
+ icon_state = "plasma"
+ flags = CONDUCT
+ slot_flags = null //they have no straps!
+ force = 8
+
+/obj/item/tank/internals/plasma/populate_gas()
+ air_contents.toxins = (3 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C)
+
+/obj/item/tank/internals/plasma/attackby(obj/item/I, mob/user, params)
+ if(istype(I, /obj/item/flamethrower))
+ var/obj/item/flamethrower/F = I
+ if((!F.status)||(F.ptank))
+ return
+ master = F
+ F.ptank = src
+ user.unEquip(src)
+ loc = F
+ F.update_icon()
+ else
+ return ..()
+
+/obj/item/tank/internals/plasma/full/populate_gas()
+ air_contents.toxins = (10 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C)
+
+/obj/item/tank/internals/plasma/empty/populate_gas()
+ return
+
+/*
+ * Plasmaman Plasma Tank
+ */
+/obj/item/tank/internals/plasmaman
+ name = "plasma internals tank"
+ desc = "A tank of plasma gas designed specifically for use as internals, particularly for plasma-based lifeforms. If you're not a Plasmaman, you probably shouldn't use this."
+ icon_state = "plasma_fr"
+ item_state = "plasma_fr"
+ force = 10
+ distribute_pressure = TANK_DEFAULT_RELEASE_PRESSURE
+
+/obj/item/tank/internals/plasmaman/populate_gas()
+ air_contents.toxins = (3 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C)
+
+/obj/item/tank/internals/plasmaman/full/populate_gas()
+ air_contents.toxins = (10 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C)
+
+
+/obj/item/tank/internals/plasmaman/belt
+ icon_state = "plasmaman_tank_belt"
+ item_state = "plasmaman_tank_belt"
+ slot_flags = SLOT_BELT
+ force = 5
+ volume = 35
+ w_class = WEIGHT_CLASS_SMALL
+
+/obj/item/tank/internals/plasmaman/belt/full/populate_gas()
+ air_contents.toxins = (10 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C)
+
+/obj/item/tank/internals/plasmaman/belt/empty/populate_gas()
+ return
+
+/obj/item/tank/internals/emergency_oxygen/plasma
+ name = "emergency plasma tank"
+ desc = "An emergency tank designed specifically for Plasmamen."
+ icon_state = "emergency_p"
+
+/obj/item/tank/internals/emergency_oxygen/plasma/populate_gas()
+ air_contents.toxins = (10 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C)
+
+/*
+ * Emergency Oxygen
+ */
+/obj/item/tank/internals/emergency_oxygen
name = "emergency oxygen tank"
desc = "Used for emergencies. Contains very little oxygen, so try to conserve it until you actually need it."
icon_state = "emergency"
flags = CONDUCT
slot_flags = SLOT_BELT
w_class = WEIGHT_CLASS_SMALL
- force = 4.0
+ force = 4
+ distribute_pressure = TANK_DEFAULT_RELEASE_PRESSURE
volume = 3 //Tiny. Real life equivalents only have 21 breaths of oxygen in them. They're EMERGENCY tanks anyway -errorage (dangercon 2011)
+/obj/item/tank/internals/emergency_oxygen/populate_gas()
+ air_contents.oxygen = (10 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C)
-/obj/item/tank/emergency_oxygen/New()
- ..()
- air_contents.oxygen = (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
+/obj/item/tank/internals/emergency_oxygen/empty/populate_gas()
+ return
-/obj/item/tank/emergency_oxygen/examine(mob/user)
- . = ..()
- if(get_dist(user, src) <= 0 && air_contents.oxygen < 0.2)
- . += "The meter on [src] indicates you are almost out of air!"
- playsound(user, 'sound/effects/alert.ogg', 50, 1)
-
-/obj/item/tank/emergency_oxygen/empty/New()
- ..()
- air_contents.oxygen = null
-
-/obj/item/tank/emergency_oxygen/engi
+/obj/item/tank/internals/emergency_oxygen/engi
name = "extended-capacity emergency oxygen tank"
icon_state = "emergency_engi"
- volume = 6
+ volume = 6 // should last 24 minutes if full
-/obj/item/tank/emergency_oxygen/engi/full/New()
- ..()
- air_contents.oxygen = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
+/obj/item/tank/internals/emergency_oxygen/engi/empty/populate_gas()
+ return
-
-/obj/item/tank/emergency_oxygen/engi/empty/New()
- ..()
- air_contents.oxygen = null
-
-/obj/item/tank/emergency_oxygen/syndi
+/obj/item/tank/internals/emergency_oxygen/engi/syndi
name = "suspicious emergency oxygen tank"
icon_state = "emergency_syndi"
desc = "A dark emergency oxygen tank. The label on the back reads \"Original Oxygen Tank Design, Do Not Steal.\""
- volume = 6
-/obj/item/tank/emergency_oxygen/double
+/obj/item/tank/internals/emergency_oxygen/double
name = "double emergency oxygen tank"
icon_state = "emergency_double"
- volume = 10
+ volume = 12 //If it's double of the above, shouldn't it be double the volume??
-/obj/item/tank/emergency_oxygen/double/empty/New()
- ..()
- air_contents.oxygen = null
-
-/obj/item/tank/emergency_oxygen/double/full
- name = "pressurized double emergency oxygen tank"
- desc = "Used for \"emergencies,\" it actually contains a fair amount of oxygen."
-
-/obj/item/tank/emergency_oxygen/double/full/New()
- ..()
- air_contents.oxygen = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
+/obj/item/tank/internals/emergency_oxygen/double/empty/populate_gas()
+ return
/*
* Nitrogen
*/
-
-/obj/item/tank/nitrogen
+/obj/item/tank/internals/nitrogen
name = "nitrogen tank"
desc = "A tank of nitrogen."
icon_state = "oxygen_fr"
sprite_sheets = list("Vox Armalis" = 'icons/mob/species/armalis/back.dmi') //Do it for Big Bird.
+ distribute_pressure = TANK_DEFAULT_RELEASE_PRESSURE
-/obj/item/tank/nitrogen/New()
- ..()
- air_contents.nitrogen = (3*ONE_ATMOSPHERE)*70/(R_IDEAL_GAS_EQUATION*T20C)
+/obj/item/tank/internals/nitrogen/populate_gas()
+ air_contents.nitrogen = (6 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C)
-/obj/item/tank/nitrogen/examine(mob/user)
- . = ..()
- if(get_dist(user, src) <= 0 && air_contents.nitrogen < 10)
- . += "The meter on the [src.name] indicates you are almost out of air!"
-
-/obj/item/tank/emergency_oxygen/vox
- name = "vox specialized nitrogen tank"
- desc = "A high-tech nitrogen tank designed specifically for Vox."
- icon_state = "emergency_vox"
- volume = 25
- sprite_sheets = list("Vox Armalis" = 'icons/mob/species/armalis/belt.dmi') //Do it for Big Bird.
-
-/obj/item/tank/emergency_oxygen/vox/New()
- ..()
- air_contents.oxygen -= (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
- air_contents.nitrogen = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
-
-/obj/item/tank/emergency_oxygen/nitrogen
+/obj/item/tank/internals/emergency_oxygen/nitrogen
name = "emergency nitrogen tank"
desc = "An emergency tank designed specifically for Vox."
icon_state = "emergency_nitrogen"
- volume = 3
-/obj/item/tank/emergency_oxygen/nitrogen/New()
- ..()
- air_contents.oxygen -= (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
- air_contents.nitrogen = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
+/obj/item/tank/internals/emergency_oxygen/nitrogen/populate_gas()
+ air_contents.nitrogen = (10 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C)
-/*
- Plasma
-*/
+/obj/item/tank/internals/emergency_oxygen/double/vox
+ name = "vox specialized nitrogen tank"
+ desc = "A high-tech nitrogen tank designed specifically for Vox."
+ icon_state = "emergency_vox"
+ sprite_sheets = list("Vox Armalis" = 'icons/mob/species/armalis/belt.dmi') //Do it for Big Bird.
+ volume = 35
-/obj/item/tank/plasma
- name = "plasma tank"
- desc = "Contains dangerous plasma. Do not inhale. Warning: extremely flammable."
- icon_state = "plasma"
- flags = CONDUCT
- slot_flags = null //they have no straps!
-
-/obj/item/tank/plasma/New()
- ..()
- air_contents.toxins = (3*ONE_ATMOSPHERE)*70/(R_IDEAL_GAS_EQUATION*T20C)
-
-/obj/item/tank/plasma/attackby(obj/item/W as obj, mob/user as mob, params)
- ..()
-
- if(istype(W, /obj/item/flamethrower))
- var/obj/item/flamethrower/F = W
- if((!F.status)||(F.ptank)) return
- master = F
- F.ptank = src
- user.unEquip(src)
- loc = F
- F.update_icon()
-
-/obj/item/tank/plasma/full/New()
- ..()
- air_contents.toxins = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
-
-/obj/item/tank/plasma/plasmaman
- name = "plasma internals tank"
- desc = "A tank of plasma gas designed specifically for use as internals, particularly for plasma-based lifeforms. If you're not a Plasmaman, you probably shouldn't use this."
- icon_state = "plasmaman_tank"
- item_state = "plasmaman_tank"
- force = 10
-
-/obj/item/tank/plasma/plasmaman/examine(mob/user)
- . = ..()
- if(get_dist(user, src) <= 0 && air_contents.toxins < 0.2)
- . += "The meter on [src] indicates you are almost out of plasma!"
- playsound(user, 'sound/effects/alert.ogg', 50, 1)
-
-
-/obj/item/tank/plasma/plasmaman/belt
- icon_state = "plasmaman_tank_belt"
- item_state = "plasmaman_tank_belt"
- slot_flags = SLOT_BELT
- force = 5
- volume = 25
- w_class = WEIGHT_CLASS_SMALL
-
-/obj/item/tank/plasma/plasmaman/belt/full/New()
- ..()
- air_contents.toxins = (10 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C)
-
-/obj/item/tank/emergency_oxygen/plasma
- name = "emergency plasma tank"
- desc = "An emergency tank designed specifically for Plasmamen."
- icon_state = "emergency_p"
- volume = 3
-
-/obj/item/tank/emergency_oxygen/plasma/New()
- ..()
- air_contents.oxygen -= (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
- air_contents.toxins = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
+/obj/item/tank/internals/emergency_oxygen/double/vox/populate_gas()
+ air_contents.nitrogen = (10 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C)
/*
* Air Mix
*/
-/obj/item/tank/air
+/obj/item/tank/internals/air
name = "air tank"
desc = "Mixed anyone?"
icon_state = "air"
item_state = "air"
distribute_pressure = ONE_ATMOSPHERE
-/obj/item/tank/air/examine(mob/user)
- . = ..()
- if(get_dist(user, src) <= 0 && air_contents.oxygen < 1)
- . += "The meter on [src] indicates you are almost out of air!"
- playsound(user, 'sound/effects/alert.ogg', 50, 1)
-
-/obj/item/tank/air/New()
- ..()
- air_contents.oxygen = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * O2STANDARD
- air_contents.nitrogen = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * N2STANDARD
-
+/obj/item/tank/internals/air/populate_gas()
+ air_contents.oxygen = (3 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C) * O2STANDARD
+ air_contents.nitrogen = (3 * ONE_ATMOSPHERE) * volume / (R_IDEAL_GAS_EQUATION * T20C) * N2STANDARD
/*
- * Anesthetic
+ * Generic
*/
-/obj/item/tank/anesthetic
- name = "anesthetic tank"
- desc = "A tank with an N2O/O2 gas mix."
- icon_state = "anesthetic"
- item_state = "an_tank"
- distribute_pressure = ONE_ATMOSPHERE
-
-/obj/item/tank/anesthetic/New()
- ..()
- air_contents.oxygen = (3 * ONE_ATMOSPHERE) * 70 / (R_IDEAL_GAS_EQUATION * T20C) * O2STANDARD
- air_contents.sleeping_agent = (3 * ONE_ATMOSPHERE) * 70 / (R_IDEAL_GAS_EQUATION * T20C) * N2STANDARD
+/obj/item/tank/internals/generic
+ name = "gas tank"
+ desc = "A generic tank used for storing and transporting gasses. Can be used for internals."
+ icon_state = "generic"
+ item_state = "generic"
+ distribute_pressure = TANK_DEFAULT_RELEASE_PRESSURE
+ force = 10
+ dog_fashion = /datum/dog_fashion/back
+/obj/item/tank/internals/generic/populate_gas()
+ return
diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm
index 73a75919af8..be1e8e48feb 100644
--- a/code/game/objects/items/weapons/tanks/tanks.dm
+++ b/code/game/objects/items/weapons/tanks/tanks.dm
@@ -1,5 +1,3 @@
-#define TANK_MAX_RELEASE_PRESSURE (3*ONE_ATMOSPHERE)
-
/obj/item/tank
name = "tank"
icon = 'icons/obj/tank.dmi'
@@ -8,14 +6,14 @@
hitsound = 'sound/weapons/smash.ogg'
w_class = WEIGHT_CLASS_NORMAL
pressure_resistance = ONE_ATMOSPHERE * 5
- force = 5.0
- throwforce = 10.0
+ force = 5
+ throwforce = 10
throw_speed = 1
throw_range = 4
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 10, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 30)
actions_types = list(/datum/action/item_action/set_internals)
var/datum/gas_mixture/air_contents = null
- var/distribute_pressure = TANK_DEFAULT_RELEASE_PRESSURE
+ var/distribute_pressure = ONE_ATMOSPHERE
var/integrity = 3
var/volume = 70
@@ -25,6 +23,9 @@
air_contents = new /datum/gas_mixture()
air_contents.volume = volume //liters
air_contents.temperature = T20C
+
+ populate_gas()
+
START_PROCESSING(SSobj, src)
return
@@ -35,6 +36,8 @@
return ..()
+/obj/item/tank/proc/populate_gas()
+ return
/obj/item/tank/ui_action_click(mob/user)
toggle_internals(user)
@@ -82,7 +85,7 @@
. += "It's \a [bicon(icon)][src]! If you want any more information you'll need to get closer."
return
- var/celsius_temperature = air_contents.temperature-T0C
+ var/celsius_temperature = air_contents.temperature - T0C
var/descriptive
if(celsius_temperature < 20)
@@ -147,10 +150,10 @@
/obj/item/tank/ui_data(mob/user)
var/list/data = list()
- data["tankPressure"] = round(air_contents.return_pressure() ? air_contents.return_pressure() : 0)
- data["releasePressure"] = round(distribute_pressure ? distribute_pressure : 0)
+ data["tankPressure"] = round(air_contents.return_pressure())
+ data["releasePressure"] = round(distribute_pressure)
data["defaultReleasePressure"] = round(TANK_DEFAULT_RELEASE_PRESSURE)
- data["minReleasePressure"] = round(TANK_DEFAULT_RELEASE_PRESSURE)
+ data["minReleasePressure"] = round(TANK_MIN_RELEASE_PRESSURE)
data["maxReleasePressure"] = round(TANK_MAX_RELEASE_PRESSURE)
var/mob/living/carbon/C = user
if(!istype(C))
@@ -171,7 +174,7 @@
if(pressure == "reset")
pressure = initial(distribute_pressure)
else if(pressure == "min")
- pressure = TANK_DEFAULT_RELEASE_PRESSURE
+ pressure = TANK_MIN_RELEASE_PRESSURE
else if(pressure == "max")
pressure = TANK_MAX_RELEASE_PRESSURE
else if(text2num(pressure) != null)
@@ -179,7 +182,7 @@
else
. = FALSE
if(.)
- distribute_pressure = clamp(round(pressure), TANK_DEFAULT_RELEASE_PRESSURE, TANK_MAX_RELEASE_PRESSURE)
+ distribute_pressure = clamp(round(pressure), TANK_MIN_RELEASE_PRESSURE, TANK_MAX_RELEASE_PRESSURE)
if("internals")
toggle_internals(usr)
else
@@ -204,10 +207,9 @@
return null
var/tank_pressure = air_contents.return_pressure()
- if(tank_pressure < distribute_pressure)
- distribute_pressure = tank_pressure
+ var/actual_distribute_pressure = clamp(tank_pressure, 0, distribute_pressure)
- var/moles_needed = distribute_pressure*volume_to_return/(R_IDEAL_GAS_EQUATION*air_contents.temperature)
+ var/moles_needed = actual_distribute_pressure * volume_to_return / (R_IDEAL_GAS_EQUATION * air_contents.temperature)
return remove_air(moles_needed)
diff --git a/code/game/objects/obj_defense.dm b/code/game/objects/obj_defense.dm
index e41d2173c23..b796740a60b 100644
--- a/code/game/objects/obj_defense.dm
+++ b/code/game/objects/obj_defense.dm
@@ -224,15 +224,24 @@ GLOBAL_DATUM_INIT(acid_overlay, /mutable_appearance, mutable_appearance('icons/e
SSfires.processing -= src
///Called when the obj is hit by a tesla bolt.
-/obj/proc/tesla_act(power)
+/obj/zap_act(power, zap_flags)
+ if(QDELETED(src))
+ return FALSE
being_shocked = TRUE
- var/power_bounced = power * 0.5
- tesla_zap(src, 3, power_bounced)
- addtimer(CALLBACK(src, .proc/reset_shocked), 10)
+ addtimer(CALLBACK(src, .proc/reset_shocked), 1 SECONDS)
+ return power / 2
/obj/proc/reset_shocked()
being_shocked = FALSE
+//The surgeon general warns that being buckled to certain objects receiving powerful shocks is greatly hazardous to your health
+///Only tesla coils, vehicles, and grounding rods currently call this because mobs are already targeted over all other objects, but this might be useful for more things later.
+/obj/proc/zap_buckle_check(strength)
+ if(has_buckled_mobs())
+ for(var/m in buckled_mobs)
+ var/mob/living/buckled_mob = m
+ buckled_mob.electrocute_act((clamp(round(strength / 400), 10, 90) + rand(-5, 5)), src, flags = SHOCK_TESLA)
+
//the obj is deconstructed into pieces, whether through careful disassembly or when destroyed.
/obj/proc/deconstruct(disassembled = TRUE)
SEND_SIGNAL(src, COMSIG_OBJ_DECONSTRUCT, disassembled)
diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm
index e07c651924d..16c5f626b84 100644
--- a/code/game/objects/objs.dm
+++ b/code/game/objects/objs.dm
@@ -29,6 +29,8 @@
var/on_blueprints = FALSE //Are we visible on the station blueprints at roundstart?
var/force_blueprints = FALSE //forces the obj to be on the blueprints, regardless of when it was created.
var/suicidal_hands = FALSE // Does it requires you to hold it to commit suicide with it?
+ /// Is it emagged or not?
+ var/emagged = FALSE
/obj/New()
..()
@@ -116,8 +118,11 @@
// null if object handles breathing logic for lifeform
// datum/air_group to tell lifeform to process using that breath return
//DEFAULT: Take air from turf to give to have mob process
+
if(breath_request > 0)
- return remove_air(breath_request)
+ var/datum/gas_mixture/environment = return_air()
+ var/breath_percentage = BREATH_VOLUME / environment.return_volume()
+ return remove_air(environment.total_moles() * breath_percentage)
else
return null
diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm
index bd8ca8c024b..0f63a5315ad 100644
--- a/code/game/objects/structures.dm
+++ b/code/game/objects/structures.dm
@@ -166,3 +166,9 @@
/obj/structure/proc/prevents_buckled_mobs_attacking()
return FALSE
+
+/obj/structure/zap_act(power, zap_flags)
+ if(zap_flags & ZAP_OBJ_DAMAGE)
+ take_damage(power / 8000, BURN, "energy")
+ power -= power / 2000 //walls take a lot out of ya
+ . = ..()
diff --git a/code/game/objects/structures/barsign.dm b/code/game/objects/structures/barsign.dm
index e50456bc03d..83d03263571 100644
--- a/code/game/objects/structures/barsign.dm
+++ b/code/game/objects/structures/barsign.dm
@@ -9,7 +9,6 @@
armor = list("melee" = 20, "bullet" = 20, "laser" = 20, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
var/list/barsigns=list()
var/list/hiddensigns
- var/emagged = 0
var/state = 0
var/prev_sign = ""
var/panel_open = 0
diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm
index 9f0daed2fbe..fef7fee544c 100644
--- a/code/game/objects/structures/crates_lockers/closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets.dm
@@ -349,11 +349,6 @@
BD.attack_hand(usr)
open()
-/obj/structure/closet/tesla_act(var/power)
- ..()
- visible_message("[src] is blown apart by the bolt of electricity!", "You hear a metallic screeching sound.")
- qdel(src)
-
/obj/structure/closet/get_remote_view_fullscreens(mob/user)
if(user.stat == DEAD || !(user.sight & (SEEOBJS|SEEMOBS)))
user.overlay_fullscreen("remote_view", /obj/screen/fullscreen/impaired, 1)
diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm
index 7af65b16270..25c6572b9a8 100644
--- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm
@@ -149,5 +149,5 @@
new /obj/item/clothing/head/soft/blue(src)
new /obj/item/clothing/suit/storage/paramedic(src)
new /obj/item/clothing/suit/storage/paramedic(src)
- new /obj/item/tank/emergency_oxygen/engi(src)
- new /obj/item/tank/emergency_oxygen/engi(src)
+ new /obj/item/tank/internals/emergency_oxygen/engi(src)
+ new /obj/item/tank/internals/emergency_oxygen/engi(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/l3closet.dm b/code/game/objects/structures/crates_lockers/closets/l3closet.dm
index fc72cfa1dc1..6eb2b680b35 100644
--- a/code/game/objects/structures/crates_lockers/closets/l3closet.dm
+++ b/code/game/objects/structures/crates_lockers/closets/l3closet.dm
@@ -31,7 +31,7 @@
new /obj/item/clothing/suit/bio_suit/virology( src )
new /obj/item/clothing/head/bio_hood/virology( src )
new /obj/item/clothing/mask/breath(src)
- new /obj/item/tank/oxygen(src)
+ new /obj/item/tank/internals/oxygen(src)
/obj/structure/closet/l3closet/security
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
index 157f0b18a85..98d0bce5e5e 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
@@ -35,7 +35,7 @@
new /obj/item/radio/headset/headset_cargo(src)
new /obj/item/clothing/gloves/fingerless(src)
new /obj/item/clothing/suit/fire/firefighter(src)
- new /obj/item/tank/emergency_oxygen(src)
+ new /obj/item/tank/internals/emergency_oxygen(src)
new /obj/item/clothing/mask/gas(src)
new /obj/item/clothing/glasses/meson(src)
new /obj/item/clothing/head/soft(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
index 39b6a0a0096..f11b301202c 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
@@ -34,6 +34,7 @@
new /obj/item/holosign_creator/engineering(src)
new /obj/item/flash(src)
new /obj/item/clothing/head/beret/eng(src)
+ new /obj/item/clothing/glasses/meson/engine(src)
new /obj/item/door_remote/chief_engineer(src)
new /obj/item/rpd(src)
new /obj/item/reagent_containers/food/drinks/mug/ce(src)
@@ -109,7 +110,7 @@
new /obj/item/clothing/under/rank/engineer/skirt(src)
new /obj/item/clothing/suit/storage/hazardvest(src)
new /obj/item/clothing/mask/gas(src)
- new /obj/item/clothing/glasses/meson(src)
+ new /obj/item/clothing/glasses/meson/engine(src)
new /obj/item/cartridge/engineering(src)
new /obj/item/clothing/head/beret/eng(src)
@@ -138,10 +139,11 @@
new /obj/item/grenade/gas/oxygen(src)
new /obj/item/clothing/suit/storage/hazardvest(src)
new /obj/item/clothing/mask/gas(src)
- new /obj/item/tank/emergency_oxygen/engi(src)
+ new /obj/item/tank/internals/emergency_oxygen/engi(src)
new /obj/item/holosign_creator/atmos(src)
new /obj/item/watertank/atmos(src)
new /obj/item/clothing/suit/fire/atmos(src)
new /obj/item/clothing/head/hardhat/atmos(src)
+ new /obj/item/clothing/glasses/meson/engine/tray(src)
new /obj/item/rpd(src)
new /obj/item/destTagger(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
index 6a0885cf1d1..a56c63937e3 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
@@ -37,9 +37,9 @@
req_access = list(ACCESS_SURGERY)
/obj/structure/closet/secure_closet/medical2/populate_contents()
- new /obj/item/tank/anesthetic(src)
- new /obj/item/tank/anesthetic(src)
- new /obj/item/tank/anesthetic(src)
+ new /obj/item/tank/internals/anesthetic(src)
+ new /obj/item/tank/internals/anesthetic(src)
+ new /obj/item/tank/internals/anesthetic(src)
new /obj/item/clothing/mask/breath/medical(src)
new /obj/item/clothing/mask/breath/medical(src)
new /obj/item/clothing/mask/breath/medical(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
index 125dae94f87..07eee5bc80c 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
@@ -18,7 +18,7 @@
new /obj/item/clothing/shoes/white(src)
// new /obj/item/cartridge/signal/toxins(src)
new /obj/item/radio/headset/headset_sci(src)
- new /obj/item/tank/air(src)
+ new /obj/item/tank/internals/air(src)
new /obj/item/clothing/mask/gas(src)
new /obj/item/clothing/shoes/sandal/white(src)
@@ -64,7 +64,7 @@
new /obj/item/clothing/shoes/white(src)
new /obj/item/clothing/gloves/color/latex(src)
new /obj/item/radio/headset/heads/rd(src)
- new /obj/item/tank/air(src)
+ new /obj/item/tank/internals/air(src)
new /obj/item/clothing/mask/gas(src)
new /obj/item/clothing/suit/armor/reactive/teleport(src)
new /obj/item/flash(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
index 1a6cf561f78..95cd8753ae9 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
@@ -32,7 +32,7 @@
new /obj/item/gun/energy/gun(src)
new /obj/item/door_remote/captain(src)
new /obj/item/reagent_containers/food/drinks/mug/cap(src)
- new /obj/item/tank/emergency_oxygen/double(src)
+ new /obj/item/tank/internals/emergency_oxygen/double(src)
/obj/structure/closet/secure_closet/hop
@@ -218,7 +218,7 @@
new /obj/item/clothing/suit/storage/brigdoc(src)
new /obj/item/clothing/under/rank/security/brigphys(src)
new /obj/item/clothing/shoes/white(src)
- new /obj/item/radio/headset/headset_sec/alt(src)
+ new /obj/item/radio/headset/headset_sec/alt/brig_phys(src)
new /obj/item/clothing/shoes/sandal/white(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm
index 75dde9a7e9f..09bc5e5887f 100644
--- a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm
@@ -25,23 +25,23 @@
/obj/structure/closet/emcloset/populate_contents()
switch(pickweight(list("small" = 55, "aid" = 25, "tank" = 10, "both" = 10, "nothing" = 0, "delete" = 0)))
if("small")
- new /obj/item/tank/emergency_oxygen(src)
- new /obj/item/tank/emergency_oxygen(src)
+ new /obj/item/tank/internals/emergency_oxygen(src)
+ new /obj/item/tank/internals/emergency_oxygen(src)
new /obj/item/clothing/mask/breath(src)
new /obj/item/clothing/mask/breath(src)
if("aid")
- new /obj/item/tank/emergency_oxygen(src)
+ new /obj/item/tank/internals/emergency_oxygen(src)
new /obj/item/storage/toolbox/emergency(src)
new /obj/item/clothing/mask/breath(src)
new /obj/item/storage/firstaid/o2(src)
if("tank")
- new /obj/item/tank/emergency_oxygen/engi(src)
+ new /obj/item/tank/internals/emergency_oxygen/engi(src)
new /obj/item/clothing/mask/breath(src)
- new /obj/item/tank/emergency_oxygen/engi(src)
+ new /obj/item/tank/internals/emergency_oxygen/engi(src)
new /obj/item/clothing/mask/breath(src)
if("both")
new /obj/item/storage/toolbox/emergency(src)
- new /obj/item/tank/emergency_oxygen/engi(src)
+ new /obj/item/tank/internals/emergency_oxygen/engi(src)
new /obj/item/clothing/mask/breath(src)
new /obj/item/storage/firstaid/o2(src)
if("nothing")
@@ -57,7 +57,7 @@
qdel(src)*/
/obj/structure/closet/emcloset/legacy/populate_contents()
- new /obj/item/tank/oxygen(src)
+ new /obj/item/tank/internals/oxygen(src)
new /obj/item/clothing/mask/gas(src)
/*
@@ -73,7 +73,7 @@
/obj/structure/closet/firecloset/populate_contents()
new /obj/item/clothing/suit/fire/firefighter(src)
new /obj/item/clothing/mask/gas(src)
- new /obj/item/tank/oxygen/red(src)
+ new /obj/item/tank/internals/oxygen/red(src)
new /obj/item/extinguisher(src)
new /obj/item/clothing/head/hardhat/red(src)
@@ -81,7 +81,7 @@
new /obj/item/clothing/suit/fire/firefighter(src)
new /obj/item/clothing/mask/gas(src)
new /obj/item/flashlight(src)
- new /obj/item/tank/oxygen/red(src)
+ new /obj/item/tank/internals/oxygen/red(src)
new /obj/item/extinguisher(src)
new /obj/item/clothing/head/hardhat/red(src)
@@ -140,6 +140,7 @@
icon_closed = "radsuitcloset"
/obj/structure/closet/radiation/populate_contents()
+ new /obj/item/geiger_counter(src)
new /obj/item/clothing/suit/radiation(src)
new /obj/item/clothing/head/radiation(src)
@@ -190,7 +191,7 @@
new /obj/item/clothing/suit/fire/firefighter(src)
new /obj/item/clothing/mask/gas(src)
new /obj/item/flashlight(src)
- new /obj/item/tank/oxygen/red(src)
+ new /obj/item/tank/internals/oxygen/red(src)
new /obj/item/extinguisher(src)
new /obj/item/clothing/head/hardhat/red(src)
diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm
index 353262d123d..c729c93e2f4 100644
--- a/code/game/objects/structures/crates_lockers/crates.dm
+++ b/code/game/objects/structures/crates_lockers/crates.dm
@@ -149,7 +149,7 @@
// Called when a crate is delivered by MULE at a location, for notifying purposes
/obj/structure/closet/crate/proc/notifyRecipient(var/destination)
- var/msg = "[capitalize(name)] has arrived at [destination]."
+ var/list/msg = list("[capitalize(name)] has arrived at [destination].")
if(destination in announce_beacons)
for(var/obj/machinery/requests_console/D in GLOB.allRequestConsoles)
if(D.department in src.announce_beacons[destination])
@@ -385,16 +385,6 @@
icon_opened = "radiationopen"
icon_closed = "radiation"
-/obj/structure/closet/crate/radiation/populate_contents()
- new /obj/item/clothing/suit/radiation(src)
- new /obj/item/clothing/head/radiation(src)
- new /obj/item/clothing/suit/radiation(src)
- new /obj/item/clothing/head/radiation(src)
- new /obj/item/clothing/suit/radiation(src)
- new /obj/item/clothing/head/radiation(src)
- new /obj/item/clothing/suit/radiation(src)
- new /obj/item/clothing/head/radiation(src)
-
/obj/structure/closet/crate/secure/weapon
desc = "A secure weapons crate."
name = "weapons crate"
diff --git a/code/game/objects/structures/crates_lockers/walllocker.dm b/code/game/objects/structures/crates_lockers/walllocker.dm
index 733b34a0414..4a2f9a7ed88 100644
--- a/code/game/objects/structures/crates_lockers/walllocker.dm
+++ b/code/game/objects/structures/crates_lockers/walllocker.dm
@@ -23,9 +23,9 @@
icon_opened = "emergopen"
/obj/structure/closet/walllocker/emerglocker/populate_contents()
- new /obj/item/tank/emergency_oxygen(src)
- new /obj/item/tank/emergency_oxygen(src)
- new /obj/item/tank/emergency_oxygen(src)
+ new /obj/item/tank/internals/emergency_oxygen(src)
+ new /obj/item/tank/internals/emergency_oxygen(src)
+ new /obj/item/tank/internals/emergency_oxygen(src)
new /obj/item/clothing/mask/breath(src)
new /obj/item/clothing/mask/breath(src)
new /obj/item/clothing/mask/breath(src)
diff --git a/code/game/objects/structures/depot.dm b/code/game/objects/structures/depot.dm
index 096ffa9e33b..29ba8882bd7 100644
--- a/code/game/objects/structures/depot.dm
+++ b/code/game/objects/structures/depot.dm
@@ -44,8 +44,7 @@
if(prob(50))
empulse(src, 4, 10)
else
- for(var/mob/living/M in range(10, loc))
- M.apply_effect(rand(5, 25), IRRADIATE)
+ radiation_pulse(get_turf(src), 500, 2)
/obj/structure/fusionreactor/wrench_act(mob/user, obj/item/I)
. = TRUE
diff --git a/code/game/objects/structures/door_assembly_types.dm b/code/game/objects/structures/door_assembly_types.dm
index d421f24b911..108bffa39b5 100644
--- a/code/game/objects/structures/door_assembly_types.dm
+++ b/code/game/objects/structures/door_assembly_types.dm
@@ -124,14 +124,6 @@
noglass = TRUE
material_type = /obj/item/stack/sheet/plasteel
-/obj/structure/door_assembly/door_assembly_shuttle
- name = "shuttle airlock assembly"
- icon = 'icons/obj/doors/airlocks/shuttle/shuttle.dmi'
- base_name = "shuttle airlock"
- overlays_file = 'icons/obj/doors/airlocks/shuttle/overlays.dmi'
- airlock_type = /obj/machinery/door/airlock/shuttle
- glass_type = /obj/machinery/door/airlock/shuttle/glass
-
/obj/structure/door_assembly/multi_tile
name = "large airlock assembly"
icon = 'icons/obj/doors/airlocks/glass_large/glass_large.dmi'
diff --git a/code/game/objects/structures/false_walls.dm b/code/game/objects/structures/false_walls.dm
index 452450d31c8..09298bf7ebe 100644
--- a/code/game/objects/structures/false_walls.dm
+++ b/code/game/objects/structures/false_walls.dm
@@ -12,6 +12,8 @@
anchored = TRUE
icon = 'icons/turf/walls/wall.dmi'
icon_state = "wall"
+ flags_2 = RAD_PROTECT_CONTENTS_2 | RAD_NO_CONTAMINATE_2
+ rad_insulation = RAD_MEDIUM_INSULATION
var/mineral = /obj/item/stack/sheet/metal
var/mineral_amount = 2
@@ -37,6 +39,18 @@
. = ..()
air_update_turf(1)
+/obj/structure/falsewall/examine_status(mob/user)
+ var/healthpercent = (obj_integrity/max_integrity) * 100
+ switch(healthpercent)
+ if(100)
+ return "It looks fully intact."
+ if(70 to 99)
+ return "It looks slightly damaged."
+ if(40 to 70)
+ return "It looks moderately damaged."
+ if(0 to 40)
+ return "It looks heavily damaged."
+
/obj/structure/falsewall/ratvar_act()
new /obj/structure/falsewall/brass(loc)
qdel(src)
@@ -159,6 +173,10 @@
walltype = /turf/simulated/wall/r_wall
mineral = /obj/item/stack/sheet/plasteel
+/obj/structure/falsewall/reinforced/examine_status(mob/user)
+ . = ..()
+ . += " The outer grille is fully intact." //not going to fake other states of disassembly
+
/obj/structure/falsewall/reinforced/ChangeToWall(delete = 1)
var/turf/T = get_turf(src)
T.ChangeTurf(/turf/simulated/wall/r_wall)
@@ -191,16 +209,13 @@
/obj/structure/falsewall/uranium/proc/radiate()
if(!active)
- if(world.time > last_event+15)
+ if(world.time > last_event + 15)
active = 1
- for(var/mob/living/L in range(3,src))
- L.apply_effect(12,IRRADIATE,0)
- for(var/turf/simulated/wall/mineral/uranium/T in range(3,src))
+ radiation_pulse(src, 150)
+ for(var/turf/simulated/wall/mineral/uranium/T in orange(1, src))
T.radiate()
last_event = world.time
active = null
- return
- return
/*
* Other misc falsewall types
*/
@@ -289,7 +304,7 @@
icon_state = "sandstone"
mineral = /obj/item/stack/sheet/mineral/sandstone
walltype = /turf/simulated/wall/mineral/sandstone
- canSmoothWith = list(/obj/structure/falsewall/sandstone, /turf/simulated/wall/mineral/sandstone)
+ canSmoothWith = list(/turf/simulated/wall/mineral/sandstone, /turf/simulated/wall/indestructible/sandstone, /obj/structure/falsewall/sandstone)
/obj/structure/falsewall/wood
name = "wooden wall"
@@ -326,7 +341,7 @@
mineral = /obj/item/stack/sheet/mineral/titanium
walltype = /turf/simulated/wall/mineral/titanium
smooth = SMOOTH_MORE
- canSmoothWith = list(/turf/simulated/wall/mineral/titanium, /obj/machinery/door/airlock/shuttle, /obj/machinery/door/airlock, /obj/structure/window/full/shuttle, /obj/structure/shuttle/engine/heater)
+ canSmoothWith = list(/turf/simulated/wall/mineral/titanium, /obj/machinery/door/airlock/titanium, /obj/machinery/door/airlock, /obj/structure/window/full/shuttle, /obj/structure/shuttle/engine/heater)
/obj/structure/falsewall/plastitanium
desc = "An evil wall of plasma and titanium."
@@ -335,7 +350,7 @@
mineral = /obj/item/stack/sheet/mineral/plastitanium
walltype = /turf/simulated/wall/mineral/plastitanium
smooth = SMOOTH_MORE
- canSmoothWith = list(/turf/simulated/wall/mineral/plastitanium, /turf/simulated/wall/mineral/plastitanium/nodiagonal, /obj/machinery/door/airlock/shuttle, /obj/machinery/door/airlock, /obj/structure/window/full/shuttle, /obj/structure/shuttle/engine/heater)
+ canSmoothWith = list(/turf/simulated/wall/mineral/plastitanium, /turf/simulated/wall/indestructible/syndicate, /turf/simulated/wall/mineral/plastitanium/nodiagonal, /obj/machinery/door/airlock/titanium, /obj/machinery/door/airlock, /obj/structure/window/full/shuttle, /obj/structure/shuttle/engine/heater)
/obj/structure/falsewall/brass
name = "clockwork wall"
diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm
index 47dbf7456c1..fb145958ed7 100644
--- a/code/game/objects/structures/girders.dm
+++ b/code/game/objects/structures/girders.dm
@@ -4,6 +4,8 @@
anchored = 1
density = 1
layer = BELOW_OBJ_LAYER
+ flags_2 = RAD_PROTECT_CONTENTS_2 | RAD_NO_CONTAMINATE_2
+ rad_insulation = RAD_VERY_LIGHT_INSULATION
var/state = GIRDER_NORMAL
var/girderpasschance = 20 // percentage chance that a projectile passes through the girder.
max_integrity = 200
diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm
index b1e0f40b8d9..1b7e86571de 100644
--- a/code/game/objects/structures/grille.dm
+++ b/code/game/objects/structures/grille.dm
@@ -6,6 +6,7 @@
density = TRUE
anchored = TRUE
flags = CONDUCT
+ flags_2 = RAD_PROTECT_CONTENTS_2 | RAD_NO_CONTAMINATE_2
pressure_resistance = 5*ONE_ATMOSPHERE
layer = BELOW_OBJ_LAYER
level = 3
@@ -159,54 +160,37 @@
"You [anchored ? "fasten [src] to" : "unfasten [src] from"] the floor.")
/obj/structure/grille/proc/build_window(obj/item/stack/sheet/S, mob/user)
- var/dir_to_set = NORTH
+ var/dir_to_set = SOUTHWEST
if(!istype(S) || !user)
return
if(broken)
to_chat(user, "You must repair or replace [src] first!")
return
- if(S.get_amount() < 1)
- to_chat(user, "You need at least one sheet of glass for that!")
+ if(S.get_amount() < 2)
+ to_chat(user, "You need at least two sheets of glass for that!")
return
if(!anchored)
to_chat(user, "[src] needs to be fastened to the floor first!")
return
- if(!getRelativeDirection(src, user) && (user.loc != loc)) //essentially a cardinal direction adjacent or sharing same loc check
- to_chat(user, "You can't reach.")
- return
- if(loc == user.loc)
- dir_to_set = user.dir
- else
- if(x == user.x)
- if(y > user.y)
- dir_to_set = SOUTH
- else
- dir_to_set = NORTH
- else if(y == user.y)
- if(x > user.x)
- dir_to_set = WEST
- else
- dir_to_set = EAST
for(var/obj/structure/window/WINDOW in loc)
- if(WINDOW.dir == dir_to_set)
- to_chat(user, "There is already a window facing this way there.")
- return
+ to_chat(user, "There is already a window there!")
+ return
to_chat(user, "You start placing the window...")
if(do_after(user, 20, target = src))
if(!loc || !anchored) //Grille destroyed or unanchored while waiting
return
- for(var/obj/structure/window/WINDOW in loc)
- if(WINDOW.dir == dir_to_set)//checking this for a 2nd time to check if a window was made while we were waiting.
- to_chat(user, "There is already a window facing this way there.")
- return
- var/obj/structure/window/W = new S.created_window(get_turf(src))
- S.use(1)
+ for(var/obj/structure/window/WINDOW in loc) //checking this for a 2nd time to check if a window was made while we were waiting.
+ to_chat(user, "There is already a window there!")
+ return
+ var/obj/structure/window/W = new S.full_window(drop_location())
W.setDir(dir_to_set)
W.ini_dir = dir_to_set
W.anchored = FALSE
- W.state = WINDOW_OUT_OF_FRAME
- to_chat(user, "You place the [W] on [src].")
+ air_update_turf(TRUE)
W.update_nearby_icons()
+ W.state = WINDOW_OUT_OF_FRAME
+ S.use(2)
+ to_chat(user, "You place the [W] on [src].")
/obj/structure/grille/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
@@ -270,7 +254,7 @@
var/obj/structure/cable/C = T.get_cable_node()
if(C)
playsound(src, 'sound/magic/lightningshock.ogg', 100, TRUE, extrarange = 5)
- tesla_zap(src, 3, C.newavail() * 0.01) //Zap for 1/100 of the amount of power. At a million watts in the grid, it will be as powerful as a tesla revolver shot.
+ tesla_zap(src, 3, C.newavail() * 0.01, ZAP_MOB_DAMAGE | ZAP_OBJ_DAMAGE | ZAP_MOB_STUN | ZAP_ALLOW_DUPLICATES) //Zap for 1/100 of the amount of power. At a million watts in the grid, it will be as powerful as a tesla revolver shot.
C.add_delayedload(C.newavail() * 0.0375) // you can gain up to 3.5 via the 4x upgrades power is halved by the pole so thats 2x then 1X then .5X for 3.5x the 3 bounces shock.
return ..()
diff --git a/code/game/objects/structures/holosign.dm b/code/game/objects/structures/holosign.dm
index 91f88b34913..211dec106b3 100644
--- a/code/game/objects/structures/holosign.dm
+++ b/code/game/objects/structures/holosign.dm
@@ -62,6 +62,8 @@
/obj/structure/holosign/barrier/engineering
icon_state = "holosign_engi"
+ flags_2 = RAD_PROTECT_CONTENTS_2 | RAD_NO_CONTAMINATE_2
+ rad_insulation = RAD_LIGHT_INSULATION
/obj/structure/holosign/barrier/atmos
name = "holo firelock"
@@ -72,6 +74,8 @@
anchored = TRUE
layer = ABOVE_MOB_LAYER
alpha = 150
+ flags_2 = RAD_PROTECT_CONTENTS_2 | RAD_NO_CONTAMINATE_2
+ rad_insulation = RAD_LIGHT_INSULATION
/obj/structure/holosign/barrier/atmos/Initialize(mapload)
. = ..()
@@ -118,7 +122,7 @@
if(!shockcd)
if(isliving(user))
var/mob/living/M = user
- M.electrocute_act(15, "Energy Barrier", safety = TRUE)
+ M.electrocute_act(15, "Energy Barrier")
shockcd = TRUE
addtimer(CALLBACK(src, .proc/cooldown), 5)
@@ -130,6 +134,6 @@
return
var/mob/living/M = AM
- M.electrocute_act(15, "Energy Barrier", safety = TRUE)
+ M.electrocute_act(15, "Energy Barrier")
shockcd = TRUE
addtimer(CALLBACK(src, .proc/cooldown), 5)
diff --git a/code/game/objects/structures/mineral_doors.dm b/code/game/objects/structures/mineral_doors.dm
index 29f2337c22e..bde75bb489d 100644
--- a/code/game/objects/structures/mineral_doors.dm
+++ b/code/game/objects/structures/mineral_doors.dm
@@ -9,6 +9,8 @@
icon_state = "metal"
max_integrity = 200
armor = list("melee" = 10, "bullet" = 0, "laser" = 0, "energy" = 100, "bomb" = 10, "bio" = 100, "rad" = 100, "fire" = 50, "acid" = 50)
+ flags_2 = RAD_PROTECT_CONTENTS_2 | RAD_NO_CONTAMINATE_2
+ rad_insulation = RAD_MEDIUM_INSULATION
var/initial_state
var/state = 0 //closed, 1 == open
var/isSwitchingStates = 0
@@ -153,11 +155,13 @@
icon_state = "silver"
sheetType = /obj/item/stack/sheet/mineral/silver
max_integrity = 300
+ rad_insulation = RAD_HEAVY_INSULATION
/obj/structure/mineral_door/gold
name = "gold door"
icon_state = "gold"
sheetType = /obj/item/stack/sheet/mineral/gold
+ rad_insulation = RAD_HEAVY_INSULATION
/obj/structure/mineral_door/uranium
name = "uranium door"
@@ -174,6 +178,7 @@
/obj/structure/mineral_door/transparent
opacity = 0
+ rad_insulation = RAD_VERY_LIGHT_INSULATION
/obj/structure/mineral_door/transparent/Close()
..()
@@ -207,6 +212,7 @@
icon_state = "diamond"
sheetType = /obj/item/stack/sheet/mineral/diamond
max_integrity = 1000
+ rad_insulation = RAD_EXTREME_INSULATION
/obj/structure/mineral_door/wood
name = "wood door"
@@ -217,6 +223,7 @@
hardness = 1
resistance_flags = FLAMMABLE
max_integrity = 200
+ rad_insulation = RAD_VERY_LIGHT_INSULATION
/obj/structure/mineral_door/resin
name = "resin door"
diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm
index 5a8a122be21..ad77d1cffc1 100644
--- a/code/game/objects/structures/signs.dm
+++ b/code/game/objects/structures/signs.dm
@@ -6,6 +6,7 @@
layer = 3.5
max_integrity = 100
armor = list("melee" = 50, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
+ flags_2 = RAD_PROTECT_CONTENTS_2 | RAD_NO_CONTAMINATE_2
/obj/structure/sign/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
switch(damage_type)
@@ -152,10 +153,10 @@
icon = 'icons/obj/mining.dmi'
icon_state = "xeno_warning"
-/obj/structure/sign/redcross
+/obj/structure/sign/lifestar
name = "medbay"
- desc = "The Intergalactic symbol of Medical institutions. You'll probably get help here.'"
- icon_state = "redcross"
+ desc = "The Star of Life, a symbol of Medical Aid."
+ icon_state = "lifestar"
/obj/structure/sign/greencross
name = "medbay"
diff --git a/code/game/objects/structures/statues.dm b/code/game/objects/structures/statues.dm
index 22449bb547b..2c7ffbe2e90 100644
--- a/code/game/objects/structures/statues.dm
+++ b/code/game/objects/structures/statues.dm
@@ -90,10 +90,9 @@
/obj/structure/statue/uranium/proc/radiate()
if(!active)
- if(world.time > last_event+15)
+ if(world.time > last_event + 15)
active = 1
- for(var/mob/living/L in range(3,src))
- L.apply_effect(12,IRRADIATE,0)
+ radiation_pulse(src, 30)
last_event = world.time
active = null
diff --git a/code/game/objects/structures/tank_dispenser.dm b/code/game/objects/structures/tank_dispenser.dm
index 1a67c1668e4..8748ab570fd 100644
--- a/code/game/objects/structures/tank_dispenser.dm
+++ b/code/game/objects/structures/tank_dispenser.dm
@@ -30,11 +30,11 @@
/obj/structure/dispenser/proc/initialize_tanks()
for(var/I in 1 to starting_plasma_tanks)
- var/obj/item/tank/plasma/P = new(src)
+ var/obj/item/tank/internals/plasma/P = new(src)
stored_plasma_tanks.Add(P)
for(var/I in 1 to starting_oxygen_tanks)
- var/obj/item/tank/oxygen/O = new(src)
+ var/obj/item/tank/internals/oxygen/O = new(src)
stored_oxygen_tanks.Add(O)
/obj/structure/dispenser/update_icon()
@@ -89,11 +89,11 @@
return TRUE
/obj/structure/dispenser/attackby(obj/item/I, mob/user, params)
- if(istype(I, /obj/item/tank/oxygen) || istype(I, /obj/item/tank/air) || istype(I, /obj/item/tank/anesthetic))
+ if(istype(I, /obj/item/tank/internals/oxygen) || istype(I, /obj/item/tank/internals/air) || istype(I, /obj/item/tank/internals/anesthetic))
try_insert_tank(user, stored_oxygen_tanks, I)
return
- if(istype(I, /obj/item/tank/plasma))
+ if(istype(I, /obj/item/tank/internals/plasma))
try_insert_tank(user, stored_plasma_tanks, I)
return
@@ -112,7 +112,7 @@
if(!LAZYLEN(tank_list))
return // There are no tanks left to withdraw.
- var/obj/item/tank/T = tank_list[1]
+ var/obj/item/tank/internals/T = tank_list[1]
tank_list.Remove(T)
if(!user.put_in_hands(T))
diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm
index b54e6f40434..d513b4e2920 100644
--- a/code/game/objects/structures/watercloset.dm
+++ b/code/game/objects/structures/watercloset.dm
@@ -27,7 +27,7 @@
user.changeNext_move(CLICK_CD_MELEE)
playsound(src.loc, "swing_hit", 25, 1)
swirlie.visible_message("[user] slams the toilet seat onto [swirlie]'s head!", "[user] slams the toilet seat onto [swirlie]'s head!", "You hear reverberating porcelain.")
- swirlie.adjustBruteLoss(5)
+ swirlie.apply_damage(5, BRUTE, BODY_ZONE_HEAD)
return
if(cistern && !open)
@@ -101,8 +101,8 @@
swirlie = null
else
playsound(src.loc, 'sound/effects/bang.ogg', 25, 1)
- GM.visible_message("[user] slams [GM.name] into [src]!", "[user] slams [GM.name] into [src]!")
- GM.adjustBruteLoss(5)
+ GM.visible_message("[user] slams [GM.name]'s head into [src]!", "[user] slams [GM.name]'s head into [src]!")
+ GM.apply_damage(5, BRUTE, BODY_ZONE_HEAD)
else
to_chat(user, "You need a tighter grip!")
@@ -212,8 +212,8 @@
return
user.changeNext_move(CLICK_CD_MELEE)
playsound(src.loc, 'sound/effects/bang.ogg', 25, 1)
- user.visible_message("[user] slams [GM] into [src]!", "You slam [GM] into [src]!")
- GM.adjustBruteLoss(8)
+ user.visible_message("[user] slams [GM]'s head into [src]!", "You slam [GM]'s head into [src]!")
+ GM.apply_damage(8, BRUTE, BODY_ZONE_HEAD)
else
to_chat(user, "You need a tighter grip!")
@@ -240,6 +240,10 @@
pixel_x = 0
pixel_y = 32
+#define SHOWER_FREEZING "freezing"
+#define SHOWER_NORMAL "normal"
+#define SHOWER_BOILING "boiling"
+
/obj/machinery/shower
name = "shower"
desc = "The HS-451. Installed in the 2550s by the Nanotrasen Hygiene Division."
@@ -248,11 +252,11 @@
density = 0
anchored = 1
use_power = NO_POWER_USE
- var/on = 0
- var/obj/effect/mist/mymist = null
- var/ismist = 0 //needs a var so we can make it linger~
- var/watertemp = "normal" //freezing, normal, or boiling
- var/mobpresent = 0 //true if there is a mob on the shower's loc, this is to ease process()
+ ///Is the shower on or off?
+ var/on = FALSE
+ ///What temperature the shower reagents are set to.
+ var/current_temperature = SHOWER_NORMAL
+ ///What sound will be played on loop when the shower is on and pouring water.
var/datum/looping_sound/showering/soundloop
/obj/machinery/shower/New(turf/T, newdir = SOUTH, building = FALSE)
@@ -270,7 +274,6 @@
layer = FLY_LAYER
/obj/machinery/shower/Destroy()
- QDEL_NULL(mymist)
QDEL_NULL(soundloop)
return ..()
@@ -280,47 +283,45 @@
name = "mist"
icon = 'icons/obj/watercloset.dmi'
icon_state = "mist"
- layer = MOB_LAYER + 1
- anchored = 1
+ layer = FLY_LAYER
+ anchored = TRUE
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
-/obj/machinery/shower/attack_hand(mob/M as mob)
+/obj/machinery/shower/attack_hand(mob/M)
on = !on
update_icon()
+ handle_mist()
+ add_fingerprint(M)
if(on)
+ START_PROCESSING(SSmachines, src)
+ process()
soundloop.start()
- if(M.loc == loc)
- wash(M)
- check_heat(M)
- M.water_act(100, convertHeat(), src)
- for(var/atom/movable/G in src.loc)
- G.clean_blood()
- G.water_act(100, convertHeat(), src)
else
soundloop.stop()
+ var/turf/simulated/T = loc
+ if(istype(T) && !T.density)
+ T.MakeSlippery(TURF_WET_WATER, 5 SECONDS)
-/obj/machinery/shower/attackby(obj/item/I as obj, mob/user as mob, params)
+/obj/machinery/shower/attackby(obj/item/I, mob/user, params)
if(I.type == /obj/item/analyzer)
- to_chat(user, "The water temperature seems to be [watertemp].")
- if(on)
- I.water_act(100, convertHeat(), src)
+ to_chat(user, "The water temperature seems to be [current_temperature].")
return ..()
/obj/machinery/shower/wrench_act(mob/user, obj/item/I)
- . = TRUE
- if(!I.tool_use_check(user, 0))
- return
- to_chat(user, "You begin to adjust the temperature valve with the [I].")
- if(I.use_tool(src, user, 50, volume = I.tool_volume))
- switch(watertemp)
- if("normal")
- watertemp = "freezing"
- if("freezing")
- watertemp = "boiling"
- if("boiling")
- watertemp = "normal"
- user.visible_message("[user] adjusts the shower with the [I].", "You adjust [src] to [watertemp].")
- update_icon() //letsa update whenever we change the temperature, since the mist might need to change
+ ..()
+ to_chat(user, "You begin to adjust the temperature valve with [I].")
+ if(I.use_tool(src, user, 50))
+ switch(current_temperature)
+ if(SHOWER_NORMAL)
+ current_temperature = SHOWER_FREEZING
+ if(SHOWER_FREEZING)
+ current_temperature = SHOWER_BOILING
+ if(SHOWER_BOILING)
+ current_temperature = SHOWER_NORMAL
+ user.visible_message("[user] adjusts the shower with \the [I].", "You adjust the shower with \the [I] to [current_temperature] temperature.")
+ add_hiddenprint(user)
+ handle_mist()
+ return TRUE
/obj/machinery/shower/welder_act(mob/user, obj/item/I)
. = TRUE
@@ -331,111 +332,103 @@
return
visible_message("[user] begins slicing [src] free...", "You begin slicing [src] free...", "You hear welding.")
if(I.use_tool(src, user, 40, volume = I.tool_volume))
- if(mymist)
- qdel(mymist)
user.visible_message("[user] cuts [src] loose!", "You cut [src] loose!")
var/obj/item/mounted/shower/S = new /obj/item/mounted/shower(get_turf(user))
transfer_prints_to(S, TRUE)
qdel(src)
-/obj/machinery/shower/update_icon() //this makes the shower mist up or clear mist (depending on water temperature)
- overlays.Cut() //once it's been on for a while, in addition to handling the water overlay.
+/obj/machinery/shower/update_icon()
+ cut_overlays()
if(on)
- overlays += image('icons/obj/watercloset.dmi', src, "water", MOB_LAYER + 1, dir)
- var/mist_time = 50 //5 seconds at normal temperature to build up mist
- if(watertemp == "freezing")
- mist_time = 70 //7 seconds on freezing temperature to disperse existing mist
- if(watertemp == "boiling")
- mist_time = 20 //2 seconds on boiling temperature to build up mist
- addtimer(CALLBACK(src, .proc/update_mist), mist_time)
- else
- addtimer(CALLBACK(src, .proc/update_mist), 250) //25 seconds for mist to disperse after being turned off
+ var/mutable_appearance/water_falling = mutable_appearance('icons/obj/watercloset.dmi', "water", ABOVE_MOB_LAYER)
+ add_overlay(water_falling)
-/obj/machinery/shower/proc/update_mist()
+/obj/machinery/shower/proc/handle_mist()
+ // If there is no mist, and the shower was turned on (on a non-freezing temp): make mist in 5 seconds
+ // If there was already mist, and the shower was turned off (or made cold): remove the existing mist in 25 sec
+ var/obj/effect/mist/mist = locate() in loc
+ if(!mist && on && current_temperature != SHOWER_FREEZING)
+ addtimer(CALLBACK(src, .proc/make_mist), 5 SECONDS)
+
+ if(mist && (!on || current_temperature == SHOWER_FREEZING))
+ addtimer(CALLBACK(src, .proc/clear_mist), 25 SECONDS)
+
+
+/obj/machinery/shower/proc/make_mist()
+ var/obj/effect/mist/mist = locate() in loc
+ if(!mist && on && current_temperature != SHOWER_FREEZING)
+ new /obj/effect/mist(loc)
+
+/obj/machinery/shower/proc/clear_mist()
+ var/obj/effect/mist/mist = locate() in loc
+ if(mist && (!on || current_temperature == SHOWER_FREEZING))
+ qdel(mist)
+
+/obj/machinery/shower/Crossed(atom/movable/AM)
+ ..()
if(on)
- if(watertemp == "freezing")
- if(mymist)
- qdel(mymist)
- ismist = 0
- return
- if(mymist)
- return
- ismist = 1
- mymist = new /obj/effect/mist(loc)
- else
- if(mymist)
- qdel(mymist)
- ismist = 0
-
-/obj/machinery/shower/Crossed(atom/movable/O, oldloc)
- ..()
- wash(O)
- if(ismob(O))
- mobpresent += 1
- check_heat(O)
-
-/obj/machinery/shower/Uncrossed(atom/movable/O)
- if(ismob(O))
- mobpresent -= 1
- ..()
+ wash(AM)
/obj/machinery/shower/proc/convertHeat()
- switch(watertemp)
- if("boiling")
+ switch(current_temperature)
+ if(SHOWER_BOILING)
return 340.15
- if("normal")
+ if(SHOWER_NORMAL)
return 310.15
- if("freezing")
+ if(SHOWER_FREEZING)
return 230.15
//Yes, showers are super powerful as far as washing goes.
-/obj/machinery/shower/proc/wash(atom/movable/O as obj|mob)
- if(!on) return
-
- if(istype(O, /obj/item))
- var/obj/item/I = O
+/obj/machinery/shower/proc/wash(atom/A)
+ if(isitem(A))
+ var/obj/item/I = A
I.extinguish()
- O.water_act(100, convertHeat(), src)
+ A.water_act(100, convertHeat(), src)
- if(isliving(O))
- var/mob/living/L = O
+ if(isliving(A))
+ var/mob/living/L = A
+ check_heat(L)
L.ExtinguishMob()
L.adjust_fire_stacks(-20) //Douse ourselves with water to avoid fire more easily
- to_chat(L, "You've been drenched in water!")
- L.clean_blood()
- if(isturf(loc))
- var/turf/tile = loc
- loc.clean_blood()
- for(var/obj/effect/E in tile)
- if(is_cleanable(E))
- qdel(E)
+ A.clean_blood(radiation_clean = TRUE)
/obj/machinery/shower/process()
- if(!on || !mobpresent)
- return
- for(var/mob/living/carbon/C in loc)
- if(prob(33))
- wash(C) //re-applies water and re-cleans mob while they remain under the shower, 33% chance per process to avoid message spam/quick death
- check_heat(C)
+ if(on)
+ if(isturf(loc))
+ var/turf/tile = loc
+ tile.water_act(100, convertHeat(), src)
+ tile.clean_blood(radiation_clean = TRUE)
+ for(var/obj/effect/E in tile)
+ if(is_cleanable(E))
+ qdel(E)
+ for(var/A in loc)
+ wash(A)
+ else
+ on = FALSE
+ soundloop.stop()
+ handle_mist()
+ update_icon()
-/obj/machinery/shower/proc/check_heat(mob/M as mob)
- if(!on || watertemp == "normal")
+/obj/machinery/shower/proc/check_heat(mob/M)
+ if(current_temperature == SHOWER_NORMAL)
return
if(iscarbon(M))
var/mob/living/carbon/C = M
- if(watertemp == "freezing")
+ if(current_temperature == SHOWER_FREEZING)
//C.bodytemperature = max(80, C.bodytemperature - 80)
to_chat(C, "The water is freezing!")
- return
- if(watertemp == "boiling")
+
+ else if(current_temperature == SHOWER_BOILING)
//C.bodytemperature = min(500, C.bodytemperature + 35)
C.adjustFireLoss(5)
to_chat(C, "The water is searing!")
- return
+#undef SHOWER_FREEZING
+#undef SHOWER_NORMAL
+#undef SHOWER_BOILING
/obj/item/bikehorn/rubberducky
name = "rubber ducky"
diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm
index 65c212af723..d7f5470d91a 100644
--- a/code/game/objects/structures/window.dm
+++ b/code/game/objects/structures/window.dm
@@ -1,26 +1,3 @@
-GLOBAL_LIST_INIT(wcBar, pick(list("#0d8395", "#58b5c3", "#58c366", "#90d79a", "#ffffff")))
-GLOBAL_LIST_INIT(wcBrig, pick(list("#aa0808", "#7f0606", "#ff0000")))
-GLOBAL_LIST_INIT(wcCommon, pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8fcf44", "#ffffff")))
-
-/obj/proc/color_windows(obj/W)
- var/list/wcBarAreas = list(/area/crew_quarters/bar)
- var/list/wcBrigAreas = list(/area/security, /area/shuttle/gamma)
-
- var/newcolor
- var/turf/T = get_turf(W)
- if(!istype(T))
- return
- var/area/A = T.loc
-
- if(is_type_in_list(A,wcBarAreas))
- newcolor = GLOB.wcBar
- else if(is_type_in_list(A,wcBrigAreas))
- newcolor = GLOB.wcBrig
- else
- newcolor = GLOB.wcCommon
-
- return newcolor
-
/obj/structure/window
name = "window"
desc = "A window."
@@ -30,10 +7,12 @@ GLOBAL_LIST_INIT(wcCommon, pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e",
pressure_resistance = 4*ONE_ATMOSPHERE
anchored = TRUE
flags = ON_BORDER
+ flags_2 = RAD_PROTECT_CONTENTS_2
can_be_unanchored = TRUE
max_integrity = 25
resistance_flags = ACID_PROOF
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 100)
+ rad_insulation = RAD_VERY_LIGHT_INSULATION
var/ini_dir = null
var/state = WINDOW_OUT_OF_FRAME
var/reinf = FALSE
@@ -41,11 +20,10 @@ GLOBAL_LIST_INIT(wcCommon, pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e",
var/decon_speed = null
var/fulltile = FALSE
var/shardtype = /obj/item/shard
+ var/glass_decal = /obj/effect/decal/cleanable/glass
var/glass_type = /obj/item/stack/sheet/glass
var/glass_amount = 1
- var/cancolor = FALSE
- var/image/crack_overlay
- var/list/debris = list()
+ var/mutable_appearance/crack_overlay
var/real_explosion_block //ignore this, just use explosion_block
var/breaksound = "shatter"
var/hitsound = 'sound/effects/Glasshit.ogg'
@@ -79,30 +57,12 @@ GLOBAL_LIST_INIT(wcCommon, pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e",
ini_dir = dir
- if(!color && cancolor)
- color = color_windows(src)
-
- // Precreate our own debris
-
- var/shards = 1
if(fulltile)
- shards++
setDir()
if(decon_speed == null && fulltile)
decon_speed = 2 SECONDS
- var/rods = 0
- if(reinf)
- rods++
- if(fulltile)
- rods++
-
- for(var/i in 1 to shards)
- debris += new shardtype(src)
- if(rods)
- debris += new /obj/item/stack/rods(src, rods)
-
//windows only block while reinforced and fulltile, so we'll use the proc
real_explosion_block = explosion_block
explosion_block = EXPLOSION_BLOCK_PROC
@@ -111,8 +71,6 @@ GLOBAL_LIST_INIT(wcCommon, pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e",
/obj/structure/window/narsie_act()
color = NARSIE_WINDOW_COLOUR
- for(var/obj/item/shard/shard in debris)
- shard.color = NARSIE_WINDOW_COLOUR
/obj/structure/window/ratvar_act()
if(!fulltile)
@@ -322,6 +280,7 @@ GLOBAL_LIST_INIT(wcCommon, pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e",
WELDER_ATTEMPT_REPAIR_MESSAGE
if(I.use_tool(src, user, 40, volume = I.tool_volume))
obj_integrity = max_integrity
+ update_nearby_icons()
WELDER_REPAIR_SUCCESS_MESSAGE
/obj/structure/window/proc/check_state(checked_state)
@@ -369,13 +328,20 @@ GLOBAL_LIST_INIT(wcCommon, pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e",
if(!disassembled)
playsound(src, breaksound, 70, 1)
if(!(flags & NODECONSTRUCT))
- for(var/i in debris)
- var/obj/item/I = i
- I.forceMove(loc)
- transfer_fingerprints_to(I)
+ for(var/obj/item/shard/debris in spawnDebris(drop_location()))
+ transfer_fingerprints_to(debris) // transfer fingerprints to shards only
qdel(src)
update_nearby_icons()
+/obj/structure/window/proc/spawnDebris(location)
+ . = list()
+ . += new shardtype(location)
+ . += new glass_decal(location)
+ if(reinf)
+ . += new /obj/item/stack/rods(location, (fulltile ? 2 : 1))
+ if(fulltile)
+ . += new shardtype(location)
+
/obj/structure/window/verb/rotate()
set name = "Rotate Window Counter-Clockwise"
set category = "Object"
@@ -477,14 +443,16 @@ GLOBAL_LIST_INIT(wcCommon, pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e",
if(!fulltile)
return
var/ratio = obj_integrity / max_integrity
- ratio = CEILING(ratio*4, 1) * 25
+ ratio = CEILING(ratio * 4, 1) * 25
+
if(smooth)
queue_smooth(src)
- overlays -= crack_overlay
+
+ cut_overlay(crack_overlay)
if(ratio > 75)
return
- crack_overlay = image('icons/obj/structures.dmi',"damage[ratio]",-(layer+0.1))
- overlays += crack_overlay
+ crack_overlay = mutable_appearance('icons/obj/structures.dmi', "damage[ratio]", -(layer+0.1))
+ add_overlay(crack_overlay)
/obj/structure/window/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
..()
@@ -502,9 +470,9 @@ GLOBAL_LIST_INIT(wcCommon, pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e",
desc = "It looks rather strong. Might take a few good hits to shatter it."
icon_state = "rwindow"
reinf = TRUE
- cancolor = TRUE
heat_resistance = 1600
armor = list("melee" = 50, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 25, "bio" = 100, "rad" = 100, "fire" = 80, "acid" = 100)
+ rad_insulation = RAD_HEAVY_INSULATION
max_integrity = 50
explosion_block = 1
glass_type = /obj/item/stack/sheet/rglass
@@ -573,12 +541,14 @@ GLOBAL_LIST_INIT(wcCommon, pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e",
name = "plasma window"
desc = "A window made out of a plasma-silicate alloy. It looks insanely tough to break and burn through."
icon_state = "plasmawindow"
+ glass_decal = /obj/effect/decal/cleanable/glass/plasma
shardtype = /obj/item/shard/plasma
glass_type = /obj/item/stack/sheet/plasmaglass
heat_resistance = 32000
max_integrity = 150
explosion_block = 1
armor = list("melee" = 75, "bullet" = 5, "laser" = 0, "energy" = 0, "bomb" = 45, "bio" = 100, "rad" = 100, "fire" = 99, "acid" = 100)
+ rad_insulation = RAD_NO_INSULATION
/obj/structure/window/plasmabasic/BlockSuperconductivity()
return 1
@@ -587,12 +557,14 @@ GLOBAL_LIST_INIT(wcCommon, pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e",
name = "reinforced plasma window"
desc = "A plasma-glass alloy window, with rods supporting it. It looks hopelessly tough to break. It also looks completely fireproof, considering how basic plasma windows are insanely fireproof."
icon_state = "plasmarwindow"
+ glass_decal = /obj/effect/decal/cleanable/glass/plasma
shardtype = /obj/item/shard/plasma
glass_type = /obj/item/stack/sheet/plasmarglass
reinf = TRUE
max_integrity = 500
explosion_block = 2
armor = list("melee" = 85, "bullet" = 20, "laser" = 0, "energy" = 0, "bomb" = 60, "bio" = 100, "rad" = 100, "fire" = 99, "acid" = 100)
+ rad_insulation = RAD_NO_INSULATION
damage_deflection = 21
/obj/structure/window/plasmareinforced/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
@@ -614,7 +586,6 @@ GLOBAL_LIST_INIT(wcCommon, pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e",
icon_state = "window"
max_integrity = 50
smooth = SMOOTH_TRUE
- cancolor = TRUE
canSmoothWith = list(/obj/structure/window/full/basic, /obj/structure/window/full/reinforced, /obj/structure/window/full/reinforced/tinted, /obj/structure/window/full/plasmabasic, /obj/structure/window/full/plasmareinforced)
/obj/structure/window/full/plasmabasic
@@ -622,6 +593,7 @@ GLOBAL_LIST_INIT(wcCommon, pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e",
desc = "A plasma-glass alloy window. It looks insanely tough to break. It appears it's also insanely tough to burn through."
icon = 'icons/obj/smooth_structures/plasma_window.dmi'
icon_state = "plasmawindow"
+ glass_decal = /obj/effect/decal/cleanable/glass/plasma
shardtype = /obj/item/shard/plasma
glass_type = /obj/item/stack/sheet/plasmaglass
heat_resistance = 32000
@@ -630,12 +602,14 @@ GLOBAL_LIST_INIT(wcCommon, pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e",
canSmoothWith = list(/obj/structure/window/full/basic, /obj/structure/window/full/reinforced, /obj/structure/window/full/reinforced/tinted, /obj/structure/window/full/plasmabasic, /obj/structure/window/full/plasmareinforced)
explosion_block = 1
armor = list("melee" = 75, "bullet" = 5, "laser" = 0, "energy" = 0, "bomb" = 45, "bio" = 100, "rad" = 100, "fire" = 99, "acid" = 100)
+ rad_insulation = RAD_NO_INSULATION
/obj/structure/window/full/plasmareinforced
name = "reinforced plasma window"
desc = "A plasma-glass alloy window, with rods supporting it. It looks hopelessly tough to break. It also looks completely fireproof, considering how basic plasma windows are insanely fireproof."
icon = 'icons/obj/smooth_structures/rplasma_window.dmi'
icon_state = "rplasmawindow"
+ glass_decal = /obj/effect/decal/cleanable/glass/plasma
shardtype = /obj/item/shard/plasma
glass_type = /obj/item/stack/sheet/plasmarglass
smooth = SMOOTH_TRUE
@@ -643,6 +617,7 @@ GLOBAL_LIST_INIT(wcCommon, pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e",
max_integrity = 1000
explosion_block = 2
armor = list("melee" = 85, "bullet" = 20, "laser" = 0, "energy" = 0, "bomb" = 60, "bio" = 100, "rad" = 100, "fire" = 99, "acid" = 100)
+ rad_insulation = RAD_NO_INSULATION
/obj/structure/window/full/plasmareinforced/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
return
@@ -658,9 +633,9 @@ GLOBAL_LIST_INIT(wcCommon, pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e",
reinf = TRUE
heat_resistance = 1600
armor = list("melee" = 50, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 25, "bio" = 100, "rad" = 100, "fire" = 80, "acid" = 100)
+ rad_insulation = RAD_HEAVY_INSULATION
explosion_block = 1
glass_type = /obj/item/stack/sheet/rglass
- cancolor = TRUE
/obj/structure/window/full/reinforced/tinted
name = "tinted window"
@@ -673,7 +648,6 @@ GLOBAL_LIST_INIT(wcCommon, pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e",
icon = 'icons/obj/smooth_structures/rice_window.dmi'
icon_state = "ice_window"
max_integrity = 150
- cancolor = FALSE
/obj/structure/window/full/shuttle
name = "shuttle window"
@@ -695,24 +669,20 @@ GLOBAL_LIST_INIT(wcCommon, pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e",
/obj/structure/window/full/shuttle/tinted
opacity = TRUE
-/obj/structure/window/plastitanium
+/obj/structure/window/full/plastitanium
name = "plastitanium window"
desc = "An evil looking window of plasma and titanium."
icon = 'icons/obj/smooth_structures/plastitanium_window.dmi'
icon_state = "plastitanium_window"
- dir = FULLTILE_WINDOW_DIR
max_integrity = 100
- fulltile = TRUE
- flags = PREVENT_CLICK_UNDER
reinf = TRUE
heat_resistance = 1600
armor = list("melee" = 50, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 50, "bio" = 100, "rad" = 100, "fire" = 80, "acid" = 100)
+ rad_insulation = RAD_HEAVY_INSULATION
smooth = SMOOTH_TRUE
canSmoothWith = null
explosion_block = 3
- level = 3
glass_type = /obj/item/stack/sheet/plastitaniumglass
- glass_amount = 2
/obj/structure/window/reinforced/clockwork
name = "brass window"
@@ -725,19 +695,18 @@ GLOBAL_LIST_INIT(wcCommon, pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e",
explosion_block = 2 //fancy AND hard to destroy. the most useful combination.
glass_type = /obj/item/stack/tile/brass
reinf = FALSE
- cancolor = FALSE
var/made_glow = FALSE
/obj/structure/window/reinforced/clockwork/Initialize(mapload, direct)
. = ..()
if(fulltile)
made_glow = TRUE
- QDEL_LIST(debris)
if(fulltile)
new /obj/effect/temp_visual/ratvar/window(get_turf(src))
- debris += new/obj/item/stack/tile/brass(src, 2)
- else
- debris += new/obj/item/stack/tile/brass(src, 1)
+
+/obj/structure/window/reinforced/clockwork/spawnDebris(location)
+ . = list()
+ . += new /obj/item/stack/tile/brass(location, (fulltile ? 2 : 1))
/obj/structure/window/reinforced/clockwork/setDir(direct)
if(!made_glow)
@@ -748,7 +717,7 @@ GLOBAL_LIST_INIT(wcCommon, pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e",
/obj/structure/window/reinforced/clockwork/ratvar_act()
obj_integrity = max_integrity
- update_icon()
+ update_nearby_icons()
/obj/structure/window/reinforced/clockwork/narsie_act()
take_damage(rand(25, 75), BRUTE)
diff --git a/code/game/shuttle_engines.dm b/code/game/shuttle_engines.dm
index 415df5d9dde..3e40186623d 100644
--- a/code/game/shuttle_engines.dm
+++ b/code/game/shuttle_engines.dm
@@ -11,23 +11,6 @@
M.Turn(rotation)
transform = M
-/obj/structure/shuttle/window
- name = "shuttle window"
- icon = 'icons/obj/podwindows.dmi'
- icon_state = "1"
- density = 1
- opacity = 0
- anchored = 1
-
-/obj/structure/shuttle/window/CanPass(atom/movable/mover, turf/target, height)
- if(!height)
- return 0
- else
- return ..()
-
-/obj/structure/shuttle/window/CanAtmosPass(turf/T)
- return !density
-
/obj/structure/shuttle/engine
name = "engine"
density = 1
diff --git a/code/game/sound.dm b/code/game/sound.dm
index 6882c27df3d..2801863db7d 100644
--- a/code/game/sound.dm
+++ b/code/game/sound.dm
@@ -161,4 +161,8 @@
soundin = pick('sound/effects/bone_break_1.ogg', 'sound/effects/bone_break_2.ogg', 'sound/effects/bone_break_3.ogg', 'sound/effects/bone_break_4.ogg', 'sound/effects/bone_break_5.ogg', 'sound/effects/bone_break_6.ogg')
if("honkbot_e")
soundin = pick('sound/items/bikehorn.ogg', 'sound/items/AirHorn2.ogg', 'sound/misc/sadtrombone.ogg', 'sound/items/AirHorn.ogg', 'sound/items/WEEOO1.ogg', 'sound/voice/biamthelaw.ogg', 'sound/voice/bcreep.ogg','sound/magic/Fireball.ogg' ,'sound/effects/pray.ogg', 'sound/voice/hiss1.ogg','sound/machines/buzz-sigh.ogg', 'sound/machines/ping.ogg', 'sound/weapons/flashbang.ogg', 'sound/weapons/bladeslice.ogg')
+ if("smcalm")
+ soundin = pick('sound/machines/sm/accent/normal/1.ogg', 'sound/machines/sm/accent/normal/2.ogg', 'sound/machines/sm/accent/normal/3.ogg', 'sound/machines/sm/accent/normal/4.ogg', 'sound/machines/sm/accent/normal/5.ogg', 'sound/machines/sm/accent/normal/6.ogg', 'sound/machines/sm/accent/normal/7.ogg', 'sound/machines/sm/accent/normal/8.ogg', 'sound/machines/sm/accent/normal/9.ogg', 'sound/machines/sm/accent/normal/10.ogg', 'sound/machines/sm/accent/normal/11.ogg', 'sound/machines/sm/accent/normal/12.ogg', 'sound/machines/sm/accent/normal/13.ogg', 'sound/machines/sm/accent/normal/14.ogg', 'sound/machines/sm/accent/normal/15.ogg', 'sound/machines/sm/accent/normal/16.ogg', 'sound/machines/sm/accent/normal/17.ogg', 'sound/machines/sm/accent/normal/18.ogg', 'sound/machines/sm/accent/normal/19.ogg', 'sound/machines/sm/accent/normal/20.ogg', 'sound/machines/sm/accent/normal/21.ogg', 'sound/machines/sm/accent/normal/22.ogg', 'sound/machines/sm/accent/normal/23.ogg', 'sound/machines/sm/accent/normal/24.ogg', 'sound/machines/sm/accent/normal/25.ogg', 'sound/machines/sm/accent/normal/26.ogg', 'sound/machines/sm/accent/normal/27.ogg', 'sound/machines/sm/accent/normal/28.ogg', 'sound/machines/sm/accent/normal/29.ogg', 'sound/machines/sm/accent/normal/30.ogg', 'sound/machines/sm/accent/normal/31.ogg', 'sound/machines/sm/accent/normal/32.ogg', 'sound/machines/sm/accent/normal/33.ogg')
+ if("smdelam")
+ soundin = pick('sound/machines/sm/accent/delam/1.ogg', 'sound/machines/sm/accent/normal/2.ogg', 'sound/machines/sm/accent/normal/3.ogg', 'sound/machines/sm/accent/normal/4.ogg', 'sound/machines/sm/accent/normal/5.ogg', 'sound/machines/sm/accent/normal/6.ogg', 'sound/machines/sm/accent/normal/7.ogg', 'sound/machines/sm/accent/normal/8.ogg', 'sound/machines/sm/accent/normal/9.ogg', 'sound/machines/sm/accent/normal/10.ogg', 'sound/machines/sm/accent/normal/11.ogg', 'sound/machines/sm/accent/normal/12.ogg', 'sound/machines/sm/accent/normal/13.ogg', 'sound/machines/sm/accent/normal/14.ogg', 'sound/machines/sm/accent/normal/15.ogg', 'sound/machines/sm/accent/normal/16.ogg', 'sound/machines/sm/accent/normal/17.ogg', 'sound/machines/sm/accent/normal/18.ogg', 'sound/machines/sm/accent/normal/19.ogg', 'sound/machines/sm/accent/normal/20.ogg', 'sound/machines/sm/accent/normal/21.ogg', 'sound/machines/sm/accent/normal/22.ogg', 'sound/machines/sm/accent/normal/23.ogg', 'sound/machines/sm/accent/normal/24.ogg', 'sound/machines/sm/accent/normal/25.ogg', 'sound/machines/sm/accent/normal/26.ogg', 'sound/machines/sm/accent/normal/27.ogg', 'sound/machines/sm/accent/normal/28.ogg', 'sound/machines/sm/accent/normal/29.ogg', 'sound/machines/sm/accent/normal/30.ogg', 'sound/machines/sm/accent/normal/31.ogg', 'sound/machines/sm/accent/normal/32.ogg', 'sound/machines/sm/accent/normal/33.ogg')
return soundin
diff --git a/code/game/turfs/simulated/floor/mineral.dm b/code/game/turfs/simulated/floor/mineral.dm
index dd975dc80d9..4f62b4dc87b 100644
--- a/code/game/turfs/simulated/floor/mineral.dm
+++ b/code/game/turfs/simulated/floor/mineral.dm
@@ -144,6 +144,11 @@
/turf/simulated/floor/mineral/plastitanium/red/brig
name = "brig floor"
+/turf/simulated/floor/mineral/plastitanium/red/nitrogen
+ oxygen = 0
+ nitrogen = MOLES_N2STANDARD + MOLES_O2STANDARD
+
+
//BANANIUM
/turf/simulated/floor/mineral/bananium
name = "bananium floor"
@@ -237,15 +242,13 @@
/turf/simulated/floor/mineral/uranium/proc/radiate()
if(!active)
- if(world.time > last_event+15)
- active = 1
- for(var/mob/living/L in range(3,src))
- L.apply_effect(1,IRRADIATE,0)
- for(var/turf/simulated/floor/mineral/uranium/T in orange(1,src))
+ if(world.time > last_event + 15)
+ active = TRUE
+ radiation_pulse(src, 10)
+ for(var/turf/simulated/floor/mineral/uranium/T in orange(1, src))
T.radiate()
last_event = world.time
- active = 0
- return
+ active = FALSE
// ALIEN ALLOY
/turf/simulated/floor/mineral/abductor
diff --git a/code/game/turfs/simulated/floor/misc_floor.dm b/code/game/turfs/simulated/floor/misc_floor.dm
index 0808fef7e95..c80cddff699 100644
--- a/code/game/turfs/simulated/floor/misc_floor.dm
+++ b/code/game/turfs/simulated/floor/misc_floor.dm
@@ -49,26 +49,31 @@
/turf/simulated/floor/beach/sand
name = "sand"
icon_state = "sand"
+ baseturf = /turf/simulated/floor/beach/sand
/turf/simulated/floor/beach/coastline
name = "coastline"
icon = 'icons/misc/beach2.dmi'
icon_state = "sandwater"
+ baseturf = /turf/simulated/floor/beach/coastline
/turf/simulated/floor/beach/coastline_t
name = "coastline"
desc = "Tide's high tonight. Charge your batons."
icon_state = "sandwater_t"
+ baseturf = /turf/simulated/floor/beach/coastline_t
/turf/simulated/floor/beach/coastline_b
name = "coastline"
icon_state = "sandwater_b"
+ baseturf = /turf/simulated/floor/beach/coastline_b
/turf/simulated/floor/beach/water // TODO - Refactor water so they share the same parent type - Or alternatively component something like that
name = "water"
icon_state = "water"
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
var/obj/machinery/poolcontroller/linkedcontroller = null
+ baseturf = /turf/simulated/floor/beach/water
/turf/simulated/floor/beach/water/Initialize(mapload)
. = ..()
diff --git a/code/game/turfs/simulated/floor/plating.dm b/code/game/turfs/simulated/floor/plating.dm
index a6dbe0de281..703b98fd094 100644
--- a/code/game/turfs/simulated/floor/plating.dm
+++ b/code/game/turfs/simulated/floor/plating.dm
@@ -125,7 +125,6 @@
name = "reinforced floor"
icon_state = "engine"
thermal_conductivity = 0.025
- var/insulated
heat_capacity = 325000
floor_tile = /obj/item/stack/rods
@@ -161,18 +160,6 @@
return
new /obj/item/stack/rods(src, 2)
ChangeTurf(/turf/simulated/floor/plating)
- return
-
- if(istype(C, /obj/item/stack/sheet/plasteel) && !insulated) //Insulating the floor
- to_chat(user, "You begin insulating [src]...")
- if(do_after(user, 40, target = src) && !insulated) //You finish insulating the insulated insulated insulated insulated insulated insulated insulated insulated vacuum floor
- to_chat(user, "You finish insulating [src].")
- var/obj/item/stack/sheet/plasteel/W = C
- W.use(1)
- thermal_conductivity = 0
- insulated = 1
- name = "insulated " + name
- return
/turf/simulated/floor/engine/ex_act(severity)
switch(severity)
@@ -258,18 +245,6 @@
nitrogen = 0
temperature = TCMB
-/turf/simulated/floor/engine/insulated
- name = "insulated reinforced floor"
- icon_state = "engine"
- insulated = 1
- thermal_conductivity = 0
-
-/turf/simulated/floor/engine/insulated/vacuum
- name = "insulated vacuum floor"
- icon_state = "engine"
- oxygen = 0
- nitrogen = 0
-
/turf/simulated/floor/plating/ironsand
name = "Iron Sand"
icon = 'icons/turf/floors/ironsand.dmi'
@@ -357,11 +332,12 @@
/turf/simulated/floor/plating/abductor
name = "alien floor"
+ icon = 'icons/turf/floors.dmi'
icon_state = "alienpod1"
/turf/simulated/floor/plating/abductor/Initialize(mapload)
. = ..()
- icon_state = "alienpod[rand(1,9)]"
+ icon_state = "alienpod[rand(1, 9)]"
/turf/simulated/floor/plating/ice
name = "ice sheet"
@@ -387,3 +363,7 @@
icon_state = "smooth"
smooth = SMOOTH_MORE | SMOOTH_BORDER
canSmoothWith = list(/turf/simulated/floor/plating/ice/smooth, /turf/simulated/floor/plating/ice)
+
+/turf/simulated/floor/plating/nitrogen
+ oxygen = 0
+ nitrogen = MOLES_N2STANDARD + MOLES_O2STANDARD
diff --git a/code/game/turfs/simulated/minerals.dm b/code/game/turfs/simulated/minerals.dm
index f528483db5c..538c1599069 100644
--- a/code/game/turfs/simulated/minerals.dm
+++ b/code/game/turfs/simulated/minerals.dm
@@ -11,6 +11,8 @@
opacity = 1
density = TRUE
blocks_air = TRUE
+ flags_2 = RAD_PROTECT_CONTENTS_2 | RAD_NO_CONTAMINATE_2
+ rad_insulation = RAD_MEDIUM_INSULATION
layer = EDGED_TURF_LAYER
temperature = TCMB
var/environment_type = "asteroid"
diff --git a/code/game/turfs/simulated/shuttle.dm b/code/game/turfs/simulated/shuttle.dm
deleted file mode 100644
index 7a781679173..00000000000
--- a/code/game/turfs/simulated/shuttle.dm
+++ /dev/null
@@ -1,72 +0,0 @@
-/turf/simulated/shuttle
- name = "shuttle"
- icon = 'icons/turf/shuttle.dmi'
- thermal_conductivity = 0.05
- heat_capacity = 0
- layer = 2
-
-/turf/simulated/shuttle/wall
- name = "wall"
- icon_state = "wall1"
- opacity = 1
- density = 1
- blocks_air = 1
-
-/turf/simulated/shuttle/rpd_act(mob/user, obj/item/rpd/our_rpd)
- if(our_rpd.mode == RPD_DELETE_MODE)//No pipes on shuttles
- our_rpd.delete_all_pipes(user, src)
-
-/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)
- if(T.type != type)
- T.ChangeTurf(type)
- if(underlays.len)
- T.underlays = underlays
- if(T.icon_state != icon_state)
- T.icon_state = icon_state
- if(T.icon != icon)
- T.icon = icon
- if(T.color != color)
- T.color = color
- if(T.dir != dir)
- T.dir = dir
- T.transform = transform
- return T
-
-/turf/simulated/shuttle/wall/copyTurf(turf/T)
- . = ..()
- T.transform = transform
-
-//why don't shuttle walls habe smoothwall? now i gotta do rotation the dirty way
-/turf/simulated/shuttle/shuttleRotate(rotation)
- ..()
- var/matrix/M = transform
- M.Turn(rotation)
- transform = M
-
-/turf/simulated/shuttle/floor
- name = "floor"
- icon_state = "floor"
-
-/turf/simulated/shuttle/plating
- name = "plating"
- icon = 'icons/turf/floors.dmi'
- icon_state = "plating"
-
-/turf/simulated/shuttle/plating/vox //Vox skipjack plating
- oxygen = 0
- nitrogen = MOLES_N2STANDARD + MOLES_O2STANDARD
-
-/turf/simulated/shuttle/floor4 // Added this floor tile so that I have a seperate turf to check in the shuttle -- Polymorph
- name = "brig floor" // Also added it into the 2x3 brig area of the shuttle.
- icon_state = "floor4"
-
-/turf/simulated/shuttle/floor4/vox //Vox skipjack floors
- name = "skipjack floor"
- oxygen = 0
- nitrogen = MOLES_N2STANDARD + MOLES_O2STANDARD
diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm
index 23d0c9789bd..6b8e5affdd1 100644
--- a/code/game/turfs/simulated/walls.dm
+++ b/code/game/turfs/simulated/walls.dm
@@ -15,13 +15,14 @@
var/damage_overlay
var/global/damage_overlays[8]
- var/max_temperature = 1800 //K, walls will take damage if they're next to a fire hotter than this
-
opacity = 1
density = 1
blocks_air = 1
explosion_block = 1
+ flags_2 = RAD_PROTECT_CONTENTS_2 | RAD_NO_CONTAMINATE_2
+ rad_insulation = RAD_MEDIUM_INSULATION
+
thermal_conductivity = WALL_HEAT_TRANSFER_COEFFICIENT
heat_capacity = 312500 //a little over 5 cm thick , 312500 for 1 m by 2.5 m by 0.25 m plasteel wall
@@ -41,8 +42,7 @@
/obj/structure/falsewall,
/obj/structure/falsewall/reinforced,
/turf/simulated/wall/rust,
- /turf/simulated/wall/r_wall/rust,
- /turf/simulated/wall/r_wall/coated)
+ /turf/simulated/wall/r_wall/rust)
smooth = SMOOTH_TRUE
/turf/simulated/wall/BeforeChange()
@@ -51,7 +51,7 @@
. = ..()
//Appearance
-/turf/simulated/wall/examine(mob/user)
+/turf/simulated/wall/examine(mob/user) //If you change this, consider changing the examine_status proc of false walls to match
. = ..()
if(!damage)
@@ -117,12 +117,6 @@
else
update_icon()
- return
-
-/turf/simulated/wall/proc/adjacent_fire_act(turf/simulated/wall, radiated_temperature)
- if(radiated_temperature > max_temperature)
- take_damage(rand(10, 20) * (radiated_temperature / max_temperature))
-
/turf/simulated/wall/handle_ricochet(obj/item/projectile/P) //A huge pile of shitcode!
var/turf/p_turf = get_turf(P)
var/face_direction = get_dir(src, p_turf)
diff --git a/code/game/turfs/simulated/walls_indestructible.dm b/code/game/turfs/simulated/walls_indestructible.dm
index 6bb3cb9c22a..63a64a4a200 100644
--- a/code/game/turfs/simulated/walls_indestructible.dm
+++ b/code/game/turfs/simulated/walls_indestructible.dm
@@ -1,4 +1,7 @@
/turf/simulated/wall/indestructible
+ name = "wall"
+ desc = "Effectively impervious to conventional methods of destruction."
+ explosion_block = 50
/turf/simulated/wall/indestructible/dismantle_wall(devastated = 0, explode = 0)
return
@@ -50,7 +53,6 @@
desc = "A seemingly impenetrable wall."
icon = 'icons/turf/walls.dmi'
icon_state = "necro"
- explosion_block = 50
baseturf = /turf/simulated/wall/indestructible/necropolis
/turf/simulated/wall/indestructible/boss
@@ -59,7 +61,6 @@
icon = 'icons/turf/walls/boss_wall.dmi'
icon_state = "wall"
canSmoothWith = list(/turf/simulated/wall/indestructible/boss, /turf/simulated/wall/indestructible/boss/see_through)
- explosion_block = 50
baseturf = /turf/simulated/floor/plating/asteroid/basalt
smooth = SMOOTH_TRUE
@@ -73,6 +74,27 @@
icon_state = "wall"
smooth = SMOOTH_TRUE
+/turf/simulated/wall/indestructible/sandstone
+ icon = 'icons/turf/walls/sandstone_wall.dmi'
+ icon_state = "sandstone"
+ canSmoothWith = list(/turf/simulated/wall/mineral/sandstone, /turf/simulated/wall/indestructible/sandstone, /obj/structure/falsewall/sandstone)
+
/turf/simulated/wall/indestructible/uranium
icon = 'icons/turf/walls/uranium_wall.dmi'
icon_state = "uranium"
+
+/turf/simulated/wall/indestructible/rock
+ name = "dense rock"
+ desc = "An extremely densely-packed rock, most mining tools or explosives would never get through this."
+ icon = 'icons/turf/walls.dmi'
+ icon_state = "rock"
+
+/turf/simulated/wall/indestructible/riveted
+ icon = 'icons/turf/walls.dmi'
+ icon_state = "riveted"
+
+/turf/simulated/wall/indestructible/syndicate
+ icon = 'icons/turf/walls/plastitanium_wall.dmi'
+ icon_state = "map-shuttle"
+ smooth = SMOOTH_MORE | SMOOTH_DIAGONAL
+ canSmoothWith = list(/turf/simulated/wall/mineral/plastitanium, /turf/simulated/wall/indestructible/syndicate, /obj/machinery/door/airlock/titanium, /obj/machinery/door/airlock, /obj/structure/shuttle/engine, /obj/structure/falsewall/plastitanium)
diff --git a/code/game/turfs/simulated/walls_mineral.dm b/code/game/turfs/simulated/walls_mineral.dm
index 8b60be916c3..21a51d38f30 100644
--- a/code/game/turfs/simulated/walls_mineral.dm
+++ b/code/game/turfs/simulated/walls_mineral.dm
@@ -48,7 +48,7 @@
icon_state = "sandstone"
sheet_type = /obj/item/stack/sheet/mineral/sandstone
explosion_block = 0
- canSmoothWith = list(/turf/simulated/wall/mineral/sandstone, /obj/structure/falsewall/sandstone)
+ canSmoothWith = list(/turf/simulated/wall/mineral/sandstone, /turf/simulated/wall/indestructible/sandstone, /obj/structure/falsewall/sandstone)
/turf/simulated/wall/mineral/uranium
name = "uranium wall"
@@ -60,16 +60,13 @@
/turf/simulated/wall/mineral/uranium/proc/radiate()
if(!active)
- if(world.time > last_event+15)
+ if(world.time > last_event + 15)
active = 1
- for(var/mob/living/L in range(3,src))
- L.apply_effect(12,IRRADIATE,0)
- for(var/turf/simulated/wall/mineral/uranium/T in range(3,src))
+ radiation_pulse(src, 40)
+ for(var/turf/simulated/wall/mineral/uranium/T in orange(1, src))
T.radiate()
last_event = world.time
active = null
- return
- return
/turf/simulated/wall/mineral/uranium/attack_hand(mob/user as mob)
radiate()
@@ -198,7 +195,7 @@
flags_2 = CHECK_RICOCHET_2
sheet_type = /obj/item/stack/sheet/mineral/titanium
smooth = SMOOTH_MORE|SMOOTH_DIAGONAL
- canSmoothWith = list(/turf/simulated/wall/mineral/titanium, /obj/machinery/door/airlock/shuttle, /obj/machinery/door/airlock, /obj/structure/window/full/shuttle, /obj/structure/shuttle/engine/heater, /obj/structure/falsewall/titanium)
+ canSmoothWith = list(/turf/simulated/wall/mineral/titanium, /obj/machinery/door/airlock/titanium, /obj/machinery/door/airlock, /obj/structure/window/full/shuttle, /obj/structure/shuttle/engine/heater, /obj/structure/falsewall/titanium)
/turf/simulated/wall/mineral/titanium/nodiagonal
smooth = SMOOTH_MORE
@@ -224,10 +221,11 @@
T.icon_state = icon_state
if(T.icon != icon)
T.icon = icon
- if(T.color != color)
- T.color = color
+ if(color)
+ T.atom_colours = atom_colours.Copy()
+ T.update_atom_colour()
if(T.dir != dir)
- T.dir = dir
+ T.setDir(dir)
T.transform = transform
return T
@@ -290,7 +288,7 @@
explosion_block = 4
sheet_type = /obj/item/stack/sheet/mineral/plastitanium
smooth = SMOOTH_MORE|SMOOTH_DIAGONAL
- canSmoothWith = list(/turf/simulated/wall/mineral/plastitanium, /obj/machinery/door/airlock/shuttle, /obj/machinery/door/airlock, /obj/structure/shuttle/engine, /obj/structure/falsewall/plastitanium)
+ canSmoothWith = list(/turf/simulated/wall/mineral/plastitanium, /turf/simulated/wall/indestructible/syndicate, /obj/machinery/door/airlock/titanium, /obj/machinery/door/airlock, /obj/structure/shuttle/engine, /obj/structure/falsewall/plastitanium)
/turf/simulated/wall/mineral/plastitanium/nodiagonal
smooth = SMOOTH_MORE
@@ -305,16 +303,6 @@
icon_state = "map-overspace"
fixed_underlay = list("space"=1)
-/turf/simulated/wall/mineral/plastitanium/coated
- name = "coated wall"
- max_temperature = INFINITY
- icon_state = "map-shuttle_nd"
- smooth = SMOOTH_MORE
-
-/turf/simulated/wall/mineral/plastitanium/coated/Initialize(mapload)
- . = ..()
- desc += " It seems to have additional plating to protect against heat."
-
/turf/simulated/wall/mineral/plastitanium/explosive
var/explosive_wall_group = EXPLOSIVE_WALL_GROUP_SYNDICATE_BASE
icon_state = "map-shuttle_nd"
@@ -345,10 +333,11 @@
T.icon_state = icon_state
if(T.icon != icon)
T.icon = icon
- if(T.color != color)
- T.color = color
+ if(color)
+ T.atom_colours = atom_colours.Copy()
+ T.update_atom_colour()
if(T.dir != dir)
- T.dir = dir
+ T.setDir(dir)
T.transform = transform
return T
diff --git a/code/game/turfs/simulated/walls_misc.dm b/code/game/turfs/simulated/walls_misc.dm
index 56908a7ecae..89122891702 100644
--- a/code/game/turfs/simulated/walls_misc.dm
+++ b/code/game/turfs/simulated/walls_misc.dm
@@ -44,12 +44,6 @@
icon = 'icons/turf/walls/rusty_reinforced_wall.dmi'
icon_state = "rrust"
-/turf/simulated/wall/r_wall/coated //Coated for heat resistance
- name = "coated reinforced wall"
- desc = "A huge chunk of reinforced metal used to seperate rooms. It seems to have additional plating to protect against heat."
- icon = 'icons/turf/walls/coated_reinforced_wall.dmi'
- max_temperature = INFINITY
-
//Clockwork walls
/turf/simulated/wall/clockwork
name = "clockwork wall"
diff --git a/code/game/turfs/simulated/walls_reinforced.dm b/code/game/turfs/simulated/walls_reinforced.dm
index a3e9c9ae0f2..d840ff2c355 100644
--- a/code/game/turfs/simulated/walls_reinforced.dm
+++ b/code/game/turfs/simulated/walls_reinforced.dm
@@ -6,8 +6,8 @@
opacity = 1
density = 1
explosion_block = 2
+ rad_insulation = RAD_HEAVY_INSULATION
damage_cap = 600
- max_temperature = 6000
hardness = 10
sheet_type = /obj/item/stack/sheet/plasteel
sheet_amount = 1
@@ -72,23 +72,6 @@
queue_smooth_neighbors(src)
to_chat(user, "You repair the last of the damage.")
return
-
- else if(istype(I, /obj/item/stack/sheet/plasteel))
- var/obj/item/stack/sheet/plasteel/PS = I
- if(!can_be_reinforced)
- to_chat(user, "The wall is already coated!")
- return
- to_chat(user, "You begin adding an additional layer of coating to the wall with [PS]...")
- if(do_after(user, 40 * PS.toolspeed, target = src) && !d_state)
- if(!PS.use(2))
- to_chat(user, "You don't have enough [PS.name] for that!")
- return
- to_chat(user, "You add an additional layer of coating to the wall.")
- ChangeTurf(/turf/simulated/wall/r_wall/coated)
- update_icon()
- queue_smooth_neighbors(src)
- can_be_reinforced = FALSE
- return
else
return ..()
diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm
index 3aaf12cd5fc..a4da61fbbaf 100644
--- a/code/game/turfs/turf.dm
+++ b/code/game/turfs/turf.dm
@@ -81,11 +81,8 @@
qdel(A)
return
// Adds the adjacent turfs to the current atmos processing
- for(var/direction in GLOB.cardinal)
- if(atmos_adjacent_turfs & direction)
- var/turf/simulated/T = get_step(src, direction)
- if(istype(T))
- SSair.add_to_active(T)
+ for(var/turf/simulated/T in atmos_adjacent_turfs)
+ SSair.add_to_active(T)
SSair.remove_from_active(src)
visibilityChanged()
QDEL_LIST(blueprint_data)
@@ -154,10 +151,16 @@
return FALSE
//Finally, check objects/mobs to block entry that are not on the border
+ var/atom/movable/tompost_bump
+ var/top_layer = FALSE
for(var/atom/movable/obstacle in large_dense)
if(!obstacle.CanPass(mover, mover.loc, 1) && (forget != obstacle))
- mover.Bump(obstacle, TRUE)
- return FALSE
+ if(obstacle.layer > top_layer)
+ tompost_bump = obstacle
+ top_layer = obstacle.layer
+ if(tompost_bump)
+ mover.Bump(tompost_bump, TRUE)
+ return FALSE
return TRUE //Nothing found to block so return success!
/turf/Entered(atom/movable/M, atom/OL, ignoreRest = FALSE)
@@ -560,6 +563,3 @@
/turf/AllowDrop()
return TRUE
-
-/turf/proc/water_act(volume, temperature, source)
- return FALSE
diff --git a/code/game/turfs/unsimulated.dm b/code/game/turfs/unsimulated.dm
index 02af9173e2b..d501bfc9b31 100644
--- a/code/game/turfs/unsimulated.dm
+++ b/code/game/turfs/unsimulated.dm
@@ -1,4 +1,4 @@
-/turf/unsimulated
+/turf/unsimulated // Sometimes....sometimes I have dreams of you dieing. Of you gasping for your last unsimulated breath, of you passing away and being a dirty memory of a bygone era. - Fox
intact = 1
name = "command"
oxygen = MOLES_O2STANDARD
@@ -12,34 +12,3 @@
/turf/unsimulated/acid_act(acidpwr, acid_volume, acid_id)
return 0
-
-/turf/unsimulated/floor/plating/vox
- icon_state = "plating"
- name = "plating"
- nitrogen = 100
- oxygen = 0
-
-/turf/unsimulated/floor/plating/snow
- name = "snow"
- icon = 'icons/turf/snow.dmi'
- icon_state = "snow"
- temperature = T0C
-
-/turf/unsimulated/floor/plating/snow/concrete
- name = "concrete"
- icon = 'icons/turf/floors.dmi'
- icon_state = "concrete"
-
-/turf/unsimulated/floor/plating/snow/ex_act(severity)
- return
-
-/turf/unsimulated/floor/plating/airless
- icon_state = "plating"
- name = "airless plating"
- oxygen = 0
- nitrogen = 0
- temperature = TCMB
-
-/turf/unsimulated/floor/plating/airless/Initialize(mapload)
- . = ..()
- name = "plating"
diff --git a/code/game/turfs/unsimulated/beach.dm b/code/game/turfs/unsimulated/beach.dm
deleted file mode 100644
index a7c73971e99..00000000000
--- a/code/game/turfs/unsimulated/beach.dm
+++ /dev/null
@@ -1,127 +0,0 @@
-/turf/unsimulated/beach
- name = "Beach"
- icon = 'icons/misc/beach.dmi'
- var/water_overlay_image = null
- mouse_opacity = MOUSE_OPACITY_TRANSPARENT
-
-/turf/unsimulated/beach/Initialize(mapload)
- . = ..()
- if(water_overlay_image)
- var/image/overlay_image = image('icons/misc/beach.dmi', icon_state = water_overlay_image, layer = ABOVE_MOB_LAYER)
- overlay_image.plane = GAME_PLANE
- overlays += overlay_image
-
-/turf/unsimulated/beach/sand
- name = "Sand"
- icon_state = "desert"
- mouse_opacity = MOUSE_OPACITY_ICON
-
-/turf/unsimulated/beach/sand/Initialize(mapload)
- . = ..() //adds some aesthetic randomness to the beach sand
- icon_state = pick("desert", "desert0", "desert1", "desert2", "desert3", "desert4")
-
-/turf/unsimulated/beach/sand/dense //for boundary "walls"
- density = 1
-
-/turf/unsimulated/beach/coastline
- name = "Coastline"
- //icon = 'icons/misc/beach2.dmi'
- //icon_state = "sandwater"
- icon_state = "beach"
- water_overlay_image = "water_coast"
-
-/turf/unsimulated/beach/coastline/dense //for boundary "walls"
- density = 1
-
-/turf/unsimulated/beach/water
- name = "Shallow Water"
- icon_state = "seashallow"
- water_overlay_image = "water_shallow"
- var/obj/machinery/poolcontroller/linkedcontroller = null
-
-/turf/unsimulated/beach/water/Entered(atom/movable/AM, atom/OldLoc)
- . = ..()
- if(!linkedcontroller)
- return
- if(ismob(AM))
- linkedcontroller.mobinpool += AM
-
-/turf/unsimulated/beach/water/Exited(atom/movable/AM, atom/newloc)
- . = ..()
- if(!linkedcontroller)
- return
- if(ismob(AM))
- linkedcontroller.mobinpool -= AM
-
-/turf/unsimulated/beach/water/InitializedOn(atom/A)
- if(!linkedcontroller)
- return
- if(istype(A, /obj/effect/decal/cleanable)) // Better a typecheck than looping through thousands of turfs everyday
- linkedcontroller.decalinpool += A
-
-/turf/unsimulated/beach/water/dense //for boundary "walls"
- density = 1
-
-/turf/unsimulated/beach/water/edge_drop
- name = "Water"
- icon_state = "seadrop"
- water_overlay_image = "water_drop"
-
-/turf/unsimulated/beach/water/drop
- name = "Water"
- icon = 'icons/turf/floors/seadrop.dmi'
- icon_state = "seadrop"
- water_overlay_image = null
- smooth = SMOOTH_TRUE
- canSmoothWith = list(
- /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/beach_drop_overlay/water_overlay
-
-/turf/unsimulated/beach/water/drop/Initialize(mapload)
- . = ..()
- water_overlay = new(src)
-
-/turf/unsimulated/beach/water/drop/Destroy()
- QDEL_NULL(water_overlay)
- return ..()
-
-/obj/effect/beach_drop_overlay
- name = "Water"
- icon = 'icons/turf/floors/seadrop-o.dmi'
- layer = MOB_LAYER + 0.1
- smooth = SMOOTH_TRUE
- anchored = 1
- canSmoothWith = list(
- /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)
-
-/turf/unsimulated/beach/water/drop/dense
- density = 1
-
-/turf/unsimulated/beach/water/deep
- name = "Deep Water"
- icon_state = "seadeep"
- water_overlay_image = "water_deep"
-
-/turf/unsimulated/beach/water/deep/dense
- density = 1
-
-/turf/unsimulated/beach/water/deep/wood_floor
- name = "Sunken Floor"
- icon = 'icons/turf/floors.dmi'
- icon_state = "wood"
-
-/turf/unsimulated/beach/water/deep/sand_floor
- name = "Sea Floor"
- icon_state = "sand"
-
-/turf/unsimulated/beach/water/deep/rock_wall
- name = "Reef Stone"
- icon_state = "desert7"
- density = 1
- opacity = 1
- explosion_block = 2
- mouse_opacity = MOUSE_OPACITY_ICON
diff --git a/code/game/turfs/unsimulated/floor.dm b/code/game/turfs/unsimulated/floor.dm
index 750ebe015ae..f3edf3b0def 100644
--- a/code/game/turfs/unsimulated/floor.dm
+++ b/code/game/turfs/unsimulated/floor.dm
@@ -3,13 +3,11 @@
icon = 'icons/turf/floors.dmi'
icon_state = "Floor3"
-/turf/unsimulated/floor/grass
- name = "grass patch"
- icon_state = "grass1"
-
-/turf/unsimulated/floor/grass/Initialize(mapload)
- . = ..()
- icon_state = "grass[rand(1,4)]"
+/turf/unsimulated/floor/plating/vox
+ icon_state = "plating"
+ name = "plating"
+ nitrogen = 100
+ oxygen = 0
/turf/unsimulated/floor/snow
name = "snow"
@@ -28,44 +26,3 @@
icon_state = "dark"
nitrogen = 100
oxygen = 0
-
-/turf/unsimulated/floor/carpet
- name = "Carpet"
- icon = 'icons/turf/floors/carpet.dmi'
- icon_state = "carpet"
- smooth = SMOOTH_TRUE
- canSmoothWith = null
-
- footstep_sounds = list(
- "human" = list('sound/effects/footstep/carpet_human.ogg'),
- "xeno" = list('sound/effects/footstep/carpet_xeno.ogg')
- )
-
-/turf/unsimulated/floor/wood
- icon_state = "wood"
-
- footstep_sounds = list(
- "human" = list('sound/effects/footstep/wood_all.ogg'), //@RonaldVanWonderen of Freesound.org
- "xeno" = list('sound/effects/footstep/wood_all.ogg') //@RonaldVanWonderen of Freesound.org
- )
-
-/turf/unsimulated/floor/lava
- name = "lava"
- desc = "That looks... a bit dangerous"
- icon = 'icons/turf/floors/lava.dmi'
- icon_state = "smooth"
- smooth = SMOOTH_MORE
- canSmoothWith = list(/turf/unsimulated/floor/lava)
- var/lava_damage = 250
- var/lava_fire = 20
- light_range = 2
- light_color = "#FFC040"
-
-/turf/unsimulated/floor/lava/Entered(mob/living/M, atom/OL, ignoreRest = 0)
- if(istype(M))
- M.apply_damage(lava_damage, BURN)
- M.adjust_fire_stacks(lava_fire)
- M.IgniteMob()
-
-/turf/unsimulated/floor/lava/dense
- density = 1
diff --git a/code/game/turfs/unsimulated/walls.dm b/code/game/turfs/unsimulated/walls.dm
index c5688c31323..f7ce4099721 100644
--- a/code/game/turfs/unsimulated/walls.dm
+++ b/code/game/turfs/unsimulated/walls.dm
@@ -4,6 +4,8 @@
icon_state = "riveted"
opacity = 1
density = 1
+ flags_2 = RAD_PROTECT_CONTENTS_2 | RAD_NO_CONTAMINATE_2
+ rad_insulation = RAD_MEDIUM_INSULATION
explosion_block = 2
/turf/unsimulated/wall/fakeglass
@@ -22,14 +24,6 @@
icon_state = ""
layer = FLY_LAYER
-/turf/unsimulated/wall/other
- icon_state = "r_wall"
-
-/turf/unsimulated/wall/metal
- icon = 'icons/turf/walls/wall.dmi'
- icon_state = "wall"
- smooth = SMOOTH_TRUE
-
/turf/unsimulated/wall/abductor
icon_state = "alien1"
explosion_block = 50
diff --git a/code/game/world.dm b/code/game/world.dm
index eeca8b321ba..0cb7e750c77 100644
--- a/code/game/world.dm
+++ b/code/game/world.dm
@@ -22,16 +22,18 @@ GLOBAL_LIST_INIT(map_transition_config, MAP_TRANSITION_CONFIG)
// This needs to happen early, otherwise people can get a null species, nuking their character
makeDatumRefLists()
- TgsNew(new /datum/tgs_event_handler/impl, TGS_SECURITY_TRUSTED) // creates a new TGS object
+ InitTGS() // creates a new TGS object
log_world("World loaded at [time_stamp()]")
- log_world("[GLOB.vars.len - GLOB.gvars_datum_in_built_vars.len] global variables")
+ log_world("[length(GLOB.vars) - length(GLOB.gvars_datum_in_built_vars)] global variables")
GLOB.revision_info.log_info()
- load_admins(run_async=FALSE) // This better happen early on.
+ load_admins(run_async = FALSE) // This better happen early on.
#ifdef UNIT_TESTS
log_world("Unit Tests Are Enabled!")
#endif
+ if(!fexists("config/config.txt") || !fexists("config/game_options.txt"))
+ stack_trace("The game config files have not been properly set! Please copy ALL files from '/config/example' into the parent folder, '/config'.")
if(byond_version < MIN_COMPILER_VERSION || byond_build < MIN_COMPILER_BUILD)
log_world("Your server's byond version does not meet the recommended requirements for this code. Please update BYOND")
@@ -44,7 +46,7 @@ GLOBAL_LIST_INIT(map_transition_config, MAP_TRANSITION_CONFIG)
startup_procs() // Call procs that need to occur on startup (Generate lists, load MOTD, etc)
- src.update_status()
+ update_status()
GLOB.space_manager.initialize() //Before the MC starts up
@@ -57,7 +59,10 @@ GLOBAL_LIST_INIT(map_transition_config, MAP_TRANSITION_CONFIG)
HandleTestRun()
#endif
- return
+
+/world/proc/InitTGS()
+ TgsNew(new /datum/tgs_event_handler/impl, TGS_SECURITY_TRUSTED) // creates a new TGS object
+ GLOB.revision_info.load_tgs_info() // Loads git and TM info from TGS itself
// This is basically a replacement for hook/startup. Please dont shove random bullshit here
// If it doesnt need to happen IMMEDIATELY on world load, make a subsystem for it
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index cfcc216187d..5347a55135e 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -2194,7 +2194,7 @@
switch(punishment)
// These smiting types are valid for all living mobs
if("Lightning bolt")
- M.electrocute_act(5, "Lightning Bolt", safety = TRUE, override = TRUE)
+ M.electrocute_act(5, "Lightning Bolt", flags = SHOCK_NOGLOVES)
playsound(get_turf(M), 'sound/magic/lightningshock.ogg', 50, 1, -1)
M.adjustFireLoss(75)
M.Weaken(5)
diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm
index 1ad69a31911..e206f345c0c 100644
--- a/code/modules/admin/verbs/adminhelp.dm
+++ b/code/modules/admin/verbs/adminhelp.dm
@@ -1,7 +1,5 @@
-
-
//This is a list of words which are ignored by the parser when comparing message contents for names. MUST BE IN LOWER CASE!
-GLOBAL_LIST_INIT(adminhelp_ignored_words, list("unknown","the","a","an","of","monkey","alien","as"))
+GLOBAL_LIST_INIT(adminhelp_ignored_words, list("unknown", "the", "a", "an", "of", "monkey", "alien", "as"))
/client/verb/adminhelp()
set category = "Admin"
@@ -12,27 +10,28 @@ GLOBAL_LIST_INIT(adminhelp_ignored_words, list("unknown","the","a","an","of","mo
to_chat(src, "Error: Admin-PM: You cannot send adminhelps (Muted).")
return
- adminhelped = 1 //Determines if they get the message to reply by clicking the name.
+ adminhelped = TRUE //Determines if they get the message to reply by clicking the name.
var/msg
- var/list/type = list("Mentorhelp","Adminhelp")
- var/selected_type = input("Pick a category.", "Admin Help", null, null) as null|anything in type
+ var/list/type = list("Mentorhelp", "Adminhelp")
+ var/selected_type = input("Pick a category.", "Admin Help") as null|anything in type
if(selected_type)
- msg = clean_input("Please enter your message.", "Admin Help", null)
+ msg = clean_input("Please enter your message.", selected_type)
- //clean the input msg
if(!msg)
return
if(handle_spam_prevention(msg, MUTE_ADMINHELP, OOC_COOLDOWN))
return
- msg = sanitize_simple(copytext(msg,1,MAX_MESSAGE_LEN))
- if(!msg) return
+ msg = sanitize_simple(copytext(msg, 1, MAX_MESSAGE_LEN))
+ if(!msg) // No message after sanitisation
+ return
+
if(selected_type == "Mentorhelp")
- SSmentor_tickets.newHelpRequest(src, msg)
+ SSmentor_tickets.newHelpRequest(src, msg) // Mhelp
else
- SStickets.newHelpRequest(src, msg)
+ SStickets.newHelpRequest(src, msg) // Ahelp
//show it to the person adminhelping too
to_chat(src, "[selected_type]: [msg]")
@@ -54,7 +53,7 @@ GLOBAL_LIST_INIT(adminhelp_ignored_words, list("unknown","the","a","an","of","mo
var/inactive_mentors = mentorcount[3]
if(active_mentors <= 0)
- if(inactive_mentors > 0)
+ if(inactive_mentors)
alerttext = " | **ALL MENTORS AFK**"
else
alerttext = " | **NO MENTORS ONLINE**"
diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm
index 32a416b34ce..81a6854639e 100644
--- a/code/modules/admin/verbs/debug.dm
+++ b/code/modules/admin/verbs/debug.dm
@@ -743,11 +743,11 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention)
for(var/obj/machinery/power/rad_collector/Rad in GLOB.machines)
if(Rad.anchored)
- if(!Rad.P)
- var/obj/item/tank/plasma/Plasma = new/obj/item/tank/plasma(Rad)
+ if(!Rad.loaded_tank)
+ var/obj/item/tank/internals/plasma/Plasma = new/obj/item/tank/internals/plasma(Rad)
Plasma.air_contents.toxins = 70
Rad.drainratio = 0
- Rad.P = Plasma
+ Rad.loaded_tank = Plasma
Plasma.loc = Rad
if(!Rad.active)
diff --git a/code/modules/admin/verbs/infiltratorteam_syndicate.dm b/code/modules/admin/verbs/infiltratorteam_syndicate.dm
index 0b620ceac8e..1ed13ac8ed0 100644
--- a/code/modules/admin/verbs/infiltratorteam_syndicate.dm
+++ b/code/modules/admin/verbs/infiltratorteam_syndicate.dm
@@ -133,7 +133,7 @@ GLOBAL_VAR_INIT(sent_syndicate_infiltration_team, 0)
new_syndicate_infiltrator.mind_initialize()
new_syndicate_infiltrator.mind.assigned_role = "Syndicate Infiltrator"
new_syndicate_infiltrator.mind.special_role = "Syndicate Infiltrator"
- new_syndicate_infiltrator.mind.offstation_role = TRUE //they can flee to z2 so make them inelligible as antag targets
+ new_syndicate_infiltrator.mind.offstation_role = TRUE //they can flee to the syndicate base on the admin level so make them inelligible as antag targets
SSticker.mode.traitors |= new_syndicate_infiltrator.mind //Adds them to extra antag list
new_syndicate_infiltrator.equip_syndicate_infiltrator(syndicate_leader_selected, uplink_tc, is_mgmt)
return new_syndicate_infiltrator
diff --git a/code/modules/admin/verbs/one_click_antag.dm b/code/modules/admin/verbs/one_click_antag.dm
index d13152455b7..58677605714 100644
--- a/code/modules/admin/verbs/one_click_antag.dm
+++ b/code/modules/admin/verbs/one_click_antag.dm
@@ -282,18 +282,14 @@
return 1
/datum/admins/proc/makeAliens()
- var/datum/event/alien_infestation/E = new /datum/event/alien_infestation
-
var/antnum = input(owner, "How many aliens you want to create? Enter 0 to cancel.","Amount:", 0) as num
if(!antnum || antnum <= 0)
return
+ var/datum/event/alien_infestation/E = new /datum/event/alien_infestation
+ E.spawncount = antnum
log_admin("[key_name(owner)] tried making Aliens with One-Click-Antag")
message_admins("[key_name_admin(owner)] tried making Aliens with One-Click-Antag")
- E.spawncount = antnum
- // TODO The fact we have to do this rather than just have events start
- // when we ask them to, is bad.
- E.processing = TRUE
return TRUE
/*
diff --git a/code/modules/admin/verbs/striketeam.dm b/code/modules/admin/verbs/striketeam.dm
index 87649fe3d4e..59ab53f3ca6 100644
--- a/code/modules/admin/verbs/striketeam.dm
+++ b/code/modules/admin/verbs/striketeam.dm
@@ -193,7 +193,7 @@ GLOBAL_VAR_INIT(sent_strike_team, 0)
equip_to_slot_or_del(new /obj/item/melee/energy/sword/saber(src), slot_l_store)
equip_to_slot_or_del(new /obj/item/shield/energy(src), slot_r_store)
- equip_to_slot_or_del(new /obj/item/tank/emergency_oxygen/double/full(src), slot_s_store)
+ equip_to_slot_or_del(new /obj/item/tank/internals/emergency_oxygen/double(src), slot_s_store)
equip_to_slot_or_del(new /obj/item/gun/projectile/revolver/mateba(src), slot_belt)
equip_to_slot_or_del(new /obj/item/gun/energy/pulse(src), slot_r_hand)
diff --git a/code/modules/admin/verbs/vox_raiders.dm b/code/modules/admin/verbs/vox_raiders.dm
index c474cf785e2..9a15b0b15db 100644
--- a/code/modules/admin/verbs/vox_raiders.dm
+++ b/code/modules/admin/verbs/vox_raiders.dm
@@ -49,7 +49,7 @@ GLOBAL_VAR_INIT(vox_tick, 1)
equip_to_slot_or_del(new /obj/item/gun/dartgun/vox/medical, slot_r_hand)
equip_to_slot_or_del(new /obj/item/clothing/mask/breath/vox(src), slot_wear_mask)
- equip_to_slot_or_del(new /obj/item/tank/nitrogen(src), slot_back)
+ equip_to_slot_or_del(new /obj/item/tank/internals/nitrogen(src), slot_back)
equip_to_slot_or_del(new /obj/item/flashlight(src), slot_r_store)
var/obj/item/card/id/syndicate/vox/W = new(src)
diff --git a/code/modules/antagonists/traitor/contractor/datums/contractor.dm b/code/modules/antagonists/traitor/contractor/datums/contractor.dm
deleted file mode 100644
index d1e9d0c729b..00000000000
--- a/code/modules/antagonists/traitor/contractor/datums/contractor.dm
+++ /dev/null
@@ -1,75 +0,0 @@
-/**
- * # Contractor antagonist datum
- *
- * A variant of the Traitor, Contractors rely on kidnapping crew members to earn TC.
- *
- * Contractors are supplied with some unique items
- * and three random low cost contraband items to help kickstart their contracts.
- * A Traitor may become a Contractor if given the chance (random).
- * They will forfeit all their initial TC and receive the above items.
- * The opportunity to become a Contractor goes away after some time or if the traitor spends any initial TC.
- */
-/datum/antagonist/traitor/contractor
- name = "Contractor"
- // Settings
- /// How many telecrystals a traitor must forfeit to become a contractor.
- var/tc_cost = 20
- /// How long a traitor's chance to become a contractor lasts before going away. In deciseconds.
- var/offer_duration = 10 MINUTES
- // Variables
- /// The associated contractor uplink. Only present if the offer was accepted.
- var/obj/item/contractor_uplink/contractor_uplink = null
- /// world.time at which the offer will expire.
- var/offer_deadline = -1
-
-/datum/antagonist/traitor/contractor/finalize_traitor()
- ..()
- // Setup the vars and contractor stuff in the uplink
- var/obj/item/uplink/hidden/U = owner.find_syndicate_uplink()
- if(!U)
- stack_trace("Potential contractor [owner] spawned without a hidden uplink!")
- return
- U.contractor = src
- offer_deadline = world.time + offer_duration
-
- // Greet them with the unique message
- var/greet_text = "Contractors forfeit [tc_cost] telecrystals for the privilege of taking on kidnapping contracts for credit and TC payouts that can add up to more than the normal starting amount of TC. "\
- + "If you are interested, simply access your hidden uplink and select the \"Contracting Opportunity\" tab for more information. "
- to_chat(owner.current, "You have been offered a chance to become a Contractor. ")
- to_chat(owner.current, "[greet_text]")
- to_chat(owner.current, "This offer will expire in 10 minutes starting now (expiry time: [station_time_timestamp(time = offer_deadline)]).")
-
-/datum/antagonist/traitor/contractor/update_traitor_icons_added(datum/mind/traitor_mind)
- if(!contractor_uplink)
- return ..()
- var/hud_name = "hudcontractor"
- if(locate(/datum/objective/hijack) in owner.objectives)
- hud_name = "hudhijackcontractor"
- var/datum/atom_hud/antag/traitorhud = GLOB.huds[ANTAG_HUD_TRAITOR]
- traitorhud.join_hud(owner.current, null)
- set_antag_hud(owner.current, hud_name)
-
-/**
- * Accepts the offer to be a contractor if possible.
- */
-/datum/antagonist/traitor/contractor/proc/become_contractor(mob/living/carbon/human/M, obj/item/uplink/U)
- if(contractor_uplink || !istype(M))
- return
- if(U.uses < tc_cost || world.time >= offer_deadline)
- var/reason = (U.uses < tc_cost) ? \
- "you have insufficient telecrystals ([tc_cost] needed in total)" : \
- "the deadline has passed"
- to_chat(M, "You can no longer become a contractor as [reason].")
- return
-
- // Give the kit
- var/obj/item/storage/box/syndie_kit/contractor/B = new(M)
- M.put_in_hands(B)
- contractor_uplink = locate(/obj/item/contractor_uplink, B)
- contractor_uplink.hub = new(M.mind, contractor_uplink)
-
- // Update AntagHUD icon
- update_traitor_icons_added(owner)
-
- // Remove the TC
- U.uses -= tc_cost
diff --git a/code/modules/antagonists/traitor/contractor/datums/contractor_hub.dm b/code/modules/antagonists/traitor/contractor/datums/contractor_hub.dm
index 81cb7bd9460..fcb86a9ce43 100644
--- a/code/modules/antagonists/traitor/contractor/datums/contractor_hub.dm
+++ b/code/modules/antagonists/traitor/contractor/datums/contractor_hub.dm
@@ -17,7 +17,7 @@
EXTRACTION_DIFFICULTY_HARD = 40,
)
/// Maximum variation a single contract's TC reward can have upon generation.
- /// In other words: final_reward = CEILING((tc_threshold / num_contracts) * (1 + (rand(-100, 100) / 100) * tc_variation), 1)
+ /// In other words: final_reward = CEILING((tc_threshold / num_contracts) * (1 - (rand(0, 100) / 100) * tc_variation), 1)
var/tc_variation = 0.25
/// TC reward multiplier if the target was extracted DEAD. Should be a penalty so between 0 and 1.
/// The final amount is rounded up.
@@ -98,9 +98,6 @@
C.reward_tc = list(null, null, null)
for(var/difficulty in EXTRACTION_DIFFICULTY_EASY to EXTRACTION_DIFFICULTY_HARD)
var/amount_tc = calculate_tc_reward(num_to_generate, difficulty)
- // Bump up the TC reward a little if it's too close to the lower difficulty's reward
- if(difficulty > EXTRACTION_DIFFICULTY_EASY)
- amount_tc = max(amount_tc, C.reward_tc[difficulty - 1] + (difficulty - 1))
C.reward_tc[difficulty] = amount_tc
total_earnable_tc[difficulty] += amount_tc
// Add to lists
@@ -111,11 +108,10 @@
for(var/difficulty in EXTRACTION_DIFFICULTY_EASY to EXTRACTION_DIFFICULTY_HARD)
var/total = total_earnable_tc[difficulty]
var/missing = difficulty_tc_thresholds[difficulty] - total
- if(missing <= 0)
- continue
- // Just add the missing TC to a random contract
- var/datum/syndicate_contract/C = pick(contracts)
- C.reward_tc[difficulty] += missing
+ // Increment the TC payout of a random contract till we're even
+ while(missing-- > 0)
+ var/datum/syndicate_contract/C = pick(contracts)
+ C.reward_tc[difficulty]++
/**
* Generates an amount of TC to be used as a contract reward for the given difficulty.
@@ -126,7 +122,7 @@
*/
/datum/contractor_hub/proc/calculate_tc_reward(total_contracts, difficulty = EXTRACTION_DIFFICULTY_EASY)
ASSERT(total_contracts > 0)
- return CEILING((difficulty_tc_thresholds[difficulty] / total_contracts) * (1 + (rand(-100, 100) / 100) * tc_variation), 1)
+ return FLOOR((difficulty_tc_thresholds[difficulty] / total_contracts) * (1 - (rand(0, 100) / 100) * tc_variation), 1)
/**
* Called when a [/datum/syndicate_contract] has been completed.
@@ -180,4 +176,4 @@
* * M - The mob.
*/
/datum/contractor_hub/proc/is_user_authorized(mob/living/carbon/M)
- return M.mind.has_antag_datum(/datum/antagonist/traitor/contractor)
+ return LAZYACCESS(GLOB.contractors, M.mind) && M.mind == owner
diff --git a/code/modules/antagonists/traitor/contractor/datums/rep_purchases/blackout.dm b/code/modules/antagonists/traitor/contractor/datums/rep_purchases/blackout.dm
index b1bab21d429..e4d0fc3fa8e 100644
--- a/code/modules/antagonists/traitor/contractor/datums/rep_purchases/blackout.dm
+++ b/code/modules/antagonists/traitor/contractor/datums/rep_purchases/blackout.dm
@@ -7,7 +7,7 @@
cost = 3
// Settings
/// How long a contractor must wait before calling another blackout, in deciseconds.
- var/static/cooldown = 15 MINUTES
+ var/static/cooldown = 45 MINUTES
// Variables
/// Static cooldown variable for blackouts.
var/static/next_blackout = -1
diff --git a/code/modules/antagonists/traitor/contractor/datums/syndicate_contract.dm b/code/modules/antagonists/traitor/contractor/datums/syndicate_contract.dm
index 9faf77487b3..e0c2cf1b2b5 100644
--- a/code/modules/antagonists/traitor/contractor/datums/syndicate_contract.dm
+++ b/code/modules/antagonists/traitor/contractor/datums/syndicate_contract.dm
@@ -10,7 +10,7 @@
/**
* # Syndicate Contract
*
- * Describes a contract that can be completed by a [/datum/antagonist/traitor/contractor].
+ * Describes a contract that can be completed by a Contractor.
*/
/datum/syndicate_contract
// Settings
@@ -320,6 +320,7 @@
*/
/datum/syndicate_contract/proc/target_received(mob/living/M, obj/effect/portal/redspace/contractor/P)
INVOKE_ASYNC(src, .proc/clean_up)
+ add_attack_logs(owning_hub.owner.current, M, "extracted to Syndicate Jail")
complete(M.stat == DEAD)
handle_target_experience(M, P)
@@ -408,13 +409,13 @@
// Give some species the necessary to survive. Courtesy of the Syndicate.
if(istype(H))
- var/obj/item/tank/emergency_oxygen/tank
+ var/obj/item/tank/internals/emergency_oxygen/tank
var/obj/item/clothing/mask/breath/mask
if(isvox(H))
- tank = new /obj/item/tank/emergency_oxygen/nitrogen(H)
+ tank = new /obj/item/tank/internals/emergency_oxygen/nitrogen(H)
mask = new /obj/item/clothing/mask/breath/vox(H)
else if(isplasmaman(H))
- tank = new /obj/item/tank/emergency_oxygen/plasma(H)
+ tank = new /obj/item/tank/internals/emergency_oxygen/plasma(H)
mask = new /obj/item/clothing/mask/breath(H)
if(tank)
diff --git a/code/modules/antagonists/traitor/datum_traitor.dm b/code/modules/antagonists/traitor/datum_traitor.dm
index b1599d5dfd0..3e36a11fbe9 100644
--- a/code/modules/antagonists/traitor/datum_traitor.dm
+++ b/code/modules/antagonists/traitor/datum_traitor.dm
@@ -12,8 +12,6 @@
var/should_equip = TRUE
var/traitor_kind = TRAITOR_HUMAN
var/list/assigned_targets = list() // This includes assassinate as well as steal objectives. prevents duplicate objectives
- /// Whether the traitor can specialize into a contractor.
- var/is_contractor = FALSE
/datum/antagonist/traitor/on_gain()
if(owner.current && isAI(owner.current))
@@ -251,14 +249,15 @@
/datum/antagonist/traitor/proc/update_traitor_icons_added(datum/mind/traitor_mind)
+ var/is_contractor = LAZYACCESS(GLOB.contractors, traitor_mind)
if(locate(/datum/objective/hijack) in owner.objectives)
var/datum/atom_hud/antag/hijackhud = GLOB.huds[ANTAG_HUD_TRAITOR]
hijackhud.join_hud(owner.current, null)
- set_antag_hud(owner.current, "hudhijack")
+ set_antag_hud(owner.current, is_contractor ? "hudhijackcontractor" : "hudhijack")
else
var/datum/atom_hud/antag/traitorhud = GLOB.huds[ANTAG_HUD_TRAITOR]
traitorhud.join_hud(owner.current, null)
- set_antag_hud(owner.current, "hudsyndicate")
+ set_antag_hud(owner.current, is_contractor ? "hudcontractor" : "hudsyndicate")
/datum/antagonist/traitor/proc/update_traitor_icons_removed(datum/mind/traitor_mind)
@@ -411,8 +410,3 @@
The code responses were:[responses] "
return message
-
-/datum/antagonist/traitor/specialization(datum/mind/new_owner)
- if(isAI(new_owner?.current) || !is_contractor)
- return ..()
- return new /datum/antagonist/traitor/contractor
diff --git a/code/modules/arcade/mob_hunt/mob_datums.dm b/code/modules/arcade/mob_hunt/mob_datums.dm
index 56a88d589ad..5d937232524 100644
--- a/code/modules/arcade/mob_hunt/mob_datums.dm
+++ b/code/modules/arcade/mob_hunt/mob_datums.dm
@@ -110,7 +110,7 @@
var/list/possible_areas = list()
//setup, sets all station areas (and subtypes) to weight 1
for(var/A in GLOB.the_station_areas)
- if(A == /area/holodeck) //don't allow holodeck areas as possible spawns since it will allow it to spawn in the holodeck rooms on z2 as well
+ if(A == /area/holodeck) //don't allow holodeck areas as possible spawns since it will allow it to spawn in the holodeck rooms on CC level as well
continue
if(A in possible_areas)
continue
diff --git a/code/modules/awaymissions/maploader/reader.dm b/code/modules/awaymissions/maploader/reader.dm
index f034c4f39d1..d27ffe70b24 100644
--- a/code/modules/awaymissions/maploader/reader.dm
+++ b/code/modules/awaymissions/maploader/reader.dm
@@ -479,3 +479,4 @@ GLOBAL_DATUM_INIT(_preloader, /datum/dmm_suite/preloader, new())
/turf/template_noop
name = "Turf Passthrough"
+ icon_state = "noop"
diff --git a/code/modules/awaymissions/mission_code/beach.dm b/code/modules/awaymissions/mission_code/beach.dm
index 90027e5503c..1252943e66f 100644
--- a/code/modules/awaymissions/mission_code/beach.dm
+++ b/code/modules/awaymissions/mission_code/beach.dm
@@ -27,3 +27,154 @@
spawn(1)
W.loc = get_step(W, dir)
water_timer = addtimer(CALLBACK(src, .proc/drip), water_frequency, TIMER_STOPPABLE)
+
+/turf/simulated/floor/beach/away
+ name = "Beach"
+ icon = 'icons/misc/beach.dmi'
+ var/water_overlay_image = null
+ mouse_opacity = MOUSE_OPACITY_TRANSPARENT
+ planetary_atmos = TRUE
+
+/turf/simulated/floor/beach/away/Initialize(mapload)
+ . = ..()
+ if(water_overlay_image)
+ var/image/overlay_image = image('icons/misc/beach.dmi', icon_state = water_overlay_image, layer = ABOVE_MOB_LAYER)
+ overlay_image.plane = GAME_PLANE
+ overlays += overlay_image
+
+/turf/simulated/floor/beach/away/sand
+ name = "Sand"
+ icon_state = "desert"
+ mouse_opacity = MOUSE_OPACITY_ICON
+ baseturf = /turf/simulated/floor/beach/away/sand
+
+/turf/simulated/floor/beach/away/sand/Initialize(mapload)
+ . = ..() //adds some aesthetic randomness to the beach sand
+ icon_state = pick("desert", "desert0", "desert1", "desert2", "desert3", "desert4")
+
+/turf/simulated/floor/beach/away/sand/dense //for boundary "walls"
+ density = TRUE
+ baseturf = /turf/simulated/floor/beach/away/sand/dense
+
+/turf/simulated/floor/beach/away/coastline
+ name = "Coastline"
+ //icon = 'icons/misc/beach2.dmi'
+ //icon_state = "sandwater"
+ icon_state = "beach"
+ water_overlay_image = "water_coast"
+ baseturf = /turf/simulated/floor/beach/away/coastline
+
+/turf/simulated/floor/beach/away/coastline/dense //for boundary "walls"
+ density = TRUE
+ baseturf = /turf/simulated/floor/beach/away/coastline/dense
+
+/turf/simulated/floor/beach/away/water
+ name = "Shallow Water"
+ icon_state = "seashallow"
+ water_overlay_image = "water_shallow"
+ var/obj/machinery/poolcontroller/linkedcontroller = null
+ baseturf = /turf/simulated/floor/beach/away/water
+
+/turf/simulated/floor/beach/away/water/Entered(atom/movable/AM, atom/OldLoc)
+ . = ..()
+ if(!linkedcontroller)
+ return
+ if(ismob(AM))
+ linkedcontroller.mobinpool += AM
+
+/turf/simulated/floor/beach/away/water/Exited(atom/movable/AM, atom/newloc)
+ . = ..()
+ if(!linkedcontroller)
+ return
+ if(ismob(AM))
+ linkedcontroller.mobinpool -= AM
+
+/turf/simulated/floor/beach/away/water/InitializedOn(atom/A)
+ if(!linkedcontroller)
+ return
+ if(istype(A, /obj/effect/decal/cleanable)) // Better a typecheck than looping through thousands of turfs everyday
+ linkedcontroller.decalinpool += A
+
+/turf/simulated/floor/beach/away/water/dense //for boundary "walls"
+ density = TRUE
+ baseturf = /turf/simulated/floor/beach/away/water/dense
+
+/turf/simulated/floor/beach/away/water/edge_drop
+ name = "Water"
+ icon_state = "seadrop"
+ water_overlay_image = "water_drop"
+ baseturf = /turf/simulated/floor/beach/away/water/edge_drop
+
+/turf/simulated/floor/beach/away/water/drop
+ name = "Water"
+ icon = 'icons/turf/floors/seadrop.dmi'
+ icon_state = "seadrop"
+ water_overlay_image = null
+ smooth = SMOOTH_TRUE
+ canSmoothWith = list(
+ /turf/simulated/floor/beach/away/water/drop, /turf/simulated/floor/beach/away/water/drop/dense,
+ /turf/simulated/floor/beach/away/water, /turf/simulated/floor/beach/away/water/dense,
+ /turf/simulated/floor/beach/away/water/edge_drop)
+ var/obj/effect/beach_drop_overlay/water_overlay
+ baseturf = /turf/simulated/floor/beach/away/water/drop
+
+/turf/simulated/floor/beach/away/water/drop/Initialize(mapload)
+ . = ..()
+ water_overlay = new(src)
+
+/turf/simulated/floor/beach/away/water/drop/Destroy()
+ QDEL_NULL(water_overlay)
+ return ..()
+
+/obj/effect/beach_drop_overlay
+ name = "Water"
+ icon = 'icons/turf/floors/seadrop-o.dmi'
+ layer = MOB_LAYER + 0.1
+ smooth = SMOOTH_TRUE
+ anchored = 1
+ canSmoothWith = list(
+ /turf/simulated/floor/beach/away/water/drop, /turf/simulated/floor/beach/away/water/drop/dense,
+ /turf/simulated/floor/beach/away/water, /turf/simulated/floor/beach/away/water/dense,
+ /turf/simulated/floor/beach/away/water/edge_drop)
+
+/turf/simulated/floor/beach/away/water/drop/dense
+ density = TRUE
+ baseturf = /turf/simulated/floor/beach/away/water/drop/dense
+
+/turf/simulated/floor/beach/away/water/deep
+ name = "Deep Water"
+ icon_state = "seadeep"
+ water_overlay_image = "water_deep"
+ baseturf = /turf/simulated/floor/beach/away/water/deep
+
+/turf/simulated/floor/beach/away/water/deep/dense
+ density = TRUE
+ baseturf = /turf/simulated/floor/beach/away/water/deep/dense
+
+/turf/simulated/floor/beach/away/water/deep/wood_floor
+ name = "Sunken Floor"
+ icon = 'icons/turf/floors.dmi'
+ icon_state = "wood"
+ baseturf = /turf/simulated/floor/beach/away/water/deep/wood_floor
+
+/turf/simulated/floor/beach/away/water/deep/sand_floor
+ name = "Sea Floor"
+ icon_state = "sand"
+ baseturf = /turf/simulated/floor/beach/away/water/deep/sand_floor
+
+/turf/simulated/floor/beach/away/water/deep/rock_wall
+ name = "Reef Stone"
+ icon_state = "desert7"
+ density = TRUE
+ opacity = TRUE
+ explosion_block = 2
+ mouse_opacity = MOUSE_OPACITY_ICON
+ baseturf = /turf/simulated/floor/beach/away/water/deep/rock_wall
+
+/obj/effect/baseturf_helper/beach/away/sand
+ name = "beach away sand baseturf editor"
+ baseturf = /turf/simulated/floor/beach/away/sand
+
+/obj/effect/baseturf_helper/beach/away/water
+ name = "beach away water baseturf editor"
+ baseturf = /turf/simulated/floor/beach/away/water/deep/sand_floor
diff --git a/code/modules/awaymissions/mission_code/ghost_role_spawners/oldstation.dm b/code/modules/awaymissions/mission_code/ghost_role_spawners/oldstation.dm
index 62f4226394d..ab868439cee 100644
--- a/code/modules/awaymissions/mission_code/ghost_role_spawners/oldstation.dm
+++ b/code/modules/awaymissions/mission_code/ghost_role_spawners/oldstation.dm
@@ -71,7 +71,7 @@
shoes = /obj/item/clothing/shoes/workboots
id = /obj/item/card/id/away/old/eng
gloves = /obj/item/clothing/gloves/color/fyellow/old
- l_pocket = /obj/item/tank/emergency_oxygen
+ l_pocket = /obj/item/tank/internals/emergency_oxygen
assignedrole = "Ancient Crew"
/obj/effect/mob_spawn/human/oldeng/Destroy()
diff --git a/code/modules/awaymissions/mission_code/ruins/oldstation.dm b/code/modules/awaymissions/mission_code/ruins/oldstation.dm
index 9489ddec45b..ab1f4ca2603 100644
--- a/code/modules/awaymissions/mission_code/ruins/oldstation.dm
+++ b/code/modules/awaymissions/mission_code/ruins/oldstation.dm
@@ -62,7 +62,7 @@
item_state = "void"
desc = "A CentCom engineering dark red space suit. Age has degraded the suit making is difficult to move around in."
slowdown = 4
- allowed = list(/obj/item/flashlight, /obj/item/tank, /obj/item/multitool)
+ allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/multitool)
/obj/item/clothing/head/helmet/old
name = "degrading helmet"
diff --git a/code/modules/awaymissions/mission_code/spacehotel.dm b/code/modules/awaymissions/mission_code/spacehotel.dm
deleted file mode 100644
index 8f2f03aea62..00000000000
--- a/code/modules/awaymissions/mission_code/spacehotel.dm
+++ /dev/null
@@ -1,279 +0,0 @@
-#define PAY_INTERVAL 6000 // amount of ticks between payment
-
-/area/awaymission/spacehotel
- name = "Deep Space Hotel 419"
- requires_power = FALSE
- dynamic_lighting = DYNAMIC_LIGHTING_FORCED
-
-/area/awaymission/spacehotel/kitchen
- name = "Hotel Kitchen"
- icon_state = "kitchen"
-
-/area/awaymission/spacehotel/reception
- name = "Hotel Reception"
- icon_state = "entry"
-
-// "Directional" map template loader for N or S hotel room
-/obj/effect/landmark/map_loader/hotel_room
- icon = 'icons/testing/turf_analysis.dmi'
- icon_state = "arrow"
-
-/obj/item/paper/crumpled/hotel_scrap_1
- name = "paper scrap"
- info = "I can't believe this shitty hotel assigned me a purple-themed room. Why does the shower dump grape drink everywhere??"
-
-/obj/item/paper/hotel_scrap_2
- name = "Journal Entry #2"
- info = "
Day 7:
Today, I stepped into my bathroom, only to discover that it had become a mountainside wilderness. I tried to wash my hands with snow, but it didn't particularly pan out. I contacting the front desk regarding the issue, but the receptionist just stared at me with dead eyes and spouted unrepeatable curses at me. However, I convinced them to reassign me to an upgraded suite."
-
-/obj/item/paper/hotel_scrap_3
- name = "Journal Entry #3"
- info = "
Day 26:
Well, that sucked royally. The queen-sized bed was nice, but the hottub in my room was, well, my wife described it as \"a portal to hell\". I don't know, I guess the lava and weird blood gave it that impression, but it was pretty nicely warm. However, \"we\" decided to get assigned to a new room. Whatever."
-
-/obj/item/paper/hotel_scrap_4
- name = "Diary Page"
- info = "Day 7 of Bad Vacation Thanks Qzxor this shit vacation is ending today. The novelty of the trashy pool wore off 2 days in and I'm not allowed in the bar. The tiny box they called a room that, we had to cram into, just had a poster and a couple of beds. Only one bedsheet to spare. Shower had brown water and sink just dumped its water back out the ceiling, somehow.
PS: The receptionist isn't paying attention to us when we try to check out. Apparently, we're staying another day."
-
-/obj/item/paper/hotel_scrap_5
- name = "Journal Entry #5"
- info = "
Day 185:
I feel like the restaurant's chef is just making random dishes to mess with me. I request something from the menu, and he throws out something nobody asked for on the counter. The bartender isn't much better. At least both of them can make some nice food and drinks. I would complain to the management... but they never seem to care."
-
-/obj/item/paper/crumpled/hotel_scrap_6
- name = "Journal Entry #6"
- info = "
Day 386:
AMBGAT MEZLBNU. Something wrong. Can't stop hugging plushies."
-
-/obj/item/paper/crumpled/hotel_scrap_7
- name = "Journal Entry #8"
- info = "ASGATDHU NAMSPA KER OKS O OKDOFLI OSDSFKO OASKDAFO AOSDKF OINAIS ISJDDEF OSKFEREAODIK OSI ODIFOSA OEKRRO ASODFKAO PSSDOF SDFK OSDKF OSDKFSASPODFIOSASD UHGU DFYG FPO ASDFOS DFOASSD FAPSO FSPDFOIER OPWASDSA PS DODIOF OSDI pizza OKSDFO AL OKEWORK CVBUASO SDFO AOE RAOWEIK SODDFI"
-
-/obj/item/paper/hotel_scrap_8
- name = "Mysterious Note"
- icon_state = "paper_talisman"
- info = "
There is only one way to leave.
"
-
-/obj/item/paper/pamphlet/hotel
- name = "space hotel pamphlet"
- info = "
Welcome to Deep Space Hotel 419!
Thank you for choosing our hotel. Simply hand your credit or debit card to the concierge and get your room key! To check out, hand your credit card back.
Conditions:
The hotel is not responsible for any losses due to time or space anomalies.
The hotel is not responsible for events that occur outside of the hotel station, including, but not limited to, events that occur inside of dimensional pockets.
The hotel is not responsible for overcharging your account.
The hotel is not responsible for missing persons.
The hotel is not responsible for mind-altering effects due to drugs, magic, demons, or space worms.
"
+
/obj/effect/countdown/anomaly
name = "anomaly countdown"
diff --git a/code/modules/crafting/recipes.dm b/code/modules/crafting/recipes.dm
index 3ec2e5bf565..dcf12d64746 100644
--- a/code/modules/crafting/recipes.dm
+++ b/code/modules/crafting/recipes.dm
@@ -523,6 +523,14 @@
tools = list(TOOL_SCREWDRIVER, TOOL_WRENCH, TOOL_WELDER)
category = CAT_MISC
+/datum/crafting_recipe/ghettojetpack
+ name = "Improvised Jetpack"
+ result = /obj/item/tank/jetpack/improvised
+ time = 30
+ reqs = list(/obj/item/tank/internals/oxygen = 2, /obj/item/extinguisher = 1, /obj/item/pipe = 3, /obj/item/stack/cable_coil = MAXCOIL)
+ category = CAT_MISC
+ tools = list(TOOL_WRENCH, TOOL_WELDER, TOOL_WIRECUTTER)
+
/datum/crafting_recipe/drill
name = "Thermal Drill"
result = /obj/item/thermal_drill
diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm
index 4ee33f4d87e..18c6553bf66 100644
--- a/code/modules/customitems/item_defines.dm
+++ b/code/modules/customitems/item_defines.dm
@@ -807,7 +807,7 @@
item_state = "supplymaster_jacket_open"
ignore_suitadjust = 0
suit_adjusted = 1
- allowed = list(/obj/item/flashlight,/obj/item/tank/emergency_oxygen,/obj/item/toy,/obj/item/storage/fancy/cigarettes,/obj/item/lighter)
+ allowed = list(/obj/item/flashlight,/obj/item/tank/internals/emergency_oxygen,/obj/item/toy,/obj/item/storage/fancy/cigarettes,/obj/item/lighter)
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS
actions_types = list(/datum/action/item_action/button)
@@ -971,7 +971,7 @@
icon_state = "xantholne_wintercoat"
hoodtype = /obj/item/clothing/head/hooded/hood/fluff/xantholne
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
- allowed = list(/obj/item/flashlight, /obj/item/tank/emergency_oxygen, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter)
+ allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter)
/obj/item/clothing/head/hooded/hood/fluff/xantholne // Xantholne: Meex Zwichsnicrur
@@ -992,7 +992,7 @@
hoodtype = /obj/item/clothing/head/hooded/hood/fluff/xydonus
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS
- allowed = list(/obj/item/flashlight,/obj/item/tank/emergency_oxygen,/obj/item/toy,/obj/item/storage/fancy/cigarettes,/obj/item/lighter)
+ allowed = list(/obj/item/flashlight,/obj/item/tank/internals/emergency_oxygen,/obj/item/toy,/obj/item/storage/fancy/cigarettes,/obj/item/lighter)
/obj/item/clothing/head/hooded/hood/fluff/xydonus
name = "custom fit hood"
@@ -1055,7 +1055,7 @@
icon_state = "dtxbomber"
item_state = "dtxbomber"
ignore_suitadjust = 0
- allowed = list(/obj/item/flashlight,/obj/item/tank/emergency_oxygen,/obj/item/toy,/obj/item/storage/fancy/cigarettes,/obj/item/lighter)
+ allowed = list(/obj/item/flashlight,/obj/item/tank/internals/emergency_oxygen,/obj/item/toy,/obj/item/storage/fancy/cigarettes,/obj/item/lighter)
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS
actions_types = list(/datum/action/item_action/zipper)
@@ -1213,7 +1213,7 @@
icon = 'icons/obj/custom_items.dmi'
icon_state = "fox_jacket"
item_state = "fox_jacket"
- allowed = list(/obj/item/flashlight, /obj/item/tank/emergency_oxygen, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/gun/projectile/automatic/pistol, /obj/item/gun/projectile/revolver, /obj/item/gun/projectile/revolver/detective)
+ allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/gun/projectile/automatic/pistol, /obj/item/gun/projectile/revolver, /obj/item/gun/projectile/revolver/detective)
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS
min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
@@ -1583,7 +1583,7 @@
item_state = "asmer_accordion"
-/obj/item/clothing/head/fluff/pinesalad_horns //Pineapple Salad: Dan Jello
+/obj/item/clothing/head/fluff/pinesalad_horns //Pineapple Salad: Dan Jello
name = "Bluespace Horns"
desc = "A pair of fake horns. Now with added bluespace!"
icon = 'icons/obj/custom_items.dmi'
diff --git a/code/modules/economy/Economy_TradeDestinations.dm b/code/modules/economy/Economy_TradeDestinations.dm
index 74d005e3b3b..0efa3a4a058 100644
--- a/code/modules/economy/Economy_TradeDestinations.dm
+++ b/code/modules/economy/Economy_TradeDestinations.dm
@@ -28,7 +28,7 @@ GLOBAL_LIST_EMPTY(weighted_mundaneevent_locations)
/datum/trade_destination/anansi
name = "NSS Anansi"
- description = "Medical station ran by Second Red Cross (but owned by NT) for handling emergency cases from nearby colonies."
+ description = "Medical station ran by Second Green Cross (but owned by NT) for handling emergency cases from nearby colonies."
distance = 1.7
willing_to_buy = list()
willing_to_sell = list()
@@ -37,7 +37,7 @@ GLOBAL_LIST_EMPTY(weighted_mundaneevent_locations)
/datum/trade_destination/anansi/get_custom_eventstring(var/event_type)
if(event_type == RESEARCH_BREAKTHROUGH)
- return "Thanks to research conducted on the NSS Anansi, Second Red Cross Society wishes to announce a major breakthough in the field of \
+ return "Thanks to research conducted on the NSS Anansi, Second Green Cross Society wishes to announce a major breakthough in the field of \
[pick("mind-machine interfacing","neuroscience","nano-augmentation","genetics")]. Nanotrasen is expected to announce a co-exploitation deal within the fortnight."
return null
diff --git a/code/modules/events/abductor.dm b/code/modules/events/abductor.dm
index 4ad8fb4eb90..782595931ac 100644
--- a/code/modules/events/abductor.dm
+++ b/code/modules/events/abductor.dm
@@ -1,12 +1,12 @@
/datum/event/abductor
/datum/event/abductor/start()
- //spawn abductor team
- processing = 0 //so it won't fire again in next tick
+ INVOKE_ASYNC(src, .proc/try_makeAbductorTeam)
+
+/datum/event/abductor/proc/try_makeAbductorTeam()
if(!makeAbductorTeam())
message_admins("Abductor event failed to find players. Retrying in 30s.")
- spawn(300)
- makeAbductorTeam()
+ addtimer(CALLBACK(src, .proc/makeAbductorTeam), 30 SECONDS)
/datum/event/abductor/proc/makeAbductorTeam()
var/list/mob/dead/observer/candidates = SSghost_spawns.poll_candidates("Do you wish to be considered for an Abductor Team?", ROLE_ABDUCTOR, TRUE)
@@ -46,7 +46,6 @@
if(SSticker.mode.config_tag != "abduction")
SSticker.mode.abductors |= temp.abductors
- processing = 1 //So it will get gc'd
return 1
else
return 0
diff --git a/code/modules/events/alien_infestation.dm b/code/modules/events/alien_infestation.dm
index b4342f29836..eac29d2a877 100644
--- a/code/modules/events/alien_infestation.dm
+++ b/code/modules/events/alien_infestation.dm
@@ -15,23 +15,24 @@
log_and_message_admins("Warning: Could not spawn any mobs for event Alien Infestation")
/datum/event/alien_infestation/start()
- var/list/vents = get_valid_vent_spawns(exclude_mobs_nearby = TRUE, exclude_visible_by_mobs = TRUE)
playercount = length(GLOB.clients)//grab playercount when event starts not when game starts
if(playercount >= highpop_trigger) //spawn with 4 if highpop
spawncount = 4
+ INVOKE_ASYNC(src, .proc/spawn_xenos)
- spawn()
- var/list/candidates = SSghost_spawns.poll_candidates("Do you want to play as an alien?", ROLE_ALIEN, TRUE, source = /mob/living/carbon/alien/larva)
- while(spawncount && length(vents) && length(candidates))
- var/obj/vent = pick_n_take(vents)
- var/mob/C = pick_n_take(candidates)
- if(C)
- GLOB.respawnable_list -= C.client
- var/mob/living/carbon/alien/larva/new_xeno = new(vent.loc)
- new_xeno.amount_grown += (0.75 * new_xeno.max_grown) //event spawned larva start off almost ready to evolve.
- new_xeno.key = C.key
- if(SSticker && SSticker.mode)
- SSticker.mode.xenos += new_xeno.mind
+/datum/event/alien_infestation/proc/spawn_xenos()
+ var/list/candidates = SSghost_spawns.poll_candidates("Do you want to play as an alien?", ROLE_ALIEN, TRUE, source = /mob/living/carbon/alien/larva)
+ var/list/vents = get_valid_vent_spawns(exclude_mobs_nearby = TRUE, exclude_visible_by_mobs = TRUE)
+ while(spawncount && length(vents) && length(candidates))
+ var/obj/vent = pick_n_take(vents)
+ var/mob/C = pick_n_take(candidates)
+ if(C)
+ GLOB.respawnable_list -= C.client
+ var/mob/living/carbon/alien/larva/new_xeno = new(vent.loc)
+ new_xeno.amount_grown += (0.75 * new_xeno.max_grown) //event spawned larva start off almost ready to evolve.
+ new_xeno.key = C.key
+ if(SSticker && SSticker.mode)
+ SSticker.mode.xenos += new_xeno.mind
- spawncount--
- successSpawn = TRUE
+ spawncount--
+ successSpawn = TRUE
diff --git a/code/modules/events/apc_overload.dm b/code/modules/events/apc_overload.dm
index 2ca2cdbfa70..4e2a296dda5 100644
--- a/code/modules/events/apc_overload.dm
+++ b/code/modules/events/apc_overload.dm
@@ -29,6 +29,7 @@
/proc/apc_overload_failure(announce=TRUE)
var/list/skipped_areas_apc = list(
/area/engine/engineering,
+ /area/engine/supermatter,
/area/turret_protected/ai)
if(announce)
diff --git a/code/modules/events/apc_short.dm b/code/modules/events/apc_short.dm
index bb82ceb15c4..21facb9b411 100644
--- a/code/modules/events/apc_short.dm
+++ b/code/modules/events/apc_short.dm
@@ -29,6 +29,7 @@
/proc/power_failure(announce=TRUE)
var/list/skipped_areas_apc = list(
/area/engine/engineering,
+ /area/engine/supermatter,
/area/turret_protected/ai)
if(announce)
diff --git a/code/modules/events/blob.dm b/code/modules/events/blob.dm
index 3af25262d18..eb5dfc6a738 100644
--- a/code/modules/events/blob.dm
+++ b/code/modules/events/blob.dm
@@ -10,12 +10,12 @@
log_and_message_admins("Warning: Could not spawn any mobs for event Blob")
/datum/event/blob/start()
- processing = FALSE //so it won't fire again in next tick
-
var/turf/T = pick(GLOB.blobstart)
if(!T)
return kill()
+ INVOKE_ASYNC(src, .proc/make_blob)
+/datum/event/blob/proc/make_blob()
var/list/candidates = SSghost_spawns.poll_candidates("Do you want to play as a blob infested mouse?", ROLE_BLOB, TRUE, source = /mob/living/simple_animal/mouse/blobinfected)
if(!length(candidates))
return kill()
@@ -32,4 +32,3 @@
to_chat(B, "You are now a mouse, infected with blob spores. Find somewhere isolated... before you burst and become the blob! Use ventcrawl (alt-click on vents) to move around.")
notify_ghosts("Infected Mouse has appeared in [get_area(B)].", source = B)
successSpawn = TRUE
- processing = TRUE // Let it naturally end, if it runs successfully
diff --git a/code/modules/events/dust.dm b/code/modules/events/dust.dm
index 672a81cce15..4654a09ba72 100644
--- a/code/modules/events/dust.dm
+++ b/code/modules/events/dust.dm
@@ -18,6 +18,7 @@
var/strength = 2 //ex_act severity number
var/life = 2 //how many things we hit before qdel(src)
var/atom/goal = null
+ var/shake_chance = 50
/obj/effect/space_dust/weak
strength = 3
@@ -64,30 +65,33 @@
src.x = startx
src.y = starty
src.z = level_name_to_num(MAIN_STATION)
- spawn(0)
- walk_towards(src, goal, 1)
- return
+ walk_towards(src, goal, 1)
/obj/effect/space_dust/Bump(atom/A)
- spawn(0)
- if(prob(50))
- for(var/mob/M in range(10, src))
- if(!M.stat && !istype(M, /mob/living/silicon/ai))
- shake_camera(M, 3, 1)
- if(A)
- playsound(src.loc, 'sound/effects/meteorimpact.ogg', 40, 1)
+ if(QDELETED(src))
+ return
+ if(prob(shake_chance))
+ for(var/mob/M in range(10, src))
+ if(!M.stat && !istype(M, /mob/living/silicon/ai))
+ shake_camera(M, 3, 1)
+ playsound(loc, 'sound/effects/meteorimpact.ogg', 40, 1)
- if(ismob(A))
- A.ex_act(strength)//This should work for now I guess
- else if(!istype(A,/obj/machinery/power/emitter) && !istype(A,/obj/machinery/field/generator)) //Protect the singularity from getting released every round!
- A.ex_act(strength) //Changing emitter/field gen ex_act would make it immune to bombs and C4
+ INVOKE_ASYNC(src, .proc/impact_meteor, A) // ex_act can have some sleeps in it
- life--
- if(life <= 0)
- walk(src,0)
- spawn(1)
- qdel(src)
- return
+/obj/effect/space_dust/proc/impact_meteor(atom/A)
+ var/turf/where = get_turf(A)
+ if(ismob(A))
+ A.ex_act(strength)//This should work for now I guess
+ else if(!istype(A, /obj/machinery/power/emitter) && !istype(A, /obj/machinery/field/generator)) //Protect the singularity from getting released every round!
+ A.ex_act(strength) //Changing emitter/field gen ex_act would make it immune to bombs and C4
+
+ life--
+ if(life <= 0)
+ walk(src, 0)
+ on_shatter(where)
+ qdel(src)
+
+/obj/effect/space_dust/proc/on_shatter(turf/where)
return
/obj/effect/space_dust/Bumped(atom/A)
diff --git a/code/modules/events/event.dm b/code/modules/events/event.dm
index dc6016d2c1f..bde882b6f69 100644
--- a/code/modules/events/event.dm
+++ b/code/modules/events/event.dm
@@ -53,7 +53,6 @@
/datum/event //NOTE: Times are measured in master controller ticks!
/// The human-readable name of the event
var/name
- var/processing = 1
/// When in the lifetime to call start().
var/startWhen = 0
/// When in the lifetime to call announce().
@@ -93,6 +92,7 @@
*
* Allows you to start before announcing or vice versa.
* Only called once.
+ * Ensure no sleep is called. Use INVOKE_ASYNC to call procs which do.
*/
/datum/event/proc/start()
return
@@ -102,6 +102,7 @@
*
* Allows you to announce before starting or vice versa.
* Only called once.
+ * Ensure no sleep is called. Use INVOKE_ASYNC to call procs which do.
*/
/datum/event/proc/announce()
return
@@ -112,6 +113,7 @@
* You can include code related to your event or add your own
* time stamped events.
* Called more than once.
+ * Ensure no sleep is called. Use INVOKE_ASYNC to call procs which do.
*/
/datum/event/proc/tick()
return
@@ -124,6 +126,7 @@
* the activeFor variable.
* For example: if(activeFor == myOwnVariable + 30) doStuff()
* Only called once.
+ * Ensure no sleep is called. Use INVOKE_ASYNC to call procs which do.
*/
/datum/event/proc/end()
return
@@ -138,11 +141,9 @@
* Do not override this proc, instead use the appropiate procs.
*
* This proc will handle the calls to the appropiate procs.
+ * Ensure none of the code paths have a sleep in them. Use INVOKE_ASYNC to call procs which do.
*/
/datum/event/process()
- if(!processing)
- return
-
if(activeFor > startWhen && activeFor < endWhen || noAutoEnd)
tick()
diff --git a/code/modules/events/immovable_rod.dm b/code/modules/events/immovable_rod.dm
index 43252bd2000..bb4d3c940de 100644
--- a/code/modules/events/immovable_rod.dm
+++ b/code/modules/events/immovable_rod.dm
@@ -15,8 +15,8 @@ In my current plan for it, 'solid' will be defined as anything with density == 1
/datum/event/immovable_rod/start()
var/startside = pick(GLOB.cardinal)
- var/turf/startT = spaceDebrisStartLoc(startside, 1)
- var/turf/endT = spaceDebrisFinishLoc(startside, 1)
+ var/turf/startT = spaceDebrisStartLoc(startside, level_name_to_num(MAIN_STATION))
+ var/turf/endT = spaceDebrisFinishLoc(startside, level_name_to_num(MAIN_STATION))
new /obj/effect/immovablerod/event(startT, endT)
/obj/effect/immovablerod
@@ -25,8 +25,8 @@ In my current plan for it, 'solid' will be defined as anything with density == 1
icon = 'icons/obj/objects.dmi'
icon_state = "immrod"
throwforce = 100
- density = 1
- anchored = 1
+ density = TRUE
+ anchored = TRUE
var/z_original = 0
var/destination
var/notify = TRUE
@@ -41,9 +41,9 @@ In my current plan for it, 'solid' will be defined as anything with density == 1
if(notify)
notify_ghosts("\A [src] is inbound!",
enter_link="(Click to follow)",
- source=src, action=NOTIFY_FOLLOW)
+ source = src, action = NOTIFY_FOLLOW)
GLOB.poi_list |= src
- if(end && end.z==z_original)
+ if(end?.z == z_original)
walk_towards(src, destination, move_delay)
/obj/effect/immovablerod/Topic(href, href_list)
@@ -67,21 +67,23 @@ In my current plan for it, 'solid' will be defined as anything with density == 1
/obj/effect/immovablerod/Bump(atom/clong)
if(prob(10))
- playsound(src, 'sound/effects/bang.ogg', 50, 1)
+ playsound(src, 'sound/effects/bang.ogg', 50, TRUE)
audible_message("CLANG")
if(clong && prob(25))
x = clong.x
y = clong.y
- if(istype(clong, /turf) || istype(clong, /obj))
+ if(isturf(clong) || isobj(clong))
if(clong.density)
clong.ex_act(2)
- else if(istype(clong, /mob))
- if(istype(clong, /mob/living/carbon/human))
+ else if(ismob(clong))
+ if(ishuman(clong))
var/mob/living/carbon/human/H = clong
- H.visible_message("[H.name] is penetrated by an immovable rod!" , "The rod penetrates you!" , "You hear a CLANG!")
+ H.visible_message("[H.name] is penetrated by an immovable rod!" ,
+ "The rod penetrates you!" ,
+ "You hear a CLANG!")
H.adjustBruteLoss(160)
if(clong.density || prob(10))
clong.ex_act(2)
diff --git a/code/modules/events/infestation.dm b/code/modules/events/infestation.dm
index c4da62d5801..2c83f094204 100644
--- a/code/modules/events/infestation.dm
+++ b/code/modules/events/infestation.dm
@@ -80,20 +80,17 @@
spawn_types = list(/obj/structure/spider/spiderling)
max_number = 3
vermstring = "spiders"
+ var/amount_to_spawn = rand(2, max_number)
+ while(length(turfs) && amount_to_spawn > 0)
+ var/turf/simulated/floor/T = pick_n_take(turfs)
+ amount_to_spawn--
- spawn(0)
- var/num = rand(2,max_number)
- while(turfs.len > 0 && num > 0)
- var/turf/simulated/floor/T = pick(turfs)
- turfs.Remove(T)
- num--
-
- if(vermin == VERM_SPIDERS)
- var/obj/structure/spider/spiderling/S = new(T)
- S.amount_grown = -1
- else
- var/spawn_type = pick(spawn_types)
- new spawn_type(T)
+ if(vermin == VERM_SPIDERS)
+ var/obj/structure/spider/spiderling/S = new(T)
+ S.amount_grown = -1
+ else
+ var/spawn_type = pick(spawn_types)
+ new spawn_type(T)
/datum/event/infestation/announce()
diff --git a/code/modules/events/meaty_gore.dm b/code/modules/events/meaty_gore.dm
index 99ee121e4b6..a90d3e118c7 100644
--- a/code/modules/events/meaty_gore.dm
+++ b/code/modules/events/meaty_gore.dm
@@ -4,14 +4,11 @@
/datum/event/meteor_wave/gore/setup()
waves = 3
+/datum/event/meteor_wave/gore/get_meteor_count()
+ return rand(5, 8)
-/datum/event/meteor_wave/gore/tick()
- if(waves && activeFor >= next_meteor)
- spawn() spawn_meteors(rand(5,8), GLOB.meteors_gore)
- next_meteor += rand(15, 30)
- waves--
- endWhen = (waves ? next_meteor + 1 : activeFor + 15)
-
+/datum/event/meteor_wave/gore/get_meteors()
+ return GLOB.meteors_gore
/datum/event/meteor_wave/gore/end()
GLOB.event_announcement.Announce("The station has cleared the debris.", "Debris Alert")
diff --git a/code/modules/events/meaty_ops.dm b/code/modules/events/meaty_ops.dm
index f2892292932..c76c38abc1e 100644
--- a/code/modules/events/meaty_ops.dm
+++ b/code/modules/events/meaty_ops.dm
@@ -5,15 +5,11 @@
/datum/event/meteor_wave/goreop/setup()
waves = 3
+/datum/event/meteor_wave/goreop/get_meteor_count()
+ return 5
-/datum/event/meteor_wave/goreop/tick()
- if(waves && activeFor >= next_meteor)
- spawn() spawn_meteors(5, GLOB.meteors_ops)
- next_meteor += rand(15, 30)
- waves--
- endWhen = (waves ? next_meteor + 1 : activeFor + 15)
-
-
+/datum/event/meteor_wave/goreop/get_meteors()
+ return GLOB.meteors_ops
/datum/event/meteor_wave/goreop/end()
GLOB.event_announcement.Announce("All MeteorOps are dead. Major Station Victory.", "MeteorOps")
diff --git a/code/modules/events/meaty_ores.dm b/code/modules/events/meaty_ores.dm
index 7365eb40d29..0b13bddf9a6 100644
--- a/code/modules/events/meaty_ores.dm
+++ b/code/modules/events/meaty_ores.dm
@@ -8,6 +8,9 @@
qnty = rand(45,125)
/datum/event/dust/meaty/start()
+ INVOKE_ASYNC(src, .proc/spawn_meaty_ores)
+
+/datum/event/dust/meaty/proc/spawn_meaty_ores()
while(qnty-- > 0)
new /obj/effect/space_dust/meaty()
if(prob(10))
@@ -19,35 +22,18 @@
strength = 1
life = 3
+ shake_chance = 20
-/obj/effect/space_dust/meaty/Bump(atom/A)
- if(prob(20))
- spawn(1)
- for(var/mob/M in range(10, src))
- if(!M.stat && !istype(M, /mob/living/silicon/ai))
- shake_camera(M, 3, 1)
- if(A)
- playsound(src.loc, 'sound/effects/meteorimpact.ogg', 40, 1)
- walk(src,0)
- invisibility = 101
- new /obj/effect/decal/cleanable/blood(get_turf(A))
- if(ismob(A))
- A.ex_act(strength)
- else
- spawn(0)
- if(A)
- A.ex_act(strength)
- if(src)
- walk_towards(src,goal,1)
- life--
- if(!life)
- if(prob(80))
- gibs(loc)
- if(prob(45))
- new /obj/item/reagent_containers/food/snacks/meat(loc)
- else if(prob(10))
- explosion(get_turf(loc), 0, pick(0,1), pick(2,3), 0)
- else
- new /mob/living/simple_animal/cow(loc)
+/obj/effect/space_dust/meaty/impact_meteor(atom/A)
+ new /obj/effect/decal/cleanable/blood(get_turf(A))
+ ..()
- qdel(src)
+/obj/effect/space_dust/meaty/on_shatter(turf/where)
+ if(prob(80))
+ gibs(where)
+ if(prob(45))
+ new /obj/item/reagent_containers/food/snacks/meat(where)
+ else if(prob(10))
+ explosion(where, 0, pick(0,1), pick(2,3), 0)
+ else
+ new /mob/living/simple_animal/cow(where)
diff --git a/code/modules/events/meteors.dm b/code/modules/events/meteors.dm
index f52fd01a5e6..d68ed189be2 100644
--- a/code/modules/events/meteors.dm
+++ b/code/modules/events/meteors.dm
@@ -17,7 +17,7 @@
//meteor showers are lighter and more common,
/datum/event/meteor_wave/tick()
if(waves && activeFor >= next_meteor)
- spawn() spawn_meteors(severity * rand(1,2), get_meteors())
+ INVOKE_ASYNC(GLOBAL_PROC, .proc/spawn_meteors, get_meteor_count(), get_meteors())
next_meteor += rand(15, 30) / severity
waves--
endWhen = (waves ? next_meteor + 1 : activeFor + 15)
@@ -37,3 +37,6 @@
return GLOB.meteors_threatening
else
return GLOB.meteors_normal
+
+/datum/event/meteor_wave/proc/get_meteor_count()
+ return severity * rand(1, 2)
diff --git a/code/modules/events/sentience.dm b/code/modules/events/sentience.dm
index b28dc6a467d..0691641fc5e 100644
--- a/code/modules/events/sentience.dm
+++ b/code/modules/events/sentience.dm
@@ -1,8 +1,9 @@
/datum/event/sentience
/datum/event/sentience/start()
- processing = FALSE //so it won't fire again in next tick
+ INVOKE_ASYNC(src, .proc/make_sentient_mob)
+/datum/event/sentience/proc/make_sentient_mob()
var/list/candidates = SSghost_spawns.poll_candidates("Do you want to awaken as a sentient being?", ROLE_SENTIENT, TRUE)
var/list/potential = list()
var/sentience_type = SENTIENCE_ORGANIC
@@ -40,7 +41,6 @@
SA.del_on_death = FALSE
greet_sentient(SA)
print_command_report(sentience_report, "[command_name()] Update", FALSE)
- processing = TRUE // Let it naturally end, if it runs successfully
/datum/event/sentience/proc/greet_sentient(var/mob/living/carbon/human/M)
to_chat(M, "Hello world!")
diff --git a/code/modules/events/slaughterevent.dm b/code/modules/events/slaughterevent.dm
index 043f43da83c..0f03cb691ca 100644
--- a/code/modules/events/slaughterevent.dm
+++ b/code/modules/events/slaughterevent.dm
@@ -1,49 +1,48 @@
/datum/event/spawn_slaughter
var/key_of_slaughter
-/datum/event/spawn_slaughter/proc/get_slaughter(var/end_if_fail = 0)
- spawn()
- var/list/candidates = SSghost_spawns.poll_candidates("Do you want to play as a slaughter demon?", ROLE_DEMON, TRUE, source = /mob/living/simple_animal/slaughter)
- if(!candidates.len)
- key_of_slaughter = null
- kill()
- return
- var/mob/C = pick(candidates)
- key_of_slaughter = C.key
+/datum/event/spawn_slaughter/proc/get_slaughter()
+ var/list/candidates = SSghost_spawns.poll_candidates("Do you want to play as a slaughter demon?", ROLE_DEMON, TRUE, source = /mob/living/simple_animal/slaughter)
+ if(!length(candidates))
+ kill()
+ return
- if(!key_of_slaughter)
- kill()
- return
+ var/mob/C = pick(candidates)
+ key_of_slaughter = C.key
- var/datum/mind/player_mind = new /datum/mind(key_of_slaughter)
- player_mind.active = 1
- var/list/spawn_locs = list()
+ if(!key_of_slaughter)
+ kill()
+ return
+
+ var/datum/mind/player_mind = new /datum/mind(key_of_slaughter)
+ player_mind.active = TRUE
+ var/list/spawn_locs = list()
+ for(var/thing in GLOB.landmarks_list)
+ var/obj/effect/landmark/L = thing
+ if(isturf(L.loc))
+ switch(L.name)
+ if("revenantspawn")
+ spawn_locs += L.loc
+ if(!spawn_locs) //If we can't find any revenant spawns, try the carp spawns
for(var/thing in GLOB.landmarks_list)
var/obj/effect/landmark/L = thing
if(isturf(L.loc))
switch(L.name)
- if("revenantspawn")
+ if("carpspawn")
spawn_locs += L.loc
- if(!spawn_locs) //If we can't find any revenant spawns, try the carp spawns
- for(var/thing in GLOB.landmarks_list)
- var/obj/effect/landmark/L = thing
- if(isturf(L.loc))
- switch(L.name)
- if("carpspawn")
- spawn_locs += L.loc
- if(!spawn_locs) //If we can't find either, just spawn the revenant at the player's location
- spawn_locs += get_turf(player_mind.current)
- if(!spawn_locs) //If we can't find THAT, then just retry
- kill()
- return
- var/obj/effect/dummy/slaughter/holder = new /obj/effect/dummy/slaughter(pick(spawn_locs))
- var/mob/living/simple_animal/slaughter/S = new /mob/living/simple_animal/slaughter/(holder)
- S.holder = holder
- player_mind.transfer_to(S)
- player_mind.assigned_role = "Slaughter Demon"
- player_mind.special_role = SPECIAL_ROLE_SLAUGHTER_DEMON
- message_admins("[key_name_admin(S)] has been made into a Slaughter Demon by an event.")
- log_game("[key_name_admin(S)] was spawned as a Slaughter Demon by an event.")
+ if(!spawn_locs) //If we can't find either, just spawn the revenant at the player's location
+ spawn_locs += get_turf(player_mind.current)
+ if(!spawn_locs) //If we can't find THAT, then just retry
+ kill()
+ return
+ var/obj/effect/dummy/slaughter/holder = new /obj/effect/dummy/slaughter(pick(spawn_locs))
+ var/mob/living/simple_animal/slaughter/S = new /mob/living/simple_animal/slaughter/(holder)
+ S.holder = holder
+ player_mind.transfer_to(S)
+ player_mind.assigned_role = "Slaughter Demon"
+ player_mind.special_role = SPECIAL_ROLE_SLAUGHTER_DEMON
+ message_admins("[key_name_admin(S)] has been made into a Slaughter Demon by an event.")
+ log_game("[key_name_admin(S)] was spawned as a Slaughter Demon by an event.")
/datum/event/spawn_slaughter/start()
- get_slaughter()
+ INVOKE_ASYNC(src, .proc/get_slaughter)
diff --git a/code/modules/events/spacevine.dm b/code/modules/events/spacevine.dm
index 4ea63cf2fbe..38582f141d2 100644
--- a/code/modules/events/spacevine.dm
+++ b/code/modules/events/spacevine.dm
@@ -230,9 +230,8 @@
if(explosion_severity < 3)
qdel(holder)
else
- . = 1
- spawn(5)
- holder.wither()
+ addtimer(CALLBACK(holder, /obj/structure/spacevine.proc/wither), 5)
+ return TRUE
/datum/spacevine_mutation/explosive/on_death(obj/structure/spacevine/holder, mob/hitter, obj/item/I)
explosion(holder.loc, 0, 0, severity, 0, 0)
diff --git a/code/modules/events/tear.dm b/code/modules/events/tear.dm
index 327ae59c935..19805dabe63 100644
--- a/code/modules/events/tear.dm
+++ b/code/modules/events/tear.dm
@@ -34,9 +34,7 @@
animation.icon_state = "newtear"
animation.icon = 'icons/effects/tear.dmi'
animation.master = src
- spawn(15)
- if(animation)
- qdel(animation)
+ QDEL_IN(animation, 15)
addtimer(CALLBACK(src, .proc/spew_critters), rand(30, 120))
diff --git a/code/modules/events/traders.dm b/code/modules/events/traders.dm
index d4ae1de3b9c..01133ed19e5 100644
--- a/code/modules/events/traders.dm
+++ b/code/modules/events/traders.dm
@@ -33,38 +33,39 @@ GLOBAL_LIST_INIT(unused_trade_stations, list("sol"))
trader_objectives = forge_trader_objectives()
- spawn()
- var/list/candidates = SSghost_spawns.poll_candidates("Do you want to play as a Sol Trader?", ROLE_TRADER, TRUE)
- var/index = 1
- while(spawn_count > 0 && candidates.len > 0)
- if(index > spawnlocs.len)
- index = 1
+ INVOKE_ASYNC(src, .proc/spawn_traders, spawnlocs)
- var/turf/picked_loc = spawnlocs[index]
- index++
- var/mob/C = pick_n_take(candidates)
- spawn_count--
- if(C)
- GLOB.respawnable_list -= C.client
- var/mob/living/carbon/human/M = new /mob/living/carbon/human(picked_loc)
- M.ckey = C.ckey // must be before equipOutfit, or that will runtime due to lack of mind
- M.equipOutfit(/datum/outfit/admin/sol_trader)
- M.dna.species.after_equip_job(null, M)
- M.mind.objectives += trader_objectives
- M.mind.offstation_role = TRUE
- greet_trader(M)
- success_spawn = 1
- if(success_spawn)
- GLOB.event_announcement.Announce("A trading shuttle from Jupiter Station has been granted docking permission at [station_name()] arrivals port 4.", "Trader Shuttle Docking Request Accepted")
- else
- GLOB.unused_trade_stations += station // Return the station to the list of usable stations.
+/datum/event/traders/proc/spawn_traders(list/spawnlocs)
+ var/list/candidates = SSghost_spawns.poll_candidates("Do you want to play as a Sol Trader?", ROLE_TRADER, TRUE)
+ var/index = 1
+ while(spawn_count > 0 && length(candidates))
+ if(index > length(spawnlocs))
+ index = 1
+
+ var/turf/picked_loc = spawnlocs[index]
+ index++
+ var/mob/C = pick_n_take(candidates)
+ spawn_count--
+ if(C)
+ GLOB.respawnable_list -= C.client
+ var/mob/living/carbon/human/M = new /mob/living/carbon/human(picked_loc)
+ M.ckey = C.ckey // must be before equipOutfit, or that will runtime due to lack of mind
+ M.equipOutfit(/datum/outfit/admin/sol_trader)
+ M.dna.species.after_equip_job(null, M)
+ M.mind.objectives += trader_objectives
+ M.mind.offstation_role = TRUE
+ greet_trader(M)
+ success_spawn = TRUE
+ if(success_spawn)
+ GLOB.event_announcement.Announce("A trading shuttle from Jupiter Station has been granted docking permission at [station_name()] arrivals port 4.", "Trader Shuttle Docking Request Accepted")
+ else
+ GLOB.unused_trade_stations += station // Return the station to the list of usable stations.
/datum/event/traders/proc/greet_trader(var/mob/living/carbon/human/M)
to_chat(M, "You are a trader!")
to_chat(M, "You are currently docked at [get_area(M)].")
to_chat(M, "You are about to trade with [station_name()].")
- spawn(25)
- show_objectives(M.mind)
+ addtimer(CALLBACK(GLOBAL_PROC, .proc/show_objectives, M.mind), 25)
/datum/event/traders/proc/forge_trader_objectives()
var/list/objs = list()
diff --git a/code/modules/events/wallrot.dm b/code/modules/events/wallrot.dm
index 040c228735f..33134001a1f 100644
--- a/code/modules/events/wallrot.dm
+++ b/code/modules/events/wallrot.dm
@@ -6,26 +6,31 @@
GLOB.event_announcement.Announce("Harmful fungi detected on station. Station structures may be contaminated.", "Biohazard Alert")
/datum/event/wallrot/start()
- spawn()
- var/turf/simulated/wall/center = null
+ INVOKE_ASYNC(src, .proc/spawn_wallrot)
- // 100 attempts
- for(var/i=0, i<100, i++)
- var/turf/candidate = locate(rand(1, world.maxx), rand(1, world.maxy), 1)
- if(istype(candidate, /turf/simulated/wall))
- center = candidate
+/datum/event/wallrot/proc/spawn_wallrot()
+ var/turf/simulated/wall/center = null
- if(center)
- // Make sure at least one piece of wall rots!
- center.rot()
+ // 100 attempts
+ for(var/i in 0 to 100)
+ var/turf/candidate = locate(rand(1, world.maxx), rand(1, world.maxy), level_name_to_num(MAIN_STATION))
+ if(istype(candidate, /turf/simulated/wall))
+ center = candidate
+ break
- // Have a chance to rot lots of other walls.
- var/rotcount = 0
- var/actual_severity = severity * rand(5, 10)
- for(var/turf/simulated/wall/W in range(5, center)) if(prob(50))
- W.rot()
- rotcount++
+ if(!center)
+ return
+ // Make sure at least one piece of wall rots!
+ center.rot()
- // Only rot up to severity walls
- if(rotcount >= actual_severity)
- break
+ // Have a chance to rot lots of other walls.
+ var/rotcount = 0
+ var/actual_severity = severity * rand(5, 10)
+ for(var/turf/simulated/wall/W in range(5, center))
+ if(prob(50))
+ W.rot()
+ rotcount++
+
+ // Only rot up to severity walls
+ if(rotcount >= actual_severity)
+ break
diff --git a/code/modules/examine/descriptions/atmospherics.dm b/code/modules/examine/descriptions/atmospherics.dm
index fb723336d85..55f4ecb761b 100644
--- a/code/modules/examine/descriptions/atmospherics.dm
+++ b/code/modules/examine/descriptions/atmospherics.dm
@@ -105,15 +105,9 @@
/obj/machinery/atmospherics/unary/vent_pump
description_info = "This pumps the contents of the attached pipe out into the atmosphere, if needed. It can be controlled from an Air Alarm."
-//Freezers
-/obj/machinery/atmospherics/unary/cold_sink/freezer
- description_info = "Cools down the gas of the pipe it is connected to. It uses massive amounts of electricity while on. \
- It can be upgraded by replacing the capacitors, manipulators, and matter bins. It can be deconstructed by screwing the maintenance panel open with a \
- screwdriver, and then using a crowbar."
-
-//Heaters
-/obj/machinery/atmospherics/unary/heat_reservoir/heater
- description_info = "Heats up the gas of the pipe it is connected to. It uses massive amounts of electricity while on. \
+//Freezer and Heater
+/obj/machinery/atmospherics/unary/thermomachine
+ description_info = "Cools or heats the gas of the pipe it is connected to. It uses massive amounts of electricity while on. \
It can be upgraded by replacing the capacitors, manipulators, and matter bins. It can be deconstructed by screwing the maintenance panel open with a \
screwdriver, and then using a crowbar."
diff --git a/code/modules/examine/descriptions/engineering.dm b/code/modules/examine/descriptions/engineering.dm
index cd22eed3db5..6745c24f244 100644
--- a/code/modules/examine/descriptions/engineering.dm
+++ b/code/modules/examine/descriptions/engineering.dm
@@ -1,4 +1,4 @@
-/obj/machinery/power/supermatter_shard
+/obj/machinery/power/supermatter_crystal
description_info = "When energized by a laser (or something hitting it), it emits radiation and heat. If the heat reaches above 7000 kelvin, it will send an alert and start taking damage. \
After integrity falls to zero percent, it will delaminate, causing a massive explosion, station-wide radiation spikes, and hallucinations. \
Supermatter reacts badly to oxygen in the atmosphere. It'll also heat up really quick if it is in vacuum. \
diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm
index a0f2015536f..c779f34ccd9 100644
--- a/code/modules/flufftext/Hallucination.dm
+++ b/code/modules/flufftext/Hallucination.dm
@@ -705,7 +705,7 @@ GLOBAL_LIST_INIT(non_fakeattack_weapons, list(/obj/item/gun/projectile, /obj/ite
/obj/item/hand_tele, /obj/item/rcd, /obj/item/tank/jetpack,\
/obj/item/clothing/under/rank/captain, /obj/item/aicard,\
/obj/item/clothing/shoes/magboots, /obj/item/areaeditor/blueprints, /obj/item/disk/nuclear,\
- /obj/item/clothing/suit/space/nasavoid, /obj/item/tank))
+ /obj/item/clothing/suit/space/nasavoid, /obj/item/tank/internals))
/obj/effect/hallucination/bolts
var/list/doors = list()
diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm
index dbc01373a9f..8444e101132 100644
--- a/code/modules/food_and_drinks/drinks/drinks.dm
+++ b/code/modules/food_and_drinks/drinks/drinks.dm
@@ -36,12 +36,6 @@
if(istype(M, /mob/living/carbon))
var/mob/living/carbon/C = M
if(C.eat(src, user))
- if(isrobot(user)) //Cyborg modules that include drinks automatically refill themselves, but drain the borg's cell
- var/mob/living/silicon/robot/borg = user
- borg.cell.use(30)
- var/refill = reagents.get_master_reagent_id()
- if(refill in GLOB.drinks) // Only synthesize drinks
- addtimer(CALLBACK(reagents, /datum/reagents.proc/add_reagent, refill, bitesize), 600)
return TRUE
return FALSE
@@ -72,24 +66,9 @@
to_chat(user, " [target] is full.")
return FALSE
- var/datum/reagent/refill
- var/datum/reagent/refillName
- if(isrobot(user))
- refill = reagents.get_master_reagent_id()
- refillName = reagents.get_master_reagent_name()
-
var/trans = reagents.trans_to(target, amount_per_transfer_from_this)
to_chat(user, " You transfer [trans] units of the solution to [target].")
- if(isrobot(user)) //Cyborg modules that include drinks automatically refill themselves, but drain the borg's cell
- if(refill in GLOB.drinks) // Only synthesize drinks
- var/mob/living/silicon/robot/bro = user
- var/chargeAmount = max(30,4*trans)
- bro.cell.use(chargeAmount)
- to_chat(user, "Now synthesizing [trans] units of [refillName]...")
- addtimer(CALLBACK(reagents, /datum/reagents.proc/add_reagent, refill, trans), 300)
- addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, user, "Cyborg [src] refilled."), 300)
-
else if(target.is_drainable()) //A dispenser. Transfer FROM it TO us.
if(!is_refillable())
to_chat(user, "[src]'s tab isn't open!")
diff --git a/code/modules/hydroponics/grown/herbals.dm b/code/modules/hydroponics/grown/herbals.dm
index 051c8685b69..e98247d8cb5 100644
--- a/code/modules/hydroponics/grown/herbals.dm
+++ b/code/modules/hydroponics/grown/herbals.dm
@@ -53,3 +53,28 @@
to_chat(user, "You mash [src] into a poultice.")
user.drop_item()
qdel(src)
+
+// mint
+/obj/item/seeds/mint
+ name = "pack of mint seeds"
+ desc = "These seeds grow into mint plants."
+ icon_state = "seed-mint"
+ species = "mint"
+ plantname = "Mint Plant"
+ product = /obj/item/reagent_containers/food/snacks/grown/mint
+ lifespan = 20
+ maturation = 4
+ production = 5
+ yield = 5
+ growthstages = 3
+ icon_dead = "mint-dead"
+ reagents_add = list("mint" = 0.03, "plantmatter" = 0.03)
+
+/obj/item/reagent_containers/food/snacks/grown/mint
+ seed = /obj/item/seeds/mint
+ name = "mint leaves"
+ desc = "Process for mint. Distill for menthol. No need to experi-mint." //haha
+ icon_state = "mint"
+ tastes = list("mint" = 1)
+ filling_color = "#A7EE9F"
+ distill_reagent = "menthol"
diff --git a/code/modules/hydroponics/plant_genes.dm b/code/modules/hydroponics/plant_genes.dm
index 39051b1cc0d..7b3e7cbe964 100644
--- a/code/modules/hydroponics/plant_genes.dm
+++ b/code/modules/hydroponics/plant_genes.dm
@@ -224,7 +224,7 @@
// Cell recharging trait. Charges all mob's power cells to (potency*rate)% mark when eaten.
// Generates sparks on squash.
// Small (potency*rate*5) chance to shock squish or slip target for (potency*rate*5) damage.
- // Multiplies max charge by (rate*1000) when used in potato power cells.
+ // Multiplies max charge by (rate*100) when used in potato power cells.
name = "Electrical Activity"
rate = 0.2
origin_tech = list("powerstorage" = 5)
@@ -233,14 +233,14 @@
/datum/plant_gene/trait/cell_charge/on_slip(obj/item/reagent_containers/food/snacks/grown/G, mob/living/carbon/C)
var/power = G.seed.potency*rate
if(prob(power))
- C.electrocute_act(round(power), G, 1, TRUE)
+ C.electrocute_act(round(power), G, 1, SHOCK_NOGLOVES)
/datum/plant_gene/trait/cell_charge/on_squash(obj/item/reagent_containers/food/snacks/grown/G, atom/target)
if(isliving(target))
var/mob/living/carbon/C = target
var/power = G.seed.potency*rate
if(prob(power))
- C.electrocute_act(round(power), G, 1, TRUE)
+ C.electrocute_act(round(power), G, 1, SHOCK_NOGLOVES)
/datum/plant_gene/trait/cell_charge/on_consume(obj/item/reagent_containers/food/snacks/grown/G, mob/living/carbon/target)
if(!G.reagents.total_volume)
@@ -375,8 +375,8 @@
// The secret of potato supercells!
var/datum/plant_gene/trait/cell_charge/CG = G.seed.get_gene(/datum/plant_gene/trait/cell_charge)
- if(CG) // 10x charge for deafult cell charge gene - 20 000 with 100 potency.
- pocell.maxcharge *= CG.rate*1000
+ if(CG) // 20x charge for deafult cell charge gene - 40 000 with 100 potency.
+ pocell.maxcharge *= CG.rate*100
pocell.charge = pocell.maxcharge
pocell.name = "[G] battery"
pocell.desc = "A rechargable plant based power cell. This one has a power rating of [pocell.maxcharge], and you should not swallow it."
diff --git a/code/modules/martial_arts/combos/sleeping_carp/elbow_drop.dm b/code/modules/martial_arts/combos/sleeping_carp/elbow_drop.dm
index 0269c9bed4d..61dc8759f39 100644
--- a/code/modules/martial_arts/combos/sleeping_carp/elbow_drop.dm
+++ b/code/modules/martial_arts/combos/sleeping_carp/elbow_drop.dm
@@ -8,7 +8,8 @@
user.do_attack_animation(target, ATTACK_EFFECT_PUNCH)
target.visible_message("[user] elbow drops [target]!", \
"[user] piledrives you with [user.p_their()] elbow!")
- target.death() //FINISH HIM!
+ if(target.health <= 0) //so it actually checks for crit now
+ target.death() //FINISH HIM!
target.apply_damage(50, BRUTE, "chest")
playsound(get_turf(target), 'sound/weapons/punch1.ogg', 75, 1, -1)
add_attack_logs(user, target, "Melee attacked with martial-art [src] : Elbow Drop", ATKLOG_ALL)
diff --git a/code/modules/mining/equipment/explorer_gear.dm b/code/modules/mining/equipment/explorer_gear.dm
index b4a5a0891ed..84bf8f1fc0d 100644
--- a/code/modules/mining/equipment/explorer_gear.dm
+++ b/code/modules/mining/equipment/explorer_gear.dm
@@ -11,7 +11,7 @@
heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
hoodtype = /obj/item/clothing/head/hooded/explorer
armor = list("melee" = 30, "bullet" = 20, "laser" = 20, "energy" = 20, "bomb" = 50, "bio" = 100, "rad" = 50, "fire" = 50, "acid" = 50)
- allowed = list(/obj/item/flashlight, /obj/item/tank, /obj/item/resonator, /obj/item/mining_scanner, /obj/item/t_scanner/adv_mining_scanner, /obj/item/gun/energy/kinetic_accelerator, /obj/item/pickaxe)
+ allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/resonator, /obj/item/mining_scanner, /obj/item/t_scanner/adv_mining_scanner, /obj/item/gun/energy/kinetic_accelerator, /obj/item/pickaxe)
resistance_flags = FIRE_PROOF
hide_tail_by_species = list("Vox" , "Vulpkanin" , "Unathi" , "Tajaran")
@@ -53,7 +53,7 @@
resistance_flags = FIRE_PROOF | LAVA_PROOF
slowdown = 0
armor = list("melee" = 70, "bullet" = 40, "laser" = 10, "energy" = 10, "bomb" = 50, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 100)
- allowed = list(/obj/item/flashlight, /obj/item/tank, /obj/item/resonator, /obj/item/mining_scanner, /obj/item/t_scanner/adv_mining_scanner, /obj/item/gun/energy/kinetic_accelerator, /obj/item/pickaxe)
+ allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/resonator, /obj/item/mining_scanner, /obj/item/t_scanner/adv_mining_scanner, /obj/item/gun/energy/kinetic_accelerator, /obj/item/pickaxe)
/obj/item/clothing/suit/space/hostile_environment/New()
..()
diff --git a/code/modules/mining/equipment/survival_pod.dm b/code/modules/mining/equipment/survival_pod.dm
index 0c7b836b322..615718bb834 100644
--- a/code/modules/mining/equipment/survival_pod.dm
+++ b/code/modules/mining/equipment/survival_pod.dm
@@ -70,23 +70,13 @@
//Pod turfs and objects
//Window
-/obj/structure/window/shuttle/survival_pod
+/obj/structure/window/full/shuttle/survival_pod
name = "pod window"
icon = 'icons/obj/smooth_structures/pod_window.dmi'
icon_state = "smooth"
- dir = FULLTILE_WINDOW_DIR
- max_integrity = 100
- fulltile = TRUE
- flags = PREVENT_CLICK_UNDER
- reinf = TRUE
- heat_resistance = 1600
- armor = list("melee" = 50, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 50, "bio" = 100, "rad" = 100, "fire" = 80, "acid" = 100)
smooth = SMOOTH_MORE
- canSmoothWith = list(/turf/simulated/wall/mineral/titanium/survival, /obj/machinery/door/airlock/survival_pod, /obj/structure/window/shuttle/survival_pod)
- explosion_block = 3
- level = 3
glass_type = /obj/item/stack/sheet/titaniumglass
- glass_amount = 2
+ canSmoothWith = list(/turf/simulated/wall/mineral/titanium/survival, /obj/machinery/door/airlock/survival_pod, /obj/structure/window/full/shuttle/survival_pod)
/obj/structure/window/reinforced/survival_pod
name = "pod window"
diff --git a/code/modules/mining/equipment/wormhole_jaunter.dm b/code/modules/mining/equipment/wormhole_jaunter.dm
index f9a98b01483..c791c5d58b7 100644
--- a/code/modules/mining/equipment/wormhole_jaunter.dm
+++ b/code/modules/mining/equipment/wormhole_jaunter.dm
@@ -11,7 +11,6 @@
throw_range = 5
origin_tech = "bluespace=2"
slot_flags = SLOT_BELT
- var/emagged = FALSE
/obj/item/wormhole_jaunter/attack_self(mob/user)
user.visible_message("[user.name] activates the [name]!")
@@ -73,7 +72,6 @@
icon_state = "bhole3"
desc = "A stable hole in the universe made by a wormhole jaunter. Turbulent doesn't even begin to describe how rough passage through one of these is, but at least it will always get you somewhere near a beacon."
failchance = 0
- var/emagged = FALSE
/obj/effect/portal/jaunt_tunnel/can_teleport(atom/movable/M)
if(!emagged && ismegafauna(M))
diff --git a/code/modules/mining/lavaland/loot/colossus_loot.dm b/code/modules/mining/lavaland/loot/colossus_loot.dm
index 12895f59d23..f0c57fadfe6 100644
--- a/code/modules/mining/lavaland/loot/colossus_loot.dm
+++ b/code/modules/mining/lavaland/loot/colossus_loot.dm
@@ -335,7 +335,7 @@
if(ishuman(user))
var/mobcheck = 0
for(var/mob/living/simple_animal/A in range(1, src))
- if(A.melee_damage_upper > 5 || A.mob_size >= MOB_SIZE_LARGE || A.ckey || A.stat)
+ if(A.melee_damage_upper > 5 || A.mob_size >= MOB_SIZE_LARGE || A.ckey || A.stat || isbot(A))
break
var/obj/structure/closet/stasis/S = new /obj/structure/closet/stasis(A)
user.forceMove(S)
diff --git a/code/modules/mining/machine_redemption.dm b/code/modules/mining/machine_redemption.dm
index 84433a96fa6..18681157664 100644
--- a/code/modules/mining/machine_redemption.dm
+++ b/code/modules/mining/machine_redemption.dm
@@ -440,7 +440,7 @@
if(!is_station_level(z))
return
- var/msg = "Now available in [get_area_name(src, TRUE) || "Unknown"]:"
+ var/list/msg = list("Now available in [get_area_name(src, TRUE) || "Unknown"]:")
var/mats_in_stock = list()
var/datum/component/material_container/materials = GetComponent(/datum/component/material_container)
for(var/MAT in materials.materials)
@@ -448,7 +448,7 @@
var/mineral_amount = M.amount / MINERAL_MATERIAL_AMOUNT
if(mineral_amount)
mats_in_stock += M.id
- msg += "[capitalize(M.name)]: [mineral_amount] sheets"
+ msg.Add("[capitalize(M.name)]: [mineral_amount] sheets")
// No point sending a message if we're dry
if(!length(mats_in_stock))
diff --git a/code/modules/mining/shelters.dm b/code/modules/mining/shelters.dm
index 2389470e7f5..41b651340f6 100644
--- a/code/modules/mining/shelters.dm
+++ b/code/modules/mining/shelters.dm
@@ -7,7 +7,7 @@
/datum/map_template/shelter/New()
. = ..()
- blacklisted_turfs = typecacheof(list(/turf/simulated/wall, /turf/simulated/mineral, /turf/simulated/shuttle/wall))
+ blacklisted_turfs = typecacheof(list(/turf/simulated/wall, /turf/simulated/mineral))
whitelisted_turfs = list()
banned_areas = typecacheof(/area/shuttle)
diff --git a/code/modules/mob/living/carbon/alien/alien.dm b/code/modules/mob/living/carbon/alien/alien.dm
index f6354b61940..02f639f018a 100644
--- a/code/modules/mob/living/carbon/alien/alien.dm
+++ b/code/modules/mob/living/carbon/alien/alien.dm
@@ -217,7 +217,8 @@ Des: Removes all infected images from the alien.
/mob/living/carbon/alien/proc/updatePlasmaDisplay()
if(hud_used) //clientless aliens
- hud_used.alien_plasma_display.maptext = "
[getPlasma()]
"
+ hud_used.alien_plasma_display.maptext = "
[getPlasma()]
"
+ hud_used.alien_plasma_display.maptext_x = -3
/mob/living/carbon/alien/larva/updatePlasmaDisplay()
return
diff --git a/code/modules/mob/living/carbon/brain/life.dm b/code/modules/mob/living/carbon/brain/life.dm
index 0faa238190e..b188c7bac72 100644
--- a/code/modules/mob/living/carbon/brain/life.dm
+++ b/code/modules/mob/living/carbon/brain/life.dm
@@ -1,21 +1,3 @@
-/mob/living/carbon/brain/handle_mutations_and_radiation()
- if(radiation)
- if(radiation > 100)
- if(!container)
- to_chat(src, "You feel weak.")
- else
- to_chat(src, "STATUS: CRITICAL AMOUNTS OF RADIATION DETECTED.")
-
- switch(radiation)
-
- if(50 to 75)
- if(prob(5))
- if(!container)
- to_chat(src, "You feel weak.")
- else
- to_chat(src, "STATUS: DANGEROUS AMOUNTS OF RADIATION DETECTED.")
- ..()
-
/mob/living/carbon/brain/proc/handle_temperature_damage(body_part, exposed_temperature, exposed_intensity)
if(status_flags & GODMODE)
return
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 02035a31520..e4a711546a4 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -144,54 +144,44 @@
M.forceMove(drop_location())
visible_message("[M] bursts out of [src]!")
-/mob/living/carbon/electrocute_act(shock_damage, obj/source, siemens_coeff = 1, safety = FALSE, override = FALSE, tesla_shock = FALSE, illusion = FALSE, stun = TRUE)
- SEND_SIGNAL(src, COMSIG_LIVING_ELECTROCUTE_ACT, shock_damage)
- if(status_flags & GODMODE) //godmode
- return FALSE
- if(NO_SHOCK in mutations) //shockproof
- return FALSE
- if(tesla_shock && tesla_ignore)
- return FALSE
- shock_damage *= siemens_coeff
- if(dna && dna.species)
- shock_damage *= dna.species.siemens_coeff
- if(shock_damage < 1 && !override)
- return FALSE
- if(reagents.has_reagent("teslium"))
- shock_damage *= 1.5 //If the mob has teslium in their body, shocks are 50% more damaging!
- if(illusion)
- adjustStaminaLoss(shock_damage)
- else
- take_overall_damage(0, shock_damage, TRUE, used_weapon = "Electrocution")
- shock_internal_organs(shock_damage)
- visible_message(
- "[src] was shocked by \the [source]!",
- "You feel a powerful shock coursing through your body!",
- "You hear a heavy electrical crack.")
- AdjustJitter(1000) //High numbers for violent convulsions
+///Adds to the parent by also adding functionality to propagate shocks through pulling and doing some fluff effects.
+/mob/living/carbon/electrocute_act(shock_damage, source, siemens_coeff = 1, flags = NONE)
+ . = ..()
+ if(!.)
+ return
+ //Propagation through pulling
+ if(!(flags & SHOCK_ILLUSION))
+ var/list/shocking_queue = list()
+ if(iscarbon(pulling) && source != pulling)
+ shocking_queue += pulling
+ if(iscarbon(pulledby) && source != pulledby)
+ shocking_queue += pulledby
+ if(iscarbon(buckled) && source != buckled)
+ shocking_queue += buckled
+ for(var/mob/living/carbon/carried in buckled_mobs)
+ if(source != carried)
+ shocking_queue += carried
+ //Found our victims, now lets shock them all
+ for(var/victim in shocking_queue)
+ var/mob/living/carbon/C = victim
+ C.electrocute_act(shock_damage * 0.75, src, 1, flags)
+ //Stun
+ var/should_stun = (!(flags & SHOCK_TESLA) || siemens_coeff > 0.5) && !(flags & SHOCK_NOSTUN)
+ if(should_stun)
+ Stun(2)
+ //Jitter and other fluff.
+ AdjustJitter(1000)
do_jitter_animation(jitteriness)
AdjustStuttering(2)
- if((!tesla_shock || (tesla_shock && siemens_coeff > 0.5)) && stun)
- Stun(2)
- spawn(20)
- AdjustJitter(-1000, bound_lower = 10) //Still jittery, but vastly less
- if((!tesla_shock || (tesla_shock && siemens_coeff > 0.5)) && stun)
- Stun(3)
- Weaken(3)
- if(shock_damage > 200)
- src.visible_message(
- "[src] was arc flashed by the [source]!",
- "The [source] arc flashes and electrocutes you!",
- "You hear a lightning-like crack!")
- playsound(loc, 'sound/effects/eleczap.ogg', 50, 1, -1)
- explosion(loc, -1, 0, 2, 2)
-
- if(override)
- return override
- else
- return shock_damage
-
+ shock_internal_organs(shock_damage)
+ addtimer(CALLBACK(src, .proc/secondary_shock, should_stun), 20)
+ return shock_damage
+///Called slightly after electrocute act to reduce jittering and apply a secondary stun.
+/mob/living/carbon/proc/secondary_shock(should_stun)
+ AdjustJitter(-1000, bound_lower = 10) //Still jittery, but vastly less
+ if(should_stun)
+ Weaken(3)
/mob/living/carbon/swap_hand()
var/obj/item/item_in_hand = src.get_active_hand()
@@ -1225,14 +1215,14 @@ so that different stomachs can handle things in different ways VB*/
I.extinguish() //extinguishes our clothes
..()
-/mob/living/carbon/clean_blood(clean_hands = TRUE, clean_mask = TRUE, clean_feet = TRUE)
+/mob/living/carbon/clean_blood(radiation_clean = FALSE, clean_hands = TRUE, clean_mask = TRUE, clean_feet = TRUE)
if(head)
- if(head.clean_blood())
+ if(head.clean_blood(radiation_clean))
update_inv_head()
if(head.flags_inv & HIDEMASK)
clean_mask = FALSE
if(wear_suit)
- if(wear_suit.clean_blood())
+ if(wear_suit.clean_blood(radiation_clean))
update_inv_wear_suit()
if(wear_suit.flags_inv & HIDESHOES)
clean_feet = FALSE
diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm
index 78489251ca1..2ec78381536 100644
--- a/code/modules/mob/living/carbon/human/examine.dm
+++ b/code/modules/mob/living/carbon/human/examine.dm
@@ -412,6 +412,8 @@
. = list(msg)
+ SEND_SIGNAL(src, COMSIG_PARENT_EXAMINE, user, .)
+
//Helper procedure. Called by /mob/living/carbon/human/examine() and /mob/living/carbon/human/Topic() to determine HUD access to security and medical records.
/proc/hasHUD(mob/M, hudtype)
if(istype(M, /mob/living/carbon/human))
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index e5ad4790701..4e0069dcfae 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -4,6 +4,7 @@
voice_name = "unknown"
icon = 'icons/mob/human.dmi'
icon_state = "body_m_s"
+ appearance_flags = KEEP_TOGETHER|TILE_BOUND|PIXEL_SCALE|LONG_GLIDE
deathgasp_on_death = TRUE
/mob/living/carbon/human/New(loc)
@@ -580,37 +581,35 @@
SEND_SIGNAL(src, COMSIG_MOB_UPDATE_SIGHT)
sync_lighting_plane_alpha()
-//Added a safety check in case you want to shock a human mob directly through electrocute_act.
-/mob/living/carbon/human/electrocute_act(shock_damage, obj/source, siemens_coeff = 1, safety = FALSE, override = FALSE, tesla_shock = FALSE, illusion = FALSE, stun = TRUE)
- if(tesla_shock)
- var/total_coeff = 1
- if(gloves)
- var/obj/item/clothing/gloves/G = gloves
- if(G.siemens_coefficient <= 0)
- total_coeff -= 0.5
+///Calculates the siemens coeff based on clothing and species, can also restart hearts.
+/mob/living/carbon/human/electrocute_act(shock_damage, source, siemens_coeff = 1, flags = NONE)
+ //Calculates the siemens coeff based on clothing. Completely ignores the arguments
+ if(flags & SHOCK_TESLA) //I hate this entire block. This gets the siemens_coeff for tesla shocks
+ if(gloves && gloves.siemens_coefficient <= 0)
+ siemens_coeff -= 0.5
if(wear_suit)
- var/obj/item/clothing/suit/S = wear_suit
- if(S.siemens_coefficient <= 0)
- total_coeff -= 0.95
- else if(S.siemens_coefficient == (-1))
- total_coeff -= 1
- siemens_coeff = total_coeff
- if(tesla_ignore)
- siemens_coeff = 0
- else if(!safety)
- var/gloves_siemens_coeff = 1
+ if(wear_suit.siemens_coefficient == -1)
+ siemens_coeff -= 1
+ else if(wear_suit.siemens_coefficient <= 0)
+ siemens_coeff -= 0.95
+ siemens_coeff = max(siemens_coeff, 0)
+ else if(!(flags & SHOCK_NOGLOVES)) //This gets the siemens_coeff for all non tesla shocks
if(gloves)
- var/obj/item/clothing/gloves/G = gloves
- gloves_siemens_coeff = G.siemens_coefficient
- siemens_coeff = gloves_siemens_coeff
- if(undergoing_cardiac_arrest() && !illusion)
+ siemens_coeff *= gloves.siemens_coefficient
+ siemens_coeff *= dna.species.siemens_coeff
+ . = ..()
+ //Don't go further if the shock was blocked/too weak.
+ if(!.)
+ return
+ //Note we both check that the user is in cardiac arrest and can actually heartattack
+ //If they can't, they're missing their heart and this would runtime
+ if(undergoing_cardiac_arrest() && !(flags & SHOCK_ILLUSION))
if(shock_damage * siemens_coeff >= 1 && prob(25))
set_heartattack(FALSE)
if(stat == CONSCIOUS)
to_chat(src, "You feel your heart beating again!")
- dna.species.spec_electrocute_act(src, shock_damage, source, siemens_coeff, safety, override, tesla_shock, illusion, stun)
- . = ..(shock_damage, source, siemens_coeff, safety, override, tesla_shock, illusion, stun)
+ dna.species.spec_electrocute_act(src, shock_damage, source, siemens_coeff, flags = NONE)
/mob/living/carbon/human/Topic(href, href_list)
if(!usr.stat && usr.canmove && !usr.restrained() && in_range(src, usr))
@@ -1601,13 +1600,18 @@ Eyes need to have significantly high darksight to shine unless the mob has the X
if(prob(current_size * 5) && hand.w_class >= ((11-current_size)/2) && unEquip(hand))
step_towards(hand, src)
to_chat(src, "\The [S] pulls \the [hand] from your grip!")
- apply_effect(current_size * 3, IRRADIATE)
+ rad_act(current_size * 3)
/mob/living/carbon/human/narsie_act()
if(iswizard(src) && iscultist(src)) //Wizard cultists are immune to narsie because it would prematurely end the wiz round that's about to end by the automated shuttle call anyway
return
..()
+/mob/living/carbon/human/rad_act(amount)
+ if(RADIMMUNE in dna.species.species_traits)
+ return SEND_SIGNAL(src, COMSIG_ATOM_RAD_ACT, amount)
+ . = ..()
+
/mob/living/carbon/human/proc/do_cpr(mob/living/carbon/human/H)
if(H == src)
to_chat(src, "You cannot perform CPR on yourself!")
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index 950089bf011..1e1363bdec2 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -193,64 +193,8 @@
if(gene_stability < GENETIC_DAMAGE_STAGE_3)
gib()
- if(!(RADIMMUNE in dna.species.species_traits))
- if(radiation)
- radiation = clamp(radiation, 0, 200)
-
- var/autopsy_damage = 0
- switch(radiation)
- if(1 to 49)
- radiation = max(radiation-1, 0)
- if(prob(25))
- adjustToxLoss(1)
- adjustFireLoss(1)
- autopsy_damage = 2
-
- if(50 to 74)
- radiation = max(radiation-2, 0)
- adjustToxLoss(1)
- adjustFireLoss(1)
- autopsy_damage = 2
- if(prob(5))
- radiation = max(radiation-5, 0)
- Weaken(3)
- to_chat(src, "You feel weak.")
- emote("collapse")
-
- if(75 to 100)
- radiation = max(radiation-2, 0)
- adjustToxLoss(2)
- adjustFireLoss(2)
- autopsy_damage = 4
- if(prob(2))
- to_chat(src, "You mutate!")
- randmutb(src)
- domutcheck(src, null)
-
- if(101 to 150)
- radiation = max(radiation-3, 0)
- adjustToxLoss(2)
- adjustFireLoss(3)
- autopsy_damage = 5
- if(prob(4))
- to_chat(src, "You mutate!")
- randmutb(src)
- domutcheck(src, null)
-
- if(151 to INFINITY)
- radiation = max(radiation-3, 0)
- adjustToxLoss(2)
- adjustFireLoss(3)
- autopsy_damage = 5
- if(prob(6))
- to_chat(src, "You mutate!")
- randmutb(src)
- domutcheck(src, null)
-
- if(autopsy_damage)
- var/obj/item/organ/external/chest/chest = get_organ("chest")
- if(chest)
- chest.add_autopsy_data("Radiation Poisoning", autopsy_damage)
+ if(!dna || !dna.species.handle_mutations_and_radiation(src))
+ ..()
/mob/living/carbon/human/breathe()
if(!dna.species.breathe(src))
@@ -919,7 +863,7 @@
mind.changeling.regenerate(src)
if(hud_used)
hud_used.lingchemdisplay.invisibility = 0
- hud_used.lingchemdisplay.maptext = "
[round(mind.changeling.chem_charges)]
"
+ hud_used.lingchemdisplay.maptext = "
[round(mind.changeling.chem_charges)]
"
else
if(hud_used)
hud_used.lingchemdisplay.invisibility = 101
diff --git a/code/modules/mob/living/carbon/human/species/_species.dm b/code/modules/mob/living/carbon/human/species/_species.dm
index 42680f9f807..17abcd9ba2c 100644
--- a/code/modules/mob/living/carbon/human/species/_species.dm
+++ b/code/modules/mob/living/carbon/human/species/_species.dm
@@ -370,7 +370,7 @@
/datum/species/proc/spec_stun(mob/living/carbon/human/H,amount)
return
-/datum/species/proc/spec_electrocute_act(mob/living/carbon/human/H, shock_damage, obj/source, siemens_coeff = 1, safety = FALSE, override = FALSE, tesla_shock = FALSE, illusion = FALSE, stun = TRUE)
+/datum/species/proc/spec_electrocute_act(mob/living/carbon/human/H, shock_damage, source, siemens_coeff = 1, flags = NONE)
return
/datum/species/proc/help(mob/living/carbon/human/user, mob/living/carbon/human/target, datum/martial_art/attacker_style)
@@ -628,9 +628,9 @@
return FALSE
var/obj/item/organ/external/O = H.get_organ(BODY_ZONE_CHEST)
- if(!H.w_uniform && !nojumpsuit && (!O || !(O.status & ORGAN_ROBOT)))
+ if(!H.w_uniform && !nojumpsuit && !(O?.status & ORGAN_ROBOT))
if(!disable_warning)
- to_chat(H, "You need a jumpsuit before you can attach this [name].")
+ to_chat(H, "You need a jumpsuit before you can attach this [I.name].")
return FALSE
if(!(I.slot_flags & SLOT_BELT))
return
@@ -650,9 +650,9 @@
return FALSE
var/obj/item/organ/external/O = H.get_organ(BODY_ZONE_CHEST)
- if(!H.w_uniform && !nojumpsuit && (!O || !(O.status & ORGAN_ROBOT)))
+ if(!H.w_uniform && !nojumpsuit && !(O?.status & ORGAN_ROBOT))
if(!disable_warning)
- to_chat(H, "You need a jumpsuit before you can attach this [name].")
+ to_chat(H, "You need a jumpsuit before you can attach this [I.name].")
return FALSE
if(!(I.slot_flags & SLOT_ID))
return FALSE
@@ -662,9 +662,9 @@
return FALSE
var/obj/item/organ/external/O = H.get_organ(BODY_ZONE_CHEST)
- if(!H.w_uniform && !nojumpsuit && (!O || !(O.status & ORGAN_ROBOT)))
+ if(!H.w_uniform && !nojumpsuit && !(O?.status & ORGAN_ROBOT))
if(!disable_warning)
- to_chat(H, "You need a jumpsuit before you can attach this [name].")
+ to_chat(H, "You need a jumpsuit before you can attach this [I.name].")
return FALSE
if(!(I.slot_flags & SLOT_PDA))
return FALSE
@@ -676,9 +676,9 @@
return FALSE
var/obj/item/organ/external/O = H.get_organ(BODY_ZONE_L_LEG)
- if(!H.w_uniform && !nojumpsuit && (!O || !(O.status & ORGAN_ROBOT)))
+ if(!H.w_uniform && !nojumpsuit && !(O?.status & ORGAN_ROBOT))
if(!disable_warning)
- to_chat(H, "You need a jumpsuit before you can attach this [name].")
+ to_chat(H, "You need a jumpsuit before you can attach this [I.name].")
return FALSE
if(I.slot_flags & SLOT_DENYPOCKET)
return
@@ -691,9 +691,9 @@
return FALSE
var/obj/item/organ/external/O = H.get_organ(BODY_ZONE_R_LEG)
- if(!H.w_uniform && !nojumpsuit && (!O || !(O.status & ORGAN_ROBOT)))
+ if(!H.w_uniform && !nojumpsuit && !(O?.status & ORGAN_ROBOT))
if(!disable_warning)
- to_chat(H, "You need a jumpsuit before you can attach this [name].")
+ to_chat(H, "You need a jumpsuit before you can attach this [I.name].")
return FALSE
if(I.slot_flags & SLOT_DENYPOCKET)
return FALSE
@@ -707,7 +707,7 @@
return FALSE
if(!H.wear_suit)
if(!disable_warning)
- to_chat(H, "You need a suit before you can attach this [name].")
+ to_chat(H, "You need a suit before you can attach this [I.name].")
return FALSE
if(!H.wear_suit.allowed)
if(!disable_warning)
@@ -715,7 +715,7 @@
return FALSE
if(I.w_class > WEIGHT_CLASS_BULKY)
if(!disable_warning)
- to_chat(H, "The [name] is too big to attach.")
+ to_chat(H, "[I] is too big to attach.")
return FALSE
if(istype(I, /obj/item/pda) || istype(I, /obj/item/pen) || is_type_in_list(I, H.wear_suit.allowed))
return TRUE
@@ -733,7 +733,7 @@
if(slot_tie)
if(!H.w_uniform)
if(!disable_warning)
- to_chat(H, "You need a jumpsuit before you can attach this [name].")
+ to_chat(H, "You need a jumpsuit before you can attach this [I.name].")
return FALSE
var/obj/item/clothing/under/uniform = H.w_uniform
if(uniform.accessories.len && !uniform.can_attach_accessory(H))
@@ -749,6 +749,49 @@
/datum/species/proc/update_health_hud(mob/living/carbon/human/H)
return FALSE
+/datum/species/proc/handle_mutations_and_radiation(mob/living/carbon/human/H)
+ if(RADIMMUNE in species_traits)
+ H.radiation = 0
+ return TRUE
+
+ . = FALSE
+ var/radiation = H.radiation
+
+ if(radiation > RAD_MOB_KNOCKDOWN && prob(RAD_MOB_KNOCKDOWN_PROB))
+ if(!H.IsWeakened())
+ H.emote("collapse")
+ H.Weaken(RAD_MOB_KNOCKDOWN_AMOUNT)
+ to_chat(H, "You feel weak.")
+
+ if(radiation > RAD_MOB_VOMIT && prob(RAD_MOB_VOMIT_PROB))
+ H.vomit(10, TRUE)
+
+ if(radiation > RAD_MOB_MUTATE)
+ if(prob(1))
+ to_chat(H, "You mutate!")
+ randmutb(H)
+ H.emote("gasp")
+ domutcheck(H, null)
+
+ if(radiation > RAD_MOB_HAIRLOSS)
+ var/obj/item/organ/external/head/head_organ = H.get_organ("head")
+ if(!head_organ)
+ return
+ if(prob(15) && head_organ.h_style != "Bald")
+ to_chat(H, "Your hair starts to fall out in clumps...")
+ addtimer(CALLBACK(src, .proc/go_bald, H), 5 SECONDS)
+
+/datum/species/proc/go_bald(mob/living/carbon/human/H)
+ if(QDELETED(H)) //may be called from a timer
+ return
+ var/obj/item/organ/external/head/head_organ = H.get_organ("head")
+ if(!head_organ)
+ return
+ head_organ.f_style = "Shaved"
+ head_organ.h_style = "Bald"
+ H.update_hair()
+ H.update_fhair()
+
/*
Returns the path corresponding to the corresponding organ
It'll return null if the organ doesn't correspond, so include null checks when using this!
diff --git a/code/modules/mob/living/carbon/human/species/golem.dm b/code/modules/mob/living/carbon/human/species/golem.dm
index 7ff32e38644..cde56de264b 100644
--- a/code/modules/mob/living/carbon/human/species/golem.dm
+++ b/code/modules/mob/living/carbon/human/species/golem.dm
@@ -389,13 +389,7 @@
special_names = list("Oxide", "Rod", "Meltdown")
/datum/species/golem/uranium/handle_life(mob/living/carbon/human/H)
- for(var/mob/living/L in range(2, H))
- if(ishuman(L))
- var/mob/living/carbon/human/I = L
- if(!(RADIMMUNE in I.dna.species.species_traits))
- L.apply_effect(10, IRRADIATE)
- if(prob(25)) //reduce spam
- to_chat(L, "You are enveloped by a soft green glow emanating from [H].")
+ radiation_pulse(H, 20)
..()
//Ventcrawler
diff --git a/code/modules/mob/living/carbon/human/species/plasmaman.dm b/code/modules/mob/living/carbon/human/species/plasmaman.dm
index 7ea282512c2..408a7451c39 100644
--- a/code/modules/mob/living/carbon/human/species/plasmaman.dm
+++ b/code/modules/mob/living/carbon/human/species/plasmaman.dm
@@ -134,6 +134,9 @@
if("Blueshield")
O = new /datum/outfit/plasmaman/blueshield
+ if("Assistant", "Tourist", "Civilian", "Businessman", "Trader")
+ O = new /datum/outfit/plasmaman/assistant
+
H.equipOutfit(O, visualsOnly)
H.internal = H.r_hand
H.update_action_buttons_icon()
diff --git a/code/modules/mob/living/carbon/human/species/vox.dm b/code/modules/mob/living/carbon/human/species/vox.dm
index 6ac20e77b9b..37da7bc2698 100644
--- a/code/modules/mob/living/carbon/human/species/vox.dm
+++ b/code/modules/mob/living/carbon/human/species/vox.dm
@@ -86,9 +86,9 @@
var/tank_pref = H.client && H.client.prefs ? H.client.prefs.speciesprefs : null
var/obj/item/tank/internal_tank
if(tank_pref)//Diseasel, here you go
- internal_tank = new /obj/item/tank/nitrogen(H)
+ internal_tank = new /obj/item/tank/internals/nitrogen(H)
else
- internal_tank = new /obj/item/tank/emergency_oxygen/vox(H)
+ internal_tank = new /obj/item/tank/internals/emergency_oxygen/double/vox(H)
if(!H.equip_to_appropriate_slot(internal_tank))
if(!H.put_in_any_hand_if_possible(internal_tank))
H.unEquip(H.l_hand)
diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm
index c11eaca5293..45f75bf9f07 100644
--- a/code/modules/mob/living/carbon/life.dm
+++ b/code/modules/mob/living/carbon/life.dm
@@ -47,7 +47,7 @@
else
if(istype(loc, /obj/))
var/obj/location_as_object = loc
- location_as_object.handle_internal_lifeform(src,0)
+ location_as_object.handle_internal_lifeform(src, 0)
//Second link in a breath chain, calls check_breath()
/mob/living/carbon/proc/breathe()
@@ -81,7 +81,7 @@
if(isobj(loc)) //Breathe from loc as object
var/obj/loc_as_obj = loc
- breath = loc_as_obj.handle_internal_lifeform(src, BREATH_MOLES)
+ breath = loc_as_obj.handle_internal_lifeform(src, BREATH_VOLUME)
else if(isturf(loc)) //Breathe from loc as turf
var/breath_moles = 0
@@ -92,7 +92,7 @@
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)
+ loc_as_obj.handle_internal_lifeform(src, 0)
check_breath(breath)
@@ -226,29 +226,9 @@
return
/mob/living/carbon/handle_mutations_and_radiation()
- if(radiation)
-
- switch(radiation)
- if(0 to 50)
- radiation--
- if(prob(25))
- adjustToxLoss(1)
- updatehealth("handle mutations and radiation(0-50)")
-
- if(50 to 75)
- radiation -= 2
- adjustToxLoss(1)
- if(prob(5))
- radiation -= 5
- updatehealth("handle mutations and radiation(50-75)")
-
- if(75 to 100)
- radiation -= 3
- adjustToxLoss(3)
- updatehealth("handle mutations and radiation(75-100)")
-
- radiation = clamp(radiation, 0, 100)
-
+ radiation -= min(radiation, RAD_LOSS_PER_TICK)
+ if(radiation > RAD_MOB_SAFE)
+ adjustToxLoss(log(radiation - RAD_MOB_SAFE) * RAD_TOX_COEFFICIENT)
/mob/living/carbon/handle_chemicals_in_body()
reagents.metabolize(src)
diff --git a/code/modules/mob/living/damage_procs.dm b/code/modules/mob/living/damage_procs.dm
index 60f186631b7..c0f667e9d31 100644
--- a/code/modules/mob/living/damage_procs.dm
+++ b/code/modules/mob/living/damage_procs.dm
@@ -72,10 +72,10 @@
-/mob/living/proc/apply_effect(var/effect = 0,var/effecttype = STUN, var/blocked = 0, var/negate_armor = 0)
- blocked = (100-blocked)/100
+/mob/living/proc/apply_effect(effect = 0, effecttype = STUN, blocked = 0)
+ blocked = (100 - blocked) / 100
if(!effect || (blocked <= 0))
- return 0
+ return FALSE
switch(effecttype)
if(STUN)
Stun(effect * blocked)
@@ -84,10 +84,7 @@
if(PARALYZE)
Paralyse(effect * blocked)
if(IRRADIATE)
- var/rad_damage = effect
- if(!negate_armor) // Setting negate_armor overrides radiation armor checks, which are automatic otherwise
- rad_damage = max(effect * ((100-run_armor_check(null, "rad", "Your clothes feel warm.", "Your clothes feel warm."))/100),0)
- radiation += rad_damage
+ radiation += max(effect * blocked, 0)
if(SLUR)
Slur(effect * blocked)
if(STUTTER)
@@ -100,21 +97,32 @@
if(status_flags & CANSTUN)
Jitter(effect * blocked)
updatehealth("apply effect")
- return 1
+ return TRUE
-/mob/living/proc/apply_effects(var/stun = 0, var/weaken = 0, var/paralyze = 0, var/irradiate = 0, var/slur = 0, var/stutter = 0, var/eyeblur = 0, var/drowsy = 0, var/blocked = 0, var/stamina = 0, var/jitter = 0)
- if(blocked >= 100) return 0
- if(stun) apply_effect(stun, STUN, blocked)
- if(weaken) apply_effect(weaken, WEAKEN, blocked)
- if(paralyze) apply_effect(paralyze, PARALYZE, blocked)
- if(irradiate) apply_effect(irradiate, IRRADIATE, blocked)
- if(slur) apply_effect(slur, SLUR, blocked)
- if(stutter) apply_effect(stutter, STUTTER, blocked)
- if(eyeblur) apply_effect(eyeblur, EYE_BLUR, blocked)
- if(drowsy) apply_effect(drowsy, DROWSY, blocked)
- if(stamina) apply_damage(stamina, STAMINA, null, blocked)
- if(jitter) apply_effect(jitter, JITTER, blocked)
- return 1
+/mob/living/proc/apply_effects(stun = 0, weaken = 0, paralyze = 0, irradiate = 0, slur = 0, stutter = 0, eyeblur = 0, drowsy = 0, blocked = 0, stamina = 0, jitter = 0)
+ if(blocked >= 100)
+ return FALSE
+ if(stun)
+ apply_effect(stun, STUN, blocked)
+ if(weaken)
+ apply_effect(weaken, WEAKEN, blocked)
+ if(paralyze)
+ apply_effect(paralyze, PARALYZE, blocked)
+ if(irradiate)
+ apply_effect(irradiate, IRRADIATE, blocked)
+ if(slur)
+ apply_effect(slur, SLUR, blocked)
+ if(stutter)
+ apply_effect(stutter, STUTTER, blocked)
+ if(eyeblur)
+ apply_effect(eyeblur, EYE_BLUR, blocked)
+ if(drowsy)
+ apply_effect(drowsy, DROWSY, blocked)
+ if(stamina)
+ apply_damage(stamina, STAMINA, null, blocked)
+ if(jitter)
+ apply_effect(jitter, JITTER, blocked)
+ return TRUE
/mob/living/proc/getBruteLoss()
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index bb76b436ad0..05b29d20545 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -1033,6 +1033,21 @@
return 1
return 0
+/mob/living/rad_act(amount)
+ . = ..()
+
+ if(!amount || (amount < RAD_MOB_SKIN_PROTECTION))
+ return
+
+ amount -= RAD_BACKGROUND_RADIATION // This will always be at least 1 because of how skin protection is calculated
+
+ var/blocked = getarmor(null, "rad")
+
+ if(amount > RAD_BURN_THRESHOLD)
+ apply_damage(RAD_BURN_CURVE(amount), BURN, null, blocked)
+
+ apply_effect((amount * RAD_MOB_COEFFICIENT) / max(1, (radiation ** 2) * RAD_OVERDOSE_REDUCTION), IRRADIATE, blocked)
+
/mob/living/proc/fakefireextinguish()
return
diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index ddf5fb9875b..e2aeadf1963 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -55,22 +55,35 @@
/mob/living/proc/check_projectile_dismemberment(obj/item/projectile/P, def_zone)
return 0
-/mob/living/proc/electrocute_act(shock_damage, obj/source, siemens_coeff = 1, safety = FALSE, override = FALSE, tesla_shock = FALSE, illusion = FALSE, stun = TRUE)
- SEND_SIGNAL(src, COMSIG_LIVING_ELECTROCUTE_ACT, shock_damage)
+///As the name suggests, this should be called to apply electric shocks.
+/mob/living/proc/electrocute_act(shock_damage, source, siemens_coeff = 1, flags = NONE)
+ SEND_SIGNAL(src, COMSIG_LIVING_ELECTROCUTE_ACT, shock_damage, source, siemens_coeff, flags)
if(status_flags & GODMODE) //godmode
return FALSE
+ if((flags & SHOCK_TESLA) && HAS_TRAIT(src, TRAIT_TESLA_SHOCKIMMUNE))
+ return FALSE
if(NO_SHOCK in mutations) //shockproof
return FALSE
- if(tesla_shock && tesla_ignore)
+ shock_damage *= siemens_coeff
+ if(shock_damage < 1)
return FALSE
- if(shock_damage > 0)
- if(!illusion)
- adjustFireLoss(shock_damage)
- visible_message(
- "[src] was shocked by \the [source]!",
- "You feel a powerful shock coursing through your body!",
- "You hear a heavy electrical crack.")
- return shock_damage
+ if(!(flags & SHOCK_ILLUSION))
+ take_overall_damage(0, shock_damage, TRUE, used_weapon = "Electrocution")
+ if(shock_damage > 200)
+ visible_message(
+ "[src] was arc flashed by the [source]!",
+ "The [source] arc flashes and electrocutes you!",
+ "You hear a lightning-like crack!")
+ playsound(loc, 'sound/effects/eleczap.ogg', 50, 1, -1)
+ explosion(loc, -1, 0, 2, 2)
+ else
+ adjustStaminaLoss(shock_damage)
+ visible_message(
+ "[src] was shocked by \the [source]!", \
+ "You feel a powerful shock coursing through your body!", \
+ "You hear a heavy electrical crack." \
+ )
+ return shock_damage
/mob/living/emp_act(severity)
..()
diff --git a/code/modules/mob/living/living_defines.dm b/code/modules/mob/living/living_defines.dm
index 65ef4943059..49c4dbfca63 100644
--- a/code/modules/mob/living/living_defines.dm
+++ b/code/modules/mob/living/living_defines.dm
@@ -57,9 +57,6 @@
var/gene_stability = DEFAULT_GENE_STABILITY
var/ignore_gene_stability = 0
-
- var/tesla_ignore = FALSE
-
var/list/say_log = list() //a log of what we've said, plain text, no spans or junk, essentially just each individual "message"
var/list/emote_log = list() //like say_log but for emotes
diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm
index 97196868c9c..9bba6784af5 100644
--- a/code/modules/mob/living/say.dm
+++ b/code/modules/mob/living/say.dm
@@ -108,7 +108,7 @@ GLOBAL_LIST_EMPTY(channel_to_radio_key)
return returns
-/mob/living/say(var/message, var/verb = "says", var/sanitize = TRUE, var/ignore_speech_problems = FALSE, var/ignore_atmospherics = FALSE)
+/mob/living/say(message, verb = "says", sanitize = TRUE, ignore_speech_problems = FALSE, ignore_atmospherics = FALSE, ignore_languages = FALSE)
if(client)
if(client.prefs.muted & MUTE_IC)
to_chat(src, "You cannot speak in IC (Muted).")
@@ -137,7 +137,12 @@ GLOBAL_LIST_EMPTY(channel_to_radio_key)
message = trim_left(message)
//parse the language code and consume it
- var/list/message_pieces = parse_languages(message)
+ var/list/message_pieces = list()
+ if(ignore_languages)
+ message_pieces = message_to_multilingual(message)
+ else
+ message_pieces = parse_languages(message)
+
if(istype(message_pieces, /datum/multilingual_say_piece)) // Little quirk to just easily deal with HIVEMIND languages
var/datum/multilingual_say_piece/S = message_pieces // Yay BYOND's hilarious typecasting
S.speaking.broadcast(src, S.message)
diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
index 2bd990f1f85..a73f98778f9 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -1142,6 +1142,9 @@ GLOBAL_LIST_INIT(ai_verbs_default, list(
set category = "AI Commands"
var/newmsg = clean_input("What would you like the arrival message to be? List of options: $name, $rank, $species, $gender, $age", "Change Arrival Message", arrivalmsg)
+ if(!newmsg)
+ return
+ newmsg = html_decode(newmsg) // This feels a bit redundant, but sanitisation is (probably) important.
if(newmsg != arrivalmsg)
arrivalmsg = newmsg
to_chat(usr, "The arrival message has been successfully changed.")
diff --git a/code/modules/mob/living/silicon/pai/software/pai_apps.dm b/code/modules/mob/living/silicon/pai/software/pai_apps.dm
index 2dc05917e32..2dad56dd4b4 100644
--- a/code/modules/mob/living/silicon/pai/software/pai_apps.dm
+++ b/code/modules/mob/living/silicon/pai/software/pai_apps.dm
@@ -317,16 +317,17 @@
to_chat(usr, "You are already hacking that door!")
else
hacking = TRUE
- INVOKE_ASYNC(src, /datum/pai_software/door_jack/.proc/hackloop)
+ INVOKE_ASYNC(src, .proc/hackloop)
if("cancel")
hackdoor = null
if("cable")
- if(cable)
- to_chat(usr, "You already have a cable deployed!")
- return
- var/turf/T = get_turf(pai_holder)
- cable = new /obj/item/pai_cable(T)
- pai_holder.visible_message("A port on [pai_holder] opens to reveal [cable], which promptly falls to the floor.")
+ playsound(pai_holder, 'sound/mecha/mechmove03.ogg', 25, TRUE)
+ if(cable) // Retracting
+ pai_holder.visible_message("[cable] is pulled back into [pai_holder] with a quick snap.")
+ QDEL_NULL(cable)
+ else // Extending
+ cable = new /obj/item/pai_cable(get_turf(pai_holder))
+ pai_holder.visible_message("A port on [pai_holder] opens to reveal [cable], which promptly falls to the floor.")
/**
* Door jack hack loop
diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm
index 48fe9d996a9..0a4bbfa6ec1 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone.dm
@@ -1,4 +1,4 @@
-#define EMAG_TIMER 3000
+#define EMAG_TIMER 5 MINUTES
/mob/living/silicon/robot/drone
name = "drone"
real_name = "drone"
@@ -7,21 +7,19 @@
maxHealth = 35
health = 35
bubble_icon = "machine"
- universal_speak = 0
- universal_understand = 1
- gender = NEUTER
pass_flags = PASSTABLE
braintype = "Robot"
- lawupdate = 0
- density = 0
+ lawupdate = FALSE
+ density = FALSE
has_camera = FALSE
req_one_access = list(ACCESS_ENGINE, ACCESS_ROBOTICS)
- ventcrawler = 2
- magpulse = 1
+ ventcrawler = VENTCRAWLER_ALWAYS
+ magpulse = TRUE
mob_size = MOB_SIZE_SMALL
pull_force = MOVE_FORCE_VERY_WEAK // Can only drag small items
-
modules_break = FALSE
+ /// Cooldown for law syncs
+ var/sync_cooldown = 0
// We need to keep track of a few module items so we don't need to do list operations
// every time we need them. These get set in New() after the module is chosen.
@@ -37,7 +35,7 @@
//Used for self-mailing.
var/mail_destination = 0
- var/reboot_cooldown = 60 // one minute
+ var/reboot_cooldown = 1 MINUTES
var/last_reboot
var/list/pullable_drone_items = list(
/obj/item/pipe,
@@ -57,8 +55,8 @@
remove_language("Robot Talk")
remove_language("Galactic Common")
- add_language("Drone Talk", 1)
- add_language("Drone", 1)
+ add_language("Drone Talk", TRUE)
+ add_language("Drone", TRUE)
// Disable the microphone wire on Drones
if(radio)
@@ -86,13 +84,13 @@
radio.recalculateChannels()
//Grab stacks.
- stack_metal = locate(/obj/item/stack/sheet/metal/cyborg) in src.module
- stack_wood = locate(/obj/item/stack/sheet/wood) in src.module
- stack_glass = locate(/obj/item/stack/sheet/glass/cyborg) in src.module
- stack_plastic = locate(/obj/item/stack/sheet/plastic) in src.module
+ stack_metal = locate(/obj/item/stack/sheet/metal/cyborg) in module
+ stack_wood = locate(/obj/item/stack/sheet/wood) in module
+ stack_glass = locate(/obj/item/stack/sheet/glass/cyborg) in module
+ stack_plastic = locate(/obj/item/stack/sheet/plastic) in module
//Grab decompiler.
- decompiler = locate(/obj/item/matter_decompiler) in src.module
+ decompiler = locate(/obj/item/matter_decompiler) in module
//Some tidying-up.
flavor_text = "It's a tiny little repair drone. The casing is stamped with an NT logo and the subscript: 'Nanotrasen Recursive Repair Systems: Fixing Tomorrow's Problem, Today!'"
@@ -103,10 +101,10 @@
laws = new /datum/ai_laws/drone()
connected_ai = null
- aiCamera = new/obj/item/camera/siliconcam/drone_camera(src)
+ aiCamera = new /obj/item/camera/siliconcam/drone_camera(src)
additional_law_channels["Drone"] = ";"
- playsound(src.loc, 'sound/machines/twobeep.ogg', 50, 0)
+ playsound(loc, 'sound/machines/twobeep.ogg', 50)
//Redefining some robot procs...
/mob/living/silicon/robot/drone/rename_character(oldname, newname)
@@ -114,7 +112,7 @@
return ..(newname, newname)
/mob/living/silicon/robot/drone/get_default_name()
- return "maintenance drone ([rand(100,999)])"
+ return "maintenance drone ([rand(100, 999)])"
/mob/living/silicon/robot/drone/update_icons()
overlays.Cut()
@@ -126,7 +124,6 @@
/mob/living/silicon/robot/drone/choose_icon()
return
-
/mob/living/silicon/robot/drone/pick_module()
return
@@ -136,25 +133,23 @@
return FALSE
//Drones cannot be upgraded with borg modules so we need to catch some items before they get used in ..().
-/mob/living/silicon/robot/drone/attackby(obj/item/W as obj, mob/user as mob, params)
-
- if(istype(W, /obj/item/borg/upgrade/))
- to_chat(user, "The maintenance drone chassis not compatible with \the [W].")
+/mob/living/silicon/robot/drone/attackby(obj/item/I, mob/user, params)
+ if(istype(I, /obj/item/borg/upgrade))
+ to_chat(user, "The maintenance drone chassis is not compatible with [I].")
return
- else if(istype(W, /obj/item/crowbar))
- to_chat(user, "The machine is hermetically sealed. You can't open the case.")
+ else if(istype(I, /obj/item/crowbar))
+ to_chat(user, "The machine is hermetically sealed. You can't open the case.")
return
- else if(istype(W, /obj/item/card/id)||istype(W, /obj/item/pda))
-
+ else if(istype(I, /obj/item/card/id) || istype(I, /obj/item/pda))
if(stat == DEAD)
-
- if(!config.allow_drone_spawn || emagged || health < -35) //It's dead, Dave.
+ // Currently not functional, so commenting out until it's fixed to avoid confusion
+ /*if(!config.allow_drone_spawn || emagged || health < -35) //It's dead, Dave.
to_chat(user, "The interface is fried, and a distressing burned smell wafts from the robot's interior. You're not rebooting this one.")
return
- if(!allowed(W))
+ if(!allowed(I))
to_chat(user, "Access denied.")
return
@@ -164,25 +159,26 @@
to_chat(usr, "The reboot system is currently offline. Please wait another [cooldown_time] seconds.")
return
- user.visible_message("\the [user] swipes [user.p_their()] ID card through [src], attempting to reboot it.", "You swipe your ID card through [src], attempting to reboot it.")
+ user.visible_message("[user] swipes [user.p_their()] ID card through [src], attempting to reboot it.",
+ "You swipe your ID card through [src], attempting to reboot it.")
last_reboot = world.time / 10
var/drones = 0
for(var/mob/living/silicon/robot/drone/D in GLOB.silicon_mob_list)
if(D.key && D.client)
drones++
if(drones < config.max_maint_drones)
- request_player()
+ request_player()*/
return
else
var/confirm = alert("Using your ID on a Maintenance Drone will shut it down, are you sure you want to do this?", "Disable Drone", "Yes", "No")
if(confirm == ("Yes") && (user in range(3, src)))
- user.visible_message("\the [user] swipes [user.p_their()] ID card through [src], attempting to shut it down.", "You swipe your ID card through \the [src], attempting to shut it down.")
+ user.visible_message("[user] swipes [user.p_their()] ID card through [src], attempting to shut it down.",
+ "You swipe your ID card through [src], attempting to shut it down.")
if(emagged)
return
-
- if(allowed(W))
+ if(allowed(I))
shut_down()
else
to_chat(user, "Access denied.")
@@ -191,7 +187,7 @@
..()
-/mob/living/silicon/robot/drone/emag_act(user as mob)
+/mob/living/silicon/robot/drone/emag_act(mob/user)
if(!client || stat == DEAD)
to_chat(user, "There's not much point subverting this heap of junk.")
return
@@ -210,7 +206,7 @@
if(jobban_isbanned(src, ROLE_SYNDICATE))
SSticker.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.")
+ 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.")
@@ -218,13 +214,12 @@
GLOB.lawchanges.Add("[time] : [H.name]([H.key]) emagged [name]([key])")
addtimer(CALLBACK(src, .proc/shut_down, TRUE), EMAG_TIMER)
- emagged = 1
- density = 1
+ emagged = TRUE
+ density = TRUE
pass_flags = 0
icon_state = "repairbot-emagged"
holder_type = /obj/item/holder/drone/emagged
update_icons()
- lawupdate = 0
connected_ai = null
clear_supplied_laws()
clear_inherent_laws()
@@ -234,7 +229,6 @@
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 [H.real_name]'s commands.")
- return
//DRONE LIFE/DEATH
@@ -262,7 +256,7 @@
full_law_reset()
show_laws()
-/mob/living/silicon/robot/drone/proc/shut_down(force=FALSE)
+/mob/living/silicon/robot/drone/proc/shut_down(force = FALSE)
if(stat == DEAD)
return
@@ -285,32 +279,32 @@
for(var/mob/dead/observer/O in GLOB.player_list)
if(cannotPossess(O))
continue
- if(jobban_isbanned(O,"nonhumandept") || jobban_isbanned(O,"Drone"))
+ if(jobban_isbanned(O, "nonhumandept") || jobban_isbanned(O, "Drone"))
continue
if(O.client)
if(ROLE_PAI in O.client.prefs.be_special)
- question(O.client,O)
+ question(O.client, O)
-/mob/living/silicon/robot/drone/proc/question(var/client/C,var/mob/M)
+/mob/living/silicon/robot/drone/proc/question(client/C, mob/M)
spawn(0)
- if(!C || !M || jobban_isbanned(M,"nonhumandept") || jobban_isbanned(M,"Drone")) return
+ if(!C || !M || jobban_isbanned(M, "nonhumandept") || jobban_isbanned(M, "Drone"))
+ return
var/response = alert(C, "Someone is attempting to reboot a maintenance drone. Would you like to play as one?", "Maintenance drone reboot", "Yes", "No")
if(!C || ckey)
return
if(response == "Yes")
transfer_personality(C)
-/mob/living/silicon/robot/drone/proc/transfer_personality(var/client/player)
+/mob/living/silicon/robot/drone/proc/transfer_personality(client/player)
+ if(!player)
+ return
- if(!player) return
-
- if(player.mob && player.mob.mind)
+ if(player.mob?.mind)
player.mob.mind.transfer_to(src)
player.mob.mind.assigned_role = "Drone"
else
ckey = player.ckey
- lawupdate = 0
to_chat(src, "Systems rebooted. Loading base pattern maintenance protocol... loaded.")
full_law_reset()
to_chat(src, " You are a maintenance drone, a tiny-brained robotic repair machine.")
@@ -358,21 +352,21 @@
to_chat(src, "You are too small to pull that.")
/mob/living/silicon/robot/drone/add_robot_verbs()
- src.verbs |= silicon_subsystems
+ verbs |= silicon_subsystems
/mob/living/silicon/robot/drone/remove_robot_verbs()
- src.verbs -= silicon_subsystems
+ verbs -= silicon_subsystems
-/mob/living/silicon/robot/drone/update_canmove(delay_action_updates = 0)
+/mob/living/silicon/robot/drone/update_canmove(delay_action_updates = FALSE)
. = ..()
density = emagged //this is reset every canmove update otherwise
-/mob/living/simple_animal/drone/flash_eyes(intensity = 1, override_blindness_check = 0, affect_silicon = 0, visual = 0)
+/mob/living/silicon/robot/drone/flash_eyes(intensity = 1, override_blindness_check = FALSE, affect_silicon = FALSE, visual = FALSE)
if(affect_silicon)
return ..()
/mob/living/silicon/robot/drone/decompile_act(obj/item/matter_decompiler/C, mob/user)
- if(!client && istype(user, /mob/living/silicon/robot/drone))
+ if(!client && isdrone(user))
to_chat(user, "You begin decompiling the other drone.")
if(!do_after(user, 5 SECONDS, target = loc))
to_chat(user, "You need to remain still while decompiling such a large object.")
@@ -380,7 +374,7 @@
if(QDELETED(src) || QDELETED(user))
return ..()
to_chat(user, "You carefully and thoroughly decompile your downed fellow, storing as much of its resources as you can within yourself.")
- new/obj/effect/decal/cleanable/blood/oil(get_turf(src))
+ new /obj/effect/decal/cleanable/blood/oil(get_turf(src))
C.stored_comms["metal"] += 15
C.stored_comms["glass"] += 15
C.stored_comms["wood"] += 5
diff --git a/code/modules/mob/living/silicon/robot/drone/drone_console.dm b/code/modules/mob/living/silicon/robot/drone/drone_console.dm
index d961d8e1c62..02924fbbbda 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone_console.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone_console.dm
@@ -6,16 +6,18 @@
req_access = list(ACCESS_ENGINE_EQUIP)
circuit = /obj/item/circuitboard/drone_control
- //Used when pinging drones.
- var/drone_call_area = "Engineering"
- //Used to enable or disable drone fabrication.
+ /// The linked fabricator
var/obj/machinery/drone_fabricator/dronefab
+ /// Used when pinging drones
+ var/drone_call_area = "Engineering"
+ /// Cooldown for area pings
+ var/ping_cooldown = 0
-/obj/machinery/computer/drone_control/attack_ai(var/mob/user as mob)
- return src.attack_hand(user)
+/obj/machinery/computer/drone_control/Initialize(mapload)
+ . = ..()
+ find_fab()
-
-/obj/machinery/computer/drone_control/attack_hand(var/mob/user as mob)
+/obj/machinery/computer/drone_control/attack_hand(mob/user)
if(..())
return
@@ -23,105 +25,112 @@
to_chat(user, "Access denied.")
return
- interact(user)
+ ui_interact(user)
-/obj/machinery/computer/drone_control/attack_ghost(mob/user as mob)
- interact(user)
+/obj/machinery/computer/drone_control/attack_ghost(mob/user)
+ ui_interact(user)
-/obj/machinery/computer/drone_control/interact(mob/user)
+// tgui\packages\tgui\interfaces\DroneConsole.js
+/obj/machinery/computer/drone_control/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
+ ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+ if(!ui)
+ ui = new(user, src, ui_key, "DroneConsole", "Drone Control Console", 420, 500, master_ui, state)
+ ui.open()
- user.set_machine(src)
- var/dat
- dat += "Maintenance Units "
+/obj/machinery/computer/drone_control/ui_data(mob/user)
+ var/list/data = list()
+ data["drone_fab"] = FALSE
+ data["fab_power"] = null
+ data["drone_prod"] = null
+ data["drone_progress"] = null
+ if(dronefab)
+ data["drone_fab"] = TRUE
+ data["fab_power"] = dronefab.stat & NOPOWER ? FALSE : TRUE
+ data["drone_prod"] = dronefab.produce_drones
+ data["drone_progress"] = dronefab.drone_progress
+ data["selected_area"] = drone_call_area
+ data["ping_cd"] = ping_cooldown > world.time ? TRUE : FALSE
+ data["drones"] = list()
for(var/mob/living/silicon/robot/drone/D in GLOB.silicon_mob_list)
- dat += " [D.real_name] ([D.stat == 2 ? "INACTIVE" : "ACTIVE"])"
- dat += " Cell charge: [D.cell.charge]/[D.cell.maxcharge]."
- dat += " Currently located in: [get_area(D)]."
- dat += " Resync | Shutdown"
+ var/area/A = get_area(D)
+ var/turf/T = get_turf(D)
+ var/list/drone_data = list(
+ name = D.real_name,
+ uid = D.UID(),
+ stat = D.stat,
+ client = D.client ? TRUE : FALSE,
+ health = round(D.health / D.maxHealth, 0.1),
+ charge = round(D.cell.charge / D.cell.maxcharge, 0.1),
+ location = "[A] ([T.x], [T.y])",
+ sync_cd = D.sync_cooldown > world.time ? TRUE : FALSE
+ )
+ data["drones"] += list(drone_data)
+ return data
- dat += "
Request drone presence in area:[drone_call_area] (Send ping)"
+/obj/machinery/computer/drone_control/ui_static_data(mob/user)
+ var/list/data = list()
+ data["area_list"] = GLOB.TAGGERLOCATIONS
+ return data
- dat += "
Drone fabricator: "
- dat += "[dronefab ? "[(dronefab.produce_drones && !(dronefab.stat & NOPOWER)) ? "ACTIVE" : "INACTIVE"]" : "FABRICATOR NOT DETECTED. (search)"]"
- user << browse(dat, "window=computer;size=400x500")
- onclose(user, "computer")
- return
-
-
-/obj/machinery/computer/drone_control/Topic(href, href_list)
+/obj/machinery/computer/drone_control/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
if(..())
return
+ . = TRUE
- if(!allowed(usr) && !usr.can_admin_interact())
- to_chat(usr, "Access denied.")
+ switch(action)
+ if("find_fab")
+ find_fab(usr)
+
+ if("toggle_fab")
+ if(QDELETED(dronefab))
+ dronefab = null
+ return
+
+ dronefab.produce_drones = !dronefab.produce_drones
+ var/toggle = dronefab.produce_drones ? "enable" : "disable"
+ to_chat(usr, "You [toggle] drone production in the nearby fabricator.")
+ message_admins("[key_name_admin(usr)] [toggle]d maintenance drone production from the control console.")
+ log_game("[key_name(usr)] [toggle]d maintenance drone production from the control console.")
+
+ if("set_area")
+ drone_call_area = params["area"]
+
+ if("ping")
+ ping_cooldown = world.time + 1 MINUTES // One minute cooldown to prevent chat spam
+ to_chat(usr, "You issue a maintenance request for all active drones, highlighting [drone_call_area].")
+ for(var/mob/living/silicon/robot/drone/D in GLOB.silicon_mob_list)
+ if(D.client && D.stat == CONSCIOUS)
+ to_chat(D, "-- Maintenance drone presence requested in: [drone_call_area].")
+
+ if("resync")
+ var/mob/living/silicon/robot/drone/D = locateUID(params["uid"])
+ if(D)
+ D.sync_cooldown = world.time + 1 MINUTES // One minute cooldown to prevent chat spam
+ to_chat(usr, "You issue a law synchronization directive for the drone.")
+ D.law_resync()
+
+ if("shutdown")
+ var/mob/living/silicon/robot/drone/D = locateUID(params["uid"])
+ if(D)
+ to_chat(usr, "You issue a kill command for the unfortunate drone.")
+ message_admins("[key_name_admin(usr)] issued kill order for drone [key_name_admin(D)] from control console.")
+ log_game("[key_name(usr)] issued kill order for [key_name(D)] from control console.")
+ D.shut_down()
+
+/obj/machinery/computer/drone_control/proc/find_fab(mob/user)
+ if(dronefab)
return
- if((usr.contents.Find(src) || (in_range(src, usr) && istype(src.loc, /turf))) || (istype(usr, /mob/living/silicon)))
- usr.set_machine(src)
+ for(var/obj/machinery/drone_fabricator/fab in get_area(src))
- if(href_list["setarea"])
+ if(fab.stat & NOPOWER)
+ continue
- //Probably should consider using another list, but this one will do.
- var/t_area = input("Select the area to ping.", "Set Target Area", null) as null|anything in GLOB.TAGGERLOCATIONS
+ dronefab = fab
+ if(user)
+ to_chat(user, "Drone fabricator located.")
+ return
- if(!t_area || GLOB.TAGGERLOCATIONS[t_area])
- return
-
- drone_call_area = t_area
- to_chat(usr, "You set the area selector to [drone_call_area].")
-
- else if(href_list["ping"])
-
- to_chat(usr, "You issue a maintenance request for all active drones, highlighting [drone_call_area].")
- for(var/mob/living/silicon/robot/drone/D in GLOB.silicon_mob_list)
- if(D.client && D.stat == 0)
- to_chat(D, "-- Maintenance drone presence requested in: [drone_call_area].")
-
- else if(href_list["resync"])
-
- var/mob/living/silicon/robot/drone/D = locate(href_list["resync"])
-
- if(D.stat != 2)
- to_chat(usr, "You issue a law synchronization directive for the drone.")
- D.law_resync()
-
- else if(href_list["shutdown"])
-
- var/mob/living/silicon/robot/drone/D = locate(href_list["shutdown"])
-
- if(D.stat != 2)
- to_chat(usr, "You issue a kill command for the unfortunate drone.")
- message_admins("[key_name_admin(usr)] issued kill order for drone [key_name_admin(D)] from control console.")
- log_game("[key_name(usr)] issued kill order for [key_name(src)] from control console.")
- D.shut_down()
-
- else if(href_list["search_fab"])
- if(dronefab)
- return
-
- for(var/obj/machinery/drone_fabricator/fab in get_area(src))
-
- if(fab.stat & NOPOWER)
- continue
-
- dronefab = fab
- to_chat(usr, "Drone fabricator located.")
- return
-
- to_chat(usr, "Unable to locate drone fabricator.")
-
- else if(href_list["toggle_fab"])
-
- if(!dronefab)
- return
-
- if(get_dist(src,dronefab) > 3)
- dronefab = null
- to_chat(usr, "Unable to locate drone fabricator.")
- return
-
- dronefab.produce_drones = !dronefab.produce_drones
- to_chat(usr, "You [dronefab.produce_drones ? "enable" : "disable"] drone production in the nearby fabricator.")
-
- src.updateUsrDialog()
+ if(user)
+ to_chat(user, "Unable to locate drone fabricator.")
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 023cced9cdb..73c78ff3bec 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm
@@ -1,22 +1,18 @@
/obj/machinery/drone_fabricator
name = "drone fabricator"
desc = "A large automated factory for producing maintenance drones."
+ icon = 'icons/obj/machines/drone_fab.dmi'
+ icon_state = "drone_fab_idle"
- density = 1
- anchored = 1
+ density = TRUE
+ anchored = TRUE
use_power = IDLE_POWER_USE
idle_power_usage = 20
active_power_usage = 5000
- var/drone_progress = 0
- var/produce_drones = 1
- var/time_last_drone = 500
-
- icon = 'icons/obj/machines/drone_fab.dmi'
- icon_state = "drone_fab_idle"
-
-/obj/machinery/drone_fabricator/New()
- ..()
+ var/produce_drones = TRUE
+ var/drone_progress = 100
+ var/time_last_drone = 0
/obj/machinery/drone_fabricator/power_change()
if(powered())
@@ -31,7 +27,8 @@
return
if(stat & NOPOWER || !produce_drones)
- if(icon_state != "drone_fab_nopower") icon_state = "drone_fab_nopower"
+ if(icon_state != "drone_fab_nopower")
+ icon_state = "drone_fab_nopower"
return
if(drone_progress >= 100)
@@ -40,14 +37,14 @@
icon_state = "drone_fab_active"
var/elapsed = world.time - time_last_drone
- drone_progress = round((elapsed/config.drone_build_time)*100)
+ drone_progress = round((elapsed / config.drone_build_time) * 100)
if(drone_progress >= 100)
- visible_message("\The [src] voices a strident beep, indicating a drone chassis is prepared.")
+ visible_message("[src] voices a strident beep, indicating a drone chassis is prepared.")
/obj/machinery/drone_fabricator/examine(mob/user)
. = ..()
- if(produce_drones && drone_progress >= 100 && istype(user,/mob/dead) && config.allow_drone_spawn && count_drones() < config.max_maint_drones)
+ if(produce_drones && drone_progress >= 100 && isobserver(user) && config.allow_drone_spawn && count_drones() < config.max_maint_drones)
. += " A drone is prepared. Select 'Join As Drone' from the Ghost tab to spawn as a maintenance drone."
/obj/machinery/drone_fabricator/proc/count_drones()
@@ -57,18 +54,17 @@
drones++
return drones
-/obj/machinery/drone_fabricator/proc/create_drone(var/client/player)
-
+/obj/machinery/drone_fabricator/proc/create_drone(client/player)
if(stat & NOPOWER)
return
if(!produce_drones || !config.allow_drone_spawn || count_drones() >= config.max_maint_drones)
return
- if(!player || !istype(player.mob,/mob/dead))
+ if(!player || !isobserver(player.mob))
return
- visible_message("\The [src] churns and grinds as it lurches into motion, disgorging a shiny new drone after a few moments.")
+ visible_message("[src] churns and grinds as it lurches into motion, disgorging a shiny new drone after a few moments.")
flick("h_lathe_leave",src)
time_last_drone = world.time
@@ -88,41 +84,40 @@
to_chat(src, "That verb is not currently permitted.")
return
- if(!src.stat)
+ if(stat != DEAD)
return
if(usr != src)
- return 0 //something is terribly wrong
+ return FALSE //something is terribly wrong
- if(jobban_isbanned(src,"nonhumandept") || jobban_isbanned(src,"Drone"))
- to_chat(usr, "You are banned from playing drones and cannot spawn as a drone.")
+ if(jobban_isbanned(src, "nonhumandept") || jobban_isbanned(src, "Drone"))
+ to_chat(usr, "You are banned from playing drones, and cannot spawn as one.")
return
- if(!SSticker || SSticker.current_state < 3)
+ if(!SSticker || SSticker.current_state < GAME_STATE_PLAYING)
to_chat(src, "You can't join as a drone before the game starts!")
return
- var/drone_age = 14 // 14 days to play as a drone
- var/player_age_check = check_client_age(usr.client, drone_age)
+ var/player_age_check = check_client_age(usr.client, 14) // 14 days to play as a drone
if(player_age_check && config.use_age_restriction_for_antags)
to_chat(usr, "This role is not yet available to you. You need to wait another [player_age_check] days.")
return
- var/pt_req = role_available_in_playtime(client, ROLE_DRONE)
+ var/pt_req = role_available_in_playtime(client, "Drone")
if(pt_req)
var/pt_req_string = get_exp_format(pt_req)
to_chat(usr, "This role is not yet available to you. Play another [pt_req_string] to unlock it.")
return
- var/deathtime = world.time - src.timeofdeath
- var/joinedasobserver = 0
- if(istype(src,/mob/dead/observer))
+ var/deathtime = world.time - timeofdeath
+ var/joinedasobserver = FALSE
+ if(isobserver(src))
var/mob/dead/observer/G = src
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)
- joinedasobserver = 1
+ if(G.started_as_observer == TRUE)
+ joinedasobserver = TRUE
var/deathtimeminutes = round(deathtime / 600)
var/pluralcheck = "minute"
@@ -132,7 +127,7 @@
pluralcheck = " [deathtimeminutes] minute and"
else if(deathtimeminutes > 1)
pluralcheck = " [deathtimeminutes] minutes and"
- var/deathtimeseconds = round((deathtime - deathtimeminutes * 600) / 10,1)
+ var/deathtimeseconds = round((deathtime - deathtimeminutes * 600) / 10, 1)
if(deathtime < 6000 && joinedasobserver == 0)
to_chat(usr, "You have been dead for[pluralcheck] [deathtimeseconds] seconds.")
@@ -151,7 +146,7 @@
return
if(DF.drone_progress >= 100)
- DF.create_drone(src.client)
+ DF.create_drone(client)
return
to_chat(src, "There are no available drone spawn points, sorry.")
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 5789def0f8b..7e321a46aee 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -474,6 +474,7 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
rename_character(real_name, get_default_name("Default"))
languages = list()
speech_synthesizer_langs = list()
+ radio.recalculateChannels()
update_icons()
update_headlamp()
@@ -481,7 +482,7 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
speed = 0 // Remove upgrades.
ionpulse = FALSE
magpulse = FALSE
- add_language("Robot Talk", 1)
+ add_language("Robot Talk", TRUE)
if("lava" in weather_immunities) // Remove the lava-immunity effect given by a printable upgrade
weather_immunities -= "lava"
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index 006573b018f..b59a6084c7c 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -241,6 +241,7 @@
modules += new /obj/item/multitool/cyborg(src)
modules += new /obj/item/t_scanner(src)
modules += new /obj/item/analyzer(src)
+ modules += new /obj/item/geiger_counter/cyborg(src)
modules += new /obj/item/holosign_creator/engineering(src)
modules += new /obj/item/gripper(src)
modules += new /obj/item/matter_decompiler(src)
@@ -337,7 +338,7 @@
/obj/item/robot_module/butler/respawn_consumable(var/mob/living/silicon/robot/R)
if(emag)
var/obj/item/reagent_containers/food/drinks/cans/beer/B = emag
- B.reagents.add_reagent("beer2", 2)
+ B.reagents.add_reagent("beer2", 5)
..()
/obj/item/robot_module/butler/add_languages(var/mob/living/silicon/robot/R)
diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm
index 70fc688607a..afaa2f21e57 100644
--- a/code/modules/mob/living/silicon/silicon.dm
+++ b/code/modules/mob/living/silicon/silicon.dm
@@ -5,6 +5,7 @@
bubble_icon = "machine"
has_unlimited_silicon_privilege = 1
weather_immunities = list("ash")
+ flags_2 = RAD_PROTECT_CONTENTS_2 | RAD_NO_CONTAMINATE_2
var/syndicate = 0
var/const/MAIN_CHANNEL = "Main Frequency"
var/lawchannel = MAIN_CHANNEL // Default channel on which to state laws
@@ -161,7 +162,7 @@
/mob/living/silicon/drop_item()
return
-/mob/living/silicon/electrocute_act(shock_damage, obj/source, siemens_coeff = 1, safety = FALSE, override = FALSE, tesla_shock = FALSE, illusion = FALSE, stun = TRUE)
+/mob/living/silicon/electrocute_act(shock_damage, source, siemens_coeff = 1, flags = NONE)
return FALSE //So borgs they don't die trying to fix wiring
/mob/living/silicon/emp_act(severity)
@@ -222,27 +223,9 @@
return 2
-/mob/living/silicon/apply_effect(var/effect = 0,var/effecttype = STUN, var/blocked = 0, var/negate_armor = 0)
- return 0//The only effect that can hit them atm is flashes and they still directly edit so this works for now
-/*
- if(!effect || (blocked >= 2)) return 0
- switch(effecttype)
- if(STUN)
- Stun(effect / (blocked + 1))
- if(WEAKEN)
- Weaken(effect / (blocked + 1))
- if(PARALYZE)
- Paralyse(effect / (blocked + 1))
- if(IRRADIATE)
- radiation += min((effect - (effect*getarmor(null, "rad"))), 0)//Rads auto check armor
- if(STUTTER)
- stuttering = max(stuttering,(effect/(blocked+1)))
- if(EYE_BLUR)
- eye_blurry = max(eye_blurry,(effect/(blocked+1)))
- if(DROWSY)
- drowsyness = max(drowsyness,(effect/(blocked+1)))
- updatehealth()
- return 1*/
+/mob/living/silicon/apply_effect(effect = 0, effecttype = STUN, blocked = 0)
+ return FALSE //The only effect that can hit them atm is flashes and they still directly edit so this works for now
+
/proc/islinked(var/mob/living/silicon/robot/bot, var/mob/living/silicon/ai/ai)
if(!istype(bot) || !istype(ai))
diff --git a/code/modules/mob/living/simple_animal/constructs.dm b/code/modules/mob/living/simple_animal/constructs.dm
index 131c4f8160b..bafed690f1a 100644
--- a/code/modules/mob/living/simple_animal/constructs.dm
+++ b/code/modules/mob/living/simple_animal/constructs.dm
@@ -86,7 +86,7 @@
/mob/living/simple_animal/hostile/construct/narsie_act()
return
-/mob/living/simple_animal/hostile/construct/electrocute_act(shock_damage, obj/source, siemens_coeff = 1, safety = FALSE, override = FALSE, tesla_shock = FALSE, illusion = FALSE, stun = TRUE)
+/mob/living/simple_animal/hostile/construct/electrocute_act(shock_damage, source, siemens_coeff = 1, flags = NONE)
return FALSE
/////////////////Juggernaut///////////////
diff --git a/code/modules/mob/living/simple_animal/corpse.dm b/code/modules/mob/living/simple_animal/corpse.dm
index 8d0ad5d0e2b..83d3e9da513 100644
--- a/code/modules/mob/living/simple_animal/corpse.dm
+++ b/code/modules/mob/living/simple_animal/corpse.dm
@@ -39,7 +39,7 @@
l_ear = /obj/item/radio/headset
mask = /obj/item/clothing/mask/gas/syndicate
back = /obj/item/tank/jetpack/oxygen
- r_pocket = /obj/item/tank/emergency_oxygen
+ r_pocket = /obj/item/tank/internals/emergency_oxygen
id = /obj/item/card/id
diff --git a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
index 58e3ad54089..f2e9743ff2d 100644
--- a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
+++ b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
@@ -99,6 +99,11 @@
H.visible_message("[src] takes a big chomp out of [H]!", "[src] takes a big chomp out of your [NB.name]!")
NB.droplimb()
+/mob/living/simple_animal/hostile/retaliate/goat/chef
+ name = "Pete"
+ desc = "Pete, the Chef's pet goat from the Caribbean. Not known for their pleasant disposition."
+ unique_pet = TRUE
+
//cow
/mob/living/simple_animal/cow
name = "cow"
diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm
index be3f985db2e..275eb133862 100644
--- a/code/modules/mob/living/simple_animal/friendly/mouse.dm
+++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm
@@ -207,7 +207,7 @@
var/client/C = client
if(istype(blobmind) && istype(C))
blobmind.special_role = SPECIAL_ROLE_BLOB
- var/obj/structure/blob/core/core = new(T, 200, C, 3)
+ var/obj/structure/blob/core/core = new(T, C, 3)
core.lateblobtimer()
else
new /obj/structure/blob/core(T) // Ghosts will be prompted to control it.
diff --git a/code/modules/mob/living/simple_animal/hostile/floorcluwne.dm b/code/modules/mob/living/simple_animal/hostile/floorcluwne.dm
index 77fb0cd0c5b..196de37457c 100644
--- a/code/modules/mob/living/simple_animal/hostile/floorcluwne.dm
+++ b/code/modules/mob/living/simple_animal/hostile/floorcluwne.dm
@@ -144,7 +144,7 @@
return
-/mob/living/simple_animal/hostile/floor_cluwne/electrocute_act(shock_damage, obj/source, siemens_coeff = 1, safety = FALSE, override = FALSE, tesla_shock = FALSE, illusion = FALSE, stun = TRUE) //prevents runtimes with machine fuckery
+/mob/living/simple_animal/hostile/floor_cluwne/electrocute_act(shock_damage, source, siemens_coeff = 1, flags = NONE) //prevents runtimes with machine fuckery
return FALSE
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/swarmer.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/swarmer.dm
index 34b0a3d51a4..77c710359bb 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/swarmer.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/swarmer.dm
@@ -281,7 +281,7 @@ GLOBAL_LIST_INIT(AISwarmerCapsByType, list(/mob/living/simple_animal/hostile/swa
else
var/mob/living/L = target
L.attack_animal(src)
- L.electrocute_act(10, src, safety = TRUE) //safety = TRUE means we don't check gloves... Ok?
+ L.electrocute_act(10, src, flags = SHOCK_NOGLOVES)
return TRUE
else
return ..()
diff --git a/code/modules/mob/living/simple_animal/hostile/mining/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining/hivelord.dm
index a5248e98bb6..7504f7d379e 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining/hivelord.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining/hivelord.dm
@@ -344,7 +344,7 @@
else if(prob(10))
belt = pickweight(list(/obj/item/pickaxe = 8, /obj/item/pickaxe/mini = 4, /obj/item/pickaxe/silver = 2, /obj/item/pickaxe/diamond = 1))
else
- belt = /obj/item/tank/emergency_oxygen/engi
+ belt = /obj/item/tank/internals/emergency_oxygen/engi
if(mob_species != /datum/species/unathi)
shoes = /obj/item/clothing/shoes/workboots/mining
gloves = /obj/item/clothing/gloves/color/black
@@ -402,7 +402,7 @@
suit = /obj/item/clothing/suit/armor/riot/knight
back = /obj/item/shield/riot/buckler
belt = /obj/item/nullrod/claymore
- r_pocket = /obj/item/tank/emergency_oxygen
+ r_pocket = /obj/item/tank/internals/emergency_oxygen
mask = /obj/item/clothing/mask/breath
if("Operative")
id_job = "Operative"
@@ -413,7 +413,7 @@
shoes = /obj/item/clothing/shoes/black
suit = /obj/item/clothing/suit/storage/labcoat
glasses = /obj/item/clothing/glasses/sunglasses/blindfold
- back = /obj/item/tank/oxygen
+ back = /obj/item/tank/internals/oxygen
mask = /obj/item/clothing/mask/breath
if("Cultist")
uniform = /obj/item/clothing/under/roman
diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm
index 8d6db8ade3c..73a08ef2bfd 100644
--- a/code/modules/mob/living/simple_animal/parrot.dm
+++ b/code/modules/mob/living/simple_animal/parrot.dm
@@ -14,45 +14,45 @@
//Only a maximum of one action and one intent should be active at any given time.
//Actions
-#define PARROT_PERCH 1 //Sitting/sleeping, not moving
-#define PARROT_SWOOP 2 //Moving towards or away from a target
-#define PARROT_WANDER 4 //Moving without a specific target in mind
+#define PARROT_PERCH (1<<0) //Sitting/sleeping, not moving
+#define PARROT_SWOOP (1<<1) //Moving towards or away from a target
+#define PARROT_WANDER (1<<2) //Moving without a specific target in mind
//Intents
-#define PARROT_STEAL 8 //Flying towards a target to steal it/from it
-#define PARROT_ATTACK 16 //Flying towards a target to attack it
-#define PARROT_RETURN 32 //Flying towards its perch
-#define PARROT_FLEE 64 //Flying away from its attacker
-
+#define PARROT_STEAL (1<<3) //Flying towards a target to steal it/from it
+#define PARROT_ATTACK (1<<4) //Flying towards a target to attack it
+#define PARROT_RETURN (1<<5) //Flying towards its perch
+#define PARROT_FLEE (1<<6) //Flying away from its attacker
/mob/living/simple_animal/parrot
- name = "\improper Parrot"
- desc = "The parrot squaks, \"It's a Parrot! BAWWK!\""
+ name = "parrot"
+ desc = "The parrot squaks, \"It's a parrot! BAWWK!\""
icon = 'icons/mob/animal.dmi'
icon_state = "parrot_fly"
icon_living = "parrot_fly"
icon_dead = "parrot_dead"
pass_flags = PASSTABLE
- can_collar = 1
+ can_collar = TRUE
var/list/clean_speak = list(
"Hi",
"Hello!",
"Cracker?",
- "BAWWWWK george mellons griffing me")
- speak_emote = list("squawks","says","yells")
- emote_hear = list("squawks","bawks")
+ "BAWWWWK george mellons griffing me"
+ )
+ speak_emote = list("squawks", "says", "yells")
+ emote_hear = list("squawks", "bawks")
emote_see = list("flutters its wings")
speak_chance = 1//1% (1 in 100) chance every tick; So about once per 150 seconds, assuming an average tick is 1.5s
turns_per_move = 5
butcher_results = list(/obj/item/reagent_containers/food/snacks/cracker = 3)
- response_help = "pets the"
- response_disarm = "gently moves aside the"
- response_harm = "swats the"
- stop_automated_movement = 1
- universal_speak = 1
+ response_help = "pets"
+ response_disarm = "gently moves aside"
+ response_harm = "swats"
+ stop_automated_movement = TRUE
+ universal_speak = TRUE
mob_size = MOB_SIZE_SMALL
var/parrot_state = PARROT_WANDER //Hunt for a perch when created
@@ -63,8 +63,8 @@
var/parrot_speed = 5 //"Delay in world ticks between movement." according to byond. Yeah, that's BS but it does directly affect movement. Higher number = slower.
var/parrot_been_shot = 0 //Parrots get a speed bonus after being shot. This will deincrement every process_ai() and at 0 the parrot will return to regular speed.
- var/list/speech_buffer = list()
- var/list/available_channels = list()
+ var/list/speech_buffer
+ var/list/available_channels
//Headset for Poly to yell at engineers :)
var/obj/item/radio/headset/ears = null
@@ -78,7 +78,7 @@
var/obj/parrot_perch = null
var/obj/desired_perches = list(/obj/structure/computerframe, /obj/structure/displaycase, \
/obj/structure/filingcabinet, /obj/machinery/teleport, \
- /obj/machinery/suit_storage_unit, /obj/machinery/clonepod, \
+ /obj/machinery/suit_storage_unit, /obj/machinery/clonepod, \
/obj/machinery/dna_scannernew, /obj/machinery/tcomms, \
/obj/machinery/nuclearbomb, /obj/machinery/particle_accelerator, \
/obj/machinery/recharge_station, /obj/machinery/smartfridge, \
@@ -89,9 +89,10 @@
flying = TRUE
gold_core_spawnable = FRIENDLY_SPAWN
-
/mob/living/simple_animal/parrot/New()
..()
+ speech_buffer = list()
+ available_channels = list()
GLOB.hear_radio_list += src
if(!ears)
var/headset = pick(/obj/item/radio/headset/headset_sec, \
@@ -116,9 +117,9 @@
/mob/living/simple_animal/parrot/death(gibbed)
if(can_die())
if(held_item)
- held_item.loc = src.loc
- held_item = null
- walk(src,0)
+ custom_emote(EMOTE_VISUAL, "lets go of [held_item]!")
+ drop_held_item()
+ walk(src, 0)
return ..()
/mob/living/simple_animal/parrot/Stat()
@@ -128,7 +129,7 @@
/*
* Inventory
*/
-/mob/living/simple_animal/parrot/show_inv(mob/user as mob)
+/mob/living/simple_animal/parrot/show_inv(mob/user)
user.set_machine(src)
var/dat = {"
"}
@@ -147,9 +148,8 @@
popup.open()
/mob/living/simple_animal/parrot/Topic(href, href_list)
-
//Can the usr physically do this?
- if(!usr.canmove || usr.stat || usr.restrained() || !in_range(loc, usr))
+ if(!usr.canmove || usr.stat || usr.restrained() || !usr.Adjacent(src))
return
//Is the usr's mob type able to do this?
@@ -185,7 +185,7 @@
if(!item_to_add)
return
- if( !istype(item_to_add, /obj/item/radio/headset) )
+ if(!istype(item_to_add, /obj/item/radio/headset))
to_chat(usr, "This object won't fit.")
return
@@ -221,16 +221,16 @@
else
..()
-
/*
* Attack responces
*/
//Humans, monkeys, aliens
-/mob/living/simple_animal/parrot/attack_hand(mob/living/carbon/M as mob)
+/mob/living/simple_animal/parrot/attack_hand(mob/living/carbon/M)
..()
- if(client) return
- if(!stat && M.a_intent == "hurt")
+ if(client)
+ return
+ if(!stat && M.a_intent == "harm")
icon_state = "parrot_fly" //It is going to be flying regardless of whether it flees or attacks
if(parrot_state == PARROT_PERCH)
@@ -242,12 +242,15 @@
if(M.health < 50) //Weakened mob? Fight back!
parrot_state |= PARROT_ATTACK
else
+ if(held_item)
+ custom_emote(EMOTE_VISUAL, "lets go of [held_item]!")
+
parrot_state |= PARROT_FLEE //Otherwise, fly like a bat out of hell!
- drop_held_item(0)
+ drop_held_item(FALSE)
return
//Mobs with objects
-/mob/living/simple_animal/parrot/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
+/mob/living/simple_animal/parrot/attackby(obj/item/O, mob/user, params)
..()
if(!stat && !client && !istype(O, /obj/item/stack/medical))
if(O.force)
@@ -255,13 +258,13 @@
parrot_sleep_dur = parrot_sleep_max //Reset it's sleep timer if it was perched
parrot_interest = user
- parrot_state = PARROT_SWOOP | PARROT_FLEE
+ parrot_state = PARROT_SWOOP|PARROT_FLEE
icon_state = "parrot_fly"
- drop_held_item(0)
+ drop_held_item(FALSE)
return
//Bullets
-/mob/living/simple_animal/parrot/bullet_act(var/obj/item/projectile/Proj)
+/mob/living/simple_animal/parrot/bullet_act(obj/item/projectile/P)
..()
if(!stat && !client)
if(parrot_state == PARROT_PERCH)
@@ -271,10 +274,9 @@
parrot_state = PARROT_WANDER //OWFUCK, Been shot! RUN LIKE HELL!
parrot_been_shot += 5
icon_state = "parrot_fly"
- drop_held_item(0)
+ drop_held_item(FALSE)
return
-
/*
* AI - Not really intelligent, but I'm calling it AI anyway.
*/
@@ -302,10 +304,9 @@
parrot_state = PARROT_WANDER
return
- if(!isturf(src.loc) || !canmove || buckled)
+ if(!isturf(loc) || !canmove || buckled)
return //If it can't move, dont let it move. (The buckled check probably isn't necessary thanks to canmove)
-
//-----SPEECH
/* Parrot speech mimickry!
Phrases that the parrot hears in mob/living/say() get added to speach_buffer.
@@ -318,12 +319,11 @@
clean_speak += pick(speech_buffer)
speech_buffer.Cut()
-
//-----SLEEPING
if(parrot_state == PARROT_PERCH)
- if(parrot_perch && parrot_perch.loc != src.loc) //Make sure someone hasnt moved our perch on us
+ if(parrot_perch && parrot_perch.loc != loc) //Make sure someone hasnt moved our perch on us
if(parrot_perch in view(src))
- parrot_state = PARROT_SWOOP | PARROT_RETURN
+ parrot_state = PARROT_SWOOP|PARROT_RETURN
icon_state = "parrot_fly"
return
else
@@ -333,7 +333,6 @@
if(--parrot_sleep_dur) //Zzz
return
-
else
//This way we only call the stuff below once every [sleep_max] ticks.
parrot_sleep_dur = parrot_sleep_max
@@ -344,8 +343,8 @@
//Search for item to steal
parrot_interest = search_for_item()
if(parrot_interest)
- custom_emote(1,"looks in [parrot_interest]'s direction and takes flight.")
- parrot_state = PARROT_SWOOP | PARROT_STEAL
+ custom_emote(EMOTE_VISUAL, "looks in [parrot_interest]'s direction and takes flight.")
+ parrot_state = PARROT_SWOOP|PARROT_STEAL
icon_state = "parrot_fly"
return
@@ -366,88 +365,98 @@
if(AM)
if(istype(AM, /obj/item) || isliving(AM)) //If stealable item
parrot_interest = AM
- custom_emote(1,"turns and flies towards [parrot_interest]")
- parrot_state = PARROT_SWOOP | PARROT_STEAL
+ parrot_state = PARROT_SWOOP|PARROT_STEAL
+ face_atom(AM)
+ custom_emote(EMOTE_VISUAL, "turns and flies towards [parrot_interest].")
return
else //Else it's a perch
parrot_perch = AM
- parrot_state = PARROT_SWOOP | PARROT_RETURN
+ parrot_state = PARROT_SWOOP|PARROT_RETURN
return
return
if(parrot_interest && (parrot_interest in view(src)))
- parrot_state = PARROT_SWOOP | PARROT_STEAL
+ parrot_state = PARROT_SWOOP|PARROT_STEAL
return
if(parrot_perch && (parrot_perch in view(src)))
- parrot_state = PARROT_SWOOP | PARROT_RETURN
+ parrot_state = PARROT_SWOOP|PARROT_RETURN
return
else //Have an item but no perch? Find one!
parrot_perch = search_for_perch()
if(parrot_perch)
- parrot_state = PARROT_SWOOP | PARROT_RETURN
+ parrot_state = PARROT_SWOOP|PARROT_RETURN
return
//-----STEALING
- else if(parrot_state == (PARROT_SWOOP | PARROT_STEAL))
- walk(src,0)
- if(!parrot_interest || held_item)
- parrot_state = PARROT_SWOOP | PARROT_RETURN
+ else if(parrot_state == (PARROT_SWOOP|PARROT_STEAL))
+ walk(src, 0)
+
+ if(!parrot_interest || held_item || !(parrot_interest in view(src)))
+ parrot_state = PARROT_SWOOP|PARROT_RETURN
return
- if(!(parrot_interest in view(src)))
- parrot_state = PARROT_SWOOP | PARROT_RETURN
- return
-
- if(in_range(src, parrot_interest))
-
+ if(Adjacent(parrot_interest))
if(isliving(parrot_interest))
steal_from_mob()
-
else //This should ensure that we only grab the item we want, and make sure it's not already collected on our perch
if(!parrot_perch || parrot_interest.loc != parrot_perch.loc)
- held_item = parrot_interest
- parrot_interest.loc = src
- visible_message("[src] grabs the [held_item]!", "You grab the [held_item]!", "You hear the sounds of wings flapping furiously.")
+ try_grab_item(parrot_interest)
+ visible_message("[src] grabs [held_item]!", "You grab [held_item]!", "You hear the sounds of wings flapping furiously.")
parrot_interest = null
- parrot_state = PARROT_SWOOP | PARROT_RETURN
+ parrot_state = PARROT_SWOOP|PARROT_RETURN
return
- walk_to(src, parrot_interest, 1, parrot_speed)
+ var/list/path_to_take = get_path_to(src, get_turf(parrot_interest), /turf/proc/Distance_cardinal)
+ if(length(path_to_take) <= 1) // The target is below us
+ parrot_interest = null
+ parrot_state = PARROT_SWOOP|PARROT_RETURN
+ return
+
+ walk_to(src, path_to_take[2], 0, parrot_speed)
return
//-----RETURNING TO PERCH
- else if(parrot_state == (PARROT_SWOOP | PARROT_RETURN))
+ else if(parrot_state == (PARROT_SWOOP|PARROT_RETURN))
walk(src, 0)
+
if(!parrot_perch || !isturf(parrot_perch.loc)) //Make sure the perch exists and somehow isnt inside of something else.
parrot_perch = null
parrot_state = PARROT_WANDER
return
- if(in_range(src, parrot_perch))
- src.loc = parrot_perch.loc
+ if(Adjacent(parrot_perch))
+ forceMove(parrot_perch.loc)
drop_held_item()
parrot_state = PARROT_PERCH
icon_state = "parrot_sit"
return
- walk_to(src, parrot_perch, 1, parrot_speed)
+ var/list/path_to_take = get_path_to(src, get_turf(parrot_perch), /turf/proc/Distance_cardinal)
+ if(length(path_to_take) <= 1) // The target is below us
+ parrot_perch = null
+ parrot_state = PARROT_WANDER
+ return
+
+ walk_to(src, path_to_take[2], 0, parrot_speed)
return
//-----FLEEING
- else if(parrot_state == (PARROT_SWOOP | PARROT_FLEE))
- walk(src,0)
- if(!parrot_interest || !isliving(parrot_interest)) //Sanity
- parrot_state = PARROT_WANDER
+ else if(parrot_state == (PARROT_SWOOP|PARROT_FLEE))
+ walk(src, 0)
- walk_away(src, parrot_interest, 1, parrot_speed-parrot_been_shot)
+ if(!parrot_interest || !isliving(parrot_interest) || !Adjacent(parrot_interest)) //Sanity
+ parrot_state = PARROT_WANDER
+ parrot_interest = null
+ return
+
+ walk_away(src, parrot_interest, 0, parrot_speed - parrot_been_shot)
parrot_been_shot--
return
//-----ATTACKING
- else if(parrot_state == (PARROT_SWOOP | PARROT_ATTACK))
-
+ else if(parrot_state == (PARROT_SWOOP|PARROT_ATTACK))
//If we're attacking a nothing, an object, a turf or a ghost for some stupid reason, switch to wander
if(!parrot_interest || !isliving(parrot_interest))
parrot_interest = null
@@ -457,8 +466,7 @@
var/mob/living/L = parrot_interest
//If the mob is close enough to interact with
- if(in_range(src, parrot_interest))
-
+ if(Adjacent(parrot_interest))
//If the mob we've been chasing/attacking dies or falls into crit, check for loot!
if(L.stat)
parrot_interest = null
@@ -466,34 +474,34 @@
held_item = steal_from_ground()
if(!held_item)
held_item = steal_from_mob() //Apparently it's possible for dead mobs to hang onto items in certain circumstances.
+ update_held_icon()
if(parrot_perch in view(src)) //If we have a home nearby, go to it, otherwise find a new home
- parrot_state = PARROT_SWOOP | PARROT_RETURN
+ parrot_state = PARROT_SWOOP|PARROT_RETURN
else
parrot_state = PARROT_WANDER
return
//Time for the hurt to begin!
- var/damage = rand(5,10)
+ var/damage = rand(5, 10)
if(ishuman(parrot_interest))
var/mob/living/carbon/human/H = parrot_interest
var/obj/item/organ/external/affecting = H.get_organ(ran_zone(pick(parrot_dam_zone)))
- H.apply_damage(damage, BRUTE, affecting, H.run_armor_check(affecting, "melee"), sharp = 1)
- custom_emote(1, pick("pecks [H]'s [affecting].", "cuts [H]'s [affecting] with its talons."))
-
+ H.apply_damage(damage, BRUTE, affecting, H.run_armor_check(affecting, "melee"), sharp = TRUE)
+ custom_emote(EMOTE_VISUAL, pick("pecks [H]'s [affecting].", "cuts [H]'s [affecting] with its talons."))
else
L.adjustBruteLoss(damage)
- custom_emote(1, pick("pecks at [L].", "claws [L]."))
+ custom_emote(EMOTE_VISUAL, pick("pecks at [L].", "claws [L]."))
return
-
//Otherwise, fly towards the mob!
else
+ // No AStar here because the parrot is pissed and isn't thinking rationally.
walk_to(src, parrot_interest, 1, parrot_speed)
return
//-----STATE MISHAP
else //This should not happen. If it does lets reset everything and try again
- walk(src,0)
+ walk(src, 0)
parrot_interest = null
parrot_perch = null
drop_held_item()
@@ -516,6 +524,10 @@
if(parrot_perch && AM.loc == parrot_perch.loc || AM.loc == src)
continue
+ // Can we find a path to it?
+ if(loc != AM.loc && !length(get_path_to(src, get_turf(AM), /turf/proc/Distance_cardinal)))
+ continue
+
if(istype(AM, /obj/item))
var/obj/item/I = AM
if(I.w_class < WEIGHT_CLASS_SMALL)
@@ -529,6 +541,10 @@
/mob/living/simple_animal/parrot/proc/search_for_perch()
for(var/obj/O in view(src))
+ // Can we find a path to it?
+ if(loc != O.loc && !length(get_path_to(src, get_turf(O), /turf/proc/Distance_cardinal)))
+ continue
+
for(var/path in desired_perches)
if(istype(O, path))
return O
@@ -537,6 +553,10 @@
//This proc was made to save on doing two 'in view' loops seperatly
/mob/living/simple_animal/parrot/proc/search_for_perch_and_item()
for(var/atom/movable/AM in view(src))
+ // Can we find a path to it?
+ if(loc != AM.loc && !length(get_path_to(src, get_turf(AM), /turf/proc/Distance_cardinal)))
+ continue
+
for(var/perch_path in desired_perches)
if(istype(AM, perch_path))
return AM
@@ -556,7 +576,6 @@
return C
return null
-
/*
* Verbs - These are actually procs, but can be used as verbs by player-controlled parrots.
*/
@@ -569,20 +588,18 @@
return -1
if(held_item)
- to_chat(src, "You are already holding the [held_item]")
+ to_chat(src, "You are already holding [held_item]")
return 1
- for(var/obj/item/I in view(1,src))
+ for(var/obj/item/I in view(1, src))
//Make sure we're not already holding it and it's small enough
if(I.loc != src && I.w_class <= WEIGHT_CLASS_SMALL)
-
//If we have a perch and the item is sitting on it, continue
if(!client && parrot_perch && I.loc == parrot_perch.loc)
continue
- held_item = I
- I.loc = src
- visible_message("[src] grabs the [held_item]!", "You grab the [held_item]!", "You hear the sounds of wings flapping furiously.")
+ try_grab_item(I)
+ visible_message("[src] grabs [held_item]!", "You grab [held_item]!", "You hear the sounds of wings flapping furiously.")
return held_item
to_chat(src, "There is nothing of interest to take.")
@@ -597,23 +614,21 @@
return -1
if(held_item)
- to_chat(src, "You are already holding the [held_item]")
+ to_chat(src, "You are already holding [held_item]")
return 1
var/obj/item/stolen_item = null
- for(var/mob/living/carbon/C in view(1,src))
+ for(var/mob/living/carbon/C in view(1, src))
if(C.l_hand && C.l_hand.w_class <= WEIGHT_CLASS_SMALL)
stolen_item = C.l_hand
if(C.r_hand && C.r_hand.w_class <= WEIGHT_CLASS_SMALL)
stolen_item = C.r_hand
- if(stolen_item)
- C.unEquip(stolen_item)
- held_item = stolen_item
- stolen_item.loc = src
- visible_message("[src] grabs the [held_item] out of [C]'s hand!", "You snag the [held_item] out of [C]'s hand!", "You hear the sounds of wings flapping furiously.")
+ if(stolen_item && C.unEquip(stolen_item))
+ try_grab_item(stolen_item)
+ visible_message("[src] grabs [held_item] out of [C]'s hand!", "You snag [held_item] out of [C]'s hand!", "You hear the sounds of wings flapping furiously.")
return held_item
to_chat(src, "There is nothing of interest to take.")
@@ -627,11 +642,10 @@
if(stat)
return
- src.drop_held_item()
-
+ drop_held_item()
return
-/mob/living/simple_animal/parrot/proc/drop_held_item(var/drop_gently = 1)
+/mob/living/simple_animal/parrot/proc/drop_held_item(drop_gently = TRUE)
set name = "Drop held item"
set category = "Parrot"
set desc = "Drop the item you're holding."
@@ -646,16 +660,18 @@
if(!drop_gently)
if(istype(held_item, /obj/item/grenade))
var/obj/item/grenade/G = held_item
- G.loc = src.loc
+ G.forceMove(loc)
G.prime()
- to_chat(src, "You let go of the [held_item]!")
+ to_chat(src, "You let go of [held_item]!")
held_item = null
+ update_held_icon()
return 1
- to_chat(src, "You drop the [held_item].")
+ to_chat(src, "You drop [held_item].")
- held_item.loc = src.loc
+ held_item.forceMove(loc)
held_item = null
+ update_held_icon()
return 1
/mob/living/simple_animal/parrot/proc/perch_player()
@@ -667,15 +683,30 @@
return
if(icon_state == "parrot_fly")
- for(var/atom/movable/AM in view(src,1))
+ for(var/atom/movable/AM in view(src, 1))
for(var/perch_path in desired_perches)
if(istype(AM, perch_path))
- src.loc = AM.loc
+ forceMove(AM.loc)
icon_state = "parrot_sit"
return
to_chat(src, "There is no perch nearby to sit on.")
return
+/**
+ * Attempts to pick up an adjacent item
+ *
+ * Arguments:
+ * * I - The item to try and pick up
+ */
+/mob/living/simple_animal/parrot/proc/try_grab_item(obj/I)
+ if(!Adjacent(I))
+ return
+ if(held_item)
+ drop_held_item()
+ held_item = I
+ update_held_icon()
+ I.forceMove(src)
+
/*
* Sub-types
*/
@@ -684,17 +715,17 @@
desc = "Poly the Parrot. An expert on quantum cracker theory."
clean_speak = list(
"Poly wanna cracker!",
- "Check the singlo, you chucklefucks!",
+ "Check the crystal, you chucklefucks!",
"Check the tesla, you shits!",
"STOP HOT-WIRING THE ENGINE, FUCKING CHRIST!",
"Wire the solars, you lazy bums!",
"WHO TOOK THE DAMN HARDSUITS?",
- "OH GOD ITS FREE CALL THE SHUTTLE",
+ "OH GOD ITS ABOUT TO DELAMINATE CALL THE SHUTTLE",
"Why are there so many atmos alerts?",
- "OH GOD WHY WOULD YOU TURN ON THE PA BEFORE CONTAINMENT IS UP?",
+ "OH GOD WHY WOULD YOU PUT CARBON-DIOXIDE IN THE SM?",
"Remember to lock the emitters!",
"Stop goofing off and repair the goddam station!",
- "The singularity is not your friend!",
+ "The supermatter is not your friend!",
"What were the wires again?",
"Goddam emaggers!"
)
@@ -706,7 +737,7 @@
available_channels = list(":e")
..()
-/mob/living/simple_animal/parrot/handle_message_mode(var/message_mode, list/message_pieces, var/verb, var/used_radios)
+/mob/living/simple_animal/parrot/handle_message_mode(message_mode, list/message_pieces, verb, used_radios)
if(message_mode && istype(ears))
ears.talk_into(src, message_pieces, message_mode, verb)
used_radios += ears
@@ -716,15 +747,30 @@
parrot_hear(html_decode(multilingual_to_message(message_pieces)))
..()
-
-
-/mob/living/simple_animal/parrot/hear_radio(list/message_pieces, var/verb="says", var/part_a, var/part_b, var/mob/speaker = null, var/hard_to_hear = 0, var/atom/follow_target)
+/mob/living/simple_animal/parrot/hear_radio(list/message_pieces, verb = "says", part_a, part_b, mob/speaker = null, hard_to_hear = 0, atom/follow_target)
if(speaker != src && prob(50))
parrot_hear(html_decode(multilingual_to_message(message_pieces)))
..()
-
-/mob/living/simple_animal/parrot/proc/parrot_hear(var/message="")
+/mob/living/simple_animal/parrot/proc/parrot_hear(message)
if(!message || stat)
return
speech_buffer.Add(message)
+
+/mob/living/simple_animal/parrot/proc/update_held_icon()
+ underlays.Cut()
+
+ if(!held_item)
+ return
+
+ var/matrix/m180 = matrix(held_item.transform)
+ m180.Turn(180)
+
+ var/held_item_icon = image(held_item, pixel_y = -8)
+ animate(held_item_icon, transform = m180)
+ underlays += held_item_icon
+
+/mob/living/simple_animal/parrot/CanAStarPassTo(ID, dir, obj/destination)
+ for(var/path in desired_perches)
+ if(istype(destination, path))
+ return TRUE
diff --git a/code/modules/mob/living/simple_animal/tribbles.dm b/code/modules/mob/living/simple_animal/tribbles.dm
index e5ebfb2ff61..09d94f81901 100644
--- a/code/modules/mob/living/simple_animal/tribbles.dm
+++ b/code/modules/mob/living/simple_animal/tribbles.dm
@@ -180,7 +180,7 @@ GLOBAL_VAR_INIT(totaltribbles, 0) //global variable so it updates for all trib
item_state = "furcoat"
blood_overlay_type = "armor"
body_parts_covered = UPPER_TORSO|ARMS|LOWER_TORSO
- allowed = list (/obj/item/tank/emergency_oxygen)
+ allowed = list (/obj/item/tank/internals/emergency_oxygen)
cold_protection = UPPER_TORSO | LOWER_TORSO | ARMS
min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
diff --git a/code/modules/mob/living/status_procs.dm b/code/modules/mob/living/status_procs.dm
index d4cca1b985d..4afd47b839d 100644
--- a/code/modules/mob/living/status_procs.dm
+++ b/code/modules/mob/living/status_procs.dm
@@ -588,3 +588,9 @@
to_chat(src, "[priority_absorb_key["self_message"]]")
priority_absorb_key["stuns_absorbed"] += amount
return TRUE
+
+/mob/living/proc/set_shocked()
+ flags_2 |= SHOCKED_2
+
+/mob/living/proc/reset_shocked()
+ flags_2 &= ~ SHOCKED_2
diff --git a/code/modules/mob/login.dm b/code/modules/mob/login.dm
index 639f3da7aaf..81150ac3be5 100644
--- a/code/modules/mob/login.dm
+++ b/code/modules/mob/login.dm
@@ -68,5 +68,9 @@
for(var/datum/alternate_appearance/AA in viewing_alternate_appearances)
AA.display_to(list(src))
+ if(!fexists("config/config.txt") || !fexists("config/game_options.txt"))
+ to_chat(src, "The game config files have not been properly set!\n Please copy ALL files from '/config/example' into the parent folder, '/config'.")
+ log_world("The game config files have not been properly set! Please copy ALL files from /config/example into the parent folder, /config.")
+
update_client_colour(0)
update_morgue()
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 270dd00e48e..4bae6316905 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -998,8 +998,10 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \
statpanel("Status") // Switch to the Status panel again, for the sake of the lazy Stat procs
- if(client && client.statpanel == "Status" && SSticker)
- show_stat_station_time()
+ if(client?.statpanel == "Status")
+ if(SSticker)
+ show_stat_station_time()
+ stat(null, "Players Connected: [length(GLOB.clients)]")
// this function displays the station time in the status panel
/mob/proc/show_stat_station_time()
@@ -1345,6 +1347,8 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \
/mob/proc/spin(spintime, speed)
set waitfor = 0
+ if(!spintime || !speed || spintime > 100)
+ CRASH("Aborted attempted call of /mob/proc/spin with invalid args ([spintime],[speed]) which could have frozen the server.")
var/D = dir
while(spintime >= speed)
sleep(speed)
@@ -1424,22 +1428,22 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \
/mob/proc/set_nutrition(change)
nutrition = max(0, change)
-/mob/clean_blood(clean_hands = TRUE, clean_mask = TRUE, clean_feet = TRUE)
+/mob/clean_blood(radiation_clean = FALSE, clean_hands = TRUE, clean_mask = TRUE, clean_feet = TRUE)
. = ..()
if(bloody_hands && clean_hands)
bloody_hands = 0
update_inv_gloves()
if(l_hand)
- if(l_hand.clean_blood())
+ if(l_hand.clean_blood(radiation_clean))
update_inv_l_hand()
if(r_hand)
- if(r_hand.clean_blood())
+ if(r_hand.clean_blood(radiation_clean))
update_inv_r_hand()
if(back)
- if(back.clean_blood())
+ if(back.clean_blood(radiation_clean))
update_inv_back()
if(wear_mask && clean_mask)
- if(wear_mask.clean_blood())
+ if(wear_mask.clean_blood(radiation_clean))
update_inv_wear_mask()
if(clean_feet)
feet_blood_color = null
@@ -1448,4 +1452,3 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \
blood_state = BLOOD_STATE_NOT_BLOODY
update_inv_shoes()
update_icons() //apply the now updated overlays to the mob
-
diff --git a/code/modules/ninja/suit/suit.dm b/code/modules/ninja/suit/suit.dm
index ed2b0025fad..0d965f8b483 100644
--- a/code/modules/ninja/suit/suit.dm
+++ b/code/modules/ninja/suit/suit.dm
@@ -12,7 +12,7 @@ Contents:
desc = "A unique, vaccum-proof suit of nano-enhanced armor designed specifically for Spider Clan assassins."
icon_state = "s-ninja"
item_state = "s-ninja_suit"
- allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/melee/baton, /obj/item/tank, /obj/item/stock_parts/cell)
+ allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/melee/baton, /obj/item/tank/internals, /obj/item/stock_parts/cell)
slowdown = 0
armor = list("melee" = 60, "bullet" = 50, "laser" = 30,"energy" = 15, "bomb" = 30, "bio" = 30, "rad" = 30, "fire" = 100, "acid" = 100)
diff --git a/code/modules/paperwork/faxmachine.dm b/code/modules/paperwork/faxmachine.dm
index bcf6bcc07db..2aba7f854b6 100644
--- a/code/modules/paperwork/faxmachine.dm
+++ b/code/modules/paperwork/faxmachine.dm
@@ -104,7 +104,9 @@ GLOBAL_LIST_EMPTY(fax_blacklist)
/obj/machinery/photocopier/faxmachine/ui_data(mob/user)
var/list/data = list()
data["authenticated"] = is_authenticated(user)
+ data["realauth"] = authenticated
data["scan_name"] = scan ? scan.name : FALSE
+ data["nologin"] = !data["scan_name"] && !data["realauth"]
if(!data["authenticated"])
data["network"] = "Disconnected"
else if(!emagged)
diff --git a/code/modules/pda/cart.dm b/code/modules/pda/cart.dm
index d4845926786..bd6994d21c3 100644
--- a/code/modules/pda/cart.dm
+++ b/code/modules/pda/cart.dm
@@ -299,7 +299,6 @@
desc = "The hit new PDA game that lets you track down and capture your favorite Nano-Mobs living in your world!"
icon_state = "cart-eye"
programs = list(new/datum/data/pda/app/mob_hunter_game)
- var/emagged = 0
/obj/item/cartridge/mob_hunt_game/attackby(obj/item/O, mob/user, params)
if(istype(O, /obj/item/nanomob_card))
diff --git a/code/modules/pda/utilities.dm b/code/modules/pda/utilities.dm
index 81a2271db04..3f3f8303469 100644
--- a/code/modules/pda/utilities.dm
+++ b/code/modules/pda/utilities.dm
@@ -125,8 +125,8 @@
pda.atmosanalyzer_scan(T.parent.air, user, T)
else if(istype(A, /obj/machinery/power/rad_collector))
var/obj/machinery/power/rad_collector/T = A
- if(T.P)
- pda.atmosanalyzer_scan(T.P.air_contents, user, T)
+ if(T.loaded_tank)
+ pda.atmosanalyzer_scan(T.loaded_tank.air_contents, user, T)
else if(istype(A, /obj/item/flamethrower))
var/obj/item/flamethrower/T = A
if(T.ptank)
diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm
index 40969d7e677..3c8db1f50df 100644
--- a/code/modules/power/cable.dm
+++ b/code/modules/power/cable.dm
@@ -97,7 +97,7 @@ By design, d1 is the smallest direction and d2 is the highest
/obj/structure/cable/hide(i)
if(level == 1 && isturf(loc))
- invisibility = i ? 101 : 0
+ invisibility = i ? INVISIBILITY_MAXIMUM : 0
updateicon()
/obj/structure/cable/proc/updateicon()
diff --git a/code/modules/power/generator.dm b/code/modules/power/generator.dm
index 4a2d8b66518..7da60057947 100644
--- a/code/modules/power/generator.dm
+++ b/code/modules/power/generator.dm
@@ -150,13 +150,13 @@
/obj/machinery/power/generator/attack_ghost(mob/user)
if(stat & (NOPOWER|BROKEN))
return
- interact(user)
+ ui_interact(user)
/obj/machinery/power/generator/attack_hand(mob/user)
if(..())
user << browse(null, "window=teg")
return
- interact(user)
+ ui_interact(user)
/obj/machinery/power/generator/multitool_act(mob/user, obj/item/I)
. = TRUE
@@ -190,60 +190,49 @@
connect()
to_chat(user, "You [anchored ? "secure" : "unsecure"] the bolts holding [src] to the floor.")
-/obj/machinery/power/generator/proc/get_menu(include_link = 1)
- var/t = ""
+/obj/machinery/power/generator/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
+ ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+ if(!ui)
+ ui = new(user, src, ui_key, "TEG", name, 500, 400, master_ui, state)
+ ui.open()
+
+/obj/machinery/power/generator/ui_data(mob/user)
+ var/list/data = list()
if(!powernet)
- t += "Unable to connect to the power network!"
- t += " Retry"
+ data["error"] = "Unable to connect to the power network!"
else if(cold_circ && hot_circ)
var/datum/gas_mixture/cold_circ_air1 = cold_circ.get_outlet_air()
var/datum/gas_mixture/cold_circ_air2 = cold_circ.get_inlet_air()
var/datum/gas_mixture/hot_circ_air1 = hot_circ.get_outlet_air()
var/datum/gas_mixture/hot_circ_air2 = hot_circ.get_inlet_air()
- t += "
"
-
- t += "Output: [round(lastgen)] W"
-
- t += " "
-
- t += "Cold loop "
- t += "Temperature Inlet: [round(cold_circ_air2.temperature, 0.1)] K / Outlet: [round(cold_circ_air1.temperature, 0.1)] K "
- t += "Pressure Inlet: [round(cold_circ_air2.return_pressure(), 0.1)] kPa / Outlet: [round(cold_circ_air1.return_pressure(), 0.1)] kPa "
-
- t += "Hot loop "
- t += "Temperature Inlet: [round(hot_circ_air2.temperature, 0.1)] K / Outlet: [round(hot_circ_air1.temperature, 0.1)] K "
- t += "Pressure Inlet: [round(hot_circ_air2.return_pressure(), 0.1)] kPa / Outlet: [round(hot_circ_air1.return_pressure(), 0.1)] kPa "
-
- t += "
"
+ data["cold_dir"] = dir2text(cold_dir)
+ data["hot_dir"] = dir2text(hot_dir)
+ data["output_power"] = round(lastgen)
+ // Temps are K, pressures are kPa, power is W
+ data["cold_inlet_temp"] = round(cold_circ_air2.temperature, 0.1)
+ data["hot_inlet_temp"] = round(hot_circ_air2.temperature, 0.1)
+ data["cold_outlet_temp"] = round(cold_circ_air1.temperature, 0.1)
+ data["hot_outlet_temp"] = round(hot_circ_air1.temperature, 0.1)
+ data["cold_delta_temp"] = data["cold_outlet_temp"] - data["cold_inlet_temp"]
+ data["cold_inlet_pressure"] = round(cold_circ_air2.return_pressure(), 0.1)
+ data["hot_inlet_pressure"] = round(hot_circ_air2.return_pressure(), 0.1)
+ data["cold_outlet_pressure"] = round(cold_circ_air1.return_pressure(), 0.1)
+ data["hot_outlet_pressure"] = round(hot_circ_air1.return_pressure(), 0.1)
+ data["warning_switched"] = (data["cold_inlet_temp"] > data["hot_inlet_temp"])
+ data["warning_cold_pressure"] = (data["cold_inlet_pressure"] < 1000)
+ data["warning_hot_pressure"] = (data["hot_inlet_pressure"] < 1000)
else
- t += "Unable to locate all parts!"
- t += " Retry"
- if(include_link)
- t += " Close"
+ data["error"] = "Unable to locate all parts!"
+ return data
- return t
-
-/obj/machinery/power/generator/interact(mob/user)
- user.set_machine(src)
-
- var/datum/browser/popup = new(user, "teg", "Thermo-Electric Generator", 460, 300)
- popup.set_content(get_menu())
- popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state))
- popup.open()
- return 1
-
-/obj/machinery/power/generator/Topic(href, href_list)
+/obj/machinery/power/generator/ui_act(action, params)
if(..())
- return 0
- if( href_list["close"] )
- usr << browse(null, "window=teg")
- usr.unset_machine()
- return 0
- if( href_list["check"] )
+ return
+ if(action == "check")
if(!powernet || !cold_circ || !hot_circ)
connect()
- return 1
+ return TRUE
/obj/machinery/power/generator/power_change()
..()
diff --git a/code/modules/power/gravitygenerator.dm b/code/modules/power/gravitygenerator.dm
index cf04c8a66f8..d69ad514b4d 100644
--- a/code/modules/power/gravitygenerator.dm
+++ b/code/modules/power/gravitygenerator.dm
@@ -1,18 +1,14 @@
-
-//
-// Gravity Generator
-//
-
-GLOBAL_LIST_EMPTY(gravity_generators) // We will keep track of this by adding new gravity generators to the list, and keying it with the z level.
+/// Global list of all active gravity generators. Keyed by the Z level
+GLOBAL_LIST_EMPTY(gravity_generators)
#define GRAV_POWER_IDLE 0
#define GRAV_POWER_UP 1
#define GRAV_POWER_DOWN 2
-#define GRAV_NEEDS_SCREWDRIVER 0
-#define GRAV_NEEDS_WELDING 1
-#define GRAV_NEEDS_PLASTEEL 2
-#define GRAV_NEEDS_WRENCH 3
+#define GRAV_NEEDS_WELDING 0
+#define GRAV_NEEDS_PLASTEEL 1
+#define GRAV_NEEDS_WRENCH 2
+#define GRAV_NEEDS_SCREWDRIVER 3
//
// Abstract Generator
@@ -20,10 +16,10 @@ GLOBAL_LIST_EMPTY(gravity_generators) // We will keep track of this by adding ne
/obj/machinery/gravity_generator
name = "gravitational generator"
- desc = "A device which produces a gravaton field when set up."
+ desc = "A device which produces a graviton field when set up."
icon = 'icons/obj/machines/gravity_generator.dmi'
- anchored = 1
- density = 1
+ anchored = TRUE
+ density = TRUE
use_power = NO_POWER_USE
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
var/sprite_number = 0
@@ -36,9 +32,9 @@ GLOBAL_LIST_EMPTY(gravity_generators) // We will keep track of this by adding ne
if(prob(20))
set_broken()
-/obj/machinery/gravity_generator/tesla_act(power, explosive)
- ..()
- if(explosive)
+/obj/machinery/gravity_generator/zap_act(power, zap_flags)
+ . = ..()
+ if(zap_flags & ZAP_MACHINE_EXPLOSIVE)
qdel(src)//like the singulo, tesla deletes it. stops it from exploding over and over
/obj/machinery/gravity_generator/update_icon()
@@ -71,13 +67,13 @@ GLOBAL_LIST_EMPTY(gravity_generators) // We will keep track of this by adding ne
/obj/machinery/gravity_generator/part
var/obj/machinery/gravity_generator/main/main_part = null
-/obj/machinery/gravity_generator/part/attackby(obj/item/I as obj, mob/user as mob, params)
+/obj/machinery/gravity_generator/part/attackby(obj/item/I, mob/user, params)
return main_part.attackby(I, user, params)
/obj/machinery/gravity_generator/part/get_status()
return main_part.get_status()
-/obj/machinery/gravity_generator/part/attack_hand(mob/user as mob)
+/obj/machinery/gravity_generator/part/attack_hand(mob/user)
return main_part.attack_hand(user)
/obj/machinery/gravity_generator/part/set_broken()
@@ -93,7 +89,7 @@ GLOBAL_LIST_EMPTY(gravity_generators) // We will keep track of this by adding ne
. = ..()
setup_parts()
middle.overlays += "activated"
- update_list()
+ update_gen_list()
//
// Main Generator with the main code
@@ -101,36 +97,55 @@ GLOBAL_LIST_EMPTY(gravity_generators) // We will keep track of this by adding ne
/obj/machinery/gravity_generator/main
icon_state = "on_8"
- idle_power_usage = 0
active_power_usage = 3000
power_channel = ENVIRON
sprite_number = 8
use_power = IDLE_POWER_USE
- interact_offline = 1
- var/on = 1
- var/breaker = 1
+ interact_offline = TRUE
+ /// Is the generator producing gravity
+ var/on = TRUE
+ /// Is the breaker switch turned on
+ var/breaker_on = TRUE
+ /// Generator parts on adjacent tiles
var/list/parts = list()
+ /// The central part of the structure
var/obj/middle = null
+ /// Charging state (Idle, Charging, Discharging)
var/charging_state = GRAV_POWER_IDLE
+ /// Charge percentage
var/charge_count = 100
var/current_overlay = null
- var/broken_state = 0
+ var/construction_state = GRAV_NEEDS_WELDING
+
+/obj/machinery/gravity_generator/main/examine(mob/user)
+ . = ..()
+ if(!(stat & BROKEN))
+ return
+
+ switch(construction_state)
+ if(GRAV_NEEDS_WELDING)
+ . += "The framework is damaged, and needs welding."
+ if(GRAV_NEEDS_PLASTEEL)
+ . += "The framework needs new plasteel plating."
+ if(GRAV_NEEDS_WRENCH)
+ . += "The plating needs wrenching into place."
+ if(GRAV_NEEDS_SCREWDRIVER)
+ . += "The cover screws are loose."
/obj/machinery/gravity_generator/main/Destroy() // If we somehow get deleted, remove all of our other parts.
investigate_log("was destroyed!", "gravity")
- on = 0
- update_list()
+ on = FALSE
+ update_gen_list()
for(var/obj/machinery/gravity_generator/part/O in parts)
O.main_part = null
qdel(O)
for(var/area/A in world)
- if(!is_station_level(A.z)) continue
- A.gravitychange(0,A)
+ if(!is_station_level(A.z))
+ continue
+ A.gravitychange(FALSE, A)
shake_everyone()
return ..()
-
-
/obj/machinery/gravity_generator/main/proc/setup_parts()
var/turf/our_turf = get_turf(src)
// 9x9 block obtained from the bottom middle of the block
@@ -144,26 +159,23 @@ GLOBAL_LIST_EMPTY(gravity_generators) // We will keep track of this by adding ne
if(count == 5) // Middle
middle = part
if(count <= 3) // Their sprite is the top part of the generator
- part.density = 0
+ part.density = FALSE
part.layer = MOB_LAYER + 0.1
part.sprite_number = count
part.main_part = src
parts += part
part.update_icon()
-/obj/machinery/gravity_generator/main/proc/connected_parts()
- return parts.len == 8
-
/obj/machinery/gravity_generator/main/set_broken()
..()
for(var/obj/machinery/gravity_generator/M in parts)
if(!(M.stat & BROKEN))
M.set_broken()
middle.overlays.Cut()
+ charging_state = GRAV_POWER_IDLE
charge_count = 0
- breaker = 0
- set_power()
- set_state(0)
+ breaker_on = FALSE
+ set_gravity(FALSE)
investigate_log("has broken down.", "gravity")
/obj/machinery/gravity_generator/main/set_fix()
@@ -171,96 +183,95 @@ GLOBAL_LIST_EMPTY(gravity_generators) // We will keep track of this by adding ne
for(var/obj/machinery/gravity_generator/M in parts)
if(M.stat & BROKEN)
M.set_fix()
- broken_state = 0
+ construction_state = initial(construction_state)
update_icon()
set_power()
// Interaction
-// Fixing the gravity generator.
-/obj/machinery/gravity_generator/main/attackby(obj/item/I as obj, mob/user as mob, params)
- switch(broken_state)
- if(GRAV_NEEDS_SCREWDRIVER)
- if(istype(I, /obj/item/screwdriver))
- to_chat(user, "You secure the screws of the framework.")
- playsound(src.loc, I.usesound, 50, 1)
- broken_state++
- update_icon()
- return
- if(GRAV_NEEDS_PLASTEEL)
- if(istype(I, /obj/item/stack/sheet/plasteel))
- var/obj/item/stack/sheet/plasteel/PS = I
- if(PS.amount >= 10)
- PS.use(10)
- to_chat(user, "You add the plating to the framework.")
- playsound(src.loc, PS.usesound, 75, 1)
- broken_state++
- update_icon()
- else
- to_chat(user, "You need 10 sheets of plasteel.")
- return
- if(GRAV_NEEDS_WRENCH)
- if(istype(I, /obj/item/wrench))
- to_chat(user, "You secure the plating to the framework.")
- playsound(src.loc, I.usesound, 75, 1)
- set_fix()
- return
- return ..()
-
+// REPAIRS //
+// Step 1
/obj/machinery/gravity_generator/main/welder_act(mob/user, obj/item/I)
- if(broken_state != GRAV_NEEDS_WELDING)
+ if(construction_state != GRAV_NEEDS_WELDING)
return
. = TRUE
- if(!I.use_tool(src, user, amount = 1, volume = I.tool_volume))
+ if(!I.use_tool(src, user, null, 1, I.tool_volume))
return
to_chat(user, "You mend the damaged framework.")
- broken_state++
+ construction_state = GRAV_NEEDS_PLASTEEL
update_icon()
-/obj/machinery/gravity_generator/main/attack_hand(mob/user as mob)
+// Step 2
+/obj/machinery/gravity_generator/main/attackby(obj/item/I, mob/user, params)
+ if(construction_state != GRAV_NEEDS_PLASTEEL)
+ return ..()
+ if(istype(I, /obj/item/stack/sheet/plasteel))
+ var/obj/item/stack/sheet/plasteel/PS = I
+ if(PS.amount < 10)
+ to_chat(user, "You need 10 sheets of plasteel.")
+ return
+
+ to_chat(user, "You add new plating to the framework.")
+ construction_state = GRAV_NEEDS_WRENCH
+ update_icon()
+
+// Step 3
+/obj/machinery/gravity_generator/main/wrench_act(mob/living/user, obj/item/I)
+ if(construction_state != GRAV_NEEDS_WRENCH)
+ return
+ . = TRUE
+ if(!I.use_tool(src, user, volume = I.tool_volume))
+ return
+ to_chat(user, "You secure the plating to the framework.")
+ construction_state = GRAV_NEEDS_SCREWDRIVER
+ update_icon()
+
+// Step 4
+/obj/machinery/gravity_generator/main/screwdriver_act(mob/living/user, obj/item/I)
+ if(!(stat & BROKEN)) // Not actually broken
+ return
+ if(construction_state != GRAV_NEEDS_SCREWDRIVER)
+ return
+ . = TRUE
+ if(!I.use_tool(src, user, volume = I.tool_volume))
+ return
+ to_chat(user, "You screw the covers back into place.")
+ set_fix()
+
+/obj/machinery/gravity_generator/main/attack_hand(mob/user)
if(!..())
- return interact(user)
+ return ui_interact(user)
-/obj/machinery/gravity_generator/main/attack_ai(mob/user as mob)
- return 1
+/obj/machinery/gravity_generator/main/attack_ai(mob/user)
+ return TRUE
-/obj/machinery/gravity_generator/main/attack_ghost(mob/user as mob)
- return interact(user)
+/obj/machinery/gravity_generator/main/attack_ghost(mob/user)
+ return ui_interact(user)
-/obj/machinery/gravity_generator/main/interact(mob/user as mob)
- if(stat & BROKEN)
+// tgui\packages\tgui\interfaces\GravityGen.js
+/obj/machinery/gravity_generator/main/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
+ ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+ if(!ui && !(stat & BROKEN))
+ ui = new(user, src, ui_key, "GravityGen", name, 350, 250, master_ui, state)
+ ui.open()
+
+/obj/machinery/gravity_generator/main/ui_data(mob/user)
+ var/list/data = list()
+ data["charging_state"] = charging_state
+ data["charge_count"] = charge_count
+ data["breaker"] = breaker_on
+ data["ext_power"] = on
+ return data
+
+/obj/machinery/gravity_generator/main/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
+ if(..())
return
- var/dat = "Gravity Generator Breaker: "
- if(breaker)
- dat += "ONOFF"
- else
- dat += "ONOFF "
-
- dat += " Generator Status:
"
- if(charging_state != GRAV_POWER_IDLE)
- dat += "WARNING Radiation Detected. [charging_state == GRAV_POWER_UP ? "Charging..." : "Discharging..."]"
- else if(on)
- dat += "Powered."
- else
- dat += "Unpowered."
-
- dat += " Gravity Charge: [charge_count]%
"
-
- var/datum/browser/popup = new(user, "gravgen", name)
- popup.set_content(dat)
- popup.open()
-
-
-/obj/machinery/gravity_generator/main/Topic(href, href_list)
- if(..())
- return 1
-
- if(href_list["gentoggle"])
- breaker = !breaker
- investigate_log("was toggled [breaker ? "ON" : "OFF"] by [usr.key].", "gravity")
+ . = TRUE
+ if(action == "breaker")
+ breaker_on = !breaker_on
+ investigate_log("was toggled [breaker_on ? "ON" : "OFF"] by [usr.key].", "gravity")
set_power()
- src.updateUsrDialog()
// Power and Icon States
@@ -271,54 +282,61 @@ GLOBAL_LIST_EMPTY(gravity_generators) // We will keep track of this by adding ne
/obj/machinery/gravity_generator/main/get_status()
if(stat & BROKEN)
- return "fix[min(broken_state, 3)]"
- return on || charging_state != GRAV_POWER_IDLE ? "on" : "off"
+ return "fix[construction_state]"
+ if(on || charging_state != GRAV_POWER_IDLE)
+ return "on"
+ else
+ return "off"
/obj/machinery/gravity_generator/main/update_icon()
..()
for(var/obj/O in parts)
O.update_icon()
-// Set the charging state based on power/breaker.
+/**
+ * Set the charging state based on external power and the breaker state.
+ */
/obj/machinery/gravity_generator/main/proc/set_power()
- var/new_state = 0
- if(stat & (NOPOWER|BROKEN) || !breaker)
- new_state = 0
- else if(breaker)
- new_state = 1
+ if(stat & (NOPOWER|BROKEN) || !breaker_on)
+ charging_state = GRAV_POWER_DOWN
+ else if(breaker_on)
+ charging_state = GRAV_POWER_UP
- charging_state = new_state ? GRAV_POWER_UP : GRAV_POWER_DOWN // Startup sequence animation.
investigate_log("is now [charging_state == GRAV_POWER_UP ? "charging" : "discharging"].", "gravity")
update_icon()
-// Set the state of the gravity.
-/obj/machinery/gravity_generator/main/proc/set_state(var/new_state)
- charging_state = GRAV_POWER_IDLE
- on = new_state
+/**
+ * Set the state of gravity on the z-level.
+ *
+ * * enable - `TRUE` to enable gravity, `FALSE` to disable gravity
+ */
+/obj/machinery/gravity_generator/main/proc/set_gravity(gravity)
+ var/alert = FALSE // Sound the alert if gravity was just enabled or disabled.
+ var/area/src_area = get_area(src)
+ on = gravity
use_power = on ? ACTIVE_POWER_USE : IDLE_POWER_USE
- // Sound the alert if gravity was just enabled or disabled.
- var/alert = 0
- var/area/area = get_area(src)
- if(new_state) // If we turned on
- if(gravity_in_level() == 0)
- alert = 1
+
+ if(gravity) // If we turned on
+ if(generators_in_level() == FALSE) // And there's no gravity
+ alert = TRUE
investigate_log("was brought online and is now producing gravity for this level.", "gravity")
- message_admins("The gravity generator was brought online. ([area.name])")
+ message_admins("The gravity generator was brought online. ([src_area.name])")
for(var/area/A in world)
- if(!is_station_level(A.z)) continue
- A.gravitychange(1,A)
- else
- if(gravity_in_level() == 1)
- alert = 1
- investigate_log("was brought offline and there is now no gravity for this level.", "gravity")
- message_admins("The gravity generator was brought offline with no backup generator. ([area.name])")
- for(var/area/A in world)
- if(!is_station_level(A.z)) continue
- A.gravitychange(0,A)
+ if(!is_station_level(A.z))
+ continue
+ A.gravitychange(TRUE, A)
+
+ else if(generators_in_level() == TRUE) // Turned off, and there is gravity
+ alert = TRUE
+ investigate_log("was brought offline and there is now no gravity for this level.", "gravity")
+ message_admins("The gravity generator was brought offline with no backup generator. ([src_area.name])")
+ for(var/area/A in world)
+ if(!is_station_level(A.z))
+ continue
+ A.gravitychange(FALSE, A)
update_icon()
- update_list()
- src.updateUsrDialog()
+ update_gen_list()
if(alert)
shake_everyone()
@@ -327,73 +345,77 @@ GLOBAL_LIST_EMPTY(gravity_generators) // We will keep track of this by adding ne
/obj/machinery/gravity_generator/main/process()
if(stat & BROKEN)
return
- if(charging_state != GRAV_POWER_IDLE)
- if(charging_state == GRAV_POWER_UP && charge_count >= 100)
- set_state(1)
- else if(charging_state == GRAV_POWER_DOWN && charge_count <= 0)
- set_state(0)
- else
- if(charging_state == GRAV_POWER_UP)
- charge_count += 2
- else if(charging_state == GRAV_POWER_DOWN)
- charge_count -= 2
+ if(charging_state == GRAV_POWER_IDLE)
+ return
- if(charge_count % 4 == 0 && prob(75)) // Let them know it is charging/discharging.
- playsound(src.loc, 'sound/effects/empulse.ogg', 100, 1)
+ if(charging_state == GRAV_POWER_UP && charge_count >= 100) // Fully charged
+ charging_state = GRAV_POWER_IDLE
+ set_gravity(TRUE)
+ else if(charging_state == GRAV_POWER_DOWN && charge_count <= 0) // Fully discharged
+ charging_state = GRAV_POWER_IDLE
+ set_gravity(FALSE)
+ else
+ if(charging_state == GRAV_POWER_UP)
+ charge_count += 2
+ else if(charging_state == GRAV_POWER_DOWN)
+ charge_count -= 2
- updateDialog()
- if(prob(25)) // To help stop "Your clothes feel warm" spam.
- pulse_radiation()
+ if(charge_count < 100 && prob(75)) // Let them know it is charging/discharging.
+ playsound(loc, 'sound/effects/empulse.ogg', 100, TRUE)
- var/overlay_state = null
- switch(charge_count)
- if(0 to 20)
- overlay_state = null
- if(21 to 40)
- overlay_state = "startup"
- if(41 to 60)
- overlay_state = "idle"
- if(61 to 80)
- overlay_state = "activating"
- if(81 to 100)
- overlay_state = "activated"
+ if(prob(25)) // To help stop "Your clothes feel warm" spam.
+ pulse_radiation()
- if(overlay_state != current_overlay)
- if(middle)
- middle.overlays.Cut()
- if(overlay_state)
- middle.overlays += overlay_state
- current_overlay = overlay_state
+ var/overlay_state
+ switch(charge_count)
+ if(0 to 20)
+ overlay_state = null
+ if(21 to 40)
+ overlay_state = "startup"
+ if(41 to 60)
+ overlay_state = "idle"
+ if(61 to 80)
+ overlay_state = "activating"
+ if(81 to 100)
+ overlay_state = "activated"
+
+ if(overlay_state != current_overlay)
+ if(middle)
+ middle.cut_overlays()
+ if(overlay_state)
+ middle.add_overlay(overlay_state)
+ current_overlay = overlay_state
/obj/machinery/gravity_generator/main/proc/pulse_radiation()
- for(var/mob/living/L in view(7, src))
- L.apply_effect(20, IRRADIATE)
+ radiation_pulse(src, 200)
-// Shake everyone on the z level to let them know that gravity was enagaged/disenagaged.
+/**
+ * Shake everyone on the z level and play an alarm to let them know that gravity was enagaged/disenagaged.
+ */
/obj/machinery/gravity_generator/main/proc/shake_everyone()
var/turf/our_turf = get_turf(src)
var/sound/alert_sound = sound('sound/effects/alert.ogg')
- for(var/shaked in GLOB.mob_list)
- var/mob/M = shaked
+ for(var/shaken in GLOB.mob_list)
+ var/mob/M = shaken
var/turf/their_turf = get_turf(M)
- if(their_turf && their_turf.z == our_turf.z)
+ if(their_turf?.z == our_turf.z)
M.update_gravity(M.mob_has_gravity())
if(M.client)
shake_camera(M, 15, 1)
- M.playsound_local(our_turf, null, 100, 1, 0.5, S = alert_sound)
+ M.playsound_local(our_turf, null, 100, TRUE, 0.5, S = alert_sound)
// TODO: Make the gravity generator cooperate with the space manager
-/obj/machinery/gravity_generator/main/proc/gravity_in_level()
+/obj/machinery/gravity_generator/main/proc/generators_in_level()
var/turf/T = get_turf(src)
if(!T)
- return 0
+ return FALSE
if(GLOB.gravity_generators["[T.z]"])
return length(GLOB.gravity_generators["[T.z]"])
- return 0
+ return FALSE
-/obj/machinery/gravity_generator/main/proc/update_list()
- var/turf/T = get_turf(src.loc)
+/obj/machinery/gravity_generator/main/proc/update_gen_list()
+ var/turf/T = get_turf(src)
if(T)
if(!GLOB.gravity_generators["[T.z]"])
GLOB.gravity_generators["[T.z]"] = list()
@@ -405,8 +427,8 @@ GLOBAL_LIST_EMPTY(gravity_generators) // We will keep track of this by adding ne
// Misc
/obj/item/paper/gravity_gen
- name = "paper- 'Generate your own gravity!'"
- info = {"
Gravity Generator Instructions For Dummies
+ name = "paper - 'Generate your own gravity!'"
+ info = {"
Generating Gravity For Dummies
Surprisingly, gravity isn't that hard to make! All you have to do is inject deadly radioactive minerals into a ball of
energy and you have yourself gravity! You can turn the machine on or off when required but you must remember that the generator
will EMIT RADIATION when charging or discharging, you can tell it is charging or discharging by the noise it makes, so please WEAR PROTECTIVE CLOTHING.
@@ -414,7 +436,16 @@ GLOBAL_LIST_EMPTY(gravity_generators) // We will keep track of this by adding ne
It blew up!
Don't panic! The gravity generator was designed to be easily repaired. If, somehow, the sturdy framework did not survive then
please proceed to panic; otherwise follow these steps.
-
Secure the screws of the framework with a screwdriver.
Mend the damaged framework with a welding tool.
Add additional plasteel plating.
-
Secure the additional plating with a wrench.
"}
+
Secure the additional plating with a wrench.
+
Secure the cover screws with a screwdriver.
"}
+
+#undef GRAV_POWER_IDLE
+#undef GRAV_POWER_UP
+#undef GRAV_POWER_DOWN
+
+#undef GRAV_NEEDS_WELDING
+#undef GRAV_NEEDS_PLASTEEL
+#undef GRAV_NEEDS_WRENCH
+#undef GRAV_NEEDS_SCREWDRIVER
diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm
index d6089a421d0..fb669390c6c 100644
--- a/code/modules/power/lighting.dm
+++ b/code/modules/power/lighting.dm
@@ -652,10 +652,13 @@
on = 1
update()
-/obj/machinery/light/tesla_act(power, explosive = FALSE)
+/obj/machinery/light/zap_act(power, zap_flags)
+ var/explosive = zap_flags & ZAP_MACHINE_EXPLOSIVE
+ zap_flags &= ~(ZAP_MACHINE_EXPLOSIVE | ZAP_OBJ_DAMAGE)
+ . = ..()
if(explosive)
- explosion(loc,0,0,0,flame_range = 5, adminlog = 0)
- qdel(src)
+ explosion(src, 0, 0, 0, flame_range = 5, adminlog = FALSE)
+ qdel(src)
// timed process
// use power
diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm
index 08af8a3df17..067589f959d 100644
--- a/code/modules/power/port_gen.dm
+++ b/code/modules/power/port_gen.dm
@@ -401,19 +401,13 @@
/obj/machinery/power/port_gen/pacman/super/UseFuel()
//produces a tiny amount of radiation when in use
- if(prob(2*power_output))
- for(var/mob/living/L in range(src, 5))
- L.apply_effect(1, IRRADIATE) //should amount to ~5 rads per minute at max safe power
+ if(prob(2 * power_output))
+ radiation_pulse(get_turf(src), 50)
..()
/obj/machinery/power/port_gen/pacman/super/explode()
//a nice burst of radiation
- var/rads = 50 + (sheets + sheet_left)*1.5
- for(var/mob/living/L in range(src, 10))
- //should really fall with the square of the distance, but that makes the rads value drop too fast
- //I dunno, maybe physics works different when you live in 2D -- SM radiation also works like this, apparently
- L.apply_effect(max(20, round(rads/get_dist(L,src))), IRRADIATE)
-
+ radiation_pulse(get_turf(src), 500, 2)
explosion(src.loc, 3, 3, 5, 3)
qdel(src)
diff --git a/code/modules/power/singularity/collector.dm b/code/modules/power/singularity/collector.dm
index e6a933c4458..9af7029d3d4 100644
--- a/code/modules/power/singularity/collector.dm
+++ b/code/modules/power/singularity/collector.dm
@@ -1,21 +1,28 @@
+// stored_energy += (pulse_strength - RAD_COLLECTOR_EFFICIENCY) * RAD_COLLECTOR_COEFFICIENT
+#define RAD_COLLECTOR_EFFICIENCY 80 // radiation needs to be over this amount to get power
+#define RAD_COLLECTOR_COEFFICIENT 100
+#define RAD_COLLECTOR_STORED_OUT 0.04 // (this * 100)% of stored power outputted per tick. Doesn't actualy change output total, lower numbers just means collectors output for longer in absence of a source
+#define RAD_COLLECTOR_OUTPUT min(stored_energy, (stored_energy * RAD_COLLECTOR_STORED_OUT) + 1000) //Produces at least 1000 watts if it has more than that stored
+
GLOBAL_LIST_EMPTY(rad_collectors)
/obj/machinery/power/rad_collector
- name = "Radiation Collector Array"
+ name = "\improper radiation collector array"
desc = "A device which uses Hawking Radiation and plasma to produce power."
icon = 'icons/obj/singularity.dmi'
icon_state = "ca"
- anchored = 0
- density = 1
+ anchored = FALSE
+ density = TRUE
req_access = list(ACCESS_ENGINE_EQUIP)
-// use_power = NO_POWER_USE
max_integrity = 350
integrity_failure = 80
- var/obj/item/tank/plasma/P = null
- var/last_power = 0
- var/active = 0
- var/locked = 0
+ rad_insulation = RAD_EXTREME_INSULATION
+ var/obj/item/tank/internals/plasma/loaded_tank = null
+ var/stored_energy = 0
+ var/active = FALSE
+ var/locked = FALSE
var/drainratio = 1
+ var/powerproduction_drain = 0.001
/obj/machinery/power/rad_collector/Initialize(mapload)
. = ..()
@@ -26,114 +33,118 @@ GLOBAL_LIST_EMPTY(rad_collectors)
return ..()
/obj/machinery/power/rad_collector/process()
- if(P)
- if(P.air_contents.toxins <= 0)
- investigate_log("out of fuel.","singulo")
- P.air_contents.toxins = 0
- eject()
- else
- P.air_contents.toxins -= 0.001*drainratio
- return
+ if(!loaded_tank)
+ return
+ if(!loaded_tank.air_contents.toxins)
+ investigate_log("out of fuel.", "singulo")
+ playsound(src, 'sound/machines/ding.ogg', 50, TRUE)
+ eject()
+ else
+ var/gasdrained = min(powerproduction_drain * drainratio, loaded_tank.air_contents.toxins)
+ loaded_tank.air_contents.toxins -= gasdrained
+
+ var/power_produced = RAD_COLLECTOR_OUTPUT
+ add_avail(power_produced)
+ stored_energy -= power_produced
-/obj/machinery/power/rad_collector/attack_hand(mob/user as mob)
+/obj/machinery/power/rad_collector/attack_hand(mob/user)
if(anchored)
- if(!src.locked)
+ if(!locked)
toggle_power()
- user.visible_message("[user.name] turns the [src.name] [active? "on":"off"].", \
- "You turn the [src.name] [active? "on":"off"].")
- investigate_log("turned [active?"on":"off"] by [user.key]. [P?"Fuel: [round(P.air_contents.toxins/0.29)]%":"It is empty"].","singulo")
- return
+ user.visible_message("[user.name] turns the [name] [active ? "on" : "off"].", "You turn the [name] [active ? "on" : "off"].")
+ investigate_log("turned [active ? "on" : "off"] by [user.key]. [loaded_tank ? "Fuel: [round(loaded_tank.air_contents.toxins / 0.29)]%" : "It is empty"].", "singulo")
else
to_chat(user, "The controls are locked!")
- return
-/obj/machinery/power/rad_collector/attackby(obj/item/W, mob/user, params)
- if(istype(W, /obj/item/multitool))
- to_chat(user, "The [W.name] detects that [last_power]W were recently produced.")
- return 1
- else if(istype(W, /obj/item/analyzer) && P)
- atmosanalyzer_scan(P.air_contents, user)
- else if(istype(W, /obj/item/tank/plasma))
- if(!src.anchored)
- to_chat(user, "The [src] needs to be secured to the floor first.")
- return 1
- if(src.P)
+/obj/machinery/power/rad_collector/attackby(obj/item/I, mob/user, params)
+ if(istype(I, /obj/item/analyzer) && loaded_tank)
+ atmosanalyzer_scan(loaded_tank.air_contents, user)
+ else if(istype(I, /obj/item/tank/internals/plasma))
+ if(!anchored)
+ to_chat(user, "[src] needs to be secured to the floor first.")
+ return TRUE
+ if(loaded_tank)
to_chat(user, "There's already a plasma tank loaded.")
- return 1
- user.drop_item()
- src.P = W
- W.loc = src
- update_icons()
- else if(istype(W, /obj/item/crowbar))
- if(P && !src.locked)
+ return TRUE
+ if(user.drop_item())
+ loaded_tank = I
+ I.forceMove(src)
+ update_icons()
+ else if(iscrowbar(I))
+ if(loaded_tank && !locked)
eject()
- return 1
- else if(istype(W, /obj/item/wrench))
- if(P)
+ return TRUE
+ else if(iswrench(I))
+ if(loaded_tank)
to_chat(user, "Remove the plasma tank first.")
- return 1
- playsound(src.loc, W.usesound, 75, 1)
- src.anchored = !src.anchored
- user.visible_message("[user.name] [anchored? "secures":"unsecures"] the [src.name].", \
- "You [anchored? "secure":"undo"] the external bolts.", \
- "You hear a ratchet")
+ return TRUE
+ playsound(loc, I.usesound, 75, TRUE)
+ anchored = !anchored
+ user.visible_message("[user.name] [anchored ? "secures" : "unsecures"] the [name].", "You [anchored ? "secure" : "undo"] the external bolts.", "You hear a ratchet")
if(anchored)
connect_to_network()
else
disconnect_from_network()
- else if(istype(W, /obj/item/card/id)||istype(W, /obj/item/pda))
- if(src.allowed(user))
+ else if(istype(I, /obj/item/card/id) || istype(I, /obj/item/pda))
+ if(allowed(user))
if(active)
- src.locked = !src.locked
- to_chat(user, "The controls are now [src.locked ? "locked." : "unlocked."]")
+ locked = !locked
+ to_chat(user, "The controls are now [locked ? "locked." : "unlocked."]")
else
- src.locked = 0 //just in case it somehow gets locked
- to_chat(user, "The controls can only be locked when the [src] is active")
+ locked = FALSE //just in case it somehow gets locked
+ to_chat(user, "The controls can only be locked when [src] is active")
else
to_chat(user, "Access denied!")
- return 1
+ return TRUE
else
return ..()
+/obj/machinery/power/rad_collector/examine(mob/user)
+ . = ..()
+ if(active)
+ // stored_energy is converted directly to watts every SSmachines.wait * 0.1 seconds.
+ // Therefore, its units are joules per SSmachines.wait * 0.1 seconds.
+ // So joules = stored_energy * SSmachines.wait * 0.1
+ var/joules = stored_energy * SSmachines.wait * 0.1
+ . += "[src]'s display states that it has stored [DisplayJoules(joules)], and is processing [DisplayPower(RAD_COLLECTOR_OUTPUT)]."
+ else
+ . += "[src]'s display displays the words: \"Power production mode. Please insert Plasma.\""
+
/obj/machinery/power/rad_collector/obj_break(damage_flag)
if(!(stat & BROKEN) && !(flags & NODECONSTRUCT))
eject()
stat |= BROKEN
/obj/machinery/power/rad_collector/proc/eject()
- locked = 0
- var/obj/item/tank/plasma/Z = src.P
+ locked = FALSE
+ var/obj/item/tank/internals/plasma/Z = loaded_tank
if(!Z)
return
- Z.loc = get_turf(src)
+ Z.forceMove(drop_location())
Z.layer = initial(Z.layer)
Z.plane = initial(Z.plane)
- src.P = null
+ loaded_tank = null
if(active)
toggle_power()
else
update_icons()
-/obj/machinery/power/rad_collector/proc/receive_pulse(var/pulse_strength)
- if(P && active)
- var/power_produced = 0
- power_produced = P.air_contents.toxins*pulse_strength*20
- add_avail(power_produced)
- last_power = power_produced
- return
- return
+/obj/machinery/power/rad_collector/rad_act(amount)
+ . = ..()
+ if(loaded_tank && active && amount > RAD_COLLECTOR_EFFICIENCY)
+ stored_energy += (amount - RAD_COLLECTOR_EFFICIENCY) * RAD_COLLECTOR_COEFFICIENT
/obj/machinery/power/rad_collector/proc/update_icons()
- overlays.Cut()
- if(P)
- overlays += image('icons/obj/singularity.dmi', "ptank")
+ cut_overlays()
+ if(loaded_tank)
+ add_overlay("ptank")
if(stat & (NOPOWER|BROKEN))
return
if(active)
- overlays += image('icons/obj/singularity.dmi', "on")
+ add_overlay("on")
/obj/machinery/power/rad_collector/proc/toggle_power()
@@ -145,4 +156,8 @@ GLOBAL_LIST_EMPTY(rad_collectors)
icon_state = "ca"
flick("ca_deactive", src)
update_icons()
- return
+
+#undef RAD_COLLECTOR_EFFICIENCY
+#undef RAD_COLLECTOR_COEFFICIENT
+#undef RAD_COLLECTOR_STORED_OUT
+#undef RAD_COLLECTOR_OUTPUT
diff --git a/code/modules/power/singularity/narsie.dm b/code/modules/power/singularity/narsie.dm
index 257d98fffc1..4eea225caea 100644
--- a/code/modules/power/singularity/narsie.dm
+++ b/code/modules/power/singularity/narsie.dm
@@ -5,7 +5,6 @@
pixel_x = -89
pixel_y = -85
current_size = 9 //It moves/eats like a max-size singulo, aside from range. --NEO
- contained = FALSE
dissipate = FALSE
move_self = TRUE
grav_pull = 5
@@ -26,8 +25,8 @@
grav_pull = 10
consume_range = 12 //How many tiles out do we eat
-/obj/singularity/narsie/large/New()
- ..()
+/obj/singularity/narsie/large/Initialize(mapload, starting_energy)
+ . = ..()
icon_state = SSticker.cultdat?.entity_icon_state
name = SSticker.cultdat?.entity_name
to_chat(world, " [uppertext(name)] HAS RISEN")
@@ -42,9 +41,10 @@
var/image/alert_overlay = image('icons/effects/cult_effects.dmi', "ghostalertsie")
notify_ghosts("[name] 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()
+ INVOKE_ASYNC(src, .proc/narsie_spawn_animation)
+ addtimer(CALLBACK(src, .proc/call_shuttle), 7 SECONDS)
- sleep(7 SECONDS)
+/obj/singularity/narsie/large/proc/call_shuttle()
SSshuttle.emergency.request(null, 0.3)
SSshuttle.emergency.canRecall = FALSE // Cannot recall
diff --git a/code/modules/power/singularity/particle_accelerator/particle.dm b/code/modules/power/singularity/particle_accelerator/particle.dm
index 93eb3fa18c6..621bc34964a 100644
--- a/code/modules/power/singularity/particle_accelerator/particle.dm
+++ b/code/modules/power/singularity/particle_accelerator/particle.dm
@@ -31,7 +31,7 @@
/obj/effect/accelerated_particle/proc/try_irradiate(src, atom/A)
if(isliving(A))
var/mob/living/L = A
- L.apply_effect((energy * 6), IRRADIATE, 0)
+ L.rad_act(energy * 6)
else if(istype(A, /obj/machinery/the_singularitygen))
var/obj/machinery/the_singularitygen/S = A
S.energy += energy
diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm
index d5e511af009..26ad13014a1 100644
--- a/code/modules/power/singularity/singularity.dm
+++ b/code/modules/power/singularity/singularity.dm
@@ -3,20 +3,19 @@
desc = "A gravitational singularity."
icon = 'icons/obj/singularity.dmi'
icon_state = "singularity_s1"
- anchored = 1
- density = 1
+ anchored = TRUE
+ density = TRUE
layer = MASSIVE_OBJ_LAYER
light_range = 6
- appearance_flags = 0
+ appearance_flags = LONG_GLIDE
var/current_size = 1
var/allowed_size = 1
- var/contained = 1 //Are we going to move around?
var/energy = 100 //How strong are we?
var/dissipate = 1 //Do we lose energy over time?
var/dissipate_delay = 10
var/dissipate_track = 0
var/dissipate_strength = 1 //How much energy do we lose?
- var/move_self = 1 //Do we move on our own?
+ var/move_self = TRUE //Do we move on our own?
var/grav_pull = 4 //How many tiles out do we pull?
move_resist = INFINITY //no, you don't get to push the singulo. Not even you OP wizard gateway statues
var/consume_range = 0 //How many tiles out do we eat
@@ -28,12 +27,13 @@
allow_spin = 0
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF | FREEZE_PROOF
-/obj/singularity/New(loc, var/starting_energy = 50, var/temp = 0)
+/obj/singularity/Initialize(mapload, starting_energy = 50)
+ . = ..()
//CARN: admin-alert for chuckle-fuckery.
admin_investigate_setup()
- src.energy = starting_energy
- ..()
+ energy = starting_energy
+
START_PROCESSING(SSobj, src)
GLOB.poi_list |= src
GLOB.singularities += src
@@ -116,7 +116,7 @@
// it might mean we are stuck in a corner somewere. So move around to try to expand.
move()
if(current_size >= STAGE_TWO)
- pulse()
+ radiation_pulse(src, min(5000, (energy * 4.5) + 1000), RAD_DISTANCE_COEFFICIENT * 0.5)
if(prob(event_chance))//Chance for it to run a special event TODO:Come up with one or two more that fit
event()
eat()
@@ -275,7 +275,7 @@
/obj/singularity/proc/consume(atom/A)
var/gain = A.singularity_act(current_size)
src.energy += gain
- if(istype(A, /obj/machinery/power/supermatter_shard) && !consumedSupermatter)
+ if(istype(A, /obj/machinery/power/supermatter_crystal) && !consumedSupermatter)
desc = "[initial(desc)] It glows fiercely with inner fire."
name = "supermatter-charged [initial(name)]"
consumedSupermatter = 1
@@ -377,15 +377,13 @@
/obj/singularity/proc/event()
- var/numb = pick(1,2,3,4,5,6)
+ var/numb = rand(1, 4)
switch(numb)
- if(1)//EMP
+ if(1) //EMP
emp_area()
- if(2,3)//tox damage all carbon mobs in area
- toxmob()
- if(4)//Stun mobs who lack optic scanners
+ if(2) //Stun mobs who lack optic scanners
mezzer()
- if(5,6) //Sets all nearby mobs on fire
+ if(3, 4) //Sets all nearby mobs on fire
if(current_size < STAGE_SIX)
return 0
combust_mobs()
@@ -394,17 +392,6 @@
return 1
-/obj/singularity/proc/toxmob()
- var/toxrange = 10
- var/radiation = 15
- var/radiationmin = 3
- if(energy>200)
- radiation += round((energy-150)/10,1)
- radiationmin = round((radiation/5),1)
- for(var/mob/living/M in view(toxrange, src.loc))
- M.apply_effect(rand(radiationmin,radiation), IRRADIATE)
-
-
/obj/singularity/proc/combust_mobs()
for(var/mob/living/carbon/C in urange(20, src, 1))
C.visible_message("[C]'s skin bursts into flame!", \
@@ -438,12 +425,6 @@
empulse(src, 8, 10)
return
-
-/obj/singularity/proc/pulse()
- for(var/obj/machinery/power/rad_collector/R in GLOB.rad_collectors)
- if(R.z == z && get_dist(R, src) <= 15) // Better than using orange() every process
- R.receive_pulse(energy)
-
/obj/singularity/singularity_act()
var/gain = (energy/2)
var/dist = max((current_size - 2),1)
diff --git a/code/modules/power/supermatter/sm_shard.dm b/code/modules/power/supermatter/sm_shard.dm
deleted file mode 100644
index b9e4a2435e6..00000000000
--- a/code/modules/power/supermatter/sm_shard.dm
+++ /dev/null
@@ -1,104 +0,0 @@
-
-/obj/item/shard/supermatter
- name = "supermatter shard"
- desc = "A shard of supermatter. Incredibly dangerous, though not large enough to go critical."
- force = 10.0
- throwforce = 20.0
- icon_state = "supermatter"
- sharp = 1
- edge = 1
- w_class = WEIGHT_CLASS_SMALL
- flags = CONDUCT
- light_color = "#8A8A00"
- var/brightness = 2
-
-/obj/item/shard/supermatter/New()
- ..()
- src.icon_state = "supermatter" + pick("large", "medium", "small")
- switch(src.icon_state)
- if("supermattersmall")
- src.pixel_x = rand(-12, 12)
- src.pixel_y = rand(-12, 12)
- if("supermattermedium")
- src.pixel_x = rand(-8, 8)
- src.pixel_y = rand(-8, 8)
- if("supermatterlarge")
- src.pixel_x = rand(-5, 5)
- src.pixel_y = rand(-5, 5)
- else
-
- set_light(brightness)
-
-/obj/item/shard/supermatter/attackby(obj/item/W as obj, mob/user as mob)
- if( istype( W, /obj/item/tongs ))
- var/obj/item/tongs/T = W
- T.pick_up( src )
- T.icon_state = "tongs_supermatter"
- return
-
- ..()
-
-/obj/item/shard/supermatter/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
- playsound(loc, 'sound/weapons/bladeslice.ogg', 50, 1, -1)
- return ..()
-
-/obj/item/shard/supermatter/Crossed(AM as mob|obj, oldloc)
- if(ismob(AM))
- var/mob/M = AM
- to_chat(M, "You step on \the [src]!")
- playsound(src.loc, 'sound/effects/glass_step_sm.ogg', 70, 1) // not sure how to handle metal shards with sounds
- if(ishuman(M))
- var/mob/living/carbon/human/H = M
-
- if(H.species.flags & IS_SYNTHETIC) //Thick skin.
- return
-
- if( !H.shoes && ( !H.wear_suit || !(H.wear_suit.body_parts_covered & FEET) ) )
- var/obj/item/organ/external/affecting = H.get_organ(pick("l_foot", "r_foot"))
- if(affecting.status & ORGAN_ROBOT)
- return
- if(affecting.receive_damage(5, 20))
- H.UpdateDamageIcon()
- H.updatehealth()
- if(!(H.species && (H.species.flags & NO_PAIN)))
- H.Weaken(3)
- ..()
-
-
-/obj/item/shard/supermatter/attack_hand(var/mob/user)
- if(!istype(user,/mob/living/carbon/human/nucleation))
- to_chat(user, pick( "You think twice before touching that without protection.",)
- "You don't want to touch that without some protection.",
- "You probably should get something else to pick that up.",
- "You aren't sure that's a good idea.",
- "You aren't in the mood to get vaporized today.",
- "You really don't feel like frying your hand off.",
- "You assume that's a bad idea." )
- return
-
- ..()
-
-/obj/item/tongs
- name = "tongs"
- desc = "Tungsten-alloy tongs used for handling dangerous materials."
- force = 7.0
- throwforce = 12.0
- icon = 'icons/obj/weapons.dmi'
- icon_state = "tongs"
- edge = 1
- w_class = WEIGHT_CLASS_SMALL
- flags = CONDUCT
- var/obj/item/held = null // The item currently being held
-
-/obj/item/tongs/proc/pick_up( var/obj/item/I )
- held = I
- I.loc = src
- playsound(loc, 'sound/effects/tong_pickup.ogg', 50, 1, -1)
-
-/obj/item/tongs/attack_self(var/mob/user as mob)
- if( held )
- var/turf/T = get_turf(user.loc)
- held.loc = T
- held = null
- icon_state = initial(icon_state)
- ..()
diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm
index 84f32308964..116faf9e883 100644
--- a/code/modules/power/supermatter/supermatter.dm
+++ b/code/modules/power/supermatter/supermatter.dm
@@ -1,395 +1,230 @@
-#define NITROGEN_RETARDATION_FACTOR 0.15 //Higher == N2 slows reaction more
-#define THERMAL_RELEASE_MODIFIER 10000 //Higher == more heat released during reaction
-#define PLASMA_RELEASE_MODIFIER 1500 //Higher == less phor.. plasma released by reaction
-#define OXYGEN_RELEASE_MODIFIER 15000 //Higher == less oxygen released at high temperature/power
-#define REACTION_POWER_MODIFIER 1.1 //Higher == more overall power
+//Ported from /vg/station13, which was in turn forked from baystation12;
+//Please do not bother them with bugs from this port, however, as it has been modified quite a bit.
+//Modifications include removing the world-ending full supermatter variation, and leaving only the shard.
-/*
- How to tweak the SM
- POWER_FACTOR directly controls how much power the SM puts out at a given level of excitation (power var). Making this lower means you have to work the SM harder to get the same amount of power.
- CRITICAL_TEMPERATURE The temperature at which the SM starts taking damage.
- CHARGING_FACTOR Controls how much emitter shots excite the SM.
- DAMAGE_RATE_LIMIT Controls the maximum rate at which the SM will take damage due to high temperatures.
-*/
+//Zap constants, speeds up targeting
-//Controls how much power is produced by each collector in range - this is the main parameter for tweaking SM balance, as it basically controls how the power variable relates to the rest of the game.
-#define POWER_FACTOR 1.0
-#define DECAY_FACTOR 700 //Affects how fast the supermatter power decays
-#define CRITICAL_TEMPERATURE 10000 //K
-#define CHARGING_FACTOR 0.05
-#define DAMAGE_RATE_LIMIT 4.5 //damage rate cap at power = 300, scales linearly with power
+#define COIL (ROD + 1)
+#define ROD (LIVING + 1)
+#define LIVING (MACHINERY + 1)
+#define MACHINERY (OBJECT + 1)
+#define OBJECT (LOWEST + 1)
+#define LOWEST (1)
+
+#define PLASMA_HEAT_PENALTY 15 // Higher == Bigger heat and waste penalty from having the crystal surrounded by this gas. Negative numbers reduce penalty.
+#define OXYGEN_HEAT_PENALTY 1
+#define CO2_HEAT_PENALTY 0.1
+#define NITROGEN_HEAT_PENALTY -1.5
+
+#define OXYGEN_TRANSMIT_MODIFIER 1.5 //Higher == Bigger bonus to power generation.
+#define PLASMA_TRANSMIT_MODIFIER 4
+
+#define N2O_HEAT_RESISTANCE 6 //Higher == Gas makes the crystal more resistant against heat damage.
+
+#define POWERLOSS_INHIBITION_GAS_THRESHOLD 0.20 //Higher == Higher percentage of inhibitor gas needed before the charge inertia chain reaction effect starts.
+#define POWERLOSS_INHIBITION_MOLE_THRESHOLD 20 //Higher == More moles of the gas are needed before the charge inertia chain reaction effect starts. //Scales powerloss inhibition down until this amount of moles is reached
+#define POWERLOSS_INHIBITION_MOLE_BOOST_THRESHOLD 500 //bonus powerloss inhibition boost if this amount of moles is reached
+
+#define MOLE_PENALTY_THRESHOLD 1800 //Above this value we can get lord singulo and independent mol damage, below it we can heal damage
+#define MOLE_HEAT_PENALTY 350 //Heat damage scales around this. Too hot setups with this amount of moles do regular damage, anything above and below is scaled
+//Along with damage_penalty_point, makes flux anomalies.
+/// The cutoff for the minimum amount of power required to trigger the crystal invasion delamination event.
+#define EVENT_POWER_PENALTY_THRESHOLD 4500
+#define POWER_PENALTY_THRESHOLD 5000 //The cutoff on power properly doing damage, pulling shit around, and delamming into a tesla. Low chance of pyro anomalies, +2 bolts of electricity
+#define SEVERE_POWER_PENALTY_THRESHOLD 7000 //+1 bolt of electricity, allows for gravitational anomalies, and higher chances of pyro anomalies
+#define CRITICAL_POWER_PENALTY_THRESHOLD 9000 //+1 bolt of electricity.
+#define HEAT_PENALTY_THRESHOLD 40 //Higher == Crystal safe operational temperature is higher.
+#define DAMAGE_HARDCAP 0.002
+#define DAMAGE_INCREASE_MULTIPLIER 0.25
-// Base variants are applied to everyone on the same Z level
-// Range variants are applied on per-range basis: numbers here are on point blank, it scales with the map size (assumes square shaped Z levels)
+#define THERMAL_RELEASE_MODIFIER 5 //Higher == less heat released during reaction, not to be confused with the above values
+#define PLASMA_RELEASE_MODIFIER 750 //Higher == less plasma released by reaction
+#define OXYGEN_RELEASE_MODIFIER 325 //Higher == less oxygen released at high temperature/power
+
+#define REACTION_POWER_MODIFIER 0.55 //Higher == more overall power
+
+#define MATTER_POWER_CONVERSION 10 //Crystal converts 1/this value of stored matter into energy.
+
+//These would be what you would get at point blank, decreases with distance
#define DETONATION_RADS 200
#define DETONATION_HALLUCINATION 600
+#define WARNING_DELAY 60
-#define WARNING_DELAY 20 //seconds between warnings.
-/obj/machinery/power/supermatter_shard
- name = "supermatter shard"
- desc = "A strangely translucent and iridescent crystal that looks like it used to be part of a larger structure. You get headaches just from looking at it."
- icon = 'icons/obj/supermatter.dmi'
- icon_state = "darkmatter_shard"
- density = 1
- anchored = 0
- light_range = 4
- resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF | FREEZE_PROOF
+#define HALLUCINATION_RANGE(P) (min(7, round(P ** 0.25)))
- var/gasefficency = 0.125
+#define GRAVITATIONAL_ANOMALY "gravitational_anomaly"
+#define FLUX_ANOMALY "flux_anomaly"
+#define PYRO_ANOMALY "pyro_anomaly"
- var/base_icon_state = "darkmatter_shard"
+//If integrity percent remaining is less than these values, the monitor sets off the relevant alarm.
+#define SUPERMATTER_DELAM_PERCENT 5
+#define SUPERMATTER_EMERGENCY_PERCENT 25
+#define SUPERMATTER_DANGER_PERCENT 50
+#define SUPERMATTER_WARNING_PERCENT 100
+#define CRITICAL_TEMPERATURE 10000
- var/damage = 0
- var/damage_archived = 0
- var/safe_alert = "Crystalline hyperstructure returning to safe operating levels."
- var/warning_point = 50
- var/warning_alert = "Danger! Crystal hyperstructure instability!"
- var/emergency_point = 400
- var/emergency_alert = "CRYSTAL DELAMINATION IMMINENT."
- var/explosion_point = 600
+#define SUPERMATTER_COUNTDOWN_TIME 30 SECONDS
- var/emergency_issued = 0
+///to prevent accent sounds from layering
+#define SUPERMATTER_ACCENT_SOUND_MIN_COOLDOWN 2 SECONDS
- var/explosion_power = 8
+#define DEFAULT_ZAP_ICON_STATE "sm_arc"
+#define SLIGHTLY_CHARGED_ZAP_ICON_STATE "sm_arc_supercharged"
+#define OVER_9000_ZAP_ICON_STATE "sm_arc_dbz_referance" //Witty I know
- var/lastwarning = 0 // Time in 1/10th of seconds since the last sent warning
- var/last_zap = 0 // Time in 1/10th of seconds since the last tesla zap
- var/power = 0
+#define MAX_SPACE_EXPOSURE_DAMAGE 2
- var/oxygen = 0 // Moving this up here for easier debugging.
-
- //Temporary values so that we can optimize this
- //How much the bullets damage should be multiplied by when it is added to the internal variables
- var/config_bullet_energy = 2
- //How much hallucination should it produce per unit of power?
- var/config_hallucination_power = 0.1
-
- var/debug = 0
-
- var/disable_adminwarn = FALSE
-
- var/aw_normal = FALSE
- var/aw_notify = FALSE
- var/aw_warning = FALSE
- var/aw_danger = FALSE
- var/aw_emerg = FALSE
- var/aw_delam = FALSE
-
- var/obj/item/radio/radio
-
- //for logging
- var/has_been_powered = 0
- var/has_reached_emergency = 0
-
-/obj/machinery/power/supermatter_shard/crystal
+/obj/machinery/power/supermatter_crystal
name = "supermatter crystal"
desc = "A strangely translucent and iridescent crystal."
- base_icon_state = "darkmatter"
+ icon = 'icons/obj/supermatter.dmi'
icon_state = "darkmatter"
+ density = TRUE
anchored = TRUE
- warning_point = 200
- emergency_point = 2000
- explosion_point = 3600
- gasefficency = 0.25
- explosion_power = 24
+ flags_2 = RAD_PROTECT_CONTENTS_2 | RAD_NO_CONTAMINATE_2
+ light_range = 4
+ resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF | FREEZE_PROOF
+ var/base_icon_state = "darkmatter"
+ ///The id of our supermatter
+ var/supermatter_id = 1
+ ///The amount of supermatters that have been created this round
+ var/static/global_supermatter_id = 1
+ ///Tracks the bolt color we are using
+ var/zap_icon = DEFAULT_ZAP_ICON_STATE
+ ///The portion of the gasmix we're on that we should remove
+ var/gasefficency = 0.15
-/obj/machinery/power/supermatter_shard/New()
+ ///Are we exploding?
+ var/final_countdown = FALSE
+
+ ///The amount of damage we have currently
+ var/damage = 0
+ ///The damage we had before this cycle. Used to limit the damage we can take each cycle, and for safe_alert
+ var/damage_archived = 0
+ ///Our "Shit is no longer fucked" message. We send it when damage is less then damage_archived
+ var/safe_alert = "Crystalline hyperstructure returning to safe operating parameters."
+ ///The point at which we should start sending messeges about the damage to the engi channels.
+ var/warning_point = 50
+ ///The alert we send when we've reached warning_point
+ var/warning_alert = "Danger! Crystal hyperstructure integrity faltering!"
+ ///The point at which we start sending messages to the common channel
+ var/emergency_point = 700
+ ///The alert we send when we've reached emergency_point
+ var/emergency_alert = "CRYSTAL DELAMINATION IMMINENT."
+ ///The point at which we delam
+ var/explosion_point = 900
+ ///When we pass this amount of damage we start shooting bolts
+ var/damage_penalty_point = 550
+
+ ///A scaling value that affects the severity of explosions.
+ var/explosion_power = 35
+ ///Time in 1/10th of seconds since the last sent warning
+ var/lastwarning = 0
+ ///Refered to as eer on the moniter. This value effects gas output, heat, damage, and radiation.
+ var/power = 0
+ ///Determines the rate of positve change in gas comp values
+ var/gas_change_rate = 0.05
+
+ var/n2comp = 0 // raw composition of each gas in the chamber, ranges from 0 to 1
+ var/plasmacomp = 0
+ var/o2comp = 0
+ var/co2comp = 0
+ var/n2ocomp = 0
+
+ ///The last air sample's total molar count, will always be above or equal to 0
+ var/combined_gas = 0
+ ///Affects the power gain the sm experiances from heat
+ var/gasmix_power_ratio = 0
+ ///Affects the amount of o2 and plasma the sm outputs, along with the heat it makes.
+ var/dynamic_heat_modifier = 1
+ ///Affects the amount of damage and minimum point at which the sm takes heat damage
+ var/dynamic_heat_resistance = 1
+ ///Uses powerloss_dynamic_scaling and combined_gas to lessen the effects of our powerloss functions
+ var/powerloss_inhibitor = 1
+ ///Based on co2 percentage, slowly moves between 0 and 1. We use it to calc the powerloss_inhibitor
+ var/powerloss_dynamic_scaling= 0
+ ///Affects the amount of radiation the sm makes. We multiply this with power to find the rads.
+ var/power_transmission_bonus = 0
+ ///Used to increase or lessen the amount of damage the sm takes from heat based on molar counts.
+ var/mole_heat_penalty = 0
+ ///Takes the energy throwing things into the sm generates and slowly turns it into actual power
+ var/matter_power = 0
+ ///The cutoff for a bolt jumping, grows with heat, lowers with higher mol count,
+ var/zap_cutoff = 1500
+ ///How much the bullets damage should be multiplied by when it is added to the internal variables
+ var/bullet_energy = 2
+ ///How much hallucination should we produce per unit of power?
+ var/hallucination_power = 0.1
+
+ ///Our internal radio
+ var/obj/item/radio/radio
+
+ ///Boolean used for logging if we've been powered
+ var/has_been_powered = FALSE
+ ///Boolean used for logging if we've passed the emergency point
+ var/has_reached_emergency = FALSE
+
+ ///An effect we show to admins and ghosts the percentage of delam we're at
+ var/obj/effect/countdown/supermatter/countdown
+
+ ///Used to track if we can give out the sm sliver stealing objective
+ var/is_main_engine = FALSE
+ ///Our soundloop
+ var/datum/looping_sound/supermatter/soundloop
+ ///Can it be moved?
+ var/moveable = FALSE
+
+ ///cooldown tracker for accent sounds
+ var/last_accent_sound = 0
+
+ //For making hugbox supermatters
+ ///Disables all methods of taking damage
+ var/takes_damage = TRUE
+ ///Disables the production of gas, and pretty much any handling of it we do.
+ var/produces_gas = TRUE
+ ///Disables power changes
+ var/power_changes = TRUE
+ ///Disables the sm's proccessing totally.
+ var/processes = TRUE
+
+/obj/machinery/power/supermatter_crystal/Initialize(mapload)
. = ..()
- GLOB.poi_list |= src
- //Added to the atmos_machine process as the SM is highly coupled with the atmospherics system.
- //Having the SM run at a different rate then atmospherics causes odd behavior.
+ supermatter_id = global_supermatter_id++
SSair.atmos_machinery += src
+ countdown = new(src)
+ countdown.start()
+ GLOB.poi_list |= src
radio = new(src)
radio.listening = 0
+ radio.config(list("Engineering" = 0))
investigate_log("has been created.", "supermatter")
+ soundloop = new(list(src), TRUE)
-/obj/machinery/power/supermatter_shard/proc/handle_admin_warnings()
- if(disable_adminwarn)
- return
-
- // Generic checks, similar to checks done by supermatter monitor program.
- aw_normal = status_adminwarn_check(SUPERMATTER_NORMAL, aw_normal, "INFO: Supermatter crystal has been energised.(JMP).", FALSE)
- aw_notify = status_adminwarn_check(SUPERMATTER_NOTIFY, aw_notify, "INFO: Supermatter crystal is approaching unsafe operating temperature.(JMP).", FALSE)
- aw_warning = status_adminwarn_check(SUPERMATTER_WARNING, aw_warning, "WARN: Supermatter crystal is taking integrity damage!(JMP).", FALSE)
- aw_danger = status_adminwarn_check(SUPERMATTER_DANGER, aw_danger, "WARN: Supermatter integrity is below 75%!(JMP).", TRUE)
- aw_emerg = status_adminwarn_check(SUPERMATTER_EMERGENCY, aw_emerg, "CRIT: Supermatter integrity is below 50%!(JMP).", FALSE)
- aw_delam = status_adminwarn_check(SUPERMATTER_DELAMINATING, aw_delam, "CRIT: Supermatter is delaminating!(JMP).", TRUE)
-
-/obj/machinery/power/supermatter_shard/proc/status_adminwarn_check(min_status, current_state, message)
- var/status = get_status()
- if(status >= min_status)
- if(!current_state)
- log_and_message_admins(message)
- SSdiscord.send2discord_simple_noadmins(message)
- return TRUE
- else
- return FALSE
-
-
-/obj/machinery/power/supermatter_shard/Destroy()
+/obj/machinery/power/supermatter_crystal/Destroy()
investigate_log("has been destroyed.", "supermatter")
- if(damage > emergency_point)
- emergency_lighting(0)
- QDEL_NULL(radio)
- GLOB.poi_list.Remove(src)
SSair.atmos_machinery -= src
+ QDEL_NULL(radio)
+ GLOB.poi_list -= src
+ QDEL_NULL(countdown)
+ QDEL_NULL(soundloop)
return ..()
-/obj/machinery/power/supermatter_shard/proc/explode()
- investigate_log("has exploded.", "supermatter")
- explosion(get_turf(src), explosion_power, explosion_power * 1.2, explosion_power * 1.5, explosion_power * 2, 1, 1)
- qdel(src)
- return
-
-/obj/machinery/power/supermatter_shard/process_atmos()
- var/turf/L = loc
-
- if(isnull(L)) // We have a null turf...something is wrong, stop processing this entity.
- return PROCESS_KILL
-
- if(!istype(L)) //We are in a crate or somewhere that isn't turf, if we return to turf resume processing but for now.
- return //Yeah just stop.
-
- if(damage > warning_point) // while the core is still damaged and it's still worth noting its status
- if((world.timeofday - lastwarning) / 10 >= WARNING_DELAY)
- alarm()
- emergency_lighting(1)
- var/stability = num2text(round((damage / explosion_point) * 100))
-
- if(damage > emergency_point)
- radio.autosay("[emergency_alert] Instability: [stability]%", src.name)
- lastwarning = world.timeofday
- if(!has_reached_emergency)
- investigate_log("has reached the emergency point for the first time.", "supermatter")
- message_admins("[src] has reached the emergency point (JMP).")
- has_reached_emergency = 1
-
- else if(damage >= damage_archived) // The damage is still going up
- radio.autosay("[warning_alert] Instability: [stability]%", src.name)
- lastwarning = world.timeofday - 150
-
- else // Phew, we're safe
- radio.autosay("[safe_alert]", src.name)
- emergency_lighting(0)
- lastwarning = world.timeofday
-
- if(damage > explosion_point)
- if(get_turf(src))
- var/turf/position = get_turf(src)
- for(var/mob/living/mob in GLOB.alive_mob_list)
- var/turf/mob_pos = get_turf(mob)
- if(mob_pos && mob_pos.z == position.z)
- if(ishuman(mob))
- //Hilariously enough, running into a closet should make you get hit the hardest.
- var/mob/living/carbon/human/H = mob
- H.AdjustHallucinate(max(50, min(300, DETONATION_HALLUCINATION * sqrt(1 / (get_dist(mob, src) + 1)))))
- var/rads = DETONATION_RADS * sqrt( 1 / (get_dist(mob, src) + 1) )
- mob.apply_effect(rads, IRRADIATE)
-
- explode()
- emergency_lighting(0)
-
- if(damage > warning_point && world.timeofday > last_zap)
- last_zap = world.timeofday + rand(80,200)
- supermatter_zap()
-
- //Ok, get the air from the turf
- var/datum/gas_mixture/env = L.return_air()
-
- //Remove gas from surrounding area
- var/datum/gas_mixture/removed = env.remove(gasefficency * env.total_moles())
-
- //ensure that damage doesn't increase too quickly due to super high temperatures resulting from no coolant, for example. We dont want the SM exploding before anyone can react.
- //We want the cap to scale linearly with power (and explosion_point). Let's aim for a cap of 5 at power = 300 (based on testing, equals roughly 5% per SM alert announcement).
- var/damage_inc_limit = (power/300)*(explosion_point/1000)*DAMAGE_RATE_LIMIT
-
- if(!env || !removed || !removed.total_moles())
- damage += max((power - 15*POWER_FACTOR)/10, 0)
- else
- damage_archived = damage
-
- damage = max(0, damage + between(-DAMAGE_RATE_LIMIT, (removed.temperature - CRITICAL_TEMPERATURE) / 150, damage_inc_limit))
-
- //Maxes out at 100% oxygen pressure
- oxygen = clamp((removed.oxygen - (removed.nitrogen * NITROGEN_RETARDATION_FACTOR)) / removed.total_moles(), 0, 1)
-
- var/temp_factor
- var/equilibrium_power
- if(oxygen > 0.8)
- //If chain reacting at oxygen > 0.8, we want the power at 800 K to stabilize at a power level of 400
- equilibrium_power = 400
- icon_state = "[base_icon_state]_glow"
- else
- //Otherwise, we want the power at 800 K to stabilize at a power level of 250
- equilibrium_power = 250
- icon_state = base_icon_state
-
- temp_factor = ((equilibrium_power / DECAY_FACTOR) ** 3) / 800
- power = max((removed.temperature * temp_factor) * oxygen + power, 0)
-
- var/device_energy = power * REACTION_POWER_MODIFIER
-
- var/heat_capacity = removed.heat_capacity()
-
- removed.toxins += max(device_energy / PLASMA_RELEASE_MODIFIER, 0)
-
- removed.oxygen += max((device_energy + removed.temperature - T0C) / OXYGEN_RELEASE_MODIFIER, 0)
-
- var/thermal_power = THERMAL_RELEASE_MODIFIER * device_energy
- if(debug)
- var/heat_capacity_new = removed.heat_capacity()
- visible_message("[src]: Releasing [round(thermal_power)] W.")
- visible_message("[src]: Releasing additional [round((heat_capacity_new - heat_capacity)*removed.temperature)] W with exhaust gasses.")
-
- removed.temperature += (device_energy)
-
- removed.temperature = max(0, min(removed.temperature, 10000))
-
- env.merge(removed)
-
- air_update_turf()
- transfer_energy()
-
- for(var/mob/living/carbon/human/l in view(src, min(7, round(sqrt(power/6)))))
- // If they can see it without mesons on. Bad on them.
- if(l.glasses && istype(l.glasses, /obj/item/clothing/glasses/meson))
- continue
- // Where we're going, we don't need eyes.
- // Prosthetic eyes will also protect against this business.
- var/obj/item/organ/internal/eyes/eyes = l.get_int_organ(/obj/item/organ/internal/eyes)
- if(!istype(eyes))
- continue
- l.Hallucinate(min(200, l.hallucination + power * config_hallucination_power * sqrt( 1 / max(1,get_dist(l, src)))))
-
- for(var/mob/living/l in range(src, round((power / 100) ** 0.25)))
- var/rads = (power / 10) * sqrt( 1 / max(get_dist(l, src),1) )
- l.apply_effect(rads, IRRADIATE)
-
- power -= (power/DECAY_FACTOR)**3
- handle_admin_warnings()
-
- return 1
-
-/obj/machinery/power/supermatter_shard
-
-/obj/machinery/power/supermatter_shard/bullet_act(var/obj/item/projectile/Proj)
- var/turf/L = loc
- if(!istype(L)) // We don't run process() when we are in space
- return 0 // This stops people from being able to really power up the supermatter
- // Then bring it inside to explode instantly upon landing on a valid turf.
-
-
- if(Proj.flag != "bullet")
- power += Proj.damage * config_bullet_energy
- if(!has_been_powered)
- investigate_log("has been powered for the first time.", "supermatter")
- message_admins("[src] has been powered for the first time (JMP).")
- has_been_powered = 1
- else
- damage += Proj.damage * config_bullet_energy
- supermatter_zap()
- return 0
-
-/obj/machinery/power/supermatter_shard/singularity_act()
- var/gain = 100
- investigate_log("Supermatter shard consumed by singularity.","singulo")
- message_admins("Singularity has consumed a supermatter shard and can now become stage six.(JMP).")
- visible_message("[src] is consumed by the singularity!")
- for(var/mob/M in GLOB.mob_list)
- M << 'sound/effects/supermatter.ogg' //everyone gunna know bout this
- to_chat(M, "A horrible screeching fills your ears, and a wave of dread washes over you...")
- qdel(src)
- return(gain)
-
-/obj/machinery/power/supermatter_shard/attack_robot(mob/user as mob)
- if(Adjacent(user))
- return attack_hand(user)
-
-/obj/machinery/power/supermatter_shard/attack_hand(mob/user as mob)
- if(isAI(user))
+/obj/machinery/power/supermatter_crystal/examine(mob/user)
+ . = ..()
+ if(!ishuman(user))
return
- user.visible_message("\The [user] reaches out and touches \the [src], inducing a resonance... [user.p_their(TRUE)] body starts to glow and bursts into flames before flashing into ash.",\
- "You reach out and touch \the [src]. Everything starts burning and all you can hear is ringing. Your last thought is \"That was not a wise decision.\"",\
- "You hear an uneartly ringing, then what sounds like a shrilling kettle as you are washed with a wave of heat.")
+ var/mob/living/carbon/human/H = user
+ var/immune = istype(H.glasses, /obj/item/clothing/glasses/meson)
+ if(!immune && (get_dist(user, src) < HALLUCINATION_RANGE(power)))
+ . += "You get headaches just from looking at it."
- playsound(get_turf(src), 'sound/effects/supermatter.ogg', 50, 1)
-
- Consume(user)
-
-/obj/machinery/power/supermatter_shard/proc/get_integrity()
- var/integrity = damage / explosion_point
- integrity = round(100 - integrity * 100)
- integrity = integrity < 0 ? 0 : integrity
- return integrity
-
-/obj/machinery/power/supermatter_shard/proc/transfer_energy()
- for(var/obj/machinery/power/rad_collector/R in GLOB.rad_collectors)
- if(get_dist(R, src) <= 15) // Better than using orange() every process
- R.receive_pulse(power/10)
- return
-
-/obj/machinery/power/supermatter_shard/attackby(obj/item/W as obj, mob/living/user as mob, params)
- if(!istype(W) || (W.flags & ABSTRACT) || !istype(user))
- return
- if(user.drop_item(W))
- Consume(W)
- user.visible_message("As [user] touches \the [src] with \a [W], silence fills the room...",\
- "You touch \the [src] with \the [W], and everything suddenly goes silent.\"\n\The [W] flashes into dust as you flinch away from \the [src].",\
- "Everything suddenly goes silent.")
-
- playsound(get_turf(src), 'sound/effects/supermatter.ogg', 50, 1)
-
- user.apply_effect(150, IRRADIATE)
-
-/obj/machinery/power/supermatter_shard/Bumped(atom/AM as mob|obj)
- if(istype(AM, /mob/living))
- AM.visible_message("\The [AM] slams into \the [src] inducing a resonance... [AM.p_their(TRUE)] body starts to glow and catch flame before flashing into ash.",\
- "You slam into \the [src] as your ears are filled with unearthly ringing. Your last thought is \"Oh, fuck.\"",\
- "You hear an unearthly noise as a wave of heat washes over you.")
- else if(isobj(AM) && !istype(AM, /obj/effect))
- AM.visible_message("\The [AM] smacks into \the [src] and rapidly flashes to ash.",\
- "You hear a loud crack as you are washed with a wave of heat.")
- else
- return
-
- playsound(get_turf(src), 'sound/effects/supermatter.ogg', 50, 1)
-
- Consume(AM)
-
-
-/obj/machinery/power/supermatter_shard/proc/Consume(atom/movable/AM)
- if(istype(AM, /mob/living))
- var/mob/living/user = AM
- user.dust()
- power += 200
- message_admins("[src] has consumed [key_name_admin(user)] (JMP).")
- investigate_log("has consumed [key_name(user)].", "supermatter")
- else if(isobj(AM) && !istype(AM, /obj/effect))
- investigate_log("has consumed [AM].", "supermatter")
- qdel(AM)
-
- power += 200
- supermatter_zap()
-
-
- //Some poor sod got eaten, go ahead and irradiate people nearby.
- for(var/mob/living/L in range(10))
- var/rads = 500 * sqrt( 1 / (get_dist(L, src) + 1) )
- L.apply_effect(rads, IRRADIATE)
- investigate_log("has irradiated [L] after consuming [AM].", "supermatter")
- if(L in view())
- L.show_message("As \the [src] slowly stops resonating, you find your skin covered in new radiation burns.", 1,\
- "The unearthly ringing subsides and you notice you have new radiation burns.", 2)
- else
- L.show_message("You hear an uneartly ringing and notice your skin is covered in fresh radiation burns.", 2)
-
-/obj/machinery/power/supermatter_shard/proc/get_status()
+/obj/machinery/power/supermatter_crystal/proc/get_status()
var/turf/T = get_turf(src)
if(!T)
return SUPERMATTER_ERROR
@@ -397,16 +232,17 @@
if(!air)
return SUPERMATTER_ERROR
- if(get_integrity() < 25)
+ var/integrity = get_integrity()
+ if(integrity < SUPERMATTER_DELAM_PERCENT)
return SUPERMATTER_DELAMINATING
- if(get_integrity() < 50)
+ if(integrity < SUPERMATTER_EMERGENCY_PERCENT)
return SUPERMATTER_EMERGENCY
- if(get_integrity() < 75)
+ if(integrity < SUPERMATTER_DANGER_PERCENT)
return SUPERMATTER_DANGER
- if((get_integrity() < 100) || (air.temperature > CRITICAL_TEMPERATURE))
+ if((integrity < SUPERMATTER_WARNING_PERCENT) || (air.temperature > CRITICAL_TEMPERATURE))
return SUPERMATTER_WARNING
if(air.temperature > (CRITICAL_TEMPERATURE * 0.8))
@@ -416,23 +252,716 @@
return SUPERMATTER_NORMAL
return SUPERMATTER_INACTIVE
-/obj/machinery/power/supermatter_shard/proc/alarm()
+/obj/machinery/power/supermatter_crystal/proc/alarm()
switch(get_status())
if(SUPERMATTER_DELAMINATING)
- playsound(src, 'sound/misc/bloblarm.ogg', 100)
+ playsound(src, 'sound/misc/bloblarm.ogg', 100, FALSE, 40, 30)
if(SUPERMATTER_EMERGENCY)
- playsound(src, 'sound/machines/engine_alert1.ogg', 100)
+ playsound(src, 'sound/machines/engine_alert1.ogg', 100, FALSE, 30, 30)
if(SUPERMATTER_DANGER)
- playsound(src, 'sound/machines/engine_alert2.ogg', 100)
+ playsound(src, 'sound/machines/engine_alert2.ogg', 100, FALSE, 30, 30)
if(SUPERMATTER_WARNING)
playsound(src, 'sound/machines/terminal_alert.ogg', 75)
-/obj/machinery/power/supermatter_shard/proc/emergency_lighting(active)
- if(active)
- post_status("alert", "radiation")
- else
- post_status("shuttle")
+/obj/machinery/power/supermatter_crystal/proc/get_integrity()
+ var/integrity = damage / explosion_point
+ integrity = round(100 - integrity * 100, 0.01)
+ integrity = integrity < 0 ? 0 : integrity
+ return integrity
-/obj/machinery/power/supermatter_shard/proc/supermatter_zap()
- playsound(src.loc, 'sound/magic/lightningshock.ogg', 100, 1, extrarange = 5)
- tesla_zap(src, 10, max(1000,power * damage / explosion_point))
+/obj/machinery/power/supermatter_crystal/proc/countdown()
+ set waitfor = FALSE
+
+ if(final_countdown) // We're already doing it go away
+ return
+ final_countdown = TRUE
+
+ var/image/causality_field = image(icon, null, "causality_field")
+ add_overlay(causality_field, TRUE)
+
+ var/speaking = "[emergency_alert] The supermatter has reached critical integrity failure. Emergency causality destabilization field has been activated."
+ radio.autosay(speaking, name, null, list(z))
+ for(var/i in SUPERMATTER_COUNTDOWN_TIME to 0 step -10)
+ if(damage < explosion_point) // Cutting it a bit close there engineers
+ radio.autosay("[safe_alert] Failsafe has been disengaged.", name, null, list(z))
+ cut_overlay(causality_field, TRUE)
+ final_countdown = FALSE
+ return
+ else if((i % 50) != 0 && i > 50) // A message once every 5 seconds until the final 5 seconds which count down individualy
+ sleep(10)
+ continue
+ else if(i > 50)
+ speaking = "[DisplayTimeText(i, TRUE)] remain before causality stabilization."
+ else
+ speaking = "[i*0.1]..."
+ radio.autosay(speaking, name, null, list(z))
+ sleep(10)
+
+ explode()
+
+/obj/machinery/power/supermatter_crystal/proc/explode()
+ SSblackbox.record_feedback("amount", "supermatter_delaminations", 1)
+ for(var/mob in GLOB.alive_mob_list)
+ var/mob/living/L = mob
+ if(istype(L) && atoms_share_level(L, src))
+ if(ishuman(mob))
+ //Hilariously enough, running into a closet should make you get hit the hardest.
+ var/mob/living/carbon/human/H = mob
+ H.hallucination += max(50, min(300, DETONATION_HALLUCINATION * sqrt(1 / (get_dist(mob, src) + 1))))
+ var/rads = DETONATION_RADS * sqrt(1 / (get_dist(L, src) + 1))
+ L.rad_act(rads)
+
+ var/turf/T = get_turf(src)
+ for(var/mob/M in GLOB.player_list)
+ var/turf/mob_turf = get_turf(M)
+ if(atoms_share_level(T, mob_turf))
+ SEND_SOUND(M, 'sound/magic/charge.ogg')
+
+ if(atoms_share_level(M, src))
+ to_chat(M, "You feel reality distort for a moment...")
+ else
+ to_chat(M, "You hold onto \the [M.loc] as hard as you can, as reality distorts around you. You feel safe.")
+
+ if(combined_gas > MOLE_PENALTY_THRESHOLD)
+ investigate_log("has collapsed into a singularity.", "supermatter")
+ if(T)
+ var/obj/singularity/S = new(T)
+ S.energy = 800
+ S.consume(src)
+ return //No boom for me sir
+ else if(power > POWER_PENALTY_THRESHOLD)
+ investigate_log("has spawned additional energy balls.", "supermatter")
+ if(T)
+ var/obj/singularity/energy_ball/E = new(T)
+ E.energy = 200 //Gets us about 9 balls
+// else if(power > EVENT_POWER_PENALTY_THRESHOLD && prob(power/50) && !istype(src, /obj/machinery/power/supermatter_crystal/shard))
+// var/datum/round_event_control/crystal_invasion/crystals = new/datum/round_event_control/crystal_invasion
+// crystals.runEvent()
+// return //No boom for me sir
+ //Dear mappers, balance the sm max explosion radius to 17.5, 37, 39, 41
+ explosion(get_turf(T), explosion_power * max(gasmix_power_ratio, 0.205) * 0.5 , explosion_power * max(gasmix_power_ratio, 0.205) + 2, explosion_power * max(gasmix_power_ratio, 0.205) + 4 , explosion_power * max(gasmix_power_ratio, 0.205) + 6, 1, 1)
+ qdel(src)
+
+/obj/machinery/power/supermatter_crystal/process_atmos()
+ if(!processes) //Just fuck me up bro
+ return
+ var/turf/T = loc
+
+ if(isnull(T)) // We have a null turf...something is wrong, stop processing this entity.
+ return PROCESS_KILL
+
+ if(!istype(T)) //We are in a crate or somewhere that isn't turf, if we return to turf resume processing but for now.
+ return //Yeah just stop.
+
+ if(T.density)
+ var/turf/did_it_melt = T.ChangeTurf(T.baseturf)
+ if(!did_it_melt.density) //In case some joker finds way to place these on indestructible walls
+ visible_message("[src] melts through [T]!")
+ return
+
+ //We vary volume by power, and handle OH FUCK FUSION IN COOLING LOOP noises.
+ if(power)
+ soundloop.volume = clamp((50 + (power / 50)), 50, 100)
+ if(damage >= 300)
+ soundloop.mid_sounds = list('sound/machines/sm/loops/delamming.ogg' = 1)
+ else
+ soundloop.mid_sounds = list('sound/machines/sm/loops/calm.ogg' = 1)
+
+ //We play delam/neutral sounds at a rate determined by power and damage
+ if(last_accent_sound < world.time && prob(20))
+ var/aggression = min(((damage / 800) * (power / 2500)), 1.0) * 100
+ if(damage >= 300)
+ playsound(src, "smdelam", max(50, aggression), FALSE, 40, 30)
+ else
+ playsound(src, "smcalm", max(50, aggression), FALSE, 25, 25)
+ var/next_sound = round((100 - aggression) * 5)
+ last_accent_sound = world.time + max(SUPERMATTER_ACCENT_SOUND_MIN_COOLDOWN, next_sound)
+
+ //Ok, get the air from the turf
+ var/datum/gas_mixture/env = T.return_air()
+
+ var/datum/gas_mixture/removed
+ if(produces_gas)
+ //Remove gas from surrounding area
+ removed = env.remove(gasefficency * env.total_moles())
+ else
+ // Pass all the gas related code an empty gas container
+ removed = new()
+ damage_archived = damage
+ if(!removed || !removed.total_moles() || isspaceturf(T)) //we're in space or there is no gas to process
+ if(takes_damage)
+ damage += max((power / 1000) * DAMAGE_INCREASE_MULTIPLIER, 0.1) // always does at least some damage
+ else
+ if(takes_damage)
+ //causing damage
+ //Due to DAMAGE_INCREASE_MULTIPLIER, we only deal one 4th of the damage the statements otherwise would cause
+
+ //((((some value between 0.5 and 1 * temp - ((273.15 + 40) * some values between 1 and 10)) * some number between 0.25 and knock your socks off / 150) * 0.25
+ //Heat and mols account for each other, a lot of hot mols are more damaging then a few
+ //Mols start to have a positive effect on damage after 350
+ damage = max(damage + (max(clamp(removed.total_moles() / 200, 0.5, 1) * removed.temperature - ((T0C + HEAT_PENALTY_THRESHOLD)*dynamic_heat_resistance), 0) * mole_heat_penalty / 150 ) * DAMAGE_INCREASE_MULTIPLIER, 0)
+ //Power only starts affecting damage when it is above 5000
+ damage = max(damage + (max(power - POWER_PENALTY_THRESHOLD, 0)/500) * DAMAGE_INCREASE_MULTIPLIER, 0)
+ //Molar count only starts affecting damage when it is above 1800
+ damage = max(damage + (max(combined_gas - MOLE_PENALTY_THRESHOLD, 0)/80) * DAMAGE_INCREASE_MULTIPLIER, 0)
+
+ //There might be a way to integrate healing and hurting via heat
+ //healing damage
+ if(combined_gas < MOLE_PENALTY_THRESHOLD)
+ //Only has a net positive effect when the temp is below 313.15, heals up to 2 damage. Psycologists increase this temp min by up to 45
+ damage = max(damage + (min(removed.temperature - (T0C + HEAT_PENALTY_THRESHOLD), 0) / 150 ), 0)
+
+ //Check for holes in the SM inner chamber
+ for(var/t in RANGE_TURFS(1, loc))
+ if(!isspaceturf(t))
+ continue
+ var/turf/turf_to_check = t
+ if(length(turf_to_check.atmos_adjacent_turfs))
+ var/integrity = get_integrity()
+ if(integrity < 10)
+ damage += clamp((power * 0.0005) * DAMAGE_INCREASE_MULTIPLIER, 0, MAX_SPACE_EXPOSURE_DAMAGE)
+ else if(integrity < 25)
+ damage += clamp((power * 0.0009) * DAMAGE_INCREASE_MULTIPLIER, 0, MAX_SPACE_EXPOSURE_DAMAGE)
+ else if(integrity < 45)
+ damage += clamp((power * 0.005) * DAMAGE_INCREASE_MULTIPLIER, 0, MAX_SPACE_EXPOSURE_DAMAGE)
+ else if(integrity < 75)
+ damage += clamp((power * 0.002) * DAMAGE_INCREASE_MULTIPLIER, 0, MAX_SPACE_EXPOSURE_DAMAGE)
+ break
+ //caps damage rate
+
+ //Takes the lower number between archived damage + (1.8) and damage
+ //This means we can only deal 1.8 damage per function call
+ damage = min(damage_archived + (DAMAGE_HARDCAP * explosion_point),damage)
+
+ //calculating gas related values
+ combined_gas = max(removed.total_moles(), 0)
+
+ plasmacomp = max(removed.toxins / combined_gas, 0)
+ o2comp = max(removed.oxygen / combined_gas, 0)
+ co2comp = max(removed.carbon_dioxide / combined_gas, 0)
+ n2ocomp = max(removed.sleeping_agent / combined_gas, 0)
+ n2comp = max(removed.nitrogen / combined_gas, 0)
+
+ gasmix_power_ratio = min(max(plasmacomp + o2comp + co2comp - n2comp, 0), 1)
+
+ dynamic_heat_modifier = max((plasmacomp * PLASMA_HEAT_PENALTY) + (o2comp * OXYGEN_HEAT_PENALTY) + (co2comp * CO2_HEAT_PENALTY) + (n2comp * NITROGEN_HEAT_PENALTY), 0.5)
+ dynamic_heat_resistance = max(n2ocomp * N2O_HEAT_RESISTANCE, 1)
+
+ power_transmission_bonus = max((plasmacomp * PLASMA_TRANSMIT_MODIFIER) + (o2comp * OXYGEN_TRANSMIT_MODIFIER), 0)
+
+ //more moles of gases are harder to heat than fewer, so let's scale heat damage around them
+ mole_heat_penalty = max(combined_gas / MOLE_HEAT_PENALTY, 0.25)
+
+ if(combined_gas > POWERLOSS_INHIBITION_MOLE_THRESHOLD && co2comp > POWERLOSS_INHIBITION_GAS_THRESHOLD)
+ powerloss_dynamic_scaling = clamp(powerloss_dynamic_scaling + clamp(co2comp - powerloss_dynamic_scaling, -0.02, 0.02), 0, 1)
+ else
+ powerloss_dynamic_scaling = clamp(powerloss_dynamic_scaling - 0.05, 0, 1)
+ //Ranges from 0 to 1(1-(value between 0 and 1 * ranges from 1 to 1.5(mol / 500)))
+ //We take the mol count, and scale it to be our inhibitor
+ powerloss_inhibitor = clamp(1 - (powerloss_dynamic_scaling * clamp(combined_gas / POWERLOSS_INHIBITION_MOLE_BOOST_THRESHOLD, 1 , 1.5)), 0 , 1)
+
+ //Releases stored power into the general pool
+ //We get this by consuming shit or being scalpeled
+ if(matter_power && power_changes)
+ //We base our removed power off one 10th of the matter_power.
+ var/removed_matter = max(matter_power / MATTER_POWER_CONVERSION, 40)
+ //Adds at least 40 power
+ power = max(power + removed_matter, 0)
+ //Removes at least 40 matter power
+ matter_power = max(matter_power - removed_matter, 0)
+
+ var/temp_factor = 50
+ if(gasmix_power_ratio > 0.8)
+ //with a perfect gas mix, make the power less based on heat
+ icon_state = "[base_icon_state]_glow"
+ else
+ //in normal mode, base the produced energy around the heat
+ temp_factor = 30
+ icon_state = base_icon_state
+
+
+ if(power_changes)
+ power = max((removed.temperature * temp_factor / T0C) * gasmix_power_ratio + power, 0)
+
+ if(prob(50))
+
+ radiation_pulse(src, power * max(0, (1 + (power_transmission_bonus / 10))))
+
+ //Power * 0.55 * a value between 1 and 0.8
+ var/device_energy = power * REACTION_POWER_MODIFIER
+
+ //To figure out how much temperature to add each tick, consider that at one atmosphere's worth
+ //of pure oxygen, with all four lasers firing at standard energy and no N2 present, at room temperature
+ //that the device energy is around 2140. At that stage, we don't want too much heat to be put out
+ //Since the core is effectively "cold"
+
+ //Also keep in mind we are only adding this temperature to (efficiency)% of the one tile the rock
+ //is on. An increase of 4*C @ 25% efficiency here results in an increase of 1*C / (#tilesincore) overall.
+ //Power * 0.55 * (some value between 1.5 and 23) / 5
+ removed.temperature += ((device_energy * dynamic_heat_modifier) / THERMAL_RELEASE_MODIFIER)
+ //We can only emit so much heat, that being 57500
+ removed.temperature = max(0, min(removed.temperature, 2500 * dynamic_heat_modifier))
+
+ //Calculate how much gas to release
+ //Varies based on power and gas content
+ removed.toxins += max((device_energy * dynamic_heat_modifier) / PLASMA_RELEASE_MODIFIER, 0)
+ //Varies based on power, gas content, and heat
+ removed.oxygen += max(((device_energy + removed.temperature * dynamic_heat_modifier) - T0C) / OXYGEN_RELEASE_MODIFIER, 0)
+
+ if(produces_gas)
+ env.merge(removed)
+ air_update_turf()
+
+ //Makes em go mad and accumulate rads.
+ for(var/mob/living/carbon/human/l in view(src, HALLUCINATION_RANGE(power))) // If they can see it without mesons on. Bad on them.
+ if(!istype(l.glasses, /obj/item/clothing/glasses/meson))
+ var/D = sqrt(1 / max(1, get_dist(l, src)))
+ l.hallucination += power * hallucination_power * D
+ l.hallucination = clamp(l.hallucination, 0, 200)
+ for(var/mob/living/l in range(src, round((power / 100) ** 0.25)))
+ var/rads = (power / 10) * sqrt( 1 / max(get_dist(l, src), 1) )
+ l.rad_act(rads)
+
+ //Transitions between one function and another, one we use for the fast inital startup, the other is used to prevent errors with fusion temperatures.
+ //Use of the second function improves the power gain imparted by using co2
+ if(power_changes)
+ power = max(power - min(((power / 500) ** 3) * powerloss_inhibitor, power * 0.83 * powerloss_inhibitor), 0)
+ //After this point power is lowered
+ //This wraps around to the begining of the function
+ //Handle high power zaps/anomaly generation
+ if(power > POWER_PENALTY_THRESHOLD || damage > damage_penalty_point) //If the power is above 5000 or if the damage is above 550
+ var/range = 4
+ zap_cutoff = 1500
+ if(removed && removed.return_pressure() > 0 && removed.return_temperature() > 0)
+ //You may be able to freeze the zapstate of the engine with good planning, we'll see
+ zap_cutoff = clamp(3000 - (power * (removed.total_moles()) / 10) / removed.return_temperature(), 350, 3000)//If the core is cold, it's easier to jump, ditto if there are a lot of mols
+ //We should always be able to zap our way out of the default enclosure
+ //See supermatter_zap() for more details
+ range = clamp(power / removed.return_pressure() * 10, 2, 7)
+ var/flags = ZAP_SUPERMATTER_FLAGS
+ var/zap_count = 0
+ //Deal with power zaps
+ switch(power)
+ if(POWER_PENALTY_THRESHOLD to SEVERE_POWER_PENALTY_THRESHOLD)
+ zap_icon = DEFAULT_ZAP_ICON_STATE
+ zap_count = 2
+ if(SEVERE_POWER_PENALTY_THRESHOLD to CRITICAL_POWER_PENALTY_THRESHOLD)
+ zap_icon = SLIGHTLY_CHARGED_ZAP_ICON_STATE
+ //Uncaps the zap damage, it's maxed by the input power
+ //Objects take damage now
+ flags |= (ZAP_MOB_DAMAGE | ZAP_OBJ_DAMAGE)
+ zap_count = 3
+ if(CRITICAL_POWER_PENALTY_THRESHOLD to INFINITY)
+ zap_icon = OVER_9000_ZAP_ICON_STATE
+ //It'll stun more now, and damage will hit harder, gloves are no garentee.
+ //Machines go boom
+ flags |= (ZAP_MOB_STUN | ZAP_MACHINE_EXPLOSIVE | ZAP_MOB_DAMAGE | ZAP_OBJ_DAMAGE)
+ zap_count = 4
+ //Now we deal with damage shit
+ if(damage > damage_penalty_point && prob(20))
+ zap_count += 1
+
+ if(zap_count >= 1)
+ playsound(src.loc, 'sound/weapons/emitter2.ogg', 100, TRUE, extrarange = 10)
+ for(var/i in 1 to zap_count)
+ supermatter_zap(src, range, clamp(power*2, 4000, 20000), flags)
+
+ if(prob(5))
+ supermatter_anomaly_gen(src, FLUX_ANOMALY, rand(5, 10))
+ if(power > SEVERE_POWER_PENALTY_THRESHOLD && prob(5) || prob(1))
+ supermatter_anomaly_gen(src, GRAVITATIONAL_ANOMALY, rand(5, 10))
+ if((power > SEVERE_POWER_PENALTY_THRESHOLD && prob(2)) || (prob(0.3) && power > POWER_PENALTY_THRESHOLD))
+ supermatter_anomaly_gen(src, PYRO_ANOMALY, rand(5, 10))
+
+ if(prob(15))
+ supermatter_pull(loc, min(power / 850, 3)) //850, 1700, 2550
+
+ //Tells the engi team to get their butt in gear
+ if(damage > warning_point) // while the core is still damaged and it's still worth noting its status
+ if((REALTIMEOFDAY - lastwarning) / 10 >= WARNING_DELAY)
+ alarm()
+
+ //Oh shit it's bad, time to freak out
+ if(damage > emergency_point)
+ radio.autosay("[emergency_alert] Integrity: [get_integrity()]%", name, null, list(z))
+ lastwarning = REALTIMEOFDAY
+ if(!has_reached_emergency)
+ investigate_log("has reached the emergency point for the first time.", "supermatter")
+ message_admins("[src] has reached the emergency point [ADMIN_JMP(src)].")
+ has_reached_emergency = TRUE
+ else if(damage >= damage_archived) // The damage is still going up
+ radio.autosay("[warning_alert] Integrity: [get_integrity()]%", name, "Engineering", list(z))
+ lastwarning = REALTIMEOFDAY - (WARNING_DELAY * 5)
+
+ else // Phew, we're safe
+ radio.autosay("[safe_alert] Integrity: [get_integrity()]%", name, "Engineering", list(z))
+ lastwarning = REALTIMEOFDAY
+
+ if(power > POWER_PENALTY_THRESHOLD)
+ radio.autosay("Warning: Hyperstructure has reached dangerous power level.", name, "Engineering", list(z))
+ if(powerloss_inhibitor < 0.5)
+ radio.autosay("DANGER: CHARGE INERTIA CHAIN REACTION IN PROGRESS.", name, "Engineering", list(z))
+
+ if(combined_gas > MOLE_PENALTY_THRESHOLD)
+ radio.autosay("Warning: Critical coolant mass reached.", name, "Engineering", list(z))
+ //Boom (Mind blown)
+ if(damage > explosion_point)
+ countdown()
+
+ return 1
+
+/obj/machinery/power/supermatter_crystal/bullet_act(obj/item/projectile/Proj)
+ var/turf/L = loc
+ if(!istype(L))
+ return FALSE
+ if(!istype(Proj.firer, /obj/machinery/power/emitter) && power_changes)
+ investigate_log("has been hit by [Proj] fired by [key_name(Proj.firer)]", "supermatter")
+ if(Proj.flag != "bullet")
+ if(power_changes) //This needs to be here I swear
+ power += Proj.damage * bullet_energy
+ if(!has_been_powered)
+ investigate_log("has been powered for the first time.", "supermatter")
+ message_admins("[src] has been powered for the first time [ADMIN_JMP(src)].")
+ has_been_powered = TRUE
+ else if(takes_damage)
+ damage += Proj.damage * bullet_energy
+ return FALSE
+
+/obj/machinery/power/supermatter_crystal/singularity_act()
+ var/gain = 100
+ investigate_log("Supermatter shard consumed by singularity.", "singulo")
+ message_admins("Singularity has consumed a supermatter shard and can now become stage six.")
+ visible_message("[src] is consumed by the singularity!")
+ var/supermatter_sound = 'sound/effects/supermatter.ogg'
+ for(var/mob/M in GLOB.player_list)
+ if(atoms_share_level(M, src))
+ SEND_SOUND(M, supermatter_sound) //everyone goan know bout this
+ to_chat(M, "A horrible screeching fills your ears, and a wave of dread washes over you...")
+ qdel(src)
+ return gain
+
+/obj/machinery/power/supermatter_crystal/blob_act(obj/structure/blob/B)
+ if(B && !isspaceturf(loc)) //does nothing in space
+ playsound(get_turf(src), 'sound/effects/supermatter.ogg', 50, TRUE)
+ damage += B.obj_integrity * 0.5 //take damage equal to 50% of remaining blob health before it tried to eat us
+ if(B.obj_integrity > 100)
+ B.visible_message("[B] strikes at [src] and flinches away!",\
+ "You hear a loud crack as you are washed with a wave of heat.")
+ B.take_damage(100, BURN)
+ else
+ B.visible_message("[B] strikes at [src] and rapidly flashes to ash.",\
+ "You hear a loud crack as you are washed with a wave of heat.")
+ Consume(B)
+
+/obj/machinery/power/supermatter_crystal/attack_tk(mob/user)
+ if(iscarbon(user))
+ var/mob/living/carbon/C = user
+ to_chat(C, "That was a really dense idea.")
+ var/obj/item/organ/internal/brain/B = C.get_int_organ(/obj/item/organ/internal/brain)
+ C.ghostize(0)
+ if(B)
+ B.remove(C)
+ qdel(B)
+
+/obj/machinery/power/supermatter_crystal/attack_alien(mob/user)
+ dust_mob(user, cause = "alien attack")
+
+/obj/machinery/power/supermatter_crystal/attack_animal(mob/living/simple_animal/S)
+ var/murder
+ if(!S.melee_damage_upper && !S.melee_damage_lower)
+ murder = S.friendly
+ else
+ murder = S.attacktext
+ dust_mob(S, \
+ "[S] unwisely [murder] [src], and [S.p_their()] body burns brilliantly before flashing into ash!", \
+ "You unwisely touch [src], and your vision glows brightly as your body crumbles to dust. Oops.", \
+ "simple animal attack")
+
+/obj/machinery/power/supermatter_crystal/attack_robot(mob/user)
+ if(Adjacent(user))
+ dust_mob(user, cause = "cyborg attack")
+
+/obj/machinery/power/supermatter_crystal/attack_ai(mob/user)
+ return
+
+/obj/machinery/power/supermatter_crystal/attack_hand(mob/living/user)
+ ..()
+ dust_mob(user, cause = "hand")
+
+/obj/machinery/power/supermatter_crystal/proc/dust_mob(mob/living/nom, vis_msg, mob_msg, cause)
+ if(nom.incorporeal_move || nom.status_flags & GODMODE)
+ return
+ if(!vis_msg)
+ vis_msg = "[nom] reaches out and touches [src], inducing a resonance... [nom.p_their()] body starts to glow and burst into flames before flashing into dust!"
+ if(!mob_msg)
+ mob_msg = "You reach out and touch [src]. Everything starts burning and all you can hear is ringing. Your last thought is \"That was not a wise decision.\""
+ if(!cause)
+ cause = "contact"
+ nom.visible_message(vis_msg, mob_msg, "You hear an unearthly noise as a wave of heat washes over you.")
+ investigate_log("has been attacked ([cause]) by [key_name(nom)]", "supermatter")
+ playsound(get_turf(src), 'sound/effects/supermatter.ogg', 50, TRUE)
+ Consume(nom)
+
+/obj/machinery/power/supermatter_crystal/attackby(obj/item/I, mob/living/user, params)
+ if(!istype(I) || (I.flags & ABSTRACT) || !istype(user))
+ return
+ if(moveable && default_unfasten_wrench(user, I, time = 20))
+ return
+ if(user.drop_item())
+ user.visible_message("As [user] touches [src] with \a [I], silence fills the room...",\
+ "You touch [src] with [I], and everything suddenly goes silent.\n[I] flashes into dust as you flinch away from [src].",\
+ "Everything suddenly goes silent.")
+ investigate_log("has been attacked ([I]) by [key_name(user)]", "supermatter")
+ Consume(I)
+ playsound(get_turf(src), 'sound/effects/supermatter.ogg', 50, TRUE)
+
+ radiation_pulse(src, 150, 4)
+
+/obj/machinery/power/supermatter_crystal/Bumped(atom/movable/AM)
+ if(isliving(AM))
+ AM.visible_message("[AM] slams into [src] inducing a resonance... [AM.p_their()] body starts to glow and burst into flames before flashing into dust!",\
+ "You slam into [src] as your ears are filled with unearthly ringing. Your last thought is \"Oh, fuck.\"",\
+ "You hear an unearthly noise as a wave of heat washes over you.")
+ else if(isobj(AM) && !iseffect(AM))
+ AM.visible_message("[AM] smacks into [src] and rapidly flashes to ash.", null,\
+ "You hear a loud crack as you are washed with a wave of heat.")
+ else
+ return
+
+ playsound(get_turf(src), 'sound/effects/supermatter.ogg', 50, TRUE)
+ Consume(AM)
+
+/obj/machinery/power/supermatter_crystal/proc/Consume(atom/movable/AM)
+ if(isliving(AM))
+ var/mob/living/user = AM
+ if(user.status_flags & GODMODE)
+ return
+ message_admins("[src] has consumed [key_name_admin(user)] [ADMIN_JMP(src)].")
+ investigate_log("has consumed [key_name(user)].", "supermatter")
+ user.dust()
+ if(power_changes)
+ matter_power += 200
+ else if(istype(AM, /obj/singularity))
+ return
+ else if(isobj(AM))
+ if(!iseffect(AM))
+ var/suspicion = ""
+ if(AM.fingerprintslast)
+ suspicion = "last touched by [AM.fingerprintslast]"
+ message_admins("[src] has consumed [AM], [suspicion] [ADMIN_JMP(src)].")
+ investigate_log("has consumed [AM] - [suspicion].", "supermatter")
+ qdel(AM)
+ if(!iseffect(AM) && power_changes)
+ matter_power += 200
+
+ //Some poor sod got eaten, go ahead and irradiate people nearby.
+ radiation_pulse(src, 3000, 2, TRUE)
+ for(var/mob/living/L in range(10))
+ investigate_log("has irradiated [key_name(L)] after consuming [AM].", "supermatter")
+ if(L in view())
+ L.show_message("As [src] slowly stops resonating, you find your skin covered in new radiation burns.", 1,
+ "The unearthly ringing subsides and you notice you have new radiation burns.", 2)
+ else
+ L.show_message("You hear an unearthly ringing and notice your skin is covered in fresh radiation burns.", 2)
+
+/obj/machinery/power/supermatter_crystal/engine
+ is_main_engine = TRUE
+
+/obj/machinery/power/supermatter_crystal/shard
+ name = "supermatter shard"
+ desc = "A strangely translucent and iridescent crystal that looks like it used to be part of a larger structure."
+ base_icon_state = "darkmatter_shard"
+ icon_state = "darkmatter_shard"
+ anchored = FALSE
+ gasefficency = 0.125
+ explosion_power = 12
+ layer = ABOVE_MOB_LAYER
+ moveable = TRUE
+
+/obj/machinery/power/supermatter_crystal/shard/engine
+ name = "anchored supermatter shard"
+ is_main_engine = TRUE
+ anchored = TRUE
+ moveable = FALSE
+
+// When you wanna make a supermatter shard for the dramatic effect, but
+// don't want it exploding suddenly
+/obj/machinery/power/supermatter_crystal/shard/hugbox
+ name = "anchored supermatter shard"
+ takes_damage = FALSE
+ produces_gas = FALSE
+ power_changes = FALSE
+ processes = FALSE //SHUT IT DOWN
+ moveable = FALSE
+ anchored = TRUE
+
+/obj/machinery/power/supermatter_crystal/shard/hugbox/fakecrystal //Hugbox shard with crystal visuals, used in the Supermatter/Hyperfractal shuttle
+ name = "supermatter crystal"
+ base_icon_state = "darkmatter"
+ icon_state = "darkmatter"
+
+/obj/machinery/power/supermatter_crystal/proc/supermatter_pull(turf/center, pull_range = 3)
+ playsound(center, 'sound/weapons/marauder.ogg', 100, TRUE, extrarange = pull_range - world.view)
+ for(var/atom/movable/P in orange(pull_range,center))
+ if((P.anchored || P.move_resist >= MOVE_FORCE_EXTREMELY_STRONG)) //move resist memes.
+ if(istype(P, /obj/structure/closet))
+ var/obj/structure/closet/toggle = P
+ toggle.open()
+ continue
+ if(ismob(P))
+ var/mob/M = P
+ if(M.mob_negates_gravity())
+ continue //You can't pull someone nailed to the deck
+ step_towards(P,center)
+
+/obj/machinery/power/supermatter_crystal/proc/supermatter_anomaly_gen(turf/anomalycenter, type = FLUX_ANOMALY, anomalyrange = 5)
+ var/turf/L = pick(orange(anomalyrange, anomalycenter))
+ if(L)
+ switch(type)
+ if(FLUX_ANOMALY)
+ var/obj/effect/anomaly/flux/A = new(L, 300, FALSE)
+ A.explosive = FALSE
+ if(GRAVITATIONAL_ANOMALY)
+ new /obj/effect/anomaly/grav(L, 250, FALSE)
+ if(PYRO_ANOMALY)
+ new /obj/effect/anomaly/pyro(L, 200, FALSE)
+
+/obj/machinery/power/supermatter_crystal/proc/supermatter_zap(atom/zapstart = src, range = 5, zap_str = 4000, zap_flags = ZAP_SUPERMATTER_FLAGS, list/targets_hit = list())
+ if(QDELETED(zapstart))
+ return
+ . = zapstart.dir
+ //If the strength of the zap decays past the cutoff, we stop
+ if(zap_str < zap_cutoff)
+ return
+ var/atom/target
+ var/target_type = LOWEST
+ var/list/arctargets = list()
+ //Making a new copy so additons further down the recursion do not mess with other arcs
+ //Lets put this ourself into the do not hit list, so we don't curve back to hit the same thing twice with one arc
+ for(var/test in oview(zapstart, range))
+ if(!(zap_flags & ZAP_ALLOW_DUPLICATES) && LAZYACCESS(targets_hit, test))
+ continue
+
+ if(target_type > COIL)
+ continue
+
+ if(istype(test, /obj/machinery/power/tesla_coil))
+ var/obj/machinery/power/tesla_coil/coil = test
+ if(coil.anchored && !coil.being_shocked && !coil.panel_open && prob(70)) //Diversity of death
+ if(target_type != COIL)
+ arctargets = list()
+ arctargets += test
+ target_type = COIL
+
+ if(target_type > ROD)
+ continue
+
+ if(istype(test, /obj/machinery/power/grounding_rod))
+ var/obj/machinery/power/grounding_rod/rod = test
+ //We're adding machine damaging effects, rods need to be surefire
+ if(rod.anchored && !rod.panel_open)
+ if(target_type != ROD)
+ arctargets = list()
+ arctargets += test
+ target_type = ROD
+
+ if(target_type > LIVING)
+ continue
+
+ if(isliving(test))
+ var/mob/living/alive = test
+ if(!(HAS_TRAIT(alive, TRAIT_TESLA_SHOCKIMMUNE)) && !(alive.flags_2 & SHOCKED_2) && alive.stat != DEAD && prob(20)) //let's not hit all the engineers with every beam and/or segment of the arc
+ if(target_type != LIVING)
+ arctargets = list()
+ arctargets += test
+ target_type = LIVING
+
+ if(target_type > MACHINERY)
+ continue
+
+ if(ismachinery(test))
+ var/obj/machinery/machine = test
+ if(!machine.being_shocked && prob(40))
+ if(target_type != MACHINERY)
+ arctargets = list()
+ arctargets += test
+ target_type = MACHINERY
+
+ if(target_type > OBJECT)
+ continue
+
+ if(isobj(test))
+ var/obj/object = test
+ if(!object.being_shocked)
+ if(target_type != OBJECT)
+ arctargets = list()
+ arctargets += test
+ target_type = OBJECT
+
+ if(length(arctargets)) //Pick from our pool
+ target = pick(arctargets)
+
+ if(!QDELETED(target)) //If we found something
+ //Do the animation to zap to it from here
+ if(!(zap_flags & ZAP_ALLOW_DUPLICATES))
+ LAZYSET(targets_hit, target, TRUE)
+ zapstart.Beam(target, icon_state = zap_icon, time = 5)
+ var/zapdir = get_dir(zapstart, target)
+ if(zapdir)
+ . = zapdir
+
+ //Going boom should be rareish
+ if(prob(80))
+ zap_flags &= ~ZAP_MACHINE_EXPLOSIVE
+ if(target_type == COIL)
+ //In the best situation we can expect this to grow up to 2120kw before a delam/IT'S GONE TOO FAR FRED SHUT IT DOWN
+ //The formula for power gen is zap_str * zap_mod / 2 * capacitor rating, between 1 and 4
+ var/multi = 10
+ switch(power)//Between 7k and 9k it's 20, above that it's 40
+ if(SEVERE_POWER_PENALTY_THRESHOLD to CRITICAL_POWER_PENALTY_THRESHOLD)
+ multi = 20
+ if(CRITICAL_POWER_PENALTY_THRESHOLD to INFINITY)
+ multi = 40
+ target.zap_act(zap_str * multi, zap_flags)
+ zap_str /= 3 //Coils should take a lot out of the power of the zap
+
+ else if(isliving(target))//If we got a fleshbag on our hands
+ var/mob/living/creature = target
+ creature.set_shocked()
+ addtimer(CALLBACK(creature, /mob/living/proc/reset_shocked), 10)
+ //3 shots a human with no resistance. 2 to crit, one to death. This is at at least 10000 power.
+ //There's no increase after that because the input power is effectivly capped at 10k
+ //Does 1.5 damage at the least
+ var/shock_damage = ((zap_flags & ZAP_MOB_DAMAGE) ? (power / 200) - 10 : rand(5, 10))
+ creature.electrocute_act(shock_damage, "Supermatter Discharge Bolt", 1, ((zap_flags & ZAP_MOB_STUN) ? SHOCK_TESLA : SHOCK_NOSTUN))
+ zap_str /= 1.5 //Meatsacks are conductive, makes working in pairs more destructive
+
+ else
+ zap_str = target.zap_act(zap_str, zap_flags)
+ //This gotdamn variable is a boomer and keeps giving me problems
+ var/turf/T = get_turf(target)
+ var/pressure = 1
+ if(T?.return_air())
+ var/datum/gas_mixture/G = T.return_air()
+ pressure = max(1, G.return_pressure())
+ //We get our range with the strength of the zap and the pressure, the higher the former and the lower the latter the better
+ var/new_range = clamp(zap_str / pressure * 10, 2, 7)
+ var/zap_count = 1
+ if(prob(5))
+ zap_str -= (zap_str / 10)
+ zap_count += 1
+ for(var/j in 1 to zap_count)
+ if(zap_count > 1)
+ targets_hit = targets_hit.Copy() //Pass by ref begone
+ supermatter_zap(target, new_range, zap_str, zap_flags, targets_hit)
+
+#undef HALLUCINATION_RANGE
+#undef GRAVITATIONAL_ANOMALY
+#undef FLUX_ANOMALY
+#undef PYRO_ANOMALY
+#undef COIL
+#undef ROD
+#undef LIVING
+#undef MACHINERY
+#undef OBJECT
+#undef LOWEST
diff --git a/code/modules/power/supermatter/wall.dm b/code/modules/power/supermatter/wall.dm
deleted file mode 100644
index afadcb23a46..00000000000
--- a/code/modules/power/supermatter/wall.dm
+++ /dev/null
@@ -1,74 +0,0 @@
-/turf/simulated/floor/plating/smatter
- name = "supermatter floor"
- icon_state = "smatter"
- light_color = "#8A8A00"
-
-/turf/simulated/floor/plating/smatter/New()
- ..()
-
- var/r = rand( 0, 3 )
- icon_state = "smatter[r]"
-
- spawn(2)
- var/list/step_overlays = list("s" = NORTH, "n" = SOUTH, "w" = EAST, "e" = WEST)
- for(var/direction in step_overlays)
- var/turf/turf_to_check = get_step(src,step_overlays[direction])
- if((istype(turf_to_check,/turf/space) || istype(turf_to_check,/turf/simulated/floor)) && !istype(turf_to_check,/turf/simulated/floor/plating/smatter))
- turf_to_check.overlays += image('icons/turf/floors.dmi', "smatter_side_[direction]")
-
-
-/turf/simulated/floor/plating/smatter/Destroy()
- . = ..()
-
- var/list/step_overlays = list("n" = NORTH, "s" = SOUTH, "e" = EAST, "w" = WEST)
- // Kill and update the space overlays around us.
- for(var/direction in step_overlays)
- var/turf/space/T = get_step(src, step_overlays[direction])
- if(istype(T))
- for(var/next_direction in step_overlays)
- if(istype(get_step(T, step_overlays[next_direction]),/turf/simulated/floor/plating/smatter))
- T.overlays += image('icons/turf/floors.dmi', "smatter_side_[next_direction]")
-
-/turf/simulated/wall/smatter
- name = "supermatter"
- desc = "thats a wall of supermatter"
- icon = 'icons/turf/walls.dmi'
- icon_state = "smatter"
- temperature = T20C+80
- density = 1
- opacity = 1
- blocks_air = 1
-
-
-/turf/simulated/smatter/New()
- ..()
-
- name = "supermatter"
- desc = "thats a wall of supermatter"
- icon = 'icons/turf/walls.dmi'
- icon_state = "smatter"
- temperature = T20C+80
- density = 1
- set_opacity(1)
- blocks_air = 1
-
- spawn(2)
- var/list/step_overlays = list("s" = NORTH, "n" = SOUTH, "w" = EAST, "e" = WEST)
- for(var/direction in step_overlays)
- var/turf/turf_to_check = get_step(src,step_overlays[direction])
- if(istype(turf_to_check,/turf/space) || istype(turf_to_check,/turf/simulated/floor))
- turf_to_check.overlays += image('icons/turf/walls.dmi', "smatter_side_[direction]")
-
-/turf/simulated/smatter/Destroy()
- . = ..()
-
- var/list/step_overlays = list("n" = NORTH, "s" = SOUTH, "e" = EAST, "w" = WEST)
- // Kill and update the space overlays around us.
- for(var/direction in step_overlays)
- var/turf/space/T = get_step(src, step_overlays[direction])
- if(istype(T))
- T.overlays.Cut()
- for(var/next_direction in step_overlays)
- if(istype(get_step(T, step_overlays[next_direction]),/turf/simulated/wall/smatter))
- T.overlays += image('icons/turf/walls.dmi', "smatter_side_[next_direction]")
-
diff --git a/code/modules/power/terminal.dm b/code/modules/power/terminal.dm
index e66128ba724..584079b3c45 100644
--- a/code/modules/power/terminal.dm
+++ b/code/modules/power/terminal.dm
@@ -27,7 +27,7 @@
/obj/machinery/power/terminal/hide(i)
if(i)
- invisibility = 101
+ invisibility = INVISIBILITY_MAXIMUM
icon_state = "term-f"
else
invisibility = 0
diff --git a/code/modules/power/tesla/coil.dm b/code/modules/power/tesla/coil.dm
index 5743bea8475..53be32d51c2 100644
--- a/code/modules/power/tesla/coil.dm
+++ b/code/modules/power/tesla/coil.dm
@@ -3,10 +3,15 @@
desc = "For the union!"
icon = 'icons/obj/tesla_engine/tesla_coil.dmi'
icon_state = "coil0"
- anchored = 0
- density = 1
+ anchored = FALSE
+ density = TRUE
- var/power_loss = 2
+ // Executing a traitor caught releasing tesla was never this fun!
+ can_buckle = TRUE
+ buckle_lying = 0
+ buckle_requires_restraints = TRUE
+
+ var/zap_flags = ZAP_MOB_DAMAGE | ZAP_OBJ_DAMAGE
var/input_power_multiplier = 1
var/zap_cooldown = 100
var/last_zap = 0
@@ -31,7 +36,12 @@
for(var/obj/item/stock_parts/capacitor/C in component_parts)
power_multiplier += C.rating
zap_cooldown -= (C.rating * 20)
- input_power_multiplier = power_multiplier
+ input_power_multiplier = (0.85 * (power_multiplier / 4)) //Max out at 85% efficency.
+
+/obj/machinery/power/tesla_coil/examine(mob/user)
+ . = ..()
+ if(in_range(user, src) || isobserver(user))
+ . += "The status display reads: Power generation at [input_power_multiplier*100]%. Shock interval at [zap_cooldown*0.1] seconds."
/obj/machinery/power/tesla_coil/attackby(obj/item/W, mob/user, params)
if(exchange_parts(user, W))
@@ -77,38 +87,45 @@
else
connect_to_network()
-/obj/machinery/power/tesla_coil/tesla_act(var/power)
+/obj/machinery/power/tesla_coil/zap_act(power, zap_flags)
if(anchored && !panel_open)
- being_shocked = 1
//don't lose arc power when it's not connected to anything
//please place tesla coils all around the station to maximize effectiveness
- var/power_produced = powernet ? power / power_loss : power
- add_avail(power_produced*input_power_multiplier)
+ being_shocked = TRUE
+ addtimer(CALLBACK(src, .proc/reset_shocked), 1 SECONDS)
+ zap_buckle_check(power)
+ if(zap_flags & ZAP_GENERATES_POWER) //I don't want no tesla revolver making 8GW you hear
+ return power / 2
+ var/power_produced = powernet ? power * input_power_multiplier : power
+ add_avail(power_produced)
flick("coilhit", src)
- playsound(src.loc, 'sound/magic/lightningshock.ogg', 100, 1, extrarange = 5)
- tesla_zap(src, 5, power_produced)
- addtimer(CALLBACK(src, .proc/reset_shocked), 10)
+ playsound(loc, 'sound/magic/lightningshock.ogg', 100, TRUE, extrarange = 5)
+ return power - power_produced //You get back the amount we didn't use
else
- ..()
+ . = ..()
/obj/machinery/power/tesla_coil/proc/zap()
if((last_zap + zap_cooldown) > world.time || !powernet)
return FALSE
last_zap = world.time
- var/coeff = (20 - ((input_power_multiplier - 1) * 3))
- coeff = max(coeff, 10)
- var/power = (powernet.avail/2)
+ var/power = (powernet.avail) * 0.2 * input_power_multiplier //Always always always use more then you output for the love of god
+ power = min(surplus(), power) //Take the smaller of the two
add_load(power)
- playsound(src.loc, 'sound/magic/lightningshock.ogg', 100, 1, extrarange = 5)
- tesla_zap(src, 10, power/(coeff/2))
+ playsound(loc, 'sound/magic/lightningshock.ogg', 100, TRUE, extrarange = 5)
+ tesla_zap(src, 10, power, zap_flags)
+ zap_buckle_check(power)
/obj/machinery/power/grounding_rod
name = "grounding rod"
- desc = "Keep an area from being fried from Edison's Bane."
+ desc = "Keeps an area from being fried by Edison's Bane."
icon = 'icons/obj/tesla_engine/tesla_coil.dmi'
icon_state = "grounding_rod0"
- anchored = 0
- density = 1
+ anchored = FALSE
+ density = TRUE
+
+ can_buckle = TRUE
+ buckle_lying = 0
+ buckle_requires_restraints = TRUE
/obj/machinery/power/grounding_rod/Initialize(mapload)
. = ..()
@@ -133,8 +150,10 @@
. = TRUE
default_deconstruction_crowbar(user, I)
-/obj/machinery/power/grounding_rod/tesla_act(var/power)
+/obj/machinery/power/grounding_rod/zap_act(power, zap_flags)
if(anchored && !panel_open)
flick("grounding_rodhit", src)
+ zap_buckle_check(power)
+ return FALSE
else
- ..()
+ . = ..()
diff --git a/code/modules/power/tesla/energy_ball.dm b/code/modules/power/tesla/energy_ball.dm
index 36faa49b533..a840c583128 100644
--- a/code/modules/power/tesla/energy_ball.dm
+++ b/code/modules/power/tesla/energy_ball.dm
@@ -1,6 +1,15 @@
#define TESLA_DEFAULT_POWER 1738260
#define TESLA_MINI_POWER 869130
+//Zap constants, speeds up targeting
+#define COIL (ROD + 1)
+#define ROD (RIDE + 1)
+#define RIDE (LIVING + 1)
+#define LIVING (MACHINERY + 1)
+#define MACHINERY (BLOB + 1)
+#define BLOB (STRUCTURE + 1)
+#define STRUCTURE (1)
+/// The Tesla engine
/obj/singularity/energy_ball
name = "energy ball"
desc = "An energy ball."
@@ -9,20 +18,30 @@
pixel_x = -32
pixel_y = -32
current_size = STAGE_TWO
- move_self = 1
+ move_self = TRUE
grav_pull = 0
- contained = 0
- density = 1
+ density = TRUE
energy = 0
- dissipate = 1
+ dissipate = FALSE
dissipate_delay = 5
dissipate_strength = 1
var/list/orbiting_balls = list()
+ var/miniball = FALSE
var/produced_power
var/energy_to_raise = 32
var/energy_to_lower = -20
+ var/list/shocked_things = list()
-/obj/singularity/energy_ball/ex_act(severity)
+/obj/singularity/energy_ball/Initialize(mapload, starting_energy = 50, is_miniball = FALSE)
+ miniball = is_miniball
+ . = ..()
+ if(!is_miniball)
+ set_light(10, 7, "#5e5edd")
+
+/obj/singularity/energy_ball/ex_act(severity, target)
+ return
+
+/obj/singularity/energy_ball/consume(severity, target)
return
/obj/singularity/energy_ball/Destroy()
@@ -32,43 +51,54 @@
orbiting = null
QDEL_LIST(orbiting_balls)
-
+ shocked_things.Cut()
return ..()
+/obj/singularity/energy_ball/admin_investigate_setup()
+ if(miniball)
+ return //don't annnounce miniballs
+ ..()
+
/obj/singularity/energy_ball/process()
if(!orbiting)
handle_energy()
- move_the_basket_ball(4 + orbiting_balls.len * 1.5)
+ move_the_basket_ball(4 + length(orbiting_balls) * 1.5)
- playsound(src.loc, 'sound/magic/lightningbolt.ogg', 100, 1, extrarange = 30)
+ playsound(loc, 'sound/magic/lightningbolt.ogg', 100, TRUE, extrarange = 30)
pixel_x = 0
pixel_y = 0
-
- setDir(tesla_zap(src, 7, TESLA_DEFAULT_POWER, TRUE))
+ shocked_things.Cut(1, length(shocked_things) / 1.3)
+ var/list/shocking_info = list()
+ tesla_zap(src, 3, TESLA_DEFAULT_POWER, shocked_targets = shocking_info)
pixel_x = -32
pixel_y = -32
for(var/ball in orbiting_balls)
- var/range = rand(1, clamp(orbiting_balls.len, 3, 7))
- tesla_zap(ball, range, TESLA_MINI_POWER/7*range, TRUE)
+ var/range = rand(1, clamp(length(orbiting_balls), 2, 3))
+ var/list/temp_shock = list()
+ //We zap off the main ball instead of ourselves to make things looks proper
+ tesla_zap(src, range, TESLA_MINI_POWER / 7 * range, shocked_targets = temp_shock)
+ shocking_info += temp_shock
+ shocked_things += shocking_info
else
- energy = 0 // ensure we dont have miniballs of miniballs
+ energy = 0 // ensure we dont have miniballs of miniballs //But it'll be cool broooooooooooooooo
/obj/singularity/energy_ball/examine(mob/user)
. = ..()
- var/len = LAZYLEN(orbiting_balls)
- if(len)
- . += "The amount of orbiting mini-balls is [len]."
+ if(length(orbiting_balls))
+ . += "There are [length(orbiting_balls)] mini-balls orbiting it."
-
-/obj/singularity/energy_ball/proc/move_the_basket_ball(var/move_amount)
- //we face the last thing we zapped, so this lets us favor that direction a bit
- var/first_move = dir
+/obj/singularity/energy_ball/proc/move_the_basket_ball(move_amount)
+ var/list/dirs = GLOB.alldirs.Copy()
+ if(length(shocked_things))
+ for(var/i in 1 to 30)
+ var/atom/real_thing = pick(shocked_things)
+ dirs += get_dir(src, real_thing) //Carry some momentum yeah? Just a bit tho
for(var/i in 0 to move_amount)
- var/move_dir = pick(GLOB.alldirs + first_move) //give the first move direction a bit of favoring.
- if(target && prob(60))
+ var/move_dir = pick(dirs) //ensures teslas don't just sit around
+ if(target && prob(10))
move_dir = get_dir(src,target)
var/turf/T = get_step(src, move_dir)
if(can_move(T))
@@ -77,29 +107,28 @@
for(var/mob/living/carbon/C in loc)
dust_mobs(C)
-
/obj/singularity/energy_ball/proc/handle_energy()
if(energy >= energy_to_raise)
energy_to_lower = energy_to_raise - 20
energy_to_raise = energy_to_raise * 1.25
- playsound(src.loc, 'sound/magic/lightning_chargeup.ogg', 100, 1, extrarange = 30)
+ playsound(src.loc, 'sound/magic/lightning_chargeup.ogg', 100, TRUE, extrarange = 30)
addtimer(CALLBACK(src, .proc/new_mini_ball), 100)
- else if(energy < energy_to_lower && orbiting_balls.len)
+ else if(energy < energy_to_lower && length(orbiting_balls))
energy_to_raise = energy_to_raise / 1.25
energy_to_lower = (energy_to_raise / 1.25) - 20
var/Orchiectomy_target = pick(orbiting_balls)
qdel(Orchiectomy_target)
- else if(orbiting_balls.len)
+ else if(length(orbiting_balls))
dissipate() //sing code has a much better system.
/obj/singularity/energy_ball/proc/new_mini_ball()
if(!loc)
return
- var/obj/singularity/energy_ball/EB = new(loc)
+ var/obj/singularity/energy_ball/EB = new(loc, 0, TRUE)
EB.transform *= pick(0.3, 0.4, 0.5, 0.6, 0.7)
var/icon/I = icon(icon,icon_state,dir)
@@ -109,12 +138,11 @@
EB.orbit(src, orbitsize, pick(FALSE, TRUE), rand(10, 25), pick(3, 4, 5, 6, 36))
-
/obj/singularity/energy_ball/Bump(atom/A)
dust_mobs(A)
-/obj/singularity/energy_ball/Bumped(atom/A)
- dust_mobs(A)
+/obj/singularity/energy_ball/Bumped(atom/movable/AM)
+ dust_mobs(AM)
/obj/singularity/energy_ball/attack_tk(mob/user)
if(iscarbon(user))
@@ -130,13 +158,12 @@
if(istype(target))
target.orbiting_balls += src
GLOB.poi_list -= src
- target.dissipate_strength = target.orbiting_balls.len
-
+ target.dissipate_strength = length(target.orbiting_balls)
. = ..()
if(istype(target))
target.orbiting_balls -= src
- target.dissipate_strength = target.orbiting_balls.len
+ target.dissipate_strength = length(target.orbiting_balls)
if(!loc)
qdel(src)
@@ -153,23 +180,26 @@
var/mob/living/carbon/C = A
C.dust()
-/proc/tesla_zap(atom/source, zap_range = 3, power, explosive = FALSE, stun_mobs = TRUE)
+/proc/tesla_zap(atom/source, zap_range = 3, power, zap_flags = ZAP_DEFAULT_FLAGS, list/shocked_targets = list())
+ if(QDELETED(source))
+ return
+ if(!(zap_flags & ZAP_ALLOW_DUPLICATES))
+ LAZYSET(shocked_targets, source, TRUE) //I don't want no null refs in my list yeah?
. = source.dir
if(power < 1000)
return
- var/closest_dist = 0
- var/closest_atom
- var/obj/machinery/power/tesla_coil/closest_tesla_coil
- var/obj/machinery/power/grounding_rod/closest_grounding_rod
- var/mob/living/closest_mob
- var/obj/machinery/closest_machine
- var/obj/structure/closest_structure
- var/obj/structure/blob/closest_blob
- var/static/things_to_shock = typecacheof(list(/obj/machinery, /mob/living, /obj/structure))
+ /*
+ THIS IS SO FUCKING UGLY AND I HATE IT, but I can't make it nice without making it slower, check*N rather then n. So we're stuck with it.
+ */
+ var/atom/closest_atom
+ var/closest_type = 0
+ var/static/things_to_shock = typecacheof(list(/obj/machinery, /mob/living, /obj/structure, /obj/vehicle))
var/static/blacklisted_tesla_types = typecacheof(list(/obj/machinery/atmospherics,
+ /obj/machinery/portable_atmospherics,
/obj/machinery/power/emitter,
/obj/machinery/field/generator,
+ /mob/living/simple_animal/slime,
/obj/machinery/particle_accelerator/control_box,
/obj/structure/particle_accelerator/fuel_chamber,
/obj/structure/particle_accelerator/particle_emitter/center,
@@ -184,109 +214,124 @@
/obj/machinery/camera,
/obj/structure/sign,
/obj/machinery/gateway,
+ /obj/structure/lattice,
/obj/structure/grille,
/obj/machinery/the_singularitygen/tesla,
- /mob/living/simple_animal/slime))
+ /obj/machinery/constructable_frame/machine_frame))
+ //Ok so we are making an assumption here. We assume that view() still calculates from the center out.
+ //This means that if we find an object we can assume it is the closest one of its type. This is somewhat of a speed increase.
+ //This also means we have no need to track distance, as the doview() proc does it all for us.
- for(var/A in typecache_filter_multi_list_exclusion(oview(source, zap_range+2), things_to_shock, blacklisted_tesla_types))
- if(istype(A, /obj/machinery/power/tesla_coil))
- var/dist = get_dist(source, A)
- var/obj/machinery/power/tesla_coil/C = A
- if(dist <= zap_range && (dist < closest_dist || !closest_tesla_coil) && !C.being_shocked)
- closest_dist = dist
-
- //we use both of these to save on istype and typecasting overhead later on
- //while still allowing common code to run before hand
- closest_tesla_coil = C
- closest_atom = C
-
-
- else if(closest_tesla_coil)
+ //Darkness fucks oview up hard. I've tried dview() but it doesn't seem to work
+ //I hate existance
+ for(var/a in typecache_filter_multi_list_exclusion(oview(zap_range + 2, source), things_to_shock, blacklisted_tesla_types))
+ var/atom/A = a
+ if(!(zap_flags & ZAP_ALLOW_DUPLICATES) && LAZYACCESS(shocked_targets, A))
+ continue
+ if(closest_type >= COIL)
continue //no need checking these other things
- else if(istype(A, /obj/machinery/power/grounding_rod))
- var/dist = get_dist(source, A)-2
- if(dist <= zap_range && (dist < closest_dist || !closest_grounding_rod))
- closest_grounding_rod = A
- closest_atom = A
- closest_dist = dist
+ else if(istype(A, /obj/machinery/power/tesla_coil))
+ var/obj/machinery/power/tesla_coil/C = A
+ if(!C.being_shocked)
+ closest_type = COIL
+ closest_atom = C
- else if(closest_grounding_rod)
+ else if(closest_type >= ROD)
+ continue
+
+ else if(istype(A, /obj/machinery/power/grounding_rod))
+ closest_type = ROD
+ closest_atom = A
+
+ else if(closest_type >= RIDE)
+ continue
+
+ else if(istype(A, /obj/vehicle))
+ var/obj/vehicle/R = A
+ if(R.can_buckle && !R.being_shocked)
+ closest_type = RIDE
+ closest_atom = A
+
+ else if(closest_type >= LIVING)
continue
else if(isliving(A))
- var/dist = get_dist(source, A)
var/mob/living/L = A
- if(dist <= zap_range && (dist < closest_dist || !closest_mob) && L.stat != DEAD && !L.tesla_ignore)
- closest_mob = L
+ if(L.stat != DEAD && !(HAS_TRAIT(L, TRAIT_TESLA_SHOCKIMMUNE)) && !(L.flags_2 & SHOCKED_2))
+ closest_type = LIVING
closest_atom = A
- closest_dist = dist
- else if(closest_mob)
+ else if(closest_type >= MACHINERY)
continue
- else if(istype(A, /obj/machinery))
+ else if(ismachinery(A))
var/obj/machinery/M = A
- var/dist = get_dist(source, A)
- if(dist <= zap_range && (dist < closest_dist || !closest_machine) && !M.being_shocked)
- closest_machine = M
+ if(!M.being_shocked)
+ closest_type = MACHINERY
closest_atom = A
- closest_dist = dist
- else if(closest_mob)
+ else if(closest_type >= BLOB)
continue
else if(istype(A, /obj/structure/blob))
var/obj/structure/blob/B = A
- var/dist = get_dist(source, A)
- if(dist <= zap_range && (dist < closest_dist || !closest_tesla_coil) && !B.being_shocked)
- closest_blob = B
+ if(!B.being_shocked)
+ closest_type = BLOB
closest_atom = A
- closest_dist = dist
- else if(closest_blob)
+ else if(closest_type >= STRUCTURE)
continue
else if(isstructure(A))
var/obj/structure/S = A
- var/dist = get_dist(source, A)
- if(dist <= zap_range && (dist < closest_dist || !closest_tesla_coil) && !S.being_shocked)
- closest_structure = S
+ if(!S.being_shocked)
+ closest_type = STRUCTURE
closest_atom = A
- closest_dist = dist
//Alright, we've done our loop, now lets see if was anything interesting in range
- if(closest_atom)
- //common stuff
- source.Beam(closest_atom, icon_state="lightning[rand(1,12)]", icon='icons/effects/effects.dmi', time=5)
- var/zapdir = get_dir(source, closest_atom)
- if(zapdir)
- . = zapdir
+ if(!closest_atom)
+ return
+ //common stuff
+ source.Beam(closest_atom, icon_state = "lightning[rand(1, 12)]", icon = 'icons/effects/effects.dmi', time = 5, maxdistance = INFINITY)
+ var/zapdir = get_dir(source, closest_atom)
+ if(zapdir)
+ . = zapdir
- //per type stuff:
- if(closest_tesla_coil)
- closest_tesla_coil.tesla_act(power, explosive)
+ var/next_range = 2
+ if(closest_type == COIL)
+ next_range = 5
- else if(closest_grounding_rod)
- closest_grounding_rod.tesla_act(power, explosive)
-
- else if(closest_mob)
- var/shock_damage = clamp(round(power/400), 10, 90) + rand(-5, 5)
- closest_mob.electrocute_act(shock_damage, source, 1, tesla_shock = TRUE)
+ if(closest_type == LIVING)
+ var/mob/living/closest_mob = closest_atom
+ closest_mob.set_shocked()
+ addtimer(CALLBACK(closest_mob, /mob/living/proc/reset_shocked), 10)
+ var/shock_damage = (zap_flags & ZAP_MOB_DAMAGE) ? (min(round(power / 600), 90) + rand(-5, 5)) : 0
+ closest_mob.electrocute_act(shock_damage, source, 1, SHOCK_TESLA | ((zap_flags & ZAP_MOB_STUN) ? NONE : SHOCK_NOSTUN))
if(issilicon(closest_mob))
var/mob/living/silicon/S = closest_mob
- if(stun_mobs)
- S.emp_act(2)
- tesla_zap(S, 7, power / 1.5, explosive, stun_mobs) // metallic folks bounce it further
+ if((zap_flags & ZAP_MOB_STUN) && (zap_flags & ZAP_MOB_DAMAGE))
+ S.emp_act(EMP_LIGHT)
+ next_range = 7 // metallic folks bounce it further
else
- tesla_zap(closest_mob, 5, power / 1.5, explosive, stun_mobs)
+ next_range = 5
+ power /= 1.5
- else if(closest_machine)
- closest_machine.tesla_act(power, explosive)
+ else
+ power = closest_atom.zap_act(power, zap_flags)
+ if(prob(20)) //I know I know
+ var/list/shocked_copy = shocked_targets.Copy()
+ tesla_zap(closest_atom, next_range, power * 0.5, zap_flags, shocked_copy) //Normally I'd copy here so grounding rods work properly, but it fucks with movement
+ tesla_zap(closest_atom, next_range, power * 0.5, zap_flags, shocked_targets)
+ shocked_targets += shocked_copy
+ else
+ tesla_zap(closest_atom, next_range, power, zap_flags, shocked_targets)
- else if(closest_blob)
- closest_blob.tesla_act(power, explosive)
-
- else if(closest_structure)
- closest_structure.tesla_act(power, explosive)
+#undef COIL
+#undef ROD
+#undef RIDE
+#undef LIVING
+#undef MACHINERY
+#undef BLOB
+#undef STRUCTURE
diff --git a/code/modules/power/tesla/generator.dm b/code/modules/power/tesla/generator.dm
index 63bce099fab..260f4128bcf 100644
--- a/code/modules/power/tesla/generator.dm
+++ b/code/modules/power/tesla/generator.dm
@@ -5,6 +5,6 @@
icon_state = "TheSingGen"
creation_type = /obj/singularity/energy_ball
-/obj/machinery/the_singularitygen/tesla/tesla_act(power, explosive = FALSE)
- if(explosive)
+/obj/machinery/the_singularitygen/tesla/zap_act(power, zap_flags)
+ if(zap_flags & ZAP_MACHINE_EXPLOSIVE)
energy += power
diff --git a/code/modules/procedural_mapping/mapGeneratorModules/nature.dm b/code/modules/procedural_mapping/mapGeneratorModules/nature.dm
index 09ca84574b1..e4cee07f7c5 100644
--- a/code/modules/procedural_mapping/mapGeneratorModules/nature.dm
+++ b/code/modules/procedural_mapping/mapGeneratorModules/nature.dm
@@ -28,7 +28,7 @@
//Grass turfs
/datum/mapGeneratorModule/bottomLayer/grassTurfs
- spawnableTurfs = list(/turf/unsimulated/floor/grass = 100)
+ spawnableTurfs = list(/turf/simulated/floor/grass = 100)
//Grass tufts with a high spawn chance
diff --git a/code/modules/procedural_mapping/mapGenerators/syndicate.dm b/code/modules/procedural_mapping/mapGenerators/syndicate.dm
index fc762354c32..620d88ca48a 100644
--- a/code/modules/procedural_mapping/mapGenerators/syndicate.dm
+++ b/code/modules/procedural_mapping/mapGenerators/syndicate.dm
@@ -1,10 +1,7 @@
// Modules
-/turf/simulated/shuttle/floor/syndicate //TODO: move to proper file/replace syndie shuttle turfs
- icon_state = "floor4"
-
/datum/mapGeneratorModule/bottomLayer/syndieFloor
- spawnableTurfs = list(/turf/simulated/shuttle/floor/syndicate = 100)
+ spawnableTurfs = list(/turf/simulated/floor/mineral/plastitanium/red = 100)
/datum/mapGeneratorModule/border/syndieWalls
spawnableAtoms = list()
diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm
index 5742e2d34bb..5bd4c4eb283 100644
--- a/code/modules/projectiles/guns/energy/special.dm
+++ b/code/modules/projectiles/guns/energy/special.dm
@@ -336,8 +336,6 @@
var/powercost = ""
var/powercostcolor = ""
-
- var/emagged = 0 //ups the temperature cap from 500 to 1000, targets hit by beams over 500 Kelvin will burst into flames
var/dat = ""
/obj/item/gun/energy/temperature/Initialize(mapload, ...)
diff --git a/code/modules/projectiles/projectile/energy.dm b/code/modules/projectiles/projectile/energy.dm
index 1781e1970eb..2a2131cc308 100644
--- a/code/modules/projectiles/projectile/energy.dm
+++ b/code/modules/projectiles/projectile/energy.dm
@@ -75,19 +75,22 @@
name = "shock bolt"
icon_state = "purple_laser"
impact_effect_type = /obj/effect/temp_visual/impact_effect/purple_laser
+ damage = 10 //A worse lasergun
+ var/zap_flags = ZAP_MOB_DAMAGE | ZAP_OBJ_DAMAGE
+ var/zap_range = 3
+ var/power = 10000
var/chain
/obj/item/ammo_casing/energy/shock_revolver/ready_proj(atom/target, mob/living/user, quiet, zone_override = "")
..()
var/obj/item/projectile/energy/shock_revolver/P = BB
spawn(1)
- P.chain = P.Beam(user,icon_state="purple_lightning",icon = 'icons/effects/effects.dmi',time=1000, maxdistance = 30)
+ P.chain = P.Beam(user, icon_state = "purple_lightning", icon = 'icons/effects/effects.dmi', time = 1000, maxdistance = 30)
/obj/item/projectile/energy/shock_revolver/on_hit(atom/target)
. = ..()
- if(isliving(target))
- tesla_zap(src, 3, 10000)
- qdel(chain)
+ tesla_zap(src, zap_range, power, zap_flags)
+ qdel(src)
/obj/item/projectile/energy/toxplasma
name = "plasma bolt"
diff --git a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm
index b78339e8ef7..71258e4fc0b 100644
--- a/code/modules/projectiles/projectile/special.dm
+++ b/code/modules/projectiles/projectile/special.dm
@@ -140,18 +140,18 @@
var/mob/living/carbon/human/H = M
if(IS_PLANT in H.dna.species.species_traits)
if(prob(15))
- M.apply_effect((rand(30,80)),IRRADIATE)
- M.Weaken(5)
- M.visible_message("[M] writhes in pain as [M.p_their()] vacuoles boil.", "You writhe in pain as your vacuoles boil!", "You hear the crunching of leaves.")
+ H.rad_act(rand(30, 80))
+ H.Weaken(5)
+ H.visible_message("[H] writhes in pain as [M.p_their()] vacuoles boil.", "You writhe in pain as your vacuoles boil!", "You hear the crunching of leaves.")
if(prob(80))
- randmutb(M)
- domutcheck(M,null)
+ randmutb(H)
+ domutcheck(H, null)
else
- randmutg(M)
- domutcheck(M,null)
+ randmutg(H)
+ domutcheck(H, null)
else
- M.adjustFireLoss(rand(5,15))
- M.show_message("The radiation beam singes you!")
+ H.adjustFireLoss(rand(5, 15))
+ H.show_message("The radiation beam singes you!")
else if(iscarbon(target))
M.show_message("The radiation beam dissipates harmlessly through your body.")
else
diff --git a/code/modules/reagents/chemistry/reagents/blob.dm b/code/modules/reagents/chemistry/reagents/blob.dm
index d3a157c9e2d..430586d5654 100644
--- a/code/modules/reagents/chemistry/reagents/blob.dm
+++ b/code/modules/reagents/chemistry/reagents/blob.dm
@@ -182,7 +182,7 @@
M.apply_damage(0.4 * volume, BURN)
if(M.reagents)
if(M.reagents.has_reagent("teslium") && prob(0.6 * volume))
- M.electrocute_act((0.5 * volume), "the blob's electrical discharge", 1, TRUE)
+ M.electrocute_act((0.5 * volume), "the blob's electrical discharge", 1, SHOCK_NOGLOVES)
M.reagents.del_reagent("teslium")
return //don't add more teslium after you shock it out of someone.
M.reagents.add_reagent("teslium", 0.125 * volume) // a little goes a long way
diff --git a/code/modules/reagents/chemistry/reagents/drugs.dm b/code/modules/reagents/chemistry/reagents/drugs.dm
index ea110581083..893d6c30837 100644
--- a/code/modules/reagents/chemistry/reagents/drugs.dm
+++ b/code/modules/reagents/chemistry/reagents/drugs.dm
@@ -409,7 +409,7 @@
to_chat(M, "You feel FUCKED UP!!!!!!")
M << 'sound/effects/singlebeat.ogg'
M.emote("faint")
- M.apply_effect(5, IRRADIATE, negate_armor = 1)
+ M.apply_effect(5, IRRADIATE)
M.adjustToxLoss(5)
M.adjustBrainLoss(10)
else
diff --git a/code/modules/reagents/chemistry/reagents/food.dm b/code/modules/reagents/chemistry/reagents/food.dm
index a0550221029..c517f0d4bd7 100644
--- a/code/modules/reagents/chemistry/reagents/food.dm
+++ b/code/modules/reagents/chemistry/reagents/food.dm
@@ -983,3 +983,11 @@
update_flags |= M.adjustBruteLoss(-1 * REAGENTS_EFFECT_MULTIPLIER, FALSE)
update_flags |= M.adjustFireLoss(-1 * REAGENTS_EFFECT_MULTIPLIER, FALSE)
return ..() | update_flags
+
+/datum/reagent/consumable/mint
+ name = "Mint"
+ id = "mint"
+ description = "A light green liquid extracted from mint leaves."
+ reagent_state = LIQUID
+ color = "#A7EE9F"
+ taste_description = "mint"
diff --git a/code/modules/reagents/chemistry/reagents/medicine.dm b/code/modules/reagents/chemistry/reagents/medicine.dm
index 894491056fc..1f3acb41f5a 100644
--- a/code/modules/reagents/chemistry/reagents/medicine.dm
+++ b/code/modules/reagents/chemistry/reagents/medicine.dm
@@ -411,7 +411,7 @@
/datum/reagent/medicine/potass_iodide/on_mob_life(mob/living/M)
if(prob(80))
- M.radiation = max(0, M.radiation-1)
+ M.radiation = max(0, M.radiation-10)
return ..()
/datum/reagent/medicine/pen_acid
@@ -428,7 +428,7 @@
for(var/datum/reagent/R in M.reagents.reagent_list)
if(R != src)
M.reagents.remove_reagent(R.id,4)
- M.radiation = max(0, M.radiation-7)
+ M.radiation = max(0, M.radiation-70)
if(prob(75))
update_flags |= M.adjustToxLoss(-4*REAGENTS_EFFECT_MULTIPLIER, FALSE)
if(prob(33))
diff --git a/code/modules/reagents/chemistry/reagents/pyrotechnic.dm b/code/modules/reagents/chemistry/reagents/pyrotechnic.dm
index fdc8e4ece15..f3b39d27cf7 100644
--- a/code/modules/reagents/chemistry/reagents/pyrotechnic.dm
+++ b/code/modules/reagents/chemistry/reagents/pyrotechnic.dm
@@ -203,8 +203,6 @@
S.create_reagents(volume)
S.reagents.add_reagent("thermite", volume)
S.thermite = TRUE
- S.overlays.Cut()
- S.overlays = image('icons/effects/effects.dmi', icon_state = "thermite")
if(S.active_hotspot)
S.reagents.temperature_reagents(S.active_hotspot.temperature, 10, 300)
diff --git a/code/modules/reagents/chemistry/reagents/toxins.dm b/code/modules/reagents/chemistry/reagents/toxins.dm
index 33092629a49..73e393ea66a 100644
--- a/code/modules/reagents/chemistry/reagents/toxins.dm
+++ b/code/modules/reagents/chemistry/reagents/toxins.dm
@@ -160,7 +160,7 @@
/datum/reagent/radium/on_mob_life(mob/living/M)
if(M.radiation < 80)
- M.apply_effect(4, IRRADIATE, negate_armor = 1)
+ M.apply_effect(4, IRRADIATE)
return ..()
/datum/reagent/radium/reaction_turf(turf/T, volume)
@@ -190,7 +190,7 @@
/datum/reagent/mutagen/on_mob_life(mob/living/M)
if(!M.dna)
return //No robots, AIs, aliens, Ians or other mobs should be affected by this.
- M.apply_effect(2*REAGENTS_EFFECT_MULTIPLIER, IRRADIATE, negate_armor = 1)
+ M.apply_effect(2 * REAGENTS_EFFECT_MULTIPLIER, IRRADIATE)
if(prob(4))
randmutb(M)
return ..()
@@ -215,7 +215,7 @@
/datum/reagent/stable_mutagen/on_mob_life(mob/living/M)
if(!ishuman(M) || !M.dna)
return
- M.apply_effect(2*REAGENTS_EFFECT_MULTIPLIER, IRRADIATE, negate_armor = 1)
+ M.apply_effect(2 * REAGENTS_EFFECT_MULTIPLIER, IRRADIATE)
if(current_cycle == 10 && islist(data))
if(istype(data["dna"], /datum/dna))
var/mob/living/carbon/human/H = M
@@ -241,7 +241,7 @@
taste_description = "the inside of a reactor"
/datum/reagent/uranium/on_mob_life(mob/living/M)
- M.apply_effect(2, IRRADIATE, negate_armor = 1)
+ M.apply_effect(2, IRRADIATE)
return ..()
/datum/reagent/uranium/reaction_turf(turf/T, volume)
@@ -472,7 +472,7 @@
taste_mult = 0
/datum/reagent/polonium/on_mob_life(mob/living/M)
- M.apply_effect(8, IRRADIATE, negate_armor = 1)
+ M.apply_effect(8, IRRADIATE)
return ..()
/datum/reagent/histamine
@@ -1182,7 +1182,7 @@
M.UpdateAppearance()
/datum/reagent/glowing_slurry/on_mob_life(mob/living/M)
- M.apply_effect(2, IRRADIATE, 0, negate_armor = 1)
+ M.apply_effect(2, IRRADIATE)
if(!M.dna)
return
var/did_mutation = FALSE
@@ -1233,10 +1233,22 @@
shock_timer++
if(shock_timer >= rand(5,30)) //Random shocks are wildly unpredictable
shock_timer = 0
- M.electrocute_act(rand(5, 20), "Teslium in their body", 1, TRUE) //Override because it's caused from INSIDE of you
+ M.electrocute_act(rand(5, 20), "Teslium in their body", 1, SHOCK_NOGLOVES) //Override because it's caused from INSIDE of you
playsound(M, "sparks", 50, 1)
return ..()
+/datum/reagent/teslium/on_mob_add(mob/living/M)
+ ..()
+ if(ishuman(M))
+ var/mob/living/carbon/human/H = M
+ H.dna.species.siemens_coeff *= 2
+
+/datum/reagent/teslium/on_mob_delete(mob/living/M)
+ if(ishuman(M))
+ var/mob/living/carbon/human/H = M
+ H.dna.species.siemens_coeff *= 0.5
+ ..()
+
/datum/reagent/gluttonytoxin
name = "Gluttony's Blessing"
id = "gluttonytoxin"
diff --git a/code/modules/reagents/chemistry/reagents/water.dm b/code/modules/reagents/chemistry/reagents/water.dm
index bd6efd5a5d7..f01325c4242 100644
--- a/code/modules/reagents/chemistry/reagents/water.dm
+++ b/code/modules/reagents/chemistry/reagents/water.dm
@@ -249,6 +249,12 @@
if(prob(5))
M.AdjustCultSlur(5)//5 seems like a good number...
M.say(pick("Av'te Nar'sie","Pa'lid Mors","INO INO ORA ANA","SAT ANA!","Daim'niodeis Arc'iai Le'eones","Egkau'haom'nai en Chaous","Ho Diak'nos tou Ap'iron","R'ge Na'sie","Diabo us Vo'iscum","Si gn'um Co'nu"))
+ if(isvampirethrall(M))
+ if(prob(10))
+ M.say(pick("*gasp", "*cough", "*sneeze"))
+ if(prob(5)) //Same as cult, for the real big tell
+ M.visible_message("A fog lifts from [M]'s eyes for a moment, but soon returns.")
+
if(current_cycle >= 75 && prob(33)) // 30 units, 150 seconds
M.AdjustConfused(3)
if(isvampirethrall(M))
diff --git a/code/modules/reagents/chemistry/recipes/medicine.dm b/code/modules/reagents/chemistry/recipes/medicine.dm
index f7fb78dcdec..6aa846298b0 100644
--- a/code/modules/reagents/chemistry/recipes/medicine.dm
+++ b/code/modules/reagents/chemistry/recipes/medicine.dm
@@ -280,3 +280,13 @@
result_amount = 3
min_temp = T0C + 100
mix_message = "The solution gently swirls with a metallic sheen."
+
+/datum/chemical_reaction/menthol
+ name = "Menthol"
+ id = "menthol"
+ result = "menthol"
+ required_reagents = list("mint" = 1, "ethanol" = 1)
+ result_amount = 1
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
+ min_temp = T0C + 50
+ mix_message = "Large white crystals precipitate out of the mixture."
diff --git a/code/modules/reagents/reagent_containers/applicator.dm b/code/modules/reagents/reagent_containers/applicator.dm
index 42f001d3de7..d7c53f1f5a3 100644
--- a/code/modules/reagents/reagent_containers/applicator.dm
+++ b/code/modules/reagents/reagent_containers/applicator.dm
@@ -11,7 +11,6 @@
temperature_min = 270
temperature_max = 350
var/ignore_flags = FALSE
- var/emagged = FALSE
var/applied_amount = 8 // How much it applies
var/applying = FALSE // So it can't be spammed.
var/measured_health = 0 // Used for measuring health; we don't want this to stop applying once the person's health isn't changing.
diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm
index 965717a4d77..d9929bfa51d 100644
--- a/code/modules/reagents/reagent_containers/hypospray.dm
+++ b/code/modules/reagents/reagent_containers/hypospray.dm
@@ -15,7 +15,6 @@
container_type = OPENCONTAINER
slot_flags = SLOT_BELT
var/ignore_flags = FALSE
- var/emagged = FALSE
var/safety_hypo = FALSE
/obj/item/reagent_containers/hypospray/attack(mob/living/M, mob/user)
diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm
index 690f0688b62..7e376b0ebaa 100644
--- a/code/modules/reagents/reagent_dispenser.dm
+++ b/code/modules/reagents/reagent_dispenser.dm
@@ -110,9 +110,10 @@
..()
boom()
-/obj/structure/reagent_dispensers/fueltank/tesla_act()
- ..() //extend the zap
- boom()
+/obj/structure/reagent_dispensers/fueltank/zap_act(power, zap_flags)
+ . = ..() //extend the zap
+ if(ZAP_OBJ_DAMAGE & zap_flags)
+ boom()
/obj/structure/reagent_dispensers/fueltank/examine(mob/user)
. = ..()
diff --git a/code/modules/recycling/disposal-construction.dm b/code/modules/recycling/disposal-construction.dm
index 44366341678..18820c4c703 100644
--- a/code/modules/recycling/disposal-construction.dm
+++ b/code/modules/recycling/disposal-construction.dm
@@ -69,7 +69,7 @@
// hide called by levelupdate if turf intact status changes
// change visibility status and force update of icon
/obj/structure/disposalconstruct/hide(var/intact)
- invisibility = (intact && level==1) ? 101: 0 // hide if floor is intact
+ invisibility = (intact && level == 1) ? INVISIBILITY_MAXIMUM : 0 // hide if floor is intact
update()
diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm
index 3df56d94ef0..7ca4ba37de4 100644
--- a/code/modules/recycling/disposal.dm
+++ b/code/modules/recycling/disposal.dm
@@ -17,6 +17,7 @@
on_blueprints = TRUE
armor = list("melee" = 25, "bullet" = 10, "laser" = 10, "energy" = 100, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 90, "acid" = 30)
max_integrity = 200
+ flags_2 = RAD_PROTECT_CONTENTS_2 | RAD_NO_CONTAMINATE_2
resistance_flags = FIRE_PROOF
var/datum/gas_mixture/air_contents // internal reservoir
var/mode = 1 // item mode 0=off 1=charging 2=charged
@@ -510,8 +511,9 @@
// this allows the gas flushed to be tracked
/obj/structure/disposalholder
- invisibility = 101
+ invisibility = INVISIBILITY_MAXIMUM
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
+ flags_2 = RAD_PROTECT_CONTENTS_2 | RAD_NO_CONTAMINATE_2
var/datum/gas_mixture/gas = null // gas used to flush, will appear at exit point
var/active = 0 // true if the holder is moving, otherwise inactive
dir = 0
@@ -688,6 +690,7 @@
max_integrity = 200
armor = list("melee" = 25, "bullet" = 10, "laser" = 10, "energy" = 100, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 90, "acid" = 30)
damage_deflection = 10
+ flags_2 = RAD_PROTECT_CONTENTS_2 | RAD_NO_CONTAMINATE_2
layer = DISPOSAL_PIPE_LAYER // slightly lower than wires and other pipes
var/base_icon_state // initial icon state on map
@@ -760,7 +763,7 @@
// hide called by levelupdate if turf intact status changes
// change visibility status and force update of icon
/obj/structure/disposalpipe/hide(var/intact)
- invisibility = intact ? 101: 0 // hide if floor is intact
+ invisibility = intact ? INVISIBILITY_MAXIMUM: 0 // hide if floor is intact
update_icon()
// update actual icon_state depending on visibility
@@ -1263,6 +1266,7 @@
icon_state = "outlet"
density = 1
anchored = 1
+ flags_2 = RAD_PROTECT_CONTENTS_2 | RAD_NO_CONTAMINATE_2
var/active = 0
var/turf/target // this will be where the output objects are 'thrown' to.
var/obj/structure/disposalpipe/trunk/linkedtrunk
diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm
index 6d274a47ed3..fd0a434e087 100644
--- a/code/modules/research/designs/autolathe_designs.dm
+++ b/code/modules/research/designs/autolathe_designs.dm
@@ -840,6 +840,14 @@
build_path = /obj/item/toy/crayon/spraycan
category = list("initial", "Tools")
+/datum/design/geiger
+ name = "Geiger Counter"
+ id = "geigercounter"
+ build_type = AUTOLATHE
+ materials = list(MAT_METAL = 150, MAT_GLASS = 150)
+ build_path = /obj/item/geiger_counter
+ category = list("initial", "Tools")
+
/datum/design/desttagger
name = "Destination tagger"
id = "desttagger"
diff --git a/code/modules/research/designs/equipment_designs.dm b/code/modules/research/designs/equipment_designs.dm
index af6fc828ad3..a2527ca6d64 100644
--- a/code/modules/research/designs/equipment_designs.dm
+++ b/code/modules/research/designs/equipment_designs.dm
@@ -91,6 +91,27 @@
build_path = /obj/item/clothing/glasses/meson
category = list("Equipment")
+
+/datum/design/engine_goggles
+ name = "Engineering Scanner Goggles"
+ desc = "Goggles used by engineers. The Meson Scanner mode lets you see basic structural and terrain layouts through walls, regardless of lighting condition. The T-ray Scanner mode lets you see underfloor objects such as cables and pipes."
+ id = "engine_goggles"
+ req_tech = list("materials" = 4, "magnets" = 3, "engineering" = 4, "plasmatech" = 3)
+ build_type = PROTOLATHE
+ materials = list(MAT_METAL = 500, MAT_GLASS = 500, MAT_PLASMA = 100)
+ build_path = /obj/item/clothing/glasses/meson/engine
+ category = list("Equipment")
+
+/datum/design/tray_goggles
+ name = "Optical T-Ray Scanners"
+ desc = "Used by engineering staff to see underfloor objects such as cables and pipes."
+ id = "tray_goggles"
+ req_tech = list("materials" = 3, "magnets" = 2, "engineering" = 2)
+ build_type = PROTOLATHE
+ materials = list(MAT_METAL = 500, MAT_GLASS = 500)
+ build_path = /obj/item/clothing/glasses/meson/engine/tray
+ category = list("Equipment")
+
/datum/design/nvgmesons
name = "Night Vision Optical Meson Scanners"
desc = "Prototype meson scanners fitted with an extra sensor which amplifies the visible light spectrum and overlays it to the UHD display."
diff --git a/code/modules/research/designs/misc_designs.dm b/code/modules/research/designs/misc_designs.dm
index 7d8b50d21be..2518d3fb2b8 100644
--- a/code/modules/research/designs/misc_designs.dm
+++ b/code/modules/research/designs/misc_designs.dm
@@ -98,7 +98,7 @@
req_tech = list("toxins" = 3)
build_type = PROTOLATHE
materials = list(MAT_METAL=500, MAT_GLASS=100)
- build_path = /obj/item/tank/emergency_oxygen/empty
+ build_path = /obj/item/tank/internals/emergency_oxygen/empty
category = list("Miscellaneous")
/datum/design/extended_oxygen
@@ -108,7 +108,7 @@
req_tech = list("toxins" = 4)
build_type = PROTOLATHE
materials = list(MAT_METAL=800, MAT_GLASS=100)
- build_path = /obj/item/tank/emergency_oxygen/engi/empty
+ build_path = /obj/item/tank/internals/emergency_oxygen/engi/empty
category = list("Miscellaneous")
/datum/design/double_oxygen
@@ -118,7 +118,7 @@
req_tech = list("toxins" = 5)
build_type = PROTOLATHE
materials = list(MAT_METAL=1500, MAT_GLASS=200)
- build_path = /obj/item/tank/emergency_oxygen/double/empty
+ build_path = /obj/item/tank/internals/emergency_oxygen/double/empty
category = list("Miscellaneous")
/datum/design/oxygen_tank
@@ -128,5 +128,5 @@
req_tech = list("toxins" = 5)
build_type = PROTOLATHE
materials = list(MAT_METAL=3000, MAT_GLASS=500)
- build_path = /obj/item/tank/oxygen/empty
+ build_path = /obj/item/tank/internals/oxygen/empty
category = list("Miscellaneous")
diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm
index 43cc010ac1c..76e9f4b4119 100644
--- a/code/modules/research/experimentor.dm
+++ b/code/modules/research/experimentor.dm
@@ -282,9 +282,7 @@
ejectItem()
if(prob(EFFECT_PROB_VERYLOW-badThingCoeff))
visible_message("[src] malfunctions, melting [exp_on] and leaking radiation!")
- for(var/mob/living/m in oview(1, src))
- m.apply_effect(25,IRRADIATE)
- investigate_log("Experimentor has irradiated [m]", "experimentor") //One entry per person so we know what was irradiated.
+ radiation_pulse(src, 500)
ejectItem(TRUE)
if(prob(EFFECT_PROB_LOW-badThingCoeff))
visible_message("[src] malfunctions, spewing toxic waste!")
diff --git a/code/modules/research/message_server.dm b/code/modules/research/message_server.dm
index 5dfc5b4b3bc..819011e4f18 100644
--- a/code/modules/research/message_server.dm
+++ b/code/modules/research/message_server.dm
@@ -95,7 +95,7 @@ GLOBAL_LIST_EMPTY(message_servers)
var/obj/machinery/requests_console/RC = C
if(ckey(RC.department) == ckey(recipient))
if(RC.inoperable())
- RC.message_log += "Message lost due to console failure. Please contact [station_name()]'s system administrator or AI for technical assistance."
+ RC.message_log.Add(list(list("Message lost due to console failure. Please contact [station_name()]'s system administrator or AI for technical assistance.")))
continue
if(RC.newmessagepriority < priority)
RC.newmessagepriority = priority
@@ -105,12 +105,12 @@ GLOBAL_LIST_EMPTY(message_servers)
if(!RC.silent)
playsound(RC.loc, 'sound/machines/twobeep.ogg', 50, 1)
RC.atom_say("PRIORITY Alert in [sender]")
- RC.message_log += "High Priority message from [sender]: [authmsg]"
+ RC.message_log.Add(list(list("High Priority message from [sender]:", "[authmsg]")))
else
if(!RC.silent)
playsound(RC.loc, 'sound/machines/twobeep.ogg', 50, 1)
RC.atom_say("Message from [sender]")
- RC.message_log += "Message [sender]: [authmsg]"
+ RC.message_log.Add(list(list("Message [sender]:", "[authmsg]")))
RC.set_light(2)
/obj/machinery/message_server/attack_hand(user as mob)
diff --git a/code/modules/response_team/ert_outfits.dm b/code/modules/response_team/ert_outfits.dm
index f7463b6d8be..1c093bc3c1d 100644
--- a/code/modules/response_team/ert_outfits.dm
+++ b/code/modules/response_team/ert_outfits.dm
@@ -231,8 +231,8 @@
shoes = /obj/item/clothing/shoes/magboots
gloves = /obj/item/clothing/gloves/color/yellow
suit = /obj/item/clothing/suit/space/hardsuit/ert/engineer
- suit_store = /obj/item/tank/emergency_oxygen/engi
- glasses = /obj/item/clothing/glasses/meson
+ suit_store = /obj/item/tank/internals/emergency_oxygen/engi
+ glasses = /obj/item/clothing/glasses/meson/engine
mask = /obj/item/clothing/mask/gas
l_pocket = /obj/item/gun/energy/gun/mini
@@ -251,14 +251,14 @@
gloves = /obj/item/clothing/gloves/color/yellow
belt = /obj/item/storage/belt/utility/chief/full
suit = /obj/item/clothing/suit/space/hardsuit/ert/engineer/gamma
- suit_store = /obj/item/tank/emergency_oxygen/engi
- glasses = /obj/item/clothing/glasses/meson
+ suit_store = /obj/item/tank/internals/emergency_oxygen/engi
+ glasses = /obj/item/clothing/glasses/meson/engine
mask = /obj/item/clothing/mask/gas
cybernetic_implants = list(
/obj/item/organ/internal/cyberimp/eyes/shield,
/obj/item/organ/internal/cyberimp/chest/nutriment
)
- l_pocket = /obj/item/t_scanner/extended_range
+ l_pocket = /obj/item/t_scanner
r_pocket = /obj/item/melee/classic_baton/telescopic
backpack_contents = list(
@@ -281,7 +281,7 @@
glasses = /obj/item/clothing/glasses/meson/night
mask = /obj/item/clothing/mask/gas/sechailer/swat
- l_pocket = /obj/item/t_scanner/extended_range
+ l_pocket = /obj/item/t_scanner
r_pocket = /obj/item/melee/classic_baton/telescopic
backpack_contents = list(
diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm
index c6124104307..1686be9b083 100644
--- a/code/modules/shuttle/emergency.dm
+++ b/code/modules/shuttle/emergency.dm
@@ -84,7 +84,6 @@
height = 11
dir = 4
travelDir = 0
- roundstart_move = "emergency_away"
var/sound_played = 0 //If the launch sound has been sent to all players on the shuttle itself
var/datum/announcement/priority/emergency_shuttle_docked = new(0, new_sound = sound('sound/AI/shuttledock.ogg'))
@@ -310,8 +309,8 @@
width = 3
height = 4
-/obj/docking_port/mobile/pod/New()
- ..()
+/obj/docking_port/mobile/pod/Initialize(mapload)
+ . = ..()
if(id == "pod")
WARNING("[type] id has not been changed from the default. Use the id convention \"pod1\" \"pod2\" etc.")
@@ -364,8 +363,6 @@
height = 8
dir = 4
- roundstart_move = "backup_away"
-
/obj/docking_port/mobile/emergency/backup/register()
var/current_emergency = SSshuttle.emergency
..()
diff --git a/code/modules/shuttle/ert.dm b/code/modules/shuttle/ert.dm
index ddb7bb343b6..b32f4b480a3 100644
--- a/code/modules/shuttle/ert.dm
+++ b/code/modules/shuttle/ert.dm
@@ -25,6 +25,4 @@
y_offset = 0
resistance_flags = INDESTRUCTIBLE
flags = NODECONSTRUCT
- access_tcomms = FALSE
- access_construction = FALSE
access_mining = FALSE
diff --git a/code/modules/shuttle/navigation_computer.dm b/code/modules/shuttle/navigation_computer.dm
index b73901cf2fa..4fabc5f48cf 100644
--- a/code/modules/shuttle/navigation_computer.dm
+++ b/code/modules/shuttle/navigation_computer.dm
@@ -11,10 +11,7 @@
var/shuttlePortName = "custom location"
var/list/jumpto_ports = list() //list of ports to jump to
var/access_station = TRUE //can we park near X?
- var/access_tcomms = TRUE
- var/access_construction = TRUE
var/access_mining = TRUE
- var/access_derelict = FALSE
var/obj/docking_port/stationary/my_port //the custom docking port placed by this console
var/obj/docking_port/mobile/shuttle_port //the mobile docking port of the connected shuttle
var/view_range = 7
@@ -29,17 +26,13 @@
. = ..()
GLOB.navigation_computers += src
if(access_station)
- jumpto_ports += list("nav_z1" = 1)
- if(access_tcomms)
- jumpto_ports += list("nav_z3" = 1)
+ jumpto_ports += list("nav_z[level_name_to_num(MAIN_STATION)]" = 1)
if(access_mining)
- jumpto_ports += list("nav_z5" = 1)
- if(access_derelict)
- jumpto_ports += list("nav_z6" = 1)
+ jumpto_ports += list("nav_z[level_name_to_num(MINING)]" = 1)
/obj/machinery/computer/camera_advanced/shuttle_docker/Destroy()
- . = ..()
GLOB.navigation_computers -= src
+ return ..()
/obj/machinery/computer/camera_advanced/shuttle_docker/attack_hand(mob/user)
if(!shuttle_port && !SSshuttle.getShuttle(shuttleId))
diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm
index 686f772e86a..5caae9905a0 100644
--- a/code/modules/shuttle/shuttle.dm
+++ b/code/modules/shuttle/shuttle.dm
@@ -168,8 +168,8 @@
/obj/docking_port/stationary/register()
if(!SSshuttle)
- throw EXCEPTION("docking port [src] could not initialize.")
- return 0
+ stack_trace("Docking port [src] could not initialize. SSshuttle doesnt exist!")
+ return FALSE
SSshuttle.stationary += src
if(!id)
@@ -229,9 +229,8 @@
var/obj/docking_port/stationary/destination
var/obj/docking_port/stationary/previous
-/obj/docking_port/mobile/New()
- ..()
-
+/obj/docking_port/mobile/Initialize(mapload)
+ . = ..()
var/area/A = get_area(src)
if(istype(A, /area/shuttle))
areaInstance = A
@@ -245,7 +244,6 @@
highlight("#0f0")
#endif
-/obj/docking_port/mobile/Initialize()
if(!timid)
register()
shuttle_areas = list()
@@ -255,12 +253,10 @@
var/area/cur_area = curT.loc
if(istype(cur_area, areaInstance))
shuttle_areas[cur_area] = TRUE
- ..()
/obj/docking_port/mobile/register()
if(!SSshuttle)
- throw EXCEPTION("docking port [src] could not initialize.")
- return 0
+ CRASH("Docking port [src] could not initialize. SSshuttle doesnt exist!")
SSshuttle.mobile += src
@@ -322,7 +318,7 @@
else
var/msg = "check_dock(): shuttle [src] cannot dock at [S], error: [status]"
message_admins(msg)
- throw EXCEPTION(msg)
+ stack_trace(msg)
return FALSE
@@ -912,8 +908,6 @@
x_offset = 0
y_offset = 0
resistance_flags = INDESTRUCTIBLE
- access_tcomms = TRUE
- access_construction = TRUE
access_mining = TRUE
/obj/machinery/computer/shuttle/trade
@@ -959,8 +953,9 @@
T.icon_state = icon_state
if(T.icon != icon)
T.icon = icon
- if(T.color != color)
- T.color = color
+ if(color)
+ T.atom_colours = atom_colours.Copy()
+ T.update_atom_colour()
if(T.dir != dir)
- T.dir = dir
+ T.setDir(dir)
return T
diff --git a/code/modules/shuttle/supply.dm b/code/modules/shuttle/supply.dm
index 2bce922f05d..412f93ea7eb 100644
--- a/code/modules/shuttle/supply.dm
+++ b/code/modules/shuttle/supply.dm
@@ -14,7 +14,6 @@
width = 12
dwidth = 5
height = 7
- roundstart_move = "supply_away"
/obj/docking_port/mobile/supply/register()
if(!..())
diff --git a/code/modules/shuttle/vox.dm b/code/modules/shuttle/vox.dm
index 6d67e87e415..713389e325a 100644
--- a/code/modules/shuttle/vox.dm
+++ b/code/modules/shuttle/vox.dm
@@ -18,4 +18,3 @@
y_offset = -10
resistance_flags = INDESTRUCTIBLE
flags = NODECONSTRUCT
- access_derelict = TRUE
diff --git a/code/modules/spacepods/equipment.dm b/code/modules/spacepods/equipment.dm
index abe3bdf4643..b1b5e489108 100644
--- a/code/modules/spacepods/equipment.dm
+++ b/code/modules/spacepods/equipment.dm
@@ -252,8 +252,8 @@ GLOBAL_LIST_EMPTY(pod_trackers)
icon_state = "lock_tumbler"
var/static/id_source = 0
-/obj/item/spacepod_equipment/lock/keyed/New()
- ..()
+/obj/item/spacepod_equipment/lock/keyed/Initialize(mapload)
+ . = ..()
id = ++id_source
// The key
diff --git a/code/modules/spacepods/spacepod.dm b/code/modules/spacepods/spacepod.dm
index 26144761e66..12bcd14911b 100644
--- a/code/modules/spacepods/spacepod.dm
+++ b/code/modules/spacepods/spacepod.dm
@@ -91,33 +91,40 @@
/obj/spacepod/get_cell()
return battery
-/obj/spacepod/New()
+/obj/spacepod/Initialize(mapload)
. = ..()
if(!pod_overlays)
pod_overlays = new/list(2)
pod_overlays[DAMAGE] = image(icon, icon_state="pod_damage")
pod_overlays[FIRE] = image(icon, icon_state="pod_fire")
+
if(!pod_paint_effect)
pod_paint_effect = new/list(4)
pod_paint_effect[POD_LIGHT] = image(icon,icon_state = "LIGHTS")
pod_paint_effect[WINDOW] = image(icon,icon_state = "Windows")
pod_paint_effect[RIM] = image(icon,icon_state = "RIM")
pod_paint_effect[PAINT] = image(icon,icon_state = "PAINT")
+
bound_width = 64
bound_height = 64
dir = EAST
battery = new battery_type(src)
+
add_cabin()
add_airtank()
- src.use_internal_tank = 1
+
+ use_internal_tank = TRUE
equipment_system = new(src)
equipment_system.installed_modules += battery
+
GLOB.spacepods_list += src
+
cargo_hold = new/obj/item/storage/internal(src)
cargo_hold.w_class = 5 //so you can put bags in
cargo_hold.storage_slots = 0 //You need to install cargo modules to use it.
cargo_hold.max_w_class = 5 //fit almost anything
cargo_hold.max_combined_w_class = 0 //you can optimize your stash with larger items
+
START_PROCESSING(SSobj, src)
RegisterSignal(src, COMSIG_MOVABLE_MOVED, .proc/create_trail)
@@ -603,24 +610,27 @@
/obj/spacepod/syndi/unlocked
unlocked = TRUE
-/obj/spacepod/sec/New()
- ..()
+/obj/spacepod/sec/Initialize(mapload)
+ . = ..()
var/obj/item/spacepod_equipment/weaponry/burst_taser/T = new /obj/item/spacepod_equipment/weaponry/taser
T.loc = equipment_system
equipment_system.weapon_system = T
equipment_system.weapon_system.my_atom = src
equipment_system.installed_modules += T
+
var/obj/item/spacepod_equipment/misc/tracker/L = new /obj/item/spacepod_equipment/misc/tracker
L.loc = equipment_system
equipment_system.misc_system = L
equipment_system.misc_system.my_atom = src
equipment_system.installed_modules += L
+
var/obj/item/spacepod_equipment/sec_cargo/chair/C = new /obj/item/spacepod_equipment/sec_cargo/chair
C.loc = equipment_system
equipment_system.sec_cargo_system = C
equipment_system.sec_cargo_system.my_atom = src
equipment_system.installed_modules += C
max_passengers = 1
+
var/obj/item/spacepod_equipment/lock/keyed/K = new /obj/item/spacepod_equipment/lock/keyed
K.loc = equipment_system
equipment_system.lock_system = K
@@ -628,8 +638,8 @@
equipment_system.lock_system.id = 100000
equipment_system.installed_modules += K
-/obj/spacepod/random/New()
- ..()
+/obj/spacepod/random/Initialize(mapload)
+ . = ..()
icon_state = pick("pod_civ", "pod_black", "pod_mil", "pod_synd", "pod_gold", "pod_industrial")
switch(icon_state)
if("pod_civ")
diff --git a/code/modules/station_goals/dna_vault.dm b/code/modules/station_goals/dna_vault.dm
index c03ea48c92b..ab5fadb5516 100644
--- a/code/modules/station_goals/dna_vault.dm
+++ b/code/modules/station_goals/dna_vault.dm
@@ -306,7 +306,8 @@ GLOBAL_LIST_INIT(non_simple_animals, typecacheof(list(/mob/living/carbon/human/m
to_chat(H, "You feel resistant to airborne toxins.")
var/obj/item/organ/internal/lungs/L = H.get_int_organ(/obj/item/organ/internal/lungs)
if(L)
- L.tox_breath_dam_multiplier = 0
+ L.tox_breath_dam_min = 0
+ L.tox_breath_dam_max = 0
S.species_traits |= VIRUSIMMUNE
if(VAULT_NOBREATH)
to_chat(H, "Your lungs feel great.")
diff --git a/code/modules/surgery/organs/augments_internal.dm b/code/modules/surgery/organs/augments_internal.dm
index 53090e761cb..ba186aaa272 100644
--- a/code/modules/surgery/organs/augments_internal.dm
+++ b/code/modules/surgery/organs/augments_internal.dm
@@ -235,12 +235,22 @@
/obj/item/organ/internal/cyberimp/brain/speech_translator/emp_act(severity)
if(emp_proof)
return
- if(owner && active)
- to_chat(owner, "Your translator's safeties trigger, it is now turned off.")
+ if(owner && active && !crit_fail)
+ to_chat(owner, "Your translator implant shuts down with a harsh buzz.")
+ addtimer(CALLBACK(src, .proc/reboot), 60 SECONDS)
+ crit_fail = TRUE
active = FALSE
+/obj/item/organ/internal/cyberimp/brain/speech_translator/proc/reboot()
+ crit_fail = FALSE
+ if(owner)
+ to_chat(owner, "Your translator implant beeps.")
+ SEND_SOUND(owner, 'sound/machines/twobeep.ogg')
+
/obj/item/organ/internal/cyberimp/brain/speech_translator/ui_action_click()
- if(owner && !active)
+ if(owner && crit_fail)
+ to_chat(owner, "The implant is still rebooting.")
+ else if(owner && !active)
to_chat(owner, "You turn on your translator implant.")
active = TRUE
else if(owner && active)
diff --git a/code/modules/surgery/organs/heart.dm b/code/modules/surgery/organs/heart.dm
index 8308a793ca9..e6afe6054cf 100644
--- a/code/modules/surgery/organs/heart.dm
+++ b/code/modules/surgery/organs/heart.dm
@@ -153,7 +153,6 @@
icon_state = "heart-c-u-on"
icon_base = "heart-c-u"
dead_icon = "heart-c-u-off"
- var/emagged = FALSE
var/attempted_restart = FALSE
/obj/item/organ/internal/heart/cybernetic/upgraded/on_life()
diff --git a/code/modules/surgery/organs/lungs.dm b/code/modules/surgery/organs/lungs.dm
index 34b83d9fe7f..cb399360f30 100644
--- a/code/modules/surgery/organs/lungs.dm
+++ b/code/modules/surgery/organs/lungs.dm
@@ -21,14 +21,18 @@
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/oxy_breath_dam_multiplier = 1
+ var/nitro_breath_dam_min = MIN_TOXIC_GAS_DAMAGE
+ var/nitro_breath_dam_max = MAX_TOXIC_GAS_DAMAGE
var/nitro_damage_type = OXY
- var/nitro_breath_dam_multiplier = 1
+ var/co2_breath_dam_min = MIN_TOXIC_GAS_DAMAGE
+ var/co2_breath_dam_max = MAX_TOXIC_GAS_DAMAGE
var/co2_damage_type = OXY
- var/co2_breath_dam_multiplier = 1
+ var/tox_breath_dam_min = MIN_TOXIC_GAS_DAMAGE
+ var/tox_breath_dam_max = MAX_TOXIC_GAS_DAMAGE
var/tox_damage_type = TOX
- var/tox_breath_dam_multiplier = 1
var/cold_message = "your face freezing and an icicle forming"
var/cold_level_1_threshold = 260
@@ -118,8 +122,8 @@
//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
- H.apply_damage_type(ratio * 325 * oxy_breath_dam_multiplier, oxy_damage_type)
+ var/ratio = (breath.oxygen / safe_oxygen_max / 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")
@@ -144,8 +148,8 @@
//Too much nitrogen!
if(safe_nitro_max)
if(N2_pp > safe_nitro_max)
- var/ratio = breath.nitrogen/safe_nitro_max
- H.apply_damage_type(ratio * 325 * nitro_breath_dam_multiplier, nitro_damage_type)
+ 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")
@@ -174,9 +178,9 @@
H.co2overloadtime = world.time
else if(world.time - H.co2overloadtime > 120)
H.Paralyse(3)
- H.apply_damage_type(HUMAN_MAX_OXYLOSS * co2_breath_dam_multiplier, co2_damage_type) // Lets hurt em a little, let them know we mean business
+ H.apply_damage_type(HUMAN_MAX_OXYLOSS, 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(15 * co2_breath_dam_multiplier, co2_damage_type)
+ H.apply_damage_type(15, 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")
@@ -206,8 +210,8 @@
//Too much toxins!
if(safe_toxins_max)
if(Toxins_pp > safe_toxins_max)
- var/ratio = breath.toxins/safe_toxins_max
- H.apply_damage_type(ratio * 325 * tox_breath_dam_multiplier, tox_damage_type)
+ 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")
@@ -324,7 +328,6 @@
safe_oxygen_max = 0.05 //This is toxic to us
safe_nitro_min = 16 //We breathe THIS!
oxy_damage_type = TOX //And it poisons us
- oxy_breath_dam_multiplier = 0.16
/obj/item/organ/internal/lungs/drask
icon = 'icons/obj/species_organs/drask.dmi'
diff --git a/code/modules/surgery/organs/organ_external.dm b/code/modules/surgery/organs/organ_external.dm
index 10c47f1eae6..21ac34a16c6 100644
--- a/code/modules/surgery/organs/organ_external.dm
+++ b/code/modules/surgery/organs/organ_external.dm
@@ -7,7 +7,7 @@
max_damage = 0
dir = SOUTH
organ_tag = "limb"
-
+ flags_2 = RAD_PROTECT_CONTENTS_2 | RAD_NO_CONTAMINATE_2 // On Para, external organs have a loc, ergo they need this.
var/brute_mod = 1
var/burn_mod = 1
diff --git a/code/modules/surgery/organs/parasites.dm b/code/modules/surgery/organs/parasites.dm
index b9afa20b7d2..84b2cf1695b 100644
--- a/code/modules/surgery/organs/parasites.dm
+++ b/code/modules/surgery/organs/parasites.dm
@@ -52,9 +52,13 @@
var/egg_progress = 0 // # of on_life() cycles completed, unlike cycle_num this is reset on each hatch event
var/egg_progress_per_hatch = 90 // if egg_progress > this, chance to hatch and reset egg_progress
var/eggs_hatched = 0 // num of hatch events completed
- var/awaymission_checked = FALSE
var/awaymission_infection = FALSE // TRUE if infection occurred inside gateway
+/obj/item/organ/internal/body_egg/terror_eggs/Initialize(mapload)
+ . = ..()
+ var/turf/T = get_turf(src)
+ if(istype(T) && is_away_level(T.z))
+ awaymission_infection = TRUE
/obj/item/organ/internal/body_egg/terror_eggs/on_life()
// Safety first.
@@ -67,10 +71,6 @@
egg_progress += calc_variable_progress()
// Detect & stop people attempting to bring a gateway white spider infection back to the main station.
- if(!awaymission_checked)
- awaymission_checked = TRUE
- if(is_away_level(owner.z))
- awaymission_infection = TRUE
if(awaymission_infection)
var/turf/T = get_turf(owner)
if(istype(T) && !is_away_level(T.z))
diff --git a/code/modules/telesci/gps.dm b/code/modules/telesci/gps.dm
index 0945885a988..94639805985 100644
--- a/code/modules/telesci/gps.dm
+++ b/code/modules/telesci/gps.dm
@@ -1,4 +1,13 @@
GLOBAL_LIST_EMPTY(GPS_list)
+
+#define EMP_DISABLE_TIME 30 SECONDS
+#define POS_VECTOR(A) list(A.x, A.y, A.z)
+
+/**
+ * # GPS
+ *
+ * A small item that reports its current location. Has a tag to help distinguish between them.
+ */
/obj/item/gps
name = "default gps"
desc = "Helping lost spacemen find their way through the planets since 2016."
@@ -7,97 +16,136 @@ GLOBAL_LIST_EMPTY(GPS_list)
w_class = WEIGHT_CLASS_SMALL
slot_flags = SLOT_BELT
origin_tech = "materials=2;magnets=1;bluespace=2"
- var/gpstag = "COM0"
- var/emped = 0
- var/turf/locked_location
+ /// Whether the GPS is on.
var/tracking = TRUE
- var/local = FALSE //local gps show up only to gps on same z level
+ /// The tag that is visible to other GPSes.
+ var/gpstag = "COM0"
+ /// Whether to only list signals that are on the same Z-level.
+ var/same_z = FALSE
+ /// Whether the GPS should only show up to GPSes on the same Z-level.
+ var/local = FALSE
+ /// Whether the GPS is EMPed, disabling it temporarily.
+ var/emped = FALSE
+ /// Turf reference. If set, it will appear in the UI. Used by [/obj/machinery/computer/telescience].
+ var/turf/locked_location
-/obj/item/gps/New()
- ..()
+/obj/item/gps/Initialize(mapload)
+ . = ..()
GLOB.GPS_list.Add(src)
GLOB.poi_list.Add(src)
- if(name == "default gps") //use default naming scheme
+ if(name == initial(name))
name = "global positioning system ([gpstag])"
- overlays += "working"
+ update_icon()
/obj/item/gps/Destroy()
GLOB.GPS_list.Remove(src)
GLOB.poi_list.Remove(src)
return ..()
-/obj/item/gps/emp_act(severity)
- emped = 1
- overlays -= "working"
- overlays += "emp"
- addtimer(CALLBACK(src, .proc/reboot), 300)
+/obj/item/gps/update_icon()
+ cut_overlays()
+ if(emped)
+ add_overlay("emp")
+ else if(tracking)
+ add_overlay("working")
-/obj/item/gps/proc/reboot()
- emped = FALSE
- overlays -= "emp"
- overlays += "working"
+/obj/item/gps/emp_act(severity)
+ emped = TRUE
+ update_icon()
+ addtimer(CALLBACK(src, .proc/reboot), EMP_DISABLE_TIME)
/obj/item/gps/AltClick(mob/user)
if(ui_status(user, GLOB.inventory_state) != STATUS_INTERACTIVE)
- return 1 //user not valid to use gps
+ return //user not valid to use gps
if(emped)
to_chat(user, "It's busted!")
- if(tracking)
- overlays -= "working"
- to_chat(user, "[src] is no longer tracking, or visible to other GPS devices.")
- tracking = FALSE
- else
- overlays += "working"
- to_chat(user, "[src] is now tracking, and visible to other GPS devices.")
- tracking = TRUE
-
-/obj/item/gps/attack_self(mob/user as mob)
- if(!tracking)
- to_chat(user, "[src] is turned off. Use alt+click to toggle it back on.")
return
- var/obj/item/gps/t = ""
- var/gps_window_height = 110 + GLOB.GPS_list.len * 20 // Variable window height, depending on how many GPS units there are to show
- if(emped)
- t += "ERROR"
+ tracking = !tracking
+ update_icon()
+ if(tracking)
+ to_chat(user, "[src] is now tracking, and visible to other GPS devices.")
else
- t += " Set Tag "
- t += " Tag: [gpstag]"
- if(locked_location && locked_location.loc)
- t += " Bluespace coordinates saved: [locked_location.loc]"
- gps_window_height += 20
+ to_chat(user, "[src] is no longer tracking, or visible to other GPS devices.")
+ SStgui.update_uis(src)
- var/turf/own_pos = get_turf(src)
- var/own_z = own_pos.z
- for(var/obj/item/gps/G in GLOB.GPS_list)
- var/turf/pos = get_turf(G)
- var/area/gps_area = get_area(G)
- var/tracked_gpstag = G.gpstag
- if(G.emped == 1)
- t += " [tracked_gpstag]: ERROR"
- else if(G.tracking && (!G.local || (own_z == pos.z)))
- t += " [tracked_gpstag]: [format_text(gps_area.name)] ([pos.x], [pos.y], [pos.z])"
- else
- continue
+/obj/item/gps/ui_data(mob/user)
+ var/list/data = list()
+ if(emped)
+ data["emped"] = TRUE
+ return data
- var/datum/browser/popup = new(user, "GPS", name, 360, min(gps_window_height, 800))
- popup.set_content(t)
- popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state))
- popup.open()
+ // General
+ data["active"] = tracking
+ data["tag"] = gpstag
+ data["same_z"] = same_z
+ if(!tracking)
+ return data
+ var/turf/T = get_turf(src)
+ data["area"] = get_area_name(src, TRUE)
+ data["position"] = POS_VECTOR(T)
-/obj/item/gps/Topic(href, href_list)
+ // Saved location
+ if(locked_location)
+ data["saved"] = POS_VECTOR(locked_location)
+ else
+ data["saved"] = null
+
+ // GPS signals
+ var/signals = list()
+ for(var/g in GLOB.GPS_list)
+ var/obj/item/gps/G = g
+ var/turf/GT = get_turf(G)
+ if(!G.tracking || G == src)
+ continue
+ if((G.local || same_z) && (GT.z != T.z))
+ continue
+
+ var/list/signal = list("tag" = G.gpstag, "area" = null, "position" = null)
+ if(!G.emped)
+ signal["area"] = get_area_name(G, TRUE)
+ signal["position"] = POS_VECTOR(GT)
+ signals += list(signal)
+ data["signals"] = signals
+
+ return data
+
+/obj/item/gps/attack_self(mob/user)
+ ui_interact(user)
+
+/obj/item/gps/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.inventory_state)
+ ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+ if(!ui)
+ ui = new(user, src, ui_key, "GPS", "GPS", 450, 700)
+ ui.open()
+
+/obj/item/gps/ui_act(action, list/params)
if(..())
- return 1
+ return
- if(href_list["tag"] )
- var/tag = input("Please enter desired tag.", name, gpstag) as text|null
- if(!tag || ..())
- return TRUE
+ . = TRUE
+ switch(action)
+ if("tag")
+ var/newtag = params["newtag"] || ""
+ newtag = uppertext(paranoid_sanitize(copytext(newtag, 1, 5)))
+ if(!length(newtag) || gpstag == newtag)
+ return
+ gpstag = newtag
+ name = "global positioning system ([gpstag])"
+ if("toggle")
+ AltClick(usr)
+ return FALSE
+ if("same_z")
+ same_z = !same_z
+ else
+ return FALSE
- tag = uppertext(sanitize(copytext(tag, 1, 5)))
- gpstag = tag
- name = "global positioning system ([gpstag])"
- attack_self(usr)
+/**
+ * Turns off the GPS's EMPed state. Called automatically after an EMP.
+ */
+/obj/item/gps/proc/reboot()
+ emped = FALSE
+ update_icon()
/obj/item/gps/science
icon_state = "gps-s"
@@ -169,3 +217,6 @@ GLOBAL_LIST_EMPTY(GPS_list)
tagged = null
STOP_PROCESSING(SSfastprocess, src)
. = ..()
+
+#undef EMP_DISABLE_TIME
+#undef POS_VECTOR
diff --git a/code/modules/telesci/rcs.dm b/code/modules/telesci/rcs.dm
index 13d0383b145..28475ce55d8 100644
--- a/code/modules/telesci/rcs.dm
+++ b/code/modules/telesci/rcs.dm
@@ -27,8 +27,6 @@
var/teleporting = FALSE
/// How much power does each teleport use?
var/chargecost = 1000
- /// Is emagged?
- var/emagged = FALSE
/obj/item/rcs/get_cell()
return rcell
diff --git a/code/modules/tgs/core/core.dm b/code/modules/tgs/core/core.dm
index f75e7837af0..41a04733945 100644
--- a/code/modules/tgs/core/core.dm
+++ b/code/modules/tgs/core/core.dm
@@ -40,7 +40,7 @@
if(5)
api_datum = /datum/tgs_api/v5
- var/datum/tgs_version/max_api_version = TgsMaximumAPIVersion();
+ var/datum/tgs_version/max_api_version = TgsMaximumApiVersion();
if(version.suite != null && version.minor != null && version.patch != null && version.deprecated_patch != null && version.deprefixed_parameter > max_api_version.deprefixed_parameter)
TGS_ERROR_LOG("Detected unknown API version! Defaulting to latest. Update the DMAPI to fix this problem.")
api_datum = /datum/tgs_api/latest
@@ -64,10 +64,10 @@
TGS_WRITE_GLOBAL(tgs, null)
TGS_ERROR_LOG("Failed to activate API!")
-/world/TgsMaximumAPIVersion()
+/world/TgsMaximumApiVersion()
return new /datum/tgs_version("5.x.x")
-/world/TgsMinimumAPIVersion()
+/world/TgsMinimumApiVersion()
return new /datum/tgs_version("3.2.x")
/world/TgsInitializationComplete()
diff --git a/code/modules/tgs/v3210/api.dm b/code/modules/tgs/v3210/api.dm
index 5b41e6a89d8..245381b93ea 100644
--- a/code/modules/tgs/v3210/api.dm
+++ b/code/modules/tgs/v3210/api.dm
@@ -160,7 +160,7 @@
var/datum/tgs_revision_information/test_merge/tm = new
tm.number = text2num(I)
var/list/entry = json[I]
- tm.pull_request_commit = entry["commit"]
+ tm.head_commit = entry["commit"]
tm.author = entry["author"]
tm.title = entry["title"]
. += tm
diff --git a/code/modules/tgs/v4/api.dm b/code/modules/tgs/v4/api.dm
index 081543828e8..4eb8e67d928 100644
--- a/code/modules/tgs/v4/api.dm
+++ b/code/modules/tgs/v4/api.dm
@@ -92,7 +92,7 @@
var/list/json = cached_json["testMerges"]
for(var/entry in json)
var/datum/tgs_revision_information/test_merge/tm = new
- tm.time_merged = text2num(entry["timeMerged"])
+ tm.timestamp = text2num(entry["timeMerged"])
var/list/revInfo = entry["revision"]
if(revInfo)
@@ -104,7 +104,7 @@
tm.url = entry["url"]
tm.author = entry["author"]
tm.number = entry["number"]
- tm.pull_request_commit = entry["pullRequestRevision"]
+ tm.head_commit = entry["pullRequestRevision"]
tm.comment = entry["comment"]
cached_test_merges += tm
diff --git a/code/modules/tgs/v5/_defines.dm b/code/modules/tgs/v5/_defines.dm
index 8fd84e19fa3..10bc4cbe406 100644
--- a/code/modules/tgs/v5/_defines.dm
+++ b/code/modules/tgs/v5/_defines.dm
@@ -79,6 +79,7 @@
#define DMAPI5_TOPIC_RESPONSE_CHAT_RESPONSES "chatResponses"
#define DMAPI5_REVISION_INFORMATION_COMMIT_SHA "commitSha"
+#define DMAPI5_REVISION_INFORMATION_TIMESTAMP "timestamp"
#define DMAPI5_REVISION_INFORMATION_ORIGIN_COMMIT_SHA "originCommitSha"
#define DMAPI5_CHAT_USER_ID "id"
diff --git a/code/modules/tgs/v5/api.dm b/code/modules/tgs/v5/api.dm
index 7a2ff694e0f..6735ed5dec5 100644
--- a/code/modules/tgs/v5/api.dm
+++ b/code/modules/tgs/v5/api.dm
@@ -18,7 +18,9 @@
var/initialized = FALSE
/datum/tgs_api/v5/ApiVersion()
- return new /datum/tgs_version(TGS_DMAPI_VERSION)
+ return new /datum/tgs_version(
+ #include "interop_version.dm"
+ )
/datum/tgs_api/v5/OnWorldNew(minimum_required_security_level)
server_port = world.params[DMAPI5_PARAM_SERVER_PORT]
@@ -48,6 +50,7 @@
if(istype(revisionData))
revision = new
revision.commit = revisionData[DMAPI5_REVISION_INFORMATION_COMMIT_SHA]
+ revision.timestamp = revisionData[DMAPI5_REVISION_INFORMATION_TIMESTAMP]
revision.origin_commit = revisionData[DMAPI5_REVISION_INFORMATION_ORIGIN_COMMIT_SHA]
else
TGS_ERROR_LOG("Failed to decode [DMAPI5_RUNTIME_INFORMATION_REVISION] from runtime information!")
@@ -63,15 +66,18 @@
if(revInfo)
tm.commit = revisionData[DMAPI5_REVISION_INFORMATION_COMMIT_SHA]
tm.origin_commit = revisionData[DMAPI5_REVISION_INFORMATION_ORIGIN_COMMIT_SHA]
+ tm.timestamp = entry[DMAPI5_REVISION_INFORMATION_TIMESTAMP]
else
TGS_WARNING_LOG("Failed to decode [DMAPI5_TEST_MERGE_REVISION] from test merge #[tm.number]!")
- tm.time_merged = text2num(entry[DMAPI5_TEST_MERGE_TIME_MERGED])
+ if(!tm.timestamp)
+ tm.timestamp = entry[DMAPI5_TEST_MERGE_TIME_MERGED]
+
tm.title = entry[DMAPI5_TEST_MERGE_TITLE_AT_MERGE]
tm.body = entry[DMAPI5_TEST_MERGE_BODY_AT_MERGE]
tm.url = entry[DMAPI5_TEST_MERGE_URL]
tm.author = entry[DMAPI5_TEST_MERGE_AUTHOR]
- tm.pull_request_commit = entry[DMAPI5_TEST_MERGE_PULL_REQUEST_REVISION]
+ tm.head_commit = entry[DMAPI5_TEST_MERGE_PULL_REQUEST_REVISION]
tm.comment = entry[DMAPI5_TEST_MERGE_COMMENT]
test_merges += tm
diff --git a/code/modules/tgs/v5/interop_version.dm b/code/modules/tgs/v5/interop_version.dm
new file mode 100644
index 00000000000..c7bf62ecae3
--- /dev/null
+++ b/code/modules/tgs/v5/interop_version.dm
@@ -0,0 +1 @@
+"5.3.0"
diff --git a/code/modules/tgs/v5/undefs.dm b/code/modules/tgs/v5/undefs.dm
index 34fc481d36e..5885a60e75c 100644
--- a/code/modules/tgs/v5/undefs.dm
+++ b/code/modules/tgs/v5/undefs.dm
@@ -79,6 +79,7 @@
#undef DMAPI5_TOPIC_RESPONSE_CHAT_RESPONSES
#undef DMAPI5_REVISION_INFORMATION_COMMIT_SHA
+#undef DMAPI5_REVISION_INFORMATION_TIMESTAMP
#undef DMAPI5_REVISION_INFORMATION_ORIGIN_COMMIT_SHA
#undef DMAPI5_CHAT_USER_ID
diff --git a/code/modules/tgui/states/notcontained.dm b/code/modules/tgui/states/notcontained.dm
index 859e45d3649..cb05fd2ebfc 100644
--- a/code/modules/tgui/states/notcontained.dm
+++ b/code/modules/tgui/states/notcontained.dm
@@ -21,6 +21,3 @@ GLOBAL_DATUM_INIT(notcontained_state, /datum/ui_state/notcontained_state, new)
/mob/living/silicon/notcontained_can_use_topic(src_object)
return default_can_use_topic(src_object) // Silicons use default bevhavior.
-
-/mob/living/simple_animal/drone/notcontained_can_use_topic(src_object)
- return default_can_use_topic(src_object) // Drones use default bevhavior.
diff --git a/code/modules/vehicle/ambulance.dm b/code/modules/vehicle/ambulance.dm
index 37c9d97e5c6..702b8e97201 100644
--- a/code/modules/vehicle/ambulance.dm
+++ b/code/modules/vehicle/ambulance.dm
@@ -63,7 +63,7 @@
/obj/item/key/ambulance
name = "ambulance key"
- desc = "A keyring with a small steel key, and tag with a red cross on it."
+ desc = "A keyring with a small steel key, and tag with a green cross on it."
icon_state = "keydoc"
diff --git a/code/modules/vehicle/snowmobile.dm b/code/modules/vehicle/snowmobile.dm
index c4b8d7aefba..25d2f4e1ccf 100644
--- a/code/modules/vehicle/snowmobile.dm
+++ b/code/modules/vehicle/snowmobile.dm
@@ -13,5 +13,5 @@
/obj/item/key/snowmobile
name = "snowmobile key"
- desc = "A keyring with a small steel key, and tag with a red cross on it; clearly it's not implying you're going to the hospital for this..."
+ desc = "A keyring with a small steel key, and tag with a green cross on it; Clearly it's not implying you're going to the hospital for this..."
icon_state = "keydoc" //get a better icon, sometime.
diff --git a/code/modules/vehicle/vehicle.dm b/code/modules/vehicle/vehicle.dm
index 308967cdf82..06a93bda215 100644
--- a/code/modules/vehicle/vehicle.dm
+++ b/code/modules/vehicle/vehicle.dm
@@ -230,3 +230,7 @@
/obj/vehicle/space/Process_Spacemove(direction)
return TRUE
+
+/obj/vehicle/zap_act(power, zap_flags)
+ zap_buckle_check(power)
+ return ..()
diff --git a/config/example/away_mission_config.txt b/config/example/away_mission_config.txt
index d06e581e04b..5d2967295c2 100644
--- a/config/example/away_mission_config.txt
+++ b/config/example/away_mission_config.txt
@@ -24,7 +24,6 @@ _maps/map_files/RandomZLevels/moonoutpost19.dmm
_maps/map_files/RandomZLevels/undergroundoutpost45.dmm
_maps/map_files/RandomZLevels/academy.dmm
_maps/map_files/RandomZLevels/blackmarketpackers.dmm
-_maps/map_files/RandomZLevels/spacehotel.dmm
_maps/map_files/RandomZLevels/wildwest.dmm
_maps/map_files/RandomZLevels/terrorspiders.dmm
diff --git a/config/example/config.txt b/config/example/config.txt
index 9698d7f90ab..454bd3c20a6 100644
--- a/config/example/config.txt
+++ b/config/example/config.txt
@@ -474,3 +474,6 @@ CENTCOM_BAN_DB_URL https://centcom.melonmesa.com/ban/search/
## Max amount of CIDs that one ckey can have attached to them before they trip a warning. Set to 0 to disable.
MAX_CLIENT_CID_HISTORY 2
+
+## Uncomment to enable automatic performance profiling of rounds
+#ENABLE_AUTO_PROFILER
diff --git a/icons/_nanomaps/Cyberiad_nanomap_z1.png b/icons/_nanomaps/Cyberiad_nanomap_z1.png
index b0c25ff74b8..9eb35139e1d 100644
Binary files a/icons/_nanomaps/Cyberiad_nanomap_z1.png and b/icons/_nanomaps/Cyberiad_nanomap_z1.png differ
diff --git a/icons/_nanomaps/Delta_nanomap_z1.png b/icons/_nanomaps/Delta_nanomap_z1.png
index 53bc723c6d4..393f74720b7 100644
Binary files a/icons/_nanomaps/Delta_nanomap_z1.png and b/icons/_nanomaps/Delta_nanomap_z1.png differ
diff --git a/icons/_nanomaps/MetaStation_nanomap_z1.png b/icons/_nanomaps/MetaStation_nanomap_z1.png
index 082591af144..b7b177aac6e 100644
Binary files a/icons/_nanomaps/MetaStation_nanomap_z1.png and b/icons/_nanomaps/MetaStation_nanomap_z1.png differ
diff --git a/icons/effects/beam.dmi b/icons/effects/beam.dmi
index a6afd27cc86..80cd21051ab 100644
Binary files a/icons/effects/beam.dmi and b/icons/effects/beam.dmi differ
diff --git a/icons/mob/back.dmi b/icons/mob/back.dmi
index d3253d3e1fb..ec7e6827b19 100644
Binary files a/icons/mob/back.dmi and b/icons/mob/back.dmi differ
diff --git a/icons/mob/eyes.dmi b/icons/mob/eyes.dmi
index 8620822ca5d..5ff3a9b0fb2 100644
Binary files a/icons/mob/eyes.dmi and b/icons/mob/eyes.dmi differ
diff --git a/icons/mob/inhands/clothing_lefthand.dmi b/icons/mob/inhands/clothing_lefthand.dmi
index b1f406da718..c01be54b995 100644
Binary files a/icons/mob/inhands/clothing_lefthand.dmi and b/icons/mob/inhands/clothing_lefthand.dmi differ
diff --git a/icons/mob/inhands/clothing_righthand.dmi b/icons/mob/inhands/clothing_righthand.dmi
index 8e9bdfc6200..5b0e3fc17fd 100644
Binary files a/icons/mob/inhands/clothing_righthand.dmi and b/icons/mob/inhands/clothing_righthand.dmi differ
diff --git a/icons/mob/inhands/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi
index 94a7f849a41..c3dd016de8c 100644
Binary files a/icons/mob/inhands/items_lefthand.dmi and b/icons/mob/inhands/items_lefthand.dmi differ
diff --git a/icons/mob/inhands/items_righthand.dmi b/icons/mob/inhands/items_righthand.dmi
index cfd70ebef1f..0e85c1c84d1 100644
Binary files a/icons/mob/inhands/items_righthand.dmi and b/icons/mob/inhands/items_righthand.dmi differ
diff --git a/icons/mob/screen_robot.dmi b/icons/mob/screen_robot.dmi
index 3b3430582ab..d235cd06248 100644
Binary files a/icons/mob/screen_robot.dmi and b/icons/mob/screen_robot.dmi differ
diff --git a/icons/mob/species/plasmaman/helmet.dmi b/icons/mob/species/plasmaman/helmet.dmi
index c0c3413bb71..b836d1de219 100644
Binary files a/icons/mob/species/plasmaman/helmet.dmi and b/icons/mob/species/plasmaman/helmet.dmi differ
diff --git a/icons/mob/species/plasmaman/uniform.dmi b/icons/mob/species/plasmaman/uniform.dmi
index f3d53d76db7..f28f3f7e1ff 100644
Binary files a/icons/mob/species/plasmaman/uniform.dmi and b/icons/mob/species/plasmaman/uniform.dmi differ
diff --git a/icons/obj/chemical.dmi b/icons/obj/chemical.dmi
index 129f0a0e6e7..17101426105 100644
Binary files a/icons/obj/chemical.dmi and b/icons/obj/chemical.dmi differ
diff --git a/icons/obj/closet.dmi b/icons/obj/closet.dmi
index cd6f7eeec94..83cde24a8a4 100644
Binary files a/icons/obj/closet.dmi and b/icons/obj/closet.dmi differ
diff --git a/icons/obj/clothing/glasses.dmi b/icons/obj/clothing/glasses.dmi
index c17502604fe..03bcddbd266 100644
Binary files a/icons/obj/clothing/glasses.dmi and b/icons/obj/clothing/glasses.dmi differ
diff --git a/icons/obj/clothing/species/plasmaman/hats.dmi b/icons/obj/clothing/species/plasmaman/hats.dmi
index f4064942316..4105423ce8e 100644
Binary files a/icons/obj/clothing/species/plasmaman/hats.dmi and b/icons/obj/clothing/species/plasmaman/hats.dmi differ
diff --git a/icons/obj/clothing/species/plasmaman/uniform.dmi b/icons/obj/clothing/species/plasmaman/uniform.dmi
index d41f12135e1..cc6c2a0ed1e 100644
Binary files a/icons/obj/clothing/species/plasmaman/uniform.dmi and b/icons/obj/clothing/species/plasmaman/uniform.dmi differ
diff --git a/icons/obj/custom_items.dmi b/icons/obj/custom_items.dmi
index 0cf67d92ef9..3f0b2180e58 100644
Binary files a/icons/obj/custom_items.dmi and b/icons/obj/custom_items.dmi differ
diff --git a/icons/obj/decals.dmi b/icons/obj/decals.dmi
index e393e5b326e..1412801fa40 100644
Binary files a/icons/obj/decals.dmi and b/icons/obj/decals.dmi differ
diff --git a/icons/obj/device.dmi b/icons/obj/device.dmi
index 912f1d12a84..11189a5a0ad 100644
Binary files a/icons/obj/device.dmi and b/icons/obj/device.dmi differ
diff --git a/icons/obj/doors/shutters_radiation.dmi b/icons/obj/doors/shutters_radiation.dmi
new file mode 100644
index 00000000000..657b613b0cc
Binary files /dev/null and b/icons/obj/doors/shutters_radiation.dmi differ
diff --git a/icons/obj/hydroponics/growing.dmi b/icons/obj/hydroponics/growing.dmi
index 438d764cd11..4f1a92274b0 100644
Binary files a/icons/obj/hydroponics/growing.dmi and b/icons/obj/hydroponics/growing.dmi differ
diff --git a/icons/obj/hydroponics/harvest.dmi b/icons/obj/hydroponics/harvest.dmi
index 3c1d27750e6..54bd0ec78ec 100644
Binary files a/icons/obj/hydroponics/harvest.dmi and b/icons/obj/hydroponics/harvest.dmi differ
diff --git a/icons/obj/hydroponics/seeds.dmi b/icons/obj/hydroponics/seeds.dmi
index fd35ff9a2bd..7e4c97e5a09 100644
Binary files a/icons/obj/hydroponics/seeds.dmi and b/icons/obj/hydroponics/seeds.dmi differ
diff --git a/icons/obj/shards.dmi b/icons/obj/shards.dmi
index 20927b8dd79..b136530df63 100644
Binary files a/icons/obj/shards.dmi and b/icons/obj/shards.dmi differ
diff --git a/icons/obj/smooth_structures/clockwork_window.dmi b/icons/obj/smooth_structures/clockwork_window.dmi
index 90309ac3d52..e326e93ce8d 100644
Binary files a/icons/obj/smooth_structures/clockwork_window.dmi and b/icons/obj/smooth_structures/clockwork_window.dmi differ
diff --git a/icons/obj/smooth_structures/plasma_window.dmi b/icons/obj/smooth_structures/plasma_window.dmi
index 3d57d156f01..b5249e13a8a 100644
Binary files a/icons/obj/smooth_structures/plasma_window.dmi and b/icons/obj/smooth_structures/plasma_window.dmi differ
diff --git a/icons/obj/smooth_structures/pod_window.dmi b/icons/obj/smooth_structures/pod_window.dmi
index 0fe7501225c..643449e5335 100644
Binary files a/icons/obj/smooth_structures/pod_window.dmi and b/icons/obj/smooth_structures/pod_window.dmi differ
diff --git a/icons/obj/smooth_structures/reinforced_window.dmi b/icons/obj/smooth_structures/reinforced_window.dmi
index ed9a2a143e6..7c846fa4eee 100644
Binary files a/icons/obj/smooth_structures/reinforced_window.dmi and b/icons/obj/smooth_structures/reinforced_window.dmi differ
diff --git a/icons/obj/smooth_structures/rice_window.dmi b/icons/obj/smooth_structures/rice_window.dmi
index f5e7a6dd57a..5b3bebb2539 100644
Binary files a/icons/obj/smooth_structures/rice_window.dmi and b/icons/obj/smooth_structures/rice_window.dmi differ
diff --git a/icons/obj/smooth_structures/rplasma_window.dmi b/icons/obj/smooth_structures/rplasma_window.dmi
index c64f42c7f5a..9da045e0350 100644
Binary files a/icons/obj/smooth_structures/rplasma_window.dmi and b/icons/obj/smooth_structures/rplasma_window.dmi differ
diff --git a/icons/obj/smooth_structures/tinted_window.dmi b/icons/obj/smooth_structures/tinted_window.dmi
index be9affafeea..c0cffb23b88 100644
Binary files a/icons/obj/smooth_structures/tinted_window.dmi and b/icons/obj/smooth_structures/tinted_window.dmi differ
diff --git a/icons/obj/smooth_structures/window.dmi b/icons/obj/smooth_structures/window.dmi
index 670713bcfe0..a0d424f1957 100644
Binary files a/icons/obj/smooth_structures/window.dmi and b/icons/obj/smooth_structures/window.dmi differ
diff --git a/icons/obj/structures.dmi b/icons/obj/structures.dmi
index d1b6b267f8a..6621a04b939 100644
Binary files a/icons/obj/structures.dmi and b/icons/obj/structures.dmi differ
diff --git a/icons/obj/supermatter.dmi b/icons/obj/supermatter.dmi
index 6c6efd5fb4b..4fd64bb4fc0 100644
Binary files a/icons/obj/supermatter.dmi and b/icons/obj/supermatter.dmi differ
diff --git a/icons/obj/tank.dmi b/icons/obj/tank.dmi
index 7496d65027c..76e9fa7766c 100644
Binary files a/icons/obj/tank.dmi and b/icons/obj/tank.dmi differ
diff --git a/icons/obj/vehicles.dmi b/icons/obj/vehicles.dmi
index 2f528c44c77..d377ff37a3f 100644
Binary files a/icons/obj/vehicles.dmi and b/icons/obj/vehicles.dmi differ
diff --git a/icons/obj/vending.dmi b/icons/obj/vending.dmi
index 5be90269399..8e80cf11eae 100755
Binary files a/icons/obj/vending.dmi and b/icons/obj/vending.dmi differ
diff --git a/icons/turf/floors.dmi b/icons/turf/floors.dmi
index 7eccbce5a7d..223f5ccddd0 100644
Binary files a/icons/turf/floors.dmi and b/icons/turf/floors.dmi differ
diff --git a/paradise.dme b/paradise.dme
index 1b9bc64a2f0..6ef21deda02 100644
--- a/paradise.dme
+++ b/paradise.dme
@@ -16,6 +16,7 @@
#include "code\hub.dm"
#include "code\world.dm"
#include "code\__DEFINES\_globals.dm"
+#include "code\__DEFINES\_profile.dm"
#include "code\__DEFINES\_protection.dm"
#include "code\__DEFINES\_readme.dm"
#include "code\__DEFINES\_spacemandmm.dm"
@@ -67,6 +68,7 @@
#include "code\__DEFINES\pipes.dm"
#include "code\__DEFINES\preferences.dm"
#include "code\__DEFINES\qdel.dm"
+#include "code\__DEFINES\radiation.dm"
#include "code\__DEFINES\radio.dm"
#include "code\__DEFINES\reagents.dm"
#include "code\__DEFINES\role_preferences.dm"
@@ -97,6 +99,7 @@
#include "code\__HELPERS\debugger.dm"
#include "code\__HELPERS\experimental.dm"
#include "code\__HELPERS\files.dm"
+#include "code\__HELPERS\filters.dm"
#include "code\__HELPERS\game.dm"
#include "code\__HELPERS\global_lists.dm"
#include "code\__HELPERS\heap.dm"
@@ -108,6 +111,7 @@
#include "code\__HELPERS\names.dm"
#include "code\__HELPERS\pronouns.dm"
#include "code\__HELPERS\qdel.dm"
+#include "code\__HELPERS\radiation.dm"
#include "code\__HELPERS\sanitize_values.dm"
#include "code\__HELPERS\text.dm"
#include "code\__HELPERS\time.dm"
@@ -188,16 +192,15 @@
#include "code\ATMOSPHERICS\components\trinary_devices\mixer.dm"
#include "code\ATMOSPHERICS\components\trinary_devices\trinary_base.dm"
#include "code\ATMOSPHERICS\components\trinary_devices\tvalve.dm"
-#include "code\ATMOSPHERICS\components\unary_devices\cold_sink.dm"
#include "code\ATMOSPHERICS\components\unary_devices\generator_input.dm"
#include "code\ATMOSPHERICS\components\unary_devices\heat_exchanger.dm"
-#include "code\ATMOSPHERICS\components\unary_devices\heat_source.dm"
#include "code\ATMOSPHERICS\components\unary_devices\outlet_injector.dm"
#include "code\ATMOSPHERICS\components\unary_devices\oxygen_generator.dm"
#include "code\ATMOSPHERICS\components\unary_devices\passive_vent.dm"
#include "code\ATMOSPHERICS\components\unary_devices\portables_connector.dm"
#include "code\ATMOSPHERICS\components\unary_devices\tank.dm"
#include "code\ATMOSPHERICS\components\unary_devices\thermal_plate.dm"
+#include "code\ATMOSPHERICS\components\unary_devices\thermomachine.dm"
#include "code\ATMOSPHERICS\components\unary_devices\unary_base.dm"
#include "code\ATMOSPHERICS\components\unary_devices\vent_pump.dm"
#include "code\ATMOSPHERICS\components\unary_devices\vent_scrubber.dm"
@@ -251,6 +254,8 @@
#include "code\controllers\subsystem\overlays.dm"
#include "code\controllers\subsystem\parallax.dm"
#include "code\controllers\subsystem\persistent_data.dm"
+#include "code\controllers\subsystem\profiler.dm"
+#include "code\controllers\subsystem\radiation.dm"
#include "code\controllers\subsystem\radio.dm"
#include "code\controllers\subsystem\runechat.dm"
#include "code\controllers\subsystem\shuttles.dm"
@@ -299,6 +304,7 @@
#include "code\datums\periodic_news.dm"
#include "code\datums\pipe_datums.dm"
#include "code\datums\progressbar.dm"
+#include "code\datums\radiation_wave.dm"
#include "code\datums\radio.dm"
#include "code\datums\recipe.dm"
#include "code\datums\revision.dm"
@@ -326,6 +332,7 @@
#include "code\datums\components\material_container.dm"
#include "code\datums\components\paintable.dm"
#include "code\datums\components\proximity_monitor.dm"
+#include "code\datums\components\radioactive.dm"
#include "code\datums\components\slippery.dm"
#include "code\datums\components\spawner.dm"
#include "code\datums\components\spooky.dm"
@@ -388,6 +395,7 @@
#include "code\datums\diseases\advance\symptoms\weight.dm"
#include "code\datums\diseases\advance\symptoms\youth.dm"
#include "code\datums\elements\_element.dm"
+#include "code\datums\elements\rad_insulation.dm"
#include "code\datums\elements\waddling.dm"
#include "code\datums\helper_datums\construction_datum.dm"
#include "code\datums\helper_datums\icon_snapshot.dm"
@@ -395,6 +403,7 @@
#include "code\datums\helper_datums\map_template.dm"
#include "code\datums\helper_datums\teleport.dm"
#include "code\datums\helper_datums\topic_input.dm"
+#include "code\datums\looping_sounds\item_sounds.dm"
#include "code\datums\looping_sounds\looping_sound.dm"
#include "code\datums\looping_sounds\machinery_sounds.dm"
#include "code\datums\looping_sounds\thermal_drill.dm"
@@ -669,7 +678,6 @@
#include "code\game\machinery\firealarm.dm"
#include "code\game\machinery\flasher.dm"
#include "code\game\machinery\floodlight.dm"
-#include "code\game\machinery\Freezer.dm"
#include "code\game\machinery\gameboard.dm"
#include "code\game\machinery\guestpass.dm"
#include "code\game\machinery\hologram.dm"
@@ -897,6 +905,7 @@
#include "code\game\objects\items\devices\flash.dm"
#include "code\game\objects\items\devices\flashlight.dm"
#include "code\game\objects\items\devices\floor_painter.dm"
+#include "code\game\objects\items\devices\geiger_counter.dm"
#include "code\game\objects\items\devices\handheld_defib.dm"
#include "code\game\objects\items\devices\laserpointer.dm"
#include "code\game\objects\items\devices\lightreplacer.dm"
@@ -1165,7 +1174,6 @@
#include "code\game\turfs\simulated\floor.dm"
#include "code\game\turfs\simulated\minerals.dm"
#include "code\game\turfs\simulated\river.dm"
-#include "code\game\turfs\simulated\shuttle.dm"
#include "code\game\turfs\simulated\walls.dm"
#include "code\game\turfs\simulated\walls_indestructible.dm"
#include "code\game\turfs\simulated\walls_mineral.dm"
@@ -1183,7 +1191,6 @@
#include "code\game\turfs\simulated\floor\plating.dm"
#include "code\game\turfs\space\space.dm"
#include "code\game\turfs\space\transit.dm"
-#include "code\game\turfs\unsimulated\beach.dm"
#include "code\game\turfs\unsimulated\floor.dm"
#include "code\game\turfs\unsimulated\walls.dm"
#include "code\game\verbs\ooc.dm"
@@ -1271,7 +1278,6 @@
#include "code\modules\antagonists\survivalist\survivalist.dm"
#include "code\modules\antagonists\traitor\datum_mindslave.dm"
#include "code\modules\antagonists\traitor\datum_traitor.dm"
-#include "code\modules\antagonists\traitor\contractor\datums\contractor.dm"
#include "code\modules\antagonists\traitor\contractor\datums\contractor_hub.dm"
#include "code\modules\antagonists\traitor\contractor\datums\contractor_hub_ui.dm"
#include "code\modules\antagonists\traitor\contractor\datums\objective_contract.dm"
@@ -1320,7 +1326,6 @@
#include "code\modules\awaymissions\map_rng.dm"
#include "code\modules\awaymissions\pamphlet.dm"
#include "code\modules\awaymissions\zlevel.dm"
-#include "code\modules\awaymissions\zvis.dm"
#include "code\modules\awaymissions\maploader\dmm_suite.dm"
#include "code\modules\awaymissions\maploader\reader.dm"
#include "code\modules\awaymissions\maploader\writer.dm"
@@ -1331,7 +1336,6 @@
#include "code\modules\awaymissions\mission_code\challenge.dm"
#include "code\modules\awaymissions\mission_code\evil_santa.dm"
#include "code\modules\awaymissions\mission_code\spacebattle.dm"
-#include "code\modules\awaymissions\mission_code\spacehotel.dm"
#include "code\modules\awaymissions\mission_code\stationCollision.dm"
#include "code\modules\awaymissions\mission_code\UO71-terrorspiders.dm"
#include "code\modules\awaymissions\mission_code\wildwest.dm"
@@ -1381,6 +1385,7 @@
#include "code\modules\clothing\chameleon.dm"
#include "code\modules\clothing\clothing.dm"
#include "code\modules\clothing\ears\ears.dm"
+#include "code\modules\clothing\glasses\engine_goggles.dm"
#include "code\modules\clothing\glasses\glasses.dm"
#include "code\modules\clothing\glasses\hud.dm"
#include "code\modules\clothing\gloves\boxing.dm"
diff --git a/sound/items/geiger/ext1.ogg b/sound/items/geiger/ext1.ogg
new file mode 100644
index 00000000000..ca1b44e4d85
Binary files /dev/null and b/sound/items/geiger/ext1.ogg differ
diff --git a/sound/items/geiger/ext2.ogg b/sound/items/geiger/ext2.ogg
new file mode 100644
index 00000000000..c0c316245ba
Binary files /dev/null and b/sound/items/geiger/ext2.ogg differ
diff --git a/sound/items/geiger/ext3.ogg b/sound/items/geiger/ext3.ogg
new file mode 100644
index 00000000000..fc367d94662
Binary files /dev/null and b/sound/items/geiger/ext3.ogg differ
diff --git a/sound/items/geiger/ext4.ogg b/sound/items/geiger/ext4.ogg
new file mode 100644
index 00000000000..d3b00ebaac6
Binary files /dev/null and b/sound/items/geiger/ext4.ogg differ
diff --git a/sound/items/geiger/high1.ogg b/sound/items/geiger/high1.ogg
new file mode 100644
index 00000000000..8725affdd4f
Binary files /dev/null and b/sound/items/geiger/high1.ogg differ
diff --git a/sound/items/geiger/high2.ogg b/sound/items/geiger/high2.ogg
new file mode 100644
index 00000000000..f1e3868898d
Binary files /dev/null and b/sound/items/geiger/high2.ogg differ
diff --git a/sound/items/geiger/high3.ogg b/sound/items/geiger/high3.ogg
new file mode 100644
index 00000000000..bdc5282a5c0
Binary files /dev/null and b/sound/items/geiger/high3.ogg differ
diff --git a/sound/items/geiger/high4.ogg b/sound/items/geiger/high4.ogg
new file mode 100644
index 00000000000..8e185d6f78d
Binary files /dev/null and b/sound/items/geiger/high4.ogg differ
diff --git a/sound/items/geiger/low1.ogg b/sound/items/geiger/low1.ogg
new file mode 100644
index 00000000000..9bdb8bd3275
Binary files /dev/null and b/sound/items/geiger/low1.ogg differ
diff --git a/sound/items/geiger/low2.ogg b/sound/items/geiger/low2.ogg
new file mode 100644
index 00000000000..ce4855f25fc
Binary files /dev/null and b/sound/items/geiger/low2.ogg differ
diff --git a/sound/items/geiger/low3.ogg b/sound/items/geiger/low3.ogg
new file mode 100644
index 00000000000..70aaea064f5
Binary files /dev/null and b/sound/items/geiger/low3.ogg differ
diff --git a/sound/items/geiger/low4.ogg b/sound/items/geiger/low4.ogg
new file mode 100644
index 00000000000..f36e3b7699d
Binary files /dev/null and b/sound/items/geiger/low4.ogg differ
diff --git a/sound/items/geiger/med1.ogg b/sound/items/geiger/med1.ogg
new file mode 100644
index 00000000000..c062c4d2a8f
Binary files /dev/null and b/sound/items/geiger/med1.ogg differ
diff --git a/sound/items/geiger/med2.ogg b/sound/items/geiger/med2.ogg
new file mode 100644
index 00000000000..210119a287f
Binary files /dev/null and b/sound/items/geiger/med2.ogg differ
diff --git a/sound/items/geiger/med3.ogg b/sound/items/geiger/med3.ogg
new file mode 100644
index 00000000000..ed6f0f4d7f5
Binary files /dev/null and b/sound/items/geiger/med3.ogg differ
diff --git a/sound/items/geiger/med4.ogg b/sound/items/geiger/med4.ogg
new file mode 100644
index 00000000000..70635a97a3a
Binary files /dev/null and b/sound/items/geiger/med4.ogg differ
diff --git a/sound/machines/sm/accent/delam/1.ogg b/sound/machines/sm/accent/delam/1.ogg
new file mode 100644
index 00000000000..75c79f89ab2
Binary files /dev/null and b/sound/machines/sm/accent/delam/1.ogg differ
diff --git a/sound/machines/sm/accent/delam/10.ogg b/sound/machines/sm/accent/delam/10.ogg
new file mode 100644
index 00000000000..c87b63b526b
Binary files /dev/null and b/sound/machines/sm/accent/delam/10.ogg differ
diff --git a/sound/machines/sm/accent/delam/11.ogg b/sound/machines/sm/accent/delam/11.ogg
new file mode 100644
index 00000000000..c7f678245b1
Binary files /dev/null and b/sound/machines/sm/accent/delam/11.ogg differ
diff --git a/sound/machines/sm/accent/delam/12.ogg b/sound/machines/sm/accent/delam/12.ogg
new file mode 100644
index 00000000000..a3959421830
Binary files /dev/null and b/sound/machines/sm/accent/delam/12.ogg differ
diff --git a/sound/machines/sm/accent/delam/13.ogg b/sound/machines/sm/accent/delam/13.ogg
new file mode 100644
index 00000000000..934f17947de
Binary files /dev/null and b/sound/machines/sm/accent/delam/13.ogg differ
diff --git a/sound/machines/sm/accent/delam/14.ogg b/sound/machines/sm/accent/delam/14.ogg
new file mode 100644
index 00000000000..4175e5b9474
Binary files /dev/null and b/sound/machines/sm/accent/delam/14.ogg differ
diff --git a/sound/machines/sm/accent/delam/15.ogg b/sound/machines/sm/accent/delam/15.ogg
new file mode 100644
index 00000000000..dcf73deb84c
Binary files /dev/null and b/sound/machines/sm/accent/delam/15.ogg differ
diff --git a/sound/machines/sm/accent/delam/16.ogg b/sound/machines/sm/accent/delam/16.ogg
new file mode 100644
index 00000000000..20bc19399be
Binary files /dev/null and b/sound/machines/sm/accent/delam/16.ogg differ
diff --git a/sound/machines/sm/accent/delam/17.ogg b/sound/machines/sm/accent/delam/17.ogg
new file mode 100644
index 00000000000..b517fb3d3db
Binary files /dev/null and b/sound/machines/sm/accent/delam/17.ogg differ
diff --git a/sound/machines/sm/accent/delam/18.ogg b/sound/machines/sm/accent/delam/18.ogg
new file mode 100644
index 00000000000..4ef138d27a5
Binary files /dev/null and b/sound/machines/sm/accent/delam/18.ogg differ
diff --git a/sound/machines/sm/accent/delam/19.ogg b/sound/machines/sm/accent/delam/19.ogg
new file mode 100644
index 00000000000..f638a6971bb
Binary files /dev/null and b/sound/machines/sm/accent/delam/19.ogg differ
diff --git a/sound/machines/sm/accent/delam/2.ogg b/sound/machines/sm/accent/delam/2.ogg
new file mode 100644
index 00000000000..5b480daa2e1
Binary files /dev/null and b/sound/machines/sm/accent/delam/2.ogg differ
diff --git a/sound/machines/sm/accent/delam/20.ogg b/sound/machines/sm/accent/delam/20.ogg
new file mode 100644
index 00000000000..6072bc62276
Binary files /dev/null and b/sound/machines/sm/accent/delam/20.ogg differ
diff --git a/sound/machines/sm/accent/delam/21.ogg b/sound/machines/sm/accent/delam/21.ogg
new file mode 100644
index 00000000000..1223dd946de
Binary files /dev/null and b/sound/machines/sm/accent/delam/21.ogg differ
diff --git a/sound/machines/sm/accent/delam/22.ogg b/sound/machines/sm/accent/delam/22.ogg
new file mode 100644
index 00000000000..9ccfb9b55af
Binary files /dev/null and b/sound/machines/sm/accent/delam/22.ogg differ
diff --git a/sound/machines/sm/accent/delam/23.ogg b/sound/machines/sm/accent/delam/23.ogg
new file mode 100644
index 00000000000..6399a8376ae
Binary files /dev/null and b/sound/machines/sm/accent/delam/23.ogg differ
diff --git a/sound/machines/sm/accent/delam/24.ogg b/sound/machines/sm/accent/delam/24.ogg
new file mode 100644
index 00000000000..b51d3598071
Binary files /dev/null and b/sound/machines/sm/accent/delam/24.ogg differ
diff --git a/sound/machines/sm/accent/delam/25.ogg b/sound/machines/sm/accent/delam/25.ogg
new file mode 100644
index 00000000000..823f22f1363
Binary files /dev/null and b/sound/machines/sm/accent/delam/25.ogg differ
diff --git a/sound/machines/sm/accent/delam/26.ogg b/sound/machines/sm/accent/delam/26.ogg
new file mode 100644
index 00000000000..24b2a2f040c
Binary files /dev/null and b/sound/machines/sm/accent/delam/26.ogg differ
diff --git a/sound/machines/sm/accent/delam/27.ogg b/sound/machines/sm/accent/delam/27.ogg
new file mode 100644
index 00000000000..4b4b145b7bf
Binary files /dev/null and b/sound/machines/sm/accent/delam/27.ogg differ
diff --git a/sound/machines/sm/accent/delam/28.ogg b/sound/machines/sm/accent/delam/28.ogg
new file mode 100644
index 00000000000..7bc71bf0e63
Binary files /dev/null and b/sound/machines/sm/accent/delam/28.ogg differ
diff --git a/sound/machines/sm/accent/delam/29.ogg b/sound/machines/sm/accent/delam/29.ogg
new file mode 100644
index 00000000000..7fec2f271c6
Binary files /dev/null and b/sound/machines/sm/accent/delam/29.ogg differ
diff --git a/sound/machines/sm/accent/delam/3.ogg b/sound/machines/sm/accent/delam/3.ogg
new file mode 100644
index 00000000000..5b57cc27070
Binary files /dev/null and b/sound/machines/sm/accent/delam/3.ogg differ
diff --git a/sound/machines/sm/accent/delam/30.ogg b/sound/machines/sm/accent/delam/30.ogg
new file mode 100644
index 00000000000..ed1ec7d89fc
Binary files /dev/null and b/sound/machines/sm/accent/delam/30.ogg differ
diff --git a/sound/machines/sm/accent/delam/31.ogg b/sound/machines/sm/accent/delam/31.ogg
new file mode 100644
index 00000000000..0baa82e246e
Binary files /dev/null and b/sound/machines/sm/accent/delam/31.ogg differ
diff --git a/sound/machines/sm/accent/delam/32.ogg b/sound/machines/sm/accent/delam/32.ogg
new file mode 100644
index 00000000000..e925b32d677
Binary files /dev/null and b/sound/machines/sm/accent/delam/32.ogg differ
diff --git a/sound/machines/sm/accent/delam/33.ogg b/sound/machines/sm/accent/delam/33.ogg
new file mode 100644
index 00000000000..9ddec0e84a4
Binary files /dev/null and b/sound/machines/sm/accent/delam/33.ogg differ
diff --git a/sound/machines/sm/accent/delam/4.ogg b/sound/machines/sm/accent/delam/4.ogg
new file mode 100644
index 00000000000..aa4f4da0714
Binary files /dev/null and b/sound/machines/sm/accent/delam/4.ogg differ
diff --git a/sound/machines/sm/accent/delam/5.ogg b/sound/machines/sm/accent/delam/5.ogg
new file mode 100644
index 00000000000..be438f6f151
Binary files /dev/null and b/sound/machines/sm/accent/delam/5.ogg differ
diff --git a/sound/machines/sm/accent/delam/6.ogg b/sound/machines/sm/accent/delam/6.ogg
new file mode 100644
index 00000000000..b89d52a564a
Binary files /dev/null and b/sound/machines/sm/accent/delam/6.ogg differ
diff --git a/sound/machines/sm/accent/delam/7.ogg b/sound/machines/sm/accent/delam/7.ogg
new file mode 100644
index 00000000000..3a9cfc62cae
Binary files /dev/null and b/sound/machines/sm/accent/delam/7.ogg differ
diff --git a/sound/machines/sm/accent/delam/8.ogg b/sound/machines/sm/accent/delam/8.ogg
new file mode 100644
index 00000000000..7bc0a727fae
Binary files /dev/null and b/sound/machines/sm/accent/delam/8.ogg differ
diff --git a/sound/machines/sm/accent/delam/9.ogg b/sound/machines/sm/accent/delam/9.ogg
new file mode 100644
index 00000000000..5c1bd374055
Binary files /dev/null and b/sound/machines/sm/accent/delam/9.ogg differ
diff --git a/sound/machines/sm/accent/normal/1.ogg b/sound/machines/sm/accent/normal/1.ogg
new file mode 100644
index 00000000000..e92beed7fe6
Binary files /dev/null and b/sound/machines/sm/accent/normal/1.ogg differ
diff --git a/sound/machines/sm/accent/normal/10.ogg b/sound/machines/sm/accent/normal/10.ogg
new file mode 100644
index 00000000000..9efb616f0b3
Binary files /dev/null and b/sound/machines/sm/accent/normal/10.ogg differ
diff --git a/sound/machines/sm/accent/normal/11.ogg b/sound/machines/sm/accent/normal/11.ogg
new file mode 100644
index 00000000000..2af0981ef16
Binary files /dev/null and b/sound/machines/sm/accent/normal/11.ogg differ
diff --git a/sound/machines/sm/accent/normal/12.ogg b/sound/machines/sm/accent/normal/12.ogg
new file mode 100644
index 00000000000..2fab78b02da
Binary files /dev/null and b/sound/machines/sm/accent/normal/12.ogg differ
diff --git a/sound/machines/sm/accent/normal/13.ogg b/sound/machines/sm/accent/normal/13.ogg
new file mode 100644
index 00000000000..784e84e4a82
Binary files /dev/null and b/sound/machines/sm/accent/normal/13.ogg differ
diff --git a/sound/machines/sm/accent/normal/14.ogg b/sound/machines/sm/accent/normal/14.ogg
new file mode 100644
index 00000000000..af170394ddd
Binary files /dev/null and b/sound/machines/sm/accent/normal/14.ogg differ
diff --git a/sound/machines/sm/accent/normal/15.ogg b/sound/machines/sm/accent/normal/15.ogg
new file mode 100644
index 00000000000..05c88c6b291
Binary files /dev/null and b/sound/machines/sm/accent/normal/15.ogg differ
diff --git a/sound/machines/sm/accent/normal/16.ogg b/sound/machines/sm/accent/normal/16.ogg
new file mode 100644
index 00000000000..46b0e339802
Binary files /dev/null and b/sound/machines/sm/accent/normal/16.ogg differ
diff --git a/sound/machines/sm/accent/normal/17.ogg b/sound/machines/sm/accent/normal/17.ogg
new file mode 100644
index 00000000000..e432b2ee025
Binary files /dev/null and b/sound/machines/sm/accent/normal/17.ogg differ
diff --git a/sound/machines/sm/accent/normal/18.ogg b/sound/machines/sm/accent/normal/18.ogg
new file mode 100644
index 00000000000..1e0e91abc85
Binary files /dev/null and b/sound/machines/sm/accent/normal/18.ogg differ
diff --git a/sound/machines/sm/accent/normal/19.ogg b/sound/machines/sm/accent/normal/19.ogg
new file mode 100644
index 00000000000..31de063e022
Binary files /dev/null and b/sound/machines/sm/accent/normal/19.ogg differ
diff --git a/sound/machines/sm/accent/normal/2.ogg b/sound/machines/sm/accent/normal/2.ogg
new file mode 100644
index 00000000000..05e3c9ff17f
Binary files /dev/null and b/sound/machines/sm/accent/normal/2.ogg differ
diff --git a/sound/machines/sm/accent/normal/20.ogg b/sound/machines/sm/accent/normal/20.ogg
new file mode 100644
index 00000000000..36810bd8f10
Binary files /dev/null and b/sound/machines/sm/accent/normal/20.ogg differ
diff --git a/sound/machines/sm/accent/normal/21.ogg b/sound/machines/sm/accent/normal/21.ogg
new file mode 100644
index 00000000000..306e8856e50
Binary files /dev/null and b/sound/machines/sm/accent/normal/21.ogg differ
diff --git a/sound/machines/sm/accent/normal/22.ogg b/sound/machines/sm/accent/normal/22.ogg
new file mode 100644
index 00000000000..38286aa98b2
Binary files /dev/null and b/sound/machines/sm/accent/normal/22.ogg differ
diff --git a/sound/machines/sm/accent/normal/23.ogg b/sound/machines/sm/accent/normal/23.ogg
new file mode 100644
index 00000000000..89f85fed911
Binary files /dev/null and b/sound/machines/sm/accent/normal/23.ogg differ
diff --git a/sound/machines/sm/accent/normal/24.ogg b/sound/machines/sm/accent/normal/24.ogg
new file mode 100644
index 00000000000..7c12a3e768e
Binary files /dev/null and b/sound/machines/sm/accent/normal/24.ogg differ
diff --git a/sound/machines/sm/accent/normal/25.ogg b/sound/machines/sm/accent/normal/25.ogg
new file mode 100644
index 00000000000..f89175ceb19
Binary files /dev/null and b/sound/machines/sm/accent/normal/25.ogg differ
diff --git a/sound/machines/sm/accent/normal/26.ogg b/sound/machines/sm/accent/normal/26.ogg
new file mode 100644
index 00000000000..9efd1d8ef39
Binary files /dev/null and b/sound/machines/sm/accent/normal/26.ogg differ
diff --git a/sound/machines/sm/accent/normal/27.ogg b/sound/machines/sm/accent/normal/27.ogg
new file mode 100644
index 00000000000..1fb1edbb5a8
Binary files /dev/null and b/sound/machines/sm/accent/normal/27.ogg differ
diff --git a/sound/machines/sm/accent/normal/28.ogg b/sound/machines/sm/accent/normal/28.ogg
new file mode 100644
index 00000000000..890c5ea4294
Binary files /dev/null and b/sound/machines/sm/accent/normal/28.ogg differ
diff --git a/sound/machines/sm/accent/normal/29.ogg b/sound/machines/sm/accent/normal/29.ogg
new file mode 100644
index 00000000000..cd2aa40714c
Binary files /dev/null and b/sound/machines/sm/accent/normal/29.ogg differ
diff --git a/sound/machines/sm/accent/normal/3.ogg b/sound/machines/sm/accent/normal/3.ogg
new file mode 100644
index 00000000000..38de5571a4a
Binary files /dev/null and b/sound/machines/sm/accent/normal/3.ogg differ
diff --git a/sound/machines/sm/accent/normal/30.ogg b/sound/machines/sm/accent/normal/30.ogg
new file mode 100644
index 00000000000..87d1782768a
Binary files /dev/null and b/sound/machines/sm/accent/normal/30.ogg differ
diff --git a/sound/machines/sm/accent/normal/31.ogg b/sound/machines/sm/accent/normal/31.ogg
new file mode 100644
index 00000000000..9ce3eeb72ee
Binary files /dev/null and b/sound/machines/sm/accent/normal/31.ogg differ
diff --git a/sound/machines/sm/accent/normal/32.ogg b/sound/machines/sm/accent/normal/32.ogg
new file mode 100644
index 00000000000..26ca0561428
Binary files /dev/null and b/sound/machines/sm/accent/normal/32.ogg differ
diff --git a/sound/machines/sm/accent/normal/33.ogg b/sound/machines/sm/accent/normal/33.ogg
new file mode 100644
index 00000000000..24964c1ce96
Binary files /dev/null and b/sound/machines/sm/accent/normal/33.ogg differ
diff --git a/sound/machines/sm/accent/normal/4.ogg b/sound/machines/sm/accent/normal/4.ogg
new file mode 100644
index 00000000000..2e71e976e86
Binary files /dev/null and b/sound/machines/sm/accent/normal/4.ogg differ
diff --git a/sound/machines/sm/accent/normal/5.ogg b/sound/machines/sm/accent/normal/5.ogg
new file mode 100644
index 00000000000..04852e10f2b
Binary files /dev/null and b/sound/machines/sm/accent/normal/5.ogg differ
diff --git a/sound/machines/sm/accent/normal/6.ogg b/sound/machines/sm/accent/normal/6.ogg
new file mode 100644
index 00000000000..bf06c06bbe0
Binary files /dev/null and b/sound/machines/sm/accent/normal/6.ogg differ
diff --git a/sound/machines/sm/accent/normal/7.ogg b/sound/machines/sm/accent/normal/7.ogg
new file mode 100644
index 00000000000..d29821701f4
Binary files /dev/null and b/sound/machines/sm/accent/normal/7.ogg differ
diff --git a/sound/machines/sm/accent/normal/8.ogg b/sound/machines/sm/accent/normal/8.ogg
new file mode 100644
index 00000000000..0b94b9dbe04
Binary files /dev/null and b/sound/machines/sm/accent/normal/8.ogg differ
diff --git a/sound/machines/sm/accent/normal/9.ogg b/sound/machines/sm/accent/normal/9.ogg
new file mode 100644
index 00000000000..545b038be11
Binary files /dev/null and b/sound/machines/sm/accent/normal/9.ogg differ
diff --git a/sound/machines/sm/loops/calm.ogg b/sound/machines/sm/loops/calm.ogg
new file mode 100644
index 00000000000..cee14fcd13d
Binary files /dev/null and b/sound/machines/sm/loops/calm.ogg differ
diff --git a/sound/machines/sm/loops/delamming.ogg b/sound/machines/sm/loops/delamming.ogg
new file mode 100644
index 00000000000..7d79f0e3c4a
Binary files /dev/null and b/sound/machines/sm/loops/delamming.ogg differ
diff --git a/sound/machines/sm/supermatter1.ogg b/sound/machines/sm/supermatter1.ogg
new file mode 100644
index 00000000000..be5185009eb
Binary files /dev/null and b/sound/machines/sm/supermatter1.ogg differ
diff --git a/sound/machines/sm/supermatter2.ogg b/sound/machines/sm/supermatter2.ogg
new file mode 100644
index 00000000000..5c98d28ed1c
Binary files /dev/null and b/sound/machines/sm/supermatter2.ogg differ
diff --git a/sound/machines/sm/supermatter3.ogg b/sound/machines/sm/supermatter3.ogg
new file mode 100644
index 00000000000..fb8e09166c3
Binary files /dev/null and b/sound/machines/sm/supermatter3.ogg differ
diff --git a/tgui/packages/tgui/constants.js b/tgui/packages/tgui/constants.js
index 26a7d513a36..96bcc3b9cfa 100644
--- a/tgui/packages/tgui/constants.js
+++ b/tgui/packages/tgui/constants.js
@@ -227,6 +227,12 @@ const GASES = [
'label': 'Hâ‚‚',
'color': 'white',
},
+ {
+ 'id': 'ab',
+ 'name': 'Agent B',
+ 'label': 'Agent B',
+ 'color': 'purple',
+ },
];
export const getGasLabel = (gasId, fallbackValue) => {
diff --git a/tgui/packages/tgui/interfaces/AirAlarm.js b/tgui/packages/tgui/interfaces/AirAlarm.js
index 0069c760792..1237d7cda34 100644
--- a/tgui/packages/tgui/interfaces/AirAlarm.js
+++ b/tgui/packages/tgui/interfaces/AirAlarm.js
@@ -303,7 +303,7 @@ const AirAlarmScrubbersView = (props, context) => {
-
+
{data.jobs_engineering.map(v => (
-
+
{data.jobs_medical.map(v => (
-
+
{data.jobs_science.map(v => (
-
+
{data.jobs_security.map(v => (
-
+
{data.jobs_service.map(v => (
-
+
{data.jobs_supply.map(v => (
{!!data.iscentcom && (
-
+
{data.jobs_centcom.map(v => (