Commit Graph

53 Commits

Author SHA1 Message Date
Enric Gabriel b7ad21dafa X-Ray mutation comeback (#38) 2020-08-06 01:07:33 -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 aa7316b93b some tweaks and removes unused code 2020-07-28 18:54:12 -03:00
Enric Gabriel a09178fde7 Quality of life thing? (#31) 2020-07-27 18:46:42 -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 3c64b4ab3a Healthdoll Changes (#29) 2020-07-24 12:35:44 -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 e7934d7bd5 that moment when you find several typos 2020-07-21 03:06:58 -03:00
Enric Gabriel 3c099218f0 come on 2020-07-21 02:38:52 -03:00
Enric Gabriel 1c63c8080e a little thing 2020-07-21 02:04:10 -03:00
Enric Gabriel 06264ba994 Some lewdy additions. (#26) 2020-07-20 15:39:27 -03:00
Enric Gabriel 6859279d3e CentCom Teleporters! (#25) 2020-07-20 01:20:49 -03:00
Enric Gabriel 1d2fb06b66 Skyrat13#2897 2020-07-18 22:39:11 -03:00
crazyraio2 44ee877660 Degeneracy, be gone 2020-07-17 23:21:34 -03:00
Enric Gabriel 26dda611f6 oh no Skyrat/#2861 2020-07-17 22:35:41 -03:00
crazyraio2 8a67b210f1 now it actually ejects sheets too 2020-07-17 09:27:31 -03:00
crazyraio2 08371af4fa yay, it supports the new categories now 2020-07-17 08:39:31 -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 f989a015ef Replaces decal painter menu with a radial menu (#21)
* the changes
* meh, doesn't work, and i already did enough stuff
* little mistake
2020-07-06 19:19:54 -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 ad48e8a05c the interactions (#20) 2020-07-04 17:04:58 -03:00
Enric Gabriel 1f4cad192c ic quick spawn revamped (#19) 2020-07-04 14:15:04 -03:00
Enric Gabriel 04445eaf3c [READY] New map (#13)
* some stuff for shuttle
* yay, an unoriginal map
looks like i'm the one responsible for it
* moves them to a path that game finds it
* requested changes
* some changes to fix shuttles
* more shuttle fixes
* almost done with it
* mapmerger
* making travis hate us less?
* permabrig shuttle
* more stuff
* thought it was abandoned
* renames it to the right name
* well, i guess we're testing
* almost finished with it, give me pizza
* who ya gonna call ?
the police, let me out of this basement
* forgot this one
* please, tell me that's how you connect them
* maybe the shuttle works now ?
* Revert "Merge branch 'new-map' of https://github.com/SandPoot/Sandstorm-Station-13 into new-map"
This reverts commit 1941a64e28, reversing
changes made to fda6afe660.
* Revert "maybe the shuttle works now ?"
This reverts commit fda6afe660.
* Revert "Revert "Merge branch 'new-map' of https://github.com/SandPoot/Sandstorm-Station-13 into new-map""
This reverts commit fbae802dd3.
* jeez, why did i make so many shuttles
i'm lazy
* google
how do i modify the changelog
* another one bites the dust
* is it finally done ?
* do we need viro ?
* IT ISN'T OVER!!
* this isn't the last one, apparently
Co-authored-by: crazyraio2 <44246096+crazyraio2@users.noreply.github.com> *actually mainly done by them*
2020-07-03 15:46:15 -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
Enric Gabriel 178cddcf9d some stuff from all around 2020-06-22 16:48:34 -03:00
Enric Gabriel 69bbddc43e craftable double o2 2020-06-22 11:18:58 -03:00
Enric Gabriel 796b37574e fix the thing. 2020-05-25 18:02:51 -03:00
Enric Gabriel ba41e5a013 replace space with tab and remove unused things 2020-05-18 13:27:54 -03:00
Enric Gabriel e76a4b5e3a ce hardsuit buff and give tweak (#6) 2020-05-14 23:19:59 -03:00
ZombieTsar 0fad139f13 Adds atmos plants (#4) 2020-05-11 18:27:40 -03:00