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

89 Commits

Author SHA1 Message Date
SandPoot 6d6e95b479 Delete generic_negative_events.dm 
meant to go on master
 2020-10-11 13:46:32 -03:00
Enric Gabriel 46ef6a63c5 upload files 2020-09-21 13:27:22 -03:00
Enric Gabriel d86e4354a9 travis no likey 2020-09-21 02:14:57 -03:00
Enric Gabriel 46288f263e upload files 2020-09-21 02:04:24 -03:00
Enric Gabriel d85ebed8db Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-09-16 16:22:36 -03:00
SandPoot 6809afb45c Many borg changes (seriously) (#69) 2020-09-15 23:25:59 -03:00
Enric Gabriel 520a9d7ef2 this 2020-09-11 19:07:27 -03:00
Enric Gabriel efaba6d0d1 Merge branch 'master' of https://github.com/SandPoot/Sandstorm-Station-13 into master 2020-09-08 17:30:31 -03:00
Enric Gabriel a13d713a50 push 2020-09-08 17:30:17 -03:00
Enric Gabriel aaf4613791 push 2020-09-08 14:26:19 -03:00
Enric Gabriel 242400a5d6 push the files 2020-09-07 20:40:03 -03:00
Enric Gabriel 1ddcd7669e yes 2020-09-07 16:23:13 -03:00
Enric Gabriel 6d9d39cd1c fix some breaky stuff force push 2020-08-30 02:18:32 -03:00
SandPoot 89a55525f5 [TESTMERGE] New tgs commands + modification of a existant one (#58) 2020-08-29 15:45:02 -03:00
Enric Gabriel f70b74eca3 here 2020-08-26 12:05:06 -03:00
Enric Gabriel 84c3518b54 button 2020-08-25 17:32:47 -03:00
Enric Gabriel ecb7c13c4b Merge branch 'master' of https://github.com/SandPoot/Sandstorm-Station-13 into master 2020-08-22 20:30:55 -03: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
ZombieTsar e5396256ee Iron and sand can be made from chemistry (#54) 2020-08-22 20:30:07 -03:00
SandPoot 36aee0b3ac Various ERP verb fixes (#53) 2020-08-21 03:26:51 -03:00
Enric Gabriel 35b1483cad does some stuff that makes travis happy 2020-08-21 02:34:36 -03:00
SandPoot bcb474627b Bluespace miner update + a little fix for borgdrakes* (#52) 2020-08-20 17:53:37 -03:00
SandPoot 4d105bb50f A few fixes and stuff (#51) 2020-08-18 01:22:14 -03:00
Enric Gabriel 0aea0b2303 updat 2020-08-17 23:06:41 -03:00
SandPoot 66541bbe67 Adds tgstation's fix air for admins (#49) 2020-08-17 14:55:59 -03:00
Enric Gabriel 9610b6a9af ya guys like wiring? 2020-08-16 15:17:37 -03:00
SandPoot 518c70e6ed Some Cit reverts and skyrat features. (#46) 2020-08-15 13:29:50 -03:00
SandPoot fe8119c18c Code optimizations + clean-up (#45) 2020-08-14 02:01:54 -03:00
crazyraio2 d7b3b609e6 looks like i'm dumber than i thought 2020-08-12 14:09:50 -03:00
crazyraio2 e3999a0033 we can't have nice things 2020-08-12 13:52:20 -03:00
Enric Gabriel ddf08e6185 guessitwasnotupstreamproblemafterall 2020-08-12 13:04:49 -03:00
Enric Gabriel 24eb2308b3 just this little thing so nothing goes wrong later 2020-08-12 11:40:12 -03:00
Enric Gabriel 3fbf8d71f4 Show Held Item 2020-08-12 11:30:55 -03:00
SandPoot f4165e6dbb Kinectic Destroyer (#40) 2020-08-09 19:40:38 -03:00
Enric Gabriel 1e03f40397 Spaceship beacons and etc. (#39) 2020-08-06 22:01:47 -03:00
Enric Gabriel b7ad21dafa X-Ray mutation comeback (#38) 2020-08-06 01:07:33 -03:00
Enric Gabriel 7b0e832ce6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-05 12:26:12 -03: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
crazyraio2 b056de1285 new inhand icons for the power tools 2020-07-31 13:46:28 -03:00
crazyraio2 aa8d28a86b gets rid of my lazy fix for the glory kill 2020-07-31 12:37:45 -03:00
Enric Gabriel 12c21496b6 Some useful stuff (#34) 2020-07-29 22:13:57 -03:00
Enric Gabriel cba42e7cf2 no. 2020-07-29 22:01:58 -03:00
Enric Gabriel bcda6cb6a6 fixes some stuff. **NOT DMM ON SPACE MAN THOUGH** 2020-07-29 11:04:22 -03:00
Enric Gabriel aa7316b93b some tweaks and removes unused code 2020-07-28 18:54:12 -03:00
Enric Gabriel a09178fde7 Quality of life thing? (#31) 2020-07-27 18:46:42 -03:00
Enric Gabriel 5225eed156 web edit momment. 2020-07-26 19:18:27 -03: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
crazyraio2 76872e3a36 and i forgot one file 2020-07-26 15:29:48 -03:00
crazyraio2 5283ec71fe there's your plushie 2020-07-26 14:33:08 -03:00