34ced43f45
Explosions throw items, items can embed in limbs, embedded items cause damage, embedded items can fall out, surgery for embedded item removal, ninja throwing stars!
2015-02-13 12:59:02 +00:00
897618d42f
Fixed some recipes in chef recipes book. Fixed jelly sandwich recipes. Remove unused milk/soymilk carton sprites from drinks.dmi
2015-02-12 21:39:20 +01:00
216630f1db
Merge pull request #7572 from phil235/CookingOverhaul
...
Cooking overhaul
2015-02-12 08:01:17 -06:00
6613851028
Merge pull request #7593 from Cheridan/pin_fix
...
Pin fixes, additions
2015-02-12 06:43:11 +00:00
549b71a487
Merge branch 'master' of https://github.com/tgstation/-tg-station into CookingOverhaul
...
Conflicts:
icons/obj/drinks.dmi
Fixing a couple typos. Making sure all eggs used in tablecraft recipes are boiled
2015-02-11 16:13:04 +01:00
ee75ba2acd
Merge pull request #7639 from GunHog/RollyPollyBorgies
...
Adds movement states for some cyborgs + overlay for miner jetpack
2015-02-11 09:02:09 -06:00
65e8a4ce31
Merge pull request #7624 from paprka/defibfuckupv2
...
Defib changes
2015-02-11 08:37:28 -06:00
575b117a70
Merge branch 'master' of https://github.com/tgstation/-tg-station into drugs
...
Conflicts:
icons/obj/drinks.dmi
2015-02-10 21:37:49 -08:00
cfacd3bf9f
Merge pull request #7589 from Menshin/reagents_warnings_fix
...
Fixes warnings related to add_reagent
2015-02-10 17:55:32 +01:00
147b2fc28a
Merge pull request #7578 from Deantwo/BoomBoomBoom
...
Fixes stock grenades
2015-02-10 17:47:29 +01:00
6542a0b706
Merge pull request #7620 from xxalpha/briefcasescam
...
Fix syndicate briefcase not having cash.
2015-02-10 17:42:15 +01:00
da326b30d3
Merge pull request #7553 from Menshin/yet_another_atmos_fix_bundle
...
Yet Another Atmos Fixes Bundle
2015-02-10 17:41:56 +01:00
8465c965c0
Adds movement states for some cyborgs
...
Mining and Mediborgs get new movement states.
Janiborg scubbers will only move when the borg does.
Made mining borg jetpack an overlay.
2015-02-10 00:44:38 -06:00
75b9f815d3
Merge branch 'master' of https://github.com/tgstation/-tg-station into drugs
...
Conflicts:
code/game/machinery/vending.dm
2015-02-09 15:41:29 -08:00
e1412250da
Merge pull request #7601 from Menshin/rods_icon_fix
...
Fixes icon updating for rods
2015-02-09 20:06:01 +01:00
8150750a4d
removes unnecessary else if(
2015-02-09 10:29:59 -08:00
1b24461841
Fix syndicate briefcase not having cash.
...
Fix returns, fix everything.
2015-02-09 18:06:20 +00:00
89bbb80d1c
small change
2015-02-08 17:09:31 -08:00
3e61bba236
defib changes
2015-02-08 17:06:34 -08:00
424dd37782
hard-light holotape
2015-02-08 07:29:10 -08:00
0864e4a8dc
Merge branch 'master' of https://github.com/tgstation/-tg-station into drugs
...
Conflicts:
code/modules/reagents/Chemistry-Goon-Medicine.dm
code/modules/reagents/reagent_containers/pill.dm
icons/obj/drinks.dmi
2015-02-07 15:46:12 -08:00
eea438c42d
Literal shitton of changes
2015-02-07 15:37:55 -08:00
5610b46a0f
Merge pull request #7528 from paprka/clothessec
...
Some clothing changes
2015-02-07 17:00:36 -06:00
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
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
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
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
2edcbc5a08
Merge pull request #7526 from TheVekter/redbutton
...
Adds red button toy to arcade machines
2015-02-04 12:17:24 +03: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
0645d46168
iv drip hotfixes
2015-02-03 18:34:32 -08:00
a480ffbc98
whole lotta bugfixes
2015-02-03 17:57:57 -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
de0175bfee
Blargh removed commented code I'm fuckin' tired
2015-02-03 08:37:48 -06:00
Remie Richards
phil235
Cheridan
phil235
Iamgoofball
Swag McYolosteinen
GunHog
paprka
xxalpha
Menshin
Cheridan
Deantwo
Steelpoint
Razharas
TheVekter