carnie
5e7cffcf5c
>update_mutantrace() is no more, it is now part of update_body() >Moved a lot of stuff into update_base_icon_state(), this will allow making mutantraces modular. Almost all icon operations are now removed from human overlays (obviously some are still required for recolouring hair and eyes). Any remaining dynamically generated overlay icons are applied individually. This will allow byond to cache them better. This will also eliminate the bug where humans are initially invisible/unclickable when you first encounter them (due to network latency where the icons are being downloaded). >UpdateDamageIcons() renamed to update_damage_overlays(), so it has the same sort of name as the other procs >update_icons=true or false arguments removed from human overaly-update procs, no longer required. (i.e. the update_body() update_inv_whatever etc procs do not call update_icons() - see documentation for details) >mutantrace icon_states moved into human.dmi >skeletons are now a mutantrace, not a mutation. >update_icons system should now be even more efficient (thanks partly to aranclanos) >documentation rewritten >copypasted code moved into helper procs - super tidy code :3 Other: >Removed compile error where the core code was reliant on compiling away mission code. >:[ >s_tone renamed to skin_tone Modified code/modules/mob/living/carbon/human/update_icons.dm Modified code/__DEFINES.dm Modified code/datums/datumvars.dm Modified code/datums/limbs.dm Modified code/game/dna.dm Modified code/game/gamemodes/changeling/changeling_powers.dm Modified code/game/gamemodes/cult/cult_items.dm Modified code/game/gamemodes/cult/runes.dm Modified code/game/machinery/doors/airlock.dm Modified code/game/machinery/portable_turret.dm Modified code/game/machinery/teleporter.dm Modified code/game/mecha/combat/combat.dm Modified code/game/objects/items.dm Modified code/game/objects/items/stacks/medical.dm Modified code/game/objects/items/stacks/sheets/glass.dm Modified code/game/objects/items/weapons/storage/bible.dm Modified code/modules/assembly/mousetrap.dm Modified code/modules/hydroponics/hydroitemcode.dm Modified code/modules/mob/living/carbon/carbon.dm Modified code/modules/mob/living/carbon/human/death.dm Modified code/modules/mob/living/carbon/human/human.dm Modified code/modules/mob/living/carbon/human/human_damage.dm Modified code/modules/mob/living/carbon/human/human_defines.dm Modified code/modules/mob/living/living.dm Modified code/modules/mob/living/simple_animal/friendly/slime.dm Modified code/modules/mob/mob_grab.dm Modified code/modules/power/lighting.dm Modified code/modules/reagents/Chemistry-Reagents.dm Modified code/unused/_debug.dm Modified icons/effects/genetics.dmi Modified icons/mob/human.dmi Modified maps/RandomZLevels/wildwest.dm Modified tgstation.dme Signed-off-by: carnie <elly1989@rocketmail.com>
85 lines
2.3 KiB
Plaintext
85 lines
2.3 KiB
Plaintext
/obj/item/stack/medical
|
|
name = "medical pack"
|
|
singular_name = "medical pack"
|
|
icon = 'icons/obj/items.dmi'
|
|
amount = 5
|
|
max_amount = 5
|
|
w_class = 1
|
|
throw_speed = 4
|
|
throw_range = 20
|
|
var/heal_brute = 0
|
|
var/heal_burn = 0
|
|
|
|
/obj/item/stack/medical/attack(mob/living/carbon/M as mob, mob/user as mob)
|
|
if (M.stat == 2)
|
|
var/t_him = "it"
|
|
if (M.gender == MALE)
|
|
t_him = "him"
|
|
else if (M.gender == FEMALE)
|
|
t_him = "her"
|
|
user << "\red \The [M] is dead, you cannot help [t_him]!"
|
|
return
|
|
|
|
if (!istype(M))
|
|
user << "\red \The [src] cannot be applied to [M]!"
|
|
return 1
|
|
|
|
if ( ! (istype(user, /mob/living/carbon/human) || \
|
|
istype(user, /mob/living/silicon) || \
|
|
istype(user, /mob/living/carbon/monkey) && ticker && ticker.mode.name == "monkey") )
|
|
user << "\red You don't have the dexterity to do this!"
|
|
return 1
|
|
|
|
if (user)
|
|
if (M != user)
|
|
user.visible_message( \
|
|
"\blue [M] has been applied with [src] by [user].", \
|
|
"\blue You apply \the [src] to [M]." \
|
|
)
|
|
else
|
|
var/t_himself = "itself"
|
|
if (user.gender == MALE)
|
|
t_himself = "himself"
|
|
else if (user.gender == FEMALE)
|
|
t_himself = "herself"
|
|
|
|
user.visible_message( \
|
|
"\blue [M] applied [src] on [t_himself].", \
|
|
"\blue You apply \the [src] on yourself." \
|
|
)
|
|
|
|
if (istype(M, /mob/living/carbon/human))
|
|
var/mob/living/carbon/human/H = M
|
|
var/datum/limb/affecting = H.get_organ("chest")
|
|
|
|
if(istype(user, /mob/living/carbon/human))
|
|
var/mob/living/carbon/human/user2 = user
|
|
affecting = H.get_organ(check_zone(user2.zone_sel.selecting))
|
|
else
|
|
if(!istype(affecting, /datum/limb) || affecting:burn_dam <= 0)
|
|
affecting = H.get_organ("head")
|
|
|
|
if (affecting.heal_damage(src.heal_brute, src.heal_burn))
|
|
H.update_damage_overlays(0)
|
|
M.updatehealth()
|
|
else
|
|
M.heal_organ_damage((src.heal_brute/2), (src.heal_burn/2))
|
|
|
|
use(1)
|
|
|
|
/obj/item/stack/medical/bruise_pack
|
|
name = "bruise pack"
|
|
singular_name = "bruise pack"
|
|
desc = "A pack designed to treat blunt-force trauma."
|
|
icon_state = "brutepack"
|
|
heal_brute = 60
|
|
origin_tech = "biotech=1"
|
|
|
|
/obj/item/stack/medical/ointment
|
|
name = "ointment"
|
|
desc = "Used to treat those nasty burns."
|
|
gender = PLURAL
|
|
singular_name = "ointment"
|
|
icon_state = "ointment"
|
|
heal_burn = 40
|
|
origin_tech = "biotech=1" |