Anewbe
c1008b52cd
Merge pull request #2989 from MagmaRam/sandwich
...
Meat Meat Meat Meat Meat Meat and Fork Sandwich
2017-02-09 21:24:03 -06:00
MagmaRam
f92e189cc7
Fixes not being able to pick up sandwiches with a fork if they're at max size.
2017-02-05 19:25:59 -06:00
Yoshax
f497cbf5cf
Droppers are known for being inconsistent and inaccurate
2017-02-05 01:41:50 +00:00
Arokha Sieyes
2e6d423047
Fix chocolate milk
...
I am a man who can appreciate his chocolate milk. Unless his chocolate milk carton is always full of normal milk due to a faulty constructor inheritance scheme that fills it with first the wrong amount of milk, then tries to fill it with more wrong milk, then finally attempts to fill the soggy milk carton with chocolate milk.
2017-02-02 15:34:34 -05:00
Anewbe
1b3b67b8ca
Merge branch 'master' into heart_damage
2017-01-30 22:43:09 -06:00
Anewbe
62d19de99f
Merge pull request #2929 from Anewbe/taste
...
Ports taste from Bay
2017-01-28 21:06:21 -06:00
Anewbe
701695ba07
Changes two taste descriptions
2017-01-28 20:57:54 -06:00
Anewbe
9818b9a06f
Fixes a type
2017-01-26 21:45:10 -06:00
Anewbe
6930f06030
Fixes some stuff
2017-01-25 15:59:40 -06:00
Anewbe
83db0cc38f
Medical tweaks
2017-01-23 23:43:44 -06:00
Anewbe
10248f7677
Syringe code cleanup
2017-01-22 23:11:54 -06:00
Anewbe
d53cfc4773
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into theUnboxingBegins
...
# Conflicts:
# code/modules/mob/new_player/sprite_accessories.dm
# code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
# icons/mob/human_face.dmi
# icons/mob/suit.dmi
2017-01-17 22:05:38 -06:00
Anewbe
9cbee4baf4
Ports taste
2017-01-16 17:07:41 -06:00
Anewbe
a379aa2779
Merge pull request #2911 from Anewbe/taj_chems
...
Applies various chem changes to Tajaran
2017-01-15 18:16:34 -05:00
Anewbe
d14096148a
Adjusts removed, rather than strength for Taj things
2017-01-14 15:20:50 -06:00
MagmaRam
1351e5b013
Merge pull request #2890 from Anewbe/chem_spills
...
Fixes phoron/fuel spills not affecting the spilled-upon mob
2017-01-14 14:39:08 -06:00
Anewbe
397f812451
Corrects an error in the previous commit
2017-01-11 17:26:52 -06:00
Anewbe
4f70a0e942
Applies various chem changes to Tajaran
2017-01-11 17:09:35 -06:00
Anewbe
2c86a0a465
Returns the Vox, who now breath Phoron
2017-01-06 17:49:39 -06:00
Anewbe
5f1a99edfc
Removes the last bit of Taj coffee poisoning
2017-01-03 14:28:18 -06:00
Anewbe
426bb55bfc
Chems with touch_turf should now also do the proper touch_mob and affect_touch
2017-01-01 21:32:00 -06:00
Anewbe
24fcd2523b
Farmbots can be constructed again
2016-12-31 17:16:34 -06:00
MagmaRam
4d8c2aaa3e
hurf durf dumb html mistake
2016-12-17 10:25:59 -06:00
MagmaRam
52f3ee7e19
Labels for beakers can now be longer, and are in the description, too.
2016-12-17 09:47:05 -06:00
ForFoxSake
716c89b8cd
Fixes water-cooler runtime.
2016-12-06 22:38:52 +00:00
Anewbe
1c7b32787b
Skrell chem changes
2016-11-27 19:18:02 -06:00
MagmaRam
3f57783bf3
People will now process reagents when dead.
...
Most reagents are still skipped, but blood is, importantly, not.
This needs to be discussed further.
2016-11-24 00:31:20 -06:00
MagmaRam
4c533c0a74
Merge pull request #2745 from Anewbe/stimm
...
Adds Stimm, a homemade hyperzine; makes hyperzine toxic
2016-11-21 12:34:38 -06:00
Anewbe
c59f2a9711
Fixes the double use bug
2016-11-19 23:02:40 -06:00
Anewbe
6530f098d4
No timer on self
2016-11-19 16:41:26 -06:00
Anewbe
8e9416d03e
Drawing blood takes time
2016-11-19 14:31:57 -06:00
Anewbe
5e3bf04e35
Lowers the downsides to hyper, changes them for stimm, makes fuel more lethal
2016-11-16 22:18:00 -06:00
Nerezza
e1fcdabdf9
Renames the bar's milk carton
...
It's larger than normal, so it's a large milk carton.
2016-11-16 17:37:07 -06:00
Nerezza
bdb1096a6b
More lemons, plus milk!
...
Adds lemon juice and milk to booze-o-mat (not soda fountain) and adds lemon juice cartridges to appropriate Cargo lists.
2016-11-16 16:47:16 -06:00
Nerezza
1d66540460
Adds lemon juice to dispensers.
...
Also adds lemon juice cartridges to cargo's crate.
2016-11-15 12:00:30 -06:00
Anewbe
1778f562d4
Adds Stimm, a homemade hyperzine; makes hyperzine toxic
2016-11-14 20:49:36 -06:00
Anewbe
006197dbc6
Merge pull request #2603 from Yoshax/minorbugfixboogalo
...
Some bugfixes
2016-10-06 22:38:32 -05:00
Yoshax
8c02e93b03
Fixes #2587
2016-10-07 03:58:16 +01:00
Spades
2330968176
Replaces Station Administrator
2016-10-06 22:38:02 -04:00
Neerti
fd62cbe006
Merge pull request #2560 from Anewbe/alien_metabolism
...
Adds code to make species level metabolism rates possible.
2016-10-03 18:10:25 -04:00
Neerti
2ddaf04226
More Circuit Ports by Psi
...
Adds ability to have pins initialize with data.
Adds helper for reagent moving.
Other fixes.
2016-09-29 23:49:34 -04:00
Anewbe
9b57ecbe82
Adds code to make species level metabolism changes possible.
2016-09-28 16:16:31 -05:00
Neerti
828dacf485
Centralizes weight class definitions
...
A lot of new defines are now in inventory_sizes.dm, which contains;
All the size identifiers (the thing that tells the game if something is bulky, or w/e).
Storage costs for all the sizes, which are exponents of two, as previously.
A few constants for inventory size.
Also changes all storage item's capacity definitions by basing it off of how many 'normal slots' exist for it. This allows one to change the definition for all of the defines in the file, and everything will follow along without needing to change 500 files. In testing, I made all ITEMSIZE_COST_* defines doubled, and nothing had broke.
The benefit of doing all of this is that it makes adding new weight classes in the future much simpler, and makes knowing how much space a container has easier, as seeing ITEMSIZE_COST_NORMAL * 7 means it can hold seven normal items.
2016-09-22 00:51:51 -04:00
Anewbe
3941918b35
Water > Fire
2016-09-12 16:11:21 -05:00
Anewbe
9c9697882c
Speeds Hyperzine metabolism
2016-08-31 21:08:42 -05:00
SinTwo
a2a2f58e93
Fixes #2352
2016-08-27 13:44:32 -04:00
woodratt
28dfa328fe
Tea Tweaks
...
- Minor changes to the color of some of the drinks such as tea and iced tea. Still not happy with the colors, but they seem better than before.
- Modification to the British cup sprite.
- Addition of a tea sprite for the coffee cups.
2016-08-24 15:02:48 -07:00
Hubblenaut
10391e5f3b
Bottles will now sell for their set prices.
2016-08-15 15:32:28 +02:00
Neerti
1a27f41076
Merge pull request #2282 from Yoshax/low-end-combat
...
Item force tweaks
2016-08-08 07:24:24 -04:00
EmperorJon
8110fbbf3c
Merge pull request #2232 from SinTwo/scheduler
...
510 scheduler
2016-08-08 10:36:36 +01:00
