Commit Graph

270 Commits

Author SHA1 Message Date
Fox-McCloud
f31bf75764 Blob Rebalance 2015-09-10 19:12:59 -04:00
Fox-McCloud
fc82cc6976 typo 2015-09-07 13:52:37 -04:00
Fox-McCloud
2214a8b455 R&D Update: Implants and Autolathes 2015-09-05 23:57:22 -04:00
Markolie
1cd47ee4a3 Life reaction log update 2015-08-24 19:53:42 +02:00
Markolie
8bede1db99 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ipcmasterrace
Conflicts:
	code/modules/mob/living/simple_animal/friendly/fox.dm
	code/modules/organs/organ_alien.dm
2015-08-18 18:38:59 +02:00
Markolie
766b0c979f Turn dionas into simple animals 2015-08-17 02:19:29 +02:00
Markolie
4a14a97b3b IPC overhaul part deux 2015-08-16 02:34:52 +02:00
Markolie
362a817d79 Runtime and bug fixes 2015-08-12 18:20:53 +02:00
Fox-McCloud
f5784b72a2 Chemistry Tweaks 2015-08-08 19:59:31 -04:00
Markolie
f939800c68 Update upgradable machinery New code 2015-07-30 22:19:32 +02:00
SamCroswell
d84dfe5a49 ERT Rework - Code Changes 2015-07-20 19:37:56 -04:00
Fox-McCloud
04511d3f0b Blob Mode Major Overhaul 2015-07-12 02:45:40 -04:00
TheDZD
13f01232c9 Merge pull request #1480 from Fox-McCloud/qdel-the-dels
The Great Del() Cull of 2015
2015-07-09 22:37:43 -04:00
Fox-McCloud
54f59b9899 Pass II 2015-07-09 19:51:40 -04:00
FalseIncarnate
5255d652f0 Freezing is silent
Ice and Applejack are now reactions without sound.
2015-07-09 05:49:56 -04:00
Fox-McCloud
0dbea7621f The Great Del() Cull of 2015 2015-07-09 02:48:34 -04:00
FalseIncarnate
fa4fa1237e Cold Reactions and Applejack
Adds the ability to make a chemical reaction only occur when at or below
a specified temperature.

Adds new reaction for freezing water into ice
- Must be at or below 270K to turn water to ice

Adds two new reagents/drinks: Applejack and Jack Rose cocktail
-Applejack is obtained by freezing cider at or below 270K
- Applejack is slightly more potent than cider, due to it's alcohol
concentration being higher
- Jack Rose is a new mixed drink that is 4 parts Applejack, 1 part Lemon
Juice

Only Ice and Applejack utilize the cold reactions at this time, but the
functionality is in place for future reactions.
- This should allow coders more flexibility with defining new reactions
that may realistically occur at low temperatures.

Renamed the existing "required_temp" variable for reactions to
"min_temp" to better communicate it's purpose and differentiate it from
the new "max_temp" variable for cold reactions.
2015-07-08 04:34:25 -04:00
TheDZD
b38d741801 Merge pull request #1446 from Fox-McCloud/pools-and-fires
Pools Hotspots
2015-07-05 17:51:20 -04:00
Fox-McCloud
ab28186d13 Kill is Kill 2015-07-04 19:27:43 -04:00
Fox-McCloud
a878ccee30 Pools Hotspots 2015-07-04 09:34:03 -04:00
Fox-McCloud
3cea706688 Black Powder Balance 2015-07-02 17:46:24 -04:00
Fox-McCloud
a89ddd5a7d Adds in Ether 2015-06-28 20:39:26 -04:00
FalseIncarnate
fc6ebc4854 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 2015-06-23 04:18:46 -04:00
FalseIncarnate
acf1e268f1 Synthetic Reagent Processing and Synth Drugs 2015-06-23 04:17:01 -04:00
ZomgPonies
4d9baf9936 Merge pull request #1358 from Fox-McCloud/sarin-tabun
Sarin -> Tabun
2015-06-22 21:40:51 -04:00
Fox-McCloud
a75a1165dc Sarin->Tabun 2015-06-20 15:21:24 -04:00
PJB3005
8ad74ebb6e Fixes all your problems...
Except the fact that 75% of paradise is still using del, and you have no pooling.

Or defer_powernet_rebuild, do you guys have that yet?
2015-06-20 14:47:45 +02:00
Fox-McCloud
5d3e837b4a Mob Refactor+Update and Pet Collars 2015-05-28 00:20:25 -04:00
ZomgPonies
fa5e97deb5 Missing dmis, final fixes 2015-05-25 20:35:35 -04:00
ZomgPonies
e056abfb82 3/3 port done 2015-05-25 20:16:34 -04:00
ZomgPonies
1935a82afe 2/3 of port done 2015-05-25 19:48:13 -04:00
Fox-McCloud
8a5e3663df Fixes and Tweaks 2015-05-15 21:58:24 -04:00
ZomgPonies
e8782f90bd Merge pull request #1003 from Fox-McCloud/sound-tweak
Black Powder Sound Tweak
2015-05-11 21:54:31 -04:00
Krausus
65ce3e4c20 Fixes numbered contents grouping different things
Also fixes a runtime from the black powder fix. Whoops!
2015-05-11 08:53:14 -04:00
Krausus
264244630c Fixes black powder decals not exploding away 2015-05-11 08:36:25 -04:00
Fox-McCloud
e2ee01b621 Black Powder Sound Tweak 2015-05-10 21:51:50 -04:00
FalseIncarnate
db9d9fc647 Botany / Xenobotany Update
Largely a port of https://github.com/Baystation12/Baystation12/pull/8038
(Credit to Zuhayr for his hard work on botany)

Breakdown of the port:
- Plant traits have been expanded drastically
- You want a bio-luminescent tomato that explodes into a cloud of acid
when thrown or stepped on? Or maybe a corn vine that entangles people
and injects them with mannitol and it's harvests that can be used as a
battery? Totally possible.
- Adds new random seeds! Replaces the egg-plant seed in the exotic seeds
crate from cargo with 2 of these.
- Literally random, they have randomly generated stats, chemicals, and
traits. Great for researching, and/or wasting cargo's supply points.
- Plant analyzers can now print off the last scan they recorded, meaning
you can distribute copies of the report to validate your claims of
having the dankest weed on station.
- Potatoes, carrots, watermelons, soybeans, and pumpkins can all be
sliced/diced/carved with ANY sharp object, such as knives, hatchets,
glass shards, and e-swords.
- This should give the chef a bit more room to make it look like he
actually is doing the work by slicing up fries by hand. The processor
still also works.
- New reagent: Wood Pulp
- Currently has no use in recipes, but any plant with this reagent in it
can be chopped into planks with a hatchet. Did someone order some
Ambrosia Deus planks?
- Also, vines with woodpulp are dense. You have been warned.

Now onto the stuff I did in addition to the stuff from Bay.
- Fixed typos where plasma was mistakenly called "phoron" in the port.
(Sorry bay)
- Replaced bay's botany mutation chances with our tiered mutation
system.
- Re-re-added tobacco, space tobacco, tea aspera, tea astra, coffee
arabica, and coffee robusta.
- Re-enabled the rolling of joints
- Made it possible to hand-roll cigarettes from tobacco / space tobacco.
(A requested / promised addition)
- Just like with joints, it will inherit any chems in the tobacco, has
the same reagent capacity as a joint, but looks and smokes like a cig
(lasts as long as the cigarettes) with a different name/description to
differentiate it from pre-made cigs.
- Corn can now be juiced in the grinder, in addition to grinding it.
Grinding corn will result in it's contained reagents (like corn starch),
while juicing corn will result in corn oil.
- Re-added the additional plant analyzer information when scanning trays
(displays age, weed level, etc)

Also cleaned up the recipes_microwave.dm file, removing the commented
out recipes that were distributed to the other machines during the
Kitchen Overhaul. Shortens the file a bit and makes it more readable.

I probably forgot stuff, so I will add things as I remember them / they
get pointed out.
2015-05-09 06:00:24 -04:00
Tigercat2000
627c600b81 Restore CLF3 to standard level
Whoops. Forgot to reintegrate a fire_stacks multiplication when I
reintegrated mob fire.
2015-04-29 17:17:34 -07:00
Tigercat2000
43a09daddc Merge remote-tracking branch 'Fox/fixessssss' into okayletstrysomethingslightlydifferent
Conflicts:
	code/modules/reagents/reagent_containers/glass_containers.dm
	maps/cyberiad.dmm

Fawwkss wai ;-;
2015-04-29 15:31:21 -07:00
Krausus
57cd8f69c7 Fixes Colorful Reagent coloring non-simple mobs 2015-04-29 07:52:56 -04:00
Tigercat2000
62657448d4 Reintegrate mob fire
I took out the entire on_fire system to work on LINDA. This commit readds
it.
2015-04-28 13:57:58 -07:00
Tigercat2000
4f1053f5b7 LINDA, Stage 1
This commit ports the base system of LINDA from TG. This version of linda
is the original version, with none of -tg-'s fixes, rewrites, or other
such improvements attached.

The mob ignite system has been 100% removed, as LINDA does not support
this normally. It may be added back in when the improvements and refactors
to LINDA have been ported.
2015-04-28 08:43:42 -07:00
Fox-McCloud
f620fab569 [Goonchem] Fixes 2015-04-27 13:50:50 -04:00
ZomgPonies
013e7cfcdd Merge pull request #874 from Fox-McCloud/chem-messages
[Goonchem] No Mix Messages
2015-04-25 17:45:31 -04:00
Fox-McCloud
bd16e0fbaa [Goonchem] No Mix Messages 2015-04-24 16:21:33 -04:00
Fox-McCloud
9a99f8758f [Goonchem] Smoke Tweaks 2015-04-24 00:17:03 -04:00
Fox-McCloud
e8038738f6 Merge pull request #800 from ZomgPonies/shadow
Mutantrace update
2015-04-21 18:36:24 -04:00
ZomgPonies
6374add892 Merge pull request #835 from Fox-McCloud/mixmixmix
[Goonchem] Custom Mix Sounds and Animated Dispenser
2015-04-20 08:23:16 -04:00
Fox-McCloud
fcbe8dacf1 [Goonchem] Custom Mix Sounds and Animated Dispenser 2015-04-19 02:59:50 -04:00
Fox-McCloud
4889bd56a0 [Goonchem] Minor Pyrotechnic Tweaks 2015-04-18 19:30:12 -04:00