2a6e4fce59
Photography Update
2018-07-20 15:26:13 -07:00
3e18d8208e
Updates to tgstation commit 78e471d
2018-07-05 01:22:27 -04:00
ac6fddcfb3
Merge remote-tracking branch 'upstream/master' into hopefullythefinalhardsync
2018-07-05 00:17:44 -04:00
7f0c82b0ba
[MIRROR] SDQL where filter message is now correct ( #7309 )
...
* Merge pull request #38853 from optimumtact/seequeuedeeall
SDQL where filter message is now correct
* SDQL where filter message is now correct
2018-07-03 09:14:00 -07:00
b1688405d9
and finally, the modules folder. Now I can publish and take a break
2018-07-02 01:19:37 -04:00
acd10b02cf
Merge pull request #7195 from Citadel-Station-13/upstream-merge-38574
...
[MIRROR] Global component signals
2018-06-24 18:20:17 -05:00
72bc5121bd
Merge pull request #7233 from Citadel-Station-13/upstream-merge-38653
...
[MIRROR] Ports more things to Initialize
2018-06-24 18:12:40 -05:00
a73bfd0913
Ports more things to Initialize ( #38653 )
2018-06-24 05:17:15 -05:00
4e89973d0b
Merge pull request #38637 from DaxDupont/create-antag
...
Makes create antags check for on station.
2018-06-21 18:19:13 -05:00
c11557d23d
Global component signals
2018-06-19 17:18:34 -05:00
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
cf96c7dd11
Dsay now shows admin rank instead of ADMIN ( #38555 )
...
* Dsay now shows admin rank instead of ADMIN
* All caps to protect the dongs of our admemes
2018-06-18 19:17:55 -05:00
03a22ca16d
[MIRROR] Transit space refactor ( #7130 )
...
* Transit space refactor
* Update bitfields.dm
2018-06-18 11:51:02 -07:00
98f6e8def0
Update randomverbs.dm
2018-06-16 16:47:19 -05:00
162b827033
Update topic.dm
2018-06-16 16:44:42 -05:00
68d33c79de
Update admin_verbs.dm
2018-06-16 16:43:48 -05:00
7f6f8eb21f
Update admin.dm
2018-06-16 16:43:23 -05:00
b4edde2c0a
Add syndicate headset messages, squashes both together.
2018-06-16 06:19:29 -05:00
1d0f775f56
Merge pull request #38360 from ShizCalev/key-cleanup
...
Cleans up some logging
2018-06-11 22:29:27 -05:00
cc4ffe31dd
[MIRROR] Fixes note/message interface flooding the string tree. ( #7048 )
...
* Merge pull request #38379 from MrStonedOne/fasternotes
Fixes note/message interface flooding the string tree.
* Fixes note/message interface flooding the string tree.
2018-06-10 12:32:10 -07:00
8413eb2888
[MIRROR] Squashes traitors under one path ( #7049 )
...
* Squashes traitors under one path (#38332 )
* Squashes traitors under one path
2018-06-10 12:30:00 -07:00
e279392386
Merge pull request #6962 from Citadel-Station-13/upstream-merge-38128
...
[MIRROR] Standardizes and cleans up some admin messages & logging
2018-06-09 05:53:25 +00:00
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
71f684e5d8
Admin Supplypod tweaks (Behaves like fireballs, also stuns targets) ( #38290 )
...
* Arianya
* whups caps
2018-06-05 18:02:36 -05:00
678e429dbf
Adds a Supplypod-delivery admin smite ( #38069 )
...
* wa la
* oop forgot an icon
* buildmode compatibility
* ok
* makes centcompod default
* CentCom pods fall faster and are capatilized right
* yike
* yike2
* FASTER
* white space and default icon state
* spacemaniac thanks
2018-06-04 00:37:24 -05:00
67841c3f19
Fixes pocket items being deleted when monkeyizing ( #38220 )
2018-06-03 09:04:08 -05:00
91351e1f1f
Merge pull request #6970 from Citadel-Station-13/upstream-merge-38172
...
[MIRROR] allows changing the rank of players in the playerpanel
2018-06-02 07:28:31 -05:00
3b6e5236bf
allows changing the rank of players in the playerpanel ( #38172 )
...
* allows changing the rank of players in the playerpanel
* Update permissionedit.dm
* Update permissionedit.dm
2018-06-01 08:26:25 -05:00
4ae974644c
Standardizes and cleans up some admin messages & logging
2018-05-31 22:41:31 -05:00
bc671f35f8
Fix rank changing with legacy only rank loading ( #38160 )
...
Legacy only rank loading would block any permanent rank changing.
Now only blocks adding a new rank to the db.
2018-05-31 22:40:40 -05:00
340c6d2e83
Merge pull request #6824 from Citadel-Station-13/kevinz000-patch-1
...
Roll Dice Verb
2018-06-01 01:46:14 +00:00
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
15085c732f
Update admin_verbs.dm
2018-05-27 17:19:48 -07:00
45dcee8f29
Merge pull request #6891 from Citadel-Station-13/upstream-merge-38047
...
[MIRROR] Sync permanent admin removals to the players table immediately
2018-05-25 22:52:27 -05:00
1a87aa1b33
Merge pull request #6890 from Citadel-Station-13/upstream-merge-38052
...
[MIRROR] Fixes accidental empty ahelp replies
2018-05-25 22:51:51 -05:00
ccb8a98a85
Merge pull request #38047 from tgstation/MrStonedOne-patch-1
...
Sync permanent admin removals to the players table immediately
2018-05-25 10:37:22 -05:00
6ecadf6d93
Fixes accidental empty ahelp replies ( #38052 )
2018-05-25 09:36:23 -05:00
f41df8a925
Fix template preview being invisible on space turfs ( #37971 )
2018-05-25 07:35:31 -05:00
63a857901f
Merge pull request #6642 from Citadel-Station-13/upstream-merge-37623
...
[MIRROR] Some dbadmin fixes
2018-05-23 22:26:22 -05:00
9f8ef69014
Merge pull request #37986 from AutomaticFrenzy/patch/sneaky-cyberboss
...
Fix global proccalls not working
2018-05-22 22:12:30 -05:00
664f2ac150
Merge branch 'master' into upstream-merge-37623
2018-05-22 07:23:41 -05:00
ec14a7c7ef
Merge pull request #37944 from AutomaticFrenzy/patch/irv-jquery
...
Remove second copy of jQuery used only by IRV polls
2018-05-21 16:33:42 -05:00
6489ef5511
Merge pull request #6550 from Citadel-Station-13/upstream-merge-37476
...
[MIRROR] Uppercases slot defines.
2018-05-21 11:23:02 -05:00
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
4582ed8c11
Update admin_verbs.dm
2018-05-21 02:34:03 -07:00
db415cb507
Update dice.dm
2018-05-21 02:32:14 -07:00
2fd45f4eeb
Create dice.dm
2018-05-21 02:31:14 -07:00
0758204515
Merge branch 'master' into upstream-merge-37476
2018-05-20 23:12:07 -05:00
ea9b3622fd
Merge branch 'master' into upstream-merge-37476
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2018-05-20 23:11:16 -05:00
75144686a4
Update permissionedit.dm
2018-05-20 16:38:29 -05:00
kevinz000