Commit Graph

10065 Commits

Author SHA1 Message Date
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
TheDZD e55af53edb Merge pull request #1521 from Fox-McCloud/powernet-into-machines
Merging Powernets into Machines
2015-07-15 19:44:03 -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
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
ZomgPonies 5d094585e5 Merge pull request #1497 from Fox-McCloud/auto-toggle-ooc
Auto-Toggling OOC
2015-07-12 22:36:06 -04:00
ZomgPonies f4ea821829 Merge pull request #1496 from Fox-McCloud/LINDA-Pressure
LINDA Pressure Changes
2015-07-12 22:35:21 -04:00
Fox-McCloud 74f54a12e8 Merge pull request #1494 from tigercat2000/unfucklifeFUCK
Clean up human Life()
2015-07-12 19:41:29 -04:00
DZD d8adcca1cf Makes log viewing use ftp() instead of run()
Carbon copy of tgstation/-tg-station#10467.
This should fix not being able to retrieve logs, because BYOND 508 broke
run() again. The main difference is that instead of directly opening a
log, a prompt will come up asking to save the file to a location.
2015-07-12 12:27:45 -04:00
Aurorablade 2c677779d0 Adds cult glows to constructs taken from VG
will put in mob.dmi when i am SURE its not gonna conflict on me
2015-07-12 07:58:33 -04:00
Fox-McCloud 04511d3f0b Blob Mode Major Overhaul 2015-07-12 02:45:40 -04:00
Fox-McCloud 898bcea1e8 Merge pull request #1489 from FalseIncarnate/master
Kitchen Machine Refactor and Max Item fix
2015-07-11 22:19:07 -04:00
TheDZD 90026bdec2 Merge pull request #1493 from Fox-McCloud/just-stop
Changes a few del to del()
2015-07-11 21:46:22 -04:00
Fox-McCloud e5ee234292 Auto-Toggling OOC 2015-07-11 09:38:20 -04:00
Fox-McCloud 99bf49504a LINDA Pressure Changes 2015-07-11 06:28:03 -04:00
FalseIncarnate ec2aab62ef Z5 revert / compatibility, 2015-07-11 03:28:07 -04:00
Fox-McCloud f5ce957f33 qdel pass II 2015-07-11 02:10:31 -04:00
Tigercat2000 b295590cad Fix a few horrible mashed-together-operators in human Life() 2015-07-10 20:34:07 -07:00
Tigercat2000 c4494116a1 Fix a few color macros, one obsolete message, and some bad formatting 2015-07-10 20:32:30 -07:00
Fox-McCloud e4d6acb538 Changes a few del to del() 2015-07-10 23:28:08 -04:00
Tigercat2000 059b405ac8 Un-relative-path human life.dm 2015-07-10 20:20:54 -07:00
FalseIncarnate 8a8011acbf Kitchen Machine Refactor and Max Item fix
Refactors the code for Microwaves, Ovens, Grills, and Candy Makers to
utilize a shared parent which holds the common procs.
- This means any new additions or fixes will only need to be implemented
in one place, rather than 4, to affect them all.
- Also reduces file sizes on the individual machines' files by removing
a lot of the duplicate code

Updated the code for the kitchen machines to be more modular and fixed
some issues.
- Replaced color macros with span classes
- Replaced hardcoded names with src references
- Each machine has a cook_verbs list which is used to create the in use
message (Microwaving in progress)
- Each machine has variables to define the icon states for the different
states of the machine (on, off, broken, dirty, open).
- Changed a few formerly global variables to not be global, as this
would cause issues with the shared code (microwave with candy maker
recipes for example)

Fixed a bug where the microwave would be considered "full" before having
all of the ingredients for a recipe
- Created a new proc to count the number of items and fruits in a recipe
to determine the max_n_items value

Map Edits to Cyberiad and associated Z-levels for pathing changes
(map-merged)
- MetaStation will need to be updated as well, I'll do this in another
PR unless someone else beats me to it.
2015-07-10 09:46:30 -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
Fox-McCloud db17187584 Merge pull request #1474 from FalseIncarnate/cold_reagents
Cold Reactions and Applejack
2015-07-09 05:56:42 -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
TheDZD f91f3d84c3 Merge pull request #1473 from Fox-McCloud/destroyer
Destroy Pass III
2015-07-08 23:14:09 -04:00
Fox-McCloud ba163bef39 Makes Cables GC Better 2015-07-08 09:30:03 -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
Fox-McCloud 0e8619a202 Destroy Pass III 2015-07-08 03:39:52 -04:00
ZomgPonies 737eb44b04 Merge pull request #1471 from Fox-McCloud/destroy-them-all
Destroy Pass II
2015-07-08 02:25:03 -04:00
ZomgPonies 8d5d97bd45 Merge pull request #1468 from SamCroswell/computerupdate
Computer Lighting Update
2015-07-08 02:23:58 -04:00
Fox-McCloud 6e87b96501 Pass 3 2015-07-08 01:34:53 -04:00
Fox-McCloud 0fd80d0b1f pass one fix 2015-07-08 01:09:10 -04:00