cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Nerfed environmental robusting a bit

Browse Source
This commit is contained in:
Chinsky
2013-01-24 14:49:15 +04:00
parent ebc6529b68
commit 3ceaa7e4d8
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/objects/structures/stool_bed_chair_nest/stools.dm
View File

@@ -49,7 +49,7 @@
icon = 'icons/obj/objects.dmi' icon = 'icons/obj/objects.dmi'
icon_state = "stool" icon_state = "stool"
force = 10 force = 10
throwforce = 20 throwforce = 10
w_class = 5.0 w_class = 5.0
var/obj/structure/stool/origin = null var/obj/structure/stool/origin = null

6
code/game/objects/structures/tables_racks.dm
View File

@@ -323,8 +323,8 @@
var/mob/living/M = G.affecting var/mob/living/M = G.affecting
if (G.state < 2) if (G.state < 2)
if(user.a_intent == "hurt") if(user.a_intent == "hurt")
if (prob(5)) M.Weaken(3) if (prob(5)) M.Weaken(5)
M.apply_damage(10) M.apply_damage(6)
visible_message("\red [G.assailant] slams [G.affecting] against \the [src]!") visible_message("\red [G.assailant] slams [G.affecting] against \the [src]!")
playsound(src.loc, 'sound/weapons/tablehit1.ogg', 50, 1) playsound(src.loc, 'sound/weapons/tablehit1.ogg', 50, 1)
else else
@@ -591,4 +591,4 @@
visible_message("<span class='danger'>[user] smashes [src] apart!</span>") visible_message("<span class='danger'>[user] smashes [src] apart!</span>")
new /obj/item/weapon/rack_parts(loc) new /obj/item/weapon/rack_parts(loc)
density = 0 density = 0
del(src) del(src)

11
code/game/objects/structures/window.dm
View File

@@ -152,17 +152,18 @@
del(W) //gotta delete it here because if window breaks, it won't get deleted del(W) //gotta delete it here because if window breaks, it won't get deleted
switch (state) switch (state)
if(1) if(1)
M.apply_damage(10) M.apply_damage(7)
hit(10) hit(10)
visible_message("\red [user] slams [M] against \the [src]!") visible_message("\red [user] slams [M] against \the [src]!")
if(2) if(2)
M.Weaken(2) if (prob(50))
M.apply_damage(15) M.Weaken(1)
M.apply_damage(10)
hit(25) hit(25)
visible_message("\red <b>[user] bashes [M] against \the [src]!</b>") visible_message("\red <b>[user] bashes [M] against \the [src]!</b>")
if(3) if(3)
M.Weaken(10) M.Weaken(5)
M.apply_damage(25) M.apply_damage(20)
hit(50) hit(50)
visible_message("\red <big><b>[user] crushes [M] against \the [src]!</b></big>") visible_message("\red <big><b>[user] crushes [M] against \the [src]!</b></big>")
return return