cyberpresidentvanellope/Sandstorm-Station-13
1
0
Fork 0
mirror of https://github.com/Sandstorm-Station/Sandstorm-Station-13.git synced 2026-08-30 16:56:26 +01:00
Code Issues Packages Projects Releases Wiki Activity
37,558 Commits 8 Branches 0 Tags
bluespace-locker
Commit Graph
1068 Commits
Author SHA1 Message Date
Enric Gabriel 97796c2141 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-17 14:58:00 -03:00
siliconsandGitHub d35cba095f Merge pull request #13108 from Hatterhat/357-dumdum 
.357 DumDum Rounds (they're adminspawn only don't worry)
 2020-08-17 08:58:00 -07:00
Enric Gabriel 06496434a4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-16 23:30:53 -03:00
silicons 384e5ae311 Merge branch '13167' 2020-08-16 18:51:48 -07:00
silicons 53fe2c95c5 Merge branch 'pr-13122' 2020-08-16 18:45:01 -07:00
Detective-GoogleandGitHub 13f6df3991 nerfs plasma cutters 2020-08-14 19:38:14 -05:00
lolman360 3aba9eb5a6 kee 2020-08-12 15:11:55 +10:00
Hatterhat eeefc1cbaa heho woundies 2020-08-11 16:01:29 -05:00
Enric Gabriel 7929924d4a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-11 13:04:34 -03:00
lolman360 8c70b56706 whoops 2020-08-11 19:04:59 +10:00
lolman360 472ef6165f imamurderer 2020-08-11 18:52:26 +10:00
siliconsandGitHub a8d61b60ef Merge pull request #13011 from timothyteakettle/insane-shot-eyepatch 
adds a cybernetic eyepatch to the syndicate uplink
 2020-08-11 01:47:32 -07:00
Hatterhat 8370a31942 funny adminspawn wound bullets 2020-08-10 12:12:32 -05:00
Enric Gabriel ca2a53b616 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-07 00:15:48 -03:00
siliconsandGitHub 6876edbd85 Merge pull request #12992 from Hatterhat/rifle-book-pt2 
unatomic as shit PR about nukie guns
 2020-08-06 19:40:09 -07:00
timothyteakettle a3b3e23bac fix ricochets 2020-08-04 23:41:55 +01:00
Timothy Teakettle ef53f3faea the old system isnt needed really but sure i guess 2020-08-04 11:43:15 +01: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
Hatterhat 25ab96cf53 funny revolver reskins 2020-08-03 20:39:06 -05:00
Timothy Teakettle 91664f5064 bracket 2020-08-03 22:17:35 +01:00
Timothy Teakettle 3a0b34fb1b funny aim go brr 2020-08-03 21:58:58 +01:00
Timothy Teakettle 8a3e69d32f no more inaccuracy 2020-08-03 21:40:10 +01:00
Timothy Teakettle 2153f9ea35 i too, want people to be hit their ricochets 2020-08-03 17:36:40 +01:00
Timothy Teakettle 9b34407c9f uplink 2020-08-03 15:27:17 +01:00
Timothy Teakettle 2bbe4631d6 working ricochets 2020-08-03 14:46:24 +01:00
Timothy Teakettle 0bf9553eca hmm 2020-08-02 19:13:39 +01:00
Timothy Teakettle 03d01d917f Merge branch 'master' into wounds-part-2 2020-08-02 18:10:31 +01:00
Hatterhat 6a5e26eb1c unatomic as shit 2020-08-01 12:31:13 -05:00
Enric Gabriel 3bf338087d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-07-31 17:11:36 -03:00
siliconsandGitHub f02bc4a572 Update toy.dm 2020-07-29 19:49:11 -07:00
Timothy TeakettleandGitHub 9721025582 Merge branch 'master' into wounds-part-2 2020-07-29 15:47:44 +01:00
Enric Gabriel 935901593b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-07-29 09:52:32 -03:00
LinandGitHub bbffd41d55 Merge pull request #12883 from Citadel-Station-13/silicons-patch-49 
beam rifles are now practical in emitters
 2020-07-28 22:05:39 -05:00
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 6da5ecffbc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-07-27 14:23:35 -03:00
LinandGitHub 87eac49bbf Merge pull request #12862 from Citadel-Station-13/silicons-patch-44 
you can now shoot yourself with a gun by using disarm intent will this cause balance issues maybe do i care not really
 2020-07-27 11:46:37 -05:00
LinandGitHub 2514f4111d Merge pull request #12900 from Citadel-Station-13/silicons-patch-53 
drops 1.5 second taser alt fire delay to normal fire rate (0.4 seconds)
 2020-07-27 11:43:31 -05:00
GhomandGitHub 4fad4ad969 Merge pull request #12888 from Citadel-Station-13/silicons-patch-50 
sorry gamers, no more self healing with a medbeam
 2020-07-27 15:27:07 +02: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
silicons 1990f75957 Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-25 23:46:27 -07:00
silicons 2a29f73ac8 ok 2020-07-25 17:34:12 -07: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 23465355d0 Update stun.dm 2020-07-24 22:16:06 -07: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
siliconsandGitHub 1c4249c99d Update medbeam.dm 2020-07-24 00:57:30 -07:00
silicons f47a7449e3 Update gun.dm 2020-07-23 18:52:23 -07:00
silicons 0b4185e26f Update beam_rifle.dm 2020-07-23 18:52:18 -07:00
siliconsandGitHub ce18584fb1 Update beam_rifle.dm 2020-07-23 18:47:22 -07:00