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

Grammar fixes for item-suicides.

Browse Source 
I got about half-way through changing these when SuperSayu came up and said he fixed this a while ago but never posted the fix. So technically half of these were fixed by me and half by him. Credit to both of us!

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5564 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
johnsonmt88@gmail.com
2013-01-17 02:52:57 +00:00
parent 4f95636530
commit 1f07f31b64
13 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/defines/obj/hydro.dm
View File

@@ -1220,7 +1220,7 @@
force = round((5+potency/2.5), 1) force = round((5+potency/2.5), 1)
suicide_act(mob/user) suicide_act(mob/user)
viewers(user) << "\red <b>[user] is eating some of the [src]! It looks like \he's trying to commit suicide.</b>" viewers(user) << "\red <b>[user] is eating some of the [src.name]! It looks like \he's trying to commit suicide.</b>"
return (BRUTELOSS|TOXLOSS) return (BRUTELOSS|TOXLOSS)
// ************************************* // *************************************
@@ -1291,7 +1291,7 @@
var/WeedKillStr = 2 var/WeedKillStr = 2
suicide_act(mob/user) suicide_act(mob/user)
viewers(user) << "\red <b>[user] is huffing the [src]! It looks like \he's trying to commit suicide.</b>" viewers(user) << "\red <b>[user] is huffing the [src.name]! It looks like \he's trying to commit suicide.</b>"
return (TOXLOSS) return (TOXLOSS)
/obj/item/weapon/pestspray // -- Skie /obj/item/weapon/pestspray // -- Skie
@@ -1310,7 +1310,7 @@
var/PestKillStr = 2 var/PestKillStr = 2
suicide_act(mob/user) suicide_act(mob/user)
viewers(user) << "\red <b>[user] is huffing the [src]! It looks like \he's trying to commit suicide.</b>" viewers(user) << "\red <b>[user] is huffing the [src.name]! It looks like \he's trying to commit suicide.</b>"
return (TOXLOSS) return (TOXLOSS)
/obj/item/weapon/minihoe // -- Numbers /obj/item/weapon/minihoe // -- Numbers

4
code/defines/obj/weapon.dm
View File

@@ -224,7 +224,7 @@
var/armed = 0 var/armed = 0
suicide_act(mob/user) suicide_act(mob/user)
viewers(user) << "\red <b>[user] is putting the [src] on \his head! It looks like \he's trying to commit suicide.</b>" viewers(user) << "\red <b>[user] is putting the [src.name] on \his head! It looks like \he's trying to commit suicide.</b>"
return (BRUTELOSS) return (BRUTELOSS)
/obj/item/weapon/legcuffs/beartrap/attack_self(mob/user as mob) /obj/item/weapon/legcuffs/beartrap/attack_self(mob/user as mob)
@@ -412,7 +412,7 @@
attack_verb = list("whipped", "lashed", "disciplined", "tickled") attack_verb = list("whipped", "lashed", "disciplined", "tickled")
suicide_act(mob/user) suicide_act(mob/user)
viewers(user) << "\red <b>[user] is strangling \himself with the [src]! It looks like \he's trying to commit suicide.</b>" viewers(user) << "\red <b>[user] is strangling \himself with the [src.name]! It looks like \he's trying to commit suicide.</b>"
return (OXYLOSS) return (OXYLOSS)
/obj/item/weapon/module /obj/item/weapon/module

10
code/game/objects/items.dm
View File

@@ -63,11 +63,11 @@
//user: The mob that is suiciding //user: The mob that is suiciding
//damagetype: The type of damage the item will inflict on the user //damagetype: The type of damage the item will inflict on the user
//bruteloss = 1 //BRUTELOSS = 1
//fireloss = 2 //FIRELOSS = 2
//toxloss = 4 //TOXLOSS = 4
//oxyloss = 8 //OXYLOSS = 8
//This proc will return an array. The first element of the list should always be the suicide message that players will see, next is the damagetype //Output a creative message and then return the damagetype done
/obj/item/proc/suicide_act(mob/user) /obj/item/proc/suicide_act(mob/user)
return return

2
code/game/objects/items/toys.dm
View File

@@ -369,7 +369,7 @@
var/colourName = "red" //for updateIcon purposes var/colourName = "red" //for updateIcon purposes
suicide_act(mob/user) suicide_act(mob/user)
viewers(user) << "\red <b>[user] is jaming the [src] up \his nose and into \his brain. It looks like \he's trying to commit suicide.</b>" viewers(user) << "\red <b>[user] is jamming the [src.name] up \his nose and into \his brain. It looks like \he's trying to commit suicide.</b>"
return (BRUTELOSS|OXYLOSS) return (BRUTELOSS|OXYLOSS)
/* /*

12
code/game/objects/items/weapons/kitchen.dm
View File

@@ -82,9 +82,9 @@
throwforce = 10.0 throwforce = 10.0
suicide_act(mob/user) suicide_act(mob/user)
viewers(user) << pick("\red <b>[user] is slitting \his wrists with the [src]! It looks like \he's trying to commit suicide.</b>", \ viewers(user) << pick("\red <b>[user] is slitting \his wrists with the [src.name]! It looks like \he's trying to commit suicide.</b>", \
"\red <b>[user] is slitting \his throat with the [src]! It looks like \he's trying to commit suicide.</b>", \ "\red <b>[user] is slitting \his throat with the [src.name]! It looks like \he's trying to commit suicide.</b>", \
"\red <b>[user] is slitting \his stomach open with the [src]! It looks like \he's trying to commit seppuku.</b>") "\red <b>[user] is slitting \his stomach open with the [src.name]! It looks like \he's trying to commit seppuku.</b>")
return (BRUTELOSS) return (BRUTELOSS)
/obj/item/weapon/kitchen/utensil/knife/attack(target as mob, mob/living/user as mob) /obj/item/weapon/kitchen/utensil/knife/attack(target as mob, mob/living/user as mob)
@@ -114,9 +114,9 @@
attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
suicide_act(mob/user) suicide_act(mob/user)
viewers(user) << pick("\red <b>[user] is slitting \his wrists with the [src]! It looks like \he's trying to commit suicide.</b>", \ viewers(user) << pick("\red <b>[user] is slitting \his wrists with the [src.name]! It looks like \he's trying to commit suicide.</b>", \
"\red <b>[user] is slitting \his throat with the [src]! It looks like \he's trying to commit suicide.</b>", \ "\red <b>[user] is slitting \his throat with the [src.name]! It looks like \he's trying to commit suicide.</b>", \
"\red <b>[user] is slitting \his stomach open with the [src]! It looks like \he's trying to commit seppuku.</b>") "\red <b>[user] is slitting \his stomach open with the [src.name]! It looks like \he's trying to commit seppuku.</b>")
return (BRUTELOSS) return (BRUTELOSS)
/obj/item/weapon/kitchenknife/ritual /obj/item/weapon/kitchenknife/ritual

6
code/game/objects/items/weapons/melee/energy.dm
View File

@@ -2,8 +2,8 @@
var/active = 0 var/active = 0
suicide_act(mob/user) suicide_act(mob/user)
viewers(user) << pick("\red <b>[user] is slitting \his stomach open with the [src]! It looks like \he's trying to commit seppuku.</b>", \ 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]! It looks like \he's trying to commit suicide.</b>") "\red <b>[user] is falling on the [src.name]! It looks like \he's trying to commit suicide.</b>")
return (BRUTELOSS|FIRELOSS) return (BRUTELOSS|FIRELOSS)
/obj/item/weapon/melee/energy/axe /obj/item/weapon/melee/energy/axe
@@ -20,7 +20,7 @@
attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut") attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut")
suicide_act(mob/user) suicide_act(mob/user)
viewers(user) << "\red <b>[user] swings the [src] towards /his head! It looks like \he's trying to commit suicide.</b>" viewers(user) << "\red <b>[user] swings the [src.name] towards /his head! It looks like \he's trying to commit suicide.</b>"
return (BRUTELOSS|FIRELOSS) return (BRUTELOSS|FIRELOSS)
/obj/item/weapon/melee/energy/sword /obj/item/weapon/melee/energy/sword

2
code/game/objects/items/weapons/melee/misc.dm
View File

@@ -12,5 +12,5 @@
attack_verb = list("flogged", "whipped", "lashed", "disciplined") attack_verb = list("flogged", "whipped", "lashed", "disciplined")
suicide_act(mob/user) suicide_act(mob/user)
viewers(user) << "\red <b>[user] is strangling \himself with the [src]! It looks like \he's trying to commit suicide.</b>" viewers(user) << "\red <b>[user] is strangling \himself with the [src.name]! It looks like \he's trying to commit suicide.</b>"
return (OXYLOSS) return (OXYLOSS)

2
code/game/objects/items/weapons/power_cells.dm
View File

@@ -21,7 +21,7 @@
var/construction_time=100 var/construction_time=100
suicide_act(mob/user) suicide_act(mob/user)
viewers(user) << "\red <b>[user] is licking the electrodes of the [src]! It looks like \he's trying to commit suicide.</b>" viewers(user) << "\red <b>[user] is licking the electrodes of the [src.name]! It looks like \he's trying to commit suicide.</b>"
return (FIRELOSS) return (FIRELOSS)
/obj/item/weapon/cell/crap /obj/item/weapon/cell/crap

2
code/game/objects/items/weapons/stunbaton.dm
View File

@@ -13,7 +13,7 @@
origin_tech = "combat=2" origin_tech = "combat=2"
suicide_act(mob/user) suicide_act(mob/user)
viewers(user) << "\red <b>[user] is putting the live [src] in \his mouth! It looks like \he's trying to commit suicide.</b>" viewers(user) << "\red <b>[user] is putting the live [src.name] in \his mouth! It looks like \he's trying to commit suicide.</b>"
return (FIRELOSS) return (FIRELOSS)
/obj/item/weapon/melee/baton/update_icon() /obj/item/weapon/melee/baton/update_icon()

10
code/game/objects/items/weapons/surgery_tools.dm
View File

@@ -370,8 +370,8 @@
attack_verb = list("drilled") attack_verb = list("drilled")
suicide_act(mob/user) suicide_act(mob/user)
viewers(user) << pick("/red <b>[user] is pressing the [src] to \his temple and activating it! It looks like \he's trying to commit suicide.</b>", \ viewers(user) << pick("/red <b>[user] is pressing the [src.name] to \his temple and activating it! It looks like \he's trying to commit suicide.</b>", \
"/red <b>[user] is pressing [src] to \his chest and activating it! It looks like \he's trying to commit suicide.</b>") "/red <b>[user] is pressing [src.name] to \his chest and activating it! It looks like \he's trying to commit suicide.</b>")
return (BRUTELOSS) return (BRUTELOSS)
/* /*
* Scalpel * Scalpel
@@ -393,9 +393,9 @@
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
suicide_act(mob/user) suicide_act(mob/user)
viewers(user) << pick("\red <b>[user] is slitting \his wrists with the [src]! It looks like \he's trying to commit suicide.</b>", \ viewers(user) << pick("\red <b>[user] is slitting \his wrists with the [src.name]! It looks like \he's trying to commit suicide.</b>", \
"\red <b>[user] is slitting \his throat with the [src]! It looks like \he's trying to commit suicide.</b>", \ "\red <b>[user] is slitting \his throat with the [src.name]! It looks like \he's trying to commit suicide.</b>", \
"\red <b>[user] is slitting \his stomach open with the [src]! It looks like \he's trying to commit seppuku.</b>") "\red <b>[user] is slitting \his stomach open with the [src.name]! It looks like \he's trying to commit seppuku.</b>")
return (BRUTELOSS) return (BRUTELOSS)
/obj/item/weapon/scalpel/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) /obj/item/weapon/scalpel/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)

4
code/game/objects/items/weapons/tools.dm
View File

@@ -49,8 +49,8 @@
attack_verb = list("stabbed") attack_verb = list("stabbed")
suicide_act(mob/user) suicide_act(mob/user)
viewers(user) << pick("\red <b>[user] is stabbing the [src] into \his temple! It looks like \he's trying to commit suicide.</b>", \ viewers(user) << pick("\red <b>[user] is stabbing the [src.name] into \his temple! It looks like \he's trying to commit suicide.</b>", \
"\red <b>[user] is stabbing the [src] into \his heart! It looks like \he's trying to commit suicide.</b>") "\red <b>[user] is stabbing the [src.name] into \his heart! It looks like \he's trying to commit suicide.</b>")
return(BRUTELOSS) return(BRUTELOSS)
/obj/item/weapon/screwdriver/New() /obj/item/weapon/screwdriver/New()

10
code/game/objects/items/weapons/weaponry.dm
View File

@@ -12,7 +12,7 @@
attack_verb = list("banned") attack_verb = list("banned")
suicide_act(mob/user) suicide_act(mob/user)
viewers(user) << "\red <b>[user] is hitting \himself with the [src]! It looks like \he's trying to ban \himself from life.</b>" viewers(user) << "\red <b>[user] is hitting \himself with the [src.name]! It looks like \he's trying to ban \himself from life.</b>"
return (BRUTELOSS|FIRELOSS|TOXLOSS|OXYLOSS) return (BRUTELOSS|FIRELOSS|TOXLOSS|OXYLOSS)
/obj/item/weapon/nullrod /obj/item/weapon/nullrod
@@ -29,7 +29,7 @@
w_class = 1 w_class = 1
suicide_act(mob/user) suicide_act(mob/user)
viewers(user) << "\red <b>[user] is impaling \himself with the [src]! It looks like \he's trying to commit suicide.</b>" viewers(user) << "\red <b>[user] is impaling \himself with the [src.name]! It looks like \he's trying to commit suicide.</b>"
return (BRUTELOSS|FIRELOSS) return (BRUTELOSS|FIRELOSS)
/obj/item/weapon/sord /obj/item/weapon/sord
@@ -45,7 +45,7 @@
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
suicide_act(mob/user) suicide_act(mob/user)
viewers(user) << "\red <b>[user] is impaling \himself with the [src]! It looks like \he's trying to commit suicide.</b>" viewers(user) << "\red <b>[user] is impaling \himself with the [src.name]! It looks like \he's trying to commit suicide.</b>"
return(BRUTELOSS) return(BRUTELOSS)
/obj/item/weapon/sord/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) /obj/item/weapon/sord/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
@@ -68,7 +68,7 @@
return 1 return 1
suicide_act(mob/user) suicide_act(mob/user)
viewers(user) << "\red <b>[user] is falling on the [src]! It looks like \he's trying to commit suicide.</b>" viewers(user) << "\red <b>[user] is falling on the [src.name]! It looks like \he's trying to commit suicide.</b>"
return(BRUTELOSS) return(BRUTELOSS)
/obj/item/weapon/claymore/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) /obj/item/weapon/claymore/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
@@ -88,7 +88,7 @@
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
suicide_act(mob/user) suicide_act(mob/user)
viewers(user) << "\red <b>[user] is slitting \his stomach open with the [src]! It looks like \he's trying to commit seppuku.</b>" viewers(user) << "\red <b>[user] is slitting \his stomach open with the [src.name]! It looks like \he's trying to commit seppuku.</b>"
return(BRUTELOSS) return(BRUTELOSS)
/obj/item/weapon/katana/IsShield() /obj/item/weapon/katana/IsShield()

2
code/modules/power/cable.dm
View File

@@ -173,7 +173,7 @@
attack_verb = list("whipped", "lashed", "disciplined", "flogged") attack_verb = list("whipped", "lashed", "disciplined", "flogged")
suicide_act(mob/user) suicide_act(mob/user)
viewers(user) << "\red <b>[user] is strangling \himself with the [src]! It looks like \he's trying to commit suicide.</b>" viewers(user) << "\red <b>[user] is strangling \himself with the [src.name]! It looks like \he's trying to commit suicide.</b>"
return(OXYLOSS) return(OXYLOSS)