Commit Graph

13438 Commits

Author SHA1 Message Date
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 6478231a3d New Pai Frames thanks to DestroOmega 2015-07-12 09:05:43 -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
Aurorablade 6b9ae3a809 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ImportentpAIUpdate 2015-07-10 22:22:15 -04:00
DZD 3ed90434e0 Projectile, borg, and RnD fixes. 2015-07-10 21:36:23 -04:00
DZD 412443dbf1 Fix non-icon merge conflicts 2015-07-10 19:57:59 -04:00
DZD d4cf433e7c Various fixes, changes, additions, and removal of old features.
More changes
2015-07-10 19:41:27 -04: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
DZD 1202538dc5 Actually compiles 2015-07-09 19:26:41 -04:00
DZD 916f9bf4bb Sort of compiles
Time to fix xenoarch, and then the map.
2015-07-09 15:55:36 -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
Aurorablade a2d6591d29 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into STILLALOTOFBLOOD 2015-07-08 18:16:25 -04:00
Aurorablade 94602215c4 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ImportentpAIUpdate 2015-07-08 18:02:04 -04:00
Aurorablade c1aaf402db pais Can now ping and buzz.
Still stumped on the icon bit.
2015-07-08 17:59:27 -04:00
DZD b94c3deaf2 Initial Commit for -tg- Mining
I can guarantee this will not compile, very much a WIP and currently
consists of mostly copy+pasting -tg-'s modules/mining folder over ours,
and unticking a few of our own files.
2015-07-08 16:19:26 -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
Fox-McCloud 9dc27ce126 Destroy Pass II 2015-07-07 22:26:28 -04:00
TheDZD b02cd94168 Merge pull request #1467 from Fox-McCloud/del-the-dels
Replaces Remaining Del()'s
2015-07-07 19:07:53 -04:00
TheDZD db8767265a Merge pull request #1461 from Fox-McCloud/singulo-equipment
Singulo Equipment Cleanup and Fixes
2015-07-07 19:07:12 -04:00
TheDZD e48de984c4 Merge pull request #1453 from Fox-McCloud/job-selection
Adjusts Character Setup and Job Selection Menus
2015-07-07 19:07:07 -04:00
Fox-McCloud 40c047f89a Merge pull request #1464 from tigercat2000/gibtoy
Minigibber toy
2015-07-07 16:35:36 -04:00
SamCroswell 0dbfc3bd04 Crystals now eject at the bottom of a computer 2015-07-07 02:28:54 -04:00
SamCroswell d9a76bef17 GPS now goes in the hand 2015-07-07 02:18:11 -04:00
SamCroswell f7cc10aae5 Telesci / Poly Update 2015-07-07 02:10:54 -04:00
Fox-McCloud 561e0c2268 pass 3 and cleanup 2015-07-07 01:32:40 -04:00