LetterJay
fd6df15f93
Merge branch 'master' into upstream-merge-26131
2017-05-02 09:19:49 -05:00
LetterJay
3b8484b52b
Merge pull request #579 from Citadel-Station-13/upstream-merge-26129
...
[MIRROR] Unorphans the blackbox
2017-05-02 05:13:49 -05:00
LetterJay
a8e6de5795
manual merge
2017-05-02 05:06:13 -05:00
LetterJay
4a6ffec412
rej cleanup
2017-05-02 04:56:46 -05:00
LetterJay
7ab8ee8cae
Merge pull request #581 from Citadel-Station-13/upstream-merge-26524
...
[MIRROR] Admin proc calls are now serialized per admin
2017-05-02 04:51:43 -05:00
CitadelStationBot
34a701a1bc
You can no longer queue up ahelps by queing up prompts
2017-05-01 11:38:04 -05:00
LetterJay
a3eec6c8f9
Merge pull request #670 from Citadel-Station-13/upstream-merge-26713
...
[MIRROR] [s] SDQL security patches
2017-05-01 08:11:36 -05:00
LetterJay
31ea9cb309
Merge pull request #657 from Citadel-Station-13/upstream-merge-26689
...
[MIRROR] [s] Patches SDQL exploits that can return world reference
2017-05-01 08:11:22 -05:00
LetterJay
dd904e3640
Merge pull request #663 from Citadel-Station-13/upstream-merge-26736
...
[MIRROR] >You have to advanced proccall your client to see who griefed with kudzu (Fixes botany investigate logs being inaccessible with normal means.)
2017-05-01 08:02:44 -05:00
LetterJay
d46b85e9ed
Merge pull request #653 from Citadel-Station-13/upstream-merge-26676
...
[MIRROR] Fix SDQL vars again
2017-05-01 07:59:42 -05:00
CitadelStationBot
fbe0803699
[s] SDQL security patches
2017-04-30 11:30:44 -05:00
CitadelStationBot
3799c28620
>You have to advanced proccall your client to see who griefed with kudzu (Fixes botany investigate logs being inaccessible with normal means.)
2017-04-30 10:24:27 -05:00
CitadelStationBot
9ef9161537
[s] Patches SDQL exploits that can return world reference
2017-04-29 16:59:08 -05:00
CitadelStationBot
c6544f20fd
Fix SDQL vars again
2017-04-29 16:36:36 -05:00
LetterJay
29720a0bb5
Update randomverbs.dm
2017-04-29 12:01:32 -05:00
LetterJay
06bfa8770e
Merge branch 'master' into upstream-merge-26129
2017-04-29 11:45:37 -05:00
LetterJay
991fb8335c
manual merge
2017-04-29 11:42:28 -05:00
LetterJay
101f1337a6
manual merge
2017-04-29 07:43:07 -05:00
CitadelStationBot
29fd2c6de6
Option for admins to show a song's title
2017-04-28 21:02:52 -05:00
LetterJay
a39b40d879
Merge pull request #578 from Citadel-Station-13/upstream-merge-25981
...
[MIRROR] Initialize Refactor
2017-04-28 09:29:00 -05:00
LetterJay
085b421348
rej fixes
2017-04-28 09:03:56 -05:00
LetterJay
f7fa4d9843
Merge pull request #615 from Citadel-Station-13/upstream-merge-26187
...
[MIRROR] Adds a delete verb to the vv_drop_down
2017-04-28 08:18:07 -05:00
CitadelStationBot
6e874d1089
Fixes ircadminwho making the wrong list check
2017-04-27 17:56:36 -05:00
CitadelStationBot
df4f3aaaad
Adds a delete verb to the vv_drop_down
2017-04-27 17:10:44 -05:00
CitadelStationBot
d77a2bf87d
Fixes SDQL global procs
2017-04-27 09:13:33 -05:00
CitadelStationBot
dc1f664608
Admin proc calls are now serialized per admin
2017-04-26 17:14:40 -05:00
CitadelStationBot
08a01aa11b
Refactors roundstart checks slightly
2017-04-26 17:06:29 -05:00
CitadelStationBot
bde5d6253a
Unorphans the blackbox
2017-04-26 17:05:23 -05:00
CitadelStationBot
cea81a3357
Initialize Refactor
2017-04-26 16:03:17 -05:00
CitadelStationBot
a905c15dad
Replaces /image with /mutable_appearance ( #556 )
...
* Replaces /image with /mutable_appearance, where appropriate
* Update miscellaneous.dm
* Delete miscellaneous.dm.rej
* Delete pet.dm.rej
* Update pet.dm
* Update species.dm
* Update miscellaneous.dm
* Update species.dm
* Update miscellaneous.dm
* Delete species.dm.rej
* Update species.dm
pretty sure I got all the indentation correct THIS time, ffs
* Update species.dm
* Update species.dm
fucking tabs man, fucking tabs.
2017-04-26 08:18:35 -05:00
LetterJay
6dc70fc02f
Merge pull request #526 from Citadel-Station-13/upstream-merge-26289
...
[MIRROR] Changed alternate appearances to /datum/atom_hud s
2017-04-25 21:39:14 -05:00
CitadelStationBot
607868a5de
[s]Exploit whack-a-mole
2017-04-25 01:31:50 -05:00
LetterJay
e27c5c8db3
Merge pull request #545 from Citadel-Station-13/upstream-merge-26397
...
[MIRROR] Fixes easter eggs spawning during non-easter; SSevent now inits before SSticker
2017-04-25 01:02:38 -05:00
LetterJay
6070000c9a
Merge pull request #537 from Citadel-Station-13/upstream-merge-26485
...
[MIRROR] Renames "Hard Reset" to "Reboot World"
2017-04-24 21:23:31 -05:00
LetterJay
8c56134f56
Merge pull request #478 from Citadel-Station-13/upstream-merge-26341
...
[MIRROR] Adds a link to individual logs on the player panel and moves the other one
2017-04-24 19:57:08 -05:00
CitadelStationBot
4baa357739
Fixes easter eggs spawning during non-easter; SSevent now inits before SSticker
2017-04-24 18:07:12 -05:00
CitadelStationBot
9868ae6036
Renames "Hard Reset" to "Reboot World"
2017-04-24 14:24:27 -05:00
CitadelStationBot
4025652c11
Fixes Advanced Proc Call
2017-04-24 10:05:15 -05:00
CitadelStationBot
387caa518f
Changed alternate appearances to /datum/atom_hud s
2017-04-23 13:26:08 -05:00
CitadelStationBot
7dc86aa2db
Fix current_ticket.initiator not being set when a client relogs ( #520 )
2017-04-23 01:36:14 -05:00
CitadelStationBot
a50d9e9860
Secrets panel logging is better
2017-04-22 07:08:28 -05:00
Poojawa
f866139c52
Admin ticket tgstyle ( #493 )
...
* some porting
* other changes
2017-04-20 22:00:47 -05:00
LetterJay
de2d0985c4
Merge pull request #440 from Citadel-Station-13/upstream-merge-26134
...
[MIRROR] Refactors dbcon into a subsystem
2017-04-19 20:46:02 -05:00
CitadelStationBot
77df269541
Removes a colon
2017-04-19 09:30:58 -05:00
CitadelStationBot
1993b8a48e
Adds a link to individual logs on the player panel and moves the other one
2017-04-19 06:04:32 -05:00
CitadelStationBot
278cbbaf35
Refactors dbcon into a subsystem
2017-04-17 09:46:09 -05:00
TalkingCactus
abd7f2b348
Cleans Up Rejected Mirror files ( #414 )
...
* bang
* updates tgstation.dme
* fixes missing stylesheet entries
* updates the map
includes backup map file
* removes ten billion runtimes
2017-04-15 17:55:53 -04:00
CitadelStationBot
fe57757fd7
Adds a proc to check if the current thread is from an admin advanced proc call ( #400 )
2017-04-15 14:41:36 -04:00
Poojawa
9e72b1b8fd
/tg/ 4/14 ( #367 )
...
* outside code stuff
* defines, helpers, etc
* everything not module
* modules
* compiled fixes + missing sounds
2017-04-14 23:28:04 -05:00
Poojawa
7e9b96a00f
April sync ( #360 )
...
* Maps and things no code/icons
* helpers defines globalvars
* Onclick world.dm orphaned_procs
* subsystems
Round vote and shuttle autocall done here too
* datums
* Game folder
* Admin - chatter modules
* clothing - mining
* modular computers - zambies
* client
* mob level 1
* mob stage 2 + simple_animal
* silicons n brains
* mob stage 3 + Alien/Monkey
* human mobs
* icons updated
* some sounds
* emitter y u no commit
* update tgstation.dme
* compile fixes
* travis fixes
Also removes Fast digest mode, because reasons.
* tweaks for travis Mentors are broke again
Also fixes Sizeray guns
* oxygen loss fix for vore code.
* removes unused code
* some code updates
* bulk fixes
* further fixes
* outside things
* whoops.
* Maint bar ported
* GLOBs.
2017-04-13 23:37:00 -05:00
