Skip to content

Commit

Permalink
Fixes mobdrop item names + frontiersmen are injured on death + Fronti…
Browse files Browse the repository at this point in the history
…ersman shredder mob (#4213)

## Changelog

:cl:
fix: mob items no longer show the path when dropping
add: the frontiersman lmg-man now carries a shredder instead of a laser
minigun. prepare yourself.
/:cl:
  • Loading branch information
Erikafox authored Feb 21, 2025
1 parent 59fc78e commit e44c403
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 26 deletions.
13 changes: 9 additions & 4 deletions _maps/RandomRuins/IceRuins/icemoon_ice_lodge.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1161,6 +1161,14 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/wood/maple,
/area/ruin/powered/icemoon/lodge/mainhall)
"rc" = (
/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/heavy/internals/neutered{
aggro_vision_range = 12
},
/turf/open/floor/wood/icemoon{
icon_state = "wood-broken4"
},
/area/overmap_encounter/planetoid/cave/explored)
"rm" = (
/turf/open/floor/ship/dirt/dark,
/area/ruin/powered/icemoon/lodge/residential)
Expand Down Expand Up @@ -1736,9 +1744,6 @@
"xk" = (
/obj/effect/turf_decal/spline/fancy/wood,
/obj/effect/decal/cleanable/dirt,
/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/heavy/internals/neutered{
aggro_vision_range = 12
},
/turf/open/floor/wood/mahogany,
/area/ruin/powered/icemoon/lodge/montagne_office)
"xu" = (
Expand Down Expand Up @@ -5042,7 +5047,7 @@ Vz
Vz
xk
Ws
Mt
rc
cd
GD
ou
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/obj/effect/mob_spawn/human/corpse/frontier
name = "Frontiersman"
outfit = /datum/outfit/frontier
brute_damage = 150

/obj/effect/mob_spawn/human/corpse/frontier/internals
outfit = /datum/outfit/frontier/internals
Expand Down Expand Up @@ -86,7 +87,6 @@
name = "Frontiersman Heavy Corpse"
suit = /obj/item/clothing/suit/space/hardsuit/security/independent/frontier
head = /obj/item/clothing/head/beret/sec/frontier/officer
back = /obj/item/minigunpack

/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper/heavy/internals
outfit = /datum/outfit/frontier/trooper/heavy/internals
Expand All @@ -96,9 +96,6 @@
mask = /obj/item/clothing/mask/gas/frontiersmen
l_pocket = /obj/item/tank/internals/emergency_oxygen/engi

/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper/heavy/gunless
outfit = /datum/outfit/frontier/trooper/heavy/gunless

/obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper/flame
outfit = /datum/outfit/job/frontiersmen/ert/flamer/corpse

Expand All @@ -107,9 +104,3 @@
back = null
belt = /obj/item/storage/belt/security/military/frontiersmen
l_hand = null

backpack_contents = null

/datum/outfit/frontier/trooper/heavy/gunless
name = "Frontiersman Heavy Corpse (Gunless)"
back = null
Original file line number Diff line number Diff line change
Expand Up @@ -192,13 +192,13 @@

/mob/living/simple_animal/hostile/human/frontier/ranged/trooper/heavy
name = "Frontiersman Sweeper"
desc = "Unseen behind the mirror-visor of this heavily plated hardsuit, flinty eyes dream of cruelty. A mass of chrome and photonics swings your way, the soft whine of its motor a harbinger of iridescent death."
desc = "A horrifically still mass of plasteel and flesh. Its motions are filled with a deliberate and exacting malice. Its weapon is raised, and it prepares to pull the trigger."
icon_state = "frontiersmanrangedminigun"
projectilesound = 'sound/weapons/laser4.ogg'
rapid = 6
rapid_fire_delay = 1.5
casingtype = null
projectiletype = /obj/projectile/beam/weak/penetrator
projectilesound = 'sound/weapons/gun/hmg/shredder.ogg'
rapid = 5
rapid_fire_delay = 2
casingtype = /obj/item/ammo_casing/shotgun/buckshot
r_hand = /obj/item/gun/ballistic/automatic/hmg/shredder
mob_spawner = /obj/effect/mob_spawn/human/corpse/frontier/ranged/trooper/heavy
armor_base = /obj/item/clothing/suit/space/hardsuit/security/independent/frontier

Expand Down
8 changes: 4 additions & 4 deletions code/modules/mob/living/simple_animal/hostile/human/human.dm
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@
/// Path of the mob spawner we base the mob's visuals off of.
var/mob_spawner
/// Path of the right hand held item we give to the mob's visuals.
var/r_hand
var/obj/r_hand
/// Path of the left hand held item we give to the mob's visuals.
var/l_hand
var/obj/l_hand
// Prob of us dropping l/r hand loot.
var/weapon_drop_chance = 30

Expand Down Expand Up @@ -79,12 +79,12 @@
if(prob(weapon_drop_chance))
new r_hand(loc)
else
visible_message(span_danger("[src]'s [r_hand] is destroyed as they collapse!"))
visible_message(span_danger("[src]'s [r_hand.name] is destroyed as they collapse!"))
if(l_hand && weapon_drop_chance)
if(prob(weapon_drop_chance))
new l_hand(loc)
else
visible_message(span_danger("[src]'s [l_hand] is destroyed as they collapse!"))
visible_message(span_danger("[src]'s [l_hand.name] is destroyed as they collapse!"))


/mob/living/simple_animal/hostile/human/vv_edit_var(var_name, var_value)
Expand Down
8 changes: 6 additions & 2 deletions code/modules/projectiles/guns/energy/laser_gatling.dm
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,14 @@
var/overheat = 0
var/overheat_max = 40
var/heat_diffusion = 1
var/spawn_with_gun = TRUE

/obj/item/minigunpack/Initialize()
. = ..()
gun = new(src)
battery = new(src)
gun.cell = battery
if(spawn_with_gun)
gun = new(src)
gun.cell = battery
START_PROCESSING(SSobj, src)

/obj/item/minigunpack/Destroy()
Expand Down Expand Up @@ -97,6 +99,8 @@
update_appearance()
user.update_inv_back()

/obj/item/minigunpack/no_gun
spawn_with_gun = FALSE

/obj/item/gun/energy/minigun
name = "laser gatling gun"
Expand Down

0 comments on commit e44c403

Please sign in to comment.