Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
15120fa
frumi
SirSwagmeyer Apr 5, 2024
2355a0e
Role Changes
BobNewman-max Apr 5, 2024
19e1e28
clean up the code
BobNewman-max Apr 5, 2024
8ada6ff
holy shit I'm retarded
BobNewman-max Apr 5, 2024
ff38d4b
real
BobNewman-max Apr 5, 2024
516b1b4
did it wrong so fixed
BobNewman-max Apr 5, 2024
7859883
lmg ammo
SirSwagmeyer Apr 5, 2024
478db70
R88
SirSwagmeyer Apr 5, 2024
5cabe3e
Add files via upload
SirSwagmeyer Apr 5, 2024
2493125
Add files via upload
SirSwagmeyer Apr 5, 2024
f0cccb8
Add files via upload
SirSwagmeyer Apr 5, 2024
e90a2b3
ammopack
SirSwagmeyer Apr 5, 2024
cfb2f42
Merge pull request #1 from SirSwagmeyer/Hookers-and-Blackjack-Frumi
BobNewman-max Apr 5, 2024
027eee6
fixed code
BobNewman-max Apr 5, 2024
498b588
changes loadouts to fit more of the players comment
BobNewman-max Apr 5, 2024
7df6700
backslot onmob
SirSwagmeyer Apr 5, 2024
98c9383
small lmg
SirSwagmeyer Apr 5, 2024
05968ca
r84 fix
SirSwagmeyer Apr 5, 2024
4c98746
syntax fix
SirSwagmeyer Apr 5, 2024
8d56e58
ammolathe fixes
SirSwagmeyer Apr 5, 2024
ca133b4
weight changes
SirSwagmeyer Apr 5, 2024
d81a8a9
adding MG roles
SirSwagmeyer Apr 5, 2024
e689689
bipod toggling
SirSwagmeyer Apr 5, 2024
ee76ff4
mg sound
SirSwagmeyer Apr 5, 2024
55a92f1
forgot comma
SirSwagmeyer Apr 5, 2024
037092e
t6t0 naming
SirSwagmeyer Apr 5, 2024
a675f83
space
SirSwagmeyer Apr 5, 2024
6effd68
case sensitive
SirSwagmeyer Apr 5, 2024
c174023
ammopack naming
SirSwagmeyer Apr 5, 2024
d9b81e5
Add files via upload
SirSwagmeyer Apr 5, 2024
b9ef047
projectile sprite inhand?
SirSwagmeyer Apr 5, 2024
790b727
ammopack more sprites
SirSwagmeyer Apr 5, 2024
2673d81
Add files via upload
SirSwagmeyer Apr 5, 2024
c3c5bda
backpack inhands
SirSwagmeyer Apr 5, 2024
97e2ed8
Add files via upload
SirSwagmeyer Apr 5, 2024
370b2b1
back sprites
SirSwagmeyer Apr 5, 2024
0476a72
weight class change
SirSwagmeyer Apr 5, 2024
6b46416
sprite tweaking + balance
SirSwagmeyer Apr 5, 2024
96cbfca
making it useful
SirSwagmeyer Apr 5, 2024
1143fcd
Merge branch 'loadout-hell' into New-MG
BobNewman-max Apr 8, 2024
2bbe030
Merge branch 'master' into New-MG
xTrainx Apr 10, 2024
84c4bb9
stop moving while bipod is on
xTrainx Apr 12, 2024
398a8a3
blacklist miniguns from rechargers
xTrainx Apr 12, 2024
88b7093
Merge branch 'master' into New-MG
xTrainx Apr 12, 2024
a6dc928
Merge branch 'master' into New-MG
xTrainx Apr 13, 2024
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
6 changes: 6 additions & 0 deletions code/datums/action.dm
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,12 @@
/datum/action/item_action/toggle_firemode
name = "Toggle Firemode"

/datum/action/item_action/toggle_bipod
name = "Toggle Stability"

/datum/action/item_action/toggle_moveshoot
name = "Toggle Wielding"

/datum/action/item_action/rcl_col
name = "Change Cable Color"
icon_icon = 'icons/mob/actions/actions_items.dmi'
Expand Down
9 changes: 9 additions & 0 deletions code/game/machinery/recharger.dm
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@
/obj/item/ammo_box/magazine/mws_mag,
/obj/item/electrostaff,
/obj/item/gun/ballistic/automatic/magrifle))

var/static/list/forbidden_devices = typecacheof(list(
/obj/item/gun/energy/minigun))

/obj/machinery/recharger/RefreshParts()
for(var/obj/item/stock_parts/capacitor/C in component_parts)
Expand Down Expand Up @@ -72,7 +75,13 @@
return

var/allowed = is_type_in_typecache(G, allowed_devices)
var/forbidden = is_type_in_typecache(G, forbidden_devices)

if(forbidden)
explosion(src, 0, 3, 3, 3, flame_range = 3)
to_chat(user, "<span class='notice'>[src] shortcircuits and explodes the [G]!</span>")
qdel(G)
return 0
if(allowed)
if(anchored)
if(charging || panel_open)
Expand Down
21 changes: 21 additions & 0 deletions code/game/objects/items/storage/backpack.dm
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,27 @@
to_chat(user, "<span class='notice'>There is nothing left in the quiver.</span>")
return TRUE

/obj/item/storage/backpack/ammopack
name = "Ammobearer Backpack"
desc = "A sturdy, unwieldy backpack designed to store heavy munitions."
icon_state = "ammopack"
item_state = "ammopack"
w_class = WEIGHT_CLASS_BULKY
slot_flags = ITEM_SLOT_BACK

/obj/item/storage/backpack/ammopack/ComponentInitialize()
. = ..()
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
STR.max_items = 12
STR.can_hold = typecacheof(list(/obj/item/ammo_box/magazine/lmg/huge, /obj/item/ammo_box/magazine/lmg/large, /obj/item/ammo_box/magazine/lmg/huge/empty, /obj/item/ammo_box/magazine/lmg/large/empty))

/obj/item/storage/backpack/ammopack/PopulateContents()
new /obj/item/ammo_box/magazine/lmg/huge
new /obj/item/ammo_box/magazine/lmg/huge
new /obj/item/ammo_box/magazine/lmg/huge
new /obj/item/ammo_box/magazine/lmg/huge
new /obj/item/ammo_box/magazine/lmg/huge

/obj/item/storage/backpack/holding/satchel
name = "satchel of holding"
desc = "A satchel that opens into a localized pocket of Blue Space."
Expand Down
82 changes: 54 additions & 28 deletions code/modules/jobs/job_types/bos.dm
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,10 @@
H.mind.teach_crafting_recipe(/datum/crafting_recipe/gate_bos)

/*
Elder
Elder
I fucking hate you this is an admin role
don't re-add it you goblins
admin role fuckers use it.
*/

/datum/job/bos/f13elder
Expand All @@ -50,8 +53,8 @@ Elder
exp_type = EXP_TYPE_BROTHERHOODCOMMAND
head_announce = list("Security")
req_admin_notify = 1
total_positions = 1
spawn_positions = 1
total_positions = 0
spawn_positions = 0
description = "You are the Elder of this local chapter of the Brotherhood of Steel. You may be a veteran of warfare, an experienced commander or even a genius Scribe, and you command all the men within this bunker. Your main goals are to lead the Brotherhood, to solve conflicts inbetween castes and to manage the Head Paladin, Head Knight and Head Scribe."
supervisors = "the High Elders"
exp_requirements = 1200
Expand Down Expand Up @@ -92,7 +95,7 @@ Head Paladin
exp_requirements = 600

loadout_options = list(
/datum/outfit/loadout/hpa, //Laser Gatling, Super Sledge
/datum/outfit/loadout/hpa, //Laser Gatling,
/datum/outfit/loadout/hpb, //Tribeam, Powerfist
/datum/outfit/loadout/hpc //14mm pistol, Shield, Pre-war Ripper
)
Expand Down Expand Up @@ -124,17 +127,15 @@ Head Paladin
/datum/outfit/loadout/hpa
name = "Heavy Weapons Head Paladin"
backpack_contents = list(
/obj/item/gun/ballistic/automatic/m72 = 1,
/obj/item/ammo_box/magazine/m2mm = 2,
/obj/item/gun/energy/laser/wattz/magneto = 1,
/obj/item/stock_parts/cell/ammo/ec = 2
/obj/item/minigunpack = 1,
/obj/item/stock_parts/cell/ammo/ecp = 2
)

/datum/outfit/loadout/hpb
name = "Refined Head Paladin"
backpack_contents = list(
/obj/item/gun/ballistic/automatic/bozar = 1,
/obj/item/ammo_box/magazine/m556/rifle = 2,
/obj/item/gun/energy/laser/scatter = 1,
/obj/item/stock_parts/cell/ammo/mfc = 3,
/obj/item/gun/energy/laser/wattz/magneto = 1,
/obj/item/stock_parts/cell/ammo/ec = 2
)
Expand Down Expand Up @@ -265,10 +266,11 @@ Head Knight
)

/datum/outfit/loadout/hkc
name = "Backliner Head Knight"
name = "Explosives Head Knight"
backpack_contents = list(
/obj/item/gun/energy/laser/rcw = 1,
/obj/item/stock_parts/cell/ammo/ecp = 3
/obj/item/book/granter/trait/explosives_advanced = 1,
/obj/item/gun/ballistic/shotgun/automatic/combat/neostead = 1,
/obj/item/ammo_box/shotgun/buck = 3
)

/datum/outfit/job/bos/f13headknight/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
Expand Down Expand Up @@ -301,10 +303,12 @@ Paladin
exp_requirements = 300

loadout_options = list(
/datum/outfit/loadout/paladina, //Frontline P
/datum/outfit/loadout/paladinb, //Frontline SP
/datum/outfit/loadout/paladinc, //Heavy P
/datum/outfit/loadout/paladind //Heavy SP
/datum/outfit/loadout/paladina, // AER12
/datum/outfit/loadout/paladinb, // AER12 SP
/datum/outfit/loadout/paladinc, // RCW
/datum/outfit/loadout/paladind, // RCW SP
/datum/outfit/loadout/paladine, // Pre-war Ripper
/datum/outfit/loadout/paladinf, // Pre-war Ripper SP
)

outfit = /datum/outfit/job/bos/f13paladin
Expand Down Expand Up @@ -332,7 +336,6 @@ Paladin
neck = /obj/item/clothing/neck/mantle/bos/paladin
backpack_contents = list(
/obj/item/reagent_containers/hypospray/medipen/stimpak = 3,
/obj/item/melee/powered/ripper = 1,
)

/datum/outfit/loadout/paladina
Expand Down Expand Up @@ -362,8 +365,8 @@ Paladin
/datum/outfit/loadout/paladinc
name = "Heavy Paladin"
backpack_contents = list(
/obj/item/gun/energy/laser/scatter = 1,
/obj/item/stock_parts/cell/ammo/mfc = 3,
/obj/item/gun/energy/laser/rcw = 1,
/obj/item/stock_parts/cell/ammo/ecp = 3,
/obj/item/gun/energy/laser/wattz/magneto = 1,
/obj/item/stock_parts/cell/ammo/ec = 2,
/obj/item/clothing/suit/armor/f13/power_armor/t51b/bos = 1,
Expand All @@ -374,15 +377,38 @@ Paladin
/datum/outfit/loadout/paladind
name = "Heavy Senior Paladin"
backpack_contents = list(
/obj/item/gun/energy/laser/scatter = 1,
/obj/item/stock_parts/cell/ammo/mfc = 3,
/obj/item/gun/energy/laser/rcw = 1,
/obj/item/stock_parts/cell/ammo/ecp = 3,
/obj/item/gun/energy/laser/wattz/magneto = 1,
/obj/item/stock_parts/cell/ammo/ec = 2,
/obj/item/clothing/suit/armor/f13/power_armor/t51b/bos = 1,
/obj/item/clothing/head/helmet/f13/power_armor/t51b/bos = 1,
/obj/item/clothing/accessory/bos/seniorpaladin = 1
)

/datum/outfit/loadout/paladine
name = "CQC Paladin"
backpack_contents = list(
/obj/item/melee/powered/ripper/prewar = 1,
/obj/item/shield/riot/bullet_proof = 1,
/obj/item/gun/energy/laser/wattz/magneto = 1,
/obj/item/stock_parts/cell/ammo/ec = 2,
/obj/item/clothing/suit/armor/f13/power_armor/t51b/bos = 1,
/obj/item/clothing/head/helmet/f13/power_armor/t51b/bos = 1,
/obj/item/clothing/accessory/bos/paladin = 1
)

/datum/outfit/loadout/paladinf
name = "Senior CQC Paladin"
backpack_contents = list(
/obj/item/melee/powered/ripper/prewar = 1,
/obj/item/shield/riot/bullet_proof = 1,
/obj/item/gun/energy/laser/wattz/magneto = 1,
/obj/item/stock_parts/cell/ammo/ec = 2,
/obj/item/clothing/suit/armor/f13/power_armor/t51b/bos = 1,
/obj/item/clothing/head/helmet/f13/power_armor/t51b/bos = 1,
/obj/item/clothing/accessory/bos/paladin = 1
)

/datum/outfit/job/bos/f13paladin/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
..()
Expand Down Expand Up @@ -479,7 +505,7 @@ Senior Knight
supervisors = "the Head Knight"

loadout_options = list(
/datum/outfit/loadout/ska, //AER9, MK23 pistol
/datum/outfit/loadout/ska, //wattz2k, MK23 pistol
/datum/outfit/loadout/skb, //Marksman Rifle, Sig pistol
/datum/outfit/loadout/skc //Auto-5 Shotgun, MK23 pistol
)
Expand Down Expand Up @@ -517,9 +543,9 @@ Senior Knight
)

/datum/outfit/loadout/ska
name = "Senior Knight-Footman"
name = "Senior Knight-Sniper"
backpack_contents = list(
/obj/item/gun/energy/laser/aer9 = 1,
/obj/item/gun/energy/laser/wattz2k = 1,
/obj/item/stock_parts/cell/ammo/mfc = 3,
/obj/item/gun/ballistic/automatic/pistol/mk23 = 1,
/obj/item/ammo_box/magazine/m45exp = 2
Expand All @@ -539,8 +565,8 @@ Senior Knight
name = "Senior Knight-Engineer"
backpack_contents = list(
/obj/item/storage/belt/utility/full/engi = 1,
/obj/item/gun/ballistic/shotgun/automatic/combat/auto5 = 1,
/obj/item/ammo_box/shotgun/buck = 2,
/obj/item/gun/ballistic/automatic/shotgun/riot = 1,
/obj/item/ammo_box/magazine/d12g = 2,
/obj/item/gun/ballistic/automatic/pistol/mk23 = 1,
/obj/item/ammo_box/magazine/m45exp = 2
)
Expand Down Expand Up @@ -607,7 +633,7 @@ Knight
head = /obj/item/clothing/head/helmet/f13/combat/brotherhood
backpack_contents = list(
/obj/item/melee/onehanded/knife/survival = 1,
/obj/item/reagent_containers/hypospray/medipen/stimpak = 1,
/obj/item/reagent_containers/hypospray/medipen/stimpak = 1
)

/datum/outfit/loadout/knighta
Expand Down
Loading