Commit Graph

20807 Commits

Author SHA1 Message Date
Lin
1ed893f16d Merge pull request #15995 from SandPoot/orbit-jobs
Shows people's jobs on the orbit menu
2023-08-05 12:47:56 -04:00
SandPoot
c54ce2d09d wrong codebase 2023-08-04 00:16:53 -03:00
SandPoot
403c49afab push 2023-08-04 00:11:08 -03:00
SandPoot
410d80987e nope, who OWNS it 2023-07-31 15:04:52 -03:00
SandPoot
860f75d464 go 2023-07-31 15:02:51 -03:00
SandPoot
9421423ed5 Merge branch 'master' into changeling-update 2023-07-26 22:22:14 -03:00
SandPoot
11aa13e4e8 part 1 - 41928 2023-07-26 21:45:43 -03:00
Lin
b1f6271cb5 Merge pull request #15991 from SandPoot/screenhints
Adds a couple hints to things
2023-07-23 16:52:31 -05:00
SandPoot
994ff214d5 ? 2023-07-23 15:06:20 -03:00
Lin
77df8655e0 Merge pull request #15990 from SandPoot/lobby-collapse
Collapsible lobby buttons
2023-07-20 11:55:29 -05:00
SandPoot
3645d00ec0 alright then 2023-07-19 21:15:52 -03:00
SandPoot
19ee7f8bd2 some hints 2023-07-19 20:51:25 -03:00
Lin
3c3f609541 Merge pull request #15989 from SandPoot/screentip-update
Update screentips
2023-07-19 15:53:38 -05:00
SandPoot
6ab934f6a1 pushies 2023-07-19 15:06:23 -03:00
SandPoot
217e23fc7f push 2023-07-18 15:22:24 -03:00
deathride58
4e975c819e Merge pull request #15988 from SandPoot/fix-tooltips-again
Fix tooltips AGAIN
2023-07-06 15:29:40 -04:00
SandPoot
3fca781947 push 2023-07-06 16:12:40 -03:00
KrissKr0ss
0212870845 Update SDQL_2.dm 2023-06-24 22:41:56 -05:00
Jerry Wester
31e87bc2d7 Safeguard suit 2023-05-01 00:26:56 -05:00
Jerry Wester
86ba327b9d update painting 2023-05-01 00:24:52 -05:00
Jerry Wester
4067e0bdef Armor rebalancing 2023-05-01 00:24:42 -05:00
Jerry Wester
10baa84a27 space-ify suits 2023-05-01 00:24:20 -05:00
Jerry Wester
0eb90e3a5a fix sensitive springlock 2023-05-01 00:24:05 -05:00
Jerry Wester
79e0849990 fix pai duping 2023-05-01 00:23:33 -05:00
Jerry Wester
4ba7f2ac0a add paint kit to research 2023-05-01 00:22:37 -05:00
Jerry Wester
93efbde5a9 point of locking your modsuit i mean really why 2023-05-01 00:21:39 -05:00
Jerry Wester
908ac03b6d the ID lock doesn't even lock to your ID whats the 2023-05-01 00:20:26 -05:00
GoldenAlpharex
682d60710d Lets you retract your helmet even when the MODsuit is active (#11120) 2023-05-01 00:19:58 -05:00
Jerry Wester
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
Lin
133ad142a5 Merge pull request #15975 from zeroisthebiggay/patch-30
removes the heirloom toolbox from assistants
2023-04-23 18:09:04 -07:00
Lin
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
Lin
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
SandPoot
8d6e9f5a2d branch name 2023-03-14 16:25:22 -03:00
silicons
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
Lin
69a487e3bd Merge pull request #15973 from SandPoot/screentips-update
Screentips context help now have advanced, fancy icons (with a way to disable it for only text)
2023-02-23 21:49:51 -07:00
Lin
00fe11ee3a Merge pull request #15974 from SandPoot/does-aligning-the-correct-way
Does runechat aligning properly
2023-02-23 21:22:03 -07:00
Lin
5f0739b216 Merge pull request #15976 from SandPoot/duct-piping
Several duct pipe fixes/qol
2023-02-23 21:16:44 -07:00
Lin
1a9fae43d0 Merge pull request #15977 from SandPoot/sendtonull
Fix solar construction, again
2023-02-23 21:13:59 -07:00
SandPoot
cc8d385371 sanity 2023-02-24 01:11:12 -03:00
SandPoot
e6d471ef0d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into screentips-update 2023-02-24 01:07:49 -03:00
SandPoot
b2f7fc5a9e over action buttons also very cool you guy that hates my fancy hints, hope you know how to do everything 2023-02-24 01:07:27 -03:00
SandPoot
77969d5e2e yes 2023-02-21 20:43:48 -03:00
SandPoot
2bdec078d7 Merge pull request #311 from Sandstorm-Station/duct-piping
Several duct pipe fixes/qol
2023-02-21 16:44:35 -03:00
zeroisthebiggay
266e5892f0 Update assistant.dm 2023-02-21 05:21:09 -05:00
SandPoot
d287fc25ca poosh 2023-02-21 01:55:49 -03:00
zeroisthebiggay
4d72fd3ddf Update explorer_gear.dm 2023-02-20 22:53:26 -05:00
SandPoot
09ebd0fddf lizard content 2023-02-19 03:46:36 -03:00
Darius
12f3f9781a Sanitize screentip colors
Sanitize screentip colors as hexcolor when saving, to prevent possible cases of null values that could break the interaction screentips.

Solution provided by SandPoot, in response to an issue posted by BongaTheProto.
2023-02-18 22:48:21 -05:00
SandPoot
2bf781580e Merge branch 'master' into new-decal-painter 2023-02-15 20:06:29 -03:00