cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-19 11:05:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10129 from Novacat/nova-ert

Browse Source 
Miscellaneous Sundries
This commit is contained in:
Novacat
2021-04-11 13:53:30 -04:00
committed by GitHub
parent 878e2395fc 40904bf790
commit da60c2c40e
16 changed files with 74 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/outfits/jobs/special_vr.dm
+2
View File
@@ -8,6 +8,7 @@
glasses = /obj/item/clothing/glasses/omnihud/all
id_type = /obj/item/weapon/card/id/centcom
pda_type = /obj/item/device/pda/centcom
flags = OUTFIT_EXTENDED_SURVIVAL|OUTFIT_COMPREHENSIVE_SURVIVAL
/decl/hierarchy/outfit/job/emergency_responder
name = OUTFIT_JOB_NAME("Emergency Responder")
@@ -19,6 +20,7 @@
back = /obj/item/weapon/storage/backpack/satchel
id_type = /obj/item/weapon/card/id/centcom/ERT
pda_type = /obj/item/device/pda/centcom
flags = OUTFIT_EXTENDED_SURVIVAL|OUTFIT_COMPREHENSIVE_SURVIVAL
post_equip(var/mob/living/carbon/human/H)
..()
code/modules/mob/living/living.dm
+4
View File
@@ -1027,6 +1027,10 @@
var/turf/end_T = get_turf(target)
if(end_T)
add_attack_logs(src,M,"Thrown via grab to [end_T.x],[end_T.y],[end_T.z]")
if(ishuman(M))
var/mob/living/carbon/human/N = M
if((N.health + N.halloss) < config.health_threshold_crit || N.stat == DEAD)
N.adjustBruteLoss(rand(10,30))
src.drop_from_inventory(G)
src.drop_from_inventory(item)
code/modules/pda/cart_vr.dm
+4
View File
@@ -3,6 +3,9 @@ var/list/exploration_cartridges = list(
/obj/item/weapon/cartridge/sar
)
/obj/item/weapon/cartridge
slot_flags = SLOT_EARS
/obj/item/weapon/cartridge/explorer
name = "\improper Explorator cartridge"
icon_state = "cart-e"
@@ -24,6 +27,7 @@ var/list/exploration_cartridges = list(
desc = "It feels heavier for some reason."
w_class = ITEMSIZE_SMALL
icon_state = "cart-lib"
show_examine = FALSE
var/slots = 1
var/obj/item/weapon/storage/internal/hold
maps/offmap_vr/om_ships/aro2.dmm
+10 -10
View File
@@ -130,7 +130,7 @@
/area/aro2/room1)
"aI" = (
/obj/effect/floor_decal/industrial/warning/full,
/obj/machinery/power/pointdefense{
/obj/machinery/pointdefense{
id_tag = "aroship"
},
/obj/structure/cable/cyan{
@@ -235,7 +235,7 @@
/area/aro2/room1)
"bd" = (
/obj/effect/floor_decal/industrial/warning/full,
/obj/machinery/power/pointdefense{
/obj/machinery/pointdefense{
id_tag = "aroship"
},
/obj/structure/cable/cyan{
@@ -703,7 +703,7 @@
/area/aro2/boatdeck)
"el" = (
/obj/effect/floor_decal/industrial/warning/full,
/obj/machinery/power/pointdefense{
/obj/machinery/pointdefense{
id_tag = "aroship"
},
/obj/structure/cable/cyan,
@@ -3040,7 +3040,7 @@
/area/aro2/starboardbay)
"Ed" = (
/obj/effect/floor_decal/industrial/warning/full,
/obj/machinery/power/pointdefense{
/obj/machinery/pointdefense{
id_tag = "aroship"
},
/obj/structure/cable/cyan{
@@ -3392,7 +3392,7 @@
/area/shuttle/aroboat2)
"HF" = (
/obj/effect/floor_decal/industrial/warning/full,
/obj/machinery/power/pointdefense{
/obj/machinery/pointdefense{
id_tag = "aroship"
},
/obj/structure/cable/cyan{
@@ -3546,7 +3546,7 @@
/area/aro2/portbay)
"Jg" = (
/obj/effect/floor_decal/industrial/warning/full,
/obj/machinery/power/pointdefense{
/obj/machinery/pointdefense{
id_tag = "aroship"
},
/obj/structure/cable/cyan{
@@ -3955,7 +3955,7 @@
/area/aro2/boatdeck)
"MR" = (
/obj/effect/floor_decal/industrial/warning/full,
/obj/machinery/power/pointdefense{
/obj/machinery/pointdefense{
id_tag = "aroship"
},
/obj/structure/cable/cyan{
@@ -4072,7 +4072,7 @@
/area/aro2/cockpit)
"OK" = (
/obj/effect/floor_decal/industrial/warning/full,
/obj/machinery/power/pointdefense{
/obj/machinery/pointdefense{
id_tag = "aroship"
},
/obj/structure/cable/cyan,
@@ -4186,7 +4186,7 @@
/area/aro2/portbay)
"PF" = (
/obj/effect/floor_decal/industrial/warning/full,
/obj/machinery/power/pointdefense{
/obj/machinery/pointdefense{
id_tag = "aroship"
},
/obj/structure/cable/cyan{
@@ -4795,7 +4795,7 @@
/area/aro2/boatdeck)
"Wg" = (
/obj/effect/floor_decal/industrial/warning/full,
/obj/machinery/power/pointdefense{
/obj/machinery/pointdefense{
id_tag = "aroship"
},
/obj/structure/cable/cyan{
maps/offmap_vr/om_ships/bearcat.dmm
+2 -2
View File
@@ -3572,7 +3572,7 @@
/turf/simulated/floor/plating,
/area/shuttle/bearcat/maintenance_engine_pod_starboard)
"sg" = (
/obj/machinery/power/pointdefense{
/obj/machinery/pointdefense{
id_tag = "bearcat_pd"
},
/turf/simulated/floor/airless,
@@ -3632,7 +3632,7 @@
/turf/simulated/shuttle/plating/airless/carry,
/area/shuttle/bearcat/maintenance_engine_pod_starboard)
"Di" = (
/obj/machinery/power/pointdefense{
/obj/machinery/pointdefense{
id_tag = "bearcat_pd"
},
/turf/simulated/floor/airless,
maps/offmap_vr/om_ships/cruiser.dmm
+1 -1
View File
@@ -9355,7 +9355,7 @@
/turf/simulated/floor/wood,
/area/mothership/breakroom)
"uh" = (
/obj/machinery/power/pointdefense{
/obj/machinery/pointdefense{
id_tag = "warship_pd"
},
/turf/simulated/floor/reinforced/airless{
maps/offmap_vr/om_ships/itglight.dmm
+6 -6
View File
@@ -48,7 +48,7 @@
d2 = 4;
icon_state = "0-4"
},
/obj/machinery/power/pointdefense{
/obj/machinery/pointdefense{
id_tag = "dauntless_pd"
},
/turf/simulated/floor/airless,
@@ -328,7 +328,7 @@
/turf/simulated/floor/airless,
/area/itglight/captain)
"bq" = (
/obj/machinery/power/pointdefense{
/obj/machinery/pointdefense{
id_tag = "dauntless_pd"
},
/obj/structure/cable/pink{
@@ -2093,7 +2093,7 @@
/turf/simulated/floor/tiled/eris/steel/gray_platform,
/area/itglight/starboardhighsec)
"mo" = (
/obj/machinery/power/pointdefense{
/obj/machinery/pointdefense{
id_tag = "dauntless_pd"
},
/obj/structure/cable/pink{
@@ -6009,7 +6009,7 @@
/turf/simulated/floor/tiled/eris/steel/brown_platform,
/area/itglight/shuttlebay)
"Kv" = (
/obj/machinery/power/pointdefense{
/obj/machinery/pointdefense{
id_tag = "dauntless_pd"
},
/obj/structure/cable/pink{
@@ -7824,7 +7824,7 @@
/turf/space,
/area/itglight/starboardengi)
"We" = (
/obj/machinery/power/pointdefense{
/obj/machinery/pointdefense{
id_tag = "dauntless_pd"
},
/obj/structure/cable/pink{
@@ -8115,7 +8115,7 @@
/turf/simulated/floor/carpet/turcarpet,
/area/itglight/crew1)
"XO" = (
/obj/machinery/power/pointdefense{
/obj/machinery/pointdefense{
id_tag = "dauntless_pd"
},
/obj/structure/cable/pink{
maps/offmap_vr/om_ships/mercship.dmm
+6 -6
View File
@@ -2268,7 +2268,7 @@
/turf/simulated/floor/tiled/dark,
/area/ship/mercenary/hall1)
"dY" = (
/obj/machinery/power/pointdefense{
/obj/machinery/pointdefense{
id_tag = "merc_pd"
},
/obj/effect/decal/warning_stripes,
@@ -2902,7 +2902,7 @@
/turf/simulated/floor/plating,
/area/ship/mercenary/engine)
"fj" = (
/obj/machinery/power/pointdefense{
/obj/machinery/pointdefense{
id_tag = "merc_pd"
},
/obj/effect/decal/warning_stripes,
@@ -3530,28 +3530,28 @@
/turf/simulated/floor/tiled/dark,
/area/ship/mercenary/engineering)
"gk" = (
/obj/machinery/power/pointdefense{
/obj/machinery/pointdefense{
id_tag = "merc_pd"
},
/obj/effect/decal/warning_stripes,
/turf/simulated/floor/plating/external,
/area/ship/mercenary/bridge)
"gl" = (
/obj/machinery/power/pointdefense{
/obj/machinery/pointdefense{
id_tag = "merc_pd"
},
/obj/effect/decal/warning_stripes,
/turf/simulated/floor/plating/external,
/area/ship/mercenary/engineeringcntrl)
"gm" = (
/obj/machinery/power/pointdefense{
/obj/machinery/pointdefense{
id_tag = "merc_pd"
},
/obj/effect/decal/warning_stripes,
/turf/simulated/floor/plating/external,
/area/ship/mercenary/armoury)
"gn" = (
/obj/machinery/power/pointdefense{
/obj/machinery/pointdefense{
id_tag = "merc_pd"
},
/obj/effect/decal/warning_stripes,
maps/offmap_vr/om_ships/salamander.dmm
+2 -2
View File
@@ -36,7 +36,7 @@
/turf/simulated/floor/tiled/techmaint,
/area/shuttle/salamander)
"bk" = (
/obj/machinery/power/pointdefense{
/obj/machinery/pointdefense{
id_tag = "salamander_pd"
},
/turf/simulated/floor/plating,
@@ -1256,7 +1256,7 @@
/turf/simulated/floor/tiled/techmaint,
/area/shuttle/salamander_engineering)
"tA" = (
/obj/machinery/power/pointdefense{
/obj/machinery/pointdefense{
id_tag = "salamander_pd"
},
/turf/simulated/floor/plating,
maps/offmap_vr/om_ships/salamander_wreck.dmm
+2 -2
View File
@@ -35,7 +35,7 @@
/turf/simulated/floor/tiled/techmaint,
/area/shuttle/salamander_wreck)
"bk" = (
/obj/machinery/power/pointdefense{
/obj/machinery/pointdefense{
id_tag = "salamander_wreck_pd"
},
/turf/simulated/floor/airless,
@@ -1275,7 +1275,7 @@
/turf/simulated/floor/tiled/techmaint/airless,
/area/shuttle/salamander_wreck_engineering)
"tA" = (
/obj/machinery/power/pointdefense{
/obj/machinery/pointdefense{
id_tag = "salamander_wreck_pd"
},
/turf/simulated/floor/airless,
maps/offmap_vr/om_ships/shelter_6.dmm
+1 -1
View File
@@ -6,7 +6,7 @@
},
/area/shuttle/tabiranth)
"ab" = (
/obj/machinery/power/pointdefense{
/obj/machinery/pointdefense{
id_tag = "tabiranth_pd"
},
/turf/simulated/floor/reinforced/airless{
maps/offmap_vr/talon/talon1.dmm
+5 -5
View File
@@ -18,7 +18,7 @@
/obj/structure/cable/green{
icon_state = "0-4"
},
/obj/machinery/power/pointdefense{
/obj/machinery/pointdefense{
id_tag = "talon_pd"
},
/turf/simulated/floor/hull/airless,
@@ -2750,7 +2750,7 @@
/turf/simulated/floor/tiled/eris/dark/orangecorner,
/area/talon/deckone/secure_storage)
"qo" = (
/obj/machinery/power/pointdefense{
/obj/machinery/pointdefense{
id_tag = "talon_pd"
},
/obj/effect/floor_decal/techfloor{
@@ -3079,7 +3079,7 @@
/turf/simulated/floor/tiled/eris/dark/cyancorner,
/area/talon/deckone/starboard_solar)
"uo" = (
/obj/machinery/power/pointdefense{
/obj/machinery/pointdefense{
id_tag = "talon_pd"
},
/obj/effect/floor_decal/techfloor{
@@ -3630,7 +3630,7 @@
/turf/space,
/area/space)
"AN" = (
/obj/machinery/power/pointdefense{
/obj/machinery/pointdefense{
id_tag = "talon_pd"
},
/obj/effect/floor_decal/techfloor{
@@ -5492,7 +5492,7 @@
/turf/simulated/floor/tiled/eris/techmaint_panels,
/area/talon/deckone/brig)
"UU" = (
/obj/machinery/power/pointdefense{
/obj/machinery/pointdefense{
id_tag = "talon_pd"
},
/obj/effect/floor_decal/techfloor{
maps/offmap_vr/talon/talon2.dmm
+4 -4
View File
@@ -2454,7 +2454,7 @@
/obj/structure/cable/green{
icon_state = "0-2"
},
/obj/machinery/power/pointdefense{
/obj/machinery/pointdefense{
id_tag = "talon_pd"
},
/obj/effect/floor_decal/techfloor{
@@ -3085,7 +3085,7 @@
/turf/simulated/floor/tiled/eris/steel,
/area/talon/decktwo/central_hallway)
"CB" = (
/obj/machinery/power/pointdefense{
/obj/machinery/pointdefense{
id_tag = "talon_pd"
},
/obj/structure/cable/green{
@@ -4025,7 +4025,7 @@
/turf/simulated/floor/hull/airless,
/area/talon/maintenance/decktwo_solars)
"RA" = (
/obj/machinery/power/pointdefense{
/obj/machinery/pointdefense{
id_tag = "talon_pd"
},
/obj/effect/floor_decal/techfloor{
@@ -4067,7 +4067,7 @@
/turf/simulated/floor/tiled/eris/techmaint_panels,
/area/talon/decktwo/central_hallway)
"Sb" = (
/obj/machinery/power/pointdefense{
/obj/machinery/pointdefense{
id_tag = "talon_pd"
},
/obj/structure/cable/green{
maps/submaps/admin_use_vr/ert.dmm
+12 -12
View File
@@ -4,7 +4,7 @@
/turf/space,
/area/space)
"ab" = (
/obj/machinery/power/pointdefense{
/obj/machinery/pointdefense{
id_tag = "vonbraun_pd"
},
/turf/simulated/floor/reinforced/airless,
@@ -33,7 +33,7 @@
/turf/simulated/floor/reinforced/airless,
/area/ship/ert/mech_bay)
"ag" = (
/obj/machinery/power/pointdefense{
/obj/machinery/pointdefense{
id_tag = "vonbraun_pd"
},
/turf/simulated/floor/reinforced/airless,
@@ -132,7 +132,7 @@
/turf/simulated/floor/reinforced,
/area/shuttle/ert_ship_boat)
"aC" = (
/obj/machinery/power/pointdefense{
/obj/machinery/pointdefense{
id_tag = "vonbraun_pd"
},
/turf/simulated/floor/reinforced/airless,
@@ -191,7 +191,7 @@
/turf/simulated/floor/tiled/white,
/area/ship/ert/med_surg)
"aV" = (
/obj/machinery/power/pointdefense{
/obj/machinery/pointdefense{
id_tag = "vonbraun_pd"
},
/turf/simulated/floor/reinforced/airless,
@@ -660,7 +660,7 @@
/obj/machinery/light/no_nightshift{
dir = 8
},
/obj/machinery/power/pointdefense{
/obj/machinery/pointdefense{
id_tag = "vonbraun_pd"
},
/turf/simulated/floor/reinforced/airless,
@@ -1282,7 +1282,7 @@
/obj/effect/floor_decal/industrial/warning/corner{
dir = 1
},
/obj/machinery/power/pointdefense{
/obj/machinery/pointdefense{
id_tag = "vonbraun_pd"
},
/obj/machinery/light/no_nightshift{
@@ -1324,7 +1324,7 @@
/obj/effect/floor_decal/industrial/warning/corner{
dir = 8
},
/obj/machinery/power/pointdefense{
/obj/machinery/pointdefense{
id_tag = "vonbraun_pd"
},
/obj/machinery/light/no_nightshift{
@@ -3154,7 +3154,7 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/ert/bridge)
"sB" = (
/obj/machinery/power/pointdefense{
/obj/machinery/pointdefense{
id_tag = "vonbraun_pd"
},
/turf/simulated/floor/reinforced/airless,
@@ -6597,7 +6597,7 @@
/turf/simulated/floor/tiled/techmaint,
/area/shuttle/ert_ship_boat)
"Nk" = (
/obj/machinery/power/pointdefense{
/obj/machinery/pointdefense{
id_tag = "vonbraun_pd"
},
/obj/machinery/light/no_nightshift{
@@ -6811,7 +6811,7 @@
/turf/simulated/floor/tiled/techmaint,
/area/ship/ert/hangar)
"Om" = (
/obj/machinery/power/pointdefense{
/obj/machinery/pointdefense{
id_tag = "vonbraun_pd"
},
/turf/simulated/floor/reinforced/airless,
@@ -8078,7 +8078,7 @@
/turf/simulated/floor/tiled/techmaint,
/area/ship/ert/hangar)
"WF" = (
/obj/machinery/power/pointdefense{
/obj/machinery/pointdefense{
id_tag = "vonbraun_pd"
},
/turf/simulated/floor/reinforced/airless,
@@ -8422,7 +8422,7 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/ert/engineering)
"ZL" = (
/obj/machinery/power/pointdefense{
/obj/machinery/pointdefense{
id_tag = "vonbraun_pd"
},
/turf/simulated/floor/reinforced/airless,
maps/submaps/admin_use_vr/kk_mercship.dmm
+12 -12
View File
@@ -563,7 +563,7 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/recreation)
"bG" = (
/obj/machinery/power/pointdefense{
/obj/machinery/pointdefense{
id_tag = "mercenary_pd"
},
/turf/simulated/floor/reinforced/airless,
@@ -635,7 +635,7 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/armoury_st)
"bT" = (
/obj/machinery/power/pointdefense{
/obj/machinery/pointdefense{
id_tag = "mercenary_pd"
},
/turf/simulated/floor/reinforced/airless,
@@ -826,7 +826,7 @@
/turf/simulated/floor/plating,
/area/ship/manta/engine)
"cI" = (
/obj/machinery/power/pointdefense{
/obj/machinery/pointdefense{
id_tag = "mercenary_pd"
},
/turf/simulated/floor/reinforced/airless,
@@ -1766,7 +1766,7 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/bridge)
"hq" = (
/obj/machinery/power/pointdefense{
/obj/machinery/pointdefense{
id_tag = "mercenary_pd"
},
/turf/simulated/floor/reinforced/airless,
@@ -2296,7 +2296,7 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/bridge)
"jh" = (
/obj/machinery/power/pointdefense{
/obj/machinery/pointdefense{
id_tag = "mercenary_pd"
},
/turf/simulated/floor/reinforced/airless,
@@ -3229,7 +3229,7 @@
/turf/simulated/floor/plating,
/area/ship/manta/engine)
"nJ" = (
/obj/machinery/power/pointdefense{
/obj/machinery/pointdefense{
id_tag = "mercenary_pd"
},
/turf/simulated/floor/reinforced/airless,
@@ -3590,7 +3590,7 @@
/turf/space,
/area/space)
"pi" = (
/obj/machinery/power/pointdefense{
/obj/machinery/pointdefense{
id_tag = "mercenary_pd"
},
/turf/simulated/floor/reinforced/airless,
@@ -3868,7 +3868,7 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/hallways_aft)
"qQ" = (
/obj/machinery/power/pointdefense{
/obj/machinery/pointdefense{
id_tag = "mercenary_pd"
},
/turf/simulated/floor/reinforced/airless,
@@ -3932,7 +3932,7 @@
/turf/simulated/floor/reinforced/airless,
/area/ship/manta/mech_bay)
"rp" = (
/obj/machinery/power/pointdefense{
/obj/machinery/pointdefense{
id_tag = "mercenary_pd"
},
/turf/simulated/floor/reinforced/airless,
@@ -4031,7 +4031,7 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/engineering)
"rR" = (
/obj/machinery/power/pointdefense{
/obj/machinery/pointdefense{
id_tag = "mercenary_pd"
},
/turf/simulated/floor/reinforced/airless,
@@ -4304,7 +4304,7 @@
/turf/simulated/floor/wood,
/area/ship/manta/barracks)
"ts" = (
/obj/machinery/power/pointdefense{
/obj/machinery/pointdefense{
id_tag = "mercenary_pd"
},
/turf/simulated/floor/reinforced/airless,
@@ -7166,7 +7166,7 @@
/turf/simulated/floor/tiled/techmaint,
/area/ship/manta/bridge)
"FZ" = (
/obj/machinery/power/pointdefense{
/obj/machinery/pointdefense{
id_tag = "mercenary_pd"
},
/turf/simulated/floor/reinforced/airless,
maps/submaps/pois_vr/debris_field/debris8.dmm
+1 -1
View File
@@ -9,7 +9,7 @@
/turf/simulated/floor/hull/airless,
/area/tether_away/debrisfield/shuttle_buffer)
"d" = (
/obj/machinery/power/pointdefense{
/obj/machinery/pointdefense{
dir = 4
},
/turf/simulated/floor/hull/airless,