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
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
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
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
fdb9c92736
Merge pull request #7494 from paprka/dirsigns
...
Adds directional signs from bay
2015-02-05 16:28:26 -06: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
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
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
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
Cheridan
Swag McYolosteinen
GunHog
phil235
xxalpha
paprka
Kraseo
Menshin
Deantwo
Steelpoint
Iamgoofball
Razharas
TZK13
TheVekter
hornygranny
dannno