Commit Graph

1281 Commits

Author SHA1 Message Date
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
Yoshax
a3b1363b2c Adds new non-alcoholic drinks 2016-07-07 21:51:30 +01:00
Mloc
7377f57e5d adds bun-bun, a bread monkey made with two burger buns
Signed-off-by: Mloc <colmohici@gmail.com>
2016-07-05 18:19:05 +01:00
SinTwo
386ceb2bc5 makes water-cooler bottles attainable through in-game means 2016-07-04 18:17:53 -04:00
Datraen
684fb4e23d Fixes runtimes resulting in chem masters not filling bottles when sprite is never changed. 2016-07-01 12:51:10 -04:00
SinTwo
c7db22b985 water cooler fixes 2016-06-29 16:36:43 -04:00
Datraen
a10f525638 Adds compatability with cooking code 2016-06-29 15:40:34 -04:00
Datraen
c7693e0eab Corrects ChemMaster Bottle Sprites. 2016-06-27 14:28:29 -04:00
SinTwo
2642bc1628 changelog and chemmaster fix 2016-06-23 15:01:17 -04:00
SinTwo
244fb40de8 Fixes part 1 2016-06-20 23:32:18 -04:00
SinTwo
8ecc72412d minor fixes and icon adjustment 2016-06-19 23:30:46 -04:00
SinTwo
da38eca686 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into featureattack 2016-06-19 22:28:31 -04:00
SinTwo
86e500d25c Adds floor lamp, benches, new tank sprites, and cup dispenser on water coolers. 2016-06-19 22:28:01 -04:00
Richard D'angelo
7ab5220f64 510 Improved Overlays
Fixes auto blindness and no click on 510 servers, lessens the lag of
mesons and material scanners, and I suspect the general speed as well.

I only made it work for Polaris (and by extention, to our server, Eros),
and adapted it a bit.

Ported from:

7c2cc890ab
2016-06-18 15:50:10 -03:00
HarpyEagle
58b87f1a4b Adds do_surgery() behaviour for various items
Heath scanners, autopsy scanners, syringes, hyposprays, droppers and bottles.
2016-06-17 19:06:56 +01:00
Yoshax
3e0745677f Fixes chocolate milk and milk 2016-06-13 20:20:07 +01:00