Shadowlight213
3303a926fa
Removes commented out code
2015-10-19 21:15:35 -07:00
Shadowlight213
9884a6624a
Adds Shadowling bans
2015-10-18 16:20:58 -07:00
Shadowlight213
35ca96331e
Adds jobban support to syndicate borg
...
Adds jobban and pref checking to various events
Adds support for alien jobbans
Adds feedback to alien infestation event.
2015-10-18 15:25:14 -07:00
phil235
8daa8d9075
Fixes some admin buttons in certain admin messages ("move ferry" in the ferry request message, "adminmoreinfo", "antagonist" (to check antagonist) in player panel, 'list_signalers' button in transfer valve opening message).
...
Fixes Blue space artillery button in Centcom message, nuke code request message and syndicate message.
2015-10-12 02:03:31 +02:00
Jordie0608
d19954dd6f
stealthmin check for kick notification
2015-10-11 23:16:24 +11:00
Remie Richards
89b12e561f
Merge pull request #12171 from Iamgoofball/patch-130
...
Kicks now inform you who kicked you.
2015-10-11 01:24:41 +01:00
Kyle Spier-Swenson
c1031a5a66
removes admin announce from follow.
...
This was only kept because it was the only easy way to claim an admin help.
Because starting to type a response to an admin help announces, this is no longer necessary
2015-10-05 20:48:07 -07:00
Razharas
070eb882db
Merge pull request #12077 from GunHog/I_am_WJs_Code_Slave_Now
...
Royal Xeno Expansion!
2015-10-06 00:30:06 +03:00
Iamgoofball
77441b42c7
Kicks now inform you who kicked you.
2015-10-04 19:39:45 -07:00
Razharas
1aa0e911ae
Merge pull request #11760 from Core0verload/selfrepair
...
Cyborgs update
2015-09-30 22:50:08 +03:00
GunHog
0a2be62d55
Royal Xeno Expansion
...
- Queens are now GIANT.
- Queens are now under the /royal type
- Added Praetorian caste.
- Buffed queen health to 400
- Royals now resist all but the strongest space winds
- Drones now must evolve into Praetorian before becoming queen.
- Queens without a Praetorian may now promote one.
- Royal Xenos now are not stunned by hulks or mechs.
- Hulks no longer push back royals, but still deal more damage.
2015-09-29 18:58:40 -05:00
MrStonedOne
c45a7c7173
MERGE CONFLICTS, MY ONLY WEAKNESS
...
How did you know?
2015-09-26 23:42:14 -07:00
c0
a687b07eac
f u c k c o n f l i c t s
2015-09-25 14:35:44 +03:00
Aranclanos
25f998393a
Removes a sleep in the admin follow command.
2015-09-19 10:41:59 -03:00
AnturK
c2a26c81e7
Adds Create Custom Outfit admin verb
...
Sechud fix
2015-09-08 14:41:15 +02:00
Jordie0608
4c1730a008
Merge branch 'master' of https://github.com/tgstation/-tg-station into fromanicperspectivethesqldbislikeadivinespacecensus
...
Conflicts:
code/modules/admin/topic.dm
2015-08-30 22:55:53 +10:00
Razharas
244408b575
Merge pull request #11377 from Jordie0608/ithoughtifixedthisbutapparentlynot
...
Fixes #11375 , note ckey fix
2015-08-30 15:44:14 +03:00
Razharas
b9009c43b0
Merge pull request #11319 from Jordie0608/wouldabanforinfinityminutesstillbeatempban
...
Fixes #11312 , Removes time limit on tempbans
2015-08-30 15:41:58 +03:00
Jordie0608
62fa9a163c
interface for watchlist, improvements to memo, varedit, ban interfaces
2015-08-27 20:57:01 +10:00
Jordie0608
e65ddd0827
note ckey fix
2015-08-25 05:11:55 +10:00
Jordie0608
d8be2d5ded
removes time limit on tempbans
2015-08-22 17:42:37 +10:00
Aranclanos
5655379866
Fixes the watchlist edit option not working at all
2015-08-20 08:11:48 -03:00
Jordie
4463c59849
Merge pull request #11221 from Core0verload/spawnpanel
...
Spawn panel improvements
2015-08-19 19:01:15 +10:00
Jordie0608
9e2c59ca24
debug fix
2015-08-15 22:34:18 +10:00
Jordie0608
e2d3488f7f
database notes
2015-08-15 22:24:24 +10:00
c0
7e1bd34583
Spawn panel improvements
2015-08-15 13:34:15 +03:00
MrStonedOne
dac8c34e78
Sticky ban in game interface
2015-08-14 08:02:15 -07:00
Jordie0608
f7489b18af
memo update
2015-07-28 21:42:25 +10:00
bgobandit
0d9f7dcb4a
Merge branch 'master' of https://github.com/tgstation/-tg-station into catsandpugs
...
Conflicts:
_maps/map_files/TgStation/tgstation.2.1.3.dmm
2015-07-24 11:58:52 -04:00
Cheridan
24d17e3c97
Merge pull request #10694 from Jordie0608/mimosmemomentionsminchinsmargerymargarine
...
Database Admin Memos
2015-07-24 00:46:26 -05:00
bgobandit
fcb081f0e1
(hopefully) fixes merge conflict, adds changelog entry
2015-07-23 11:22:49 -04:00
bgobandit
df836d0f73
Cats and pugs now respond when you pet them. Pugs and corgis are now under the same dog parent, and all dog code is moved to dog.dm (corgi.dm and pug.dm no longer exist). Updates pathing across all areas of code and on all included maps. Fixes a minor pet collar naming bug.
2015-07-23 10:49:06 -04:00
Jordie
99814bc1b9
Merge pull request #10737 from Incoming5643/end_my_suffering
...
Adds a server admin version of end round now
2015-07-23 22:33:47 +10:00
Jordie0608
75e54fb036
Merge branch 'master' of https://github.com/tgstation/-tg-station into mimosmemomentionsminchinsmargerymargarine
...
Conflicts:
code/modules/admin/topic.dm
2015-07-22 15:52:51 +10:00
Incoming
59217b2b06
Adds a server admin version of end round now; a semi obscure admin tool that came about in the mulligan push but never really got advertised. It will print out a round end report and attempt to database round stats before restarting. Suggested use is when the round has SLOWED down to an unplayble crawl for some reason but the game is still technically responcive. Pressing end round doesn't preclude the use of reset if it doesn't seem to be working, but end round should usually be tried first.
...
Removes the 20 second confirmation between prompts for the normal admin version of end round now.
If admins force end a round escape objectives will be good faith greentexted if the antagonists were still in a position to escape alive.
The survival rate will always be printed at round end now, even if the shuttle makes it to centcom (evac rate will be printed too in that case).
2015-07-20 23:06:42 -04:00
Jordie0608
073b419bd3
fixes kick and ca links in pp
2015-07-21 04:21:38 +10:00
Jordie0608
f7b66edb17
migrates admin memos to use database
2015-07-19 17:01:38 +10:00
Ikarrus
2191a2c33d
Datum-Based Gangs
2015-07-02 15:12:55 -06:00
Jordie0608
d3f78294ad
fixes edit reason and log for follow
2015-06-26 16:13:40 +10:00
Cheridan
c7e0b96314
Merge pull request #10083 from MrStonedOne/ISTHISVALID
...
Admins can now reject shitty adminhelps
2015-06-23 14:26:11 -05:00
Cheridan
7b6fdbc8ce
Merge pull request #9556 from Jordie0608/thisisnothebeginningoftotalatarinismthathappenedearlier
...
Ports watchlist flagging for ckeys
2015-06-22 23:36:06 -05:00
MrStonedOne
40c2ca5966
Tweaks adminhelp rejections and adds changelog
2015-06-21 13:23:42 -07:00
MrStonedOne
9583b1213b
Adds new timer subsystem
...
Adminhelps now use it so that they can cancel the timer to return the admin help verb.
Adminhelps now allow admins to reject the adminhelp, giving the user back the verb and a message telling them how to construct a better admin help.
2015-06-21 11:55:38 -07:00
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
