cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-09 16:07:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
33,270 Commits 55 Branches 0 Tags
0b34e20f5641beb15819ad99651d3545e2b21dd8
Commit Graph

29 Commits

Author SHA1 Message Date
Artur
0b34e20f56 https://github.com/tgstation/tgstation/pull/49330/ and https://github.com/tgstation/tgstation/pull/49982/ 2020-04-23 14:19:50 +03:00
Ghommie
b4a7bad2f8 Initial copypasta. 2019-05-21 23:49:33 +02:00
Kyle Spier-Swenson
0844993357 Adds note about correct usage of the dlls section of tgs3.json 2018-04-26 15:20:58 -05:00
Jordan Brown
342a75eff7 Merge pull request #35473 from ShizCalev/contributing-map-standards-update 
Updates CONTRIBUTING.md for MapMerge2
 2018-02-10 10:59:05 -06:00
CitadelStationBot
00e49e1eb9 [MIRROR] Removes a singular word from CONTRIBUTING.md (#5268) 
* Merge pull request #35251 from praisenarsie/patch-26

Removes a singular word from CONTRIBUTING.md

* Removes a singular word from CONTRIBUTING.md
 2018-02-04 23:04:56 -06:00
CitadelStationBot
8a3fed5509 [MIRROR] Adds a note about for loop speed (#5267) 
* Merge pull request #35154 from Iamgoofball/patch-387

Adds a note about for loop speed

* Adds a note about for loop speed
 2018-02-04 23:01:44 -06:00
Poojawa
56232d5d60 Maps and misc 2018-01-31 06:20:26 -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
oranges
bf3e314092 Merge pull request #34804 from tgstation/KorPhaeron-patch-1 
Expands our worst rule
 2018-01-23 01:52:27 -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
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
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
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
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
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
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
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