cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
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
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765

Browse Source
This commit is contained in:
Ghommie
2020-06-23 00:13:14 +02:00
parent 9a9e76664f a0a4007332
commit de77b7139c
727 changed files with 240611 additions and 242127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
_maps/RandomRuins/SpaceRuins/TheDerelict.dmm
View File

@@ -2368,7 +2368,7 @@
/turf/open/floor/plasteel/airless/white,
/area/ruin/space/derelict/medical)
"hW" = (
/obj/item/stack/medical/bruise_pack,
/obj/item/stack/medical/suture,
/turf/open/floor/plasteel/airless/white,
/area/ruin/space/derelict/medical)
"hX" = (
@@ -2610,13 +2610,13 @@
/turf/open/floor/plasteel/airless/white,
/area/ruin/space/derelict/medical)
"iM" = (
/obj/item/stack/medical/bruise_pack,
/obj/item/stack/medical/suture,
/turf/open/floor/plasteel/airless{
icon_state = "damaged2"
},
/area/ruin/space/derelict/medical)
"iN" = (
/obj/item/stack/medical/ointment,
/obj/item/stack/medical/mesh,
/turf/open/floor/plasteel/airless{
icon_state = "damaged3"
},
@@ -2866,7 +2866,7 @@
/turf/open/floor/plasteel/airless/white,
/area/ruin/space/derelict/medical)
"jB" = (
/obj/item/stack/medical/ointment,
/obj/item/stack/medical/mesh,
/turf/open/floor/plasteel/airless/white,
/area/ruin/space/derelict/medical)
"jC" = (

2
_maps/RandomRuins/SpaceRuins/oldstation.dmm
View File

@@ -843,7 +843,7 @@
/area/ruin/space/has_grav/ancientstation/deltacorridor)
"cx" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/stack/medical/bruise_pack,
/obj/item/stack/medical/suture,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/ancientstation/deltacorridor)