mirror of
https://github.com/CHOMPstation/CHOMPstation.git
synced 2026-08-26 21:46:51 +01:00
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-15
# Conflicts: # README.md # code/__defines/mobs.dm # code/__defines/subsystems.dm # code/_helpers/global_lists.dm # code/controllers/subsystems/garbage.dm # code/controllers/subsystems/overlays.dm # code/datums/datacore.dm # code/datums/supplypacks/munitions.dm # code/game/machinery/suit_storage_unit.dm # code/game/objects/items/devices/communicator/UI.dm # code/game/objects/items/weapons/id cards/station_ids.dm # code/game/objects/random/random.dm # code/game/turfs/simulated/floor.dm # code/game/turfs/simulated/floor_icon.dm # code/modules/awaymissions/gateway.dm # code/modules/client/preferences.dm # code/modules/ext_scripts/python.dm # code/modules/mob/living/carbon/human/human.dm # code/modules/mob/living/carbon/human/life.dm # code/modules/mob/living/carbon/human/species/station/station.dm # code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm # code/modules/mob/living/carbon/human/update_icons.dm # code/modules/mob/living/living.dm # code/modules/mob/living/living_defines.dm # code/modules/mob/living/simple_animal/animals/bear.dm # code/modules/mob/mob_helpers.dm # code/modules/mob/new_player/new_player.dm # code/modules/mob/new_player/preferences_setup.dm # code/modules/mob/new_player/sprite_accessories.dm # code/modules/organs/organ_external.dm # code/modules/organs/organ_icon.dm # code/modules/organs/robolimbs.dm # code/modules/reagents/reagent_containers/glass.dm # code/modules/reagents/reagent_containers/syringes.dm # html/changelogs/.all_changelog.yml # maps/southern_cross/southern_cross-1.dmm # maps/southern_cross/southern_cross-3.dmm # maps/southern_cross/southern_cross-4.dmm # maps/southern_cross/southern_cross-6.dmm # vorestation.dme
This commit is contained in:
Leshana
@@ -279,7 +279,7 @@
|
||||
G.fields["fingerprint"] = "Unknown"
|
||||
G.fields["p_stat"] = "Active"
|
||||
G.fields["m_stat"] = "Stable"
|
||||
G.fields["species"] = "Human"
|
||||
G.fields["species"] = SPECIES_HUMAN
|
||||
G.fields["home_system"] = "Unknown"
|
||||
G.fields["citizenship"] = "Unknown"
|
||||
G.fields["faction"] = "Unknown"
|
||||
|
||||
@@ -43,8 +43,8 @@
|
||||
containername = "Moghes imports crate"
|
||||
contraband = 1
|
||||
|
||||
/datum/supply_packs/security/bolt_rifles_militia
|
||||
name = "Surplus militia rifles"
|
||||
/datum/supply_packs/munitions/bolt_rifles_militia
|
||||
name = "Weapon - Surplus militia rifles"
|
||||
contains = list(
|
||||
/obj/item/weapon/gun/projectile/shotgun/pump/rifle = 3,
|
||||
/obj/item/ammo_magazine/clip/c762 = 6
|
||||
@@ -52,7 +52,7 @@
|
||||
cost = 50
|
||||
contraband = 1
|
||||
containertype = /obj/structure/closet/crate/secure/weapon
|
||||
containername = "Weapons crate"
|
||||
containername = "Ballistic weapons crate"
|
||||
|
||||
/datum/supply_packs/randomised/misc/telecrate //you get something awesome, a couple of decent things, and a few weak/filler things
|
||||
name = "ERR_NULL_ENTRY" //null crate! also dream maker is hell,
|
||||
|
||||
@@ -73,7 +73,7 @@
|
||||
|
||||
/datum/supply_packs/misc/holoplant
|
||||
name = "Holoplant Pot"
|
||||
contains = list()
|
||||
contains = list(/obj/machinery/holoplant/shipped)
|
||||
cost = 15
|
||||
containertype = /obj/machinery/holoplant/shipped
|
||||
containername = "holoplant"
|
||||
containertype = /obj/structure/closet/crate
|
||||
containername = "Holoplant crate"
|
||||
|
||||
@@ -10,21 +10,30 @@
|
||||
group = "Munitions"
|
||||
/* VOREStation Removal - What? This crate costs 40... the crate with just two eguns costs 50... what??? This crate is also like "the armory" and has OFFICER access?
|
||||
/datum/supply_packs/munitions/weapons
|
||||
name = "Weapons crate"
|
||||
name = "Weapons - Security basic equipment"
|
||||
contains = list(
|
||||
/obj/item/device/flash = 2,
|
||||
/obj/item/weapon/reagent_containers/spray/pepper = 2,
|
||||
/obj/item/weapon/melee/baton/loaded = 2,
|
||||
/obj/item/weapon/gun/energy/gun = 2,
|
||||
/obj/item/weapon/gun/energy/taser = 2,
|
||||
/obj/item/weapon/gun/projectile/colt/detective = 2,
|
||||
/obj/item/weapon/storage/box/flashbangs = 2
|
||||
)
|
||||
cost = 40
|
||||
containertype = /obj/structure/closet/crate/secure/gear
|
||||
containername = "Security equipment crate"
|
||||
access = access_security
|
||||
|
||||
/datum/supply_packs/munitions/egunpistol
|
||||
name = "Weapons - Energy sidearms"
|
||||
contains = list(/obj/item/weapon/gun/energy/gun = 2)
|
||||
cost = 40
|
||||
containertype = /obj/structure/closet/crate/secure/weapon
|
||||
containername = "Weapons crate"
|
||||
containername = "Energy sidearms crate"
|
||||
access = access_security
|
||||
*/
|
||||
/datum/supply_packs/munitions/flareguns
|
||||
name = "Flare guns crate"
|
||||
name = "Weapons - Flare guns"
|
||||
contains = list(
|
||||
/obj/item/weapon/gun/projectile/sec/flash,
|
||||
/obj/item/ammo_magazine/m45/flash,
|
||||
@@ -32,100 +41,96 @@
|
||||
/obj/item/weapon/storage/box/flashshells
|
||||
)
|
||||
cost = 25
|
||||
containertype = /obj/structure/closet/crate/secure/weapon
|
||||
containertype = /obj/structure/closet/crate/secure/gear
|
||||
containername = "Flare gun crate"
|
||||
access = access_armory //VOREStation Edit - Guns are for the armory.
|
||||
|
||||
/datum/supply_packs/munitions/eweapons
|
||||
name = "Experimental weapons crate"
|
||||
name = "Weapons - Experimental weapons crate"
|
||||
contains = list(
|
||||
/obj/item/weapon/gun/energy/xray = 2,
|
||||
/obj/item/weapon/shield/energy = 2)
|
||||
cost = 100
|
||||
containertype = /obj/structure/closet/crate/secure/weapon
|
||||
containertype = /obj/structure/closet/crate/secure/science
|
||||
containername = "Experimental weapons crate"
|
||||
access = access_armory
|
||||
|
||||
/datum/supply_packs/munitions/energyweapons
|
||||
name = "Laser carbine crate"
|
||||
/datum/supply_packs/munitions/energyweapons
|
||||
name = "Weapons - Laser rifle crate"
|
||||
contains = list(/obj/item/weapon/gun/energy/laser = 2) //VOREStation Edit - Made to be consistent with the energy guns crate.
|
||||
cost = 50
|
||||
containertype = /obj/structure/closet/crate/secure
|
||||
containername = "energy weapons crate"
|
||||
containertype = /obj/structure/closet/crate/secure/weapon
|
||||
containername = "Energy weapons crate"
|
||||
access = access_armory
|
||||
|
||||
/datum/supply_packs/munitions/shotgun
|
||||
name = "Shotgun crate"
|
||||
name = "Weapons - Shotgun crate"
|
||||
contains = list(
|
||||
/obj/item/weapon/storage/box/shotgunammo,
|
||||
/obj/item/weapon/storage/box/shotgunshells,
|
||||
/obj/item/weapon/gun/projectile/shotgun/pump/combat = 2
|
||||
)
|
||||
cost = 50
|
||||
containertype = /obj/structure/closet/crate/secure
|
||||
containertype = /obj/structure/closet/crate/secure/weapon
|
||||
containername = "Shotgun crate"
|
||||
access = access_armory
|
||||
/* VOREStation edit -- This is a bad idea. -- So is this.
|
||||
/datum/supply_packs/munitions/erifle
|
||||
name = "Energy marksman crate"
|
||||
name = "Weapons - Energy marksman"
|
||||
contains = list(/obj/item/weapon/gun/energy/sniperrifle = 2)
|
||||
cost = 100
|
||||
containertype = /obj/structure/closet/crate/secure
|
||||
containertype = /obj/structure/closet/crate/secure/weapon
|
||||
containername = "Energy marksman crate"
|
||||
access = access_armory
|
||||
|
||||
/datum/supply_packs/munitions/burstlaser
|
||||
name = "Burst laser crate"
|
||||
name = "Weapons - Burst laser"
|
||||
contains = list(/obj/item/weapon/gun/energy/gun/burst = 2)
|
||||
cost = 50
|
||||
containertype = /obj/structure/closet/crate/secure
|
||||
containertype = /obj/structure/closet/crate/secure/weapon
|
||||
containername = "Burst laser crate"
|
||||
access = access_armory
|
||||
*/
|
||||
/datum/supply_packs/munitions/ionweapons
|
||||
name = "Electromagnetic weapons crate"
|
||||
name = "Weapons - Electromagnetic Rifles"
|
||||
contains = list(
|
||||
/obj/item/weapon/gun/energy/ionrifle = 2,
|
||||
/obj/item/weapon/storage/box/empslite
|
||||
)
|
||||
cost = 50
|
||||
containertype = /obj/structure/closet/crate/secure
|
||||
containername = "electromagnetic weapons crate"
|
||||
containertype = /obj/structure/closet/crate/secure/weapon
|
||||
containername = "Electromagnetic weapons crate"
|
||||
access = access_armory
|
||||
|
||||
/datum/supply_packs/munitions/ionpistols
|
||||
name = "Electromagnetic pistols crate"
|
||||
name = "Weapons - Electromagnetic pistols"
|
||||
contains = list(
|
||||
/obj/item/weapon/gun/energy/ionrifle/pistol = 2,
|
||||
/obj/item/weapon/storage/box/empslite
|
||||
)
|
||||
cost = 30
|
||||
containertype = /obj/structure/closet/crate/secure
|
||||
containername = "electromagnetic weapons crate"
|
||||
containertype = /obj/structure/closet/crate/secure/weapon
|
||||
containername = "Electromagnetic weapons crate"
|
||||
access = access_armory
|
||||
|
||||
/datum/supply_packs/randomised/munitions/automatic
|
||||
name = "Automatic weapon crate"
|
||||
num_contained = 2
|
||||
contains = list(
|
||||
/obj/item/weapon/gun/projectile/automatic/wt550,
|
||||
/obj/item/weapon/gun/projectile/automatic/z8
|
||||
)
|
||||
cost = 100
|
||||
containertype = /obj/structure/closet/crate/secure
|
||||
containername = "Automatic weapon crate"
|
||||
access = access_armory
|
||||
|
||||
/datum/supply_packs/munitions/energy_guns
|
||||
name = "Energy gun crate"
|
||||
contains = list(/obj/item/weapon/gun/energy/gun = 2)
|
||||
/datum/supply_packs/munitions/bsmg
|
||||
name = "Weapons - Ballistic SMGs"
|
||||
contains = list(/obj/item/weapon/gun/projectile/automatic/wt550 = 2)
|
||||
cost = 50
|
||||
containertype = /obj/structure/closet/crate/secure
|
||||
containername = "Energy gun crate"
|
||||
containertype = /obj/structure/closet/crate/secure/weapon
|
||||
containername = "Ballistic weapon crate"
|
||||
access = access_armory
|
||||
|
||||
/datum/supply_packs/munitions/brifle
|
||||
name = "Weapons - Ballistic Rifles"
|
||||
contains = list(/obj/item/weapon/gun/projectile/automatic/z8 = 2)
|
||||
cost = 80
|
||||
containertype = /obj/structure/closet/crate/secure/weapon
|
||||
containername = "Ballistic weapon crate"
|
||||
access = access_armory
|
||||
|
||||
/datum/supply_packs/munitions/bolt_rifles_competitive
|
||||
name = "Competitive shooting crate"
|
||||
name = "Weapons - Competitive shooting rifles"
|
||||
contains = list(
|
||||
/obj/item/device/assembly/timer,
|
||||
/obj/item/weapon/gun/projectile/shotgun/pump/rifle/practice = 2,
|
||||
@@ -136,37 +141,56 @@
|
||||
)
|
||||
cost = 40
|
||||
containertype = /obj/structure/closet/crate/secure/weapon
|
||||
containername = "Weapons crate"
|
||||
containername = "Ballistic Weapons crate"
|
||||
access = access_armory //VOREStation Edit - Guns are for the armory.
|
||||
|
||||
/datum/supply_packs/munitions/shotgunammo
|
||||
name = "Shotgun ammunition crate"
|
||||
name = "Ammunition - Shotgun shells"
|
||||
contains = list(
|
||||
/obj/item/weapon/storage/box/shotgunammo = 2,
|
||||
/obj/item/weapon/storage/box/shotgunshells = 2
|
||||
)
|
||||
cost = 25
|
||||
containertype = /obj/structure/closet/crate/secure
|
||||
containername = "ballistic ammunition crate"
|
||||
access = access_armory
|
||||
|
||||
/datum/supply_packs/randomised/munitions/autoammo
|
||||
name = "Automatic weapon ammunition crate"
|
||||
num_contained = 6
|
||||
contains = list(
|
||||
/obj/item/ammo_magazine/m9mmt,
|
||||
/obj/item/ammo_magazine/m9mmt/rubber,
|
||||
/obj/item/ammo_magazine/m545saw
|
||||
)
|
||||
cost = 25
|
||||
containertype = /obj/structure/closet/crate/secure
|
||||
containername = "Automatic weapon ammunition crate"
|
||||
containername = "Ballistic ammunition crate"
|
||||
access = access_armory
|
||||
|
||||
/datum/supply_packs/munitions/beanbagammo
|
||||
name = "Beanbag shells"
|
||||
name = "Ammunition - Beanbag shells"
|
||||
contains = list(/obj/item/weapon/storage/box/beanbags = 3)
|
||||
cost = 25
|
||||
containertype = /obj/structure/closet/crate
|
||||
containername = "Beanbag shells"
|
||||
containername = "Ballistic ammunition crate"
|
||||
access = access_armory //VOREStation Edit - Guns are for the armory.
|
||||
|
||||
/datum/supply_packs/munitions/bsmgammo
|
||||
name = "Ammunition - 9mm top mounted lethal"
|
||||
contains = list(/obj/item/ammo_magazine/m9mmt = 6)
|
||||
cost = 25
|
||||
containertype = /obj/structure/closet/crate/secure
|
||||
containername = "Ballistic ammunition crate"
|
||||
access = access_armory
|
||||
|
||||
/datum/supply_packs/munitions/bsmgammorubber
|
||||
name = "Ammunition - 9mm top mounted rubber"
|
||||
contains = list(/obj/item/ammo_magazine/m9mmt/rubber = 6)
|
||||
cost = 25
|
||||
containertype = /obj/structure/closet/crate/secure
|
||||
containername = "Ballistic ammunition crate"
|
||||
access = access_security
|
||||
|
||||
/datum/supply_packs/munitions/brifleammo
|
||||
name = "Ammunition - 7.62mm lethal"
|
||||
contains = list(/obj/item/ammo_magazine/m762 = 6)
|
||||
cost = 25
|
||||
containertype = /obj/structure/closet/crate/secure
|
||||
containername = "Ballistic ammunition crate"
|
||||
access = access_armory
|
||||
|
||||
/datum/supply_packs/munitions/pcellammo
|
||||
name = "Ammunition - Power cell"
|
||||
contains = list(/obj/item/weapon/cell/device/weapon = 3)
|
||||
cost = 50
|
||||
containertype = /obj/structure/closet/crate/secure
|
||||
containername = "Energy ammunition crate"
|
||||
access = access_security
|
||||
|
||||
@@ -13,6 +13,7 @@
|
||||
access = access_security
|
||||
|
||||
/datum/supply_packs/randomised/security/armor
|
||||
name = "Armor - Security armor"
|
||||
num_contained = 5
|
||||
contains = list(
|
||||
/obj/item/clothing/suit/storage/vest,
|
||||
@@ -27,15 +28,13 @@
|
||||
/obj/item/clothing/suit/storage/vest/heavy/hos,
|
||||
/obj/item/clothing/suit/storage/vest/heavy/pcrc
|
||||
)
|
||||
|
||||
name = "Armor crate"
|
||||
cost = 40
|
||||
containertype = /obj/structure/closet/crate/secure
|
||||
containertype = /obj/structure/closet/crate/secure/gear
|
||||
containername = "Armor crate"
|
||||
access_armory //VOREStation Add - Armor is for the armory.
|
||||
|
||||
/datum/supply_packs/security/riot_gear
|
||||
name = "Riot gear crate"
|
||||
name = "Gear - Riot"
|
||||
contains = list(
|
||||
/obj/item/weapon/melee/baton = 3,
|
||||
/obj/item/weapon/shield/riot = 3,
|
||||
@@ -45,12 +44,12 @@
|
||||
/obj/item/weapon/storage/box/handcuffs
|
||||
)
|
||||
cost = 40
|
||||
containertype = /obj/structure/closet/crate/secure
|
||||
containername = "riot gear crate"
|
||||
containertype = /obj/structure/closet/crate/secure/gear
|
||||
containername = "Riot gear crate"
|
||||
access = access_armory
|
||||
|
||||
/datum/supply_packs/security/riot_armor
|
||||
name = "Riot armor set crate"
|
||||
name = "Armor - Riot"
|
||||
contains = list(
|
||||
/obj/item/clothing/head/helmet/riot,
|
||||
/obj/item/clothing/suit/armor/riot,
|
||||
@@ -58,12 +57,12 @@
|
||||
/obj/item/clothing/shoes/leg_guard/riot
|
||||
)
|
||||
cost = 30
|
||||
containertype = /obj/structure/closet/crate/secure
|
||||
containername = "riot armor set crate"
|
||||
containertype = /obj/structure/closet/crate/secure/gear
|
||||
containername = "Riot armor crate"
|
||||
access = access_armory
|
||||
|
||||
/datum/supply_packs/security/ablative_armor
|
||||
name = "Ablative armor set crate"
|
||||
name = "Armor - Ablative"
|
||||
contains = list(
|
||||
/obj/item/clothing/head/helmet/laserproof,
|
||||
/obj/item/clothing/suit/armor/laserproof,
|
||||
@@ -71,12 +70,12 @@
|
||||
/obj/item/clothing/shoes/leg_guard/laserproof
|
||||
)
|
||||
cost = 40
|
||||
containertype = /obj/structure/closet/crate/secure
|
||||
containername = "ablative armor set crate"
|
||||
containertype = /obj/structure/closet/crate/secure/gear
|
||||
containername = "Ablative armor crate"
|
||||
access = access_armory
|
||||
|
||||
/datum/supply_packs/security/bullet_resistant_armor
|
||||
name = "Bullet resistant armor set crate"
|
||||
name = "Armor - Ballistic"
|
||||
contains = list(
|
||||
/obj/item/clothing/head/helmet/bulletproof,
|
||||
/obj/item/clothing/suit/armor/bulletproof,
|
||||
@@ -84,12 +83,12 @@
|
||||
/obj/item/clothing/shoes/leg_guard/bulletproof
|
||||
)
|
||||
cost = 40
|
||||
containertype = /obj/structure/closet/crate/secure
|
||||
containername = "bullet resistant armor set crate"
|
||||
containertype = /obj/structure/closet/crate/secure/gear
|
||||
containername = "Ballistic armor crate"
|
||||
access = access_armory
|
||||
/* VOREStation Removal - Howabout no ERT armor being orderable?
|
||||
/datum/supply_packs/security/combat_armor
|
||||
name = "Combat armor set crate"
|
||||
name = "Armor - Combat"
|
||||
contains = list(
|
||||
/obj/item/clothing/head/helmet/combat,
|
||||
/obj/item/clothing/suit/armor/combat,
|
||||
@@ -97,14 +96,14 @@
|
||||
/obj/item/clothing/shoes/leg_guard/combat
|
||||
)
|
||||
cost = 40
|
||||
containertype = /obj/structure/closet/crate/secure
|
||||
containername = "combat armor set crate"
|
||||
containertype = /obj/structure/closet/crate/secure/gear
|
||||
containername = "Combat armor crate"
|
||||
access = access_armory
|
||||
|
||||
/datum/supply_packs/security/tactical
|
||||
name = "Tactical suits"
|
||||
containertype = /obj/structure/closet/crate/secure
|
||||
containername = "Tactical Suit Locker"
|
||||
name = "Armor - Tactical"
|
||||
containertype = /obj/structure/closet/crate/secure/gear
|
||||
containername = "Tactical armor crate"
|
||||
cost = 40
|
||||
access = access_armory
|
||||
contains = list(
|
||||
@@ -127,23 +126,23 @@
|
||||
)
|
||||
*/
|
||||
/datum/supply_packs/security/securitybarriers
|
||||
name = "Security barrier crate"
|
||||
name = "Misc - Security Barriers"
|
||||
contains = list(/obj/machinery/deployable/barrier = 4)
|
||||
cost = 20
|
||||
containertype = /obj/structure/closet/crate/secure/gear
|
||||
containertype = /obj/structure/largecrate
|
||||
containername = "Security barrier crate"
|
||||
access = null
|
||||
|
||||
/datum/supply_packs/security/securityshieldgen
|
||||
name = "Wall shield Generators"
|
||||
name = "Misc - Wall shield generators"
|
||||
contains = list(/obj/machinery/shieldwallgen = 4)
|
||||
cost = 20
|
||||
containertype = /obj/structure/closet/crate/secure
|
||||
containername = "wall shield generators crate"
|
||||
containername = "Wall shield generators crate"
|
||||
access = access_teleporter
|
||||
|
||||
/datum/supply_packs/randomised/security/holster
|
||||
name = "Holster crate"
|
||||
name = "Gear - Holsters"
|
||||
num_contained = 4
|
||||
contains = list(
|
||||
/obj/item/clothing/accessory/holster,
|
||||
@@ -152,11 +151,11 @@
|
||||
/obj/item/clothing/accessory/holster/hip
|
||||
)
|
||||
cost = 15
|
||||
containertype = "/obj/structure/closet/crate/secure"
|
||||
containertype = /obj/structure/closet/crate
|
||||
containername = "Holster crate"
|
||||
|
||||
/datum/supply_packs/security/extragear
|
||||
name = "Security surplus equipment"
|
||||
name = "Gear - Security surplus equipment"
|
||||
contains = list(
|
||||
/obj/item/weapon/storage/belt/security = 3,
|
||||
/obj/item/clothing/glasses/sunglasses/sechud = 3,
|
||||
@@ -164,12 +163,11 @@
|
||||
/obj/item/clothing/suit/storage/hooded/wintercoat/security = 3
|
||||
)
|
||||
cost = 10
|
||||
containertype = "/obj/structure/closet/crate/secure"
|
||||
containertype = /obj/structure/closet/crate
|
||||
containername = "Security surplus equipment"
|
||||
access = null
|
||||
|
||||
/datum/supply_packs/security/detectivegear
|
||||
name = "Forensic investigation equipment"
|
||||
name = "Forensic - Investigation equipment"
|
||||
contains = list(
|
||||
/obj/item/weapon/storage/box/evidence = 2,
|
||||
/obj/item/clothing/suit/storage/vest/detective,
|
||||
@@ -191,12 +189,12 @@
|
||||
/obj/item/weapon/storage/briefcase/crimekit
|
||||
)
|
||||
cost = 20
|
||||
containertype = "/obj/structure/closet/crate/secure"
|
||||
containertype = /obj/structure/closet/crate/secure
|
||||
containername = "Forensic equipment"
|
||||
access = access_forensics_lockers
|
||||
|
||||
/datum/supply_packs/security/detectiveclothes
|
||||
name = "Investigation apparel"
|
||||
name = "Forensic - Investigation apparel"
|
||||
contains = list(
|
||||
/obj/item/clothing/under/det/black = 2,
|
||||
/obj/item/clothing/under/det/grey = 2,
|
||||
@@ -213,12 +211,12 @@
|
||||
/obj/item/clothing/gloves/black = 2
|
||||
)
|
||||
cost = 10
|
||||
containertype = "/obj/structure/closet/crate/secure"
|
||||
containertype = /obj/structure/closet/crate/secure
|
||||
containername = "Investigation clothing"
|
||||
access = access_forensics_lockers
|
||||
|
||||
/datum/supply_packs/security/officergear
|
||||
name = "Officer equipment"
|
||||
name = "Gear - Officer equipment"
|
||||
contains = list(
|
||||
/obj/item/clothing/suit/storage/vest/officer,
|
||||
/obj/item/clothing/head/helmet,
|
||||
@@ -243,12 +241,12 @@
|
||||
/obj/item/device/flashlight/maglight
|
||||
)
|
||||
cost = 20
|
||||
containertype = "/obj/structure/closet/crate/secure"
|
||||
containertype = /obj/structure/closet/crate/secure
|
||||
containername = "Officer equipment"
|
||||
access = access_brig
|
||||
|
||||
/datum/supply_packs/security/wardengear
|
||||
name = "Warden equipment"
|
||||
name = "Gear - Warden equipment"
|
||||
contains = list(
|
||||
/obj/item/clothing/suit/storage/vest/warden,
|
||||
/obj/item/clothing/under/rank/warden,
|
||||
@@ -271,12 +269,12 @@
|
||||
/obj/item/device/flashlight/maglight
|
||||
)
|
||||
cost = 20
|
||||
containertype = "/obj/structure/closet/crate/secure"
|
||||
containertype = /obj/structure/closet/crate/secure
|
||||
containername = "Warden equipment"
|
||||
access = access_armory
|
||||
|
||||
/datum/supply_packs/security/headofsecgear
|
||||
name = "Head of security equipment"
|
||||
name = "Gear - Head of security equipment"
|
||||
contains = list(
|
||||
/obj/item/clothing/head/helmet/HoS,
|
||||
/obj/item/clothing/suit/storage/vest/hos,
|
||||
@@ -297,12 +295,12 @@
|
||||
/obj/item/device/flashlight/maglight
|
||||
)
|
||||
cost = 50
|
||||
containertype = "/obj/structure/closet/crate/secure"
|
||||
containertype = /obj/structure/closet/crate/secure
|
||||
containername = "Head of security equipment"
|
||||
access = access_hos
|
||||
|
||||
/datum/supply_packs/security/securityclothing
|
||||
name = "Security uniform crate"
|
||||
name = "Misc - Security uniform red"
|
||||
contains = list(
|
||||
/obj/item/weapon/storage/backpack/satchel/sec = 2,
|
||||
/obj/item/weapon/storage/backpack/security = 2,
|
||||
@@ -316,11 +314,11 @@
|
||||
/obj/item/weapon/storage/box/holobadge
|
||||
)
|
||||
cost = 10
|
||||
containertype = "/obj/structure/closet/crate/secure"
|
||||
containertype = /obj/structure/closet/crate/secure
|
||||
containername = "Security uniform crate"
|
||||
|
||||
/datum/supply_packs/security/navybluesecurityclothing
|
||||
name = "Navy blue security uniform crate"
|
||||
name = "Misc - Security uniform navy blue"
|
||||
contains = list(
|
||||
/obj/item/weapon/storage/backpack/satchel/sec = 2,
|
||||
/obj/item/weapon/storage/backpack/security = 2,
|
||||
@@ -337,11 +335,11 @@
|
||||
/obj/item/weapon/storage/box/holobadge
|
||||
)
|
||||
cost = 10
|
||||
containertype = "/obj/structure/closet/crate/secure"
|
||||
containertype = /obj/structure/closet/crate/secure
|
||||
containername = "Navy blue security uniform crate"
|
||||
|
||||
/datum/supply_packs/security/corporatesecurityclothing
|
||||
name = "Corporate security uniform crate"
|
||||
name = "Misc - Security uniform corporate"
|
||||
contains = list(
|
||||
/obj/item/weapon/storage/backpack/satchel/sec = 2,
|
||||
/obj/item/weapon/storage/backpack/security = 2,
|
||||
@@ -357,11 +355,11 @@
|
||||
/obj/item/weapon/storage/box/holobadge
|
||||
)
|
||||
cost = 10
|
||||
containertype = "/obj/structure/closet/crate/secure"
|
||||
containertype = /obj/structure/closet/crate/secure
|
||||
containername = "Corporate security uniform crate"
|
||||
|
||||
/datum/supply_packs/security/biosuit
|
||||
name = "Security biohazard gear"
|
||||
name = "Gear - Security biohazard gear"
|
||||
contains = list(
|
||||
/obj/item/clothing/head/bio_hood/security = 3,
|
||||
/obj/item/clothing/under/rank/security = 3,
|
||||
@@ -372,6 +370,7 @@
|
||||
/obj/item/clothing/gloves/sterile/latex,
|
||||
/obj/item/weapon/storage/box/gloves
|
||||
)
|
||||
cost = 50
|
||||
containertype = "/obj/structure/closet/crate/secure"
|
||||
cost = 25
|
||||
containertype = /obj/structure/closet/crate/secure
|
||||
containername = "Security biohazard gear"
|
||||
access = access_security
|
||||
@@ -63,11 +63,11 @@ datum/category_group/underwear/dd_SortValue()
|
||||
/datum/category_item/underwear/proc/is_default(var/gender)
|
||||
return is_default
|
||||
|
||||
/datum/category_item/underwear/proc/generate_image(var/list/metadata)
|
||||
/datum/category_item/underwear/proc/generate_image(var/list/metadata, var/layer = FLOAT_LAYER)
|
||||
if(!icon_state)
|
||||
return
|
||||
|
||||
var/image/I = image(icon = icon, icon_state = icon_state)
|
||||
var/image/I = image(icon = icon, icon_state = icon_state, layer = layer)
|
||||
for(var/datum/gear_tweak/gt in tweaks)
|
||||
gt.tweak_item(I, metadata && metadata["[gt]"] ? metadata["[gt]"] : gt.get_default())
|
||||
return I
|
||||
Reference in New Issue
Block a user