cyberpresidentvanellope/Sandstorm-Station-13
1
0
Fork 0
mirror of https://github.com/Sandstorm-Station/Sandstorm-Station-13.git synced 2026-08-31 01:06:28 +01:00
Code Issues Packages Projects Releases Wiki Activity
37,558 Commits 8 Branches 0 Tags
bluespace-locker
Commit Graph
1248 Commits
Author SHA1 Message Date
Enric Gabriel 4e7312d276 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-14 15:07:53 -03:00
LinandGitHub b8ba29e6f8 Merge pull request #13117 from Citadel-Station-13/silicons-patch-3 
fixes nanite hubs
 2020-08-14 13:01:15 -05:00
LinandGitHub ba9a808aaa Merge pull request #13118 from Citadel-Station-13/silicons-patch-4 
fixes nanite programmers not ejecting disks
 2020-08-14 13:01:08 -05:00
siliconsandGitHub b931b450ac Update nanite_cloud_controller.dm 2020-08-12 17:18:56 -07:00
siliconsandGitHub bb29d85983 Update nanite_programmer.dm 2020-08-12 17:18:40 -07:00
siliconsandGitHub cd95685eaa Update nanite_program_hub.dm 2020-08-12 17:18:06 -07:00
siliconsandGitHub 7bcbcda37b Update nanite_cloud_controller.dm 2020-08-11 00:37:44 -07:00
siliconsandGitHub 471d036881 Update nanite_programmer.dm 2020-08-11 00:35:53 -07:00
siliconsandGitHub e99414c3d4 Update nanite_program_hub.dm 2020-08-11 00:34:17 -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
Letter N e964b3aabf skillpannel fix, and nyanite fixes. Minified js does not include pai spoilers 2020-08-08 20:04:16 +08:00
Letter N 83207baaee reverts nanite thing 2020-08-08 16:30:07 +08:00
Letter N a19e306137 less redtext - updates anomalies 2020-08-03 20:53:36 +08:00
Letter N b376a6b6c4 Merge remote-tracking branch 'origin/master' into TGUI-4 2020-07-30 14:43:52 +08:00
Letter N 10fefca674 another batch. MAJOR: chem_master, pandemic 2020-07-30 14:06:20 +08:00
Enric GabrielandGitHub 12c21496b6 Some useful stuff (#34) 2020-07-29 22:13:57 -03:00
Enric Gabriel c0e884b3a9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-07-29 20:25:36 -03:00
Timothy Teakettle 9a9993c7be yep 2020-07-29 19:00:06 +01:00
Enric Gabriel bcda6cb6a6 fixes some stuff. **NOT DMM ON SPACE MAN THOUGH** 2020-07-29 11:04:22 -03: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
siliconsandGitHub 9ff94e019b Merge pull request #12924 from SiliconMain/analyzer 
Ports long range atmos analyzer from skyrat
 2020-07-29 01:09:48 -07:00
SiliconMain 63bb9fe0f3 the dangers of copypaste 2020-07-26 16:35:50 -05:00
SiliconMain abdafe15fa fuck 2020-07-26 15:21:24 -05: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
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
Enric GabrielGitHubTrilbySpaceCloneTrilbyspaceclone
 		309803771b T5 parts (#28) 
* :D

* Update chem_dispenser.dm

* Update chem_dispenser.dm

* D:

* Update power_designs.dm

Co-authored-by: TrilbySpaceClone <trilbyspaseclone@gmail.com>
Co-authored-by: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
 2020-07-23 19:08:54 -03:00
silicons ffd44b78ba Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-23 10:26:03 -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 1a040dd2a6 changes 2020-07-18 18:44:17 -07:00
silicons 7c5d4f863d click cd breakout 2020-07-18 18:10:21 -07:00
Timothy TeakettleandGitHub 1a5008fee7 Merge branch 'master' into wound-port 2020-07-18 23:06:49 +01:00
Timothy TeakettleandGitHub 974b80a2fd Merge branch 'master' into wound-port 2020-07-18 21:45:24 +01:00
timothyteakettle 8bb9b11922 Merge branch 'wound-port' of https://github.com/timothyteakettle/Citadel-Station-13 into wound-port 2020-07-18 01:26:41 +01:00
timothyteakettle 7714fcfaba more changes 2020-07-18 01:26:38 +01:00
Timothy Teakettle 93b4570f8d more changes 2020-07-17 23:23:47 +01:00
silicons 993b4ec222 Merge remote-tracking branch 'citadel/master' into unarmed_parry 2020-07-16 19:39:46 -07:00
Artur 5f9364c5f8 Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 2020-07-13 16:20:54 +03:00
Artur 9de8483bcf Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 2020-07-09 22:14:20 +03:00
Putnam a625d6562b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real 2020-07-08 22:02:03 -07:00
siliconsandGitHub 6d1ca993f6 Merge pull request #12648 from timothyteakettle/tray-and-jar 
bluespace tray + bluespace jar
 2020-07-08 03:10:44 -07:00
silicons 6cbab55ef8 Merge remote-tracking branch 'citadel/master' into unarmed_parry 2020-07-07 21:07:58 -07:00
silicons 6ee63f66aa whew 2020-07-07 20:48:54 -07:00
Artur 280d3de6c3 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-07-07 18:37:45 +03:00
GhomandGitHub 17ee8c5960 Merge pull request #12660 from YakumoChen/master 
Reverts improv small arms, makes guncrafting easier and faster
 2020-07-04 18:35:22 +02:00
Artur f0154f3f1c conflicts!!! 2020-07-03 15:45:11 +03:00
Artur 6ee1eba56c Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-07-02 23:23:47 +03:00
Sonic121xandGitHub 4e2b05a22a Fix the missing Technode icon 2020-07-02 22:33:35 +08:00
Timothy TeakettleandGitHub 15e137dd18 Merge branch 'master' into tray-and-jar 2020-07-01 22:06:17 +01:00
kappa-samaandGitHub cfc14a04f1 Merge branch 'master' into patch-28 2020-07-01 07:48:46 -04:00