24cef3c30a
fixes baton looping
2015-02-14 12:41:37 -08:00
2284954409
Increase the range of t-ray scanner pulse.
2015-02-14 19:45:08 +00:00
85ec168881
Foam spreading now respects type.
2015-02-14 13:32:32 -06:00
28d1e9bad2
Several additions and new sprites.
...
Reverts glasses.dm
2015-02-14 19:24:41 +00: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
c119fede36
sponsored by DaZe
2015-02-13 23:40:43 -08:00
85675e92b8
my good judgement gets the better of me
2015-02-13 21:50:00 -08:00
88760896ad
initial commit
2015-02-13 20:59:39 -08:00
99cab4ddcb
Changes
2015-02-13 18:05:03 -08:00
46d21ae2c2
robots lose power from their cell for leaving their baton active
2015-02-13 17:48:58 -08:00
d519de5018
Added embedded items to self examining. Allows embedded items to be removed from yourself via links in self examining, this hurts. Adds can_embed(). Reworks help_shake_act().
2015-02-14 01:31:40 +00:00
c66327318d
adds megaphones
2015-02-13 15:07:15 -08:00
5028067061
Remove unwanted cyka.
2015-02-13 20:35:09 +00:00
26ecb9cc96
Adds new graffiti: cyka, prolizard, antilizard.
2015-02-13 20:29:52 +00:00
9bd3c1d8a6
Fix tracking implant description when inserted inside implant pad.
2015-02-13 20:09:48 +01:00
54040d9867
stun changes and stun revolver
2015-02-13 09:26:31 -08:00
ab754b6182
Corrects all spellings of Embedds --> Embeds
2015-02-13 13:15:20 +00:00
154a94105d
Minor cleanup + Committing the surgery
2015-02-13 13:08:45 +00:00
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
940601bcfa
Merge branch 'master' of https://github.com/tgstation/-tg-station into HoSGun
...
Conflicts:
icons/obj/guns/energy.dmi
2015-02-13 01:14:52 +08: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
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
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
paprka
xxalpha
Cheridan
Incoming
phil235
Iamgoofball
Remie Richards
phil235
Steelpoint
Swag McYolosteinen
GunHog
Kraseo