cyberpresidentvanellope/Sandstorm-Station-13
1
0
Fork 0
mirror of https://github.com/Sandstorm-Station/Sandstorm-Station-13.git synced 2026-08-26 22:58:05 +01:00
Code Issues Packages Projects Releases Wiki Activity
38,600 Commits 8 Branches 0 Tags
machine-changes
Commit Graph
1569 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
siliconsandGitHub 9e204f167f Merge pull request #12452 from Trilbyspaceclone/spike-loot-differentces 
Miner Loot Shuffle MK III
 2020-09-06 01:58:46 -07:00
Enric Gabriel ad8a55ebbe Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-09-04 23:50:13 -03:00
siliconsandGitHub aee7974140 Update astral.dm 2020-08-31 22:34:19 -07:00
Enric Gabriel c4bb4e5873 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-31 21:23:27 -03:00
Blue Wildrose cc9648c08d Update slime.dm 2020-08-30 23:19:18 -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
TrilbyspacecloneandGitHub 9c8f3305bb Merge branch 'master' into spike-loot-differentces 2020-08-30 00:41:42 -04:00
Timothy Teakettle b3c459c59c okay you can use any emote 2020-08-27 21:04:36 +01:00
TrilbyspacecloneandGitHub c4885d81f3 Merge branch 'master' into spike-loot-differentces 2020-08-27 03:41:14 -04:00
Enric Gabriel 4028af4f4f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-26 12:24:38 -03:00
siliconsandGitHub f611fee193 mecha are no longer immune to goliath tentacles (#13172) 
* Update goliath.dm

* Update goliath.dm

* Update goliath.dm
 2020-08-26 13:06:53 +02:00
siliconsandGitHub 1608214156 gives vortex blasts 50% armor pen vs mechas (#13171) 
* Update hierophant.dm

* Update hierophant.dm

* Update hierophant.dm
 2020-08-25 22:17:36 +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
siliconsandGitHub 188bb13272 Merge pull request #13181 from Putnam3145/dynnamic 
Dynamic: tweaks and fixes: the reckoning
 2020-08-22 15:22:19 -07:00
siliconsandGitHub 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
Ghommie fde859bca0 Removing priority overlays, update_icon() splitup for guns. 2020-08-20 18:33:23 +02:00
Enric Gabriel 600c3b3528 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-18 23:31:57 -03: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
Timothy TeakettleandGitHub f5300750b5 Revert "[TESTMERGE ONLY] FUCK" 2020-08-17 03:18:36 +01:00
siliconsandGitHub 4cd731ce11 Revert "cease your shitcode: cum edition" 2020-08-16 19:06:57 -07:00
silicons 8dedcbcf76 Merge branch '13113' 2020-08-16 18:53:35 -07:00
silicons b56742beb5 Merge branch 'pr-13110' 2020-08-16 18:40:23 -07:00
Putnam f54d272b11 Yet more dynamic tweaks. 2020-08-15 23:38:21 -07:00
TrilbyspacecloneandGitHub 1b61a5feb2 Merge branch 'master' into spike-loot-differentces 2020-08-12 15:10:37 -04:00
Enric Gabriel cea68c05f5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-12 13:37:19 -03:00
siliconsandGitHub 130c3a9480 Merge pull request #13096 from Michiyamenotehifunana/possum 
Ports Opossums from Desert Rose
 2020-08-11 16:19:42 -07:00
kiwedespars 3bd2f73449 travis 2020-08-10 21:37:50 -07:00
kiwedespars eb8574d6d6 heretics from tg (with changes) 2020-08-10 19:17:26 -07:00
Timothy Teakettle 24557c415c i said CEASE 2020-08-10 21:42:52 +01:00
Michiyamenotehifunana 0f274d5891 Fixes some code anomalies 
Adds newline to possum code, reverts var invalidation in kilostation's pets
 2020-08-10 09:40:23 +08:00
Enric Gabriel bae8c236f6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-09 18:34:33 -03:00
siliconsandGitHub a950adc0df Update regalrat.dm (#13076) 2020-08-09 14:49:10 +02:00
Michiyamenotehifunana 9b6156ad81 Ports opposums 
Everything stolen from Desert Rose, including sprites. All credits to whoever made it there.
 2020-08-09 16:35:12 +08:00
TrilbySpaceClone 3ae10ac826 update? 2020-08-06 13:09:41 -04:00
Letter N 333ca2cc7b Merge remote-tracking branch 'origin/master' into TGUI-4 2020-08-06 18:26:04 +08:00
Enric Gabriel e4f7092490 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-05 22:52:22 -03:00
LinandGitHub 0ff5c90fc8 Merge pull request #12969 from silicons/e 
someone asked i code holoparasites playing music so here we are???
 2020-08-05 19:48:37 -05:00
siliconsandGitHub b2052a16cb Merge pull request #13008 from zeroisthebiggay/powercreepislife 
nukies can buy holoparasites not including support ones
 2020-08-05 15:13:13 -07: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
Letter N 454baea55f Merge remote-tracking branch 'origin/master' into TGUI-4 2020-08-04 09:31:34 +08:00
siliconsandGitHub a4132c04ea Merge pull request #12894 from timothyteakettle/wounds-part-2 
port of wounds part 2
 2020-08-03 14:43:07 -07:00
TrilbyspacecloneandGitHub e1e6198140 Merge branch 'master' into spike-loot-differentces 2020-08-03 10:53:08 -04:00
Letter N b30607b759 ayys update - ordering shit 2020-08-03 21:37:11 +08:00
Letter N 9a9e3ffef5 fixfixfix squared. Will not fix missing clockslab tabs, you just have to give it a category. 2020-08-03 21:14:17 +08:00
zerothebigboy d3cfa47d65 a 2020-08-02 22:27:42 -04:00
zerothebigboy 2d4127a9a7 a 2020-08-02 22:26:45 -04:00
zerothebigboy 35c5c2f4cd a 2020-08-02 22:17:44 -04:00
Enric Gabriel 656dbe6d06 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-02 17:41:21 -03:00
Enric GabrielandGitHub 771ca629eb Xenolings comeback (#37) 2020-08-02 17:36:27 -03:00