Commit Graph

16315 Commits

Author SHA1 Message Date
spasticVerbalizer bccb7cb14f Standardized heat-proofing airlocks 2015-05-11 20:52:31 +02:00
spasticVerbalizer 040fd7d8b7 Change uses of 'usr' to 'user', move checking of wall up so the message actually shows 2015-05-10 13:31:10 +02:00
spasticVerbalizer 087365e763 src.contents to src.loc.contents 2015-05-09 20:49:44 +02:00
spasticVerbalizer faf6bff92c Typecheck for turf being a wall, look in contents rather than loc. 2015-05-09 18:58:30 +02:00
spasticVerbalizer 22fd9cc430 Added check to prevent false wall stacking 2015-05-06 15:35:17 +02: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 f11122c255 Merge pull request #9338 from optimumtact/framingrage
Change machine frames and girders deconstruction step
2015-05-05 21:38:02 -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
oranges 4ac3497ebe Change machine frames and girders deconstruction step
They now use the screwdriver instead of the welding tool

On top of that I added a check to ensure you can't disassemble the same girder
more than once to farm materials
2015-05-05 10:32:57 +12: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
Cheridan c4a5edd792 Merge pull request #9301 from Incoming5643/damn_your_strange_nontraditional_concept_of_life
Fixes an instance where bleb wouldn't mulligan properly
2015-05-04 09:24:45 -05:00
Cheridan 5bbf2be174 Merge pull request #9233 from Firecage/Operatingcuffing
Allows you to buckle people to an operating table.
2015-05-04 09:15:41 -05:00
Cheridan c655462d14 Merge pull request #9292 from Incoming5643/mutations_please
Fixes a runtime in exotic blood clearing.
2015-05-04 09:11:05 -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
Cheridan 306af775f3 Merge pull request #9295 from Xhuis/cult_update_un
Small cult update
2015-05-03 23:41:16 -05:00
Cheridan 909217b733 Merge pull request #9285 from MrStonedOne/fuck
Fixes bug preventing pipe construction.
2015-05-03 21:18:27 -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 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
Incoming e84acea13b Fixes an instance where a sanity check was being mistakenly failed because blobs have a different sort of standard for being "alive" or "dead" than other antags. This will fix a problem where blob rounds weren't properly mulliganing. 2015-05-02 21:23:22 -04:00
Xhuis 43bc7260de Cult update 2015-05-02 19:03:32 -04:00
Cheridan bbb1df2654 Merge pull request #9263 from Incoming5643/fightvale_pride
Fixes another instance of FIGHTVALE
2015-05-02 17:46:24 -05:00
Incoming 6a91232fbc fixes a runtime in exotic blood clearing.
my batting average has been really bad lately. I gotta be more extensive in bug testing.
2015-05-02 17:29:13 -04:00
MrStonedOne 6d755ba900 Fixes pipe construction bug 2015-05-02 09:07:08 -07: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 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
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
Jordie 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
AnturK 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
AnturK 9c1d52a7ae Fixes non-gamemode rounded reports. Also formatting consistent with other modes. 2015-05-02 12:54:56 +02:00
AnturK d01bd11f47 Update tracking.dm
Oops
2015-05-02 12:54:55 +02:00
AnturK d5c52fab50 Fixes blockTracking variable 2015-05-02 12:54:55 +02:00
AnturK 76717c6a2f Adds some tech levels to the abductor gear 2015-05-02 12:54:54 +02:00
AnturK 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
AnturK 0115296a86 Fixes alien table icon 2015-05-02 12:54:53 +02:00
AnturK a92b3b24e4 - Adds make abductor buttons on traitor panel
- Fixes clotheless surgery
2015-05-02 12:54:52 +02:00