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

fixing cfc ship, light sprites

Browse Source 
- brough back better lightbulb sprites
- slightly fixed cfc ship (it still can't seem to move)
This commit is contained in:
evilew
2024-11-20 16:11:50 +01:00
parent bdccf133cb
commit f9e6623372
3 changed files with 101 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GainStation13/icons/obj/lighting.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 77 KiB

_maps/RandomRuins/SpaceRuins/whiteship_CFC01.dmm
+96 -142
View File
@@ -95,18 +95,7 @@
/obj/structure/fans/tiny,
/obj/effect/mapping_helpers/airlock/cyclelink_helper,
/obj/docking_port/mobile{
callTime = 250;
can_move_docking_ports = 1;
dheight = 0;
dir = 2;
dwidth = 11;
height = 17;
launch_status = 0;
movement_force = list("KNOCKDOWN"=0,"THROW"=0);
name = "Salvage Ship";
port_direction = 8;
preferred_direction = 4;
width = 33
dir = 2
},
/turf/open/floor/mineral/basaltstone_floor,
/area/shuttle/abandoned/crew{
@@ -136,14 +125,10 @@
ambientsounds = list('sound/ambience/ambinice.ogg','sound/ambience/ambigen1.ogg','sound/ambience/ambigen3.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg','sound/ambience/ambigen6.ogg','sound/ambience/ambigen7.ogg','sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg','sound/ambience/ambigen12.ogg','sound/ambience/ambigen14.ogg','sound/ambience/ambigen15.ogg')
})
"ak" = (
/obj/structure/sign/poster/contraband/communist_state{
pixel_y = -32
},
/obj/effect/turf_decal/tile/bar,
/obj/effect/turf_decal/tile/bar{
dir = 1
},
/obj/item/kirbyplants/random,
/obj/effect/turf_decal/stripes/corner,
/obj/machinery/power/apc{
name = "Food Hall APC";
@@ -195,20 +180,14 @@
ambientsounds = list('sound/ambience/ambinice.ogg','sound/ambience/ambigen1.ogg','sound/ambience/ambigen3.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg','sound/ambience/ambigen6.ogg','sound/ambience/ambigen7.ogg','sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg','sound/ambience/ambigen12.ogg','sound/ambience/ambigen14.ogg','sound/ambience/ambigen15.ogg')
})
"aq" = (
/obj/effect/decal/cleanable/dirt{
desc = "A thin layer of dust coating the floor.";
name = "dust"
/obj/structure/sign/barsign{
req_access = null;
req_access_txt = "0";
name = "Restaurant Sign"
},
/obj/effect/turf_decal/bot_white,
/obj/machinery/door/poddoor{
id = "whiteship_starboard"
},
/obj/structure/fans/tiny,
/obj/structure/fans/tiny,
/obj/effect/turf_decal/delivery,
/turf/open/floor/plating,
/area/shuttle/abandoned/bar{
name = "Kitchen";
/turf/closed/wall/mineral/titanium,
/area/shuttle/abandoned/cargo{
name = "Food Hall";
ambientsounds = list('sound/ambience/ambinice.ogg','sound/ambience/ambigen1.ogg','sound/ambience/ambigen3.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg','sound/ambience/ambigen6.ogg','sound/ambience/ambigen7.ogg','sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg','sound/ambience/ambigen12.ogg','sound/ambience/ambigen14.ogg','sound/ambience/ambigen15.ogg')
})
"ar" = (
@@ -348,6 +327,7 @@
/obj/machinery/light{
dir = 8
},
/obj/machinery/computer/arcade/orion_trail,
/turf/open/floor/plasteel/dark,
/area/shuttle/abandoned/cargo{
name = "Food Hall";
@@ -505,9 +485,6 @@
})
"aO" = (
/obj/effect/turf_decal/bot,
/obj/structure/window/reinforced{
dir = 4
},
/obj/structure/reagent_dispensers/fueltank,
/obj/item/clothing/head/welding{
pixel_x = -2;
@@ -742,10 +719,7 @@
ambientsounds = list('sound/ambience/ambinice.ogg','sound/ambience/ambigen1.ogg','sound/ambience/ambigen3.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg','sound/ambience/ambigen6.ogg','sound/ambience/ambigen7.ogg','sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg','sound/ambience/ambigen12.ogg','sound/ambience/ambigen14.ogg','sound/ambience/ambigen15.ogg')
})
"bc" = (
/obj/item/kirbyplants/random{
pixel_y = 12
},
/turf/open/floor/mineral/basaltstone_floor,
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/shuttle/abandoned/crew{
name = "Arrival Hallway";
ambientsounds = list('sound/ambience/ambinice.ogg','sound/ambience/ambigen1.ogg','sound/ambience/ambigen3.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg','sound/ambience/ambigen6.ogg','sound/ambience/ambigen7.ogg','sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg','sound/ambience/ambigen12.ogg','sound/ambience/ambigen14.ogg','sound/ambience/ambigen15.ogg')
@@ -792,7 +766,10 @@
/obj/effect/turf_decal/stripes/corner{
dir = 1
},
/obj/machinery/vending/coffee,
/obj/machinery/vending/snack/random{
extended_inventory = 1;
free = 1
},
/turf/open/floor/plasteel,
/area/shuttle/abandoned/cargo{
name = "Food Hall";
@@ -808,10 +785,7 @@
name = "Window Blast Door Control";
pixel_y = -24
},
/obj/machinery/vending/snack/random{
extended_inventory = 1;
free = 1
},
/obj/machinery/vending/mealdor,
/turf/open/floor/plasteel,
/area/shuttle/abandoned/cargo{
name = "Food Hall";
@@ -875,6 +849,9 @@
/obj/structure/window/reinforced/tinted{
dir = 8
},
/obj/structure/window/reinforced{
dir = 8
},
/turf/open/floor/plasteel/freezer,
/area/shuttle/abandoned/bar{
name = "Kitchen";
@@ -1008,7 +985,6 @@
/obj/effect/turf_decal/tile/bar{
dir = 1
},
/obj/item/kirbyplants/random,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1,
/turf/open/floor/plasteel,
/area/shuttle/abandoned/cargo{
@@ -1043,12 +1019,12 @@
dir = 4
},
/obj/vehicle/ridden/grocery_cart,
/obj/machinery/light/small{
pixel_x = 16
},
/obj/structure/sign/poster/contraband/shamblers_juice{
pixel_y = -32
},
/obj/machinery/light/small{
pixel_x = 16
},
/turf/open/floor/plasteel/checker,
/area/shuttle/abandoned/crew{
name = "Arrival Hallway";
@@ -1163,7 +1139,7 @@
})
"bQ" = (
/obj/structure/sign/poster/contraband/chefpropaganda,
/turf/closed/wall/mineral/titanium,
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/shuttle/abandoned/bar{
name = "Kitchen";
ambientsounds = list('sound/ambience/ambinice.ogg','sound/ambience/ambigen1.ogg','sound/ambience/ambigen3.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg','sound/ambience/ambigen6.ogg','sound/ambience/ambigen7.ogg','sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg','sound/ambience/ambigen12.ogg','sound/ambience/ambigen14.ogg','sound/ambience/ambigen15.ogg')
@@ -1248,7 +1224,9 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
dir = 5
},
/obj/structure/scale,
/obj/structure/scale{
name = "discount counter"
},
/turf/open/floor/plasteel,
/area/shuttle/abandoned/cargo{
name = "Food Hall";
@@ -1258,7 +1236,7 @@
/obj/structure/sign/warning/docking{
name = "\improper KEEP CLEAR: BLAST DOORS"
},
/turf/closed/wall/mineral/titanium,
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/shuttle/abandoned/bar{
name = "Kitchen";
ambientsounds = list('sound/ambience/ambinice.ogg','sound/ambience/ambigen1.ogg','sound/ambience/ambigen3.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg','sound/ambience/ambigen6.ogg','sound/ambience/ambigen7.ogg','sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg','sound/ambience/ambigen12.ogg','sound/ambience/ambigen14.ogg','sound/ambience/ambigen15.ogg')
@@ -1418,10 +1396,6 @@
/obj/effect/turf_decal/tile/blue{
dir = 8
},
/obj/structure/table/reinforced,
/obj/machinery/recharger{
pixel_x = -14
},
/obj/machinery/airalarm/all_access{
pixel_y = 24
},
@@ -1438,17 +1412,14 @@
pixel_y = -5;
pixel_x = 5
},
/obj/item/paper{
pixel_x = -7;
pixel_y = 3;
name = "Radio Network Manual";
info = "<B>RADIO NETWORK MANUAL</B><BR><BR><BR>Every order intercom is set on 145.3 frequency by default. There are 6 of them, 0-5. It is recommended that you familiarize yourself with the layout of these tables for more efficient ship operation.<BR><BR>The general radio broadcast channel is for communicating with nearby crafts and stations. May be used for advertising purposes. It is recommended to temporary mute the order receiver intercom when preparing for general broadcast, as orders may interrupt your transmission."
},
/obj/effect/turf_decal/tile/blue,
/obj/effect/turf_decal/stripes{
icon_state = "trim";
dir = 5
},
/obj/machinery/computer/shuttle/white_ship{
dir = 8
},
/turf/open/floor/plasteel/dark,
/area/shuttle/abandoned/bridge{
name = "Bridge";
@@ -1495,10 +1466,6 @@
},
/obj/structure/table,
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
/obj/item/stock_parts/cell/high{
pixel_y = 9;
pixel_x = 4
},
/obj/structure/cable,
/obj/item/circuitboard/machine/chem_dispenser{
pixel_x = -7;
@@ -1510,9 +1477,6 @@
pixel_x = 24
},
/obj/effect/turf_decal/delivery,
/obj/machinery/light{
dir = 4
},
/obj/machinery/cell_charger,
/obj/item/stock_parts/cell/high/plus,
/obj/item/radio/off{
@@ -1520,6 +1484,9 @@
pixel_y = 0;
name = "radio"
},
/obj/machinery/light/small{
dir = 4
},
/turf/open/floor/plating,
/area/shuttle/abandoned/engine{
name = "Engineering";
@@ -1617,9 +1584,10 @@
name = "drain";
dir = 1
},
/obj/machinery/door/window/westleft{
/obj/machinery/door/window/westright{
dir = 2;
name = "Drinks Access"
name = "Drinks Access";
icon_state = "left"
},
/turf/open/floor/plasteel,
/area/shuttle/abandoned/bar{
@@ -1632,7 +1600,8 @@
dir = 4
},
/obj/machinery/door/window/westright{
dir = 2
dir = 2;
name = "Drinks Access"
},
/obj/machinery/chem_dispenser/drinks/fullupgrade{
dir = 8
@@ -1807,10 +1776,12 @@
name = "paper - printed note";
info = "<B>Hello lucky soul!</B><BR><BR>I'm Cynthia! More precisely, one of the Autonomous Spacefearring Nutrision Distribution Centers (A.S.N.D.)! One of the Cynthia Fitness Corporation most advanced public assets! I don't have much time, so I'll make it quick! I got hit by a solar flare, lost contact with CFC, and soon being offline from hivemind will trigger my termination protocols as I no longer be the Cynthia!<BR><BR>I'm asking for one thing! Please, continue my mission! Bring 'healthy' yummies to whoever wants (or needs, by your judgment)! CFC will be grateful for your service! Make me proud of you, random explorer!<BR><BR><BR><BR>((PS. Remember my company policy! Clients with BMI equal or higher than 35 gets at least triple servings!))"
},
/obj/machinery/computer/shuttle/white_ship{
/obj/machinery/computer/camera_advanced/shuttle_docker/whiteship{
designate_time = 100;
dir = 8;
name = "A.S.N.D. Console";
desc = "Used to control the A.S.N.D. Ship."
view_range = 14;
x_offset = -4;
y_offset = -8
},
/turf/open/floor/plasteel/dark,
/area/shuttle/abandoned/bridge{
@@ -2151,11 +2122,8 @@
/obj/machinery/light{
light_color = "#cee5d2"
},
/obj/machinery/chem_master/condimaster{
name = "CondiMaster Neo";
pixel_x = -4
},
/obj/effect/turf_decal/bot_white,
/obj/machinery/chem_master/condimaster,
/turf/open/floor/plasteel/cafeteria,
/area/shuttle/abandoned/bar{
name = "Kitchen";
@@ -2271,11 +2239,6 @@
ambientsounds = list('sound/ambience/ambinice.ogg','sound/ambience/ambigen1.ogg','sound/ambience/ambigen3.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg','sound/ambience/ambigen6.ogg','sound/ambience/ambigen7.ogg','sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg','sound/ambience/ambigen12.ogg','sound/ambience/ambigen14.ogg','sound/ambience/ambigen15.ogg','sound/ambience/ambigen1.ogg','sound/ambience/ambigen3.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg','sound/ambience/ambigen6.ogg','sound/ambience/ambigen7.ogg','sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg','sound/ambience/ambigen12.ogg','sound/ambience/ambigen14.ogg','sound/ambience/ambigen15.ogg')
})
"cY" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
external_pressure_bound = 140;
name = "server vent";
pressure_checks = 0
},
/obj/effect/turf_decal/stripes/corner{
dir = 1
},
@@ -2283,6 +2246,7 @@
icon_state = "manifold-1";
dir = 4
},
/obj/machinery/atmospherics/components/unary/vent_pump/on,
/turf/open/floor/plating,
/area/shuttle/abandoned/engine{
name = "Engineering";
@@ -2421,6 +2385,7 @@
/obj/structure/window/reinforced,
/obj/machinery/deepfryer,
/obj/machinery/door/firedoor/border_only,
/obj/structure/window/reinforced/tinted,
/turf/open/floor/plasteel/cafeteria,
/area/shuttle/abandoned/bar{
name = "Kitchen";
@@ -2469,6 +2434,7 @@
/obj/item/reagent_containers/food/condiment/milk,
/obj/item/reagent_containers/food/condiment/milk,
/obj/structure/closet/secure_closet/freezer/fridge,
/obj/structure/window/reinforced/tinted,
/turf/open/floor/plasteel/cafeteria,
/area/shuttle/abandoned/bar{
name = "Kitchen";
@@ -2550,7 +2516,7 @@
dir = 4;
pixel_x = -24
},
/obj/machinery/light{
/obj/machinery/light/small{
dir = 8
},
/turf/open/floor/plating,
@@ -2941,9 +2907,6 @@
"dN" = (
/obj/effect/turf_decal/bot_white,
/obj/structure/window/reinforced,
/obj/machinery/door/window/brigdoor/westleft{
name = "Pete Containment Unit"
},
/obj/structure/window/reinforced{
dir = 4
},
@@ -2953,6 +2916,12 @@
/obj/structure/window/reinforced{
dir = 1
},
/obj/structure/window/reinforced/tinted{
dir = 1
},
/obj/machinery/door/window/brigdoor/westleft{
name = "Pete Containment Unit"
},
/turf/open/floor/plasteel/freezer,
/area/shuttle/abandoned/bar{
name = "Kitchen";
@@ -3038,6 +3007,7 @@
/obj/structure/table/reinforced,
/obj/structure/window/reinforced,
/obj/item/reagent_containers/glass/beaker/large,
/obj/structure/window/reinforced/tinted,
/turf/open/floor/plasteel/cafeteria,
/area/shuttle/abandoned/bar{
name = "Kitchen";
@@ -3255,7 +3225,6 @@
id = "whiteship_starboard"
},
/obj/structure/fans/tiny,
/obj/structure/fans/tiny,
/obj/effect/turf_decal/delivery,
/turf/open/floor/plating,
/area/shuttle/abandoned/bar{
@@ -3410,38 +3379,9 @@
name = "Kitchen";
ambientsounds = list('sound/ambience/ambinice.ogg','sound/ambience/ambigen1.ogg','sound/ambience/ambigen3.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg','sound/ambience/ambigen6.ogg','sound/ambience/ambigen7.ogg','sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg','sound/ambience/ambigen12.ogg','sound/ambience/ambigen14.ogg','sound/ambience/ambigen15.ogg')
})
"mR" = (
/obj/structure/window/reinforced,
/obj/effect/turf_decal/tile/bar{
dir = 1
},
/obj/effect/turf_decal/tile/bar,
/obj/machinery/door/firedoor/border_only,
/obj/machinery/vending/cola/blue,
/turf/open/floor/plasteel,
/area/shuttle/abandoned/cargo{
name = "Food Hall";
ambientsounds = list('sound/ambience/ambinice.ogg','sound/ambience/ambigen1.ogg','sound/ambience/ambigen3.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg','sound/ambience/ambigen6.ogg','sound/ambience/ambigen7.ogg','sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg','sound/ambience/ambigen12.ogg','sound/ambience/ambigen14.ogg','sound/ambience/ambigen15.ogg')
})
"nM" = (
/obj/structure/sign/poster/contraband/space_up,
/turf/closed/wall/mineral/titanium,
/area/shuttle/abandoned/cargo{
name = "Food Hall";
ambientsounds = list('sound/ambience/ambinice.ogg','sound/ambience/ambigen1.ogg','sound/ambience/ambigen3.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg','sound/ambience/ambigen6.ogg','sound/ambience/ambigen7.ogg','sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg','sound/ambience/ambigen12.ogg','sound/ambience/ambigen14.ogg','sound/ambience/ambigen15.ogg')
})
"nT" = (
/obj/effect/turf_decal/tile/bar,
/obj/effect/turf_decal/tile/bar{
dir = 1
},
/obj/structure/sign/barsign{
pixel_y = 32;
req_access = null;
req_access_txt = "0";
name = "Restaurant Sign"
},
/turf/open/floor/plasteel,
/area/shuttle/abandoned/cargo{
name = "Food Hall";
ambientsounds = list('sound/ambience/ambinice.ogg','sound/ambience/ambigen1.ogg','sound/ambience/ambigen3.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg','sound/ambience/ambigen6.ogg','sound/ambience/ambigen7.ogg','sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg','sound/ambience/ambigen12.ogg','sound/ambience/ambigen14.ogg','sound/ambience/ambigen15.ogg')
@@ -3529,20 +3469,15 @@
ambientsounds = list('sound/ambience/ambinice.ogg','sound/ambience/ambigen1.ogg','sound/ambience/ambigen3.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg','sound/ambience/ambigen6.ogg','sound/ambience/ambigen7.ogg','sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg','sound/ambience/ambigen12.ogg','sound/ambience/ambigen14.ogg','sound/ambience/ambigen15.ogg')
})
"qY" = (
/obj/effect/turf_decal/tile/bar,
/obj/effect/turf_decal/tile/bar{
dir = 1
},
/obj/machinery/vending/mealdor,
/obj/structure/sign/poster/contraband/eat{
pixel_x = 32
},
/obj/machinery/airalarm/all_access{
pixel_y = 24
},
/turf/open/floor/plasteel,
/area/shuttle/abandoned/cargo{
name = "Food Hall";
/turf/closed/wall/mineral/titanium,
/area/shuttle/abandoned/crew{
name = "Arrival Hallway";
ambientsounds = list('sound/ambience/ambinice.ogg','sound/ambience/ambigen1.ogg','sound/ambience/ambigen3.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg','sound/ambience/ambigen6.ogg','sound/ambience/ambigen7.ogg','sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg','sound/ambience/ambigen12.ogg','sound/ambience/ambigen14.ogg','sound/ambience/ambigen15.ogg')
})
"rT" = (
@@ -3732,9 +3667,6 @@
})
"zn" = (
/obj/effect/turf_decal/bot,
/obj/structure/window/reinforced{
dir = 4
},
/obj/effect/spawner/lootdrop/keg,
/turf/open/floor/plating,
/area/shuttle/abandoned/engine{
@@ -3826,6 +3758,12 @@
name = "Kitchen";
ambientsounds = list('sound/ambience/ambinice.ogg','sound/ambience/ambigen1.ogg','sound/ambience/ambigen3.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg','sound/ambience/ambigen6.ogg','sound/ambience/ambigen7.ogg','sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg','sound/ambience/ambigen12.ogg','sound/ambience/ambigen14.ogg','sound/ambience/ambigen15.ogg')
})
"Cv" = (
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/shuttle/abandoned/cargo{
name = "Food Hall";
ambientsounds = list('sound/ambience/ambinice.ogg','sound/ambience/ambigen1.ogg','sound/ambience/ambigen3.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg','sound/ambience/ambigen6.ogg','sound/ambience/ambigen7.ogg','sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg','sound/ambience/ambigen12.ogg','sound/ambience/ambigen14.ogg','sound/ambience/ambigen15.ogg')
})
"DK" = (
/obj/machinery/hydroponics/constructable,
/obj/effect/turf_decal/tile/green{
@@ -3923,6 +3861,7 @@
pixel_y = -28;
listening = 0
},
/obj/structure/table/wood,
/turf/open/floor/plasteel/dark,
/area/shuttle/abandoned/cargo{
name = "Food Hall";
@@ -4078,6 +4017,12 @@
dir = 8
},
/turf/open/floor/plating,
/area/shuttle/abandoned/engine{
name = "Engineering";
ambientsounds = list('sound/ambience/ambinice.ogg','sound/ambience/ambigen1.ogg','sound/ambience/ambigen3.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg','sound/ambience/ambigen6.ogg','sound/ambience/ambigen7.ogg','sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg','sound/ambience/ambigen12.ogg','sound/ambience/ambigen14.ogg','sound/ambience/ambigen15.ogg','sound/ambience/ambigen1.ogg','sound/ambience/ambigen3.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg','sound/ambience/ambigen6.ogg','sound/ambience/ambigen7.ogg','sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg','sound/ambience/ambigen12.ogg','sound/ambience/ambigen14.ogg','sound/ambience/ambigen15.ogg')
})
"Sc" = (
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/shuttle/abandoned/engine{
name = "Engineering";
ambientsounds = list('sound/ambience/ambinice.ogg','sound/ambience/ambigen1.ogg','sound/ambience/ambigen3.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg','sound/ambience/ambigen6.ogg','sound/ambience/ambigen7.ogg','sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg','sound/ambience/ambigen12.ogg','sound/ambience/ambigen14.ogg','sound/ambience/ambigen15.ogg','sound/ambience/ambigen1.ogg','sound/ambience/ambigen3.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg','sound/ambience/ambigen6.ogg','sound/ambience/ambigen7.ogg','sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg','sound/ambience/ambigen12.ogg','sound/ambience/ambigen14.ogg','sound/ambience/ambigen15.ogg')
@@ -4096,6 +4041,12 @@
},
/obj/item/storage/bag/tray,
/turf/open/floor/plasteel,
/area/shuttle/abandoned/bar{
name = "Kitchen";
ambientsounds = list('sound/ambience/ambinice.ogg','sound/ambience/ambigen1.ogg','sound/ambience/ambigen3.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg','sound/ambience/ambigen6.ogg','sound/ambience/ambigen7.ogg','sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg','sound/ambience/ambigen12.ogg','sound/ambience/ambigen14.ogg','sound/ambience/ambigen15.ogg')
})
"Ts" = (
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/shuttle/abandoned/bar{
name = "Kitchen";
ambientsounds = list('sound/ambience/ambinice.ogg','sound/ambience/ambigen1.ogg','sound/ambience/ambigen3.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg','sound/ambience/ambigen6.ogg','sound/ambience/ambigen7.ogg','sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg','sound/ambience/ambigen12.ogg','sound/ambience/ambigen14.ogg','sound/ambience/ambigen15.ogg')
@@ -4249,6 +4200,9 @@
/obj/structure/window/reinforced/tinted{
dir = 8
},
/obj/structure/window/reinforced{
dir = 8
},
/turf/open/floor/plasteel/freezer,
/area/shuttle/abandoned/bar{
name = "Kitchen";
@@ -4334,7 +4288,7 @@ aG
aG
aG
aG
dW
Sc
kr
kr
kr
@@ -4410,13 +4364,13 @@ hK
aC
aP
bj
aG
Cv
aG
aG
an
an
an
dW
Sc
xu
ds
dK
@@ -4454,8 +4408,8 @@ bT
tC
cz
Hb
dW
dW
Sc
Sc
RP
Yw
bq
@@ -4516,7 +4470,7 @@ an
dv
AV
dZ
aq
ei
"}
(12,1,1) = {"
ae
@@ -4554,7 +4508,7 @@ an
BE
dM
ea
an
Ts
"}
(14,1,1) = {"
af
@@ -4581,8 +4535,8 @@ cU
bn
aV
aK
aG
nT
aq
bP
bZ
cn
cz
@@ -4600,7 +4554,7 @@ aj
aj
aj
aj
aG
Cv
fs
pG
co
@@ -4628,9 +4582,9 @@ aX
cT
dh
dy
Ts
an
an
an
Ts
"}
(18,1,1) = {"
ah
@@ -4654,10 +4608,10 @@ ej
(19,1,1) = {"
He
aj
aj
bc
aZ
bw
aj
bc
qY
df
cr
@@ -4668,7 +4622,7 @@ dS
dA
an
an
an
Ts
"}
(20,1,1) = {"
aj
@@ -4678,7 +4632,7 @@ ao
de
da
aj
mR
Cv
cs
LP
DU
@@ -4711,8 +4665,8 @@ tS
(22,1,1) = {"
aj
aj
aj
bc
ao
de
ai
aj
code/modules/power/lighting.dm
+5 -5
View File
@@ -14,7 +14,7 @@
/obj/item/wallframe/light_fixture
name = "light fixture frame"
desc = "Used for building lights."
icon = 'icons/obj/lighting.dmi'
icon = 'GainStation13/icons/obj/lighting.dmi' //GS13 - sprite change
icon_state = "tube-construct-item"
result_path = /obj/structure/light_construct
inverse = TRUE
@@ -38,7 +38,7 @@
/obj/structure/light_construct
name = "light fixture frame"
desc = "A light fixture under construction."
icon = 'icons/obj/lighting.dmi'
icon = 'GainStation13/icons/obj/lighting.dmi' //GS13 - sprite change
icon_state = "tube-construct-stage1"
anchored = TRUE
layer = WALL_OBJ_LAYER
@@ -178,7 +178,7 @@
// the standard tube light fixture
/obj/machinery/light
name = "light fixture"
icon = 'icons/obj/lighting.dmi'
icon = 'GainStation13/icons/obj/lighting.dmi' //GS13 - sprite change
var/overlayicon = 'icons/obj/lighting_overlay.dmi'
var/base_state = "tube" // base description and icon_state
icon_state = "tube"
@@ -733,7 +733,7 @@
// will fit into empty /obj/machinery/light of the corresponding type
/obj/item/light
icon = 'icons/obj/lighting.dmi'
icon = 'GainStation13/icons/obj/lighting.dmi' //GS13 - sprite change
force = 2
throwforce = 5
w_class = WEIGHT_CLASS_TINY
@@ -839,7 +839,7 @@
/obj/machinery/light/floor
name = "floor light"
icon = 'icons/obj/lighting.dmi'
icon = 'GainStation13/icons/obj/lighting.dmi' //GS13 - sprite change
base_state = "floor" // base description and icon_state
icon_state = "floor"
brightness = 5