Swag McYolosteinen
|
65a3674969
|
Merge pull request #7489 from paprka/ghostsa
Makes ghosts float up and down ala zero-g
|
2015-02-05 18:08:38 +01:00 |
|
Swag McYolosteinen
|
f5653fa923
|
Merge pull request #7500 from Iamgoofball/patch-27
Fixes #7493
|
2015-02-05 18:07:52 +01:00 |
|
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
|
aa3f6d8635
|
Merge pull request #7540 from Delimusca/slimefixins
slime feeding hotfix
|
2015-02-05 18:05:15 +01:00 |
|
Swag McYolosteinen
|
ac60a828f9
|
Merge pull request #7536 from Iamgoofball/chemblob
fixes my shit
|
2015-02-05 18:04:54 +01:00 |
|
paprka
|
468b00a16f
|
bandaids diseases and bleeding
|
2015-02-05 01:36:16 -08: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 |
|
Iamgoofball
|
2098fd5ea5
|
Fixes #7497
|
2015-02-04 18:53:33 -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 |
|
Cheridan
|
7622968e56
|
Merge pull request #7538 from paprka/ohmygah
Fixes hardsuit runtime
|
2015-02-04 00:24:42 -06: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 |
|
Delimusca
|
4f618c9ca3
|
fixed slime drag exploits
|
2015-02-03 22:09:05 -07:00 |
|
paprka
|
6e329a6cf4
|
fixes hardsuit runtime
|
2015-02-03 21:07:38 -08:00 |
|
Iamgoofball
|
9a1036d43b
|
Fixes #6991
|
2015-02-03 20:26:58 -08:00 |
|
Iamgoofball
|
d0b51e86ed
|
fixes #7154
|
2015-02-03 19:09:18 -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 |
|
Swag McYolosteinen
|
500a236b51
|
Merge pull request #7507 from paprka/hardsuitfixes
Fixes mining helmet not having nodrop or thickmaterial flags
|
2015-02-03 16:03:15 +01: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 |
|
Iamgoofball
|
48413b4a89
|
makes roundstart pills append their reagent number to their name, only roundstart ones do this
|
2015-02-02 18:35:51 -08:00 |
|
hornygranny
|
a1899f4373
|
Merge pull request #7502 from Iamgoofball/chemblob
Fixes #7020
|
2015-02-02 18:34:01 -08:00 |
|
hornygranny
|
6068fb4162
|
Merge pull request #7455 from Iamgoofball/patch-25
Fixes #7258
|
2015-02-02 18:32:02 -08:00 |
|
Iamgoofball
|
fa7e15d734
|
what is object oriented programming
|
2015-02-02 18:30:24 -08:00 |
|
hornygranny
|
078c8caaea
|
Merge pull request #7453 from Iamgoofball/patch-23
Fixes #7312
|
2015-02-02 18:26:36 -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
|
e4262d21a5
|
nanite injector for med ert
|
2015-02-02 06:24:16 -08:00 |
|
paprka
|
f4cd2cd4af
|
fixes ert access
|
2015-02-02 06:22:07 -08:00 |
|
Razharas
|
106fbf6347
|
Merge pull request #7487 from paprka/voxtest
Removes voxtest 2, removes /tg/ culture
|
2015-02-02 15:02:27 +03:00 |
|
paprka
|
d232086ff5
|
small bandaid fix
|
2015-02-02 03:54:24 -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
|
8173cd2460
|
fixes pulse rifles not being emp proof apparently
|
2015-02-01 23:27:56 -08:00 |
|
paprka
|
f6be6754ae
|
readds the stun revolver (oops)
|
2015-02-01 21:32:51 -08:00 |
|