Commit Graph
5328 Commits
Author SHA1 Message Date
silicons c87c2bd850 smh 2020-07-28 12:31:35 -07:00
silicons 78b6a60e80 oh 2020-07-28 12:25:27 -07:00
silicons 4ab175d812 sigh 2020-07-28 12:10:34 -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
Enric Gabriel 1010b764bd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-07-28 14:45:40 -03:00
siliconsandGitHub a5063a92b9 Merge pull request #12941 from timothyteakettle/alien-embeds-work
aliens can remove embeds now
2020-07-28 10:45:31 -07:00
Timothy Teakettle c8960624d3 sorry artur 2020-07-28 18:37:01 +01:00
Enric Gabriel ac03db0808 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-07-28 14:30:43 -03:00
siliconsandGitHub 475d8ed6fb Merge pull request #12950 from timothyteakettle/species-are-dumb
tail wagging fix
2020-07-28 10:15:17 -07:00
Timothy Teakettle 72972e1659 some species code fixes 2020-07-28 17:56:50 +01:00
Enric GabrielandGitHub a09178fde7 Quality of life thing? (#31) 2020-07-27 18:46:42 -03:00
silicons ffcfd21613 fix 2020-07-27 14:24:10 -07:00
silicons 5bf4afcade sigh 2020-07-27 14:09:37 -07:00
silicons 67b518bf42 experimental 2020-07-27 13:09:54 -07:00
Timothy Teakettle 8d9c94c087 aliens can remove embeds now 2020-07-27 17:59:05 +01: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
siliconsandGitHub 20d9c74f9f Merge pull request #12876 from timothyteakettle/species-are-dumb
tidies up species files
2020-07-26 22:52:00 -07:00
Enric Gabriel 861faf7210 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-07-26 23:33:23 -03:00
BlackMajorandGitHub dd6fefa43e Merge pull request #12917 from Citadel-Station-13/silicons-patch-57
FIXES. STUNBATONS. FOR. THE LAST. TIME - WINGET IS A SLEEP() AND NO ONE REALIZED THAT MAKING BATONS MAKE PEOPLE -GLORF WOULD MAKE THEM BREAK UNDER LAG
2020-07-27 13:20:38 +12:00
BlackMajorandGitHub 5e3cb62790 Merge pull request #12903 from Sishen1542/zoom-zoom-go-boom-boom
removes zoomba/roomba borg sprites
2020-07-27 13:00:17 +12:00
silicons 308c52df00 ok 2020-07-26 17:14:38 -07:00
silicons 0b17c761e7 whew 2020-07-26 17:11:23 -07:00
silicons 349874e512 haha 2020-07-26 16:49:47 -07:00
siliconsandGitHub 3ee5611b1d Update living_active_block.dm 2020-07-26 16:19:43 -07:00
Enric Gabriel 0c6f463962 Merge branch 'master' of https://github.com/SandPoot/Sandstorm-Station-13 2020-07-26 20:18:58 -03: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
siliconsandGitHub cebd21696f Update living_active_parry.dm 2020-07-26 16:18:12 -07:00
silicons bf4b2dfbf5 ok 2020-07-26 15:59:56 -07:00
siliconsandGitHub e13b6d36da Merge pull request #12895 from Hatterhat/bokken
Training Bokkens - "funny wood sticks for parrying and beating the shit out of people"
2020-07-26 15:52:35 -07:00
LinandGitHub 8aa20d10b8 Merge pull request #12863 from Citadel-Station-13/clownops
clown mobss are now allied to each other and clownops are now allied to clown mobs
2020-07-26 17:51:00 -05: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
silicons 7d7f40ce90 fixes 2020-07-26 14:56:03 -07:00
Hatterhat af08e8a37f altclick for fucked up parries! also bugfixes 2020-07-26 13:02:56 -05:00
silicons 389a54590e fix 2020-07-26 00:32:14 -07:00
siliconsandGitHub 829403a2ac Update say.dm 2020-07-25 23:52:15 -07:00
silicons 1990f75957 Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-25 23:46:27 -07:00
siliconsandGitHub e2a7064c10 Update say.dm 2020-07-25 23:40:39 -07:00
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
Sishen 04feb3c4a5 borg 2020-07-25 03:22:48 -06:00
silicons 44d3a0aa27 fixes 2020-07-24 20:37:02 -07:00
timothyteakettle e18bfb41b7 woopsy 2020-07-25 02:16:39 +01:00
timothyteakettle e273d327bd yeah 2020-07-25 01:11:04 +01:00
timothyteakettle 3ca098fe98 bugfixes 2020-07-25 00:22:24 +01:00
timothyteakettle 8360bb1a7f section 2 2020-07-24 23:44:57 +01:00
Timothy Teakettle 7fb55a02a5 section one 2020-07-24 22:34:22 +01: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