Incoming
7903aba6d3
Adds optional population caps for those that want them. These be dark measures, so tread carefully ye who dare enter this place.
...
There are three "levels" of popcaps, and you can use them in any assortment you like:
The "soft" cap produces a message on join, and takes no action.
The "hard" cap disallows joining whilst too many other people are alive and playing in game, but allows observing.
The "extreme" cap prevents people from joining the server at all while the cap is exceeded. It won't kick out people who failed to qualify during roundstart, but if they leave they won't be able to get back in.
In each case a customizable message config option has been given. Admins are also immune to most population caps (they still are hit by the ones in job shuffling, but can late join as normal afterwards)
2015-02-04 01:58:02 -05: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
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
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
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
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
Iamgoofball
fa7ac922f9
changes to isliving()
2015-01-31 10:21:44 -08:00
paprka
453a3db196
etc
2015-01-30 23:18:02 -08:00
Iamgoofball
77562ab06a
Fixes #7458
...
Fixes #7458
2015-01-30 22:23:57 -08:00
Iamgoofball
7bf38b41f7
Fixes #7258
...
Fixes #7258
2015-01-30 16:47:40 -08:00
Iamgoofball
920c730b8e
Fixes #7409
...
Fixes #7409
2015-01-30 16:09:55 -08:00
phil235
b4324a2db4
Fixes typo in CPR logs that switched attacker and victim.
2015-01-30 22:16:48 +01:00
Cheridan
2716046e09
Merge pull request #6817 from Perakp/speed_tweak
...
Cold temperatures slow you down even when there is no gravity.
2015-01-30 14:45:27 -06:00
Cheridan
9eb4e67d58
Merge pull request #7412 from paprka/capwazer
...
adds unique inhands for the captain's laser
2015-01-30 14:07:12 -06:00
Incoming
31b84ca71f
changes how the bolt of door creation works so it behaves expectedly on shuttles
...
adds butterflies to the staff/wand of change/polymorph since I'm here.
Removes two colons
2015-01-29 16:30:31 -05:00
hornygranny
f7659eb4e5
Merge pull request #7426 from Miauw62/ye_olde_bugfix
...
fixes MMI and pAI teleporting
2015-01-29 10:51:12 -08:00
Swag McYolosteinen
eafdaae185
Merge pull request #7393 from GunHog/WhyDidYouBorgTheClown
...
More Silicon Emotes!
2015-01-29 19:06:19 +01:00
Swag McYolosteinen
3bb7213d14
Merge pull request #7346 from paprka/hoodshit
...
New hood/hardsuit helmet system
2015-01-29 18:57:25 +01:00
Miauw
b6b17e214f
After-merge cleanup.
2015-01-29 18:51:31 +01:00
