Commit Graph
22590 Commits
Author SHA1 Message Date
Jerry WesterandKrissKr0ss 0eb90e3a5a fix sensitive springlock 2023-05-01 00:24:05 -05:00
Jerry WesterandKrissKr0ss 79e0849990 fix pai duping 2023-05-01 00:23:33 -05:00
Jerry WesterandKrissKr0ss 4ba7f2ac0a add paint kit to research 2023-05-01 00:22:37 -05:00
Jerry WesterandKrissKr0ss 93efbde5a9 point of locking your modsuit i mean really why 2023-05-01 00:21:39 -05:00
Jerry WesterandKrissKr0ss 908ac03b6d the ID lock doesn't even lock to your ID whats the 2023-05-01 00:20:26 -05:00
GoldenAlpharexandKrissKr0ss 682d60710d Lets you retract your helmet even when the MODsuit is active (#11120) 2023-05-01 00:19:58 -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
WoolyAypa 36f8a4ea71 Merge branch 'master' of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13 into Chastity-system 2023-04-26 16:12:15 -03:00
SPLURT-Station d73aa9f8ac Update TGS DMAPI 2023-04-26 00:32:51 +00:00
LinandGitHub 133ad142a5 Merge pull request #15975 from zeroisthebiggay/patch-30
removes the heirloom toolbox from assistants
2023-04-23 18:09:04 -07:00
BongaTheProtoandGitHub 994f14c5d5 Merge pull request #520 from Pin-alternative/rework
Reworks to genitals
2023-04-23 14:47:32 -05:00
BongaTheProto 525741658b shaft beast? Like hype beast but with cocks? 2023-04-23 13:55:45 -05:00
Pin-alternative cd29d1e6bc changes 2023-04-23 17:17:52 +10:00
SPLURT-Station a1e8ce2e09 Update TGS DMAPI 2023-04-18 00:30:40 +00:00
BongaTheProto 4b547a3208 Merge remote-tracking branch 'upstream/master' 2023-04-08 15:49:43 -05:00
SPLURT-Station b396770a9e Update TGS DMAPI 2023-04-08 00:29:34 +00:00
SandPoot 7cc1ecfa1e (i'm being shot by those red arrows help) 2023-04-06 18:49:21 -03:00
Pin-alternative 8dbbd69ae0 Merge remote-tracking branch 'upstream/master' into rework 2023-04-05 20:14:10 +10:00
WoolyAypa eefbaed5bf proc calling -> signal 2023-04-04 12:19:46 -03:00
WoolyAypa ff61f1def1 Merge branch 'master' of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13 into Chastity-system 2023-04-04 11:28:23 -03:00
SPLURT-Station c592296c2b Update TGS DMAPI 2023-04-04 00:32:15 +00:00
Comicao1 4feb5f5b35 Merge remote-tracking branch 'upstream/master' into xenoarch-new 2023-04-03 20:32:55 -03:00
Comicao1 a5cee0c4cb Merge remote-tracking branch 'upstream/master' into xenoarch-new 2023-04-03 19:31:53 -03:00
Pin-alternative 54bb70438f Merge remote-tracking branch 'upstream/master' into rework 2023-04-04 08:16:14 +10:00
BongaTheProto 1f58235a4a Merge remote-tracking branch 'upstream/master' 2023-04-03 11:52:47 -05:00
SandPoot 9d214e2f9d Merge branch 'master' of https://github.com/Sandstorm-Station/Sandstorm-Station-13; branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-04-03 12:53:37 -03:00
BongaTheProtoandGitHub db1ac71d9b Merge pull request #803 from SPLURT-Station/we-be-stealing-again
Ports a bunch of suits
2023-04-02 16:25:43 -05:00
SPLURT-Station 24ac0ea29b Update TGS DMAPI 2023-04-02 00:34:40 +00:00
BongaTheProto 815afcc45a suits
all the suits from that file
2023-04-01 16:01:05 -05:00
LinandGitHub 654e5dad9d Merge pull request #15864 from Putnam3145/auxmos-2
UPDATE AUXMOS TO 2.0.0 (TESTMERGE THIS HOLY CRAP)
2023-04-01 00:17:22 -07:00
BongaTheProtoandGitHub 4d036ae8cf Merge pull request #793 from KeplerWasTaken/variousfixes
Cryo messages fixes, BO & BS greetings tweaks, Die of Fate is kill
2023-03-29 21:34:58 -05:00
SPLURT-Station f6ce4b186a Update TGS DMAPI 2023-03-29 00:37:32 +00:00
KeplerWasTaken 02c20c35e4 Mafia verb removal 2023-03-28 23:22:55 +02:00
KeplerWasTaken 3a81451a2d Tweaked cryo messages for heads of staff and AI, changed greeting messages for blueshields and bridge officers 2023-03-28 23:22:32 +02:00
KeplerWasTaken e6dab1762a Removed die of fate from being acquirable through ic means 2023-03-28 23:21:37 +02:00
WoolyAypa f70e1e901e Merge branch 'master' of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13 into Chastity-system 2023-03-24 23:46:54 -03:00
Comicao1 f2c79712a3 Merge remote-tracking branch 'upstream/master' into xenoarch-new 2023-03-23 15:45:55 -03:00
Pin-alternative 53645b1795 Merge remote-tracking branch 'upstream/master' into rework 2023-03-23 22:16:31 +11:00
BongaTheProtoandGitHub a3d68a2f95 Merge pull request #786 from KeplerWasTaken/mechdrillfix
Mech Drill Fix & Lavaland Syndicate Base Fix
2023-03-23 02:45:07 -05:00
Comicao1 44f8522120 Requested 2023-03-22 17:34:10 -03:00
Pin-alternative c9457047aa Merge remote-tracking branch 'upstream/master' into rework 2023-03-22 15:45:09 +11:00
LinandGitHub b53d4206df Merge pull request #15980 from SandPoot/prevent-mech-self-shoot
Mechs can no longer shoot themself from being faster than their projectile
2023-03-15 14:43:28 -07:00
BongaTheProto 017c235b4f Merge remote-tracking branch 'upstream/master' 2023-03-14 17:43:38 -05:00
SandPoot e42166dda7 branch name 2023-03-14 16:34:54 -03:00
SandPoot 8d6e9f5a2d branch name 2023-03-14 16:25:22 -03:00
KeplerWasTaken 76c8fbfd3f Merge branch 'mechdrillfix' of https://github.com/KeplerWasTaken/S.P.L.U.R.T-Station-13 into mechdrillfix 2023-03-12 12:00:30 +01:00
KeplerWasTaken 6516901a9c Mech Drill now no longer works if the target is further away than 1 tile, and the diamond drill applies the correct damage 2023-03-12 10:37:25 +01:00
Pin-alternative 98707d4135 fix get fluids 2023-03-08 09:31:02 +11:00
Pin-alternative 1c1460ecd7 Merge remote-tracking branch 'upstream/master' into rework 2023-03-08 08:14:47 +11:00