Commit Graph

9874 Commits

Author SHA1 Message Date
ZomgPonies
2879590f76 Merge pull request #1314 from Fox-McCloud/powernet-tweaking
Powernet Tweaks
2015-06-16 08:02:10 -04:00
Krausus
66506d9049 Fixes Make Wizard and timed alerts
Turns out timed alerts, which are ONLY used by Make Wizard, were broken
ever since they were added... 11 months ago. Now they work, so Make
Wizard works.
2015-06-15 11:03:23 -04:00
Krausus
7aa8c06e6c Fixes runtime when add_reagent-ing 0 of something
On rare occasions, something will try to add 0 of a reagent, which would
cause problems.
2015-06-15 10:10:26 -04:00
Krausus
43578f8172 Fixes one-click-antag runtimes
Should make one-click-wizard stop breaking unpredictably.
2015-06-15 09:58:23 -04:00
Krausus
ea34114321 Fixes protolathe stack-inserting runtime 2015-06-15 08:52:53 -04:00
Krausus
094e3e24cc Fixes HUDType runtimes 2015-06-15 08:22:05 -04:00
Fox-McCloud
3f70dc58d6 Powernet Tweaks 2015-06-14 17:21:01 -04:00
Fox-McCloud
8a78887ba6 Blueshield Jacket Re-submission 2015-06-14 14:23:55 -04:00
ZomgPonies
200a948fc9 Merge pull request #1308 from Robertha89/master
Ads xeno fat suit
2015-06-14 04:55:14 -04:00
ZomgPonies
b2f0cc8deb Merge pull request #1297 from Fox-McCloud/rip-emag-rng
Removes Emag RNG on APCs
2015-06-14 04:54:32 -04:00
Robertha89
662a101bce adds xeno fat suit 2015-06-14 09:12:40 +02:00
Fox-McCloud
5db85679cc Singulo Optimization 2015-06-14 00:31:11 -04:00
ZomgPonies
b3a585172a Merge pull request #1302 from FalseIncarnate/master
[High Priority][Fix] Removes Collars from the Cargo Merch Store
2015-06-13 04:31:02 -04:00
FalseIncarnate
cc0058f789 Removes Collars from the Cargo Merch Store
Removes them from the merch store, since they can be purchased MUCH
cheaper at the CritterCare vendor. The only advantage to them being here
is not needing to restock and the box you get with it.
2015-06-13 04:22:13 -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
ZomgPonies
ce58ae99e1 Merge pull request #1300 from Fox-McCloud/Hos-laserzzz
HoS Lasergun Fix
2015-06-13 04:17:41 -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
e203a7d17f HoS Lasergun Fix 2015-06-13 03:53:07 -04:00
Fox-McCloud
344a5e8157 Merge pull request #1293 from SamCroswell/VisionUpdate
Vision Update
2015-06-13 02:49:09 -04:00
Fox-McCloud
b014c5b1b3 Removes Emag RNG on APCs 2015-06-12 20:37:17 -04:00
TheDZD
3d32ed1574 Merge pull request #1292 from Fox-McCloud/mphhh-mphhh
Re-adds Pyroclastic Anomally Event
2015-06-12 15:05:36 -04:00
TheDZD
1f66442519 Merge pull request #1290 from Fox-McCloud/stupid-RNG
Removes Borg Emag RNG
2015-06-12 15:05:17 -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
SamCroswell
4e3f4bfa17 Adds Vision Flags for Helmets 2015-06-11 23:15:42 -04:00
Fox-McCloud
b398977d16 runtime fix 2015-06-11 23:13:14 -04:00
SamCroswell
dcc0128a54 Removes Automatic Night Vision from Mesons/Thermals
Mersons, Thermals, and Material Scanners no longer have automatic
nightvision.
2015-06-11 21:56:20 -04:00
SamCroswell
b6cd6b4384 Rewrites HUD Handling for Glasses 2015-06-11 21:42:15 -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
5b5209e0a5 Re-adds Pyroclastic Anomally Event 2015-06-11 11:30:49 -04:00
Fox-McCloud
e6524e19a4 Removes Borg Emag RNG 2015-06-11 01:19:09 -04:00
Fox-McCloud
8db197f71c ALL HAIL LORD SINGULO 2015-06-11 00:11:20 -04:00
Fox-McCloud
4eff027e67 yay-oh-crap 2015-06-10 23:38:29 -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
4bd9e08da6 Allows the chem dispenser to accept all drinks 2015-06-10 19:07:50 -04:00
Krausus
1389f0eb9b A couple istype->ishuman replacements 2015-06-10 11:02:54 -04:00
Krausus
7ac19cd320 Fixes loading food items into chem dispensers 2015-06-10 09:38:16 -04:00
Krausus
a67021784f Fixes issues with change projectiles
Fixes dropping organs/limbs, cyborgizing runtimes, transfer of
non-wizard spells, transformation attack logging, and transformation
into unintended species
2015-06-10 09:29:13 -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
Fox-McCloud
6614ab8a8c Makes the Code Compile for 508.1287+Travis Update 2015-06-09 18:14:15 -04:00
ZomgPonies
b5fa4d15fc Merge pull request #1272 from tigercat2000/intercomusic
New admin sound verb; Play a sound originating at every radio.
2015-06-09 05:41:09 -04:00
Fox-McCloud
bb9a6c5a81 Merge pull request #1276 from Krausus/Fixes-201506080338
Various Fixes - Cyborg Stacks, Sleepy/Deaf Animals/pAIs, Admin Stuff, Runtimes, etc.
2015-06-09 00:40:11 -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
ZomgPonies
009edf366d Merge pull request #1270 from tigercat2000/tramprocess
Move tram processing to internal loop, so they can go a decent speed.
2015-06-08 18:38:33 -04:00
Tigercat2000
f271e162f8 Clean up odd list cancel things in playsound. 2015-06-08 07:16:28 -07:00
Krausus
3299870a2e Fixes bees not checking for calmers properly
This check was so wrong. How could anyone even...
2015-06-08 09:09:33 -04:00