diff --git a/code/game/gamemodes/blob/blobs/blob_mobs.dm b/code/game/gamemodes/blob/blobs/blob_mobs.dm index 66a303d6f16..bb1d37faa29 100644 --- a/code/game/gamemodes/blob/blobs/blob_mobs.dm +++ b/code/game/gamemodes/blob/blobs/blob_mobs.dm @@ -82,8 +82,8 @@ desc = "A floating, fragile spore." icon_state = "blobpod" icon_living = "blobpod" - health = 40 - maxHealth = 40 + health = 30 + maxHealth = 30 verb_say = "psychically pulses" verb_ask = "psychically probes" verb_exclaim = "psychically yells" @@ -91,7 +91,7 @@ melee_damage_lower = 2 melee_damage_upper = 4 obj_damage = 20 - environment_smash = 0 + environment_smash = 1 attacktext = "hits" attack_sound = 'sound/weapons/genhit1.ogg' flying = 1 diff --git a/code/game/gamemodes/blob/powers.dm b/code/game/gamemodes/blob/powers.dm index 8cdca0ae62d..b5118a6bf0f 100644 --- a/code/game/gamemodes/blob/powers.dm +++ b/code/game/gamemodes/blob/powers.dm @@ -34,7 +34,7 @@ else src << "There is already a blob here!" return 0 - if(O.density) + else if(O.density) src << "This spot is too dense to place a blob core on!" return 0 if(world.time <= manualplace_min_time && world.time <= autoplace_max_time) @@ -170,7 +170,6 @@ var/list/mob/dead/observer/candidates = pollCandidatesForMob("Do you want to play as a [blob_reagent_datum.name] blobbernaut?", ROLE_BLOB, null, ROLE_BLOB, 50, blobber) //players must answer rapidly if(candidates.len) //if we got at least one candidate, they're a blobbernaut now. var/client/C = pick(candidates) - blobber.notransform = 0 blobber.key = C.key blobber << 'sound/effects/blobattack.ogg' blobber << 'sound/effects/attackblob.ogg' @@ -179,8 +178,8 @@ blobber << "You can communicate with other blobbernauts and overminds via :b" blobber << "Your overmind's blob reagent is: [blob_reagent_datum.name]!" blobber << "The [blob_reagent_datum.name] reagent [blob_reagent_datum.shortdesc ? "[blob_reagent_datum.shortdesc]" : "[blob_reagent_datum.description]"]" - else - blobber.notransform = 0 //otherwise, just let it move + if(blobber) + blobber.notransform = 0 /mob/camera/blob/verb/relocate_core() set category = "Blob" diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 9c97338acf2..1933cf891ff 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -37,9 +37,8 @@ qdel(I) staticOverlays.len = 0 remove_from_all_data_huds() - ..() - return QDEL_HINT_HARDDEL + return ..() /mob/living/proc/OpenCraftingMenu() diff --git a/code/modules/mob/living/silicon/robot/robot_defense.dm b/code/modules/mob/living/silicon/robot/robot_defense.dm index 4bd5bc8d278..bd7adc230f3 100644 --- a/code/modules/mob/living/silicon/robot/robot_defense.dm +++ b/code/modules/mob/living/silicon/robot/robot_defense.dm @@ -152,14 +152,11 @@ /mob/living/silicon/robot/blob_act(obj/structure/blob/B) - if (stat != 2) - adjustBruteLoss(60) - updatehealth() - return 1 + if(stat != DEAD) + adjustBruteLoss(30) else gib() - return 1 - return 0 + return TRUE /mob/living/silicon/robot/ex_act(severity, target) switch(severity) diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index e6a735b39a9..6e72855055d 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -16,7 +16,8 @@ qdel(cc) client_colours = null ghostize() - return ..() + ..() + return QDEL_HINT_HARDDEL var/next_mob_id = 0 /mob/New()