cyberpresidentvanellope/Sandstorm-Station-13
1
0
Fork 0
mirror of https://github.com/Sandstorm-Station/Sandstorm-Station-13.git synced 2026-07-22 05:35:21 +01:00
Code Issues Packages Projects Releases Wiki Activity
38,600 Commits 8 Branches 0 Tags
machine-changes
Commit Graph

585 Commits

Author SHA1 Message Date
Enric Gabriel 499fec6a16 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-09-06 10:42:43 -03:00
silicons 9e204f167f Merge pull request #12452 from Trilbyspaceclone/spike-loot-differentces 
Miner Loot Shuffle MK III
 2020-09-06 01:58:46 -07:00
BlackMajor 8b59b4a80d Merge pull request #13332 from Citadel-Station-13/silicons-patch-31 
makes magweapons emp-immune
 2020-09-06 18:05:34 +12:00
BlackMajor 75e38edb43 Merge pull request #13287 from Citadel-Station-13/revert-13122-haha 
Reverts load delays because it's still a problem and by god am I just done at this point
 2020-09-06 18:01:09 +12:00
silicons cbcacaa0af Update magweapon.dm 2020-09-02 15:51:28 -07:00
Enric Gabriel c10471fac9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-30 01:42:29 -03:00
Trilbyspaceclone 9c8f3305bb Merge branch 'master' into spike-loot-differentces 2020-08-30 00:41:42 -04:00
silicons 05b5d39732 Update ballistic.dm 2020-08-29 21:38:45 -07:00
Trilbyspaceclone c4885d81f3 Merge branch 'master' into spike-loot-differentces 2020-08-27 03:41:14 -04:00
Ghommie 2811f744e3 Fixing some mistakes with the priority overlays removal PR. 2020-08-26 14:00:35 +02: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
silicons 7737e76b32 Merge pull request #13224 from Ghommie/Ghommie-cit835 
Removing priority overlays, update_icon() splitup for guns.
 2020-08-22 15:19:07 -07:00
Ghom cd10655985 fix 2 2020-08-20 23:02:13 +02:00
Ghommie 921a963e59 fix 1 2020-08-20 20:26:29 +02:00
Ghommie fde859bca0 Removing priority overlays, update_icon() splitup for guns. 2020-08-20 18:33:23 +02:00
Enric Gabriel b0cf18fc5a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-20 13:29:24 -03:00
lolman360 5306da7938 Update code/modules/projectiles/guns/ballistic.dm 
Co-authored-by: silicons <2003111+silicons@users.noreply.github.com>
 2020-08-19 12:02:53 +10:00
lolman360 6f21b23a87 Fixes Shit. 2020-08-18 14:28:57 +10:00
Trilbyspaceclone 1b61a5feb2 Merge branch 'master' into spike-loot-differentces 2020-08-12 15:10:37 -04: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
silicons 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
TrilbySpaceClone 3ae10ac826 update? 2020-08-06 13:09:41 -04: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
Trilbyspaceclone e1e6198140 Merge branch 'master' into spike-loot-differentces 2020-08-03 10:53:08 -04:00
Timothy Teakettle 03d01d917f Merge branch 'master' into wounds-part-2 2020-08-02 18:10:31 +01: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
silicons f02bc4a572 Update toy.dm 2020-07-29 19:49:11 -07:00
Timothy Teakettle 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
Lin 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
Lin 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
Lin 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
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
silicons 23465355d0 Update stun.dm 2020-07-24 22:16:06 -07:00
Timothy Teakettle 7fb55a02a5 section one 2020-07-24 22:34:22 +01:00
silicons 1c4249c99d Update medbeam.dm 2020-07-24 00:57:30 -07:00
silicons 0b4185e26f Update beam_rifle.dm 2020-07-23 18:52:18 -07:00
silicons ce18584fb1 Update beam_rifle.dm 2020-07-23 18:47:22 -07:00
silicons ffd44b78ba Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-23 10:26:03 -07:00
silicons 4d48abf3a6 fixes 2020-07-21 11:46:17 -07:00
silicons 98d3ac80d9 :pika: 2020-07-20 11:25:17 -07:00
Timothy Teakettle 1a5008fee7 Merge branch 'master' into wound-port 2020-07-18 23:06:49 +01:00
Timothy Teakettle 974b80a2fd Merge branch 'master' into wound-port 2020-07-18 21:45:24 +01:00
timothyteakettle 7714fcfaba more changes 2020-07-18 01:26:38 +01:00
silicons 993b4ec222 Merge remote-tracking branch 'citadel/master' into unarmed_parry 2020-07-16 19:39:46 -07:00
Letter N 2afab07b4a https://github.com/tgstation/tgstation/pull/52255 2020-07-16 20:05:37 +08:00
timothyteakettle 03bd806c73 pickle 2020-07-16 02:51:07 +01:00
silicons 6cbab55ef8 Merge remote-tracking branch 'citadel/master' into unarmed_parry 2020-07-07 21:07:58 -07:00