cyberpresidentvanellope/Sandstorm-Station-13
1
0
Fork 0
mirror of https://github.com/Sandstorm-Station/Sandstorm-Station-13.git synced 2026-08-21 20:28:14 +01:00
Code Issues Packages Projects Releases Wiki Activity
38,600 Commits 8 Branches 0 Tags
machine-changes
Commit Graph
918 Commits
Author SHA1 Message Date
silicons 1990f75957 Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-25 23:46:27 -07:00
Enric GabrielGitHubcrazyraio2
 		d312fbc4db Mining update (#30) 
* smol mining update

* Revert "smol mining update"

This reverts commit 9a0bd466ff.

* the .wav files i will use

* the rest that is being added for now

* fixes your stuff

* makes the crusher purchasable

* fixes legion's trophy

* so many icons and oggs

* SIF and more icons

* even more icons, sorry

* new modkits, yay

* oh come on, it didn't update

* some bosses seen to be ready

* Glory Kill system, should work just fine

* even more icons, jeez, also, elite mods

* oh hey, i got the icon

* almost done

* icons and meme dragon

* it's icon was hidden and i didn't notice

* why do i hear boss music ?

* one day...

* while Nano was...

* not continuing that

* stole some compatibility stuff

* the end is near

* some stuff to make stuff work

* probably one of the last commits

* king goat itself

* THE ERRORS, THEY'RE EVERYWHERE

* so close...

* the new ruins should spawn now

* should be the last commit, let's test it

* Now The Gladiator actually exists

* make them mad, and toggle their music

* oh, wait, need to give you the new files

* i think i saved someone's ears

* missing areas, i'm sorry

* good luck fighting KG without a ladder

* just leave a comment, nothing else

* fixes double spawn at least for hiero, aka why the fuck make two of the same proc and not remove 1st

* invisible hat, not anymore

* takes some stuff before bob even merges it on theirs

* how did these icons disappear ?

* fixes some oopsies

* sand plz help

* *fixes your thing*

* and i think i fixed the other

* fixes

* no async needed

* im done, just merge this useless thing

Co-authored-by: crazyraio2 <44246096+crazyraio2@users.noreply.github.com>
 2020-07-25 20:04:07 -03:00
Timothy Teakettle 7fb55a02a5 section one 2020-07-24 22:34:22 +01:00
Enric Gabriel e0fdf3dce9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 / merge conflicts 2020-07-23 19:14:58 -03:00
silicons 03f0d76a8e yeah ok 2020-07-23 13:23:45 -07:00
LinandGitHub 02add89513 Merge pull request #12846 from Citadel-Station-13/silicons-patch-42 
it would be real lovely if the server didn't nuke 40 people's characters because the configuration couldn't be loaded because i really hate dll memes
 2020-07-23 13:29:18 -05:00
LinandGitHub 6fca9af0ed Merge pull request #12848 from silicons/morecolors 
species customization now allows 16 million colors instead of 4 thousand
 2020-07-23 13:28:50 -05:00
silicons ffd44b78ba Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-23 10:26:03 -07:00
siliconsandGitHub 8a9d806d04 Update client_procs.dm 2020-07-23 08:12:48 -07:00
silicons 87d53957bf sigh 2020-07-20 20:09:13 -07:00
siliconsandGitHub 4832069181 Update preferences_savefile.dm 2020-07-20 18:57:09 -07:00
silicons 58e26c540c merge from master 2020-07-20 10:18:44 -07:00
silicons b1ccccb322 more 2020-07-18 18:51:16 -07:00
Timothy TeakettleandGitHub 974b80a2fd Merge branch 'master' into wound-port 2020-07-18 21:45:24 +01:00
Timothy Teakettle a4478b0cda it continues 2020-07-17 22:38:28 +01:00
Enric Gabriel 05593f84a0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-07-16 22:13:13 -03:00
siliconsandGitHub e03948dcba Merge pull request #12229 from Arturlang/TGUI-3.0 
[READY]TGUI 3.0
 2020-07-16 17:28:42 -07:00
Enric Gabriel 310b0e4e91 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-07-16 14:53:25 -03:00
Letter N 2afab07b4a https://github.com/tgstation/tgstation/pull/52255 2020-07-16 20:05:37 +08:00
Artur d0f1a805e4 Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 2020-07-14 16:15:48 +03:00
Enric Gabriel 485d7b3fec i don't... just why? 2020-07-13 20:08:45 -03:00
Enric Gabriel 674af2dc86 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-07-13 17:30:11 -03:00
LinandGitHub 55c4e40fbb Merge pull request #12706 from silicons/records 
adds security/medical records to character setup
 2020-07-13 11:50:02 -05:00
Artur 5f9364c5f8 Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 2020-07-13 16:20:54 +03:00
siliconsandGitHub f7b476bc64 Update preferences.dm 2020-07-11 21:23:06 -07:00
Enric Gabriel 11883281e1 removes a rogue button and moves an option 2020-07-11 22:50:33 -03:00
Enric Gabriel beec77b17d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-07-11 20:04:30 -03:00
Timothy Teakettle 02f46322ad port examine 2020-07-09 18:32:45 +01:00
silicons 22c3d9fe3e ok 2020-07-07 21:07:13 -07:00
Artur 280d3de6c3 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-07-07 18:37:45 +03:00
silicons 6634e43be4 fix 2020-07-07 07:41:33 -07:00
silicons cee15792b7 ok 2020-07-07 07:25:10 -07:00
Enric Gabriel 9c43c980cd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-07-06 19:20:20 -03:00
GhomandGitHub bc5e7d1513 Merge pull request #12688 from Weblure/small-strides-fix 
[READY] Fixes Small Strides Formula
 2020-07-06 22:48:09 +02:00
Enric Gabriel 22eba9a026 breaks a line 2020-07-04 21:45:44 -03:00
Enric Gabriel 961a217691 holy shit, there's so much stuff here, so... idk exactly what it does 2020-07-04 21:39:32 -03:00
Enric Gabriel ee00138850 if you don't want a spotlight in you, that's okay 2020-07-04 17:42:04 -03:00
Enric Gabriel 83522c8571 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-07-04 17:18:13 -03:00
Enric GabrielandGitHub ad48e8a05c the interactions (#20) 2020-07-04 17:04:58 -03:00
GhomandGitHub 871993ce14 Merge pull request #12593 from silicons/autobunker 
adds verb to auto bunker override on linked servers
 2020-07-04 18:36:59 +02:00
siliconsandGitHub 03aa8fcc2b Update autobunker.dm 2020-07-04 00:14:32 -07:00
siliconsandGitHub ae5fb008c7 Update client_defines.dm 2020-07-04 00:13:34 -07:00
WeblureandGitHub 832bea9ca5 Fixed sentence formatting, removed Skyrat comments 2020-07-03 21:55:42 -07:00
WeblureandGitHub c9ec6d4a03 Fixes a button, rewords text to be clearer 2020-07-03 21:51:22 -07:00
Artur f0154f3f1c conflicts!!! 2020-07-03 15:45:11 +03:00
Enric Gabriel 31738b0c8b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-07-03 09:41:42 -03:00
Artur 365aadec54 Trying to fix the dna t 2020-07-03 00:55:18 +03:00
Artur 6ee1eba56c Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-07-02 23:23:47 +03:00
GhomandGitHub e586d03e0a text spans. 2020-07-02 19:47:05 +02:00
GhomandGitHub c919075aca Thanks Timothy. 2020-07-02 19:46:10 +02:00