diff --git a/code/datums/tattoo.dm b/code/datums/tattoo.dm index 4e73c94438..9810094d84 100644 --- a/code/datums/tattoo.dm +++ b/code/datums/tattoo.dm @@ -745,8 +745,8 @@ next_time = 0.5 SECONDS user.visible_message(span_notice("[user] zips a quick mark into [victim]'s [lowertext(tat_loc)].")) if(prob(scream_prob)) - victim.emote("scream") - owie.receive_damage(brute = owie.brute_dam < 30 ? brute_d : 0, stamina = stamina_d, wound_bonus = bleed_d, sharpness = SHARP_EDGED, damage_coverings = FALSE) + victim.emote("scream") // V- all the fuckin furries belong at weenie hut jr + owie.receive_damage(brute = owie.brute_dam < 10 ? brute_d : 0, stamina = stamina_d, wound_bonus = -999, sharpness = SHARP_EDGED, damage_coverings = FALSE) if(engraving) addtimer(CALLBACK(src,PROC_REF(make_noises_and_pain), victim, user, tat_loc, part), next_time) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 2e8366fa10..62349827d4 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -274,6 +274,15 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb if(reskinnable_component) AddComponent(reskinnable_component) + add_filter("wacky_shadow",10, list( + "type"="drop_shadow", + "x"=1, + "y"=-1, + "size"=1, + "offset"=0, + "color"= "#0000007A")) + + /obj/item/proc/check_allowed_items(atom/target, not_inside, target_self) if(((src in target) && !target_self) || (!isturf(target.loc) && !isturf(target) && not_inside)) return 0 diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index ca87879c80..fcff9bbc66 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -1049,7 +1049,7 @@ GLOBAL_PROTECT(admin_verbs_hideable) /// Never gonna give one up, never gonna give one down /datum/admins/proc/grope_shotglass() set category = "Admin.Game" - set name = "Let people grope wierd things" + set name = "grope shotglass" if(!check_rights(R_ADMIN)) message_admins("[ADMIN_TPMONTY(usr)] tried to use mess with grope_shotglass() without admin perms.") diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 1b2fd78fdf..a5a477f6c2 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -20,6 +20,17 @@ faction += "[REF(src)]" GLOB.mob_living_list += src clienthud.add_hud_to(src) + add_filter("cool_shadow",10, list( + "type"="drop_shadow", + "x"=1, + "y"=-1, + "size"=3, + "offset"=2, + "color"= "#0000007A")) + // add_filter("sick_outline",11, list( + // "type"="outline", + // "size"=1, + // "color"= "#000000")) /mob/living/prepare_huds() ..()