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

Merge remote-tracking branch 'origin/master' into TGUI-3.0

Browse Source
This commit is contained in:
Artur
2020-07-02 23:23:47 +03:00
parent f46d0b9409 382bcfa777
commit 6ee1eba56c
190 changed files with 4635 additions and 3663 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/BoxStation/BoxStation.dmm
+17 -17
View File
@@ -17691,7 +17691,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 9
},
/obj/item/twohanded/required/kirbyplants{
/obj/item/kirbyplants{
icon_state = "plant-20"
},
/turf/open/floor/plasteel,
@@ -21029,7 +21029,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 4
},
/obj/item/twohanded/required/kirbyplants{
/obj/item/kirbyplants{
icon_state = "plant-05"
},
/turf/open/floor/plasteel,
@@ -21590,7 +21590,7 @@
dir = 1;
pixel_y = -24
},
/obj/item/twohanded/required/kirbyplants{
/obj/item/kirbyplants{
icon_state = "plant-08"
},
/turf/open/floor/wood,
@@ -24147,7 +24147,7 @@
/obj/effect/turf_decal/tile/purple{
dir = 8
},
/obj/item/twohanded/required/kirbyplants{
/obj/item/kirbyplants{
icon_state = "plant-13"
},
/turf/open/floor/plasteel,
@@ -24196,7 +24196,7 @@
/obj/effect/turf_decal/tile/purple{
dir = 8
},
/obj/item/twohanded/required/kirbyplants{
/obj/item/kirbyplants{
icon_state = "plant-10"
},
/turf/open/floor/plasteel,
@@ -29753,7 +29753,7 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/obj/item/twohanded/required/kirbyplants{
/obj/item/kirbyplants{
icon_state = "plant-16"
},
/turf/open/floor/plasteel/white,
@@ -33842,7 +33842,7 @@
/obj/machinery/light_switch{
pixel_y = -23
},
/obj/item/twohanded/required/kirbyplants/dead,
/obj/item/kirbyplants/dead,
/turf/open/floor/plasteel/cafeteria,
/area/crew_quarters/heads/hor)
"bCg" = (
@@ -39007,7 +39007,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/obj/item/twohanded/required/kirbyplants,
/obj/item/kirbyplants,
/turf/open/floor/plasteel/white/side{
dir = 1
},
@@ -48276,8 +48276,8 @@
/obj/structure/cable{
icon_state = "1-2"
},
/obj/item/twohanded/rcl/pre_loaded,
/obj/item/twohanded/rcl/pre_loaded,
/obj/item/rcl/pre_loaded,
/obj/item/rcl/pre_loaded,
/turf/open/floor/plasteel,
/area/engine/engineering)
"cnB" = (
@@ -52007,7 +52007,7 @@
/obj/structure/table/reinforced,
/obj/machinery/cell_charger,
/obj/item/stock_parts/cell/high/plus,
/obj/item/twohanded/rcl/pre_loaded,
/obj/item/rcl/pre_loaded,
/turf/open/floor/plasteel,
/area/crew_quarters/heads/chief)
"cBN" = (
@@ -53727,7 +53727,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/obj/item/twohanded/required/kirbyplants{
/obj/item/kirbyplants{
icon_state = "plant-04"
},
/turf/open/floor/plasteel/white,
@@ -53860,7 +53860,7 @@
/turf/open/floor/plating,
/area/crew_quarters/fitness)
"exP" = (
/obj/item/twohanded/required/kirbyplants{
/obj/item/kirbyplants{
icon_state = "plant-14"
},
/turf/open/floor/plasteel,
@@ -54206,7 +54206,7 @@
/obj/effect/turf_decal/tile/blue{
dir = 4
},
/obj/item/twohanded/required/kirbyplants{
/obj/item/kirbyplants{
icon_state = "plant-06"
},
/turf/open/floor/plasteel/white/corner{
@@ -54404,7 +54404,7 @@
/obj/effect/turf_decal/stripes/line{
dir = 10
},
/obj/item/twohanded/required/kirbyplants{
/obj/item/kirbyplants{
icon_state = "plant-18"
},
/turf/open/floor/plasteel,
@@ -56365,7 +56365,7 @@
/turf/open/floor/plasteel,
/area/security/processing)
"lPr" = (
/obj/item/twohanded/required/kirbyplants{
/obj/item/kirbyplants{
icon_state = "applebush"
},
/turf/open/floor/plasteel,
@@ -57945,7 +57945,7 @@
/turf/open/floor/carpet,
/area/crew_quarters/theatre)
"qTV" = (
/obj/item/twohanded/required/kirbyplants{
/obj/item/kirbyplants{
icon_state = "plant-22"
},
/turf/open/floor/plasteel/white,