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

Cleans up map errors

Browse Source 
Knowing my fucking luck it ain't all of 'em
This commit is contained in:
Poojawa
2018-09-20 04:28:02 -05:00
parent 23ab8838a0
commit c836a7e5ea
22 changed files with 58 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/BoxStation/BoxStation.dmm
+2 -18
View File
@@ -12374,7 +12374,6 @@
icon_state = "1-8"
},
/obj/structure/window{
icon_state = "window";
dir = 4
},
/obj/structure/window,
@@ -17464,9 +17463,7 @@
req_access_txt = "25"
},
/obj/structure/disposalpipe/segment,
/turf/open/floor/plasteel{
icon_state = "wood"
},
/turf/open/floor/wood,
/area/crew_quarters/bar)
"aOP" = (
/obj/effect/landmark/blobstart,
@@ -17677,10 +17674,7 @@
/area/hallway/secondary/entry)
"aPw" = (
/obj/machinery/disposal/bin,
/obj/structure/sign/warning/securearea{
desc = "Under the painting a plaque reads: 'While the meat grinder may not have spared you, fear not. Not one part of you has gone to waste... You were delicious.'";
icon_state = "monkey_painting";
name = "Mr. Deempisi portrait";
/obj/structure/sign/plaques/deempisi{
pixel_x = -28;
pixel_y = -4
},
@@ -20315,7 +20309,6 @@
"aWj" = (
/obj/structure/grille,
/obj/structure/window{
icon_state = "window";
dir = 8
},
/obj/structure/window,
@@ -20331,7 +20324,6 @@
"aWl" = (
/obj/structure/grille,
/obj/structure/window{
icon_state = "window";
dir = 1
},
/turf/open/floor/plating,
@@ -21498,7 +21490,6 @@
/obj/structure/table,
/obj/item/razor,
/obj/structure/window{
icon_state = "window";
dir = 1
},
/obj/effect/turf_decal/tile/blue{
@@ -21593,7 +21584,6 @@
pixel_x = -2
},
/obj/structure/window{
icon_state = "window";
dir = 1
},
/obj/effect/turf_decal/tile/blue{
@@ -25111,7 +25101,6 @@
dir = 4
},
/obj/structure/window{
icon_state = "window";
dir = 1
},
/obj/structure/window,
@@ -25123,7 +25112,6 @@
dir = 4
},
/obj/structure/window{
icon_state = "window";
dir = 8
},
/turf/open/floor/plating,
@@ -25441,7 +25429,6 @@
/area/quartermaster/office)
"biG" = (
/obj/machinery/mech_bay_recharge_port{
icon_state = "recharge_port";
dir = 2
},
/obj/structure/cable{
@@ -50846,7 +50833,6 @@
"crb" = (
/obj/machinery/atmospherics/components/binary/pump{
dir = 2;
icon_state = "pump_map";
name = "Gas to Chamber"
},
/obj/effect/decal/cleanable/dirt,
@@ -55098,7 +55084,6 @@
},
/obj/machinery/atmospherics/components/binary/pump{
dir = 2;
icon_state = "pump_map";
name = "Cooling Loop Bypass"
},
/turf/open/floor/engine,
@@ -55731,7 +55716,6 @@
/area/science/robotics/lab)
"cHL" = (
/obj/machinery/mech_bay_recharge_port{
icon_state = "recharge_port";
dir = 2
},
/obj/structure/cable{
_maps/map_files/Deltastation/DeltaStation2.dmm
+3 -33
View File
@@ -9263,15 +9263,9 @@
pixel_y = 3
},
/obj/item/storage/box/mousetraps,
/obj/item/restraints/legcuffs/beartrap{
icon_state = "beartrap0"
},
/obj/item/restraints/legcuffs/beartrap{
icon_state = "beartrap0"
},
/obj/item/restraints/legcuffs/beartrap{
icon_state = "beartrap0"
},
/obj/item/restraints/legcuffs/beartrap,
/obj/item/restraints/legcuffs/beartrap,
/obj/item/restraints/legcuffs/beartrap,
/obj/effect/decal/cleanable/cobweb,
/obj/effect/turf_decal/bot,
/obj/effect/turf_decal/tile/neutral{
@@ -9621,7 +9615,6 @@
"awd" = (
/obj/machinery/atmospherics/components/binary/pump{
dir = 1;
icon_state = "pump_map";
name = "Gas to Loop"
},
/obj/effect/turf_decal/tile/neutral{
@@ -10992,7 +10985,6 @@
},
/obj/machinery/atmospherics/components/binary/pump{
dir = 1;
icon_state = "pump_map";
name = "Thermo to Gas"
},
/turf/open/floor/plasteel,
@@ -12307,7 +12299,6 @@
"aBb" = (
/obj/machinery/atmospherics/components/binary/pump{
dir = 8;
icon_state = "pump_map";
name = "Atmos to Gas"
},
/obj/effect/turf_decal/stripes/line{
@@ -12964,7 +12955,6 @@
"aCn" = (
/obj/machinery/atmospherics/components/binary/pump{
dir = 1;
icon_state = "pump_map";
name = "Gas to Chamber"
},
/turf/open/floor/engine,
@@ -19744,7 +19734,6 @@
/area/maintenance/disposal/incinerator)
"aNP" = (
/obj/machinery/power/turbine{
icon_state = "turbine";
dir = 8;
luminosity = 2
},
@@ -21203,7 +21192,6 @@
"aPZ" = (
/obj/structure/table/wood,
/obj/item/toy/cards/deck/syndicate{
icon_state = "deck_syndicate_full";
pixel_y = 6
},
/turf/open/floor/plasteel/grimy,
@@ -23137,7 +23125,6 @@
/obj/effect/decal/cleanable/dirt,
/obj/machinery/atmospherics/components/binary/pump{
dir = 1;
icon_state = "pump_map";
name = "Port to Turbine"
},
/obj/effect/turf_decal/tile/neutral{
@@ -23158,7 +23145,6 @@
},
/obj/machinery/atmospherics/components/binary/pump{
dir = 1;
icon_state = "pump_map";
name = "Port to Filter"
},
/obj/effect/turf_decal/tile/neutral{
@@ -56179,7 +56165,6 @@
"bRQ" = (
/obj/structure/lattice,
/obj/structure/transit_tube/curved/flipped{
icon_state = "curved1";
dir = 4
},
/turf/open/space,
@@ -56192,7 +56177,6 @@
"bRS" = (
/obj/structure/lattice,
/obj/structure/transit_tube/curved{
icon_state = "curved0";
dir = 8
},
/turf/open/space,
@@ -57389,7 +57373,6 @@
"bTJ" = (
/obj/structure/lattice,
/obj/structure/transit_tube/diagonal{
icon_state = "diagonal";
dir = 4
},
/turf/open/space,
@@ -59082,7 +59065,6 @@
},
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
/obj/structure/transit_tube/station{
icon_state = "closed_station0";
dir = 8
},
/obj/effect/turf_decal/tile/neutral{
@@ -59120,7 +59102,6 @@
dir = 4
},
/obj/structure/transit_tube/junction{
icon_state = "junction0";
dir = 4
},
/turf/open/space,
@@ -59150,7 +59131,6 @@
dir = 4
},
/obj/structure/transit_tube/curved{
icon_state = "curved0";
dir = 8
},
/turf/open/space,
@@ -60824,7 +60804,6 @@
dir = 4
},
/obj/structure/transit_tube/curved/flipped{
icon_state = "curved1";
dir = 1
},
/obj/effect/turf_decal/tile/neutral{
@@ -60849,7 +60828,6 @@
dir = 8
},
/obj/structure/transit_tube/curved{
icon_state = "curved0";
dir = 4
},
/obj/structure/sign/warning/securearea{
@@ -62243,7 +62221,6 @@
"cap" = (
/obj/structure/lattice,
/obj/structure/transit_tube/curved{
icon_state = "curved0";
dir = 4
},
/turf/open/space,
@@ -62251,7 +62228,6 @@
"caq" = (
/obj/structure/lattice,
/obj/structure/transit_tube/curved/flipped{
icon_state = "curved1";
dir = 8
},
/turf/open/space,
@@ -101722,7 +101698,6 @@
/area/science/robotics/mechbay)
"dpb" = (
/obj/machinery/mech_bay_recharge_port{
icon_state = "recharge_port";
dir = 8
},
/obj/effect/turf_decal/stripes/line{
@@ -101935,7 +101910,6 @@
req_access_txt = "5"
},
/obj/effect/mapping_helpers/airlock/unres{
icon_state = "airlock_unres_helper";
dir = 8
},
/obj/structure/cable/white{
@@ -102182,7 +102156,6 @@
"dpP" = (
/obj/structure/table/wood/poker,
/obj/item/toy/cards/deck/syndicate{
icon_state = "deck_syndicate_full";
pixel_y = 6
},
/turf/open/floor/plasteel/grimy,
@@ -102929,7 +102902,6 @@
req_access_txt = "5"
},
/obj/effect/mapping_helpers/airlock/unres{
icon_state = "airlock_unres_helper";
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -104890,7 +104862,6 @@
/area/science/robotics/mechbay)
"duY" = (
/obj/machinery/mech_bay_recharge_port{
icon_state = "recharge_port";
dir = 8
},
/obj/effect/turf_decal/stripes/line{
@@ -108118,7 +108089,6 @@
/area/science/research/abandoned)
"dAr" = (
/obj/machinery/mech_bay_recharge_port{
icon_state = "recharge_port";
dir = 1
},
/obj/effect/decal/cleanable/dirt,
_maps/map_files/MetaStation/MetaStation.dmm
+2 -7
View File
@@ -37966,9 +37966,7 @@
},
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/structure/disposalpipe/segment,
/turf/open/floor/plasteel{
icon_state = "wood"
},
/turf/open/floor/wood,
/area/crew_quarters/bar)
"buP" = (
/obj/machinery/computer/slot_machine{
@@ -39025,10 +39023,7 @@
/turf/open/floor/plasteel,
/area/crew_quarters/bar)
"bwQ" = (
/obj/structure/sign/warning/securearea{
desc = "Under the painting a plaque reads: 'While the meat grinder may not have spared you, fear not. Not one part of you has gone to waste... You were delicious.'";
icon_state = "monkey_painting";
name = "Mr. Deempisi portrait";
/obj/structure/sign/plaques/deempisi{
pixel_y = 28
},
/obj/structure/disposalpipe/trunk{
_maps/map_files/OmegaStation/OmegaStation.dmm
+3 -11
View File
@@ -20486,15 +20486,9 @@
pixel_y = 3
},
/obj/item/storage/box/mousetraps,
/obj/item/restraints/legcuffs/beartrap{
icon_state = "beartrap0"
},
/obj/item/restraints/legcuffs/beartrap{
icon_state = "beartrap0"
},
/obj/item/restraints/legcuffs/beartrap{
icon_state = "beartrap0"
},
/obj/item/restraints/legcuffs/beartrap,
/obj/item/restraints/legcuffs/beartrap,
/obj/item/restraints/legcuffs/beartrap,
/obj/effect/decal/cleanable/cobweb,
/obj/machinery/requests_console{
department = "Custodial Closet";
@@ -31360,7 +31354,6 @@
"bdH" = (
/obj/structure/table/wood,
/obj/item/toy/cards/deck/syndicate{
icon_state = "deck_syndicate_full";
pixel_y = 6
},
/obj/machinery/light/small{
@@ -42329,7 +42322,6 @@
"sOw" = (
/obj/effect/turf_decal/bot,
/obj/structure/transit_tube/station/reverse{
icon_state = "closed_terminus0";
dir = 8
},
/turf/open/floor/plating,
_maps/map_files/PubbyStation/PubbyStation.dmm
+12 -48
View File
@@ -3466,9 +3466,8 @@
"akb" = (
/obj/machinery/disposal/bin,
/obj/structure/disposalpipe/trunk,
/obj/structure/sign/plaques/atmos{
/obj/structure/sign/plaques/kiddie{
desc = "An embossed piece of paper from the University of Nanotrasen at Portpoint.";
icon_state = "kiddieplaque";
name = "\improper 'Diploma' frame";
pixel_y = 32
},
@@ -4701,7 +4700,6 @@
/area/crew_quarters/heads/hos)
"amA" = (
/obj/structure/transit_tube/curved/flipped{
icon_state = "curved1";
dir = 4
},
/obj/structure/lattice/catwalk,
@@ -4719,7 +4717,6 @@
/area/space/nearstation)
"amD" = (
/obj/structure/transit_tube/curved/flipped{
icon_state = "curved1";
dir = 8
},
/obj/structure/lattice/catwalk,
@@ -6900,7 +6897,6 @@
},
/obj/effect/turf_decal/stripes/line,
/obj/structure/transit_tube/curved/flipped{
icon_state = "curved1";
dir = 8
},
/turf/open/floor/plating,
@@ -8623,10 +8619,7 @@
/obj/machinery/light/small{
dir = 1
},
/obj/structure/sign/warning/securearea{
desc = "Under the painting a plaque reads: 'While the meat grinder may not have spared you, fear not. Not one part of you has gone to waste... You were delicious.'";
icon_state = "monkey_painting";
name = "Mr. Deempisi portrait";
//obj/structure/sign/plaques/deempisi{
pixel_y = 28
},
/obj/machinery/atmospherics/components/unary/vent_pump/on{
@@ -10078,10 +10071,7 @@
/obj/machinery/light/small{
dir = 1
},
/obj/structure/sign/warning/securearea{
desc = "Under the painting a plaque reads: 'While the meat grinder may not have spared you, fear not. Not one part of you has gone to waste... You were delicious.'";
icon_state = "monkey_painting";
name = "Mr. Deempisi portrait";
/obj/structure/sign/plaques/deempisi{
pixel_y = 28
},
/obj/machinery/atmospherics/components/unary/vent_pump/on{
@@ -11539,10 +11529,7 @@
/obj/machinery/light/small{
dir = 1
},
/obj/structure/sign/warning/securearea{
desc = "Under the painting a plaque reads: 'While the meat grinder may not have spared you, fear not. Not one part of you has gone to waste... You were delicious.'";
icon_state = "monkey_painting";
name = "Mr. Deempisi portrait";
/obj/structure/sign/plaques/deempisi{
pixel_y = 28
},
/obj/machinery/atmospherics/components/unary/vent_pump/on{
@@ -12266,7 +12253,6 @@
dir = 8
},
/turf/open/floor/plasteel/white/corner{
icon_state = "whitecorner";
dir = 8
},
/area/crew_quarters/dorms)
@@ -15252,7 +15238,6 @@
icon_state = "plant-04"
},
/turf/open/floor/plasteel/white/corner{
icon_state = "whitecorner";
dir = 4
},
/area/hallway/primary/central)
@@ -20433,10 +20418,7 @@
/area/hallway/secondary/exit/departure_lounge)
"aWM" = (
/obj/machinery/washing_machine,
/obj/structure/sign/warning/securearea{
desc = "Under the painting a plaque reads: 'While the meat grinder may not have spared you, fear not. Not one part of you has gone to waste... You were delicious.'";
icon_state = "monkey_painting";
name = "Mr. Deempisi portrait";
/obj/structure/sign/plaques/deempisi{
pixel_y = 28
},
/obj/effect/turf_decal/tile/neutral{
@@ -33772,7 +33754,6 @@
/area/science/xenobiology)
"bAI" = (
/obj/structure/transit_tube/curved/flipped{
icon_state = "curved1";
dir = 4
},
/turf/open/space/basic,
@@ -37097,7 +37078,6 @@
/area/medical/virology)
"bGV" = (
/obj/machinery/shower{
icon_state = "shower";
dir = 4
},
/obj/item/radio/intercom{
@@ -38736,7 +38716,6 @@
/area/maintenance/department/engine)
"bKm" = (
/obj/structure/light_construct{
icon_state = "tube-construct-stage1";
dir = 4
},
/turf/open/floor/plasteel/dark,
@@ -40179,7 +40158,6 @@
/area/chapel/dock)
"bNx" = (
/obj/structure/transit_tube/station/reverse{
icon_state = "closed_terminus0";
dir = 1
},
/turf/open/floor/plating,
@@ -41206,8 +41184,7 @@
/area/chapel/asteroid/monastery)
"bQe" = (
/obj/item/flashlight/lantern{
icon_state = "lantern-on";
on = 1
icon_state = "lantern-on"
},
/turf/open/floor/plating/asteroid,
/area/chapel/asteroid/monastery)
@@ -46689,8 +46666,7 @@
/area/chapel/main/monastery)
"ccL" = (
/obj/item/flashlight/lantern{
icon_state = "lantern-on";
on = 1
icon_state = "lantern-on"
},
/obj/effect/turf_decal/sand,
/turf/open/floor/plasteel,
@@ -47975,10 +47951,7 @@
/area/chapel/main/monastery)
"cgM" = (
/obj/structure/dresser,
/obj/structure/sign/warning/securearea{
desc = "Under the painting a plaque reads: 'While the meat grinder may not have spared you, fear not. Not one part of you has gone to waste... You were delicious.'";
icon_state = "monkey_painting";
name = "Mr. Deempisi portrait";
/obj/structure/sign/plaques/deempisi{
pixel_y = 28
},
/turf/open/floor/plasteel/grimy,
@@ -49065,8 +49038,7 @@
/area/library)
"clj" = (
/obj/item/flashlight/lantern{
icon_state = "lantern-on";
on = 1
icon_state = "lantern-on"
},
/turf/open/floor/plating/asteroid/airless,
/area/asteroid/nearstation/bomb_site)
@@ -52786,7 +52758,6 @@
"czC" = (
/obj/structure/table/wood/fancy,
/obj/item/flashlight/lantern{
on = 1;
icon_state = "lantern-on";
pixel_y = 8
},
@@ -55891,10 +55862,7 @@
/turf/open/floor/plasteel/white,
/area/medical/sleeper)
"jsD" = (
/obj/structure/sign/warning/securearea{
desc = "Under the painting a plaque reads: 'While the meat grinder may not have spared you, fear not. Not one part of you has gone to waste... You were delicious.'";
icon_state = "monkey_painting";
name = "Mr. Deempisi portrait";
/obj/structure/sign/plaques/deempisi{
pixel_y = 28
},
/obj/item/twohanded/required/kirbyplants{
@@ -59394,10 +59362,7 @@
/area/maintenance/department/security/brig)
"syQ" = (
/obj/machinery/vending/games,
/obj/structure/sign/warning/securearea{
desc = "Under the painting a plaque reads: 'While the meat grinder may not have spared you, fear not. Not one part of you has gone to waste... You were delicious.'";
icon_state = "monkey_painting";
name = "Mr. Deempisi portrait";
/obj/structure/sign/plaques/deempisi{
pixel_y = 28
},
/turf/open/floor/plating{
@@ -61370,9 +61335,8 @@
/area/science/mixing)
"xJy" = (
/obj/structure/chair/comfy/black,
/obj/structure/sign/plaques/atmos{
/obj/structure/sign/plaques/kiddie{
desc = "An embossed piece of paper from the Third University of Harvard.";
icon_state = "kiddieplaque";
name = "\improper 'Diploma' frame";
pixel_y = 32
},
_maps/map_files/generic/CentCom.dmm
-1
View File
@@ -8571,7 +8571,6 @@
pixel_y = -2
},
/obj/item/toy/cards/deck/syndicate{
icon_state = "deck_syndicate_full";
pixel_x = -6;
pixel_y = 6
},
_maps/shuttles/emergency_bar.dmm
+1 -2
View File
@@ -178,8 +178,7 @@
/area/shuttle/escape)
"aF" = (
/obj/structure/piano{
icon_state = "piano";
name = "space piano"
icon_state = "piano"
},
/turf/open/floor/plasteel/grimy,
/area/shuttle/escape)
_maps/shuttles/emergency_delta.dmm
-1
View File
@@ -437,7 +437,6 @@
"aJ" = (
/obj/machinery/shower{
dir = 8;
icon_state = "shower";
name = "emergency shower"
},
/obj/effect/turf_decal/tile/blue,
_maps/shuttles/emergency_luxury.dmm
+8 -10
View File
@@ -7,7 +7,7 @@
/area/shuttle/escape/luxury)
"ac" = (
/obj/machinery/door/airlock/external,
/turf/open/floor/plating{
/turf/open/floor/wood{
icon_state = "wood-broken2"
},
/area/shuttle/escape/luxury)
@@ -33,22 +33,20 @@
/turf/open/floor/mineral/gold,
/area/shuttle/escape/luxury)
"af" = (
/turf/open/floor/plating{
/turf/open/floor/wood{
icon_state = "wood-broken3"
},
/area/shuttle/escape/luxury)
"ag" = (
/turf/open/floor/plating{
icon_state = "wood"
},
/turf/open/floor/wood,
/area/shuttle/escape/luxury)
"ah" = (
/turf/open/floor/plating{
/turf/open/floor/wood{
icon_state = "wood-broken"
},
/area/shuttle/escape/luxury)
"ai" = (
/turf/open/floor/plating{
/turf/open/floor/wood{
icon_state = "wood-broken5"
},
/area/shuttle/escape/luxury)
@@ -68,19 +66,19 @@
/turf/open/floor/mineral/gold,
/area/shuttle/escape/luxury)
"am" = (
/turf/open/floor/plating{
/turf/open/floor/wood{
icon_state = "wood-broken7"
},
/area/shuttle/escape/luxury)
"an" = (
/obj/machinery/light/small,
/turf/open/floor/plating{
/turf/open/floor/wood{
icon_state = "wood-broken2"
},
/area/shuttle/escape/luxury)
"ao" = (
/obj/machinery/light/small,
/turf/open/floor/plating{
/turf/open/floor/wood{
icon_state = "wood-broken6"
},
/area/shuttle/escape/luxury)
_maps/shuttles/emergency_omega.dmm
-1
View File
@@ -699,7 +699,6 @@
"bh" = (
/obj/machinery/shower{
dir = 4;
icon_state = "shower";
name = "emergency shower"
},
/obj/effect/turf_decal/tile/blue{
_maps/shuttles/emergency_raven.dmm
-1
View File
@@ -290,7 +290,6 @@
"aH" = (
/obj/machinery/shower{
dir = 4;
icon_state = "shower";
name = "emergency shower"
},
/obj/effect/turf_decal/tile/purple{
_maps/shuttles/infiltrator_basic.dmm
+2 -5
View File
@@ -505,11 +505,8 @@
/turf/open/floor/plasteel/dark,
/area/shuttle/syndicate/airlock)
"bd" = (
/obj/structure/sign/warning/securearea{
desc = "A warning sign which reads 'EXTERNAL AIRLOCK'";
icon_state = "space";
layer = 4;
name = "EXTERNAL AIRLOCK"
/obj/structure/sign/warning/vacuum/external{
layer = 4
},
/turf/closed/wall/mineral/plastitanium,
/area/shuttle/syndicate/airlock)
_maps/shuttles/whiteship_cere.dmm
-1
View File
@@ -35,7 +35,6 @@
/area/shuttle/abandoned)
"ae" = (
/obj/machinery/mech_bay_recharge_port{
icon_state = "recharge_port";
dir = 2
},
/obj/effect/decal/cleanable/dirt{
_maps/templates/medium_shuttle2.dmm
-1
View File
@@ -93,7 +93,6 @@
/area/ruin/powered/shuttle/medium_2)
"t" = (
/obj/machinery/sleeper{
icon_state = "sleeper";
dir = 1
},
/obj/effect/turf_decal/tile/blue{
_maps/templates/medium_shuttle4.dmm
-1
View File
@@ -49,7 +49,6 @@
/area/ruin/powered/shuttle/medium_4)
"l" = (
/obj/structure/chair/old{
icon_state = "chairold";
dir = 1
},
/turf/open/floor/oldshuttle,
_maps/templates/shelter_2.dmm
+2 -8
View File
@@ -64,7 +64,6 @@
"n" = (
/obj/structure/window/reinforced/survival_pod{
dir = 8;
icon_state = "pwindow";
layer = 3
},
/obj/machinery/door/window/survival_pod{
@@ -81,7 +80,6 @@
name = "lusty xenomorph maid"
},
/obj/structure/window/reinforced/survival_pod{
icon_state = "pwindow";
dir = 1
},
/turf/open/floor/carpet/black,
@@ -101,8 +99,7 @@
/area/survivalpod)
"r" = (
/obj/structure/window/reinforced/survival_pod{
dir = 8;
icon_state = "pwindow"
dir = 8
},
/turf/open/floor/carpet/black,
/area/survivalpod)
@@ -127,7 +124,6 @@
pixel_y = -2
},
/obj/structure/window/reinforced/survival_pod{
icon_state = "pwindow";
dir = 1
},
/obj/structure/table/wood/fancy/black{
@@ -144,7 +140,6 @@
/area/survivalpod)
"v" = (
/obj/structure/window/reinforced/survival_pod{
icon_state = "pwindow";
dir = 1
},
/obj/structure/displaycase{
@@ -159,8 +154,7 @@
"w" = (
/obj/structure/window/reinforced/survival_pod{
density = 0;
dir = 9;
icon_state = "pwindow"
dir = 9
},
/turf/open/floor/carpet/black,
/area/survivalpod)
code/game/objects/items/devices/flashlight.dm
+2
View File
@@ -17,6 +17,8 @@
/obj/item/flashlight/Initialize()
. = ..()
if(icon_state == "[initial(icon_state)]-on")
on = TRUE
update_brightness()
/obj/item/flashlight/proc/update_brightness(mob/user = null)
code/game/objects/items/toys.dm
+1
View File
@@ -949,6 +949,7 @@
/obj/item/toy/cards/deck/syndicate
name = "suspicious looking deck of cards"
desc = "A deck of space-grade playing cards. They seem unusually rigid."
icon_state = "deck_syndicate_full"
deckstyle = "syndicate"
card_hitsound = 'sound/weapons/bladeslice.ogg'
card_force = 5
code/game/objects/structures/musician.dm
+1 -1
View File
@@ -335,7 +335,7 @@
..()
song = new("piano", src)
if(prob(50))
if(prob(50) && icon_state == initial(icon_state))
name = "space minimoog"
desc = "This is a minimoog, like a space piano, but more spacey!"
icon_state = "minimoog"
code/game/objects/structures/signs/signs_plaques.dm
+6
View File
@@ -41,3 +41,9 @@
/obj/structure/sign/plaques/kiddie/perfect_drone
name = "\improper 'Perfect Drone' sign"
desc = "A guide to the drone shell dispenser, detailing the constructive and destructive applications of modern repair drones, as well as the development of the incorruptible cyborg servants of tomorrow, available today."
/obj/structure/sign/plaques/deempisi
name = "Mr. Deempisi portrait"
desc = "Under the painting a plaque reads: 'While the meat grinder may not have spared you, fear not. Not one part of you has gone to waste... You were delicious.'"
icon_state = "monkey_painting"
code/modules/holodeck/turfs.dm
+4
View File
@@ -119,6 +119,10 @@
if(intact)
queue_smooth(src)
/turf/open/floor/holofloor/wood
icon_state = "wood"
tiled_dirt = FALSE
/turf/open/floor/holofloor/snow
gender = PLURAL
name = "snow"
code/modules/hydroponics/grown/towercap.dm
+9 -4
View File
@@ -110,12 +110,17 @@
anchored = TRUE
buckle_lying = 0
var/burning = 0
var/burn_icon = "bonfire_on_fire" //for a softer more burning embers icon, use "bonfire_warm"
var/grill = FALSE
var/fire_stack_strength = 5
/obj/structure/bonfire/dense
density = TRUE
/obj/structure/bonfire/prelit/Initialize()
. = ..()
StartBurning()
/obj/structure/bonfire/CanPass(atom/movable/mover, turf/target)
if(istype(mover) && (mover.pass_flags & PASSTABLE))
return TRUE
@@ -183,13 +188,13 @@
if(O.air)
var/loc_gases = O.air.gases
if(loc_gases[/datum/gas/oxygen][MOLES] > 13)
return 1
return 0
return TRUE
return FALSE
/obj/structure/bonfire/proc/StartBurning()
if(!burning && CheckOxygen())
icon_state = "bonfire_on_fire"
burning = 1
icon_state = burn_icon
burning = TRUE
set_light(6)
Burn()
START_PROCESSING(SSobj, src)