shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits

Browse Source
This commit is contained in:
Putnam3145
2022-05-17 13:22:40 -07:00
parent d5c36b4a99 35f86287e2
commit 33889870c9
1311 changed files with 12771 additions and 10321 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/PULL_REQUEST_TEMPLATE.md
+5
View File
@@ -27,6 +27,11 @@ refactor: refactored some code
config: changed some config setting
admin: messed with admin stuff
server: something server ops should know
wip: still being worked on
experiment: experimental
tgs: has something to do with tgs
expansion: expands on something
qol: quality of life content
/:cl:
<!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. -->
.github/workflows/compile_changelogs.yml
+1
View File
@@ -43,6 +43,7 @@ jobs:
git config --local user.email "action@github.com"
git config --local user.name "Changelogs"
git pull origin master
git add html/changelogs
git commit -m "Automatic changelog compile [ci skip]" -a || true
- name: "Push"
if: steps.value_holder.outputs.CL_ENABLED
_maps/RandomRuins/LavaRuins/lavaland_surface_random_ripley.dmm
+1 -1
View File
@@ -9,7 +9,7 @@
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"d" = (
/obj/mecha/working/ripley/mining,
/obj/vehicle/sealed/mecha/working/ripley/mining,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"e" = (
_maps/RandomRuins/SpaceRuins/deepstorage.dmm
+1 -4
View File
@@ -49,7 +49,6 @@
/area/ruin/space/has_grav/deepstorage/crusher)
"an" = (
/obj/machinery/conveyor{
dir = 2;
id = "bunkerrecycle"
},
/turf/open/floor/plating,
@@ -142,7 +141,6 @@
icon_state = "0-8"
},
/obj/machinery/power/apc{
dir = 2;
name = "Recycling APC";
pixel_y = -23
},
@@ -694,7 +692,6 @@
icon_state = "0-8"
},
/obj/machinery/power/apc{
dir = 2;
name = "Kitchen APC";
pixel_y = -23
},
@@ -1762,7 +1759,6 @@
},
/obj/structure/cable/yellow,
/obj/machinery/power/apc{
dir = 2;
name = "Main Area APC";
pixel_y = -23
},
@@ -2682,6 +2678,7 @@
/area/ruin/space/has_grav/deepstorage)
"fU" = (
/obj/machinery/camera{
c_tag = "Deep Storage - Entry";
network = list("bunker1")
},
/obj/structure/sign/warning/securearea{
_maps/RandomRuins/SpaceRuins/mechtransport.dmm
+1 -1
View File
@@ -102,7 +102,7 @@
/turf/open/floor/mineral/titanium/yellow/airless,
/area/ruin/space/has_grav/powered/mechtransport)
"A" = (
/obj/mecha/working/ripley,
/obj/vehicle/sealed/mecha/working/ripley,
/turf/open/floor/mineral/titanium/yellow/airless,
/area/ruin/space/has_grav/powered/mechtransport)
"B" = (
_maps/RandomZLevels/VR/snowdin_VR.dmm
+1 -1
View File
@@ -14451,7 +14451,7 @@
/turf/open/floor/plasteel/dark,
/area/awaymission/snowdin/post/mining_main/mechbay)
"In" = (
/obj/mecha/working/ripley/mining{
/obj/vehicle/sealed/mecha/working/ripley/mining{
dir = 1;
icon_state = "ripley"
},
_maps/RandomZLevels/away_mission/caves.dmm
+1 -1
View File
@@ -2039,7 +2039,7 @@
},
/area/awaymission/caves/BMP_asteroid)
"gC" = (
/obj/mecha/working/ripley/mining,
/obj/vehicle/sealed/mecha/working/ripley/mining,
/turf/open/floor/plasteel/recharge_floor,
/area/awaymission/caves/BMP_asteroid)
"gD" = (
_maps/RandomZLevels/away_mission/snowdin.dmm
+1 -1
View File
@@ -14452,7 +14452,7 @@
/turf/open/floor/plasteel/dark,
/area/awaymission/snowdin/post/mining_main/mechbay)
"In" = (
/obj/mecha/working/ripley/mining{
/obj/vehicle/sealed/mecha/working/ripley/mining{
dir = 1
},
/obj/effect/turf_decal/bot,
_maps/map_files/BoxStation/BoxStation.dmm
+201 -113
View File
@@ -463,8 +463,8 @@
/turf/closed/wall,
/area/security/execution/transfer)
"abd" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 1
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 6
},
/turf/closed/wall,
/area/security/execution/transfer)
@@ -4655,7 +4655,7 @@
pixel_x = -32
},
/turf/open/floor/plasteel/white,
/area/medical/medbay/lobby)
/area/medical/medbay/central)
"aiQ" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable{
@@ -9444,6 +9444,10 @@
/area/maintenance/port/fore)
"atK" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/light_switch{
pixel_x = 24;
pixel_y = -24
},
/turf/open/floor/plating,
/area/commons/vacant_room/office/b)
"atL" = (
@@ -12669,9 +12673,7 @@
/turf/open/floor/plasteel,
/area/construction/mining/aux_base)
"aCW" = (
/obj/machinery/sleeper{
dir = 4
},
/obj/machinery/stasis,
/turf/open/floor/plating,
/area/maintenance/port/fore)
"aCX" = (
@@ -15212,7 +15214,7 @@
/obj/structure/plasticflaps/opaque,
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/service/kitchen/coldroom)
/area/service/kitchen)
"aJL" = (
/obj/machinery/navbeacon{
codes_txt = "delivery;dir=2";
@@ -15437,10 +15439,12 @@
/obj/item/radio/intercom{
pixel_y = 25
},
/obj/machinery/camera,
/obj/structure/chair/comfy/brown{
dir = 4
},
/obj/machinery/camera{
c_tag = "Bar North"
},
/turf/open/floor/wood,
/area/service/bar)
"aKs" = (
@@ -15485,7 +15489,7 @@
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/showroomfloor,
/area/service/kitchen/coldroom)
/area/service/kitchen)
"aKD" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
@@ -15589,7 +15593,7 @@
"aKT" = (
/obj/structure/closet/secure_closet/freezer/meat,
/turf/open/floor/plasteel/showroomfloor,
/area/service/kitchen/coldroom)
/area/service/kitchen)
"aKU" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on,
/turf/open/floor/plasteel,
@@ -15604,7 +15608,7 @@
dir = 8
},
/turf/open/floor/plasteel,
/area/service/kitchen/coldroom)
/area/service/kitchen)
"aKW" = (
/obj/machinery/light_switch{
pixel_y = 28
@@ -16056,13 +16060,13 @@
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/showroomfloor,
/area/service/kitchen/coldroom)
/area/service/kitchen)
"aMl" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 8
},
/turf/open/floor/plasteel/showroomfloor,
/area/service/kitchen/coldroom)
/area/service/kitchen)
"aMm" = (
/obj/machinery/firealarm{
pixel_y = 24
@@ -16167,7 +16171,7 @@
"aMD" = (
/obj/machinery/icecream_vat,
/turf/open/floor/plasteel/showroomfloor,
/area/service/kitchen/coldroom)
/area/service/kitchen)
"aME" = (
/obj/structure/disposalpipe/segment{
dir = 10
@@ -16179,7 +16183,7 @@
/area/service/hydroponics)
"aMF" = (
/turf/open/floor/plasteel/showroomfloor,
/area/service/kitchen/coldroom)
/area/service/kitchen)
"aMG" = (
/obj/structure/closet/crate/hydroponics,
/obj/item/shovel/spade,
@@ -16470,7 +16474,7 @@
name = "Pete"
},
/turf/open/floor/plasteel/showroomfloor,
/area/service/kitchen/coldroom)
/area/service/kitchen)
"aNL" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/closed/wall,
@@ -16481,7 +16485,7 @@
dir = 8
},
/turf/open/floor/plasteel/showroomfloor,
/area/service/kitchen/coldroom)
/area/service/kitchen)
"aNN" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/public/glass{
@@ -16502,7 +16506,7 @@
},
/obj/machinery/vending/wardrobe/chef_wardrobe,
/turf/open/floor/plasteel/showroomfloor,
/area/service/kitchen/coldroom)
/area/service/kitchen)
"aNP" = (
/obj/structure/disposalpipe/segment,
/turf/open/floor/wood,
@@ -16873,7 +16877,7 @@
"aOI" = (
/obj/structure/kitchenspike,
/turf/open/floor/plasteel/showroomfloor,
/area/service/kitchen/coldroom)
/area/service/kitchen)
"aOJ" = (
/obj/structure/chair/comfy/brown{
dir = 8
@@ -16895,14 +16899,18 @@
dir = 8
},
/turf/open/floor/plasteel/showroomfloor,
/area/service/kitchen/coldroom)
/area/service/kitchen)
"aON" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 8
},
/obj/machinery/light_switch{
pixel_x = 24;
pixel_y = -24
},
/turf/open/floor/plasteel/showroomfloor,
/area/service/kitchen/coldroom)
/area/service/kitchen)
"aOO" = (
/obj/machinery/door/airlock{
name = "Bar Storage";
@@ -16939,7 +16947,7 @@
"aOT" = (
/obj/machinery/gibber,
/turf/open/floor/plasteel/showroomfloor,
/area/service/kitchen/coldroom)
/area/service/kitchen)
"aOU" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 8
@@ -18682,6 +18690,7 @@
/obj/structure/table,
/obj/item/storage/crayons,
/obj/item/storage/crayons,
/obj/item/chisel,
/turf/open/floor/plasteel,
/area/commons/storage/art)
"aTH" = (
@@ -21951,6 +21960,7 @@
/obj/structure/table,
/obj/item/aiModule/supplied/quarantine,
/obj/machinery/camera/motion{
c_tag = "AI Upload Chamber - West";
dir = 4;
network = list("aiupload")
},
@@ -21970,6 +21980,7 @@
pixel_x = 32
},
/obj/machinery/camera/motion{
c_tag = "AI Upload Chamber - East";
dir = 8;
network = list("aiupload")
},
@@ -22904,6 +22915,10 @@
dir = 9
},
/obj/structure/closet/crate,
/obj/machinery/light_switch{
pixel_x = 7;
pixel_y = -26
},
/turf/open/floor/plasteel,
/area/cargo/warehouse)
"beE" = (
@@ -23086,9 +23101,7 @@
/turf/open/floor/plasteel,
/area/hallway/primary/central)
"beY" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/dark,
/area/medical/morgue)
"beZ" = (
@@ -23285,13 +23298,18 @@
/turf/closed/wall,
/area/medical/chemistry)
"bfG" = (
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
/area/medical/medbay/lobby)
/obj/machinery/cryopod{
dir = 4
},
/obj/machinery/light{
dir = 8
},
/turf/open/floor/carpet,
/area/commons/cryopod)
"bfH" = (
/obj/structure/sign/departments/medbay/alt,
/turf/closed/wall,
/area/medical/medbay/lobby)
/area/medical/medbay/central)
"bfI" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 4
@@ -23423,8 +23441,12 @@
/turf/open/floor/plasteel,
/area/hallway/primary/starboard)
"bgc" = (
/turf/closed/wall/r_wall,
/area/science/lab)
/obj/machinery/camera{
c_tag = "Theatre - Stage";
dir = 8
},
/turf/open/floor/carpet,
/area/service/theater)
"bgd" = (
/obj/machinery/airalarm{
dir = 1;
@@ -23692,7 +23714,7 @@
dir = 8
},
/turf/open/floor/plasteel/white,
/area/medical/medbay/lobby)
/area/medical/medbay/central)
"bgX" = (
/obj/structure/table/wood,
/obj/machinery/airalarm{
@@ -23759,7 +23781,7 @@
"bhe" = (
/obj/structure/chair,
/turf/open/floor/plasteel/white,
/area/medical/medbay/lobby)
/area/medical/medbay/central)
"bhg" = (
/obj/effect/turf_decal/tile/blue,
/obj/effect/turf_decal/tile/blue{
@@ -23833,9 +23855,6 @@
/turf/open/floor/plasteel,
/area/security/checkpoint/medical)
"bhm" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 4
},
/obj/machinery/power/apc{
areastring = "/area/medical/morgue";
dir = 1;
@@ -24362,7 +24381,7 @@
dir = 1
},
/turf/open/floor/plasteel/white,
/area/medical/medbay/lobby)
/area/medical/medbay/central)
"biu" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/white,
@@ -24434,9 +24453,12 @@
/turf/open/floor/plasteel/dark,
/area/medical/paramedic)
"biC" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/closed/wall,
/area/service/kitchen/coldroom)
/obj/machinery/light_switch{
pixel_x = 7;
pixel_y = -26
},
/turf/open/floor/mineral/titanium/blue,
/area/commons/toilet)
"biD" = (
/obj/machinery/portable_atmospherics/canister/air,
/turf/open/floor/plating,
@@ -24998,14 +25020,14 @@
dir = 8
},
/turf/open/floor/plasteel/white,
/area/medical/medbay/lobby)
/area/medical/medbay/central)
"bjU" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 6
},
/obj/effect/turf_decal/tile/blue,
/turf/open/floor/plasteel/white,
/area/medical/medbay/lobby)
/area/medical/medbay/central)
"bjV" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -25015,7 +25037,7 @@
dir = 8
},
/turf/open/floor/plasteel/white,
/area/medical/medbay/lobby)
/area/medical/medbay/central)
"bjX" = (
/obj/structure/table,
/obj/machinery/recharger{
@@ -25559,7 +25581,7 @@
dir = 4
},
/turf/open/floor/plasteel/white,
/area/medical/medbay/lobby)
/area/medical/medbay/central)
"bll" = (
/obj/structure/table/reinforced,
/obj/item/folder/white,
@@ -26176,7 +26198,7 @@
pixel_x = -24
},
/turf/open/floor/plasteel/white,
/area/medical/medbay/lobby)
/area/medical/medbay/central)
"bmK" = (
/obj/structure/table/reinforced,
/turf/open/floor/plasteel/white,
@@ -29787,7 +29809,7 @@
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/white,
/area/medical/medbay/lobby)
/area/medical/medbay/central)
"bvl" = (
/obj/machinery/door/airlock/medical/glass{
name = "Surgery Observation"
@@ -32035,14 +32057,12 @@
/turf/open/floor/plating,
/area/maintenance/port/aft)
"bAq" = (
/obj/machinery/sleeper{
dir = 8
},
/obj/machinery/camera{
c_tag = "Medbay Treatment Center";
dir = 8;
network = list("ss13","medbay")
},
/obj/machinery/stasis,
/turf/open/floor/plasteel,
/area/medical/medbay/central)
"bAr" = (
@@ -44867,7 +44887,7 @@
dir = 8
},
/turf/open/floor/plasteel/dark,
/area/command)
/area/command/heads_quarters/ce)
"cgQ" = (
/obj/machinery/camera{
c_tag = "Engineering East";
@@ -52491,6 +52511,9 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 6
},
/obj/machinery/light_switch{
pixel_y = 24
},
/turf/open/floor/plasteel/freezer,
/area/commons/toilet/locker)
"ddI" = (
@@ -53335,7 +53358,7 @@
},
/obj/machinery/camera{
c_tag = "Prison Forestry";
dir = 8;
dir = 4;
network = list("ss13","prison")
},
/turf/open/floor/plasteel,
@@ -53652,9 +53675,12 @@
/turf/open/floor/carpet,
/area/commons/dorms)
"eRr" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/white,
/area/medical/medbay/lobby)
/obj/machinery/light_switch{
pixel_x = -10;
pixel_y = 26
},
/turf/open/floor/plasteel/dark,
/area/service/chapel/main)
"eRz" = (
/obj/structure/lattice,
/obj/structure/grille,
@@ -53962,6 +53988,10 @@
"fgl" = (
/obj/structure/closet/crate/bin,
/obj/item/coin/silver,
/obj/machinery/airalarm{
dir = 8;
pixel_x = 23
},
/turf/open/floor/carpet/arcade,
/area/commons/arcade)
"fgy" = (
@@ -54222,6 +54252,10 @@
dir = 8;
pixel_x = 24
},
/obj/machinery/light_switch{
pixel_x = -7;
pixel_y = -24
},
/turf/open/floor/plasteel,
/area/security/range)
"fsQ" = (
@@ -55117,6 +55151,10 @@
},
/obj/effect/turf_decal/tile/red,
/obj/effect/landmark/start/clown,
/obj/machinery/camera{
c_tag = "Theatre - Backstage";
dir = 1
},
/turf/open/floor/plasteel,
/area/service/theater)
"gLz" = (
@@ -55870,7 +55908,6 @@
req_access_txt = "6"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/open/floor/plasteel/dark,
/area/medical/morgue)
"ibK" = (
@@ -55916,8 +55953,11 @@
/turf/open/floor/plasteel/freezer,
/area/security/prison/cells)
"ihR" = (
/turf/open/floor/plasteel/white,
/area/medical/medbay/lobby)
/obj/machinery/airalarm{
pixel_y = 24
},
/turf/open/floor/plasteel,
/area/cargo/warehouse)
"ihS" = (
/obj/effect/landmark/event_spawn,
/obj/effect/turf_decal/tile/blue{
@@ -56272,7 +56312,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/reagent_dispensers/cooking_oil,
/turf/open/floor/plasteel/showroomfloor,
/area/service/kitchen/coldroom)
/area/service/kitchen)
"iPX" = (
/obj/structure/table,
/obj/machinery/reagentgrinder{
@@ -56475,6 +56515,10 @@
pixel_y = -28
},
/obj/effect/landmark/start/paramedic,
/obj/machinery/light_switch{
pixel_x = -26;
pixel_y = -26
},
/turf/open/floor/plasteel/dark,
/area/medical/paramedic)
"jex" = (
@@ -56531,9 +56575,18 @@
/turf/closed/wall,
/area/engineering/main)
"jiT" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel/white,
/area/medical/medbay/lobby)
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/obj/structure/cable{
icon_state = "4-8"
},
/obj/machinery/light_switch{
pixel_x = -9;
pixel_y = 26
},
/turf/open/floor/plasteel,
/area/cargo/sorting)
"jkx" = (
/obj/effect/decal/cleanable/cobweb/cobweb2,
/obj/machinery/computer/slot_machine,
@@ -58875,6 +58928,9 @@
/obj/structure/sign/poster/contraband/fun_police{
pixel_x = 32
},
/obj/machinery/camera{
c_tag = "Bar Arcade"
},
/turf/open/floor/carpet/arcade,
/area/commons/arcade)
"meb" = (
@@ -60602,10 +60658,12 @@
/turf/open/floor/mineral/titanium/blue,
/area/commons/dorms)
"oJV" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/cable{
icon_state = "2-4"
},
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 4
},
/turf/open/floor/plasteel/dark,
/area/medical/morgue)
"oKh" = (
@@ -61649,9 +61707,26 @@
},
/area/maintenance/starboard/aft)
"qnC" = (
/obj/machinery/door/firedoor,
/turf/open/floor/plasteel/white,
/area/medical/medbay/lobby)
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/structure/cable{
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/obj/machinery/power/apc{
areastring = "/area/maintenance/department/medical/morgue";
dir = 1;
name = "Morgue Maintenance APC";
pixel_y = 23
},
/obj/structure/cable{
icon_state = "0-4"
},
/turf/open/floor/plating,
/area/maintenance/department/medical/morgue)
"qoT" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 9
@@ -62015,7 +62090,7 @@
icon_state = "plant-22"
},
/turf/open/floor/plasteel/white,
/area/medical/medbay/lobby)
/area/medical/medbay/central)
"qUh" = (
/obj/machinery/door/airlock/public/glass{
name = "Chapel Office";
@@ -63054,6 +63129,11 @@
pixel_x = 2;
pixel_y = 2
},
/obj/machinery/camera{
c_tag = "Service Hallway";
dir = 1;
name = "hallway camera"
},
/turf/open/floor/plasteel,
/area/hallway/secondary/service)
"syJ" = (
@@ -63871,7 +63951,7 @@
dir = 1
},
/turf/open/floor/plasteel/white,
/area/medical/medbay/lobby)
/area/medical/medbay/central)
"tCs" = (
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
@@ -64041,11 +64121,14 @@
"tMl" = (
/obj/effect/turf_decal/loading_area,
/turf/open/floor/plasteel/showroomfloor,
/area/service/kitchen/coldroom)
/area/service/kitchen)
"tNl" = (
/obj/structure/cable{
icon_state = "1-2"
},
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 4
},
/turf/open/floor/plasteel/dark,
/area/medical/morgue)
"tNF" = (
@@ -64239,6 +64322,10 @@
/obj/structure/cable{
icon_state = "0-4"
},
/obj/machinery/light_switch{
pixel_x = -26;
pixel_y = 26
},
/turf/open/floor/wood,
/area/maintenance/bar)
"ucq" = (
@@ -64556,13 +64643,6 @@
/obj/structure/grille,
/turf/open/floor/plating,
/area/maintenance/port/fore)
"uBr" = (
/obj/effect/turf_decal/tile/blue,
/obj/effect/turf_decal/tile/blue{
dir = 8
},
/turf/open/floor/plasteel/white,
/area/medical/medbay/lobby)
"uCn" = (
/obj/structure/table/reinforced,
/obj/item/paper_bin,
@@ -64731,6 +64811,10 @@
/turf/open/floor/plasteel/dark,
/area/security/prison/upper)
"uOd" = (
/obj/machinery/light_switch{
pixel_x = 7;
pixel_y = -26
},
/turf/open/floor/plasteel/white/side{
dir = 4
},
@@ -65612,7 +65696,7 @@
dir = 8
},
/turf/open/floor/plasteel/white,
/area/medical/medbay/lobby)
/area/medical/medbay/central)
"wcB" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 10
@@ -67022,6 +67106,10 @@
/area/security/execution/transfer)
"yfX" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on,
/obj/machinery/light_switch{
pixel_x = 24;
pixel_y = -24
},
/turf/open/floor/carpet/arcade,
/area/commons/arcade)
"ygb" = (
@@ -87984,7 +88072,7 @@ wUr
mzB
uSc
wHm
qTG
bgc
aJe
aKw
aLE
@@ -88768,7 +88856,7 @@ aTH
aPK
aWz
aWC
baS
ihR
baS
baS
bcR
@@ -89805,7 +89893,7 @@ aZH
aZK
bhZ
aZK
cNM
jiT
bfQ
bnG
bnz
@@ -97234,7 +97322,7 @@ atf
dgz
tqg
ujF
ujF
bfG
ujF
dgz
aaa
@@ -99550,7 +99638,7 @@ aDM
aGx
aDM
aDM
aDM
biC
aAh
aMm
aJq
@@ -102397,7 +102485,7 @@ bet
bfH
aiP
wbE
ihR
bhh
wbE
bmJ
bof
@@ -102651,12 +102739,12 @@ bby
aYV
aYV
bet
bfG
rUe
bhe
bit
bjS
tCd
eRr
bli
boe
bli
bpN
@@ -102908,9 +102996,9 @@ aJC
aYV
aYV
bet
bfG
rUe
bhe
ihR
bhh
bjU
blk
blk
@@ -103165,9 +103253,9 @@ aJC
bcr
aYV
bet
bfG
rUe
bhe
ihR
bhh
bjV
blj
bmK
@@ -103423,8 +103511,8 @@ aYV
bdo
beu
bvk
jiT
jiT
biu
biu
bjT
blm
bmL
@@ -103679,9 +103767,9 @@ aJC
aYV
aYV
bet
qnC
ihR
ihR
bfJ
bhh
bhh
bgQ
bll
bhh
@@ -103938,8 +104026,8 @@ aYV
bet
bfH
qTV
ihR
uBr
bhh
bhg
bln
bmM
boj
@@ -104948,10 +105036,10 @@ alP
aGL
aIe
bhr
bhr
bhr
bhr
bhr
aJI
aJI
aJI
aJI
aJI
aRC
aSK
@@ -105204,7 +105292,7 @@ aaa
alP
aGN
aIh
bhr
aJI
aKT
aMD
aNM
@@ -105718,7 +105806,7 @@ aaa
alP
aGL
aHY
biC
aQj
iNn
aMk
aNK
@@ -106232,9 +106320,9 @@ vpY
alP
aGJ
avI
bhr
bhr
bhr
aJI
aJI
aJI
aNO
aOT
aJI
@@ -106491,9 +106579,9 @@ aGJ
avI
aJL
aKX
bhr
bhr
bhr
aJI
aJI
aJI
aJI
aRH
aVz
@@ -107282,7 +107370,7 @@ tIE
dnW
jdE
nyi
cTO
qnC
bmZ
bpG
bqZ
@@ -113431,7 +113519,7 @@ aFw
aFw
aFw
aFw
aFz
eRr
aPk
aQu
aPk
@@ -115509,7 +115597,7 @@ pKV
pKV
pKV
bpp
pKV
bqe
brr
bsE
bvK
@@ -115766,7 +115854,7 @@ biY
bmd
bnr
bpr
bgc
bqe
btj
buu
bvM
@@ -116022,8 +116110,8 @@ bhG
blO
bmc
bnq
bgc
bgc
bqe
bqe
bru
bsF
btY
_maps/map_files/CogStation/CogStation.dmm
+4 -12
View File
@@ -8805,12 +8805,11 @@
/obj/effect/turf_decal/tile/blue{
dir = 1
},
/obj/machinery/sleeper{
dir = 8
},
/obj/machinery/airalarm{
pixel_y = 24
},
/obj/structure/table,
/obj/item/stack/medical/suture/five,
/turf/open/floor/plasteel/white,
/area/medical/clinic)
"auS" = (
@@ -8876,9 +8875,7 @@
name = "Station Intercom (Common)";
pixel_y = 26
},
/obj/machinery/sleep_console{
dir = 8
},
/obj/machinery/stasis,
/turf/open/floor/plasteel/white,
/area/medical/clinic)
"auZ" = (
@@ -36751,9 +36748,6 @@
/obj/machinery/light/small{
dir = 4
},
/obj/item/storage/box/engineer{
pixel_y = 4
},
/turf/open/floor/plasteel,
/area/maintenance/disposal)
"bCu" = (
@@ -58340,9 +58334,7 @@
dir = 4
},
/obj/structure/window/reinforced/spawner/east,
/obj/machinery/sleeper{
dir = 8
},
/obj/machinery/stasis,
/turf/open/floor/plasteel/white,
/area/medical/medbay/zone2)
"cua" = (
_maps/map_files/Deltastation/DeltaStation2.dmm
+69 -21
View File
@@ -46157,8 +46157,7 @@
},
/obj/effect/turf_decal/delivery,
/obj/machinery/atmospherics/components/binary/valve/digital{
dir = 8;
icon_state = "dvalve_map-2"
dir = 8
},
/turf/open/floor/plasteel,
/area/science/xenobiology)
@@ -46911,12 +46910,10 @@
dir = 4;
pixel_x = -23
},
/obj/machinery/sleeper{
dir = 4
},
/obj/effect/turf_decal/stripes/line{
dir = 6
},
/obj/machinery/stasis,
/turf/open/floor/plasteel,
/area/medical/abandoned)
"ddn" = (
@@ -47560,10 +47557,10 @@
/turf/open/floor/plating,
/area/security/checkpoint/medical)
"deC" = (
/obj/machinery/sleeper{
/obj/effect/turf_decal/stripes/end{
dir = 4
},
/obj/effect/turf_decal/stripes/end{
/obj/machinery/sleeper{
dir = 4
},
/turf/open/floor/plasteel,
@@ -47585,12 +47582,10 @@
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"deF" = (
/obj/machinery/sleeper{
dir = 8
},
/obj/effect/turf_decal/stripes/end{
dir = 8
},
/obj/machinery/stasis,
/turf/open/floor/plasteel,
/area/medical/medbay/central)
"deG" = (
@@ -50090,6 +50085,9 @@
/obj/effect/turf_decal/tile/purple{
dir = 4
},
/obj/machinery/airalarm{
pixel_y = 23
},
/turf/open/floor/plasteel/white,
/area/science/misc_lab)
"djz" = (
@@ -50940,6 +50938,9 @@
/obj/effect/turf_decal/tile/purple{
dir = 8
},
/obj/machinery/light_switch{
pixel_x = -26
},
/turf/open/floor/plasteel/white,
/area/science/misc_lab)
"dln" = (
@@ -53782,6 +53783,9 @@
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/effect/turf_decal/tile/blue,
/obj/item/wallframe/light_fixture/small{
pixel_y = -15
},
/turf/open/floor/plasteel,
/area/maintenance/department/medical)
"dss" = (
@@ -56700,6 +56704,10 @@
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/delivery,
/obj/machinery/light_switch{
pixel_x = -26;
pixel_y = -26
},
/turf/open/floor/plasteel,
/area/hallway/secondary/construction)
"dyP" = (
@@ -60428,6 +60436,10 @@
/obj/item/clothing/gloves/color/latex/nitrile,
/obj/item/clothing/suit/apron/surgical,
/obj/item/clothing/mask/breath/medical,
/obj/item/wallframe/light_fixture/small{
dir = 4;
pixel_x = 14
},
/turf/open/floor/plating,
/area/maintenance/department/medical/morgue)
"dGA" = (
@@ -77552,8 +77564,7 @@
/area/engineering/main)
"grf" = (
/obj/machinery/atmospherics/pipe/simple/orange/hidden{
dir = 5;
icon_state = "pipe11-2"
dir = 5
},
/turf/closed/wall/r_wall,
/area/science/xenobiology)
@@ -77889,8 +77900,7 @@
dir = 8
},
/obj/machinery/atmospherics/components/unary/outlet_injector/on{
dir = 4;
icon_state = "inje_map-2"
dir = 4
},
/turf/open/floor/plasteel/dark,
/area/science/xenobiology)
@@ -78953,7 +78963,6 @@
/turf/open/floor/plasteel,
/area/commons/dorms)
"gUc" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/bodycontainer/crematorium{
dir = 4;
id = "cremawheat"
@@ -86276,7 +86285,7 @@
"jjN" = (
/obj/structure/table/reinforced,
/obj/machinery/camera{
c_tag = "Science - Experimentation Lab";
c_tag = "Science - Circuitry Lab";
name = "science camera";
network = list("ss13","rd")
},
@@ -91351,7 +91360,7 @@
pixel_y = 32
},
/obj/machinery/camera{
c_tag = "Library - Aft";
c_tag = "Library - Port";
name = "library camera"
},
/turf/open/floor/wood,
@@ -101092,6 +101101,19 @@
},
/turf/open/floor/plasteel,
/area/engineering/main)
"orP" = (
/obj/structure/cable/white{
icon_state = "4-8"
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/obj/machinery/light/small{
dir = 1
},
/turf/open/floor/plating,
/area/maintenance/aft)
"orZ" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
@@ -113658,6 +113680,20 @@
},
/turf/open/floor/plasteel,
/area/engineering/break_room)
"sOn" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/effect/turf_decal/tile/red{
dir = 1
},
/obj/effect/turf_decal/tile/red{
dir = 8
},
/obj/machinery/light_switch{
pixel_x = -26;
pixel_y = 8
},
/turf/open/floor/plasteel,
/area/security/brig)
"sOo" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
@@ -114372,7 +114408,7 @@
dir = 4
},
/obj/machinery/camera{
c_tag = "Library - Aft";
c_tag = "Library - Beam";
name = "library camera"
},
/turf/open/floor/plasteel/grimy,
@@ -117067,6 +117103,10 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/machinery/camera{
c_tag = "Engineering MiniSat Access";
dir = 1
},
/turf/open/floor/plasteel/dark,
/area/engineering/transit_tube)
"tVn" = (
@@ -118939,6 +118979,9 @@
/obj/effect/turf_decal/tile/red{
dir = 4
},
/obj/machinery/light_switch{
pixel_y = 24
},
/turf/open/floor/plasteel,
/area/security/office)
"uBU" = (
@@ -119406,6 +119449,10 @@
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/machinery/light_switch{
pixel_x = 26;
pixel_y = 26
},
/turf/open/floor/plasteel,
/area/ai_monitored/command/storage/eva)
"uNf" = (
@@ -124179,6 +124226,7 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/item/chisel,
/turf/open/floor/plasteel/dark,
/area/service/library)
"wDf" = (
@@ -126517,7 +126565,7 @@
dir = 4
},
/obj/machinery/camera{
c_tag = "Science - Lab Access";
c_tag = "Science - Circuitry Lab Starboard";
dir = 8;
name = "science camera";
network = list("ss13","rd")
@@ -169461,7 +169509,7 @@ dGk
dHF
dIW
dCy
dKY
orP
dMx
dNS
aaa
@@ -179929,7 +179977,7 @@ byJ
bAl
bCe
bEc
bmh
sOn
bHA
bJw
bLn
_maps/map_files/FestiveBall/FestiveStation.dmm
+3 -3
View File
@@ -29800,8 +29800,8 @@
/turf/open/floor/carpet/green,
/area/medical/surgery)
"byn" = (
/obj/machinery/sleeper,
/obj/effect/decal/festive/christmas_ivy_string,
/obj/machinery/sleeper,
/turf/open/floor/plasteel/white/side,
/area/medical/exam_room)
"byo" = (
@@ -33048,8 +33048,8 @@
},
/area/medical/genetics/cloning)
"bEC" = (
/obj/machinery/sleeper{
dir = 1
/obj/machinery/stasis{
dir = 4
},
/turf/open/floor/plasteel/white/side{
dir = 1
_maps/map_files/KiloStation/KiloStation.dmm
+14 -2
View File
@@ -22447,7 +22447,7 @@
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/machinery/sleeper{
/obj/machinery/stasis{
dir = 4
},
/turf/open/floor/plasteel/dark,
@@ -39443,6 +39443,7 @@
/obj/machinery/light/small{
dir = 1
},
/obj/item/chisel,
/turf/open/floor/plasteel/dark,
/area/service/library)
"blB" = (
@@ -84644,6 +84645,17 @@
icon_state = "wood-broken6"
},
/area/commons/vacant_room/office)
"fuh" = (
/obj/effect/turf_decal/delivery,
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
/obj/machinery/sleeper{
dir = 4
},
/turf/open/floor/plasteel/dark,
/area/medical/medbay/central)
"fyr" = (
/obj/effect/decal/cleanable/cobweb/cobweb2,
/turf/closed/mineral/random/labormineral,
@@ -104570,7 +104582,7 @@ aRd
aOR
abl
aSW
aLi
fuh
aLi
aOW
aWp
_maps/map_files/LambdaStation/lambda.dmm
+5 -2
View File
@@ -18306,6 +18306,7 @@
/obj/structure/table,
/obj/item/stack/cable_coil/random,
/obj/item/stack/cable_coil/random,
/obj/item/chisel,
/turf/open/floor/plasteel,
/area/commons/storage/art)
"aGS" = (
@@ -38153,17 +38154,19 @@
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"bDq" = (
/obj/machinery/sleeper,
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 9
},
/obj/machinery/sleeper{
dir = 4
},
/turf/open/floor/plasteel/white,
/area/medical/cryo)
"bDr" = (
/obj/machinery/sleeper,
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 5
},
/obj/machinery/stasis,
/turf/open/floor/plasteel/white,
/area/medical/cryo)
"bDs" = (
_maps/map_files/MetaStation/MetaStation.dmm
+78 -11
View File
@@ -4143,6 +4143,10 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/machinery/light_switch{
pixel_x = -10;
pixel_y = -26
},
/turf/open/floor/plasteel,
/area/security/range)
"amt" = (
@@ -5971,6 +5975,10 @@
pixel_x = -3;
pixel_y = 5
},
/obj/machinery/light_switch{
pixel_x = 16;
pixel_y = -26
},
/turf/open/floor/plasteel/showroomfloor,
/area/security/warden)
"ast" = (
@@ -8519,6 +8527,9 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/machinery/light/small{
dir = 1
},
/turf/open/floor/plating{
icon_state = "platingdmg2"
},
@@ -24204,6 +24215,11 @@
},
/obj/structure/table,
/obj/item/kitchen/rollingpin,
/obj/machinery/camera{
c_tag = "Service Hallway";
dir = 4;
name = "hallway camera"
},
/turf/open/floor/plasteel,
/area/hallway/secondary/service)
"bYp" = (
@@ -33174,6 +33190,10 @@
icon_state = "1-8"
},
/obj/effect/landmark/start/medical_doctor,
/obj/machinery/camera{
c_tag = "Patient Room";
dir = 10
},
/turf/open/floor/plasteel/white,
/area/medical/patients_rooms/room_a)
"cum" = (
@@ -33364,6 +33384,10 @@
/obj/effect/turf_decal/tile/blue{
dir = 4
},
/obj/machinery/light_switch{
pixel_x = -25;
pixel_y = 26
},
/turf/open/floor/plasteel,
/area/medical/paramedic)
"cuy" = (
@@ -35364,7 +35388,7 @@
dir = 10
},
/obj/machinery/camera{
c_tag = "Genetics Lab";
c_tag = "Genetics Lab Hall";
dir = 6;
network = list("ss13","medbay")
},
@@ -50555,9 +50579,6 @@
/turf/open/floor/plasteel/dark,
/area/engineering/storage/tech)
"eAe" = (
/obj/machinery/sleeper{
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
@@ -50571,6 +50592,7 @@
/obj/effect/turf_decal/tile/blue{
dir = 8
},
/obj/machinery/stasis,
/turf/open/floor/plasteel/white,
/area/medical/treatment_center)
"eAy" = (
@@ -52788,7 +52810,7 @@
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/camera{
c_tag = "Atmospherics - Entrance"
c_tag = "Atmospherics - Bow"
},
/turf/open/floor/plasteel,
/area/engineering/atmos)
@@ -54751,7 +54773,7 @@
"gXt" = (
/obj/machinery/cryopod,
/obj/machinery/camera{
c_tag = "Fitness Room - Fore"
c_tag = "Cryogenics"
},
/turf/open/floor/plasteel/dark,
/area/commons/cryopod)
@@ -56227,6 +56249,10 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/machinery/light_switch{
pixel_x = 8;
pixel_y = 30
},
/turf/open/floor/plasteel/dark,
/area/command/teleporter)
"hNB" = (
@@ -56376,6 +56402,16 @@
},
/turf/open/floor/engine/n2,
/area/engineering/atmos)
"hRD" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/effect/turf_decal/tile/red{
dir = 1
},
/obj/machinery/light_switch{
pixel_x = -24
},
/turf/open/floor/plasteel,
/area/security/brig)
"hSe" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 10
@@ -56908,6 +56944,9 @@
/area/solars/starboard/aft)
"ihO" = (
/obj/machinery/portable_atmospherics/canister/air,
/obj/machinery/light/small{
dir = 4
},
/turf/open/floor/plating,
/area/maintenance/prison)
"iiu" = (
@@ -59850,6 +59889,16 @@
/obj/effect/turf_decal/delivery,
/turf/open/floor/plasteel,
/area/cargo/storage)
"jPq" = (
/obj/structure/urinal{
pixel_y = 29
},
/obj/machinery/camera{
c_tag = "Auxiliary Restrooms";
dir = 5
},
/turf/open/floor/plating,
/area/commons/toilet/auxiliary)
"jPu" = (
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -64388,6 +64437,10 @@
"moT" = (
/obj/structure/table,
/obj/item/camera,
/obj/machinery/camera{
c_tag = "Art Storage";
dir = 1
},
/turf/open/floor/plasteel,
/area/commons/storage/art)
"moW" = (
@@ -67269,6 +67322,9 @@
/obj/effect/turf_decal/bot{
dir = 1
},
/obj/machinery/light_switch{
pixel_x = -23
},
/turf/open/floor/plasteel{
dir = 1
},
@@ -70711,6 +70767,10 @@
pixel_x = -28
},
/obj/machinery/light/small,
/obj/machinery/light_switch{
pixel_x = -10;
pixel_y = -26
},
/turf/open/floor/plasteel/freezer,
/area/commons/fitness/recreation)
"pRd" = (
@@ -72469,6 +72529,7 @@
/obj/item/stack/cable_coil/random,
/obj/item/stack/cable_coil/random,
/obj/item/stack/cable_coil/random,
/obj/item/chisel,
/turf/open/floor/plasteel,
/area/commons/storage/art)
"qNe" = (
@@ -80971,9 +81032,6 @@
/turf/open/space/basic,
/area/space)
"vLV" = (
/obj/machinery/sleeper{
dir = 4
},
/obj/effect/turf_decal/tile/blue{
dir = 1
},
@@ -80984,6 +81042,9 @@
/obj/effect/turf_decal/tile/blue{
dir = 8
},
/obj/machinery/sleeper{
dir = 4
},
/turf/open/floor/plasteel/white,
/area/medical/treatment_center)
"vMm" = (
@@ -83941,6 +84002,9 @@
/obj/effect/turf_decal/tile/red{
dir = 8
},
/obj/machinery/light_switch{
pixel_x = -24
},
/turf/open/floor/plasteel,
/area/security/office)
"xnt" = (
@@ -84591,6 +84655,9 @@
/turf/open/floor/wood,
/area/service/lawoffice)
"xEM" = (
/obj/machinery/light_switch{
pixel_x = -20
},
/turf/open/floor/plating,
/area/commons/toilet/auxiliary)
"xFb" = (
@@ -102517,7 +102584,7 @@ btZ
bvV
bxN
mei
nzp
jPq
xEM
mei
smm
@@ -110693,7 +110760,7 @@ afR
akx
anh
anh
anh
hRD
anh
alQ
anh
_maps/map_files/OmegaStation/OmegaStation.dmm
+176 -123
View File
@@ -937,9 +937,6 @@
id = "engsm";
name = "Radiation Chamber Shutters"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 10
},
/turf/open/floor/plating,
/area/engineering/gravity_generator)
"abR" = (
@@ -1314,14 +1311,14 @@
/area/engineering/main)
"acA" = (
/obj/structure/cable/white,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 4
},
/obj/effect/spawner/structure/window/plasma/reinforced,
/obj/machinery/door/poddoor/shutters/radiation/preopen{
id = "engsm";
name = "Radiation Chamber Shutters"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 10
},
/turf/open/floor/plating,
/area/engineering/gravity_generator)
"acB" = (
@@ -2545,6 +2542,10 @@
pixel_x = 24;
pixel_y = 24
},
/obj/machinery/light_switch{
pixel_x = 24;
pixel_y = -24
},
/turf/open/floor/plasteel,
/area/cargo/qm)
"aeQ" = (
@@ -6573,6 +6574,10 @@
/area/commons/toilet/restrooms)
"alX" = (
/obj/machinery/vending/wardrobe/law_wardrobe,
/obj/machinery/camera{
c_tag = "Law Office";
dir = 8
},
/turf/open/floor/wood,
/area/service/lawoffice)
"alY" = (
@@ -7009,14 +7014,10 @@
/turf/open/floor/wood,
/area/service/lawoffice)
"amS" = (
/obj/machinery/camera{
c_tag = "Law Office";
dir = 8
},
/obj/machinery/power/apc{
areastring = "/area/commons/toilet/restrooms";
areastring = "/area/service/lawoffice";
dir = 4;
name = "Restrooms APC";
name = "Law Office APC";
pixel_x = 24
},
/obj/structure/cable/white{
@@ -7345,6 +7346,10 @@
name = "Chief Engineer RC";
pixel_x = 32
},
/obj/machinery/light_switch{
pixel_x = 24;
pixel_y = -17
},
/turf/open/floor/plasteel,
/area/command/heads_quarters/ce)
"anB" = (
@@ -8434,7 +8439,7 @@
pixel_y = 32
},
/obj/machinery/atmospherics/components/unary/vent_pump/on,
/obj/machinery/atmospherics/pipe/simple/orange/visible{
/obj/machinery/atmospherics/pipe/simple/orange/hidden{
dir = 4
},
/turf/open/floor/plasteel/dark,
@@ -8844,10 +8849,12 @@
/turf/open/floor/plasteel,
/area/service/bar/atrium)
"apX" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/obj/effect/turf_decal/delivery,
/obj/effect/turf_decal/stripes/box,
/obj/machinery/rnd/production/techfab/department/service,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 9
},
/turf/open/floor/plasteel,
/area/service/bar/atrium)
"apY" = (
@@ -12774,6 +12781,10 @@
pixel_x = -26;
pixel_y = -26
},
/obj/machinery/camera{
c_tag = "Bathrooms";
dir = 1
},
/turf/open/floor/plasteel/freezer,
/area/commons/toilet/restrooms)
"axg" = (
@@ -13508,6 +13519,10 @@
"ayE" = (
/obj/structure/table/wood,
/obj/item/instrument/violin,
/obj/machinery/camera{
c_tag = "Central Diner 2";
dir = 4
},
/turf/open/floor/plasteel/dark,
/area/service/theater)
"ayF" = (
@@ -13540,10 +13555,6 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/obj/machinery/camera{
c_tag = "Central Diner 2";
dir = 4
},
/turf/open/floor/plasteel/dark/side{
dir = 8
},
@@ -15209,6 +15220,10 @@
},
/area/service/theater)
"aBW" = (
/obj/machinery/light_switch{
pixel_x = 10;
pixel_y = 26
},
/turf/open/floor/wood{
icon_state = "wood-broken7"
},
@@ -16021,7 +16036,7 @@
"aDv" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/turf/closed/wall/r_wall,
/area/engineering/break_room)
/area/engineering/lobby)
"aDw" = (
/obj/machinery/firealarm{
dir = 4;
@@ -16037,7 +16052,7 @@
/turf/open/floor/plasteel/white/corner{
dir = 1
},
/area/engineering/break_room)
/area/engineering/lobby)
"aDx" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 4
@@ -16051,7 +16066,7 @@
/turf/open/floor/plasteel/dark/corner{
dir = 1
},
/area/engineering/break_room)
/area/engineering/lobby)
"aDy" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/effect/turf_decal/tile/yellow{
@@ -16060,7 +16075,7 @@
/turf/open/floor/plasteel/dark/corner{
dir = 1
},
/area/engineering/break_room)
/area/engineering/lobby)
"aDz" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 8
@@ -16071,7 +16086,7 @@
/turf/open/floor/plasteel/dark/corner{
dir = 1
},
/area/engineering/break_room)
/area/engineering/lobby)
"aDA" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 8
@@ -16082,7 +16097,7 @@
/turf/open/floor/plasteel/dark/corner{
dir = 1
},
/area/engineering/break_room)
/area/engineering/lobby)
"aDB" = (
/obj/item/kirbyplants{
icon_state = "plant-21"
@@ -16091,7 +16106,7 @@
dir = 4
},
/turf/open/floor/plasteel/checker,
/area/engineering/break_room)
/area/engineering/lobby)
"aDC" = (
/obj/structure/table/reinforced,
/obj/item/airlock_painter,
@@ -16596,7 +16611,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/sign/warning/nosmoking,
/turf/closed/wall/r_wall,
/area/engineering/break_room)
/area/engineering/lobby)
"aEB" = (
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
dir = 4
@@ -16608,7 +16623,7 @@
/turf/open/floor/plasteel/white/corner{
dir = 1
},
/area/engineering/break_room)
/area/engineering/lobby)
"aEC" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 9
@@ -16617,26 +16632,26 @@
icon_state = "1-2"
},
/turf/open/floor/plasteel,
/area/engineering/break_room)
/area/engineering/lobby)
"aED" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 8
},
/turf/open/floor/plasteel,
/area/engineering/break_room)
/area/engineering/lobby)
"aEE" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/turf/open/floor/plasteel,
/area/engineering/break_room)
/area/engineering/lobby)
"aEF" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 1
},
/turf/open/floor/plasteel,
/area/engineering/break_room)
/area/engineering/lobby)
"aEG" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -16645,7 +16660,7 @@
dir = 4
},
/turf/open/floor/plasteel,
/area/engineering/break_room)
/area/engineering/lobby)
"aEH" = (
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -16655,7 +16670,7 @@
name = "Engineering Foyer"
},
/turf/open/floor/plasteel,
/area/engineering/break_room)
/area/engineering/lobby)
"aEI" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -17202,7 +17217,7 @@
/turf/open/floor/plasteel/white/corner{
dir = 1
},
/area/engineering/break_room)
/area/engineering/lobby)
"aFD" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 10
@@ -17217,7 +17232,7 @@
icon_state = "2-4"
},
/turf/open/floor/plasteel,
/area/engineering/break_room)
/area/engineering/lobby)
"aFE" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/cable/white{
@@ -17231,7 +17246,7 @@
icon_state = "2-4"
},
/turf/open/floor/plasteel,
/area/engineering/break_room)
/area/engineering/lobby)
"aFF" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 8
@@ -17241,7 +17256,7 @@
},
/obj/effect/landmark/event_spawn,
/turf/open/floor/plasteel,
/area/engineering/break_room)
/area/engineering/lobby)
"aFG" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -17251,7 +17266,7 @@
icon_state = "4-8"
},
/turf/open/floor/plasteel,
/area/engineering/break_room)
/area/engineering/lobby)
"aFH" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -17261,7 +17276,7 @@
},
/obj/effect/turf_decal/tile/yellow,
/turf/open/floor/plasteel,
/area/engineering/break_room)
/area/engineering/lobby)
"aFI" = (
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
@@ -17274,7 +17289,7 @@
name = "Engineering Foyer"
},
/turf/open/floor/plasteel,
/area/engineering/break_room)
/area/engineering/lobby)
"aFJ" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -17615,7 +17630,7 @@
/turf/open/floor/plasteel/white/corner{
dir = 1
},
/area/engineering/break_room)
/area/engineering/lobby)
"aGq" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 4
@@ -17627,7 +17642,7 @@
dir = 8
},
/turf/open/floor/plasteel,
/area/engineering/break_room)
/area/engineering/lobby)
"aGr" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/light,
@@ -17646,28 +17661,28 @@
dir = 8
},
/turf/open/floor/plasteel,
/area/engineering/break_room)
/area/engineering/lobby)
"aGs" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/effect/turf_decal/tile/yellow{
dir = 8
},
/turf/open/floor/plasteel,
/area/engineering/break_room)
/area/engineering/lobby)
"aGt" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 1
},
/obj/effect/turf_decal/tile/yellow,
/turf/open/floor/plasteel,
/area/engineering/break_room)
/area/engineering/lobby)
"aGu" = (
/obj/item/kirbyplants{
icon_state = "plant-22"
},
/obj/effect/turf_decal/tile/yellow,
/turf/open/floor/plasteel,
/area/engineering/break_room)
/area/engineering/lobby)
"aGv" = (
/obj/structure/table/reinforced,
/obj/item/stock_parts/cell/high,
@@ -20008,7 +20023,6 @@
/obj/structure/cable/white{
icon_state = "4-8"
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
@@ -21046,6 +21060,10 @@
dir = 1;
pixel_y = 1
},
/obj/machinery/camera{
c_tag = "Hydroponics South";
dir = 9
},
/turf/open/floor/grass,
/area/service/hydroponics)
"aMt" = (
@@ -21434,7 +21452,7 @@
icon_state = "1-2"
},
/obj/machinery/camera{
c_tag = "Atmospherics South West";
c_tag = "Central Hallway West 2";
dir = 4
},
/turf/open/floor/plasteel{
@@ -21580,10 +21598,6 @@
"aNu" = (
/obj/structure/closet/crate/bin,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/camera{
c_tag = "Hydroponics South";
dir = 8
},
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel/dark/side,
/area/service/hydroponics)
@@ -23309,7 +23323,7 @@
pixel_y = -32
},
/obj/machinery/camera{
c_tag = "Starboard Primary Hallway 3";
c_tag = "Starboard Primary Hallway";
dir = 1
},
/obj/effect/turf_decal/bot,
@@ -23475,18 +23489,14 @@
/area/engineering/main)
"aQU" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/obj/structure/cable/white{
icon_state = "1-2"
},
/obj/machinery/door/airlock/maintenance_hatch{
name = "Maintenance Hatch";
req_access_txt = "12"
/obj/machinery/light/small{
dir = 4
},
/turf/open/floor/plasteel,
/area/maintenance/port/aft)
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
"aQV" = (
/obj/machinery/computer/arcade{
dir = 4
@@ -24002,6 +24012,10 @@
dir = 1
},
/obj/machinery/holopad,
/obj/machinery/light_switch{
pixel_x = 12;
pixel_y = 32
},
/turf/open/floor/plasteel/white,
/area/medical/virology)
"aSf" = (
@@ -24087,6 +24101,10 @@
/area/medical/chemistry)
"aSo" = (
/obj/effect/landmark/event_spawn,
/obj/machinery/light_switch{
pixel_x = 24;
pixel_y = -24
},
/turf/open/floor/plasteel/dark,
/area/medical/morgue)
"aSp" = (
@@ -24615,22 +24633,22 @@
/obj/structure/table/wood,
/obj/item/flashlight/lamp,
/turf/open/floor/plasteel/grimy,
/area/commons/lounge)
/area/hallway/primary/aft)
"aTz" = (
/obj/structure/chair/comfy/brown,
/turf/open/floor/plasteel/grimy,
/area/commons/lounge)
/area/hallway/primary/aft)
"aTA" = (
/obj/item/kirbyplants{
icon_state = "plant-18"
},
/turf/open/floor/plasteel/grimy,
/area/commons/lounge)
/area/hallway/primary/aft)
"aTB" = (
/obj/structure/chair/comfy/brown,
/obj/effect/landmark/start/assistant,
/turf/open/floor/plasteel/grimy,
/area/commons/lounge)
/area/hallway/primary/aft)
"aTC" = (
/obj/structure/table/wood,
/obj/item/storage/fancy/donut_box,
@@ -24638,7 +24656,7 @@
c_tag = "Arrivals Lounge"
},
/turf/open/floor/plasteel/grimy,
/area/commons/lounge)
/area/hallway/primary/aft)
"aTD" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plasteel,
@@ -24928,7 +24946,9 @@
/turf/open/floor/wood,
/area/service/library)
"aUh" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 9
},
/turf/closed/wall/r_wall,
/area/medical/virology)
"aUi" = (
@@ -25071,16 +25091,16 @@
dir = 4
},
/turf/open/floor/plasteel/grimy,
/area/commons/lounge)
/area/hallway/primary/aft)
"aUy" = (
/turf/open/floor/carpet,
/area/commons/lounge)
/area/hallway/primary/aft)
"aUz" = (
/obj/structure/chair/comfy/brown{
dir = 8
},
/turf/open/floor/plasteel/grimy,
/area/commons/lounge)
/area/hallway/primary/aft)
"aUA" = (
/obj/machinery/rnd/destructive_analyzer,
/obj/effect/turf_decal/stripes/line{
@@ -25350,6 +25370,7 @@
name = "Station Intercom";
pixel_x = 26
},
/obj/item/chisel,
/turf/open/floor/plasteel/dark,
/area/service/library)
"aVc" = (
@@ -25498,17 +25519,17 @@
dir = 8
},
/turf/open/floor/plasteel/grimy,
/area/commons/lounge)
/area/hallway/primary/aft)
"aVq" = (
/obj/machinery/holopad,
/turf/open/floor/carpet,
/area/commons/lounge)
/area/hallway/primary/aft)
"aVr" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 4
},
/turf/open/floor/plasteel/grimy,
/area/commons/lounge)
/area/hallway/primary/aft)
"aVt" = (
/obj/machinery/computer/rdconsole/core{
dir = 4
@@ -26261,7 +26282,7 @@
/obj/structure/table/wood,
/obj/item/reagent_containers/food/snacks/chips,
/turf/open/floor/plasteel/grimy,
/area/commons/lounge)
/area/hallway/primary/aft)
"aWQ" = (
/obj/structure/chair/comfy/brown{
buildstackamount = 0;
@@ -26273,7 +26294,7 @@
pixel_y = -22
},
/turf/open/floor/plasteel/grimy,
/area/commons/lounge)
/area/hallway/primary/aft)
"aWR" = (
/obj/item/kirbyplants{
icon_state = "plant-21";
@@ -26285,7 +26306,7 @@
pixel_y = -32
},
/turf/open/floor/plasteel/grimy,
/area/commons/lounge)
/area/hallway/primary/aft)
"aWS" = (
/obj/structure/chair/comfy/brown{
buildstackamount = 0;
@@ -26296,13 +26317,13 @@
pixel_y = -24
},
/turf/open/floor/plasteel/grimy,
/area/commons/lounge)
/area/hallway/primary/aft)
"aWT" = (
/obj/structure/table/wood,
/obj/item/folder,
/obj/item/pen,
/turf/open/floor/plasteel/grimy,
/area/commons/lounge)
/area/hallway/primary/aft)
"aWU" = (
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -26793,12 +26814,12 @@
/turf/open/floor/plating,
/area/medical/medbay/zone3)
"aXS" = (
/obj/machinery/sleeper{
dir = 4
},
/obj/effect/turf_decal/stripes/line{
dir = 6
},
/obj/machinery/sleeper{
dir = 4
},
/turf/open/floor/plasteel/dark/side{
dir = 8
},
@@ -26876,20 +26897,12 @@
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
"aYe" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
/obj/machinery/airalarm{
dir = 8;
pixel_x = 24
},
/obj/machinery/power/apc{
areastring = "/area/commons/lounge";
dir = 1;
name = "Lounge APC";
pixel_y = 23
},
/obj/structure/cable/white{
icon_state = "0-2"
},
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
/turf/open/floor/plasteel/white/corner,
/area/commons/dorms)
"aYf" = (
/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden,
/turf/open/floor/plasteel,
@@ -26991,7 +27004,7 @@
/area/science/research)
"aYp" = (
/obj/machinery/camera{
c_tag = "Communications Relay";
c_tag = "Telecommunications Relay";
dir = 8;
network = list("ss13","tcomms")
},
@@ -28145,9 +28158,6 @@
/turf/open/floor/plating,
/area/medical/medbay/zone3)
"bax" = (
/obj/machinery/sleeper{
dir = 4
},
/obj/machinery/newscaster{
pixel_y = -32
},
@@ -28157,6 +28167,9 @@
/obj/effect/turf_decal/stripes/end{
dir = 4
},
/obj/machinery/stasis{
dir = 4
},
/turf/open/floor/plasteel/dark/side{
dir = 8
},
@@ -30415,6 +30428,10 @@
},
/obj/effect/turf_decal/stripes/line,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/camera{
c_tag = "Toxins Lab";
network = list("ss13","rd")
},
/turf/open/floor/plasteel/dark/side{
dir = 1
},
@@ -33375,7 +33392,7 @@
icon_state = "1-2"
},
/obj/machinery/camera{
c_tag = "Starboard Primary Hallway 2";
c_tag = "Starboard Primary Hallway 3";
dir = 8
},
/turf/open/floor/plasteel,
@@ -33433,7 +33450,7 @@
"blm" = (
/obj/structure/closet/emcloset,
/obj/machinery/camera{
c_tag = "Starboard Primary Hallway"
c_tag = "Starboard Primary Hallway 1"
},
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel/dark/side{
@@ -35282,7 +35299,7 @@
"fgG" = (
/obj/machinery/status_display/ai,
/turf/closed/wall,
/area/commons/lounge)
/area/hallway/primary/aft)
"fgZ" = (
/obj/structure/girder/reinforced,
/obj/effect/turf_decal/sand/plating,
@@ -35877,6 +35894,10 @@
/obj/effect/turf_decal/stripes/line{
dir = 9
},
/obj/machinery/light_switch{
dir = 9;
pixel_x = -22
},
/turf/open/floor/plasteel/dark,
/area/command/gateway)
"hIu" = (
@@ -35924,9 +35945,6 @@
/obj/structure/cable/white{
icon_state = "0-8"
},
/obj/structure/cable/white{
icon_state = "1-8"
},
/turf/open/floor/plasteel{
heat_capacity = 1e+006
},
@@ -36155,6 +36173,13 @@
/obj/item/toy/poolnoodle/red,
/turf/open/floor/wood,
/area/maintenance/starboard/aft)
"iUa" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 8
},
/turf/closed/wall/r_wall,
/area/engineering/gravity_generator)
"iUq" = (
/obj/machinery/status_display,
/turf/closed/wall,
@@ -36951,7 +36976,7 @@
/area/asteroid/nearstation)
"lIM" = (
/turf/closed/wall/rust,
/area/commons/lounge)
/area/hallway/primary/aft)
"lMu" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -37333,10 +37358,6 @@
/obj/machinery/firealarm{
pixel_y = 24
},
/obj/machinery/camera{
c_tag = "Toxins Lab West";
network = list("ss13","rd")
},
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plasteel/dark/side{
dir = 1
@@ -38475,6 +38496,9 @@
/obj/structure/cable/white{
icon_state = "4-8"
},
/obj/structure/cable/white{
icon_state = "2-8"
},
/turf/open/floor/plating,
/area/maintenance/starboard)
"sEq" = (
@@ -38484,7 +38508,7 @@
"sEG" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/commons/lounge)
/area/hallway/primary/aft)
"sEJ" = (
/obj/structure/cable/white{
icon_state = "1-2"
@@ -38522,6 +38546,9 @@
name = "Technology Storage";
req_access_txt = "23"
},
/obj/structure/cable/white{
icon_state = "1-2"
},
/turf/open/floor/plasteel/dark,
/area/engineering/storage/tech)
"sEQ" = (
@@ -38548,9 +38575,21 @@
pixel_x = -3;
pixel_y = -3
},
/obj/machinery/power/apc{
areastring = "/area/engineering/storage/tech";
dir = 1;
name = "Tech Storage APC";
pixel_y = 23
},
/obj/structure/cable/white{
icon_state = "0-4"
},
/turf/open/floor/plasteel/dark,
/area/engineering/storage/tech)
"sFo" = (
/obj/structure/cable/white{
icon_state = "1-8"
},
/turf/open/floor/plasteel/dark/side{
dir = 9
},
@@ -38620,6 +38659,10 @@
pixel_x = -4;
pixel_y = -4
},
/obj/machinery/camera{
c_tag = "Tech Storage";
dir = 4
},
/turf/open/floor/plasteel/dark,
/area/engineering/storage/tech)
"sFS" = (
@@ -38645,6 +38688,14 @@
/obj/item/electronics/apc,
/obj/item/electronics/airlock,
/obj/item/stock_parts/cell/high,
/obj/machinery/airalarm{
dir = 8;
pixel_x = 24
},
/obj/machinery/light_switch{
pixel_x = -6;
pixel_y = -24
},
/turf/open/floor/plasteel/dark,
/area/engineering/storage/tech)
"sFX" = (
@@ -39226,7 +39277,7 @@
/obj/effect/turf_decal/delivery,
/obj/effect/turf_decal/stripes/line,
/obj/machinery/camera{
c_tag = "AI Chamber - Core";
c_tag = "AI Chamber - Core Fore";
name = "core camera";
network = list("rd")
},
@@ -39536,7 +39587,7 @@
dir = 10
},
/obj/machinery/camera{
c_tag = "AI Chamber - Core";
c_tag = "AI Chamber - Core Aft";
name = "core camera";
network = list("rd")
},
@@ -40072,7 +40123,7 @@
"sNz" = (
/obj/item/beacon,
/turf/open/floor/carpet,
/area/commons/lounge)
/area/hallway/primary/aft)
"sNA" = (
/obj/effect/turf_decal/stripes/line{
dir = 10
@@ -40640,7 +40691,7 @@
/area/hallway/secondary/entry)
"tWh" = (
/turf/closed/wall,
/area/commons/lounge)
/area/hallway/primary/aft)
"tWQ" = (
/obj/effect/turf_decal/stripes/line{
dir = 1
@@ -40860,7 +40911,7 @@
"uuU" = (
/obj/machinery/status_display,
/turf/closed/wall,
/area/commons/lounge)
/area/hallway/primary/aft)
"uuX" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -41484,7 +41535,9 @@
/area/science/mixing)
"wQj" = (
/obj/effect/turf_decal/bot,
/obj/machinery/atmospherics/components/unary/thermomachine/freezer,
/obj/machinery/atmospherics/components/unary/thermomachine/freezer{
dir = 1
},
/turf/open/floor/plasteel/dark,
/area/engineering/main)
"wRY" = (
@@ -41570,7 +41623,7 @@
dir = 4
},
/obj/machinery/camera{
c_tag = "Security Checkpoint";
c_tag = "Science Foyer";
dir = 6
},
/turf/open/floor/plasteel,
@@ -41666,7 +41719,7 @@
"xwu" = (
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/engineering/break_room)
/area/engineering/lobby)
"xxx" = (
/obj/structure/chair/stool/bar,
/obj/effect/turf_decal/tile/red{
@@ -70849,7 +70902,7 @@ amF
anw
anO
aop
aGe
iUa
aJl
aKu
aLI
@@ -76781,7 +76834,7 @@ aQW
aQW
sJI
aPO
aQU
aXv
aRV
aUb
aUu
@@ -79067,7 +79120,7 @@ jJn
bxJ
aDD
aBQ
aDD
aYe
aDF
aEN
awQ
@@ -83972,7 +84025,7 @@ aUy
aUy
aWS
lIM
aYe
ugK
hOc
byo
baK
@@ -87522,7 +87575,7 @@ bym
bdi
bdF
bxw
bym
aQU
afB
agu
ahj
_maps/map_files/PubbyStation/PubbyStation.dmm
+135 -38
View File
@@ -5229,6 +5229,10 @@
/obj/structure/cable{
icon_state = "2-8"
},
/obj/machinery/light_switch{
pixel_x = 24;
pixel_y = 24
},
/turf/open/floor/plasteel,
/area/security/brig)
"anw" = (
@@ -15212,6 +15216,10 @@
/obj/structure/cable{
icon_state = "1-8"
},
/obj/machinery/light_switch{
pixel_x = 24;
pixel_y = 24
},
/turf/open/floor/plasteel,
/area/command/teleporter)
"aMa" = (
@@ -15846,6 +15854,10 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/machinery/light_switch{
pixel_x = 24;
pixel_y = 24
},
/turf/open/floor/plasteel/dark,
/area/ai_monitored/command/storage/eva)
"aNu" = (
@@ -15950,6 +15962,10 @@
/obj/effect/turf_decal/tile/red{
dir = 4
},
/obj/machinery/light_switch{
pixel_x = 24;
pixel_y = 24
},
/turf/open/floor/plasteel,
/area/security/checkpoint/supply)
"aNH" = (
@@ -16161,6 +16177,7 @@
/obj/effect/turf_decal/tile/blue{
dir = 8
},
/obj/item/chisel,
/turf/open/floor/plasteel,
/area/commons/storage/art)
"aOu" = (
@@ -16898,6 +16915,10 @@
/area/cargo/warehouse)
"aQe" = (
/obj/effect/spawner/lootdrop/maintenance,
/obj/machinery/light_switch{
pixel_x = -7;
pixel_y = -24
},
/turf/open/floor/plasteel,
/area/cargo/warehouse)
"aQf" = (
@@ -19482,7 +19503,7 @@
receive_ore_updates = 1
},
/obj/machinery/camera{
c_tag = "Bar Access"
c_tag = "Service Hallway"
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -20644,6 +20665,10 @@
/obj/effect/turf_decal/tile/brown{
dir = 4
},
/obj/machinery/light_switch{
pixel_x = 24;
pixel_y = 24
},
/turf/open/floor/plasteel,
/area/cargo/office)
"aYs" = (
@@ -21835,6 +21860,10 @@
/obj/effect/turf_decal/tile/red{
dir = 8
},
/obj/machinery/light_switch{
pixel_x = -26;
pixel_y = -26
},
/turf/open/floor/plasteel,
/area/security/checkpoint/customs)
"baR" = (
@@ -24548,6 +24577,10 @@
/obj/effect/turf_decal/tile/brown{
dir = 8
},
/obj/machinery/light_switch{
pixel_x = -6;
pixel_y = -24
},
/turf/open/floor/plasteel,
/area/cargo/miningdock)
"bht" = (
@@ -25504,6 +25537,9 @@
/obj/effect/turf_decal/tile/red{
dir = 4
},
/obj/machinery/light_switch{
pixel_y = 22
},
/turf/open/floor/plasteel,
/area/security/checkpoint/medical)
"bkb" = (
@@ -26499,6 +26535,9 @@
/obj/machinery/vending/wallmed{
pixel_y = -28
},
/obj/machinery/light_switch{
pixel_x = -23
},
/turf/open/floor/plasteel/dark,
/area/medical/paramedic)
"bmn" = (
@@ -30452,6 +30491,9 @@
/obj/effect/turf_decal/tile/purple{
dir = 8
},
/obj/machinery/light_switch{
pixel_x = 24
},
/turf/open/floor/plasteel/dark,
/area/science/xenobiology)
"bva" = (
@@ -31157,6 +31199,10 @@
dir = 4
},
/obj/structure/disposalpipe/segment,
/obj/machinery/light_switch{
dir = 8;
pixel_x = 24
},
/turf/open/floor/plasteel/white,
/area/medical/medbay/zone3)
"bwE" = (
@@ -32683,9 +32729,6 @@
/turf/open/floor/plasteel/white,
/area/medical/medbay/zone3)
"bzP" = (
/obj/machinery/sleeper{
dir = 4
},
/obj/effect/turf_decal/stripes/line{
dir = 1
},
@@ -32702,6 +32745,9 @@
/obj/effect/turf_decal/tile/blue{
dir = 8
},
/obj/machinery/sleeper{
dir = 4
},
/turf/open/floor/plasteel,
/area/medical/treatment_center)
"bzQ" = (
@@ -32738,6 +32784,10 @@
/obj/effect/turf_decal/tile/blue{
dir = 4
},
/obj/machinery/light_switch{
pixel_x = 24;
pixel_y = 24
},
/turf/open/floor/plasteel/white,
/area/medical/treatment_center)
"bzU" = (
@@ -33911,9 +33961,6 @@
/turf/open/floor/plasteel,
/area/medical/treatment_center)
"bCj" = (
/obj/machinery/sleeper{
dir = 4
},
/obj/effect/turf_decal/tile/blue{
dir = 1
},
@@ -33924,6 +33971,9 @@
/obj/effect/turf_decal/tile/blue{
dir = 8
},
/obj/machinery/stasis{
dir = 4
},
/turf/open/floor/plasteel,
/area/medical/treatment_center)
"bCl" = (
@@ -35453,6 +35503,10 @@
/obj/effect/turf_decal/tile/red{
dir = 8
},
/obj/machinery/light_switch{
pixel_x = 24;
pixel_y = -24
},
/turf/open/floor/plasteel,
/area/security/checkpoint/science)
"bEZ" = (
@@ -37187,6 +37241,10 @@
/obj/structure/cable{
icon_state = "0-8"
},
/obj/machinery/light_switch{
pixel_x = 24;
pixel_y = -24
},
/turf/open/floor/engine,
/area/science/storage)
"bII" = (
@@ -37973,7 +38031,7 @@
layer = 4.5
},
/turf/open/floor/plasteel/freezer,
/area/medical/exam_room)
/area/medical/medbay/central)
"bKw" = (
/obj/machinery/vending/wallmed{
pixel_y = 28
@@ -37986,7 +38044,7 @@
},
/obj/effect/landmark/xeno_spawn,
/turf/open/floor/plasteel/freezer,
/area/medical/exam_room)
/area/medical/medbay/central)
"bKx" = (
/obj/machinery/button/door{
id = "patientB";
@@ -38000,7 +38058,7 @@
dir = 4
},
/turf/open/floor/plasteel/freezer,
/area/medical/exam_room)
/area/medical/medbay/central)
"bKy" = (
/obj/machinery/door/airlock/medical{
name = "Patient Room";
@@ -38010,7 +38068,7 @@
dir = 4
},
/turf/open/floor/plasteel/freezer,
/area/medical/exam_room)
/area/medical/medbay/central)
"bKz" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
@@ -38462,7 +38520,7 @@
pixel_x = -22
},
/turf/open/floor/plasteel/freezer,
/area/medical/exam_room)
/area/medical/medbay/central)
"bLG" = (
/obj/structure/chair/office/light{
dir = 8
@@ -38470,15 +38528,19 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 4
},
/obj/machinery/airalarm{
dir = 1;
pixel_y = -22
},
/turf/open/floor/plasteel/freezer,
/area/medical/exam_room)
/area/medical/medbay/central)
"bLH" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/obj/structure/closet/secure_closet/personal/patient,
/turf/open/floor/plasteel/freezer,
/area/medical/exam_room)
/area/medical/medbay/central)
"bLI" = (
/obj/machinery/door/poddoor/shutters/preopen{
id = "patientB";
@@ -38489,7 +38551,7 @@
},
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/medical/exam_room)
/area/medical/medbay/central)
"bLJ" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
/obj/effect/turf_decal/tile/blue{
@@ -40138,6 +40200,10 @@
/obj/structure/disposalpipe/sorting/mail{
sortType = 6
},
/obj/machinery/light_switch{
pixel_x = 24;
pixel_y = 24
},
/turf/open/floor/plasteel,
/area/engineering/atmos)
"bPP" = (
@@ -40557,6 +40623,9 @@
dir = 4
},
/obj/effect/turf_decal/tile/yellow,
/obj/machinery/light{
dir = 4
},
/turf/open/floor/plasteel,
/area/engineering/atmos)
"bQI" = (
@@ -42547,6 +42616,10 @@
/obj/effect/turf_decal/tile/red{
dir = 8
},
/obj/machinery/light_switch{
pixel_x = -24;
pixel_y = -13
},
/turf/open/floor/plasteel,
/area/security/checkpoint/engineering)
"bUW" = (
@@ -47468,6 +47541,10 @@
/area/maintenance/department/security/brig)
"clm" = (
/obj/machinery/photocopier,
/obj/machinery/light_switch{
pixel_x = -24;
pixel_y = -8
},
/turf/open/floor/plasteel/dark,
/area/service/library/lounge)
"cln" = (
@@ -50925,8 +51002,11 @@
/turf/open/floor/plasteel/dark,
/area/service/library)
"czP" = (
/turf/closed/mineral,
/area/maintenance/department/chapel/monastery)
/obj/machinery/light_switch{
pixel_x = -24
},
/turf/open/floor/carpet/black,
/area/service/chapel/office)
"czQ" = (
/obj/structure/table/wood,
/obj/item/storage/bag/books,
@@ -53664,7 +53744,7 @@
/area/security/courtroom)
"gDR" = (
/obj/machinery/camera{
c_tag = "Central Primary Hallway Escape";
c_tag = "Aft Primary Hallway Medsci";
dir = 4
},
/obj/effect/turf_decal/tile/blue{
@@ -53944,7 +54024,7 @@
"gXZ" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/camera{
c_tag = "Engineering Supermatter Fore";
c_tag = "Engineering Supermatter Port";
dir = 4;
network = list("ss13","engine")
},
@@ -57485,6 +57565,10 @@
pixel_y = -32
},
/obj/item/gavelhammer,
/obj/machinery/light_switch{
pixel_x = -26;
pixel_y = 26
},
/turf/open/floor/plasteel,
/area/security/courtroom)
"nih" = (
@@ -59200,6 +59284,9 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/obj/machinery/light_switch{
pixel_x = -25
},
/turf/open/floor/plasteel/dark,
/area/science/xenobiology)
"pNy" = (
@@ -59419,8 +59506,15 @@
/turf/open/floor/plating,
/area/maintenance/department/engine)
"qdY" = (
/turf/closed/wall,
/area/medical/exam_room)
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/obj/machinery/light_switch{
pixel_x = 24;
pixel_y = -24
},
/turf/open/floor/plasteel/dark,
/area/service/library)
"qeY" = (
/turf/closed/wall/r_wall,
/area/engineering/supermatter)
@@ -59868,6 +59962,9 @@
/obj/effect/turf_decal/tile/blue{
dir = 4
},
/obj/machinery/light_switch{
pixel_x = -25
},
/turf/open/floor/plasteel/dark,
/area/science/xenobiology)
"qVP" = (
@@ -61786,7 +61883,7 @@
name = "Defense"
},
/obj/machinery/camera{
c_tag = "Atmospherics Starboard";
c_tag = "Atmospherics Hallway";
dir = 8
},
/obj/effect/turf_decal/tile/purple,
@@ -75511,7 +75608,7 @@ csd
csd
csB
csd
csd
czP
cBM
aaa
aaa
@@ -83005,7 +83102,7 @@ hlj
cAg
cAt
ckH
hlj
qdY
lEh
cyU
aaa
@@ -85028,10 +85125,10 @@ aht
cjm
cvK
cjm
czP
czP
czP
czP
cfN
cfN
cfN
cfN
cAj
eNc
cfN
@@ -85285,10 +85382,10 @@ cjm
cjm
cwg
cjm
czP
cfN
kJo
czP
czP
cfN
cfN
cAj
eNc
cjm
@@ -85545,7 +85642,7 @@ cjm
cwg
eNc
czt
czP
cfN
qWo
lxI
xVt
@@ -85802,8 +85899,8 @@ cjm
eNc
czl
cjm
czP
czP
cfN
cfN
eNc
cjm
cjm
@@ -91164,7 +91261,7 @@ bIe
bjc
bKv
bLF
qdY
bjc
bNS
bCz
bPB
@@ -91421,7 +91518,7 @@ bIf
bjc
bKw
bLG
qdY
bjc
bNT
bCz
bPB
@@ -91678,7 +91775,7 @@ bIg
bjc
bKx
bLH
qdY
bjc
bNU
bCz
bPB
@@ -91935,7 +92032,7 @@ bkb
bjc
bKy
bLI
qdY
bjc
bjc
bCz
bPB
_maps/map_files/Snaxi/Snaxi.dmm
+11 -18
View File
@@ -11007,9 +11007,7 @@
/obj/effect/turf_decal/tile/blue{
dir = 4
},
/obj/machinery/sleeper{
dir = 8
},
/obj/machinery/stasis,
/turf/open/floor/plasteel/white,
/area/medical/medbay/zone2)
"aPZ" = (
@@ -20516,9 +20514,6 @@
/turf/open/floor/plating,
/area/maintenance/solars/starboard/aft)
"fUX" = (
/obj/machinery/sleeper{
dir = 4
},
/obj/structure/window/reinforced{
dir = 1
},
@@ -20528,6 +20523,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 9
},
/obj/machinery/sleeper{
dir = 4
},
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"fVm" = (
@@ -23736,9 +23734,6 @@
/turf/open/floor/plasteel/dark,
/area/security/office)
"hWn" = (
/obj/machinery/sleeper{
dir = 8
},
/obj/structure/window/reinforced{
dir = 1
},
@@ -23755,6 +23750,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 1
},
/obj/machinery/stasis,
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"hWp" = (
@@ -29421,9 +29417,6 @@
/turf/open/floor/plasteel/dark,
/area/ai_monitored/turret_protected/ai_upload_foyer)
"lOX" = (
/obj/machinery/sleeper{
dir = 8
},
/obj/structure/window/reinforced,
/obj/structure/mirror{
pixel_x = 25
@@ -29433,6 +29426,7 @@
},
/obj/effect/turf_decal/tile/blue,
/obj/effect/turf_decal/stripes/line,
/obj/machinery/stasis,
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"lPB" = (
@@ -43682,6 +43676,7 @@
/obj/structure/table,
/obj/item/toy/cards/deck,
/obj/item/storage/crayons,
/obj/item/chisel,
/turf/open/floor/plasteel/grimy,
/area/commons/fitness/recreation)
"uWC" = (
@@ -44164,9 +44159,7 @@
/obj/effect/turf_decal/tile/blue{
dir = 4
},
/obj/machinery/sleeper{
dir = 8
},
/obj/machinery/stasis,
/turf/open/floor/plasteel/white,
/area/medical/medbay/zone3)
"vkk" = (
@@ -46270,9 +46263,6 @@
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"wut" = (
/obj/machinery/sleeper{
dir = 4
},
/obj/structure/window/reinforced,
/obj/structure/window/reinforced{
dir = 8
@@ -46281,6 +46271,9 @@
/obj/effect/turf_decal/stripes/line{
dir = 10
},
/obj/machinery/sleeper{
dir = 4
},
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"wuC" = (
_maps/map_files/SpookyStation/SpookyStation.dmm
+1 -1
View File
@@ -4981,7 +4981,7 @@
/turf/open/floor/wood,
/area/eventmap/inside)
"aoJ" = (
/obj/mecha/working/ripley/deathripley{
/obj/vehicle/sealed/mecha/working/ripley/deathripley{
equipment_disabled = 1;
light_color = "#FAA019";
lights_power = 3
_maps/map_files/generic/CentCom.dmm
+16 -14
View File
@@ -1121,7 +1121,7 @@
dir = 8
},
/obj/machinery/sleeper{
dir = 1
dir = 4
},
/turf/open/floor/holofloor{
icon_state = "white"
@@ -1134,9 +1134,7 @@
},
/area/holodeck/rec_center/medical)
"dd" = (
/obj/machinery/sleeper{
dir = 1
},
/obj/machinery/stasis,
/turf/open/floor/holofloor{
icon_state = "white"
},
@@ -11920,12 +11918,12 @@
/turf/open/floor/plasteel/white,
/area/centcom/control)
"BH" = (
/obj/machinery/sleeper{
dir = 4
},
/obj/effect/turf_decal/stripes/line{
dir = 9
},
/obj/machinery/sleeper{
dir = 4
},
/turf/open/floor/plasteel,
/area/centcom/control)
"BI" = (
@@ -11940,12 +11938,10 @@
/turf/open/floor/plasteel,
/area/centcom/control)
"BJ" = (
/obj/machinery/sleeper{
dir = 8
},
/obj/effect/turf_decal/stripes/line{
dir = 5
},
/obj/machinery/stasis,
/turf/open/floor/plasteel,
/area/centcom/control)
"BK" = (
@@ -16449,8 +16445,8 @@
/turf/open/floor/holofloor/wood,
/area/holodeck/rec_center/wrestlingarena)
"Lh" = (
/obj/machinery/sleeper{
dir = 8
/obj/machinery/stasis{
dir = 4
},
/turf/open/floor/mineral/titanium/blue,
/area/centcom/evac)
@@ -17335,6 +17331,12 @@
/obj/effect/turf_decal/delivery,
/turf/open/floor/plating,
/area/syndicate_mothership)
"Pa" = (
/obj/machinery/sleeper{
dir = 8
},
/turf/open/floor/mineral/titanium/blue,
/area/centcom/evac)
"Pg" = (
/obj/machinery/light{
dir = 1
@@ -46068,7 +46070,7 @@ KH
KY
Lb
KV
Lh
Pa
Lb
Li
Li
@@ -46325,7 +46327,7 @@ KO
KV
KV
KV
Lb
Lh
Lb
Lp
Lp
_maps/shuttles/aux_base_default.dmm
+2 -5
View File
@@ -52,11 +52,7 @@
/area/shuttle/auxillary_base)
"P" = (
/obj/docking_port/mobile/auxillary_base{
dheight = 4;
dir = 2;
dwidth = 4;
height = 9;
width = 9
dir = 2
},
/obj/machinery/bluespace_beacon,
/obj/machinery/computer/auxillary_base,
@@ -77,6 +73,7 @@
/area/shuttle/auxillary_base)
"X" = (
/obj/machinery/camera{
c_tag = "Auxiliary Base Platform";
dir = 1;
network = list("auxbase")
},
_maps/shuttles/aux_base_small.dmm
+2 -5
View File
@@ -35,6 +35,7 @@
/area/shuttle/auxillary_base)
"h" = (
/obj/machinery/camera{
c_tag = "Auxiliary Base Platform";
dir = 1;
network = list("auxbase")
},
@@ -49,11 +50,7 @@
/area/shuttle/auxillary_base)
"j" = (
/obj/docking_port/mobile/auxillary_base{
dheight = 4;
dir = 2;
dwidth = 4;
height = 9;
width = 9
dir = 2
},
/obj/machinery/bluespace_beacon,
/obj/machinery/computer/auxillary_base,
_maps/shuttles/emergency_discoinferno.dmm
+1 -1
View File
@@ -89,7 +89,7 @@
"q" = (
/obj/structure/statue/plasma/scientist{
anchored = 1;
oreAmount = 50
custom_materials = list(/datum/material/plasma = 100000)
},
/turf/open/floor/light/colour_cycle,
/area/shuttle/escape)
auxmos.dll
BIN
View File
Binary file not shown.
auxmos.pdb
BIN
View File
Binary file not shown.
code/__DEFINES/DNA.dm
+1
View File
@@ -179,6 +179,7 @@
#define ORGAN_SLOT_VAGINA "vagina"
#define ORGAN_SLOT_TESTICLES "testicles"
#define ORGAN_SLOT_BREASTS "breasts"
#define ORGAN_SLOT_BUTT "butt"
////organ defines
#define STANDARD_ORGAN_THRESHOLD 100
code/__DEFINES/_flags/_flags.dm
+5 -2
View File
@@ -106,15 +106,18 @@ GLOBAL_LIST_INIT(bitflags, list(
#define PASSBLOB (1<<3)
#define PASSMOB (1<<4)
#define PASSCLOSEDTURF (1<<5)
/// Let thrown things past us. **ONLY MEANINGFUL ON pass_flags_self!**
#define LETPASSTHROW (1<<6)
#define PASSMACHINE (1<<7)
#define PASSSTRUCTURE (1<<8)
//Movement Types
#define GROUND (1<<0)
#define FLYING (1<<1)
#define VENTCRAWLING (1<<2)
#define FLOATING (1<<3)
///When moving, will Bump()/Cross()/Uncross() everything, but won't be stopped.
#define UNSTOPPABLE (1<<4)
///When moving, will Bump()/Cross()/Uncross() everything, but won't stop or Bump() anything.
#define PHASING (1<<4)
///Applied if you're crawling around on the ground/resting.
#define CRAWLING (1<<5)
code/__DEFINES/atmospherics.dm
+2
View File
@@ -275,6 +275,7 @@
#define GAS_PLASMA "plasma"
#define GAS_H2O "water_vapor"
#define GAS_HYPERNOB "nob"
#define GAS_NITRIC "no"
#define GAS_NITROUS "n2o"
#define GAS_NITRYL "no2"
#define GAS_HYDROGEN "hydrogen"
@@ -289,6 +290,7 @@
#define GAS_AMMONIA "ammonia"
#define GAS_FLUORINE "fluorine"
#define GAS_ETHANOL "ethanol"
#define GAS_QCD "qcd"
#define GAS_GROUP_CHEMICALS "Chemicals"
code/__DEFINES/citadel_defines.dm
+11 -5
View File
@@ -6,12 +6,13 @@
#define CIT_FILTER_STAMINACRIT filter(type="drop_shadow", x=0, y=0, size=-3, color="#04080F")
//organ defines
#define VAGINA_LAYER_INDEX 1
#define TESTICLES_LAYER_INDEX 2
#define GENITAL_LAYER_INDEX 3
#define PENIS_LAYER_INDEX 4
#define BUTT_LAYER_INDEX 1
#define VAGINA_LAYER_INDEX 2
#define TESTICLES_LAYER_INDEX 3
#define GENITAL_LAYER_INDEX 4
#define PENIS_LAYER_INDEX 5
#define GENITAL_LAYER_INDEX_LENGTH 4 //keep it updated with each new index added, thanks.
#define GENITAL_LAYER_INDEX_LENGTH 5 //keep it updated with each new index added, thanks.
//genital flags
#define GENITAL_BLACKLISTED (1<<0) //for genitals that shouldn't be added to GLOB.genitals_list.
@@ -62,6 +63,9 @@
#define MILK_RATE_MULT 1
#define MILK_EFFICIENCY 1
#define BUTT_SIZE_DEF 1
#define BUTT_SIZE_MAX 5 //butt genitals are special in that they have caps. if there's the event there's even bigger butt sprites, raise this number.
//visibility toggles defines to avoid errors typos code errors.
#define GEN_VISIBLE_ALWAYS "Always visible"
#define GEN_VISIBLE_NO_CLOTHES "Hidden by clothes"
@@ -102,6 +106,8 @@
#define GENITAL_EXAMINE (1<<13)
#define VORE_EXAMINE (1<<14)
#define TRASH_FORCEFEED (1<<15)
#define BUTT_ENLARGEMENT (1<<16)
//Note: reminder, if you're a coder adding more bitflags here in the event we add more horny things, the maximum is (1<<23).
#define TOGGLES_CITADEL 0
//belly sound pref things
code/__DEFINES/cooldowns.dm
+9
View File
@@ -31,12 +31,21 @@
#define COOLDOWN_OBJECTIVES "objectives"
#define COOLDOWN_OBJ_ADMIN_PING "obj_admin_ping"
//Mecha cooldowns
#define COOLDOWN_MECHA_MESSAGE "mecha_message"
#define COOLDOWN_MECHA_EQUIPMENT "mecha_equipment"
#define COOLDOWN_MECHA_ARMOR "mecha_armor"
#define COOLDOWN_MECHA_MELEE_ATTACK "mecha_melee"
#define COOLDOWN_MECHA_SMOKE "mecha_smoke"
//car cooldowns
#define COOLDOWN_CAR_HONK "car_honk"
//clown car cooldowns
#define COOLDOWN_CLOWNCAR_RANDOMNESS "clown_car_randomness"
//TIMER COOLDOWN MACROS
#define COMSIG_CD_STOP(cd_index) "cooldown_[cd_index]"
code/__DEFINES/dcs/signals.dm
+13
View File
@@ -415,6 +415,7 @@
#define COMSIG_LIVING_LIFE "life_tick" //from base of mob/living/Life() (seconds, times_fired)
#define COMPONENT_INTERRUPT_LIFE_BIOLOGICAL 1 // interrupt biological processes
#define COMPONENT_INTERRUPT_LIFE_PHYSICAL 2 // interrupt physical handling
#define COMPONET_INTERRUPT_STATUS_EFFECTS 3 // interrupt status effects
#define COMSIG_LIVING_BIOLOGICAL_LIFE "biological_life" //from base of mob/living/BiologicalLife() (seconds, times_fired)
@@ -556,7 +557,19 @@
#define COMSIG_PROJECTILE_PREHIT "com_proj_prehit" ///sent to targets during the process_hit proc of projectiles
#define COMSIG_PELLET_CLOUD_INIT "pellet_cloud_init" // sent to targets during the process_hit proc of projectiles
// /obj/vehicle/sealed/mecha signals
// /sent from mecha action buttons to the mecha they're linked to
#define COMSIG_MECHA_ACTION_TRIGGER "mecha_action_activate"
///sent from clicking while you have no equipment selected. Sent before cooldown and adjacency checks, so you can use this for infinite range things if you want.
#define COMSIG_MECHA_MELEE_CLICK "mecha_action_melee_click"
/// Prevents click from happening.
#define COMPONENT_CANCEL_MELEE_CLICK (1<<0)
///sent from clicking while you have equipment selected.
#define COMSIG_MECHA_EQUIPMENT_CLICK "mecha_action_equipment_click"
/// Prevents click from happening.
#define COMPONENT_CANCEL_EQUIPMENT_CLICK (1<<0)
// /mob/living/carbon/human signals
#define COMSIG_HUMAN_MELEE_UNARMED_ATTACK "human_melee_unarmed_attack" //from mob/living/carbon/human/UnarmedAttack(): (atom/target)
#define COMSIG_HUMAN_MELEE_UNARMED_ATTACKBY "human_melee_unarmed_attackby" //from mob/living/carbon/human/UnarmedAttack(): (mob/living/carbon/human/attacker)
code/__DEFINES/is_helpers.dm
+1 -1
View File
@@ -207,7 +207,7 @@ GLOBAL_LIST_INIT(turfs_without_ground, typecacheof(list(
#define ismachinery(A) (istype(A, /obj/machinery))
#define ismecha(A) (istype(A, /obj/mecha))
#define ismecha(A) (istype(A, /obj/vehicle/sealed/mecha))
#define is_cleanable(A) (istype(A, /obj/effect/decal/cleanable) || istype(A, /obj/effect/rune)) //if something is cleanable
code/__DEFINES/logging.dm
+1
View File
@@ -39,6 +39,7 @@
#define LOG_ADMIN_PRIVATE (1 << 14)
#define LOG_ASAY (1 << 15)
#define LOG_VIRUS (1 << 16)
#define LOG_MECHA (1 << 17)
#define LOG_SHUTTLE (1 << 18)
#define LOG_VICTIM (1 << 19)
code/__DEFINES/mecha.dm
+31
View File
@@ -0,0 +1,31 @@
#define MECHA_INT_FIRE (1<<0)
#define MECHA_INT_TEMP_CONTROL (1<<1)
#define MECHA_INT_SHORT_CIRCUIT (1<<2)
#define MECHA_INT_TANK_BREACH (1<<3)
#define MECHA_INT_CONTROL_LOST (1<<4)
#define ADDING_ACCESS_POSSIBLE (1<<0)
#define ADDING_MAINT_ACCESS_POSSIBLE (1<<1)
#define CANSTRAFE (1<<2)
#define LIGHTS_ON (1<<3)
#define SILICON_PILOT (1<<4)
#define IS_ENCLOSED (1<<5)
#define HAS_LIGHTS (1<<6)
#define QUIET_STEPS (1<<7)
#define QUIET_TURNS (1<<8)
///blocks using equipment and melee attacking.
#define CANNOT_INTERACT (1<<9)
/// posibrains can drive this mecha
#define MMI_COMPATIBLE (1<<10)
#define MECHA_MELEE (1 << 0)
#define MECHA_RANGED (1 << 1)
#define MECHA_FRONT_ARMOUR 1
#define MECHA_SIDE_ARMOUR 2
#define MECHA_BACK_ARMOUR 3
#define MECHA_LOCKED 0
#define MECHA_SECURE_BOLTS 1
#define MECHA_LOOSE_BOLTS 2
#define MECHA_OPEN_HATCH 3
code/__DEFINES/mobs.dm
+23
View File
@@ -344,9 +344,32 @@
///Define for spawning megafauna instead of a mob for cave gen
#define SPAWN_MEGAFAUNA "bluh bluh huge boss"
/*
* Defines for "AI emotions", allowing the AI to expression emotions
* with status displays via emotes.
*/
#define AI_EMOTION_VERY_HAPPY "Very Happy"
#define AI_EMOTION_HAPPY "Happy"
#define AI_EMOTION_NEUTRAL "Neutral"
#define AI_EMOTION_UNSURE "Unsure"
#define AI_EMOTION_CONFUSED "Confused"
#define AI_EMOTION_SAD "Sad"
#define AI_EMOTION_BSOD "BSOD"
#define AI_EMOTION_BLANK "Blank"
#define AI_EMOTION_PROBLEMS "Problems?"
#define AI_EMOTION_AWESOME "Awesome"
#define AI_EMOTION_FACEPALM "Facepalm"
#define AI_EMOTION_THINKING "Thinking"
#define AI_EMOTION_FRIEND_COMPUTER "Friend Computer"
#define AI_EMOTION_DORFY "Dorfy"
#define AI_EMOTION_BLUE_GLOW "Blue Glow"
#define AI_EMOTION_RED_GLOW "Red Glow"
// / Breathing types. Lungs can access either by these or by a string, which will be considered a gas ID.
#define BREATH_OXY /datum/breathing_class/oxygen
#define BREATH_PLASMA /datum/breathing_class/plasma
#define BREATH_METHANE /datum/breathing_class/methane
//Gremlins
#define NPC_TAMPER_ACT_FORGET 1 //Don't try to tamper with this again
code/__DEFINES/preferences.dm
+6
View File
@@ -16,6 +16,12 @@
#define DISABLE_ARRIVALRATTLE (1<<13)
#define COMBOHUD_LIGHTING (1<<14)
#define DEADMIN_ALWAYS (1<<0)
#define DEADMIN_ANTAGONIST (1<<1)
#define DEADMIN_POSITION_HEAD (1<<2)
#define DEADMIN_POSITION_SECURITY (1<<3)
#define DEADMIN_POSITION_SILICON (1<<4)
#define TOGGLES_DEFAULT (SOUND_ADMINHELP|SOUND_MIDI|SOUND_AMBIENCE|SOUND_LOBBY|MEMBER_PUBLIC|INTENT_STYLE|MIDROUND_ANTAG|SOUND_INSTRUMENTS|SOUND_SHIP_AMBIENCE|SOUND_PRAYERS|SOUND_ANNOUNCEMENTS)
//Chat toggles
code/__DEFINES/projectiles.dm
+11
View File
@@ -1,3 +1,14 @@
// check_pierce() return values
/// Default behavior: hit and delete self
#define PROJECTILE_PIERCE_NONE 0
/// Hit the thing but go through without deleting. Causes on_hit to be called with pierced = TRUE
#define PROJECTILE_PIERCE_HIT 1
/// Entirely phase through the thing without ever hitting.
#define PROJECTILE_PIERCE_PHASE 2
// Delete self without hitting
#define PROJECTILE_DELETE_WITHOUT_HITTING 3
/// This atom should be ricocheted off of from its inherent properties using standard % chance handling.
#define PROJECTILE_RICOCHET_YES 1
/// This atom should not be ricocheted off of from its inherent properties.
code/__DEFINES/reactions.dm
+2
View File
@@ -42,3 +42,5 @@
#define FUSION_RAD_MAX 2000
#define FUSION_RAD_COEFFICIENT (-1000)
#define FUSION_INSTABILITY_ENDOTHERMALITY 2
// Snowflake fire product types
#define FIRE_PRODUCT_PLASMA 0
code/__DEFINES/research.dm
+2 -1
View File
@@ -74,5 +74,6 @@
)
#define BOMB_TARGET_POINTS 50000 //Adjust as needed. Actual hard cap is double this, but will never be reached due to hyperbolic curve.
#define BOMB_TARGET_SIZE 175 // The shockwave radius required for a bomb to get TECHWEB_BOMB_MIDPOINT points.
#define BOMB_TARGET_SIZE (world.system_type == MS_WINDOWS ? 240 : 50000) // The shockwave radius required for a bomb to get TECHWEB_BOMB_MIDPOINT points.
// Linux still has old trit fires, so
#define BOMB_SUB_TARGET_EXPONENT 3 // The power of the points curve below the target size. Higher = less points for worse bombs, below target.
code/__DEFINES/status_effects.dm
+5
View File
@@ -152,4 +152,9 @@
// GROUPED //
/////////////
#define STASIS_MACHINE_EFFECT "stasis_machine"
#define STASIS_ASCENSION_EFFECT "heretic_ascension"
/// If the incapacitated status effect will ignore a mob in stasis (stasis beds)
#define IGNORE_STASIS (1<<1)
code/__DEFINES/traits.dm
+7
View File
@@ -70,6 +70,10 @@
#define HAS_TRAIT_NOT_FROM(target, trait, source) (target.status_traits ? (target.status_traits[trait] ? (length(target.status_traits[trait] - source) > 0) : FALSE) : FALSE)
//mob traits
/// Prevents voluntary movement.
#define TRAIT_IMMOBILIZED "immobilized"
/// Prevents usage of manipulation appendages (picking, holding or using items, manipulating storage).
#define TRAIT_HANDS_BLOCKED "handsblocked"
#define TRAIT_BLIND "blind"
#define TRAIT_MUTE "mute"
#define TRAIT_EMOTEMUTE "emotemute"
@@ -175,6 +179,8 @@
#define TRAIT_DWARF "dwarf"
#define TRAIT_ALCOHOL_TOLERANCE "alcohol_tolerance"
#define TRAIT_AGEUSIA "ageusia"
#define TRAIT_ANOSMIA "anosmia"
#define TRAIT_GOODSMELL "super_smeller"
#define TRAIT_HEAVY_SLEEPER "heavy_sleeper"
#define TRAIT_NIGHT_VISION "night_vision"
#define TRAIT_LIGHT_STEP "light_step"
@@ -349,6 +355,7 @@
#define STICKY_NODROP "sticky-nodrop" //sticky nodrop sounds like a bad soundcloud rapper's name
#define TRAIT_SACRIFICED "sacrificed" //Makes sure that people cant be cult sacrificed twice.
#define TRAIT_SPACEWALK "spacewalk"
#define TRAIT_SALT_SENSITIVE "salt_sensitive"
/// obtained from mapping helper
code/__DEFINES/vehicles.dm
+5
View File
@@ -11,6 +11,11 @@
///changing around settings and the like.
#define VEHICLE_CONTROL_SETTINGS (1<<4)
///ez define for giving a single pilot mech all the flags it needs.
#define FULL_MECHA_CONTROL ALL
//car_traits flags
///Will this car kidnap people by ramming into them?
#define CAN_KIDNAP (1<<0)
code/__HELPERS/_cit_helpers.dm
+8
View File
@@ -56,6 +56,7 @@ GLOBAL_LIST_EMPTY(ipc_antennas_list)
GLOBAL_LIST_EMPTY(genitals_list)
GLOBAL_LIST_EMPTY(cock_shapes_list)
GLOBAL_LIST_EMPTY(balls_shapes_list)
GLOBAL_LIST_EMPTY(butt_shapes_list)
GLOBAL_LIST_EMPTY(breasts_shapes_list)
GLOBAL_LIST_EMPTY(vagina_shapes_list)
//longcat memes.
@@ -124,6 +125,11 @@ GLOBAL_VAR_INIT(miscreants_allowed, FALSE)
return TRUE
return FALSE
/mob/living/carbon/proc/has_butt()
if(getorganslot(ORGAN_SLOT_BUTT))
return TRUE
return FALSE
/mob/living/carbon/proc/is_groin_exposed(list/L)
if(!L)
L = get_equipped_items()
@@ -157,7 +163,9 @@ GLOBAL_VAR_INIT(miscreants_allowed, FALSE)
if(H.gender == MALE)
H.give_genital(/obj/item/organ/genital/penis)
H.give_genital(/obj/item/organ/genital/testicles)
H.give_genital(/obj/item/organ/genital/butt)
else
H.give_genital(/obj/item/organ/genital/vagina)
H.give_genital(/obj/item/organ/genital/womb)
H.give_genital(/obj/item/organ/genital/breasts)
H.give_genital(/obj/item/organ/genital/butt)
code/__HELPERS/_logging.dm
+4
View File
@@ -77,6 +77,10 @@
if (CONFIG_GET(flag/log_game))
WRITE_LOG(GLOB.world_game_log, "GAME: [text]")
/proc/log_mecha(text)
if (CONFIG_GET(flag/log_mecha))
WRITE_LOG(GLOB.world_mecha_log, "MECHA: [text]")
/proc/log_virus(text)
if (CONFIG_GET(flag/log_virus))
WRITE_LOG(GLOB.world_virus_log, "VIRUS: [text]")
code/__HELPERS/do_after.dm
+12 -7
View File
@@ -121,7 +121,7 @@
break
// CLEANUP
qdel(progbar)
progbar.end_progress()
// If we failed, just return.
if(!.)
return FALSE
@@ -206,8 +206,9 @@
if((!drifting && user.loc != user_loc) || target.loc != target_loc || (!ignorehelditem && user.get_active_held_item() != holding) || user.incapacitated() || user.lying || (extra_checks && !extra_checks.Invoke()))
. = 0
break
if(progress)
qdel(progbar)
if(!QDELETED(progbar))
progbar.end_progress()
if(!QDELETED(target))
LAZYREMOVE(user.do_afters, target)
@@ -296,8 +297,10 @@
if(user.get_active_held_item() != holding)
. = 0
break
if(progress)
qdel(progbar)
if(!QDELETED(progbar))
progbar.end_progress()
if(!QDELETED(target))
LAZYREMOVE(user.do_afters, target)
@@ -351,8 +354,10 @@
if((!drifting && user_loc != user.loc) || QDELETED(target) || originalloc[target] != target.loc || user.get_active_held_item() != holding || user.incapacitated() || user.lying || (extra_checks && !extra_checks.Invoke()))
. = 0
break mainloop
if(progbar)
qdel(progbar)
if(!QDELETED(progbar))
progbar.end_progress()
for(var/thing in targets)
var/atom/target = thing
if(!QDELETED(target))
code/__HELPERS/global_lists.dm
+1
View File
@@ -55,6 +55,7 @@
init_sprite_accessory_subtypes(/datum/sprite_accessory/penis, GLOB.cock_shapes_list)
init_sprite_accessory_subtypes(/datum/sprite_accessory/vagina, GLOB.vagina_shapes_list)
init_sprite_accessory_subtypes(/datum/sprite_accessory/breasts, GLOB.breasts_shapes_list)
init_sprite_accessory_subtypes(/datum/sprite_accessory/butt, GLOB.butt_shapes_list)
init_sprite_accessory_subtypes(/datum/sprite_accessory/testicles, GLOB.balls_shapes_list)
for(var/gpath in subtypesof(/obj/item/organ/genital))
code/__HELPERS/mobs.dm
+10
View File
@@ -90,6 +90,8 @@
init_sprite_accessory_subtypes(/datum/sprite_accessory/vagina, GLOB.vagina_shapes_list)
if(!GLOB.breasts_shapes_list.len)
init_sprite_accessory_subtypes(/datum/sprite_accessory/breasts, GLOB.breasts_shapes_list)
if(!GLOB.butt_shapes_list.len)
init_sprite_accessory_subtypes(/datum/sprite_accessory/butt, GLOB.butt_shapes_list)
if(!GLOB.ipc_screens_list.len)
init_sprite_accessory_subtypes(/datum/sprite_accessory/screen, GLOB.ipc_screens_list)
if(!GLOB.ipc_antennas_list.len)
@@ -206,10 +208,16 @@
"vag_shape" = pick(GLOB.vagina_shapes_list),
"vag_color" = pick("FFFFFF","7F7F7F", "7FFF7F", "7F7FFF", "FF7F7F", "7FFFFF", "FF7FFF", "FFFF7F"),
"has_womb" = FALSE,
"has_butt" = FALSE,
"butt_size" = BUTT_SIZE_DEF,
"butt_color" = pick("FFFFFF","7F7F7F", "7FFF7F", "7F7FFF", "FF7F7F", "7FFFFF", "FF7FFF", "FFFF7F"),
"balls_visibility" = GEN_VISIBLE_NO_UNDIES,
"breasts_visibility"= GEN_VISIBLE_NO_UNDIES,
"cock_visibility" = GEN_VISIBLE_NO_UNDIES,
"vag_visibility" = GEN_VISIBLE_NO_UNDIES,
"butt_visibility" = GEN_VISIBLE_NO_UNDIES,
"ipc_screen" = snowflake_ipc_antenna_list ? pick(snowflake_ipc_antenna_list) : "None",
"ipc_antenna" = "None",
"flavor_text" = "",
@@ -476,3 +484,5 @@ GLOBAL_LIST_EMPTY(species_datums)
//check if the person is dead, not sure where to put this
#define IS_DEAD_OR_INCAP(source) (source.incapacitated() || source.stat)
#define IS_IN_STASIS(mob) (mob.has_status_effect(/datum/status_effect/grouped/stasis))
code/__HELPERS/path.dm
+23 -1
View File
@@ -44,7 +44,7 @@
* Note that this can only be used inside the [datum/pathfind][pathfind datum] since it uses variables from said datum.
* If you really want to optimize things, optimize this, cuz this gets called a lot.
*/
#define CAN_STEP(cur_turf, next) (next && !next.density && cur_turf.Adjacent(next) && !(simulated_only && SSpathfinder.space_type_cache[next.type]) && !cur_turf.LinkBlockedWithAccess(next,caller, id) && (next != avoid))
#define CAN_STEP(cur_turf, next) (next && !next.density && !(simulated_only && SSpathfinder.space_type_cache[next.type]) && !cur_turf.LinkBlockedWithAccess(next,caller, id) && (next != avoid))
/// Another helper macro for JPS, for telling when a node has forced neighbors that need expanding
#define STEP_NOT_HERE_BUT_THERE(cur_turf, dirA, dirB) ((!CAN_STEP(cur_turf, get_step(cur_turf, dirA)) && CAN_STEP(cur_turf, get_step(cur_turf, dirB))))
@@ -338,8 +338,21 @@
* * simulated_only: Do we only worry about turfs with simulated atmos, most notably things that aren't space?
*/
/turf/proc/LinkBlockedWithAccess(turf/destination_turf, caller, ID)
if(destination_turf.x != x && destination_turf.y != y) //diagonal
var/in_dir = get_dir(destination_turf,src) // eg. northwest (1+8) = 9 (00001001)
var/first_step_direction_a = in_dir & 3 // eg. north (1+8)&3 (0000 0011) = 1 (0000 0001)
var/first_step_direction_b = in_dir & 12 // eg. west (1+8)&12 (0000 1100) = 8 (0000 1000)
for(var/first_step_direction in list(first_step_direction_a,first_step_direction_b))
var/turf/midstep_turf = get_step(destination_turf,first_step_direction)
var/way_blocked = midstep_turf.density || LinkBlockedWithAccess(midstep_turf,caller,ID) || midstep_turf.LinkBlockedWithAccess(destination_turf,caller,ID)
if(!way_blocked)
return FALSE
return TRUE
var/actual_dir = get_dir(src, destination_turf)
// Source border object checks
for(var/obj/structure/window/iter_window in src)
if(!iter_window.CanAStarPass(ID, actual_dir))
return TRUE
@@ -348,6 +361,15 @@
if(!iter_windoor.CanAStarPass(ID, actual_dir))
return TRUE
for(var/obj/structure/railing/iter_rail in src)
if(!iter_rail.CanAStarPass(ID, actual_dir))
return TRUE
for(var/obj/machinery/door/firedoor/border_only/firedoor in src)
if(!firedoor.CanAStarPass(ID, actual_dir))
return TRUE
// Destination blockers check
var/reverse_dir = get_dir(destination_turf, src)
for(var/obj/iter_object in destination_turf)
if(!iter_object.CanAStarPass(ID, reverse_dir, caller))
code/__HELPERS/time.dm
+3 -5
View File
@@ -75,10 +75,8 @@ GLOBAL_VAR_INIT(rollovercheck_last_timeofday, 0)
/proc/daysSince(realtimev)
return round((world.realtime - realtimev) / (24 HOURS))
/proc/worldtime2text()
return gameTimestamp("hh:mm:ss", world.time)
/proc/worldtime2text(wtime = world.timeofday)
return gameTimestamp("hh:mm:ss", wtime)
/proc/gameTimestamp(format = "hh:mm:ss", wtime=null)
if(!wtime)
wtime = world.time
/proc/gameTimestamp(format = "hh:mm:ss", wtime=world.time)
return time2text(wtime - GLOB.timezoneOffset, format)
code/__HELPERS/unsorted.dm
+1 -1
View File
@@ -1235,7 +1235,7 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new)
move_resist = INFINITY
var/ready_to_die = FALSE
/mob/dview/Initialize() //Properly prevents this mob from gaining huds or joining any global lists
/mob/dview/Initialize(mapload) //Properly prevents this mob from gaining huds or joining any global lists
SHOULD_CALL_PARENT(FALSE)
if(flags_1 & INITIALIZED_1)
stack_trace("Warning: [src]([type]) initialized multiple times!")
code/_globalvars/bitfields.dm
+1 -1
View File
@@ -130,7 +130,7 @@ GLOBAL_LIST_INIT(bitfields, list(
"FLYING" = FLYING,
"VENTCRAWLING" = VENTCRAWLING,
"FLOATING" = FLOATING,
"UNSTOPPABLE" = UNSTOPPABLE
"PHASING" = PHASING
),
"resistance_flags" = list(
"LAVA_PROOF" = LAVA_PROOF,
code/_globalvars/lists/flavor_misc.dm
+2
View File
@@ -292,6 +292,8 @@ GLOBAL_LIST_INIT(station_names, world.file2list("strings/station_names.txt" + ""
GLOBAL_LIST_INIT(station_suffixes, world.file2list("strings/station_suffixes.txt"))
GLOBAL_LIST_INIT(server_taglines, world.file2list("[global.config.directory]/server_taglines.txt"))
GLOBAL_LIST_INIT(greek_letters, world.file2list("strings/greek_letters.txt"))
GLOBAL_LIST_INIT(phonetic_alphabet, world.file2list("strings/phonetic_alphabet.txt"))
code/_globalvars/logging.dm
+2 -2
View File
@@ -33,8 +33,8 @@ GLOBAL_VAR(query_debug_log)
GLOBAL_PROTECT(query_debug_log)
GLOBAL_VAR(world_job_debug_log)
GLOBAL_PROTECT(world_job_debug_log)
// GLOBAL_VAR(world_mecha_log)
// GLOBAL_PROTECT(world_mecha_log)
GLOBAL_VAR(world_mecha_log)
GLOBAL_PROTECT(world_mecha_log)
GLOBAL_VAR(world_virus_log)
GLOBAL_PROTECT(world_virus_log)
GLOBAL_VAR(world_asset_log)
code/_globalvars/traits.dm
+2 -1
View File
@@ -126,7 +126,8 @@ GLOBAL_LIST_INIT(traits_by_type, list(
"TRAIT_EMPATH" = TRAIT_EMPATH,
"TRAIT_FRIENDLY" = TRAIT_FRIENDLY,
"TRAIT_IWASBATONED" = TRAIT_IWASBATONED,
"TRAIT_SPACEWALK" = TRAIT_SPACEWALK
"TRAIT_SPACEWALK" = TRAIT_SPACEWALK,
"TRAIT_SALT_SENSITIVE" = TRAIT_SALT_SENSITIVE
),
/obj/item/bodypart = list(
"TRAIT_PARALYSIS" = TRAIT_PARALYSIS
code/_onclick/adjacent.dm
+1 -1
View File
@@ -94,7 +94,7 @@
for(var/obj/O in src)
if((mover && O.CanPass(mover,get_step(src,target_dir))) || (!mover && !O.density))
continue
if(O == target_atom || O == mover || (O.pass_flags & LETPASSTHROW)) //check if there's a dense object present on the turf
if(O == target_atom || O == mover || (O.pass_flags_self & LETPASSTHROW)) //check if there's a dense object present on the turf
continue // LETPASSTHROW is used for anything you can click through (or the firedoor special case, see above)
if( O.flags_1&ON_BORDER_1) // windows are on border, check them first
code/_onclick/ai.dm
-5
View File
@@ -55,11 +55,6 @@
if(modifiers["shift"] && modifiers["ctrl"])
CtrlShiftClickOn(A)
return
if(modifiers["middle"])
if(controlled_mech) //Are we piloting a mech? Placed here so the modifiers are not overridden.
controlled_mech.click_action(A, src, params) //Override AI normal click behavior.
return
if(modifiers["shift"])
ShiftClickOn(A)
return
code/_onclick/click.dm
-5
View File
@@ -82,11 +82,6 @@
if(!modifiers["catcher"] && A.IsObscured())
return
if(ismecha(loc))
var/obj/mecha/M = loc
M.click_action(A,src,params)
return TRUE
if(restrained())
DelayNextAction(CLICK_CD_HANDCUFFED)
return RestrainedClickOn(A)
code/_onclick/hud/action_button.dm
+1 -1
View File
@@ -72,7 +72,7 @@
var/mutable_appearance/hide_appearance
var/mutable_appearance/show_appearance
/atom/movable/screen/movable/action_button/hide_toggle/Initialize()
/atom/movable/screen/movable/action_button/hide_toggle/Initialize(mapload)
. = ..()
var/static/list/icon_cache = list()
code/_onclick/hud/alert.dm
+3 -3
View File
@@ -349,7 +349,7 @@ or shoot a gun to move around via Newton's 3rd Law of Motion."
/// Simply checks if the other person is still in range
/atom/movable/screen/alert/give/proc/check_in_range(atom/taker)
SIGNAL_HANDLER
if(!offerer.CanReach(taker))
to_chat(owner, span_warning("You moved out of range of [offerer]!"))
owner.clear_alert("[offerer]")
@@ -455,7 +455,7 @@ or shoot a gun to move around via Newton's 3rd Law of Motion."
var/angle = 0
var/mob/living/simple_animal/hostile/construct/Cviewer = null
/atom/movable/screen/alert/bloodsense/Initialize()
/atom/movable/screen/alert/bloodsense/Initialize(mapload)
. = ..()
narnar = new('icons/mob/screen_alert.dmi', "mini_nar")
START_PROCESSING(SSprocessing, src)
@@ -820,7 +820,7 @@ so as to remain in compliance with the most up-to-date laws."
return FALSE
if(master && click_master)
return usr.client.Click(master, location, control, params)
return TRUE
/atom/movable/screen/alert/Destroy()
code/_onclick/hud/families.dm
+1 -1
View File
@@ -12,7 +12,7 @@
/atom/movable/screen/wanted/New()
return ..()
/atom/movable/screen/wanted/Initialize()
/atom/movable/screen/wanted/Initialize(mapload)
. = ..()
update_icon()
code/_onclick/hud/picture_in_picture.dm
+1 -1
View File
@@ -14,7 +14,7 @@
var/mutable_appearance/standard_background
var/const/max_dimensions = 10
/atom/movable/screen/movable/pic_in_pic/Initialize()
/atom/movable/screen/movable/pic_in_pic/Initialize(mapload)
. = ..()
make_backgrounds()
code/_onclick/hud/plane_master.dm
+7 -7
View File
@@ -24,7 +24,7 @@
blend_mode = BLEND_MULTIPLY
alpha = 255
/atom/movable/screen/plane_master/openspace/Initialize()
/atom/movable/screen/plane_master/openspace/Initialize(mapload)
. = ..()
filters += filter(type="alpha", render_source=FIELD_OF_VISION_RENDER_TARGET, flags=MASK_INVERSE)
@@ -61,7 +61,7 @@
plane = ABOVE_WALL_PLANE
appearance_flags = PLANE_MASTER
/atom/movable/screen/plane_master/above_wall/Initialize()
/atom/movable/screen/plane_master/above_wall/Initialize(mapload)
. = ..()
add_filter("vision_cone", 100, list(type="alpha", render_source=FIELD_OF_VISION_RENDER_TARGET, flags=MASK_INVERSE))
@@ -78,7 +78,7 @@
appearance_flags = PLANE_MASTER //should use client color
blend_mode = BLEND_OVERLAY
/atom/movable/screen/plane_master/game_world/Initialize()
/atom/movable/screen/plane_master/game_world/Initialize(mapload)
. = ..()
add_filter("vision_cone", 100, list(type="alpha", render_source=FIELD_OF_VISION_RENDER_TARGET, flags=MASK_INVERSE))
@@ -95,7 +95,7 @@
render_target = FIELD_OF_VISION_RENDER_TARGET
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
/atom/movable/screen/plane_master/field_of_vision/Initialize()
/atom/movable/screen/plane_master/field_of_vision/Initialize(mapload)
. = ..()
filters += filter(type="alpha", render_source=FIELD_OF_VISION_BLOCKER_RENDER_TARGET, flags=MASK_INVERSE)
@@ -112,7 +112,7 @@
plane = FIELD_OF_VISION_VISUAL_PLANE
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
/atom/movable/screen/plane_master/field_of_vision_visual/Initialize()
/atom/movable/screen/plane_master/field_of_vision_visual/Initialize(mapload)
. = ..()
filters += filter(type="alpha", render_source=FIELD_OF_VISION_BLOCKER_RENDER_TARGET, flags=MASK_INVERSE)
@@ -138,7 +138,7 @@
* This is then used to alpha mask the lighting plane.
*/
/atom/movable/screen/plane_master/lighting/Initialize()
/atom/movable/screen/plane_master/lighting/Initialize(mapload)
. = ..()
add_filter("emissives", 1, alpha_mask_filter(render_source = EMISSIVE_RENDER_TARGET, flags = MASK_INVERSE))
add_filter("object_lighting", 2, alpha_mask_filter(render_source = O_LIGHTING_VISUAL_RENDER_TARGET, flags = MASK_INVERSE))
@@ -152,7 +152,7 @@
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
render_target = EMISSIVE_RENDER_TARGET
/atom/movable/screen/plane_master/emissive/Initialize()
/atom/movable/screen/plane_master/emissive/Initialize(mapload)
. = ..()
add_filter("em_block_masking", 1, color_matrix_filter(GLOB.em_mask_matrix))
code/_onclick/hud/radial.dm
+3
View File
@@ -194,6 +194,9 @@ GLOBAL_LIST_EMPTY(radial_menus)
else
if(istext(choices_values[choice_id]))
E.name = choices_values[choice_id]
else if(ispath(choices_values[choice_id],/atom))
var/atom/A = choices_values[choice_id]
E.name = initial(A.name)
else
var/atom/movable/AM = choices_values[choice_id] //Movables only
E.name = AM.name
code/_onclick/hud/screen_objects/clickdelay.dm
+1 -1
View File
@@ -25,7 +25,7 @@
icon_state = "prog_bar_100"
layer = 20 // under hand buttons
/atom/movable/screen/action_bar/clickdelay/Initialize()
/atom/movable/screen/action_bar/clickdelay/Initialize(mapload)
. = ..()
var/matrix/M = new
M.Scale(2, 1)
code/_onclick/right_click.dm
-4
View File
@@ -11,10 +11,6 @@
if(!modifiers["catcher"] && A.IsObscured())
return
if(ismecha(loc))
var/obj/mecha/M = loc
return M.click_action(A,src,params)
if(restrained())
DelayNextAction(CLICK_CD_HANDCUFFED)
return RestrainedClickOn(A)
code/_onclick/telekinesis.dm
+1 -1
View File
@@ -79,7 +79,7 @@
var/atom/movable/focus
var/mob/living/carbon/tk_user
/obj/item/tk_grab/Initialize()
/obj/item/tk_grab/Initialize(mapload)
. = ..()
START_PROCESSING(SSfastprocess, src)
code/_rendering/atom_huds/data_huds.dm
+4 -4
View File
@@ -381,14 +381,14 @@
/*~~~~~~~~~~~~~~~~~~~~
BIG STOMPY MECHS
~~~~~~~~~~~~~~~~~~~~~*/
/obj/mecha/proc/diag_hud_set_mechhealth()
/obj/vehicle/sealed/mecha/proc/diag_hud_set_mechhealth()
var/image/holder = hud_list[DIAG_MECH_HUD]
var/icon/I = icon(icon, icon_state, dir)
holder.pixel_y = I.Height() - world.icon_size
holder.icon_state = "huddiag[RoundDiagBar(obj_integrity/max_integrity)]"
/obj/mecha/proc/diag_hud_set_mechcell()
/obj/vehicle/sealed/mecha/proc/diag_hud_set_mechcell()
var/image/holder = hud_list[DIAG_BATT_HUD]
var/icon/I = icon(icon, icon_state, dir)
holder.pixel_y = I.Height() - world.icon_size
@@ -399,7 +399,7 @@
holder.icon_state = "hudnobatt"
/obj/mecha/proc/diag_hud_set_mechstat()
/obj/vehicle/sealed/mecha/proc/diag_hud_set_mechstat()
var/image/holder = hud_list[DIAG_STAT_HUD]
var/icon/I = icon(icon, icon_state, dir)
holder.pixel_y = I.Height() - world.icon_size
@@ -407,7 +407,7 @@
if(internal_damage)
holder.icon_state = "hudwarn"
/obj/mecha/proc/diag_hud_set_mechtracking() //Shows tracking beacons on the mech
/obj/vehicle/sealed/mecha/proc/diag_hud_set_mechtracking() //Shows tracking beacons on the mech
var/image/holder = hud_list[DIAG_TRACK_HUD]
var/icon/I = icon(icon, icon_state, dir)
holder.pixel_y = I.Height() - world.icon_size
code/controllers/configuration/entries/admin.dm
+15
View File
@@ -64,3 +64,18 @@
/datum/config_entry/flag/automute_on //enables automuting/spam prevention
/datum/config_entry/flag/debug_admin_hrefs
/datum/config_entry/flag/auto_deadmin_players
protection = CONFIG_ENTRY_LOCKED
/datum/config_entry/flag/auto_deadmin_antagonists
protection = CONFIG_ENTRY_LOCKED
/datum/config_entry/flag/auto_deadmin_heads
protection = CONFIG_ENTRY_LOCKED
/datum/config_entry/flag/auto_deadmin_silicons
protection = CONFIG_ENTRY_LOCKED
/datum/config_entry/flag/auto_deadmin_security
protection = CONFIG_ENTRY_LOCKED
code/controllers/configuration/entries/fetish_content.dm
+10
View File
@@ -11,6 +11,16 @@
config_entry_value = 20
min_val = 0
/datum/config_entry/number/butt_min_size_prefs
config_entry_value = 1
min_val = 0
max_val = BUTT_SIZE_MAX
/datum/config_entry/number/butt_max_size_prefs
config_entry_value = BUTT_SIZE_MAX
min_val = 0
max_val = BUTT_SIZE_MAX
/datum/config_entry/keyed_list/safe_visibility_toggles
key_mode = KEY_MODE_TEXT
value_mode = VALUE_MODE_FLAG
code/controllers/configuration/entries/logging.dm
+4
View File
@@ -31,6 +31,10 @@
/datum/config_entry/flag/log_game
config_entry_value = TRUE
/// log mech data
/datum/config_entry/flag/log_mecha
config_entry_value = TRUE
/// log virology data
/datum/config_entry/flag/log_virus
config_entry_value = TRUE
code/controllers/configuration/entries/server.dm
+6
View File
@@ -2,9 +2,15 @@
/datum/config_entry/string/servername // server name (the name of the game window)
/datum/config_entry/string/communityshortname // short name of the server's community
/datum/config_entry/string/communitylink // link to the server's website
/datum/config_entry/string/servertagline
config_entry_value = "We forgot to set the server's tagline in config.txt"
/datum/config_entry/flag/usetaglinestrings
/datum/config_entry/string/serversqlname // short form server name used for the DB
/datum/config_entry/string/stationname // station name (the name of the station in-game)
code/controllers/subsystem/atoms.dm
+2 -2
View File
@@ -67,7 +67,7 @@ SUBSYSTEM_DEF(atoms)
for (var/queued_deletion in queued_deletions)
qdel(queued_deletion)
testing("[queued_deletions.len] atoms were queued for deletion.")
queued_deletions.Cut()
@@ -152,7 +152,7 @@ SUBSYSTEM_DEF(atoms)
. += "Path : [path] \n"
var/fails = BadInitializeCalls[path]
if(fails & BAD_INIT_DIDNT_INIT)
. += "- Didn't call atom/Initialize()\n"
. += "- Didn't call atom/Initialize(mapload)\n"
if(fails & BAD_INIT_NO_HINT)
. += "- Didn't return an Initialize hint\n"
if(fails & BAD_INIT_QDEL_BEFORE)
code/controllers/subsystem/job.dm
+8 -8
View File
@@ -453,11 +453,11 @@ SUBSYSTEM_DEF(job)
SSpersistence.antag_rep_change[M.client.ckey] += job.GetAntagRep()
/* if(M.client.holder)
if(CONFIG_GET(flag/auto_deadmin_players) || (M.client.prefs?.toggles & DEADMIN_ALWAYS))
if(M.client.holder)
if(CONFIG_GET(flag/auto_deadmin_players) || (M.client.prefs?.deadmin & DEADMIN_ALWAYS))
M.client.holder.auto_deadmin()
else
handle_auto_deadmin_roles(M.client, rank) */
handle_auto_deadmin_roles(M.client, rank)
to_chat(M, "<b>You are the [rank].</b>")
if(job)
@@ -504,19 +504,19 @@ SUBSYSTEM_DEF(job)
binder.decks = N.client.prefs.tcg_decks
return H
/*
/datum/controller/subsystem/job/proc/handle_auto_deadmin_roles(client/C, rank)
if(!C?.holder)
return TRUE
var/datum/job/job = GetJob(rank)
if(!job)
return
if((job.auto_deadmin_role_flags & DEADMIN_POSITION_HEAD) && (CONFIG_GET(flag/auto_deadmin_heads) || (C.prefs?.toggles & DEADMIN_POSITION_HEAD)))
if((job.auto_deadmin_role_flags & DEADMIN_POSITION_HEAD) && (CONFIG_GET(flag/auto_deadmin_heads) || (C.prefs?.deadmin & DEADMIN_POSITION_HEAD)))
return C.holder.auto_deadmin()
else if((job.auto_deadmin_role_flags & DEADMIN_POSITION_SECURITY) && (CONFIG_GET(flag/auto_deadmin_security) || (C.prefs?.toggles & DEADMIN_POSITION_SECURITY)))
else if((job.auto_deadmin_role_flags & DEADMIN_POSITION_SECURITY) && (CONFIG_GET(flag/auto_deadmin_security) || (C.prefs?.deadmin & DEADMIN_POSITION_SECURITY)))
return C.holder.auto_deadmin()
else if((job.auto_deadmin_role_flags & DEADMIN_POSITION_SILICON) && (CONFIG_GET(flag/auto_deadmin_silicons) || (C.prefs?.deadmin & DEADMIN_POSITION_SILICON))) //in the event there's ever psuedo-silicon roles added, ie synths.
return C.holder.auto_deadmin()
else if((job.auto_deadmin_role_flags & DEADMIN_POSITION_SILICON) && (CONFIG_GET(flag/auto_deadmin_silicons) || (C.prefs?.toggles & DEADMIN_POSITION_SILICON))) //in the event there's ever psuedo-silicon roles added, ie synths.
return C.holder.auto_deadmin()*/
/datum/controller/subsystem/job/proc/setup_officer_positions()
var/datum/job/J = SSjob.GetJob("Security Officer")
code/controllers/subsystem/materials.dm
+1 -1
View File
@@ -25,7 +25,7 @@ SUBSYSTEM_DEF(materials)
)
///List of stackcrafting recipes for materials using rigid recipes
var/list/rigid_stack_recipes = list(
// new /datum/stack_recipe("Carving block", /obj/structure/carving_block, 5, one_per_turf = TRUE, on_floor = TRUE, applies_mats = TRUE),
new /datum/stack_recipe("Carving block", /obj/structure/carving_block, 5, one_per_turf = TRUE, on_floor = TRUE, applies_mats = TRUE),
)
///Ran on initialize, populated the materials and materials_by_category dictionaries with their appropiate vars (See these variables for more info)
code/controllers/subsystem/processing/quirks.dm
+1 -1
View File
@@ -48,7 +48,7 @@ PROCESSING_SUBSYSTEM_DEF(quirks)
cli.prefs.save_character()
if (!silent && LAZYLEN(cut))
to_chat(to_chat_target || user, "<span class='boldwarning'>Some quirks have been cut from your character because of these quirks conflicting with your job assignment: [english_list(cut)].</span>")
var/mob/living/carbon/human/H = user
if(istype(H) && H.dna?.species)
var/datum/species/S = H.dna.species
code/controllers/subsystem/statpanel.dm
+1 -1
View File
@@ -18,7 +18,7 @@ SUBSYSTEM_DEF(statpanels)
cached ? "Next Map: [cached.map_name]" : null,
"Round ID: [GLOB.round_id ? GLOB.round_id : "NULL"]",
"Server Time: [time2text(world.timeofday, "YYYY-MM-DD hh:mm:ss")]",
"Round Time: [round_time > MIDNIGHT_ROLLOVER ? "[round(round_time/MIDNIGHT_ROLLOVER)]:[worldtime2text()]" : worldtime2text()]",
"Round Time: [GAMETIMESTAMP("hh:mm:ss", round_time)]",
"Station Time: [STATION_TIME_TIMESTAMP("hh:mm:ss", world.time)]",
"Time Dilation: [round(SStime_track.time_dilation_current,1)]% AVG:([round(SStime_track.time_dilation_avg_fast,1)]%, [round(SStime_track.time_dilation_avg,1)]%, [round(SStime_track.time_dilation_avg_slow,1)]%)"
)
code/controllers/subsystem/throwing.dm
+1 -1
View File
@@ -200,6 +200,6 @@ SUBSYSTEM_DEF(throwing)
var/atom/movable/AM = thing
if (AM == thrownthing || (AM == thrower && !ismob(thrownthing)))
continue
if (AM.density && !(AM.pass_flags & LETPASSTHROW) && !(AM.flags_1 & ON_BORDER_1))
if (AM.density && !(AM.pass_flags_self & LETPASSTHROW) && !(AM.flags_1 & ON_BORDER_1))
finalize(hit=TRUE, target=AM)
return TRUE
code/controllers/subsystem/traumas.dm
+3 -3
View File
@@ -107,7 +107,7 @@ SUBSYSTEM_DEF(traumas)
/obj/item/clothing/under/rank/medical/doctor/nurse, /obj/item/clothing/under/rank/medical/chief_medical_officer,
/obj/item/reagent_containers/syringe, /obj/item/reagent_containers/pill/, /obj/item/reagent_containers/hypospray,
/obj/item/storage/firstaid, /obj/item/storage/pill_bottle, /obj/item/healthanalyzer,
/obj/structure/sign/departments/medbay, /obj/machinery/door/airlock/medical, /obj/machinery/sleeper,
/obj/structure/sign/departments/medbay, /obj/machinery/door/airlock/medical, /obj/machinery/sleeper, /obj/machinery/stasis,
/obj/machinery/dna_scannernew, /obj/machinery/atmospherics/components/unary/cryo_cell, /obj/item/surgical_drapes,
/obj/item/retractor, /obj/item/hemostat, /obj/item/cautery, /obj/item/surgicaldrill, /obj/item/scalpel, /obj/item/circular_saw,
/obj/item/clothing/suit/bio_suit/plaguedoctorsuit, /obj/item/clothing/head/plaguedoctorhat, /obj/item/clothing/mask/gas/plaguedoctor)),
@@ -159,7 +159,7 @@ SUBSYSTEM_DEF(traumas)
/obj/item/storage/backpack/mime, /obj/item/reagent_containers/food/snacks/grown/banana/mime,
/obj/item/grown/bananapeel/mimanapeel, /obj/item/cartridge/virus/mime, /obj/item/clothing/shoes/sneakers/mime,
/obj/item/bedsheet/mime, /obj/item/reagent_containers/food/snacks/burger/mime, /obj/item/clothing/head/beret,
/obj/item/toy/figure/mime, /obj/item/toy/crayon/mime, /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/silenced, /obj/mecha/combat/reticence)),
/obj/item/toy/figure/mime, /obj/item/toy/crayon/mime, /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/silenced, /obj/vehicle/sealed/mecha/combat/reticence)),
"cats" = typecacheof(list(/obj/item/organ/ears/cat, /obj/item/organ/tail/cat, /obj/item/laser_pointer, /obj/item/toy/cattoy, /obj/item/clothing/head/kitty,
/obj/item/clothing/head/collectable/kitty, /obj/item/melee/chainofcommand/tailwhip/kitty, /obj/item/stack/sheet/animalhide/cat)),
@@ -169,7 +169,7 @@ SUBSYSTEM_DEF(traumas)
/obj/structure/fluff/empty_sleeper/syndicate, /obj/item/implant/radio/syndicate, /obj/item/clothing/head/helmet/space/syndicate, /obj/machinery/nuclearbomb/syndicate, /obj/item/grenade/syndieminibomb, /obj/item/storage/backpack/duffelbag/syndie, /obj/item/gun/ballistic/automatic/pistol, /obj/item/gun/ballistic/revolver,
/obj/item/gun/ballistic/automatic/shotgun/bulldog, /obj/item/gun/ballistic/automatic/c20r, /obj/item/gun/ballistic/automatic/m90, /obj/item/gun/ballistic/automatic/l6_saw, /obj/item/storage/belt/grenade/full, /obj/item/gun/ballistic/automatic/sniper_rifle/syndicate, /obj/item/gun/energy/kinetic_accelerator/crossbow,
/obj/item/melee/transforming/energy/sword/saber, /obj/item/dualsaber, /obj/item/melee/powerfist, /obj/item/storage/box/syndie_kit, /obj/item/grenade/spawnergrenade/manhacks, /obj/item/grenade/chem_grenade/bioterrorfoam, /obj/item/reagent_containers/spray/chemsprayer/bioterror, /obj/item/ammo_box/magazine/m10mm,
/obj/item/ammo_box/magazine/pistolm9mm, /obj/item/ammo_box/a357, /obj/item/ammo_box/magazine/m12g, /obj/item/ammo_box/magazine/mm195x129, /obj/item/antag_spawner/nuke_ops, /obj/mecha/combat/gygax/dark, /obj/mecha/combat/marauder/mauler, /obj/item/soap/syndie, /obj/item/gun/syringe/syndicate, /obj/item/cartridge/virus/syndicate,
/obj/item/ammo_box/magazine/pistolm9mm, /obj/item/ammo_box/a357, /obj/item/ammo_box/magazine/m12g, /obj/item/ammo_box/magazine/mm195x129, /obj/item/antag_spawner/nuke_ops, /obj/vehicle/sealed/mecha/combat/gygax/dark, /obj/vehicle/sealed/mecha/combat/marauder/mauler, /obj/item/soap/syndie, /obj/item/gun/syringe/syndicate, /obj/item/cartridge/virus/syndicate,
/obj/item/cartridge/virus/frame, /obj/item/chameleon, /obj/item/storage/box/syndie_kit/cutouts, /obj/item/clothing/suit/space/hardsuit/syndi, /obj/item/card/emag, /obj/item/storage/toolbox/syndicate, /obj/item/storage/book/bible/syndicate, /obj/item/encryptionkey/binary, /obj/item/encryptionkey/syndicate, /obj/item/aiModule/syndicate,
/obj/item/clothing/shoes/magboots/syndie, /obj/item/powersink, /obj/item/sbeacondrop, /obj/item/sbeacondrop/bomb, /obj/item/syndicatedetonator, /obj/item/shield/energy, /obj/item/assault_pod, /obj/item/slimepotion/slime/sentience/nuclear, /obj/item/stack/telecrystal, /obj/item/jammer, /obj/item/codespeak_manual/unlimited,
/obj/item/toy/cards/deck/syndicate, /obj/item/storage/secure/briefcase/syndie, /obj/item/storage/fancy/cigarettes/cigpack_syndicate, /obj/item/toy/syndicateballoon, /obj/item/clothing/gloves/fingerless/pugilist/rapid, /obj/item/paper/fluff/ruins/thederelict/syndie_mission, /obj/item/organ/cyberimp/eyes/hud/security/syndicate, /obj/item/clothing/head/HoS/syndicate,
code/controllers/subsystem/vis_overlays.dm
+1 -4
View File
@@ -5,12 +5,10 @@ SUBSYSTEM_DEF(vis_overlays)
init_order = INIT_ORDER_VIS
var/list/vis_overlay_cache
var/list/unique_vis_overlays
var/list/currentrun
/datum/controller/subsystem/vis_overlays/Initialize()
vis_overlay_cache = list()
unique_vis_overlays = list()
return ..()
/datum/controller/subsystem/vis_overlays/fire(resumed = FALSE)
@@ -30,7 +28,7 @@ SUBSYSTEM_DEF(vis_overlays)
if(MC_TICK_CHECK)
return
//the "thing" var can be anything with vis_contents which includes images
//the "thing" var can be anything with vis_contents which includes images - in the future someone should totally allow vis overlays to be passed in as an arg instead of all this bullshit
/datum/controller/subsystem/vis_overlays/proc/add_vis_overlay(atom/movable/thing, icon, iconstate, layer, plane, dir, alpha = 255, add_appearance_flags = NONE, unique = FALSE)
var/obj/effect/overlay/vis/overlay
if(!unique)
@@ -45,7 +43,6 @@ SUBSYSTEM_DEF(vis_overlays)
overlay = _create_new_vis_overlay(icon, iconstate, layer, plane, dir, alpha, add_appearance_flags)
overlay.cache_expiration = -1
var/cache_id = "\ref[overlay]@{[world.time]}"
unique_vis_overlays += overlay
vis_overlay_cache[cache_id] = overlay
. = overlay
thing.vis_contents += overlay
code/datums/armor.dm
+14 -1
View File
@@ -1,5 +1,18 @@
#define ARMORID "armor-[melee]-[bullet]-[laser]-[energy]-[bomb]-[bio]-[rad]-[fire]-[acid]-[magic]-[wound]"
#define MELEE "melee"
#define BULLET "bullet"
#define LASER "laser"
#define ENERGY "energy"
#define BOMB "bomb"
#define BIO "bio"
#define RAD "rad"
#define FIRE "fire"
#define ACID "acid"
#define MAGIC "magic"
#define WOUND "wound"
/proc/getArmor(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 0, acid = 0, magic = 0, wound = 0)
. = locate(ARMORID)
if (!.)
@@ -56,7 +69,7 @@
return vars[rating]
/datum/armor/proc/getList()
return list("melee" = melee, "bullet" = bullet, "laser" = laser, "energy" = energy, "bomb" = bomb, "bio" = bio, "rad" = rad, "fire" = fire, "acid" = acid, "magic" = magic, "wound" = wound)
return list(MELEE = melee, BULLET = bullet, LASER = laser, ENERGY = energy, BOMB = bomb, BIO = bio, RAD = rad, FIRE = fire, ACID = acid, MAGIC = magic, WOUND = wound)
/datum/armor/proc/attachArmor(datum/armor/AA)
return getArmor(melee+AA.melee, bullet+AA.bullet, laser+AA.laser, energy+AA.energy, bomb+AA.bomb, bio+AA.bio, rad+AA.rad, fire+AA.fire, acid+AA.acid, magic+AA.magic, wound+AA.wound)
code/datums/atmosphere/planetary.dm
+44 -11
View File
@@ -12,8 +12,8 @@
GAS_CO2=5,
)
restricted_gases = list(
GAS_BZ = 0.1,
GAS_METHYL_BROMIDE= 0.1
GAS_BZ=0.1,
GAS_BROMINE=0.1
)
minimum_pressure = HAZARD_LOW_PRESSURE + 10
@@ -22,26 +22,44 @@
minimum_temp = 281
maximum_temp = 320
/datum/atmosphere/lavaland/generate_gas_string()
if(prob(restricted_chance))
base_gases = list(
GAS_METHANE=5,
GAS_N2=10
)
normal_gases = list(
GAS_METHANE=5,
GAS_N2=5,
)
restricted_gases = list(
GAS_AMMONIA = 0.1,
GAS_METHYL_BROMIDE = 0.1,
GAS_HYDROGEN = 0.1
)
return ..()
/datum/atmosphere/lavaland/check_for_sanity(datum/gas_mixture/mix)
var/datum/breathing_class/o2_class = GLOB.gas_data.breathing_classes[BREATH_OXY]
while(o2_class.get_effective_pp(mix) < 10)
mix.adjust_moles(GAS_CO2, -0.5)
mix.adjust_moles(GAS_O2, 0.5)
if(mix.get_moles(GAS_METHANE) < 0.1)
var/datum/breathing_class/o2_class = GLOB.gas_data.breathing_classes[BREATH_OXY]
while(o2_class.get_effective_pp(mix) < 10)
mix.adjust_moles(GAS_CO2, -0.5)
mix.adjust_moles(GAS_O2, 0.5)
/datum/atmosphere/icemoon
id = ICEMOON_DEFAULT_ATMOS
base_gases = list(
GAS_O2=5,
GAS_METHANE=5,
GAS_N2=10,
)
normal_gases = list(
GAS_O2=10,
GAS_N2=10,
GAS_CO2=10,
GAS_METHANE=5,
GAS_N2=10
)
restricted_gases = list(
GAS_METHYL_BROMIDE=0.1
GAS_METHYL_BROMIDE=0.1,
GAS_HYDROGEN=0.1
)
restricted_chance = 5
@@ -51,3 +69,18 @@
minimum_temp = 180
maximum_temp = 180
/datum/atmosphere/icemoon/generate_gas_string()
if(prob(restricted_chance))
base_gases = list(
GAS_O2=5,
GAS_N2=10,
)
normal_gases = list(
GAS_O2=5,
GAS_N2=10,
)
restricted_gases = list(
GAS_BZ = 0.1,
GAS_METHYL_BROMIDE = 0.1,
)
return ..()
code/datums/brain_damage/special.dm
+1 -1
View File
@@ -99,7 +99,7 @@
var/obj/effect/hallucination/simple/bluespace_stream/linked_to
var/mob/living/carbon/seer
/obj/effect/hallucination/simple/bluespace_stream/Initialize()
/obj/effect/hallucination/simple/bluespace_stream/Initialize(mapload)
. = ..()
QDEL_IN(src, 300)
code/datums/components/acid.dm
+1 -1
View File
@@ -53,7 +53,7 @@
if(!(O.resistance_flags & ACID_PROOF))
if(prob(33))
playsound(O.loc, 'sound/items/welder.ogg', 150, 1)
O.take_damage(min(1 + round(sqrt(level)*0.3), 300), BURN, "acid", 0)
O.take_damage(min(1 + round(sqrt(level)*0.3), 300), BURN, ACID, 0)
level = max(level - (5 + 3*round(sqrt(level))), 0)
if(level <= 0)
code/datums/components/armor_plate.dm
+5 -5
View File
@@ -2,7 +2,7 @@
var/amount = 0
var/maxamount = 3
var/upgrade_item = /obj/item/stack/sheet/animalhide/goliath_hide
var/datum/armor/added_armor = list("melee" = 10)
var/datum/armor/added_armor = list(MELEE = 10)
var/upgrade_name
/datum/component/armor_plate/Initialize(_maxamount,obj/item/_upgrade_item,datum/armor/_added_armor)
@@ -12,7 +12,7 @@
RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/examine)
RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/applyplate)
RegisterSignal(parent, COMSIG_PARENT_PREQDELETED, .proc/dropplates)
if(istype(parent, /obj/mecha/working/ripley))
if(istype(parent, /obj/vehicle/sealed/mecha/working/ripley))
RegisterSignal(parent, COMSIG_ATOM_UPDATE_OVERLAYS, .proc/apply_mech_overlays)
if(_maxamount)
@@ -67,7 +67,7 @@
O.armor = O.armor.attachArmor(added_armor)
if(ismecha(O))
var/obj/mecha/R = O
var/obj/vehicle/sealed/mecha/R = O
R.update_icon()
to_chat(user, "<span class='info'>You strengthen [R], improving its resistance against melee, bullet and laser damage.</span>")
else
@@ -80,11 +80,11 @@
for(var/i in 1 to amount)
new upgrade_item(get_turf(parent))
/datum/component/armor_plate/proc/apply_mech_overlays(obj/mecha/mech, list/overlays)
/datum/component/armor_plate/proc/apply_mech_overlays(obj/vehicle/sealed/mecha/mech, list/overlays)
if(amount)
var/overlay_string = "ripley-g"
if(amount >= 3)
overlay_string += "-full"
if(!mech.occupant)
if(LAZYLEN(mech.occupants) < 1)
overlay_string += "-open"
overlays += overlay_string
code/datums/components/embedded.dm
+1 -1
View File
@@ -152,7 +152,7 @@
to_chat(victim, "<span class='userdanger'>[weapon] sticks itself to your [limb.name]!</span>")
if(damage > 0)
var/armor = victim.run_armor_check(limb.body_zone, "melee", "Your armor has protected your [limb.name].", "Your armor has softened a hit to your [limb.name].",weapon.armour_penetration)
var/armor = victim.run_armor_check(limb.body_zone, MELEE, "Your armor has protected your [limb.name].", "Your armor has softened a hit to your [limb.name].",weapon.armour_penetration)
limb.receive_damage(brute=(1-pain_stam_pct) * damage, stamina=pain_stam_pct * damage, blocked=armor, sharpness = weapon.get_sharpness())
/// Called every time a carbon with a harmful embed moves, rolling a chance for the item to cause pain. The chance is halved if the carbon is crawling or walking.
code/datums/components/killerqueen.dm
+2 -2
View File
@@ -1,6 +1,6 @@
/**
* KILLER QUEEN
*
*
* Simple contact bomb component
* Blows up the first person to touch it.
*/
@@ -26,7 +26,7 @@
var/flame = 0
/// only triggered by living mobs
var/living_only = TRUE
/datum/component/killerqueen/Initialize(ex_strength = EXPLODE_HEAVY, datum/callback/pre_explode, datum/callback/failure, examine_message, light = 0, heavy = 0, dev = 0, flame = 0, living_only = TRUE)
. = ..()
code/datums/components/knockoff.dm
+1 -1
View File
@@ -11,7 +11,7 @@
RegisterSignal(parent, COMSIG_ITEM_DROPPED,.proc/OnDropped)
src.knockoff_chance = knockoff_chance
if(zone_override)
target_zones = zone_override
code/datums/components/mirv.dm
+1 -1
View File
@@ -38,5 +38,5 @@
P.range = override_projectile_range
P.preparePixelProjectile(shootat_turf, target)
P.firer = firer // don't hit ourself that would be really annoying
P.permutated += target // don't hit the target we hit already with the flak
P.impacted = list(target = TRUE) // don't hit the target we hit already with the flak
P.fire()
code/datums/components/pellet_cloud.dm
+1 -1
View File
@@ -242,7 +242,7 @@
P.original = target
P.fired_from = parent
P.firer = parent // don't hit ourself that would be really annoying
P.permutated += parent // don't hit the target we hit already with the flak
P.impacted = list(parent = TRUE) // don't hit the target we hit already with the flak
P.suppressed = SUPPRESSED_VERY // set the projectiles to make no message so we can do our own aggregate message
P.preparePixelProjectile(target, parent)
RegisterSignal(P, COMSIG_PROJECTILE_SELF_ON_HIT, .proc/pellet_hit)
code/datums/components/squeak.dm
+2
View File
@@ -42,6 +42,8 @@
RegisterSignal(parent, COMSIG_ITEM_DROPPED, .proc/on_drop)
if(istype(parent, /obj/item/clothing/shoes))
RegisterSignal(parent, COMSIG_SHOES_STEP_ACTION, .proc/step_squeak)
else if(isstructure(parent))
RegisterSignal(parent, COMSIG_ATOM_ATTACK_HAND, .proc/use_squeak)
override_squeak_sounds = custom_sounds
if(chance_override)
code/datums/components/storage/concrete/rped.dm
+2 -2
View File
@@ -39,7 +39,7 @@
var/datum/progressbar/progress = new(M, length(things), T)
while (do_after(M, 10, TRUE, T, FALSE, CALLBACK(src, .proc/mass_remove_from_storage, T, things, progress, TRUE, M)))
stoplag(1)
qdel(progress)
progress.end_progress()
A.do_squish(0.8, 1.2)
/datum/component/storage/concrete/bluespace/rped
@@ -83,5 +83,5 @@
var/datum/progressbar/progress = new(M, length(things), T)
while (do_after(M, 10, TRUE, T, FALSE, CALLBACK(src, .proc/mass_remove_from_storage, T, things, progress, TRUE, M)))
stoplag(1)
qdel(progress)
progress.end_progress()
A.do_squish(0.8, 1.2)
code/datums/components/storage/storage.dm
+2 -2
View File
@@ -215,7 +215,7 @@
var/list/rejections = list()
while(do_after(M, 10, TRUE, parent, FALSE, CALLBACK(src, .proc/handle_mass_pickup, things, I.loc, rejections, progress)))
stoplag(1)
qdel(progress)
progress.end_progress()
to_chat(M, "<span class='notice'>You put everything you could [insert_preposition] [parent].</span>")
A.do_squish(1.4, 0.4)
@@ -273,7 +273,7 @@
var/datum/progressbar/progress = new(M, length(things), T)
while (do_after(M, 10, TRUE, T, FALSE, CALLBACK(src, .proc/mass_remove_from_storage, T, things, progress, TRUE, M)))
stoplag(1)
qdel(progress)
progress.end_progress()
A.do_squish(0.8, 1.2)
/datum/component/storage/proc/mass_remove_from_storage(atom/target, list/things, datum/progressbar/progress, trigger_on_found = TRUE, mob/user)
code/datums/diseases/_MobProcs.dm
+1 -1
View File
@@ -145,7 +145,7 @@
return !is_mouth_covered()
/mob/living/carbon/CanSpreadAirborneDisease()
return !((head && (head.flags_cover & HEADCOVERSMOUTH) && (head.armor.getRating("bio") >= 25)) || (wear_mask && (wear_mask.flags_cover & MASKCOVERSMOUTH) && (wear_mask.armor.getRating("bio") >= 25)))
return !((head && (head.flags_cover & HEADCOVERSMOUTH) && (head.armor.getRating(BIO) >= 25)) || (wear_mask && (wear_mask.flags_cover & MASKCOVERSMOUTH) && (wear_mask.armor.getRating(BIO) >= 25)))
/mob/living/proc/set_shocked()
flags_1 |= SHOCKED_1
code/datums/diseases/crabcancer.dm
+67
View File
@@ -0,0 +1,67 @@
/datum/disease/crabcancer
name = "Crab Cancer"
form = "Skin Cancer"
max_stages = 3
cure_text = "Mutadone"
spread_text = "Noncontagious"
cures = list(/datum/reagent/medicine/mutadone)
agent = "Carcinisoprojection Jelly"
viable_mobtypes = list(/mob/living/carbon/human, /mob/living/carbon/monkey)
permeability_mod = 1
desc = "If left untreated, the patient will rapidly and painfully grow flesh that will fall off the subject. This can result in death if unmaintained."
severity = DISEASE_SEVERITY_DANGEROUS
spread_flags = DISEASE_SPREAD_NON_CONTAGIOUS
visibility_flags = HIDDEN_PANDEMIC
bypasses_immunity = TRUE
/datum/disease/crabcancer/stage_act()
..()
switch(stage)
if(1)
if(prob(10))
to_chat(affected_mob, "<span class='warning'>" + pick("You feel uncomfortable.",
"You can feel your arms and legs throbbing.",
"You feel... crabby.",
"You're starting to smell like seafood.") + "</span>")
if(2)
if(prob(10))
to_chat(affected_mob, "<span class='danger'>" + pick("Your flesh is starting to look deformed.",
"You feel your flesh bubbling and swelling.",
"You think you see pincers coming out of your flesh.",
"It's time for crab...") + "</span>")
if(3)
if(prob(5))
to_chat(affected_mob, "<span class='danger'>" + pick("Your skin forms black, rough patches!",
"The pain is unbearable!",
"Your skin is forming painful cysts!") + "</span>")
affected_mob.take_bodypart_damage(rand(1,5))
if(prob(5))
affected_mob.visible_message("<span class='danger'>[affected_mob]'s own flesh swells and tears away from \him!</span>", \
"<span class='userdanger'>" + pick("You feel your flesh swelling and tearing away from you!",
"Your own flesh grows and falls beneath you!",
"The pain... the crabby meat falls off you!",
"Your flesh... it tears!",
"It is now time for crab!") + "</span>",
"<span class='italics'>You hear a disgusting squelch of flesh being torn.</span>")
playsound(affected_mob, 'sound/items/poster_ripped.ogg', 50, TRUE)
playsound(get_turf(affected_mob), 'sound/effects/splat.ogg', 20, TRUE)
affected_mob.emote("scream")
affected_mob.take_bodypart_damage(rand(15,25))
var/humanmeatamount = rand(0,2)
var/crabmeatamount = rand(1,2)
var/meattype = /obj/item/reagent_containers/food/snacks/meat/slab/human
if(ishuman(affected_mob))
meattype = affected_mob.dna.species.meat
else //grab the carbon's meat instead (usually this means monkey meat... though other disease-compatible carbon mobs might apply.)
meattype = affected_mob.type_of_meat
if(humanmeatamount)
for(var/i=1 to humanmeatamount)
var/obj/item/reagent_containers/food/snacks/meat/slab/newmeat = new meattype
newmeat.name = "[affected_mob.real_name] [newmeat.name]"
newmeat.forceMove(affected_mob.loc)
if(crabmeatamount)
for(var/i=1 to crabmeatamount)
new /obj/item/reagent_containers/food/snacks/meat/rawcrab(affected_mob.loc)
affected_mob.jitteriness += 3
code/datums/elements/art.dm
+10 -7
View File
@@ -54,11 +54,14 @@
/datum/element/art/rev
/datum/element/art/rev/apply_moodlet(atom/source, mob/M, impress)
M.visible_message("<span class='notice'>[M] stops to inspect [source].</span>", \
"<span class='notice'>You take in [source], inspecting the fine craftsmanship of the proletariat.</span>")
if(M.mind && M.mind.has_antag_datum(/datum/antagonist/rev))
SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "artgreat", /datum/mood_event/artgreat)
/datum/element/art/rev/apply_moodlet(atom/source, mob/user, impress)
var/msg
if(user.mind?.has_antag_datum(/datum/antagonist/rev))
SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "artgreat", /datum/mood_event/artgreat)
msg = "What \a [pick("masterpiece", "chef-d'oeuvre")] [source.p_theyre()]. So [pick("subversive", "revolutionary", "unitizing", "egalitarian")]!"
else
SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "artbad", /datum/mood_event/artbad)
SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "artbad", /datum/mood_event/artbad)
msg = "Wow, [source.p_they()] sucks."
user.visible_message(span_notice("[user] stops to inspect [source]."), \
span_notice("You appraise [source], inspecting the fine craftsmanship of the proletariat... [msg]"))
code/datums/elements/embed.dm
+1 -1
View File
@@ -79,7 +79,7 @@
var/actual_chance = embed_chance
if(!weapon.isEmbedHarmless()) // all the armor in the world won't save you from a kick me sign
var/armor = max(victim.run_armor_check(hit_zone, "bullet", silent=TRUE), victim.run_armor_check(hit_zone, "bomb", silent=TRUE)) * 0.5 // we'll be nice and take the better of bullet and bomb armor, halved
var/armor = max(victim.run_armor_check(hit_zone, BULLET, silent=TRUE), victim.run_armor_check(hit_zone, BOMB, silent=TRUE)) * 0.5 // we'll be nice and take the better of bullet and bomb armor, halved
if(armor) // we only care about armor penetration if there's actually armor to penetrate
var/pen_mod = -armor + weapon.armour_penetration // even a little bit of armor can make a big difference for shrapnel with large negative armor pen
code/datums/elements/trash.dm
+3 -3
View File
@@ -11,9 +11,9 @@
if(HAS_TRAIT(H, TRAIT_TRASHCAN))
playsound(H.loc,'sound/items/eatfood.ogg', rand(10,50), 1)
if(H.vore_selected)
H.visible_message("<span class='notice'>[H] [H.vore_selected.vore_verb]s the [source] into their [H.vore_selected]</span>",
"<span class='notice'>You [H.vore_selected.vore_verb]s the [source] into your [H.vore_selected]</span>")
H.visible_message("<span class='notice'>[H] [H.vore_selected.vore_verb]s the [source.name] into their [H.vore_selected.name]</span>",
"<span class='notice'>You [H.vore_selected.vore_verb] the [source.name] into your [H.vore_selected.name]</span>")
source.forceMove(H.vore_selected)
else
H.visible_message("<span class='notice'>[H] consumes the [source].")
H.visible_message("<span class='notice'>[H] consumes the [source.name].")
qdel(source)
code/datums/martial/boxing.dm
+1 -1
View File
@@ -26,7 +26,7 @@
return TRUE
var/obj/item/bodypart/affecting = D.get_bodypart(ran_zone(A.zone_selected))
var/armor_block = D.run_armor_check(affecting, "melee")
var/armor_block = D.run_armor_check(affecting, MELEE)
playsound(D.loc, A.dna.species.attack_sound, 25, 1, -1)
code/datums/martial/krav_maga.dm
+4 -4
View File
@@ -98,7 +98,7 @@
/datum/martial_art/krav_maga/proc/leg_sweep(mob/living/carbon/human/A, mob/living/carbon/human/D)
var/obj/item/bodypart/affecting = D.get_bodypart(BODY_ZONE_CHEST)
var/armor_block = D.run_armor_check(affecting, "melee")
var/armor_block = D.run_armor_check(affecting, MELEE)
var/damage = (damage_roll(A,D)*2 + 25)
if(!CHECK_MOBILITY(D, MOBILITY_STAND))
return FALSE
@@ -140,7 +140,7 @@
/datum/martial_art/krav_maga/harm_act(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D)
var/obj/item/bodypart/affecting = D.get_bodypart(ran_zone(A.zone_selected))
var/armor_block = D.run_armor_check(affecting, "melee")
var/armor_block = D.run_armor_check(affecting, MELEE)
if(check_streak(A,D))
return TRUE
log_combat(A, D, "punched")
@@ -165,7 +165,7 @@
if(check_streak(A,D))
return TRUE
var/obj/item/bodypart/affecting = D.get_bodypart(ran_zone(A.zone_selected))
var/armor_block = D.run_armor_check(affecting, "melee")
var/armor_block = D.run_armor_check(affecting, MELEE)
var/damage = damage_roll(A,D)
var/stunthreshold = A.dna.species.punchstunthreshold
if(CHECK_MOBILITY(D, MOBILITY_STAND))
@@ -233,4 +233,4 @@
heat_protection = HANDS
max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT
resistance_flags = NONE
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 50)
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 80, ACID = 50)
code/datums/martial/sleeping_carp.dm
+1 -1
View File
@@ -223,7 +223,7 @@
block_chance = 50
var/wielded = FALSE // track wielded status on item
/obj/item/staff/bostaff/Initialize()
/obj/item/staff/bostaff/Initialize(mapload)
. = ..()
RegisterSignal(src, COMSIG_TWOHANDED_WIELD, .proc/on_wield)
RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, .proc/on_unwield)

Some files were not shown because too many files have changed in this diff Show More