47ec0bbca7
Fixes icon updating for rods
2015-02-07 22:48:10 +01:00
35fb458293
Merge branch 'master' of https://github.com/tgstation/-tg-station into CookingOverhaul
...
Conflicts:
code/modules/food&drinks/food/snacks_other.dm
icons/obj/drinks.dmi
2015-02-07 20:22:49 +01:00
f6b0f57e89
last fixes I hope:
...
tiny change to latexballoon (b/c I reorganized is_sharp proc already, so why not)
some fixes suggested by razharas in table.dm
Renamed microwave to microwave oven. Adding efficiency effect (upgrading the machine)
Adding rolling pins to the kitchen vending machine (so the two cooks don't fight.
2015-02-07 20:10:11 +01:00
6d3584fa63
Pin Fixes
...
Implant pins now require the actual specific implant instead of allowing any implant at all.
2015-02-07 09:43:03 -06:00
e154d69b0b
* Fixes warnings related to add_reagent when trying to inject blood containing reagents
...
* Fixes sleepers showing reagent id instead of name
* Some formatting adjustments to the mass spectrometer output
* Make the "Saline-Glucose Solution" name fit in one line.
2015-02-07 16:32:25 +01:00
63456ef622
Many fixes. Adding custom pizza slices. Reducing amount of icons used. Adding a changelog.
2015-02-07 03:10:32 +01:00
4a50eb5a50
Fixes stock acid grenade
...
- A beaker can only hold 50 units, filling it with 100 "facid" first
capped it at 50 and prevented adding "potassium".
- On a side note, this grenades instantly kill anyone standing near it
when it goes off.
2015-02-06 13:57:57 +01:00
2c279736c1
Fixes naming of stock grenades
...
- Changed stage_change to set stage to current stage if no argument is
set.
- Removed a few spaces from my old code.
- Had to remove Large Grenade Casing's custom desc.
2015-02-06 13:11:23 +01:00
ea3bb2e80b
Merge branch 'master' of https://github.com/tgstation/-tg-station into SecBorgDisabler
...
Conflicts:
code/modules/research/designs/mechfabricator_designs.dm
2015-02-06 13:19:15 +08:00
f6d7823fc2
Adds muriatic, caustic, and hydrochloride to maint loot
2015-02-05 18:57:58 -08:00
c527491f41
Merge branch 'master' of https://github.com/tgstation/-tg-station into clothessec
...
Conflicts:
icons/mob/uniform.dmi
icons/obj/clothing/uniforms.dmi
2015-02-05 17:44:22 -08:00
2ef8848c74
adds ability to store ammo and any type of revolver in holster
2015-02-05 17:41:10 -08:00
eadf32312e
Yet more fixes.
2015-02-06 01:15:58 +01:00
fdb9c92736
Merge pull request #7494 from paprka/dirsigns
...
Adds directional signs from bay
2015-02-05 16:28:26 -06:00
e4464b3b9f
Merge branch 'master' of https://github.com/tgstation/-tg-station into CookingOverhaul
2015-02-05 22:35:00 +01:00
a296e8f6a1
Updating the cook book. Finishing giving filling color to growns. More fixes
2015-02-05 22:34:11 +01:00
6fab02e7cd
Merge pull request #7546 from TZK13/Purple-Shorts
...
Adds purple shorts
2015-02-05 18:16:14 +01:00
574fc61c83
Merge pull request #7543 from TZK13/Work-Boots
...
Adds work boots for engineers
2015-02-05 18:15:28 +01:00
ac60a828f9
Merge pull request #7536 from Iamgoofball/chemblob
...
fixes my shit
2015-02-05 18:04:54 +01:00
faba71fcca
Cooking overhaul: adding tablecraft food recipes, customizable food, food ingredients (from bay)
...
- converted the microwave recipes to tablecraft recipes
- Added customizable food (thanks iamgoofball)
- added food ingredients (from baystation)
- changing food recipes a bit (replacing stuff with the new food ingredients)
- repurpose the microwave to actually cook certain food items.
- bowl is no longer trash but a reagent_containers/glass that is used in salad/soup recipes
- Changed the hunger system a bit, sugar becomes a normal reagent again. Adding a junkiness var to foods to drain mob satiety.
- milk carton is now a condiment bottle
- slight buff to vitamin
2015-02-05 16:48:25 +01:00
2393380711
grenades now add up the temperature of contained beakers when mixing
2015-02-04 18:59:18 -08:00
6299c546ab
fixes a runtime related to stacks
2015-02-04 18:05:45 -08:00
a1a8555a45
* Fixes the air stored inside atmos machinery not updating on construction
...
* Fixes filters and mixers switching off on icon update
* Fixes the RPD not properly setting the flipped variable for flipped mixers/filters
* Fixes using the atmos analyzer on a pipe making you attack it
2015-02-04 21:56:07 +01:00
2b195c1f2d
Merge pull request #7512 from paprka/rodslel
...
Rods now change sprite depending on how much in the stack
2015-02-04 13:03:16 +01:00
cd9a08e684
Merge branch 'master' of https://github.com/tgstation/-tg-station into HoSGun
...
Conflicts:
code/modules/projectiles/ammunition/energy.dm
icons/mob/inhands/guns_lefthand.dmi
icons/mob/inhands/guns_righthand.dmi
icons/obj/guns/energy.dmi
2015-02-04 18:36:50 +08:00
2edcbc5a08
Merge pull request #7526 from TheVekter/redbutton
...
Adds red button toy to arcade machines
2015-02-04 12:17:24 +03:00
01bf5b343f
Adds purple shorts.
2015-02-04 01:23:58 -06:00
8400ec9800
Adds work boots and fixes character setup previews.
2015-02-04 00:32:15 -06:00
6648390bf5
Merge branch 'master' of https://github.com/tgstation/-tg-station into rodslel
...
Conflicts:
icons/obj/items.dmi
2015-02-03 22:24:00 -08:00
495ae29ab8
helmet, armor, and corgi changes
2015-02-03 19:12:38 -08:00
0645d46168
iv drip hotfixes
2015-02-03 18:34:32 -08:00
a480ffbc98
whole lotta bugfixes
2015-02-03 17:57:57 -08:00
11463998e6
Merge branch 'master' of https://github.com/tgstation/-tg-station into dirsigns
2015-02-03 14:56:23 -08:00
5f884b6017
Merge pull request #7496 from dannno/killyoselfmyman
...
Adds proper suicide messages to like a lot of stuff
2015-02-03 16:43:09 -06:00
80913f143b
Merge pull request #7239 from paprka/ointmentandshit
...
BLOOD FOR THE BLOOD GOD
2015-02-03 16:30:42 -06:00
784766e8cc
Merge pull request #7509 from paprka/gunstuff
...
Improves pulse guns, ERT, and centcomm areas
2015-02-03 16:14:48 -06:00
890b3800e6
some clothing changes
2015-02-03 09:00:51 -08:00
de0175bfee
Blargh removed commented code I'm fuckin' tired
2015-02-03 08:37:48 -06:00
9bf58de009
Added red button
2015-02-03 08:25:50 -06:00
e0f492c104
un-hardcodes loss per tick
2015-02-02 21:20:00 -08:00
bbfad5b137
Merge pull request #7488 from paprka/memetiersprioite
...
fixes janicart
2015-02-02 19:37:28 -08:00
6de33d4063
Merge branch 'master' of https://github.com/tgstation/-tg-station into gunstuff
...
Conflicts:
_maps/map_files/generic/z2.dmm
2015-02-02 19:13:49 -08:00
d8823a8038
Merge branch 'master' of https://github.com/tgstation/-tg-station into killyoselfmyman
2015-02-02 19:30:24 -05:00
c18f485b17
fix shit, make bible suicide sacrifice you to your deity
2015-02-02 15:13:17 -05:00
9bddcb3df4
Merge pull request #7492 from xxalpha/spacesuit_storage
...
Repath all non jetpack tank types to tank/internals
2015-02-02 18:52:51 +01:00
f4cd2cd4af
fixes ert access
2015-02-02 06:22:07 -08:00
18a90495b2
updates to ERT stuff
2015-02-02 03:33:37 -08:00
50e152f402
rods
2015-02-02 00:20:22 -08:00
a5dcd1abd8
improves ert spawning and centcomm
2015-02-01 21:16:11 -08:00
55bdca20da
Merge branch 'master' of https://github.com/tgstation/-tg-station into gunstuff
2015-02-01 18:22:02 -08:00
Menshin
phil235
Cheridan
Deantwo
Steelpoint
Iamgoofball
paprka
Cheridan
Swag McYolosteinen
Razharas
TZK13
TheVekter
hornygranny
dannno