Commit Graph

914 Commits

Author SHA1 Message Date
FalseIncarnate
fa4fa1237e Cold Reactions and Applejack
Adds the ability to make a chemical reaction only occur when at or below
a specified temperature.

Adds new reaction for freezing water into ice
- Must be at or below 270K to turn water to ice

Adds two new reagents/drinks: Applejack and Jack Rose cocktail
-Applejack is obtained by freezing cider at or below 270K
- Applejack is slightly more potent than cider, due to it's alcohol
concentration being higher
- Jack Rose is a new mixed drink that is 4 parts Applejack, 1 part Lemon
Juice

Only Ice and Applejack utilize the cold reactions at this time, but the
functionality is in place for future reactions.
- This should allow coders more flexibility with defining new reactions
that may realistically occur at low temperatures.

Renamed the existing "required_temp" variable for reactions to
"min_temp" to better communicate it's purpose and differentiate it from
the new "max_temp" variable for cold reactions.
2015-07-08 04:34:25 -04: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
TheDZD
b38d741801 Merge pull request #1446 from Fox-McCloud/pools-and-fires
Pools Hotspots
2015-07-05 17:51:20 -04:00
Fox-McCloud
ab28186d13 Kill is Kill 2015-07-04 19:27:43 -04:00
Fox-McCloud
a878ccee30 Pools Hotspots 2015-07-04 09:34:03 -04:00
Fox-McCloud
3cea706688 Black Powder Balance 2015-07-02 17:46:24 -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
FalseIncarnate
39305b1a86 Food/Pill Fixes
Fixes Food and Pills so that they actually transfer their reagents
properly
- Big thanks to Krausus for helping with locating and correcting the
issue

Fixes IPCs being able to eat pills.
- They have a monitor for a head, where do you think you're going to put
that?

Fixes IPCs being immune to the soothing effects of water
- IPCs that are on fire can be properly doused with a splashing of
water.
2015-06-30 09:27:06 -04:00
Fox-McCloud
a89ddd5a7d Adds in Ether 2015-06-28 20:39:26 -04:00
Fox-McCloud
c28f9bb8ca Merge pull request #1370 from FalseIncarnate/master
Synthetic Reagent Processing and Synth Drugs
2015-06-24 17:49:02 -04:00
Fox-McCloud
02aaca9c7b Merge remote-tracking branch 'upstream/master' into revenants 2015-06-23 23:44:20 -04:00
FalseIncarnate
f3c9098ecd Reaction_Mob Checks and Golem Reagent Processing Change
Reaction_mob(), which handles things like TOUCH based reactions, now
will properly obey process_flags.
- This means things like Synthflesh won't work on Synthetics.

Changed Golems from PROCESS_DUO to PROCESS_ORG
- This will give them back the ability to be healed via chemistry, since
they don't naturally regenerate.
- PROCESS_DUO remains defined in case someone finds a use for it
(adminbuse maybe?)
2015-06-23 18:06:54 -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
ZomgPonies
4d9baf9936 Merge pull request #1358 from Fox-McCloud/sarin-tabun
Sarin -> Tabun
2015-06-22 21:40:51 -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
a75a1165dc Sarin->Tabun 2015-06-20 15:21:24 -04: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
93392f8e90 Explosion Rework 2015-06-20 04:13:55 -04:00
Fox-McCloud
ada66fabd4 Update II 2015-06-18 17:47:52 -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
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
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
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
ZomgPonies
498408ca45 Merge pull request #1284 from Fox-McCloud/get-turf-optimizations
Get Turf Optimizations
2015-06-10 21:19:25 -04:00
Krausus
4bd9e08da6 Allows the chem dispenser to accept all drinks 2015-06-10 19:07:50 -04:00
Krausus
7ac19cd320 Fixes loading food items into chem dispensers 2015-06-10 09:38:16 -04:00
Fox-McCloud
c6cc874869 Get Turf Optimizations 2015-06-09 21:29:21 -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
Tigercat2000
82f6855755 Initial Compiling port of MetaStation 2015-06-04 09:12:37 -07:00
Krausus
887a4bad03 Fixes corgis consuming food at warp speed
Also fixes a small issue with the code that restores corgi health when
they eat.
2015-05-30 05:48:03 -04:00
ZomgPonies
f8878438af Who needs cream pie logging anyways 2015-05-29 19:09:20 -04:00
ZomgPonies
f27eef3e48 Small sprite fix 2015-05-29 18:51:16 -04:00
TheDZD
38d3eeaa31 Merge pull request #1206 from ZomgPonies/piecannon
Adds Piecannons to HONKsquad
2015-05-29 17:41:18 -04: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
ZomgPonies
c286793403 Upped pies from 3 to 5 2015-05-28 17:45:27 -04:00
ZomgPonies
8bfc376886 Add pie cannons to HONKsquad 2015-05-28 17:44:56 -04:00
ZomgPonies
52e8720bd8 Merge pull request #1195 from Fox-McCloud/wolpin-fix
Wolpin Fix+Monkey Tail Fix
2015-05-28 12:34:17 -04: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
Krausus
460fccd8db Fixes syringe blood duping 2015-05-27 21:56:01 -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
ZomgPonies
41bc4eed31 Merge pull request #1156 from Fox-McCloud/spess-dogs
New Race: Canine Race--Vulpkanin
2015-05-25 04:43:04 -04:00
Fox-McCloud
bc3ecd68c6 Removes Nanomachines 2015-05-24 18:31:12 -04:00