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
Yoshax
730fceb2d7
Makes Datraen happy
2016-06-09 17:23:43 +01:00
Yoshax
52f8c6a344
Ensures retail scanners work with drinks
2016-06-09 17:08:07 +01:00
GinjaNinja32
72e32eeed9
Fixes, change underlay icons to fit with glass icon style
2016-06-07 17:41:25 +01:00
Yoshax
3211ca961b
Makes coffee cups somewhat work
2016-06-07 16:35:29 +01:00
GinjaNinja32
debfd3dabf
Ports GinjaNinja32's drinks rewrite from Bay
2016-06-06 20:33:11 +01:00
Yoshax
0fb98bbabd
Scheduler now uses btime, and other improvements
2016-06-01 17:56:07 +01:00
Yoshax
722c099847
Merge pull request #1788 from Datraen/Xenobio2_Tweaks
...
Xenobio2 tweaks
2016-05-29 03:56:39 +01:00
Datraen
1e6ecb0c88
Xenobio2 Tweaks
...
Adds nameVar to products, sets it to products/xenos when they are created from the proper machinery.
Adds the manual injector to the machinery that can take beakers, preventing them from spilling onto the machine when inserted.
Tweaks the NanoUI to properly display percent mutated, adds a proper check to see if it is not a xeno occupant.
2016-05-28 20:06:51 -04:00
