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

Merge pull request #3039 from Furlucis/master

Browse Source 
Typo fixes
This commit is contained in:
Chinsky
2013-06-11 12:21:16 -07:00
parent 362aa26a1e 360bde9f83
commit 09d0bb7f8e
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -319,7 +319,7 @@
attack_verb = list("stabbed", "slashed", "sliced", "cut") attack_verb = list("stabbed", "slashed", "sliced", "cut")
suicide_act(mob/user) suicide_act(mob/user)
viewers(user) << pick("/red <b>[user] is slitting \his wrists with the shard of glass! It looks like \he's trying to commit suicide.</b>", \ viewers(user) << pick("\red <b>[user] is slitting \his wrists with the shard of glass! It looks like \he's trying to commit suicide.</b>", \
"\red <b>[user] is slitting \his throat with the shard of glass! It looks like \he's trying to commit suicide.</b>") "\red <b>[user] is slitting \his throat with the shard of glass! It looks like \he's trying to commit suicide.</b>")
return (BRUTELOSS) return (BRUTELOSS)

2
code/game/objects/items/robot/robot_upgrades.dm
View File

@@ -14,7 +14,7 @@
/obj/item/borg/upgrade/proc/action(var/mob/living/silicon/robot/R) /obj/item/borg/upgrade/proc/action(var/mob/living/silicon/robot/R)
if(R.stat == DEAD) if(R.stat == DEAD)
usr << "/red The [src] will not function on a deceased robot." usr << "\red The [src] will not function on a deceased robot."
return 1 return 1
return 0 return 0

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

@@ -365,8 +365,8 @@ LOOK FOR SURGERY.DM*/
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.name] 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.name] 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)
/* /*

2
code/modules/mob/living/simple_animal/constructs.dm
View File

@@ -290,4 +290,4 @@
if (cultist == usr) //just to be sure. if (cultist == usr) //just to be sure.
return return
cultist.loc = usr.loc cultist.loc = usr.loc
usr.visible_message("/red [cultist] appears in a flash of red light as [usr] glows with power")*/ usr.visible_message("\red [cultist] appears in a flash of red light as [usr] glows with power")*/

2
code/modules/research/xenoarchaeology/finds/finds.dm
View File

@@ -143,7 +143,7 @@
icon_state = "statuette" icon_state = "statuette"
additional_desc = "It depicts a [pick("small","ferocious","wild","pleasing","hulking")] \ additional_desc = "It depicts a [pick("small","ferocious","wild","pleasing","hulking")] \
[pick("alien figure","rodent-like creature","reptilian alien","primate","unidentifiable object")] \ [pick("alien figure","rodent-like creature","reptilian alien","primate","unidentifiable object")] \
[pick("performing unspeakable acts","posing heroically","in a feotal position","cheering","sobbing","making a plaintive gesture","making a rude gesture")]." [pick("performing unspeakable acts","posing heroically","in a fetal position","cheering","sobbing","making a plaintive gesture","making a rude gesture")]."
if(5) if(5)
item_type = "instrument" item_type = "instrument"
icon_state = "instrument" icon_state = "instrument"