Commit Graph

10034 Commits

Author SHA1 Message Date
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
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
Fox-McCloud
e4d6acb538 Changes a few del to del() 2015-07-10 23:28:08 -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
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
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
SamCroswell
1d670c4c0f Computer Lighting Update 2015-07-07 01:10:55 -04:00
Fox-McCloud
a9f3eab669 pass 2+fix 2015-07-07 00:58:34 -04:00
Fox-McCloud
88dfaa51a4 Replaces Reamining Del()'s 2015-07-07 00:35:19 -04:00
Fox-McCloud
b9a492a3a5 no world 2015-07-06 23:25:29 -04:00
Krausus
d694ad1d09 Inverts new karma reminder and scoreboard toggles
These can't default to 1, or they'll have the wrong default for every
existing player.
2015-07-06 23:07:04 -04:00
ZomgPonies
fcc6b76440 Merge pull request #1458 from TheDZD/fluff
MrBarrelrolll Fluff Item
2015-07-06 22:04:12 -04:00
Tigercat2000
997d616b62 Minigibber toy
This commit adds a miniature gibber toy (/obj/item/toy/minigibber), which
uses a downscaled sprite of the gibber.

Features:
 - Plays a gibbing noise when you click on it with itself, cooldown of 8
   ticks applies.
 - It's a miniature gibber.
 - Custom attack verbs (grinded, gibbed)
 - Feed DnD minifigures into it for REALISTIC GIBBING ACTION (tm)
 - Obtain from arcade machine or cargo store (400 credits)

** SQUASHED COMMITS **

Minigibber name-spellchecking

Protip: Miniature is actually spelled mini-ature, not min-ature.

Minigibber minifigure eating action!

You can now shove minifigures into the Minigibber, then click on it with
itself to tear them apart! GIB! GIB! GIB!

Make minigibber obtainable

Via arcade machine and cargo store (400 credits)

Minigibber desc now says grinder...

instead of meat producing machine. Because it's really just a giant
grinder, and that will match the store item description.

Readd gibbing sound to minigibber, mistakenly removed it earlier.
2015-07-06 17:15:54 -07:00
Tigercat2000
3a45d52fe0 Fix remaining non-returning Destroys()
Plus a little refactor to mining flaps and spacepod doors- they now use
CanAtmosPass instead of manually setting the turf to no-atmos-passing
2015-07-06 09:20:39 -07:00
Fox-McCloud
3a44b3097f Singulo Equipment Cleanup 2015-07-06 01:07:08 -04:00
TheDZD
226324595c Merge pull request #1444 from Fox-McCloud/round-end-toggles
Scoreboard and Karma Toggles
2015-07-05 17:51:38 -04:00
TheDZD
b38d741801 Merge pull request #1446 from Fox-McCloud/pools-and-fires
Pools Hotspots
2015-07-05 17:51:20 -04:00
TheDZD
893e5a91c9 Merge pull request #1449 from Fox-McCloud/side-effects
Removes Unused/Non-functional Medical Side-Effects
2015-07-05 17:51:09 -04:00
TheDZD
59b154e8cb Merge pull request #1452 from Fox-McCloud/parents-and-procs
Tweaks a Few Destroy()'s
2015-07-05 17:51:03 -04:00
DZD
136a81664a MrBarrelrolll Fluff Item
- Adds in fluff item for MrBarrelrolll, a replica claymore.
2015-07-05 17:39:32 -04:00
Fox-McCloud
32b991c6b8 Merge pull request #1447 from PJB3005/CARPET
Fixes fucked up lights on carpets and the alike.
2015-07-05 17:19:25 -04:00
Fox-McCloud
1804586fbd Adjusts Character Setup and Job Selection Menus 2015-07-05 08:48:30 -04:00
Fox-McCloud
44881a4016 Tweaks a Few Destroy()'s 2015-07-05 04:51:47 -04:00
TheDZD
d8c3ff71dc Merge pull request #1442 from Fox-McCloud/dreaming
Dreams Refactor
2015-07-04 21:50:16 -04:00
TheDZD
547373b55f Merge pull request #1450 from Fox-McCloud/emitter-pooling-fix
Fixes Emitter Beam Pooling
2015-07-04 21:50:03 -04:00
Fox-McCloud
6610d71dd7 Fixes Emitter Beam Pooling 2015-07-04 20:59:12 -04:00
Fox-McCloud
ab28186d13 Kill is Kill 2015-07-04 19:27:43 -04:00
Fox-McCloud
650580c0b6 Removes Unused/Non-functional Medical Side-Effects 2015-07-04 18:10:44 -04:00