66720a5ce9
Merge pull request #7834 from Menshin/telexploit_fix
...
Deactivates the Hidden Syndicate Teleportation Device
2015-02-19 16:39:49 +01:00
0d0ef9e02a
Deactivates the Hidden Syndicate Teleportation Device
2015-02-19 16:34:49 +01:00
da4f8e74d8
Merge pull request #7733 from Cheridan/reagent_foam
...
Reagent Foam
2015-02-18 21:43:50 -08:00
7905cc618d
Merge pull request #7773 from phil235/HoloSignFix
...
Fixes the holosign projector sign count not increasing after destroying old signs.
2015-02-18 12:59:50 -08:00
cf3f03c039
Merge pull request #7479 from paprka/batonshit
...
Makes batons slowly lose charge when left on
2015-02-18 21:49:25 +01:00
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
67f4cc75d9
Fixes the holosign projector not increasing after destroying old signs.
2015-02-16 22:57:06 +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
743af3a5b2
processing |=
2015-02-14 19:43:27 -08: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
24cef3c30a
fixes baton looping
2015-02-14 12:41:37 -08:00
85ec168881
Foam spreading now respects type.
2015-02-14 13:32:32 -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
69b856f373
Saving before I ruin everything
...
Lightning works too
Cleans up old shit from Chemistry-Recipes.dm
2015-02-14 11:46:20 -06:00
e5cecc41a6
Merge branch 'master' of https://github.com/tgstation/-tg-station into reagent_foam
2015-02-14 10:50:53 -06: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
46d21ae2c2
robots lose power from their cell for leaving their baton active
2015-02-13 17:48:58 -08: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
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
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
phil235
Menshin
hornygranny
Cheridan
phil235
Incoming
paprka
Remie Richards
Swag McYolosteinen
GunHog
xxalpha
Kraseo
Menshin