cyberpresidentvanellope/Sandstorm-Station-13
1
0
Fork 0
mirror of https://github.com/Sandstorm-Station/Sandstorm-Station-13.git synced 2026-07-22 13:44:25 +01:00
Code Issues Packages Projects Releases Wiki Activity
38,600 Commits 8 Branches 0 Tags
machine-changes
Commit Graph

1275 Commits

Author SHA1 Message Date
SandPoot 6809afb45c Many borg changes (seriously) (#69) 2020-09-15 23:25:59 -03:00
Enric Gabriel 499fec6a16 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-09-06 10:42:43 -03:00
BlackMajor 1943a2fdd7 Merge pull request #13246 from silicons/anomaly_manufacturing 
anomaly manufacturing port from tg. supermatter anomaly generation nerfed to 20% rather than removed
 2020-09-06 17:53:35 +12:00
Enric Gabriel d286153128 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-09-04 19:08:14 -03:00
raspy-on-osu 9b56991f77 init 2020-09-02 17:54:35 -04:00
Enric Gabriel c10471fac9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-30 01:42:29 -03:00
silicons 9250a6d71d Merge pull request #13275 from Chiirno/portable-chem-mixer 
Portable chem mixer
 2020-08-29 21:34:57 -07:00
Chiirno fdc2cea077 added chem dispenser, time for errors 2020-08-27 14:27:35 -03:00
silicons b2a38a09a1 circuit 2020-08-23 05:59:24 -07:00
silicons bd5766a8be changes 2020-08-23 05:27:53 -07:00
Letter N b8d812fb47 "what if adminbus stops leaking confidential adminchat" and also updates admin things. you can now do obj/structure/singulo:50 2020-08-23 17:18:32 +08: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
silicons 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 9b9a3b6d8d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-19 12:54:18 -03:00
silicons 5414a8949c Update text.dm 2020-08-19 08:50:26 -07:00
Enric Gabriel 600c3b3528 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-18 23:31:57 -03:00
silicons ce80f64d27 Update suppression.dm 2020-08-18 18:52:06 -07:00
lolman360 f2a86f2c42 Update medical_designs.dm 2020-08-18 14:23:09 +10:00
lolman360 8356dbf20a Update medical_designs.dm 2020-08-18 13:26:32 +10:00
lolman360 32c0335a17 Update medical_designs.dm 2020-08-18 10:35:56 +10:00
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
Lin b8ba29e6f8 Merge pull request #13117 from Citadel-Station-13/silicons-patch-3 
fixes nanite hubs
 2020-08-14 13:01:15 -05:00
Lin 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
silicons b931b450ac Update nanite_cloud_controller.dm 2020-08-12 17:18:56 -07:00
silicons bb29d85983 Update nanite_programmer.dm 2020-08-12 17:18:40 -07:00
silicons cd95685eaa Update nanite_program_hub.dm 2020-08-12 17:18:06 -07:00
silicons 7bcbcda37b Update nanite_cloud_controller.dm 2020-08-11 00:37:44 -07:00
silicons 471d036881 Update nanite_programmer.dm 2020-08-11 00:35:53 -07:00
silicons e99414c3d4 Update nanite_program_hub.dm 2020-08-11 00:34:17 -07:00
lolman360 f977ac7180 e e e ee ee 2020-08-11 17:08:21 +10: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
lolman360 fee304fb19 Update medical_designs.dm 2020-08-09 22:55:10 +10:00
lolman360 308d77da7c Merge branch 'master' into plumb 2020-08-09 22:48:18 +10: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 Gabriel 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
silicons 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 Gabriel 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 Gabriel 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