Commit Graph

616 Commits

Author SHA1 Message Date
Mark van Alphen
87ed05c146 Merge pull request #326 from Artorp/AutolatheQueue
Added queue functionality to the autolathe
2015-02-18 16:16:05 +01:00
Artorp
e1eb2b9a1d Updated m_amt and g_amt to match their design 2015-02-17 18:52:31 +01:00
Markolie
f5e2d82953 (Plasma decal already fixed) - Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
Conflicts:
	code/game/machinery/atmoalter/canister.dm
2015-02-17 02:12:22 +01:00
Markolie
4d8481f83a Merge surgical borgs and crisis borgs 2015-02-16 22:47:55 +01:00
Mark van Alphen
3bc771b15b Merge pull request #314 from Fox-McCloud/Cargo
Cargo
2015-02-16 06:52:16 +01:00
Fox-McCloud
1e4d1df880 Merge remote-tracking branch 'upstream/master' into Cargo 2015-02-14 22:02:39 -05:00
Fox-McCloud
0de7e1035c Cargo Supplies 2015-02-14 21:21:09 -05:00
Markolie
49d8ab165a Turn chemistry dispenser beaker in overlay so the constructable dispenser has one 2015-02-14 21:34:14 +01:00
ZomgPonies
a3716dbea4 Moved fueltankbomb logging from adminlong to attacklog 2015-02-12 02:06:44 -05:00
DZD
4e93cc5203 Merge with upstream/maser 2015-02-09 18:22:19 -05:00
DZD
752bd825ac Cling Test, Syringe Changes, Species Edge Cases
- Syringes take 30 seconds to extract blood, 60 seconds if target is in
a hardsuit, instant if target is user.
- Slime people can no longer be lings.
- Species with NO_SCAN not affected by transform sting.
- Adds reaction between blood and welding fuel. If the blood is normal,
destroys the blood and gives a message, giving a specific message if the
blood belonged to a changeling.
2015-02-09 13:28:48 -05:00
Markolie
354e569f9d Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
Conflicts:
	code/game/machinery/rechargestation.dm
2015-02-09 16:15:00 +01:00
Markolie
7285f39fc1 Defib update, cell path update 2015-02-09 16:12:01 +01:00
Markolie
d10451c567 Fix a bunch of runtimes 2015-02-09 04:03:20 +01:00
Fox-McCloud
4d89f5b086 Merge pull request #256 from Artorp/MorgueChanges
Morgue indicator changes
2015-02-07 12:29:05 -05:00
Artorp
3f77e16fb5 Removed printing delay 2015-02-06 15:07:33 +01:00
Fox-McCloud
b975b1e998 Cleanup 2015-02-04 22:57:06 -05:00
Fox-McCloud
0d93278247 Merge pull request #207 from FalseIncarnate/master
Botany Plant Additions
2015-01-30 16:35:37 -05:00
FalseIncarnate
5575ca217c Tea and Coffee Fixes
Fixes indentation issues preventing subtypes of coffee from inheriting
the base traits of coffee.

Adds indentation to allow Ice Tea to inherit base traits of Tea, just as
Iced Coffee does for Coffee. (standardization)

Adds Tea to the recognized list of Drinking Glass contents. Now it won't
show as a "Glass of ...What?"
2015-01-30 15:25:26 -05:00
Fox-McCloud
2b85b9b777 TG Mining Items 2015-01-30 00:23:53 -05:00
FalseIncarnate
07c3dad77d Botany Reagents/Recipes Revert
Reverts the changes to Reagents and Recipes introduced with the initial
Botany Plant Additions commit.

All ground tea is created equal, as is coffee. Tea Astra and Coffee
Robusta no longer will give special versions of tea and coffee powders
and drinks.
2015-01-29 19:59:37 -05:00
Artorp
d8464d2b7f Chem Master can print the chemical analysis
The Chem Master 3000 can now print out the result of a chemical analysis
to paper.
2015-01-29 05:51:15 +01:00
FalseIncarnate
fa2e1be750 Botany Plant Additions
> Reintroduced a number of previously removed plants:
+ Tobacco
+ Space Tobacco
+ Tea Aspera
+ Tea Astra
+ Coffee Arabica
+ Coffee Robusta
+ Moonflower
+ Novaflower
+ Koibean

> Fixed a typo preventing the mutation of Blood tomatoes into Killer
Tomatoes.
> Added an additional version of both tea and coffee powders and drinks.
> Added additional tea and coffee recipes to make and utilize the new
versions.
> Added coffee arabica, tobacco, and tea aspera seeds to seed vending
machines.
2015-01-23 02:24:06 -05:00
Fox-McCloud
af61ed860a Grey Rebalance 2015-01-18 15:54:11 -05:00
DZD
8a03f88923 Minor Slime Additions
- Injecting slimes with plasma will increase their chance of mutating,
up to 50%.
- Injecting slimes with inaprovaline will decrease their chance of
mutating, this can reach 0%.
- Injecting a grey slime core with water will produce inaprovaline
inside the core.
- You can feed slimes plasma bars to make them more friendly, this does
NOT work the same way as pink slime extracts, but rather like feeding
them a monkey and punching the monkey to unconsciousness.
- Adds gold slime core + blood reaction, will spawn a mob that plasma +
gold core reactions normally spawn, but the mob will not be hostile.
This does not prevent space bears from becoming VERY pissed off if you
pet them.

All shamelessly ~~open source stolen (thefted?)~~ ported from /tg/.
2015-01-13 22:24:13 -05:00
Bone-White
f8302889d4 Merge pull request #1 from ParadiseSS13/master
Downstream merge
2015-01-11 17:36:57 +00:00
Bone White
17e0193b9e Cult hud on deconversion fix
Fixes the long-standing bug which meant that a client's icon over their
mob was not removed when deconverted, leading to mass confusion.
2015-01-11 09:02:28 +00:00
DZD
29d572ee23 Kitchen Food Processor Nerfs
- The cereal maker, deep fryer, and the grill can only process food
items instead of almost anything.
- Deep frying and cerealizing food add 3 nutriment from 30.
- Ice cream cones have a reagent storage volume of 50 from 300.
2015-01-10 20:14:07 -05:00
Markolie
2e37a88639 More verb fixes 2015-01-06 22:46:11 +01:00
Markolie
3e7e6ef1e6 Fix startup runtime, remove debug from karma 2014-12-21 13:14:41 +01:00
Markolie
090c57819c Chemistry runtime fixes 2014-12-20 23:16:37 +01:00
Markolie
17ae62bc99 Karma refund option, IPC radiation checks 2014-12-20 20:45:31 +01:00
Markolie
90cc925f78 Didn't quite work 2014-12-20 17:56:47 +01:00
Markolie
da8115dc2e Bug fixes 2014-12-20 16:27:33 +01:00
Fox-McCloud
5d416041c2 Merge pull request #92 from FalseIncarnate/master
Assorted Fixes / Changes
2014-12-18 03:20:13 -05:00
FalseIncarnate
8a5a9b0242 Assorted Fixes / Changes
Hydroponics trays can now be sprayed with any spray container (Space
Cleaner bottles, Chemsprayers, Plant-B-Gone bottles, etc) and will
correctly transfer the actual reagents to the tray and remove them from
the container.

Repairing robotic limbs with a welder will no longer cause eye damage.
This will allow medical to repair IPCs and prosthetic limbs again
without needing a welding mask/goggles. May also extend to fixing up
borgs with a welder too. The sounds and other recent IPC changes are
unaffected.

Anyone injected with Slime Toxin, the special reagent from Green Slime
Extract, will now receive some messages explaining their new form.
Should hopefully avoid confusion regarding Shadow People and the
previously unexplained damage they were receiving. At this time, the
dark sight for Shadow People is likely still not functioning properly,
and will hopefully be improved in the near future.
2014-12-18 03:14:56 -05:00
Fox-McCloud
84b9f05149 Xeno Tweaking 2014-12-16 20:26:27 -05:00
Fox-McCloud
8cec4742d0 Defib Unit 2014-12-15 04:55:02 -05:00
Fox-McCloud
fece84d974 Fixes-Tweakes 2014-12-14 03:18:10 -05:00
Markolie
22eb3e3c29 Bug fixes 2014-12-13 21:53:01 +01:00
Fox-McCloud
fb14d3831e Movement Speed Refactor 2014-12-12 10:17:53 -05:00
Fox-McCloud
e76c8f26f3 Stamina 2014-12-12 06:52:20 -05:00
Fox-McCloud
4868d3795d Vox and Space 2014-12-09 03:47:46 -05:00
Markolie
86f80d5a69 IPC fixes galore 2014-12-06 08:28:02 +01:00
Fox-McCloud
fd9d3edffb Cell Changes and other Stuff 2014-12-05 05:37:55 -05:00
Fox-McCloud
934550d268 Reagent Rebalance 2014-11-30 21:05:35 -05:00
Fox-McCloud
4b2e3beb96 Weapon Changes 2014-11-30 08:18:29 -05:00
Fox-McCloud
9a391827b6 Shotgun and Sprite Updates 2014-11-30 00:09:47 -05:00
Markolie
bd11c78235 Replace every instance of NanoTrasen with Nanotrasen. 2014-11-29 21:01:29 +01:00
SamCroswell
8b16d394ed Projectile Laser Update
Lasers are now projectiles instead of instant beams. Fire delay removed,
damages adjusted accordingly.
2014-11-26 19:16:21 -05:00