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

Resolve conflicts, fix compile errors

Browse Source
This commit is contained in:
Meghan-Rossi
2019-12-18 18:42:18 +00:00
parent ef75d1c2a0
commit ef7dfaa6cc
5 changed files with 3 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/game/objects/items/weapons/id cards/station_ids.dm
View File

@@ -265,14 +265,8 @@
rank = "Quartermaster"
/obj/item/weapon/card/id/assistant
<<<<<<< HEAD
assignment = USELESS_JOB //VOREStation Edit - Visitor not Assistant
rank = USELESS_JOB //VOREStation Edit - Visitor not Assistant
job_access_type = /datum/job/assistant
=======
assignment = "Assistant"
rank = "Assistant"
>>>>>>> 7b9bc5b... Merge pull request #6520 from Meghan-Rossi/idcleanup
/obj/item/weapon/card/id/civilian
name = "identification card"