cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix lost changes (#6633)

Browse Source 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Raeschen <Raeschen@users.noreply.github.com>
Co-authored-by: FluffMedic <109300046+FluffMedic@users.noreply.github.com>
Co-authored-by: Victor Zisthus <56660717+VictorZisthus@users.noreply.github.com>
Co-authored-by: Razgriz1032 <Razgriz1032@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <58959929+CHOMPStation2@users.noreply.github.com>
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: CHOMPStation2 <chompsation2@gmail.com>
Co-authored-by: purplefoxy27 <38367315+purplefoxy27@users.noreply.github.com>
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
Co-authored-by: Aroliacue <96730930+Aroliacue@users.noreply.github.com>
This commit is contained in:
Raeschen
2023-07-21 08:44:40 +02:00
committed by GitHub
parent 66ce5daf87
commit 071905fed5
50 changed files with 1073 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
code/game/objects/structures/crates_lockers/closets/l3closet.dm
View File

@@ -7,27 +7,30 @@
closet_appearance = /decl/closet_appearance/bio
starts_with = list(
/obj/item/clothing/suit/bio_suit/general,
/obj/item/clothing/head/bio_hood/general)
/obj/item/clothing/suit/bio_suit/general = 2, // CHOMP Block Edit Start
/obj/item/clothing/head/bio_hood/general = 2,
/obj/item/weapon/tank/oxygen = 2,
/obj/item/clothing/mask/gas = 2) // CHOMP Block Edit End
/obj/structure/closet/l3closet/virology
closet_appearance = /decl/closet_appearance/bio/virology
starts_with = list(
/obj/item/clothing/suit/bio_suit/virology,
/obj/item/clothing/head/bio_hood/virology,
/obj/item/clothing/mask/gas,
/obj/item/weapon/tank/oxygen)
/obj/item/clothing/suit/bio_suit/virology = 2, // CHOMP Block Edit Start
/obj/item/clothing/head/bio_hood/virology = 2,
/obj/item/clothing/mask/gas = 2,
/obj/item/weapon/tank/oxygen = 2) // CHOMP Block Edit End
/obj/structure/closet/l3closet/security
closet_appearance = /decl/closet_appearance/bio/security
starts_with = list(
/obj/item/clothing/suit/bio_suit/security,
/obj/item/clothing/head/bio_hood/security)
///obj/item/weapon/gun/energy/taser/xeno/sec) //VOREStation Removal
/obj/item/clothing/suit/bio_suit/security = 2, // CHOMP Block Edit Start
/obj/item/clothing/head/bio_hood/security = 2,
/obj/item/clothing/mask/gas = 2,
/obj/item/weapon/tank/oxygen = 2) // CHOMP Block Edit End
/obj/structure/closet/l3closet/janitor
closet_appearance = /decl/closet_appearance/bio/janitor
@@ -43,14 +46,19 @@
closet_appearance = /decl/closet_appearance/bio/science
starts_with = list(
/obj/item/clothing/suit/bio_suit/scientist,
/obj/item/clothing/head/bio_hood/scientist)
/obj/item/clothing/suit/bio_suit/scientist = 2, // CHOMP Block Edit Start
/obj/item/clothing/head/bio_hood/scientist = 2,
/obj/item/clothing/mask/gas = 2,
/obj/item/weapon/tank/oxygen = 2) // CHOMP Block Edit End
/obj/structure/closet/l3closet/scientist/double
starts_with = list(
/obj/item/clothing/suit/bio_suit/scientist = 2,
/obj/item/clothing/suit/bio_suit/scientist = 2, // CHOMP Block Edit Start
/obj/item/clothing/head/bio_hood/scientist = 2,
/obj/item/weapon/storage/bag/xeno = 2) // VOREEdit, adding the xenobag to xenobio.
/obj/item/weapon/storage/bag/xeno = 2,
/obj/item/clothing/mask/gas = 2,
/obj/item/weapon/tank/oxygen = 2,
/obj/item/weapon/storage/bag/xeno = 2) // CHOMP Block Edit End
/obj/structure/closet/l3closet/medical
@@ -59,4 +67,5 @@
starts_with = list(
/obj/item/clothing/suit/bio_suit/general = 3,
/obj/item/clothing/head/bio_hood/general = 3,
/obj/item/clothing/mask/gas = 3)
/obj/item/clothing/mask/gas = 3, // CHOMP Block Edit Start
/obj/item/weapon/tank/oxygen = 3) // CHOMP Block Edit End

6
code/game/objects/structures/crates_lockers/closets/secure/security_vr.dm
View File

@@ -40,7 +40,8 @@
/obj/item/clothing/suit/storage/hooded/wintercoat/security/hos,
/obj/item/clothing/shoes/boots/winter/security,
//CHOMP Add ^
/obj/item/clothing/mask/gas/half)
/obj/item/clothing/mask/gas/half, // CHOMPADD
/obj/item/clothing/mask/gas/sechailer/swat/hos) // CHOMPADD
/obj/structure/closet/secure_closet/hos2
name = "head of security's gear"
@@ -61,6 +62,8 @@
/obj/item/weapon/melee/baton/loaded,
// /obj/item/weapon/storage/secure/briefcase/nsfw_pack_hos,
//YW Removal,
/obj/item/weapon/gun/projectile/caseless/prototype/loaded, // CHOMPADD
/obj/item/ammo_magazine/m5mmcaseless, // CHOMPADD
/obj/item/weapon/gun/energy/x01,
/obj/item/weapon/cell/device/weapon,
/obj/item/weapon/melee/telebaton,
@@ -68,6 +71,7 @@
// /obj/item/clothing/suit/storage/hooded/wintercoat/security, //CHOMP Remove
// /obj/item/clothing/shoes/boots/winter/security, //CHOMP Remove
/obj/item/device/ticket_printer, //CHOMP Add
/obj/item/weapon/gun/energy/taser, // CHOMPADD
/obj/item/device/flashlight/maglight)
//Custom NT Security Lockers, Only found at central command