[MIRROR] Job rank and radio channel rework (#8965)

Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2
2024-09-17 21:24:13 +02:00
committed by GitHub
co-authored by Heroman3003 Kashargul Kashargul
parent 6159cecfc8
commit 4153768ba1
444 changed files with 3341 additions and 2440 deletions
+3 -3
View File
@@ -352,7 +352,7 @@
desc_with_canvas = "A masterpiece hand-picked by the librarian, supposedly."
persistence_id = "library"
req_one_access = list(access_library)
curator = "Librarian"
curator = JOB_LIBRARIAN
/obj/structure/sign/painting/chapel_secure
name = "\improper Religious Painting Exhibit mounting"
@@ -360,7 +360,7 @@
desc_with_canvas = "A masterpiece hand-picked by the chaplain, supposedly."
persistence_id = "chapel"
req_one_access = list(access_chapel_office)
curator = "Chaplain"
curator = JOB_CHAPLAIN
/obj/structure/sign/painting/library_private // keep your smut away from prying eyes, or non-librarians at least
name = "\improper Private Painting Exhibit mounting"
@@ -368,7 +368,7 @@
desc_with_canvas = "A painting hung away from lesser minds."
persistence_id = "library_private"
req_one_access = list(access_library)
curator = "Librarian"
curator = JOB_LIBRARIAN
/obj/structure/sign/painting/away_areas // for very hard-to-get-to areas
name = "\improper Remote Painting Exhibit mounting"
@@ -92,7 +92,7 @@
var/choice
var/finalized = "No"
if(jobban_isbanned(M, "GhostRoles"))
if(jobban_isbanned(M, JOB_GHOSTROLES))
to_chat(M, "<span class='warning'>You cannot inhabit this creature because you are banned from playing ghost roles.</span>")
reset_ghostpod()
return
@@ -87,7 +87,7 @@
/obj/structure/ghost_pod/ghost_activated/attack_ghost(var/mob/observer/dead/user)
//VOREStation Add Start
if(jobban_isbanned(user, "GhostRoles"))
if(jobban_isbanned(user, JOB_GHOSTROLES))
to_chat(user, "<span class='warning'>You cannot inhabit this creature because you are banned from playing ghost roles.</span>")
return
@@ -11,7 +11,7 @@
var/activated = FALSE
/obj/structure/ghost_pod/manual/attack_ghost(var/mob/observer/dead/user)
if(jobban_isbanned(user, "GhostRoles"))
if(jobban_isbanned(user, JOB_GHOSTROLES))
to_chat(user, "<span class='warning'>You cannot inhabit this creature because you are banned from playing ghost roles.</span>")
return
+2 -2
View File
@@ -14,11 +14,11 @@
/obj/structure/cult/pylon/swarm/CanPass(atom/movable/mover, turf/target)
if(istype(mover, /mob/living))
var/mob/living/L = mover
if(L.faction == "swarmer")
if(L.faction == FACTION_SWARMER)
return TRUE
else if(istype(mover, /obj/item/projectile))
var/obj/item/projectile/P = mover
if(istype(P.firer) && P.firer.faction == "swarmer")
if(istype(P.firer) && P.firer.faction == FACTION_SWARMER)
return TRUE
return ..()
@@ -89,7 +89,7 @@
return
//VOREStation Add Start
if(jobban_isbanned(user, "GhostRoles"))
if(jobban_isbanned(user, JOB_GHOSTROLES))
to_chat(user, "<span class='warning'>You cannot become a mouse because you are banned from playing ghost roles.</span>")
return
//VOREStation Add End