Commit Graph

263 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
c81d7904c5 Merging Powernets into Machines 2015-07-15 03:36:35 -04:00
Fox-McCloud
6cbdad58cf Sun Controller Scheduler Integration 2015-07-13 20:54:10 -04:00
Fox-McCloud
04511d3f0b Blob Mode Major Overhaul 2015-07-12 02:45:40 -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
Tigercat2000
d614145f40 Clean up pipecode and split huge file into folder structure
This commit cleans up any remaining relative pathing in the ATMOSPHERICS/
folder, and splits the absolutely huge pipes.dm file into 6-7 files in the
pipes/ folder tree.
2015-07-08 15:43:24 -07:00
Fox-McCloud
650580c0b6 Removes Unused/Non-functional Medical Side-Effects 2015-07-04 18:10:44 -04:00
Fox-McCloud
a569c898e9 tweak 2015-06-30 21:24:26 -04:00
Fox-McCloud
62ef1cb7e2 TG Supermatter Port 2015-06-30 21:07:08 -04:00
Fox-McCloud
af2410c3f8 Fixes Pizza Bomb Pathing 2015-06-28 18:56:02 -04:00
Fox-McCloud
2a34b600a9 Merge pull request #1397 from Krausus/GarbageCollectorWasGarbage
Garbage Collector Fixes/Tweaks/Cleanup/Documenting
2015-06-28 06:36:04 -04:00
Krausus
b386cec388 Initial GC fixes/tweaks/cleanup/documenting 2015-06-27 01:56:57 -04:00
Fox-McCloud
02aaca9c7b Merge remote-tracking branch 'upstream/master' into revenants 2015-06-23 23:44:20 -04: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
PJB3005
8ad74ebb6e Fixes all your problems...
Except the fact that 75% of paradise is still using del, and you have no pooling.

Or defer_powernet_rebuild, do you guys have that yet?
2015-06-20 14:47:45 +02:00
Fox-McCloud
5f2f3f6789 Merge pull request #1343 from tigercat2000/DidntIsayIamGoingtoStopThisstuff
Window spawners + Adding to map
2015-06-19 22:19:37 -04:00
Tigercat2000
654cb37e9a Window spawners + Adding to map
This commit adds window spawners, mapping tools which either spawn full
windows or automatically detect where it should place each pane.
2015-06-18 12:33:12 -07:00
Fox-McCloud
36b7e7b233 Merge pull request #1333 from SamCroswell/NinjaDev
EKatana Changes, Removes Ninja Eye Implant
2015-06-18 01:02:17 -04:00
SamCroswell
192b568d6c Re-Submission of a352f2c 2015-06-18 00:27:03 -04:00
SamCroswell
e8e8f2e6df Temporary Revert of a352f2
This reverts commit a352f2c5c2.
2015-06-18 00:18:13 -04:00
SamCroswell
a352f2c5c2 Removes Ninja Eyewear 2015-06-17 00:49:41 -04:00
Nienhaus
060318cb29 Adds Deer ;D 2015-06-15 18:50:39 -05:00
Fox-McCloud
09097b38ed Revenant 2015-06-13 20:10:02 -04:00
ZomgPonies
f70106a344 Merge pull request #1295 from FalseIncarnate/master
[Feature][Sprites][Map Edit] Aquariums and Pet Rocks!
2015-06-13 04:21:07 -04:00
ZomgPonies
bb02973e49 Merge pull request #1288 from Fox-McCloud/singularity-OOP
Singularity and Narsie Refactor
2015-06-13 04:18:40 -04:00
FalseIncarnate
9074629123 Aquariums and Pet Rocks!
Adds fishbowls, fish tanks, and wall aquariums.
- Buildable with glass
- Fish Tanks and Wall Aquariums also have built-in lights that can be
toggled
- Wall Aquariums block atmos just like a full window or wall.

Adds fish and fish/aquarium related items:
- Goldfish, Clownfish, Sharks, and Baby Space Carp
- Eggs can be obtained for each of these fish types and a dud egg type.
- Fish food, fish nets, egg scoops, tank brushes
- These are used to maintain your aquarium

Adds new vendor: CritterCare!
- Sells pet supplies and pet rocks!
- Moved pet collars from the clothing machine into the CritterCare

Adds new room/area: Pet Store!
- Located between the Port Emergency Storage and Auxilary Tool Storage
(across from the Vault)
- Contains a CritterCare machine, 2 fishbowls, a bucket, and a sink

Adjusts some Cargo order options!
- New category: Vending
- Contains all the vending machine refill crates
- Renamed the Bartending Supply Crate to Bar Supply Crate to avoid
confusion
- Removes the coffee refill canisters from the Bar Supply Crate, placed
them into the new Coffee Supply Crate
- Adds new Clothing Supply Crate, contains refill canisters for the
Hatlord 9000, Suitlord 9000, Shoelord 9000, and ClothesMate vendors
- Adds new Pet Supply Crate, contains refill canisters for the new
CritterCare vendor

Makes the ClothesMate and CritterCare vendors constructable
- Using a screwdriver on a vendor circuitboard will now have a chance to
set it to the ClothesMate or CritterCare setting, in addition to the
previously possible settings like Booze-o-mat and Shoelord 9000.
New reagent: Fishwater
- Obtained by using an empty reagent_container on any aquarium that has
some water in it.
- Ingesting fishwater has a 30% chance per cycle to make you vomit (what
did you expect from dirty water and fish poo?)
- Fishwater is good for botany, as it provides both water and nutrients
to hydro trays

ADDITIONAL FIXES!
- Fixes the abandoned bar's misaligned area (mostly a mapper thing, will
also ensure an APC in the area will properly power the entire area (and
not space)
- Fixes a couple instances of piping mistakes where there were manifolds
and straight pipes on the same tile, preventing vent-crawlers from being
able to navigate properly
- One was in security, another was the back room of hydroponics
- Fixed a missing pipe in the AI upload causing the vent to be
disconnected from the pipe network
2015-06-12 04:14:28 -04:00
Fox-McCloud
2ad1c74457 Singularity Refactor 2015-06-10 20:04:28 -04:00
Krausus
94c2c3cca2 Removes two old/unused/redundant magical projectiles 2015-06-10 07:45:05 -04:00
Tigercat2000
ab94fb2f9f Untick Metastation, tick cyberiad.
The .dme changes never got.. actually.. done.. ugh. I'm bad at this.
2015-06-05 15:11:43 -07:00
ZomgPonies
fd2dce684f Merge pull request #1159 from tigercat2000/MetaStationPort
MetaStation V41A II port
2015-06-05 17:49:13 -04:00
Tigercat2000
74f304e88c Metastation: Compatibility modifications
This commit modifies metastation to actually be playable on our code
Squashed Commits:
 - [META] Fixes emergency shuttle being stuck
 - Toxins Mixing fix: chamber floor > engine
 - Adds research outpost + Chem lab to routpost
 - Add vox raider ship, fix pods and a few shuttle zones.
 - Remove step_x so TRAVIS likes it
 - Finish spawn points, add telepad.

 - Replace showroom with NT-rep/Blueshield Office
   Don't worry, the nuke keg is in the meeting room.
 - Convert art storage to barber shop, place artvend in tool storage
 - Buncha medbay tweaks, 2nd surgery table, body scanners, fixed sleepers,
   minor balance changes.
 - Add Mr. Changs to dorms
 - Update meta to latest paracode
 - Fix punpun
 - Atmos volume pumps, atmos control console
 - Add chicken statue to Mr. Chang's (*cry), Bar smartfridge
 - Fix mr. changs statue and chairs
 - Add togglable polarized windows to surgery, so surgeons can prevent seeing
   other surgery procedures if necessary
 - Actually add atmos control comp
 - Hydro trays are no longer dirt
 - Fix brig windoors
 - Fix escape shuttle sleepers
2015-06-04 19:28:45 -07:00
Tigercat2000
82f6855755 Initial Compiling port of MetaStation 2015-06-04 09:12:37 -07:00
Fox-McCloud
b6ee1342e9 Redoes the Ion Storm Event and Toy AI 2015-06-04 00:06:16 -04:00
ZomgPonies
e5f026d02e Merge pull request #1216 from tigercat2000/OHGODIHAVETOTESTTHIS
Port Atlas's implementation of -tg-'s canvas art.
2015-05-30 20:17:41 -04:00
TheDZD
bb921b552d Merge pull request #1153 from tigercat2000/BUILDMODEINf
Adds area generators to build mode - Take 2 [DNM]
2015-05-30 09:56:36 -04:00
Tigercat2000
cced767094 Port Atlas's implementation of -tg-'s canvas art. 2015-05-29 15:43:42 -07:00
ZomgPonies
277a900aa7 Merge pull request #1193 from Fox-McCloud/mobs-pets-stuffs
Simple Animal Refactor+Update+Fixes and Pet Collars
2015-05-28 22:45:03 -04:00
Fox-McCloud
5d3e837b4a Mob Refactor+Update and Pet Collars 2015-05-28 00:20:25 -04:00
Tigercat2000
0691822f9c Mob Resizing, -tg- mob lying standarization 2015-05-27 15:58:13 -07:00
ZomgPonies
1aa5a8533d Cleanup and moving of species files 2015-05-26 21:21:37 -04:00
ZomgPonies
a9e2f0c641 HUD fixes 2015-05-26 21:13:02 -04:00
ZomgPonies
fa5e97deb5 Missing dmis, final fixes 2015-05-25 20:35:35 -04:00
ZomgPonies
e056abfb82 3/3 port done 2015-05-25 20:16:34 -04:00
ZomgPonies
1935a82afe 2/3 of port done 2015-05-25 19:48:13 -04:00
Tigercat2000
78b13ba338 Finish syndicate template, other finishes 2015-05-23 16:50:33 -07:00
AnturK
28e952dc8c Adds area generators to build mode - Take 2
Adds two generators : Asteroid and Syndicate
2015-05-23 07:50:24 -07:00
tigercat2000
9173f1056a Revert "Adds area generators to build mode" 2015-05-23 07:39:14 -07:00
AnturK
aac8b6d5a6 Adds area generators to build mode
Adds two generators : Asteroid and Syndicate
2015-05-22 04:58:56 -07:00
ZomgPonies
3e828465f2 Merge pull request #1114 from tigercat2000/massindrivein
/vg/ mass driver port
2015-05-21 08:40:58 -04:00