undoes some of vega's changes (#336)

* a * a * a * a * Update raider.dm * a * a * a
Foundation-19 · Nov 14, 2023 · d57c93b · d57c93b
1 parent f9a28bb
commit d57c93b
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 24 deletions.
diff --git a/_maps/map_files/Pahrump/Pahrump-Above-3.dmm b/_maps/map_files/Pahrump/Pahrump-Above-3.dmm
@@ -371,6 +371,11 @@
 	icon_state = "whitegreenrustychess"
 	},
 /area/f13/building)
+"bj" = (
+/obj/structure/table,
+/obj/effect/spawner/lootdrop/f13/blueprintLowMid,
+/turf/open/floor/plasteel/f13/vault_floor/white,
+/area/f13/clinic)
 "bk" = (
 /obj/structure/fence{
 	dir = 1
@@ -2351,6 +2356,11 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/wood/f13/carpet,
 /area/f13/building)
+"hw" = (
+/obj/structure/table,
+/obj/item/locked_box/medical/drugs,
+/turf/open/floor/plasteel/f13/vault_floor/white,
+/area/f13/clinic)
 "hx" = (
 /obj/structure/table/reinforced,
 /turf/open/floor/plasteel/f13/vault_floor/floor,
@@ -3311,6 +3321,8 @@
 "kx" = (
 /obj/structure/table,
 /obj/effect/spawner/lootdrop/f13/junkspawners,
+/obj/effect/spawner/lootdrop/f13/blueprintMid,
+/obj/effect/spawner/lootdrop/f13/blueprintHigh,
 /turf/open/floor/plasteel/f13/vault_floor/white/whitesolid{
 	icon_state = "whitedirtysolid"
 	},
@@ -12200,6 +12212,8 @@
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/table,
 /obj/item/defibrillator/primitive,
+/obj/item/reagent_containers/hypospray/medipen/medx,
+/obj/item/reagent_containers/hypospray/medipen/medx,
 /turf/open/floor/plasteel/f13/vault_floor/white/whitesolid{
 	icon_state = "whitedirtysolid"
 	},
@@ -12456,6 +12470,7 @@
 /obj/item/organ/heart,
 /obj/item/reagent_containers/hypospray/medipen/stimpak/super,
 /obj/machinery/light,
+/obj/item/reagent_containers/hypospray/medipen/stimpak/super,
 /turf/open/floor/plasteel/f13/vault_floor/white/whitesolid{
 	icon_state = "whitedirtysolid"
 	},
@@ -63010,7 +63025,7 @@ pS
 Ig
 WG
 EY
-MF
+hw
 xr
 lE
 EY
@@ -64564,7 +64579,7 @@ Ve
 Ve
 IS
 EY
-MF
+bj
 lq
 iZ
 EY

diff --git a/_maps/map_files/Pahrump/Pahrump-Underground-1.dmm b/_maps/map_files/Pahrump/Pahrump-Underground-1.dmm
@@ -7407,6 +7407,7 @@
 /obj/effect/spawner/lootdrop/f13/weapon/melee/random_mid,
 /obj/effect/spawner/lootdrop/f13/weapon/melee/random,
 /obj/effect/spawner/lootdrop/f13/weapon/gun/tier4,
+/obj/effect/spawner/lootdrop/f13/armor/tier3,
 /turf/open/floor/f13{
 	icon_state = "bluerustysolid"
 	},
@@ -7709,11 +7710,6 @@
 /obj/item/reagent_containers/food/snacks/meat/slab/ant_meat,
 /turf/open/indestructible/ground/inside/subway,
 /area/f13/tunnel)
-"fAg" = (
-/obj/structure/simple_door/wood,
-/obj/item/mine/explosive,
-/turf/open/floor/wood/f13/oak,
-/area/f13/building)
 "fAi" = (
 /obj/machinery/light,
 /obj/effect/decal/cleanable/dirt,
@@ -8104,10 +8100,6 @@
 /obj/machinery/workbench/advanced,
 /turf/open/floor/wood/f13/oakbroken3,
 /area/f13/building)
-"fOy" = (
-/mob/living/simple_animal/hostile/raider/ranged/boss,
-/turf/open/floor/wood/f13/oak,
-/area/f13/building)
 "fOZ" = (
 /obj/structure/simple_door/metal/iron,
 /obj/structure/barricade/wooden/planks/pregame,
@@ -15554,6 +15546,7 @@
 /obj/structure/closet/cabinet,
 /obj/effect/spawner/lootdrop/f13/armor/clothes,
 /obj/effect/spawner/lootdrop/f13/armor/tier3,
+/obj/effect/spawner/lootdrop/f13/armor/tier4,
 /turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,
 /area/f13/tunnel)
 "lTu" = (
@@ -18269,6 +18262,8 @@
 /obj/effect/decal/cleanable/dirt{
 	color = "#363636"
 	},
+/obj/effect/spawner/lootdrop/f13/armor/tier3,
+/obj/effect/spawner/lootdrop/f13/armor/tier4,
 /turf/open/floor/plasteel/darkred/side{
 	dir = 4
 	},
@@ -19667,14 +19662,14 @@
 "pCg" = (
 /obj/structure/closet,
 /obj/effect/spawner/lootdrop/f13/blueprintLowPartsWeighted,
-/obj/effect/spawner/lootdrop/f13/weapon/gun/tier4,
 /mob/living/simple_animal/hostile/raider/junker/boss{
 	robust_searching = 1;
 	minimum_distance = 2;
 	retreat_distance = 5;
 	melee_damage_lower = 80;
 	melee_damage_upper = 80
 	},
+/obj/effect/spawner/lootdrop/f13/weapon/gun/tier5,
 /turf/open/indestructible/ground/inside/mountain,
 /area/f13/building)
 "pCJ" = (
@@ -20352,6 +20347,7 @@
 	dir = 1
 	},
 /obj/effect/spawner/lootdrop/f13/armor/tier3,
+/obj/effect/spawner/lootdrop/f13/armor/tier4,
 /turf/open/indestructible/ground/inside/subway,
 /area/f13/tunnel)
 "qhW" = (
@@ -25393,7 +25389,6 @@
 /obj/effect/decal/cleanable/dirt{
 	color = "#363636"
 	},
-/mob/living/simple_animal/hostile/raider/ranged/boss,
 /turf/open/floor/f13{
 	icon_state = "floorrusty"
 	},
@@ -26344,6 +26339,7 @@
 /area/f13/bunker)
 "vcM" = (
 /obj/item/reagent_containers/hypospray/medipen/stimpak,
+/obj/effect/spawner/lootdrop/f13/weapon/gun/tier5,
 /turf/open/floor/f13{
 	icon_state = "reddirtyfull"
 	},
@@ -28781,6 +28777,7 @@
 /obj/effect/decal/cleanable/dirt{
 	color = "000000"
 	},
+/obj/effect/spawner/lootdrop/f13/weapon/gun/tier4,
 /turf/open/floor/carpet/black,
 /area/f13/building)
 "wVg" = (
@@ -50093,7 +50090,7 @@ ajV
 enc
 bxT
 bxT
-fAg
+vEd
 rMm
 kGo
 mDq
@@ -50605,7 +50602,7 @@ vPg
 ydu
 xLj
 ocG
-fOy
+rrZ
 npt
 ydu
 iMA
@@ -71552,7 +71549,7 @@ vPg
 vPg
 vPg
 aoj
-lnr
+bcq
 iOJ
 aoj
 aoj

diff --git a/code/game/objects/effects/spawners/f13lootdrop.dm b/code/game/objects/effects/spawners/f13lootdrop.dm
@@ -1013,26 +1013,29 @@
 				/obj/item/gun/ballistic/automatic/smg/american180,
 				/obj/effect/spawner/bundle/f13/aer9,
 				/obj/effect/spawner/bundle/f13/wattz2k,
-				/obj/effect/spawner/lootdrop/f13/weapon/revolver44variants
+				/obj/effect/spawner/lootdrop/f13/weapon/revolver44variants,
+				/obj/effect/spawner/bundle/f13/mp5,
+				/obj/effect/spawner/bundle/f13/smg10mm
 				)
 
 /obj/effect/spawner/lootdrop/f13/weapon/gun/tier4
 	name = "tier four firearms"
-	loot = list(/obj/effect/spawner/bundle/f13/mp5,
-				/obj/effect/spawner/bundle/f13/smg10mm,
+	loot = list(
 				/obj/effect/spawner/bundle/f13/worn_assault_carbine,
 				/obj/effect/spawner/bundle/f13/marksman,
 				/obj/effect/spawner/bundle/f13/guns/tommygun,
 				/obj/effect/spawner/bundle/f13/shotgunlever,
 				/obj/effect/spawner/bundle/f13/aer12,
 				/obj/effect/spawner/bundle/f13/dkssniper,
 				/obj/effect/spawner/bundle/f13/plasmapistol,
-				/obj/effect/spawner/bundle/f13/wattz2kext
+				/obj/effect/spawner/bundle/f13/wattz2kext,
+				/obj/effect/spawner/bundle/f13/r82
 				)
 
 /obj/effect/spawner/lootdrop/f13/weapon/gun/tier5
 	name = "tier five firearms"
 	loot = list(/obj/effect/spawner/bundle/f13/assault_rifle,
+				/obj/effect/spawner/bundle/f13/infiltrator,
 				/obj/effect/spawner/bundle/f13/r84,
 				/obj/effect/spawner/bundle/f13/brushgun,
 				/obj/effect/spawner/bundle/f13/assault_carbine,

diff --git a/code/modules/mob/living/simple_animal/hostile/f13/raider.dm b/code/modules/mob/living/simple_animal/hostile/f13/raider.dm
@@ -315,12 +315,12 @@
 	icon_state = "junker_boss"
 	icon_living = "junker_boss"
 	icon_dead = "junker_dead"
-	maxHealth = 450
-	health = 450
+	maxHealth = 400
+	health = 400
 	ranged = TRUE
 	retreat_distance = 4
 	minimum_distance = 6
-	extra_projectiles = 9
-	ranged_cooldown_time = 15
+	extra_projectiles = 5
+	ranged_cooldown_time = 30
 	projectiletype = /obj/item/projectile/bullet/shrapnel
 	projectilesound = 'sound/f13weapons/auto5.ogg'