cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-13 16:13:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes syndicate mobs not always dropping the correct corpse (#26134)

Browse Source 
* FINALLY, IT WORKS

* fix tabs

* Contra's suggestion

* Spaghetti's review

* removes an unnecessary enter

* Guarantees the stronger version drops a salvage

* Lewc's/DGAMER's review
This commit is contained in:
Taurtura
2024-07-26 16:30:42 +02:00
committed by GitHub
parent 304e265e45
commit c38680fcc2
1 changed files with 2 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/simple_animal/hostile/syndicate_mobs.dm
+2 -32
View File
@@ -38,12 +38,7 @@
/mob/living/simple_animal/hostile/syndicate/Initialize(mapload)
. = ..()
if(prob(50))
loot = list(/obj/effect/mob_spawn/human/corpse/syndicatesoldier,
/obj/item/salvage/loot/syndicate,
/obj/effect/decal/cleanable/blood/innards,
/obj/effect/decal/cleanable/blood,
/obj/effect/gibspawner/generic,
/obj/effect/gibspawner/generic)
loot += /obj/item/salvage/loot/syndicate
/mob/living/simple_animal/hostile/syndicate/Aggro()
. = ..()
@@ -308,12 +303,7 @@
speed = 2
projectiletype = /obj/item/projectile/bullet/sniper/penetrator // Ignores cover.
projectilesound = 'sound/weapons/gunshots/gunshot_sniper.ogg'
loot = list(/obj/effect/mob_spawn/human/corpse/syndicatequartermaster,
/obj/item/salvage/loot/syndicate,
/obj/effect/decal/cleanable/blood/innards,
/obj/effect/decal/cleanable/blood,
/obj/effect/gibspawner/generic,
/obj/effect/gibspawner/generic)
loot |= /obj/item/salvage/loot/syndicate
return INITIALIZE_HINT_LATELOAD
/mob/living/simple_animal/hostile/syndicate/melee/autogib/depot/armory/LateInitialize()
@@ -358,7 +348,6 @@
speed = 1.5
death_sound = 'sound/mecha/mechmove03.ogg'
loot = list(/obj/effect/mob_spawn/human/corpse/syndicatecommando,
/obj/item/salvage/loot/syndicate,
/obj/effect/decal/cleanable/blood/innards,
/obj/effect/decal/cleanable/blood,
/obj/effect/gibspawner/generic,
@@ -367,15 +356,6 @@
/mob/living/simple_animal/hostile/syndicate/melee/space/Process_Spacemove(movement_dir = 0)
return TRUE
/mob/living/simple_animal/hostile/syndicate/melee/space/Initialize(mapload)
. = ..()
if(prob(50))
loot = list(/obj/effect/mob_spawn/human/corpse/syndicatecommando,
/obj/effect/decal/cleanable/blood/innards,
/obj/effect/decal/cleanable/blood,
/obj/effect/gibspawner/generic,
/obj/effect/gibspawner/generic)
/mob/living/simple_animal/hostile/syndicate/ranged
ranged = TRUE
rapid = 2
@@ -394,16 +374,6 @@
speed = 1.5
death_sound = 'sound/mecha/mechmove03.ogg'
loot = list(/obj/effect/mob_spawn/human/corpse/syndicatecommando,
/obj/item/salvage/loot/syndicate,
/obj/effect/decal/cleanable/blood/innards,
/obj/effect/decal/cleanable/blood,
/obj/effect/gibspawner/generic,
/obj/effect/gibspawner/generic)
/mob/living/simple_animal/hostile/syndicate/ranged/space/Initialize(mapload)
. = ..()
if(prob(50))
loot = list(/obj/effect/mob_spawn/human/corpse/syndicatecommando,
/obj/effect/decal/cleanable/blood/innards,
/obj/effect/decal/cleanable/blood,
/obj/effect/gibspawner/generic,