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

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2021-05-31 01:50:23 -04:00
committed by GitHub
parent 92c2ebed60
commit 51e7be7fca
1 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/game/machinery/suit_storage_unit.dm
View File

@@ -1104,19 +1104,9 @@
if("Exploration")
parent_helmet = /obj/item/clothing/head/helmet/space/void/exploration
parent_suit = /obj/item/clothing/suit/space/void/exploration
<<<<<<< HEAD
if("Expedition Medic")
parent_helmet = /obj/item/clothing/head/helmet/space/void/exploration_medical
parent_suit = /obj/item/clothing/suit/space/void/exploration_medical
||||||| parent of 3ba6436350... Merge pull request #10487 from VOREStation/upstream-merge-8106
if("Expedition Medic")
parent_helmet = /obj/item/clothing/head/helmet/space/void/expedition_medical
parent_suit = /obj/item/clothing/suit/space/void/expedition_medical
=======
if("Field Medic")
parent_helmet = /obj/item/clothing/head/helmet/space/void/expedition_medical
parent_suit = /obj/item/clothing/suit/space/void/expedition_medical
>>>>>>> 3ba6436350... Merge pull request #10487 from VOREStation/upstream-merge-8106
if("Old Exploration")
parent_helmet = /obj/item/clothing/head/helmet/space/void/exploration/alt
parent_suit = /obj/item/clothing/suit/space/void/exploration/alt