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

Adds Some Extra Blind Messages and Tweaks Some Too. (#25855)

Browse Source 
* Blind

* comma

* Update code/modules/games/cards.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* Update gun.dm

* this applies to other blind people, not you

* dedent

* Reformatting

* Update bloodcrawl.dm

* Apply suggestions from code review

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* Update cards.dm

---------

Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
This commit is contained in:
CRUNCH
2024-07-31 12:04:13 +00:00
committed by GitHub
co-authored by Ryan Luc
parent 5234b6386b
commit 2a949e11ab
7 changed files with 178 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/games/cards.dm
+41 -9
View File
@@ -163,7 +163,11 @@
H.parentdeck = src
H.update_values()
H.update_appearance(UPDATE_NAME|UPDATE_DESC|UPDATE_OVERLAYS)
user.visible_message("<span class='notice'>[user] draws a card.</span>","<span class='notice'>You draw a card.</span>")
user.visible_message(
"<span class='notice'>[user] draws a card.</span>",
"<span class='notice'>You draw a card.</span>",
"<span class='notice'>You hear a card being drawn.</span>"
)
to_chat(user,"<span class='notice'>It's the [P].</span>")
/obj/item/deck/proc/deal_card()
@@ -217,12 +221,19 @@
H.concealed = TRUE
H.update_appearance(UPDATE_NAME|UPDATE_DESC|UPDATE_OVERLAYS)
if(user == target)
user.visible_message("<span class='notice'>[user] deals [dcard] card(s) to [user.p_themselves()].</span>")
user.visible_message(
"<span class='notice'>[user] deals [dcard] card\s to [user.p_themselves()].</span>",
"<span class='notice'>You deal [dcard] card\s to yourself.</span>",
"<span class='notice'>You hear cards being dealt.</span>"
)
else
user.visible_message("<span class='notice'>[user] deals [dcard] card(s) to [target].</span>")
user.visible_message(
"<span class='notice'>[user] deals [dcard] card\s to [target].</span>",
"<span class='notice'>You deal [dcard] card\s to [target].</span>",
"<span class='notice'>You hear cards being dealt.</span>"
)
H.throw_at(get_step(target, target.dir), 3, 1, null)
/obj/item/deck/attack_self()
deckshuffle()
@@ -235,7 +246,11 @@
cards = shuffle(cards)
if(user)
user.visible_message("<span class='notice'>[user] shuffles [src].</span>")
user.visible_message(
"<span class='notice'>[user] shuffles [src].</span>",
"<span class='notice'>You shuffle [src].</span>",
"<span class='notice'>You hear cards being shuffled.</span>"
)
playsound(user, 'sound/items/cardshuffle.ogg', 50, TRUE)
cooldown = world.time
@@ -244,6 +259,7 @@
var/mob/M = usr
if(M.incapacitated() || !Adjacent(M))
return
if(!ishuman(M))
return
@@ -278,7 +294,11 @@
/obj/item/pack/attack_self(mob/user as mob)
user.visible_message("<span class='notice'>[name] rips open [src]!</span>", "<span class='notice'>You rip open [src]!</span>")
user.visible_message(
"<span class='notice'>[name] rips open [src]!</span>",
"<span class='notice'>You rip open [src]!</span>",
"<span class='notice'>You hear the sound of a packet being ripped open.</span>"
)
var/obj/item/cardhand/H = new(get_turf(user))
H.cards += cards
@@ -352,7 +372,11 @@
/obj/item/cardhand/proc/turn_hand(mob/user)
concealed = !concealed
update_appearance(UPDATE_NAME|UPDATE_DESC|UPDATE_OVERLAYS)
user.visible_message("<span class='notice'>[user] [concealed ? "conceals" : "reveals"] their hand.</span>")
user.visible_message(
"<span class='notice'>[user] [concealed ? "conceals" : "reveals"] their hand.</span>",
"<span class='notice'>You[concealed ? "conceal" : "reveal"] your hand.</span>",
"<span class='notice'>You hear a hand of cards being flipped over.</span>"
)
/obj/item/cardhand/interact(mob/user)
var/dat = "You have:<br>"
@@ -440,7 +464,11 @@
var/datum/playingcard/card = pickablecards[pickedcard]
if(loc != user) // Don't want people teleporting cards
return
user.visible_message("<span class='notice'>[user] draws a card from [user.p_their()] hand.</span>", "<span class='notice'>You take the [pickedcard] from your hand.</span>")
user.visible_message(
"<span class='notice'>[user] draws a card from [user.p_their()] hand.</span>",
"<span class='notice'>You take \the [pickedcard] from your hand.</span>",
"<span class='notice'>You hear a card being drawn.</span>"
)
pickedcard = null
var/obj/item/cardhand/H = new(get_turf(src))
@@ -492,7 +520,11 @@
if(length(cards))
update_appearance(UPDATE_NAME|UPDATE_DESC|UPDATE_OVERLAYS)
if(length(H.cards))
user.visible_message("<span class='notice'>[user] plays the [discarding].</span>", "<span class='notice'>You play the [discarding].</span>")
user.visible_message(
"<span class='notice'>[user] plays \the [discarding].</span>",
"<span class='notice'>You play \the [discarding].</span>",
"<span class='notice'>You hear a card being played.</span>"
)
H.loc = get_step(user, user.dir)
if(!length(cards))
code/modules/games/tarot.dm
+6 -2
View File
@@ -25,7 +25,11 @@
newcards += P
cards -= P
cards = newcards
playsound(user, 'sound/items/cardshuffle.ogg', 50, 1)
user.visible_message("<span class='notice'>[user] shuffles [src].</span>", "<span class='notice'>You shuffle [src].</span>")
playsound(user, 'sound/items/cardshuffle.ogg', 50, TRUE)
user.visible_message(
"<span class='notice'>[user] shuffles [src].</span>",
"<span class='notice'>You shuffle [src].</span>",
"<span class='notice'>You hear cards being shuffled.</span>"
)
cooldown = world.time
code/modules/projectiles/gun.dm
+32 -10
View File
@@ -150,10 +150,18 @@
playsound(user, fire_sound, 50, 1)
if(message)
if(pointblank)
user.visible_message("<span class='danger'>[user] fires [src] point blank at [target]!</span>", "<span class='danger'>You fire [src] point blank at [target]!</span>", "<span class='italics'>You hear \a [fire_sound_text]!</span>")
user.visible_message(
"<span class='danger'>[user] fires [src] point blank at [target]!</span>",
"<span class='danger'>You fire [src] point blank at [target]!</span>",
"<span class='danger'>You hear \a [fire_sound_text]!</span>"
)
else
user.visible_message("<span class='danger'>[user] fires [src]!</span>", "<span class='danger'>You fire [src]!</span>", "You hear \a [fire_sound_text]!")
if(chambered?.muzzle_flash_effect)
user.visible_message(
"<span class='danger'>[user] fires [src]!</span>",
"<span class='danger'>You fire [src]!</span>",
"<span class='danger'>You hear \a [fire_sound_text]!</span>"
)
if(chambered.muzzle_flash_effect)
var/obj/effect/temp_visual/target_angled/muzzle_flash/effect = new chambered.muzzle_flash_effect(get_turf(src), target, muzzle_flash_time)
effect.alpha = min(255, muzzle_strength * 255)
if(chambered.muzzle_flash_color)
@@ -193,7 +201,11 @@
if(flag)
if(user.zone_selected == "mouth")
if(target == user && HAS_TRAIT(user, TRAIT_BADASS)) // Check if we are blowing smoke off of our own gun, otherwise we are trying to execute someone
user.visible_message("<span class='danger'>[user] blows smoke off of [src]'s barrel. What a badass.</span>")
user.visible_message(
"<span class='danger'>[user] blows smoke off of [src]'s barrel. What a badass.</span>",
"<span class='danger'>You blow smoke off of [src]'s barrel.</span>",
"<span class='danger'>You hear someone blowing over a hollow tube.</span>"
)
else
handle_suicide(user, target, params)
return
@@ -473,11 +485,15 @@
if(user == target)
if(!ishuman(user)) // Borg suicide needs a refactor for this to work.
return
target.visible_message("<span class='warning'>[user] sticks [src] in [user.p_their()] mouth, ready to pull the trigger...</span>", \
"<span class='userdanger'>You stick [src] in your mouth, ready to pull the trigger...</span>")
target.visible_message(
"<span class='warning'>[user] sticks [src] in [user.p_their()] mouth, ready to pull the trigger...</span>",
"<span class='userdanger'>You stick [src] in your mouth, ready to pull the trigger...</span>"
)
else
target.visible_message("<span class='warning'>[user] points [src] at [target]'s head, ready to pull the trigger...</span>", \
"<span class='userdanger'>[user] points [src] at your head, ready to pull the trigger...</span>")
target.visible_message(
"<span class='warning'>[user] points [src] at [target]'s head, ready to pull the trigger...</span>",
"<span class='userdanger'>[user] points [src] at your head, ready to pull the trigger...</span>"
)
semicd = 1
@@ -486,13 +502,19 @@
if(user == target)
user.visible_message("<span class='notice'>[user] decided life was worth living.</span>")
else if(target && target.Adjacent(user))
target.visible_message("<span class='notice'>[user] has decided to spare [target]'s life.</span>", "<span class='notice'>[user] has decided to spare your life!</span>")
target.visible_message(
"<span class='notice'>[user] has decided to spare [target]'s life.</span>",
"<span class='userdanger'>[user] has decided to spare your life!</span>"
)
semicd = 0
return
semicd = 0
target.visible_message("<span class='warning'>[user] pulls the trigger!</span>", "<span class='userdanger'>[user] pulls the trigger!</span>")
target.visible_message(
"<span class='warning'>[user] pulls the trigger!</span>",
"<span class='userdanger'>[user] pulls the trigger!</span>"
)
if(chambered && chambered.BB)
chambered.BB.damage *= 5