cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 12:37:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Makes admin outfits set offstation_role to true and give syndicate factions to SIT and SST. (#22169)

Browse Source 
* Update outfit_admin.dm

* add trailing newline

* GDN suggestion

* Update code/datums/outfits/outfit_admin.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* Update code/datums/outfits/outfit_admin.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* Update code/datums/outfits/outfit_admin.dm

Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>

* Contrabang suggestion

* Update code/modules/mob/living/carbon/human/human_mob.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* Update code/modules/mob/living/carbon/human/human_mob.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
This commit is contained in:
Tourte-Yaya
2023-09-13 21:12:26 +01:00
committed by GitHub
co-authored by Contrabang GDN Luc
parent 653fbdc8fb
commit efe6dc810e
4 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/dcs/signals.dm
+2
View File
@@ -311,6 +311,8 @@
///from base of /mob/Login(): ()
#define COMSIG_MOB_LOGIN "mob_login"
///called in human/login
#define COMSIG_HUMAN_LOGIN "human_login"
///from base of /mob/Logout(): ()
#define COMSIG_MOB_LOGOUT "mob_logout"
///from base of mob/death(): (gibbed)
code/datums/outfits/outfit_admin.dm
+17 -7
View File
@@ -7,6 +7,17 @@
H.mind.assigned_role = name
H.job = name
/datum/outfit/admin/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
. = ..()
if(visualsOnly)
return
if(H.mind)
H.mind.offstation_role = TRUE
else
H.RegisterSignal(H, COMSIG_HUMAN_LOGIN, TYPE_PROC_REF(/mob/living/carbon/human, apply_offstation_roles))
/proc/apply_to_card(obj/item/card/id/I, mob/living/carbon/human/H, list/access = list(), rank, special_icon)
if(!istype(I) || !istype(H))
@@ -71,7 +82,7 @@
/datum/outfit/admin/syndicate_infiltrator/equip(mob/living/carbon/human/H, visualsOnly = FALSE)
. = H.equip_syndicate_infiltrator(0, 20, FALSE)
H.sec_hud_set_ID()
H.faction |= "syndicate"
/datum/outfit/admin/syndicate/operative
name = "Syndicate Nuclear Operative"
@@ -115,8 +126,8 @@
name = "Syndicate Strike Team"
/datum/outfit/admin/syndicate_strike_team/equip(mob/living/carbon/human/H, visualsOnly = FALSE)
return H.equip_syndicate_commando(FALSE, TRUE)
. = H.equip_syndicate_commando(FALSE, TRUE)
H.faction |= "syndicate"
/datum/outfit/admin/syndicate/spy
name = "Syndicate Spy"
@@ -975,7 +986,7 @@
name = "Tournament Standard Green"
uniform = /obj/item/clothing/under/color/green
/datum/outfit/admin/tournament_gangster //gangster are supposed to fight each other. --rastaf0
/datum/outfit/admin/tournament/tournament_gangster //gangster are supposed to fight each other. --rastaf0
name = "Tournament Gangster"
uniform = /obj/item/clothing/under/rank/security/detective
@@ -986,7 +997,7 @@
l_pocket = /obj/item/ammo_box/a357
r_hand = /obj/item/gun/projectile/automatic/proto
/datum/outfit/admin/tournament_chef //Steven Seagal FTW
/datum/outfit/admin/tournament/tournament_chef //Steven Seagal FTW
name = "Tournament Chef"
uniform = /obj/item/clothing/under/rank/civilian/chef
@@ -998,7 +1009,7 @@
l_hand = /obj/item/kitchen/knife
r_hand = /obj/item/kitchen/rollingpin
/datum/outfit/admin/tournament_janitor
/datum/outfit/admin/tournament/tournament_janitor
name = "Tournament Janitor"
uniform = /obj/item/clothing/under/rank/civilian/janitor
@@ -1178,7 +1189,6 @@
var/datum/antagonist/vampire/V = H.mind.has_antag_datum(/datum/antagonist/vampire)
V.bloodusable = 9999
V.bloodtotal = 9999
H.mind.offstation_role = TRUE
V.add_subclass(SUBCLASS_ANCIENT, FALSE)
H.dna.SetSEState(GLOB.jumpblock, TRUE)
singlemutcheck(H, GLOB.jumpblock, MUTCHK_FORCED)
code/modules/mob/living/carbon/human/human_login.dm
+1
View File
@@ -7,4 +7,5 @@
to_chat(src, "<span class='notice'>You can ventcrawl! Use alt+click on vents to quickly travel about the station.</span>")
update_pipe_vision()
regenerate_icons()
SEND_SIGNAL(src, COMSIG_HUMAN_LOGIN)
return
code/modules/mob/living/carbon/human/human_mob.dm
+4
View File
@@ -2179,3 +2179,7 @@ Eyes need to have significantly high darksight to shine unless the mob has the X
set category = "IC"
update_flavor_text()
/mob/living/carbon/human/proc/apply_offstation_roles(source)
SIGNAL_HANDLER
mind.offstation_role = TRUE