cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 19:52:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1241 from Mark9013100/3/23/2016magstorage

Browse Source 
Armor can now hold maglights
This commit is contained in:
Neerti
2016-03-24 09:06:51 -04:00
parent b457b54b02 5f734effbc
commit dfb6ea7071
4 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
code/datums/supplypacks.dm
View File

@@ -1001,7 +1001,7 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
containername = "Security barrier crate" containername = "Security barrier crate"
group = "Security" group = "Security"
/datum/supply_packs/securitybarriers /datum/supply_packs/securityshieldgen
name = "Wall shield Generators" name = "Wall shield Generators"
contains = list(/obj/machinery/shieldwallgen, contains = list(/obj/machinery/shieldwallgen,
/obj/machinery/shieldwallgen, /obj/machinery/shieldwallgen,
@@ -1729,7 +1729,8 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/obj/item/device/camera_film, /obj/item/device/camera_film,
/obj/item/device/camera_film, /obj/item/device/camera_film,
/obj/item/weapon/storage/photo_album, /obj/item/weapon/storage/photo_album,
/obj/item/device/reagent_scanner) /obj/item/device/reagent_scanner,
/obj/item/device/flashlight/maglight)
cost = 35 cost = 35
containertype = "/obj/structure/closet/crate/secure" containertype = "/obj/structure/closet/crate/secure"
containername = "Forensic equipment" containername = "Forensic equipment"
@@ -1785,7 +1786,8 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/obj/item/clothing/accessory/storage/black_vest, /obj/item/clothing/accessory/storage/black_vest,
/obj/item/clothing/head/soft/sec/corp, /obj/item/clothing/head/soft/sec/corp,
/obj/item/clothing/under/rank/security/corp, /obj/item/clothing/under/rank/security/corp,
/obj/item/weapon/gun/energy/taser) /obj/item/weapon/gun/energy/taser,
/obj/item/device/flashlight/maglight)
cost = 30 cost = 30
containertype = "/obj/structure/closet/crate/secure" containertype = "/obj/structure/closet/crate/secure"
containername = "Officer equipment" containername = "Officer equipment"
@@ -1811,7 +1813,8 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/obj/item/weapon/reagent_containers/spray/pepper, /obj/item/weapon/reagent_containers/spray/pepper,
/obj/item/weapon/melee/baton/loaded, /obj/item/weapon/melee/baton/loaded,
/obj/item/weapon/storage/box/holobadge, /obj/item/weapon/storage/box/holobadge,
/obj/item/clothing/head/beret/sec/corporate/warden) /obj/item/clothing/head/beret/sec/corporate/warden,
/obj/item/device/flashlight/maglight)
cost = 45 cost = 45
containertype = "/obj/structure/closet/crate/secure" containertype = "/obj/structure/closet/crate/secure"
containername = "Warden equipment" containername = "Warden equipment"
@@ -1835,7 +1838,8 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
/obj/item/clothing/accessory/holster/waist, /obj/item/clothing/accessory/holster/waist,
/obj/item/weapon/melee/telebaton, /obj/item/weapon/melee/telebaton,
/obj/item/weapon/shield/riot/tele, /obj/item/weapon/shield/riot/tele,
/obj/item/clothing/head/beret/sec/corporate/hos) /obj/item/clothing/head/beret/sec/corporate/hos,
/obj/item/device/flashlight/maglight)
cost = 65 cost = 65
containertype = "/obj/structure/closet/crate/secure" containertype = "/obj/structure/closet/crate/secure"
containername = "Head of security equipment" containername = "Head of security equipment"

1
code/game/objects/structures/crates_lockers/closets/secure/security.dm
View File

@@ -297,6 +297,7 @@
new /obj/item/taperoll/police(src) new /obj/item/taperoll/police(src)
new /obj/item/weapon/gun/projectile/colt/detective(src) new /obj/item/weapon/gun/projectile/colt/detective(src)
new /obj/item/clothing/accessory/holster/armpit(src) new /obj/item/clothing/accessory/holster/armpit(src)
new /obj/item/device/flashlight/maglight(src)
return return
/obj/structure/closet/secure_closet/detective/update_icon() /obj/structure/closet/secure_closet/detective/update_icon()

4
code/modules/clothing/suits/armor.dm
View File

@@ -1,6 +1,6 @@
/obj/item/clothing/suit/armor /obj/item/clothing/suit/armor
allowed = list(/obj/item/weapon/gun/energy,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/weapon/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs) allowed = list(/obj/item/weapon/gun/energy,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/weapon/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/device/flashlight/maglight)
body_parts_covered = UPPER_TORSO|LOWER_TORSO body_parts_covered = UPPER_TORSO|LOWER_TORSO
item_flags = THICKMATERIAL item_flags = THICKMATERIAL
@@ -263,7 +263,7 @@
icon_state = "kvest" icon_state = "kvest"
item_state = "kvest" item_state = "kvest"
armor = list(melee = 40, bullet = 30, laser = 30, energy = 10, bomb = 10, bio = 0, rad = 0) armor = list(melee = 40, bullet = 30, laser = 30, energy = 10, bomb = 10, bio = 0, rad = 0)
allowed = list(/obj/item/weapon/gun,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs) allowed = list(/obj/item/weapon/gun,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/device/flashlight/maglight)
body_parts_covered = UPPER_TORSO|LOWER_TORSO body_parts_covered = UPPER_TORSO|LOWER_TORSO
item_flags = THICKMATERIAL item_flags = THICKMATERIAL

4
code/modules/clothing/suits/jobs.dm
View File

@@ -96,7 +96,7 @@
item_state = "det_suit" item_state = "det_suit"
blood_overlay_type = "coat" blood_overlay_type = "coat"
body_parts_covered = UPPER_TORSO|ARMS body_parts_covered = UPPER_TORSO|ARMS
allowed = list(/obj/item/weapon/tank/emergency_oxygen, /obj/item/device/flashlight,/obj/item/weapon/gun/energy,/obj/item/weapon/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/flame/lighter,/obj/item/device/taperecorder) allowed = list(/obj/item/weapon/tank/emergency_oxygen, /obj/item/device/flashlight,/obj/item/weapon/gun/energy,/obj/item/weapon/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/flame/lighter,/obj/item/device/taperecorder,/obj/item/device/uv_light)
armor = list(melee = 50, bullet = 10, laser = 25, energy = 10, bomb = 0, bio = 0, rad = 0) armor = list(melee = 50, bullet = 10, laser = 25, energy = 10, bomb = 0, bio = 0, rad = 0)
/obj/item/clothing/suit/storage/det_trench/grey /obj/item/clothing/suit/storage/det_trench/grey
@@ -109,7 +109,7 @@
desc = "A forensics technician jacket." desc = "A forensics technician jacket."
item_state = "det_suit" item_state = "det_suit"
body_parts_covered = UPPER_TORSO|ARMS body_parts_covered = UPPER_TORSO|ARMS
allowed = list(/obj/item/weapon/tank/emergency_oxygen, /obj/item/device/flashlight,/obj/item/weapon/gun/energy,/obj/item/weapon/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/device/taperecorder) allowed = list(/obj/item/weapon/tank/emergency_oxygen, /obj/item/device/flashlight,/obj/item/weapon/gun/energy,/obj/item/weapon/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/device/taperecorder,/obj/item/device/uv_light)
armor = list(melee = 10, bullet = 10, laser = 15, energy = 10, bomb = 0, bio = 0, rad = 0) armor = list(melee = 10, bullet = 10, laser = 15, energy = 10, bomb = 0, bio = 0, rad = 0)
/obj/item/clothing/suit/storage/forensics/red /obj/item/clothing/suit/storage/forensics/red