Commit Graph

1296 Commits

Author SHA1 Message Date
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
Yoshax
058b6f1aa3 Further weapon force tweaks 2016-08-07 15:00:25 +01:00
Yoshax
60c4fb436c no message 2016-08-07 01:39:55 +01:00
Yoshax
403c9adcdb Low/er end combat force adjustments 2016-08-07 01:31:45 +01:00
SinTwo
4f7ea573c1 world time fix 2016-07-30 03:19:47 -04:00
Anewbe
a9b093bcec Sprays now respect blocking 2016-07-30 02:16:25 -05:00
Yoshax
f90f2ec08a Fixes some items on working on people on tables 2016-07-26 03:10:54 +01:00
Anewbe
612a6f8328 Merge pull request #2149 from SinTwo/item_state
Item State Cleanup
2016-07-23 15:53:36 -05:00
Yoshax
baa25044c3 Ensures drinking glasses have a cost in the autolathe 2016-07-23 20:15:22 +01:00
SinTwo
4bff201f8b Merge branch 'master' of https://github.com/PolarisSS13/Polaris into item_state
Conflicts:
	code/game/objects/items/devices/telecrystal.dm
	icons/mob/suit.dmi
	icons/obj/clothing/suits.dmi
2016-07-22 23:39:19 -04:00
Yoshax
b2a704904c Removes adverse effects to Tajaran drinking coffee 2016-07-22 18:07:08 +01:00
SinTwo
c1bd0aa6b4 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into item_state
Conflicts:
	code/modules/clothing/clothing.dm
2016-07-19 17:37:14 -04:00
Neerti
ba33340ce0 Merge pull request #2099 from Anewbe/tricord_nerf
Halves the effect of Tricordrazine
2016-07-15 07:07:14 -04:00
SinTwo
976847a0b4 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into item_state
Conflicts:
	code/modules/clothing/head/jobs.dm
	icons/mob/items/lefthand.dmi
	icons/mob/items/righthand.dmi
	icons/mob/suit.dmi
	icons/mob/uniform.dmi
	icons/obj/items.dmi
2016-07-13 17:07:52 -04:00
Anewbe
52a7c0d797 Speeds up toxin 2016-07-11 22:04:15 -05:00
SinTwo
7192bf08fd item_state cleanup 2016-07-11 22:31:32 -04:00
mwerezak
108a748d1f Fixes pepperspray making sounds even when the safety is on 2016-07-11 04:54:40 +01:00
Anewbe
3ac6d351ff Halves the effect of Tricordrazine 2016-07-10 21:45:16 -05:00
Neerti
61e291a083 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 12/16/2015_newwizard 2016-07-08 21:00:12 -04:00
Neerti
8a61641479 Some more work + prep for drydocking. 2016-07-08 20:38:34 -04:00
EmperorJon
5b3c952be9 Merge pull request #2039 from SinTwo/smallfeatures
Water-Coolers, Floor Lamps, and Benches
2016-07-08 09:54:11 +01:00
SinTwo
5c4c283b80 changelog and span tags 2016-07-07 20:38:46 -04:00