Remie Richards
14aa907252
Merge pull request #9407 from phil235/StaminaFix
...
Fixes stamina damage
2015-05-09 06:03:26 +01:00
phil235
489d076de5
Merge pull request #9126 from Jordie0608/doesrussellsteapotapplytorussellsteapot
...
Fixes #9035 , atmos locker sprite and misc logging bug
2015-05-08 16:24:21 +02:00
phil235
b5bbc6f1ef
Fixes aliens getting an exhaustion message.
...
Fixes nearly infinite loop when calling setStaminaLoss -> CHeckStamina -> SetStaminaLoss -> etc...
CheckStamina is now called in carbon/handle_status_effects instead of carbon/handle_regular_status_updates().
2015-05-08 15:37:40 +02:00
Jordie
2febf4dacd
Merge pull request #9293 from xxalpha/cable_color
...
Engineering Cyborgs can now change their cable coil color.
2015-05-08 22:10:58 +10:00
Jordie
f16c21e99f
Merge pull request #9252 from RemieRichards/MapGeneratorImprovements
...
Procedural Map Generator Improvements [Perfect for Merging/Porting]
2015-05-08 22:10:17 +10:00
Cheridan
9e863a46d8
Merge pull request #9373 from AnturK/bunny_sterilization
...
Fixes leftover easter rabbit event
2015-05-07 07:54:35 -05:00
Cheridan
e91300f07d
Merge pull request #9168 from Ikarrus/SMES_boost
...
[MAP] Doubles Initial Engineering SMES charge
2015-05-06 09:28:04 -05:00
Cheridan
95d7af4e48
Merge pull request #9277 from Ikarrus/ertbaton
...
Batons for Light ERP
2015-05-06 09:03:55 -05:00
Cheridan
f49fbf1efc
Merge pull request #9303 from RemieRichards/ExperimentalPerfomancetest
...
Explosion Performance Upgrades
2015-05-06 09:00:42 -05:00
Cheridan
09c3c2cdc1
Merge pull request #9321 from KorPhaeron/master
...
Slime Mutation Changes +new reactions
2015-05-05 22:12:51 -05:00
KorPhaeron
daa9a92998
Update slime.dm
...
Fixed mutator used to be boolean
2015-05-05 21:50:22 -05:00
KorPhaeron
91be614fa5
More changes
...
Based on Remie's suggestions
2015-05-05 21:49:49 -05:00
Cheridan
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
Cheridan
867f283d85
Merge pull request #9330 from Jordie0608/whenpushcomestoshoveruntimeswilloccur
...
Fixes #693 , non-humans pushing restrained mobs
2015-05-05 21:11:58 -05:00
AnturK
ac4b76ac52
Fixes #9257
2015-05-05 18:50:30 +02:00
Dorsisdwarf
4a0df6fd45
Fixes #9222
2015-05-04 17:31:51 +01:00
Jordie0608
febd9406a0
mobs pushing restrained fix
2015-05-05 00:43:37 +10:00
Cheridan
dfaf90c79e
Merge pull request #9264 from phil235/BundleFix6
...
a group of fixes.
2015-05-04 09:41:01 -05:00
KorPhaeron
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
phil235
ba1f186ba4
Merge pull request #9307 from kingofkosmos/ragspanfix
...
Fixes span in wiping with rag.
2015-05-04 13:31:48 +02:00
Cheridan
191e011c14
Merge pull request #9272 from phil235/BundleFix7
...
animal knockdown, nettle soup, defib, extinguisher fixes
2015-05-04 00:26:22 -05:00
Cheridan
78e25c3175
Merge pull request #9220 from RemieRichards/PlasmaaaaaaaMeeeeeeen
...
Ports VG's Plasmamen + Species breathing additions
2015-05-04 00:19:18 -05:00
KorPhaeron
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
Remie Richards
a5f39d1cb8
minor correction.
2015-05-03 23:39:04 +01:00
Remie Richards
5e41b790d0
Fixes centerX and centerY not being correctly centered, corrects sphere logic.
...
why is it called sphereMagic? because as far as I'm concerned, it is magic, it was previously named centerZ but it actually was quite a ways off being the center of any spheres. Idk what it does, but It serves a vital part of building mathematically correct spheres.
2015-05-03 23:34:05 +01:00
Ikarrus
040ffc9ace
Grammar for special_role
2015-05-03 15:19:43 -06:00
Ikarrus
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
Remie Richards
e5f034fc0d
Merge pull request #9147 from GunHog/Rise_Of_The_RR_Androids
...
[Review Ready] Positronic Brains!
2015-05-03 06:34:02 +01:00
kingofkosmos
4dfee04698
Fixes span in wiping with rag.
2015-05-03 08:11:31 +03:00
Remie Richards
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
xxalpha
ba823213d2
Added ability for cyborgs to pick their cable coil color.
2015-05-03 00:43:21 +01:00
Cheridan
bbb1df2654
Merge pull request #9263 from Incoming5643/fightvale_pride
...
Fixes another instance of FIGHTVALE
2015-05-02 17:46:24 -05:00
xxalpha
638ccf8503
Changed engineering cyborg cable coils to be randomly colored.
2015-05-02 23:10:53 +01:00
Jordie
f0c57b916f
Merge pull request #9237 from Firecage/Butchering
...
Changes how butchering works, Changes butchering drops
2015-05-03 00:00:15 +10:00
Jordie
5f4b41c226
Merge pull request #9246 from Wolfie13/9097-borgs-fix
...
Fixes #9097
2015-05-03 00:00:08 +10:00
Jordie
6008404738
Merge pull request #9185 from AnturK/aliens_stole_my_branch_name
...
Abduction Update 2.5
2015-05-02 23:59:48 +10:00
Jordie
d5c7ead540
Merge pull request #9165 from Xhuis/REMOVE_REVENANT_remove_revenant
...
Temporarily disables revenants
2015-05-02 23:59:36 +10:00
Jordie
3606662c88
Merge pull request #9106 from phil235/BundleFix5
...
Cyborgs, MMIs, and other fixes
2015-05-02 23:59:22 +10:00
Jordie
562766bdb0
Merge pull request #9129 from Incoming5643/begone_ye_jellies
...
Some Mutantrace Housekeeping
2015-05-02 23:59:15 +10:00
Jordie
840d858aa1
Merge pull request #9202 from xxalpha/igppigigppigigppigigppig
...
Fixed surgery closing step not removing bleeding overlay.
2015-05-02 23:59:06 +10:00
Jordie
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
AnturK
a92b3b24e4
- Adds make abductor buttons on traitor panel
...
- Fixes clotheless surgery
2015-05-02 12:54:52 +02:00
MrStonedOne
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
Ikarrus
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
phil235
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
Cheridan
84d2a5a006
Merge pull request #9228 from Ikarrus/pregamedelay
...
Admins can now adjust pre-game delay time
2015-05-01 15:03:26 -05:00
Cheridan
0d1cfba3b7
Merge pull request #9200 from Ikarrus/ERTcodes
...
[Z2 MAP] Centcom Response Team Variations
2015-05-01 14:31:22 -05:00
Cheridan
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
phil235
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
Incoming
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