cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-28 07:39:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adds new GPSs

Browse Source
This commit is contained in:
Heroman
2019-07-02 12:04:17 +10:00
parent 2b16679f78
commit 2965503cbd
8 changed files with 147 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets/secure/cargo_vr.dm
+3
View File
@@ -0,0 +1,3 @@
/obj/structure/closet/secure_closet/miner/Initialize()
starts_with += /obj/item/device/gps/mining
return ..()
code/game/objects/structures/crates_lockers/closets/secure/medical_vr.dm
+3
View File
@@ -0,0 +1,3 @@
/obj/structure/closet/secure_closet/paramedic/Initialize()
starts_with += /obj/item/device/gps/medical
return ..()
maps/southern_cross/structures/closets/misc_vr.dm
+3 -2
View File
@@ -59,7 +59,7 @@
/obj/item/weapon/storage/box/freezer,
/obj/item/clothing/accessory/storage/white_vest,
/obj/item/taperoll/medical,
/obj/item/device/gps,
/obj/item/device/gps/medical,
/obj/item/device/geiger,
/obj/item/bodybag/cryobag)
@@ -82,7 +82,8 @@
/obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle,
/obj/item/weapon/storage/box/flare,
/obj/item/weapon/cell/device,
/obj/item/device/radio)
/obj/item/device/radio,
/obj/item/device/gps/explorer)
/obj/structure/closet/secure_closet/pathfinder
name = "pathfinder locker"
maps/tether/tether-03-surface3.dmm
+1 -1
View File
@@ -5549,10 +5549,10 @@
icon_state = "pipe-c"
},
/obj/structure/table/steel,
/obj/random/tech_supply,
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/effect/floor_decal/rust,
/obj/item/device/gps/science,
/turf/simulated/floor/plating,
/area/rnd/research_storage)
"jz" = (
maps/tether/tether-05-station1.dmm
+37 -24
View File
@@ -6648,6 +6648,41 @@
},
/turf/simulated/floor/tiled,
/area/engineering/hallway)
"amd" = (
/obj/machinery/light{
dir = 1
},
/obj/structure/table/reinforced,
/obj/item/device/radio/intercom{
dir = 1;
pixel_y = 24;
req_access = list()
},
/obj/item/device/gps/engineering{
pixel_x = 3;
pixel_y = 6
},
/obj/item/device/gps/engineering{
pixel_y = 3
},
/obj/item/device/gps/engineering{
pixel_x = -3
},
/turf/simulated/floor/tiled,
/area/engineering/engine_eva)
"ame" = (
/obj/structure/table/rack{
dir = 8;
layer = 2.9
},
/obj/item/clothing/mask/gas,
/obj/item/clothing/mask/gas,
/obj/item/clothing/mask/gas,
/obj/item/device/gps/command,
/obj/item/device/gps/command,
/obj/item/device/gps/command,
/turf/simulated/floor/tiled/dark,
/area/teleporter)
"amf" = (
/obj/structure/cable/green{
d1 = 4;
@@ -11025,18 +11060,6 @@
/obj/item/clothing/head/helmet/space/void/atmos,
/turf/simulated/floor/tiled,
/area/engineering/engine_eva)
"aAU" = (
/obj/machinery/light{
dir = 1
},
/obj/structure/table/reinforced,
/obj/item/device/radio/intercom{
dir = 1;
pixel_y = 24;
req_access = list()
},
/turf/simulated/floor/tiled,
/area/engineering/engine_eva)
"aAV" = (
/obj/structure/bed/chair,
/turf/simulated/floor/tiled,
@@ -21318,16 +21341,6 @@
},
/turf/simulated/floor/wood,
/area/library_conference_room)
"bOQ" = (
/obj/structure/table/rack{
dir = 8;
layer = 2.9
},
/obj/item/clothing/mask/gas,
/obj/item/clothing/mask/gas,
/obj/item/clothing/mask/gas,
/turf/simulated/floor/tiled/dark,
/area/teleporter)
"bOT" = (
/obj/machinery/firealarm{
dir = 4;
@@ -27667,7 +27680,7 @@ auX
asy
axG
aue
aAU
amd
aJl
aLX
aQv
@@ -32961,7 +32974,7 @@ aGK
bLN
aHO
bNL
bOQ
ame
aGK
aac
aac
maps/tether/tether-06-station2.dmm
+92 -78
View File
@@ -1297,15 +1297,49 @@
/turf/simulated/wall/r_wall,
/area/engineering/shaft)
"bX" = (
/obj/structure/shuttle/engine/propulsion{
dir = 8;
icon_state = "propulsion_l"
/obj/structure/table/rack/shelf,
/obj/effect/floor_decal/borderfloor{
dir = 4
},
/turf/space,
/turf/simulated/shuttle/plating/airless/carry,
/area/shuttle/large_escape_pod1/station{
base_turf = /turf/simulated/mineral/floor/vacuum
})
/obj/effect/floor_decal/corner/purple/border{
icon_state = "bordercolor";
dir = 4
},
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 10
},
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 9
},
/obj/item/stack/marker_beacon/thirty{
pixel_x = 5;
pixel_y = 4
},
/obj/item/stack/marker_beacon/thirty{
pixel_x = -5;
pixel_y = 4
},
/obj/machinery/light{
dir = 4
},
/obj/item/device/gps{
pixel_x = -6;
pixel_y = -4
},
/obj/item/device/gps{
pixel_x = -6;
pixel_y = -4
},
/obj/item/device/gps{
pixel_x = 6;
pixel_y = -4
},
/obj/item/device/gps{
pixel_x = 6;
pixel_y = -4
},
/turf/simulated/floor/tiled,
/area/tether/exploration/crew)
"bY" = (
/obj/effect/floor_decal/borderfloor/shifted{
icon_state = "borderfloor_shifted";
@@ -2494,41 +2528,41 @@
/turf/simulated/floor/tiled,
/area/tether/exploration/crew)
"dA" = (
/obj/structure/table/rack/shelf,
/obj/effect/floor_decal/borderfloor{
dir = 4
/obj/structure/table/rack,
/obj/effect/floor_decal/corner/paleblue{
dir = 6
},
/obj/effect/floor_decal/corner/purple/border{
icon_state = "bordercolor";
dir = 4
},
/obj/effect/floor_decal/steeldecal/steel_decals7{
dir = 10
},
/obj/effect/floor_decal/steeldecal/steel_decals7{
/obj/effect/floor_decal/corner/paleblue{
dir = 9
},
/obj/item/device/gps/explorer{
pixel_x = -6;
pixel_y = -4
/obj/effect/floor_decal/steeldecal/steel_decals9{
dir = 8
},
/obj/item/device/gps/explorer{
pixel_x = 6;
pixel_y = -4
/obj/effect/floor_decal/steeldecal/steel_decals9{
dir = 1
},
/obj/item/stack/marker_beacon/thirty{
pixel_x = 5;
pixel_y = 4
},
/obj/item/stack/marker_beacon/thirty{
pixel_x = -5;
pixel_y = 4
},
/obj/machinery/light{
/obj/effect/floor_decal/steeldecal/steel_decals9{
dir = 4
},
/turf/simulated/floor/tiled,
/area/tether/exploration/crew)
/obj/effect/floor_decal/steeldecal/steel_decals9,
/obj/item/device/multitool,
/obj/item/weapon/storage/toolbox/mechanical,
/obj/item/device/radio{
pixel_x = -4;
pixel_y = 1
},
/obj/item/device/radio{
pixel_x = 4;
pixel_y = -1
},
/obj/item/device/gps/medical{
pixel_y = 3
},
/obj/item/device/gps/medical{
pixel_x = -3
},
/turf/simulated/floor/tiled/dark,
/area/medical/medbay_emt_bay)
"dB" = (
/obj/structure/stairs/north,
/turf/simulated/floor/tiled,
@@ -17505,10 +17539,14 @@
"AC" = (
/obj/structure/table/rack,
/obj/effect/floor_decal/corner/paleblue{
dir = 6
dir = 9
},
/obj/effect/floor_decal/corner/paleblue{
dir = 9
dir = 6
},
/obj/effect/floor_decal/steeldecal/steel_decals9,
/obj/effect/floor_decal/steeldecal/steel_decals9{
dir = 4
},
/obj/effect/floor_decal/steeldecal/steel_decals9{
dir = 8
@@ -17516,21 +17554,13 @@
/obj/effect/floor_decal/steeldecal/steel_decals9{
dir = 1
},
/obj/effect/floor_decal/steeldecal/steel_decals9{
dir = 4
},
/obj/effect/floor_decal/steeldecal/steel_decals9,
/obj/item/device/multitool,
/obj/item/weapon/storage/toolbox/mechanical,
/obj/item/device/radio{
pixel_x = -4;
pixel_y = 1
},
/obj/item/device/radio{
pixel_x = 4;
pixel_y = -1
/obj/machinery/firealarm{
dir = 4;
layer = 3.3;
pixel_x = 26
},
/obj/item/device/defib_kit/compact/loaded,
/obj/item/weapon/rig/medical/equipped,
/turf/simulated/floor/tiled/dark,
/area/medical/medbay_emt_bay)
"AD" = (
@@ -17658,31 +17688,15 @@
/turf/simulated/floor/tiled/dark,
/area/medical/medbay_emt_bay)
"AO" = (
/obj/structure/table/rack,
/obj/item/weapon/rig/medical/equipped,
/obj/effect/floor_decal/corner/paleblue{
dir = 9
/obj/structure/shuttle/engine/propulsion{
dir = 8;
icon_state = "propulsion_l"
},
/obj/effect/floor_decal/corner/paleblue{
dir = 6
},
/obj/effect/floor_decal/steeldecal/steel_decals9,
/obj/effect/floor_decal/steeldecal/steel_decals9{
dir = 4
},
/obj/effect/floor_decal/steeldecal/steel_decals9{
dir = 8
},
/obj/effect/floor_decal/steeldecal/steel_decals9{
dir = 1
},
/obj/machinery/firealarm{
dir = 4;
layer = 3.3;
pixel_x = 26
},
/turf/simulated/floor/tiled/dark,
/area/medical/medbay_emt_bay)
/turf/space,
/turf/simulated/shuttle/plating/airless/carry,
/area/shuttle/large_escape_pod1/station{
base_turf = /turf/simulated/mineral/floor/vacuum
})
"AP" = (
/obj/effect/floor_decal/borderfloorwhite{
dir = 8
@@ -32585,7 +32599,7 @@ AN
Ci
Bw
yY
bX
AO
EF
EF
EF
@@ -32722,8 +32736,8 @@ ve
zt
zU
Ai
dA
AC
AO
Be
Be
yY
@@ -32965,7 +32979,7 @@ ac
ac
bA
cI
dA
bX
dY
eH
gf
maps/tether/tether-07-station3.dmm
+6
View File
@@ -4073,6 +4073,12 @@
/obj/machinery/alarm{
pixel_y = 22
},
/obj/item/device/gps/security{
pixel_y = 3
},
/obj/item/device/gps/security{
pixel_x = -3
},
/turf/simulated/floor/tiled,
/area/security/eva)
"gX" = (
vorestation.dme
+2
View File
@@ -1261,11 +1261,13 @@
#include "code\game\objects\structures\crates_lockers\closets\wardrobe.dm"
#include "code\game\objects\structures\crates_lockers\closets\secure\bar.dm"
#include "code\game\objects\structures\crates_lockers\closets\secure\cargo.dm"
#include "code\game\objects\structures\crates_lockers\closets\secure\cargo_vr.dm"
#include "code\game\objects\structures\crates_lockers\closets\secure\engineering.dm"
#include "code\game\objects\structures\crates_lockers\closets\secure\freezer.dm"
#include "code\game\objects\structures\crates_lockers\closets\secure\guncabinet.dm"
#include "code\game\objects\structures\crates_lockers\closets\secure\hydroponics.dm"
#include "code\game\objects\structures\crates_lockers\closets\secure\medical.dm"
#include "code\game\objects\structures\crates_lockers\closets\secure\medical_vr.dm"
#include "code\game\objects\structures\crates_lockers\closets\secure\personal.dm"
#include "code\game\objects\structures\crates_lockers\closets\secure\scientist.dm"
#include "code\game\objects\structures\crates_lockers\closets\secure\secure_closets.dm"