Merge remote-tracking branch 'origin/master' into hardsync-1.5

This commit is contained in:
Letter N
2021-03-03 17:09:01 +08:00
122 changed files with 2913 additions and 1722 deletions

View File

@@ -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" = (

View File

@@ -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
"}

View File

@@ -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" = (