Commit Graph

4401 Commits

Author SHA1 Message Date
ZomgPonies ace7624975 Merge pull request #1301 from Fox-McCloud/storage-fixes
Can Hold Fixes
2015-06-13 04:30:33 -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 25b9283717 Feedback Fixes
Changes instances of \red and \blue to use spans as per suggestions in
glass.dm and fishtank.dm

Fixed a mistake preventing the building of one direction windows and
fishbowls (whoops!)

Fixes grammar concerns in multiple messages

Holy water is now (magically?) worth 110% of it's reagent amount when
filling aquariums.
- This is a rather small boost to having the chaplain bless the water
you are going to dump into a filtration system anyways.

Moves the fishwater ingestion method out of the on_mob_life proc to
prevent spam, now will display when initially ingested

Updates the CritterCare vendor's sprite to include the pug and fox, as
well as adjusting the "static" between displays to give it a slight
variety.
2015-06-13 04:13:47 -04:00
Fox-McCloud 481008b94e Can Hold Fixes 2015-06-13 04:11:14 -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 ce496fcee6 beacon cleanup 2015-06-10 23:36:01 -04:00
ZomgPonies bc4525f145 Merge pull request #1283 from Fox-McCloud/Throw-BYOND-Instead
Makes the Code Compile for 508.1287+Travis Update
2015-06-10 21:19:46 -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 23d9750822 Fixes telebaton attack logs 2015-06-10 07:27:19 -04:00
Fox-McCloud c6cc874869 Get Turf Optimizations 2015-06-09 21:29:21 -04:00
Fox-McCloud 6614ab8a8c Makes the Code Compile for 508.1287+Travis Update 2015-06-09 18:14:15 -04:00
Krausus 1fc0f235ef Fixes plurality of stacks and updates miss message
Some stacks didn't have their gender set to plural, despite having a
pluralized item name.
2015-06-08 23:32:44 -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
Krausus 075f89fcb0 Fixes stacks acting strange for cyborgs
Robot modules weren't handling qdel'd stacks properly, so now they
simply don't get qdel'd. They shouldn't get deleted often enough for
this to hurt performance.

Also, the module slot of a stack will now be deselected when it's used
up, and it will show up immediately when respawned while recharging.
2015-06-08 06:37:52 -04:00
Krausus b4dd04dd85 Fixes engie ERT's infinitely-duplicable materials
Also removes the (worthlessly broken) full-stack subtypes added
specifically for them.
2015-06-08 05:42:02 -04:00
Krausus ba38be536b Fixes intercom frames "mounting" in the wrong direction 2015-06-08 04:20:27 -04:00
ZomgPonies 757650896a Merge pull request #1258 from Fox-McCloud/batons
Classic Baton Refactor
2015-06-07 14:08:31 -04:00
Fox-McCloud 7ae9ec41a0 Merge remote-tracking branch 'upstream/master' into lootdrop 2015-06-05 18:10:30 -04:00
Fox-McCloud e4cbc5619e Classic Baton Refactor 2015-06-05 18:01:50 -04:00
ZomgPonies fd2dce684f Merge pull request #1159 from tigercat2000/MetaStationPort
MetaStation V41A II port
2015-06-05 17:49:13 -04:00
ZomgPonies f65d374d1c Merge pull request #1249 from Fox-McCloud/AI-STATE-YOUR-LAWS
TG Ion Storm Event and Toy AI
2015-06-05 04:55:50 -04:00
Krausus 3880364321 Fixes monkey quick-equip
Monkeys could use quick-equip to equip things they weren't supposed to.
2015-06-05 00:57:19 -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
Fox-McCloud 4eadd086d0 Fixes Wardrobes an Item Spawning 2015-06-04 20:13:18 -04:00
Fox-McCloud 7b455d8b89 Re-Works Maintenance Loot 2015-06-04 18:53:13 -04: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
Fox-McCloud 296093951b defib failed 2015-06-03 02:24:02 -04:00
Fox-McCloud c5f16b538a oops 2015-06-03 00:27:38 -04:00
Fox-McCloud 41512b0252 Exam Room Tweaks 2015-06-02 23:17:17 -04:00
ZomgPonies 97fadbede5 Merge pull request #1237 from Fox-McCloud/barsigns
Refactors Barsigns
2015-06-01 19:42:41 -04:00
ZomgPonies e641c847d6 Merge pull request #1233 from Fox-McCloud/stun-balance
Stun+Weaken Balancing
2015-06-01 15:20:19 -04:00
Fox-McCloud 866de52f0f SNIP 2015-05-31 22:32:20 -04:00
Fox-McCloud bbed6a2a42 Refactors Barsigns 2015-05-31 20:04:12 -04:00
Fox-McCloud e71bcdb9d0 Adds Grenade, Flash, and EMP in-hands 2015-05-31 16:39:41 -04:00
Fox-McCloud e098364432 Stun+Weaken Balancing 2015-05-31 06:35:14 -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
Fox-McCloud 0602435d8a Fixes and Tweaks to Defenses 2015-05-30 01:47:25 -04:00
ZomgPonies 01896f9209 Merge pull request #1208 from tigercat2000/coloredtilelight
Colored Light Tiles
2015-05-29 19:36:56 -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
Tigercat2000 f7ccb2ef79 Colored Light Tiles
Light tiles (item) can now have their color changed by attacking them with a
multitool. These colors have special sprites and glow a color similar to
their sprite.
2015-05-28 16:52:06 -07:00
Fox-McCloud cd112b5364 Wolpin Fix+Monkey Tail Fix 2015-05-28 04:04:39 -04:00
Fox-McCloud 5d3e837b4a Mob Refactor+Update and Pet Collars 2015-05-28 00:20:25 -04:00
Fox-McCloud f87c819d25 heheh 2015-05-27 20:02:22 -04:00
Fox-McCloud 127aff20ba Fixes Rubber Duck 2015-05-27 19:55:35 -04:00
FalseIncarnate a1cce51559 Merge Conflict Fix, Attempt 2 2015-05-27 01:07:19 -04:00
ZomgPonies 5c79a9a065 Small object manipulation stuff 2015-05-26 14:00:20 -04:00