mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-26 05:27:01 +01:00
Removes some non-existant typepaths (#27362)
* Adds CI for missing icon_states * yeah * more fixes * more fixes * seems good * moar * fix * yea * hrtyhrt * yeah * WOE * Removes some non-existant typepaths * yes
This commit is contained in:
@@ -1,10 +1,10 @@
|
||||
/**
|
||||
* Emotes usable by humanoid xenomorphs.
|
||||
*/
|
||||
/datum/emote/living/carbon/alien/humanoid
|
||||
/datum/emote/living/carbon/alien_humanoid
|
||||
mob_type_allowed_typecache = list(/mob/living/carbon/alien/humanoid)
|
||||
|
||||
/datum/emote/living/carbon/alien/humanoid/roar
|
||||
/datum/emote/living/carbon/alien_humanoid/roar
|
||||
key = "roar"
|
||||
key_third_person = "roars"
|
||||
message = "roars!"
|
||||
@@ -13,7 +13,7 @@
|
||||
sound = "sound/voice/hiss5.ogg"
|
||||
volume = 80
|
||||
|
||||
/datum/emote/living/carbon/alien/humanoid/hiss
|
||||
/datum/emote/living/carbon/alien_humanoid/hiss
|
||||
key = "hiss"
|
||||
key_third_person = "hisses"
|
||||
message = "hisses!"
|
||||
@@ -22,7 +22,7 @@
|
||||
sound = "sound/voice/hiss1.ogg"
|
||||
volume = 30
|
||||
|
||||
/datum/emote/living/carbon/alien/humanoid/gnarl
|
||||
/datum/emote/living/carbon/alien_humanoid/gnarl
|
||||
key = "gnarl"
|
||||
key_third_person = "gnarls"
|
||||
message = "gnarls and shows its teeth."
|
||||
|
||||
@@ -168,7 +168,7 @@
|
||||
to_chat(H, "<span class='warning'>You cannot weave a cocoon in your current state.</span>")
|
||||
return
|
||||
H.visible_message("<span class='notice'>[H] finishes weaving a cocoon!</span>", "<span class='notice'>You finish weaving your cocoon.</span>")
|
||||
var/obj/structure/moth/cocoon/C = new(get_turf(H))
|
||||
var/obj/structure/moth_cocoon/C = new(get_turf(H))
|
||||
H.forceMove(C)
|
||||
C.preparing_to_emerge = TRUE
|
||||
H.apply_status_effect(STATUS_EFFECT_COCOONED)
|
||||
@@ -181,14 +181,14 @@
|
||||
/**
|
||||
* Removes moth from cocoon, restores burnt wings
|
||||
*/
|
||||
/datum/action/innate/cocoon/proc/emerge(obj/structure/moth/cocoon/C)
|
||||
/datum/action/innate/cocoon/proc/emerge(obj/structure/moth_cocoon/C)
|
||||
for(var/mob/living/carbon/human/H in C.contents)
|
||||
H.remove_status_effect(STATUS_EFFECT_COCOONED)
|
||||
H.remove_status_effect(STATUS_EFFECT_BURNT_WINGS)
|
||||
C.preparing_to_emerge = FALSE
|
||||
qdel(C)
|
||||
|
||||
/obj/structure/moth/cocoon
|
||||
/obj/structure/moth_cocoon
|
||||
name = "\improper Nian cocoon"
|
||||
desc = "Someone wrapped in a Nian cocoon."
|
||||
icon = 'icons/effects/effects.dmi'
|
||||
@@ -197,11 +197,11 @@
|
||||
max_integrity = 60
|
||||
var/preparing_to_emerge
|
||||
|
||||
/obj/structure/moth/cocoon/Initialize(mapload)
|
||||
/obj/structure/moth_cocoon/Initialize(mapload)
|
||||
. = ..()
|
||||
icon_state = pick("cocoon1", "cocoon2", "cocoon3")
|
||||
|
||||
/obj/structure/moth/cocoon/Destroy()
|
||||
/obj/structure/moth_cocoon/Destroy()
|
||||
if(!preparing_to_emerge)
|
||||
visible_message("<span class='danger'>[src] splits open from within!</span>")
|
||||
else
|
||||
|
||||
@@ -1110,7 +1110,7 @@
|
||||
max_amount = 25
|
||||
|
||||
//Energy stack for landmines
|
||||
/datum/robot_storage/energy/janitor/landmine
|
||||
/datum/robot_storage/energy/jani_landmine
|
||||
name = "Landmine Synthesizer"
|
||||
statpanel_name = "Landmines"
|
||||
max_amount = 4
|
||||
|
||||
@@ -54,7 +54,7 @@
|
||||
add_language("Tkachi")
|
||||
evolve_action.Grant(src)
|
||||
|
||||
/mob/living/simple_animal/nian_caterpillar/proc/evolve(obj/structure/moth/cocoon/C, datum/mind/M)
|
||||
/mob/living/simple_animal/nian_caterpillar/proc/evolve(obj/structure/moth_cocoon/C, datum/mind/M)
|
||||
if(stat != CONSCIOUS)
|
||||
return FALSE
|
||||
|
||||
@@ -136,7 +136,7 @@
|
||||
button_overlay_icon = 'icons/effects/effects.dmi'
|
||||
button_overlay_icon_state = "cocoon1"
|
||||
|
||||
/datum/action/innate/nian_caterpillar_emerge/proc/emerge(obj/structure/moth/cocoon/C)
|
||||
/datum/action/innate/nian_caterpillar_emerge/proc/emerge(obj/structure/moth_cocoon/C)
|
||||
for(var/mob/living/carbon/human/H in C)
|
||||
H.remove_status_effect(STATUS_EFFECT_COCOONED)
|
||||
H.remove_status_effect(STATUS_EFFECT_BURNT_WINGS)
|
||||
@@ -148,7 +148,7 @@
|
||||
|
||||
user.visible_message("<span class='notice'>[user] begins to hold still and concentrate on weaving a cocoon...</span>", "<span class='notice'>You begin to focus on weaving a cocoon... (This will take [COCOON_WEAVE_DELAY / 10] seconds, and you must hold still.)</span>")
|
||||
if(do_after(user, COCOON_WEAVE_DELAY, FALSE, user))
|
||||
var/obj/structure/moth/cocoon/C = new(get_turf(user))
|
||||
var/obj/structure/moth_cocoon/C = new(get_turf(user))
|
||||
var/datum/mind/H = user.mind
|
||||
user.evolve(C, H)
|
||||
addtimer(CALLBACK(src, PROC_REF(emerge), C), COCOON_EMERGE_DELAY, TIMER_UNIQUE)
|
||||
|
||||
@@ -45,7 +45,7 @@
|
||||
|
||||
/mob/living/simple_animal/hostile/gorilla/Initialize(mapload)
|
||||
. = ..()
|
||||
var/datum/action/innate/gorilla/gorilla_toggle/toggle = new
|
||||
var/datum/action/innate/gorilla_toggle/toggle = new
|
||||
toggle.Grant(src)
|
||||
var/static/default_cache = typecacheof(list(/obj/structure/closet/crate)) // Normal crates only please, no weird sized ones
|
||||
carriable_cache = default_cache
|
||||
@@ -54,14 +54,14 @@
|
||||
LAZYCLEARLIST(crates_in_hand)
|
||||
return ..()
|
||||
|
||||
/datum/action/innate/gorilla/gorilla_toggle
|
||||
/datum/action/innate/gorilla_toggle
|
||||
name = "Toggle Stand"
|
||||
desc = "Toggles between crawling and standing up."
|
||||
button_overlay_icon = 'icons/mob/actions/actions_animal.dmi'
|
||||
button_overlay_icon_state = "gorilla_toggle"
|
||||
check_flags = AB_CHECK_CONSCIOUS
|
||||
|
||||
/datum/action/innate/gorilla/gorilla_toggle/Activate()
|
||||
/datum/action/innate/gorilla_toggle/Activate()
|
||||
. = ..()
|
||||
var/mob/living/simple_animal/hostile/gorilla/gorilla = owner
|
||||
if(!istype(gorilla))
|
||||
|
||||
@@ -37,7 +37,7 @@
|
||||
|
||||
/mob/living/simple_animal/hostile/hellhound/Initialize(mapload)
|
||||
. = ..()
|
||||
var/datum/action/innate/demon/whisper/whisper_action = new
|
||||
var/datum/action/innate/demon_whisper/whisper_action = new
|
||||
whisper_action.Grant(src)
|
||||
ADD_TRAIT(src, TRAIT_NOBREATH, SPECIES_TRAIT)
|
||||
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
name = "Short Horns"
|
||||
icon_state = "short_horns"
|
||||
|
||||
/datum/sprite_accessory/hairy/unathi/curled
|
||||
/datum/sprite_accessory/hair/unathi/curled
|
||||
name = "Curled Horns"
|
||||
icon_state = "curled_horns"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user