LetterJay
|
92c347d068
|
Merge branch 'master' into upstream-merge-33246
|
2017-12-20 00:27:06 -06:00 |
|
LetterJay
|
7af461539f
|
Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"
|
2017-12-16 13:08:50 -06:00 |
|
kevinz000
|
253c819bc1
|
TG Sync 12/15/17
s
s
|
2017-12-15 06:27:57 -08:00 |
|
Kyle Spier-Swenson
|
55247e9bdf
|
Deadmin tweaks: Admins without +AUTOLOGIN start deadmined. AUTOLOGIN defaults to on.
|
2017-12-13 21:04:00 -06:00 |
|
AnturK
|
6bfca33a78
|
Roundend report refactor
|
2017-12-11 10:58:23 -06:00 |
|
Jordan Brown
|
4b297f509e
|
512 forward compatibility merge
|
2017-10-29 10:28:36 -05:00 |
|
Jordan Brown
|
e5ef3d2405
|
Configuration datum refactor
|
2017-09-28 21:37:53 -05:00 |
|
ShizCalev
|
169aa85d9c
|
DisplayTimeText mk2
|
2017-09-24 18:59:57 -05:00 |
|
kevinz000
|
93647d77ad
|
[DNM] Fixes the codebase (#2556)
* fixes stuff
* goddamnit flags
|
2017-08-30 00:08:40 -07:00 |
|
kevinz000
|
35b7b93b24
|
ok this is going to be a pain in the ass ain't it (#2458)
lets hope nothing blows up this time (Flags PR but it works!)
|
2017-08-22 05:01:38 -07:00 |
|
kevinz000
|
6a309b5996
|
Revert "[MIRROR] Replace all secondary flags with bitflags stored in the flags_2 var" (#2457)
ok you know what yeah i think i'll properly mirror https://github.com/Citadel-Station-13/Citadel-Station-13/pull/2411
|
2017-08-22 04:04:21 -07:00 |
|
LetterJay
|
b01a24c95b
|
my eyes hurt
|
2017-08-22 01:42:20 -05:00 |
|
TalkingCactus
|
cb5247d060
|
Fixes Gamemode Voting & Map Edits (#1937)
* fixes roundtype voting
* keg spawner
* maint bar to box and kinkmates to delta+meta
|
2017-07-07 17:54:53 -04:00 |
|
Poojawa
|
b1b4826c0c
|
July 5th TG sync (#1883)
July 5th TG sync
|
2017-07-05 22:14:19 -05:00 |
|
CitadelStationBot
|
83b4c1d8d4
|
Adds round table to replace tacking some data in feedback table
|
2017-05-26 15:18:16 -05:00 |
|
LetterJay
|
e0f65beb37
|
World > SSticker
|
2017-05-22 12:31:05 -05:00 |
|
Poojawa
|
186ed2acbb
|
Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-27268
|
2017-05-21 00:44:08 -05:00 |
|
CitadelStationBot
|
94b7e560ab
|
World.dm Refactor
|
2017-05-18 16:37:46 -05:00 |
|
CitadelStationBot
|
4463646952
|
[MIRROR] MC Runlevels (#988)
* MC Runlevels
* Update ticker.dm
* Delete ticker.dm.rej
|
2017-05-18 12:42:43 -05:00 |
|
CitadelStationBot
|
7a4f1496e9
|
Changes a lot of ticker and ticker.mode checks to SSticker.hasRoundStarted
|
2017-05-01 07:24:45 -05:00 |
|
TalkingCactus
|
6f0aa809df
|
Patches for 4/18/17 (#454)
* fixes modular receiver sprites
* fixes legs rendering for taurs
* fixes shoes not rendering in UI for nagas
* typo fix in preferences.dm
* crewsimov
* Revert "fixes legs rendering for taurs"
This reverts commit 8a64c0c80af8a6798639bb151d1448eeb454ac5d.
* fixes looc logging
* fixes gamemode voting
* admin respawn bypass
* thanks GitHub Desktop
totally wanted to omit the very important if()
* proc tweak
* savefile sanitizing
|
2017-04-18 18:38:23 -04: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 |
|