cyberpresidentvanellope/Sandstorm-Station-13
1
0
Fork 0
mirror of https://github.com/Sandstorm-Station/Sandstorm-Station-13.git synced 2026-08-23 05:08:54 +01:00
Code Issues Packages Projects Releases Wiki Activity
38,600 Commits 8 Branches 0 Tags
machine-changes
Commit Graph
3328 Commits
Author SHA1 Message Date
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
Enric Gabriel 5b7fbc1b70 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-07-28 17:43:37 -03:00
siliconsandGitHub 93da2515b6 Merge pull request #12948 from Hatterhat/windows 
[speedmerge? it's not that bad i swear] directional window rotation fix
 2020-07-28 13:27:12 -07:00
silicons c87c2bd850 smh 2020-07-28 12:31:35 -07:00
silicons 78b6a60e80 oh 2020-07-28 12:25:27 -07:00
silicons fd738fd16a spelling 2020-07-28 12:12:30 -07:00
silicons c720e800df whew! 2020-07-28 12:08:02 -07:00
Enric Gabriel b942c9f162 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-07-28 14:46:58 -03:00
siliconsandGitHub 6c83beea02 Merge pull request #12937 from Ghommie/Ghommie-cit834 
Fixing new bugs and stuff.
 2020-07-28 10:46:17 -07:00
Hatterhat 8a32cac8db window rotation fix 2020-07-28 10:47:07 -05:00
Sishen 27aba092e0 aaaaaaaaaa 2020-07-27 08:20:03 -06:00
Enric Gabriel 48f8a998d5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-07-27 10:33:25 -03:00
Ghommie f1c242aadc Fixing new bugs and stuff. 2020-07-27 14:16:01 +02:00
Timothy Teakettle 36d6246bc1 it is now harder to deal wounds 2020-07-26 18:54:57 +01:00
SiliconMainandGitHub 8f1a8adcfd Update negative.dm 2020-07-26 04:15:39 -05:00
silicons 1990f75957 Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-25 23:46:27 -07:00
Enric Gabriel 7ef0a3b076 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-07-25 22:23:50 -03:00
timothyteakettle 3467bf3515 Merge remote-tracking branch 'upstream/master' into wounds-part-2 2020-07-26 00:25:26 +01: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
siliconsandGitHub 91081ef24c Merge pull request #12872 from Iatots/hairball 
Adds depth to the lick wounds mechanic.
 2020-07-25 15:40:15 -07:00
Timothy Teakettle 8b2a92994f less rng reliance 2020-07-25 20:14:41 +01:00
silicons 0e1574bf77 sigh 2020-07-24 23:34:47 -07:00
timothyteakettle b708be60e9 hey look ma i removed a space 2020-07-25 02:12:21 +01:00
timothyteakettle 2a3f45f7af fixes 2020-07-25 01:10:12 +01:00
timothyteakettle 3ca098fe98 bugfixes 2020-07-25 00:22:24 +01:00
timothyteakettle 315e7e1f99 bugfixes 2020-07-24 23:49:15 +01:00
Timothy Teakettle 7fb55a02a5 section one 2020-07-24 22:34:22 +01:00
Timothy Teakettle c6de85bae4 yes i too like sec being blind 2020-07-24 15:24:02 +01:00
Letter N 8e177bf01e another batch - MAJOR: teleportaiton, displaycase (ico port needed), 2020-07-24 19:58:48 +08:00
IatotsandGitHub f53f7c5e92 Update cuts.dm 2020-07-24 07:46:09 +02:00
Enric Gabriel e383e4cad8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-07-24 00:11:22 -03:00
Enric Gabriel ba3da94e74 fix some positioning stuff + revert forced _indicator on some binds 2020-07-24 00:08:08 -03:00
silicons 1f25c7f06d Merge remote-tracking branch 'citadel/master' into shoelaces 2020-07-23 16:23:34 -07:00
siliconsandGitHub d946998fb9 Merge pull request #12857 from timothyteakettle/let-bots-wear-hats 
adds deep beepsky lore to the game in the form of hats
 2020-07-23 16:18:17 -07: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
IatotsandGitHub 554e764be8 Update cuts.dm 
dang speededit
 2020-07-23 21:00:26 +02:00
IatotsandGitHub a2381755e1 Update cuts.dm 
nomenclature error
 2020-07-23 20:52:29 +02:00
IatotsandGitHub e6dd213a2a Update recipes_misc.dm 2020-07-23 20:26:11 +02:00
LinandGitHub cdd509479e Merge pull request #12868 from Citadel-Station-13/silicons-patch-46 
regarding manifest injections
 2020-07-23 13:18:35 -05:00
IatotsandGitHub 9d89158fda Update cuts.dm 2020-07-23 19:48:41 +02:00
Timothy Teakettle b18356c95d requested changes 2020-07-23 18:47:34 +01:00
IatotsandGitHub 3dac7e4b43 Update generic_positive_events.dm 2020-07-23 19:44:02 +02:00
silicons da4e208f94 ok 2020-07-23 10:40:12 -07:00
silicons db24df58a0 Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-23 10:36:46 -07:00
siliconsandGitHub ce87d3e8c5 Merge pull request #12856 from zeroisthebiggay/radiationsuitsareugly 
ports tg radiation suits and also makes syndiekrav gloves actually visually distinct
 2020-07-23 10:28:44 -07:00
silicons ffd44b78ba Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-23 10:26:03 -07:00
siliconsandGitHub 9222933d77 Merge pull request #12816 from timothyteakettle/wound-port 
ports part 1 of tg wounds
 2020-07-23 10:25:25 -07:00
Timothy Teakettle f5ac0b5762 some fixes 2020-07-23 18:10:46 +01:00
silicons 3a38344a04 fix 2020-07-23 00:25:06 -07:00