Commit Graph

30568 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
Drulikar ad145751a7 Fix admin command to load away missions. 2023-03-26 00:01:04 -07:00
Lin 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
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
SandPoot f1eb8fe54f rotat 2023-03-14 15:06:18 -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 ca5dddfc29 less weird coloring 2023-02-20 00:44:40 -03:00
SandPoot 1f6338189a new icon with adjustments for it 2023-02-19 14:29:25 -03: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
SandPoot 8ea39f9cf4 helpers 2023-02-10 00:39:04 -03: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 c1e8039c11 source 2023-02-09 03:00:56 -03:00
SandPoot 78c28a40c7 sneaky hint about reskinning 2023-02-09 02:54:31 -03: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
Timothy Teakettle 7e77bc8023 Merge pull request #15963 from zeroisthebiggay/sickkicks
sick kicks: tg/skyrat boot sprite theft
2023-02-03 09:54:04 +00:00
Timothy Teakettle f40584685b Merge pull request #15952 from zeroisthebiggay/sabre
very ready sabre resprite and minor sprite tweaks
2023-02-03 09:53:15 +00:00
Timothy Teakettle 560fbd3ffb Merge pull request #15956 from zeroisthebiggay/posters
poster resprite bottom text
2023-02-03 09:52:48 +00:00
zerothebigboy d93dcf5b76 sickkicks 2023-02-01 08:25:30 -05:00
SandPoot ed06e686e1 pushies. 2023-01-31 16:40:17 -03:00
zerothebigboy 8dd5986788 okay 2023-01-30 00:06:49 -05:00
zerothebigboy 091d9ec00f good 2023-01-30 00:01:22 -05:00
zerothebigboy 8776b8c0cc epic 2023-01-29 22:35:59 -05:00
zerothebigboy c99b22fe32 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into sabre
# Conflicts:
#	icons/obj/items_and_weapons.dmi
2023-01-29 21:59:01 -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