shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,885 Commits 5 Branches 0 Tags
b0c94deff3e15a76743afef26c58f309d44a81b2
Commit Graph

38 Commits

Author SHA1 Message Date
LetterJay
25e933f63f Update CODEOWNERS 2018-01-28 15:17:16 -06:00
Leo
2e424d70a5 Fixes CODEOWNERS conflict 2018-01-28 13:33:11 -06:00
Jordan Brown
504815d117 Merge pull request #34825 from Anonmare/patch-3 
Buffs the Contributing Guide (Fixes a typo)
 2018-01-24 10:06:12 -06:00
LetterJay
65733375bd Merge pull request #5043 from Citadel-Station-13/upstream-merge-34804 
[MIRROR] Expands our worst rule
 2018-01-23 08:23:49 -06:00
LetterJay
abf98762c8 Update CODEOWNERS 2018-01-23 08:17:53 -06:00
oranges
bf3e314092 Merge pull request #34804 from tgstation/KorPhaeron-patch-1 
Expands our worst rule
 2018-01-23 01:52:27 -06:00
Leo
bd5ec4eee3 Adds the Wjohn as /icons folder codeowner 2018-01-22 16:48:54 -06:00
Jordan Brown
204759aee8 Readability over micro-optimizations (#34646) 2018-01-21 04:22:09 -06:00
oranges
53ac5588c1 Merge pull request #34494 from tgstation/KorPhaeron-patch-1 
Adds a line about alien species to contributing.md
 2018-01-17 00:25:14 -06:00
LetterJay
ae8b59937b Merge pull request #4629 from Citadel-Station-13/upstream-merge-33987 
[MIRROR] Removes some periods from contributing.md
 2018-01-02 15:45:58 -06:00
FrozenGuy5
bed61a6676 removes some dots (#33987) 2018-01-01 20:46:43 -06:00
Jordan Brown
cf978b0f52 Adds a note on config changes to CONTRIBUTING (#33964) 2018-01-01 04:00:59 -06:00
LetterJay
747ba20ded Merge pull request #4410 from Citadel-Station-13/upstream-merge-33572 
[MIRROR] Pings maintainers to review PRs in areas they are familiar with
 2017-12-18 15:19:48 -06:00
Jordan Brown
67ad417291 Pings maintainers to review PRs in areas they are familiar with (#33572) 
* Pings maintainers to review PRs in areas they are familiar with

* Add ShizCalev to _maps

* air.dm

* Forgot this

* Fix ShizCalev

* Added more
 2017-12-17 04:10:51 -06:00
LetterJay
7af461539f Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC" 2017-12-16 13:08:50 -06:00
Jordan Brown
533c716e56 Further emphasises the importance of round ID in issue template (#33538) 
* Further emphasises the importance of round ID in issue template

* Update statbus url. Add server note
 2017-12-15 14:07:20 -06:00
kevinz000
253c819bc1 TG Sync 12/15/17 
s

s
 2017-12-15 06:27:57 -08:00
Jordan Brown
dda9a4f57c Emphasises the importance of round ID in issue template 2017-12-05 03:23:38 -06:00
oranges
1ea7f146bf Merge pull request #31811 from ShizCalev/mapping-standards 
Adds mapping standards to CONTRIBUTING.md
 2017-10-19 03:54:05 -05:00
Jordan Brown
5c6503c206 Updates out of date URL in CONTRIBUTING.md (#31573) 2017-10-12 12:42:31 -05:00
CitadelStationBot
eb36f34267 [MIRROR] Specifies one format of variable declaration for the codebase. (#2895) 
* Specifies one format of variable declaration for the codebase.

* dumb mirroring
 2017-09-22 23:35:36 -05:00
CitadelStationBot
15c321108f [MIRROR] Update ISSUE_TEMPLATE and PULL_REQUEST_TEMPLATE (#2826) 
* Update ISSUE_TEMPLATE and PULL_REQUEST_TEMPLATE (#30799)

* Improve .github/ISSUE_TEMPLATE.md

* Improve .github/PULL_REQUEST_TEMPLATE.md

* Short message about Show Server Revision

* Re-add the admin note to ISSUE_TEMPLATE

* [Note] -> [Directions]

* Update ISSUE_TEMPLATE and PULL_REQUEST_TEMPLATE
 2017-09-17 22:41:55 -05:00
CitadelStationBot
7cd8cde132 Add note about regex and schema version to contributing.md 2017-08-26 11:07:29 -05:00
LetterJay
188193eb61 here we go again (#2456) 2017-08-24 19:24:25 -07:00
CitadelStationBot
7e351b9b8e ❄ --- ==== D E E P F R E E Z E ==== --- ❄ 2017-08-15 05:09:00 -05:00
CitadelStationBot
4a1126e73e Adds some contributing guidelines (#2118) 2017-07-24 15:11:12 -07:00
CitadelStationBot
51ae2fb9b7 Fixes formatting (#2009) 2017-07-14 19:30:48 -07:00
CitadelStationBot
5f8c523cc2 Request only the round ID in the issue template 2017-07-07 15:03:17 -05:00
Poojawa
b1b4826c0c July 5th TG sync (#1883) 
July 5th TG sync
 2017-07-05 22:14:19 -05:00
CitadelStationBot
9e4b55b2c4 Adds sql insert note (#833) 2017-05-10 16:17:56 -07:00
TalkingCactus
4c92b2c6ce another typo caught 2017-05-03 07:46:23 -04:00
TalkingCactus
f5fce8eeee typo fix 2017-05-03 07:22:08 -04:00
TalkingCactus
3f77a10266 Update ISSUE_TEMPLATE.md 
makes issues less intimidating by removing unnecessary information.
 2017-05-03 07:16:20 -04:00
CitadelStationBot
a87f1d2418 Adds note about unrelated new to initialize changes. 2017-04-18 18:05:40 -05: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
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