diff --git a/_maps/map_files/Pahrump-AB/Pahrump-AB-Upper.dmm b/_maps/map_files/Pahrump-AB/Pahrump-AB-Upper.dmm
index a1a27619e3c..a278524cd2e 100644
--- a/_maps/map_files/Pahrump-AB/Pahrump-AB-Upper.dmm
+++ b/_maps/map_files/Pahrump-AB/Pahrump-AB-Upper.dmm
@@ -2521,6 +2521,7 @@
/obj/structure/chair/office{
dir = 1
},
+/obj/effect/landmark/start/f13/orator,
/turf/open/floor/wood_fancy,
/area/f13/legion)
"fgx" = (
@@ -10437,6 +10438,14 @@
icon_state = "greenrustychess"
},
/area/f13/building/massfusion)
+"wKs" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/table/wood,
+/obj/item/card/id/dogtag/legrecruit,
+/obj/item/card/id/dogtag/legrecruit,
+/obj/item/card/id/dogtag/legrecruit,
+/turf/open/floor/wood_fancy,
+/area/f13/legion)
"wLE" = (
/obj/structure/campfire,
/turf/open/indestructible/ground/inside/mountain,
@@ -74277,7 +74286,7 @@ oQP
fxn
qnx
qTd
-qTd
+wKs
rCg
jxl
oez
diff --git a/_maps/map_files/Pahrump-AB/Pahrump-AB.dmm b/_maps/map_files/Pahrump-AB/Pahrump-AB.dmm
index 9a4f8bc8bea..72ef424654c 100644
--- a/_maps/map_files/Pahrump-AB/Pahrump-AB.dmm
+++ b/_maps/map_files/Pahrump-AB/Pahrump-AB.dmm
@@ -294,7 +294,7 @@
},
/area/f13/brotherhood)
"abk" = (
-/obj/machinery/smartfridge/bottlerack/gardentool,
+/obj/machinery/smartfridge/bottlerack/gardentool/primitive,
/turf/open/floor/plasteel/f13/vault_floor/misc,
/area/f13/city)
"abl" = (
@@ -2337,6 +2337,9 @@
/area/f13/bunker)
"akh" = (
/obj/structure/rack,
+/obj/item/storage/belt/army/assault/ncr,
+/obj/item/storage/belt/army/assault/ncr,
+/obj/item/storage/belt/army/assault/ncr,
/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,
/area/f13/ncr)
"aki" = (
@@ -3127,6 +3130,12 @@
/obj/machinery/light{
dir = 8
},
+/obj/structure/closet/crate{
+ opened = 1
+ },
+/obj/item/card/id/dogtag/ncrtrooper,
+/obj/item/card/id/dogtag/ncrtrooper,
+/obj/item/card/id/dogtag/ncrtrooper,
/turf/open/floor/plasteel/vault,
/area/f13/ncr)
"anw" = (
@@ -3869,7 +3878,7 @@
},
/area/f13/wasteland)
"aqS" = (
-/obj/machinery/smartfridge,
+/obj/structure/closet/fridge/meat,
/turf/open/floor/plasteel/f13/vault_floor/red/white/whiteredchess/whiteredchess2,
/area/f13/ncr)
"aqT" = (
@@ -8693,7 +8702,6 @@
/obj/item/cultivator/rake,
/obj/item/storage/bag/plants,
/obj/item/storage/bag/plants,
-/obj/item/melee/onehanded/knife/switchblade,
/turf/open/indestructible/ground/outside/sidewalk,
/area/f13/ncr)
"aHo" = (
@@ -16778,7 +16786,7 @@
},
/area/f13/wasteland)
"bqU" = (
-/obj/structure/reagent_dispensers/watertank/high,
+/obj/machinery/seed_extractor,
/turf/open/indestructible/ground/outside/dirt,
/area/f13/ncr)
"bqX" = (
@@ -19615,7 +19623,7 @@
/obj/machinery/light/small{
dir = 4
},
-/obj/machinery/hydroponics/soil,
+/obj/machinery/smartfridge/bottlerack/gardentool/primitive,
/turf/open/indestructible/ground/outside/dirt,
/area/f13/wasteland)
"cjI" = (
@@ -21706,8 +21714,8 @@
/turf/open/floor/f13/wood,
/area/f13/building/hospital)
"cLv" = (
-/mob/living/simple_animal/cow/brahmin,
/obj/effect/turf_decal/shadow,
+/mob/living/simple_animal/chicken,
/turf/open/indestructible/ground/inside/dirt/stamped/outside/sand{
dir = 1;
icon_state = "desertsmooth2"
@@ -24133,12 +24141,6 @@
icon_state = "horizontaltopborderbottom2left"
},
/area/f13/wasteland)
-"dOs" = (
-/obj/effect/landmark/start/f13/orator,
-/turf/open/indestructible/ground/outside/gravel/edge{
- dir = 6
- },
-/area/f13/wasteland)
"dOw" = (
/obj/effect/decal/cleanable/oil,
/obj/effect/decal/cleanable/dirt,
@@ -27857,12 +27859,6 @@
/obj/effect/decal/cleanable/dirt/dust,
/turf/open/floor/plasteel/f13/vault_floor/white,
/area/f13/building/mall)
-"fmU" = (
-/obj/machinery/smartfridge/bottlerack/grownbin,
-/turf/open/indestructible/ground/outside/sidewalk{
- icon_state = "horizontaloutermain2left"
- },
-/area/f13/wasteland)
"fmX" = (
/obj/effect/decal/waste{
icon_state = "goo10"
@@ -28675,6 +28671,16 @@
/obj/structure/wreck/trash/autoshaft,
/turf/open/indestructible/ground/outside/graveldirt,
/area/f13/caves)
+"fBu" = (
+/obj/structure/flora/grass/wasteland{
+ icon_state = "tall_grass_4"
+ },
+/mob/living/simple_animal/cow/brahmin/nightstalker,
+/turf/open/indestructible/ground/outside/desert/sonora{
+ dir = 4;
+ icon_state = "desertsmooth3"
+ },
+/area/f13/wasteland)
"fBC" = (
/obj/effect/turf_decal/weather/dirt{
dir = 5
@@ -28723,10 +28729,9 @@
icon_state = "darkrusty"
},
/area/f13/radiation)
-"fDe" = (
-/obj/structure/flora/ausbushes/sparsegrass,
-/mob/living/simple_animal/chicken,
-/turf/open/indestructible/ground/outside/dirt,
+"fCW" = (
+/obj/machinery/smartfridge/bottlerack/seedbin,
+/turf/open/indestructible/ground/outside/sidewalk,
/area/f13/wasteland)
"fDm" = (
/obj/structure/flora/grass/wasteland{
@@ -29167,6 +29172,7 @@
pixel_y = 8
},
/obj/effect/turf_decal/shadow,
+/mob/living/simple_animal/cow/brahmin,
/turf/open/indestructible/ground/inside/dirt/stamped/outside/sand{
dir = 1;
icon_state = "desertsmooth4"
@@ -30021,6 +30027,7 @@
/area/f13/wasteland)
"ght" = (
/obj/effect/turf_decal/shadow,
+/mob/living/simple_animal/chicken,
/turf/open/indestructible/ground/inside/dirt/stamped/outside/sand{
dir = 1;
icon_state = "desertsmooth3"
@@ -33366,6 +33373,9 @@
/obj/structure/fence/wooden{
pixel_x = 18
},
+/obj/item/reagent_containers/food/snacks/grown/wheat,
+/obj/item/reagent_containers/food/snacks/grown/wheat,
+/obj/item/reagent_containers/food/snacks/grown/wheat,
/turf/open/indestructible/ground/outside/desert/sonora{
dir = 4;
icon_state = "desertsmooth1"
@@ -34215,6 +34225,19 @@
},
/turf/open/floor/plasteel/f13/vault_floor/white/whitesolid,
/area/f13/building/mall)
+"hTN" = (
+/obj/machinery/light{
+ dir = 1
+ },
+/obj/structure/closet/anchored,
+/obj/item/clothing/suit/armor/ncrarmor/conscript,
+/obj/item/clothing/suit/armor/ncrarmor/conscript,
+/obj/item/clothing/suit/armor/ncrarmor/conscript,
+/obj/item/clothing/under/f13/ncr/conscript,
+/obj/item/clothing/under/f13/ncr/conscript,
+/obj/item/clothing/under/f13/ncr/conscript,
+/turf/open/floor/plasteel/f13/vault_floor/dark,
+/area/f13/ncr)
"hUh" = (
/obj/structure/table/reinforced,
/obj/effect/decal/cleanable/dirt{
@@ -34351,15 +34374,6 @@
/obj/structure/decoration/legion/chains,
/turf/closed/wall/f13/wood,
/area/f13/legion)
-"hWN" = (
-/obj/structure/fence/corner{
- max_integrity = 500;
- name = "reinforced fence"
- },
-/turf/open/indestructible/ground/outside/dirt{
- icon_state = "dirt"
- },
-/area/f13/wasteland)
"hWP" = (
/obj/machinery/hydroponics/soil/pot,
/obj/machinery/light/small,
@@ -34524,7 +34538,7 @@
/turf/open/indestructible/ground/outside/road,
/area/f13/building)
"ibi" = (
-/obj/machinery/seed_extractor,
+/obj/structure/legion_extractor,
/turf/open/indestructible/ground/outside/sidewalk,
/area/f13/ncr)
"ibj" = (
@@ -35841,6 +35855,12 @@
},
/turf/open/floor/f13/wood,
/area/f13/building/mall)
+"izT" = (
+/obj/item/toy/beach_ball/holoball/dodgeball,
+/obj/item/toy/beach_ball/holoball/dodgeball,
+/obj/item/toy/beach_ball/holoball/dodgeball,
+/turf/open/indestructible/ground/outside/sidewalk,
+/area/f13/wasteland)
"izV" = (
/obj/structure/flora/ausbushes/sparsegrass,
/obj/effect/turf_decal/weather/dirt{
@@ -35877,7 +35897,6 @@
/area/f13/wasteland)
"iAR" = (
/obj/structure/flora/ausbushes/sparsegrass,
-/mob/living/simple_animal/cow/brahmin,
/obj/effect/turf_decal/shadow,
/turf/open/indestructible/ground/inside/dirt/stamped/outside/sand{
dir = 1;
@@ -38180,6 +38199,13 @@
},
/turf/open/indestructible/ground/inside/mountain,
/area/f13/caves)
+"jwQ" = (
+/obj/machinery/smartfridge/bottlerack/grownbin,
+/turf/open/indestructible/ground/inside/dirt/stamped/outside/sand{
+ dir = 1;
+ icon_state = "desertsmooth2"
+ },
+/area/f13/wasteland)
"jxi" = (
/obj/structure/table,
/obj/effect/decal/cleanable/dirt{
@@ -40958,6 +40984,7 @@
/obj/item/brahminbridle,
/obj/item/brahminbridle,
/obj/item/brahminbridle,
+/obj/structure/table/wood,
/turf/open/indestructible/ground/outside/desert/sonora{
dir = 4;
icon_state = "desertsmooth1"
@@ -43055,6 +43082,10 @@
icon_state = "floorrusty"
},
/area/f13/building/firestation)
+"lAY" = (
+/mob/living/simple_animal/cow/brahmin/sgtsillyhorn,
+/turf/open/indestructible/ground/outside/dirt,
+/area/f13/wasteland)
"lBg" = (
/obj/structure/barricade/wooden,
/obj/structure/spacevine,
@@ -44825,20 +44856,6 @@
icon_state = "whitedirtysolid"
},
/area/f13/brotherhood)
-"mji" = (
-/obj/structure/fence/door{
- max_integrity = 500;
- name = "reinforced fence door"
- },
-/turf/open/indestructible/ground/outside/dirt{
- icon_state = "dirt"
- },
-/area/f13/wasteland)
-"mju" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/smartfridge/bottlerack/grownbin,
-/turf/open/indestructible/ground/outside/sidewalk,
-/area/f13/wasteland)
"mjF" = (
/obj/structure/sign/radiation_l,
/turf/closed/mineral/random/low_chance,
@@ -46122,6 +46139,7 @@
"mIG" = (
/obj/structure/table/wood,
/obj/effect/decal/cleanable/dirt,
+/obj/effect/spawner/lootdrop/f13/weapon/melee/tier3,
/turf/open/indestructible/ground/inside/mountain,
/area/f13/legion)
"mIK" = (
@@ -46464,6 +46482,13 @@
},
/turf/open/floor/wood_common,
/area/f13/village)
+"mQJ" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/closet/fridge/standard,
+/turf/open/floor/f13{
+ icon_state = "floorrusty"
+ },
+/area/f13/ncr)
"mQQ" = (
/obj/structure/table/wood/settler,
/obj/machinery/chem_dispenser/drinks/beer/fullupgrade{
@@ -48812,6 +48837,12 @@
icon_state = "verticaloutermain0"
},
/area/f13/wasteland)
+"nNI" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/shadow/floor,
+/obj/item/storage/money_stack,
+/turf/open/floor/wood_fancy,
+/area/f13/legion)
"nOi" = (
/obj/machinery/light/small{
dir = 1
@@ -50822,6 +50853,12 @@
},
/turf/open/floor/plasteel/f13/vault_floor/white,
/area/f13/village)
+"oEE" = (
+/obj/machinery/smartfridge/bottlerack/grownbin,
+/turf/open/indestructible/ground/outside/sidewalk{
+ icon_state = "horizontaloutermain0"
+ },
+/area/f13/wasteland)
"oEG" = (
/obj/effect/turf_decal/weather/dirt{
dir = 8
@@ -54862,6 +54899,13 @@
/obj/structure/wreck/trash/machinepile,
/turf/open/floor/f13/wood,
/area/f13/building/mall)
+"qiQ" = (
+/obj/structure/cable{
+ icon_state = "2-8"
+ },
+/obj/machinery/vending/hydronutrients,
+/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,
+/area/f13/brotherhood)
"qiU" = (
/obj/structure/barricade/tentleathercorner{
dir = 8
@@ -57775,12 +57819,6 @@
icon_state = "verticalrightborderleft0"
},
/area/f13/wasteland)
-"rBT" = (
-/mob/living/simple_animal/chicken{
- name = "Peckers"
- },
-/turf/open/indestructible/ground/inside/mountain,
-/area/f13/caves)
"rBU" = (
/obj/structure/table,
/turf/open/indestructible/ground/outside/sidewalk{
@@ -60385,6 +60423,10 @@
},
/turf/open/floor/plasteel/f13/vault_floor/misc,
/area/f13/city)
+"sIC" = (
+/mob/living/simple_animal/cow/brahmin/nightstalker,
+/turf/open/indestructible/ground/outside/desert/sonora/coarse,
+/area/f13/wasteland)
"sIE" = (
/obj/structure/flora/grass/wasteland{
icon_state = "tall_grass_6"
@@ -65044,8 +65086,10 @@
/obj/item/clothing/shoes/f13/military/ncr,
/obj/item/clothing/shoes/f13/military/ncr,
/obj/item/melee/onehanded/club/ncrflag,
-/obj/item/clothing/head/f13/ncr,
-/obj/item/clothing/head/f13/ncr,
+/obj/item/clothing/head/f13/ncr/standard/conscript,
+/obj/item/clothing/head/f13/ncr/standard/conscript,
+/obj/item/clothing/head/f13/ncr/standard/conscript,
+/obj/item/clothing/shoes/f13/military/ncr,
/turf/open/floor/plasteel/f13/vault_floor/dark,
/area/f13/ncr)
"uFh" = (
@@ -67421,6 +67465,14 @@
/obj/structure/simple_door/wood,
/turf/open/floor/f13/wood,
/area/f13/building)
+"vEY" = (
+/obj/effect/turf_decal/shadow,
+/mob/living/simple_animal/cow/brahmin,
+/turf/open/indestructible/ground/inside/dirt/stamped/outside/sand{
+ dir = 1;
+ icon_state = "desertsmooth2"
+ },
+/area/f13/wasteland)
"vFy" = (
/obj/structure/simple_door/metal/store,
/obj/effect/decal/cleanable/dirt,
@@ -69073,6 +69125,10 @@
/obj/structure/barricade/bars,
/turf/open/floor/plasteel/f13/vault_floor/blue/bluechess,
/area/f13/city)
+"wqP" = (
+/mob/living/simple_animal/hostile/retaliate/goat/bighorn,
+/turf/open/indestructible/ground/inside/mountain,
+/area/f13/caves)
"wrn" = (
/obj/structure/table/booth,
/turf/open/floor/f13/wood,
@@ -70151,6 +70207,12 @@
/obj/machinery/light/small,
/turf/open/floor/wood_common,
/area/f13/village)
+"wOJ" = (
+/mob/living/simple_animal/chicken{
+ name = "Peckers"
+ },
+/turf/open/indestructible/ground/outside/desert,
+/area/f13/wasteland)
"wOR" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
@@ -71214,12 +71276,6 @@
icon_state = "darkrustysolid"
},
/area/f13/building/massfusion)
-"xjR" = (
-/obj/structure/weightlifter,
-/turf/open/indestructible/ground/outside/sidewalk{
- icon_state = "horizontaloutermain0"
- },
-/area/f13/wasteland)
"xjV" = (
/obj/structure/chair/f13chair1{
dir = 1
@@ -72233,6 +72289,13 @@
},
/turf/open/indestructible/ground/outside/dirt,
/area/f13/wasteland)
+"xES" = (
+/mob/living/simple_animal/cow/brahmin/nightstalker,
+/turf/open/indestructible/ground/outside/desert/sonora{
+ dir = 4;
+ icon_state = "desertsmooth1"
+ },
+/area/f13/wasteland)
"xFk" = (
/obj/machinery/smartfridge/bottlerack/lootshelf/cooking,
/obj/effect/decal/cleanable/dirt/dust,
@@ -73561,10 +73624,6 @@
},
/turf/open/indestructible/ground/outside/dirt,
/area/f13/wasteland/khans)
-"yiG" = (
-/mob/living/simple_animal/chicken,
-/turf/open/indestructible/ground/inside/mountain,
-/area/f13/caves)
"yiM" = (
/obj/effect/spawner/lootdrop/f13/weapon/gun/ammo/tier2,
/obj/structure/table/wood,
@@ -75088,7 +75147,7 @@ wHN
wHN
qmF
kGV
-cmi
+mQJ
cjh
cld
bsj
@@ -77138,11 +77197,11 @@ fOH
lpo
vsg
bbQ
-bzX
+fCW
ean
aBO
vsg
-mBw
+oEE
kLl
ovj
ovj
@@ -79176,7 +79235,7 @@ xLa
rnk
rnk
kGV
-arX
+hTN
hmu
lTF
axa
@@ -79194,7 +79253,7 @@ igF
pjX
biB
aqp
-ean
+izT
vsg
nXv
ean
@@ -79451,7 +79510,7 @@ igF
cTz
xYE
aiN
-xjR
+vsg
wFb
kYV
sPK
@@ -84826,9 +84885,9 @@ lZB
lZB
aoC
eyf
-fmU
+bbs
nbb
-gCc
+cPG
aGR
aOk
aGR
@@ -85083,9 +85142,9 @@ lZB
lZB
aoC
eKw
-mju
+aum
nbb
-mji
+xOD
aOk
aOk
aOk
@@ -85342,13 +85401,13 @@ lZB
xLa
imR
nbb
-mji
+xOD
aOk
aOk
aOk
btA
aOk
-aOk
+fJC
bAu
bAu
bAu
@@ -85599,7 +85658,7 @@ lZB
eyf
vsg
nbb
-gCc
+xOD
aOk
aOk
aOk
@@ -85856,17 +85915,17 @@ lZB
eKw
bbs
gxo
-hWN
+xOD
aOk
aGR
aOk
aGR
aOk
-aGR
+aOk
faR
aOk
-fDe
-cIY
+hkV
+lAY
qdU
rth
xfd
@@ -86376,7 +86435,7 @@ aGR
aOk
aGR
aOk
-aGR
+aOk
faR
aOk
qxy
@@ -99831,7 +99890,7 @@ coL
aiO
aTE
aTE
-aTE
+apZ
bNH
sqb
bcD
@@ -113582,7 +113641,7 @@ aaa
(156,1,1) = {"
aaa
pxe
-eZf
+qiQ
dze
syf
iml
@@ -125386,7 +125445,7 @@ hEK
dJF
vLm
nmJ
-eXj
+vEY
mAw
ght
peQ
@@ -125900,7 +125959,7 @@ dJF
uWK
hxZ
nmJ
-nmJ
+wOJ
fME
cLv
eXj
@@ -126411,14 +126470,14 @@ sWC
tHd
mtE
quZ
-fxd
+jwQ
ihr
gph
wgu
fxd
cPg
nuz
-rBT
+aaB
aaB
btv
bsP
@@ -126676,7 +126735,7 @@ nQX
pmd
jnA
aaB
-aaB
+wqP
aaB
bsP
aae
@@ -126933,7 +126992,7 @@ xwz
eBH
cej
aaB
-yiG
+aaB
aaB
bsP
aae
@@ -131807,8 +131866,8 @@ luD
luD
qPs
tfD
-aWW
-aWW
+mry
+mry
mry
oxV
oCb
@@ -132056,7 +132115,7 @@ aii
qqE
sQy
qqE
-dOs
+vaD
ejT
jJS
fPm
@@ -136425,8 +136484,8 @@ wtI
hrE
sVE
sWC
-izz
-ccj
+xLC
+xES
fPm
fnz
ccj
@@ -136684,7 +136743,7 @@ ccj
voq
sVE
ccj
-xJd
+xLC
ccj
sWC
eov
@@ -137195,10 +137254,10 @@ sMp
sMp
gvW
dJF
-oDu
+fBu
ccj
ccj
-sWC
+sIC
ccj
vNP
eov
@@ -137456,7 +137515,7 @@ ccj
ccj
ccj
ccj
-dJF
+xLC
uWK
uVZ
aqx
@@ -138215,7 +138274,7 @@ ixo
crt
sWC
hrE
-tWI
+nNI
sMp
rCi
hrE
diff --git a/code/_globalvars/lists/maintenance_loot.dm b/code/_globalvars/lists/maintenance_loot.dm
index 97b00d4ca9e..16f143888e2 100644
--- a/code/_globalvars/lists/maintenance_loot.dm
+++ b/code/_globalvars/lists/maintenance_loot.dm
@@ -254,11 +254,10 @@ GLOBAL_LIST_INIT(trash_gun, list(
/obj/item/melee/onehanded/machete/scrapsabre = 5,
/obj/item/melee/onehanded/knife/cosmicdirty = 5,
/obj/item/melee/onehanded/club/tireiron = 10,
- /obj/item/twohanded/fireaxe/bmprsword = 5,
+ /obj/item/twohanded/fireaxe/bmprsword = 1,
/obj/item/melee/onehanded/club = 10,
/obj/item/twohanded/spear/scrapspear = 10,
/obj/item/melee/unarmed/lacerator = 5,
- /obj/item/shishkebabpack = 1
))
GLOBAL_LIST_INIT(trash_money, list(
diff --git a/code/datums/components/crafting/recipes/recipes_explosives.dm b/code/datums/components/crafting/recipes/recipes_explosives.dm
index 5c252429f21..7510454bc37 100644
--- a/code/datums/components/crafting/recipes/recipes_explosives.dm
+++ b/code/datums/components/crafting/recipes/recipes_explosives.dm
@@ -15,18 +15,6 @@
time = 30
category = CAT_AMMO
-/datum/crafting_recipe/chemical_payload
- name = "Chemical Payload (C4)"
- result = /obj/item/bombcore/chemical
- reqs = list(
- /obj/item/stock_parts/matter_bin = 1,
- /obj/item/grenade/plastic/c4 = 1,
- /obj/item/grenade/chem_grenade = 2
- )
- parts = list(/obj/item/stock_parts/matter_bin = 1, /obj/item/grenade/chem_grenade = 2)
- time = 30
- category = CAT_AMMO
-
/datum/crafting_recipe/explosive/molotov
name = "Molotov Cocktail (empty)"
result = /obj/item/reagent_containers/food/drinks/bottle/molotov
@@ -40,7 +28,7 @@
name = "Stick of Dynamite"
result = /obj/item/grenade/f13/dynamite
reqs = list(/datum/reagent/fuel = 10,
- /obj/item/paper = 2,
+ /obj/item/paper = 1,
/obj/item/stack/ore/blackpowder = 2)
time = 5
category = CAT_AMMO
@@ -96,6 +84,7 @@
/obj/item/stack/f13Cash/caps = 200)
time = 15
category = CAT_AMMO
+
/datum/crafting_recipe/explosive/shrapnelmine
name = "Shrapnel Mine"
result = /obj/item/mine/shrapnel/random
diff --git a/code/datums/components/crafting/recipes/recipes_forge.dm b/code/datums/components/crafting/recipes/recipes_forge.dm
index 9ce753f773c..c9b2d520a0a 100644
--- a/code/datums/components/crafting/recipes/recipes_forge.dm
+++ b/code/datums/components/crafting/recipes/recipes_forge.dm
@@ -76,10 +76,10 @@
/datum/crafting_recipe/tools/forged/sledge
name = "Sledgehammer"
result = /obj/item/twohanded/sledgehammer/simple
- time = 700
+ time = 500
reqs = list(
- /obj/item/stack/sheet/metal = 15,
- /obj/item/stack/sheet/mineral/wood = 5,
+ /obj/item/stack/sheet/metal = 30,
+ /obj/item/stack/sheet/mineral/wood = 10,
)
tools = list(TOOL_WORKBENCH, TOOL_WELDER)
category = CAT_CRAFTING
@@ -214,10 +214,11 @@
name = "Bumper Sword"
result = /obj/item/twohanded/fireaxe/bmprsword
reqs = list(
- /obj/item/stack/sheet/metal = 25,
- /obj/item/stack/sheet/cloth = 2,
+ /obj/item/stack/sheet/metal = 50,
+ /obj/item/stack/sheet/cloth = 5,
+ /obj/item/stack/sheet/leather = 5,
)
- time = 400
+ time = 700
tools = list(TOOL_FORGE)
category = CAT_WEAPONRY
subcategory = CAT_MELEE
diff --git a/code/datums/components/crafting/recipes/recipes_medicine.dm b/code/datums/components/crafting/recipes/recipes_medicine.dm
index 16019e2d646..d95949b998e 100644
--- a/code/datums/components/crafting/recipes/recipes_medicine.dm
+++ b/code/datums/components/crafting/recipes/recipes_medicine.dm
@@ -113,8 +113,7 @@
/datum/crafting_recipe/bitterdrink5
name = "Batch of bitterdrink (x5)"
result = /obj/item/storage/box/medicine/bitterdrink5
- reqs = list(/datum/reagent/medicine/bitter_drink = 25,
- /obj/item/reagent_containers/food/drinks = 5)
+ reqs = list(/datum/reagent/medicine/bitter_drink = 25)
tools = list(TOOL_ALCHEMY_TABLE)
time = 20
category = CAT_MEDICAL
@@ -200,7 +199,7 @@
/datum/crafting_recipe/stimpak/chemistry // Purely chemistry recipe
name = "Stimpak (from chems)"
result = /obj/item/reagent_containers/hypospray/medipen/stimpak
- reqs = list(/datum/reagent/medicine/stimpak = 20,
+ reqs = list(/datum/reagent/medicine/stimpak = 15,
/obj/item/reagent_containers/syringe = 1)
tools = list(TOOL_CHEMMASTER)
time = 10
@@ -221,7 +220,7 @@
/datum/crafting_recipe/stimpak5/chemistry // Purely chemistry recipe
name = "Stimpak x5 (from chems)"
result = /obj/item/storage/box/medicine/stimpaks/stimpaks5
- reqs = list(/datum/reagent/medicine/stimpak = 100,
+ reqs = list(/datum/reagent/medicine/stimpak = 75,
/obj/item/reagent_containers/syringe = 5)
tools = list(TOOL_CHEMMASTER)
time = 20
diff --git a/code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm b/code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm
index cafcfd35d4c..95702e41abd 100644
--- a/code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm
+++ b/code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm
@@ -1701,11 +1701,13 @@
name = "Glock 86A Plasma Pistol"
result = /obj/item/gun/energy/laser/plasma/glock/extended
reqs = list(/obj/item/gun/energy/laser/plasma/glock = 1,
- /obj/item/stack/crafting/metalparts = 3,
- /obj/item/stack/sheet/metal = 1,
- /obj/item/stack/crafting/electronicparts = 3)
+ /obj/item/stack/crafting/metalparts = 5,
+ /obj/item/stack/sheet/metal = 5,
+ /obj/item/advanced_crafting_components/conductors = 1,
+ /obj/item/advanced_crafting_components/lenses = 1,
+ /obj/item/stack/crafting/electronicparts = 15)
tools = list(TOOL_AWORKBENCH)
- time = 120
+ time = 130
category = CAT_WEAPONRY
subcategory = CAT_WEAPON
diff --git a/code/datums/martial/sleeping_carp.dm b/code/datums/martial/sleeping_carp.dm
index 7f15b244f61..2f2dc0fef0d 100644
--- a/code/datums/martial/sleeping_carp.dm
+++ b/code/datums/martial/sleeping_carp.dm
@@ -167,10 +167,10 @@
/mob/living/carbon/human/proc/sleeping_carp_help()
set name = "Recall Teachings"
- set desc = "Remember the martial techniques of the Sleeping Carp clan."
- set category = "Sleeping Carp"
+ set desc = "Remember the martial techniques of the Iron Wall."
+ set category = "Iron Wall"
- to_chat(usr, "You retreat inward and recall the teachings of the Sleeping Carp...")
+ to_chat(usr, "You retreat inward and recall the teachings of the Iron Wall...")
//to_chat(usr, "Gnashing Teeth: Harm Harm. Deal additional damage every second punch, with a chance for even more damage!")
//to_chat(usr, "Crashing Wave Kick: Harm Disarm. Launch people brutally across rooms, and away from you.")
diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm
index 85477352a31..ae38f8585bd 100644
--- a/code/game/machinery/computer/card.dm
+++ b/code/game/machinery/computer/card.dm
@@ -497,6 +497,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
"NCR Colonel",
"NCR Captain",
"NCR Lieutenant",
+ "NCR Brahmin Baron",
)
/obj/machinery/computer/card/legion
@@ -515,6 +516,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
"Legate",
"Legion Centurion",
"Legion Veteran Decanus",
+ "Legion Orator",
)
/obj/machinery/computer/card/enclave
diff --git a/code/game/objects/effects/spawners/f13lootdrop.dm b/code/game/objects/effects/spawners/f13lootdrop.dm
index d165af7a3ec..30788665fcc 100644
--- a/code/game/objects/effects/spawners/f13lootdrop.dm
+++ b/code/game/objects/effects/spawners/f13lootdrop.dm
@@ -720,6 +720,7 @@
/obj/item/melee/unarmed/maceglove,
/obj/item/melee/unarmed/punchdagger,
/obj/item/twohanded/baseball/louisville,
+ /obj/item/twohanded/baseball/spiked,
/obj/item/shishkebabpack,
/obj/item/shield/riot,
)
@@ -780,9 +781,10 @@
/obj/effect/spawner/lootdrop/f13/weapon/gun/energy/hobo
name = "very low tier energy gun"
- loot = list(/obj/effect/spawner/bundle/f13/wattz,
- /obj/item/gun/energy/laser/wattz/recharger,
- /obj/item/gun/ballistic/rifle/hobo/lasmusket,
+ loot = list(/obj/effect/spawner/bundle/f13/wattz = 30,
+ /obj/item/gun/energy/laser/wattz/recharger = 15,
+ /obj/item/gun/ballistic/rifle/hobo/lasmusket = 20,
+ /obj/item/gun/ballistic/rifle/hobo/plasmacaster = 20,
)
/obj/effect/spawner/lootdrop/f13/weapon/gun/energy/low
diff --git a/code/game/objects/effects/spawners/themed_loot_tables.dm b/code/game/objects/effects/spawners/themed_loot_tables.dm
index 06d8963acf5..6165975b334 100644
--- a/code/game/objects/effects/spawners/themed_loot_tables.dm
+++ b/code/game/objects/effects/spawners/themed_loot_tables.dm
@@ -99,12 +99,11 @@
/obj/item/melee/onehanded/machete/scrapsabre = 10,
/obj/item/melee/onehanded/knife/cosmicdirty = 5,
/obj/item/melee/onehanded/club/tireiron = 10,
- /obj/item/twohanded/fireaxe/bmprsword = 5,
+ /obj/item/twohanded/fireaxe/bmprsword = 1,
/obj/item/melee/onehanded/club = 10,
/obj/item/twohanded/spear/scrapspear = 10,
/obj/item/gun/ballistic/automatic/hobo/destroyer = 1,
/obj/item/melee/unarmed/lacerator = 10,
- /obj/item/shishkebabpack = 5,
/obj/item/gun/ballistic/automatic/smg/mini_uzi/rockwell = 10,
)
diff --git a/code/game/objects/items/granters.dm b/code/game/objects/items/granters.dm
index 49d0037a15a..69dbb91a981 100644
--- a/code/game/objects/items/granters.dm
+++ b/code/game/objects/items/granters.dm
@@ -443,14 +443,14 @@
/obj/item/book/granter/martial/carp
martial = /datum/martial_art/the_sleeping_carp
name = "mysterious scroll"
- martialname = "sleeping carp"
+ martialname = "iron wall"
desc = "A scroll filled with strange markings. It seems to be drawings of some sort of martial art."
- greet = "You have learned the ancient martial art of the Sleeping Carp! Your hand-to-hand combat has become much more effective, and you are now able to deflect any projectiles \
+ greet = "You have learned the ancient martial art of the Iron Wall! Your hand-to-hand combat has become much more effective, and you are now able to deflect any projectiles \
directed toward you while in Throw Mode. Your body is also honed to protect you from damage and punctures, and even briefly survive space. \
- However, you are also unable to use any ranged weaponry, and some medical supplies will prove useless to you. You can learn more about your newfound art by using the Recall Teachings verb in the Sleeping Carp tab."
+ However, you are also unable to use any ranged weaponry, and some medical supplies will prove useless to you. You can learn more about your newfound art by using the Recall Teachings verb in the Iron Wall tab."
icon = 'icons/obj/wizard.dmi'
icon_state = "scroll2"
- remarks = list("Wait, a high protein diet is really all it takes to become bulletproof...?", "Overwhelming force, immovable object...", "Focus... And you'll be able to incapacitate any foe in seconds...", "I must pierce armor for maximum damage...", "I don't think this would combine with other martial arts...", "Become one with the carp...", "Glub...")
+ remarks = list("Wait, a high protein diet is really all it takes to become bulletproof...?", "Overwhelming force, immovable object...", "Focus... And you'll be able to overwhelm any foe in seconds...", "I never thought about just blocking the bullets...", "I don't think this would combine with other martial arts...", "Become one with my armor...", "Tink...")
/obj/item/book/granter/martial/carp/onlearned(mob/living/carbon/user)
..()
@@ -1044,7 +1044,8 @@
traitname = "explosive crafting"
remarks = list("If you want to get started making bombs, you're going to need a lot of igniters and black powder.", "Did a Follower write this book, or something?", "All thermite takes is some aluminum and iron.", "Coconut shells make acceptable grenade casings in a pinch.")
crafting_recipe_types = list(/datum/crafting_recipe/frag_shrapnel, /datum/crafting_recipe/stinger, /datum/crafting_recipe/flashbang,
-/datum/crafting_recipe/smokebomb, /datum/crafting_recipe/rocket_base, /datum/crafting_recipe/weakrocket)
+ /datum/crafting_recipe/smokebomb, /datum/crafting_recipe/explosive/shrapnelmine, /datum/crafting_recipe/explosive/stingmine, /datum/crafting_recipe/explosive/stunmine,
+ /datum/crafting_recipe/rocket_base, /datum/crafting_recipe/weakrocket)
/obj/item/book/granter/trait/explosives_advanced
name = "Advanced Techniques for Winning at Postal Chess"
@@ -1054,7 +1055,7 @@
traitname = "advanced explosive crafting"
remarks = list("Is this actually a legal chess move...?", "If you hook electronic parts up to a flux capacitor-oh, that makes a lot of sense, actually.", "Radium? What would you use radium f-oh no.", "Why would anyone actually publish this?")
crafting_recipe_types = list(/datum/crafting_recipe/incendiary, /datum/crafting_recipe/concussion, /datum/crafting_recipe/radgrenade, /datum/crafting_recipe/empgrenade, /datum/crafting_recipe/incendiaryrocket, /datum/crafting_recipe/strongrocket, /datum/crafting_recipe/frag_shrapnel, /datum/crafting_recipe/stinger, /datum/crafting_recipe/flashbang,
-/datum/crafting_recipe/smokebomb, /datum/crafting_recipe/rocket_base, /datum/crafting_recipe/weakrocket)
+/datum/crafting_recipe/smokebomb, /datum/crafting_recipe/explosive/shrapnelmine, /datum/crafting_recipe/explosive/stingmine, /datum/crafting_recipe/explosive/stunmine, /datum/crafting_recipe/explosive/pulsemine, /datum/crafting_recipe/explosive/explomine, /datum/crafting_recipe/rocket_base, /datum/crafting_recipe/weakrocket)
/obj/item/book/granter/trait/gunslinger
name = "Tycho: Life of a Lawman"
diff --git a/code/game/objects/items/loadout_beacons.dm b/code/game/objects/items/loadout_beacons.dm
index 9ec837961c7..17bfffb2db1 100644
--- a/code/game/objects/items/loadout_beacons.dm
+++ b/code/game/objects/items/loadout_beacons.dm
@@ -817,10 +817,6 @@ GLOBAL_LIST_EMPTY(loadout_boxes)
/obj/item/storage/box/gun/melee/pitchfork/PopulateContents()
new /obj/item/pitchfork(src)
-/obj/item/storage/box/gun/melee/chainsaw
- name = "chainsaw case"
- w_class = WEIGHT_CLASS_BULKY
-
/obj/item/storage/box/gun/melee/chainsaw/PopulateContents()
new /obj/item/twohanded/chainsaw(src)
@@ -860,9 +856,6 @@ GLOBAL_LIST_EMPTY(loadout_boxes)
/obj/item/storage/box/gun/melee/oldkanobo/PopulateContents()
new /obj/item/melee/coyote/oldkanobo(src)
-/obj/item/storage/box/gun/melee/mauler/PopulateContents()
- new /obj/item/melee/coyote/mauler(src)
-
/obj/item/storage/box/gun/melee/club/PopulateContents()
new /obj/item/melee/coyote/club(src)
@@ -1217,18 +1210,6 @@ GLOBAL_LIST_EMPTY(loadout_boxes)
/obj/item/storage/box/gun/tribal/forgedmachete/PopulateContents()
new /obj/item/melee/onehanded/machete/forgedmachete(src)
-/obj/item/storage/box/gun/tribal/bmprsword
- name = "bumpersword case"
-
-/obj/item/storage/box/gun/tribal/bmprsword/PopulateContents()
- new /obj/item/twohanded/fireaxe/bmprsword(src)
-
-/obj/item/storage/box/gun/tribal/warmace
- name = "warmace case"
-
-/obj/item/storage/box/gun/tribal/warmace/PopulateContents()
- new /obj/item/twohanded/sledgehammer/warmace(src)
-
/obj/item/storage/box/gun/tribal/spearquiver
name = "spear quiver case"
@@ -1309,6 +1290,13 @@ GLOBAL_LIST_EMPTY(loadout_boxes)
new /obj/item/gun/energy/laser/pistol/worn(src)
new /obj/item/stock_parts/cell/ammo/ec(src)
+/obj/item/storage/box/gun/energy/wornplasmapistol
+ name = "worn Plasma Pistol case"
+
+/obj/item/storage/box/gun/energy/wornplasmapistol/PopulateContents()
+ new /obj/item/gun/energy/laser/plasma/pistol/worn(src)
+ new /obj/item/stock_parts/cell/ammo/ec(src)
+
/obj/item/choice_beacon/box/gun //template for sprites
name = "weapon case"
desc = "a sturdy case keeping your weapon of choice safe until you pop it open."
@@ -1370,6 +1358,12 @@ GLOBAL_LIST_EMPTY(loadout_boxes)
entry_class = LOADOUT_CAT_ENERGY
spawn_thing = /obj/item/storage/box/gun/energy/wornaep7
+/datum/loadout_box/wornplasmapistol
+ entry_tag = "Worn Plasma Pistol"
+ entry_flags = LOADOUT_FLAG_WASTER
+ entry_class = LOADOUT_CAT_ENERGY
+ spawn_thing = /obj/item/storage/box/gun/energy/wornplasmapistol
+
/// Fancyguns
/datum/loadout_box/beretta_auto
@@ -1888,12 +1882,6 @@ GLOBAL_LIST_EMPTY(loadout_boxes)
entry_class = LOADOUT_CAT_MELEE_TWO
spawn_thing = /obj/item/storage/box/gun/melee/pitchfork
-/datum/loadout_box/chainsaw
- entry_tag = "Chainsaw"
- entry_flags = LOADOUT_FLAG_WASTER
- entry_class = LOADOUT_CAT_MELEE_TWO
- spawn_thing = /obj/item/storage/box/gun/melee/chainsaw
-
/datum/loadout_box/oldclaymore //FOR SCOTLAND
entry_tag = "Old Claymore"
entry_flags = LOADOUT_FLAG_WASTER
@@ -1948,12 +1936,6 @@ GLOBAL_LIST_EMPTY(loadout_boxes)
entry_class = LOADOUT_CAT_MELEE_TWO
spawn_thing = /obj/item/melee/coyote/crudeblade
-/datum/loadout_box/mauler
- entry_tag = "Mauler"
- entry_flags = LOADOUT_FLAG_WASTER
- entry_class = LOADOUT_CAT_MELEE_TWO
- spawn_thing = /obj/item/melee/coyote/mauler
-
/datum/loadout_box/club
entry_tag = "Club"
entry_flags = LOADOUT_FLAG_WASTER
@@ -2034,18 +2016,6 @@ GLOBAL_LIST_EMPTY(loadout_boxes)
entry_class = LOADOUT_CAT_MELEE_ONE
spawn_thing = /obj/item/storage/box/gun/tribal/forgedmachete
-/datum/loadout_box/bmprsword
- entry_tag = "Bumper Sword"
- entry_flags = LOADOUT_FLAG_TRIBAL
- entry_class = LOADOUT_CAT_MELEE_TWO
- spawn_thing = /obj/item/storage/box/gun/tribal/bmprsword
-
-/datum/loadout_box/warmace
- entry_tag = "Warmace"
- entry_flags = LOADOUT_FLAG_TRIBAL
- entry_class = LOADOUT_CAT_MELEE_TWO
- spawn_thing = /obj/item/storage/box/gun/tribal/warmace
-
/datum/loadout_box/spear_quiver
entry_tag = "Spear Quiver"
entry_flags = LOADOUT_FLAG_TRIBAL
@@ -2080,14 +2050,6 @@ GLOBAL_LIST_EMPTY(loadout_boxes)
spawn_thing = /obj/item/storage/box/gun/bow/crossbow
*/
-/// Preacher Stuff
-
-/datum/loadout_box/nullrod
- entry_tag = "Spiritual Device"
- entry_flags = LOADOUT_FLAG_PREACHER
- entry_class = LOADOUT_CAT_NULLROD
- spawn_thing = /obj/item/storage/box/gun/preacher/nullrod
-
/// misc Stuff
/datum/loadout_box/dynamite
diff --git a/code/game/objects/items/melee/coyotemelee.dm b/code/game/objects/items/melee/coyotemelee.dm
index 3e9e3cf2a54..4f2e6820355 100644
--- a/code/game/objects/items/melee/coyotemelee.dm
+++ b/code/game/objects/items/melee/coyotemelee.dm
@@ -238,7 +238,7 @@
flags_1 = CONDUCT_1
slot_flags = ITEM_SLOT_BACK
force = 10 //Needs to be wielded
- force_wielded = 65
+ force_wielded = 60
throwforce = 25
wound_bonus = 20
bare_wound_bonus = 10
diff --git a/code/game/objects/items/melee/f13onehanded.dm b/code/game/objects/items/melee/f13onehanded.dm
index eb17b0042f4..5651b6c1806 100644
--- a/code/game/objects/items/melee/f13onehanded.dm
+++ b/code/game/objects/items/melee/f13onehanded.dm
@@ -903,7 +903,7 @@ obj/item/melee/unarmed/punchdagger/cyborg
icon_state = "entrenching_tool"
item_state = "trench"
w_class = WEIGHT_CLASS_NORMAL
- force = 30
+ force = 35
throwforce = 15
toolspeed = 0.7
sharpness = SHARP_EDGED
diff --git a/code/game/objects/items/melee/f13powerfist.dm b/code/game/objects/items/melee/f13powerfist.dm
index 14a72c7c44d..01e8662bb4e 100644
--- a/code/game/objects/items/melee/f13powerfist.dm
+++ b/code/game/objects/items/melee/f13powerfist.dm
@@ -12,7 +12,7 @@
righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi'
flags_1 = CONDUCT_1
attack_verb = list("whacked", "fisted", "power-punched")
- force = 30 //needs more hefty damage to be worthwhile outside pvp. will have to test
+ force = 45
throwforce = 10
throw_range = 3
w_class = WEIGHT_CLASS_NORMAL
diff --git a/code/game/objects/items/melee/f13twohanded.dm b/code/game/objects/items/melee/f13twohanded.dm
index 53c089644dc..82f29b64840 100644
--- a/code/game/objects/items/melee/f13twohanded.dm
+++ b/code/game/objects/items/melee/f13twohanded.dm
@@ -44,7 +44,7 @@
icon_prefix = "legionaxe"
force = 30
throwforce = 15
- wound_bonus = 10
+ wound_bonus = 20
bare_wound_bonus = 10
sharpness = SHARP_EDGED
resistance_flags = FIRE_PROOF
@@ -52,7 +52,7 @@
hitsound = 'sound/weapons/bladeslice.ogg'
wielded_icon = "legionaxe2"
force_unwielded = 30
- force_wielded = 65
+ force_wielded = 50
attack_speed = CLICK_CD_MELEE * 1.3 //10.4
/obj/item/twohanded/legionaxe/ComponentInitialize()
@@ -88,7 +88,7 @@
icon_prefix = "fireaxe"
force = 28
throwforce = 15
- wound_bonus = 10
+ wound_bonus = 15
bare_wound_bonus = 10
sharpness = SHARP_EDGED
resistance_flags = FIRE_PROOF
@@ -96,7 +96,7 @@
hitsound = 'sound/weapons/bladeslice.ogg'
wielded_icon = "fireaxe2"
force_unwielded = 28
- force_wielded = 55
+ force_wielded = 43
attack_speed = CLICK_CD_MELEE * 1.25 //10
/obj/item/twohanded/fireaxe/ComponentInitialize()
@@ -160,7 +160,9 @@
desc = "It was too big to be called a sword. Massive, thick, heavy, and far too rough. Indeed, it was more like a heap of raw iron."
icon_prefix = "bumper"
icon_state = "bumper"
- wound_bonus = null
+ force_unwielded = 25
+ force_wielded = 48
+ wound_bonus = 10
sharpness = SHARP_EDGED
resistance_flags = null
wielded_icon = "bumper2"
@@ -191,7 +193,7 @@
icon_state = "spear-metal"
icon_prefix = "spear-metal"
force = 13
- throwforce = 30
+ throwforce = 40
throw_speed = 4
embedding = list("embed_chance" = 0)
max_reach = 2
@@ -204,7 +206,7 @@
bare_wound_bonus = 15
wielded_icon = "spear-metal2"
force_unwielded = 13
- force_wielded = 32
+ force_wielded = 35
var/obj/item/grenade/explosive = null
var/war_cry = "AAAAARGH!!!"
@@ -293,7 +295,7 @@
wielded_icon = "spear-lance2"
force = 25
force_unwielded = 25
- force_wielded = 40
+ force_wielded = 42
// Scrap spear Keywords: Damage 17/28, Reach, Throw bonus
/obj/item/twohanded/spear/scrapspear
@@ -393,11 +395,11 @@
icon_prefix = "baseballspike"
force = 26
throwforce = 15
- wound_bonus = 5
+ wound_bonus = 10
sharpness = SHARP_POINTY
wielded_icon = "baseballspike2"
force_unwielded = 26
- force_wielded = 40
+ force_wielded = 39
/obj/item/twohanded/baseball/spiked/attack(mob/living/M, mob/living/user)
. = ..()
@@ -433,7 +435,7 @@
wielded_icon = "golfclub2"
force = 22
force_unwielded = 22
- force_wielded = 32
+ force_wielded = 35
/obj/item/twohanded/baseball/golfclub/attack(mob/living/M, mob/living/user)
. = ..()
@@ -470,7 +472,7 @@
icon_prefix = "hammer-sledge"
var/qualitymod = 0
wielded_icon = "hammer-sledge2"
- force_wielded = 65
+ force_wielded = 45
/obj/item/twohanded/sledgehammer/simple/afterattack(atom/A, mob/living/user, proximity)
. = ..()
@@ -505,7 +507,7 @@
hitsound = 'sound/items/welder2.ogg'
wielded_icon = "thermiclance2"
force_unwielded = 5
- force_wielded = 69
+ force_wielded = 65
/obj/item/twohanded/thermic_lance/afterattack(atom/A, mob/living/user, proximity)
. = ..()
@@ -567,7 +569,7 @@
force = 25
wielded_icon = "hammer-super2"
force_unwielded = 25
- force_wielded = 68
+ force_wielded = 56
/obj/item/twohanded/sledgehammer/supersledge/afterattack(atom/A, mob/living/user, proximity)
. = ..()
@@ -600,7 +602,7 @@
var/sound = "sound/f13effects/explosion_distant_2.ogg"
wielded_icon = "hammer-rocket2"
force_unwielded = 20
- force_wielded = 56
+ force_wielded = 60
/obj/item/twohanded/sledgehammer/rockethammer/ComponentInitialize()
. = ..()
@@ -668,11 +670,11 @@
icon_prefix = "hammer-war"
force = 25
throwforce = 20
- armour_penetration = 0.2
+ armour_penetration = 0.1
attack_verb = list("bashed", "pounded", "bludgeoned", "pummeled", "thrashed")
wielded_icon = "hammer-war2"
force_unwielded = 34
- force_wielded = 55
+ force_wielded = 48
attack_speed = CLICK_CD_MELEE
// Shaman staff Keywords: Damage 15/30, Big stamina damage buff
@@ -747,7 +749,7 @@
hitsound = 'sound/weapons/chainsawhit.ogg'
wielded_icon = "chainsaw2"
force_unwielded = 8
- force_wielded = 55
+ force_wielded = 51
/obj/item/twohanded/chainsaw/ComponentInitialize()
. = ..()
diff --git a/code/game/objects/items/melee/misc.dm b/code/game/objects/items/melee/misc.dm
index 71a309694e9..adcb18af67d 100644
--- a/code/game/objects/items/melee/misc.dm
+++ b/code/game/objects/items/melee/misc.dm
@@ -160,14 +160,14 @@
REMOVE_TRAIT(src, TRAIT_NODROP, SABRE_SUICIDE_TRAIT)
/obj/item/melee/rapier
- name = "plastitanium rapier"
- desc = "A thin blade made of plastitanium with a diamond tip. It appears to be coated in a persistent layer of an unknown substance."
+ name = "titanium rapier"
+ desc = "A thin blade made of titanium with a diamond tip. It appears to be coated in a persistent layer of an unknown substance."
icon = 'icons/obj/items_and_weapons.dmi'
icon_state = "rapier"
item_state = "rapier"
lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
- force = 15
+ force = 25
throwforce = 25
armour_penetration = 1
flags_1 = CONDUCT_1
diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm
index f1b0bee63fe..e78509f7a6e 100755
--- a/code/game/objects/items/storage/belt.dm
+++ b/code/game/objects/items/storage/belt.dm
@@ -105,7 +105,7 @@
new /obj/item/weldingtool/basic(src)
new /obj/item/wirecutters/basic(src)
new /obj/item/melee/smith/hammer/premade(src)
- new /obj/item/twohanded/chainsaw(src)
+ new /obj/item/twohanded/steelsaw(src)
/obj/item/storage/belt/durathread
name = "durathread toolbelt"
diff --git a/code/game/objects/items/stunbaton.dm b/code/game/objects/items/stunbaton.dm
index ead53cdc40f..49cc2147097 100644
--- a/code/game/objects/items/stunbaton.dm
+++ b/code/game/objects/items/stunbaton.dm
@@ -9,18 +9,18 @@
lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi'
slot_flags = ITEM_SLOT_BELT
- force = 30
+ force = 20
throwforce = 21
w_class = WEIGHT_CLASS_NORMAL
attack_verb = list("beaten")
armor = ARMOR_VALUE_GENERIC_ITEM
attack_speed = CLICK_CD_MELEE
- var/stamforce = 35
+ var/stamforce = 25
var/turned_on = FALSE
var/knockdown = TRUE
var/obj/item/stock_parts/cell/cell
- var/hitcost = 750
+ var/hitcost = 1500
var/throw_hit_chance = 35
var/preload_cell_type //if not empty the baton starts with this type of cell
diff --git a/code/modules/clothing/head/f13head.dm b/code/modules/clothing/head/f13head.dm
index d7d30599afc..3bc22369887 100644
--- a/code/modules/clothing/head/f13head.dm
+++ b/code/modules/clothing/head/f13head.dm
@@ -750,6 +750,14 @@
icon_state = "price_ranger"
item_state = "price_ranger"
+/obj/item/clothing/head/helmet/f13/ncr/rangercombat/zealot
+ name = "Zealot's Mask"
+ desc = "Dominus illuminatio mea"
+ icon_state = "zealot_ranger"
+ item_state = "zealot_ranger"
+ mob_overlay_icon = 'icons/fallout/onmob/clothes/head.dmi'
+ icon = 'icons/fallout/onmob/clothes/head.dmi'
+
/obj/item/clothing/head/helmet/f13/ncr/rangercombat/foxcustom
name = "reclaimed ranger-hunter combat helmet"
desc = "A reclaimed Ranger-Hunter centurion helmet, carefully and lovingly restored to working condition with a sniper's veil wrapped around the neck. 'DE OPPRESSO LIBER' is stenciled on the front."
diff --git a/code/modules/clothing/suits/arfsuits.dm b/code/modules/clothing/suits/arfsuits.dm
index 0dff20eeadc..c6682872074 100644
--- a/code/modules/clothing/suits/arfsuits.dm
+++ b/code/modules/clothing/suits/arfsuits.dm
@@ -2101,6 +2101,15 @@
icon_state = "hosbluejacket"
item_state = "hosbluejacket"
+/obj/item/clothing/suit/armor/medium/duster/zealot
+ name = "Zealot's Duster"
+ desc = "Dominus fortitudo nostra"
+ icon_state = "zealot_riot"
+ item_state = "zealot_riot"
+ mob_overlay_icon = 'icons/fallout/onmob/clothes/armor_medium.dmi'
+ icon = 'icons/fallout/onmob/clothes/armor_medium.dmi'
+ slowdown = ARMOR_SLOWDOWN_HEAVY * ARMOR_SLOWDOWN_LESS_T2 * ARMOR_SLOWDOWN_GLOBAL_MULT
+
/obj/item/clothing/suit/armor/medium/duster/trenchcoat
name = "armored trenchcoat"
desc = "A trenchcoat enhanced with a special lightweight kevlar. The epitome of tactical plainclothes."
diff --git a/code/modules/jobs/job_types/bos.dm b/code/modules/jobs/job_types/bos.dm
index 9511347b1b8..914b90b96a2 100644
--- a/code/modules/jobs/job_types/bos.dm
+++ b/code/modules/jobs/job_types/bos.dm
@@ -159,18 +159,19 @@ Paladin Commander
title = "Head Paladin"
flag = F13PALADINCOMMANDER
head_announce = list("Security")
- total_positions = 0
- spawn_positions = 0
+ total_positions = 1
+ spawn_positions = 1
description = "You are the acting field commander until the Brotherhood regains its strength enough to place an Elder for the bunker. You are a veteran of many battles and sorties in pursuit of Brotherhood goals; your only weakness may just be your hubris. Your main goals are defense of the Chapter and surveillance of the surrounding region for technology."
supervisors = "the Elders"
selection_color = "#7f8c8d"
display_order = JOB_DISPLAY_ORDER_COMMANDER
outfit = /datum/outfit/job/bos/f13commander
- exp_requirements = 2400
+ exp_requirements = 1900
loadout_options = list(
- /datum/outfit/loadout/sentheavy, //Gauss + Glock
- /datum/outfit/loadout/sentmini //Minigun
+ /datum/outfit/loadout/hpaladinfrontline,
+ /datum/outfit/loadout/hpaladinsupport,
+ /datum/outfit/loadout/hpaladinmelee,
)
min_required_special = list(
@@ -214,31 +215,40 @@ Paladin Commander
glasses = /obj/item/clothing/glasses/sunglasses
mask = /obj/item/clothing/mask/gas/sechailer
ears = /obj/item/radio/headset/headset_bos/command
- suit = /obj/item/clothing/suit/armor/power_armor/t51b
- head = /obj/item/clothing/head/helmet/f13/power_armor/t51b
+ suit = /obj/item/clothing/suit/armor/power_armor/t51b/bos
+ head = /obj/item/clothing/head/helmet/f13/power_armor/t51b/bos
neck = /obj/item/clothing/neck/mantle/bos/paladin
backpack_contents = list(
/obj/item/melee/onehanded/knife/hunting = 1,
- /obj/item/melee/powerfist/f13 = 1,
/obj/item/gun/ballistic/automatic/pistol/n99/crusader = 1,
/obj/item/ammo_box/magazine/m10mm/adv/simple = 2,
- /obj/item/reagent_containers/hypospray/medipen/stimpak = 6,
+ /obj/item/reagent_containers/hypospray/medipen/stimpak = 4,
)
-/datum/outfit/loadout/sentheavy
- name = "Heavy Paladin Commander"
+/datum/outfit/loadout/hpaladinfrontline
+ name = "Senior Frontline Paladin"
backpack_contents = list(
- /obj/item/gun/ballistic/automatic/m72 = 1,
- /obj/item/ammo_box/magazine/m2mm = 3
+ /obj/item/gun/energy/laser/aer12 = 1,
+ /obj/item/stock_parts/cell/ammo/mfc = 5,
+ /obj/item/grenade/plastic/x4 = 1
)
-/datum/outfit/loadout/sentmini
- name = "Minigun Paladin Commander"
+
+/datum/outfit/loadout/hpaladinsupport
+ name = "Senior Support Paladin"
backpack_contents = list(
- /obj/item/minigunpackbal5mm = 1,
+ /obj/item/gun/energy/laser/plasma/glock = 1,
+ /obj/item/stock_parts/cell/ammo/ec = 5,
+ /obj/item/grenade/f13/plasma = 1
)
+/datum/outfit/loadout/hpaladinmelee
+ name = "Melee Master"
+ backpack_contents = list(
+ /obj/item/melee/powerfist/f13 = 1,
+ /obj/item/restraints/legcuffs/bola/tactical = 2
+ )
/*
Proctor
@@ -447,12 +457,13 @@ Paladin
display_order = JOB_DISPLAY_ORDER_PALADIN
outfit = /datum/outfit/job/bos/f13paladin
exp_requirements = 1200
-/*
+
loadout_options = list(
- /datum/outfit/loadout/paladina, //Minigun
- /datum/outfit/loadout/paladind //Sledge and fists
+ /datum/outfit/loadout/paladinfrontline,
+ /datum/outfit/loadout/paladinsupport,
+ /datum/outfit/loadout/paladinmelee,
)
-*/
+
access = list(ACCESS_ROBOTICS, ACCESS_BOS, ACCESS_ENGINE_EQUIP, ACCESS_ENGINE, ACCESS_HYDROPONICS, ACCESS_KITCHEN, ACCESS_BAR, ACCESS_SEC_DOORS)
minimal_access = list(ACCESS_ROBOTICS, ACCESS_BOS, ACCESS_ENGINE_EQUIP, ACCESS_ENGINE, ACCESS_HYDROPONICS, ACCESS_KITCHEN, ACCESS_BAR, ACCESS_SEC_DOORS)
matchmaking_allowed = list(
@@ -483,9 +494,8 @@ Paladin
/datum/outfit/job/bos/f13paladin
name = "Paladin"
jobtype = /datum/job/bos/f13paladin
- suit = /obj/item/clothing/suit/armor/power_armor/t45d
- suit_store = /obj/item/gun/energy/laser/aer12
- head = /obj/item/clothing/head/helmet/f13/power_armor/t45d
+ suit = /obj/item/clothing/suit/armor/power_armor/t45d/bos
+ head = /obj/item/clothing/head/helmet/f13/power_armor/t45d/bos
uniform = /obj/item/clothing/under/f13/recon
belt = /obj/item/storage/belt/army/assault
mask = /obj/item/clothing/mask/gas/sechailer
@@ -495,22 +505,27 @@ Paladin
/obj/item/melee/onehanded/knife/hunting = 1,
/obj/item/stock_parts/cell/ammo/mfc = 5
)
-/*
-/datum/outfit/loadout/paladina
- name = "Firesupport Paladin"
+
+/datum/outfit/loadout/paladinfrontline
+ name = "Frontline Paladin"
backpack_contents = list(
- /obj/item/minigunpackbal5mm = 1,
- /obj/item/clothing/accessory/bos/paladin = 1
+ /obj/item/gun/energy/laser/aer12 = 1,
+ /obj/item/stock_parts/cell/ammo/mfc = 5
+ )
+
+
+/datum/outfit/loadout/paladinsupport
+ name = "Support Paladin"
+ backpack_contents = list(
+ /obj/item/gun/energy/laser/plasma/glock = 1,
+ /obj/item/stock_parts/cell/ammo/ec = 5
)
-/datum/outfit/loadout/paladind
+/datum/outfit/loadout/paladinmelee
name = "Melee Specialist"
backpack_contents = list(
- /obj/item/melee/powerfist/f13 = 1,
- /obj/item/twohanded/sledgehammer/supersledge = 1,
- /obj/item/clothing/accessory/bos/paladin = 1
- )
-*/
+ /obj/item/melee/powerfist/f13 = 1
+ )
/*
Senior Scribe
@@ -527,6 +542,12 @@ Senior Scribe
outfit = /datum/outfit/job/bos/f13seniorscribe
exp_requirements = 900
+ loadout_options = list(
+ /datum/outfit/loadout/sscribelaser,
+ /datum/outfit/loadout/sscribeplasma,
+ /datum/outfit/loadout/sscribeunarmed,
+ )
+
access = list(ACCESS_BROTHERHOOD_COMMAND, ACCESS_ROBOTICS, ACCESS_BOS, ACCESS_ENGINE_EQUIP, ACCESS_ENGINE, ACCESS_HYDROPONICS, ACCESS_KITCHEN, ACCESS_BAR, ACCESS_SEC_DOORS)
minimal_access = list(ACCESS_BROTHERHOOD_COMMAND, ACCESS_ROBOTICS, ACCESS_BOS, ACCESS_ENGINE_EQUIP, ACCESS_ENGINE, ACCESS_HYDROPONICS, ACCESS_KITCHEN, ACCESS_BAR, ACCESS_SEC_DOORS)
matchmaking_allowed = list(
@@ -558,7 +579,6 @@ Senior Scribe
shoes = /obj/item/clothing/shoes/combat
accessory = /obj/item/clothing/accessory/bos/seniorscribe
suit = /obj/item/clothing/suit/armor/light/duster/bos/scribe/seniorscribe
- suit_store = /obj/item/gun/ballistic/automatic/pistol/ninemil
glasses = /obj/item/clothing/glasses/sunglasses/big
backpack_contents = list(
/obj/item/ammo_box/magazine/m9mm = 2,
@@ -569,6 +589,29 @@ Senior Scribe
/obj/item/storage/box/bos/scribe/senior = 1
)
+/datum/outfit/loadout/sscribelaser
+ name = "Laser Commander"
+ backpack_contents = list(
+ /obj/item/gun/energy/laser/pistol = 1,
+ /obj/item/stock_parts/cell/ammo/ec = 3,
+ /obj/item/tool_upgrade/productivity/motor = 1
+ )
+
+/datum/outfit/loadout/sscribeplasma
+ name = "Plasma Spaz"
+ backpack_contents = list(
+ /obj/item/gun/energy/laser/plasma/pistol = 1,
+ /obj/item/stock_parts/cell/ammo/ec = 3,
+ /obj/item/tool_upgrade/reinforcement/plasmablock = 1
+ )
+
+/datum/outfit/loadout/sscribeunarmed
+ name = "Master"
+ backpack_contents = list(
+ /obj/item/melee/unarmed/sappers = 1,
+ /obj/item/book/granter/martial/krav_maga = 1
+ )
+
/*
Scribe
*/
@@ -585,8 +628,9 @@ Scribe
exp_requirements = 30
loadout_options = list(
- /datum/outfit/loadout/scribea, //Junior Scribe
- /datum/outfit/loadout/scribeb, //Scribe
+ /datum/outfit/loadout/scribelaser,
+ /datum/outfit/loadout/scribeplasma,
+ /datum/outfit/loadout/scribeunarmed,
)
access = list(ACCESS_ROBOTICS, ACCESS_BOS, ACCESS_ENGINE_EQUIP, ACCESS_ENGINE, ACCESS_HYDROPONICS, ACCESS_KITCHEN, ACCESS_BAR, ACCESS_SEC_DOORS)
@@ -617,24 +661,29 @@ Scribe
backpack_contents = list(
/obj/item/melee/onehanded/knife/survival = 1,
/obj/item/storage/firstaid/regular = 1,
- /obj/item/gun/energy/laser/pistol = 1,
/obj/item/reagent_containers/hypospray/medipen/stimpak = 3,
/obj/item/storage/box/bos/scribe = 1
)
-/datum/outfit/loadout/scribea
- name = "Junior Scribe"
+/datum/outfit/loadout/scribelaser
+ name = "Laser Fan"
backpack_contents = list(
- /obj/item/clothing/accessory/bos/juniorscribe = 1
+ /obj/item/gun/energy/laser/pistol = 1,
)
-/datum/outfit/loadout/scribeb
- name = "Scribe"
+/datum/outfit/loadout/scribeplasma
+ name = "Plasma Enthusiast"
backpack_contents = list(
- /obj/item/clothing/accessory/bos/scribe = 1
+ /obj/item/gun/energy/laser/plasma/pistol = 1,
)
+/datum/outfit/loadout/scribeunarmed
+ name = "Practicioner"
+ backpack_contents = list(
+ /obj/item/melee/unarmed/sappers
+ )
+
/datum/outfit/job/bos/f13scribe/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
..()
if(visualsOnly)
@@ -658,13 +707,13 @@ Senior Knight
display_order = JOB_DISPLAY_ORDER_SENIORKNIGHT
outfit = /datum/outfit/job/bos/f13seniorknight
exp_requirements = 900
-/*
+
loadout_options = list(
- /datum/outfit/loadout/sknightb, //Police Shotgun
- /datum/outfit/loadout/sknightc, //R93
- /datum/outfit/loadout/sknightd, //Pre-war Ripper
+ /datum/outfit/loadout/sknightsoldier,
+ /datum/outfit/loadout/sknightdefender,
+ /datum/outfit/loadout/sknightrecon,
)
-*/
+
access = list(ACCESS_BROTHERHOOD_COMMAND, ACCESS_ROBOTICS, ACCESS_BOS, ACCESS_ENGINE_EQUIP, ACCESS_ENGINE, ACCESS_HYDROPONICS, ACCESS_KITCHEN, ACCESS_BAR, ACCESS_SEC_DOORS)
minimal_access = list(ACCESS_BROTHERHOOD_COMMAND, ACCESS_ROBOTICS, ACCESS_BOS, ACCESS_ENGINE_EQUIP, ACCESS_ENGINE, ACCESS_HYDROPONICS, ACCESS_KITCHEN, ACCESS_BAR, ACCESS_SEC_DOORS)
matchmaking_allowed = list(
@@ -691,7 +740,6 @@ Senior Knight
name = "Senior Knight"
jobtype = /datum/job/bos/f13seniorknight
suit = /obj/item/clothing/suit/armor/medium/combat/brotherhood/senior
- suit_store = /obj/item/gun/energy/laser/aer9
accessory = /obj/item/clothing/accessory/bos/seniorknight
glasses = /obj/item/clothing/glasses/night
mask = /obj/item/clothing/mask/gas/sechailer
@@ -711,33 +759,31 @@ Senior Knight
/obj/item/book/granter/crafting_recipe/gunsmith_three = 1,
/obj/item/book/granter/crafting_recipe/gunsmith_four = 1,
)
-/*
-/datum/outfit/loadout/sknightb
- name = "Knight-Defender"
+
+/datum/outfit/loadout/sknightsoldier
+ name = "Senior Knight-Soldier"
backpack_contents = list(
- /obj/item/gun/ballistic/shotgun/police = 1,
- /obj/item/ammo_box/shotgun/buck = 2,
- /obj/item/gun/energy/laser/pistol = 1,
- /obj/item/stock_parts/cell/ammo/ec = 2
+ /obj/item/gun/energy/laser/aer9 = 1,
+ /obj/item/stock_parts/cell/ammo/mfc = 3,
+ /obj/item/grenade/f13/frag = 1
)
-/datum/outfit/loadout/sknightc
- name = "Recon"
+/datum/outfit/loadout/sknightdefender
+ name = "Senior Knight-Defender"
backpack_contents = list(
- /obj/item/gun/ballistic/automatic/r93 = 1,
- /obj/item/ammo_box/magazine/m556/rifle = 2,
- /obj/item/gun/energy/laser/pistol = 1,
- /obj/item/stock_parts/cell/ammo/ec = 2
+ /obj/item/gun/energy/laser/plasma = 1,
+ /obj/item/stock_parts/cell/ammo/mfc = 3,
+ /obj/item/grenade/f13/incendiary = 1
)
-/datum/outfit/loadout/sknightd
- name = "Knight-Sergeant-Cavalry"
+/datum/outfit/loadout/sknightrecon
+ name = "Senior Knight-Recon"
backpack_contents = list(
- /obj/item/clothing/accessory/bos/juniorknight = 1,
- /obj/item/melee/powered/ripper/prewar = 1,
- /obj/item/shield/riot/bullet_proof = 1
+ /obj/item/gun/energy/laser/wattz2k = 1,
+ /obj/item/stock_parts/cell/ammo/mfc = 3,
+ /obj/item/grenade/smokebomb = 1,
+ /obj/item/binoculars = 1
)
-*/
/*
Knight
@@ -754,6 +800,12 @@ Knight
outfit = /datum/outfit/job/bos/f13knight
exp_requirements = 300
+ loadout_options = list(
+ /datum/outfit/loadout/knightsoldier,
+ /datum/outfit/loadout/knightdefender,
+ /datum/outfit/loadout/knightrecon,
+ )
+
access = list(ACCESS_ROBOTICS, ACCESS_BOS, ACCESS_ENGINE_EQUIP, ACCESS_ENGINE, ACCESS_HYDROPONICS, ACCESS_KITCHEN, ACCESS_BAR, ACCESS_SEC_DOORS)
minimal_access = list(ACCESS_ROBOTICS, ACCESS_BOS, ACCESS_ENGINE_EQUIP, ACCESS_ENGINE, ACCESS_HYDROPONICS, ACCESS_KITCHEN, ACCESS_BAR, ACCESS_SEC_DOORS)
matchmaking_allowed = list(
@@ -785,7 +837,6 @@ Knight
name = "Knight"
jobtype = /datum/job/bos/f13knight
suit = /obj/item/clothing/suit/armor/medium/combat/brotherhood
- suit_store = /obj/item/gun/energy/laser/aer9
mask = /obj/item/clothing/mask/gas/sechailer
l_pocket = /obj/item/storage/belt/shoulderholster
belt = /obj/item/storage/belt/army/assault
@@ -801,25 +852,26 @@ Knight
/obj/item/book/granter/crafting_recipe/gunsmith_two = 1,
/obj/item/storage/box/bos = 1
)
-/*
-/datum/outfit/loadout/knighte
+
+/datum/outfit/loadout/knightsoldier
+ name = "Knight-Soldier"
+ backpack_contents = list(
+ /obj/item/gun/energy/laser/aer9 = 1
+ )
+
+/datum/outfit/loadout/knightdefender
name = "Knight-Defender"
backpack_contents = list(
- /obj/item/clothing/accessory/bos/knight = 1,
- /obj/item/gun/ballistic/automatic/r93 = 1,
- /obj/item/ammo_box/magazine/m556/rifle = 2,
- /obj/item/gun/ballistic/automatic/pistol/ninemil = 1,
- /obj/item/ammo_box/magazine/m9mm = 2
+ /obj/item/gun/energy/laser/plasma = 1
)
-/datum/outfit/loadout/knightf
- name = "Knight-Cavalry"
+/datum/outfit/loadout/knightrecon
+ name = "Knight-Recon"
backpack_contents = list(
- /obj/item/clothing/accessory/bos/knight = 1,
- /obj/item/melee/powered/ripper = 1,
- /obj/item/shield/riot/bullet_proof = 1
+ /obj/item/gun/energy/laser/wattz2k = 1,
+ /obj/item/binoculars = 1
)
-*/
+
/*
Initiate
@@ -838,6 +890,7 @@ Initiate
loadout_options = list(
/datum/outfit/loadout/initiatek, //Wattz and Engibelt with armor, helmet
+ /datum/outfit/loadout/initiatep,
/datum/outfit/loadout/initiates, //chem knowledge
)
@@ -872,13 +925,26 @@ Initiate
*/
/datum/outfit/loadout/initiatek
- name = "Knight-Aspirant"
+ name = "Laser Knight-Aspirant"
belt = /obj/item/storage/belt/utility
suit = /obj/item/clothing/suit/armor/medium/combat/brotherhood
head = /obj/item/clothing/head/helmet/f13/combat/brotherhood/initiate
backpack_contents = list(
- /obj/item/gun/energy/laser/aer9 = 1,
- /obj/item/stock_parts/cell/ammo/mfc = 2,
+ /obj/item/gun/ballistic/rifle/hobo/lasmusket = 1,
+ /obj/item/ammo_box/lasmusket = 2,
+ /obj/item/clothing/accessory/bos/initiateK = 1,
+ /obj/item/book/granter/crafting_recipe/gunsmith_one = 1,
+ /obj/item/book/granter/crafting_recipe/gunsmith_two = 1
+ )
+
+/datum/outfit/loadout/initiatep
+ name = "Plasma Knight-Aspirant"
+ belt = /obj/item/storage/belt/utility
+ suit = /obj/item/clothing/suit/armor/medium/combat/brotherhood
+ head = /obj/item/clothing/head/helmet/f13/combat/brotherhood/initiate
+ backpack_contents = list(
+ /obj/item/gun/ballistic/rifle/hobo/plasmacaster = 1,
+ /obj/item/ammo_box/plasmamusket = 2,
/obj/item/clothing/accessory/bos/initiateK = 1,
/obj/item/book/granter/crafting_recipe/gunsmith_one = 1,
/obj/item/book/granter/crafting_recipe/gunsmith_two = 1
@@ -893,5 +959,6 @@ Initiate
backpack_contents = list(
/obj/item/reagent_containers/hypospray/medipen/stimpak = 1,
/obj/item/book/granter/trait/chemistry = 1,
- /obj/item/clothing/accessory/bos/initiateS = 1
+ /obj/item/clothing/accessory/bos/initiateS = 1,
+ /obj/item/gun/energy/laser/wattz/magneto = 1
)
diff --git a/code/modules/jobs/job_types/eastwood.dm b/code/modules/jobs/job_types/eastwood.dm
index 9a7493c8d33..10388000ece 100644
--- a/code/modules/jobs/job_types/eastwood.dm
+++ b/code/modules/jobs/job_types/eastwood.dm
@@ -381,8 +381,8 @@ Mayor
title = "Deputy"
flag = F13DEPUTY
department_flag = DEP_EASTWOOD
- total_positions = 4
- spawn_positions = 4
+ total_positions = 2
+ spawn_positions = 2
supervisors = "The Sheriff"
description = "You are a loyal protector of Eastwood, keeping the settlement within firm control under the authority of the Mayor. The sheriff is your direct superior, and you should expect to take your day-to-day orders from them. Maintain your claim to authority by keeping the peace, managing disputes, and protecting the citizens from threats within and without. Never leave Eastwood undefended, and don't let its people die out."
enforces = "You may be elected temporary Sheriff if one does not exist. This may make you the stand-in leader of Eastwood if a Mayor or Secretary does not exist."
@@ -722,7 +722,7 @@ Mayor
/datum/outfit/loadout/rescueranger
name = "Search and Rescue"
backpack_contents = list(/obj/item/clothing/head/f13/police/sergeant = 1,
- /obj/item/gun/ballistic/shotgun/automatic/combat/auto5 = 1,
+ /obj/item/gun/ballistic/shotgun/hunting = 1,
/obj/item/ammo_box/shotgun/buck = 1,
/obj/item/clothing/suit/toggle/labcoat/paramedic = 1,
/obj/item/folder/white = 1,
diff --git a/code/modules/jobs/job_types/legion.dm b/code/modules/jobs/job_types/legion.dm
index 4829c1ae34a..5c3b14df0f3 100644
--- a/code/modules/jobs/job_types/legion.dm
+++ b/code/modules/jobs/job_types/legion.dm
@@ -240,7 +240,7 @@ Weapons Lever shotgun, Grease gun, Repeater carbines, Revolvers, simple guns al
box_two = /obj/item/storage/survivalkit/medical/tribal
backpack_contents = list(
/obj/item/restraints/legcuffs/bola = 1,
- // /obj/item/storage/bag/money/small/legion = 1,
+ /obj/item/storage/bag/money/small/legion = 1,
/obj/item/warpaint_bowl = 1,
/obj/item/ammo_box/a357 = 1,
/obj/item/gun/ballistic/revolver/colt357 = 1,
@@ -251,9 +251,9 @@ Weapons Lever shotgun, Grease gun, Repeater carbines, Revolvers, simple guns al
name = "Paladin-Slayer Centurion"
suit = /obj/item/clothing/suit/armor/legion/palacent
head = /obj/item/clothing/head/helmet/f13/legion/palacent
- suit_store = /obj/item/gun/ballistic/automatic/bar
+ suit_store = /obj/item/twohanded/chainsaw
backpack_contents = list(
- /obj/item/ammo_box/magazine/m308/ext = 3,
+ /obj/item/stack/crafting/armor_plate = 5
)
/datum/outfit/loadout/rangerhunter
@@ -299,10 +299,9 @@ Weapons Lever shotgun, Grease gun, Repeater carbines, Revolvers, simple guns al
minimal_access = list(ACCESS_LEGION, ACCESS_CHANGE_IDS, ACCESS_LEGION_COMMAND)
loadout_options = list(
- /datum/outfit/loadout/decvetbull, // Supersledge, Carl Gustaf, Smokebomb
- /datum/outfit/loadout/decvetwolf, // Thermic lance, Carl Gustaf, Extra Bitter
- /datum/outfit/loadout/decvetsnake, // Brush Gun + Scope, Ripper, Extra Bitters
- /datum/outfit/loadout/decvetbrave, // Lever-action Shotgun, 44 revolver, ballistic fist
+ /datum/outfit/loadout/decvetbull,
+ /datum/outfit/loadout/decvetsnake,
+ /datum/outfit/loadout/decvetbrave,
)
min_required_special = list(
@@ -336,50 +335,37 @@ Weapons Lever shotgun, Grease gun, Repeater carbines, Revolvers, simple guns al
/obj/item/ammo_box/a357 = 1,
/obj/item/gun/ballistic/revolver/colt357 = 1,
/obj/item/restraints/handcuffs = 1,
- // /obj/item/storage/bag/money/small/legofficers = 1,
+ /obj/item/storage/bag/money/small/legofficers = 1,
/obj/item/binoculars = 1,
)
/datum/outfit/loadout/decvetbull
name = "Mark of The Bull"
head = /obj/item/clothing/head/helmet/f13/legion/heavy
- suit_store = /obj/item/twohanded/sledgehammer/supersledge
backpack_contents = list(
- /obj/item/gun/ballistic/automatic/smg/cg45 = 1,
- /obj/item/ammo_box/magazine/cg45 = 2,
- /obj/item/grenade/smokebomb = 1,
- )
-
-/datum/outfit/loadout/decvetwolf
- name = "Mark of the Wolf"
- head = /obj/item/clothing/head/helmet/f13/legion/vet/decan
- suit_store = /obj/item/twohanded/thermic_lance
- backpack_contents = list(
- /obj/item/melee/onehanded/machete/spatha = 1,
- /obj/item/gun/ballistic/automatic/smg/cg45 = 1,
- /obj/item/ammo_box/magazine/cg45 = 2,
- /obj/item/reagent_containers/pill/bitterdrink = 2,
+ /obj/item/twohanded/fireaxe/bmprsword = 1,
+ /obj/item/restraints/legcuffs/bola/tactical = 3,
+ /obj/item/stack/crafting/armor_plate = 5
)
/datum/outfit/loadout/decvetsnake
name = "Mark of the Snake"
head = /obj/item/clothing/head/helmet/f13/legion/vet/decan
- suit_store = /obj/item/gun/ballistic/rifle/repeater/brush
backpack_contents = list(
- /obj/item/melee/powered/ripper = 1,
- /obj/item/ammo_box/tube/c4570 = 3,
- /obj/item/gun_upgrade/scope/watchman = 1,
- /obj/item/reagent_containers/pill/bitterdrink = 2,
+ /obj/item/gun/ballistic/bow/crossbow = 1,
+ /obj/item/storage/bag/tribe_quiver/full = 1,
+ /obj/item/stack/arrowhead/explosive = 5
)
/datum/outfit/loadout/decvetbrave
name = "Mark of the Brave"
head = /obj/item/clothing/head/helmet/f13/legion/vet/decan
- suit_store = /obj/item/gun/ballistic/shotgun/automatic/combat/shotgunlever
+ suit_store = /obj/item/gun/ballistic/shotgun/automatic/combat/auto5
backpack_contents = list(
- /obj/item/gun/ballistic/revolver/ballisticfist = 1,
/obj/item/ammo_box/shotgun/buck = 2,
- /obj/item/gun/ballistic/revolver/m29 = 1,
+ /obj/item/ammo_box/shotgun/slug = 2,
+ /obj/item/ammo_box/shotgun/incendiary = 2,
+ /obj/item/gun/ballistic/revolver/m29 = 1
)
@@ -439,7 +425,7 @@ Weapons Lever shotgun, Grease gun, Repeater carbines, Revolvers, simple guns al
box = /obj/item/storage/survivalkit/tribal/chief
backpack_contents = list(
/obj/item/melee/onehanded/machete/gladius = 1,
- // /obj/item/storage/bag/money/small/legofficers = 1,
+ /obj/item/storage/bag/money/small/legofficers = 1,
/obj/item/grenade/smokebomb = 1,
/obj/item/binoculars = 1,
/obj/item/reagent_containers/pill/bitterdrink = 1,
@@ -447,34 +433,27 @@ Weapons Lever shotgun, Grease gun, Repeater carbines, Revolvers, simple guns al
/datum/outfit/loadout/decprimfront
name = "Aspiring Prime Decanus"
- suit_store = /obj/item/twohanded/spear/lance
+ suit_store = /obj/item/twohanded/baseball/louisville
backpack_contents = list(
- /obj/item/ammo_box/shotgun/buck = 2,
- /obj/item/gun/ballistic/revolver/m29 = 1,
- /obj/item/ammo_box/m44 = 3,
- /obj/item/restraints/legcuffs/bola = 1,
- /obj/item/melee/onehanded/knife/throwing = 2,
- /obj/item/gun/ballistic/shotgun/automatic/combat/shotgunlever = 1
+ /obj/item/restraints/legcuffs/bola/tactical = 3,
+ /obj/item/stack/crafting/armor_plate = 5
)
/datum/outfit/loadout/decprimrear
name = "Battleborn Prime Decanus"
+ suit_store = /obj/item/gun/ballistic/rifle/repeater/trail/tribal
backpack_contents = list(
- /obj/item/shield/riot/legion = 1,
- /obj/item/gun/ballistic/revolver/ballisticfist = 1,
- /obj/item/ammo_box/shotgun/buck = 2,
- /obj/item/restraints/legcuffs/bola = 1,
+ /obj/item/ammo_box/tube/m44 = 3,
+ /obj/item/grenade/f13/incendiary = 1
)
/datum/outfit/loadout/decprimboom
name = "Loud Prime Decanus"
- suit_store = /obj/item/gun/ballistic/revolver/grenadelauncher
+ suit_store = /obj/item/gun/ballistic/revolver/m29
backpack_contents = list(
- /obj/item/ammo_box/a40mm = 2,
- /obj/item/gun/ballistic/revolver/m29 = 1,
- /obj/item/ammo_box/m44 = 3,
- /obj/item/grenade/f13/frag = 2,
- /obj/item/grenade/homemade/coffeepotbomb = 1,
+ /obj/item/ammo_box/m44 = 1,
+ /obj/item/storage/box/dynamite_box = 4,
+ /obj/item/storage/belt/bandolier = 1
)
@@ -494,8 +473,9 @@ Weapons Lever shotgun, Grease gun, Repeater carbines, Revolvers, simple guns al
exp_requirements = 300
loadout_options = list(
- /datum/outfit/loadout/recdeclegion, // Uzi, Bumper sword, Smokebomb
- /datum/outfit/loadout/recdectribal, // Unique Trail Carbine, Throwing spears, Reinforced machete, Bottlecap mine
+ /datum/outfit/loadout/recdeclegion,
+ /datum/outfit/loadout/recdectribal,
+ /datum/outfit/loadout/recdecbrigand,
)
matchmaking_allowed = list(
@@ -531,33 +511,38 @@ Weapons Lever shotgun, Grease gun, Repeater carbines, Revolvers, simple guns al
backpack_contents = list(
/obj/item/reagent_containers/pill/patch/healpoultice = 1,
/obj/item/restraints/handcuffs = 1,
- // /obj/item/storage/bag/money/small/legofficers = 1,
+ /obj/item/storage/bag/money/small/legofficers = 1,
)
/datum/outfit/loadout/recdeclegion
name = "Frontier Decanus"
- suit_store = /obj/item/twohanded/fireaxe/bmprsword
+ suit_store = /obj/item/twohanded/spear/lance
backpack_contents = list(
- /obj/item/grenade/smokebomb = 1,
- /obj/item/restraints/legcuffs/bola = 1,
- /obj/item/gun/ballistic/automatic/smg/mini_uzi = 1,
- /obj/item/ammo_box/magazine/uzim9mm = 3,
- /obj/item/stack/crafting/armor_plate = 5,
+ /obj/item/bottlecap_mine = 1,
+ /obj/item/storage/backpack/spearquiver = 1,
+ /obj/item/restraints/legcuffs/bola = 3
)
/datum/outfit/loadout/recdectribal
- name = "Blackliner Decanus"
- suit_store = /obj/item/gun/ballistic/rifle/repeater/trail/tribal
+ name = "Backliner Decanus"
+ suit_store = /obj/item/gun/ballistic/rifle/repeater/cowboy/tribal
backpack_contents = list(
- /obj/item/ammo_box/m44box = 2,
- /obj/item/melee/onehanded/machete/forgedmachete = 1,
- /obj/item/storage/backpack/spearquiver = 1,
- /obj/item/bottlecap_mine = 1,
- /obj/item/warpaint_bowl = 1,
+ /obj/item/ammo_box/tube/a357 = 3,
+ /obj/item/grenade/smokebomb = 1
+ )
+
+/datum/outfit/loadout/recdecbrigand
+ name = "Brigand Decanus"
+ suit_store = /obj/item/melee/onehanded/machete/gladius
+ backpack_contents = list(
+ /obj/item/shield/riot/legion = 1,
+ /obj/item/stack/crafting/armor_plate = 5,
+ /obj/item/warpaint_bowl = 1
)
+
////////////////////
///Specialist///////
////////////////////
@@ -615,7 +600,7 @@ Weapons Lever shotgun, Grease gun, Repeater carbines, Revolvers, simple guns al
/obj/item/reagent_containers/pill/patch/healpoultice = 1,
/obj/item/restraints/handcuffs = 1,
/obj/item/megaphone/cornu = 1,
- // /obj/item/storage/bag/money/small/legenlisted = 1,
+ /obj/item/storage/bag/money/small/legenlisted = 1,
/obj/item/warpaint_bowl = 1,
)
@@ -624,25 +609,25 @@ Weapons Lever shotgun, Grease gun, Repeater carbines, Revolvers, simple guns al
head = /obj/item/clothing/head/helmet/f13/legion/vet/combvexil
backpack_contents = list(
/obj/item/melee/unarmed/tigerclaw = 1,
- /obj/item/melee/powered/ripper = 1,
/obj/item/book/granter/martial/berserker = 1,
+ /obj/item/reagent_containers/pill/healingpowder/bbock = 3
)
/datum/outfit/loadout/vexfox
name = "Desert Fox"
head = /obj/item/clothing/head/helmet/f13/legion/vet/vexil
- suit_store = /obj/item/twohanded/sledgehammer/supersledge
+ suit_store = /obj/item/twohanded/legionaxe
backpack_contents = list(
- /obj/item/restraints/legcuffs/bola/tactical = 2,
+ /obj/item/restraints/legcuffs/bola/tactical = 3,
+ /obj/item/stack/crafting/armor_plate = 5
)
/datum/outfit/loadout/vexnight
name = "Night Stalker"
head = /obj/item/clothing/head/helmet/f13/legion/vet/nightvexil
- suit_store = /obj/item/gun/ballistic/rifle/repeater/trail
+ suit_store = /obj/item/gun/ballistic/rifle/mosin
backpack_contents = list(
- /obj/item/ammo_box/tube/m44 = 2,
- /obj/item/melee/onehanded/machete/gladius = 1,
+ /obj/item/ammo_box/a308 = 1,
/obj/item/book/granter/trait/rifleman = 1,
/obj/item/gun_upgrade/scope/watchman = 1
)
@@ -661,8 +646,9 @@ Weapons Lever shotgun, Grease gun, Repeater carbines, Revolvers, simple guns al
exp_requirements = 150
loadout_options = list( // ALL: .45 Revolver, Machete
- /datum/outfit/loadout/expambusher, // Lever-action Shotgun, Bottlecap mine
- /datum/outfit/loadout/expsniper, // Trail Carbine + Scope, Smokebomb
+ /datum/outfit/loadout/expambusher,
+ /datum/outfit/loadout/expsniper,
+ /datum/outfit/loadout/expfighter,
)
matchmaking_allowed = list(
@@ -696,7 +682,7 @@ Weapons Lever shotgun, Grease gun, Repeater carbines, Revolvers, simple guns al
/obj/item/gun/ballistic/revolver/revolver45 = 1,
/obj/item/ammo_box/c45rev = 1,
/obj/item/reagent_containers/pill/healingpowder = 1,
- // /obj/item/storage/bag/money/small/legenlisted = 1,
+ /obj/item/storage/bag/money/small/legenlisted = 1,
/obj/item/melee/onehanded/machete = 1,
/obj/item/restraints/handcuffs = 1,
/obj/item/restraints/legcuffs/bola/tactical = 1,
@@ -707,10 +693,9 @@ Weapons Lever shotgun, Grease gun, Repeater carbines, Revolvers, simple guns al
name = "Ambusher"
glasses = /obj/item/clothing/glasses/sunglasses/big
backpack_contents = list(
- /obj/item/gun/ballistic/shotgun/automatic/combat/shotgunlever = 1,
+ /obj/item/gun/ballistic/bow/longbow = 1,
+ /obj/item/storage/bag/tribe_quiver/full = 1,
/obj/item/bottlecap_mine = 1,
- /obj/item/grenade/smokebomb = 1,
- /obj/item/restraints/legcuffs/bola/tactical = 1,
)
/datum/outfit/loadout/expsniper
@@ -723,7 +708,14 @@ Weapons Lever shotgun, Grease gun, Repeater carbines, Revolvers, simple guns al
/obj/item/gun_upgrade/scope/watchman = 1,
)
-
+/datum/outfit/loadout/expfighter
+ name = "Fighter"
+ glasses = /obj/item/clothing/glasses/sunglasses/big
+ suit_store = /obj/item/gun/ballistic/automatic/smg/mini_uzi
+ backpack_contents = list(
+ /obj/item/ammo_box/magazine/uzim9mm = 2,
+ /obj/item/restraints/legcuffs/bola/tactical = 1
+ )
///////////////////
@@ -779,29 +771,28 @@ Weapons Lever shotgun, Grease gun, Repeater carbines, Revolvers, simple guns al
l_pocket = /obj/item/flashlight/lantern
backpack_contents = list(
/obj/item/reagent_containers/pill/patch/healpoultice = 1,
- // /obj/item/storage/bag/money/small/legenlisted = 1,
+ /obj/item/storage/bag/money/small/legenlisted = 1,
/obj/item/restraints/handcuffs = 1,
- /obj/item/melee/onehanded/machete/gladius = 1,
+ /obj/item/melee/onehanded/machete = 1,
/obj/item/reagent_containers/pill/bitterdrink = 1,
)
/datum/outfit/loadout/vetaxe
name = "Enforcer"
- suit_store = /obj/item/twohanded/legionaxe
+ suit_store = /obj/item/twohanded/sledgehammer/simple
backpack_contents = list(
- /obj/item/melee/unarmed/tigerclaw = 1,
- /obj/item/restraints/legcuffs/bola = 1,
+ /obj/item/restraints/legcuffs/bola = 3,
/obj/item/reagent_containers/pill/patch/healpoultice = 2,
- /obj/item/stack/crafting/armor_plate = 4,
+ /obj/item/stack/crafting/armor_plate = 5
)
/datum/outfit/loadout/vetsmg
name = "Flanker"
backpack_contents = list(
- /obj/item/twohanded/spear/lance = 1,
- /obj/item/gun/ballistic/revolver/colt357 = 1,
- /obj/item/ammo_box/a357 = 1,
+ /obj/item/gun/ballistic/bow/lightxbow = 1,
+ /obj/item/storage/bag/tribe_quiver/full = 1,
+ /obj/item/grenade/homemade/coffeepotbomb = 2,
/obj/item/reagent_containers/pill/patch/healpoultice = 2,
)
@@ -809,11 +800,9 @@ Weapons Lever shotgun, Grease gun, Repeater carbines, Revolvers, simple guns al
name = "Berserker"
suit_store = /obj/item/gun/ballistic/shotgun/automatic/combat/shotgunlever
backpack_contents = list(
- /obj/item/ammo_box/shotgun/slug = 1,
+ /obj/item/ammo_box/shotgun/slug = 2,
/obj/item/ammo_box/shotgun/buck = 2,
- /obj/item/twohanded/spear/lance = 1,
/obj/item/melee/onehanded/knife/bayonet = 1,
- /obj/item/restraints/legcuffs/bola = 2,
)
// PRIME
@@ -830,10 +819,10 @@ Weapons Lever shotgun, Grease gun, Repeater carbines, Revolvers, simple guns al
outfit = /datum/outfit/job/CaesarsLegion/Legionnaire/f13legionary
loadout_options = list( //ALL: Forged Machete
- /datum/outfit/loadout/primelancer, // Gladius, Buckler, Bola.
- /datum/outfit/loadout/primeclang, // Bumper Sword, Firebomb
- /datum/outfit/loadout/primebrave, // Sledgehammer, Throwing spears
- )
+ /datum/outfit/loadout/primeskirmish,
+ /datum/outfit/loadout/primesupport,
+ /datum/outfit/loadout/primefrontliner,
+ )
matchmaking_allowed = list(
/datum/matchmaking_pref/friend = list(
@@ -862,34 +851,36 @@ Weapons Lever shotgun, Grease gun, Repeater carbines, Revolvers, simple guns al
r_pocket = /obj/item/storage/survivalkit/medical/legion
l_pocket = /obj/item/flashlight/lantern
backpack_contents = list(
- // /obj/item/storage/bag/money/small/legenlisted = 1,
+ /obj/item/storage/bag/money/small/legenlisted = 1,
/obj/item/reagent_containers/pill/patch/healpoultice = 1,
- /obj/item/melee/onehanded/machete/forgedmachete = 1,
+ /obj/item/melee/onehanded/machete = 1,
)
-/datum/outfit/loadout/primelancer
- name = "Guardian"
- suit_store = /obj/item/melee/onehanded/machete/gladius
- r_hand = /obj/item/shield/riot/legion
+/datum/outfit/loadout/primeskirmish
+ name = "Skirmish"
+ suit_store = /obj/item/twohanded/fireaxe
backpack_contents = list(
- /obj/item/restraints/legcuffs/bola = 2,
+ /obj/item/grenade/homemade/coffeepotbomb = 1,
+ /obj/item/storage/backpack/spearquiver = 1,
/obj/item/reagent_containers/pill/patch/healpoultice = 2,
)
-/datum/outfit/loadout/primeclang
- name = "Swordsman"
- suit_store = /obj/item/twohanded/fireaxe/bmprsword
+/datum/outfit/loadout/primesupport
+ name = "Support"
+ suit_store = /obj/item/gun/ballistic/bow/recurvebow
backpack_contents = list(
- /obj/item/grenade/homemade/firebomb = 2,
- /obj/item/reagent_containers/pill/patch/healpoultice = 2,
+ /obj/item/grenade/homemade/firebomb = 1,
+ /obj/item/storage/bag/tribe_quiver/full = 1,
+ /obj/item/reagent_containers/pill/patch/healpoultice = 2
)
-/datum/outfit/loadout/primebrave
- name = "Skirmish"
- suit_store = /obj/item/twohanded/sledgehammer/simple
+/datum/outfit/loadout/primefrontliner
+ name = "Frontliner"
+ suit_store = /obj/item/gun/ballistic/shotgun/hunting
backpack_contents = list(
- /obj/item/storage/backpack/spearquiver = 1,
- /obj/item/reagent_containers/pill/patch/healpoultice = 2,
+ /obj/item/ammo_box/shotgun/buck = 2,
+ /obj/item/ammo_box/shotgun/slug = 2,
+ /obj/item/reagent_containers/pill/patch/healpoultice = 2
)
// RECRUIT
@@ -906,7 +897,9 @@ Weapons Lever shotgun, Grease gun, Repeater carbines, Revolvers, simple guns al
outfit = /datum/outfit/job/CaesarsLegion/Legionnaire/f13recleg
loadout_options = list( //ALL: Machete
- /datum/outfit/loadout/recruittribal, // Fire Axe, Bola, Trekking
+ /datum/outfit/loadout/recruitraider,
+ /datum/outfit/loadout/recruittribal,
+ /datum/outfit/loadout/recruitinduct,
)
matchmaking_allowed = list(
@@ -936,20 +929,33 @@ Weapons Lever shotgun, Grease gun, Repeater carbines, Revolvers, simple guns al
r_pocket = /obj/item/storage/survivalkit/medical/legion
l_pocket = /obj/item/flashlight/lantern
backpack_contents = list(
- // /obj/item/storage/bag/money/small/legenlisted = 1,
+ /obj/item/storage/bag/money/small/legenlisted = 1,
/obj/item/reagent_containers/pill/healingpowder = 1,
/obj/item/melee/onehanded/machete = 1,
)
-/datum/outfit/loadout/recruittribal
- name = "Tribal Recruit"
- suit_store = /obj/item/twohanded/fireaxe
+/datum/outfit/loadout/recruitraider
+ name = "Reshaped Raider"
+ suit_store = /obj/item/twohanded/baseball/spiked
backpack_contents = list(
- /obj/item/restraints/legcuffs/bola = 1,
- /obj/item/book/granter/trait/trekking = 1,
+ /obj/item/restraints/legcuffs/bola = 2,
/obj/item/warpaint_bowl = 1,
)
+/datum/outfit/loadout/recruittribal
+ name = "Reformed Tribal"
+ suit_store = /obj/item/gun/ballistic/bow/shortbow
+ backpack_contents = list(
+ /obj/item/storage/bag/tribe_quiver/full = 1
+ )
+
+/datum/outfit/loadout/recruitinduct
+ name = "Legion Induct"
+ suit_store = /obj/item/gun/ballistic/rifle/repeater/cowboy
+ backpack_contents = list(
+ /obj/item/ammo_box/tube/a357 = 1
+ )
+
//////////////////////
////Support Roles ////
//////////////////////
@@ -978,7 +984,7 @@ Weapons Lever shotgun, Grease gun, Repeater carbines, Revolvers, simple guns al
l_pocket = /obj/item/flashlight/lantern
suit_store = /obj/item/melee/onehanded/machete/forgedmachete
backpack_contents = list(
- // /obj/item/storage/bag/money/small/legenlisted = 1,
+ /obj/item/storage/bag/money/small/legenlisted = 1,
/obj/item/reagent_containers/pill/healingpowder = 2
)
@@ -993,7 +999,7 @@ Weapons Lever shotgun, Grease gun, Repeater carbines, Revolvers, simple guns al
/datum/job/CaesarsLegion/Legionnaire/f13campfollower // Extra materials, Blueprints
title = "Legion Forgemaster"
flag = F13CAMPFOLLOWER
- total_positions = 2
+ total_positions = 1
spawn_positions = 2
description = "The Forgemaster makes weapons of all sorts and upgrades them, keeping order in the Forge and makes sure the camp is defended."
supervisors = "the Centurion."
@@ -1011,7 +1017,7 @@ Weapons Lever shotgun, Grease gun, Repeater carbines, Revolvers, simple guns al
shoes = /obj/item/clothing/shoes/f13/military/plated
r_pocket = /obj/item/flashlight/lantern
backpack_contents = list(
- // /obj/item/storage/bag/money/small/legenlisted = 1,
+ /obj/item/storage/bag/money/small/legenlisted = 1,
/obj/item/stack/sheet/metal/twenty = 2,
/obj/item/stack/sheet/mineral/wood/twenty = 1,
/obj/item/stack/sheet/leather/twenty = 1,
@@ -1113,7 +1119,8 @@ Weapons Lever shotgun, Grease gun, Repeater carbines, Revolvers, simple guns al
/obj/item/pen/fountain = 1,
/obj/item/taperecorder = 1,
/obj/item/clothing/under/f13/legauxilia = 1,
- /obj/item/stack/f13Cash/random/aureus/high = 2,
+ /obj/item/stack/f13Cash/denarius = 20,
+ /obj/item/storage/bag/money/small/legenlisted = 1
)
/datum/outfit/loadout/auxmedicus
@@ -1122,7 +1129,6 @@ Weapons Lever shotgun, Grease gun, Repeater carbines, Revolvers, simple guns al
gloves = /obj/item/clothing/gloves/f13/crudemedical
belt = /obj/item/storage/belt/medical/primitive
backpack_contents = list(
- // /obj/item/storage/bag/money/small/legenlisted = 1,
/obj/item/storage/firstaid/bandagekit = 1,
/obj/item/stack/sticky_tape/surgical = 1,
/obj/item/stack/medical/bone_gel = 1,
@@ -1150,13 +1156,13 @@ Weapons Lever shotgun, Grease gun, Repeater carbines, Revolvers, simple guns al
/datum/outfit/loadout/auxmilita
name = "Auxiliary (Militia)"
- belt = /obj/item/storage/belt/military/legion
- suit = /obj/item/clothing/suit/armor/legion/recruit
- shoes = /obj/item/clothing/shoes/f13/military/plated
+ suit = /obj/item/clothing/suit/armor/light/kit/punk/fullchainmail
backpack_contents = list(
/obj/item/restraints/legcuffs/bola = 1,
/obj/item/warpaint_bowl = 1,
/obj/item/twohanded/spear = 1,
+ /obj/item/gun/ballistic/revolver/sling/staff = 1,
+ /obj/item/clothing/under/f13/legauxilia = 1
)
// LEGION SLAVES - Servant cook, and assist with medical, low surgery. Worker farm and mine.
@@ -1176,6 +1182,8 @@ Weapons Lever shotgun, Grease gun, Repeater carbines, Revolvers, simple guns al
loadout_options = list(
/datum/outfit/loadout/slaveservant,
/datum/outfit/loadout/slaveworker,
+ /datum/outfit/loadout/slavemule,
+ /datum/outfit/loadout/slavefodder,
)
matchmaking_allowed = list(
@@ -1251,6 +1259,30 @@ Weapons Lever shotgun, Grease gun, Repeater carbines, Revolvers, simple guns al
/obj/item/shovel/spade = 1,
)
+/datum/outfit/loadout/slavemule
+ name = "Pack Mule"
+ suit = /obj/item/clothing/suit/armor/outfit/slavelabor
+ uniform = /obj/item/clothing/under/f13/legslave
+ shoes = /obj/item/clothing/shoes/f13/rag
+ r_hand = /obj/item/flashlight/flare/torch
+ backpack_contents = list(
+ /obj/item/storage/backpack/duffelbag = 3,
+ /obj/item/storage/belt/fannypack/black = 1,
+ /obj/item/storage/bag/ammo = 1,
+ )
+
+/datum/outfit/loadout/slavefodder
+ name = "Cannon Fodder"
+ suit = /obj/item/clothing/suit/armor/outfit/slavelabor
+ uniform = /obj/item/clothing/under/f13/legslave
+ shoes = /obj/item/clothing/shoes/f13/rag
+ r_hand = /obj/item/flashlight/flare/torch
+ backpack_contents = list(
+ /obj/item/clothing/suit/armor/light/kit/plates = 1,
+ /obj/item/kitchen/knife = 1,
+ /obj/item/gun/ballistic/revolver/sling = 1
+ )
+
/*
Post Scriptum
Plans: Add recipes/traits to keep refining support roles, Forgemaster done, others will need some minor tweaking. Planned is making the medicus more of a improvised surgery master, using primitive tools to good effect, because its interesting and unique.
diff --git a/code/modules/jobs/job_types/ncr.dm b/code/modules/jobs/job_types/ncr.dm
index 1cf3ea7d01b..bcaaf2df59d 100644
--- a/code/modules/jobs/job_types/ncr.dm
+++ b/code/modules/jobs/job_types/ncr.dm
@@ -153,6 +153,7 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
loadout_options = list(
/datum/outfit/loadout/captainbackline, // Deagle
/datum/outfit/loadout/captainfrontline, // AR Service Rifle
+ /datum/outfit/loadout/captainafar
)
min_required_special = list(
@@ -182,7 +183,7 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
belt = /obj/item/storage/belt/legholster
r_pocket = /obj/item/binoculars
backpack_contents = list(
- // /obj/item/storage/bag/money/small/ncr = 1,
+ /obj/item/storage/bag/money/small/ncr = 1,
/obj/item/megaphone = 1,
/obj/item/reagent_containers/hypospray/medipen/stimpak/super = 1,
/obj/item/stack/medical/gauze/bloodleaf = 2,
@@ -206,14 +207,25 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
name = "Lead from the Front"
suit_store = /obj/item/gun/ballistic/automatic/service
backpack_contents = list(
- /obj/item/ammo_box/magazine/m556/rifle = 3,
+ /obj/item/ammo_box/magazine/m556/rifle/assault = 3,
/obj/item/clothing/suit/armor/ncrarmor/captain = 1,
/obj/item/gun/ballistic/automatic/pistol/ninemil = 1,
+ /obj/item/grenade/f13/frag = 1,
/obj/item/ammo_box/magazine/m9mm/doublestack = 2,
/obj/item/storage/box/ration/menu_eight = 1,
/obj/item/melee/onehanded/knife/trench = 1
)
+/datum/outfit/loadout/captainafar
+ name = "Lead from Afar"
+ suit_store = /obj/item/gun/ballistic/automatic/m1garand/republicspride
+ backpack_contents = list(
+ /obj/item/ammo_box/magazine/garand3006 = 2,
+ /obj/item/clothing/suit/armor/ncrarmor/ncr_dressjack = 1,
+ /obj/item/binoculars = 1,
+ /obj/item/storage/box/ration/menu_eight = 1,
+ /obj/item/melee/onehanded/knife/trench = 1
+ )
// LIEUTENANT
@@ -230,6 +242,12 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
outfit = /datum/outfit/job/ncr/f13lieutenant
exp_requirements = 1250
+ loadout_options = list(
+ /datum/outfit/loadout/lieutenantstrong,
+ /datum/outfit/loadout/lieutenanthunter,
+ /datum/outfit/loadout/lieutenantdignitary
+ )
+
matchmaking_allowed = list(
/datum/matchmaking_pref/friend = list(
/datum/job/ncr,
@@ -257,17 +275,41 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
ears = /obj/item/radio/headset/headset_ncr_com
suit = /obj/item/clothing/suit/armor/ncrarmor/lieutenant
r_pocket = /obj/item/binoculars
- suit_store = /obj/item/gun/ballistic/automatic/service
backpack_contents = list(
/obj/item/melee/onehanded/knife/bayonet = 1,
/obj/item/gun/ballistic/automatic/pistol/ninemil = 1,
/obj/item/ammo_box/magazine/m9mm/doublestack = 2,
- // /obj/item/storage/bag/money/small/ncrofficers = 1,
- /obj/item/ammo_box/magazine/m556/rifle = 3,
+ /obj/item/storage/bag/money/small/ncrofficers = 1,
+ /obj/item/grenade/f13/frag = 1,
/obj/item/stack/medical/gauze/bloodleaf = 2,
/obj/item/reagent_containers/hypospray/medipen/stimpak/super = 1
)
+/datum/outfit/loadout/lieutenantstrong
+ name = "Strong Issue"
+ suit_store = /obj/item/gun/ballistic/automatic/service
+ backpack_contents = list(
+ /obj/item/ammo_box/magazine/m556/rifle/assault = 3,
+ /obj/item/storage/box/ration/menu_two = 1,
+ /obj/item/stack/crafting/armor_plate = 5
+ )
+
+/datum/outfit/loadout/lieutenanthunter
+ name = "Game Hunter"
+ suit_store = /obj/item/gun/ballistic/revolver/hunting
+ backpack_contents = list(
+ /obj/item/ammo_box/c4570/ratshot = 3,
+ /obj/item/storage/box/ration/menu_two = 1,
+ )
+
+/datum/outfit/loadout/lieutenantdignitary
+ name = "Dignitary"
+ backpack_contents = list(
+ /obj/item/stack/f13Cash/ncr = 200,
+ /obj/item/storage/belt/sabre/rapier = 1,
+ /obj/item/storage/box/ration/menu_two = 1
+ )
+
/datum/outfit/job/ncr/f13lieutenant/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
..()
if(visualsOnly)
@@ -288,13 +330,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,
+ /datum/outfit/loadout/sergeantguard,
+ /datum/outfit/loadout/sergeantrecon
)
-*/
+
matchmaking_allowed = list(
/datum/matchmaking_pref/friend = list(
/datum/job/ncr,
@@ -318,50 +360,44 @@ 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,
+ /obj/item/storage/bag/money/small/ncrofficers = 1,
/obj/item/grenade/f13/frag = 1,
/obj/item/gun/ballistic/automatic/pistol/ninemil = 1,
/obj/item/ammo_box/magazine/m9mm/doublestack = 2,
/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
- head = /obj/item/clothing/head/f13/ncr
+ suit_store = /obj/item/gun/ballistic/automatic/service
backpack_contents = list(
- /obj/item/ammo_box/magazine/m556/rifle/extended = 2,
+ /obj/item/ammo_box/magazine/m556/rifle/extended = 3,
/obj/item/storage/box/ration/menu_two = 1,
- /obj/item/melee/onehanded/knife/bowie = 1,
- /obj/item/flashlight/seclite = 1,
+ /obj/item/melee/onehanded/knife/bowie = 1
+ )
+
+/datum/outfit/loadout/sergeantguard
+ name = "Head Safeguard"
+ suit_store = /obj/item/gun/ballistic/shotgun/trench
+ backpack_contents = list(
+ /obj/item/ammo_box/shotgun/buck = 2,
+ /obj/item/ammo_box/shotgun/incendiary = 1,
+ /obj/item/stack/sheet/mineral/sandbags = 10
)
/datum/outfit/loadout/sergeantrecon
name = "Recon Squad Leader"
suit_store = /obj/item/gun/ballistic/automatic/service/carbine
- head = /obj/item/clothing/head/f13/ncr
backpack_contents = list(
/obj/item/ammo_box/magazine/m556/rifle/extended = 2,
+ /obj/item/binoculars = 1,
/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
- backpack_contents = list(
- /obj/item/ammo_box/shotgun/buck = 2,
- /obj/item/clothing/mask/gas = 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
@@ -479,10 +515,8 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
belt = /obj/item/storage/belt/legholster
backpack = /obj/item/storage/backpack/satchel/leather
backpack_contents = list(
- /obj/item/gun/ballistic/revolver/revolver45 = 1,
- /obj/item/ammo_box/c45rev = 2,
/obj/item/stack/medical/gauze/bloodleaf = 2,
- // /obj/item/storage/bag/money/small/ncr = 2,
+ /obj/item/storage/bag/money/small/ncrofficers = 1,
)
/datum/outfit/loadout/repbrahminbaron
@@ -491,7 +525,7 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
shoes = /obj/item/clothing/shoes/f13/cowboy
head = /obj/item/clothing/head/helmet/f13/brahmincowboyhat
backpack_contents = list(
- // /obj/item/storage/bag/money/small/ncr = 1,
+ /obj/item/twohanded/baseball/golfclub = 1,
/obj/item/storage/box/ration/menu_two = 1
)
@@ -500,9 +534,8 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
suit = /obj/item/clothing/under/rank/security/detective/grey
shoes = /obj/item/clothing/shoes/laceup
backpack_contents = list(
- // /obj/item/storage/bag/money/small/ncr = 1,
+ /obj/item/gun/ballistic/automatic/pistol/ninemil = 1,
/obj/item/storage/box/ration/menu_two = 1,
- /obj/item/clothing/accessory/waistcoat = 1,
/obj/item/clothing/suit/toggle/lawyer/black = 1,
/obj/item/storage/briefcase = 1,
)
@@ -513,7 +546,7 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
shoes = /obj/item/clothing/shoes/laceup
head = /obj/item/clothing/head/helmet/f13/rustedcowboyhat
backpack_contents = list(
- // /obj/item/storage/bag/money/small/ncr = 1,
+ /obj/item/gun/ballistic/revolver/revolver45 = 1,
/obj/item/storage/box/ration/menu_two = 1
)
@@ -574,7 +607,7 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
r_pocket = /obj/item/binoculars
backpack_contents = list(
/obj/item/melee/onehanded/knife/bowie = 1,
- // /obj/item/storage/bag/money/small/ncrofficers = 1,
+ /obj/item/storage/bag/money/small/ncrofficers = 1,
/obj/item/reagent_containers/hypospray/medipen/stimpak/super = 1,
/obj/item/stack/medical/gauze/bloodleaf = 2,
/obj/item/grenade/smokebomb = 1
@@ -592,15 +625,15 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
name = "The Rifleman"
suit_store = /obj/item/gun/ballistic/rifle/repeater/brush
backpack_contents = list(
- /obj/item/ammo_box/c4570 = 3,
- /obj/item/book/granter/trait/rifleman = 1,
+ /obj/item/ammo_box/tube/c4570 = 3,
+ /obj/item/book/granter/trait/rifleman = 1
)
/datum/outfit/loadout/vrshotgunner
name = "The Shotgunner"
suit_store = /obj/item/gun/ballistic/shotgun/automatic/combat/shotgunlever/stock
backpack_contents = list(
- /obj/item/ammo_box/shotgun/buck = 3,
+ /obj/item/ammo_box/shotgun/slug = 3,
/obj/item/ammo_box/shotgun/trainshot = 1
)
@@ -660,7 +693,7 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
backpack_contents = list(
/obj/item/restraints/handcuffs = 1,
/obj/item/melee/onehanded/knife/bowie = 1,
- // /obj/item/storage/bag/money/small/ncrofficers = 1,
+ /obj/item/storage/bag/money/small/ncrofficers = 1,
/obj/item/clothing/mask/gas/ranger = 1,
/obj/item/reagent_containers/hypospray/medipen/stimpak = 1,
/obj/item/stack/medical/gauze/bloodleaf = 2,
@@ -729,6 +762,7 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
loadout_options = list(
/datum/outfit/loadout/shockht, // Shotgun
/datum/outfit/loadout/supportht, // R84
+ /datum/outfit/loadout/ironwall
)
/datum/outfit/job/ncr/f13heavytrooper/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
@@ -751,7 +785,7 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
/obj/item/ammo_box/magazine/m45/socom = 2,
/obj/item/reagent_containers/hypospray/medipen/stimpak = 1,
/obj/item/stack/medical/gauze/bloodleaf = 2,
- // /obj/item/storage/bag/money/small/ncrenlisted = 1,
+ /obj/item/storage/bag/money/small/ncrenlisted = 1,
)
/datum/outfit/loadout/shockht
@@ -770,6 +804,14 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
/obj/item/melee/onehanded/knife/bayonet = 1
)
+/datum/outfit/loadout/ironwall
+ name = "Iron Wall"
+ backpack_contents = list(
+ /obj/item/book/granter/martial/carp = 1,
+ /obj/item/melee/unarmed/maceglove = 1
+ )
+
+
// COMBAT ENGINEER
/*
@@ -897,6 +939,12 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
outfit = /datum/outfit/job/ncr/f13mp
exp_requirements = 150
+ loadout_options = list(
+ /datum/outfit/loadout/mpresponder,
+ /datum/outfit/loadout/mpfrontline,
+ /datum/outfit/loadout/mpcrowd
+ )
+
/datum/outfit/job/ncr/f13mp // 9mm Pistol, Beanbag Shotgun, Military baton
name = "NCR Military Police"
jobtype = /datum/job/ncr/f13mp
@@ -908,14 +956,10 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
suit = /obj/item/clothing/suit/armor/ncrarmor/reinforced/mantle
gloves = /obj/item/clothing/gloves/f13/leather/fingerless
backpack = /obj/item/storage/backpack/satchel/trekker
- suit_store = /obj/item/gun/ballistic/shotgun/police
backpack_contents = list(
- /obj/item/gun/ballistic/automatic/pistol/ninemil = 1,
- /obj/item/ammo_box/magazine/m9mm/doublestack = 2,
/obj/item/reagent_containers/hypospray/medipen/stimpak = 1,
/obj/item/stack/medical/gauze/bloodleaf = 2,
- // /obj/item/storage/bag/money/small/ncrenlisted = 1,
- /obj/item/ammo_box/shotgun/bean = 2,
+ /obj/item/storage/bag/money/small/ncrenlisted = 1,
/obj/item/melee/classic_baton/militarypolice = 1
)
@@ -924,6 +968,35 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
if(visualsOnly)
return
+/datum/outfit/loadout/mpresponder
+ name = "First Responder"
+ backpack_contents = list(
+ /obj/item/gun/ballistic/shotgun/police = 1,
+ /obj/item/storage/belt/military/NCR_Bandolier = 1,
+ /obj/item/ammo_box/shotgun/bean = 1,
+ /obj/item/ammo_box/shotgun/rubber = 1,
+ /obj/item/gun/ballistic/automatic/pistol/ninemil = 1,
+ /obj/item/flashlight/seclite = 1
+ )
+
+/datum/outfit/loadout/mpfrontline
+ name = "Frontline Officer"
+ backpack_contents = list(
+ /obj/item/melee/baton/loaded = 1,
+ /obj/item/shield/riot = 1
+ )
+
+/datum/outfit/loadout/mpcrowd
+ name = "Crowd Control"
+ backpack_contents = list(
+ /obj/item/gun/ballistic/automatic/pistol/n99 = 1,
+ /obj/item/grenade/stingbang = 1,
+ /obj/item/grenade/flashbang = 1,
+ /obj/item/grenade/chem_grenade/teargas = 1,
+ /obj/item/grenade/barrier = 1
+ )
+
+
// COMBAT MEDIC
/*
@@ -1007,7 +1080,8 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
loadout_options = list(
/datum/outfit/loadout/combatengineerbuilder, // Service Rifle, X4 explosive, Extra materials, blueprints
- /datum/outfit/loadout/combatmedic // Service Rifle, Chem / Medicine Knowledge
+ /datum/outfit/loadout/combatmedic, // Service Rifle, Chem / Medicine Knowledge
+ /datum/outfit/loadout/trenchraidercorporal
)
matchmaking_allowed = list(
@@ -1031,7 +1105,7 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
accessory = /obj/item/clothing/accessory/ncr/CPL
backpack_contents = list(
/obj/item/melee/onehanded/knife/bayonet = 1,
- // /obj/item/storage/bag/money/small/ncrenlisted = 1,
+ /obj/item/storage/bag/money/small/ncrenlisted = 1,
/obj/item/reagent_containers/hypospray/medipen/stimpak = 1,
/obj/item/stack/medical/gauze/bloodleaf = 2,
/obj/item/grenade/f13/frag = 1
@@ -1043,27 +1117,38 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
belt = /obj/item/storage/belt/army/assault/ncr/engineer
glasses = /obj/item/clothing/glasses/welding
suit = /obj/item/clothing/suit/armor/ncrarmor/reinforced/engineer
- suit_store = /obj/item/gun/ballistic/automatic/service
+ suit_store = /obj/item/gun/ballistic/shotgun/trench
backpack_contents = list(
- /obj/item/ammo_box/magazine/m556/rifle = 2,
+ /obj/item/ammo_box/shotgun/buck = 2,
/obj/item/stack/ore/blackpowder/twenty = 1,
/obj/item/book/granter/crafting_recipe/blueprint/r82 = 1,
- /obj/item/clothing/head/beret/ncr/ncr_sapper = 1,
/obj/item/book/granter/trait/techno = 1,
+ /obj/item/book/granter/trait/explosives = 1
)
/datum/outfit/loadout/combatmedic
name = "Combat Medic"
- suit_store = /obj/item/gun/ballistic/automatic/service
+ suit_store = /obj/item/gun/ballistic/automatic/service/carbine
suit = /obj/item/clothing/suit/armor/ncrarmor/reinforced
backpack_contents = list(
+ /obj/item/gun_upgrade/scope/watchman = 1,
/obj/item/ammo_box/magazine/m556/rifle = 2,
/obj/item/clothing/accessory/armband/med/ncr = 1,
/obj/item/clothing/gloves/color/latex/nitrile = 1,
/obj/item/clothing/head/f13/ncr/steelpot_med = 1,
/obj/item/book/granter/trait/midsurgery = 1,
/obj/item/book/granter/trait/chemistry = 1,
- /obj/item/clothing/head/beret/ncr/ncr_medic = 1,
+ /obj/item/storage/belt/medolier = 1
+ )
+
+/datum/outfit/loadout/trenchraidercorporal
+ name = "Trench Raider"
+ head = /obj/item/clothing/head/f13/ncr/steelpot_goggles/trenchraider
+ suit_store = /obj/item/shovel/trench
+ suit = /obj/item/clothing/suit/armor/ncrarmor/reinforced/mantle/trenchraider
+ backpack_contents = list(
+ /obj/item/clothing/mask/gas = 1,
+ /obj/item/grenade/plastic/c4 = 2
)
// TROOPER
@@ -1081,7 +1166,9 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
exp_requirements = 60
loadout_options = list(
- /datum/outfit/loadout/trooperrifleman // Service Rifle, Bayonet
+ /datum/outfit/loadout/trooperrifleman, // Service Rifle, Bayonet
+ /datum/outfit/loadout/troopersentinel,
+ /datum/outfit/loadout/trooperpointman
)
matchmaking_allowed = list(
@@ -1107,7 +1194,7 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
suit = /obj/item/clothing/suit/armor/ncrarmor
glasses = null
backpack_contents = list(
- // /obj/item/storage/bag/money/small/ncrenlisted = 1,
+ /obj/item/storage/bag/money/small/ncrenlisted = 1,
/obj/item/reagent_containers/hypospray/medipen/stimpak = 1,
/obj/item/stack/medical/gauze/bloodleaf = 2,
/obj/item/grenade/f13/frag = 1
@@ -1117,11 +1204,29 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
name = "Rifleman"
suit_store = /obj/item/gun/ballistic/automatic/service
backpack_contents = list(
- /obj/item/ammo_box/magazine/m556/rifle = 3,
+ /obj/item/ammo_box/magazine/m556/rifle = 4,
/obj/item/melee/onehanded/knife/bayonet = 1,
/obj/item/storage/box/ration/menu_two = 1,
)
+/datum/outfit/loadout/troopersentinel
+ name = "Sentinel"
+ suit_store = /obj/item/gun/ballistic/shotgun/trench
+ backpack_contents = list(
+ /obj/item/ammo_box/shotgun/buck = 2,
+ /obj/item/stack/sheet/mineral/sandbags = 5,
+ /obj/item/storage/box/ration/menu_two = 1
+ )
+
+/datum/outfit/loadout/trooperpointman
+ name = "Pointman"
+ suit_store = /obj/item/gun/ballistic/automatic/service/carbine
+ backpack_contents = list(
+ /obj/item/ammo_box/magazine/m556/rifle = 2,
+ /obj/item/gun_upgrade/scope/watchman = 1,
+ /obj/item/storage/box/ration/menu_two = 1
+ )
+
// CONSCRIPT
/datum/job/ncr/f13conscript
@@ -1136,8 +1241,9 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
outfit = /datum/outfit/job/ncr/f13conscript
loadout_options = list(
- /datum/outfit/loadout/conscriptvarmint, // Service Rifle, Bayonet
- /datum/outfit/loadout/conscripthunting, // Hunting rifle, Trench tool, Sandbags
+ /datum/outfit/loadout/conscriptm1,
+ /datum/outfit/loadout/conscriptshotgun,
+ /datum/outfit/loadout/conscripthunting
)
matchmaking_allowed = list(
@@ -1162,24 +1268,32 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
/obj/item/stack/medical/gauze/bloodleaf = 2
)
-/datum/outfit/loadout/conscriptvarmint
+/datum/outfit/loadout/conscriptm1
name = "Conscript"
- suit_store = /obj/item/gun/ballistic/automatic/varmint
+ suit_store = /obj/item/gun/ballistic/automatic/m1carbine
backpack_contents = list(
- /obj/item/ammo_box/magazine/m556/rifle/small = 1,
+ /obj/item/ammo_box/magazine/m10mm/adv/simple = 3,
/obj/item/melee/onehanded/knife/bayonet = 1,
/obj/item/storage/box/ration/menu_two = 1
)
-/datum/outfit/loadout/conscripthunting
+/datum/outfit/loadout/conscriptshotgun
name = "Reserve"
- suit_store = /obj/item/gun/ballistic/rifle/hunting
+ suit_store = /obj/item/gun/ballistic/revolver/widowmaker
backpack_contents = list(
- /obj/item/ammo_box/a308 = 1,
+ /obj/item/ammo_box/shotgun/buck = 1,
/obj/item/stack/sheet/mineral/sandbags = 5,
/obj/item/storage/box/ration/menu_eight = 1
)
+/datum/outfit/loadout/conscripthunting
+ name = "Support"
+ suit_store = /obj/item/gun/ballistic/rifle/hunting
+ backpack_contents = list(
+ /obj/item/ammo_box/a308 = 1,
+ /obj/item/gun_upgrade/scope/watchman = 1,
+ /obj/item/storage/box/ration/menu_eight = 1
+ )
/////////////////
/// Logistics ///
@@ -1190,8 +1304,8 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
/datum/job/ncr/f13medicalofficer
title = "NCR Medical Officer"
flag = F13MEDICALOFFICER
- total_positions = 0
- spawn_positions = 0
+ total_positions = 1
+ spawn_positions = 1
description = "You are the lead medical professional in Camp Miller, you do not have any command authority unless it is of medical nature. Your duties are to ensure your troopers are in good health and that medical supplies are stocked for troopers."
supervisors = "Captain and Above"
selection_color = "#fff5cc"
@@ -1208,6 +1322,13 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
),
)
+ loadout_options = list(
+ /datum/outfit/loadout/modoctor,
+ /datum/outfit/loadout/mochemist,
+ /datum/outfit/loadout/momachinist
+ )
+
+
/datum/outfit/job/ncr/f13medicalofficer // M1911 Custom, Telescopic baton
name = "NCR Medical Officer"
jobtype = /datum/job/ncr/f13medicalofficer
@@ -1221,19 +1342,42 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
gloves = /obj/item/clothing/gloves/color/latex/nitrile
ears = /obj/item/radio/headset/headset_ncr_com
suit = /obj/item/clothing/suit/armor/ncrarmor/labcoat
- belt = /obj/item/storage/belt/army/assault/ncr
- r_hand = /obj/item/storage/backpack/duffelbag/med/surgery
mask = /obj/item/clothing/mask/surgical
box = /obj/item/storage/survivalkit
box_two = /obj/item/storage/survivalkit/medical
backpack_contents = list(
- /obj/item/gun/ballistic/automatic/pistol/m1911/custom = 1,
- /obj/item/ammo_box/magazine/m45 = 2,
+ /obj/item/gun/ballistic/automatic/pistol/ninemil/auto = 1,
+ /obj/item/ammo_box/magazine/m9mm = 2,
/obj/item/melee/classic_baton/telescopic = 1,
- // /obj/item/storage/bag/money/small/ncrofficers = 1,
+ /obj/item/storage/bag/money/small/ncrofficers = 1,
/obj/item/storage/firstaid/regular = 1
)
+/datum/outfit/loadout/modoctor
+ name = "Doctor"
+ backpack_contents = list(
+ /obj/item/storage/belt/medical/surgery_belt_adv = 1,
+ /obj/item/reagent_containers/hypospray/medipen/stimpak = 3
+ )
+
+
+/datum/outfit/loadout/mochemist
+ name = "Chemist"
+ backpack_contents = list(
+ /obj/item/stock_parts/chem_cartridge/pristine = 3
+ )
+
+/datum/outfit/loadout/momachinist
+ name = "Machinist"
+ backpack_contents = list(
+ /obj/item/stock_parts/matter_bin/bluespace = 1,
+ /obj/item/stock_parts/manipulator/femto = 2,
+ /obj/item/reagent_containers/glass/beaker/large = 2,
+ /obj/item/circuitboard/machine/limbgrower = 1
+ )
+
+
+
/datum/outfit/job/ncr/f13medicalofficer/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
. = ..()
if(visualsOnly)
@@ -1382,7 +1526,7 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
/obj/item/melee/onehanded/knife/survival = 1,
/obj/item/metaldetector = 1,
/obj/item/weldingtool/largetank = 1,
- // /obj/item/storage/bag/money/small/ncrenlisted = 1
+ /obj/item/storage/bag/money/small/ncrenlisted = 1
)
// Corpsman Chemistry, simple medical
@@ -1400,13 +1544,12 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
/obj/item/stack/medical/gauze/bloodleaf = 3,
/obj/item/book/granter/trait/chemistry = 1,
/obj/item/book/granter/trait/lowsurgery = 1,
- // /obj/item/storage/bag/money/small/ncrenlisted = 1,
+ /obj/item/storage/bag/money/small/ncrenlisted = 1,
)
-// Off-duty Snazzy jacket, saved up money for leave
+
/datum/outfit/loadout/offduty
name = "Off-Duty"
- suit = /obj/item/clothing/suit/armor/ncrarmor/ncr_dressjack
belt = /obj/item/storage/belt/military/NCR_Bandolier
backpack_contents = list(
/obj/item/gun/ballistic/automatic/pistol/ninemil = 1,
@@ -1415,7 +1558,7 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
/obj/item/stack/medical/gauze/bloodleaf = 2,
/obj/item/reagent_containers/food/snacks/cheesyburrito = 1,
/obj/item/reagent_containers/food/drinks/bottle/f13nukacola = 1,
- // /obj/item/storage/bag/money/small/ncrofficers = 1
+ /obj/item/storage/bag/money/small/ncr = 1
)
// NCR Citizen
diff --git a/code/modules/jobs/job_types/wasteland.dm b/code/modules/jobs/job_types/wasteland.dm
index c68b0f36a45..4eef6a743c4 100644
--- a/code/modules/jobs/job_types/wasteland.dm
+++ b/code/modules/jobs/job_types/wasteland.dm
@@ -1379,7 +1379,8 @@ Raider
/datum/outfit/loadout/crusader, //This is kinda a given. You bet.
/datum/outfit/loadout/samaritan, //Water and food to share with the wastes.
/datum/outfit/loadout/cleanser, //Just some bombs.
- /datum/outfit/loadout/newcanaan //10 M1911s for the funny gun table.
+ /datum/outfit/loadout/newcanaan, //10 M1911s for the funny gun table.
+ /datum/outfit/loadout/zealot
)
access = list() //we can expand on this and make alterations as people suggest different loadouts
@@ -1410,9 +1411,10 @@ Raider
/datum/outfit/loadout/crusader
name = "Crusader"
backpack_contents = list(
- /obj/item/clothing/suit/armor/light/knight = 1,
- /obj/item/clothing/head/helmet/f13/knighthelmet = 1,
///obj/item/melee/onehanded/machete = 1,
+ /obj/item/storage/box/holy/hospitaller = 1,
+ /obj/item/melee/coyote/mauler = 1,
+ /obj/item/restraints/legcuffs/bola/tactical = 3
)
/datum/outfit/loadout/samaritan
@@ -1421,6 +1423,10 @@ Raider
/obj/item/reagent_containers/food/snacks/store/bread/plain = 5,
/obj/item/reagent_containers/food/snacks/fishmeat/salmon = 2,
/obj/item/reagent_containers/glass/beaker/waterbottle = 2,
+ /obj/item/storage/box/holy/follower = 1,
+ /obj/item/gun/energy/laser/wattz/sacred = 1,
+ /obj/item/stock_parts/cell/ammo/ec = 2,
+ /obj/item/storage/box/medicine/stimpaks/stimpaks5 = 2
) //Matthew 14:17 RSVCE and KJV - Kitsunemitsu
//Nerd shit, wataur time. ~TK
//Wataur is forbidden. - Yuffels
@@ -1429,15 +1435,27 @@ Raider
/datum/outfit/loadout/cleanser
name = "Cleanser"
backpack_contents = list(
- /obj/item/grenade/homemade/coffeepotbomb = 2, //This is funny. I swear guys.
- ///obj/item/gun/ballistic/revolver/m29 = 1, //Moved here for more *variety*
- ///obj/item/ammo_box/m44 = 2
+ /obj/item/grenade/chem_grenade/holy = 10,
+ /obj/item/gun/flintlock/musketoon = 1,
+ /obj/item/ammo_box/flintlock = 1,
+ /obj/item/storage/box/holy/witchhunter = 1
)
/datum/outfit/loadout/newcanaan
name = "New Canaanite"
backpack_contents = list(
- /obj/item/gun/ballistic/automatic/pistol/m1911 = 10 //We can't expect God to do all the work.
+ /obj/item/gun/ballistic/automatic/pistol/m1911 = 10, //We can't expect God to do all the work
+ /obj/item/gun/ballistic/automatic/pistol/m1911/custom = 1,
+ /obj/item/ammo_box/magazine/m45 = 5,
+ /obj/item/clothing/suit/armor/medium/vest/bulletproof = 1
+ )
+
+/datum/outfit/loadout/zealot
+ name = "Zealot"
+ backpack_contents = list(
+ /obj/item/clothing/head/helmet/f13/ncr/rangercombat/zealot = 1,
+ /obj/item/clothing/suit/armor/medium/duster/zealot = 1,
+ /obj/item/gun/ballistic/shotgun/automatic/combat/auto5/sacred = 1
)
@@ -1539,7 +1557,6 @@ Raider
jobtype = /datum/job/wasteland/f13preacher
id = /obj/item/card/id/dogtag/town
- belt = /obj/item/kit_spawner/preacher
uniform = /obj/item/clothing/under/f13/chaplain
gloves = /obj/item/clothing/gloves/fingerless
shoes = /obj/item/clothing/shoes/jackboots
diff --git a/code/modules/mining/money_bag.dm b/code/modules/mining/money_bag.dm
index 528c5e726b0..8206bc16bc2 100644
--- a/code/modules/mining/money_bag.dm
+++ b/code/modules/mining/money_bag.dm
@@ -32,7 +32,7 @@
for(var/i = 0, i < 5, i++)
new /obj/item/stack/spacecash/c1000(src)
-/*
+
/obj/item/storage/bag/money/small
name = "money stash"
icon_state = "moneypouch"
@@ -58,7 +58,7 @@
// Legion reserves. Spawns with the Centurion.
/obj/item/storage/bag/money/small/legion/PopulateContents()
// ~450ish worth of legion money
- new /obj/item/stack/f13Cash/random/low(src)
+ new /obj/item/stack/f13Cash/random/high(src)
// Legion enlisted. Spawns with the Legionnaires. Average 12 caps.
/obj/item/storage/bag/money/small/legenlisted/PopulateContents()
@@ -66,12 +66,12 @@
// Legion officers. Spawns with the Decanii. Average 175 caps.
/obj/item/storage/bag/money/small/legofficers/PopulateContents()
- new /obj/item/stack/f13Cash/random/low(src)
+ new /obj/item/stack/f13Cash/random/med(src)
// NCR reserves. Spawns with the Captain.
/obj/item/storage/bag/money/small/ncr/PopulateContents()
// ~450 worth of ncr money
- new /obj/item/stack/f13Cash/random/low(src)
+ new /obj/item/stack/f13Cash/random/high(src)
// NCR enlisted. Spawns with the non officers.
/obj/item/storage/bag/money/small/ncrenlisted/PopulateContents()
@@ -81,7 +81,7 @@
// NCR officers. Spawns with the officers and Rangers.
/obj/item/storage/bag/money/small/ncrofficers/PopulateContents()
// ~75 worth of ncr money
- new /obj/item/stack/f13Cash/random/low(src)
+ new /obj/item/stack/f13Cash/random/med(src)
// Den reserves. Spawns with the Sheriff.
/obj/item/storage/bag/money/small/den/PopulateContents()
@@ -109,9 +109,9 @@
// Standard Settler money bag. They are pretty wealthy, with NCR bucks and caps, no Legion money.
/obj/item/storage/bag/money/small/settler/PopulateContents()
// ~162 worth of non legion money
- new /obj/item/stack/f13Cash/random/low(src)
- new /obj/item/stack/f13Cash/random/low(src)
- new /obj/item/stack/f13Cash/random/low(src)
+ new /obj/item/stack/f13Cash/random/med(src)
+ new /obj/item/stack/f13Cash/random/med(src)
+ new /obj/item/stack/f13Cash/random/med(src)
// Standard Banker money bag. They are insanely wealthy, Caps only and only for RP purposes.
/obj/item/storage/bag/money/small/banker/PopulateContents()
@@ -126,4 +126,4 @@
/obj/item/storage/bag/money/small/raider/mobboss/PopulateContents()
new /obj/item/stack/f13Cash/random/low(src)
//mob boss, reasonably wealthy
-*/
+
diff --git a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
index 57ea9b269b3..9447e738ab0 100644
--- a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
+++ b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
@@ -1039,7 +1039,7 @@
/mob/living/simple_animal/cow/brahmin/sgtsillyhorn
name = "Sergeant Sillyhorn"
- desc = "A distinguished war veteran alongside his junior enlisted sidekick, Corporal McCattle. The two of them wear a set of golden rings, smelted from captured Centurions."
+ desc = "A distinguished war veteran, She wears a set of golden rings, smelted from captured Centurions."
emote_see = list("shakes its head.","swishes its tail eagerly.")
speak_chance = 2
diff --git a/code/modules/projectiles/guns/ballistic/automatic.dm b/code/modules/projectiles/guns/ballistic/automatic.dm
index b392a1893c8..24cb604e557 100644
--- a/code/modules/projectiles/guns/ballistic/automatic.dm
+++ b/code/modules/projectiles/guns/ballistic/automatic.dm
@@ -1310,7 +1310,7 @@
/datum/firemode/semi_auto/fast
)
can_bayonet = TRUE
- bayonet_state = "bayonet"
+ bayonet_state = "rifles"
knife_x_offset = 22
knife_y_offset = 21
fire_sound = 'sound/f13weapons/varmint_rifle.ogg'
@@ -1352,7 +1352,7 @@
weapon_weight = GUN_ONE_HAND_ONLY
damage_multiplier = GUN_EXTRA_DAMAGE_0
cock_delay = GUN_COCK_RIFLE_BASE
- init_recoil = RIFLE_RECOIL(0.8)
+ init_recoil = RIFLE_RECOIL(1.3)
can_scope = TRUE
scope_state = "scope_short"
scope_x_offset = 4
@@ -1772,7 +1772,7 @@
icon_prefix = "r82"
weapon_class = WEAPON_CLASS_RIFLE
weapon_weight = GUN_ONE_HAND_ONLY
- damage_multiplier = GUN_EXTRA_DAMAGE_0
+ damage_multiplier = GUN_EXTRA_DAMAGE_T1
cock_delay = GUN_COCK_RIFLE_BASE
init_recoil = RIFLE_RECOIL(0.8)
init_firemodes = list(
diff --git a/code/modules/projectiles/guns/ballistic/revolver.dm b/code/modules/projectiles/guns/ballistic/revolver.dm
index 7cbf36be8bf..d45df3c0522 100644
--- a/code/modules/projectiles/guns/ballistic/revolver.dm
+++ b/code/modules/projectiles/guns/ballistic/revolver.dm
@@ -493,6 +493,7 @@
init_recoil = HANDGUN_RECOIL(1.2)
gun_accuracy_zone_type = ZONE_WEIGHT_PRECISION
can_scope = TRUE
+ zoom_factor = 1
scope_state = "revolver_scope"
scope_x_offset = 9
scope_y_offset = 20
diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm
index b3f526a5820..eff5f87bb0b 100644
--- a/code/modules/projectiles/projectile/beams.dm
+++ b/code/modules/projectiles/projectile/beams.dm
@@ -304,11 +304,11 @@
name = "plasma bolt"
icon_state = "plasma_clot"
damage_type = BURN
- damage = 60
+ damage = 40
flag = "energy"
eyeblur = 0
is_reflectable = TRUE
- pixels_per_second = TILES_TO_PIXELS(50)
+ pixels_per_second = TILES_TO_PIXELS(15)
//Securitrons Beam
/obj/item/projectile/beam/laser/pistol/ultraweak
@@ -613,7 +613,7 @@
light_color = LIGHT_COLOR_RED
/obj/item/projectile/f13plasma/pistol/worn
- damage = 30
+ damage = 33
/obj/item/projectile/f13plasma/pistol/glock //Glock (streamlined plasma pistol)
damage = 40
diff --git a/code/modules/projectiles/projectile/bullets/rifle.dm b/code/modules/projectiles/projectile/bullets/rifle.dm
index 9bd3c489f28..17472f5c505 100644
--- a/code/modules/projectiles/projectile/bullets/rifle.dm
+++ b/code/modules/projectiles/projectile/bullets/rifle.dm
@@ -549,7 +549,7 @@
/obj/item/projectile/bullet/a308
name = ".308 bullet"
damage = BULLET_DAMAGE_RIFLE_308
- armour_penetration = 0.2
+ armour_penetration = 0.3
stamina = BULLET_STAMINA_RIFLE_308
spread = BULLET_SPREAD_SURPLUS
recoil = BULLET_RECOIL_RIFLE_308
@@ -654,7 +654,7 @@
/obj/item/projectile/bullet/a3006
name = ".30-06 bullet"
damage = BULLET_DAMAGE_RIFLE_3006
- armour_penetration = 0.3
+ armour_penetration = 0.4
stamina = BULLET_STAMINA_RIFLE_3006
spread = BULLET_SPREAD_SURPLUS
recoil = BULLET_RECOIL_RIFLE_3006
diff --git a/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm b/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm
index 6297e6de81c..814df40f0ab 100644
--- a/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm
@@ -117,12 +117,12 @@
if(isplasmaman(M))
M.hallucination += 5
-/datum/reagent/blackpowder/on_ex_act()
- var/location = get_turf(holder.my_atom)
- var/datum/effect_system/reagents_explosion/e = new()
- e.set_up(1 + round(volume/6, 1), location, 0, 0, message = 0)
- e.start()
- holder.clear_reagents()
+//datum/reagent/blackpowder/on_ex_act()
+ //var/location = get_turf(holder.my_atom)
+ //var/datum/effect_system/reagents_explosion/e = new()
+ //e.set_up(1 + round(volume/6, 1), location, 0, 0, message = 0)
+ //e.start()
+ //holder.clear_reagents()
/datum/reagent/flash_powder
name = "Flash Powder"
diff --git a/code/modules/reagents/chemistry/recipes/medicine.dm b/code/modules/reagents/chemistry/recipes/medicine.dm
index f0aacc13f4c..299117cab8d 100644
--- a/code/modules/reagents/chemistry/recipes/medicine.dm
+++ b/code/modules/reagents/chemistry/recipes/medicine.dm
@@ -387,10 +387,10 @@ datum/chemical_reaction/rezadone
/datum/chemical_reaction/stimfluid
name = "stimfluid"
id = /datum/reagent/medicine/stimpak
- results = list(/datum/reagent/medicine/stimpak = 5)
+ results = list(/datum/reagent/medicine/stimpak = 30)
required_reagents = list(
- /datum/reagent/medicine/bicaridine = 5,
- /datum/reagent/medicine/kelotane = 5,
+ /datum/reagent/consumable/brocjuice = 10,
+ /datum/reagent/consumable/xanderjuice = 10,
/datum/reagent/medicine/styptic_powder = 5,
/datum/reagent/medicine/silver_sulfadiazine = 5,
/datum/reagent/medicine/morphine = 5,
diff --git a/code/modules/reagents/reagent_containers/patch.dm b/code/modules/reagents/reagent_containers/patch.dm
index dbfd1453093..9980d1f570c 100644
--- a/code/modules/reagents/reagent_containers/patch.dm
+++ b/code/modules/reagents/reagent_containers/patch.dm
@@ -148,3 +148,16 @@
icon_state = "patch_hydra"
list_reagents = list(/datum/reagent/medicine/hydra = 20)
self_delay = 0
+
+//thingy i made for vex berserkers -NETNICK
+
+/obj/item/reagent_containers/pill/healingpowder/bbock
+ name = "Ballistic Bock"
+ desc = "Helps you make things die, Not very good for your brain."
+ list_reagents = list(/datum/reagent/consumable/ethanol/bbock = 10)
+ icon = 'icons/fallout/objects/medicine/drugs.dmi'
+ icon_state = "patch_healingpowder"
+ self_delay = 5
+ color = COLOR_PALE_GREEN_GRAY
+
+
diff --git a/icons/fallout/onmob/clothes/armor_medium.dmi b/icons/fallout/onmob/clothes/armor_medium.dmi
index 9315064734a..8bb5cb7a0ef 100644
Binary files a/icons/fallout/onmob/clothes/armor_medium.dmi and b/icons/fallout/onmob/clothes/armor_medium.dmi differ
diff --git a/icons/fallout/onmob/clothes/head.dmi b/icons/fallout/onmob/clothes/head.dmi
index b24ec4d64d8..03efb1cd1dd 100644
Binary files a/icons/fallout/onmob/clothes/head.dmi and b/icons/fallout/onmob/clothes/head.dmi differ
diff --git a/modular_BD2/legio_invicta/code/legio_invicta.dm b/modular_BD2/legio_invicta/code/legio_invicta.dm
index d5950eef0df..6a1919063d0 100644
--- a/modular_BD2/legio_invicta/code/legio_invicta.dm
+++ b/modular_BD2/legio_invicta/code/legio_invicta.dm
@@ -678,17 +678,17 @@
// Preloaded Legion wardrobe
/obj/machinery/smartfridge/bottlerack/wardrobe/legion
initial_contents = list(
- /obj/item/clothing/under/f13/legskirt = 3,
- /obj/item/clothing/mask/bandana/legion/dark = 2,
+ /obj/item/clothing/under/f13/legskirt = 5,
+ /obj/item/clothing/mask/bandana/legion/dark = 3,
/obj/item/clothing/head/f13/servant/auxilia = 1,
/obj/item/clothing/head/f13/servant = 1,
- /obj/item/clothing/gloves/legion = 2,
+ /obj/item/clothing/gloves/legion = 3,
/obj/item/clothing/gloves/blacksmith_mittens = 1,
/obj/item/clothing/neck/apron/labor = 1,
/obj/item/clothing/shoes/f13/military/legion = 3,
/obj/item/clothing/shoes/sandals_leather = 1,
- /obj/item/storage/belt/military/legion = 1,
- /obj/item/clothing/glasses/f13/goggles_sandstorm = 1)
+ /obj/item/storage/belt/military/legion = 3,
+ /obj/item/clothing/glasses/f13/goggles_sandstorm = 3)
// -------------- ARMORDROBE -----------------
@@ -729,8 +729,8 @@
// Preloaded Legion armor rack
/obj/machinery/smartfridge/bottlerack/wardrobe/armor/legion
initial_contents = list(
- /obj/item/clothing/suit/armor/light/legion/recruit = 2,
- /obj/item/clothing/head/helmet/f13/legion/recruit = 2)
+ /obj/item/clothing/suit/armor/light/legion/recruit = 3,
+ /obj/item/clothing/head/helmet/f13/legion/recruit = 3)
// -------------- MELEE RACK -----------------