 Swag McYolosteinen
|
15b01a2254
|
Merge pull request #7547 from Menshin/pinpointer_fix
Fixes pinpointer runtimes on qdel
|
2015-02-05 18:05:26 +01:00 |
|
|
Swag McYolosteinen
|
ac60a828f9
|
Merge pull request #7536 from Iamgoofball/chemblob
fixes my shit
|
2015-02-05 18:04:54 +01:00 |
|
 Cheridan
|
2978d1e10a
|
Merge pull request #7552 from paprka/monkeyinject
Fixes syringes with monkeys, virus transfers, and iv drip feedback
|
2015-02-04 23:19:24 -06:00 |
|
 Iamgoofball
|
2393380711
|
grenades now add up the temperature of contained beakers when mixing
|
2015-02-04 18:59:18 -08:00 |
|
|
Iamgoofball
|
ce7c2e13ff
|
Changes Spellbook can't open text
|
2015-02-04 18:55:34 -08:00 |
|
 paprka
|
6299c546ab
|
fixes a runtime related to stacks
|
2015-02-04 18:05:45 -08:00 |
|
|
paprka
|
f6bf89656b
|
fixes syringes with monkeys, virus transfers, and iv drip feedback
|
2015-02-04 12:21:05 -08:00 |
|
 Menshin
|
d8e2171f1b
|
Fixes pinpointer runtimes on qdel.
|
2015-02-04 14:26:19 +01:00 |
|
|
Swag McYolosteinen
|
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 |
|
 Razharas
|
2edcbc5a08
|
Merge pull request #7526 from TheVekter/redbutton
Adds red button toy to arcade machines
|
2015-02-04 12:17:24 +03:00 |
|
|
paprka
|
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 |
|
|
paprka
|
c9b8c55fb5
|
an additional protential fix for iv drips
|
2015-02-03 22:18:38 -08:00 |
|
|
paprka
|
1346abfc65
|
potentially fixes iv runtime
|
2015-02-03 21:47:34 -08:00 |
|
|
Iamgoofball
|
9a1036d43b
|
Fixes #6991
|
2015-02-03 20:26:58 -08:00 |
|
|
paprka
|
0645d46168
|
iv drip hotfixes
|
2015-02-03 18:34:32 -08:00 |
|
|
Iamgoofball
|
a480ffbc98
|
whole lotta bugfixes
|
2015-02-03 17:57:57 -08:00 |
|
|
Cheridan
|
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 |
|
|
Cheridan
|
80913f143b
|
Merge pull request #7239 from paprka/ointmentandshit
BLOOD FOR THE BLOOD GOD
|
2015-02-03 16:30:42 -06:00 |
|
|
Cheridan
|
784766e8cc
|
Merge pull request #7509 from paprka/gunstuff
Improves pulse guns, ERT, and centcomm areas
|
2015-02-03 16:14:48 -06:00 |
|
 TheVekter
|
de0175bfee
|
Blargh removed commented code I'm fuckin' tired
|
2015-02-03 08:37:48 -06:00 |
|
|
TheVekter
|
9bf58de009
|
Added red button
|
2015-02-03 08:25:50 -06:00 |
|
 hornygranny
|
bbfad5b137
|
Merge pull request #7488 from paprka/memetiersprioite
fixes janicart
|
2015-02-02 19:37:28 -08:00 |
|
|
paprka
|
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 |
|
|
hornygranny
|
a1899f4373
|
Merge pull request #7502 from Iamgoofball/chemblob
Fixes #7020
|
2015-02-02 18:34:01 -08:00 |
|
|
Iamgoofball
|
fa7e15d734
|
what is object oriented programming
|
2015-02-02 18:30:24 -08:00 |
|
 dannno
|
d8823a8038
|
Merge branch 'master' of https://github.com/tgstation/-tg-station into killyoselfmyman
|
2015-02-02 19:30:24 -05:00 |
|
|
dannno
|
c18f485b17
|
fix shit, make bible suicide sacrifice you to your deity
|
2015-02-02 15:13:17 -05:00 |
|
|
Swag McYolosteinen
|
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 |
|
|
Swag McYolosteinen
|
7c09c37eea
|
Merge pull request #7505 from Menshin/plating_wire_placing_fix
Fixes being unable to place cables on plating
|
2015-02-02 15:58:20 +01:00 |
|
|
paprka
|
f4cd2cd4af
|
fixes ert access
|
2015-02-02 06:22:07 -08:00 |
|
|
paprka
|
18a90495b2
|
updates to ERT stuff
|
2015-02-02 03:33:37 -08:00 |
|
|
paprka
|
50e152f402
|
rods
|
2015-02-02 00:20:22 -08:00 |
|
|
paprka
|
a5dcd1abd8
|
improves ert spawning and centcomm
|
2015-02-01 21:16:11 -08:00 |
|
|
paprka
|
55bdca20da
|
Merge branch 'master' of https://github.com/tgstation/-tg-station into gunstuff
|
2015-02-01 18:22:02 -08:00 |
|
|
Cheridan
|
f8bb02d54a
|
Merge pull request #7422 from Steelpoint/ERTBalance2
ERT Balance Pass 2 | ERT Access and Foam
|
2015-02-01 20:16:04 -06:00 |
|
|
dannno
|
c48bf44a47
|
framework for a future "suicide hotline" job
|
2015-02-01 19:44:54 -05:00 |
|
|
Menshin
|
4ef1deb1f9
|
Fixes being unable to place cables on plating
|
2015-02-02 01:14:46 +01:00 |
|
|
Iamgoofball
|
1f7ef9b218
|
Fixes #7020
|
2015-02-01 13:58:07 -08:00 |
|
 xxalpha
|
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 |
|
|
Swag McYolosteinen
|
d03ef74ebc
|
Merge pull request #7430 from Menshin/shuttle_underlays_fix
Shuttle related fixes
|
2015-02-01 12:46:46 +01:00 |
|
|
paprka
|
77dabb02fe
|
fixes janicart
|
2015-02-01 03:09:09 -08:00 |
|
|
paprka
|
d6dce069f4
|
finally actually fixes the blood decals
|
2015-02-01 00:29:37 -08:00 |
|
|
paprka
|
0b64a23310
|
fixes blood drips
|
2015-01-31 23:40:27 -08:00 |
|
|
paprka
|
ce65ad8c62
|
fixes some gauze inconsistencies
|
2015-01-31 23:27:23 -08:00 |
|
|
paprka
|
4761563571
|
removes carp and blood checks from holodeck
|
2015-01-31 23:18:21 -08:00 |
|
|
paprka
|
1ce5722eac
|
map conflicts and other changes
|
2015-01-31 23:14:12 -08:00 |
|
|
paprka
|
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 |
|
 Remie Richards
|
b1ff5dd6de
|
Merge pull request #7418 from paprka/kekwalk
Some catwalk fixes
|
2015-02-01 03:32:43 +00:00 |
|
|
paprka
|
59d4070f8a
|
removes blob changes
|
2015-01-31 19:26:35 -08:00 |
|
|
Remie Richards
|
c09bd7707b
|
Merge pull request #7435 from dannno/dufflefix
fixes dufflebag max weight class
|
2015-01-31 19:49:37 +00:00 |
|