Commit Graph

12467 Commits

Author SHA1 Message Date
phil235 ba1f186ba4 Merge pull request #9307 from kingofkosmos/ragspanfix
Fixes span in wiping with rag.
2015-05-04 13:31:48 +02:00
Samuel Rowe 76bcddca8c Spelling and grammar fixes
Just cleaning up the desc's so it is more immersive.
2015-05-04 18:13:33 +12: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
GunHog 3b35e80e4d Merge remote-tracking branch 'remotes/upstream/master' into Botcall_V2
Conflicts:
	code/game/machinery/bots/bots.dm
2015-05-03 17:59:46 -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
GunHog df902d50fc Bots Revamp
- Viciously rips radio code from bots, replacing it with something
better and faster!
- Bot patrol logic redesigned, much faster.
- Gives all bots Robotics access for easy patrol activation.
- Bot navigation beacons are no longer radios. Instead, they are
maintained in a global list.
- Navbeacons can now be accessed by Roboticists, and they use a better
UI.
- PDA bot code rewritten. They no longer use radio objects at all!
- Captain now has all-access! His cartridge now has everything except
Mime and Clown functions.
- There is now one button across all PDAs for accessing bots. Only bots
you have access to control will show on the list.
- Buffed the signaler cartridge! It may now be used to signal on all
valid frequencies.
- The AI's botcall interface now includes the bot's model, so it can
always identify the type of bot it is controlling. PDAs have this as
well.
- Spilled my blood to begin Jordie's dark ritual.
2015-05-03 17:31:10 -05: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 c9f2d282d6 Fixes #9311, Fixes destroyed pipes still being in pipe vision, Pipe vision now appears above darkness. 2015-05-03 17:34:18 +01:00
AnturK 63b33f40cf Fixes button created teams not adding to gamemode 2015-05-03 15:15:09 +02: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
Remie Richards 07f1b17a75 Update pipe vision when moving from scrubbers-->vents or vice versa via atmos/pipe fuckery, Fixes pipe vision not updating on login() 2015-05-03 00:13: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
Cheridan c947a4bea6 Merge pull request #9221 from Firecage/Grenadelauncherfix
Fixes the grammar error of the Grenade Launcher.
2015-05-01 12:17:09 -05:00
Remie Richards 96758cb2f7 Fixes the nature generator verb failing to recognise CLUSTER_CHECK_NONE as a valid flag 2015-05-01 16:36:05 +01:00
phil235 9f8c47b5f6 Removes my changes to cyborgs. 2015-05-01 16:32:34 +02:00
Remie Richards 74574a29bc Fixes the scope of the 4 Continue statements to correctly end the turfPath and atomPath loops, Corrects define bitflags 2015-05-01 08:13:47 +01:00
kingofkosmos dcbb071c22 missed a spanclass 2015-05-01 09:34:54 +03:00
Remie Richards bdfa5684c3 Adjusts some code to reduce the rapid increase of clustering accidentally somehow caused in this improvement PR 2015-05-01 05:05:32 +01:00
Remie Richards d88363c66c Fixes atoms not spawning, Corrects defineCircularRange() to produce proper spheres when given differing Z coords. 2015-05-01 04:27:14 +01:00
MrStonedOne 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
Remie Richards c7f0bc0922 Made defineRegion() procs additive instead of overwriting, overwriting has been moved to a "replace" argument, adds undefineRegion() which makes the map list a new list. 2015-05-01 01:38:39 +01:00
Remie Richards 1808b19933 Fixes a bug where turf cluster checks checked for atoms instead of turfs, adds proc to define a circular region, CIRCLES! 2015-05-01 01:26:28 +01:00
Boggart 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
Ikarrus 0615b4e09a Merge branch 'master' of https://github.com/tgstation/-tg-station into ERTcodes 2015-04-30 08:56:46 -06:00
Wolfie13 beca82e3c2 Fixes #9097
https://github.com/tgstation/-tg-station/issues/9097
2015-04-30 12:22:12 +01:00