Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
f6a19e3
Upload files
SandPoot Apr 13, 2022
15a8d55
alright so, handling layers/planes, fov and stuff i'll forget to ment…
SandPoot Apr 24, 2022
ad7e40f
fuck bring em back
SandPoot Apr 24, 2022
8a51a4c
Merge branch 'master' of https://github.com/Citadel-Station-13/Citade…
SandPoot Apr 24, 2022
654ee39
fixes
SandPoot Apr 24, 2022
b9419ec
Update shuttle.dm
SandPoot Apr 24, 2022
bbc883c
map fixes
SandPoot Apr 24, 2022
5702553
okay /general/visible
SandPoot Apr 24, 2022
632620c
safety
SandPoot Apr 24, 2022
16acca1
Fixes glass floor icons by converting them to cutter smoothing
deathride58 May 17, 2022
19f6edd
Merge branch 'master' into hardsync-maybe
deathride58 May 17, 2022
db07094
Merge branch 'master' into hardsync-maybe
SandPoot May 24, 2022
2f93401
Fixes runtimes from statclick effects lacking blocks_emissive
deathride58 May 25, 2022
eab6300
Fixes being unable to place cables on plating
deathride58 May 25, 2022
1ac8f32
fixes plastic flaps and bot paths
SandPoot May 26, 2022
8b23fa8
Merge branch 'master' of https://github.com/Citadel-Station-13/Citade…
SandPoot Jun 6, 2022
496a078
LetterN will have to scream at me why this is necessary otherwise mer…
SandPoot Jun 6, 2022
bc94644
Merge branch 'master' of https://github.com/Citadel-Station-13/Citade…
SandPoot Jun 15, 2022
c1e6fea
Closes Hitscans are broken, new testmerge probably #15685
SandPoot Jun 15, 2022
6f8dcf9
Merge branch 'master' of https://github.com/Citadel-Station-13/Citade…
SandPoot Oct 5, 2022
e2d3608
bad layer
SandPoot Oct 5, 2022
328e8c0
yeah
SandPoot Oct 5, 2022
25a3fb8
Merge branch 'master' of https://github.com/Citadel-Station-13/Citade…
SandPoot Feb 24, 2023
999f12c
Merge branch 'master' of https://github.com/Citadel-Station-13/Citade…
SandPoot Mar 21, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -1480,9 +1480,7 @@
/area/ruin/lavaland/unpowered/syndicate_lava_base/virology)
"fj" = (
/obj/structure/table/glass,
/obj/structure/reagent_dispensers/virusfood{
pixel_y = 28
},
/obj/structure/reagent_dispensers/wall/virusfood/directional/north,
/obj/item/clothing/gloves/color/latex,
/obj/item/healthanalyzer,
/obj/item/clothing/glasses/hud/health,
Expand Down
4 changes: 1 addition & 3 deletions _maps/RandomRuins/SpaceRuins/deepstorage.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2012,9 +2012,7 @@
/area/ruin/space/has_grav/deepstorage/armory)
"ex" = (
/obj/structure/table,
/obj/structure/reagent_dispensers/peppertank{
pixel_x = 32
},
/obj/structure/reagent_dispensers/wall/peppertank/directional/east,
/obj/item/gun/ballistic/automatic/wt550,
/obj/item/ammo_box/magazine/wt550m9{
pixel_y = 12
Expand Down
4 changes: 1 addition & 3 deletions _maps/RandomRuins/SpaceRuins/turretedoutpost.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -167,9 +167,7 @@
/area/ruin/space/has_grav/turretedoutpost)
"aC" = (
/obj/structure/table/reinforced,
/obj/structure/reagent_dispensers/peppertank{
pixel_y = 32
},
/obj/structure/reagent_dispensers/wall/peppertank/directional/north,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/turretedoutpost)
"aD" = (
Expand Down
8 changes: 2 additions & 6 deletions _maps/RandomZLevels/away_mission/SnowCabin.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1769,9 +1769,7 @@
/turf/open/floor/plasteel/dark,
/area/awaymission/cabin/caves/mountain)
"fs" = (
/obj/structure/reagent_dispensers/peppertank{
pixel_y = 32
},
/obj/structure/reagent_dispensers/wall/peppertank/directional/north,
/obj/effect/turf_decal/tile/blue,
/obj/effect/turf_decal/tile/blue{
dir = 4
Expand Down Expand Up @@ -1890,9 +1888,7 @@
/turf/open/floor/plating/snowed,
/area/awaymission/cabin/snowforest)
"fE" = (
/obj/structure/reagent_dispensers/peppertank{
pixel_y = 32
},
/obj/structure/reagent_dispensers/wall/peppertank/directional/north,
/obj/effect/turf_decal/tile/blue{
dir = 4
},
Expand Down
7 changes: 3 additions & 4 deletions _maps/RandomZLevels/away_mission/moonoutpost19.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2201,9 +2201,8 @@
/obj/structure/cable{
icon_state = "1-2"
},
/obj/machinery/atmospherics/pipe/manifold{
dir = 4;
level = 2
/obj/machinery/atmospherics/pipe/manifold/general/visible{
dir = 4
},
/turf/open/floor/plasteel/white,
/area/awaymission/moonoutpost19/research)
Expand Down Expand Up @@ -3045,7 +3044,7 @@
},
/area/awaymission/moonoutpost19/research)
"gi" = (
/obj/structure/reagent_dispensers/peppertank{
/obj/structure/reagent_dispensers/wall/peppertank{
pixel_x = -30
},
/obj/effect/turf_decal/tile/red{
Expand Down
8 changes: 2 additions & 6 deletions _maps/RandomZLevels/away_mission/research.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1070,9 +1070,7 @@
/turf/open/floor/plasteel/dark,
/area/awaymission/research/interior/gateway)
"cG" = (
/obj/structure/reagent_dispensers/peppertank{
pixel_y = 32
},
/obj/structure/reagent_dispensers/wall/peppertank/directional/north,
/obj/effect/turf_decal/tile/purple{
dir = 1
},
Expand Down Expand Up @@ -4523,9 +4521,7 @@
/turf/open/floor/plasteel/dark,
/area/awaymission/research/interior/genetics)
"iI" = (
/obj/structure/reagent_dispensers/peppertank{
pixel_y = -32
},
/obj/structure/reagent_dispensers/wall/peppertank/directional/south,
/obj/effect/turf_decal/tile/purple{
dir = 1
},
Expand Down
27 changes: 11 additions & 16 deletions _maps/RandomZLevels/away_mission/undergroundoutpost45.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1197,9 +1197,8 @@
},
/area/awaymission/undergroundoutpost45/central)
"cM" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 5;
level = 2
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
dir = 5
},
/turf/open/floor/plating{
heat_capacity = 1e+006
Expand Down Expand Up @@ -1804,7 +1803,7 @@
dir = 8
},
/obj/structure/chair,
/obj/structure/reagent_dispensers/peppertank{
/obj/structure/reagent_dispensers/wall/peppertank{
pixel_y = 30
},
/obj/effect/turf_decal/tile/red{
Expand Down Expand Up @@ -3826,9 +3825,8 @@
},
/area/awaymission/undergroundoutpost45/crew_quarters)
"hU" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4;
level = 2
/obj/machinery/atmospherics/pipe/simple/supply/visible{
dir = 4
},
/obj/structure/table,
/obj/item/book/manual/chef_recipes,
Expand All @@ -3839,9 +3837,8 @@
/area/awaymission/undergroundoutpost45/crew_quarters)
"hV" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4;
level = 2
/obj/machinery/atmospherics/pipe/simple/supply/visible{
dir = 4
},
/turf/open/floor/plating{
heat_capacity = 1e+006
Expand Down Expand Up @@ -7838,7 +7835,7 @@
},
/area/awaymission/undergroundoutpost45/research)
"oC" = (
/obj/structure/reagent_dispensers/peppertank{
/obj/structure/reagent_dispensers/wall/peppertank{
pixel_x = -30
},
/obj/effect/decal/cleanable/dirt,
Expand Down Expand Up @@ -9383,7 +9380,7 @@
/obj/structure/table,
/obj/item/storage/box,
/obj/item/storage/box,
/obj/structure/reagent_dispensers/peppertank{
/obj/structure/reagent_dispensers/wall/peppertank{
pixel_y = 30
},
/obj/effect/turf_decal/tile/red{
Expand Down Expand Up @@ -9591,9 +9588,8 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4;
level = 2
/obj/machinery/atmospherics/pipe/simple/supply/visible{
dir = 4
},
/obj/machinery/door/airlock/maintenance{
name = "Research Maintenance";
Expand Down Expand Up @@ -11542,7 +11538,6 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/machinery/computer/atmos_control{
dir = 4;
level = 3;
name = "Distribution and Waste Monitor";
sensors = list("UO45_air_sensor" = "Mixed Air Supply Tank", "UO45_distro_meter" = "Distribution Loop", "UO45_waste_meter" = "Waste Loop")
},
Expand Down
32 changes: 12 additions & 20 deletions _maps/map_files/BoxStation/BoxStation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -687,9 +687,7 @@
/turf/open/floor/plasteel/dark,
/area/security/office)
"abI" = (
/obj/structure/reagent_dispensers/peppertank{
pixel_y = 32
},
/obj/structure/reagent_dispensers/wall/peppertank/directional/north,
/obj/effect/turf_decal/tile/red{
dir = 1
},
Expand Down Expand Up @@ -1258,7 +1256,7 @@
/obj/machinery/light{
dir = 4
},
/obj/structure/reagent_dispensers/peppertank{
/obj/structure/reagent_dispensers/wall/peppertank{
pixel_x = 30
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
Expand Down Expand Up @@ -1953,7 +1951,7 @@
/obj/machinery/airalarm{
pixel_y = 23
},
/obj/structure/reagent_dispensers/peppertank{
/obj/structure/reagent_dispensers/wall/peppertank{
pixel_x = 30
},
/obj/structure/table/wood,
Expand Down Expand Up @@ -2600,9 +2598,7 @@
/obj/effect/turf_decal/tile/red{
dir = 8
},
/obj/structure/reagent_dispensers/peppertank{
pixel_y = -32
},
/obj/structure/reagent_dispensers/wall/peppertank/directional/south,
/turf/open/floor/plasteel/dark,
/area/security/prison)
"afy" = (
Expand Down Expand Up @@ -8942,7 +8938,7 @@
/obj/machinery/light_switch{
pixel_y = -23
},
/obj/structure/reagent_dispensers/peppertank{
/obj/structure/reagent_dispensers/wall/peppertank{
pixel_x = 32;
pixel_y = -32
},
Expand Down Expand Up @@ -12691,7 +12687,7 @@
/area/construction/mining/aux_base)
"aCY" = (
/obj/machinery/computer/security,
/obj/structure/reagent_dispensers/peppertank{
/obj/structure/reagent_dispensers/wall/peppertank{
pixel_y = 30
},
/obj/effect/turf_decal/tile/red{
Expand Down Expand Up @@ -24987,7 +24983,7 @@
/turf/open/floor/plasteel,
/area/security/checkpoint/medical)
"bjN" = (
/obj/structure/reagent_dispensers/peppertank{
/obj/structure/reagent_dispensers/wall/peppertank{
pixel_x = 30
},
/obj/effect/turf_decal/tile/red,
Expand Down Expand Up @@ -31724,7 +31720,7 @@
/turf/open/floor/plasteel/dark,
/area/science/server)
"bzz" = (
/obj/structure/reagent_dispensers/peppertank{
/obj/structure/reagent_dispensers/wall/peppertank{
pixel_x = -30
},
/obj/machinery/airalarm{
Expand Down Expand Up @@ -32419,7 +32415,7 @@
/area/medical/medbay/central)
"bBf" = (
/obj/structure/filingcabinet,
/obj/structure/reagent_dispensers/peppertank{
/obj/structure/reagent_dispensers/wall/peppertank{
pixel_x = 30
},
/obj/machinery/newscaster{
Expand Down Expand Up @@ -38235,9 +38231,7 @@
/area/security/checkpoint/engineering)
"bOP" = (
/obj/structure/table/glass,
/obj/structure/reagent_dispensers/virusfood{
pixel_x = -30
},
/obj/structure/reagent_dispensers/wall/virusfood/directional/west,
/obj/item/book/manual/wiki/infections{
pixel_y = 7
},
Expand Down Expand Up @@ -39920,7 +39914,7 @@
pixel_y = 9
},
/obj/item/pen,
/obj/structure/reagent_dispensers/peppertank{
/obj/structure/reagent_dispensers/wall/peppertank{
pixel_x = 30
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
Expand Down Expand Up @@ -45124,9 +45118,7 @@
/turf/open/floor/plasteel,
/area/maintenance/disposal/incinerator)
"chi" = (
/obj/machinery/atmospherics/pipe/manifold4w/general{
level = 2
},
/obj/machinery/atmospherics/pipe/manifold4w/general/visible,
/obj/machinery/meter,
/turf/open/floor/plasteel,
/area/maintenance/disposal/incinerator)
Expand Down
8 changes: 2 additions & 6 deletions _maps/map_files/CogStation/CogStation.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -10119,9 +10119,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 8
},
/obj/structure/reagent_dispensers/peppertank{
pixel_y = 32
},
/obj/structure/reagent_dispensers/wall/peppertank/directional/north,
/obj/machinery/atmospherics/pipe/simple/cyan/hidden{
dir = 10
},
Expand Down Expand Up @@ -59387,9 +59385,7 @@
/obj/effect/turf_decal/tile/green{
dir = 4
},
/obj/structure/reagent_dispensers/virusfood{
pixel_x = -32
},
/obj/structure/reagent_dispensers/wall/virusfood/directional/west,
/obj/structure/extinguisher_cabinet{
pixel_y = 32
},
Expand Down
Loading