Commit Graph

16 Commits

Author SHA1 Message Date
SandPoot 6d6e95b479 Delete generic_negative_events.dm
meant to go on master
2020-10-11 13:46:32 -03:00
Enric Gabriel 46ef6a63c5 upload files 2020-09-21 13:27:22 -03:00
Enric Gabriel d85ebed8db Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-09-16 16:22:36 -03:00
SandPoot 6809afb45c Many borg changes (seriously) (#69) 2020-09-15 23:25:59 -03:00
Enric Gabriel 84c3518b54 button 2020-08-25 17:32:47 -03:00
SandPoot 36aee0b3ac Various ERP verb fixes (#53) 2020-08-21 03:26:51 -03:00
Enric Gabriel 9610b6a9af ya guys like wiring? 2020-08-16 15:17:37 -03:00
SandPoot fe8119c18c Code optimizations + clean-up (#45) 2020-08-14 02:01:54 -03:00
Enric Gabriel b7ad21dafa X-Ray mutation comeback (#38) 2020-08-06 01:07:33 -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 ad48e8a05c the interactions (#20) 2020-07-04 17:04:58 -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 178cddcf9d some stuff from all around 2020-06-22 16:48:34 -03:00
Enric Gabriel 8d66a02892 pulling stuff over 2020-05-01 00:50:09 -03:00