e91300f07d
Merge pull request #9168 from Ikarrus/SMES_boost
...
[MAP] Doubles Initial Engineering SMES charge
2015-05-06 09:28:04 -05:00
95d7af4e48
Merge pull request #9277 from Ikarrus/ertbaton
...
Batons for Light ERP
2015-05-06 09:03:55 -05:00
f49fbf1efc
Merge pull request #9303 from RemieRichards/ExperimentalPerfomancetest
...
Explosion Performance Upgrades
2015-05-06 09:00:42 -05:00
09c3c2cdc1
Merge pull request #9321 from KorPhaeron/master
...
Slime Mutation Changes +new reactions
2015-05-05 22:12:51 -05:00
daa9a92998
Update slime.dm
...
Fixed mutator used to be boolean
2015-05-05 21:50:22 -05:00
91be614fa5
More changes
...
Based on Remie's suggestions
2015-05-05 21:49:49 -05:00
a48374e3a5
Merge pull request #9333 from Dorsisdwarf/fixesbug-goofball
...
Fixes #9222 Dead monkies still scream when patches applied
2015-05-05 21:43:42 -05:00
867f283d85
Merge pull request #9330 from Jordie0608/whenpushcomestoshoveruntimeswilloccur
...
Fixes #693 , non-humans pushing restrained mobs
2015-05-05 21:11:58 -05:00
4a0df6fd45
Fixes #9222
2015-05-04 17:31:51 +01:00
febd9406a0
mobs pushing restrained fix
2015-05-05 00:43:37 +10:00
dfaf90c79e
Merge pull request #9264 from phil235/BundleFix6
...
a group of fixes.
2015-05-04 09:41:01 -05:00
8b6b8887db
More slime stuff
...
Further tweaks slime mutation chances based on Crimson's feedback, makes
the code prettier based on Remie's feedback
2015-05-04 09:05:42 -05:00
ba1f186ba4
Merge pull request #9307 from kingofkosmos/ragspanfix
...
Fixes span in wiping with rag.
2015-05-04 13:31:48 +02:00
191e011c14
Merge pull request #9272 from phil235/BundleFix7
...
animal knockdown, nettle soup, defib, extinguisher fixes
2015-05-04 00:26:22 -05:00
78e25c3175
Merge pull request #9220 from RemieRichards/PlasmaaaaaaaMeeeeeeen
...
Ports VG's Plasmamen + Species breathing additions
2015-05-04 00:19:18 -05:00
e8d42244eb
Slime Mutation Changes +new reactions
...
Slime mutation chance starts at a flat 27%
Slime mutation chance is now hereditary, with the new baby slimes
inheriting the mutation chance of the parent (with a variation of -5 to
+5). This allows you to cultivate slimes that are more likely to mutate
over time rather than praying to the RNG forever.
Plasma no longer causes slimes to have a higher mutation chance, and
epinephrine no longer lowers mutation chance.
Red slime extract+plasma now gives a potion that increases mutation
chace
Blue slime extract+blood now gives a potion that lowers mutation chance.
The numbers might need tweaking if this makes xenobio too fast, but
right now it is often frustrating and slow. It is more reliable and
faster to build a mech than breed slimes given the current mutation
system.
2015-05-03 19:52:05 -05:00
040ffc9ace
Grammar for special_role
2015-05-03 15:19:43 -06:00
832e19a061
Fixed a bug with admins being told it failed to create a response team if they spawned a centcom official or deathsquad
2015-05-03 14:06:16 -06:00
e5f034fc0d
Merge pull request #9147 from GunHog/Rise_Of_The_RR_Androids
...
[Review Ready] Positronic Brains!
2015-05-03 06:34:02 +01:00
4dfee04698
Fixes span in wiping with rag.
2015-05-03 08:11:31 +03:00
2234a9b25e
powernet datums now manually clear references, subsystem/proc/postpone() now takes an optional "cycles" argument, for postponing more than 1 cycle, Explosions are less laggy!
2015-05-03 04:39:48 +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
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
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
b331391aa5
Batons for Light ERT
...
Moved the batons from the lockers to their backpacks so light ERTs can use them
2015-05-01 21:30:34 -06:00
be1708483e
- Fixed nettle soup recipe says abstract nettle.
...
- Fixes hostile animals weakening non carbons, and adjusted weakening values 1958.
- fixes being able to drop defib paddle by resting, fix a runtime linked to this.
- can no longer pick card from deck while resting, same for paper bin and bedsheet bin.
- examining extinguisher and atmos watertank nozzle gives you the amount of water remaining.
2015-05-02 01:34:38 +02: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
4a8e168ff3
- admin revive clears addiction list. 8894
...
- buffed capsaicin/frost oil temperature effects as well as basilisk temperature effect (to counterbalance the recent change in natural bodytemp stabilization). And slight nerf to ghost chili temp boost when held in hand (for consistency). 8501
- fixes religion name choice window labeled as mime name
- fixes nearly invincible larva 9223
- your health/status now updates immediately after taking damage, we don't wait for the next life(). 7031
- Fixes alien nest overlay not updating when dead mob is gibbed by larva exit. 8523
- fixes flamethrower tablecrafting. 9261
2015-05-01 19:45:36 +02: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
c947a4bea6
Merge pull request #9221 from Firecage/Grenadelauncherfix
...
Fixes the grammar error of the Grenade Launcher.
2015-05-01 12:17:09 -05:00
9f8c47b5f6
Removes my changes to cyborgs.
2015-05-01 16:32:34 +02: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
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
8b2834fadc
Made plasma exhale as CO2 instead oxygen. 1: Oxygen is indirectly harmful to plasmamen (they ignite) 2: Burnmix outputs CO2
2015-04-29 23:39:08 +01: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
2bc42255f1
New fire overlay sprite for ALL Humanoid mobs, Removes hacky plasmaman fire underlay code - Thanks WJohnston!
2015-04-29 18:19:06 +01:00
Cheridan
KorPhaeron
Dorsisdwarf
Jordie0608
phil235
Ikarrus
Remie Richards
kingofkosmos
AnturK
MrStonedOne
phil235
Incoming
Boggart
Wolfie13
Firecage