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

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2021-06-19 20:48:36 -04:00
committed by GitHub
parent 52be7df6fc
commit 761d76a43c
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm
View File

@@ -102,13 +102,7 @@
display_name = "pilot qualification pin"
description = "An iron pin denoting the qualification to fly USG spacecraft."
path = /obj/item/clothing/accessory/solgov/specialty/pilot
<<<<<<< HEAD
allowed_roles = list("Pathfinder", "Pilot", "Field Medic","Security Pilot") //YW ADDITIONS
||||||| parent of 8d33fa238a... Merge pull request #10660 from klaasjared/Talon_Merch
allowed_roles = list("Pathfinder","Pilot","Field Medic","Talon Pilot")
=======
allowed_roles = list("Pathfinder","Pilot","Field Medic","Talon Pilot")
>>>>>>> 8d33fa238a... Merge pull request #10660 from klaasjared/Talon_Merch
/datum/gear/accessory/flops
display_name = "drop straps"
@@ -125,4 +119,4 @@ Talon pin
/datum/gear/accessory/talonpin
display_name = "ITV pin"
description = "A small enamel pin of the ITV logo."
path = /obj/item/clothing/accessory/talon
path = /obj/item/clothing/accessory/talon