Commit Graph
6980 Commits
Author SHA1 Message Date
Tsurupeta d4ec25e748 all else 2023-08-08 14:01:18 +03:00
Tsurupeta d4f3793f8f QDEL_IN improvements 2023-08-08 14:01:16 +03:00
BongaTheProtoandGitHub 835f7c76f2 Merge branch 'Sandstorm-Station:master' into master 2023-07-26 18:35:43 -05:00
SandPoot ebd9cedbfb this 2023-07-26 17:28:29 -03:00
BongaTheProto e87e828638 Merge remote-tracking branch 'upstream/master' 2023-07-25 22:47:02 -05:00
SandPoot ef186347ca Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-07-23 18:56:20 -03:00
SandPoot 19ee7f8bd2 some hints 2023-07-19 20:51:25 -03:00
Satile1 61ef0f337e Hotel Radio channel! Mapping fixes and flavour 2023-05-25 17:09:21 +01:00
BongaTheProtoandGitHub 2dbd0a45e5 Update items.dm 2023-05-06 18:59:11 -05:00
BongaTheProto c72c8c145d Merge branch 'master' into pr/623 2023-05-06 18:45:19 -05:00
BongaTheProto 5116acad15 Merge remote-tracking branch 'upstream/master' 2023-05-06 18:31:55 -05:00
SandPoot 7038059ab5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-05-06 10:47:06 -03:00
Jerry WesterandKrissKr0ss 31e87bc2d7 Safeguard suit 2023-05-01 00:26:56 -05:00
Jerry WesterandKrissKr0ss 22309324dc whitespace should not be syntax grrr 2023-05-01 00:23:09 -05:00
Jerry WesterandKrissKr0ss 8271cf9bc1 move rescue plating to CMO locker 2023-05-01 00:22:59 -05:00
Jerry WesterandKrissKr0ss 44c029176c remove signals_atom_movable.dm, revert jetpack 2023-05-01 00:19:48 -05:00
KrissKr0ss 66aa1cb05c Revert "Merge pull request #15929 from JerryWester/revert-15894-modsuits"
This reverts commit 48e713ff33, reversing
changes made to efb2d19cb9.
2023-05-01 00:16:20 -05:00
BongaTheProto 525741658b shaft beast? Like hype beast but with cocks? 2023-04-23 13:55:45 -05:00
KeplerWasTaken 1e71db0b70 removed distasteful symbols 2023-04-17 22:27:46 +02:00
LinandGitHub d003e3faa5 Merge pull request #15979 from SandPoot/reflector-rotat
Reflectors will rotate inside shuttles - Rejoice supermatter shuttle builders
2023-03-15 14:43:40 -07:00
BongaTheProto 017c235b4f Merge remote-tracking branch 'upstream/master' 2023-03-14 17:43:38 -05:00
SandPoot faae67a3eb rotat 2023-03-14 15:13:51 -03:00
SandPoot f1eb8fe54f rotat 2023-03-14 15:06:18 -03:00
BongaTheProto 57a7a516e6 Merge remote-tracking branch 'upstream/master' 2023-03-06 22:43:10 -05:00
SandPoot d63c2ebdd8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-03-05 12:35:35 -03:00
siliconsandGitHub 6efd3098d4 Merge pull request #15961 from zeroisthebiggay/sevakillmarktwo
Removes the SEVA suit, replacing it with the HEVA suit - an ash-storm proof alternative.
2023-03-04 23:36:36 -08:00
BongaTheProtoandGitHub 151306bb69 Merge pull request #733 from LeDrascol/overhaul-quirk-dumb4cum
Modularize Dumb For Cum quirk
2023-02-24 18:32:18 -05:00
BongaTheProto acf6b87535 Merge remote-tracking branch 'upstream/master' 2023-02-24 01:39:26 -05:00
SandPoot f0dcf824a7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-02-24 01:59:45 -03:00
LinandGitHub 00fe11ee3a Merge pull request #15974 from SandPoot/does-aligning-the-correct-way
Does runechat aligning properly
2023-02-23 21:22:03 -07:00
Darius d48025140b Merge branch 'master' into overhaul-quirk-dumb4cum 2023-02-23 00:37:04 -05:00
BongaTheProto 2151624f10 Merge remote-tracking branch 'upstream/master' 2023-02-22 19:14:08 -05:00
SandPootandSandPoot 2bdec078d7 Merge pull request #311 from Sandstorm-Station/duct-piping
Several duct pipe fixes/qol
2023-02-21 16:44:35 -03:00
SandPoot c9055c4d65 minor issue 2023-02-21 16:34:10 -03:00
SandPoot e0c8419cdd deal with duct pipes 2023-02-21 16:09:35 -03:00
SandPoot d287fc25ca poosh 2023-02-21 01:55:49 -03:00
Darius 86b4f6c6ec Merge branch 'master' into overhaul-quirk-dumb4cum 2023-02-19 20:23:16 -05:00
Jerry Wester 1d9569e4f5 Merge branch 'master' of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13 into modsuits 2023-02-16 20:37:45 -07:00
BongaTheProto 972df3f711 Merge remote-tracking branch 'upstream/master' 2023-02-16 16:30:59 -05:00
SandPoot 072087ec14 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-02-15 20:22:44 -03:00
SandPootandGitHub 2bf781580e Merge branch 'master' into new-decal-painter 2023-02-15 20:06:29 -03:00
Timothy TeakettleandGitHub 71de9c13e3 Merge pull request #15962 from SandPoot/contextual-screentips
Contextual screentips -- Screentips now show you what items/objects can do
2023-02-15 23:04:54 +00:00
BongaTheProto 0cfe8e33eb Merge remote-tracking branch 'upstream/master' 2023-02-12 21:42:34 -05:00
SandPoot 2b8a20bae2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-02-12 22:59:51 -03:00
Timothy TeakettleandGitHub 5f6e204866 Merge pull request #15940 from squib-bot/fermichemwork
Re-Adding Bounty Consoles
2023-02-11 00:06:37 +00:00
BongaTheProtoandGitHub d9d617bf8d Merge branch 'Sandstorm-Station:master' into master 2023-02-10 16:53:13 -05:00
SandPoot 65c38e9828 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-02-10 02:18:08 -03:00
SandPoot 8ea39f9cf4 helpers 2023-02-10 00:39:04 -03:00
Timothy TeakettleandGitHub 390dcbcea0 Merge pull request #15966 from SandPoot/accessory-equip
Adds accessory quick-equip, a tab for it on the loadout and previews for accessories on the prefs screen
2023-02-09 21:39:05 +00:00
SandPoot 78c28a40c7 sneaky hint about reskinning 2023-02-09 02:54:31 -03:00