Commit Graph

218 Commits

Author SHA1 Message Date
Cheridan a2948ba203 Merge pull request #9956 from Jordie0608/whocodesthecodemen
Various admin improvements
2015-06-20 00:53:30 -05:00
phil235 f976ae8a58 Merge pull request #9957 from MrStonedOne/boomboomshaketheroom
Makes the bomb cap a config option.
2015-06-17 14:17:09 +02:00
Jordie0608 0bf6f09969 Merge branch 'master' of https://github.com/tgstation/-tg-station into whocodesthecodemen
Conflicts:
	code/modules/admin/verbs/pray.dm
2015-06-16 17:24:20 +10:00
MrStonedOne 7cfff6f1ca Secrets clean up/configurable bomb cap
Moves Secrets to it own file so its not stinking up admins.dm and topic.dm

Makes the bombcap configurable rather then being a per-round only thing.
2015-06-14 09:08:27 -07:00
MrStonedOne 8079872d35 Makes changing the bomb cap more fine grain
Also changes the other 2 bomb cap values
2015-06-14 07:38:40 -07:00
Jordie0608 a67de221cc JMP replaced with FLW, fixes and adds a bunch of key_name checks in adminlogging 2015-06-14 23:37:35 +10:00
kingofkosmos c8d79e7034 Removed unnecessary spaces in these situations:
"span class = '" changed to "span class='"
"'> " changed to "'>"
2015-06-14 12:13:19 +03:00
Razharas ec6c0465b5 Merge pull request #9879 from Incoming5643/skeleton_man
Magic Mania 1.91: Life's a lich and then you rework the mechanic to be less terrible
2015-06-13 04:24:38 +03:00
Razharas 6f624b79df Merge pull request #9139 from Xhuis/pray_4_fun
Adds prayer sounds to admins + prioritizes chaplain prayers
2015-06-11 02:58:46 +03:00
Incoming 1f0097a74a Adds the bind soul spell for wizards. It turns them into a lich (skeleton) and gives them access to a long cooldown ressurection spell (starts at 3 minutes).
The ressurection spell can only be used while dead/dying and charges at all times. When used the lich gains a new body at the site of their phylactery and is stunned for a short while. Meanwhile the old wizard body crumbles to dust leaving all the wizards worldly possessions on the ground. Anyone who sees the corpse crumble will also get a cardinal direction pointing towards the wizard.

Every time the wizard dies this way, the time between ressurections is increased by a minute. To take a lich out of the game for good, either destroy the body before the lich can cast the spell again, or destory the phylactery and kill the wizard one last time.

Liches spawn with robes and spells intact, but nothing else, everything collected on their original body stays there.

As a balance issue, this spell can't be used in the den, the item must be bound after arriving at the station.

Adds a nice black wizard robe ensemble for liches.

Magic mirrors (save for a special badmin only one) can no longer skeletonize people.

Adds a hopeful mulligan fix to wizard rounds problems. Also corrects an adminlog message.
2015-06-10 03:40:14 -04:00
Jordie0608 bd7019e033 standardizes Reboot(), allows round to be delayed after it finishes and removes immediate reboot verb 2015-06-01 22:07:22 +10:00
Aranclanos fe4d28a376 Newscaster code big cleanup.
Removes lots of copypaste.
Admin newscaster barely modified, they still are a gigantic copypaste from the topic.dm() of the newscaster object.
Printed diaries will now only report the information available when they were printed, including wanted status and the different types of censorship.
All datums are now under /datum/newscaster
Wanted is now a different type of datum, /datum/newscaster/wanted_message
Fixed a bug where you couldn't censor normal submissions, made by crewmembers.
Fixes #944
2015-05-19 09:32:46 -03:00
Jordie df2433a43f Merge pull request #9451 from Xhuis/whyAreThereFortyShadowlings
Adds a Create Shadowling button
2015-05-13 19:46:12 +10:00
Xhuis aa52d59b18 Adds a Create Shadowling button 2015-05-10 22:07:19 -04:00
Incoming 562bff95b4 Slightly widens the check antagonist panel
Makes the "(logged out)" flag on antagonists read "(ghost)" because that's what it's actually tracking

Together these fix #9268

Also sneaks a bit of mulligan functionality in so admins can see what the time and life checks for the mulligan system are, and modify them midround if desired.

Also shows and allows editing of the "on failure" behavior of mulligans, specifically if they default to instant round ending if the mulligan fails or if it just doesn't create antags.
2015-05-10 20:06:00 -04:00
phil235 489d076de5 Merge pull request #9126 from Jordie0608/doesrussellsteapotapplytorussellsteapot
Fixes #9035, atmos locker sprite and misc logging bug
2015-05-08 16:24:21 +02:00
Cheridan 95d7af4e48 Merge pull request #9277 from Ikarrus/ertbaton
Batons for Light ERP
2015-05-06 09:03:55 -05:00
Ikarrus 832e19a061 Fixed a bug with admins being told it failed to create a response team if they spawned a centcom official or deathsquad 2015-05-03 14:06:16 -06:00
Remie Richards e5f034fc0d Merge pull request #9147 from GunHog/Rise_Of_The_RR_Androids
[Review Ready] Positronic Brains!
2015-05-03 06:34:02 +01:00
Jordie d5c7ead540 Merge pull request #9165 from Xhuis/REMOVE_REVENANT_remove_revenant
Temporarily disables revenants
2015-05-02 23:59:36 +10:00
Incoming 7459238065 Merge branch 'master' of https://github.com/tgstation/-tg-station into begone_ye_jellies
Conflicts:
	code/game/machinery/teleporter.dm
2015-04-29 13:37:01 -04:00
Xhuis 3995ae73cb Makes revvies admin-spawnable again 2015-04-28 17:10:08 -04:00
GunHog 00a6762838 Ban panel and preferences changes
- Deathsquad moved from Antagonist to Ghost Roles.
- pAI jobbans split into drone, pAI, and posibrains.
- Posibrains back under pAI preference flag (the byte is full)
- Fixed Posibrain sprite if it fails to get a ghost.
2015-04-28 14:45:59 -05:00
Jordie0608 a6b3deda96 Merge branch 'master' of https://github.com/tgstation/-tg-station into doesrussellsteapotapplytorussellsteapot
Conflicts:
	icons/obj/closet.dmi
2015-04-28 22:31:11 +10:00
GunHog ae1ad22f97 pAI -> Ghost Roles
Changes the BE_PAI and "pAI" flag names to "BE_GHOST_ROLE" and "Ghost
Roles".
Name subject to change.
2015-04-27 11:07:36 -05:00
Xhuis 8c84b0b5bd Comments out revenant ( ;_; ) 2015-04-25 19:38:14 -04:00
Xhuis 7785351ad6 Adds prayer sound preference 2015-04-23 22:54:58 -04:00
Incoming f59c01e721 sets hardset_dna to clear exotic blood on race changes
sets every instance of race changes to use hardset_dna instead of directly replacing the datum (needs more testing to be sure I didn't break shit)
removes the invisible man race (aka the generic) and shadowlings from the new green slime mutation toxin while I'm in the area
2015-04-23 12:35:37 -04:00
Jordie0608 15718c515d fixes opening lockers, atmos locker sprite and misc logging bug 2015-04-23 20:46:40 +10:00
Xhuis 6eec44430a Lots of updates 2015-04-21 20:17:10 -04:00
Cheridan d6741236b5 Merge pull request #8991 from Fayrik/AllTheSmallThings
One-Click-Antag Tweaks: Now with more jobbans!
2015-04-17 09:30:08 -05:00
Fayrik 772b05d56b New Jobbans, and proper messages for when you fail to spawn antags. 2015-04-15 20:27:44 +01:00
MrStonedOne d9a9ae1358 adds a permission check to force event's topic
There existed a href exploit that allowed any admin to force an event.
2015-04-14 10:48:24 -07:00
AnturK 6fa8e5f02d Adds Abduction Mode 2015-04-13 18:40:15 +02:00
Incoming d1892cffbe Organizes the various continuous_round_x config options into one set of config options continuous. Functionality is only there for the same mode that already had that functionality, everything else is continuous always
Makes another set of config options for which rounds types, if any, use the midround antagonist (mulligan) system. Keep in mind this is by definition a subset of round with continuous set. Again this feature is only present for the roundtypes where I KNOW it works properly, other modes can't use midround antags.

The check antagonist screen will show how the game will behave when all the antagonists die, and it can be changed on the fly by admins, the four possible states are:

End on antagonist death (noncontinuous rounds)
Continue if antagonists die (unsupported continuous by default round)
Continue if antagonists die, creating replacement antagonists (continuous, using midround antags)
Continue if antagonists die, not creating new antagonists (continuous, not using midround antags)

When rounds prepare to mulligan admins will additionally get the option to just keep the round going without any automatically created antags in case they want to run their own shinanagans instead. They can also as before choose to end the round.
2015-04-09 16:03:11 -04:00
Cheridan 9606763e5f Merge pull request #8583 from Fayrik/CentcomExpansion
Centcom Two: It's better now, I swear.
2015-03-30 21:35:19 -05:00
Jordie 98873da060 Merge pull request #8549 from tedward1337/Ohgodthisishard
Adds Bluespace artillery button.
2015-03-30 01:20:45 +11:00
Fayrik 7336e6ecb8 Call Centcom! ERTs got fixed! 2015-03-29 03:54:54 +01:00
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
phil235 ffd711c26f Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal
Conflicts:
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/carbon/slime/slime.dm
	code/modules/mob/living/simple_animal/friendly/corgi.dm
	code/modules/mob/living/simple_animal/slime/say.dm
	code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm
2015-03-23 16:51:03 +01:00
phil235 aecb365f84 Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal
Conflicts:
	code/modules/mob/living/carbon/alien/life.dm
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/carbon/slime/slime.dm
	code/modules/mob/living/silicon/robot/life.dm
	code/modules/mob/living/simple_animal/slime/life.dm
2015-03-20 19:32:16 +01:00
Cheridan 7149f0382d Adds Pet Collars!
Map needs update now
2015-03-18 21:27:21 -05:00
phil235 456a64f8fd slime from carbon to simple animal 2015-03-14 23:40:57 +01: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
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
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
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
Jordie0608 6b815c7801 Stamina on adminmoreinfo and vv; ahelp and pray CA replaced by TP 2015-02-24 20:02:43 +11:00
phil235 19e3cd5d1e Fixes a window's size and a colored text in another one. 2015-02-21 16:24:13 +01:00
paprka 55bdca20da Merge branch 'master' of https://github.com/tgstation/-tg-station into gunstuff 2015-02-01 18:22:02 -08:00