Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adds a cool derp shadow, tattoo gun no longer kills u #5367

Merged
merged 2 commits into from
Sep 24, 2024
Merged

Adds a cool derp shadow, tattoo gun no longer kills u #5367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
874a876
Merge pull request #47 from ARF-SS13/drink-transfer-amount-reflavor-&…
Tk420634 Jul 21, 2024
0228b15
Merge branch 'master' into your-mamas-so-fat-light-cant-escape-her-su…
Superlagg Sep 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions code/datums/tattoo.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
9 changes: 9 additions & 0 deletions code/game/objects/items.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,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
Expand Down
11 changes: 11 additions & 0 deletions code/modules/mob/living/living.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
..()
Expand Down
Loading