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

powder that makes you say yes

Browse Source
This commit is contained in:
Razgriz
2021-12-10 01:19:53 -07:00
committed by GitHub
parent de0d1ae244
commit 7592dd99d4
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/economy/vending_machines.dm
-4
View File
@@ -1293,13 +1293,9 @@
/obj/item/clothing/under/rank/virologist/skirt = 5,
/obj/item/clothing/shoes/white = 5,
/obj/item/clothing/suit/storage/toggle/labcoat/virologist = 5,
<<<<<<< HEAD
/obj/item/clothing/suit/storage/hooded/wintercoat/medical/viro = 5,
=======
/obj/item/clothing/suit/storage/toggle/labcoat/old/vir = 5,
/obj/item/clothing/suit/storage/hooded/wintercoat/medical/viro = 5, //VoreStation edit, pre-fulp labcoat.
/obj/item/clothing/head/beret/medical/viro = 5,
>>>>>>> cfbe9e8e4e... Merge pull request #11990 from Runa-Dacino/OldSchool-Labcoats
/obj/item/clothing/mask/surgical = 5,
/obj/item/weapon/storage/backpack/virology = 5,
/obj/item/weapon/storage/backpack/satchel/vir = 5