mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-13 11:43:31 +00:00
powder that makes you say yes
This commit is contained in:
@@ -67,9 +67,6 @@
|
|||||||
|
|
||||||
/datum/alt_title/security_contractor
|
/datum/alt_title/security_contractor
|
||||||
title = "Security Contractor"
|
title = "Security Contractor"
|
||||||
<<<<<<< HEAD
|
|
||||||
=======
|
|
||||||
|
|
||||||
/datum/job/officer/get_request_reasons()
|
/datum/job/officer/get_request_reasons()
|
||||||
return list("Wildlife management")
|
return list("Wildlife management")
|
||||||
>>>>>>> 38423301cb... Merge pull request #13492 from Heroman3003/role-pings
|
|
||||||
|
|||||||
Reference in New Issue
Block a user