Commit Graph

123 Commits

Author SHA1 Message Date
AffectedArc07
16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
Ghommie
4e05c27cdb Updating supply pods code. 2019-11-27 01:54:10 +01:00
Putnam
5e51cc63f9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into super-special-awesome-dynamic 2019-11-13 16:58:44 -08:00
Ghommie
279c22b781 lentext to length. 2019-11-09 23:17:04 +01:00
Putnam
34015969e8 changed misleading message 2019-11-07 16:35:40 -08:00
Fermi
c23d6f0113 I missed an earlier port. 2019-09-17 01:08:37 +01:00
Sishen
4ba3d851ed IT JUST WORKS 2019-08-09 00:46:14 -04:00
Ghommie
ee32e1680f Ports "Replaces radio channel names and keys with defines" 2019-07-17 00:52:41 +02:00
JTGSZ
6c077758c6 ports gang 2019-05-18 05:06:22 -04:00
Poojawa
284e9d0325 module things, jfc 2018-09-11 07:51:01 -05:00
LetterJay
1b11773cd9 DB port 2018-08-23 07:20:49 -05:00
deathride58
b1688405d9 and finally, the modules folder. Now I can publish and take a break 2018-07-02 01:19:37 -04:00
CitadelStationBot
49a34614cd [MIRROR] Admin Kicks now prompt the admin to avoid accidental kicking (#7191)
* Admin Kicks now prompt the admin to avoid accidental kicking (#38544)

* TO THE PLAAAAAACE I BELOOOOOONG

* TAKE ME HOOOOOOOOOOME

* WEEEEEEST VIRGINIAAAAAAAAAAAAAAAAAAA

* fixes my shit

* No meming in admin frontend

* Admin Kicks now prompt the admin to avoid accidental kicking
2018-06-19 14:51:14 -07:00
LetterJay
162b827033 Update topic.dm 2018-06-16 16:44:42 -05:00
Jordan Brown
b4edde2c0a Add syndicate headset messages, squashes both together. 2018-06-16 06:19:29 -05:00
oranges
de68aa9571 Individual Logs now follow the client around automatically (#37790)
The logging is now stored in the persistent client/player_details datum,
that will survive an entire round

The existing mob log is retained and a new admin verb is added to access
it. It will only show logs for the mob in question, across all players
who possibly spent time in that mob

A new log type is added that tracks the mobs the player changes across
into and the times they occured, to better help admins manage complex
situations, this also appears in the mob log as a record of the players
who entered/exited control of the mob
2018-06-06 04:10:20 -05:00
deathride58
2f9e3e403d Hard upstream sync (#6951)
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync

* sync part 1 - underscore folders in code

* controllers folder

* datums folder

* game folder

* cmon, work

* modules - admin to awaymissions

* cargo to events

* fields to lighting

* mapping > ruins

* rest of the code folder

* rest of the folders in the root directory

* DME

* fixes compiling errors. it compiles so it works

* readds map changes

* fixes dogborg module select

* fixes typo in moduleselect_alternate_icon filepath
2018-05-31 16:03:18 -07:00
LetterJay
664f2ac150 Merge branch 'master' into upstream-merge-37623 2018-05-22 07:23:41 -05:00
LetterJay
6489ef5511 Merge pull request #6550 from Citadel-Station-13/upstream-merge-37476
[MIRROR] Uppercases slot defines.
2018-05-21 11:23:02 -05:00
LetterJay
6060df5b92 Merge pull request #6554 from Citadel-Station-13/upstream-merge-37267
[MIRROR] Adds log and management tabs to permissions panel
2018-05-21 08:42:21 -05:00
LetterJay
0758204515 Merge branch 'master' into upstream-merge-37476 2018-05-20 23:12:07 -05:00
Jordan Brown
a61457cd47 Merge pull request #37838 from Jordie0608/ithoughtaboutmakingthissendanemailbutidontwanttodrownmyinbox
Query debug logging
2018-05-17 21:38:41 -05:00
deathride58
6a07a66cb3 Merge branch 'master' into upstream-merge-37476 2018-05-06 07:07:02 +00:00
Jordie
49e46eea5b Some dbadmin fixes 2018-05-04 05:15:11 -05:00
kevinz000
3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
oranges
48ef6d2349 Adds log and management tabs to permissions panel 2018-04-27 20:26:42 -05:00
oranges
7d45e045a3 Uppercases slot defines. 2018-04-27 20:14:39 -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