cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-25 22:19:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Missing sprite fixes; telebatons, bullets, bottles, dead facehuggers (#3229)

Browse Source 
* Missing sprite fixes; telebatons, bullets, bottles, dead facehuggers (#56735)

* Missing sprite fixes; telebatons, bullets, bottles, dead facehuggers

Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com>
This commit is contained in:
SkyratBot
2021-02-09 09:47:45 +00:00
committed by GitHub
co-authored by necromanceranne
parent c6efd50cf2
commit aa4466afe1
4 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/alien/special/facehugger.dm
+16 -9
View File
@@ -13,7 +13,9 @@
desc = "It has some sort of a tube at the end of its tail."
icon = 'icons/mob/alien.dmi'
icon_state = "facehugger"
base_icon_state = "facehugger"
inhand_icon_state = "facehugger"
worn_icon_state = "facehugger"
w_class = WEIGHT_CLASS_TINY //note: can be picked up by aliens unlike most other items of w_class below 4
clothing_flags = MASKINTERNALS
throw_range = 5
@@ -48,12 +50,13 @@
/obj/item/clothing/mask/facehugger/dead
icon_state = "facehugger_dead"
inhand_icon_state = "facehugger_inactive"
worn_icon_state = "facehugger_dead"
stat = DEAD
/obj/item/clothing/mask/facehugger/impregnated
icon_state = "facehugger_impregnated"
inhand_icon_state = "facehugger_impregnated"
worn_icon_state = "facehugger_dead"
worn_icon_state = "facehugger_impregnated"
stat = DEAD
/obj/item/clothing/mask/facehugger/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir)
@@ -115,17 +118,17 @@
if(!.)
return
if(stat == CONSCIOUS)
icon_state = "[initial(icon_state)]_thrown"
icon_state = "[base_icon_state]_thrown"
addtimer(CALLBACK(src, .proc/clear_throw_icon_state), 15)
/obj/item/clothing/mask/facehugger/proc/clear_throw_icon_state()
if(icon_state == "[initial(icon_state)]_thrown")
icon_state = "[initial(icon_state)]"
if(icon_state == "[base_icon_state]_thrown")
icon_state = "[base_icon_state]"
/obj/item/clothing/mask/facehugger/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
..()
if(stat == CONSCIOUS)
icon_state = "[initial(icon_state)]"
icon_state = "[base_icon_state]"
Leap(hit_atom)
/obj/item/clothing/mask/facehugger/proc/valid_to_attach(mob/living/M)
@@ -216,7 +219,8 @@
"<span class='userdanger'>[src] falls limp after violating your face!</span>")
Die()
icon_state = "[initial(icon_state)]_impregnated"
icon_state = "[base_icon_state]_impregnated"
worn_icon_state = "[base_icon_state]_impregnated"
var/obj/item/bodypart/chest/LC = target.get_bodypart(BODY_ZONE_CHEST)
if((!LC || LC.status != BODYPART_ROBOTIC) && !target.getorgan(/obj/item/organ/body_egg/alien_embryo))
@@ -233,14 +237,16 @@
return
stat = CONSCIOUS
icon_state = "[initial(icon_state)]"
icon_state = "[base_icon_state]"
worn_icon_state = "[base_icon_state]"
/obj/item/clothing/mask/facehugger/proc/GoIdle()
if(stat == DEAD || stat == UNCONSCIOUS)
return
stat = UNCONSCIOUS
icon_state = "[initial(icon_state)]_inactive"
icon_state = "[base_icon_state]_inactive"
worn_icon_state = "[base_icon_state]_inactive"
addtimer(CALLBACK(src, .proc/GoActive), rand(MIN_ACTIVE_TIME, MAX_ACTIVE_TIME))
@@ -248,7 +254,8 @@
if(stat == DEAD)
return
icon_state = "[initial(icon_state)]_dead"
icon_state = "[base_icon_state]_dead"
worn_icon_state = "[base_icon_state]_dead"
inhand_icon_state = "facehugger_inactive"
stat = DEAD