xxalpha
f9ebb2cff7
Merge remote-tracking branch 'upstream/master' into traymesons
...
Conflicts:
code/modules/research/designs.dm
icons/mob/eyes.dmi
icons/obj/clothing/glasses.dmi
2015-02-27 21:15:01 +00:00
Razharas
b233b54cab
Merge pull request #8006 from MrStonedOne/SomeThingThatEndsInYFollowedByTwoNumbers
...
Panic bunker + new player notification configs
2015-02-27 16:17:20 +03:00
MrStonedOne
5529222b62
Fixes guests being allowed to connect while panic bunker is active
...
I was tempted to move all the panic bunker shit to isbanned(), but doing so would mean adding yet ANOTHER query that gets run on every connection, and run for every player on world restart.
That just seemed like not worth the effort to just make panic bunker trigger a little bit earier.
2015-02-26 16:48:43 -08:00
MrStonedOne
af4c2d86d6
Tweaks panic bunker verb logic a little bit
...
Allows toggling even if the database is not connected, alerts admins instead.
2015-02-26 16:02:26 -08:00
MrStonedOne
b39f120f4b
Makes the irc new player alert option behave like irc admin pm notices
...
It will only trigger if the new player alert is enabled for admin display and no valid non-afk admins are on to see it.
2015-02-26 14:07:56 -08:00
MrStonedOne
5ac23f6a2d
Panic bunker + new player notification configs
...
Panic bunker! Uses the power of the database to reject new ckeys that have never connected to the server(s) before.
Admins are exempt, even while deadmin'ed, but they are also unlikely to be new ckeys except in rare cases that involve vv fuckary.
New player notification is now configurable.
Adds a optional default disabled irc notification of a players first time connecting.
2015-02-25 23:27:03 -08:00
hornygranny
f64fb21f47
Merge pull request #7955 from Jordie0608/greytiderahelps!admintakes10braindamage!
...
Fixes #7288 VV, moreinfo stamina display and replaces CA with TP
2015-02-25 19:53:41 -08:00
hornygranny
bcecdaf938
Merge pull request #7928 from phil235/BuildmodeHelpFix
...
Fixes buildmode throw function's help information.
2015-02-24 10:12:15 -08:00
Jordie0608
6b815c7801
Stamina on adminmoreinfo and vv; ahelp and pray CA replaced by TP
2015-02-24 20:02:43 +11:00
Swag McYolosteinen
ac5fc9b044
Merge pull request #7544 from Incoming5643/popcapgames
...
Adds optional population caps
2015-02-23 17:20:02 +01:00
phil235
6a6a56283f
Fixes buildmode throw function's help information. (left and right were switched)
2015-02-23 14:34:40 +01:00
hornygranny
7b8a8a3308
Merge pull request #7870 from phil235/WindowFormattingFix
...
Two window fixes
2015-02-22 20:18:21 -08:00
Swag McYolosteinen
96e7a5c473
Merge pull request #7864 from Jordie0608/yoursisthelistthatwillcrashtheserver
...
Warning check before sorting long lists in vv
2015-02-22 11:57:01 +01:00
phil235
19e3cd5d1e
Fixes a window's size and a colored text in another one.
2015-02-21 16:24:13 +01:00
Jordie0608
5a3d9d883f
Warning check before sorting long lists in vv
2015-02-21 21:46:42 +11:00
GunHog
cd00e07f4f
Merge remote-tracking branch 'remotes/upstream/master' into AdminLoggingForExperimentor
...
Conflicts:
code/modules/research/experimentor.dm
2015-02-20 15:23:07 -06:00
GunHog
1cd892a0fd
Experimentor Invesigate Take 1
...
- Logs lots of the things to experimentor investigate.
2015-02-20 15:09:59 -06:00
phil235
ce1ae70d1a
Merge pull request #7723 from Miauw62/welpwelp
...
Fixes walls becoming nondense due to adminteleport.
2015-02-17 14:28:03 +01:00
Swag McYolosteinen
18a344e66b
Update adminjump.dm
2015-02-17 13:44:21 +01:00
phil235
a62c0333d6
Merge pull request #7685 from optimumtact/destructnuke
...
Nuclear self destruct option with added centcomm fun
2015-02-16 23:09:29 +01:00
Cheridan
1ad51c8201
Merge branch 'qoladv' of git://github.com/tkdrg/-tg-station into tkdrg-qoladv
...
Conflicts:
code/modules/admin/admin_verbs.dm
2015-02-14 23:16:02 -06:00
oranges
bae27bc40b
Allow station self destruct with captains identity card
2015-02-15 12:09:09 +13:00
xxalpha
28d1e9bad2
Several additions and new sprites.
...
Reverts glasses.dm
2015-02-14 19:24:41 +00:00
Swag McYolosteinen
e0f82d960a
removes incorporealmove things
2015-02-14 18:39:16 +01:00
Swag McYolosteinen
f9b962fd47
Fixed #7594 , walls becoming nondense due to adminteleport.
2015-02-14 12:00:04 +01:00
Sometinyprick
ce8d3e32b6
Update diagnostics.dm
2015-02-13 17:30:52 +00:00
Sometinyprick
98edcffb7d
oops
2015-02-13 17:29:22 +00:00
Sometinyprick
2cbff9e2dd
admins are thing
...
thing of admins
2015-02-13 17:00:51 +00:00
Cheridan
0db4c09326
Merge pull request #7573 from xxalpha/schizo
...
Hear the voice of the chosen deity in your head.
2015-02-11 09:52:05 -06:00
Swag McYolosteinen
f130872f4e
Merge pull request #7517 from RemieRichards/MovableUIElements
...
Movable UI Elements!
2015-02-10 17:50:33 +01:00
Kraseo
80191947e2
ERT now spawn with random names because cheri hates fun
2015-02-09 20:10:29 +01:00
Kraseo
08e7911f57
fixes a bunch of bugs
2015-02-08 13:27:55 +01:00
xxalpha
e894fdc6c1
You will hear the voice of the chosen god in your head.
...
Remove text macros
2015-02-06 00:54:35 +00:00
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
Remie Richards
6290462c20
Adds Debug verbs for Movable and Snap UI Elements (R_DEBUG Admin rank required)
2015-02-03 22:38:45 +00:00
Cheridan
80913f143b
Merge pull request #7239 from paprka/ointmentandshit
...
BLOOD FOR THE BLOOD GOD
2015-02-03 16:30:42 -06: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
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
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
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
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
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
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
paprka
453a3db196
etc
2015-01-30 23:18:02 -08: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
3bb7213d14
Merge pull request #7346 from paprka/hoodshit
...
New hood/hardsuit helmet system
2015-01-29 18:57:25 +01:00