Commit Graph

58 Commits

Author SHA1 Message Date
Enric Gabriel 46288f263e upload files 2020-09-21 02:04:24 -03:00
SandPoot 6809afb45c Many borg changes (seriously) (#69) 2020-09-15 23:25:59 -03:00
Enric Gabriel 520a9d7ef2 this 2020-09-11 19:07:27 -03:00
Enric Gabriel aaf4613791 push 2020-09-08 14:26:19 -03:00
SandPoot 89a55525f5 [TESTMERGE] New tgs commands + modification of a existant one (#58) 2020-08-29 15:45:02 -03:00
Enric Gabriel f70b74eca3 here 2020-08-26 12:05:06 -03:00
Enric Gabriel ecb7c13c4b Merge branch 'master' of https://github.com/SandPoot/Sandstorm-Station-13 into master 2020-08-22 20:30:55 -03:00
Enric Gabriel f759503b49 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-22 20:30:49 -03:00
ZombieTsar e5396256ee Iron and sand can be made from chemistry (#54) 2020-08-22 20:30:07 -03:00
SandPoot bcb474627b Bluespace miner update + a little fix for borgdrakes* (#52) 2020-08-20 17:53:37 -03:00
SandPoot 4d105bb50f A few fixes and stuff (#51) 2020-08-18 01:22:14 -03:00
Enric Gabriel 0aea0b2303 updat 2020-08-17 23:06:41 -03:00
SandPoot 66541bbe67 Adds tgstation's fix air for admins (#49) 2020-08-17 14:55:59 -03:00
SandPoot 518c70e6ed Some Cit reverts and skyrat features. (#46) 2020-08-15 13:29:50 -03:00
SandPoot fe8119c18c Code optimizations + clean-up (#45) 2020-08-14 02:01:54 -03:00
crazyraio2 d7b3b609e6 looks like i'm dumber than i thought 2020-08-12 14:09:50 -03:00
crazyraio2 e3999a0033 we can't have nice things 2020-08-12 13:52:20 -03:00
Enric Gabriel ddf08e6185 guessitwasnotupstreamproblemafterall 2020-08-12 13:04:49 -03:00
Enric Gabriel 24eb2308b3 just this little thing so nothing goes wrong later 2020-08-12 11:40:12 -03:00
Enric Gabriel 3fbf8d71f4 Show Held Item 2020-08-12 11:30:55 -03:00
SandPoot f4165e6dbb Kinectic Destroyer (#40) 2020-08-09 19:40:38 -03:00
Enric Gabriel 1e03f40397 Spaceship beacons and etc. (#39) 2020-08-06 22:01:47 -03:00
Enric Gabriel 7b0e832ce6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-05 12:26:12 -03: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
crazyraio2 aa8d28a86b gets rid of my lazy fix for the glory kill 2020-07-31 12:37:45 -03:00
Enric Gabriel 12c21496b6 Some useful stuff (#34) 2020-07-29 22:13:57 -03:00
Enric Gabriel cba42e7cf2 no. 2020-07-29 22:01:58 -03:00
Enric Gabriel bcda6cb6a6 fixes some stuff. **NOT DMM ON SPACE MAN THOUGH** 2020-07-29 11:04:22 -03:00
Enric Gabriel 5225eed156 web edit momment. 2020-07-26 19:18:27 -03:00
crazyraio2 ca9ef98833 GIVE ME HIS INTRO 2020-07-26 19:14:10 -03:00
Enric Gabriel 2053dcbfcc until the gladiator is fixed... and makes the loot code better? 2020-07-26 19:00:36 -03:00
crazyraio2 76872e3a36 and i forgot one file 2020-07-26 15:29:48 -03:00
crazyraio2 5283ec71fe there's your plushie 2020-07-26 14:33:08 -03: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 ba3da94e74 fix some positioning stuff + revert forced _indicator on some binds 2020-07-24 00:08:08 -03:00
Enric Gabriel 1d2fb06b66 Skyrat13#2897 2020-07-18 22:39:11 -03:00
Enric Gabriel 45a0aae315 fixes the big fox 2020-07-14 18:23:04 -03:00
Enric Gabriel b5f77eeb66 Ports a lot of stuff from all around (#23)
* shhh

* checks the thing

* please don't hurt me, it is my first time

* there, much better

* this is huge

Co-authored-by: crazyraio2 <44246096+crazyraio2@users.noreply.github.com>
2020-07-14 01:31:52 -03:00
Enric Gabriel e3eb8b0b02 few fixes 2020-07-13 00:58:06 -03:00
Enric Gabriel 3635a93248 few good stuff 2020-07-11 20:33:14 -03:00
Enric Gabriel bf39a91205 combat indicator 2020-07-11 19:47:48 -03:00
Enric Gabriel e96771b929 misterious incorrect indentation 2020-07-11 03:28:32 -03:00
Enric Gabriel 723c31a2fb fixes the (bam)boos 2020-07-11 03:25:31 -03:00
Enric Gabriel eb93eb2c3e fixes double indicators? 2020-07-11 02:57:36 -03:00
Enric Gabriel 62cba3888e possibly fixes doubled stuff on research and forces say_indicator 2020-07-09 16:01:59 -03:00
Enric Gabriel 961a217691 holy shit, there's so much stuff here, so... idk exactly what it does 2020-07-04 21:39:32 -03:00
Enric Gabriel 1f4cad192c ic quick spawn revamped (#19) 2020-07-04 14:15:04 -03:00
Enric Gabriel 72f993fdbd Pulls #1706 from Skyrat (#18) 2020-07-02 02:20:27 -03:00
Enric Gabriel 1f4bd7e6a4 Sagaru language (#17)
* stupid super custom species
* makes people actually able to speak it + solves minor problems
2020-07-02 00:43:04 -03:00
Enric Gabriel e18a47ca8a bluespace pipe dispenser and sprite previews, isn't it nice? 2020-07-02 00:13:08 -03:00