Commit Graph

3054 Commits

Author SHA1 Message Date
Fox-McCloud
3f70dc58d6 Powernet Tweaks 2015-06-14 17:21:01 -04:00
Fox-McCloud
ce9a8bea53 Autolathe Quality of Life: Build Tile 2015-06-13 14:23:36 -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
ZomgPonies
a5cce3f46d Merge pull request #1271 from tigercat2000/shakygib
Blender, food processor, gibber, monkey recycler shaking when processing
2015-06-11 20:58:28 -04:00
Fox-McCloud
ce496fcee6 beacon cleanup 2015-06-10 23:36:01 -04:00
ZomgPonies
498408ca45 Merge pull request #1284 from Fox-McCloud/get-turf-optimizations
Get Turf Optimizations
2015-06-10 21:19:25 -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
Fox-McCloud
c6cc874869 Get Turf Optimizations 2015-06-09 21:29:21 -04:00
Krausus
7178370044 Fixes various runtimes
Fixes:

- Body scanners runtiming from bad drag-drops
- Flashbangs runtiming when flashing humans without eyes
- Diona nymphs runtiming because they're not simple animals with an
environment_smash var
- A thrown object colliding with a non-existent limb runtiming
- Brains runtiming when redundantly removed
- Thrown objects runtiming when they can't find an area
2015-06-08 08:53:43 -04:00
kingofkosmos
0f48bef705 Blender, food processor, gibber, monkey recycler shaking when processing
This commit makes the machines listen in the title shake quickly, as if
vibrating, when used.
2015-06-07 14:30:01 -07:00
Fox-McCloud
e4cbc5619e Classic Baton Refactor 2015-06-05 18:01:50 -04:00
Fox-McCloud
b6ee1342e9 Redoes the Ion Storm Event and Toy AI 2015-06-04 00:06:16 -04:00
Fox-McCloud
e098364432 Stun+Weaken Balancing 2015-05-31 06:35:14 -04:00
Krausus
f84e7e8e8d Fixes losing items when dismantling machine frames 2015-05-30 06:25:46 -04:00
Krausus
778f928e6b Fixes canisters not exciting the air when broken 2015-05-29 05:11:57 -04:00
Fox-McCloud
5d3e837b4a Mob Refactor+Update and Pet Collars 2015-05-28 00:20:25 -04:00
Fox-McCloud
93935bd315 Merge pull request #1185 from ZomgPonies/monkey
Monkey Fixes
2015-05-27 20:09:06 -04:00
ZomgPonies
0587051c79 Fixes monkey inventory stuff 2015-05-27 19:29:17 -04:00
ZomgPonies
fc8a5b8789 Fixed invisible nymphs and monkey recyclers 2015-05-27 19:02:16 -04:00
FalseIncarnate
a1cce51559 Merge Conflict Fix, Attempt 2 2015-05-27 01:07:19 -04:00
FalseIncarnate
28347540b6 Merge Conflict Fix
Because Ponies removed commented out code.
2015-05-27 00:57:57 -04:00
Fox-McCloud
710dd1b520 Merge pull request #1171 from ZomgPonies/monkey
Converting monkeys to human subtypes
2015-05-26 22:14:55 -04:00
ZomgPonies
0cc15105e5 Final fix 2015-05-26 20:29:47 -04:00
ZomgPonies
5c79a9a065 Small object manipulation stuff 2015-05-26 14:00:20 -04:00
FalseIncarnate
c385cb7f4f Botany Belt, Biogenerator Additions
Adds in the new Botany Belt, a belt designed for handling all sorts of
botany-related tools.

Adds the Botany Belt, Security Belt, Medical Belt, Janitor Belt, and
Bandolier to the Biogenerator's list of products.

Re-arranges the biogenerator's product listing to have a new "Belts"
section, dedicated to (you guessed it) belts.
- Moves the Utility (tool) into the Belts section, previously was in the
Leather section
- The new belt listings are also in this section.

All belts in the biogenerator have the same base cost of 300 points.
Increasing the efficiency of the machine will lower the costs
appropriately.

Adjusts some code related to the security belt so they won't magically
have a seclite in them when created via biogenerator.
- The belts in the sec lockers will still have their light
- The ERT belt no longer needs to clear contents during its New() proc
to remove the seclite.
2015-05-26 13:54:24 -04:00
ZomgPonies
264369bdfa issmall fixes and order of operations 2015-05-25 23:50:53 -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
ZomgPonies
f2d03e93c2 First 1/3 of port done. 2015-05-25 17:59:30 -04:00
FalseIncarnate
b20d004142 Biogenerator Biomass Value Fix
Fixes the Biogenerator only giving one point of biomass per product
inserted.

The biogenerator previously calculated the points based on the amount of
the nutriment reagent in the products inserted.

Now the biogenerator will calculate the points based on the combined
amounts of the nutriment and plant-matter reagents in the product.

Overall, this just restores the values back to their pre-Nutrient
Changes levels, as nutriment in plant products was replaced with
plant-matter for nearly every plant that had it.
2015-05-25 15:20:58 -04:00
Krausus
0d6653059f Fixes "Challenge" away mission turrets 2015-05-25 08:36:07 -04:00
Krausus
5bc64c0ffd Fixes runtimes in cloning computers 2015-05-25 08:13:31 -04:00
Krausus
16886c3918 Fixes mulebots recalculating their path needlessly 2015-05-25 04:56:57 -04:00
Tigercat2000
2218d8c0ab Fix some minor issues with pod doors and buttons 2015-05-24 20:25:13 -07:00
IAmBigCoat
cdc10b2178 Adding area adjustment.
Need to add servercold to areas.dmi and re-add the mapd
2015-05-22 23:41:10 -04:00
Fox-McCloud
f04dd858cf Merge remote-tracking branch 'upstream/master' into LINDA-Fixes 2015-05-21 19:35:35 -04:00
Fox-McCloud
0da9c966f0 More Linda Fixes 2015-05-21 19:33:54 -04:00
ZomgPonies
3e828465f2 Merge pull request #1114 from tigercat2000/massindrivein
/vg/ mass driver port
2015-05-21 08:40:58 -04:00
Krausus
aea292d3a1 Fixes tracking of off-camera AI bots 2015-05-20 07:22:18 -04:00
Krausus
9d5d8f697c Fixes AI camera tracking
Fixes tracking everyone where, not being able to track everyone with
suit sensors maxed, and not seeing all trackables in the tracking list
2015-05-20 07:03:01 -04:00
Tigercat2000
e470eee477 TMDU: Mass Driver Overhaul
This commit overhauls mass drivers.
Every component of mass drivers are now buildable.
This means:
 - Mass Drivers
 - Mass Driver Control Computers
 - Mass Driver Buttons
Mass driver control computers now support multiple mass drivers.
You can link mass-drivers to buttons via multitool.
Buttons have a range of 7 for their mass driver link.
Computers have infinite range.
2015-05-19 20:28:48 -07:00
Krausus
6aec924f73 Fixes biogenerator issues
Fixes the biogenerator getting stuck if it can't fill a beaker, eating
resources if it can't fill a beaker, and getting splashed every time you
tried to load a beaker.
2015-05-18 08:54:26 -04:00
Krausus
b73474e7f8 Fixes air alarm wire interaction for silicons 2015-05-18 02:36:54 -04:00
ZomgPonies
572f364da4 Merge pull request #1054 from PJB3005/vg-masterrace
/vg/ Multitool Menu port + More things constructible + AAC
2015-05-16 21:26:54 -04:00
TheDZD
cf90e1703b Merge pull request #1087 from tigercat2000/LightDefines
REFACTOR: Most consoles and machinery now use defines for light color
2015-05-16 21:04:45 -04:00
Tigercat2000
13e395e9c6 REFACTOR: Most consoles and machinery now use defines for light color
This commit refactors light_color definitions for most machines and
consoles that use light_color's. Instead of having the same color repeated
over and over again, there are #defines for most of the common ones.

Some machines and other places may not use lighting defs- this is
intentional. The defines as they are, are relatively clean, and machinery
was where the bulk of repeated light definitions were. Other, special
colors, can just be defined in the same file that they are used once in.
2015-05-16 13:29:29 -07:00
Tigercat2000
56e3880fb6 FIX: 2-tile pod-doors
This commit re-enables 2-tile pod-doors and updates them to the new
pod-door standard.
2015-05-16 11:41:43 -07:00