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/RandomZLevels/VR/syndicate_trainer.dmm
+2 -2
View File
@@ -1370,7 +1370,7 @@
/turf/open/indestructible,
/area/awaymission/centcomAway/general)
"hW" = (
/obj/item/twohanded/required/kirbyplants,
/obj/item/kirbyplants,
/turf/open/indestructible,
/area/awaymission/centcomAway/general)
"hX" = (
@@ -1951,7 +1951,7 @@
"lv" = (
/obj/structure/rack,
/obj/item/restraints/legcuffs/beartrap,
/obj/item/twohanded/fireaxe,
/obj/item/fireaxe,
/turf/open/indestructible,
/area/awaymission/centcomAway/thunderdome)
"lw" = (
_maps/RandomZLevels/away_mission/SnowCabin.dmm
+1 -1
View File
@@ -1412,7 +1412,7 @@
/area/awaymission/cabin/snowforest)
"eA" = (
/obj/structure/table/wood,
/obj/item/twohanded/required/chainsaw,
/obj/item/chainsaw,
/turf/open/floor/wood/cold,
/area/awaymission/cabin/lumbermill)
"eB" = (
_maps/RandomZLevels/away_mission/moonoutpost19.dmm
+2 -2
View File
@@ -4746,7 +4746,7 @@
},
/area/awaymission/moonoutpost19/research)
"jq" = (
/obj/item/twohanded/required/kirbyplants{
/obj/item/kirbyplants{
desc = "A plastic potted plant.";
pixel_y = 3
},
@@ -6936,7 +6936,7 @@
},
/area/awaymission/moonoutpost19/arrivals)
"ob" = (
/obj/item/twohanded/required/kirbyplants{
/obj/item/kirbyplants{
desc = "A plastic potted plant.";
pixel_y = 3
},
_maps/RandomZLevels/away_mission/research.dmm
+9 -9
View File
@@ -117,7 +117,7 @@
/turf/open/floor/plasteel/white,
/area/awaymission/research/interior/engineering)
"ax" = (
/obj/item/twohanded/required/kirbyplants{
/obj/item/kirbyplants{
icon_state = "plant-20";
pixel_y = 3
},
@@ -1753,7 +1753,7 @@
/turf/open/floor/plasteel/dark,
/area/awaymission/research/interior/secure)
"dN" = (
/obj/item/twohanded/required/kirbyplants{
/obj/item/kirbyplants{
icon_state = "plant-16"
},
/obj/effect/turf_decal/tile/purple{
@@ -4125,7 +4125,7 @@
/turf/open/floor/plasteel,
/area/awaymission/research/interior/genetics)
"hV" = (
/obj/item/twohanded/required/kirbyplants{
/obj/item/kirbyplants{
icon_state = "plant-10"
},
/obj/effect/turf_decal/tile/purple{
@@ -4220,7 +4220,7 @@
/turf/open/floor/plasteel,
/area/awaymission/research/interior/security)
"ii" = (
/obj/item/twohanded/required/kirbyplants{
/obj/item/kirbyplants{
desc = "A potted plant, it doesn't look very healthy...";
name = "dead potted plant"
},
@@ -4701,7 +4701,7 @@
/turf/open/floor/wood,
/area/awaymission/research/interior/dorm)
"jm" = (
/obj/item/twohanded/required/kirbyplants{
/obj/item/kirbyplants{
icon_state = "plant-14"
},
/turf/open/floor/plasteel/yellowsiding{
@@ -5305,7 +5305,7 @@
/turf/open/floor/plating,
/area/awaymission/research/interior/medbay)
"kC" = (
/obj/item/twohanded/required/kirbyplants{
/obj/item/kirbyplants{
icon_state = "plant-22"
},
/turf/open/floor/plasteel/yellowsiding{
@@ -5662,7 +5662,7 @@
/turf/open/floor/plasteel/white,
/area/awaymission/research/interior/medbay)
"ly" = (
/obj/item/twohanded/required/kirbyplants{
/obj/item/kirbyplants{
icon_state = "plant-16"
},
/turf/open/floor/plasteel/yellowsiding{
@@ -6140,7 +6140,7 @@
/turf/open/floor/plasteel/white,
/area/awaymission/research/interior/escapepods)
"mJ" = (
/obj/item/twohanded/required/kirbyplants,
/obj/item/kirbyplants,
/obj/effect/turf_decal/tile/green{
dir = 1
},
@@ -6177,7 +6177,7 @@
/turf/open/floor/grass,
/area/awaymission/research/interior/escapepods)
"mN" = (
/obj/item/twohanded/required/kirbyplants{
/obj/item/kirbyplants{
icon_state = "applebush"
},
/obj/effect/turf_decal/tile/green,
_maps/RandomZLevels/away_mission/undergroundoutpost45.dmm
+7 -7
View File
@@ -1434,7 +1434,7 @@
},
/area/awaymission/undergroundoutpost45/central)
"do" = (
/obj/item/twohanded/required/kirbyplants{
/obj/item/kirbyplants{
layer = 5
},
/obj/effect/decal/cleanable/dirt,
@@ -2941,7 +2941,7 @@
},
/area/awaymission/undergroundoutpost45/central)
"fT" = (
/obj/item/twohanded/required/kirbyplants{
/obj/item/kirbyplants{
layer = 5
},
/obj/effect/decal/cleanable/dirt,
@@ -5051,7 +5051,7 @@
},
/area/awaymission/undergroundoutpost45/gateway)
"kh" = (
/obj/item/twohanded/required/kirbyplants{
/obj/item/kirbyplants{
layer = 5
},
/obj/effect/decal/cleanable/dirt,
@@ -6673,7 +6673,7 @@
/area/awaymission/undergroundoutpost45/research)
"mQ" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/twohanded/required/kirbyplants{
/obj/item/kirbyplants{
layer = 5
},
/turf/open/floor/plasteel/cafeteria{
@@ -8260,7 +8260,7 @@
},
/area/awaymission/undergroundoutpost45/research)
"pl" = (
/obj/item/twohanded/required/kirbyplants{
/obj/item/kirbyplants{
layer = 5
},
/obj/effect/decal/cleanable/dirt,
@@ -9321,7 +9321,7 @@
},
/area/awaymission/undergroundoutpost45/engineering)
"rk" = (
/obj/item/twohanded/required/kirbyplants{
/obj/item/kirbyplants{
layer = 5
},
/obj/effect/turf_decal/tile/yellow{
@@ -12227,7 +12227,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/obj/item/twohanded/required/kirbyplants{
/obj/item/kirbyplants{
layer = 5
},
/obj/effect/decal/cleanable/dirt,