116143006e
Merge pull request #7746 from Incoming5643/BuyOneGetOneFreePets
...
Fixes the horrible injustice of getting too many pets
2015-02-18 09:38:24 -06:00
6ebd5976f5
Merge pull request #7729 from Incoming5643/mediborg_gauze
...
Mediborg Improvement Drive: The man in gauze
2015-02-17 18:17:59 +01:00
15439b8c4e
Merge branch 'ObjProcessingFix' of git://github.com/phil235/-tg-station into phil235-ObjProcessingFix
...
Conflicts:
code/game/gamemodes/wizard/artefact.dm
2015-02-15 10:27:50 -06:00
136b3ed67b
Fixes the horrible injustice of getting too many pets
2015-02-14 23:54:20 -05:00
76f101de63
Merge pull request #7614 from paprka/preffer
...
Hard-light hazard holotape
2015-02-14 21:59:14 -06:00
bcd76fc64c
fixes redundant passglass
2015-02-14 15:15:22 -08:00
7f56edaa30
compile fix
2015-02-14 15:00:54 -08:00
03e93a43b7
wazer tape
2015-02-14 15:00:02 -08:00
6263436bbb
holotaeb
2015-02-14 14:49:04 -08:00
5e0e4828bd
Merge pull request #7706 from phil235/TrackImplantFix
...
Fix tracking implant description when inserted inside implant pad.
2015-02-14 15:57:16 -06:00
2885470c50
Adds gauze to Mediborgs, it can be regenerated in chargers much the same as the engiborgs materials
2015-02-14 13:45:23 -05:00
135293bedf
Fixes object processing list by replacing "SSobj.processing.Add" by "SSobj.processing |= " to avoid having duplicated objects in the list, meaning the objects would be processed more than once per iteration.
...
Fixes Alien embryo processing that was processed twice.
2015-02-14 14:18:49 +01:00
9bd3c1d8a6
Fix tracking implant description when inserted inside implant pad.
2015-02-13 20:09:48 +01: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
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
3afdaabbb2
Merge pull request #7613 from Kraseo/080215
...
A few bug fixes
2015-02-09 20:35:43 +01:00
e1412250da
Merge pull request #7601 from Menshin/rods_icon_fix
...
Fixes icon updating for rods
2015-02-09 20:06:01 +01: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
91c1a54abd
closes the open()
2015-02-08 23:33:33 +01:00
732a54fe63
Making all meat subtypes of snacks/meat
...
Adding specific cutlets and raw cutlets for a lot of types of meat.
Enabling reagent transfer from ingredients to resulting dish for foodtablecrafting
Adjusting tablecraft food recipes reagents accordingly.
Adding raw pastry base and pastry base food and including it into certain recipes.
2015-02-08 21:36:54 +01:00
424dd37782
hard-light holotape
2015-02-08 07:29:10 -08:00
4e18859e7b
fixes lockers/bodybags/etc. shielding you from explosions. whoops!
2015-02-08 15:13:04 +01:00
08e7911f57
fixes a bunch of bugs
2015-02-08 13:27:55 +01: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
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
Cheridan
phil235
Incoming
paprka
phil235
Remie Richards
Swag McYolosteinen
GunHog
xxalpha
Kraseo
Menshin
Cheridan
Deantwo
Steelpoint