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

Makes cling tentacle more reliable / less shit (#19855)

Browse Source 
* Cling tentacle love, part 1/2

* legcuff sprite

* S34N's changes

* Apply suggestions from code review

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

* attack logs.

* BOY I LOVE ICON CONFLICTS 1/3

* BOY I LOVE ICON CONFLICTS (3/3)

* EYE FOR AN ICON

* description update

* Final changes, whoops

* [H]

* swap the order

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
This commit is contained in:
Qwertytoforty
2023-01-06 21:31:37 +01:00
committed by GitHub
co-authored by Farie82
parent d1e30b9854
commit 7fb017915f
9 changed files with 89 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/carbon_defines.dm
+4 -2
View File
@@ -8,8 +8,10 @@
var/life_tick = 0 // The amount of life ticks that have processed on this mob.
var/obj/item/restraints/handcuffs/handcuffed = null //Whether or not the mob is handcuffed, restraints/handcuffs/ required for var/cuffed_state
var/obj/item/legcuffed = null //Same as handcuffs but for legs. Bear traps use this.
/// Whether or not the mob is handcuffed, restraints/handcuffs/ required for var/cuffed_state
var/obj/item/restraints/handcuffs/handcuffed = null
/// Same as handcuffs but for legs. Bear traps use this.
var/obj/item/restraints/legcuffs/legcuffed = null
var/obj/item/head = null
var/obj/item/clothing/suit/wear_suit = null //TODO: necessary? Are they even used? ~Carn
code/modules/mob/living/carbon/human/update_icons.dm
+1 -1
View File
@@ -1047,7 +1047,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts)
remove_overlay(LEGCUFF_LAYER)
clear_alert("legcuffed")
if(legcuffed)
overlays_standing[LEGCUFF_LAYER] = mutable_appearance('icons/mob/mob.dmi', "legcuff", layer = -LEGCUFF_LAYER)
overlays_standing[LEGCUFF_LAYER] = mutable_appearance('icons/mob/mob.dmi', legcuffed.cuffed_state, layer = -LEGCUFF_LAYER)
throw_alert("legcuffed", /obj/screen/alert/restrained/legcuffed, new_master = legcuffed)
if(m_intent != MOVE_INTENT_WALK)
m_intent = MOVE_INTENT_WALK