mirror of
https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git
synced 2025-12-09 16:07:40 +00:00
Merge remote-tracking branch 'origin/master' into hardsync-1.5
This commit is contained in:
@@ -294,7 +294,7 @@
|
||||
/turf/template_noop,
|
||||
/area/space/nearstation)
|
||||
"N" = (
|
||||
/obj/item/book/random/triple,
|
||||
/obj/item/book/random,
|
||||
/turf/open/floor/plasteel,
|
||||
/area/ruin/space/has_grav/powered/ancient_shuttle)
|
||||
"O" = (
|
||||
|
||||
@@ -413,10 +413,6 @@
|
||||
/obj/item/toy/figure/chef,
|
||||
/turf/open/floor/wood,
|
||||
/area/awaymission/jungleresort)
|
||||
"gC" = (
|
||||
/obj/item/clothing/head/rice_hat/cursed,
|
||||
/turf/open/floor/plating/dirt/jungle,
|
||||
/area/awaymission/jungleresort)
|
||||
"gK" = (
|
||||
/obj/structure/table/wood,
|
||||
/obj/item/gun/ballistic/automatic/c20r/toy/unrestricted,
|
||||
@@ -13828,7 +13824,7 @@ io
|
||||
du
|
||||
YF
|
||||
io
|
||||
gC
|
||||
io
|
||||
io
|
||||
io
|
||||
ia
|
||||
@@ -26666,4 +26662,3 @@ bG
|
||||
bG
|
||||
bG
|
||||
"}
|
||||
|
||||
|
||||
@@ -42885,7 +42885,7 @@
|
||||
/area/science/xenobiology)
|
||||
"bPd" = (
|
||||
/obj/structure/table/reinforced,
|
||||
/obj/item/book/random/triple,
|
||||
/obj/item/book/random,
|
||||
/turf/open/floor/engine,
|
||||
/area/science/xenobiology)
|
||||
"bPe" = (
|
||||
|
||||
Reference in New Issue
Block a user