Commit Graph

20776 Commits

Author SHA1 Message Date
SandPoot
3fca781947 push 2023-07-06 16:12:40 -03: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
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
Timothy Teakettle
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
Putnam3145
008eedfedc Fix shuttle catastrophe happening during transit 2023-02-12 17:12:52 -08:00
Timothy Teakettle
5f6e204866 Merge pull request #15940 from squib-bot/fermichemwork
Re-Adding Bounty Consoles
2023-02-11 00:06:37 +00:00
Timothy Teakettle
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
d29ce2328c some extra touches 2023-02-09 02:25:34 -03:00
SandPoot
4491abc2d7 updates to most recent version and puts intent hints! 2023-02-09 02:20:02 -03:00
SandPoot
1b1154260c correct everything and some intention based checks 2023-02-08 02:17:57 -03:00
SandPoot
b955bc222b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into new-decal-painter 2023-02-06 20:24:35 -03:00
SandPoot
5052f836e7 the stuff 2023-02-06 19:54:54 -03:00
zerothebigboy
d93dcf5b76 sickkicks 2023-02-01 08:25:30 -05:00
SandPoot
ed06e686e1 pushies. 2023-01-31 16:40:17 -03:00
zerothebigboy
091d9ec00f good 2023-01-30 00:01:22 -05:00
silicons
469ac02274 Merge pull request #15950 from SandPoot/trigger-events-tgui
Event menu rewrite
2023-01-29 13:46:39 -08:00
silicons
fec5653da6 Merge pull request #15949 from SandPoot/fix-solar-runtimes
Turns out the glass type giving you better stats didn't work
2023-01-29 13:46:21 -08:00
silicons
eda34c0dc2 Merge pull request #15946 from LetterN/mentor-sql-fix
update mentor admin log sql query
2023-01-29 13:46:12 -08:00
silicons
5e30dad781 Merge pull request #15942 from LeDrascol/protolathe-ejection-improvements
Protolathe material ejection improvements
2023-01-29 13:46:01 -08:00
silicons
e7a9edbc6f Merge pull request #15953 from SandPoot/fix-pen-tablet
Fixes the tablet pen buttons
2023-01-29 13:42:29 -08:00
SandPoot
44913d5fff Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into new-decal-painter 2023-01-28 01:20:26 -03:00
SandPoot
c60f36a42b files 2023-01-28 01:10:49 -03:00
SandPoot
32a36a1bfa put back 2023-01-27 23:03:47 -03:00
SandPoot
54641ce201 send 2023-01-23 20:44:28 -03:00
silicons
2d5e163916 Merge pull request #15947 from SandPoot/bitfield-updates
Updates bitfields, admin side
2023-01-23 13:02:28 -08:00
SandPoot
9edcd1b353 fix it 2023-01-23 16:56:37 -03:00
SandPoot
854a1c1b5c modified content 2023-01-22 14:09:10 -03:00
LetterN
d240eb5377 update mentor admin log sql query 2023-01-22 11:40:21 +08:00
Lin
6dd017fc21 Merge pull request #15933 from LeDrascol/polychromatic-cowboy-hat
Adds the Polychromatic Cowboy Hat
2023-01-18 18:11:21 -07:00
Lin
bd6a170299 Merge pull request #15943 from SandPoot/silicon-stuff
Update some silicon stuff
2023-01-18 17:52:06 -07:00
SandPoot
0ebcf0b72f stuff 2023-01-16 18:16:32 -03:00
Darius
4fc30ce8ae Protolathe material ejection improvements
Updates to the protolathe:
- Added eject buttons for 10x, 20x, and 50x
- Renamed "Eject" to "1x"
- Renamed "All" to "Max Stack"
2023-01-16 00:18:35 -05:00
Lin
c73df1efb9 Merge pull request #15937 from LeDrascol/ptech-all-carts
Add all missing job cartridges to PTech
2023-01-15 15:34:28 -07:00
President of Shit PRS
71d588f33d Update bounty_console.dm 2023-01-14 04:00:48 +00:00