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

Gonna have to clean some files after this.

Browse Source
This commit is contained in:
Aurorablade
2019-01-19 22:38:47 -05:00
parent 86d2a1634c
commit 4fc35a68b1
138 changed files with 184 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/cardboard_cutouts.dm
+2 -2
View File
@@ -18,7 +18,7 @@
if(user.a_intent == INTENT_HELP || pushed_over)
return ..()
user.visible_message("<span class='warning'>[user] pushes over [src]!</span>", "<span class='danger'>You push over [src]!</span>")
playsound(src, 'sound/weapons/Genhit.ogg', 50, 1)
playsound(src, 'sound/weapons/genhit.ogg', 50, 1)
push_over()
/obj/item/cardboard_cutout/proc/push_over()
@@ -85,7 +85,7 @@
return
if(pushed_over)
to_chat(user, "<span class='warning'>Right [src] first!</span>")
return
return
if(!new_appearance || !crayon)
return
if(!do_after(user, 10, FALSE, src, TRUE))
code/game/objects/items/latexballoon.dm
+1 -1
View File
@@ -28,7 +28,7 @@
/obj/item/latexballon/proc/burst()
if(!air_contents || icon_state != "latexballon_blow")
return
playsound(src, 'sound/weapons/Gunshot.ogg', 100, 1)
playsound(src, 'sound/weapons/gunshot.ogg', 100, 1)
icon_state = "latexballon_bursted"
item_state = "lgloves"
if(isliving(loc))
code/game/objects/items/robot/robot_items.dm
+2 -2
View File
@@ -13,7 +13,7 @@
if(ishuman(M))
var/mob/living/carbon/human/H = M
if(H.check_shields(0, "[M]'s [name]", src, MELEE_ATTACK))
playsound(M, 'sound/weapons/Genhit.ogg', 50, 1)
playsound(M, 'sound/weapons/genhit.ogg', 50, 1)
return 0
if(isrobot(user))
@@ -28,7 +28,7 @@
M.visible_message("<span class='danger'>[user] has prodded [M] with [src]!</span>", \
"<span class='userdanger'>[user] has prodded you with [src]!</span>")
playsound(loc, 'sound/weapons/Egloves.ogg', 50, 1, -1)
playsound(loc, 'sound/weapons/egloves.ogg', 50, 1, -1)
add_attack_logs(user, M, "Stunned with [src] (INTENT: [uppertext(user.a_intent)])")
/obj/item/borg/overdrive
code/game/objects/items/toys.dm
+2 -2
View File
@@ -1344,7 +1344,7 @@ obj/item/toy/cards/deck/syndicate/black
/obj/item/toy/russian_revolver/suicide_act(mob/user)
user.visible_message("<span class='suicide'>[user] quickly loads six bullets into [src]'s cylinder and points it at [user.p_their()] head before pulling the trigger! It looks like [user.p_theyre()] trying to commit suicide.</span>")
playsound(loc, 'sound/weapons/Gunshot.ogg', 50, 1)
playsound(loc, 'sound/weapons/gunshot.ogg', 50, 1)
return (BRUTELOSS)
/obj/item/toy/russian_revolver/New()
@@ -1378,7 +1378,7 @@ obj/item/toy/cards/deck/syndicate/black
return
else
bullet_position = null
playsound(src, 'sound/weapons/Gunshot.ogg', 50, 1)
playsound(src, 'sound/weapons/gunshot.ogg', 50, 1)
user.visible_message("<span class='danger'>[src] goes off!</span>")
user.apply_damage(200, BRUTE, "head", sharp = 1, used_weapon = "Self-inflicted gunshot wound to the head.")
user.death()
code/game/objects/items/weapons/stunbaton.dm
+2 -2
View File
@@ -169,7 +169,7 @@
if(check_martial_counter(L, user))
return
if(H.check_shields(0, "[user]'s [name]", src, MELEE_ATTACK)) //No message; check_shields() handles that
playsound(L, 'sound/weapons/Genhit.ogg', 50, 1)
playsound(L, 'sound/weapons/genhit.ogg', 50, 1)
return
L.Stun(stunforce)
@@ -182,7 +182,7 @@
L.visible_message("<span class='danger'>[user] has stunned [L] with [src]!</span>", \
"<span class='userdanger'>[user] has stunned you with [src]!</span>")
add_attack_logs(user, L, "stunned")
playsound(loc, 'sound/weapons/Egloves.ogg', 50, 1, -1)
playsound(loc, 'sound/weapons/egloves.ogg', 50, 1, -1)
deductcharge(hitcost)
code/game/objects/items/weapons/twohanded.dm
+1 -1
View File
@@ -405,7 +405,7 @@
/obj/structure/headspear/attack_hand(mob/living/user)
user.visible_message("<span class='warning'>[user] kicks over [src]!</span>", "<span class='danger'>You kick down [src]!</span>")
playsound(src, 'sound/weapons/Genhit.ogg', 50, 1)
playsound(src, 'sound/weapons/genhit.ogg', 50, 1)
var/turf/T = get_turf(src)
if(contained_spear)
contained_spear.forceMove(T)
code/game/objects/items/weapons/weaponry.dm
+1 -1
View File
@@ -191,7 +191,7 @@ obj/item/wirerod/attackby(obj/item/I, mob/user, params)
user.visible_message("<span class='userdanger'>It's a home run!</span>")
target.throw_at(throw_target, rand(8,10), 14, user)
target.ex_act(2)
playsound(get_turf(src), 'sound/weapons/HOMERUN.ogg', 100, 1)
playsound(get_turf(src), 'sound/weapons/homerun.ogg', 100, 1)
homerun_ready = 0
return
else