Commit Graph

97 Commits

Author SHA1 Message Date
kevinz000
3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
deathride58
927b3787bf Merge pull request #6514 from Citadel-Station-13/upstream-merge-37412
[MIRROR] Adds ckey to some of the ban prompts.
2018-04-27 09:35:10 +00:00
Dax Dupont
2d95013981 Adds ckey to some of the ban prompts. (#37412) 2018-04-25 09:23:46 -05:00
Poojawa
5518efebea everything but mob stuff 2018-04-23 01:06:17 -05:00
Jordie
3a518e0e6d Adds round id to server ban messages (#37114)
* adds round id to server ban message

* adds round id to ban denied connection message

* adds round id for legacy ban message

* B

* erroneous space
2018-04-12 11:47:08 -05:00
Dax Dupont
37b8772f1c Adds an are you sure dialog when pressing delete note. (#37017)
* Adds an are you sure dialog when pressing delete note.

* The true is out there
2018-04-08 23:40:36 -05:00
Jordan Brown
d6a5f2c831 Merge pull request #36708 from Armhulen/patch-66
removes unnecessary message
2018-03-26 14:18:12 -05:00
CitadelStationBot
33f24d9e2d [MIRROR] Adds missing "to" in admin prison TP message (#6079)
* Adds missing "to" in admin prison TP message

* Adds missing "to" in admin prison TP message
2018-03-22 19:31:01 -05:00
Poojawa
57bd3824a4 fixes things and mentors. 2018-03-06 23:34:54 -06:00
Poojawa
455ee7e687 modules 2018-03-06 21:45:16 -06:00
CitadelStationBot
d3905c723f [MIRROR] Add support for auto admin when ran in single user mode (#5762)
* Add support for auto admin when ran in single user mode

* Update client_procs.dm

* fixes compile issues, also adds in some legacy mentor code
2018-03-04 13:06:42 -06:00
CitadelStationBot
12829e5cad [MIRROR] Little changes and standardisation of some admin commands (#5781)
* Little changes and standardisation of some admin commands

* Update randomverbs.dm

* Update randomverbs.dm

* tab boi
2018-03-04 09:39:41 -06:00
Sirenfal
44dc6ac3a0 Antagonist reputation system 2018-03-02 14:38:26 -06:00
CitadelStationBot
9e229691cc Fixes clockwork sigil candidate runtime, cleans up some jobban checks with defines (#5304) 2018-02-05 04:23:09 -06:00
Poojawa
03b33075e5 Mentor System (#5235)
* reworked mentor system, again. wew

* Update admin.txt

* uhg
2018-02-05 04:09:56 -06:00
Poojawa
ac97b1593e Fixes borer banning href oversight
Remove borers when.
2018-01-27 06:03:23 -06:00
AnturK
3dc89ba058 Antag Panel / Check antagonists Refactor 2018-01-19 08:43:49 -06:00
oranges
96f17eebb2 Merge pull request #34155 from deathride58/rudimentaryoutfitequip
Allows admins to select an outfit while transforming a mob to human via rudimentary transform
2018-01-13 04:18:38 -06:00
JJRcop
ed6ec3d63a Removes some hrefs from logging (#34310)
* Removes key_name_admin calls from logging

* Removes JMP from gibtonite reaction logs
2018-01-12 07:04:39 -06:00
Jordie
8f8e16ba12 Adds ban option for team antags (#34116)
* adds ban option for team antags

* conversion antags ban button
2018-01-06 08:52:31 -06:00
Dax Dupont
417e3d801e Unsquishes job ban panel 2018-01-02 20:10:30 -06:00
LetterJay
408182758f Merge branch 'master' into upstream-merge-33498 2017-12-19 17:50:11 -06:00
LetterJay
78dcad12e4 Merge pull request #4391 from Citadel-Station-13/upstream-merge-33527
[MIRROR] Adds some permission checks to admin/topic
2017-12-17 21:23:42 -06:00
Emmett Gaines
f875d4e176 Defines math, take 2 2017-12-17 10:02:43 -06:00
LetterJay
7af461539f Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC" 2017-12-16 13:08:50 -06:00
kevinz000
253c819bc1 TG Sync 12/15/17
s

s
2017-12-15 06:27:57 -08:00
Kyle Spier-Swenson
2152bc7121 Adds some permission checks to admin/topic (#33527) 2017-12-15 03:27:46 -06:00
vuonojenmustaturska
fcceb5ec77 Finishes the forceMove port 2017-12-14 15:40:08 -06:00
AnturK
c5013d65f6 Adds "Get" command to movable vv dropdown (#33296) 2017-12-11 20:35:16 -06:00
AnturK
030812035f Undelaying will now reboot the server normally. (#33423) 2017-12-10 12:54:02 -06:00
deathride58
cf01fa79db Merge pull request #4078 from Citadel-Station-13/upstream-merge-32801
[MIRROR] Adds ip and cid to banning panel ban search
2017-11-23 01:04:20 +00:00
Jordie
31b9828285 Adds ip and cid to banning panel ban search (#32801)
For kevinz000 because he managed to lose a ban and couldn't find it with ckey or ackey somehow.

No indexes because ORDER BY indexing is too finicky and having something like 8 indexes just for this wouldn't be worth the slowdown.
2017-11-22 15:38:07 -06:00
Jordie
b7e99a7448 JSON feedback 2017-11-17 01:44:12 -06:00
Jordan Brown
4b297f509e 512 forward compatibility merge 2017-10-29 10:28:36 -05:00
Jordan Brown
faf0e0a10a Adds admin override for false alarm event. 2017-10-22 00:05:23 -05:00
CitadelStationBot
d25cb1ba5d [MIRROR] Grammar fixes to atom descriptions (#3165)
* Grammar fixes to atom descriptions

* compile errors
2017-10-21 07:17:03 -05:00
Jordan Brown
ccb0674988 Fixes the last Href Token issues (#31666) 2017-10-14 11:46:01 -05:00
Jordan Brown
e5ef3d2405 Configuration datum refactor 2017-09-28 21:37:53 -05:00
LetterJay
a960b63b0a Merge branch 'master' into upstream-merge-30056 2017-09-13 06:08:59 -05:00
LetterJay
c2a41c9b51 commit 2017-09-13 06:04:22 -05:00
LetterJay
eeadba6f18 Merge pull request #2696 from Citadel-Station-13/upstream-merge-30494
[MIRROR] Adds missing span-endings
2017-09-12 06:32:45 -05:00
LetterJay
e2536975dc Merge pull request #2675 from Citadel-Station-13/upstream-merge-30554
[MIRROR] Fixes admin topics
2017-09-12 03:07:04 -05:00
LetterJay
dac6cc56e4 Merge branch 'master' into upstream-merge-30494 2017-09-12 02:40:24 -05:00
LetterJay
8223692c32 Merge pull request #2684 from Citadel-Station-13/upstream-merge-30558
[MIRROR] Adds href tokens to topic.dm
2017-09-12 02:37:49 -05:00
LetterJay
4fdc313486 Update topic.dm 2017-09-12 02:36:28 -05:00
LetterJay
b8f2fe00e5 Update topic.dm 2017-09-12 02:31:25 -05:00
LetterJay
4d7c4e6da9 Merge branch 'master' into upstream-merge-30554 2017-09-12 01:20:05 -05:00
LetterJay
f60d57520b Merge branch 'master' into upstream-merge-29839 2017-09-11 23:22:39 -05:00
LetterJay
c3ef612490 Ports MSO's fading note system 2017-09-11 23:07:30 -05:00
kingofkosmos
63122795f9 Adds missing span-endings 2017-09-11 07:10:09 -05:00