Commit Graph

17418 Commits

Author SHA1 Message Date
Fox McCloud
9fc41ca580 Ports Talking Medibot 2018-05-27 18:02:07 -04:00
Alffd
f83e8b6aa7 Fix no ToS error 2018-05-26 19:08:53 -04:00
tigercat2000
baf5fe64a7 Merge pull request #8967 from Tayyyyyyy/pronouns
Pronouns!
2018-05-25 19:39:11 -07:00
tigercat2000
a1d2261970 Merge pull request #9071 from Allfd/tos
Terms of service
2018-05-25 19:38:22 -07:00
tigercat2000
9e54ca5dc2 Merge pull request #9054 from Tayyyyyyy/ticket_bleed_fix
Fix ticket bleed
2018-05-25 19:33:31 -07:00
Tayyyyyyy
50aceae04d Revert unwanted style change 2018-05-25 19:02:13 -07:00
Tayyyyyyy
f00d350596 Fix powercell 2018-05-25 18:39:38 -07:00
Tayyyyyyy
bc977804de Small fixes 2018-05-25 18:39:38 -07:00
Tayyyyyyy
96be9a80ea Missed a t_him 2018-05-25 18:39:38 -07:00
Tayyyyyyy
0ee6cde88e Fix a few style issues 2018-05-25 18:39:38 -07:00
Tayyyyyyy
919bd7aaf2 Replace \his, \he, \him, \himself 2018-05-25 18:39:37 -07:00
Tayyyyyyy
09fb007cfc Fix examine 2018-05-25 18:34:29 -07:00
Tayyyyyyy
98c6ddf5a7 Fix his, he, him 2018-05-25 18:34:28 -07:00
Tayyyyyyy
aa9d658847 Them 2018-05-25 18:34:28 -07:00
Tayyyyyyy
42f85919de More their 2018-05-25 18:34:26 -07:00
Tayyyyyyy
ad23362781 Death 2018-05-25 18:34:24 -07:00
Tayyyyyyy
bc210f595b Examine 2018-05-25 18:34:24 -07:00
Tayyyyyyy
dd120a00f0 Their 2018-05-25 18:34:24 -07:00
Tayyyyyyy
e6ead787c4 Use get_visible_gender 2018-05-25 18:34:23 -07:00
Tayyyyyyy
c80704e724 Conjugating verbs is hard 2018-05-25 18:34:23 -07:00
Tayyyyyyy
170266d827 More pronouns 2018-05-25 18:34:23 -07:00
Tayyyyyyy
497072d4d1 Update pronoun usage 2018-05-25 18:34:22 -07:00
tigercat2000
292f375105 Merge pull request #9033 from Tayyyyyyy/amoji
Enable emojis for asay and msay 🎉
2018-05-25 18:06:00 -07:00
tigercat2000
858d83505b Merge pull request #9067 from Birdtalon/lasertag
Laser tag projectiles make tap sound when striking
2018-05-25 18:03:06 -07:00
tigercat2000
7d54177b3e Merge pull request #8984 from Citinited/disposals-nullspace-fix
Hopefully fixes all dumb disposals nullspace shit
2018-05-25 18:00:00 -07:00
tigercat2000
ea44afdebe Merge pull request #9025 from Anasari/BombToInvestigate
Move bombing list to investigate & improve bomb logging
2018-05-25 17:58:13 -07:00
tigercat2000
5213d9b3e6 Merge pull request #9037 from Anasari/LubeCoord
Add coordinates to acid / lube spray message for administrative purpose
2018-05-25 17:55:25 -07:00
tigercat2000
6a0b9df7ab Merge pull request #9062 from Anasari/EMPJump
EMP logging improvement
2018-05-25 17:45:59 -07:00
Alffd
83305fa790 Probably fine 2018-05-25 16:35:48 -04:00
Alffd
61d746e009 Tiger changes 2018-05-25 15:51:03 -04:00
Alffd
e00c98fdde Space saving 2018-05-25 14:05:05 -04:00
Alffd
ef1b44b955 Terms of service click through. 2018-05-25 03:40:16 -04:00
Birdtalon
d46d84237f laser tag guns now make tap.ogg when striking 2018-05-23 21:43:34 +01:00
Fox McCloud
404c712aea Removes the last of the color macros 2018-05-23 14:05:17 -04:00
Ansari
827503b0a4 EMP now provide coordinates and allow you to jump to it. Most EMP instance except for the Experimentor and the Singularity are now logged. 2018-05-23 18:33:12 +08:00
Birdtalon
5bbe1f7342 fixes annoying typo on permanent ban 2018-05-22 12:00:56 +01:00
Tayyyyyyy
2e242bfc84 Fix ticket bleed 2018-05-21 17:40:05 -07:00
Crazy Lemon
689801a15c Merge pull request #9029 from Fox-McCloud/attack-animation-improvements
Further Improves Attack Animations
2018-05-18 20:33:14 -07:00
Crazy Lemon
25a3811ad3 Merge pull request #9028 from Fox-McCloud/gloves-of-death
Ports Gloves of the North Star
2018-05-18 20:20:01 -07:00
Ansari
dca636b3e5 Add coordinates to acid / lube spray message for administrative purpose 2018-05-19 11:11:43 +08:00
Ansari
f619f85655 FixGrammar 2018-05-19 08:24:01 +08:00
Ansari
ed0c209e93 Expand fuel tank logging 2018-05-18 16:39:57 +08:00
Tayyyyyyy
3e26a6b5f3 Enable emojis for asay and msay 2018-05-18 00:25:28 -07:00
Ansari
dd417c006b Uses define instead of "bombs" for styling reason. Fixes IED not logging into investigate due to its special mechanism. 2018-05-18 12:23:08 +08:00
Aurorablade
522c78b42a Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into FurasianFluff 2018-05-18 00:11:58 -04:00
tigercat2000
6bbf2920b9 Merge pull request #9020 from Fox-McCloud/preps-the-way
Preps the Way for Datumized Antags
2018-05-17 20:34:12 -07:00
Fox McCloud
224b18af1c Merge remote-tracking branch 'upstream/master' into attack-animation-improvements 2018-05-17 23:34:01 -04:00
Crazy Lemon
7aa9731e52 Merge pull request #8898 from tigercat2000/face_lock
Directional Locking
2018-05-17 20:28:03 -07:00
tigercat2000
85a19c9935 Merge remote-tracking branch 'upstream/master' into face_lock
# Conflicts:
#	code/modules/mob/mob.dm
2018-05-17 20:21:39 -07:00
tigercat2000
1cfc3f27c8 Merge pull request #8974 from Fox-McCloud/holo-projector
Ports Holoprojectors
2018-05-17 20:19:13 -07:00