shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
17,230 Commits 5 Branches 0 Tags
8d8db8d2fef2a57cdaa07376388494f18fd893bd
Commit Graph

723 Commits

Author SHA1 Message Date
LetterJay
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
Nich
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
Jordie
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
deathride58
340c6d2e83 Merge pull request #6824 from Citadel-Station-13/kevinz000-patch-1 
Roll Dice Verb
 2018-06-01 01:46:14 +00: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
kevinz000
15085c732f Update admin_verbs.dm 2018-05-27 17:19:48 -07:00
LetterJay
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
LetterJay
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
Jordan Brown
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
Dax Dupont
6ecadf6d93 Fixes accidental empty ahelp replies (#38052) 2018-05-25 09:36:23 -05:00
Tad Hardesty
f41df8a925 Fix template preview being invisible on space turfs (#37971) 2018-05-25 07:35:31 -05:00
LetterJay
63a857901f Merge pull request #6642 from Citadel-Station-13/upstream-merge-37623 
[MIRROR] Some dbadmin fixes
 2018-05-23 22:26:22 -05:00
Jordan Brown
9f8ef69014 Merge pull request #37986 from AutomaticFrenzy/patch/sneaky-cyberboss 
Fix global proccalls not working
 2018-05-22 22:12:30 -05:00
LetterJay
664f2ac150 Merge branch 'master' into upstream-merge-37623 2018-05-22 07:23:41 -05:00
Jordan Brown
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
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
kevinz000
4582ed8c11 Update admin_verbs.dm 2018-05-21 02:34:03 -07:00
kevinz000
db415cb507 Update dice.dm 2018-05-21 02:32:14 -07:00
kevinz000
2fd45f4eeb Create dice.dm 2018-05-21 02:31:14 -07:00
LetterJay
0758204515 Merge branch 'master' into upstream-merge-37476 2018-05-20 23:12:07 -05:00
LetterJay
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
LetterJay
75144686a4 Update permissionedit.dm 2018-05-20 16:38:29 -05:00
LetterJay
d5a4387c80 Update permissionedit.dm 2018-05-20 02:35:48 -05:00
Armhulen
dc0ab280ac The Run Weather Verb, from "Adds acid geysers and seismic events to lavaland" (#37910) 
* run weather!

* there we go.
 2018-05-19 14:52:21 -05:00
Dax Dupont
6eb9d6daaa Fixes mulligan for mutants (#37895) 2018-05-18 19:52:19 -05:00
Jordan Brown
a61457cd47 Merge pull request #37838 from Jordie0608/ithoughtaboutmakingthissendanemailbutidontwanttodrownmyinbox 
Query debug logging
 2018-05-17 21:38:41 -05:00
deathride58
649314c455 Merge pull request #6682 from Citadel-Station-13/upstream-merge-37429 
[MIRROR] Update DMAPI to version 3.2.1.0
 2018-05-17 18:14:54 +00:00
LetterJay
24b6ee5a6c should make life simpler 2018-05-15 10:05:56 -05:00
LetterJay
14f0f21c88 Update chat_commands.dm 2018-05-13 09:53:04 -05:00
AnturK
1c164ff28f Fixes possession funtime (#37737) 
* Fixes possession funtime

* This should probably be generic backend mob list but i can't think of anything else that would need it.
 2018-05-12 19:26:55 -05:00
Jordan Brown
ff0b19427b Merge pull request #37771 from nichlas0010/patch-1 
lets admins see dsay if they're in-game and unconscious
 2018-05-11 17:30:14 -05:00
Jordan Brown
1a25c685a1 Update DMAPI to version 3.2.1.0 2018-05-08 21:33:58 -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
LetterJay
811cc06188 Merge pull request #6536 from Citadel-Station-13/upstream-merge-37436 
[MIRROR] Adds a stationloving component to replace a couple of flags and SSinbounds with
 2018-04-28 01:36:04 -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
862898526d Gamemode and gamemode vote obfuscation (Plus hub entry rework) (#6276) 
* adds gamemode/gamemode vote obfuscation, redesigns hub entry

* ternaries: the easiest way to obfuscate your code to the point where even you can't read it

* FUCK

* changes the inaccuracy chance from 1/10 to 1/5
 2018-04-27 07:40:45 -07:00
vuonojenmustaturska
d6b48869d8 Adds a stationloving component to replace a couple of flags and SSinbounds with (#37436) 
* station lovin' happened so fast

* Update stationloving.dm

* less qdel memes

* imbue soul signal

* rename imbue soul signal

* dupemode

* henk

* Update atoms_movable.dm

* Update nuclearbomb.dm

* Update nuclearbomb.dm
 2018-04-27 07:37:15 -05:00
deathride58
455216c094 Merge pull request #6525 from Citadel-Station-13/upstream-merge-37337 
[MIRROR] Adds a picker tool to advanced buildmode
 2018-04-27 09:40:12 +00:00
deathride58
3bb8902846 Merge pull request #6518 from Citadel-Station-13/upstream-merge-37413 
[MIRROR] Gives admins the D(say) hotkey + fixes buildmode permissions
 2018-04-27 09:36:44 +00: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
Jordan Brown
4254104676 Merge pull request #37337 from ninjanomnom/buildmode-picker 
Adds a picker tool to advanced buildmode
 2018-04-26 15:26:48 -05:00
Dax Dupont
d0266b01cd Gives admins the D(say) hotkey + fixes buildmode permissions (#37413) 2018-04-25 21:40:05 -05: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
LetterJay
73e798b281 Merge pull request #6470 from Citadel-Station-13/upstream-merge-37304 
[MIRROR] Fixes buildmode trying to build in nullspace.
 2018-04-22 22:19:06 -05:00
LetterJay
5688049a7c Merge pull request #6454 from Citadel-Station-13/upstream-merge-37246 
[MIRROR] Removes href log from admin investigate
 2018-04-22 02:45:14 -05:00