Skip to content

Update legion.dm #17

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
cornercube wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Update legion.dm #17

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
0cd402f
Update legion.dm
cornercube Jan 10, 2022
ddd4d3c
Update automatic.dm
cornercube Jan 16, 2022
76e750c
Update oasis.dm
cornercube Jan 16, 2022
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
16 changes: 6 additions & 10 deletions code/modules/jobs/job_types/legion.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,28 +142,24 @@ Weapons Lever shotgun, Grease gun, Repeater carbines, Revolvers, simple guns al
box = /obj/item/storage/box/legate


// ORATOR
// CONSUL

/datum/job/CaesarsLegion/Legionnaire/f13orator
title = "Legion Orator"
flag = F13ORATOR
title = "Legion Consul"
flag = F13CONSUL
supervisors = "Legate"
selection_color = "#ffdddd"
req_admin_notify = 1
total_positions = 0
spawn_positions = 0
outfit = /datum/outfit/job/CaesarsLegion/Legionnaire/f13orator
outfit = /datum/outfit/job/CaesarsLegion/auxilia/consul
display_order = JOB_DISPLAY_ORDER_ORATOR
access = list(ACCESS_LEGION, ACCESS_CHANGE_IDS, ACCESS_LEGION_COMMAND)
minimal_access = list(ACCESS_LEGION, ACCESS_CHANGE_IDS, ACCESS_LEGION_COMMAND)

/datum/outfit/job/CaesarsLegion/Legionnaire/f13orator // 10mm Revolver, Spatha
name = "Orator"
/datum/outfit/job/CaesarsLegion/auxilia/consul // 10mm Revolver, Spatha
name = "Consul"
jobtype = /datum/job/CaesarsLegion/Legionnaire/f13orator
neck = /obj/item/storage/belt/holster
shoes = /obj/item/clothing/shoes/f13/military/legate
suit = /obj/item/clothing/suit/armor/f13/legion/legate
head = null
id = /obj/item/card/id/dogtag/legcenturion
gloves = null
shoes = /obj/item/clothing/shoes/roman
Expand Down
4 changes: 2 additions & 2 deletions code/modules/jobs/job_types/oasis.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,10 +328,10 @@ Mayor
suit = /obj/item/clothing/suit/armor/bulletproof
head = /obj/item/clothing/head/helmet/alt
neck = /obj/item/storage/belt/holster/legholster
l_hand = /obj/item/gun/ballistic/automatic/marksman/policerifle
l_hand = /obj/item/gun/ballistic/automatic/assault_carbine/policerifle
shoes = /obj/item/clothing/shoes/jackboots
backpack_contents = list(
/obj/item/ammo_box/magazine/m556/rifle = 2,
/obj/item/ammo_box/magazine/m5mm = 2,
/obj/item/gun/ballistic/automatic/pistol/mk23=1,
/obj/item/ammo_box/magazine/m45exp=2,
/obj/item/flashlight/seclite = 1,
Expand Down
15 changes: 7 additions & 8 deletions code/modules/projectiles/guns/ballistic/automatic.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -669,23 +669,22 @@
suppressor_y_offset = 28


//Police rifle Keywords: OASIS, 5.56mm, Semi-auto, 20 (10-50) round magazine
/obj/item/gun/ballistic/automatic/marksman/policerifle
//Police rifle Keywords: OASIS, 5mm, Semi-auto, 30 round magazine

/obj/item/gun/ballistic/automatic/assault_carbine/policerifle
name = "Police Rifle"
desc = "A pre-war Rifle that has been constantly repaired and rebuilt by the Oasis Police Department. Held together by duct tape and prayers, it somehow still shoots."
icon = 'icons/fallout/objects/guns/ballistic.dmi'
lefthand_file = 'icons/fallout/onmob/weapons/guns_lefthand.dmi'
righthand_file = 'icons/fallout/onmob/weapons/guns_righthand.dmi'
icon_state = "rifle-police"
item_state = "assault_carbine"
init_mag_type = /obj/item/ammo_box/magazine/m556/rifle
extra_damage = -1
burst_size = 1
spread = 1.1
extra_penetration = 0.15
burst_shot_delay = 4.2
fire_delay = 4.2
can_suppress = FALSE
can_scope = TRUE
zoomable = FALSE

semi_auto = TRUE

//Marksman carbine Keywords: 5.56mm, Semi-auto, 20 (10-50) round magazine, Small scope
/obj/item/gun/ballistic/automatic/marksman
Expand Down