cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-19 19:13:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Stamp People (#14628)" (#15125)

Browse Source 
This reverts commit ad891d8e98.
This commit is contained in:
AffectedArc07
2020-12-16 21:01:04 +00:00
committed by GitHub
parent 2bad70717c
commit 8cb3571a9c
7 changed files with 4 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/examine.dm
-13
View File
@@ -166,19 +166,6 @@
if(wear_id)
msg += "[p_they(TRUE)] [p_are()] wearing [bicon(wear_id)] \a [wear_id].\n"
//Stamp Marks
var/stamps_len = length(stamp_marks_desc)
if(stamps_len)
msg += "[p_they(TRUE)] [p_have()] been stamped: "
if(stamps_len > 2)
msg += stamp_marks_desc.Join(", ", 1, stamps_len - 1)
msg += ", and [stamp_marks_desc[stamps_len]]"
else if(stamps_len == 2)
msg += "[stamp_marks_desc[1]], and [stamp_marks_desc[2]]"
else
msg += stamp_marks_desc[1]
msg += ".\n"
//Jitters
switch(jitteriness)
if(300 to INFINITY)
code/modules/mob/living/carbon/human/human.dm
-5
View File
@@ -5,13 +5,8 @@
icon = 'icons/mob/human.dmi'
icon_state = "body_m_s"
deathgasp_on_death = TRUE
/// descriptions of stamps applied to this human that will be visible on examine
var/list/stamp_marks_desc = list()
/// combined image of all the stamp marks
var/image/stamp_marks
/mob/living/carbon/human/New(loc)
stamp_marks = new /image()
icon = null // This is now handled by overlays -- we just keep an icon for the sake of the map editor.
if(length(args) > 1)
log_runtime(EXCEPTION("human/New called with more than 1 argument (REPORT THIS ENTIRE RUNTIME TO A CODER)"))
code/modules/mob/living/carbon/human/update_icons.dm
+3 -6
View File
@@ -522,7 +522,6 @@ GLOBAL_LIST_EMPTY(damage_icon_parts)
update_inv_legcuffed()
update_inv_pockets()
update_inv_wear_pda()
update_misc_effects()
UpdateDamageIcon()
force_update_limbs()
update_tail_layer()
@@ -1259,13 +1258,11 @@ GLOBAL_LIST_EMPTY(damage_icon_parts)
/mob/living/carbon/human/proc/update_misc_effects()
remove_overlay(MISC_LAYER)
var/mutable_appearance/standing = mutable_appearance(layer = -MISC_LAYER)
if(length(stamp_marks.overlays))
standing.overlays += stamp_marks
//Begin appending miscellaneous effects.
if(eyes_shine())
standing.overlays += get_eye_shine() //Image layer is specified in get_eye_shine() proc as LIGHTING_LAYER + 1.
overlays_standing[MISC_LAYER] = standing
overlays_standing[MISC_LAYER] = get_eye_shine() //Image layer is specified in get_eye_shine() proc as LIGHTING_LAYER + 1.
apply_overlay(MISC_LAYER)
/mob/living/carbon/human/proc/update_halo_layer()