Skip to content

Commit

Permalink
Merge branch 'master' into bible
Browse files Browse the repository at this point in the history
  • Loading branch information
FalloutFalcon authored Apr 29, 2024
2 parents 428b347 + 6dda4a3 commit e6c5656
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 15 deletions.
4 changes: 2 additions & 2 deletions _maps/configs/syndicate_gorlex_hyena.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"slots": 1
},
"Foreman": {
"outfit": "/datum/outfit/job/syndicate/ce/gorlex",
"outfit": "/datum/outfit/job/syndicate/ce/gorlex/ngr",
"officer": true,
"slots": 1
},
Expand All @@ -36,7 +36,7 @@
"slots": 2
},
"Junior Agent": {
"outfit": "/datum/outfit/job/syndicate/assistant/gorlex",
"outfit": "/datum/outfit/job/syndicate/assistant/gorlex/ngr",
"slots": 2
}
},
Expand Down
20 changes: 8 additions & 12 deletions _maps/shuttles/syndicate/syndicate_gorlex_hyena.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,12 @@
req_access = list(20)
},
/obj/item/storage/backpack/security,
/obj/item/clothing/under/syndicate/combat,
/obj/item/clothing/suit/armor/vest/capcarapace/syndicate,
/obj/item/clothing/under/syndicate/ngr/officer,
/obj/item/clothing/suit/armor/vest/capcarapace/ngr_captain,
/obj/item/clothing/shoes/jackboots,
/obj/item/clothing/gloves/combat,
/obj/item/clothing/glasses/hud/security/sunglasses/eyepatch,
/obj/item/clothing/head/HoS/syndicate,
/obj/item/clothing/head/ngrcap,
/obj/effect/decal/cleanable/dirt/dust,
/obj/item/gun/ballistic/revolver,
/obj/item/ammo_box/a357/match,
Expand Down Expand Up @@ -1497,14 +1497,10 @@
/obj/item/clothing/shoes/jackboots,
/obj/item/clothing/shoes/jackboots,
/obj/item/clothing/shoes/jackboots,
/obj/item/clothing/under/syndicate/skirt,
/obj/item/clothing/under/syndicate/skirt,
/obj/item/clothing/under/syndicate/skirt,
/obj/item/clothing/under/syndicate/skirt,
/obj/item/clothing/under/syndicate,
/obj/item/clothing/under/syndicate,
/obj/item/clothing/under/syndicate,
/obj/item/clothing/under/syndicate,
/obj/item/clothing/under/syndicate/ngr,
/obj/item/clothing/under/syndicate/ngr,
/obj/item/clothing/under/syndicate/ngr,
/obj/item/clothing/under/syndicate/ngr,
/obj/item/clothing/head/soft/black,
/obj/item/clothing/head/soft/black,
/obj/item/clothing/head/soft/black,
Expand Down Expand Up @@ -1647,7 +1643,7 @@
req_access = list(56)
},
/obj/item/clothing/shoes/jackboots,
/obj/item/clothing/under/syndicate/gorlex,
/obj/item/clothing/under/syndicate/ngr/officer,
/obj/item/clothing/suit/toggle/industrial,
/obj/item/clothing/gloves/combat,
/obj/item/storage/belt/utility/chief{
Expand Down
2 changes: 1 addition & 1 deletion code/modules/client/client_procs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1087,7 +1087,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
return
var/list/verblist = list()
var/list/verbstoprocess = verbs.Copy()
if(mob?.client?.prefs.broadcast_login_logout)
if(mob)
verbstoprocess += mob.verbs
for(var/atom/movable/thing as anything in mob.contents)
verbstoprocess += thing.verbs
Expand Down
12 changes: 12 additions & 0 deletions code/modules/clothing/outfits/factions/syndicate.dm
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,12 @@
uniform = /obj/item/clothing/under/syndicate/gorlex
alt_uniform = /obj/item/clothing/under/syndicate

/datum/outfit/job/syndicate/assistant/gorlex/ngr
name = "Syndicate - Junior Agent (New Gorlex Republic)"

uniform = /obj/item/clothing/under/syndicate/ngr
alt_uniform = null

/datum/outfit/job/syndicate/assistant/gec
name = "Syndicate - Deckhand (GEC)"
id_assignment = "Deckhand"
Expand Down Expand Up @@ -421,6 +427,11 @@
shoes = /obj/item/clothing/shoes/jackboots
gloves = /obj/item/clothing/gloves/combat

/datum/outfit/job/syndicate/ce/gorlex/ngr
name = "Syndicate - Foreman (New Gorlex Republic)"

uniform = /obj/item/clothing/under/syndicate/ngr/officer

//Chief Medical Officer

/datum/outfit/job/syndicate/cmo
Expand Down Expand Up @@ -918,6 +929,7 @@
id_assignment = "Wrecker"

uniform = /obj/item/clothing/under/syndicate/gorlex
accessory = /obj/item/clothing/accessory/armband/cargo
shoes = /obj/item/clothing/shoes/workboots
ears = /obj/item/radio/headset/alt

Expand Down
7 changes: 7 additions & 0 deletions html/changelogs/archive/2024-04.yml
Original file line number Diff line number Diff line change
Expand Up @@ -137,3 +137,10 @@
- rscdel: Removed clumsy checks on guns
cuddleandtea:
- admin: adds color type to variables
2024-04-25:
Gristlebee:
- bugfix: Model H and Prototype Gauss Rifle mags are no longer invisible
2024-04-27:
Sadhorizon:
- tweak: Replaced standard syndicate outfits with NGR outfits on the Hyena.
- rscadd: Added NGR-specific CE and Assistant outfits.
Binary file modified icons/obj/ammo.dmi
Binary file not shown.

0 comments on commit e6c5656

Please sign in to comment.