Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/shiptest-ss13/Shiptest in…
Browse files Browse the repository at this point in the history
…to komodo-fixies
  • Loading branch information
axelzonvolt committed Nov 3, 2023
2 parents d64fb3f + 17c432f commit fd1fecd
Show file tree
Hide file tree
Showing 389 changed files with 6,311 additions and 9,084 deletions.
27 changes: 24 additions & 3 deletions _maps/RandomRuins/JungleRuins/jungle_demon.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@
/area/ruin/powered)
"pm" = (
/obj/structure/table/reinforced,
/obj/item/upgradescroll,
/obj/item/paper,
/turf/open/floor/plasteel/dark,
/area/ruin/powered)
"pE" = (
Expand Down Expand Up @@ -220,9 +220,27 @@
/turf/open/floor/plasteel/dark,
/area/ruin/powered)
"tR" = (
/obj/structure/closet/gimmick/tacticool,
/obj/structure/railing{
dir = 8
},
/obj/item/clothing/shoes/jackboots,
/obj/item/clothing/mask/gas/syndicate,
/obj/item/clothing/under/syndicate,
/obj/structure/closet/syndicate{
desc = "It's a basic storage unit.";
name = "uniform closet"
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/blood/old,
/obj/item/clothing/under/syndicate,
/obj/item/clothing/shoes/jackboots,
/obj/item/clothing/mask/gas/syndicate,
/obj/item/clothing/head/helmet/operator,
/obj/item/clothing/head/helmet/operator,
/obj/item/clothing/suit/armor/vest/syndie,
/obj/item/clothing/suit/armor/vest/syndie,
/obj/item/clothing/gloves/combat,
/obj/item/clothing/gloves/combat,
/turf/open/floor/plasteel/dark,
/area/ruin/powered)
"uj" = (
Expand Down Expand Up @@ -494,8 +512,11 @@
/turf/open/floor/plasteel/dark,
/area/ruin/powered)
"PA" = (
/obj/machinery/suit_storage_unit/syndicate,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/suit_storage_unit/inherit,
/obj/item/clothing/suit/space/hardsuit/syndi/scarlet,
/obj/item/clothing/mask/breath,
/obj/item/tank/internals/oxygen/red,
/turf/open/floor/plasteel/dark,
/area/ruin/powered)
"QI" = (
Expand Down
Loading

0 comments on commit fd1fecd

Please sign in to comment.