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

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport

Browse Source
This commit is contained in:
Cael_Aislinn
2012-11-07 15:48:10 +10:00
parent 0d77854520 2e26740bee
commit d6b249b945
16 changed files with 177 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/shooting_range.dm
+1 -1
View File
@@ -114,7 +114,7 @@
bmark.pixel_x--
bmark.pixel_y--
if(Proj.damage >= 20 || istype(Proj, /obj/item/projectile/practice))
if(Proj.damage >= 20 || istype(Proj, /obj/item/projectile/beam/practice))
bmark.icon_state = "scorch"
bmark.dir = pick(NORTH,SOUTH,EAST,WEST) // random scorch design
code/game/objects/items/weapons/storage/belt.dm
+3 -1
View File
@@ -93,7 +93,9 @@
"/obj/item/weapon/cigpacket",
"/obj/item/weapon/storage/pill_bottle",
"/obj/item/stack/medical",
"/obj/item/device/flashlight/pen"
"/obj/item/device/flashlight/pen",
"/obj/item/clothing/mask/surgical",
"/obj/item/clothing/gloves/latex"
)
code/game/objects/items/weapons/storage/storage.dm
+4
View File
@@ -554,4 +554,8 @@
..()
return
/obj/item/weapon/storage/pill_bottle/New()
pixel_x = rand (-7,7)
pixel_y = rand (-7,7)
..()
////////////////////////////////////////////////////////////////////////////////
code/game/objects/items/weapons/stunbaton.dm
+5 -5
View File
@@ -99,12 +99,12 @@
H.apply_effect(10, STUTTER, 0)
charges--
H.visible_message("<span class='danger'>[src] hits [H] with stunning end!</span>")
H.attack_log += "\[[time_stamp()]\]<font color='orange'> Stunned by thrown [src.name]</font>"
log_attack("<font color='red'>Flying [src.name] stunned [H.name] ([H.ckey])</font>" )
H.visible_message("<span class='danger'>[src], thrown by ([src.fingerprintslast]) hits [H] with stunning end!</span>")
H.attack_log += "\[[time_stamp()]\]<font color='orange'> Stunned by thrown [src.name] (([src.fingerprintslast]))</font>"
log_attack("<font color='red'>Flying [src.name], thrown by ([src.fingerprintslast]) stunned [H.name] ([H.ckey])</font>" )
log_admin("ATTACK: Flying [src.name] stunned [H.name] ([H.ckey])")
msg_admin_attack("ATTACK: Flying [src.name] stunned [H.name] ([H.ckey])") //BS12 EDIT ALG
log_admin("ATTACK: Flying [src.name], thrown by ([src.fingerprintslast]) stunned [H.name] ([H.ckey])")
msg_admin_attack("ATTACK: Flying [src.name], thrown by ([src.fingerprintslast]) stunned [H.name] ([H.ckey]).") //BS12 EDIT ALG
return
return ..()