From 8cb3571a9cb07be0b0359520ba27d38b648cc2fa Mon Sep 17 00:00:00 2001 From: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Date: Wed, 16 Dec 2020 21:01:04 +0000 Subject: [PATCH] Revert "Stamp People (#14628)" (#15125) This reverts commit ad891d8e98d3de58b9067a84b17d62eb869e3879. --- code/game/atoms.dm | 3 - code/modules/clothing/chameleon.dm | 6 -- .../mob/living/carbon/human/examine.dm | 13 --- code/modules/mob/living/carbon/human/human.dm | 5 - .../mob/living/carbon/human/update_icons.dm | 9 +- code/modules/paperwork/stamps.dm | 86 +----------------- icons/effects/stamp_marks.dmi | Bin 1147 -> 0 bytes 7 files changed, 4 insertions(+), 118 deletions(-) delete mode 100644 icons/effects/stamp_marks.dmi diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 1a2bd840dda..2ab953e5fc3 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -767,9 +767,6 @@ GLOBAL_LIST_EMPTY(blood_splatter_icons) if(belt) if(belt.clean_blood()) update_inv_belt() - stamp_marks.cut_overlays() - stamp_marks_desc = list() // clean stamp mark desc - update_misc_effects() ..(clean_hands, clean_mask, clean_feet) update_icons() //apply the now updated overlays to the mob diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm index 2344373a255..38b49314667 100644 --- a/code/modules/clothing/chameleon.dm +++ b/code/modules/clothing/chameleon.dm @@ -168,12 +168,6 @@ target.icon = initial(picked_item.icon) - if(istype(target, /obj/item/stamp)) - var/obj/item/stamp/S = target - var/obj/item/stamp/P = picked_item - S.stamp_color = initial(P.stamp_color) - S.stamp_description = initial(P.stamp_description) - /datum/action/item_action/chameleon/change/Trigger() if(!IsAvailable()) return diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index 7076fbaf221..78489251ca1 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -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) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 6d08531bf07..8a804dc801c 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -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)")) diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index 67e54962c2e..91f285b2873 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -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() diff --git a/code/modules/paperwork/stamps.dm b/code/modules/paperwork/stamps.dm index 318a1abdf39..8c24cc55c9d 100644 --- a/code/modules/paperwork/stamps.dm +++ b/code/modules/paperwork/stamps.dm @@ -12,61 +12,6 @@ item_color = "cargo" pressure_resistance = 2 attack_verb = list("stamped") - /// used for on human stamp marks, each mark will be colored this before adding to image in human stamp_marks - var/stamp_color = "#6ca151" - /// this is defined uniquely for each subtype, used in examine.dm for when humans are stamped. - var/stamp_description = "..." - -/obj/item/stamp/afterattack(atom/target, mob/user, proximity, params) - . = ..() - if(!ishuman(target) || !ishuman(user) || !proximity) - return - - var/mob/living/carbon/human/H = target - var/attackedSide //the stamp mark will appear on this side, NORTH = forwards, SOUTH = back, EAST = right, WEST = left - var/list/paramslist = params2list(params) - var/xOffset = text2num(paramslist["icon-x"]) - 16 - var/yOffset = text2num(paramslist["icon-y"]) - 16 - - switch(H.dir) //This makes the attackSide be the side that currently faces the 'camera' - if(NORTH) - attackedSide = SOUTH - if(SOUTH) - attackedSide = NORTH - if(EAST) - attackedSide = EAST - if(WEST) - attackedSide = WEST - - //Here the base stamp sprite is loaded, in the dmi there are 3 different types of possible marks - //and for each type there is one state for each direction, although bizzare it going to have to be this way - - var/icon/new_stamp_mark = icon('icons/effects/stamp_marks.dmi', "stamp[rand(1,3)]_[attackedSide]") - new_stamp_mark.Shift(EAST, xOffset) - new_stamp_mark.Shift(NORTH, yOffset) - - //targetBaseIcon will be a picture of the human's base body underwear and uniform - //we will use it so stamp marks cannot be put on backpack or inhand items - - var/mutable_appearance/targetBaseIcon = mutable_appearance() - targetBaseIcon.dir = H.dir - targetBaseIcon.overlays += H.overlays_standing[BODY_LAYER] - targetBaseIcon.overlays += H.overlays_standing[LIMBS_LAYER] - targetBaseIcon.overlays += H.overlays_standing[TAIL_LAYER] - targetBaseIcon.overlays += H.overlays_standing[UNDERWEAR_LAYER] - targetBaseIcon.overlays += H.overlays_standing[HAIR_LAYER] - targetBaseIcon.overlays += H.overlays_standing[UNIFORM_LAYER] - - new_stamp_mark.Blend(getFlatIcon(targetBaseIcon), BLEND_MULTIPLY) // cut out any parts of the new mark that arent on target sprite - var/image/new_stamp_mark_image = image(new_stamp_mark) - new_stamp_mark_image.color = stamp_color // it needs to be an image because it's easiest way to color sprites - - H.stamp_marks.overlays += new_stamp_mark_image // add new mark to existing image of marks - - if(!(stamp_description in H.stamp_marks_desc)) // if its a new stamp type add its desc to list of descs - H.stamp_marks_desc += stamp_description - - H.update_misc_effects() /obj/item/stamp/suicide_act(mob/user) user.visible_message("[user] stamps 'VOID' on [user.p_their()] forehead, then promptly falls over, dead.") @@ -76,103 +21,74 @@ name = "Quartermaster's rubber stamp" icon_state = "stamp-qm" item_color = "qm" - stamp_color = "#B88F3D" - stamp_description = "Quartermaster approved" /obj/item/stamp/law name = "Law office's rubber stamp" icon_state = "stamp-law" item_color = "cargo" - stamp_color = "#CC0000" - stamp_description = "Justice Department approved" /obj/item/stamp/captain name = "captain's rubber stamp" icon_state = "stamp-cap" item_color = "captain" - stamp_color = "#1F66A0" - stamp_description = "Captain approved" /obj/item/stamp/hop name = "head of personnel's rubber stamp" icon_state = "stamp-hop" item_color = "hop" - stamp_color = "#2A79AD" - stamp_description = "Head of Personnel approved" /obj/item/stamp/hos name = "head of security's rubber stamp" icon_state = "stamp-hos" item_color = "hosred" - stamp_color = "#BA0505" - stamp_description = "Head of Security approved" /obj/item/stamp/ce name = "chief engineer's rubber stamp" icon_state = "stamp-ce" item_color = "chief" - stamp_color = "#CC9900" - stamp_description = "Chief Engineer approved" /obj/item/stamp/rd name = "research director's rubber stamp" icon_state = "stamp-rd" item_color = "director" - stamp_color = "#D9D9D9" - stamp_description = "Research Director approved" /obj/item/stamp/cmo name = "chief medical officer's rubber stamp" icon_state = "stamp-cmo" item_color = "medical" - stamp_color = "#48FEFE" - stamp_description = "Chief Medical Officer approved" /obj/item/stamp/granted name = "\improper GRANTED rubber stamp" icon_state = "stamp-ok" item_color = "qm" - stamp_color = "#339900" - stamp_description = "GRANTED" /obj/item/stamp/denied name = "\improper DENIED rubber stamp" icon_state = "stamp-deny" item_color = "redcoat" - stamp_color = "#990000" - stamp_description = "DENIED" /obj/item/stamp/clown name = "clown's rubber stamp" icon_state = "stamp-clown" item_color = "clown" - stamp_color = "#FF66CC" - stamp_description = "HONK" /obj/item/stamp/rep name = "Nanotrasen Representative's rubber stamp" icon_state = "stamp-rep" item_color = "rep" - stamp_color = "#C1B640" - stamp_description = "Nanotrasen Representative approved" /obj/item/stamp/magistrate name = "Magistrate's rubber stamp" icon_state = "stamp-magistrate" item_color = "rep" - stamp_color = "#C1B640" - stamp_description = "Magistrate approved" /obj/item/stamp/centcom name = "Central Command rubber stamp" icon_state = "stamp-cent" item_color = "centcom" - stamp_color = "#009900" - stamp_description = "Central Command approved" /obj/item/stamp/syndicate name = "suspicious rubber stamp" icon_state = "stamp-syndicate" item_color = "syndicate" - stamp_color = "#7B0101" - stamp_description = "Syndicate approved" + diff --git a/icons/effects/stamp_marks.dmi b/icons/effects/stamp_marks.dmi deleted file mode 100644 index 35e6ad5ffc0d83f686e5afe58d960899bab936bb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1147 zcmeAS@N?(olHy`uVBq!ia0vp^4?viM4Mr7ITycIsdVe!d;sVXmCTU&JOxbyLVO*1S5~jFJ$%q$<(yNd-~G49RW}{JP<2P{*BbVq?3KKH)2=K%rfX{P zV*kXYi>LOn-#ihd?A@zly6H;B5;tX2sg)NwdhR>^=TTmE^ziw{dpork^+?Q@-Oa$j zJloU7F{EP7+q)ZcMI0I0E=IbzPw+Qi#?G~Xea@v5v3`D*-bF_`WRED1cVe?a4{Et58q#SuCmWCPCowr`|rO$Ucbjx zmwc{r-t(W2E&BA6d-8YB+kaL1Lut>)Pv&tf|E?6u#Gm{8CuaZguEX|EoQ~heYdS&e zF%<0D!|!q0?s0Je^SiTlkDt9^b~?dJ*cTYa;P&y32Zn-d({rUC%=tX0xNdH7orY6| z&F9B+KEK{yXLdgMHiP`8+C9e=o}HF>eAV|v=r>03vzGp^x5RAy%{xO_UK>|9lHdZU zccQp1XbCJ$x2T`ayrtj$W#qa0PZ{1m4y>B?dHWvz4Eg>`@1CD`P;aT>;v(H_9NvF$ z?A{@*3(*zrb2$rw^AqLYe|*!gw8yVu_Nwn6<<8g0ChvJ;!yjhszinrceE#>`ecK%x z1U_kN;7mLuJFMHMc%xGT_nXHXU)BC)+WpIPf+diBfVbkJ@-ATF`y2dM?~Qi@_nn$G zIDCLRA>(vQhNZ*hm?>rU_1=uPjxYYg^ZflMy9Kp2UgwMc_1%73_H*|0InU48+f-M# pecmpju;JM91^Ds{#F}56pYN=fRo}oW0W3`zJYD@<);T3K0RZp_l<5Ef