cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update civilian.dm

Browse Source
This commit is contained in:
Novacat
2019-04-27 22:33:06 -04:00
committed by GitHub
parent 13ccd7533f
commit 536d209e29
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/datums/outfits/jobs/civilian.dm
View File

@@ -6,19 +6,11 @@
name = OUTFIT_JOB_NAME("Visitor") name = OUTFIT_JOB_NAME("Visitor")
id_pda_assignment = "Visitor" id_pda_assignment = "Visitor"
uniform = /obj/item/clothing/under/assistantformal uniform = /obj/item/clothing/under/assistantformal
<<<<<<< HEAD
/decl/hierarchy/outfit/job/assistant/resident
name = OUTFIT_JOB_NAME("Resident")
id_pda_assignment = "Resident"
uniform = /obj/item/clothing/under/color/white
//VOREStation Add - Interns //VOREStation Add - Interns
/decl/hierarchy/outfit/job/assistant/intern /decl/hierarchy/outfit/job/assistant/intern
name = OUTFIT_JOB_NAME("Intern") name = OUTFIT_JOB_NAME("Intern")
id_type = /obj/item/weapon/card/id/civilian id_type = /obj/item/weapon/card/id/civilian
//VOREStation Add End - Interns //VOREStation Add End - Interns
=======
>>>>>>> 1e71944... Merge pull request #6137 from Neerti/it's_time_to_stop
/decl/hierarchy/outfit/job/service /decl/hierarchy/outfit/job/service
l_ear = /obj/item/device/radio/headset/headset_service l_ear = /obj/item/device/radio/headset/headset_service
hierarchy_type = /decl/hierarchy/outfit/job/service hierarchy_type = /decl/hierarchy/outfit/job/service