Skip to content

Commit 095f93c

Browse files
Converts mimic mobs to basic mobs (ParadiseSS13#31424)
* Converts mimic mobs to basic mobs * Unit tests * Units
1 parent 4b2661c commit 095f93c

File tree

11 files changed

+451
-357
lines changed

11 files changed

+451
-357
lines changed

_maps/map_files/RandomRuins/SpaceRuins/wizardcrash.dmm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,7 @@
396396
/turf/simulated/floor/mineral/plasma,
397397
/area/ruin/space/powered)
398398
"bz" = (
399-
/mob/living/simple_animal/hostile/mimic/crate,
399+
/mob/living/basic/mimic/crate,
400400
/obj/effect/spawner/random/pool/spaceloot/syndicate/mixed,
401401
/turf/simulated/floor/plating,
402402
/area/ruin/space/powered)

code/datums/components/ranged_attacks.dm

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,4 +87,6 @@
8787
target_zone = ran_zone()
8888
casing.fire(target, firer, null, null, null, target_zone, 0, firer)
8989
casing.update_appearance()
90+
if(istype(casing, /obj/item/ammo_casing/energy))
91+
qdel(casing)
9092
SEND_SIGNAL(parent, COMSIG_BASICMOB_POST_ATTACK_RANGED, target, modifiers)

code/game/gamemodes/malfunction/Malf_Modules.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -553,7 +553,7 @@
553553

554554
/datum/spell/ai_spell/ranged/override_machine/proc/animate_machine(obj/machinery/M, mob/user)
555555
if(M && !QDELETED(M))
556-
new /mob/living/simple_animal/hostile/mimic/copy/machine(get_turf(M), M, user, 1)
556+
new /mob/living/basic/mimic/copy/machine(get_turf(M), M, user, 1)
557557

558558
//Robotic Factory: Places a large machine that converts humans that go through it into cyborgs. Unlocking this ability removes shunting.
559559
/datum/ai_module/place_cyborg_transformer

code/modules/events/brand_intelligence.dm

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,8 @@
6262
// let them become "normal" after turning
6363
upriser.shoot_inventory = FALSE
6464
upriser.aggressive = FALSE
65-
var/mob/living/simple_animal/hostile/mimic/copy/vendor/M = new(upriser.loc, upriser, null)
65+
var/mob/living/basic/mimic/copy/vendor/M = new(upriser.loc, upriser, null)
6666
M.faction = list("profit")
67-
M.speak = rampant_speeches.Copy()
68-
M.speak_chance = 15
6967
else
7068
explosion(upriser.loc, -1, 1, 2, 4, 0, cause = "Brand Intelligence Uprising")
7169
qdel(upriser)

0 commit comments

Comments
 (0)