cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-23 20:17:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10439 from Novacat/nova-heterochromia

Browse Source 
Adds bus mapping units and mapping beacons
This commit is contained in:
Novacat
2021-05-26 22:24:31 -04:00
committed by GitHub
parent eb98e44e6d 88f56ccc54
commit 6220bb136b
3 changed files with 85 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/uplink/tools_vr.dm
+24
View File
@@ -16,6 +16,18 @@
item_cost = 2
path = /obj/item/device/suit_cooling_unit/emergency
/datum/uplink_item/item/tools/beacon_op
name = "Holomap Beacon-M"
item_cost = 2
path = /obj/item/device/holomap_beacon/operative
antag_roles = list("mercenary")
/datum/uplink_item/item/tools/beacon_ert
name = "Holomap Beacon-E"
item_cost = 2
path = /obj/item/device/holomap_beacon/ert
antag_roles = list("ert")
/datum/uplink_item/item/tools/basiclaptop
name = "Laptop (Basic)"
item_cost = 5
@@ -71,6 +83,18 @@
item_cost = 20
path = /obj/item/weapon/inducer/syndicate
/datum/uplink_item/item/tools/mappingunit_op
name = "Mapping Unit-M"
item_cost = 20
path = /obj/item/device/mapping_unit/operative
antag_roles = list("mercenary")
/datum/uplink_item/item/tools/mappingunit_ert
name = "Mapping Unit-E"
item_cost = 20
path = /obj/item/device/mapping_unit/ert
antag_roles = list("ert")
/datum/uplink_item/item/tools/luxurycapsule
name = "Survival Capsule (Luxury)"
item_cost = 40
maps/submaps/admin_use_vr/ert.dmm
+32 -31
View File
@@ -121,6 +121,35 @@
/obj/machinery/telecomms/relay/preset/tether,
/turf/simulated/floor/tiled/techfloor,
/area/ship/ert/atmos)
"ar" = (
/obj/structure/table/rack/steel,
/obj/item/toy/plushie/squid/blue{
desc = "A small, cute and loveable squid friend. This one is blue. Despite the name, it seems no more or less deadly than your regular plush squid.";
name = "NT 'Deathsquid' Plushie"
},
/obj/effect/floor_decal/industrial/outline/grey,
/obj/item/device/mapping_unit/deathsquad,
/obj/item/device/holomap_beacon/deathsquad,
/obj/item/device/holomap_beacon/deathsquad,
/obj/item/device/holomap_beacon/deathsquad,
/obj/item/device/holomap_beacon/deathsquad,
/turf/simulated/floor/tiled/techfloor,
/area/ship/ert/barracks)
"as" = (
/obj/machinery/light_switch{
pixel_y = 23
},
/obj/structure/table/woodentable,
/obj/item/device/flashlight/lamp,
/obj/item/device/holomap_beacon/ert,
/obj/item/device/holomap_beacon/ert,
/obj/item/device/mapping_unit/ert,
/turf/simulated/floor/wood,
/area/ship/ert/commander)
"at" = (
/obj/item/device/mapping_unit/ert,
/turf/simulated/floor/wood,
/area/ship/ert/commander)
"av" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/turf/simulated/floor/tiled/techfloor,
@@ -510,15 +539,6 @@
"dq" = (
/turf/simulated/wall/shull,
/area/ship/ert/med_surg)
"dr" = (
/obj/structure/table/rack/steel,
/obj/item/toy/plushie/squid/blue{
desc = "A small, cute and loveable squid friend. This one is blue. Despite the name, it seems no more or less deadly than your regular plush squid.";
name = "NT 'Deathsquid' Plushie"
},
/obj/effect/floor_decal/industrial/outline/grey,
/turf/simulated/floor/tiled/techfloor,
/area/ship/ert/barracks)
"ds" = (
/obj/structure/table/rack,
/obj/item/weapon/storage/backpack/ert/commander,
@@ -4962,17 +4982,6 @@
},
/turf/simulated/floor/tiled/techmaint,
/area/shuttle/ert_ship_boat)
"Ez" = (
/obj/structure/bed/chair/office/dark{
dir = 4
},
/obj/structure/cable/yellow{
d1 = 1;
d2 = 2;
icon_state = "1-2"
},
/turf/simulated/floor/wood,
/area/ship/ert/commander)
"EA" = (
/obj/structure/table/woodentable,
/obj/item/weapon/storage/box/trackimp,
@@ -7418,14 +7427,6 @@
},
/turf/simulated/floor/tiled/techmaint,
/area/ship/ert/teleporter)
"RV" = (
/obj/machinery/light_switch{
pixel_y = 23
},
/obj/structure/table/woodentable,
/obj/item/device/flashlight/lamp,
/turf/simulated/floor/wood,
/area/ship/ert/commander)
"Sc" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
@@ -16084,7 +16085,7 @@ iB
cS
lu
DS
RV
as
Iv
zP
Eh
@@ -16229,7 +16230,7 @@ JB
Wa
eL
zT
Ez
at
IK
Ks
Oy
@@ -20197,7 +20198,7 @@ yz
yz
Ye
Dd
dr
ar
fj
jz
nc
maps/submaps/admin_use_vr/kk_mercship.dmm
+29 -24
View File
@@ -7,6 +7,33 @@
/obj/effect/shuttle_landmark/premade/manta_ship_near_port,
/turf/space,
/area/space)
"ac" = (
/obj/structure/table/steel_reinforced,
/obj/effect/landmark{
name = "Syndicate-Uplink"
},
/obj/item/device/mapping_unit/operative,
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/armoury_st)
"ad" = (
/obj/structure/table/rack,
/obj/item/weapon/storage/box/syndie_kit/chameleon,
/obj/item/weapon/storage/box/syndie_kit/chameleon,
/obj/item/weapon/storage/box/syndie_kit/chameleon,
/obj/item/weapon/storage/box/syndie_kit/chameleon,
/obj/item/weapon/storage/box/syndie_kit/chameleon,
/obj/item/weapon/storage/box/syndie_kit/chameleon,
/obj/machinery/recharger/wallcharger{
pixel_x = 5;
pixel_y = -32
},
/obj/effect/floor_decal/techfloor,
/obj/item/device/holomap_beacon/operative,
/obj/item/device/holomap_beacon/operative,
/obj/item/device/holomap_beacon/operative,
/obj/item/device/holomap_beacon/operative,
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/armoury_st)
"ag" = (
/turf/simulated/floor/reinforced/airless,
/area/ship/manta/hangar)
@@ -10108,21 +10135,6 @@
/obj/structure/table/steel_reinforced,
/turf/simulated/floor/tiled/dark,
/area/ship/manta/holding)
"Us" = (
/obj/structure/table/rack,
/obj/item/weapon/storage/box/syndie_kit/chameleon,
/obj/item/weapon/storage/box/syndie_kit/chameleon,
/obj/item/weapon/storage/box/syndie_kit/chameleon,
/obj/item/weapon/storage/box/syndie_kit/chameleon,
/obj/item/weapon/storage/box/syndie_kit/chameleon,
/obj/item/weapon/storage/box/syndie_kit/chameleon,
/obj/machinery/recharger/wallcharger{
pixel_x = 5;
pixel_y = -32
},
/obj/effect/floor_decal/techfloor,
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/armoury_st)
"Uy" = (
/obj/item/weapon/reagent_containers/syringe/drugs{
pixel_x = 3;
@@ -11303,13 +11315,6 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/recreation)
"ZH" = (
/obj/structure/table/steel_reinforced,
/obj/effect/landmark{
name = "Syndicate-Uplink"
},
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/armoury_st)
"ZI" = (
/obj/structure/cable/orange{
d1 = 4;
@@ -19537,7 +19542,7 @@ OR
sy
nC
bR
Us
ad
ZT
tx
pB
@@ -19818,7 +19823,7 @@ ZT
ZT
cP
bR
ZH
ac
aS
bR
RU