cyberpresidentvanellope/Sandstorm-Station-13
1
0
Fork 0
mirror of https://github.com/Sandstorm-Station/Sandstorm-Station-13.git synced 2026-08-25 14:17:32 +01:00
Code Issues Packages Projects Releases Wiki Activity
38,600 Commits 8 Branches 0 Tags
machine-changes
Commit Graph
1861 Commits
Author SHA1 Message Date
Enric Gabriel d2257abe86 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-09-19 13:21:18 -03:00
siliconsandGitHub 994a0e66e2 Merge pull request #13401 from MrJWhit/chess-sprite-update 
Porting new chess sprites
 2020-09-19 05:59:08 -07:00
Enric Gabriel 2bca904377 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-09-18 20:37:34 -03:00
Jay a82dc79dbb Hopefully fixes icon overlay issue for the halo 2020-09-18 00:51:59 -05:00
MrJWhit a4763bd8c6 Port'n stuff 2020-09-16 10:56:34 -04:00
Enric Gabriel 1ddcd7669e yes 2020-09-07 16:23:13 -03:00
Enric Gabriel b163c6435d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-09-07 13:33:45 -03:00
siliconsandGitHub 45ee1cbbf8 Merge pull request #13334 from CameronWoof/revert-12739-DRAKEBORG 
Revert Drakeborgs
 2020-09-06 15:22:16 -07:00
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 20b25372e1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-09-05 13:09:14 -03:00
siliconsandGitHub 7b50b22c7b Merge pull request #13244 from lolman360/AnPrimAssistants 
Blacksmithing 2: Anarcho-Primitivist Assistants (travis don't fail on me now)
 2020-09-05 02:20:11 -07:00
siliconsandGitHub e110945568 Merge pull request #13289 from kiwedespars/heretics-touchup 
heretics touchup
 2020-09-05 02:15:21 -07:00
Cameron!andGitHub e3af0d654e Revert "[READY] DRAKEBORGS & PLUSHIES" 2020-09-02 17:47:22 -07:00
lolman360 05bd0579ca Merge remote-tracking branch 'upstream/master' into AnPrimAssistants 2020-09-01 11:23:57 +10: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
siliconsandGitHub 9250a6d71d Merge pull request #13275 from Chiirno/portable-chem-mixer 
Portable chem mixer
 2020-08-29 21:34:57 -07:00
siliconsandGitHub 5f40c2da37 Merge pull request #13229 from Sonic121x/patch-2 
Fix Tea and give them a glass sprite
 2020-08-29 21:33:21 -07:00
siliconsandGitHub 71072ebc5e Merge pull request #13260 from dapnee/deleting-time 
[s] removes a certain donator item
 2020-08-29 21:25:22 -07:00
siliconsandGitHub af74553885 Merge pull request #13283 from SweptWasTaken/cratetweaks 
Modifies some crate sprites.
 2020-08-29 21:18:51 -07:00
Letter N ae482c1bb8 Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT 2020-08-29 14:09:56 +08:00
kiwedespars a7d68281a3 new changes 
- runes can now be destroyed by non-heretics using a bible or a null rod
- mansus grasp now has a unique inhand color.
- madness grasp now has a unique inhand color.
- blood siphon is now redder.
- silence spell, lasts 20 seconds, gives an obvious message to the victim.
- fire immunity passive for ash
- guaranteed dislocation passive for flesh
- rust grasp passive for disgusting mood/vomiting
- rust grasp cooldown reduced by 75% on hit
- living heart now checks z-level when telling you where someone is.
- grasp of decay: forced corrosion for 20 seconds, can make you vomit. probably shitcode.
- madness touch: give people trauma, braindamage and a terrible mood.
- nightwatcher's rite: fire shotgun that can do 75 damage on point blank
- flesh sickle buffed a bit.
- descriptions touched up a bit.
 2020-08-28 16:42:25 -07:00
Swept 635ee0cbbb Initial 2020-08-28 00:45:05 -07:00
Chiirno fdc2cea077 added chem dispenser, time for errors 2020-08-27 14:27:35 -03:00
TrilbyspacecloneandGitHub c4885d81f3 Merge branch 'master' into spike-loot-differentces 2020-08-27 03:41:14 -04:00
dapnee 45cebd8ad1 inb4 this gets denied 
Removes cebu soap cause not even it can clean their stain /end edgyness
 2020-08-24 16:52:06 -06:00
lolman360 40bcd3f902 PACK IT UP FOLKS 2020-08-24 11:18:02 +10:00
lolman360 f2a7c2599d Merge remote-tracking branch 'upstream/master' into AnPrimAssistants 2020-08-24 09:36:36 +10:00
Enric Gabriel 78124ace3f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-23 12:54:24 -03:00
siliconsandGitHub 7f942abef2 Merge pull request #13239 from zeroisthebiggay/fetishglovesbelike 
zero adds black fetish gloves because hes Horny
 2020-08-23 05:08:14 -07:00
lolman360 04a755746b oh yeah 2020-08-23 17:45:13 +10:00
lolman360 bc14155632 Merge remote-tracking branch 'upstream/master' into AnPrimAssistants 2020-08-23 17:01:45 +10:00
lolman360 2a3ada511e It's all codersprites? 
Always has been.
 2020-08-23 16:51:55 +10: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 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
zerothebigboy 21836b4ec8 : ) 2020-08-22 18:11:03 -04:00
Letter N afe32406c0 Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT 2020-08-22 13:40:36 +08:00
Sonic121xandGitHub bc2d99da7c Add files via upload 2020-08-22 03:38:03 +08:00
zerothebigboy 5df58b3ca6 a 2020-08-21 02:24:43 -04:00
zerothebigboy cafeb6ab14 a 2020-08-21 02:12:09 -04:00
zerothebigboy 6fb537e712 a 2020-08-21 02:12:01 -04:00
zerothebigboy a9abdeb044 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into thefunnytemporalkatanas 2020-08-21 02:10:03 -04:00
zerothebigboy 421e32f3f9 a final touch up 2020-08-21 02:06:36 -04:00
zerothebigboy b960f4055d a 2020-08-21 01:31:30 -04:00
Enric Gabriel b0662f5e39 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-21 02:19:20 -03:00
siliconsandGitHub 120bcfc00c Merge pull request #13178 from lolman360/plumb 
[READY] ports plumbing (no more waiting for tgui4)
 2020-08-20 21:32:26 -07:00
lolman360andGitHub bda2c740ba Merge branch 'master' into AnPrimAssistants 2020-08-21 11:08:13 +10:00
Ghommie fde859bca0 Removing priority overlays, update_icon() splitup for guns. 2020-08-20 18:33:23 +02:00
Letter N 8d70e21239 the unexpected paperwork update. paperwork rp? And also includes ntnet upgrade because fuck it. 2020-08-20 19:40:47 +08:00