Commit Graph

17131 Commits

Author SHA1 Message Date
Tigercat2000
7db323ffe2 Remove invisimin icon-setting. It's terrible. 2015-07-28 10:52:43 -07:00
Fox-McCloud
fab96e625b Fixes the Power Monitor Being Unconstructible 2015-07-27 14:01:01 -04:00
TheDZD
e51e26a6de Merge pull request #1575 from Fox-McCloud/item-equipping-fix
Item Equipment Fixup
2015-07-27 12:18:43 -04:00
TheDZD
7fb91f6088 Merge pull request #1567 from Fox-McCloud/borer-tweaks
Borer Tweaks
2015-07-27 12:17:38 -04:00
TheDZD
82191e3d54 Merge pull request #1576 from Fox-McCloud/entered-optimizations
Turf/Entered() Optimizations
2015-07-27 12:17:30 -04:00
Fox-McCloud
3ecaadde48 Merge pull request #1571 from Markolie/master
Fixes
2015-07-27 11:46:35 -04:00
Fox-McCloud
f1dda5b677 Merge pull request #1564 from FalseIncarnate/master
Kitchen Overhaul 2: Table Edition
2015-07-26 23:46:51 -04:00
Fox-McCloud
4b629c7d3f Turf/Entered() Optimizations 2015-07-26 17:46:36 -04:00
Markolie
ef3e2e8c7b Fix tabbing 2015-07-26 22:15:12 +02:00
Markolie
573843c237 Revenant pref update 2015-07-26 22:13:24 +02:00
Fox-McCloud
d76173d642 Item Equipment Fixup 2015-07-26 13:50:16 -04:00
TheDZD
5dc7199e4f Merge pull request #1570 from tigercat2000/tofixthis
Moved changeling swap form to swap_form.dm instead of absorb.dm
2015-07-26 12:40:02 -04:00
TheDZD
e22da1d2ee Merge pull request #1569 from tigercat2000/itoldthem
Make nuke-disk z-level more specific and sane
2015-07-26 12:39:40 -04:00
Fox-McCloud
c2d7d34242 Fixes Dview Runtime 2015-07-26 06:15:12 -04:00
Markolie
bd50f9d725 Don't assign new objective if sacrifice fails - eldergod and survive are mutually exclusive 2015-07-26 06:28:04 +02:00
Markolie
fed5808f66 ensure the current song ends when streaming is disabled 2015-07-26 06:23:30 +02:00
Markolie
7dbd45857a Fix cult sacrifice objective 2015-07-26 06:06:04 +02:00
Tigercat2000
e23600067a Moved changeling swap form to swap_form.dm instead of absorb.dm, because one would think absorb.dm would contain the absorb power 2015-07-25 19:31:50 -07:00
Tigercat2000
280a326e32 Make nuke-disk z-level more specific and sane 2015-07-25 19:27:18 -07:00
TheDZD
6ac0ada097 Merge pull request #1551 from Fox-McCloud/changeling-swap
Changeling Bodyswap Ability
2015-07-25 22:03:44 -04:00
TheDZD
43d53c8135 Merge pull request #1568 from Fox-McCloud/immortal-diona
Diona Amputation Fix
2015-07-25 21:57:52 -04:00
TheDZD
0ec4471d29 Merge pull request #1562 from Fox-McCloud/nuke-disk-rework
Updates Nuke Disk Spawning
2015-07-25 21:57:24 -04:00
Fox-McCloud
5a23dbdc35 Diona Amputation Fix 2015-07-25 21:39:09 -04:00
Fox-McCloud
4a06ac4db5 Borer Tweaks 2015-07-25 21:05:36 -04:00
FalseIncarnate
ad9ad7fc40 Kitchen Overhaul 2: Table Edition
Moves a number of kitchen recipes to utilize table-crafting!
- Instead of dumping the ingredients in the microwave, simply collect
them on the table to assemble your dish via the table-crafting menu
- The option to assemble the dish will only appear if all the
ingredients are present on the SAME table section.

Table-crafted foods:
- Sandwich
- Slime Jelly Sandwich
- Cherry Jelly Sandwich
- Slime Jelly Burger
- Cherry Jelly Burger
- Not-a-sandwich
- Egg Wrap
- Herb Salad
- Aesir Salad
- Valid Salad
- Ingredients are unchanged

Standardizes the chef's knife usage!
- Now the chef can use the Cutlet knife (knife utensil), kitchen knife,
butcher knife, or scalpel to cut meat into cutlets!
- Now the Cutlet Knife (knife utensil) can be properly used to slice
cakes, pizza, bread, flat dough, and so forth instead of scooping up a
bit onto the knife.
- If a food object cannot be sliced (no slice_path defined), it will
scoop up a bit as before. Forks, spoons, and plastic knives will always
scoop, regardless of slice_path.

Fixes the Toasted Sandwich microwave recipe not working.
- It was missing a result, meaning it was not being loaded as an
acceptable recipe and causing the microwave to reject sandwiches.

BACKEND CODER CRAP:
- Tablecrafting recipes now can support botany produce and adjusting
chems in the result item.
- New fruit list var is used for botany produce
- New AdjustChems proc is used to handle final chem adjustments, such as
removing or adding chems from the finished product.
2015-07-25 06:38:09 -04:00
TheDZD
5706e34fe4 Merge pull request #1558 from Fox-McCloud/syndicate-bomb-go-boom
Syndicate Bomb Buff
2015-07-24 20:01:59 -04:00
TheDZD
38b38e910a Merge pull request #1559 from Fox-McCloud/round-end-the-griffening
Round End Attack Log Disabling
2015-07-24 20:01:52 -04:00
Fox-McCloud
eb694a50eb Updates Nuke Disk Spawning 2015-07-24 17:33:25 -04:00
TheDZD
1cb5d4808c Merge pull request #1555 from Fox-McCloud/more-lighting-tweaks
More Lighting Tweaks and Optimizations
2015-07-24 11:05:04 -04:00
Fox-McCloud
9f16296a60 Round End Attack Log Disabling 2015-07-23 17:03:43 -04:00
Fox-McCloud
b6511a9e6d Syndicate Bomb Buff 2015-07-23 16:46:15 -04:00
Fox-McCloud
13d4559b5e balance 2015-07-23 16:34:42 -04:00
TheDZD
0d1248e976 Merge pull request #1552 from tigercat2000/ithinkibrokegrabs
Number of grab fixes, other minor fixes related.
2015-07-22 22:16:07 -04:00
Fox-McCloud
20099b254f More Lighting Tweaks and Optimizations 2015-07-22 18:20:21 -04:00
Fox-McCloud
0945859066 Merge pull request #1554 from Markolie/master
Fix OneHuman law
2015-07-22 16:57:23 -04:00
Markolie
4cfd1e4340 Fix OneHuman law 2015-07-22 18:35:09 +02:00
Tigercat2000
e9ba7cbca1 Fix a number of grab bugs and odd behaviour still around.
This commit fixes a number of bugs with mob grabbing code.
Primary things fixed:
 - Aliens grabbing people will no longer break horribly, they call
   grabbedby like everything else now.
 - Any nulls that do manage to find their way into a grab list will be
   cleaned up by the next grab on that person.
 - Fixed a number of odd behaviours when grabbing xenomorphs, see
   bbcc19c764 for more details.
 - Fixed grabs having a tendency to shift someone's pixel_xy and not reset
   it when being deleted. This was simply because it previously relied on
   del() to stop all procs instantly.
2015-07-22 05:33:26 -07:00
Tigercat2000
bbcc19c764 Fix aliens constantly resetting their pixel_xy and icon. 2015-07-22 05:30:01 -07:00
Tigercat2000
8cef88659e Made sure alien unEquip() bothered to pass arguments back in the parent call. 2015-07-22 05:29:14 -07:00
Fox-McCloud
c00baec937 Merge pull request #1549 from SamCroswell/ERTUpdate
ERT Update
2015-07-22 01:50:26 -04:00
Fox-McCloud
30b434d997 Changeling Bodyswap Ability 2015-07-21 22:39:53 -04:00
PJB3005
d99ab0d2ac I think I just managed to fix all lighting lag. 2015-07-21 15:36:12 +02:00
SamCroswell
d84dfe5a49 ERT Rework - Code Changes 2015-07-20 19:37:56 -04:00
TheDZD
6ff8435545 Merge pull request #1541 from Fox-McCloud/minor-tweaks-for-uplink
Minor Uplink Cost Adjustments
2015-07-20 10:55:54 -04:00
TheDZD
8f2f2cb0a5 Merge pull request #1544 from Fox-McCloud/oh-no
Fixes Blob Self Replication
2015-07-19 17:15:02 -04:00
Fox-McCloud
0990a4ec5e Fixes Blob Self Replication 2015-07-19 15:50:27 -04:00
Fox-McCloud
4bae3f073b Reduces Blob's Lag 2015-07-19 09:56:38 -04:00
Fox-McCloud
fde654557c Minor Uplink Cost Adjustments 2015-07-18 21:54:32 -04:00
TheDZD
b858350c12 Merge pull request #1535 from Fox-McCloud/news-update
News update
2015-07-18 21:00:21 -04:00
Fox-McCloud
865d828976 Merge pull request #1538 from SamCroswell/ComputerFixes
Computer Fixes
2015-07-17 23:49:56 -04:00