cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-27 07:08:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into upstream-merge-14893

Browse Source
This commit is contained in:
Nadyr
2023-05-29 18:41:05 -04:00
committed by GitHub
parent 338d5f605b b8778e21ff
commit 182873418f
27 changed files with 214 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
+1
View File
@@ -13,6 +13,7 @@
/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/medical.dm
+1
View File
@@ -140,6 +140,7 @@
/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
+1
View File
@@ -39,6 +39,7 @@
/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
+1 -5
View File
@@ -55,6 +55,7 @@
/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,
@@ -144,15 +145,10 @@
/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,
<<<<<<< HEAD
/obj/item/clothing/suit/neo_armsco_trench,
/obj/item/clothing/suit/neo_warden_heavy,
=======
/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,
>>>>>>> 236fb54ed4... Merge pull request #14893 from KillianKirilenko/kk-nanofix
/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
+1
View File
@@ -24,6 +24,7 @@
/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,
code/game/objects/structures/trash_pile_vr.dm
+1
View File
@@ -250,6 +250,7 @@
prob(2);/obj/item/toy/tennis/cyan,
prob(2);/obj/item/toy/tennis/blue,
prob(2);/obj/item/toy/tennis/purple,
prob(1);/obj/item/toy/baseball,
prob(1);/obj/item/weapon/storage/box/brainzsnax,
prob(1);/obj/item/weapon/storage/box/brainzsnax/red,
prob(1);/obj/item/clothing/glasses/sunglasses,