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
|
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 |
|
Iamgoofball
|
2098fd5ea5
|
Fixes #7497
|
2015-02-04 18:53:33 -08:00 |
|
paprka
|
f6bf89656b
|
fixes syringes with monkeys, virus transfers, and iv drip feedback
|
2015-02-04 12:21:05 -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
|
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 |
|
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
|
6068fb4162
|
Merge pull request #7455 from Iamgoofball/patch-25
Fixes #7258
|
2015-02-02 18:32:02 -08:00 |
|
dannno
|
d8823a8038
|
Merge branch 'master' of https://github.com/tgstation/-tg-station into killyoselfmyman
|
2015-02-02 19:30:24 -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 |
|
paprka
|
e4262d21a5
|
nanite injector for med ert
|
2015-02-02 06:24:16 -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
|
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 |
|
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 |
|
paprka
|
0ef611fa98
|
fixes mining helmet not having nodrop or thickmaterial
|
2015-02-01 18:17:01 -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
|
0ec5648413
|
Merge branch 'killyoselfmyman' of https://github.com/dannno/-tg-station into killyoselfmyman
|
2015-02-01 19:46:05 -05:00 |
|
dannno
|
c48bf44a47
|
framework for a future "suicide hotline" job
|
2015-02-01 19:44:54 -05:00 |
|
dannno
|
c4fccf2651
|
remove redundant message
|
2015-02-01 16:35:14 -05:00 |
|
dannno
|
a8fd8d13fa
|
how about i put you to sleep kraso
with a banana
by killing you with it
|
2015-02-01 16:33:50 -05:00 |
|
Iamgoofball
|
fbad839b4c
|
Fixes #7493
Fixes #7493
this also fixes ODing on epi pills
|
2015-02-01 12:26:53 -08:00 |
|
dannno
|
f2ccc18c5c
|
kill yourself with banana my friend
|
2015-02-01 14:19:17 -05: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 |
|
dannno
|
a0b2e72b4c
|
gun suicide messages
|
2015-02-01 11:04:40 -05:00 |
|
Swag McYolosteinen
|
920bca9147
|
Merge pull request #7358 from Delimusca/gooeyfun
Minor slime enhancements
|
2015-02-01 14:04:52 +01:00 |
|
Swag McYolosteinen
|
ad8898d154
|
Merge pull request #7406 from Menshin/send_back_to_lobby
Added a "Send back to Lobby" option in Player Panel
|
2015-02-01 12:50:55 +01:00 |
|
Swag McYolosteinen
|
d5ccc9cffe
|
Merge pull request #7436 from Incoming5643/WaitingForTheSun
Fixes #6885
|
2015-02-01 12:46:16 +01:00 |
|
paprka
|
141bababef
|
makes ghosts float up and down
|
2015-02-01 03:37:14 -08:00 |
|
paprka
|
e4b52c3974
|
removes voxtest 2
|
2015-02-01 02:11:42 -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 |
|
Razharas
|
c0abee10a3
|
Merge pull request #7462 from Iamgoofball/patch-26
Fixes #7458
|
2015-02-01 10:26:08 +03:00 |
|
paprka
|
1ce5722eac
|
map conflicts and other changes
|
2015-01-31 23:14:12 -08:00 |
|
Razharas
|
452494aaa4
|
Merge pull request #7452 from Iamgoofball/patch-22
Fixes #7409
|
2015-02-01 10:06:46 +03: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 |
|