mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-26 13:37:58 +01:00
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
# Conflicts: # icons/mob/actions/actions.dmi # icons/mob/inhands/items_lefthand.dmi # icons/mob/inhands/items_righthand.dmi # paradise.dme
This commit is contained in:
@@ -956,9 +956,6 @@ var/list/slot_equipment_priority = list( \
|
||||
|
||||
statpanel("Status") // We only want alt-clicked turfs to come before Status
|
||||
|
||||
if(mind && mind.changeling)
|
||||
add_stings_to_statpanel(mind.changeling.purchasedpowers)
|
||||
|
||||
if(mob_spell_list && mob_spell_list.len)
|
||||
for(var/obj/effect/proc_holder/spell/S in mob_spell_list)
|
||||
add_spell_to_statpanel(S)
|
||||
@@ -1025,12 +1022,6 @@ var/list/slot_equipment_priority = list( \
|
||||
statpanel_things += A
|
||||
statpanel(listed_turf.name, null, statpanel_things)
|
||||
|
||||
|
||||
/mob/proc/add_stings_to_statpanel(var/list/stings)
|
||||
for(var/obj/effect/proc_holder/changeling/S in stings)
|
||||
if(S.chemical_cost >=0 && S.can_be_used_by(src))
|
||||
statpanel("[S.panel]",((S.chemical_cost > 0) ? "[S.chemical_cost]" : ""),S)
|
||||
|
||||
/mob/proc/add_spell_to_statpanel(var/obj/effect/proc_holder/spell/S)
|
||||
switch(S.charge_type)
|
||||
if("recharge")
|
||||
@@ -1040,7 +1031,6 @@ var/list/slot_equipment_priority = list( \
|
||||
if("holdervar")
|
||||
statpanel(S.panel,"[S.holder_var_type] [S.holder_var_amount]",S)
|
||||
|
||||
|
||||
// facing verbs
|
||||
/mob/proc/canface()
|
||||
if(!canmove) return 0
|
||||
|
||||
Reference in New Issue
Block a user