Commit Graph

13438 Commits

Author SHA1 Message Date
Krausus 6d46132b06 Resolves merge conflicts 2015-07-26 06:56:24 -04:00
Markolie fed5808f66 ensure the current song ends when streaming is disabled 2015-07-26 06:23:30 +02:00
TheDZD 43d53c8135 Merge pull request #1568 from Fox-McCloud/immortal-diona
Diona Amputation Fix
2015-07-25 21:57:52 -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
DZD d64568e309 Adds the can_charge var to energy guns
If set to 0, makes it so the gun cannot be charged in recharges. Set to
1 by default, only the nuclear (AKA advanced) egun and both plasma
cutters have it set to 0. (Nuclear egun was previously unable to be
charged, but used an istype check specific to it.)
2015-07-24 16:02:13 -04:00
DZD 66688f4dbb Fixes conflicts in icons/obj/gun.dmi. 2015-07-24 15:29:20 -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
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
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
Aurorablade 0bb5dd626b Colonectomy
Various fixes by feedback
Render Item refactor to modular system
2015-07-20 17:04:32 -04:00
TheDZD b858350c12 Merge pull request #1535 from Fox-McCloud/news-update
News update
2015-07-18 21:00:21 -04:00
Krausus c520ebd8a5 Process and Process Scheduler Tweaks 2015-07-18 13:14:32 -04:00
Fox-McCloud 2004fd3be3 Merge pull request #1534 from SamCroswell/ClickUpdate
Middle Click Override
2015-07-17 22:13:57 -04:00
Fox-McCloud 0524d49ff3 Fixes Unlimited Bullets 2015-07-17 19:36:14 -04:00
Aurorablade 138f71a421 Final Commit
A janitor weeps.
2015-07-17 11:21:43 -04:00
Aurorablade f6cb04468d Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into STILLALOTOFBLOOD 2015-07-17 10:14:46 -04:00
Fox-McCloud 728dc57f30 Re-Enables News 2015-07-17 00:09:14 -04:00
SamCroswell 73bf040ba4 Middle Click Override 2015-07-16 21:51:20 -04:00
TheDZD fbbceac377 Merge pull request #1499 from Fox-McCloud/blob-update
[Ready To Merge!]Blob Mode Major Overhaul
2015-07-16 20:34:08 -04:00
Fox-McCloud ba2127bf64 Drone Console Fix 2015-07-16 20:02:31 -04:00
Markolie 50210c6ff2 Enable malf AI jobbans 2015-07-17 01:06:05 +02:00
Fox-McCloud c96e6fd7b8 proper check-antag 2015-07-16 03:33:38 -04:00
DZD 29e70854e9 Fix merge conflicts
🖕 map conflicts over lines that weren't even edited by both upstream
and this branch.
2015-07-15 22:28:12 -04:00
TheDZD e55af53edb Merge pull request #1521 from Fox-McCloud/powernet-into-machines
Merging Powernets into Machines
2015-07-15 19:44:03 -04:00
Aurorablade 41e98f489f Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into STILLALOTOFBLOOD 2015-07-15 15:40:11 -04:00
PJB3005 2b0ea0524f gotta go fast! 2015-07-15 17:22:56 +02:00
Fox-McCloud 5882cdf1e9 Merge pull request #1512 from Aurorablade/CultistRave
[Sprites]Cultist rave AkA 'Fethas Stop making pull requests!'
2015-07-15 09:07:42 -04:00
Aurorablade 7cce3bd3fc Rename proc
updateiocn now updateglow
2015-07-15 08:17:45 -04:00
Fox-McCloud c81d7904c5 Merging Powernets into Machines 2015-07-15 03:36:35 -04:00
TheDZD 509ccbfd6d Merge pull request #1507 from Fox-McCloud/sun-rewrite
Sun Controller Scheduler Integration
2015-07-14 17:33:18 -04:00
TheDZD 9229c7513f Merge pull request #1511 from Fox-McCloud/debug-dat-controller
Adds in Lighting Controller Debugability
2015-07-14 17:33:15 -04:00
Aurorablade 6f1a7605a0 Bay Light, Sprite move
added set light and moved spirtes back into mob.dmi
2015-07-14 09:12:23 -04:00
Aurorablade 6abba693a7 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into CultistRave 2015-07-14 07:32:02 -04:00
Fox-McCloud 545aaf4003 Adds in Lighting Controller Debugability 2015-07-14 04:40:56 -04:00
Fox-McCloud 822dc6bac1 solar tweaks 2015-07-14 00:23:58 -04:00
Aurorablade d142c95948 pAiony is dead
LON LIVE pAIony! *plants pony flag*
2015-07-13 21:25:37 -04:00
Fox-McCloud 6cbdad58cf Sun Controller Scheduler Integration 2015-07-13 20:54:10 -04:00
Krausus 5d342baffb Fixes morgues and crematoriums (includes resisting)
Fixes their trays breaking for 30 seconds, not logging cremations, not
being able to resist out of them, and all these damn uses of src.
2015-07-13 07:31:48 -04:00
Fox-McCloud 70b386d861 derp 2015-07-13 00:40:26 -04:00
Fox-McCloud 18b14d6c6d updated blob event 2015-07-13 00:04:50 -04:00