shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,489 Commits 5 Branches 0 Tags
b11e600cff1cf8d2e73f2f110a787dba4df8756a
Commit Graph

60 Commits

Author SHA1 Message Date
Poojawa
5518efebea everything but mob stuff 2018-04-23 01:06:17 -05:00
deathride58
f33d77a073 Merge pull request #6323 from Citadel-Station-13/upstream-merge-37065 
[MIRROR] Fixes escape pods not getting to their default destination
 2018-04-10 07:47:00 +00:00
deathride58
96191b8b6a Update emergency.dm 2018-04-10 03:15:27 -04:00
Emmett Gaines
fd8a80d6cb Fixes escape pods not getting to their default destination 2018-04-09 05:24:55 -05:00
Poojawa
5fa001c10f things with stuff (#6233) 
* buncha things from upstream

* datums globals, onclick

* datums

* game folder, holy shit mirror bot why

* modules

* icons

* dme

* compiles cleanly

* tools purge

* updates maps

* double check just because. and wew lad

* incidentally, this needs more work first

* some things

* weh

* sound cleanup and icons

* reeeee

* compile issues

* oh look, fresh code sync

* cleans up some unused icons

* dirty vars

* reeeeeeeeeeeeeeee

* wew lad. fuck off with this already
 2018-04-07 23:07:09 -04:00
CitadelStationBot
1d6d8b454c [MIRROR] Defaults auxbase/escape pod/assault pod/elevator port timidity to FALSE (#6017) 
* Defaults auxbase/escape pod/assault pod/elevator port timidity to FALSE

* FUCK (#36483)

F A L S E
semicolon be gone
 2018-03-19 21:12:46 -05:00
Poojawa
6c7da493d9 Reee mirror bot. Hard syncs some missed PR stuff + maps (#5951) 
* maps and tgui

* missed defines and helpsers

* controller things

* datums

* game folder stuff

* module things

* icons

* stragglers

* map sync and updating

wew lad
 2018-03-14 16:49:40 -05:00
CitadelStationBot
9e229691cc Fixes clockwork sigil candidate runtime, cleans up some jobban checks with defines (#5304) 2018-02-05 04:23:09 -06:00
Poojawa
03086dfa91 Tg 1 28 sync testing/confirmation (#5178) 
* maps, tgui, tools

* defines and helpers

* onclick and controllers

* datums

fucking caught that hulk reversal too.

* game and shuttle modular

* module/admin

* oh god they fucking moved antag shit again

* haaaaate. Haaaaaaaaaate.

* enables moff wings

* more modules things

* tgstation.dme

before I forget something important

* some mob stuff

* s'more mob/living stuff

* some carbon stuff

* ayy lmaos and kitchen meat

* Human stuff

* species things

moff wings have a 'none' version too

* the rest of the module stuff.

* some strings

* misc

* mob icons

* some other icons.

* It compiles FUCK BORERS

FUCK BORERS
 2018-01-29 04:42:29 -06:00
kevinz000
47c74443da Fixes negative auth coutns 2018-01-16 07:40:29 -06:00
deathride58
aabbbb9dff aaaand the rest of the modules folder 2018-01-04 01:45:38 -05:00
Emmett Gaines
8cf30a65fb dock() re-organization 2017-12-18 21:23:58 -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
vuonojenmustaturska
7f90427a40 Replaces a bunch of loc assignments with forcemoves and moves to nullspace 2017-12-13 13:56:57 -06:00
Jordan Brown
4b297f509e 512 forward compatibility merge 2017-10-29 10:28:36 -05:00
oranges
6278d49662 Href tokens 2017-09-24 17:34:37 -05:00
pubby
a01f3213f5 Traitorbro gamemode 2017-09-17 18:03:12 -05:00
CitadelStationBot
82d0aae420 [MIRROR] Changes shuttle port direction var from an angle to a dir (#2613) 
* Changes shuttle port direction var from an angle to a dir

* actually ports the directions

* Update shuttle.dm

* how
 2017-09-13 20:39:55 -05:00
LetterJay
a960b63b0a Merge branch 'master' into upstream-merge-30056 2017-09-13 06:08:59 -05:00
LetterJay
c2a41c9b51 commit 2017-09-13 06:04:22 -05:00
LetterJay
92e055be97 Quick sync (#2587) 
* sync since the mirror was down

* fucking byond

* can't forget these
 2017-09-04 04:38:49 -05:00
LetterJay
188193eb61 here we go again (#2456) 2017-08-24 19:24:25 -07:00
CitadelStationBot
cdbaf5c4e8 Standardized CENTCOM spelling 2017-08-08 09:05:44 -05:00
CitadelStationBot
95f900a97d Adds emergency toolbox to escape pod supplies (#2182) 2017-07-29 19:51:55 -07:00
LetterJay
27b826a6f1 Merge pull request #2033 from Citadel-Station-13/upstream-merge-29260 
[MIRROR] Changes all access const to be a define
 2017-07-19 13:18:58 -05:00
CitadelStationBot
e522f715a2 [Ready] Shuttle dock() rewrite (#2040) 2017-07-17 22:52:18 -07:00
CitadelStationBot
609ae007ae Changes all access const to be a define 2017-07-16 11:44:47 -05:00
CitadelStationBot
d21766956e [MIRROR] Cleaned up some emag_acts (#2018) 
* Cleaned up some emag_acts

* Delete port_gen.dm.rej

* Update port_gen.dm
 2017-07-15 13:17:56 -07:00
CitadelStationBot
ff6bbbedf5 Changes some 1s and 0s to TRUE and FALSE (#1967) 2017-07-10 16:13:16 -07:00
Poojawa
b1b4826c0c July 5th TG sync (#1883) 
July 5th TG sync
 2017-07-05 22:14:19 -05:00
CitadelStationBot
ca2d03a082 Moves transit space to separate z level. (#1696) 2017-06-30 20:56:45 -07:00
LetterJay
1c9a15f74d Update emergency.dm 2017-06-29 05:07:12 -05:00
LetterJay
8cd84f7496 Update emergency.dm 2017-06-29 04:44:26 -05:00
CitadelStationBot
1e7c986ab5 Fixes emergency shuttle endgame state 2017-06-28 08:31:55 -05:00
CitadelStationBot
1a38b6fd6f Shuttle engines affecting travel time 2017-06-25 20:53:00 -05:00
LetterJay
b19115e10f Merge branch 'master' into upstream-merge-27454 2017-05-30 23:48:25 -05:00
CitadelStationBot
83b4c1d8d4 Adds round table to replace tacking some data in feedback table 2017-05-26 15:18:16 -05:00
CitadelStationBot
2fadc0e58b Fixes Gang War's infinity shuttle 2017-05-26 11:27:38 -05:00
LetterJay
52fa1f314f Merge branch 'master' into upstream-merge-26760 2017-05-14 01:02:26 -04: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
CitadelStationBot
036109de58 Changes a bunch of hrefs to the proper defines 2017-05-02 02:20:07 -05:00
LetterJay
b57a4aa6b4 Merge branch 'master' into upstream-merge-26386 2017-05-01 15:27:25 -05:00
LetterJay
06bfa8770e Merge branch 'master' into upstream-merge-26129 2017-04-29 11:45:37 -05:00
CitadelStationBot
57a0e05679 Even admin-called shuttles will be affected by alert level 2017-04-27 16:55:12 -05:00
CitadelStationBot
bcab389ca2 New() goes in the trash, we've gotta Initialize() 2017-04-26 17:15:48 -05:00
CitadelStationBot
bde5d6253a Unorphans the blackbox 2017-04-26 17:05:23 -05:00
CitadelStationBot
d931e5801c A bunch of Initialize()s now have return values 2017-04-25 03:51:57 -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
Poojawa
f67e9f6d87 Bleeding edgy refresh (#303) 
* not code stuff

* other things

* global vars, defines, helpers

* onclick hud stuff, orphans, world.dm

* controllers and datums

* game folder

* everything not client/mobs in modules

* client folder

* stage 1 mob stuff

* simple animal things

* silicons

* carbon things

* ayylmaos and monkeys

* hyoomahn

* icons n shit

* sprite fixes

* compile fixes

* some fixes I cherrypicked.

* qdel fixes

* forgot brain refractors
 2017-03-21 11:44:10 -05:00