mirror of
https://github.com/KabKebab/GS13.git
synced 2026-07-09 23:21:02 +01:00
Merge pull request #1179 from lyricalpaws/lets-go-mining
Mining balance changes, some new icons, and good stuff.
This commit is contained in:
@@ -544,6 +544,20 @@
|
||||
O.setOrganDamage(0)
|
||||
SEND_SIGNAL(src, COMSIG_LIVING_FULLY_HEAL, admin_revive)
|
||||
|
||||
//fuck shitcode I hate shitcode
|
||||
/mob/living/proc/legion_heal()
|
||||
restore_blood()
|
||||
setStaminaLoss(0, 0)
|
||||
SetUnconscious(0, FALSE)
|
||||
SetStun(0, FALSE)
|
||||
SetKnockdown(0, FALSE)
|
||||
SetSleeping(0, FALSE)
|
||||
bodytemperature = BODYTEMP_NORMAL
|
||||
heal_overall_damage(INFINITY, INFINITY, INFINITY, FALSE, FALSE, TRUE) //heal brute and burn dmg on both organic and robotic limbs, and update health right away.
|
||||
ExtinguishMob()
|
||||
fire_stacks = 0
|
||||
update_canmove()
|
||||
SEND_SIGNAL(src, COMSIG_LIVING_FULLY_HEAL)
|
||||
|
||||
//proc called by revive(), to check if we can actually ressuscitate the mob (we don't want to revive him and have him instantly die again)
|
||||
/mob/living/proc/can_be_revived()
|
||||
|
||||
@@ -269,7 +269,7 @@
|
||||
H.dna.add_mutation(DWARFISM)
|
||||
|
||||
/obj/effect/mob_spawn/human/corpse/damaged/legioninfested/Initialize()
|
||||
var/type = pickweight(list("Miner" = 66, "Ashwalker" = 10, "Golem" = 10,"Clown" = 10, pick(list("Shadow", "YeOlde","Operative", "Cultist", "Lavaknight")) = 4)) //CIT CHANGE: Lavaknights
|
||||
var/type = pickweight(list("Miner" = 66, "Ashwalker" = 10, "Golem" = 10,"Clown" = 10, pick(list("Shadow", "YeOlde", "Cultist", "Lavaknight")) = 4)) //CIT CHANGE: Lavaknights
|
||||
switch(type)
|
||||
if("Miner")
|
||||
mob_species = pickweight(list(/datum/species/human = 70, /datum/species/lizard = 26, /datum/species/fly = 2, /datum/species/plasmaman = 2))
|
||||
@@ -346,9 +346,6 @@
|
||||
belt = /obj/item/nullrod/claymore
|
||||
r_pocket = /obj/item/tank/internals/emergency_oxygen
|
||||
mask = /obj/item/clothing/mask/breath
|
||||
if("Operative")
|
||||
id_job = "Operative"
|
||||
outfit = /datum/outfit/syndicatecommandocorpse
|
||||
if("Shadow")
|
||||
mob_species = /datum/species/shadow
|
||||
r_pocket = /obj/item/reagent_containers/pill/shadowtoxin
|
||||
|
||||
Reference in New Issue
Block a user