Commit Graph

17587 Commits

Author SHA1 Message Date
A-t48
91bbdfee56 Fixed cyborgs being able to use Power Warning emote when broken. (#20249)
* Fix #19905

* Slight cleanup
2016-09-02 20:14:15 +12:00
oranges
156a7f30e1 Merge pull request #20223 from PKPenguin321/patch-5
Blacklists lattices from the tesla
2016-09-02 14:12:35 +12:00
oranges
aff8e48038 Merge pull request #20260 from Kromgar/revert-20186-InsertFix2
Revert "Fixes issues with packagewrap, trashbag, handlabeler, "
2016-09-02 09:39:30 +12:00
Shadowlight213
378821e975 Fixes pizza bombs and boxes not deleting correctly. (#20254)
* Fixes pizza bomb not deleting correctly.

* return
2016-09-01 15:47:52 -05:00
Kromgar
2b235b8bba Revert "Fixes issues with packagewrap, trashbag, handlabeler, " 2016-09-01 12:18:24 -04:00
AnturK
7599074f44 Merge pull request #20216 from Cruix/food_stuff
Fixed food recipe code
2016-09-01 09:34:07 +02:00
oranges
00495cedc5 Merge pull request #20186 from phil235/InsertFix2
Fixes issues with packagewrap, trashbag, handlabeler,
2016-09-01 10:13:30 +12:00
oranges
23915f99bb Merge pull request #20213 from KorPhaeron/water2
Watertanks explode when shot
2016-09-01 10:12:50 +12:00
oranges
cf720194ae Merge pull request #20214 from Cruix/telekinetic_gaia_removal
Fixed bug with adding ambrosia gaia to hydro trays.
2016-09-01 10:12:08 +12:00
oranges
b94aa6e07e Merge pull request #20049 from Iamgoofball/patch-112
Fixes stock price spikes
2016-09-01 09:11:30 +12:00
Leo
24534a07b9 Makes the admin bomb list a bit more useful (#20227)
* Adds some stuff to bombing list

* More stuff

* Added IEDs, molotovs, pizzabombs, lemons and grenades to the bombing list.
2016-08-31 14:03:31 +02:00
KorPhaeron
c98ef0bced Merge pull request #20221 from kevinz000/lava-the-staff
Makes necropolis chests not burn up in lava
2016-08-31 01:02:03 -05:00
oranges
2d46e7766d Since infinite traitor items is okay, I improved it (#20108)
* Since infinite traitor items is okay, I improved it

* Update packs.dm

* Update packs.dm

* Update packs.dm
2016-08-31 16:58:05 +12: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
PKPenguin321
afa17a66bd blacklists lattices from the tesla 2016-08-29 21:11:03 -07:00
oranges
ea90c161a0 Normalizes the ed209 to match portaturret fire time (#20200) 2016-08-29 22:03:19 -05:00
kevinz000
29779ed0ee chestproofing 2016-08-29 19:12:57 -07:00
kevinz000
a6af5eadb4 Revert "lavaproofing"
This reverts commit e528b65915.
2016-08-29 19:12:24 -07:00
kevinz000
e528b65915 lavaproofing 2016-08-29 19:01:36 -07:00
KorPhaeron
aaa447ae75 Watertanks explode when shot 2016-08-29 18:37:14 -05:00
unknown
fd80927d75 Fixed bug with adding ambrosia gaia to hydro trays. 2016-08-29 14:53:45 -07:00
unknown
07e90078e5 Fixed fortune cookies not dropping their fortune. 2016-08-29 14:52:58 -07:00
Iamgoofball
f07472a891 Update packs.dm 2016-08-29 12:03:16 -07:00
Iamgoofball
3cd5c14ccd Update packs.dm 2016-08-29 12:02:44 -07: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
phil235
42301f32e2 Fixes issues with packagewrap, trashbag, handlabeler, and other potential items that must have an effect when clicking a storage item. Clicking a storage item with those items does not try to insert them in the container but instead calls their afterattack effect directly. The var used for those items is var/no_direct_insertion.
Fixes trashbag not being able to pick up pillbottles, evidence bags.
Fixes packagewrap not being able to wrap backpacks, pillbottles, all sorts of bags.
Fixes packagewrapping a locked lockbox showing "it's locked!"
Backpack only make rustling noise if insertion is successful.
2016-08-28 19:38:15 +02:00
Joan Lung
9ea303705a fancy 2016-08-28 09:14:22 -04:00