cyberpresidentvanellope/YWPolarisVore
1
0
Fork 0
mirror of https://github.com/Yawn-Wider/YWPolarisVore.git synced 2026-08-23 21:17:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac

Browse Source
This commit is contained in:
izac112
2023-06-03 19:53:45 +02:00
parent 5529e11292 067bf338a7
commit 9cedb2ec47
608 changed files with 17985 additions and 4722 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
+8
View File
@@ -39,6 +39,14 @@
/obj/item/clothing/shoes/brown,
/obj/item/device/radio/headset/headset_qm, //VOREStation Edit,
/obj/item/device/radio/headset/headset_qm/alt, //VOREStation Edit,
/obj/item/clothing/under/rank/neo_qm,
/obj/item/clothing/under/rank/neo_qm_skirt,
/obj/item/clothing/under/rank/neo_qm_jacket,
/obj/item/clothing/under/rank/neo_qm_white,
/obj/item/clothing/under/rank/neo_qm_white_skirt,
/obj/item/clothing/under/rank/neo_qm_turtle,
/obj/item/clothing/under/rank/neo_qm_turtle_skirt,
/obj/item/clothing/under/rank/neo_qm_gorka,
/obj/item/clothing/gloves/black,
/obj/item/clothing/gloves/fingerless,
/obj/item/weapon/tank/emergency/oxygen,
code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
+3
View File
@@ -11,6 +11,9 @@
///obj/item/clamp, //VOREStation Removal: without leaks those are pointless,
/obj/item/clothing/under/rank/chief_engineer,
/obj/item/clothing/under/rank/chief_engineer/skirt,
/obj/item/clothing/under/rank/neo_chiefengi,
/obj/item/clothing/under/rank/neo_chiefengi_skirt,
/obj/item/clothing/under/rank/neo_ce_gorka,
/obj/item/clothing/head/hardhat/white,
///obj/item/clothing/head/welding, //VOREStation Removal: Locker bloat, grr. They get fancy goggles or can raid the welding supplies locker for one of these.
/obj/item/clothing/gloves/heavy_engineer, //VOREStation Edit: chief gets the good shit
code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm
+3 -1
View File
@@ -10,13 +10,15 @@
/obj/item/device/analyzer/plant_analyzer,
/obj/item/device/radio/headset/headset_service,
/obj/item/clothing/head/greenbandana,
/obj/item/weapon/shovel/spade,
/obj/item/weapon/material/minihoe,
/obj/item/weapon/material/knife/machete/hatchet,
/obj/item/weapon/reagent_containers/glass/beaker = 2,
/obj/item/weapon/tool/wirecutters/clippers/trimmers,
/obj/item/weapon/reagent_containers/spray/plantbgone,
/obj/item/clothing/suit/storage/hooded/wintercoat/hydro,
/obj/item/clothing/shoes/boots/winter/hydro)
/obj/item/clothing/shoes/boots/winter/hydro,
/obj/item/weapon/storage/belt/hydro)
/obj/structure/closet/secure_closet/hydroponics/Initialize()
if(prob(50))
code/game/objects/structures/crates_lockers/closets/secure/medical.dm
+5
View File
@@ -136,6 +136,11 @@
/obj/item/weapon/cartridge/cmo,
/obj/item/clothing/gloves/sterile/latex,
/obj/item/clothing/shoes/brown,
/obj/item/clothing/under/rank/neo_cmo,
/obj/item/clothing/under/rank/neo_cmo_skirt,
/obj/item/clothing/under/rank/neo_cmo_turtle,
/obj/item/clothing/under/rank/neo_cmo_turtle_skirt,
/obj/item/clothing/under/rank/neo_cmo_gorka,
/obj/item/device/radio/headset/heads/cmo,
/obj/item/device/radio/headset/heads/cmo/alt,
/obj/item/device/flash,
code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
+5
View File
@@ -35,6 +35,11 @@
/obj/item/clothing/suit/storage/toggle/labcoat,
/obj/item/clothing/suit/storage/toggle/labcoat/modern,
/obj/item/clothing/suit/storage/toggle/labcoat/rd,
/obj/item/clothing/under/rank/neo_rd_turtle,
/obj/item/clothing/under/rank/neo_rd_turtle_skirt,
/obj/item/clothing/under/rank/neo_rd_suit,
/obj/item/clothing/under/rank/neo_rd_suit_skirt,
/obj/item/clothing/under/rank/neo_rd_gorka,
/obj/item/weapon/cartridge/rd,
/obj/item/clothing/shoes/white,
/obj/item/clothing/shoes/laceup/brown,
code/game/objects/structures/crates_lockers/closets/secure/security.dm
+16
View File
@@ -49,6 +49,15 @@
/obj/item/clothing/under/lawyer/red,
/obj/item/clothing/under/lawyer/red/skirt,
/obj/item/clothing/under/lawyer/oldman,
/obj/item/clothing/under/rank/neo_hop,
/obj/item/clothing/under/rank/neo_hop_skirt,
/obj/item/clothing/under/rank/neo_hop_parade_masc,
/obj/item/clothing/under/rank/neo_hop_parade_fem,
/obj/item/clothing/under/rank/neo_hop_turtle,
/obj/item/clothing/under/rank/neo_hop_turtle_skirt,
/obj/item/clothing/under/rank/neo_cmd_gorka,
/obj/item/clothing/suit/storage/toggle/labcoat/neo_hopformal,
/obj/item/clothing/suit/storage/toggle/labcoat/neo_civ_dep,
/obj/item/clothing/shoes/brown,
/obj/item/clothing/shoes/black,
/obj/item/clothing/shoes/laceup,
@@ -133,6 +142,13 @@
/obj/item/clothing/head/helmet/dermal,
/obj/item/clothing/head/helmet/warden,
/obj/item/clothing/head/helmet/warden/hat,
/obj/item/clothing/under/rank/neo_warden_red,
/obj/item/clothing/under/rank/neo_warden_red_skirt,
/obj/item/clothing/under/rank/neo_warden_blue,
/obj/item/clothing/suit/storage/vest/wardencoat/neo_armsco_trench,
/obj/item/clothing/suit/storage/vest/wardencoat/neo_bluewarden,
/obj/item/clothing/suit/storage/vest/wardencoat/neo_warden_heavy,
/obj/item/clothing/under/rank/neo_sec_gorka,
/obj/item/weapon/cartridge/security,
/obj/item/device/radio/headset/headset_sec,
/obj/item/device/radio/headset/headset_sec/alt,
code/game/objects/structures/crates_lockers/closets/secure/security_vr.dm
+16
View File
@@ -13,6 +13,22 @@
/obj/item/clothing/suit/storage/vest/hoscoat/jensen/alt,
/obj/item/clothing/suit/storage/vest/hoscoat/jensen,
/obj/item/clothing/suit/storage/vest/hoscoat,
/obj/item/clothing/under/rank/neo_hos_red,
/obj/item/clothing/under/rank/neo_hos_red_skirt,
/obj/item/clothing/under/rank/neo_hos_blackred,
/obj/item/clothing/under/rank/neo_hos_blackred_skirt,
/obj/item/clothing/under/rank/neo_hos_parade,
/obj/item/clothing/under/rank/neo_hos_parade_fem,
/obj/item/clothing/under/rank/neo_hos_blue,
/obj/item/clothing/under/rank/neo_hos_blackblue,
/obj/item/clothing/under/rank/neo_hos_blackblue_skirt,
/obj/item/clothing/under/rank/neo_hos_parade_blue,
/obj/item/clothing/under/rank/neo_hos_parade_blue_fem,
/obj/item/clothing/under/rank/neo_hos_gorka,
/obj/item/clothing/suit/storage/toggle/labcoat/neo_hos_parade,
/obj/item/clothing/suit/storage/toggle/labcoat/neo_hosformal_blue,
/obj/item/clothing/suit/storage/vest/wardencoat/neo_armsco_trench,
/obj/item/clothing/head/helmet/HoS/hat/blue,
/obj/item/clothing/head/helmet/dermal,
/obj/item/device/radio/headset/heads/hos,
/obj/item/device/radio/headset/heads/hos/alt,
code/game/objects/structures/crates_lockers/closets/wardrobe.dm
+6
View File
@@ -476,6 +476,12 @@
/obj/item/clothing/head/caphat/beret,
/obj/item/clothing/under/rank/captain,
/obj/item/clothing/under/dress/dress_cap/femformal,
/obj/item/clothing/under/rank/neo_captain_parade,
/obj/item/clothing/under/rank/neo_captain_skirt,
/obj/item/clothing/under/rank/neo_captain,
/obj/item/clothing/under/rank/neo_captain_kilt,
/obj/item/clothing/under/rank/neo_captain_blacksuit,
/obj/item/clothing/under/rank/neo_commandutil,
/obj/item/clothing/shoes/brown,
/obj/item/clothing/gloves/captain,
/obj/item/clothing/under/dress/dress_cap,