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.

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

Adding Lictorii (Orator/Auxilia Bodyguard) #268

Open
wants to merge 20 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 7 additions & 1 deletion _maps/map_files/Pahrump-AB/Pahrump-AB.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -46482,6 +46482,12 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/f13/vault_floor/dark/darksolid,
/area/f13/building)
"mYH" = (
/obj/effect/landmark/start/f13/lictor,
/turf/open/indestructible/ground/outside/gravel{
icon_state = "gravel3"
},
/area/f13/wasteland)
"mYU" = (
/obj/structure/decoration/rag,
/turf/closed/wall/f13/wood/house,
Expand Down Expand Up @@ -131535,7 +131541,7 @@ xWo
qqE
aii
aii
qqE
mYH
vDY
mNn
xJd
Expand Down
32 changes: 17 additions & 15 deletions code/__DEFINES/jobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -89,21 +89,22 @@
#define F13LEGATE (1<<0)
#define F13CENTURION (1<<1)
#define F13ORATOR (1<<2)
#define F13PRIESTESS (1<<3)
#define F13DECANREC (1<<4)
#define F13DECAN (1<<5)
#define F13DECANVET (1<<6)
#define F13VEXILLARIUS (1<<7)
#define F13EXPLORER (1<<8)
#define F13VENATOR (1<<9)
#define F13VETLEGIONARY (1<<10)
#define F13LEGIONARY (1<<11)
#define F13RECRUITLEG (1<<12)
#define F13AUXILIA (1<<13)
#define F13LEGIONSLAVE (1<<14)
#define F13IMMUNE (1<<15)
#define F13CAMPFOLLOWER (1<<16)
#define F13SLAVEMASTER (1<<17)
#define F13LICTOR (1<<3)
#define F13PRIESTESS (1<<4)
#define F13DECANREC (1<<5)
#define F13DECAN (1<<6)
#define F13DECANVET (1<<7)
#define F13VEXILLARIUS (1<<8)
#define F13EXPLORER (1<<9)
#define F13VENATOR (1<<10)
#define F13VETLEGIONARY (1<<11)
#define F13LEGIONARY (1<<12)
#define F13RECRUITLEG (1<<13)
#define F13AUXILIA (1<<14)
#define F13LEGIONSLAVE (1<<15)
#define F13IMMUNE (1<<16)
#define F13CAMPFOLLOWER (1<<17)
#define F13SLAVEMASTER (1<<18)

#define BOS (1<<5)

Expand Down Expand Up @@ -307,6 +308,7 @@

#define JOB_DISPLAY_ORDER_CENTURION 52
#define JOB_DISPLAY_ORDER_ORATOR 53
#define JOB_DISPLAY_ORDER_LICTOR 53.9
#define JOB_DISPLAY_ORDER_PRIESTESS 54
#define JOB_DISPLAY_ORDER_DECANREC 55
#define JOB_DISPLAY_ORDER_DECAN 56
Expand Down
3 changes: 3 additions & 0 deletions code/game/objects/effects/landmarks.dm
Original file line number Diff line number Diff line change
Expand Up @@ -604,6 +604,9 @@ obj/effect/landmark/start/f13/ncrlogisticsofficer
/obj/effect/landmark/start/f13/orator
name = "Legion Orator"

/obj/effect/landmark/start/f13/lictor
name = "Legion Lictor"

/obj/effect/landmark/start/f13/immune
name = "Legion Immune"

Expand Down
9 changes: 9 additions & 0 deletions code/game/objects/items/granters.dm
Original file line number Diff line number Diff line change
Expand Up @@ -524,6 +524,15 @@
name = "empty scroll"
icon_state = "blankscroll"

/obj/item/book/granter/martial/wrestling
martial = /datum/martial_art/wrestling
name = "pro wrestling magazine"
martialname = "wrestling"
desc = "A magazine detailing various grapples, holds, suplexes and elbow drops. Oooh yeah, brother."
greet = "<span class='sciradio'>You have mastered the power of pro wrestling. Use the buttons at the top of your screen to harm others, grab to initiate a move.</span>"
remarks = list("Drop the leg...", "Cream of the crop...", "Hell yeah brother...", "The Macho Man is gonna...", "Warrior nation...", "One two three...")


/obj/item/book/granter/martial/plasma_fist
martial = /datum/martial_art/plasma_fist
name = "frayed scroll"
Expand Down
10 changes: 10 additions & 0 deletions code/modules/clothing/suits/bigiron_suits_factions.dm
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,16 @@ Suits. 0-10 in its primary value, slowdown 0, various utility
slowdown = ARMOR_SLOWDOWN_LIGHT * ARMOR_SLOWDOWN_GLOBAL_MULT
armor_tokens = list() // Exchanges protection for speed.

/obj/item/clothing/suit/armor/legion/praetorian
name = "legion bodyguard armor"
desc = "A suit of light armor with reinforced plates and leather added to it, protecting its user. Perfect for combatants specializing in hit-and-run."
icon = 'icons/fallout/clothing/armored_light.dmi'
mob_overlay_icon = 'icons/fallout/onmob/clothes/armor_light.dmi'
icon_state = "legion_praetorian"
item_state = "legion_praetorian"
slowdown = ARMOR_SLOWDOWN_LIGHT * ARMOR_SLOWDOWN_GLOBAL_MULT
armor_tokens = list(ARMOR_MODIFIER_UP_MELEE_T3, ARMOR_MODIFIER_UP_BULLET_T2, ARMOR_MODIFIER_UP_LASER_T1, ARMOR_MODIFIER_UP_DT_T2)

/obj/item/clothing/suit/armor/legion/vet/vexil
name = "legion vexillarius armor"
icon = 'icons/fallout/clothing/armored_medium.dmi'
Expand Down
77 changes: 77 additions & 0 deletions code/modules/jobs/job_types/legion.dm
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,83 @@ Weapons Lever shotgun, Grease gun, Repeater carbines, Revolvers, simple guns al
/obj/item/ammo_box/shotgun/magnum = 2,
)

// ----------------- LICTOR ------------------

/datum/job/CaesarsLegion/Legionnaire/f13lictor
title = "Legion Lictor"
flag = F13LICTOR
total_positions = 1
spawn_positions = 1
description = "A martial arts, unarmed fighter. You answer directly to the Centurion or the Orator. You will heed to personally protect the high-value noncombatants of the Legion, such as the Orator, the Forgemaster, or any other noncombatants that leave the camp for offiical diplomatic business."
supervisors = "the Centurion"
display_order = JOB_DISPLAY_ORDER_LICTOR
outfit = /datum/outfit/job/CaesarsLegion/Legionnaire/f13lictor
exp_requirements = 450

access = list(ACCESS_LEGION, ACCESS_CHANGE_IDS, ACCESS_LEGION_COMMAND)
minimal_access = list(ACCESS_LEGION, ACCESS_CHANGE_IDS, ACCESS_LEGION_COMMAND)

loadout_options = list(
/datum/outfit/loadout/praewrestle, // Wrestling book
/datum/outfit/loadout/praeberserk, // Berserker rites
/datum/outfit/loadout/praekravmaga, // Krav maga
)

min_required_special = list(
"special_s" = 7,
)

/datum/outfit/job/CaesarsLegion/Legionnaire/f13lictor/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
..()
if(visualsOnly)
return
ADD_TRAIT(H, TRAIT_BIG_LEAGUES, src)
ADD_TRAIT(H, TRAIT_IRONFIST, src)
ADD_TRAIT(H, TRAIT_LIFEGIVER, src)

/datum/outfit/job/CaesarsLegion/Legionnaire/f13lictor
name = "Legion Lictor"
jobtype = /datum/job/CaesarsLegion/Legionnaire/f13lictor
id = /obj/item/card/id/dogtag/legveteran
suit = /obj/item/clothing/suit/armor/legion/praetorian
head = /obj/item/clothing/head/helmet/f13/legion/venator
mask = /obj/item/clothing/mask/bandana/legion/
neck = /obj/item/storage/belt/shoulderholster
gloves = /obj/item/clothing/gloves/legion/plated
ears = /obj/item/radio/headset/headset_legion/
glasses = /obj/item/clothing/glasses/sunglasses/big
shoes = /obj/item/clothing/shoes/f13/military/plated
r_pocket = /obj/item/storage/survivalkit/medical/legion
l_pocket = /obj/item/flashlight/lantern

backpack_contents = list(
/obj/item/gun/ballistic/revolver/ballisticfist = 1,
/obj/item/ammo_box/shotgun/buck = 2,
// /obj/item/storage/bag/money/small/legofficers = 1,
/obj/item/binoculars = 1,
)

/datum/outfit/loadout/praewrestle
name = "Path of Brawn"
backpack_contents = list(
/obj/item/book/granter/martial/wrestling = 1,
/obj/item/grenade/smokebomb = 2,
)

/datum/outfit/loadout/praeberserk
name = "Path of Wrath"
backpack_contents = list(
/obj/item/book/granter/martial/berserker = 1,
/obj/item/reagent_containers/pill/bitterdrink = 2,
)

/datum/outfit/loadout/praekravmaga
name = "Path of the Protectorate"
backpack_contents = list(
/obj/item/book/granter/martial/krav_maga = 1,
/obj/item/reagent_containers/pill/bitterdrink = 2,
)


// ----------------- VETERAN DECANUS ---------------------

Expand Down
2 changes: 2 additions & 0 deletions code/modules/jobs/jobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -129,11 +129,13 @@ GLOBAL_LIST_INIT(legion_command_positions, list(
"Legion Orator",
"Legion Centurion",
"Legion Veteran Decanus",
"Legion Lictor",
))

GLOBAL_LIST_INIT(legion_positions, list(
"Legion Orator",
"Legion Centurion",
"Legion Lictor",
"Legion Veteran Decanus",
"Legion Prime Decanus",
"Legion Recruit Decanus",
Expand Down
Binary file modified icons/fallout/clothing/armored_light.dmi
Binary file not shown.
Binary file modified icons/fallout/onmob/clothes/armor_light.dmi
Binary file not shown.
Loading