e5f034fc0d
Merge pull request #9147 from GunHog/Rise_Of_The_RR_Androids
...
[Review Ready] Positronic Brains!
2015-05-03 06:34:02 +01:00
bbb1df2654
Merge pull request #9263 from Incoming5643/fightvale_pride
...
Fixes another instance of FIGHTVALE
2015-05-02 17:46:24 -05:00
f0c57b916f
Merge pull request #9237 from Firecage/Butchering
...
Changes how butchering works, Changes butchering drops
2015-05-03 00:00:15 +10:00
5f4b41c226
Merge pull request #9246 from Wolfie13/9097-borgs-fix
...
Fixes #9097
2015-05-03 00:00:08 +10:00
6008404738
Merge pull request #9185 from AnturK/aliens_stole_my_branch_name
...
Abduction Update 2.5
2015-05-02 23:59:48 +10:00
d5c7ead540
Merge pull request #9165 from Xhuis/REMOVE_REVENANT_remove_revenant
...
Temporarily disables revenants
2015-05-02 23:59:36 +10:00
3606662c88
Merge pull request #9106 from phil235/BundleFix5
...
Cyborgs, MMIs, and other fixes
2015-05-02 23:59:22 +10:00
562766bdb0
Merge pull request #9129 from Incoming5643/begone_ye_jellies
...
Some Mutantrace Housekeeping
2015-05-02 23:59:15 +10:00
840d858aa1
Merge pull request #9202 from xxalpha/igppigigppigigppigigppig
...
Fixed surgery closing step not removing bleeding overlay.
2015-05-02 23:59:06 +10:00
d1f55ec69a
Merge pull request #9203 from Boggart/RpdUiFix
...
Fixes being unable to switch back to the previous pipe type without switching off it and back after using the delete or paint modes.
2015-05-02 23:58:55 +10:00
88faa5f6e9
Merge pull request #9250 from Boggart/BorgsCantIntoDisposalBinDeconstruction
...
Fixes borg modules other than the trash bag not being able to work on disposal bins.
2015-05-02 23:58:39 +10:00
865aa7b6fe
Merge pull request #9255 from Boggart/ThisIsntTheMushroomKingdomStayOuttaThePipes
...
Fixes being able to move out of cryo into the pipes.
2015-05-02 23:58:28 +10:00
34437dffb6
- Makes additional batons cost 2 experiment points.
...
- Fixes typo in floors.dmi
- Traitor panel buttons now grant objectives as well
2015-05-02 12:57:49 +02:00
9c1d52a7ae
Fixes non-gamemode rounded reports. Also formatting consistent with other modes.
2015-05-02 12:54:56 +02:00
d01bd11f47
Update tracking.dm
...
Oops
2015-05-02 12:54:55 +02:00
d5c52fab50
Fixes blockTracking variable
2015-05-02 12:54:55 +02:00
76717c6a2f
Adds some tech levels to the abductor gear
2015-05-02 12:54:54 +02:00
1f91bdbda1
Makes the alien floor randomized
...
Adds buying spare gear for experiment points
Makes kidnapping all mob/living stuff possible.
2015-05-02 12:54:53 +02:00
0115296a86
Fixes alien table icon
2015-05-02 12:54:53 +02:00
a92b3b24e4
- Adds make abductor buttons on traitor panel
...
- Fixes clotheless surgery
2015-05-02 12:54:52 +02:00
eb7d5fefa5
Merge remote-tracking branch 'upstream/master' into step-aside-aran-im-here-to-touch-your-precious
...
Conflicts:
code/controllers/subsystem/ticker.dm
2015-05-02 03:03:29 -07:00
9b3f98571c
mulligan will no longer mulligan a round into the same mode. Because of how scaling works this would at best only create one or two additional antags. At worst it wouldn't create any antagonists, and mulligan would get frustrated and reroll after its failure.
2015-05-02 00:00:41 -04:00
84d2a5a006
Merge pull request #9228 from Ikarrus/pregamedelay
...
Admins can now adjust pre-game delay time
2015-05-01 15:03:26 -05:00
0d1cfba3b7
Merge pull request #9200 from Ikarrus/ERTcodes
...
[Z2 MAP] Centcom Response Team Variations
2015-05-01 14:31:22 -05:00
509d940746
Merge pull request #9225 from Incoming5643/Unless_its_wizbiz_bugs_will_usually_follow
...
Fixes Round End Sound
2015-05-01 14:13:07 -05:00
a68bd99960
Merge pull request #9180 from phil235/GrassSpriteFix
...
Fixes broken grass sprite.
2015-05-01 13:46:59 -05:00
2d021ab175
Merge pull request #9226 from Ikarrus/gang5.2
...
Gang Update
2015-05-01 13:00:51 -05:00
b19a66ba51
Fixes another instance of FIGHTVALE because the replacementmode didn't realize that the lists of antags are kept in the ticker.mode gamemode and not itself.
...
Clears up some language issues that was making the check antag panel a little harder to read than it needed to be.
2015-05-01 13:34:34 -04:00
566861ca62
Merge pull request #9235 from Incoming5643/noncontinuous_extended
...
Adds sanity checking for continuous configuration settings
2015-05-01 12:31:55 -05:00
c947a4bea6
Merge pull request #9221 from Firecage/Grenadelauncherfix
...
Fixes the grammar error of the Grenade Launcher.
2015-05-01 12:17:09 -05:00
9e6b93ae6c
Merge pull request #9219 from xxalpha/winter_is_coming
...
Fixed unlimited uses crayons not being unlimited.
2015-05-01 12:01:11 -05:00
9f8c47b5f6
Removes my changes to cyborgs.
2015-05-01 16:32:34 +02:00
8f925be840
Merge branch 'master' of https://github.com/tgstation/-tg-station into GrassSpriteFix
...
Conflicts:
code/game/turfs/unsimulated/floor.dm
icons/turf/floors.dmi
2015-05-01 16:17:09 +02:00
94a132dbde
pr-9231 changelog and minor subsystem tweaks
2015-05-01 05:24:33 -07:00
41542fb8c8
Fixes being able to move out of cryo into the pipes.
2015-05-01 00:17:47 -06:00
fe1d3c22d5
Minor rework of lobby admin verbs
...
Both me and #9228 fixed the same bug, so I reverted mine
Starting the round with the start now verb will now show a tip of the round.
2015-04-30 18:27:58 -07:00
cd734c8eca
Fixes borg modules other than the trash bag not being able to work on disposal bins.
2015-04-30 16:42:25 -06:00
88260a638a
Adds enforce continuous rounds and allow midround antagonist reporting to get revision. It won't tell you which modes have them on from there (because it's player accessible) but will show how many roundtypes are currently set to use the features.
...
Standard config options would currnetly read:
Enforce Continuous Rounds: 10 of 18 roundtypes
Allow Midround Antagonists: 8 of 18 roundtypes
2015-04-30 12:14:41 -04:00
0615b4e09a
Merge branch 'master' of https://github.com/tgstation/-tg-station into ERTcodes
2015-04-30 08:56:46 -06:00
beca82e3c2
Fixes #9097
...
https://github.com/tgstation/-tg-station/issues/9097
2015-04-30 12:22:12 +01:00
68d4ffaf3f
uncommitted files (+5 squashed commit)
...
Squashed commit:
[971e023] Lets try loosening the restrictions on territory tagging
[c55a30d] Reduced pen cost to 40
[2b83dca1fe81a83067acc
2015-04-29 20:28:28 -06:00
2b83dca4c5
Formatting and changelog
2015-04-29 19:29:15 -06:00
1fe81a8e39
Let's make the message slightly less gamey
2015-04-29 19:21:39 -06:00
3738946480
Rolls back the message for a round that starts noncontinuous with no antags since this theoretically could happen if a station is full of antag hating peaceniks with no flags set.
...
Disables mulliganing into DA since it's currently borked and I need to look closer at it anyways
2015-04-29 20:10:43 -04:00
7ad10b1bb1
Small ..() fix.
2015-04-29 21:10:32 +02:00
ad75060280
Changes how butchering works.
2015-04-29 20:06:20 +02:00
7459238065
Merge branch 'master' of https://github.com/tgstation/-tg-station into begone_ye_jellies
...
Conflicts:
code/game/machinery/teleporter.dm
2015-04-29 13:37:01 -04:00
fa67555dbb
Adds sanity checking for configuration settings (or lack there of) that create situations where a round would end immediately because no antags had ever existed. This closes a hole where server owners could experience highly interuptive roundtypes like non-continous extended because they didn't keep their config files up to date.
2015-04-29 13:11:57 -04:00
64b5f8540c
Merge pull request #9164 from Fayrik/TheNanoing
...
The Nanoing (Part One: Atmospherics)
2015-04-29 09:38:56 -05:00
36df27ad53
Merge pull request #9205 from phil235/SpiderKnifeFixes
...
Spiders and kitchen tool fixes
2015-04-29 08:23:10 -05:00
Remie Richards
Cheridan
Jordie
AnturK
AnturK
MrStonedOne
Incoming
phil235
Boggart
Ikarrus
Wolfie13
Firecage