Commit Graph

3054 Commits

Author SHA1 Message Date
SamCroswell 355666e1a8 Computer Fixes 2015-07-17 22:35:00 -04:00
Fox-McCloud 04204c2d30 forgot a thing 2015-07-15 18:35:29 -04:00
Fox-McCloud 409fefa4b3 Power Computer and Computer Fixes 2015-07-15 07:00:46 -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 898bcea1e8 Merge pull request #1489 from FalseIncarnate/master
Kitchen Machine Refactor and Max Item fix
2015-07-11 22:19:07 -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
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
Fox-McCloud 54f59b9899 Pass II 2015-07-09 19:51:40 -04:00
Fox-McCloud 0dbea7621f The Great Del() Cull of 2015 2015-07-09 02:48:34 -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
Fox-McCloud 40c047f89a Merge pull request #1464 from tigercat2000/gibtoy
Minigibber toy
2015-07-07 16:35:36 -04:00
SamCroswell 1d670c4c0f Computer Lighting Update 2015-07-07 01:10:55 -04:00
Fox-McCloud 88dfaa51a4 Replaces Reamining Del()'s 2015-07-07 00:35:19 -04:00
Fox-McCloud 8e68d7903c fixes another in world call 2015-07-06 23:55:05 -04:00
ZomgPonies 28c8184712 Merge pull request #1460 from tigercat2000/mmmmgibberss
Refactor gibber animation code.
2015-07-06 22:05:09 -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
Tigercat2000 1fab3ff311 Refactor gibber animation code.
Kinda. I made it longer and more complicated, but less ridiculous in
amount of icon operations.
2015-07-05 19:54:12 -07:00
TheDZD e32cecff2c Merge pull request #1445 from Fox-McCloud/font-increase
Status Display Font Size Increase
2015-07-05 17:51:26 -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
Fox-McCloud 650580c0b6 Removes Unused/Non-functional Medical Side-Effects 2015-07-04 18:10:44 -04:00
Fox-McCloud a878ccee30 Pools Hotspots 2015-07-04 09:34:03 -04:00
Fox-McCloud f26801c1ea Status Display Font Size Increase 2015-07-04 05:01:06 -04:00
Fox-McCloud 389eab6e32 Analyzer Scan Refactor 2015-07-02 02:01:13 -04:00
Fox-McCloud 4820fc7065 Merge pull request #1433 from FalseIncarnate/master
Grinder Fix, Botany qdel Refactor, Removes PanDEMIC 2200
2015-07-01 22:25:52 -04:00
FalseIncarnate 27f4ccda36 Grinder Fix, Botany qdel Refactor, Removes PanDEMIC2200
Fixes the reagent grinder machines not properly grinding tomato into
ketchup and rice into rice

Updates botany code to use qdel over del to help alleviate potential lag
from del calls

Removes the PanDEMIC 2200 board from Tech Storage and the Circuit
Imprinter, as the computer it builds has been commented out for a long
time. Also deletes the commented out code (over 250 lines of commented
out code deleted)
2015-07-01 22:09:37 -04:00
Fox-McCloud 28eda8802a RIP Plamsa, we barely knew you...*salutes* 2015-07-01 02:40:35 -04:00
Fox-McCloud 4d04bb7750 Guts Moronic Phoron 2015-06-30 01:06:09 -04:00
Fox-McCloud a89ddd5a7d Adds in Ether 2015-06-28 20:39:26 -04:00
FalseIncarnate fc6ebc4854 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 2015-06-23 04:18:46 -04:00
FalseIncarnate acf1e268f1 Synthetic Reagent Processing and Synth Drugs 2015-06-23 04:17:01 -04:00
Tigercat2000 bcb4a9601f Merge remote-tracking branch 'upstream/master' into poolit
Conflicts:
	code/game/objects/structures/displaycase.dm
	code/game/objects/structures/grille.dm
	code/game/objects/structures/lamarr_cage.dm
2015-06-22 13:40:07 -07:00
Tigercat2000 7c9139d6e0 Bay/-tg- Meteor port
Meteors now have different types, properly integrated.
Meteoract has been removed, meteors now just call ex_act.
2015-06-21 18:39:39 -07:00
Tigercat2000 d20298e996 -tg- atom pooling system, qdel changes
This commit first and foremost ports the -tg- atom pooling system, and
removes the old experimental system entirely.

Secondly, this PR modifies the qdel system to use a -tg- lookalike
"destroy hint" system, which means that individual objects can tell qdel
what to do with them beyond taking care of things they need to delete.
This ties into the atom pooling system via a new hint define,
QDEL_HINT_PUTINPOOL, which will place the atom in the pool instead of
deleting it as per standard.

Emitter beams are now fully pooled.

Qdel now has semi-compatibility with all datum types, however it is not
the same as -tg-'s "Queue everything!" system. It simply passes it through
the GC immediately and adds it to the "hard del" lists. This means that
reagents can be qdel'ed, but there is no purpose as of yet, as it is more
or less the same as just deleting them, with the added effect of adding
logs of them being deleted to the garbage collector.
2015-06-21 15:47:57 -07:00
TheDZD 6d990e2179 Merge pull request #1353 from Fox-McCloud/explosion-rework
Explosion Rework
2015-06-21 16:11:05 -04:00
Fox-McCloud 8e450f99c8 tweaks and optimization 2015-06-21 02:16:18 -04:00
Fox-McCloud 93392f8e90 Explosion Rework 2015-06-20 04:13:55 -04:00
Fox-McCloud 96685733a9 Removes a few Hitby Messages 2015-06-20 01:34:53 -04:00
ZomgPonies 2879590f76 Merge pull request #1314 from Fox-McCloud/powernet-tweaking
Powernet Tweaks
2015-06-16 08:02:10 -04:00
Krausus df220a2172 Fixes deleted air alarm runtime 2015-06-15 09:44:53 -04:00
Krausus 940b64f887 Fixes deleted cryopod runtime 2015-06-15 09:27:36 -04:00