Skip to content

Coexist #373

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

Open
Bobinater wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Coexist #373

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2535c89
Update ncr.dm
Bobinater Jan 21, 2026
ddfbf91
Update ncr.dm
Bobinater Jan 21, 2026
84d753e
Merge branch 'master' into AllPeopleAreEqual
Bobinater Jan 22, 2026
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
57 changes: 29 additions & 28 deletions code/modules/jobs/job_types/ncr.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,10 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
if(visualsOnly)
return
H.mind.teach_crafting_recipe(/datum/crafting_recipe/ncrgate)

H.mind.teach_crafting_recipe(/datum/crafting_recipe/ncrcombathelmet)
H.mind.teach_crafting_recipe(/datum/crafting_recipe/ncrcombatarmor)
H.mind.teach_crafting_recipe(/datum/crafting_recipe/ncrcombathelmetmk2)
H.mind.teach_crafting_recipe(/datum/crafting_recipe/ncrcombatarmormk2)

///////////////////////
/// Colonel - Admin ///
Expand Down Expand Up @@ -151,7 +154,7 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
exp_requirements = 1900

loadout_options = list(
/datum/outfit/loadout/captainbackline, // Deagle
/datum/outfit/loadout/captainbackline, // El Capitan
/datum/outfit/loadout/captainfrontline, // AR Service Rifle
)

Expand Down Expand Up @@ -193,10 +196,10 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.

/datum/outfit/loadout/captainbackline
name = "Lead from the Back"
suit_store = /obj/item/gun/ballistic/automatic/pistol/deagle
suit_store = /obj/item/gun/ballistic/automatic/pistol/deagle/elcapitan = 1,
backpack_contents = list(
/obj/item/clothing/suit/armor/ncrarmor/captain/ncr_officer_coat = 1,
/obj/item/ammo_box/magazine/m44 = 3,
/obj/item/ammo_box/magazine/m14mm = 3,
/obj/item/grenade/smokebomb = 2,
/obj/item/storage/box/ration/menu_two = 1,
/obj/item/melee/onehanded/knife/trench = 1
Expand All @@ -207,9 +210,7 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
suit_store = /obj/item/gun/ballistic/automatic/service
backpack_contents = list(
/obj/item/ammo_box/magazine/m556/rifle = 3,
/obj/item/clothing/suit/armor/ncrarmor/captain = 1,
/obj/item/gun/ballistic/automatic/pistol/ninemil = 1,
/obj/item/ammo_box/magazine/m9mm/doublestack = 2,
/obj/item/clothing/suit/armor/ncrarmor/captain = 1,
/obj/item/storage/box/ration/menu_eight = 1,
/obj/item/melee/onehanded/knife/trench = 1
)
Expand Down Expand Up @@ -288,13 +289,13 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
display_order = JOB_DISPLAY_ORDER_SERGEANT
outfit = /datum/outfit/job/ncr/f13sergeant
exp_requirements = 500
/*
loadout_options = list( // ALL: Bayonet, M1911 sidearm
/datum/outfit/loadout/sergeantrifleman, // R82
/datum/outfit/loadout/sergeantrecon, // Scout Carbine, Scope
/datum/outfit/loadout/sergeantcqc, // Trench Shotgun, Gas mask, Smoke bombs, Trench knife

loadout_options = list(
/datum/outfit/loadout/sergeantrifleman, // Service rifle w/ revolver
/datum/outfit/loadout/sergeantrecon, // Marksman carbine
/datum/outfit/loadout/sergeantcqc, // Trench Shotgun
)
*/

matchmaking_allowed = list(
/datum/matchmaking_pref/friend = list(
/datum/job/ncr,
Expand All @@ -318,7 +319,6 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
head = /obj/item/clothing/head/f13/ncr
gloves = /obj/item/clothing/gloves/f13/leather/fingerless
suit = /obj/item/clothing/suit/armor/ncrarmor/reinforced/mantle
suit_store = /obj/item/gun/ballistic/automatic/service
belt = /obj/item/storage/belt/legholster
backpack_contents = list(
// /obj/item/storage/bag/money/small/ncrofficers = 1,
Expand All @@ -328,40 +328,39 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
/obj/item/stack/medical/gauze/bloodleaf = 2,
/obj/item/reagent_containers/hypospray/medipen/stimpak/super = 1
)
/*

/datum/outfit/loadout/sergeantrifleman
name = "Lead Rifleman"
suit_store = /obj/item/gun/ballistic/automatic/service/r82
suit_store = /obj/item/gun/ballistic/automatic/service
head = /obj/item/clothing/head/f13/ncr
backpack_contents = list(
/obj/item/ammo_box/magazine/m556/rifle/extended = 2,
/obj/item/ammo_box/magazine/m556/rifle/extended = 1,
/obj/item/ammo_box/magazine/m556/rifle = 1,
/obj/item/storage/box/ration/menu_two = 1,
/obj/item/melee/onehanded/knife/bowie = 1,
/obj/item/flashlight/seclite = 1,
/obj/item/gun/ballistic/revolver/colt357 = 1,
/obj/item/ammo_box/a357 = 2,
)

/datum/outfit/loadout/sergeantrecon
name = "Recon Squad Leader"
suit_store = /obj/item/gun/ballistic/automatic/service/carbine
name = "Scout"
suit_store = /obj/item/gun/ballistic/automatic/marksman
head = /obj/item/clothing/head/f13/ncr
backpack_contents = list(
/obj/item/ammo_box/magazine/m556/rifle/extended = 2,
/obj/item/ammo_box/magazine/m556/rifle = 2,
/obj/item/storage/box/ration/menu_eight = 1,
/obj/item/gun_upgrade/scope/watchman = 1
)

/datum/outfit/loadout/sergeantcqc
name = "Trench Raider"
suit_store = /obj/item/gun/ballistic/shotgun/trench //Over thereee over thereeeee spread the spread the word over thereeee
head = /obj/item/clothing/head/f13/ncr/steelpot_goggles/trenchraider
name = "Pointman"
backpack_contents = list(
/obj/item/ammo_box/shotgun/buck = 2,
/obj/item/clothing/mask/gas = 1,
/obj/item/ammo_box/shotgun/buck = 1,
/obj/item/ammo_box/shotgun/slug = 1,
/obj/item/grenade/smokebomb = 2,
/obj/item/melee/onehanded/knife/bayonet = 1,
/obj/item/clothing/suit/armor/ncrarmor/reinforced/mantle/trenchraider = 1,
)
*/

// DRILL SERGEANT

/datum/job/ncr/f13drillsergeant
Expand Down Expand Up @@ -544,6 +543,7 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
if(visualsOnly)
return
ADD_TRAIT(H, TRAIT_SILENT_STEP, src)
ADD_TRAIT(H, TRAIT_SOFT_YARDS, src)
ADD_TRAIT(H, TRAIT_GENERIC, src)
var/datum/martial_art/rangertakedown/RT = new
RT.teach(H)
Expand Down Expand Up @@ -633,6 +633,7 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
return
ADD_TRAIT(H, TRAIT_LIGHT_STEP, src)
ADD_TRAIT(H, TRAIT_GENERIC, src)
ADD_TRAIT(H, TRAIT_SOFT_YARDS, src)
var/datum/martial_art/rangertakedown/RT = new
RT.teach(H)

Expand Down
Loading