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

Merge pull request #7605 from VOREStation/upstream-merge-7058

Browse Source 
[MIRROR] Allows backpacks to be carried on most hardsuits
This commit is contained in:
Novacat
2020-05-03 09:34:27 -04:00
committed by GitHub
parent 883ae115a4 c7d485db88
commit d9909b0449
8 changed files with 112 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/spacesuits/rig/suits/alien.dm
+7 -1
View File
@@ -51,7 +51,13 @@
item_flags = THICKMATERIAL
siemens_coefficient = 0.2
offline_slowdown = 5
allowed = list(/obj/item/weapon/gun,/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit)
allowed = list(
/obj/item/weapon/gun,
/obj/item/device/flashlight,
/obj/item/weapon/tank,
/obj/item/device/suit_cooling_unit,
/obj/item/weapon/storage
)
air_type = /obj/item/weapon/tank/vox
code/modules/clothing/spacesuits/rig/suits/combat.dm
+28 -5
View File
@@ -12,7 +12,14 @@
offline_vision_restriction = 1
helm_type = /obj/item/clothing/head/helmet/space/rig/combat
allowed = list(/obj/item/weapon/gun,/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/melee/baton)
allowed = list(
/obj/item/weapon/gun,
/obj/item/device/flashlight,
/obj/item/weapon/tank,
/obj/item/device/suit_cooling_unit,
/obj/item/weapon/melee/baton,
/obj/item/weapon/storage
)
/obj/item/weapon/rig/combat/equipped
@@ -42,10 +49,26 @@
slowdown = 1
offline_slowdown = 3
offline_vision_restriction = 1
allowed = list(/obj/item/device/flashlight, /obj/item/weapon/tank,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/handcuffs, \
/obj/item/device/t_scanner, /obj/item/weapon/rcd, /obj/item/weapon/weldingtool, /obj/item/weapon/tool, /obj/item/device/multitool, \
/obj/item/device/radio, /obj/item/device/analyzer,/obj/item/weapon/storage/briefcase/inflatable, /obj/item/weapon/melee/baton, /obj/item/weapon/gun, \
/obj/item/weapon/storage/firstaid, /obj/item/weapon/reagent_containers/hypospray, /obj/item/roller, /obj/item/device/suit_cooling_unit)
allowed = list(
/obj/item/device/flashlight,
/obj/item/weapon/tank,
/obj/item/ammo_magazine,
/obj/item/ammo_casing,
/obj/item/weapon/handcuffs,
/obj/item/device/t_scanner,
/obj/item/weapon/rcd,
/obj/item/weapon/weldingtool,
/obj/item/weapon/tool,
/obj/item/device/multitool,
/obj/item/device/radio,
/obj/item/device/analyzer,
/obj/item/weapon/melee/baton,
/obj/item/weapon/gun,
/obj/item/weapon/storage,
/obj/item/weapon/reagent_containers/hypospray,
/obj/item/roller,
/obj/item/device/suit_cooling_unit
)
chest_type = /obj/item/clothing/suit/space/rig/military
helm_type = /obj/item/clothing/head/helmet/space/rig/military
code/modules/clothing/spacesuits/rig/suits/ert.dm
+19 -4
View File
@@ -14,10 +14,25 @@
siemens_coefficient= 0.5
armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 100, rad = 100)
allowed = list(/obj/item/device/flashlight, /obj/item/weapon/tank, /obj/item/device/t_scanner, /obj/item/weapon/rcd, /obj/item/weapon/tool/crowbar, \
/obj/item/weapon/tool/screwdriver, /obj/item/weapon/weldingtool, /obj/item/weapon/tool/wirecutters, /obj/item/weapon/tool/wrench, /obj/item/device/multitool, \
/obj/item/device/radio, /obj/item/device/analyzer,/obj/item/weapon/storage/briefcase/inflatable, /obj/item/weapon/melee/baton, /obj/item/weapon/gun, \
/obj/item/weapon/storage/firstaid, /obj/item/weapon/reagent_containers/hypospray, /obj/item/roller)
allowed = list(
/obj/item/device/flashlight,
/obj/item/weapon/tank,
/obj/item/device/t_scanner,
/obj/item/weapon/rcd,
/obj/item/weapon/tool/crowbar,
/obj/item/weapon/tool/screwdriver,
/obj/item/weapon/weldingtool,
/obj/item/weapon/tool/wirecutters,
/obj/item/weapon/tool/wrench,
/obj/item/device/multitool,
/obj/item/device/radio,
/obj/item/device/analyzer,
/obj/item/weapon/storage,
/obj/item/weapon/melee/baton,
/obj/item/weapon/gun,
/obj/item/weapon/reagent_containers/hypospray,
/obj/item/roller
)
initial_modules = list(
/obj/item/rig_module/ai_container,
code/modules/clothing/spacesuits/rig/suits/light.dm
+11 -1
View File
@@ -4,7 +4,17 @@
desc = "A lighter, less armoured rig suit."
icon_state = "ninja_rig"
suit_type = "light suit"
allowed = list(/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/cell)
allowed = list(
/obj/item/weapon/gun,
/obj/item/ammo_magazine,
/obj/item/ammo_casing,
/obj/item/weapon/melee/baton,
/obj/item/weapon/handcuffs,
/obj/item/weapon/tank,
/obj/item/device/suit_cooling_unit,
/obj/item/weapon/cell,
/obj/item/weapon/storage
)
armor = list(melee = 50, bullet = 15, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0)
emp_protection = 10
slowdown = 0
code/modules/clothing/spacesuits/rig/suits/merc.dm
+12 -1
View File
@@ -14,7 +14,18 @@
siemens_coefficient = 0.3
glove_type = /obj/item/clothing/gloves/gauntlets/rig/eva
helm_type = /obj/item/clothing/head/helmet/space/rig/merc
allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword,/obj/item/weapon/handcuffs)
allowed = list(
/obj/item/device/flashlight,
/obj/item/weapon/tank,
/obj/item/device/suit_cooling_unit,
/obj/item/weapon/gun,
/obj/item/ammo_magazine,
/obj/item/ammo_casing,
/obj/item/weapon/melee/baton,
/obj/item/weapon/melee/energy/sword,
/obj/item/weapon/handcuffs,
/obj/item/weapon/storage
)
initial_modules = list(
/obj/item/rig_module/mounted,
code/modules/clothing/spacesuits/rig/suits/pmc.dm
+19 -4
View File
@@ -12,10 +12,25 @@
req_access = list(access_cent_specops)
armor = list(melee = 60, bullet = 50, laser = 35,energy = 15, bomb = 30, bio = 100, rad = 95)
allowed = list(/obj/item/device/flashlight, /obj/item/weapon/tank, /obj/item/device/t_scanner, /obj/item/weapon/rcd, /obj/item/weapon/tool/crowbar, \
/obj/item/weapon/tool/screwdriver, /obj/item/weapon/weldingtool, /obj/item/weapon/tool/wirecutters, /obj/item/weapon/tool/wrench, /obj/item/device/multitool, \
/obj/item/device/radio, /obj/item/device/analyzer,/obj/item/weapon/storage/briefcase/inflatable, /obj/item/weapon/melee/baton, /obj/item/weapon/gun, \
/obj/item/weapon/storage/firstaid, /obj/item/weapon/reagent_containers/hypospray, /obj/item/roller)
allowed = list(
/obj/item/device/flashlight,
/obj/item/weapon/tank,
/obj/item/device/t_scanner,
/obj/item/weapon/rcd,
/obj/item/weapon/tool/crowbar,
/obj/item/weapon/tool/screwdriver,
/obj/item/weapon/weldingtool,
/obj/item/weapon/tool/wirecutters,
/obj/item/weapon/tool/wrench,
/obj/item/device/multitool,
/obj/item/device/radio,
/obj/item/device/analyzer,
/obj/item/weapon/melee/baton,
/obj/item/weapon/gun,
/obj/item/weapon/storage,
/obj/item/weapon/reagent_containers/hypospray,
/obj/item/roller
)
/obj/item/weapon/rig/pmc/commander
name = "PMC-C hardsuit control module"
code/modules/clothing/spacesuits/rig/suits/station.dm
+10 -10
View File
@@ -35,8 +35,7 @@
/obj/item/device/flashlight,
/obj/item/weapon/tank,
/obj/item/device/suit_cooling_unit,
/obj/item/weapon/storage/briefcase,
/obj/item/weapon/storage/secure/briefcase
/obj/item/weapon/storage,
)
req_access = list()
@@ -83,7 +82,7 @@
/obj/item/device/flashlight,
/obj/item/weapon/tank,
/obj/item/device/suit_cooling_unit,
/obj/item/weapon/storage/bag/ore,
/obj/item/weapon/storage,
/obj/item/device/t_scanner,
/obj/item/weapon/pickaxe,
/obj/item/weapon/rcd
@@ -121,7 +120,7 @@
/obj/item/device/flashlight,
/obj/item/weapon/tank,
/obj/item/device/suit_cooling_unit,
/obj/item/weapon/storage/briefcase/inflatable,
/obj/item/weapon/storage,
/obj/item/device/t_scanner,
/obj/item/weapon/rcd
)
@@ -168,7 +167,7 @@
/obj/item/device/flashlight,
/obj/item/weapon/tank,
/obj/item/device/suit_cooling_unit,
/obj/item/weapon/storage/briefcase/inflatable,
/obj/item/weapon/storage,
/obj/item/device/t_scanner,
/obj/item/weapon/rcd
)
@@ -212,7 +211,7 @@
/obj/item/weapon/tank,
/obj/item/device/suit_cooling_unit,
/obj/item/stack/flag,
/obj/item/weapon/storage/excavation,
/obj/item/weapon/storage,
/obj/item/weapon/pickaxe,
/obj/item/device/healthanalyzer,
/obj/item/device/measuring_tape,
@@ -222,8 +221,8 @@
/obj/item/device/gps,
/obj/item/device/beacon_locator,
/obj/item/device/radio/beacon,
/obj/item/weapon/pickaxe/hand,
/obj/item/weapon/storage/bag/fossils)
/obj/item/weapon/pickaxe/hand
)
req_access = list()
req_one_access = list()
@@ -256,7 +255,7 @@
/obj/item/device/flashlight,
/obj/item/weapon/tank,
/obj/item/device/suit_cooling_unit,
/obj/item/weapon/storage/firstaid,
/obj/item/weapon/storage,
/obj/item/device/healthanalyzer,
/obj/item/stack/medical,
/obj/item/roller
@@ -296,7 +295,8 @@
/obj/item/device/flashlight,
/obj/item/weapon/tank,
/obj/item/device/suit_cooling_unit,
/obj/item/weapon/melee/baton
/obj/item/weapon/melee/baton,
/obj/item/weapon/storage
)
req_access = list()
html/changelogs/atlantiscze-hardsuit.yml
+6
View File
@@ -0,0 +1,6 @@
author: atlantiscze
delete-after: True
changes:
- rscadd: "Hardsuits now allow backpacks to be carried in storage slot. This is limited to hardsuits which are worn on the back slot."