Commit Graph

11280 Commits

Author SHA1 Message Date
paprka fe6e9dfd80 some overlooked text things 2014-09-30 15:17:01 -07:00
paprka c9db4d85d5 syndicate magboots and sprite fix 2014-09-30 15:11:30 -07:00
Cheridan 94c72605e2 Merge pull request #4990 from Ikarrus/deathsquads
Make Deathsquad button can be used more than once
2014-09-30 12:55:50 -05:00
Cheridan fa751f2f72 Merge pull request #4975 from phil235/CloneMessages
Replacing clone damage descriptions with "cellular damage".
2014-09-30 12:21:42 -05:00
Cheridan 3b2291189b Merge pull request #4991 from Ikarrus/ferryjmp
Adds a JMP link to the Admin Ferry Message
2014-09-30 12:16:47 -05:00
Swag McYolosteinen 9943cc3ec7 Merge pull request #4927 from Donkie/ntsl
NTSL: Cleanup, Added some functions [MERGEREADY]
2014-09-30 18:46:09 +02:00
Daniel 021e960bb3 Removed language argument from broadcast() 2014-09-30 18:20:01 +02:00
Cheridan eaecd4eb63 Merge pull request #5027 from Menshin/spacecube_hotfix
[hotfix] Fixes the spacecube runtime at server start
2014-09-30 06:25:17 -05:00
Remie Richards 219864312a Merge pull request #4988 from Miauw62/420
Fixes a bunch of saycode things.
2014-09-30 10:23:23 +01:00
Remie Richards 87c2eeb24a Merge pull request #4983 from paprka/armorbutton
Reactive Teleport Armor action button
2014-09-30 10:22:38 +01:00
Menshin be88cf80c1 Fixes the spacecube server start runtime (index out of bound for array) by making the z_level list an associative list. 2014-09-30 01:15:55 +02:00
Cheridan 094010444f Merge pull request #4970 from Jordie0608/nothingwittyhere
Fixes 'atoms' typo in unsuitable_atmos_damage
2014-09-29 12:57:08 -05:00
Swag McYolosteinen 74fcfb6f0f Merge pull request #5017 from Ikarrus/ghosthearsall
Ghosts will be able to hear all Special Chats
2014-09-29 18:34:17 +02:00
Cheridan 4dcc265d76 Merge pull request #4960 from Incoming5643/zlevel
[map] Predictably Random Z-levels and the SPACECUBE
2014-09-29 10:42:49 -05:00
Cheridan 7e8e728d85 Merge pull request #4986 from Ikarrus/gangfixes
Gang Mode fixes and improvements
2014-09-29 10:33:17 -05:00
Cheridan a42e99186c Merge pull request #4987 from Ikarrus/memospam
Fixes Issue with Deleting Memos
2014-09-29 10:20:31 -05:00
Alex 94ae6d046d Merge pull request #4993 from Ikarrus/additionalDAs
New way of calculating # of DAs
2014-09-29 13:46:14 +01:00
Cheridan 0c24237244 Merge pull request #4958 from phil235/BlobFix
Blob win reported as a win
2014-09-28 21:56:31 -05:00
Cheridan fdf75bb6d7 Merge pull request #4982 from RemieRichards/AntagBeforeJobFixes
Fixes some bizarre job+antag interactions
2014-09-28 21:53:56 -05:00
ikarrus fdecf7bb68 Ghosts will be able to hear all Special Chats
Mostly so admins can supervise them.

- Ghosts will be able to hear Cultist Chat. Ghosts weren't able to pick up ones sent by cult_innate_comm()
- You won't need ghost ears on to listen to Binary Chat, like how it used to be
- put dead_mob_list to good use (Everything seemed fine when I tested it. Let me know if I'm missing overlooking something)
- Bumped lingchat sense chance up to 40%

Resolves #4860
2014-09-28 20:35:09 -06:00
Remie Richards 7fa398836e Adds some missing checks for need_job_assign which caused Wizard and Nuke op AIs and HoS Cultists 2014-09-28 23:34:10 +01:00
ikarrus 899637a63b New way of calculating # of DAs
Instead of modifying the coefficient, it just straight up adds additional antagonists.
2014-09-27 18:06:24 -06:00
ikarrus 35068e19ae Adds a JMP link to the Admin Ferry Message 2014-09-27 17:13:37 -06:00
ikarrus b3e4bf8b7d Admin message also says what the mission is 2014-09-27 16:58:27 -06:00
ikarrus adb66f2264 Make Deathsquad button can be used more than once 2014-09-27 16:56:33 -06:00
Cheridan 0f5fd59c0c Merge pull request #4919 from Miauw62/tatorbalance
Rebalances traitor items.
2014-09-27 17:13:50 -05:00
Miauw f0ddaf7d8e Merge branch 'master' of https://github.com/tgstation/-tg-station into 420
Conflicts:
	code/modules/admin/admin_verbs.dm
2014-09-27 16:09:31 +02:00
Miauw 77584d4a7d Fixes a bunch of saycode things. Objs can now hear radio talk.
Added a proper strip_html() function.
Fixed #4959
2014-09-27 16:06:06 +02:00
Swag McYolosteinen d9ee81bb96 Merge pull request #4815 from phil235/AudibleMsgFix
Simplifying audible messages
2014-09-27 15:01:56 +02:00
ikarrus 4b1deb2252 fix 2014-09-26 22:48:23 -06:00
ikarrus ab0a698421 Fixes Issue with Deleting Memos
It was logging every memo as being deleted every time any memo was deleted.
2014-09-26 22:44:50 -06:00
ikarrus 131b5ee0ec - Removes the useless has_been_rev var
- Reworded intercept report to discourage security from inadvertently causing a gang to win.
- Recaller use is logged
- Made the text explaining membership visibility more visible
2014-09-26 21:37:07 -06:00
ikarrus a305762162 Made the text explaining membership visibility more visible 2014-09-26 19:36:18 -06:00
ikarrus 65e38bdfbc Gang Mode fixes and improvements
The first of many. Most caused by horrible merge-related accidents.
- Gang converts are no longer revolutionaries
- Revolution controls show up in the TP again
- Gang added to game_options.txt defaulting to 0
- Clarified some help text strings
2014-09-26 19:27:13 -06:00
Cheridan c35640b674 Merge pull request #4832 from Anonus/10waystowin
Buffs Lings
2014-09-26 19:53:23 -05:00
Remie Richards cc85f44ccb Merge pull request #4900 from MrStonedOne/erroageinjudgement
Fixes some "erros" in the database system
2014-09-26 23:41:37 +01:00
paprka 4cdf887308 rta button 2014-09-26 15:28:57 -07:00
Remie Richards 9bcde45b10 Fixes some bizarre job+antag interactions 2014-09-26 19:36:04 +01:00
Daniel 8fa821f267 Added $language variable
Does not support changing output language yet though
2014-09-26 20:14:22 +02:00
Daniel bbf88e4986 Fixed proper() again 2014-09-26 18:46:17 +02:00
Daniel 34a3d63f9b Added language argument to broadcast()
Can be any of HUMAN, MONKEY, ALIEN, ROBOT, SLIME or DRONE.
2014-09-26 18:46:12 +02:00
Daniel 7be2bdff8b Fixed proper() 2014-09-26 15:26:57 +02:00
Daniel bd58c3b202 Added proper(string) 2014-09-26 14:50:16 +02:00
Incoming 72e5d79171 Whoops, made a dumb mistake 2014-09-25 16:30:51 -04:00
Incoming 49fe512bab Adds z.7 (dead space 2) to boxstation because no one seemed particularly offended by the idea. This closes the cube properly there and prevents a few weird edge cases where closed loops of Z.6 to Z.6 transitions could happen.
Meta/Mini should add empty z.7 at some point after this pull is committed, I would have done so myself but it didn't play nice with mapmerge so I decided against it.
2014-09-25 15:05:06 -04:00
phil235 231c1f0ea2 Merge branch 'master' of https://github.com/tgstation/-tg-station into CloneMessages 2014-09-25 20:07:29 +02:00
phil235 1d9834b159 Adding changelog and correcting a typo 2014-09-25 20:06:01 +02:00
Cheridan 7d5fd4d24c Merge pull request #4935 from Ikarrus/distressing_alert
New sound for more distressing minor announcements
2014-09-25 12:34:59 -05:00
phil235 1840d72ae4 reverting to show_message proc in three places. 2014-09-25 19:14:51 +02:00
phil235 b00b41bbf9 Replacing clone damage descriptions by "cellular damage". 2014-09-25 19:11:31 +02:00