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
2393380711
grenades now add up the temperature of contained beakers when mixing
2015-02-04 18:59:18 -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
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
e0f492c104
un-hardcodes loss per tick
2015-02-02 21:20:00 -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
f4cd2cd4af
fixes ert access
2015-02-02 06:22:07 -08:00
18a90495b2
updates to ERT stuff
2015-02-02 03:33:37 -08:00
55bdca20da
Merge branch 'master' of https://github.com/tgstation/-tg-station into gunstuff
2015-02-01 18:22:02 -08:00
f8bb02d54a
Merge pull request #7422 from Steelpoint/ERTBalance2
...
ERT Balance Pass 2 | ERT Access and Foam
2015-02-01 20:16:04 -06:00
c48bf44a47
framework for a future "suicide hotline" job
2015-02-01 19:44:54 -05:00
a9c181bbcc
Repath all non jetpack tank types to tank/internals
...
Repath all portable tanks to tank/internals, except jetpacks
Update ministation
2015-02-01 18:25:39 +00:00
1ce5722eac
map conflicts and other changes
2015-01-31 23:14:12 -08:00
a661e58281
Merge branch 'master' of https://github.com/tgstation/-tg-station into ointmentandshit
...
Conflicts:
_maps/map_files/TgStation/tgstation.2.1.3.dmm
2015-01-31 22:03:00 -08:00
35eea8841c
adds baton charge loss
2015-01-31 18:18:24 -08:00
453a3db196
etc
2015-01-30 23:18:02 -08:00
d47f6334c3
fixes dufflebag max weight class
2015-01-29 16:05:33 -05:00
3bb7213d14
Merge pull request #7346 from paprka/hoodshit
...
New hood/hardsuit helmet system
2015-01-29 18:57:25 +01:00
18fe642fcc
ERTBalanceV2
2015-01-29 19:03:07 +08:00
9bece71e1d
adds a simple overlay system for belts
2015-01-28 20:27:44 -08:00
46f588b424
Merge pull request #7334 from Xhuis/portable_console_in_belt
...
Lets you store handheld crew monitors in medical belts
2015-01-28 09:41:04 -06:00
1c81aa37a9
Merge pull request #7330 from Menshin/variables_clusterbangs
...
Ported the variable payload clusterbangs from sayustation
2015-01-28 09:25:50 -06:00
b830f77ea2
Merge branch 'master' of https://github.com/tgstation/-tg-station into hoodshit
...
Conflicts:
icons/mob/head.dmi
icons/obj/clothing/hats.dmi
2015-01-26 15:37:33 -08:00
c43092efa9
Merge branch 'master' of https://github.com/tgstation/-tg-station into ointmentandshit
2015-01-25 21:56:39 -08:00
f7730eeaef
Merge pull request #7087 from paprka/readdjanikart
...
Improves janicart and adds secway
2015-01-26 00:31:30 +00:00
a5a9e297d4
new hood system
2015-01-25 00:22:52 -08:00
87dc5bafdd
Fixes error
2015-01-24 17:00:56 -05:00
266acdaac5
Lets you store handheld monitors on medbelts
2015-01-24 16:48:27 -05:00
882b05f287
0-day fixes
2015-01-24 16:52:01 +01:00
50e927ea33
Merge pull request #7314 from paprka/holster
...
fixes holster weight class
2015-01-24 16:48:05 +01:00
8f10dea61a
Ported the variable payload clusterbangs from sayustation.
2015-01-24 16:36:30 +01:00
279c2709d4
Merge branch 'master' of https://github.com/tgstation/-tg-station into readdjanikart
...
Conflicts:
_maps/map_files/TgStation/tgstation.2.1.3.dmm
2015-01-24 01:40:51 -08:00
8dfaed5fe4
Merge pull request #6871 from fleure/syndiebux
...
Adds briefcase with cash to uplink
2015-01-23 22:24:50 -06:00
3d9cf1dc81
Merge pull request #7242 from drynwyn/PAYDAY
...
Payday Guns Bundle (Adds gloves, clown mask, suit to the guns syndicate bundle)
2015-01-23 21:52:46 -06:00
1428a5a16d
Merge pull request #7290 from Iamgoofball/goonchem_shoehorn_backup
...
Fixes the font issues, removes 3 mutations R.I.P
2015-01-23 21:39:42 -06:00
30348d8cdd
Merge branch 'master' of https://github.com/tgstation/-tg-station into holster
...
Conflicts:
code/game/objects/items/weapons/storage/belt.dm
2015-01-23 16:48:30 -08:00
f487b70b65
fixes holster weight class
2015-01-23 16:47:00 -08:00
6094240b5a
Merge pull request #7246 from dannno/dufflebags
...
Fannypacks and Dufflebags
2015-01-23 20:06:26 +01:00
10ea66cb6b
Merge pull request #7164 from Steelpoint/ERTBalanceV1
...
[BALANCE|FIX]ERT Balance Pass: 1 + Minor Ops Ship Fix
2015-01-23 17:16:33 +01:00
9fd1c313d0
resolve conflicts
2015-01-23 01:36:58 -05:00
paprka
phil235
Swag McYolosteinen
Iamgoofball
Menshin
Cheridan
dannno
xxalpha
Steelpoint
Remie Richards
Xhuis
Menshin