cyberpresidentvanellope/Sandstorm-Station-13
1
0
Fork 0
mirror of https://github.com/Sandstorm-Station/Sandstorm-Station-13.git synced 2026-08-29 16:20:19 +01:00
Code Issues Packages Projects Releases Wiki Activity
50,585 Commits 8 Branches 0 Tags
master
Commit Graph
1006 Commits
Author SHA1 Message Date
Timothy Teakettle 1d943a34ef heterochromia 2020-08-28 18:30:28 +01:00
TrilbyspacecloneandGitHub c4885d81f3 Merge branch 'master' into spike-loot-differentces 2020-08-27 03:41:14 -04:00
lolman360 f2a7c2599d Merge remote-tracking branch 'upstream/master' into AnPrimAssistants 2020-08-24 09:36:36 +10:00
Enric Gabriel 1a4e563c9c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-23 18:54:50 -03:00
siliconsandGitHub a8ee36fe85 fixes wormhole jaunters and makes them no longer collide with bohs/other bluespace teleportation disruptors (#13209) 
* Update wormhole_jaunter.dm

* Update wormhole_jaunter.dm
 2020-08-23 21:00:07 +02:00
lolman360andGitHub bda2c740ba Merge branch 'master' into AnPrimAssistants 2020-08-21 11:08:13 +10:00
Letter N 3b7bca28b3 Functional* code 2020-08-20 13:50:33 +08: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
lolman360 7ca4fa2f55 compilies/?? 2020-08-15 17:09:12 +10:00
lolman360 0bc79b82eb ABDCE 2020-08-14 20:18:55 +10:00
Hatterhat d5b788a655 shortparry window restored, glaive parry req wield 2020-08-12 23:33:59 -05:00
TrilbyspacecloneandGitHub 1b61a5feb2 Merge branch 'master' into spike-loot-differentces 2020-08-12 15:10:37 -04:00
SandPootandGitHub f4165e6dbb Kinectic Destroyer (#40) 2020-08-09 19:40:38 -03: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
siliconsandGitHub f20f01cc6b Merge pull request #12853 from LetterN/TGUI-4 
TGUI4 port
 2020-08-09 05:46:21 -07:00
Letter N f1c4a7f6ac Merge remote-tracking branch 'origin/master' into TGUI-4 2020-08-09 14:54:16 +08:00
Hatterhat e95dcba705 price nerf, tweaks, aprc 2020-08-08 12:17:56 -05:00
Hatterhat 9a862b10e1 the perfect parry update 2020-08-08 10:47:43 -05:00
Enric Gabriel 11bb5191bf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-08 01:59:26 -03:00
Hatterhat fd8f3781cc test commit please ignore 2020-08-07 17:03:38 -05:00
Hatterhat c227fc7546 wait, shit 2020-08-07 16:56:53 -05:00
TrilbySpaceClone 3ae10ac826 update? 2020-08-06 13:09:41 -04:00
Letter N 333ca2cc7b Merge remote-tracking branch 'origin/master' into TGUI-4 2020-08-06 18:26:04 +08:00
Enric Gabriel e4f7092490 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-05 22:52:22 -03:00
LinandGitHub c310b1a70e Merge pull request #12997 from silicons/lavastaff 
fixes medsprays, sutures/regenmesh, and lavastaves not respecting clickdelay (rip instant chemdump heal on self)
 2020-08-05 19:43:38 -05:00
siliconsandGitHub 4720fedce9 Merge pull request #13003 from Hatterhat/crusher-glaive 
Proto-Kinetic Glaives - a crusher reskin
 2020-08-05 15:25:48 -07:00
Hatterhat 4df9efb076 heho attack text 2020-08-04 00:29:30 -05: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
TrilbyspacecloneandGitHub dc4d83d2db Update necropolis_chests.dm 2020-08-03 11:06:00 -04:00
TrilbyspacecloneandGitHub e1e6198140 Merge branch 'master' into spike-loot-differentces 2020-08-03 10:53:08 -04:00
TrilbyspacecloneandGitHub 0ec756cce6 the all crate 2020-08-03 10:43:58 -04:00
Letter N 9a9e3ffef5 fixfixfix squared. Will not fix missing clockslab tabs, you just have to give it a category. 2020-08-03 21:14:17 +08:00
Hatterhat ccee254546 proof of concept: crusherglaive - squashed 2020-08-02 12:30:14 -05:00
siliconsandGitHub 8b2163792a Update necropolis_chests.dm 2020-08-01 21:05:23 -07:00
silicons 20dea7e41f fix 2020-08-01 20:45:49 -07:00
kappa-samaandGitHub 94ee8bec08 ok 2020-08-01 19:19:59 -04:00
kappa-samaandGitHub adf4a8a2e3 indent 2020-07-31 17:10:06 -04:00
kappa-samaandGitHub cc34c4b1a2 no empty slot 😔 2020-07-31 17:09:54 -04:00
Letter N b376a6b6c4 Merge remote-tracking branch 'origin/master' into TGUI-4 2020-07-30 14:43:52 +08:00
Letter N 0805265412 yet another batch. MAJOR: APC 2020-07-30 12:54:53 +08: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
LinandGitHub 81a7542aa6 Merge pull request #12834 from silicons/clickcd_experimental 
Experimental hybrid clickdelay system (No seriously I'm trying my best to not call it Minecraft attack delays)
 2020-07-28 21:51:10 -05:00
kappa-samaandGitHub 72cb4fb920 honk 2020-07-28 21:56:39 -04:00
silicons 5bf4afcade sigh 2020-07-27 14:09:37 -07:00
Enric Gabriel c23b75ea39 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-07-26 20:18:40 -03:00
crazyraio2 c488257c4f amulet was getting invisible 2020-07-26 15:47:39 -03: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
Hatterhat 14fba6a056 funny parry sticks 2020-07-24 21:19:01 -05:00
Timothy Teakettle 7fb55a02a5 section one 2020-07-24 22:34:22 +01:00