mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 10:43:20 +00:00
Merge pull request #2790 from CHOMPStationBot/upstream-merge-11396
[MIRROR] Fix Salamanders and Wall-lockers
This commit is contained in:
Nadyr
GitHub
@@ -60,7 +60,7 @@
|
||||
//VOREStation Add Start
|
||||
/obj/structure/closet/walllocker/medical
|
||||
name = "first-aid closet"
|
||||
desc = "It's wall-mounted storage unit for first aid supplies."
|
||||
desc = "It's a wall-mounted storage unit for first aid supplies."
|
||||
closet_appearance = /decl/closet_appearance/wall/medical
|
||||
|
||||
/obj/structure/closet/walllocker/medical/north
|
||||
@@ -92,6 +92,7 @@
|
||||
wall_mounted = 1
|
||||
plane = TURF_PLANE
|
||||
layer = ABOVE_TURF_LAYER
|
||||
door_anim_time = 0 //Unsupported
|
||||
|
||||
/obj/structure/closet/walllocker_double/north
|
||||
pixel_y = 32
|
||||
|
||||
@@ -49,7 +49,7 @@
|
||||
/area/shuttle/salamander_q2
|
||||
name = "\improper Salamander Quarters 2"
|
||||
icon = 'icons/turf/areas_vr_talon.dmi'
|
||||
icon_state = "gray-p"
|
||||
icon_state = "gray-s"
|
||||
requires_power = 1
|
||||
has_gravity = 0
|
||||
|
||||
@@ -98,7 +98,7 @@
|
||||
/area/shuttle/salamander_wreck_q2
|
||||
name = "\improper Wrecked Salamander Quarters 2"
|
||||
icon = 'icons/turf/areas_vr_talon.dmi'
|
||||
icon_state = "gray-p"
|
||||
icon_state = "gray-s"
|
||||
requires_power = 1
|
||||
has_gravity = 0
|
||||
|
||||
|
||||
@@ -194,7 +194,7 @@
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/floor/tiled/techfloor,
|
||||
/area/shuttle/salamander_q2)
|
||||
/area/shuttle/salamander_q1)
|
||||
"dj" = (
|
||||
/turf/simulated/floor/plating,
|
||||
/area/shuttle/salamander_engineering)
|
||||
@@ -270,7 +270,7 @@
|
||||
"eG" = (
|
||||
/obj/machinery/atmospherics/unary/vent_pump/on,
|
||||
/turf/simulated/floor/tiled/techfloor,
|
||||
/area/shuttle/salamander_q2)
|
||||
/area/shuttle/salamander_q1)
|
||||
"eJ" = (
|
||||
/obj/effect/map_helper/airlock/sensor/int_sensor,
|
||||
/obj/machinery/airlock_sensor{
|
||||
@@ -319,6 +319,16 @@
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/shuttle/salamander_engineering)
|
||||
"fu" = (
|
||||
/obj/structure/bed/pod,
|
||||
/obj/item/weapon/bedsheet/blue,
|
||||
/obj/machinery/light_switch{
|
||||
dir = 4;
|
||||
pixel_x = 22
|
||||
},
|
||||
/obj/effect/landmark/late_antag/trader,
|
||||
/turf/simulated/floor/tiled/techfloor,
|
||||
/area/shuttle/salamander_q1)
|
||||
"fB" = (
|
||||
/obj/machinery/light,
|
||||
/turf/simulated/floor/plating,
|
||||
@@ -402,7 +412,7 @@
|
||||
dir = 10
|
||||
},
|
||||
/turf/simulated/floor/tiled/techfloor,
|
||||
/area/shuttle/salamander_q2)
|
||||
/area/shuttle/salamander_q1)
|
||||
"gv" = (
|
||||
/obj/machinery/power/apc{
|
||||
dir = 8;
|
||||
@@ -1323,6 +1333,9 @@
|
||||
/obj/structure/catwalk,
|
||||
/turf/simulated/floor/plating,
|
||||
/area/shuttle/salamander)
|
||||
"xj" = (
|
||||
/turf/simulated/wall/shull,
|
||||
/area/shuttle/salamander_q1)
|
||||
"xL" = (
|
||||
/obj/structure/cable{
|
||||
d1 = 4;
|
||||
@@ -1407,7 +1420,7 @@
|
||||
pixel_x = -32
|
||||
},
|
||||
/turf/simulated/floor/tiled/techfloor,
|
||||
/area/shuttle/salamander_q2)
|
||||
/area/shuttle/salamander_q1)
|
||||
"Bf" = (
|
||||
/obj/machinery/light{
|
||||
dir = 1
|
||||
@@ -1503,6 +1516,12 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled/techmaint,
|
||||
/area/shuttle/salamander)
|
||||
"FV" = (
|
||||
/obj/machinery/power/pointdefense{
|
||||
id_tag = "salamander_pd"
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/shuttle/salamander_q1)
|
||||
"Gj" = (
|
||||
/obj/machinery/door/firedoor/glass,
|
||||
/obj/structure/grille,
|
||||
@@ -1624,6 +1643,22 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled/techfloor,
|
||||
/area/shuttle/salamander)
|
||||
"Lb" = (
|
||||
/obj/machinery/door/firedoor/glass,
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
dir = 1
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
|
||||
/obj/machinery/door/airlock/voidcraft{
|
||||
req_one_access = list(160)
|
||||
},
|
||||
/turf/simulated/floor/tiled/techmaint,
|
||||
/area/shuttle/salamander_q1)
|
||||
"Lf" = (
|
||||
/obj/effect/floor_decal/industrial/warning,
|
||||
/turf/simulated/floor/tiled/techfloor,
|
||||
@@ -1753,6 +1788,26 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled/techfloor,
|
||||
/area/shuttle/salamander)
|
||||
"Rj" = (
|
||||
/obj/machinery/door/firedoor/glass,
|
||||
/obj/structure/grille,
|
||||
/obj/structure/window/reinforced/full,
|
||||
/obj/structure/window/reinforced,
|
||||
/obj/structure/window/reinforced{
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/shuttle/salamander_q1)
|
||||
"Rm" = (
|
||||
/obj/structure/bed/pod,
|
||||
/obj/item/weapon/bedsheet/blue,
|
||||
/obj/machinery/alarm/alarms_hidden{
|
||||
dir = 8;
|
||||
pixel_x = 26
|
||||
},
|
||||
/obj/effect/landmark/late_antag/trader,
|
||||
/turf/simulated/floor/tiled/techfloor,
|
||||
/area/shuttle/salamander_q1)
|
||||
"RO" = (
|
||||
/obj/structure/bed/pod,
|
||||
/obj/item/weapon/bedsheet/blue,
|
||||
@@ -2495,11 +2550,11 @@ WP
|
||||
(26,1,1) = {"
|
||||
WP
|
||||
WP
|
||||
bk
|
||||
Vz
|
||||
FV
|
||||
xj
|
||||
cY
|
||||
AN
|
||||
Vz
|
||||
xj
|
||||
hn
|
||||
yv
|
||||
Vz
|
||||
@@ -2514,10 +2569,10 @@ WP
|
||||
WP
|
||||
WP
|
||||
WP
|
||||
ci
|
||||
Rj
|
||||
eG
|
||||
gl
|
||||
ld
|
||||
Lb
|
||||
hp
|
||||
jT
|
||||
ld
|
||||
@@ -2532,10 +2587,10 @@ WP
|
||||
WP
|
||||
WP
|
||||
WP
|
||||
Vz
|
||||
oF
|
||||
RO
|
||||
Vz
|
||||
xj
|
||||
fu
|
||||
Rm
|
||||
xj
|
||||
fh
|
||||
xL
|
||||
Vz
|
||||
@@ -2550,10 +2605,10 @@ WP
|
||||
WP
|
||||
WP
|
||||
WP
|
||||
Vz
|
||||
Vz
|
||||
Vz
|
||||
Vz
|
||||
xj
|
||||
xj
|
||||
xj
|
||||
xj
|
||||
DB
|
||||
jV
|
||||
Vz
|
||||
|
||||
@@ -213,7 +213,7 @@
|
||||
nitrogen = 0;
|
||||
oxygen = 0
|
||||
},
|
||||
/area/shuttle/salamander_wreck_q2)
|
||||
/area/shuttle/salamander_wreck_q1)
|
||||
"dm" = (
|
||||
/obj/machinery/light{
|
||||
dir = 1
|
||||
@@ -270,6 +270,9 @@
|
||||
},
|
||||
/turf/simulated/floor/airless,
|
||||
/area/shuttle/salamander_wreck_engineering)
|
||||
"el" = (
|
||||
/turf/simulated/wall/shull,
|
||||
/area/shuttle/salamander_wreck_q1)
|
||||
"ey" = (
|
||||
/obj/machinery/atmospherics/pipe/manifold/visible{
|
||||
dir = 4
|
||||
@@ -292,7 +295,7 @@
|
||||
nitrogen = 0;
|
||||
oxygen = 0
|
||||
},
|
||||
/area/shuttle/salamander_wreck_q2)
|
||||
/area/shuttle/salamander_wreck_q1)
|
||||
"eJ" = (
|
||||
/obj/effect/map_helper/airlock/sensor/int_sensor,
|
||||
/obj/machinery/airlock_sensor{
|
||||
@@ -427,7 +430,7 @@
|
||||
nitrogen = 0;
|
||||
oxygen = 0
|
||||
},
|
||||
/area/shuttle/salamander_wreck_q2)
|
||||
/area/shuttle/salamander_wreck_q1)
|
||||
"gv" = (
|
||||
/obj/structure/cable{
|
||||
d2 = 2;
|
||||
@@ -1313,6 +1316,18 @@
|
||||
oxygen = 0
|
||||
},
|
||||
/area/shuttle/salamander_wreck_galley)
|
||||
"vt" = (
|
||||
/obj/structure/bed/pod,
|
||||
/obj/item/weapon/bedsheet/blue,
|
||||
/obj/machinery/alarm/alarms_hidden{
|
||||
dir = 8;
|
||||
pixel_x = 26
|
||||
},
|
||||
/turf/simulated/floor/tiled/techfloor{
|
||||
nitrogen = 0;
|
||||
oxygen = 0
|
||||
},
|
||||
/area/shuttle/salamander_wreck_q1)
|
||||
"vI" = (
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
@@ -1398,6 +1413,18 @@
|
||||
/obj/structure/catwalk,
|
||||
/turf/simulated/floor/airless,
|
||||
/area/shuttle/salamander_wreck_engineering)
|
||||
"AK" = (
|
||||
/obj/structure/bed/pod,
|
||||
/obj/item/weapon/bedsheet/blue,
|
||||
/obj/machinery/light_switch{
|
||||
dir = 4;
|
||||
pixel_x = 22
|
||||
},
|
||||
/turf/simulated/floor/tiled/techfloor{
|
||||
nitrogen = 0;
|
||||
oxygen = 0
|
||||
},
|
||||
/area/shuttle/salamander_wreck_q1)
|
||||
"AN" = (
|
||||
/obj/structure/handrail{
|
||||
dir = 1
|
||||
@@ -1422,7 +1449,7 @@
|
||||
nitrogen = 0;
|
||||
oxygen = 0
|
||||
},
|
||||
/area/shuttle/salamander_wreck_q2)
|
||||
/area/shuttle/salamander_wreck_q1)
|
||||
"Bf" = (
|
||||
/obj/machinery/light{
|
||||
dir = 1
|
||||
@@ -1522,6 +1549,23 @@
|
||||
/obj/structure/window/reinforced,
|
||||
/turf/simulated/floor/plating,
|
||||
/area/shuttle/salamander_wreck_cockpit)
|
||||
"Gr" = (
|
||||
/obj/machinery/door/firedoor/glass,
|
||||
/obj/structure/cable{
|
||||
d1 = 1;
|
||||
d2 = 2;
|
||||
icon_state = "1-2"
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
dir = 1
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
|
||||
/obj/machinery/door/airlock/voidcraft{
|
||||
density = 0;
|
||||
icon_state = "door_open"
|
||||
},
|
||||
/turf/simulated/floor/tiled/techmaint/airless,
|
||||
/area/shuttle/salamander_wreck_q1)
|
||||
"HG" = (
|
||||
/obj/structure/cable{
|
||||
d1 = 4;
|
||||
@@ -1726,6 +1770,12 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled/techmaint/airless,
|
||||
/area/shuttle/salamander_wreck)
|
||||
"Pr" = (
|
||||
/obj/machinery/power/pointdefense{
|
||||
id_tag = "salamander_wreck_pd"
|
||||
},
|
||||
/turf/simulated/floor/airless,
|
||||
/area/shuttle/salamander_wreck_q1)
|
||||
"Ps" = (
|
||||
/obj/structure/girder,
|
||||
/turf/simulated/floor/airless,
|
||||
@@ -1899,6 +1949,16 @@
|
||||
},
|
||||
/turf/simulated/floor/tiled/techmaint/airless,
|
||||
/area/shuttle/salamander_wreck)
|
||||
"UB" = (
|
||||
/obj/machinery/door/firedoor/glass,
|
||||
/obj/structure/grille,
|
||||
/obj/structure/window/reinforced/full,
|
||||
/obj/structure/window/reinforced,
|
||||
/obj/structure/window/reinforced{
|
||||
dir = 1
|
||||
},
|
||||
/turf/simulated/floor/plating,
|
||||
/area/shuttle/salamander_wreck_q1)
|
||||
"UT" = (
|
||||
/obj/machinery/door/airlock/glass_external/public{
|
||||
density = 0;
|
||||
@@ -2545,11 +2605,11 @@ WP
|
||||
(26,1,1) = {"
|
||||
WP
|
||||
WP
|
||||
bk
|
||||
Vz
|
||||
Pr
|
||||
el
|
||||
cY
|
||||
AN
|
||||
Vz
|
||||
el
|
||||
hn
|
||||
yv
|
||||
Vz
|
||||
@@ -2564,10 +2624,10 @@ WP
|
||||
WP
|
||||
WP
|
||||
WP
|
||||
ci
|
||||
UB
|
||||
eG
|
||||
gl
|
||||
ld
|
||||
Gr
|
||||
hp
|
||||
jT
|
||||
ld
|
||||
@@ -2582,10 +2642,10 @@ WP
|
||||
WP
|
||||
WP
|
||||
WP
|
||||
Vz
|
||||
oF
|
||||
RO
|
||||
Vz
|
||||
el
|
||||
AK
|
||||
vt
|
||||
el
|
||||
fh
|
||||
xL
|
||||
Vz
|
||||
@@ -2600,10 +2660,10 @@ WP
|
||||
WP
|
||||
WP
|
||||
WP
|
||||
Vz
|
||||
Vz
|
||||
Vz
|
||||
Vz
|
||||
el
|
||||
el
|
||||
el
|
||||
el
|
||||
DB
|
||||
jV
|
||||
Vz
|
||||
|
||||
90
maps/submaps/admin_use_vr/salamander_trader.dm
Normal file
90
maps/submaps/admin_use_vr/salamander_trader.dm
Normal file
@@ -0,0 +1,90 @@
|
||||
// Compile in the map for CI testing if we're testing compileability of all the maps
|
||||
#if MAP_TEST
|
||||
#include "salamander_trader.dmm"
|
||||
#endif
|
||||
|
||||
// The shuttle's area(s)
|
||||
/area/shuttle/salamander_trader
|
||||
name = "\improper Salamander Trader Cabin"
|
||||
icon = 'icons/turf/areas_vr_talon.dmi'
|
||||
icon_state = "gray"
|
||||
requires_power = 1
|
||||
has_gravity = 0
|
||||
|
||||
/area/shuttle/salamander_trader_engineering
|
||||
name = "\improper Salamander Trader Engineering"
|
||||
icon = 'icons/turf/areas_vr_talon.dmi'
|
||||
icon_state = "yellow"
|
||||
requires_power = 1
|
||||
has_gravity = 0
|
||||
|
||||
/area/shuttle/salamander_trader_cockpit
|
||||
name = "\improper Salamander Trader Cockpit"
|
||||
icon = 'icons/turf/areas_vr_talon.dmi'
|
||||
icon_state = "blue"
|
||||
requires_power = 1
|
||||
has_gravity = 0
|
||||
|
||||
/area/shuttle/salamander_trader_q1
|
||||
name = "\improper Salamander Trader Quarters 1"
|
||||
icon = 'icons/turf/areas_vr_talon.dmi'
|
||||
icon_state = "gray-p"
|
||||
requires_power = 1
|
||||
has_gravity = 0
|
||||
|
||||
/area/shuttle/salamander_trader_q2
|
||||
name = "\improper Salamander Trader Quarters 2"
|
||||
icon = 'icons/turf/areas_vr_talon.dmi'
|
||||
icon_state = "gray-s"
|
||||
requires_power = 1
|
||||
has_gravity = 0
|
||||
|
||||
/area/shuttle/salamander_trader_galley
|
||||
name = "\improper Salamander Trader Galley"
|
||||
icon = 'icons/turf/areas_vr_talon.dmi'
|
||||
icon_state = "dark-s"
|
||||
requires_power = 1
|
||||
has_gravity = 0
|
||||
|
||||
/area/shuttle/salamander_trader_head
|
||||
name = "\improper Salamander Trader Head"
|
||||
icon = 'icons/turf/areas_vr_talon.dmi'
|
||||
icon_state = "dark-p"
|
||||
requires_power = 1
|
||||
has_gravity = 0
|
||||
|
||||
// The shuttle's 'shuttle' computer
|
||||
/obj/machinery/computer/shuttle_control/explore/salamander_trader
|
||||
name = "short jump console"
|
||||
shuttle_tag = "Salamander Trader"
|
||||
req_one_access = list()
|
||||
|
||||
// The 'shuttle'
|
||||
/datum/shuttle/autodock/overmap/salamander_trader
|
||||
name = "Salamander Trader"
|
||||
current_location = "omship_spawn_salamander_trader"
|
||||
docking_controller_tag = "salamander_trader_docking"
|
||||
shuttle_area = list(/area/shuttle/salamander_trader,/area/shuttle/salamander_trader_cockpit,/area/shuttle/salamander_trader_engineering,/area/shuttle/salamander_trader_q1,/area/shuttle/salamander_trader_q2,/area/shuttle/salamander_trader_galley,/area/shuttle/salamander_trader_head)
|
||||
defer_initialisation = TRUE //We're not loaded until an admin does it
|
||||
fuel_consumption = 5
|
||||
ceiling_type = /turf/simulated/floor/reinforced/airless
|
||||
|
||||
// A shuttle lateloader landmark
|
||||
/obj/effect/shuttle_landmark/shuttle_initializer/salamander_trader
|
||||
name = "ITV Freedom"
|
||||
base_area = /area/space
|
||||
base_turf = /turf/space
|
||||
landmark_tag = "omship_spawn_salamander_trader"
|
||||
shuttle_type = /datum/shuttle/autodock/overmap/salamander_trader
|
||||
|
||||
// The 'ship'
|
||||
/obj/effect/overmap/visitable/ship/landable/salamander_trader
|
||||
name = "Salamander-class Corvette"
|
||||
scanner_desc = @{"[i]Registration[/i]: ITV Freedom
|
||||
[i]Class[/i]: Corvette
|
||||
[i]Transponder[/i]: Transmitting (CIV), non-hostile
|
||||
[b]Notice[/b]: Multirole independent vessel"}
|
||||
vessel_mass = 4500
|
||||
vessel_size = SHIP_SIZE_LARGE
|
||||
fore_dir = EAST
|
||||
shuttle = "Salamander Trader"
|
||||
2728
maps/submaps/admin_use_vr/salamander_trader.dmm
Normal file
2728
maps/submaps/admin_use_vr/salamander_trader.dmm
Normal file
File diff suppressed because it is too large
Load Diff
@@ -58,7 +58,12 @@
|
||||
|
||||
#include "../../submaps/admin_use_vr/ert.dm"
|
||||
#include "../../submaps/admin_use_vr/mercship.dm"
|
||||
<<<<<<< HEAD
|
||||
#include "../../submaps/admin_use_vr/guttersite.dm"
|
||||
||||||| parent of d14cd7fd46... Merge pull request #11396 from KillianKirilenko/kk-adminships
|
||||
=======
|
||||
#include "../../submaps/admin_use_vr/salamander_trader.dm"
|
||||
>>>>>>> d14cd7fd46... Merge pull request #11396 from KillianKirilenko/kk-adminships
|
||||
|
||||
/datum/map_template/admin_use/ert
|
||||
name = "Special Area - ERT"
|
||||
@@ -73,7 +78,7 @@
|
||||
/datum/map_template/admin_use/salamander_trader
|
||||
name = "Special Area - Salamander Trader"
|
||||
desc = "Modest trader ship."
|
||||
mappath = 'maps/offmap_vr/om_ships/salamander.dmm'
|
||||
mappath = 'maps/submaps/admin_use_vr/salamander_trader.dmm'
|
||||
|
||||
/datum/map_template/admin_use/mercenary
|
||||
name = "Special Area - Merc Ship"
|
||||
|
||||
Reference in New Issue
Block a user