shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,165 Commits 5 Branches 0 Tags
7baccb8b85ffca86c37cb905fe5ca281a656d268
Commit Graph

104 Commits

Author SHA1 Message Date
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
fd6df15f93 Merge branch 'master' into upstream-merge-26131 2017-05-02 09:19:49 -05:00
LetterJay
c6e0c95f42 heh. 2017-05-02 09:17:52 -05:00
LetterJay
fd251eb56a oops 2017-05-02 08:43:10 -05:00
LetterJay
f7fe20887a manual merge 2017-05-02 08:40:10 -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
4a6ffec412 rej cleanup 2017-05-02 04:56:46 -05:00
CitadelStationBot
7a4f1496e9 Changes a lot of ticker and ticker.mode checks to SSticker.hasRoundStarted 2017-05-01 07:24:45 -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
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
d34b65da86 Merge pull request #610 from Citadel-Station-13/upstream-merge-26612 
[MIRROR] Even admin-called shuttles will be affected by alert level
 2017-04-28 08:19:09 -05:00
LetterJay
4873b565a4 Merge pull request #614 from Citadel-Station-13/upstream-merge-26521 
[MIRROR] Fixes templates/ruins not updating area list
 2017-04-28 08:18:31 -05:00
LetterJay
fcb2a3aaf3 Merge pull request #586 from Citadel-Station-13/upstream-merge-26570 
[MIRROR] Fixes some edges cases in the garbage controller
 2017-04-28 08:15:34 -05:00
CitadelStationBot
a0c1f979dc Fixes templates/ruins not updating area list 2017-04-27 17:02:33 -05:00
CitadelStationBot
57a0e05679 Even admin-called shuttles will be affected by alert level 2017-04-27 16:55:12 -05:00
LetterJay
0ebbadbe6c Merge pull request #603 from Citadel-Station-13/upstream-merge-26581 
[MIRROR] Small fix
 2017-04-27 12:47:18 -05:00
CitadelStationBot
1f2c0e898e Small fix 2017-04-27 09:36:25 -05:00
CitadelStationBot
0d58175118 Fixes map rotation with disabled voting 2017-04-27 09:20:53 -05:00
CitadelStationBot
1fcfd0338a Fixes some edges cases in the garbage controller 2017-04-26 17:44:27 -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
73456c9e9a REJECT CLEANUP. FUUUUUUUUUUUUUUUUUUCK. 2017-04-25 21:40:46 -05:00
LetterJay
3d51a07243 world fix 2017-04-25 01:52:49 -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
CitadelStationBot
defa9d863c >We still let old code in the codebase 2017-04-24 21:22:11 -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
4e7f06f775 Copies the loaded titlescreen into the rsc (#518) 2017-04-23 01:50:04 -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
LetterJay
aff05e23aa Update dbcore.dm 2017-04-19 20:39:49 -05:00
LetterJay
95ec46d54b Merge pull request #489 from Citadel-Station-13/upstream-merge-26319 
[MIRROR] Moves simple animal automation from SSmob to SSnpc
 2017-04-19 18:33:18 -05:00
CitadelStationBot
dbd0af6b5c Moves simple animal automation from SSmob to SSnpc 2017-04-19 16:48:45 -05:00
CitadelStationBot
fa17a7680b Adds defines for evenly splitting up a subsystem's time to fire 2017-04-19 16:47:37 -05:00
LetterJay
58d2d4230f Merge pull request #468 from Citadel-Station-13/upstream-merge-26315 
[MIRROR] Micro optimization for handle_breathing
 2017-04-18 20:33:44 -05:00
LetterJay
97016b0872 Merge pull request #460 from Citadel-Station-13/upstream-merge-26323 
[MIRROR] Speeds up lighting initialization
 2017-04-18 20:23:41 -05:00
CitadelStationBot
e0b1c95b79 Micro optimization for handle_breathing 2017-04-18 18:14:03 -05:00
CitadelStationBot
d19efeba8b Speeds up lighting initialization 2017-04-18 18:02:23 -05:00
CitadelStationBot
53ac3bcb82 Normalizes how some lighting things GC 2017-04-18 18:02:20 -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
CitadelStationBot
8260ebcc33 fixes the garbage subsystem not working, at all. 2017-04-17 15:33:01 -05:00
CitadelStationBot
278cbbaf35 Refactors dbcon into a subsystem 2017-04-17 09:46:09 -05:00
CitadelStationBot
2373e2e485 Afk fixup (#412) 2017-04-15 15:45:29 -04:00
CitadelStationBot
61db5a9ba5 Tweaks some procs in garbage to make profiling it better (#394) 2017-04-15 14:46:56 -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