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-11 10:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Fixes conflicting IDs on ruined whiteship (#3525)

Browse Source 
* Fixes conflicting IDs

* Fixes conflicting IDs on ruined whiteship
This commit is contained in:
CitadelStationBot
2017-10-21 03:44:47 -05:00
committed by Poojawa
parent 0ad6e36727
commit 1a94726bdc
3 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
_maps/RandomRuins/SpaceRuins/whiteshipruin_box.dmm
View File

@@ -52,7 +52,7 @@
/area/ruin/space/has_grav/whiteship/box) /area/ruin/space/has_grav/whiteship/box)
"ak" = ( "ak" = (
/obj/machinery/computer/pod{ /obj/machinery/computer/pod{
id = "oldship_gun" id = "oldship_ruin_gun"
}, },
/turf/open/floor/mineral/titanium, /turf/open/floor/mineral/titanium,
/area/ruin/space/has_grav/whiteship/box) /area/ruin/space/has_grav/whiteship/box)
@@ -77,13 +77,13 @@
/obj/machinery/mass_driver{ /obj/machinery/mass_driver{
dir = 4; dir = 4;
icon_state = "mass_driver"; icon_state = "mass_driver";
id = "oldship_gun" id = "oldship_ruin_gun"
}, },
/turf/open/floor/plating, /turf/open/floor/plating,
/area/ruin/space/has_grav/whiteship/box) /area/ruin/space/has_grav/whiteship/box)
"aq" = ( "aq" = (
/obj/machinery/door/poddoor{ /obj/machinery/door/poddoor{
id = "oldship_gun"; id = "oldship_ruin_gun";
name = "pod bay door" name = "pod bay door"
}, },
/turf/open/floor/plating, /turf/open/floor/plating,
@@ -128,7 +128,7 @@
/turf/open/floor/mineral/titanium, /turf/open/floor/mineral/titanium,
/area/ruin/space/has_grav/whiteship/box) /area/ruin/space/has_grav/whiteship/box)
"ax" = ( "ax" = (
/obj/machinery/computer/camera_advanced/shuttle_docker/whiteship{ /obj/machinery/computer/camera_advanced/shuttle_docker/whiteship/ruin{
view_range = 18 view_range = 18
}, },
/turf/open/floor/mineral/titanium, /turf/open/floor/mineral/titanium,
@@ -211,7 +211,7 @@
/turf/open/floor/mineral/titanium, /turf/open/floor/mineral/titanium,
/area/ruin/space/has_grav/whiteship/box) /area/ruin/space/has_grav/whiteship/box)
"aM" = ( "aM" = (
/obj/machinery/computer/shuttle/white_ship, /obj/machinery/computer/shuttle/white_ship/ruin,
/turf/open/floor/mineral/titanium, /turf/open/floor/mineral/titanium,
/area/ruin/space/has_grav/whiteship/box) /area/ruin/space/has_grav/whiteship/box)
"aN" = ( "aN" = (

8
code/modules/ruins/spaceruin_code/whiteshipruin_box.dm Normal file
View File

@@ -0,0 +1,8 @@
/////////// ruined whiteship
/obj/machinery/computer/shuttle/white_ship/ruin
shuttleId = "whiteship_ruin"
/obj/machinery/computer/camera_advanced/shuttle_docker/whiteship/ruin
shuttleId = "whiteship_ruin"

1
tgstation.dme
View File

@@ -2169,6 +2169,7 @@
#include "code\modules\ruins\spaceruin_code\originalcontent.dm" #include "code\modules\ruins\spaceruin_code\originalcontent.dm"
#include "code\modules\ruins\spaceruin_code\spacehotel.dm" #include "code\modules\ruins\spaceruin_code\spacehotel.dm"
#include "code\modules\ruins\spaceruin_code\TheDerelict.dm" #include "code\modules\ruins\spaceruin_code\TheDerelict.dm"
#include "code\modules\ruins\spaceruin_code\whiteshipruin_box.dm"
#include "code\modules\security_levels\keycard_authentication.dm" #include "code\modules\security_levels\keycard_authentication.dm"
#include "code\modules\security_levels\security_levels.dm" #include "code\modules\security_levels\security_levels.dm"
#include "code\modules\server_tools\st_commands.dm" #include "code\modules\server_tools\st_commands.dm"