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

Updated all suicide_act()s to use a new span class, 'suicide'.

Browse Source 
Conflicts:
	code/game/objects/items/stacks/sheets/glass.dm
	code/game/objects/items/weapons/melee/energy.dm
	code/game/objects/items/weapons/melee/misc.dm
	code/game/objects/items/weapons/stunbaton.dm
	code/game/objects/items/weapons/weaponry.dm
	code/modules/hydroponics/growninedible.dm
	code/modules/hydroponics/hydroitemdefines.dm
	code/modules/surgery/tools.dm
	code/stylesheet.dm
This commit is contained in:
Pete Goodfellow
2014-01-19 21:25:47 -05:00
committed by ZomgPonies
parent 0ec4a502fe
commit 331cf1df95
13 changed files with 126 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/melee/energy.dm
+9 -7
View File
@@ -1,10 +1,11 @@
/obj/item/weapon/melee/energy
var/active = 0
suicide_act(mob/user)
viewers(user) << pick("\red <b>[user] is slitting \his stomach open with the [src.name]! It looks like \he's trying to commit seppuku.</b>", \
"\red <b>[user] is falling on the [src.name]! It looks like \he's trying to commit suicide.</b>")
return (BRUTELOSS|FIRELOSS)
/obj/item/weapon/melee/energy/suicide_act(mob/user)
viewers(user) << pick("<span class='suicide'>[user] is slitting \his stomach open with the [src.name]! It looks like \he's trying to commit seppuku.</span>", \
"<span class='suicide'>[user] is falling on the [src.name]! It looks like \he's trying to commit suicide.</span>")
return (BRUTELOSS|FIRELOSS)
/obj/item/weapon/melee/energy/axe
name = "energy axe"
@@ -19,8 +20,9 @@
origin_tech = "combat=3"
attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut")
suicide_act(mob/user)
viewers(user) << "\red <b>[user] swings the [src.name] towards /his head! It looks like \he's trying to commit suicide.</b>"
/obj/item/weapon/melee/energy/axe/suicide_act(mob/user)
viewers(user) << "<span class='suicide'>[user] swings the [src.name] towards /his head! It looks like \he's trying to commit suicide.</span>"
return (BRUTELOSS|FIRELOSS)
/obj/item/weapon/melee/energy/sword
@@ -53,4 +55,4 @@
w_class = 4.0//So you can't hide it in your pocket or some such.
flags = FPRINT | TABLEPASS | NOSHIELD
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
var/datum/effect/effect/system/spark_spread/spark_system
var/datum/effect/effect/system/spark_spread/spark_system
code/game/objects/items/weapons/melee/misc.dm
+4 -3
View File
@@ -11,8 +11,9 @@
origin_tech = "combat=4"
attack_verb = list("flogged", "whipped", "lashed", "disciplined")
suicide_act(mob/user)
viewers(user) << "\red <b>[user] is strangling \himself with the [src.name]! It looks like \he's trying to commit suicide.</b>"
/obj/item/weapon/melee/chainofcommand/suicide_act(mob/user)
viewers(user) << "<span class='suicide'>[user] is strangling \himself with the [src.name]! It looks like \he's trying to commit suicide.</span>"
return (OXYLOSS)
/obj/item/weapon/melee/icepick
@@ -23,4 +24,4 @@
force = 15
throwforce = 10
w_class = 2
attack_verb = list("stabbed", "jabbed", "iced,")
attack_verb = list("stabbed", "jabbed", "iced,")