paprka
|
1346abfc65
|
potentially fixes iv runtime
|
2015-02-03 21:47:34 -08:00 |
|
paprka
|
0645d46168
|
iv drip hotfixes
|
2015-02-03 18:34:32 -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 |
|
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 |
|
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
|
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 |
|
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 |
|
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 |
|
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
|
d03ef74ebc
|
Merge pull request #7430 from Menshin/shuttle_underlays_fix
Shuttle related fixes
|
2015-02-01 12:46:46 +01:00 |
|
Swag McYolosteinen
|
d5ccc9cffe
|
Merge pull request #7436 from Incoming5643/WaitingForTheSun
Fixes #6885
|
2015-02-01 12:46:16 +01:00 |
|
Swag McYolosteinen
|
bc8b506185
|
Merge pull request #7463 from Incoming5643/indentationmatters
Fixes an incorrect indentation that was leaving invisible comatose mobs all over the place
|
2015-02-01 12:45:40 +01:00 |
|
paprka
|
77dabb02fe
|
fixes janicart
|
2015-02-01 03:09:09 -08:00 |
|
Deantwo
|
f6f4318f23
|
Fixes the Goof fix
Fixes https://github.com/tgstation/-tg-station/pull/7453
I wouldn't wish any of these mutations on my worst enemy.
|
2015-02-01 11:25:59 +01: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 |
|
paprka
|
ce65ad8c62
|
fixes some gauze inconsistencies
|
2015-01-31 23:27:23 -08:00 |
|
Razharas
|
c0abee10a3
|
Merge pull request #7462 from Iamgoofball/patch-26
Fixes #7458
|
2015-02-01 10:26:08 +03: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 |
|