Commit Graph

6856 Commits

Author SHA1 Message Date
paprka
6db18cff96 initial commit 2014-09-30 13:41:02 -07: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
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
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
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
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
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
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
9bcde45b10 Fixes some bizarre job+antag interactions 2014-09-26 19:36:04 +01: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
phil235
3248e23887 Merge branch 'master' of https://github.com/tgstation/-tg-station into AudibleMsgFix
Conflicts:
	code/modules/recycling/disposal.dm
2014-09-25 18:45:53 +02:00
phil235
7afbd3345b Replacing some hearers(...) with get_hearers_in_view(...).
Renaming Make Sound to Object Say.
Switching deaf_message in audible_message proc to last argument.
Replacing some "for(mob in hearers)+show_message" with audible_message()
2014-09-25 18:22:27 +02:00
ikarrus
796e540dfc Merge branch 'master' of https://github.com/tgstation/-tg-station into ammunitionlocker
Conflicts:
	_maps/map_files/tgstation.2.1.3.dmm
2014-09-25 09:37:54 -06:00
Cheridan
013a1b1a3f Merge pull request #4918 from Aranclanos/eletropack
Adds the eletropack to the radio controller objects, so they work again.
2014-09-25 08:52:00 -05:00
Cheridan
42fb63b943 Merge pull request #4930 from Ikarrus/removerestrictions
Removes a couple of restrictions on job management
2014-09-25 08:34:59 -05:00
Cheridan
71fdb766fe Merge pull request #4921 from phil235/OddyStatFix
Sleeper and odysseus fixes
2014-09-25 08:30:51 -05:00
Cheridan
65b35c53cd Merge pull request #4954 from Aranclanos/medbotfix
Makes medbots less spammy
2014-09-24 21:11:52 -05:00
Cheridan
02d3cdc199 Merge pull request #4938 from hornygranny/tableclimbing
table bugfixes
2014-09-24 19:09:26 -05:00
Hornygranny
24edf9f6d4 Fixes #4933 by refactoring climbing (ty MrPerson) 2014-09-24 12:31:24 -07:00
Swag McYolosteinen
9409ab2b65 Merge pull request #4932 from Ikarrus/tdomereset
[MAP] Adds a reset button for the Thunderdome
2014-09-24 17:14:51 +02:00
Swag McYolosteinen
a278248597 Merge pull request #4955 from Aranclanos/MCcrash
Fixes the MC crash at using security camera computers.
2014-09-24 17:04:33 +02:00
Swag McYolosteinen
75c8cfc601 Merge pull request #4931 from Ikarrus/approvalrating
Fixes the "Command's Approval Rating" stat in rev end-round reports
2014-09-24 17:01:34 +02:00
Swag McYolosteinen
f9e17faca3 Merge pull request #4889 from Jordie0608/orwecouldpathplasmasheetsasfire
Repaths clown ore to bananium
2014-09-24 16:58:23 +02:00
Swag McYolosteinen
78ce564314 Merge pull request #4871 from phil235/FlashPowderthing
Fixes #4176
2014-09-24 16:55:49 +02:00
Remie Richards
a9d609bc9b Merge pull request #4802 from Menshin/stacks_merging_cleaning
Crafted stacks merging cleaning
2014-09-24 12:04:07 +01:00
Remie Richards
90f3b05568 Merge pull request #4724 from Lo6a4evskiy/Security_HUD_records
Integrated more of security records functionality into SecHUD
2014-09-24 12:02:52 +01:00
Remie Richards
3bf3386a47 Merge pull request #4846 from Incoming5643/revheadscaling
Changes to Revolution Mode
2014-09-24 12:00:56 +01:00
Incoming
f317c0b09d Predictably Random Z-levels and the SPACECUBE
The layout of the accessible z levels in relation to each other are now lain out in a massive preshuffled SPACECUBE. Every Z-level is no more than two screens from every other Z-level, and can be moved through in a predictable order* with a little ingenuity

*Except z.6

See pull for the full details
2014-09-23 16:10:13 -04:00
Hornygranny
8aa5fd2ff6 ishuman changed to istype for previously defined scope 2014-09-23 10:43:26 -07:00
phil235
aed2aeb7a1 Blob rounds are now reported as a win if the blob wins and vice versa (just like malf, nuke, rev) 2014-09-23 16:29:05 +02:00