mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-24 04:27:35 +01:00
Removes Fat Sprites (#13430)
* Removes Fat Sprites * fat vs chubby * edge case
This commit is contained in:
@@ -305,10 +305,14 @@
|
||||
icon = 'icons/obj/power.dmi'
|
||||
icon_state = "wire1"
|
||||
flags = NOBLUDGEON
|
||||
var/drawing_power = FALSE
|
||||
|
||||
/obj/item/apc_powercord/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
|
||||
if(!istype(target, /obj/machinery/power/apc) || !ishuman(user) || !proximity_flag)
|
||||
return ..()
|
||||
if(drawing_power)
|
||||
to_chat(user, "<span class='warning'>You're already charging.</span>")
|
||||
return
|
||||
user.changeNext_move(CLICK_CD_MELEE)
|
||||
var/obj/machinery/power/apc/A = target
|
||||
var/mob/living/carbon/human/H = user
|
||||
@@ -329,6 +333,7 @@
|
||||
|
||||
/obj/item/apc_powercord/proc/powerdraw_loop(obj/machinery/power/apc/A, mob/living/carbon/human/H)
|
||||
H.visible_message("<span class='notice'>[H] inserts a power connector into \the [A].</span>", "<span class='notice'>You begin to draw power from \the [A].</span>")
|
||||
drawing_power = TRUE
|
||||
while(do_after(H, 10, target = A))
|
||||
if(loc != H)
|
||||
to_chat(H, "<span class='warning'>You must keep your connector out while charging!</span>")
|
||||
@@ -350,6 +355,7 @@
|
||||
to_chat(H, "<span class='notice'>You are now fully charged.</span>")
|
||||
break
|
||||
H.visible_message("<span class='notice'>[H] unplugs from \the [A].</span>", "<span class='notice'>You unplug from \the [A].</span>")
|
||||
drawing_power = FALSE
|
||||
|
||||
/obj/item/organ/internal/cyberimp/arm/telebaton
|
||||
name = "telebaton implant"
|
||||
|
||||
@@ -62,7 +62,7 @@ GLOBAL_LIST_EMPTY(limb_icon_cache)
|
||||
get_icon()
|
||||
. = ..()
|
||||
|
||||
/obj/item/organ/external/proc/get_icon(skeletal, fat)
|
||||
/obj/item/organ/external/proc/get_icon(skeletal)
|
||||
// Kasparrov, you monster
|
||||
if(force_icon)
|
||||
mob_icon = new /icon(force_icon, "[icon_name]")
|
||||
@@ -181,13 +181,6 @@ GLOBAL_LIST_EMPTY(limb_icon_cache)
|
||||
icon_file = icobase
|
||||
return list(icon_file, new_icon_state)
|
||||
|
||||
/obj/item/organ/external/chest/get_icon_state(skeletal)
|
||||
var/result = ..()
|
||||
if(fat && !skeletal && !is_robotic() && (CAN_BE_FAT in dna.species.species_traits))
|
||||
result[2] += "_fat"
|
||||
return result
|
||||
|
||||
|
||||
// new damage icon system
|
||||
// adjusted to set damage_state to brute/burn code only (without r_name0 as before)
|
||||
/obj/item/organ/external/update_icon()
|
||||
|
||||
@@ -15,27 +15,8 @@
|
||||
gendered_icon = 1
|
||||
parent_organ = null
|
||||
encased = "ribcage"
|
||||
var/fat = FALSE
|
||||
convertable_children = list(/obj/item/organ/external/groin)
|
||||
|
||||
/obj/item/organ/external/chest/proc/makeFat(update_body_icon = 1)
|
||||
fat = TRUE
|
||||
if(owner)
|
||||
owner.update_body(update_body_icon)
|
||||
else
|
||||
// get_icon updates the sprite icon, update_icon updates the injuries overlay.
|
||||
// Madness.
|
||||
get_icon()
|
||||
|
||||
/obj/item/organ/external/chest/proc/makeSlim(update_body_icon = 1)
|
||||
fat = FALSE
|
||||
if(owner)
|
||||
owner.update_body(update_body_icon)
|
||||
else
|
||||
// get_icon updates the sprite icon, update_icon updates the injuries overlay.
|
||||
// Madness.
|
||||
get_icon()
|
||||
|
||||
/obj/item/organ/external/groin
|
||||
name = "lower body"
|
||||
limb_name = "groin"
|
||||
|
||||
Reference in New Issue
Block a user