From a3d2b769d99132d06575f69fd8638242dcd989ce Mon Sep 17 00:00:00 2001 From: Iamgoofball Date: Fri, 30 Jan 2015 16:20:30 -0800 Subject: [PATCH 01/11] Fixes #7312 Fixes #7312 --- code/datums/goon_mutations_disabilities.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/datums/goon_mutations_disabilities.dm b/code/datums/goon_mutations_disabilities.dm index decfd10a987..f7051862337 100644 --- a/code/datums/goon_mutations_disabilities.dm +++ b/code/datums/goon_mutations_disabilities.dm @@ -143,7 +143,7 @@ message = replacetext(message,"i don't know","wot mate") message = replacetext(message,"no","naw") message = replacetext(message,"robust","chin") - message = replacetext(message,"hi","how what how") + message = replacetext(message," hi ","how what how") message = replacetext(message,"hello","sup bruv") message = replacetext(message,"kill","bang") message = replacetext(message,"murder","bang") @@ -182,4 +182,4 @@ message = replacetext(message,"yes",pick("sure", "yea")) message = replacetext(message,"faggot","square") message = replacetext(message,"muh valids","getting my kicks") - return message \ No newline at end of file + return message From 7bf38b41f76da64b4e034055820dc1d74704de0f Mon Sep 17 00:00:00 2001 From: Iamgoofball Date: Fri, 30 Jan 2015 16:47:40 -0800 Subject: [PATCH 02/11] Fixes #7258 Fixes #7258 --- code/modules/reagents/Chemistry-Goon-Other.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/reagents/Chemistry-Goon-Other.dm b/code/modules/reagents/Chemistry-Goon-Other.dm index 62b5a848c9a..4664b374960 100644 --- a/code/modules/reagents/Chemistry-Goon-Other.dm +++ b/code/modules/reagents/Chemistry-Goon-Other.dm @@ -119,7 +119,7 @@ datum/reagent/colorful_reagent result_amount = 5 datum/reagent/colorful_reagent/reaction_mob(var/mob/M, var/volume) - if(M) + if(M && ishuman(M)) M.color = pick(potential_colors) ..() return @@ -147,4 +147,4 @@ datum/reagent/triple_citrus id = "triple_citrus" result = "triple_citrus" required_reagents = list("lemonjuice" = 1, "limejuice" = 1, "orangejuice" = 1) - result_amount = 5 \ No newline at end of file + result_amount = 5 From fa7ac922f963636eeb7757538763b72efc059492 Mon Sep 17 00:00:00 2001 From: Iamgoofball Date: Sat, 31 Jan 2015 10:21:44 -0800 Subject: [PATCH 03/11] changes to isliving() --- code/modules/reagents/Chemistry-Goon-Other.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/reagents/Chemistry-Goon-Other.dm b/code/modules/reagents/Chemistry-Goon-Other.dm index 4664b374960..963e85a214c 100644 --- a/code/modules/reagents/Chemistry-Goon-Other.dm +++ b/code/modules/reagents/Chemistry-Goon-Other.dm @@ -118,8 +118,8 @@ datum/reagent/colorful_reagent required_reagents = list("stable_plasma" = 1, "radium" = 1, "space_drugs" = 1, "cryoxadone" = 1, "triple_citrus" = 1) result_amount = 5 -datum/reagent/colorful_reagent/reaction_mob(var/mob/M, var/volume) - if(M && ishuman(M)) +datum/reagent/colorful_reagent/reaction_mob(var/mob/living/M, var/volume) + if(M && isliving(M)) M.color = pick(potential_colors) ..() return From e4b52c3974e7ec7b78b67ec19be5521a13209d14 Mon Sep 17 00:00:00 2001 From: paprka Date: Sun, 1 Feb 2015 02:11:42 -0800 Subject: [PATCH 04/11] removes voxtest 2 --- code/modules/mob/living/silicon/ai/vox_sounds.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/mob/living/silicon/ai/vox_sounds.dm b/code/modules/mob/living/silicon/ai/vox_sounds.dm index aa2bb96cfe2..317e887e90a 100644 --- a/code/modules/mob/living/silicon/ai/vox_sounds.dm +++ b/code/modules/mob/living/silicon/ai/vox_sounds.dm @@ -673,7 +673,6 @@ var/list/vox_sounds = list("," = 'sound/vox_fem/,.ogg', "vox" = 'sound/vox_fem/vox.ogg', "vox_login" = 'sound/vox_fem/vox_login.ogg', "voxtest" = 'sound/vox_fem/voxtest.ogg', -"voxtest2" = 'sound/vox_fem/voxtest2.ogg', "w" = 'sound/vox_fem/w.ogg', "walk" = 'sound/vox_fem/walk.ogg', "wall" = 'sound/vox_fem/wall.ogg', From f6f4318f2333fd4b330dda943d006cef7536bb10 Mon Sep 17 00:00:00 2001 From: Deantwo Date: Sun, 1 Feb 2015 11:25:59 +0100 Subject: [PATCH 05/11] Fixes the Goof fix Fixes https://github.com/tgstation/-tg-station/pull/7453 I wouldn't wish any of these mutations on my worst enemy. --- code/datums/goon_mutations_disabilities.dm | 157 +++++++++++---------- 1 file changed, 79 insertions(+), 78 deletions(-) diff --git a/code/datums/goon_mutations_disabilities.dm b/code/datums/goon_mutations_disabilities.dm index f7051862337..44555ce8c4b 100644 --- a/code/datums/goon_mutations_disabilities.dm +++ b/code/datums/goon_mutations_disabilities.dm @@ -31,51 +31,52 @@ /datum/mutation/human/smile/say_mod(var/message) if(message) + message = " [message] " //Time for a friendly game of SS13 - message = replacetext(message,"stupid","smart") - message = replacetext(message,"retard","genius") - message = replacetext(message,"unrobust","robust") - message = replacetext(message,"dumb","smart") - message = replacetext(message,"awful","great") - message = replacetext(message,"gay",pick("nice","ok","alright")) - message = replacetext(message,"horrible","fun") - message = replacetext(message,"terrible","terribly fun") - message = replacetext(message,"terrifying","wonderful") - message = replacetext(message,"gross","cool") - message = replacetext(message,"disgusting","amazing") - message = replacetext(message,"loser","winner") - message = replacetext(message,"useless","useful") - message = replacetext(message,"oh god","cheese and crackers") - message = replacetext(message,"jesus","gee wiz") - message = replacetext(message,"weak","strong") - message = replacetext(message,"kill","hug") - message = replacetext(message,"murder","tease") - message = replacetext(message,"ugly","beautiful") - message = replacetext(message,"douchbag","nice guy") - message = replacetext(message,"whore","lady") - message = replacetext(message,"nerd","smart guy") - message = replacetext(message,"moron","fun person") - message = replacetext(message,"IT'S LOOSE","EVERYTHING IS FINE") - message = replacetext(message,"sex","hug fight") - message = replacetext(message,"idiot","genius") - message = replacetext(message,"fat","thin") - message = replacetext(message,"beer","water with ice") - message = replacetext(message,"drink","water") - message = replacetext(message,"feminist","empowered woman") - message = replacetext(message,"i hate you","you're mean") - message = replacetext(message,"nigger","african american") - message = replacetext(message,"jew","jewish") - message = replacetext(message,"shit","shiz") - message = replacetext(message,"crap","poo") - message = replacetext(message,"slut","tease") - message = replacetext(message,"ass","butt") - message = replacetext(message,"damn","dang") - message = replacetext(message,"fuck","") - message = replacetext(message,"penis","privates") - message = replacetext(message,"cunt","privates") - message = replacetext(message,"dick","jerk") - message = replacetext(message,"vagina","privates") - return message + message = replacetext(message," stupid "," smart ") + message = replacetext(message," retard "," genius ") + message = replacetext(message," unrobust "," robust ") + message = replacetext(message," dumb "," smart ") + message = replacetext(message," awful "," great ") + message = replacetext(message," gay ",pick(" nice "," ok "," alright ")) + message = replacetext(message," horrible "," fun ") + message = replacetext(message," terrible "," terribly fun ") + message = replacetext(message," terrifying "," wonderful ") + message = replacetext(message," gross "," cool ") + message = replacetext(message," disgusting "," amazing ") + message = replacetext(message," loser "," winner ") + message = replacetext(message," useless "," useful ") + message = replacetext(message," oh god "," cheese and crackers ") + message = replacetext(message," jesus "," gee wiz ") + message = replacetext(message," weak "," strong ") + message = replacetext(message," kill "," hug ") + message = replacetext(message," murder "," tease ") + message = replacetext(message," ugly "," beautiful ") + message = replacetext(message," douchbag "," nice guy ") + message = replacetext(message," whore "," lady ") + message = replacetext(message," nerd "," smart guy ") + message = replacetext(message," moron "," fun person ") + message = replacetext(message," IT'S LOOSE "," EVERYTHING IS FINE ") + message = replacetext(message," sex "," hug fight ") + message = replacetext(message," idiot "," genius ") + message = replacetext(message," fat "," thin ") + message = replacetext(message," beer "," water with ice ") + message = replacetext(message," drink "," water ") + message = replacetext(message," feminist "," empowered woman ") + message = replacetext(message," i hate you "," you're mean ") + message = replacetext(message," nigger "," african american ") + message = replacetext(message," jew "," jewish ") + message = replacetext(message," shit "," shiz ") + message = replacetext(message," crap "," poo ") + message = replacetext(message," slut "," tease ") + message = replacetext(message," ass "," butt ") + message = replacetext(message," damn "," dang ") + message = replacetext(message," fuck "," ") + message = replacetext(message," penis "," privates ") + message = replacetext(message," cunt "," privates ") + message = replacetext(message," dick "," jerk ") + message = replacetext(message," vagina "," privates ") + return trim(message) /datum/mutation/human/unintelligable name = "Unintelligable" @@ -129,30 +130,29 @@ /datum/mutation/human/chav/say_mod(var/message) if(message) - message = replacetext(message,"dick","prat") - message = replacetext(message,"comdom","knob'ead") - message = replacetext(message,"looking at","gawpin' at") - message = replacetext(message,"great","bangin'") - message = replacetext(message,"man","mate") - message = replacetext(message,"friend",pick("mate","bruv","bledrin")) - message = replacetext(message,"what","wot") - message = replacetext(message,"drink","wet") - message = replacetext(message,"get","giz") - message = replacetext(message,"what","wot") - message = replacetext(message,"no thanks","wuddent fukken do one") - message = replacetext(message,"i don't know","wot mate") - message = replacetext(message,"no","naw") - message = replacetext(message,"robust","chin") - message = replacetext(message," hi ","how what how") - message = replacetext(message,"hello","sup bruv") - message = replacetext(message,"kill","bang") - message = replacetext(message,"murder","bang") - message = replacetext(message,"windows","windies") - message = replacetext(message,"window","windy") - message = replacetext(message,"break","do") - message = replacetext(message,"your","yer") - message = replacetext(message,"security","coppers") - return message + message = " [message] " + message = replacetext(message," looking at "," gawpin' at ") + message = replacetext(message," great "," bangin' ") + message = replacetext(message," man "," mate ") + message = replacetext(message," friend ",pick(" mate "," bruv "," bledrin ")) + message = replacetext(message," what "," wot ") + message = replacetext(message," drink "," wet ") + message = replacetext(message," get "," giz ") + message = replacetext(message," what "," wot ") + message = replacetext(message," no thanks "," wuddent fukken do one ") + message = replacetext(message," i don't know "," wot mate ") + message = replacetext(message," no "," naw ") + message = replacetext(message," robust "," chin ") + message = replacetext(message," hi "," how what how ") + message = replacetext(message," hello "," sup bruv ") + message = replacetext(message," kill "," bang ") + message = replacetext(message," murder "," bang ") + message = replacetext(message," windows "," windies ") + message = replacetext(message," window "," windy ") + message = replacetext(message," break "," do ") + message = replacetext(message," your "," yer ") + message = replacetext(message," security "," coppers ") + return trim(message) /datum/mutation/human/elvis name = "Elvis" @@ -173,13 +173,14 @@ /datum/mutation/human/elvis/say_mod(var/message) if(message) - message = replacetext(message,"i'm not","I aint") - message = replacetext(message,"girl",pick("honey","baby","baby doll")) - message = replacetext(message,"man",pick("son","buddy","brother", "pal", "friendo")) - message = replacetext(message,"out of","outta") - message = replacetext(message,"thank you","thank you, thank you very much") - message = replacetext(message,"what are you","whatcha") - message = replacetext(message,"yes",pick("sure", "yea")) - message = replacetext(message,"faggot","square") - message = replacetext(message,"muh valids","getting my kicks") - return message + message = " [message] " + message = replacetext(message," i'm not "," I aint ") + message = replacetext(message," girl ",pick(" honey "," baby "," baby doll ")) + message = replacetext(message," man ",pick(" son "," buddy "," brother"," pal "," friendo ")) + message = replacetext(message," out of "," outta ") + message = replacetext(message," thank you "," thank you, thank you very much ") + message = replacetext(message," what are you "," whatcha ") + message = replacetext(message," yes ",pick(" sure", "yea ")) + message = replacetext(message," faggot "," square ") + message = replacetext(message," muh valids "," getting my kicks ") + return trim(message) From a9c181bbcc52d6d1fd3c1d43560727e0aab78138 Mon Sep 17 00:00:00 2001 From: xxalpha Date: Sun, 1 Feb 2015 12:29:51 +0000 Subject: [PATCH 06/11] Repath all non jetpack tank types to tank/internals Repath all portable tanks to tank/internals, except jetpacks Update ministation --- _maps/map_files/MiniStation/MiniStation.dmm | 4 +-- _maps/map_files/TgStation/tgstation.2.1.3.dmm | 20 ++++++------ _maps/map_files/generic/z2.dmm | 6 ++-- _maps/map_files/generic/z3.dmm | 4 +-- _maps/map_files/generic/z5.dmm | 2 +- code/_onclick/hud/screen_objects.dm | 14 ++++---- code/datums/supplypacks.dm | 32 +++++++++---------- code/game/asteroid.dm | 4 +-- .../gamemodes/changeling/powers/mutations.dm | 2 +- code/game/gamemodes/cult/cult_items.dm | 2 +- code/game/gamemodes/sandbox/h_sandbox.dm | 2 +- code/game/machinery/suit_storage_unit.dm | 8 ++--- code/game/machinery/vending.dm | 4 +-- .../objects/effects/spawners/bombspawner.dm | 20 ++++++------ .../game/objects/effects/spawners/lootdrop.dm | 2 +- .../objects/items/weapons/flamethrower.dm | 6 ++-- .../objects/items/weapons/storage/boxes.dm | 4 +-- .../objects/items/weapons/tanks/tank_types.dm | 32 +++++++++---------- .../crates_lockers/closets/secure/cargo.dm | 2 +- .../closets/secure/engineering.dm | 2 +- .../crates_lockers/closets/secure/medical.dm | 6 ++-- .../closets/secure/scientist.dm | 4 +-- .../crates_lockers/closets/utility_closets.dm | 16 +++++----- .../game/objects/structures/tank_dispenser.dm | 12 +++---- code/modules/admin/verbs/debug.dm | 4 +-- code/modules/awaymissions/corpse.dm | 2 +- code/modules/clothing/clothing.dm | 4 +-- code/modules/clothing/spacesuits/hardsuit.dm | 12 +++---- .../clothing/spacesuits/miscellaneous.dm | 10 +++--- code/modules/clothing/spacesuits/ninja.dm | 2 +- code/modules/clothing/spacesuits/syndi.dm | 2 +- code/modules/clothing/suits/armor.dm | 4 +-- code/modules/clothing/suits/bio.dm | 2 +- code/modules/clothing/suits/jobs.dm | 10 +++--- code/modules/clothing/suits/miscellaneous.dm | 14 ++++---- code/modules/clothing/suits/utility.dm | 4 +-- code/modules/events/holiday/xmas.dm | 2 +- code/modules/events/ninja.dm | 2 +- code/modules/mob/living/carbon/carbon.dm | 6 ++-- .../mob/living/carbon/carbon_defines.dm | 2 +- code/modules/mob/living/carbon/human/human.dm | 6 ++-- .../mob/living/simple_animal/corpse.dm | 2 +- .../living/simple_animal/friendly/corgi.dm | 4 +-- code/modules/power/singularity/collector.dm | 6 ++-- 44 files changed, 155 insertions(+), 155 deletions(-) diff --git a/_maps/map_files/MiniStation/MiniStation.dmm b/_maps/map_files/MiniStation/MiniStation.dmm index 52025a7b23a..3d04818ef2a 100644 --- a/_maps/map_files/MiniStation/MiniStation.dmm +++ b/_maps/map_files/MiniStation/MiniStation.dmm @@ -1143,7 +1143,7 @@ "vY" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/turf/simulated/shuttle/plating,/area/space) "vZ" = (/obj/machinery/door/airlock/shuttle{name = "Arrivals Shuttle Airlock"},/obj/docking_port/mobile{dir = 2; dwidth = 5; height = 7; id = "arrival"; name = "arrival shuttle"; travelDir = -90; width = 15},/obj/docking_port/stationary{dir = 2; dwidth = 5; height = 7; id = "arrival_home"; name = "port bay 1"; width = 15},/turf/simulated/shuttle/floor,/area/space) "wa" = (/turf/simulated/shuttle/wall{icon_state = "swall_s6"; dir = 2},/area/space) -"wb" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/weapon/tank/emergency_oxygen,/turf/simulated/floor/plating,/area/hallway/primary/central) +"wb" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/weapon/tank/internals/emergency_oxygen,/turf/simulated/floor/plating,/area/hallway/primary/central) "wc" = (/turf/simulated/wall,/area/crew_quarters/heads{name = "\improper Job Assignment"}) "wd" = (/obj/machinery/light/small{dir = 1},/obj/structure/closet,/turf/simulated/floor/plating,/area/hallway/primary/central) "we" = (/obj/structure/piano,/turf/simulated/floor/plasteel{icon_state = "bar"},/area/crew_quarters/bar) @@ -1385,7 +1385,7 @@ "AG" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/obj/structure/dispenser,/turf/simulated/floor/plasteel,/area/engine/engineering) "AH" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/door/airlock/glass_engineering{name = "Engineering"; req_access_txt = "10"; req_one_access_txt = "0"},/turf/simulated/floor/plasteel,/area/engine/engineering) "AI" = (/obj/machinery/firealarm{dir = 8; pixel_x = -24},/turf/simulated/floor/plasteel,/area/engine/engineering) -"AJ" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/clothing/suit/hazardvest,/obj/item/clothing/suit/hazardvest,/obj/item/weapon/tank/emergency_oxygen/engi,/obj/item/weapon/tank/emergency_oxygen/engi,/turf/simulated/floor/plasteel,/area/engine/engineering) +"AJ" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/clothing/suit/hazardvest,/obj/item/clothing/suit/hazardvest,/obj/item/weapon/tank/internals/emergency_oxygen/engi,/obj/item/weapon/tank/internals/emergency_oxygen/engi,/turf/simulated/floor/plasteel,/area/engine/engineering) "AK" = (/obj/machinery/door/airlock/glass_engineering{name = "Engineering"; req_access_txt = "10"; req_one_access_txt = "0"},/turf/simulated/floor/plasteel,/area/engine/engineering) "AL" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel,/area/engine/engineering) "AM" = (/obj/machinery/light{icon_state = "tube1"; dir = 4},/turf/simulated/floor/plasteel,/area/engine/engineering) diff --git a/_maps/map_files/TgStation/tgstation.2.1.3.dmm b/_maps/map_files/TgStation/tgstation.2.1.3.dmm index c89dee2cc70..6aae2f2a24d 100644 --- a/_maps/map_files/TgStation/tgstation.2.1.3.dmm +++ b/_maps/map_files/TgStation/tgstation.2.1.3.dmm @@ -223,7 +223,7 @@ "aeo" = (/obj/structure/cable,/obj/structure/lattice/catwalk,/turf/space,/area/solar/auxport) "aep" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel,/area/security/prison) "aeq" = (/obj/structure/window/reinforced{dir = 4},/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 9},/turf/simulated/floor/plating,/area/security/transfer) -"aer" = (/obj/structure/rack,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/obj/item/device/flashlight{pixel_x = 1; pixel_y = 5},/obj/item/weapon/tank/anesthetic{pixel_x = -3; pixel_y = 1},/obj/item/weapon/tank/oxygen/red{pixel_x = 3},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/security/prison) +"aer" = (/obj/structure/rack,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/obj/item/device/flashlight{pixel_x = 1; pixel_y = 5},/obj/item/weapon/tank/internals/anesthetic{pixel_x = -3; pixel_y = 1},/obj/item/weapon/tank/internals/oxygen/red{pixel_x = 3},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 8},/area/security/prison) "aes" = (/obj/machinery/atmospherics/pipe/simple/general/visible{dir = 5},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 10},/area/security/transfer) "aet" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/general/hidden,/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/prison) "aeu" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{tag = "icon-manifold-b-f (NORTH)"; dir = 1},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/prison) @@ -781,7 +781,7 @@ "apa" = (/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{tag = "icon-manifold-r-f (NORTH)"; dir = 1},/turf/simulated/floor/plating,/area/maintenance/fsmaint) "apb" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plating,/area/maintenance/fsmaint) "apc" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/obj/machinery/light/small{dir = 4},/obj/machinery/power/apc{dir = 2; name = "Fitness Room APC"; pixel_x = 0; pixel_y = -24},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9},/turf/simulated/floor/plating,/area/crew_quarters/fitness) -"apd" = (/obj/structure/rack{dir = 1},/obj/item/clothing/suit/fire/firefighter,/obj/item/weapon/tank/oxygen,/obj/item/clothing/mask/gas,/obj/item/weapon/extinguisher,/obj/item/clothing/head/hardhat/red,/obj/item/clothing/glasses/meson,/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 10},/area/maintenance/fsmaint) +"apd" = (/obj/structure/rack{dir = 1},/obj/item/clothing/suit/fire/firefighter,/obj/item/weapon/tank/internals/oxygen,/obj/item/clothing/mask/gas,/obj/item/weapon/extinguisher,/obj/item/clothing/head/hardhat/red,/obj/item/clothing/glasses/meson,/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 10},/area/maintenance/fsmaint) "ape" = (/obj/machinery/atmospherics/unary/portables_connector/visible{dir = 1},/obj/machinery/portable_atmospherics/canister/air,/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 6},/area/maintenance/fsmaint) "apf" = (/obj/structure/grille,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/crew_quarters/fitness) "apg" = (/obj/structure/grille,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/crew_quarters/fitness) @@ -2297,7 +2297,7 @@ "aSi" = (/obj/machinery/portable_atmospherics/canister/air,/turf/simulated/floor/plating,/area/storage/emergency2) "aSj" = (/obj/machinery/light/small,/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor/plating,/area/storage/emergency2) "aSk" = (/obj/machinery/space_heater,/turf/simulated/floor/plating,/area/storage/emergency2) -"aSl" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/tank/emergency_oxygen,/obj/item/clothing/mask/breath,/obj/item/clothing/mask/breath,/turf/simulated/floor/plating,/area/storage/emergency2) +"aSl" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/weapon/tank/internals/emergency_oxygen,/obj/item/weapon/tank/internals/emergency_oxygen,/obj/item/clothing/mask/breath,/obj/item/clothing/mask/breath,/turf/simulated/floor/plating,/area/storage/emergency2) "aSm" = (/obj/structure/extinguisher_cabinet{pixel_x = -27; pixel_y = 0},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 0; scrub_Toxins = 0},/turf/simulated/floor/plasteel,/area/storage/tools) "aSn" = (/obj/structure/table,/obj/item/weapon/storage/toolbox/emergency,/turf/simulated/floor/plasteel,/area/storage/tools) "aSo" = (/obj/structure/table,/obj/item/weapon/module/power_control,/obj/item/weapon/airlock_electronics,/turf/simulated/floor/plasteel,/area/storage/tools) @@ -3165,7 +3165,7 @@ "biS" = (/obj/machinery/portable_atmospherics/canister/air,/turf/simulated/floor/plating,/area/storage/emergency) "biT" = (/obj/machinery/space_heater,/turf/simulated/floor/plating,/area/storage/emergency) "biU" = (/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor/plating,/area/storage/emergency) -"biV" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/tank/emergency_oxygen,/obj/item/clothing/mask/breath,/obj/item/clothing/mask/breath,/turf/simulated/floor/plating,/area/storage/emergency) +"biV" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/weapon/tank/internals/emergency_oxygen,/obj/item/weapon/tank/internals/emergency_oxygen,/obj/item/clothing/mask/breath,/obj/item/clothing/mask/breath,/turf/simulated/floor/plating,/area/storage/emergency) "biW" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/bluegrid,/area/assembly/chargebay) "biX" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/bluegrid,/area/assembly/chargebay) "biY" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/plasteel,/area/assembly/chargebay) @@ -3800,7 +3800,7 @@ "bvd" = (/obj/machinery/computer/teleporter,/turf/simulated/floor/plating,/area/teleporter) "bve" = (/obj/machinery/teleport/station,/turf/simulated/floor/plating,/area/teleporter) "bvf" = (/obj/machinery/teleport/hub,/turf/simulated/floor/plating,/area/teleporter) -"bvg" = (/obj/structure/rack,/obj/item/weapon/tank/oxygen,/obj/item/clothing/mask/gas,/turf/simulated/floor/plating,/area/teleporter) +"bvg" = (/obj/structure/rack,/obj/item/weapon/tank/internals/oxygen,/obj/item/clothing/mask/gas,/turf/simulated/floor/plating,/area/teleporter) "bvh" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel,/area/hallway/primary/central) "bvi" = (/obj/machinery/navbeacon{codes_txt = "delivery;dir=4"; freq = 1400; location = "Medbay"},/obj/structure/plasticflaps{opacity = 1},/turf/simulated/floor/plasteel{icon_state = "bot"},/area/medical/medbay) "bvj" = (/obj/machinery/door/window/eastleft{name = "Medical Delivery"; req_access_txt = "5"},/turf/simulated/floor/plasteel{icon_state = "delivery"},/area/medical/medbay) @@ -4923,7 +4923,7 @@ "bQI" = (/obj/structure/rack{dir = 1},/obj/item/clothing/suit/hazardvest,/turf/simulated/floor/plating,/area/construction) "bQJ" = (/obj/structure/table,/obj/item/stack/cable_coil{amount = 5},/obj/item/device/flashlight,/turf/simulated/floor/plating,/area/construction) "bQK" = (/obj/structure/table,/turf/simulated/floor/plating,/area/construction) -"bQL" = (/obj/machinery/firealarm{dir = 1; pixel_y = -24},/obj/structure/table,/obj/item/weapon/tank/emergency_oxygen{pixel_x = -8; pixel_y = 0},/obj/item/weapon/tank/emergency_oxygen{pixel_x = -8; pixel_y = 0},/obj/item/clothing/mask/breath{pixel_x = 4; pixel_y = 0},/obj/item/clothing/mask/breath{pixel_x = 4; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel,/area/atmos) +"bQL" = (/obj/machinery/firealarm{dir = 1; pixel_y = -24},/obj/structure/table,/obj/item/weapon/tank/internals/emergency_oxygen{pixel_x = -8; pixel_y = 0},/obj/item/weapon/tank/internals/emergency_oxygen{pixel_x = -8; pixel_y = 0},/obj/item/clothing/mask/breath{pixel_x = 4; pixel_y = 0},/obj/item/clothing/mask/breath{pixel_x = 4; pixel_y = 0},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/simulated/floor/plasteel,/area/atmos) "bQM" = (/obj/structure/sign/atmosplaque{pixel_x = 0; pixel_y = -32},/obj/structure/table,/obj/item/weapon/storage/box,/obj/item/weapon/storage/box,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor/plasteel,/area/atmos) "bQN" = (/obj/machinery/computer/station_alert,/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/machinery/door_control{id = "atmos"; name = "Atmospherics Lockdown"; pixel_x = 24; pixel_y = 4; req_access_txt = "24"},/turf/simulated/floor/plasteel{dir = 6; icon_state = "caution"},/area/atmos) "bQO" = (/obj/structure/table,/obj/item/clothing/head/welding{pixel_x = -3; pixel_y = 7},/obj/item/clothing/head/welding{pixel_x = -5; pixel_y = 3},/obj/machinery/light{dir = 8},/obj/item/device/multitool,/turf/simulated/floor/plasteel,/area/atmos) @@ -5408,7 +5408,7 @@ "bZZ" = (/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/power/solar{id = "portsolar"; name = "Port Solar Array"},/turf/simulated/floor/plasteel/airless{icon_state = "solarpanel"},/area/solar/port) "caa" = (/obj/structure/table,/obj/item/weapon/storage/fancy/cigarettes,/turf/simulated/floor/plating,/area/maintenance/aft) "cab" = (/obj/structure/stool,/turf/simulated/floor/plating,/area/maintenance/aft) -"cac" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/tank/emergency_oxygen,/obj/item/clothing/mask/breath,/obj/item/clothing/mask/breath,/obj/effect/decal/cleanable/cobweb,/turf/simulated/floor/plating,/area/maintenance/aft) +"cac" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/weapon/tank/internals/emergency_oxygen,/obj/item/weapon/tank/internals/emergency_oxygen,/obj/item/clothing/mask/breath,/obj/item/clothing/mask/breath,/obj/effect/decal/cleanable/cobweb,/turf/simulated/floor/plating,/area/maintenance/aft) "cad" = (/obj/machinery/light/small{dir = 1},/obj/effect/spawner/lootdrop/maintenance,/turf/simulated/floor/plating,/area/maintenance/aft) "cae" = (/obj/machinery/portable_atmospherics/canister/air,/turf/simulated/floor/plating,/area/maintenance/aft) "caf" = (/obj/item/clothing/head/hardhat,/turf/simulated/floor/plating/airless,/area/space) @@ -5717,7 +5717,7 @@ "cfW" = (/obj/machinery/light{dir = 1},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plasteel{icon_state = "yellow"},/area/engine/engineering) "cfX" = (/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/portable_atmospherics/pump,/turf/simulated/floor/plasteel{icon_state = "yellow"},/area/engine/engineering) "cfY" = (/obj/machinery/door/poddoor/preopen{id = "telelab"; name = "test chamber blast door"},/obj/machinery/door/firedoor/heavy,/turf/simulated/floor/engine,/area/toxins/explab) -"cfZ" = (/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/structure/table,/obj/item/weapon/tank/emergency_oxygen/engi,/obj/item/clothing/mask/breath{step_x = 0; step_y = 0},/turf/simulated/floor/plasteel{icon_state = "yellow"},/area/engine/engineering) +"cfZ" = (/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/structure/table,/obj/item/weapon/tank/internals/emergency_oxygen/engi,/obj/item/clothing/mask/breath{step_x = 0; step_y = 0},/turf/simulated/floor/plasteel{icon_state = "yellow"},/area/engine/engineering) "cga" = (/obj/structure/cable{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/structure/extinguisher_cabinet{pixel_x = -5; pixel_y = 30},/turf/simulated/floor/plasteel{icon_state = "yellow"},/area/engine/engineering) "cgb" = (/obj/machinery/alarm{pixel_y = 23},/obj/machinery/portable_atmospherics/canister/oxygen,/turf/simulated/floor/plasteel{icon_state = "yellow"},/area/engine/engineering) "cgc" = (/turf/simulated/wall,/area/engine/engineering) @@ -6009,7 +6009,7 @@ "clC" = (/obj/structure/closet/radiation,/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,/turf/simulated/floor/plasteel,/area/engine/engineering) "clD" = (/obj/structure/table,/obj/item/device/flashlight{pixel_y = 5},/obj/item/clothing/ears/earmuffs{pixel_x = -5; pixel_y = 6},/obj/item/weapon/airlock_painter,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/engine/engineering) "clE" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/engine/engineering) -"clF" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/clothing/suit/hazardvest,/obj/item/clothing/suit/hazardvest,/obj/item/weapon/tank/emergency_oxygen/engi,/obj/item/weapon/tank/emergency_oxygen/engi,/obj/machinery/camera{c_tag = "Engineering East"; dir = 8; network = list("SS13"); pixel_x = 0; pixel_y = 0},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{tag = "icon-manifold-r-f (EAST)"; dir = 4},/turf/simulated/floor/plasteel{dir = 4; icon_state = "yellowcorner"},/area/engine/engineering) +"clF" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/clothing/suit/hazardvest,/obj/item/clothing/suit/hazardvest,/obj/item/weapon/tank/internals/emergency_oxygen/engi,/obj/item/weapon/tank/internals/emergency_oxygen/engi,/obj/machinery/camera{c_tag = "Engineering East"; dir = 8; network = list("SS13"); pixel_x = 0; pixel_y = 0},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{tag = "icon-manifold-r-f (EAST)"; dir = 4},/turf/simulated/floor/plasteel{dir = 4; icon_state = "yellowcorner"},/area/engine/engineering) "clG" = (/obj/machinery/atmospherics/unary/outlet_injector/on{dir = 1; frequency = 1443; id = "air_in"},/turf/simulated/floor/engine/vacuum,/area/maintenance/incinerator) "clH" = (/obj/machinery/igniter{icon_state = "igniter0"; id = "Incinerator"; luminosity = 2; on = 0},/obj/structure/cable/yellow{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/engine/vacuum,/area/maintenance/incinerator) "clI" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1; external_pressure_bound = 0; initialize_directions = 1; internal_pressure_bound = 4000; on = 0; pressure_checks = 2; pump_direction = 0},/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_x = 0; pixel_y = -32},/turf/simulated/floor/engine/vacuum,/area/maintenance/incinerator) @@ -6139,7 +6139,7 @@ "coc" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_x = 32},/turf/simulated/floor/plating,/area/engine/engineering) "cod" = (/obj/structure/reagent_dispensers/fueltank,/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 1},/area/engine/engineering) "coe" = (/obj/machinery/power/rad_collector{anchored = 1},/obj/structure/cable/yellow,/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 1},/area/engine/engineering) -"cof" = (/obj/machinery/power/rad_collector{anchored = 1},/obj/item/weapon/tank/plasma,/obj/structure/cable/yellow,/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 1},/area/engine/engineering) +"cof" = (/obj/machinery/power/rad_collector{anchored = 1},/obj/item/weapon/tank/internals/plasma,/obj/structure/cable/yellow,/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 1},/area/engine/engineering) "cog" = (/obj/structure/grille,/obj/structure/window/reinforced/fulltile,/turf/simulated/floor/plating,/area/engine/engineering) "coh" = (/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 8},/area/engine/engineering) "coi" = (/obj/structure/particle_accelerator/particle_emitter/left,/turf/simulated/floor/plating,/area/engine/engineering) diff --git a/_maps/map_files/generic/z2.dmm b/_maps/map_files/generic/z2.dmm index 5270c612f11..a5d5b2b129a 100644 --- a/_maps/map_files/generic/z2.dmm +++ b/_maps/map_files/generic/z2.dmm @@ -733,13 +733,13 @@ "oe" = (/turf/unsimulated/floor{tag = "icon-cultdamage4"; icon_state = "cultdamage4"},/area/wizard_station) "of" = (/obj/machinery/telecomms/allinone{intercept = 1},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/space) "og" = (/obj/effect/landmark{name = "Nuclear-Bomb"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/space) -"oh" = (/obj/structure/rack,/obj/item/weapon/c4,/obj/item/weapon/storage/firstaid/regular,/obj/item/weapon/pinpointer,/obj/item/weapon/shield/energy,/obj/item/clothing/glasses/thermal,/obj/item/weapon/tank/emergency_oxygen,/obj/item/ammo_box/a357,/obj/item/weapon/gun/projectile/revolver/mateba,/obj/item/weapon/melee/energy/sword,/obj/item/weapon/storage/backpack/security,/turf/unsimulated/floor{dir = 4; heat_capacity = 1; icon_state = "warning"},/area/centcom/ferry) -"oi" = (/obj/structure/rack,/obj/item/weapon/c4,/obj/item/weapon/storage/firstaid/regular,/obj/item/weapon/pinpointer,/obj/item/weapon/shield/energy,/obj/item/clothing/glasses/thermal,/obj/item/weapon/tank/emergency_oxygen,/obj/item/ammo_box/a357,/obj/item/weapon/gun/projectile/revolver/mateba,/obj/item/weapon/melee/energy/sword,/obj/item/weapon/storage/backpack/security,/turf/unsimulated/floor{dir = 8; heat_capacity = 1; icon_state = "warning"},/area/centcom/ferry) +"oh" = (/obj/structure/rack,/obj/item/weapon/c4,/obj/item/weapon/storage/firstaid/regular,/obj/item/weapon/pinpointer,/obj/item/weapon/shield/energy,/obj/item/clothing/glasses/thermal,/obj/item/weapon/tank/internals/emergency_oxygen,/obj/item/ammo_box/a357,/obj/item/weapon/gun/projectile/revolver/mateba,/obj/item/weapon/melee/energy/sword,/obj/item/weapon/storage/backpack/security,/turf/unsimulated/floor{dir = 4; heat_capacity = 1; icon_state = "warning"},/area/centcom/ferry) +"oi" = (/obj/structure/rack,/obj/item/weapon/c4,/obj/item/weapon/storage/firstaid/regular,/obj/item/weapon/pinpointer,/obj/item/weapon/shield/energy,/obj/item/clothing/glasses/thermal,/obj/item/weapon/tank/internals/emergency_oxygen,/obj/item/ammo_box/a357,/obj/item/weapon/gun/projectile/revolver/mateba,/obj/item/weapon/melee/energy/sword,/obj/item/weapon/storage/backpack/security,/turf/unsimulated/floor{dir = 8; heat_capacity = 1; icon_state = "warning"},/area/centcom/ferry) "oj" = (/obj/structure/door_assembly{anchored = 1; icon_state = "door_as_uranium1"; name = "Corridor A"},/turf/unsimulated/floor{tag = "icon-cult"; icon_state = "cult"},/area/wizard_station) "ok" = (/turf/unsimulated/wall/normal{tag = "icon-uranium15"; icon_state = "uranium15"},/area/wizard_station) "ol" = (/obj/machinery/door/airlock{icon = 'icons/obj/doors/Dooruranium.dmi'; name = "Corridor A"},/turf/unsimulated/floor{tag = "icon-cult"; icon_state = "cult"},/area/wizard_station) "om" = (/obj/structure/table,/obj/item/robot_parts/r_arm,/obj/item/weapon/storage/firstaid/regular{pixel_x = 0; pixel_y = 0},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/space) -"on" = (/obj/structure/closet/crate/internals,/obj/item/weapon/tank/oxygen/red,/obj/item/clothing/mask/gas,/obj/item/weapon/tank/oxygen/red,/obj/item/clothing/mask/gas,/obj/item/weapon/tank/oxygen/red,/obj/item/clothing/mask/gas,/obj/item/weapon/tank/oxygen/red,/obj/item/clothing/mask/gas,/obj/item/weapon/tank/oxygen/red,/obj/item/clothing/mask/gas,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/space) +"on" = (/obj/structure/closet/crate/internals,/obj/item/weapon/tank/internals/oxygen/red,/obj/item/clothing/mask/gas,/obj/item/weapon/tank/internals/oxygen/red,/obj/item/clothing/mask/gas,/obj/item/weapon/tank/internals/oxygen/red,/obj/item/clothing/mask/gas,/obj/item/weapon/tank/internals/oxygen/red,/obj/item/clothing/mask/gas,/obj/item/weapon/tank/internals/oxygen/red,/obj/item/clothing/mask/gas,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/space) "oo" = (/obj/structure/closet/crate/medical,/obj/item/weapon/surgicaldrill,/obj/item/weapon/scalpel,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/space) "op" = (/obj/structure/shuttle/engine/heater,/obj/structure/window/reinforced{dir = 1},/turf/simulated/shuttle/plating,/area/space) "oq" = (/obj/machinery/teleport/station,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/space) diff --git a/_maps/map_files/generic/z3.dmm b/_maps/map_files/generic/z3.dmm index 8f2722e3b71..745e704fc30 100644 --- a/_maps/map_files/generic/z3.dmm +++ b/_maps/map_files/generic/z3.dmm @@ -34,7 +34,7 @@ "aH" = (/turf/simulated/shuttle/floor{icon_state = "floor3"},/turf/simulated/shuttle/wall{icon_state = "swall_f6"; dir = 2},/area/derelict/ship) "aI" = (/obj/item/weapon/stock_parts/cell{charge = 100; maxcharge = 15000},/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/space) "aJ" = (/turf/simulated/shuttle/wall{tag = "icon-swall_f14"; icon_state = "swall_f14"},/area/space) -"aK" = (/obj/structure/rack,/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/storage/toolbox/mechanical,/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/space) +"aK" = (/obj/structure/rack,/obj/item/weapon/tank/internals/emergency_oxygen,/obj/item/weapon/tank/internals/emergency_oxygen,/obj/item/weapon/tank/internals/emergency_oxygen,/obj/item/weapon/tank/internals/emergency_oxygen,/obj/item/weapon/storage/toolbox/mechanical,/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/space) "aL" = (/obj/structure/cable,/obj/structure/computerframe{anchored = 1},/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/space) "aM" = (/turf/simulated/shuttle/wall{tag = "icon-swall_f11"; icon_state = "swall_f11"},/area/space) "aN" = (/obj/structure/lattice,/turf/space,/area/space) @@ -56,7 +56,7 @@ "bd" = (/turf/simulated/shuttle/wall{icon_state = "swall11"; dir = 2},/area/space) "be" = (/obj/structure/stool/bed/chair{dir = 4},/obj/effect/decal/remains/human,/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/space) "bf" = (/obj/machinery/portable_atmospherics/canister/oxygen,/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/space) -"bg" = (/obj/structure/table,/obj/item/weapon/tank/oxygen,/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/space) +"bg" = (/obj/structure/table,/obj/item/weapon/tank/internals/oxygen,/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/space) "bh" = (/obj/machinery/door/airlock/shuttle,/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/space) "bi" = (/turf/simulated/shuttle/wall{icon_state = "swall_s9"; dir = 2},/area/derelict/ship) "bj" = (/turf/simulated/shuttle/wall{icon_state = "swall_s5"; dir = 2},/area/derelict/ship) diff --git a/_maps/map_files/generic/z5.dmm b/_maps/map_files/generic/z5.dmm index 6d9fc6f20dd..201c0a384ca 100644 --- a/_maps/map_files/generic/z5.dmm +++ b/_maps/map_files/generic/z5.dmm @@ -210,7 +210,7 @@ "eb" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel{dir = 2; icon_state = "whiteblue"},/area/mine/laborcamp) "ec" = (/obj/machinery/navbeacon{codes_txt = "patrol;next_patrol=1-Storage"; location = "Sleeper"},/turf/simulated/floor/plasteel{dir = 2; icon_state = "whiteblue"},/area/mine/laborcamp) "ed" = (/obj/machinery/light/small{dir = 4},/obj/structure/stool/bed/roller,/turf/simulated/floor/plasteel{dir = 2; icon_state = "whiteblue"},/area/mine/laborcamp) -"ee" = (/obj/machinery/atmospherics/pipe/simple,/obj/structure/closet/crate/internals,/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/tank/emergency_oxygen,/obj/item/clothing/mask/breath,/obj/item/clothing/mask/breath,/obj/item/clothing/mask/breath,/obj/item/clothing/mask/breath,/turf/simulated/floor/plasteel{icon_state = "floorgrime"; temperature = 273.15},/area/mine/laborcamp) +"ee" = (/obj/machinery/atmospherics/pipe/simple,/obj/structure/closet/crate/internals,/obj/item/weapon/tank/internals/emergency_oxygen,/obj/item/weapon/tank/internals/emergency_oxygen,/obj/item/weapon/tank/internals/emergency_oxygen,/obj/item/weapon/tank/internals/emergency_oxygen,/obj/item/clothing/mask/breath,/obj/item/clothing/mask/breath,/obj/item/clothing/mask/breath,/obj/item/clothing/mask/breath,/turf/simulated/floor/plasteel{icon_state = "floorgrime"; temperature = 273.15},/area/mine/laborcamp) "ef" = (/obj/machinery/light/small,/turf/simulated/floor/plasteel{icon_state = "floorgrime"; temperature = 273.15},/area/mine/laborcamp) "eg" = (/obj/machinery/bot/secbot/beepsky{desc = "Powered by tears and swet of laborer."; name = "Prison Ofitser"},/obj/machinery/navbeacon{codes_txt = "patrol;next_patrol=2-NMine"; location = "1-Storage"},/turf/simulated/floor/plasteel{icon_state = "asteroidfloor"; temperature = 273.15},/area/mine/laborcamp) "eh" = (/obj/structure/plasticflaps/mining,/turf/simulated/floor/plasteel{icon_state = "asteroidfloor"; temperature = 273.15},/area/mine/laborcamp) diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm index 7225f85733b..e23a1e42479 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/code/_onclick/hud/screen_objects.dm @@ -133,29 +133,29 @@ C << "You are not wearing a mask." return 1 else - if(istype(C.l_hand, /obj/item/weapon/tank)) + if(istype(C.l_hand, /obj/item/weapon/tank/internals)) C << "You are now running on internals from the [C.l_hand] on your left hand." C.internal = C.l_hand - else if(istype(C.r_hand, /obj/item/weapon/tank)) + else if(istype(C.r_hand, /obj/item/weapon/tank/internals)) C << "You are now running on internals from the [C.r_hand] on your right hand." C.internal = C.r_hand else if(ishuman(C)) var/mob/living/carbon/human/H = C - if(istype(H.s_store, /obj/item/weapon/tank)) + if(istype(H.s_store, /obj/item/weapon/tank/internals)) H << "You are now running on internals from the [H.s_store] on your [H.wear_suit]." H.internal = H.s_store - else if(istype(H.belt, /obj/item/weapon/tank)) + else if(istype(H.belt, /obj/item/weapon/tank/internals)) H << "You are now running on internals from the [H.belt] on your belt." H.internal = H.belt - else if(istype(H.l_store, /obj/item/weapon/tank)) + else if(istype(H.l_store, /obj/item/weapon/tank/internals)) H << "You are now running on internals from the [H.l_store] in your left pocket." H.internal = H.l_store - else if(istype(H.r_store, /obj/item/weapon/tank)) + else if(istype(H.r_store, /obj/item/weapon/tank/internals)) H << "You are now running on internals from the [H.r_store] in your right pocket." H.internal = H.r_store //Seperate so CO2 jetpacks are a little less cumbersome. - if(!C.internal && istype(C.back, /obj/item/weapon/tank)) + if(!C.internal && istype(C.back, /obj/item/weapon/tank/internals)) C << "You are now running on internals from the [C.back] on your back." C.internal = C.back diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index 4670945c3d0..3832d494020 100644 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -77,11 +77,11 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /obj/machinery/bot/floorbot, /obj/machinery/bot/medbot, /obj/machinery/bot/medbot, - /obj/item/weapon/tank/air, - /obj/item/weapon/tank/air, - /obj/item/weapon/tank/air, - /obj/item/weapon/tank/air, - /obj/item/weapon/tank/air, + /obj/item/weapon/tank/internals/air, + /obj/item/weapon/tank/internals/air, + /obj/item/weapon/tank/internals/air, + /obj/item/weapon/tank/internals/air, + /obj/item/weapon/tank/internals/air, /obj/item/clothing/mask/gas, /obj/item/clothing/mask/gas, /obj/item/clothing/mask/gas, @@ -97,9 +97,9 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine contains = list(/obj/item/clothing/mask/gas, /obj/item/clothing/mask/gas, /obj/item/clothing/mask/gas, - /obj/item/weapon/tank/air, - /obj/item/weapon/tank/air, - /obj/item/weapon/tank/air) + /obj/item/weapon/tank/internals/air, + /obj/item/weapon/tank/internals/air, + /obj/item/weapon/tank/internals/air) cost = 10 containername = "internals crate" @@ -111,8 +111,8 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /obj/item/clothing/mask/gas, /obj/item/device/flashlight, /obj/item/device/flashlight, - /obj/item/weapon/tank/oxygen/red, - /obj/item/weapon/tank/oxygen/red, + /obj/item/weapon/tank/internals/oxygen/red, + /obj/item/weapon/tank/internals/oxygen/red, /obj/item/weapon/extinguisher, /obj/item/weapon/extinguisher, /obj/item/clothing/head/hardhat/red, @@ -306,9 +306,9 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /datum/supply_packs/security/armory/eweapons name = "Incendiary Weapons Crate" contains = list(/obj/item/weapon/flamethrower/full, - /obj/item/weapon/tank/plasma, - /obj/item/weapon/tank/plasma, - /obj/item/weapon/tank/plasma, + /obj/item/weapon/tank/internals/plasma, + /obj/item/weapon/tank/internals/plasma, + /obj/item/weapon/tank/internals/plasma, /obj/item/weapon/grenade/chem_grenade/incendiary, /obj/item/weapon/grenade/chem_grenade/incendiary, /obj/item/weapon/grenade/chem_grenade/incendiary) @@ -649,9 +649,9 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /datum/supply_packs/science/plasma name = "Plasma Assembly Crate" - contains = list(/obj/item/weapon/tank/plasma, - /obj/item/weapon/tank/plasma, - /obj/item/weapon/tank/plasma, + contains = list(/obj/item/weapon/tank/internals/plasma, + /obj/item/weapon/tank/internals/plasma, + /obj/item/weapon/tank/internals/plasma, /obj/item/device/assembly/igniter, /obj/item/device/assembly/igniter, /obj/item/device/assembly/igniter, diff --git a/code/game/asteroid.dm b/code/game/asteroid.dm index e0870964a61..6e9ac7205b5 100644 --- a/code/game/asteroid.dm +++ b/code/game/asteroid.dm @@ -63,7 +63,7 @@ proc/make_mining_asteroid_secret() treasureitems = list(/obj/machinery/bot/medbot/mysterious=1, /obj/item/weapon/circular_saw=1, /obj/structure/closet/critter/cat=2) fluffitems = list(/obj/effect/decal/cleanable/blood=5,/obj/item/organ/appendix=2,/obj/structure/closet/crate/freezer=2, /obj/structure/optable=1,/obj/item/weapon/scalpel=1,/obj/item/weapon/storage/firstaid/regular=3, - /obj/item/weapon/tank/anesthetic=1, /obj/item/weapon/surgical_drapes=2, /obj/item/device/mass_spectrometer/adv=1,/obj/item/clothing/glasses/hud/health=1) + /obj/item/weapon/tank/internals/anesthetic=1, /obj/item/weapon/surgical_drapes=2, /obj/item/device/mass_spectrometer/adv=1,/obj/item/clothing/glasses/hud/health=1) if("cult") theme = "cult" @@ -91,7 +91,7 @@ proc/make_mining_asteroid_secret() treasureitems = list(/obj/mecha/working/ripley/mining=1, /obj/item/weapon/pickaxe/drill/diamonddrill=2,/obj/item/weapon/gun/energy/kinetic_accelerator=1, /obj/item/weapon/resonator=1, /obj/item/weapon/pickaxe/jackhammer=5) fluffitems = list(/obj/effect/decal/cleanable/blood=3,/obj/effect/decal/remains/human=1,/obj/item/clothing/under/overalls=1, - /obj/item/weapon/reagent_containers/food/snacks/grown/chili=1,/obj/item/weapon/tank/oxygen/red=2) + /obj/item/weapon/reagent_containers/food/snacks/grown/chili=1,/obj/item/weapon/tank/internals/oxygen/red=2) if("xenoden") theme = "xenoden" diff --git a/code/game/gamemodes/changeling/powers/mutations.dm b/code/game/gamemodes/changeling/powers/mutations.dm index 60bc0a7bacc..98d0a0f18c6 100644 --- a/code/game/gamemodes/changeling/powers/mutations.dm +++ b/code/game/gamemodes/changeling/powers/mutations.dm @@ -253,7 +253,7 @@ icon_state = "lingspacesuit" desc = "A huge, bulky mass of pressure and temperature-resistant organic tissue, evolved to facilitate space travel." flags = STOPSPRESSUREDMAGE | NODROP //Not THICKMATERIAL because it's organic tissue, so if somebody tries to inject something into it, it still ends up in your blood. (also balance but muh fluff) - allowed = list(/obj/item/device/flashlight, /obj/item/weapon/tank/emergency_oxygen, /obj/item/weapon/tank/oxygen) + allowed = list(/obj/item/device/flashlight, /obj/item/weapon/tank/internals/emergency_oxygen, /obj/item/weapon/tank/internals/oxygen) armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) //No armor at all. /obj/item/clothing/suit/space/changeling/New() diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm index 2d5225758e4..90ebb2d9f93 100644 --- a/code/game/gamemodes/cult/cult_items.dm +++ b/code/game/gamemodes/cult/cult_items.dm @@ -97,6 +97,6 @@ item_state = "cult_armor" desc = "A bulky suit of armor, bristling with spikes. It looks space proof." w_class = 3 - allowed = list(/obj/item/weapon/tome,/obj/item/weapon/melee/cultblade,/obj/item/weapon/tank/emergency_oxygen) + allowed = list(/obj/item/weapon/tome,/obj/item/weapon/melee/cultblade,/obj/item/weapon/tank/internals/emergency_oxygen) slowdown = 1 armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30) \ No newline at end of file diff --git a/code/game/gamemodes/sandbox/h_sandbox.dm b/code/game/gamemodes/sandbox/h_sandbox.dm index 9b3045d62a1..69c8e75be00 100644 --- a/code/game/gamemodes/sandbox/h_sandbox.dm +++ b/code/game/gamemodes/sandbox/h_sandbox.dm @@ -37,7 +37,7 @@ datum/hSB/proc/update() "Space Gear", "Suit Up (Space Travel Gear)" = "hsbsuit", "Spawn Gas Mask" = "hsbspawn&path=[/obj/item/clothing/mask/gas]", - "Spawn Emergency Air Tank" = "hsbspawn&path=[/obj/item/weapon/tank/emergency_oxygen/double]", + "Spawn Emergency Air Tank" = "hsbspawn&path=[/obj/item/weapon/tank/internals/emergency_oxygen/double]", "Standard Tools", "Spawn Flashlight" = "hsbspawn&path=[/obj/item/device/flashlight]", diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index 2ea08978303..16aac4c25cb 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -79,25 +79,25 @@ SUIT_TYPE = /obj/item/clothing/suit/space/ert HELMET_TYPE = /obj/item/clothing/head/helmet/space/hardsuit/ert MASK_TYPE = /obj/item/clothing/mask/breath - STORAGE_TYPE = /obj/item/weapon/tank/emergency_oxygen/double + STORAGE_TYPE = /obj/item/weapon/tank/internals/emergency_oxygen/double /obj/machinery/suit_storage_unit/ertSec SUIT_TYPE = /obj/item/clothing/suit/space/ert/sec HELMET_TYPE = /obj/item/clothing/head/helmet/space/hardsuit/ert/sec MASK_TYPE = /obj/item/clothing/mask/breath - STORAGE_TYPE = /obj/item/weapon/tank/emergency_oxygen/double + STORAGE_TYPE = /obj/item/weapon/tank/internals/emergency_oxygen/double /obj/machinery/suit_storage_unit/ertEngi SUIT_TYPE = /obj/item/clothing/suit/space/ert/engi HELMET_TYPE = /obj/item/clothing/head/helmet/space/hardsuit/ert/engi MASK_TYPE = /obj/item/clothing/mask/breath - STORAGE_TYPE = /obj/item/weapon/tank/emergency_oxygen/double + STORAGE_TYPE = /obj/item/weapon/tank/internals/emergency_oxygen/double /obj/machinery/suit_storage_unit/ertMed SUIT_TYPE = /obj/item/clothing/suit/space/ert/med HELMET_TYPE = /obj/item/clothing/head/helmet/space/hardsuit/ert/med MASK_TYPE = /obj/item/clothing/mask/breath - STORAGE_TYPE = /obj/item/weapon/tank/emergency_oxygen/double + STORAGE_TYPE = /obj/item/weapon/tank/internals/emergency_oxygen/double /obj/machinery/suit_storage_unit/New() src.update_icon() diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index d597250a2fc..2a6a4974f86 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -589,7 +589,7 @@ desc = "A vendor with a wide variety of masks and gas tanks." icon = 'icons/obj/objects.dmi' icon_state = "dispenser" - product_paths = "/obj/item/weapon/tank/oxygen;/obj/item/weapon/tank/plasma;/obj/item/weapon/tank/emergency_oxygen;/obj/item/weapon/tank/emergency_oxygen/engi;/obj/item/clothing/mask/breath" + product_paths = "/obj/item/weapon/tank/internals/oxygen;/obj/item/weapon/tank/internals/plasma;/obj/item/weapon/tank/internals/emergency_oxygen;/obj/item/weapon/tank/internals/emergency_oxygen/engi;/obj/item/clothing/mask/breath" product_amounts = "10;10;10;5;25" vend_delay = 0 */ @@ -944,7 +944,7 @@ req_access_txt = "29" products = list(/obj/item/clothing/suit/toggle/labcoat = 4,/obj/item/clothing/under/rank/roboticist = 4,/obj/item/stack/cable_coil = 4,/obj/item/device/flash/handheld = 4, /obj/item/weapon/stock_parts/cell/high = 12, /obj/item/device/assembly/prox_sensor = 3,/obj/item/device/assembly/signaler = 3,/obj/item/device/healthanalyzer = 3, - /obj/item/weapon/scalpel = 2,/obj/item/weapon/circular_saw = 2,/obj/item/weapon/tank/anesthetic = 2,/obj/item/clothing/mask/breath/medical = 5, + /obj/item/weapon/scalpel = 2,/obj/item/weapon/circular_saw = 2,/obj/item/weapon/tank/internals/anesthetic = 2,/obj/item/clothing/mask/breath/medical = 5, /obj/item/weapon/screwdriver = 5,/obj/item/weapon/crowbar = 5) //This one's from NTstation diff --git a/code/game/objects/effects/spawners/bombspawner.dm b/code/game/objects/effects/spawners/bombspawner.dm index 8fb093f8938..5e1ef66ee32 100644 --- a/code/game/objects/effects/spawners/bombspawner.dm +++ b/code/game/objects/effects/spawners/bombspawner.dm @@ -30,7 +30,7 @@ // radio if (0) var/obj/item/assembly/r_i_ptank/R = new /obj/item/assembly/r_i_ptank(src.loc) - var/obj/item/weapon/tank/plasma/p3 = new /obj/item/weapon/tank/plasma(R) + var/obj/item/weapon/tank/internals/plasma/p3 = new /obj/item/weapon/tank/internals/plasma(R) var/obj/item/device/radio/signaler/p1 = new /obj/item/device/radio/signaler(R) var/obj/item/device/igniter/p2 = new /obj/item/device/igniter(R) R.part1 = p1 @@ -47,7 +47,7 @@ // proximity if (1) var/obj/item/assembly/m_i_ptank/R = new /obj/item/assembly/m_i_ptank(src.loc) - var/obj/item/weapon/tank/plasma/p3 = new /obj/item/weapon/tank/plasma(R) + var/obj/item/weapon/tank/internals/plasma/p3 = new /obj/item/weapon/tank/internals/plasma(R) var/obj/item/device/prox_sensor/p1 = new /obj/item/device/prox_sensor(R) var/obj/item/device/igniter/p2 = new /obj/item/device/igniter(R) R.part1 = p1 @@ -69,7 +69,7 @@ // timer if (2) var/obj/item/assembly/t_i_ptank/R = new /obj/item/assembly/t_i_ptank(src.loc) - var/obj/item/weapon/tank/plasma/p3 = new /obj/item/weapon/tank/plasma(R) + var/obj/item/weapon/tank/internals/plasma/p3 = new /obj/item/weapon/tank/internals/plasma(R) var/obj/item/device/timer/p1 = new /obj/item/device/timer(R) var/obj/item/device/igniter/p2 = new /obj/item/device/igniter(R) R.part1 = p1 @@ -85,7 +85,7 @@ //bombvest if(3) var/obj/item/clothing/suit/armor/a_i_a_ptank/R = new /obj/item/clothing/suit/armor/a_i_a_ptank(src.loc) - var/obj/item/weapon/tank/plasma/p4 = new /obj/item/weapon/tank/plasma(R) + var/obj/item/weapon/tank/internals/plasma/p4 = new /obj/item/weapon/tank/internals/plasma(R) var/obj/item/device/healthanalyzer/p1 = new /obj/item/device/healthanalyzer(R) var/obj/item/device/igniter/p2 = new /obj/item/device/igniter(R) var/obj/item/clothing/suit/armor/vest/p3 = new /obj/item/clothing/suit/armor/vest(R) @@ -135,8 +135,8 @@ if (0) var/obj/item/device/transfer_valve/V = new(src.loc) - var/obj/item/weapon/tank/plasma/PT = new(V) - var/obj/item/weapon/tank/oxygen/OT = new(V) + var/obj/item/weapon/tank/internals/plasma/PT = new(V) + var/obj/item/weapon/tank/internals/oxygen/OT = new(V) var/obj/item/device/assembly/signaler/S = new(V) @@ -158,8 +158,8 @@ if (1) var/obj/item/device/transfer_valve/V = new(src.loc) - var/obj/item/weapon/tank/plasma/PT = new(V) - var/obj/item/weapon/tank/oxygen/OT = new(V) + var/obj/item/weapon/tank/internals/plasma/PT = new(V) + var/obj/item/weapon/tank/internals/oxygen/OT = new(V) var/obj/item/device/assembly/prox_sensor/P = new(V) @@ -182,8 +182,8 @@ // timer if (2) var/obj/item/device/transfer_valve/V = new(src.loc) - var/obj/item/weapon/tank/plasma/PT = new(V) - var/obj/item/weapon/tank/oxygen/OT = new(V) + var/obj/item/weapon/tank/internals/plasma/PT = new(V) + var/obj/item/weapon/tank/internals/oxygen/OT = new(V) var/obj/item/device/assembly/timer/T = new(V) diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm index 176fd79b61b..f29d9f39c9e 100644 --- a/code/game/objects/effects/spawners/lootdrop.dm +++ b/code/game/objects/effects/spawners/lootdrop.dm @@ -110,7 +110,7 @@ /obj/item/weapon/storage/fancy/cigarettes/dromedaryco = 1, /obj/item/weapon/storage/toolbox/mechanical = 1, /obj/item/weapon/screwdriver = 3, - /obj/item/weapon/tank/emergency_oxygen = 2, + /obj/item/weapon/tank/internals/emergency_oxygen = 2, /obj/item/weapon/vending_refill/cola = 1, /obj/item/weapon/weldingtool = 3, /obj/item/weapon/wirecutters = 1, diff --git a/code/game/objects/items/weapons/flamethrower.dm b/code/game/objects/items/weapons/flamethrower.dm index 3354f1f5b0c..1fa74f76454 100644 --- a/code/game/objects/items/weapons/flamethrower.dm +++ b/code/game/objects/items/weapons/flamethrower.dm @@ -18,7 +18,7 @@ var/operating = 0//cooldown var/obj/item/weapon/weldingtool/weldtool = null var/obj/item/device/assembly/igniter/igniter = null - var/obj/item/weapon/tank/plasma/ptank = null + var/obj/item/weapon/tank/internals/plasma/ptank = null /obj/item/weapon/flamethrower/Destroy() @@ -100,7 +100,7 @@ update_icon() return - if(istype(W,/obj/item/weapon/tank/plasma)) + if(istype(W,/obj/item/weapon/tank/internals/plasma)) if(ptank) user << "There appears to already be a plasma tank loaded in [src]!" return @@ -204,5 +204,5 @@ /obj/item/weapon/flamethrower/full/tank/New(var/loc) ..() - ptank = new /obj/item/weapon/tank/plasma/full(src) + ptank = new /obj/item/weapon/tank/internals/plasma/full(src) update_icon() \ No newline at end of file diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index 467ca497767..8414d40a072 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -62,7 +62,7 @@ ..() contents = list() new /obj/item/clothing/mask/breath(src) - new /obj/item/weapon/tank/emergency_oxygen(src) + new /obj/item/weapon/tank/internals/emergency_oxygen(src) new /obj/item/weapon/reagent_containers/hypospray/medipen(src) return @@ -72,7 +72,7 @@ ..() contents = list() new /obj/item/clothing/mask/breath(src) - new /obj/item/weapon/tank/emergency_oxygen/engi(src) + new /obj/item/weapon/tank/internals/emergency_oxygen/engi(src) new /obj/item/weapon/reagent_containers/hypospray/medipen(src) return diff --git a/code/game/objects/items/weapons/tanks/tank_types.dm b/code/game/objects/items/weapons/tanks/tank_types.dm index 6af3b539a8b..12c4f8d1a13 100644 --- a/code/game/objects/items/weapons/tanks/tank_types.dm +++ b/code/game/objects/items/weapons/tanks/tank_types.dm @@ -10,24 +10,24 @@ /* * Oxygen */ -/obj/item/weapon/tank/oxygen +/obj/item/weapon/tank/internals/oxygen name = "oxygen tank" desc = "A tank of oxygen." icon_state = "oxygen" distribute_pressure = ONE_ATMOSPHERE*O2STANDARD -/obj/item/weapon/tank/oxygen/New() +/obj/item/weapon/tank/internals/oxygen/New() ..() src.air_contents.oxygen = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) return -/obj/item/weapon/tank/oxygen/yellow +/obj/item/weapon/tank/internals/oxygen/yellow desc = "A tank of oxygen, this one is yellow." icon_state = "oxygen_f" -/obj/item/weapon/tank/oxygen/red +/obj/item/weapon/tank/internals/oxygen/red desc = "A tank of oxygen, this one is red." icon_state = "oxygen_fr" @@ -35,13 +35,13 @@ /* * Anesthetic */ -/obj/item/weapon/tank/anesthetic +/obj/item/weapon/tank/internals/anesthetic name = "anesthetic tank" desc = "A tank with an N2O/O2 gas mix." icon_state = "anesthetic" item_state = "an_tank" -/obj/item/weapon/tank/anesthetic/New() +/obj/item/weapon/tank/internals/anesthetic/New() ..() src.air_contents.oxygen = (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * O2STANDARD @@ -55,13 +55,13 @@ /* * Air */ -/obj/item/weapon/tank/air +/obj/item/weapon/tank/internals/air name = "air tank" desc = "Mixed anyone?" icon_state = "oxygen" -/obj/item/weapon/tank/air/New() +/obj/item/weapon/tank/internals/air/New() ..() src.air_contents.oxygen = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * O2STANDARD @@ -72,7 +72,7 @@ /* * Plasma */ -/obj/item/weapon/tank/plasma +/obj/item/weapon/tank/internals/plasma name = "plasma tank" desc = "Contains dangerous plasma. Do not inhale. Warning: extremely flammable." icon_state = "plasma" @@ -80,13 +80,13 @@ slot_flags = null //they have no straps! -/obj/item/weapon/tank/plasma/New() +/obj/item/weapon/tank/internals/plasma/New() ..() src.air_contents.toxins = (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) return -/obj/item/weapon/tank/plasma/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/item/weapon/tank/internals/plasma/attackby(obj/item/weapon/W as obj, mob/user as mob) ..() if (istype(W, /obj/item/weapon/flamethrower)) @@ -98,7 +98,7 @@ src.loc = F return -/obj/item/weapon/tank/plasma/full/New() +/obj/item/weapon/tank/internals/plasma/full/New() ..() src.air_contents.toxins = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) return @@ -106,7 +106,7 @@ /* * Emergency Oxygen */ -/obj/item/weapon/tank/emergency_oxygen +/obj/item/weapon/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" @@ -118,17 +118,17 @@ volume = 3 //Tiny. Real life equivalents only have 21 breaths of oxygen in them. They're EMERGENCY tanks anyway -errorage (dangercon 2011) -/obj/item/weapon/tank/emergency_oxygen/New() +/obj/item/weapon/tank/internals/emergency_oxygen/New() ..() src.air_contents.oxygen = (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) return -/obj/item/weapon/tank/emergency_oxygen/engi +/obj/item/weapon/tank/internals/emergency_oxygen/engi name = "extended-capacity emergency oxygen tank" icon_state = "emergency_engi" volume = 6 -/obj/item/weapon/tank/emergency_oxygen/double +/obj/item/weapon/tank/internals/emergency_oxygen/double name = "double emergency oxygen tank" icon_state = "emergency_engi" volume = 10 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 af573d346f1..e4c16bf5bba 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm @@ -37,7 +37,7 @@ new /obj/item/clothing/gloves/fingerless(src) // new /obj/item/weapon/cartridge/quartermaster(src) new /obj/item/clothing/suit/fire/firefighter(src) - new /obj/item/weapon/tank/emergency_oxygen(src) + new /obj/item/weapon/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 75c5298b2d2..2225b1d78a6 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm @@ -132,7 +132,7 @@ new /obj/item/weapon/storage/toolbox/mechanical(src) new /obj/item/weapon/storage/backpack/satchel_norm(src) new /obj/item/weapon/storage/backpack/dufflebag/engineering(src) - new /obj/item/weapon/tank/emergency_oxygen/engi(src) + new /obj/item/weapon/tank/internals/emergency_oxygen/engi(src) new /obj/item/weapon/watertank/atmos(src) new /obj/item/clothing/suit/fire/atmos(src) new /obj/item/clothing/head/hardhat/atmos(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 f8659cfbd55..a47ecc0f87e 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -46,9 +46,9 @@ /obj/structure/closet/secure_closet/medical2/New() ..() - new /obj/item/weapon/tank/anesthetic(src) - new /obj/item/weapon/tank/anesthetic(src) - new /obj/item/weapon/tank/anesthetic(src) + new /obj/item/weapon/tank/internals/anesthetic(src) + new /obj/item/weapon/tank/internals/anesthetic(src) + new /obj/item/weapon/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 86db3895e78..1179a079e6e 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm @@ -15,7 +15,7 @@ new /obj/item/clothing/shoes/sneakers/white(src) // new /obj/item/weapon/cartridge/signal/toxins(src) new /obj/item/device/radio/headset/headset_sci(src) - new /obj/item/weapon/tank/air(src) + new /obj/item/weapon/tank/internals/air(src) new /obj/item/clothing/mask/gas(src) return @@ -44,7 +44,7 @@ new /obj/item/clothing/shoes/sneakers/white(src) new /obj/item/clothing/gloves/color/latex(src) new /obj/item/device/radio/headset/heads/rd(src) - new /obj/item/weapon/tank/air(src) + new /obj/item/weapon/tank/internals/air(src) new /obj/item/clothing/mask/gas(src) new /obj/item/clothing/suit/armor/reactive(src) new /obj/item/device/flash/handheld(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 27c2655da50..7fb6712b9e7 100644 --- a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm @@ -27,18 +27,18 @@ switch (pickweight(list("small" = 40, "aid" = 25, "tank" = 20, "both" = 10, "nothing" = 4, "delete" = 1))) if ("small") - new /obj/item/weapon/tank/emergency_oxygen(src) - new /obj/item/weapon/tank/emergency_oxygen(src) + new /obj/item/weapon/tank/internals/emergency_oxygen(src) + new /obj/item/weapon/tank/internals/emergency_oxygen(src) if ("aid") - new /obj/item/weapon/tank/emergency_oxygen(src) + new /obj/item/weapon/tank/internals/emergency_oxygen(src) new /obj/item/weapon/storage/firstaid/o2(src) if ("tank") - new /obj/item/weapon/tank/air(src) + new /obj/item/weapon/tank/internals/air(src) if ("both") - new /obj/item/weapon/tank/emergency_oxygen(src) + new /obj/item/weapon/tank/internals/emergency_oxygen(src) new /obj/item/clothing/mask/breath(src) if ("nothing") @@ -54,7 +54,7 @@ qdel(src)*/ /obj/structure/closet/emcloset/legacy/New() - new /obj/item/weapon/tank/oxygen(src) + new /obj/item/weapon/tank/internals/oxygen(src) new /obj/item/clothing/mask/gas(src) /* @@ -72,7 +72,7 @@ new /obj/item/clothing/suit/fire/firefighter(src) new /obj/item/clothing/mask/gas(src) - new /obj/item/weapon/tank/oxygen/red(src) + new /obj/item/weapon/tank/internals/oxygen/red(src) new /obj/item/weapon/extinguisher(src) new /obj/item/clothing/head/hardhat/red(src) @@ -83,7 +83,7 @@ new /obj/item/clothing/suit/fire/firefighter(src) new /obj/item/clothing/mask/gas(src) new /obj/item/device/flashlight(src) - new /obj/item/weapon/tank/oxygen/red(src) + new /obj/item/weapon/tank/internals/oxygen/red(src) new /obj/item/weapon/extinguisher(src) new /obj/item/clothing/head/hardhat/red(src) diff --git a/code/game/objects/structures/tank_dispenser.dm b/code/game/objects/structures/tank_dispenser.dm index 0dcf0f5f451..06f5aa67d74 100644 --- a/code/game/objects/structures/tank_dispenser.dm +++ b/code/game/objects/structures/tank_dispenser.dm @@ -48,7 +48,7 @@ /obj/structure/dispenser/attackby(obj/item/I as obj, mob/user as mob) - if(istype(I, /obj/item/weapon/tank/oxygen) || istype(I, /obj/item/weapon/tank/air) || istype(I, /obj/item/weapon/tank/anesthetic)) + if(istype(I, /obj/item/weapon/tank/internals/oxygen) || istype(I, /obj/item/weapon/tank/internals/air) || istype(I, /obj/item/weapon/tank/internals/anesthetic)) if(oxygentanks < 10) user.drop_item() I.loc = src @@ -57,7 +57,7 @@ user << "You put [I] in [src]." else user << "[src] is full." - if(istype(I, /obj/item/weapon/tank/plasma)) + if(istype(I, /obj/item/weapon/tank/internals/plasma)) if(plasmatanks < 10) user.drop_item() I.loc = src @@ -76,24 +76,24 @@ usr.set_machine(src) if(href_list["oxygen"]) if(oxygentanks > 0) - var/obj/item/weapon/tank/oxygen/O + var/obj/item/weapon/tank/internals/oxygen/O if(oxytanks.len == oxygentanks) O = oxytanks[1] oxytanks.Remove(O) else - O = new /obj/item/weapon/tank/oxygen(loc) + O = new /obj/item/weapon/tank/internals/oxygen(loc) O.loc = loc usr << "You take [O] out of [src]." oxygentanks-- update_icon() if(href_list["plasma"]) if(plasmatanks > 0) - var/obj/item/weapon/tank/plasma/P + var/obj/item/weapon/tank/internals/plasma/P if(platanks.len == plasmatanks) P = platanks[1] platanks.Remove(P) else - P = new /obj/item/weapon/tank/plasma(loc) + P = new /obj/item/weapon/tank/internals/plasma(loc) P.loc = loc usr << "You take [P] out of [src]." plasmatanks-- diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index 1a99e573f41..885077e30b6 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -1011,7 +1011,7 @@ var/global/list/g_fancy_list_of_types = null for(var/obj/machinery/power/rad_collector/Rad in world) if(Rad.anchored) if(!Rad.P) - var/obj/item/weapon/tank/plasma/Plasma = new/obj/item/weapon/tank/plasma(Rad) + var/obj/item/weapon/tank/internals/plasma/Plasma = new/obj/item/weapon/tank/internals/plasma(Rad) Plasma.air_contents.toxins = 70 Rad.drainratio = 0 Rad.P = Plasma @@ -1087,7 +1087,7 @@ var/global/list/g_fancy_list_of_types = null M.equip_to_slot_or_del(new /obj/item/weapon/melee/energy/sword/saber(M), slot_l_store) M.equip_to_slot_or_del(new /obj/item/weapon/shield/energy(M), slot_r_store) - M.equip_to_slot_or_del(new /obj/item/weapon/tank/emergency_oxygen(M), slot_s_store) + M.equip_to_slot_or_del(new /obj/item/weapon/tank/internals/emergency_oxygen(M), slot_s_store) M.equip_to_slot_or_del(new /obj/item/weapon/gun/projectile/revolver/mateba(M), slot_belt) M.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/pulse_rifle(M), slot_r_hand) diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm index d383475aee2..703962ae3ba 100644 --- a/code/modules/awaymissions/corpse.dm +++ b/code/modules/awaymissions/corpse.dm @@ -148,7 +148,7 @@ corpsemask = /obj/item/clothing/mask/gas/syndicate corpsehelmet = /obj/item/clothing/head/helmet/space/hardsuit/syndi corpseback = /obj/item/weapon/tank/jetpack/oxygen - corpsepocket1 = /obj/item/weapon/tank/emergency_oxygen + corpsepocket1 = /obj/item/weapon/tank/internals/emergency_oxygen corpseid = 1 corpseidjob = "Operative" corpseidaccess = "Syndicate" diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 52dd1332283..7ae4d730d3c 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -144,7 +144,7 @@ BLIND // can't see anything icon = 'icons/obj/clothing/suits.dmi' name = "suit" var/fire_resist = T0C+100 - allowed = list(/obj/item/weapon/tank/emergency_oxygen) + allowed = list(/obj/item/weapon/tank/internals/emergency_oxygen) armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) slot_flags = SLOT_OCLOTHING var/blood_overlay_type = "suit" @@ -180,7 +180,7 @@ BLIND // can't see anything permeability_coefficient = 0.02 flags = STOPSPRESSUREDMAGE | THICKMATERIAL body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS - allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen) + allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/internals) slowdown = 2 armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 50) flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm index fb75f3e5711..d3f3049eba2 100644 --- a/code/modules/clothing/spacesuits/hardsuit.dm +++ b/code/modules/clothing/spacesuits/hardsuit.dm @@ -42,7 +42,7 @@ item_state = "eng_hardsuit" slowdown = 2 armor = list(melee = 10, bullet = 5, laser = 10, energy = 5, bomb = 10, bio = 100, rad = 75) - allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen,/obj/item/device/t_scanner, /obj/item/weapon/rcd) + allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/internals,/obj/item/device/t_scanner, /obj/item/weapon/rcd) var/obj/item/clothing/head/helmet/space/hardsuit/helmet action_button_name = "Toggle Helmet" var/helmettype = /obj/item/clothing/head/helmet/space/hardsuit @@ -107,7 +107,7 @@ desc = "A special suit that protects against hazardous, low pressure environments. Has reinforced plating for wildlife encounters." item_state = "mining_hardsuit" armor = list(melee = 40, bullet = 5, laser = 10, energy = 5, bomb = 50, bio = 100, rad = 50) - allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/storage/bag/ore,/obj/item/weapon/pickaxe) + allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/internals,/obj/item/weapon/storage/bag/ore,/obj/item/weapon/pickaxe) helmettype = /obj/item/clothing/head/helmet/space/hardsuit/mining @@ -164,7 +164,7 @@ var/on = 1 action_button_name = "Toggle Hardsuit Mode" armor = list(melee = 60, bullet = 50, laser = 30, energy = 15, bomb = 35, bio = 100, rad = 50) - allowed = list(/obj/item/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword/saber,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/tank/emergency_oxygen) + allowed = list(/obj/item/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword/saber,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/tank/internals) helmettype = null /obj/item/clothing/suit/space/hardsuit/syndi/update_icon() @@ -217,7 +217,7 @@ w_class = 3 unacidable = 1 armor = list(melee = 40, bullet = 20, laser = 20, energy = 20, bomb = 35, bio = 100, rad = 50) - allowed = list(/obj/item/weapon/teleportation_scroll,/obj/item/weapon/tank/emergency_oxygen) + allowed = list(/obj/item/weapon/teleportation_scroll,/obj/item/weapon/tank/internals) heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS //Uncomment to enable firesuit protection max_heat_protection_temperature = FIRE_IMMUNITY_SUIT_MAX_TEMP_PROTECT unacidable = 1 @@ -241,7 +241,7 @@ desc = "A special suit that protects against hazardous, low pressure environments. Built with lightweight materials for easier movement." item_state = "medical_hardsuit" slowdown = 1 - allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/storage/firstaid,/obj/item/device/healthanalyzer,/obj/item/stack/medical) + allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/internals,/obj/item/weapon/storage/firstaid,/obj/item/device/healthanalyzer,/obj/item/stack/medical) armor = list(melee = 10, bullet = 5, laser = 10, energy = 5, bomb = 10, bio = 100, rad = 50) helmettype = /obj/item/clothing/head/helmet/space/hardsuit/medical @@ -260,6 +260,6 @@ name = "security hardsuit" desc = "A special suit that protects against hazardous, low pressure environments. Has an additional layer of armor." item_state = "sec_hardsuit" - allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen, /obj/item/weapon/gun/energy,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/weapon/gun/projectile,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/restraints/handcuffs) + allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/internals, /obj/item/weapon/gun/energy,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/weapon/gun/projectile,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/restraints/handcuffs) armor = list(melee = 30, bullet = 15, laser = 30, energy = 10, bomb = 10, bio = 100, rad = 50) helmettype = /obj/item/clothing/head/helmet/space/hardsuit/security diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm index 4dc3903591c..ae7cbf2727e 100644 --- a/code/modules/clothing/spacesuits/miscellaneous.dm +++ b/code/modules/clothing/spacesuits/miscellaneous.dm @@ -14,7 +14,7 @@ icon_state = "caparmor" item_state = "capspacesuit" w_class = 4 - allowed = list(/obj/item/weapon/tank/emergency_oxygen, /obj/item/device/flashlight,/obj/item/weapon/gun/energy, /obj/item/weapon/gun/projectile, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/weapon/melee/baton,/obj/item/weapon/restraints/handcuffs) + allowed = list(/obj/item/weapon/tank/internals, /obj/item/device/flashlight,/obj/item/weapon/gun/energy, /obj/item/weapon/gun/projectile, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/weapon/melee/baton,/obj/item/weapon/restraints/handcuffs) slowdown = 1 armor = list(melee = 65, bullet = 50, laser = 50, energy = 25, bomb = 50, bio = 100, rad = 50) @@ -35,7 +35,7 @@ desc = "A heavily armored, advanced space suit that protects against most forms of damage." icon_state = "deathsquad" item_state = "swat_suit" - allowed = list(/obj/item/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/tank/emergency_oxygen) + allowed = list(/obj/item/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/tank/internals) armor = list(melee = 80, bullet = 80, laser = 50,energy = 50, bomb = 100, bio = 100, rad = 100) slowdown = 1 strip_delay = 130 @@ -73,7 +73,7 @@ item_state = "void" desc = "An old, NASA Centcom branch designed, dark red space suit." slowdown = 1 - allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen,/obj/item/device/multitool) + allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/internals,/obj/item/device/multitool) //Space santa outfit suit @@ -110,7 +110,7 @@ icon_state = "pirate" item_state = "pirate" w_class = 3 - allowed = list(/obj/item/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/tank/emergency_oxygen) + allowed = list(/obj/item/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/tank/internals) slowdown = 0 armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30) strip_delay = 40 @@ -150,7 +150,7 @@ desc = "Standard issue command suit for the ERT." icon_state = "ert_command" item_state = "ert_command" - allowed = list(/obj/item/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/tank/emergency_oxygen) + allowed = list(/obj/item/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/tank/internals) armor = list(melee = 65, bullet = 50, laser = 50, energy = 50, bomb = 50, bio = 100, rad = 100) slowdown = 1 strip_delay = 130 diff --git a/code/modules/clothing/spacesuits/ninja.dm b/code/modules/clothing/spacesuits/ninja.dm index 93b9129c189..9c6c98d6396 100644 --- a/code/modules/clothing/spacesuits/ninja.dm +++ b/code/modules/clothing/spacesuits/ninja.dm @@ -13,7 +13,7 @@ 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/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/stock_parts/cell) + allowed = list(/obj/item/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/tank/internals,/obj/item/weapon/stock_parts/cell) slowdown = 0 unacidable = 1 armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30) diff --git a/code/modules/clothing/spacesuits/syndi.dm b/code/modules/clothing/spacesuits/syndi.dm index b4f4bf1d773..4f96b191df6 100644 --- a/code/modules/clothing/spacesuits/syndi.dm +++ b/code/modules/clothing/spacesuits/syndi.dm @@ -13,7 +13,7 @@ item_state = "space_suit_syndicate" desc = "Has a tag on it: Totally not property of of a hostile corporation, honest!" w_class = 3 - allowed = list(/obj/item/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword/saber,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/tank/emergency_oxygen) + allowed = list(/obj/item/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword/saber,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/tank/internals) slowdown = 1 armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30) diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 95499d23afc..99caa01812d 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -112,7 +112,7 @@ name = "armor" desc = "An armored vest with a detective's badge on it." icon_state = "detective-armor" - allowed = list(/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/device/flashlight,/obj/item/weapon/gun/energy,/obj/item/weapon/gun/projectile,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/lighter,/obj/item/device/detective_scanner,/obj/item/device/taperecorder) + allowed = list(/obj/item/weapon/tank/internals/emergency_oxygen,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/device/flashlight,/obj/item/weapon/gun/energy,/obj/item/weapon/gun/projectile,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/lighter,/obj/item/device/detective_scanner,/obj/item/device/taperecorder) @@ -165,7 +165,7 @@ item_state = "centcom" w_class = 4//bulky item body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS - allowed = list(/obj/item/weapon/gun/energy,/obj/item/weapon/melee/baton,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/tank/emergency_oxygen) + allowed = list(/obj/item/weapon/gun/energy,/obj/item/weapon/melee/baton,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/tank/internals/emergency_oxygen) flags = THICKMATERIAL flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT cold_protection = CHEST | GROIN | LEGS | FEET | ARMS | HANDS diff --git a/code/modules/clothing/suits/bio.dm b/code/modules/clothing/suits/bio.dm index 869d47d6856..7d75bef57d4 100644 --- a/code/modules/clothing/suits/bio.dm +++ b/code/modules/clothing/suits/bio.dm @@ -20,7 +20,7 @@ flags = THICKMATERIAL body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS slowdown = 1.0 - allowed = list(/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/pen,/obj/item/device/flashlight/pen) + allowed = list(/obj/item/weapon/tank/internals/emergency_oxygen,/obj/item/weapon/pen,/obj/item/device/flashlight/pen) armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 20) flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT strip_delay = 70 diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index 0b63ed9999f..22a6d9b74e1 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -20,7 +20,7 @@ item_state = "bio_suit" body_parts_covered = CHEST|GROIN|LEGS|ARMS flags_inv = HIDEJUMPSUIT - allowed = list(/obj/item/weapon/disk, /obj/item/weapon/stamp, /obj/item/weapon/reagent_containers/food/drinks/flask, /obj/item/weapon/melee, /obj/item/weapon/storage/lockbox/medal, /obj/item/device/flash/handheld, /obj/item/weapon/storage/box/matches, /obj/item/weapon/lighter, /obj/item/clothing/mask/cigarette, /obj/item/weapon/storage/fancy/cigarettes, /obj/item/weapon/tank/emergency_oxygen) + allowed = list(/obj/item/weapon/disk, /obj/item/weapon/stamp, /obj/item/weapon/reagent_containers/food/drinks/flask, /obj/item/weapon/melee, /obj/item/weapon/storage/lockbox/medal, /obj/item/device/flash/handheld, /obj/item/weapon/storage/box/matches, /obj/item/weapon/lighter, /obj/item/clothing/mask/cigarette, /obj/item/weapon/storage/fancy/cigarettes, /obj/item/weapon/tank/internals/emergency_oxygen) //Chaplain /obj/item/clothing/suit/hooded/chaplain_hoodie @@ -29,7 +29,7 @@ icon_state = "chaplain_hoodie" item_state = "chaplain_hoodie" body_parts_covered = CHEST|GROIN|LEGS|ARMS - allowed = list(/obj/item/weapon/storage/book/bible, /obj/item/weapon/nullrod, /obj/item/weapon/reagent_containers/food/drinks/bottle/holywater, /obj/item/weapon/storage/fancy/candle_box, /obj/item/candle, /obj/item/weapon/tank/emergency_oxygen) + allowed = list(/obj/item/weapon/storage/book/bible, /obj/item/weapon/nullrod, /obj/item/weapon/reagent_containers/food/drinks/bottle/holywater, /obj/item/weapon/storage/fancy/candle_box, /obj/item/candle, /obj/item/weapon/tank/internals/emergency_oxygen) hooded = 1 action_button_name = "Toggle Chaplain Hoodie" hoodtype = /obj/item/clothing/head/chaplain_hood @@ -49,7 +49,7 @@ item_state = "nun" body_parts_covered = CHEST|GROIN|LEGS|ARMS|HANDS flags_inv = HIDESHOES|HIDEJUMPSUIT - allowed = list(/obj/item/weapon/storage/book/bible, /obj/item/weapon/nullrod, /obj/item/weapon/reagent_containers/food/drinks/bottle/holywater, /obj/item/weapon/storage/fancy/candle_box, /obj/item/candle, /obj/item/weapon/tank/emergency_oxygen) + allowed = list(/obj/item/weapon/storage/book/bible, /obj/item/weapon/nullrod, /obj/item/weapon/reagent_containers/food/drinks/bottle/holywater, /obj/item/weapon/storage/fancy/candle_box, /obj/item/candle, /obj/item/weapon/tank/internals/emergency_oxygen) //Chef /obj/item/clothing/suit/toggle/chef @@ -82,7 +82,7 @@ item_state = "det_suit" blood_overlay_type = "coat" body_parts_covered = CHEST|GROIN|LEGS|ARMS - allowed = list(/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/device/flashlight,/obj/item/weapon/gun/energy,/obj/item/weapon/gun/projectile,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/lighter,/obj/item/device/detective_scanner,/obj/item/device/taperecorder) + allowed = list(/obj/item/weapon/tank/internals/emergency_oxygen,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/device/flashlight,/obj/item/weapon/gun/energy,/obj/item/weapon/gun/projectile,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/lighter,/obj/item/device/detective_scanner,/obj/item/device/taperecorder) armor = list(melee = 50, bullet = 10, laser = 25, energy = 10, bomb = 0, bio = 0, rad = 0) cold_protection = CHEST|GROIN|LEGS|ARMS heat_protection = CHEST|GROIN|LEGS|ARMS @@ -100,7 +100,7 @@ icon_state = "hazard" item_state = "hazard" blood_overlay_type = "armor" - allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen,/obj/item/device/t_scanner,) + allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/internals/emergency_oxygen,/obj/item/device/t_scanner,) //Lawyer /obj/item/clothing/suit/toggle/lawyer diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index e4d2af2ca59..d18025b4472 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -86,7 +86,7 @@ item_state = "syndicate-black-red" desc = "A plastic replica of the Syndicate space suit. You'll look just like a real murderous Syndicate agent in this! This is a toy, it is not made for use in space!" w_class = 3 - allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen,/obj/item/toy) + allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/internals/emergency_oxygen,/obj/item/toy) flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT @@ -106,7 +106,7 @@ item_state = "imperium_monk" body_parts_covered = CHEST|GROIN|LEGS|ARMS flags_inv = HIDESHOES|HIDEJUMPSUIT - allowed = list(/obj/item/weapon/storage/book/bible, /obj/item/weapon/nullrod, /obj/item/weapon/reagent_containers/food/drinks/bottle/holywater, /obj/item/weapon/storage/fancy/candle_box, /obj/item/candle, /obj/item/weapon/tank/emergency_oxygen) + allowed = list(/obj/item/weapon/storage/book/bible, /obj/item/weapon/nullrod, /obj/item/weapon/reagent_containers/food/drinks/bottle/holywater, /obj/item/weapon/storage/fancy/candle_box, /obj/item/candle, /obj/item/weapon/tank/internals/emergency_oxygen) /obj/item/clothing/suit/chickensuit @@ -134,7 +134,7 @@ item_state = "w_suit" body_parts_covered = CHEST|GROIN|LEGS|ARMS flags_inv = HIDEJUMPSUIT - allowed = list(/obj/item/weapon/storage/book/bible, /obj/item/weapon/nullrod, /obj/item/weapon/reagent_containers/food/drinks/bottle/holywater, /obj/item/weapon/storage/fancy/candle_box, /obj/item/candle, /obj/item/weapon/tank/emergency_oxygen) + allowed = list(/obj/item/weapon/storage/book/bible, /obj/item/weapon/nullrod, /obj/item/weapon/reagent_containers/food/drinks/bottle/holywater, /obj/item/weapon/storage/fancy/candle_box, /obj/item/candle, /obj/item/weapon/tank/internals/emergency_oxygen) @@ -201,7 +201,7 @@ desc = "Aviators not included." icon_state = "bomberjacket" item_state = "brownjsuit" - allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen,/obj/item/toy,/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/lighter) + allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/internals/emergency_oxygen,/obj/item/toy,/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/lighter) body_parts_covered = CHEST|GROIN|ARMS cold_protection = CHEST|GROIN|ARMS min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT @@ -230,7 +230,7 @@ cold_protection = CHEST|GROIN|ARMS min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0) - allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen,/obj/item/toy,/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/lighter) + allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/internals/emergency_oxygen,/obj/item/toy,/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/lighter) hooded = 1 action_button_name = "Toggle Winter Hood" @@ -271,7 +271,7 @@ name = "engineering winter coat" icon_state = "coatengineer" armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 20) - allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen,/obj/item/device/t_scanner, /obj/item/weapon/rcd) + allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/internals/emergency_oxygen,/obj/item/device/t_scanner, /obj/item/weapon/rcd) /obj/item/clothing/suit/hooded/wintercoat/engineering/atmos name = "atmospherics winter coat" @@ -289,5 +289,5 @@ /obj/item/clothing/suit/hooded/wintercoat/miner name = "mining winter coat" icon_state = "coatminer" - allowed = list(/obj/item/weapon/pickaxe,/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen,/obj/item/toy,/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/lighter) + allowed = list(/obj/item/weapon/pickaxe,/obj/item/device/flashlight,/obj/item/weapon/tank/internals/emergency_oxygen,/obj/item/toy,/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/lighter) armor = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0) \ No newline at end of file diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm index 581cb073d03..89a5f7bc936 100644 --- a/code/modules/clothing/suits/utility.dm +++ b/code/modules/clothing/suits/utility.dm @@ -18,7 +18,7 @@ gas_transfer_coefficient = 0.90 permeability_coefficient = 0.50 body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS - allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/extinguisher) + allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/internals/emergency_oxygen,/obj/item/weapon/extinguisher) slowdown = 1.0 flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT flags = STOPSPRESSUREDMAGE | THICKMATERIAL @@ -121,7 +121,7 @@ permeability_coefficient = 0.50 flags = THICKMATERIAL body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS - allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen) + allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/internals/emergency_oxygen) slowdown = 1.5 armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 60, rad = 100) strip_delay = 60 diff --git a/code/modules/events/holiday/xmas.dm b/code/modules/events/holiday/xmas.dm index ed41e80ee0a..727c5a0dce2 100644 --- a/code/modules/events/holiday/xmas.dm +++ b/code/modules/events/holiday/xmas.dm @@ -119,7 +119,7 @@ santa.equip_to_slot_or_del(new /obj/item/clothing/mask/breath, slot_wear_mask) santa.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/red, slot_gloves) santa.equip_to_slot_or_del(new /obj/item/clothing/shoes/sneakers/red, slot_shoes) - santa.equip_to_slot_or_del(new /obj/item/weapon/tank/emergency_oxygen/double, slot_belt) + santa.equip_to_slot_or_del(new /obj/item/weapon/tank/internals/emergency_oxygen/double, slot_belt) santa.equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/captain, slot_ears) santa.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/santabag, slot_back) santa.equip_to_slot_or_del(new /obj/item/device/flashlight, slot_r_store) //most blob spawn locations are really dark. diff --git a/code/modules/events/ninja.dm b/code/modules/events/ninja.dm index 055204702ac..7396ef19ed8 100644 --- a/code/modules/events/ninja.dm +++ b/code/modules/events/ninja.dm @@ -375,7 +375,7 @@ ________________________________________________________________________________ equip_to_slot_or_del(new /obj/item/device/flashlight(src), slot_belt) equip_to_slot_or_del(new /obj/item/weapon/c4(src), slot_r_store) equip_to_slot_or_del(new /obj/item/weapon/c4(src), slot_l_store) - equip_to_slot_or_del(new /obj/item/weapon/tank/emergency_oxygen(src), slot_s_store) + equip_to_slot_or_del(new /obj/item/weapon/tank/internals/emergency_oxygen(src), slot_s_store) equip_to_slot_or_del(new /obj/item/weapon/tank/jetpack/carbondioxide(src), slot_back) var/obj/item/weapon/implant/explosive/E = new/obj/item/weapon/implant/explosive(src) diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 3ed06021ef6..7a8e7f4d01e 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -361,7 +361,7 @@ dat += "
Back: [back ? back : "Nothing"]" - if(istype(wear_mask, /obj/item/clothing/mask) && istype(back, /obj/item/weapon/tank)) + if(istype(wear_mask, /obj/item/clothing/mask) && istype(back, /obj/item/weapon/tank/internals)) dat += "
[internal ? "Disable Internals" : "Set Internals"]" if(handcuffed) @@ -383,7 +383,7 @@ if(href_list["internal"]) var/slot = text2num(href_list["internal"]) var/obj/item/ITEM = get_item_by_slot(slot) - if(ITEM && istype(ITEM, /obj/item/weapon/tank) && wear_mask && (wear_mask.flags & MASKINTERNALS)) + if(ITEM && istype(ITEM, /obj/item/weapon/tank/internals) && wear_mask && (wear_mask.flags & MASKINTERNALS)) visible_message("[usr] tries to [internal ? "close" : "open"] the valve on [src]'s [ITEM].", \ "[usr] tries to [internal ? "close" : "open"] the valve on [src]'s [ITEM].") if(do_mob(usr, src, POCKET_STRIP_DELAY)) @@ -391,7 +391,7 @@ internal = null if(internals) internals.icon_state = "internal0" - else if(ITEM && istype(ITEM, /obj/item/weapon/tank) && wear_mask && (wear_mask.flags & MASKINTERNALS)) + else if(ITEM && istype(ITEM, /obj/item/weapon/tank/internals) && wear_mask && (wear_mask.flags & MASKINTERNALS)) internal = ITEM if(internals) internals.icon_state = "internal1" diff --git a/code/modules/mob/living/carbon/carbon_defines.dm b/code/modules/mob/living/carbon/carbon_defines.dm index a1237ccd8c8..b934cd36517 100644 --- a/code/modules/mob/living/carbon/carbon_defines.dm +++ b/code/modules/mob/living/carbon/carbon_defines.dm @@ -12,6 +12,6 @@ //inventory slots var/obj/item/back = null var/obj/item/clothing/mask/wear_mask = null - var/obj/item/weapon/tank/internal = null + var/obj/item/weapon/tank/internals/internal = null var/datum/dna/dna = null//Carbon diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 068333c71a1..827bb88843b 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -158,7 +158,7 @@  "} dat += "Back:[(back && !(back.flags&ABSTRACT)) ? back : "Empty"]" - if(has_breathable_mask && istype(back, /obj/item/weapon/tank)) + if(has_breathable_mask && istype(back, /obj/item/weapon/tank/internals)) dat += " [internal ? "Disable Internals" : "Set Internals"]" dat += " " @@ -185,7 +185,7 @@ dat += "Exosuit:[(wear_suit && !(wear_suit.flags&ABSTRACT)) ? wear_suit : "Empty"]" if(wear_suit) dat += " ↳Suit Storage:[(s_store && !(s_store.flags&ABSTRACT)) ? s_store : "Empty"]" - if(has_breathable_mask && istype(s_store, /obj/item/weapon/tank)) + if(has_breathable_mask && istype(s_store, /obj/item/weapon/tank/internals)) dat += " [internal ? "Disable Internals" : "Set Internals"]" dat += "" else @@ -212,7 +212,7 @@ dat += " ↳Belt:" else dat += " ↳Belt:[(belt && !(belt.flags&ABSTRACT)) ? belt : "Empty"]" - if(has_breathable_mask && istype(belt, /obj/item/weapon/tank)) + if(has_breathable_mask && istype(belt, /obj/item/weapon/tank/internals)) dat += " [internal ? "Disable Internals" : "Set Internals"]" dat += "" dat += " ↳Pockets:[(l_store && !(l_store.flags&ABSTRACT)) ? "Left (Full)" : "Left (Empty)"]" diff --git a/code/modules/mob/living/simple_animal/corpse.dm b/code/modules/mob/living/simple_animal/corpse.dm index 405b882ea17..7e8d710e44b 100644 --- a/code/modules/mob/living/simple_animal/corpse.dm +++ b/code/modules/mob/living/simple_animal/corpse.dm @@ -110,7 +110,7 @@ corpsemask = /obj/item/clothing/mask/gas/syndicate corpsehelmet = /obj/item/clothing/head/helmet/space/hardsuit/syndi corpseback = /obj/item/weapon/tank/jetpack/oxygen - corpsepocket1 = /obj/item/weapon/tank/emergency_oxygen + corpsepocket1 = /obj/item/weapon/tank/internals/emergency_oxygen corpseid = 1 corpseidjob = "Operative" corpseidaccess = "Syndicate" diff --git a/code/modules/mob/living/simple_animal/friendly/corgi.dm b/code/modules/mob/living/simple_animal/friendly/corgi.dm index 9546b077482..5d470a986bd 100644 --- a/code/modules/mob/living/simple_animal/friendly/corgi.dm +++ b/code/modules/mob/living/simple_animal/friendly/corgi.dm @@ -153,8 +153,8 @@ /obj/item/device/radio, /obj/item/device/radio/off, /obj/item/clothing/suit/cardborg, - /obj/item/weapon/tank/oxygen, - /obj/item/weapon/tank/air, + /obj/item/weapon/tank/internals/oxygen, + /obj/item/weapon/tank/internals/air, /obj/item/weapon/extinguisher ) diff --git a/code/modules/power/singularity/collector.dm b/code/modules/power/singularity/collector.dm index 8e07804317d..dcbda800de8 100644 --- a/code/modules/power/singularity/collector.dm +++ b/code/modules/power/singularity/collector.dm @@ -10,7 +10,7 @@ var/global/list/rad_collectors = list() density = 1 req_access = list(access_engine_equip) // use_power = 0 - var/obj/item/weapon/tank/plasma/P = null + var/obj/item/weapon/tank/internals/plasma/P = null var/last_power = 0 var/active = 0 var/locked = 0 @@ -57,7 +57,7 @@ var/global/list/rad_collectors = list() return 1 else if(istype(W, /obj/item/device/analyzer) && P) atmosanalyzer_scan(P.air_contents, user) - else if(istype(W, /obj/item/weapon/tank/plasma)) + else if(istype(W, /obj/item/weapon/tank/internals/plasma)) if(!src.anchored) user << "The [src] needs to be secured to the floor first." return 1 @@ -115,7 +115,7 @@ var/global/list/rad_collectors = list() /obj/machinery/power/rad_collector/proc/eject() locked = 0 - var/obj/item/weapon/tank/plasma/Z = src.P + var/obj/item/weapon/tank/internals/plasma/Z = src.P if (!Z) return Z.loc = get_turf(src) From 1f7ef9b218388ed546919623f0e26acc7c7aba13 Mon Sep 17 00:00:00 2001 From: Iamgoofball Date: Sun, 1 Feb 2015 13:58:07 -0800 Subject: [PATCH 07/11] Fixes #7020 --- code/game/gamemodes/blob/theblob.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/gamemodes/blob/theblob.dm b/code/game/gamemodes/blob/theblob.dm index 56e73d4e1bb..42a3d83245f 100644 --- a/code/game/gamemodes/blob/theblob.dm +++ b/code/game/gamemodes/blob/theblob.dm @@ -91,7 +91,8 @@ if(!B) expand(T,1,a_color)//No blob here so try and expand return - B.color = a_color + if(!istype(B, /obj/effect/blob/core) || !istype(B, /obj/effect/blob/node)) + B.color = a_color B.Pulse((pulse+1),get_dir(src.loc,T), a_color) return return From 4ef1deb1f9152e520cffaab43c4e925cd9486c57 Mon Sep 17 00:00:00 2001 From: Menshin Date: Mon, 2 Feb 2015 01:14:46 +0100 Subject: [PATCH 08/11] Fixes being unable to place cables on plating --- code/game/turfs/simulated/floor.dm | 4 +++- code/game/turfs/simulated/floor/plating.dm | 2 +- code/game/turfs/turf.dm | 18 ++++++++++-------- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/code/game/turfs/simulated/floor.dm b/code/game/turfs/simulated/floor.dm index d96113a638c..2ef4066499b 100644 --- a/code/game/turfs/simulated/floor.dm +++ b/code/game/turfs/simulated/floor.dm @@ -126,7 +126,9 @@ var/list/icons_to_ignore_at_floor_init = list("damaged1","damaged2","damaged3"," /turf/simulated/floor/attackby(obj/item/C as obj, mob/user as mob) if(!C || !user) return 1 - if(istype(C, /obj/item/weapon/crowbar)) + if(..()) + return 1 + if(intact && istype(C, /obj/item/weapon/crowbar)) if(broken || burnt) broken = 0 burnt = 0 diff --git a/code/game/turfs/simulated/floor/plating.dm b/code/game/turfs/simulated/floor/plating.dm index f78c20ccfae..c0c65f4d039 100644 --- a/code/game/turfs/simulated/floor/plating.dm +++ b/code/game/turfs/simulated/floor/plating.dm @@ -27,7 +27,7 @@ icon_state = icon_plating //Because asteroids are 'platings' too. /turf/simulated/floor/plating/attackby(obj/item/C as obj, mob/user as mob) - if(!C || !user) + if(..()) return if(istype(C, /obj/item/stack/rods)) if(broken || burnt) diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index 2c5fdf1d013..f90bed96b57 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -43,14 +43,16 @@ user.Move_Pulled(src) /turf/attackby(obj/item/C, mob/user) - if(cancable) - if(istype(C, /obj/item/stack/cable_coil)) - var/obj/item/stack/cable_coil/coil = C - for(var/obj/structure/cable/LC in src) - if((LC.d1==0)||(LC.d2==0)) - LC.attackby(C,user) - return - coil.place_turf(src, user) + if(cancable && istype(C, /obj/item/stack/cable_coil)) + var/obj/item/stack/cable_coil/coil = C + for(var/obj/structure/cable/LC in src) + if((LC.d1==0)||(LC.d2==0)) + LC.attackby(C,user) + return + coil.place_turf(src, user) + return 1 + + return 0 /turf/Enter(atom/movable/mover as mob|obj, atom/forget as mob|obj|turf|area) if (!mover) From e15b8b2199beeedf4bf2e819acaa9776db201a43 Mon Sep 17 00:00:00 2001 From: paprka Date: Mon, 2 Feb 2015 03:58:31 -0800 Subject: [PATCH 09/11] this kills the culture --- sound/vox_fem/voxtest2.ogg | Bin 85962 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 sound/vox_fem/voxtest2.ogg diff --git a/sound/vox_fem/voxtest2.ogg b/sound/vox_fem/voxtest2.ogg deleted file mode 100644 index da1f57bc93ac611b7a16b8f3c5dddc43b2eaf3f8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 85962 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 H0FM&@P&?Nk From 400cc02d3e1d30f3e5f3f504bcfd87c69b6371b9 Mon Sep 17 00:00:00 2001 From: JJRcop Date: Mon, 2 Feb 2015 19:06:38 -0500 Subject: [PATCH 10/11] Fixes Z2 mispathing --- _maps/map_files/generic/z2.dmm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_maps/map_files/generic/z2.dmm b/_maps/map_files/generic/z2.dmm index 471681ae206..31bb1425510 100644 --- a/_maps/map_files/generic/z2.dmm +++ b/_maps/map_files/generic/z2.dmm @@ -499,7 +499,7 @@ "jE" = (/mob/living/simple_animal/hostile/retaliate/bat{desc = "A Syndicate experiment in weaponized space carp technology. Its fangs seem to have been intentionally dulled down to prevent accidents."; faction = list("syndicate"); harm_intent_damage = 5; health = 50; icon_dead = "carp_dead"; icon_gib = "carp_gib"; icon_living = "carp"; icon_state = "carp"; name = "Cayenne"; real_name = "Cayenne"; response_disarm = "lightly brushes aside"; response_help = "pets"},/turf/unsimulated/floor{icon_state = "bar"; dir = 2},/area/syndicate_mothership) "jF" = (/obj/machinery/door/airlock/centcom{name = "Study"; opacity = 1; req_access_txt = "150"},/turf/unsimulated/floor{icon_state = "bar"; dir = 2},/area/syndicate_mothership) "jG" = (/turf/unsimulated/floor{icon_state = "grimy"},/area/syndicate_mothership) -"jH" = (/obj/structure/table/reinforced,/obj/item/weapon/tank/emergency_oxygen/double,/obj/item/clothing/mask/breath,/obj/item/clothing/head/helmet/space/hardsuit/ert,/turf/unsimulated/floor{icon_state = "floor"},/area/centcom/ferry) +"jH" = (/obj/structure/table/reinforced,/obj/item/weapon/tank/internals/emergency_oxygen/double,/obj/item/clothing/mask/breath,/obj/item/clothing/head/helmet/space/hardsuit/ert,/turf/unsimulated/floor{icon_state = "floor"},/area/centcom/ferry) "jI" = (/obj/structure/closet/syndicate/ertCom,/turf/unsimulated/floor{icon_state = "floor"},/area/centcom/ferry) "jJ" = (/turf/unsimulated/floor{tag = "icon-redcorner"; icon_state = "redcorner"; dir = 2},/area/centcom/ferry) "jK" = (/turf/unsimulated/floor{icon_state = "red"; dir = 2},/area/centcom/ferry) @@ -834,7 +834,7 @@ "qb" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/turf/unsimulated/floor{name = "plating"},/area/centcom/holding) "qc" = (/obj/effect/landmark{name = "Holding Facility"},/turf/unsimulated/floor{icon_state = "engine"},/area/centcom/holding) "qd" = (/obj/docking_port/stationary/transit{dheight = 0; dir = 2; dwidth = 11; height = 22; id = "whiteship_transit"; width = 35},/turf/space/transit/horizontal,/area/space) - + (1,1,1) = {" aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababadaeaeaeaeaeafaeaeaeaeaeafaeaeaeaeaeafaeaeaeaeaeag aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacacabababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababababahaiaiaiaiaiajakakakakakajalalalalalajamanananaoap From fa7e15d734404251c524234ab5d122fdabb4b537 Mon Sep 17 00:00:00 2001 From: Iamgoofball Date: Mon, 2 Feb 2015 18:30:24 -0800 Subject: [PATCH 11/11] what is object oriented programming --- code/game/gamemodes/blob/blobs/core.dm | 1 + code/game/gamemodes/blob/blobs/node.dm | 2 +- code/game/gamemodes/blob/theblob.dm | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/code/game/gamemodes/blob/blobs/core.dm b/code/game/gamemodes/blob/blobs/core.dm index 4412b095858..ac5e4ab7ef2 100644 --- a/code/game/gamemodes/blob/blobs/core.dm +++ b/code/game/gamemodes/blob/blobs/core.dm @@ -8,6 +8,7 @@ var/overmind_get_delay = 0 // we don't want to constantly try to find an overmind, do it every 30 seconds var/resource_delay = 0 var/point_rate = 2 + can_change_color = 0 /obj/effect/blob/core/New(loc, var/h = 200, var/client/new_overmind = null, var/new_rate = 2) blob_cores += src diff --git a/code/game/gamemodes/blob/blobs/node.dm b/code/game/gamemodes/blob/blobs/node.dm index 4dee5d6517a..93d1f9753fd 100644 --- a/code/game/gamemodes/blob/blobs/node.dm +++ b/code/game/gamemodes/blob/blobs/node.dm @@ -5,7 +5,7 @@ health = 100 fire_resist = 2 var/mob/camera/blob/overmind - + can_change_color = 0 /obj/effect/blob/node/New(loc, var/h = 100) blob_nodes += src diff --git a/code/game/gamemodes/blob/theblob.dm b/code/game/gamemodes/blob/theblob.dm index 42a3d83245f..c3a0f3cff6e 100644 --- a/code/game/gamemodes/blob/theblob.dm +++ b/code/game/gamemodes/blob/theblob.dm @@ -11,6 +11,7 @@ var/health_timestamp = 0 var/brute_resist = 4 var/fire_resist = 1 + var/can_change_color = 1 /obj/effect/blob/New(loc) @@ -91,7 +92,7 @@ if(!B) expand(T,1,a_color)//No blob here so try and expand return - if(!istype(B, /obj/effect/blob/core) || !istype(B, /obj/effect/blob/node)) + if(B.can_change_color) B.color = a_color B.Pulse((pulse+1),get_dir(src.loc,T), a_color) return