Commit Graph

30541 Commits

Author SHA1 Message Date
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 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
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 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
zerothebigboy e76221f68b yeppers 2023-01-29 03:57:32 -05:00
zerothebigboy b8bc94ba13 man 2023-01-29 00:49:55 -05: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 a56247f828 oops? 2023-01-28 01:18:35 -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
Lin a00bb99936 Merge pull request #15934 from LeDrascol/update-lumi-eyes
Minor improvements to High Luminosity Eyes
2023-01-15 15:34:21 -07:00
President of Shit PRS 71d588f33d Update bounty_console.dm 2023-01-14 04:00:48 +00:00
Darius 791f89a179 Prevent nutriment pump with no process food trait (#15941)
Prevents the nutriment pump implant from functioning on mobs with TRAIT_NO_PROCESS_FOOD., as this behavior appears to be unintended.
2023-01-14 04:51:42 +01:00
President of Shit PRS d063144713 Re-Adding Bounty Consoles
Civilian bounties are great, don't get me wrong. But they're civilian bounties and it feels like cargo lost their thing to do, namely putting annoying sheets of paper everywhere. Plus checklists make the brain go ding when you work through them arooga.
2023-01-14 02:01:12 +00:00
Timothy Teakettle 35d01aa0f4 Merge pull request #15918 from LeDrascol/port-heirloom-update
[PORT] Non-global heirloom definitions
2023-01-12 23:39:41 +00:00