Remie Richards
5b18ed7c2e
Merge pull request #8403 from MrPerson/no_bug_here
...
Fixes character appearances - no more bald albinos
2015-03-20 04:36:32 +00:00
MrPerson
721b81373a
Removed commented out regenerate_icons()
2015-03-19 21:35:24 -07:00
Jordie
0cdd34ee05
Merge pull request #8354 from MMMiracles/hardsuit_upgrade
...
Revamps ERT suits to use helmet toggle
2015-03-19 16:45:05 +11:00
MrPerson
e9a36f4d53
Fixes character appearances - no more bald albinos
...
Fixes #8383
Also removed two defunct comments.
2015-03-18 02:21:56 -07:00
phil235
78d28a6d64
Merge branch 'master' of https://github.com/tgstation/-tg-station into BigUserdanger
...
Conflicts:
code/modules/events/ninja.dm
2015-03-15 12:30:27 +01:00
MMMiracles
abb835b487
revamps ERT hardsuits to use the helmet toggle, organizes the listing to be slightly better looking.
2015-03-15 02:03:18 -04:00
Cheridan
28f6aae00c
Merge branch 'NinjaCleanup' of git://github.com/RemieRichards/-tg-station into RemieRichards-NinjaCleanup
...
Conflicts:
icons/mob/back.dmi
remie is a nerd btw
2015-03-12 20:47:11 -05:00
phil235
29609457f5
Makes the message when you're attacked slightly bigger for better visibility."
...
Changes two "for... show_message()" into "visible_message()".
2015-03-12 23:15:54 +01:00
phil235
1eba7b694b
Merge pull request #8134 from Miauw62/ghostradios
...
Adds a toggle so ghosts can hear radio chatter more easily.
2015-03-10 23:56:28 +01:00
Remie Richards
f6e4c1518d
A restructure/removal/cleanup of Ninja Code
2015-03-09 20:43:56 +00:00
Cheridan
237f5c366a
Merge pull request #8177 from MrStonedOne/patch-2
...
IsBanned() now rejects blank ckeys/ips/cids
2015-03-09 00:31:26 -05:00
Cheridan
0015d4c120
Merge pull request #8141 from Incoming5643/Subjectivity_is_a_bitch
...
Skipping mulligan antag based on Time/Subjectivity from admins + tweaks
2015-03-09 00:14:28 -05:00
Remie Richards
04dcfaddcf
Merge pull request #8135 from Miauw62/adminjumpfixes
...
Fixes adminjump being dumb.
2015-03-07 18:17:41 +00:00
Miauw
f84f6aafcd
Fixes adminjump being dumb.
2015-03-07 19:00:48 +01:00
hornygranny
68c791ee7c
Merge pull request #7751 from RemieRichards/ProceduralGeneration
...
Procedural Map Generator System
2015-03-06 11:49:21 -08:00
MrStonedOne
b0b4d7f580
IsBanned() now rejects blank ckeys/ips/cids
...
Also removes the admin notice. Its still logged, but this way the admins don't get spammed during world reboot.
2015-03-05 19:35:33 -08:00
Cheridan
07676b352d
Merge pull request #8128 from Ikarrus/gangfixup
...
Makes Gang mode functional again
2015-03-05 21:11:59 -06:00
Miauw
82bc75c263
Moves chat toggles into their own variable.
2015-03-05 18:38:07 +01:00
Incoming
c28d8ff7d0
Adds the ability for admins to "take the shot" and end rounds at their discretion. This is behind a two confirmation gate with a 20 second reflection period between them. All this is logged.
...
When mulligan antag is set to kick in, the suggestion for admins to end the round if they feel enough has happened is given. The option can also be found on the check antagonist panel.
The check antagonist panel will show what the muligan roundtype is if it exists.
If absolutely no one wants/can be the midround antags, the round ends there.
The round will end no matter what if the primary antagonist survived over an hour before biting it (unless the shuttle is already past the point of no return, in which case a peaceful ending takes priority)
Adds force_ending to VV editing protection, to avoid admins trying to shinanigans it on.
2015-03-03 16:39:01 -05:00
MrStonedOne
90e46f35bb
Fixes irc alerts of adminhelps not showing the ckey
...
Also fixes irc alerts of new players having the source split up in the announcement messages
2015-03-03 04:05:08 -08:00
Ikarrus
9b28452bfe
Makes Gang mode functional again
...
I'm going on vacation soon so I thought I might as well bring this game mode back up to at least a minimally functional state before I go.
A lot of features (Gang membership visibility, conversion pens, weapons, deconversion methods) have been stripped out for now. I gave gang bosses uplinks in the meantime.
It's basically rev vs rev right now, but the victory conditions with the recallers are still there. I'll work on adding more stuff after I return from my vacation.
2015-03-02 23:46:46 -07:00
Razharas
a07f6e6bfa
Merge pull request #8103 from Ikarrus/antag_babbies
...
Age Restrictions for Antagonists
2015-03-03 09:02:52 +03:00
phil235
d2d0888432
Merge pull request #7726 from xxalpha/traymesons
...
Mesons+T-Ray = Engineering Goggles
2015-03-02 19:24:06 +01:00
Ikarrus
f95ca85ed6
Age Restrictions for Antagonists
...
Default minimum age is 7 days.
Team Antag modes and wizard is 14 days.
Malf minimum is 30 days (Same as AI minimum age).
2015-03-01 20:40:04 -07:00
Remie Richards
88cc21cb6d
Merge pull request #7963 from Incoming5643/manage_ass
...
Updates Manage Job Slots to work with assistant slots
2015-02-28 21:28:44 +00:00
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
Incoming
cbcc52beeb
Updates Manage Job Slots to work with assistant slots
...
Any (non-silicon) job can now be set to be an unlimited slot job from Manage Job Slots
People will be allowed to join as assistant if no other jobs are availible
Removes a redundant sanity check from AssignRole()
2015-02-24 16:06:36 -05: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
Remie Richards
4bebfaefc3
Procedural Map Generator System
2015-02-15 12:08:02 +00: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