cyberpresidentvanellope/Sandstorm-Station-13
1
0
Fork 0
mirror of https://github.com/Sandstorm-Station/Sandstorm-Station-13.git synced 2026-08-27 15:18:33 +01:00
Code Issues Packages Projects Releases Wiki Activity
50,585 Commits 8 Branches 0 Tags
master
Commit Graph
1006 Commits
Author SHA1 Message Date
zerothebigboy 3fae79f876 thetwentyfirstofmany 2021-06-11 20:28:25 -04:00
silicons 1a800cc470 modifications 2021-06-07 19:40:16 -07:00
silicons 40f2c06f2e Merge remote-tracking branch 'citadel/master' into combat_v7 2021-06-07 16:47:11 -07:00
SandPoot 03bdaad203 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-05-19 15:55:34 -03:00
siliconsandGitHub d0bb22da5f Merge pull request #14653 from timothyteakettle/rp-markings-attempt-two 
ports rp's marking system
 2021-05-19 08:02:59 -06:00
shellspeed1 e4e5d8f5cd adds an pod for projects 2021-05-17 00:59:10 -07:00
Timothy Teakettle 3c7137f951 what if we didnt break 90% of the game 2021-05-05 18:19:02 +01:00
silicons 1585d1c2be fixes 2021-04-26 23:32:33 -07:00
SandPoot bab386168e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-04-18 23:23:02 -03:00
siliconsandGitHub af7bb2e09f Merge pull request #14585 from zeroisthebiggay/cumbblegum 
pov: you're watching zero ruin megafauna by making them DDR raves one pr at a time (ports epic tg bubblegum)
 2021-04-18 19:00:14 -06:00
SandPoot 0165c4a7c0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-04-10 12:34:59 -03:00
siliconsandGitHub bda9f2ac76 Merge pull request #14540 from SandPoot/fixing-lizzies 
Fixes some lizards
 2021-04-08 03:22:46 -06:00
zerothebigboy 657d1f69c8 sex 2021-04-07 04:18:04 -04:00
SandPootandGitHub 2aa2a8c802 actually not that much needed 2021-03-31 20:28:50 -03:00
LetterN f976a89157 Merge remote-tracking branch 'origin/master' into perlin-genny 2021-03-31 08:19:31 +08:00
SandPoot df4779dced upload files 2021-03-29 22:26:34 -03:00
SandPoot 1a7d33b801 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-03-27 11:41:32 -03:00
R3dtailandGitHub 0b3773163c Removes Ichor Crates from chest rolls 
Does what it says on the tin
 2021-03-24 22:20:09 -05:00
LetterN e3fb2d5491 Merge remote-tracking branch 'origin/master' into perlin-genny 2021-03-24 21:55:47 +08:00
SandPoot d789df5aa9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-03-20 18:15:07 -03:00
siliconsandGitHub 720f525683 Merge pull request #14323 from dzahlus/hierophant-esword-no-more 
Hierophant staff no longer deals 30 damage
 2021-03-20 14:32:14 -06:00
LetterN 292f67e098 Merge remote-tracking branch 'origin/master' into perlin-genny 2021-03-20 20:36:56 +08:00
SandPoot a8076257a0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-03-18 22:56:09 -03:00
siliconsandGitHub df92faadd4 Update necropolis_chests.dm 2021-03-15 19:05:25 -07:00
Letter N 935e46b492 The Mapping Update 
Cleans up the map (again)
Makes mining code more better
 2021-03-12 12:11:35 +08:00
SandPoot 82caedb1ef Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-03-10 12:26:52 -03:00
Sneakyrat6andGitHub d5b0251cb5 Merge branch 'master' into matContainer 2021-03-09 05:42:47 -05:00
SandPoot 20509121b8 Merge branch 'master' of https://github.com/Sandstorm-Station/Sandstorm-Station-13; branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-03-08 14:07:57 -03:00
Sneakyrat6 703567e591 other fixes 2021-03-07 04:09:36 -05:00
dzahlus 71cbd8a615 no more free esword 2021-02-26 14:40:00 +01:00
Letter N 5304029dd9 Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-23 11:01:42 +08:00
SandPoot 98e11d88a9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-02-21 23:29:09 -03:00
SandPoot 123de14009 upload files 2021-02-18 15:05:39 -03:00
SandPoot f738023097 Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing" 
This reverts commit 2e29f30fdf, reversing
changes made to 724910cfab.
 2021-02-18 15:04:46 -03:00
SandPoot cf2e70671a upload files 2021-02-18 14:47:10 -03:00
Letter N de67720a0a icons should exist 2021-02-14 11:39:56 +08:00
Letter N 5db87b9065 more updates! 2021-02-12 17:52:59 +08:00
Letter N 6286d40082 code works 2021-02-12 17:26:08 +08:00
SandPoot 8996930bdf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-02-04 20:40:45 -03:00
keronshb 68b65c3f93 Fixes some error, re adds knockdown 
should prevent item drops
 2021-01-30 16:19:09 -05:00
keronshb 8a75d59db2 Meathook tweaks 
Changes some values to make it a bit more fair.
 2021-01-30 15:59:59 -05:00
SandPoot 28e87a5db5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-01-28 21:57:36 -03:00
Timothy Teakettle 6d6b232afe i hate shitcoders 2021-01-27 20:33:14 +00:00
SandPoot c15a3b7a4e changes some comments and var paths to be better? 2021-01-19 13:01:45 -03:00
SandPoot e10c783cf0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-01-13 20:59:40 -03:00
kappa-sama c751f114aa finally 2021-01-12 01:42:55 -05:00
SandPoot 168799038d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-01-04 02:05:26 -03:00
siliconsandGitHub 697619856c Merge pull request #13859 from timothyteakettle/unlockable-loadout-items 
unlockable loadout items
 2021-01-03 18:07:18 -07:00
Timothy Teakettle 813e0f4c79 Merge remote-tracking branch 'upstream/master' into unlockable-loadout-items 2021-01-01 22:30:04 +00:00
SandPoot 6b7359aa6a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-01-01 15:19:56 -03:00