Commit Graph

17562 Commits

Author SHA1 Message Date
AndrewJacksonThe2nd 64643ee402 code memes 2016-08-30 23:37:12 -07:00
AndrewJacksonThe2nd f405ed6603 GOOFMOS: FREON REWORK and WATER VAPOR 2016-08-30 23:25:32 -07:00
nullbear b1e8a11691 Merge pull request #3 from nullbear/multiple-product-hotfix
Multiple Products Hotfix
2016-08-30 16:00:12 -07:00
nullbear 451a32598c Multiple Products Hotfix 2016-08-30 15:59:30 -07:00
nullbear 03da8e6735 Merge pull request #2 from nullbear/slimecore-hotfix
Slimecore hotfix
2016-08-30 15:47:43 -07:00
oranges bcef1426e7 Revert "Adds support for Multiple products" 2016-08-31 09:52:31 +12:00
nullbear b5f2777fb0 Adds support for Multiple products (#20177)
* Adds support for multiple recipe results.

Makes it so that recipes can have multiple biproducts, instead of just
one. The results list works just like the reagents list.

ex. list("reagentid" = 5, "otherreagent" = 3) where 5 and 3 are the
amounts produced.

recipe on_reaction 'created volume' is the multiplier for the recipe,
not the sum of the volume of the biproducts. Equations have been
adjusted to this change.

A couple of reactions are made slightly more efficient.

Removes a couple of trailing returns and unneccessary variable
declarations.

Scales cfl3 fireball a miniscule amount with created volume. the range
is increased by 1 for every 100 units mixed.

* updates pyrotechnics.dm

* Removes unneccessary comments and unrelated tweaks.

* Changes variable name for phil

* P is for Product. R is for Reagent.

* Adds support for inverse required temp reactions.

Ie. Cooling a mixture to cause a reaction, instead of heating it. Just
set 'is_cold_recipe' to 1 in the reaction.

* Fixes chapel exploding infinite loop.

Fixes weird bug. Adds unused colorless 'powderpile' icon to
reagentfillings.dmi
2016-08-31 09:26:34 +12:00
XDTM b37182c1ff Metal slimes can spawn glass if injected with water (#20179)
* Glass slime

* phil235's changes, tested and working

* Less spaces more tabs
2016-08-31 09:25:00 +12:00
Incoming5643 540fa28339 Quality of life pull for my recent commits (#20210)
* Quality of life pull for my recent commits:

RPGloot will no longer try to place scrolls in secret satchels, as this would slowly turn the drop table into these fairly useless joke items.

Goes through and genders most(all) the pets in the game so the gender change potion can work on them. Many previously hard defined generic animals can now be either male or female.

* Secret satchel is now a bit more aggressive with making sure a satchel is placed

D E F I N E S

* "quality"

* Not Canon
2016-08-31 09:23:54 +12:00
bgobandit 9f4d354065 Admin messages for prayers show the round's deity. (#20162)
* Chaplain prayers show the deity in their admin message.

* made requested deity changes
2016-08-31 09:07:33 +12:00
Iamgoofball 634662d6b4 Adds Freon to the game (#20188)
* Adds Freon to the game

* MAP CHANGE MEMES

* hahahahafuck

* YOU SAW NNOTHING

* fuqq

* sd

* Fixes

* Fixes2

* fixes

* BALANCE

* mob icecubing ALSO FUCK YOUR STATUS EFFECT CODE @Xhuis

* i play pokemon go every day

* Reworks icecubing

* sjyuhdjzsadjhm x jymhuxzc

* Final Pass

* kmJCBQADVNWVBOJRFJN

* changes

* nnjhdxsjhjh
2016-08-31 08:58:55 +12:00
yackemflam d3aec95d82 Sniper rounds now blow off limbs (#20209)
* Update bullets.dm

* Forgot about the non brutal rounds

* Update bullets.dm
2016-08-30 08:12:08 -05:00
AnturK 645e99c1dc Merge pull request #20161 from KorPhaeron/surgery
Surgery Stat Tracking
2016-08-30 10:55:53 +02:00
Shadowlight213 e625464e09 Modular computer fixes and improvements 2 (#20170)
* Fixes runtime with can_run

* tr
2016-08-30 10:43:53 +02:00
oranges ea90c161a0 Normalizes the ed209 to match portaturret fire time (#20200) 2016-08-29 22:03:19 -05:00
Razharas a731d27c64 Merge pull request #20169 from ChangelingRain/babeyourwordsdonotaffectmeidontcarewhatyouthinkishouldbe
Makes lavaland more atmospheric
2016-08-29 21:18:46 +03:00
oranges 388324feff Merge pull request #20171 from Cruix/protolathe_stuff
Fixed rdconsole search function not showing required reagents.
2016-08-29 21:01:32 +12:00
oranges c11b9509d2 Merge pull request #20160 from ChangelingRain/goandlovemegoandhatemegoandcrybutyoucantchangeme
Simple animals with force thresholds now properly handle damage_coeff
2016-08-29 21:00:42 +12:00
AnturK 6c63593be6 Merge pull request #20091 from Cruix/bigger_disks
Added technology and design disks that can hold more than one entry.
2016-08-29 09:47:13 +02:00
nullbear 3b84e4f6a7 Fixes chapel exploding infinite loop.
Fixes weird bug. Adds unused colorless 'powderpile' icon to
reagentfillings.dmi
2016-08-28 19:44:18 -07:00
Joan Lung 073eed4009 a classic 2016-08-28 21:33:27 -04:00
Joan Lung 566936355a less loops 2016-08-28 21:28:35 -04:00
Joan Lung 58459e6239 fix issue 2016-08-28 21:13:08 -04:00
nullbear 982e3e4934 Adds support for inverse required temp reactions.
Ie. Cooling a mixture to cause a reaction, instead of heating it. Just
set 'is_cold_recipe' to 1 in the reaction.
2016-08-28 17:15:03 -07:00
nullbear 4d6702c08e P is for Product. R is for Reagent. 2016-08-28 16:59:51 -07:00
oranges ef84942384 Merge pull request #20082 from Xhuis/highlander_patch
[s] Highlander 2.0
2016-08-29 11:27:58 +12:00
nullbear ed162929a2 Changes variable name for phil 2016-08-28 16:11:09 -07:00
nullbear 46c8e9848a Removes unneccessary comments and unrelated tweaks. 2016-08-28 16:09:27 -07:00
Joan Lung 9ea303705a fancy 2016-08-28 09:14:22 -04:00
nullbear e1e5501950 updates pyrotechnics.dm 2016-08-28 04:16:39 -07:00
nullbear cded867deb Adds support for multiple recipe results.
Makes it so that recipes can have multiple biproducts, instead of just
one. The results list works just like the reagents list.

ex. list("reagentid" = 5, "otherreagent" = 3) where 5 and 3 are the
amounts produced.

recipe on_reaction 'created volume' is the multiplier for the recipe,
not the sum of the volume of the biproducts. Equations have been
adjusted to this change.

A couple of reactions are made slightly more efficient.

Removes a couple of trailing returns and unneccessary variable
declarations.

Scales cfl3 fireball a miniscule amount with created volume. the range
is increased by 1 for every 100 units mixed.
2016-08-28 04:12:17 -07:00
unknown 87386dae37 Fixed rdconsole search function not showing required reagents. 2016-08-27 21:52:38 -07:00
Core0verload ef8cb75bea Removes duplicate ..() (#20167) 2016-08-27 23:01:44 -05:00
Joan Lung bfb6fa9c16 Makes lavaland more atmospheric 2016-08-27 23:55:33 -04:00
Xhuis aa6d24d4a3 Removes nodrop from claymores 2016-08-27 22:23:58 -04:00
Xhuis ae841585b3 Removes some unneeded features, adds a coward-compass 2016-08-27 22:20:02 -04:00
Cheridan 7deb370521 FUCK POCKETS (#20129) 2016-08-28 13:06:37 +12:00
oranges 26e833b530 Merge pull request #20114 from KorPhaeron/wizard
New Wizard Armour
2016-08-28 13:00:12 +12:00
oranges 3badbcc9ec Merge pull request #20115 from Shadowlight213/whydoestheaihavetogointhecoreitcouldgoonthetable
A few tweaks and improvements to silicons.
2016-08-28 12:58:15 +12:00
oranges b5903be779 Merge pull request #20136 from ChangelingRain/asinglewhisperedtruthcanbreakchainsbreakalliesforgefriendsintoenemiesandenemiesintofriends
Being in front of the particle accelerator is now actually dangerous
2016-08-28 12:44:17 +12:00
oranges f800987765 Merge pull request #20083 from PKPenguin321/explosive-tesla
[READY] Explosive Tesla, Take 2
2016-08-28 12:42:22 +12:00
oranges 0c95041d5b Merge pull request #20106 from Shadowlight213/interactfixes
Tweaks to admin ai interact
2016-08-28 12:38:39 +12:00
oranges 5aa96750b9 Merge pull request #20102 from Shadowlight213/retryingin30secondsretryingin30secondsretryingin30seconds
Fixes the ghost role spawn infinite loop.
2016-08-28 12:38:25 +12:00
oranges 251848232f Merge pull request #20100 from GunHog/Colony_Drop_Fixes
More Mining Base Tweaks
2016-08-28 12:38:12 +12:00
oranges ced523874c Merge pull request #20099 from ChangelingRain/ayesgivenlikeitsallsomeonecansaylikeitstheonlyoptionisjustasbadasgoingonwhentheysayno
The staff of lava can now turn lava back into basalt
2016-08-28 12:37:14 +12:00
Incoming5643 09683bac79 adds the gender change potion as the blood reaction of pink slimes (pink slimes previously only had one reaction, and it's not exactly a barnburner). (#20149)
This item changes up the gender var of any gendered mob/living. Including people. There are a few interesting applications of this item, mostly if your into animal husbandry (all generic animals unless programed otherwise are all the same gender) but mostly it's just here to fill the immensely niche gap the loss of gender reassignment surgery left. Also it's 2:30 am.

Also factors out the old human var gender_ambiguous, as that surgery was the only way to ever trigger it.
2016-08-27 19:29:20 -05:00
KorPhaeron f40fd2ba02 Surgery Stat Tracking 2016-08-27 19:25:55 -05:00
Joan Lung 8637607c5e Simple animals with force thresholds now properly handle damage_coeff 2016-08-27 18:53:18 -04:00
PKPenguin321 a8f893d343 fixes runtime with grav gen 2016-08-27 15:38:44 -07:00
PKPenguin321 58f43daee3 makes nuke and grav gen properly destroy when zapped 2016-08-27 15:20:25 -07:00