cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-20 18:47:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Invasion of the moffs (#17000)

Browse Source 
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Co-authored-by: mochi <1496804+dearmochi@users.noreply.github.com>
This commit is contained in:
S34N
2022-02-23 20:37:37 +01:00
committed by GitHub
co-authored by AffectedArc07 mochi
parent 1aa4222695
commit a5bc67cd43
55 changed files with 880 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/action.dm
+4
View File
@@ -2,6 +2,7 @@
#define AB_CHECK_STUNNED 2
#define AB_CHECK_LYING 4
#define AB_CHECK_CONSCIOUS 8
#define AB_CHECK_TURF 16
/datum/action
@@ -83,6 +84,9 @@
if(check_flags & AB_CHECK_CONSCIOUS)
if(owner.stat)
return FALSE
if(check_flags & AB_CHECK_TURF)
if(!isturf(owner.loc))
return FALSE
return TRUE
/datum/action/proc/UpdateButtonIcon()
code/datums/datacore.dm
+4 -1
View File
@@ -245,12 +245,15 @@ GLOBAL_VAR_INIT(record_id_num, 1001)
preview_icon.Blend(temp, ICON_OVERLAY)
//Tail
if(H.body_accessory && istype(H.body_accessory, /datum/body_accessory/tail))
if(H.body_accessory && (istype(H.body_accessory, /datum/body_accessory/tail) || istype(H.body_accessory, /datum/body_accessory/wing)))
temp = new/icon("icon" = H.body_accessory.icon, "icon_state" = H.body_accessory.icon_state)
preview_icon.Blend(temp, ICON_OVERLAY)
else if(H.tail && H.dna.species.bodyflags & HAS_TAIL)
temp = new/icon("icon" = 'icons/effects/species.dmi', "icon_state" = "[H.tail]_s")
preview_icon.Blend(temp, ICON_OVERLAY)
else if(H.wing && H.dna.species.bodyflags & HAS_WING)
temp = new/icon("icon" = 'icons/effects/species.dmi', "icon_state" = "[H.wing]_s")
preview_icon.Blend(temp, ICON_OVERLAY)
for(var/obj/item/organ/external/E in H.bodyparts)
preview_icon.Blend(E.get_icon(), ICON_OVERLAY)