14 Commits

Author	SHA1	Message	Date
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
Poojawa	b1b4826c0c	July 5th TG sync (#1883) ... July 5th TG sync	2017-07-05 22:14:19 -05:00
LetterJay	d04001c09d	another huge sync	2017-06-21 18:00:00 -05:00
CitadelStationBot	20dd169998	Fixes ordering of text2file params	2017-05-21 22:29:19 -05:00
CitadelStationBot	fe60185171	Initialize failures are now sent to their own logfile (#1015)	2017-05-18 12:38:28 -05:00
LetterJay	085b421348	rej fixes	2017-04-28 09:03:56 -05:00
CitadelStationBot	cea81a3357	Initialize Refactor	2017-04-26 16:03:17 -05:00
CitadelStationBot	4baa357739	Fixes easter eggs spawning during non-easter; SSevent now inits before SSticker	2017-04-24 18:07:12 -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	7ad5e22830	Wew lad (#305) ... * 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 * based cyberboss. * you'd think github would suck less. * vendors * tweaks and specialty vendors. * map things * go away shitty omega * qdeletion spam supress, maps.txt tweaks * shuttle lights	2017-03-22 02:55:33 -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
Poojawa	0bca862419	Overhauls and 2/28 sync (#244) ... * map tweaks/shuttle engines * helpers and defines * global/onclick * controllers and datums * mapping * game folder * some other stuff * some modules * modules that aren't mobs * some mob stuff * new player stuff * mob living * silicon stuff * simple animal things * carbon/ayylmao * update_icons * carbon/human * sounds and tools * icons and stuff * hippie grinder changes + tgui * kitchen.dmi * compile issues fixed * mapfix * Mapfixes 2.0 * mapedit2.0 * mapmerger pls * Revert "mapedit2.0" This reverts commit 74139a3cacea10df7aafca06c0a10bd3daf3a481. * clean up vore folder + 2 hotfixes * admin ticket refinement * Blob tweaks and LAZYADD * LAZYADD IS LAZY * Magic strings purged * DEFINES NEED HIGHER PRIORITIES * Only a sleepless idiot deals in absolute TRUE|FALSE * u h g * progress bar fix * reverts ticket logs * there's always that one guy * fixes and stuff * 2/27 fixes * game folder stuff * stats * some modules again * clothing stuff gets vg clothing out of the main files * everything not mobs again * mob stuff * maps, tgui, sql stuff * icons * additional fixes and compile errors * don't need this anymore * Oh right this isn't needed anymore * maint bar re-added * that doesn't need to be here * stupid events * wtfeven * probably makes Travis happy * don't care to fix the grinder atm * fixes vending sprites, changes turret * lethal, not lethals * overylays are finicky creatures * lazy fix for bleeding edgy (#252) * map tweaks/shuttle engines * helpers and defines * global/onclick * controllers and datums * mapping * game folder * some other stuff * some modules * modules that aren't mobs * some mob stuff * new player stuff * mob living * silicon stuff * simple animal things * carbon/ayylmao * update_icons * carbon/human * sounds and tools * icons and stuff * hippie grinder changes + tgui * kitchen.dmi * compile issues fixed * mapfix * Mapfixes 2.0 * mapedit2.0 * mapmerger pls * Revert "mapedit2.0" This reverts commit 74139a3cacea10df7aafca06c0a10bd3daf3a481. * clean up vore folder + 2 hotfixes * admin ticket refinement * Blob tweaks and LAZYADD * LAZYADD IS LAZY * Magic strings purged * DEFINES NEED HIGHER PRIORITIES * Only a sleepless idiot deals in absolute TRUE|FALSE * u h g * progress bar fix * reverts ticket logs * there's always that one guy * fixes and stuff * 2/27 fixes * game folder stuff * stats * some modules again * clothing stuff gets vg clothing out of the main files * everything not mobs again * mob stuff * maps, tgui, sql stuff * icons * additional fixes and compile errors * don't need this anymore * Oh right this isn't needed anymore * maint bar re-added * that doesn't need to be here * stupid events * wtfeven * probably makes Travis happy * don't care to fix the grinder atm * fixes vending sprites, changes turret * lethal, not lethals * overylays are finicky creatures	2017-02-28 09:30:49 -06:00