Commit Graph

943 Commits

Author SHA1 Message Date
tedward1337
83961b85c9 Adds a new button for admins with +fun to push. Sends bluespace artillery to the station at the whim of God. 2015-03-25 22:03:45 -04:00
MrPerson
ce13faed09 Change select holiday names to #defines 2015-03-25 15:01:06 -07:00
MrPerson
9910cf3fe3 Change holidays into datums
Holidays are now actual datums with procs and vars and everything.
Holidays run a proc called celebrate() when it's time to celebrate them. Currently none of them do anything but that should change, wink wink.
Holidays can now run for more than a day. The important ones, april fools, christmas, halloween, new years, and easter, all last at least a week. The idea is so people can celebrate christmas in game without having to, you know, actually play on fucking christmas. And also to put a time limit on how long stuff like the annoying spookoween closet skeletons will stick around so it doesn't overstay its welcome and become annoying as shit like last year.
The event SS now allows more than 1 holiday to run at a time. This matters for new years + christmas, easter + april fools, easter + 4/20, and any holiday that can happen on friday the 13th. The events get stored in a list that's only initialized if there's an active holiday so testing for potential holidays is still pretty easy.
Added more easter dates so we won't have to add more until 2040. The current batch run out in 2017.
2015-03-25 01:46:29 -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
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
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
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
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
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
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
Jordie0608
6b815c7801 Stamina on adminmoreinfo and vv; ahelp and pray CA replaced by TP 2015-02-24 20:02:43 +11:00
phil235
6a6a56283f Fixes buildmode throw function's help information. (left and right were switched) 2015-02-23 14:34:40 +01:00
Jordie0608
5a3d9d883f Warning check before sorting long lists in vv 2015-02-21 21:46:42 +11: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
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
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