Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ISO Fixes #3176

Merged
merged 3 commits into from
Jan 30, 2025
Merged

ISO Fixes #3176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f04fe1c
Fixes
UEDCommander Jan 29, 2025
6e6cbf5
ISO antag fix
UEDCommander Jan 30, 2025
a395f8d
More loadout related stuff
UEDCommander Jan 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified maps/sierra/icons/mob/onmob/onmob_under.dmi
View file
Open in desktop
Binary file not shown.
3 changes: 2 additions & 1 deletion maps/sierra/loadout/_defines.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
//For jobs that allow for decorative or ceremonial clothing
#define FORMAL_ROLES list(\
/datum/job/iaa, \
/datum/job/iso, \
/datum/job/rd, \
/datum/job/senior_scientist, \
/datum/job/scientist, \
Expand Down Expand Up @@ -64,7 +65,7 @@
//For NanoTrasen employees
#define NANOTRASEN_ROLES list(\
/datum/job/captain, /datum/job/hop, /datum/job/rd, /datum/job/cmo, /datum/job/chief_engineer, /datum/job/hos, \
/datum/job/iaa, \
/datum/job/iaa, /datum/job/iso, \
/datum/job/senior_engineer, /datum/job/engineer, /datum/job/infsys, /datum/job/roboticist, /datum/job/engineer_trainee, \
/datum/job/officer, /datum/job/warden, /datum/job/detective, /datum/job/security_assistant, \
/datum/job/senior_doctor, /datum/job/doctor, /datum/job/doctor_trainee,/datum/job/chemist, \
Expand Down
2 changes: 1 addition & 1 deletion maps/sierra/loadout/loadout_accessories.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
/datum/gear/utility/holster_belt
display_name = "holser belt"
path = /obj/item/storage/belt/holster/general
allowed_roles = list(/datum/job/captain, /datum/job/hop, /datum/job/rd, /datum/job/cmo, /datum/job/chief_engineer, /datum/job/hos, /datum/job/iaa, /datum/job/adjutant)
allowed_roles = list(/datum/job/captain, /datum/job/hop, /datum/job/rd, /datum/job/cmo, /datum/job/chief_engineer, /datum/job/hos, /datum/job/iaa, /datum/job/iso, /datum/job/adjutant)

/datum/gear/accessory/corpbadge
display_name = "investigator holobadge (IAA)"
Expand Down
1 change: 1 addition & 0 deletions maps/sierra/loadout/loadout_tactical.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
/datum/gear/tactical/holster/New()
allowed_roles = ARMED_ROLES
allowed_roles += /datum/job/iaa
allowed_roles += /datum/job/iso
allowed_roles += /datum/job/adjutant
..()

Expand Down
2 changes: 1 addition & 1 deletion maps/sierra/loadout/loadout_uniform.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
/datum/gear/uniform/si_exec_jacket
display_name = "NanoTrasen liason suit"
path = /obj/item/clothing/under/suit_jacket/corp/nanotrasen
allowed_roles = list(/datum/job/iaa)
allowed_roles = list(/datum/job/iaa, /datum/job/iso)

/datum/gear/uniform/formal_shirt_and_pants
display_name = "formal shirts with pants"
Expand Down
6 changes: 3 additions & 3 deletions maps/sierra/sierra_antagonism.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@

/datum/antagonist/godcultist
blacklisted_jobs = list(/datum/job/ai, /datum/job/cyborg, /datum/job/chaplain, /datum/job/submap)
restricted_jobs = list(/datum/job/captain, /datum/job/hop, /datum/job/hos, /datum/job/rd, /datum/job/cmo, /datum/job/chief_engineer, /datum/job/detective, /datum/job/warden, /datum/job/officer, /datum/job/iaa, )
restricted_jobs = list(/datum/job/captain, /datum/job/hop, /datum/job/hos, /datum/job/rd, /datum/job/cmo, /datum/job/chief_engineer, /datum/job/detective, /datum/job/warden, /datum/job/officer, /datum/job/iaa, /datum/job/iso, )

/datum/antagonist/cultist
blacklisted_jobs = list(/datum/job/ai, /datum/job/cyborg, /datum/job/chaplain, /datum/job/submap)
restricted_jobs = list(/datum/job/captain, /datum/job/hop, /datum/job/hos, /datum/job/rd, /datum/job/cmo, /datum/job/chief_engineer, /datum/job/detective, /datum/job/warden, /datum/job/officer, /datum/job/iaa, )
restricted_jobs = list(/datum/job/captain, /datum/job/hop, /datum/job/hos, /datum/job/rd, /datum/job/cmo, /datum/job/chief_engineer, /datum/job/detective, /datum/job/warden, /datum/job/officer, /datum/job/iaa, /datum/job/iso, )

/datum/antagonist/loyalists
blacklisted_jobs = list(/datum/job/ai, /datum/job/cyborg, /datum/job/submap, )
Expand All @@ -20,7 +20,7 @@

/datum/antagonist/traitor
blacklisted_jobs = list(/datum/job/ai, /datum/job/cyborg, /datum/job/submap)
restricted_jobs = list(/datum/job/captain, /datum/job/hop, /datum/job/hos, /datum/job/rd, /datum/job/cmo, /datum/job/chief_engineer, /datum/job/warden, /datum/job/detective, /datum/job/officer, /datum/job/iaa, )
restricted_jobs = list(/datum/job/captain, /datum/job/hop, /datum/job/hos, /datum/job/rd, /datum/job/cmo, /datum/job/chief_engineer, /datum/job/warden, /datum/job/detective, /datum/job/officer, /datum/job/iaa, /datum/job/iso, )

/datum/antagonist/ert/equip(mob/living/carbon/human/player)
if(!..())
Expand Down