kevinz000
102b28b1c1
Delete deadsay.dm.rej
2017-05-06 21:28:23 -07:00
LetterJay
f2f42091f3
Merge branch 'master' into upstream-merge-26685
2017-05-05 09:42:36 -05:00
LetterJay
5d0f7eafaa
Merge pull request #719 from Citadel-Station-13/upstream-merge-26771
...
[MIRROR] Removes vestigial list from minds.
2017-05-05 09:40:28 -05:00
LetterJay
da4e4bbefe
Merge pull request #707 from Citadel-Station-13/upstream-merge-26746
...
[MIRROR] Makes admin sound announcement use the right span
2017-05-05 09:39:04 -05:00
LetterJay
91f3059be1
Merge pull request #693 from Citadel-Station-13/upstream-merge-26722
...
[MIRROR] Moves tips from config to strings tree
2017-05-05 09:33:45 -05:00
LetterJay
007281a51c
Revert "[MIRROR] You can no longer queue up ahelps by queing up prompts"
2017-05-02 18:53:59 -05:00
CitadelStationBot
7baccb8b85
Removes vestigial list from minds.
2017-05-02 12:47:20 -05:00
LetterJay
4ecbec1406
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-26720
2017-05-02 11:36:27 -05:00
LetterJay
6310292531
woo
2017-05-02 11:19:14 -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
b45d4ba668
Makes admin sound announcement use the right span
2017-05-01 17:32:29 -05:00
CitadelStationBot
529125d3dd
Moves tips from config to strings tree
2017-05-01 11:51:27 -05:00
CitadelStationBot
34a701a1bc
You can no longer queue up ahelps by queing up prompts
2017-05-01 11:38:04 -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
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
7a4f1496e9
Changes a lot of ticker and ticker.mode checks to SSticker.hasRoundStarted
2017-05-01 07:24:45 -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
CitadelStationBot
f972199a15
Fixed Dsay always causing a disk read
2017-04-29 15:44:51 -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
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
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
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
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
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
TalkingCactus
89a99d78d1
Adminhelp prompts will now be larger to allow you to proofread large responses and PMs ( #345 )
...
* bigger box
* even bigger
well not really, but it's better anyway
* fuck i didn't tick these
* bigger /me input
double emote size as well, stop complaining about cutoffs and don't make
me regret this
* cleanup
2017-04-09 05:53:44 -04:00
