cyberpresidentvanellope/Sandstorm-Station-13
1
0
Fork 0
mirror of https://github.com/Sandstorm-Station/Sandstorm-Station-13.git synced 2026-08-20 03:38:33 +01:00
Code Issues Packages Projects Releases Wiki Activity
38,600 Commits 8 Branches 0 Tags
machine-changes
Commit Graph
372 Commits
Author SHA1 Message Date
Enric Gabriel d2257abe86 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-09-19 13:21:18 -03:00
siliconsandGitHub 700c129c21 Update walls.dm 2020-09-10 11:51:34 -07:00
Enric Gabriel e1d88ae446 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-09-08 10:16:07 -03:00
Putnam febd4a47c1 I can probably afford to have these higher, really. 2020-09-04 08:23:53 -07:00
Putnam d6ee54c77d Makes superconducting work for the first time ever. 2020-09-04 08:22:54 -07:00
Enric Gabriel b0662f5e39 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-21 02:19:20 -03:00
siliconsandGitHub 120bcfc00c Merge pull request #13178 from lolman360/plumb 
[READY] ports plumbing (no more waiting for tgui4)
 2020-08-20 21:32:26 -07:00
Enric Gabriel cf2c21ea52 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-17 12:06:32 -03:00
siliconsandGitHub f611945b34 Merge pull request #13180 from Detective-Google/glass-floors 
ports multiz glass floors (tgstation/tgstation#50831)
 2020-08-17 03:14:15 -07:00
Enric Gabriel 06496434a4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-16 23:30:53 -03:00
Enric Gabriel 7898f1fe3e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-16 23:24:11 -03:00
silicons 8dedcbcf76 Merge branch '13113' 2020-08-16 18:53:35 -07:00
silicons 83e72b4f96 Merge branch '13164' 2020-08-16 18:51:36 -07:00
LinandGitHub d287f44d9a Merge pull request #13045 from silicons/coggers 
ports bronze (fake clockwork) airlocks and windows
 2020-08-16 20:20:03 -05:00
Detective Google 44e024a62f specification 2020-08-16 18:44:05 -05:00
Detective Google 0e1586f24d adds a construction path to glass floors 2020-08-16 18:21:29 -05:00
Detective-GoogleandGitHub f41c412cb9 material -> mineral 2020-08-14 23:41:29 -05:00
Detective-GoogleandGitHub 76bfd9b3a6 ? 2020-08-14 16:09:49 -05:00
Detective Google 81f7307575 yeah 2020-08-14 15:38:27 -05:00
lolman360andGitHub 6f7badda41 Merge branch 'master' into plumb 2020-08-12 09:03:11 +10:00
Enric Gabriel 7929924d4a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-11 13:04:34 -03:00
siliconsandGitHub a8d61b60ef Merge pull request #13011 from timothyteakettle/insane-shot-eyepatch 
adds a cybernetic eyepatch to the syndicate uplink
 2020-08-11 01:47:32 -07:00
kiwedespars eb8574d6d6 heretics from tg (with changes) 2020-08-10 19:17:26 -07:00
Enric Gabriel bae8c236f6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-09 18:34:33 -03:00
lolman360 6c57dce54e WX 2020-08-09 23:52:21 +10:00
lolman360andGitHub 308d77da7c Merge branch 'master' into plumb 2020-08-09 22:48:18 +10:00
silicons 13c9954f74 fix 2020-08-07 17:00:27 -07:00
silicons 815ddd1866 oh boy 2020-08-05 21:34:26 -07:00
Timothy Teakettle ef53f3faea the old system isnt needed really but sure i guess 2020-08-04 11:43:15 +01:00
Enric Gabriel 8558cc8747 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-04 01:48:59 -03:00
Timothy Teakettle 2bbe4631d6 working ricochets 2020-08-03 14:46:24 +01:00
Timothy TeakettleandGitHub 9721025582 Merge branch 'master' into wounds-part-2 2020-07-29 15:47:44 +01:00
Enric Gabriel 935901593b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-07-29 09:52:32 -03:00
silicons 791bfabc9b walls 2020-07-26 16:03:57 -07:00
silicons 7d7f40ce90 fixes 2020-07-26 14:56:03 -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
lolman360 17d1fd0692 fixes 2020-07-22 12:42:46 +10:00
silicons 526d257410 fix 2020-07-20 11:48:08 -07:00
silicons 98d3ac80d9 :pika: 2020-07-20 11:25:17 -07:00
silicons 58e26c540c merge from master 2020-07-20 10:18:44 -07:00
silicons 55f8e37544 sigh 2020-07-18 20:26:11 -07:00
silicons 0b98b0409b sigh 2020-07-18 18:29:09 -07:00
silicons 6ee63f66aa whew 2020-07-07 20:48:54 -07:00
Ghommie 9dc4b99620 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-06-30 00:49:06 +02:00
GhomandGitHub b280c0f550 Merge pull request #12622 from timothyteakettle/grammar-fixes 
big batch of spelling/grammar corrections
 2020-06-29 21:13:06 +02:00
timothyteakettle 76b5557e1e bunch of grammar corrections 2020-06-27 02:12:44 +01:00
Ghommie c5cbfa64e5 Porting further material datum features and improvements. 2020-06-24 20:45:17 +02:00
Ghommie de77b7139c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-06-23 00:13:14 +02:00
Detective Google 472ed97b8c port tg#51713 2020-06-22 15:32:23 -05:00