Commit Graph

47773 Commits

Author SHA1 Message Date
deathride58
226d2ba16f Merge pull request #16091 from SandPoot/update-alerts
Update Alerts
2024-05-25 14:00:06 -04:00
SandPoot
9ba4dbb242 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into update-alerts 2024-05-22 00:31:41 -03:00
SandPoot
5852293116 PROC_REF!!!!!! 2024-05-22 00:25:21 -03:00
SandPoot
98b017831c final 2024-05-22 00:22:05 -03:00
deathride58
7c01ad1dd2 Merge pull request #16090 from SandPoot/vox-rework
Vox rework
2024-05-21 23:16:40 -04:00
SandPoot
7f953a03af listener update 2024-05-22 00:06:08 -03:00
SandPoot
d73f32f51a NOT static 2024-05-21 18:31:40 -03:00
SandPoot
04c8919e75 announcement side 2024-05-21 18:25:43 -03:00
SandPoot
dcc2126b91 include help text 2024-05-21 15:18:00 -03:00
SandPoot
912ca1e374 poosh 2024-05-21 00:06:26 -03:00
deathride58
2e5e548369 Merge pull request #16089 from SandPoot/borg-buttons
Borg movement intent buttons
2024-05-20 17:40:38 -04:00
deathride58
4e8b178079 Merge pull request #16088 from SandPoot/robot-control-tgui
Robot control tgui
2024-05-20 17:39:44 -04:00
SandPoot
7832dbdba4 push 2024-05-20 18:25:24 -03:00
SandPoot
9641f16807 push 2024-05-19 04:23:23 -03:00
SandPoot
ea815d1c93 push 2024-05-19 03:30:35 -03:00
deathride58
22a0ad4b7c Merge pull request #16087 from SandPoot/jukebox-safety
Adds safeties for jukeboxes on issues that could happen
2024-05-17 20:43:43 -04:00
SandPoot
0a074ecb63 Purpose found
Co-authored-by: deathride58 <deathride58@users.noreply.github.com>
2024-05-17 21:38:45 -03:00
SandPoot
8d4b317800 poosh 2024-05-17 15:12:55 -03:00
deathride58
7901edea8f Merge pull request #16085 from SandPoot/fix-hat-runtime
Kitty ears no longer runtime
2024-05-06 13:48:30 -04:00
deathride58
d234b15425 Merge pull request #16084 from SandPoot/dangerous-cleanbot
Makes cleanbots render any weapons they are carrying
2024-05-06 13:47:48 -04:00
SandPoot
e706b328ca push 2024-05-05 20:02:50 -03:00
SandPoot
9e88a05e8f push 2024-05-05 18:21:42 -03:00
deathride58
601e3c2a2a Merge pull request #16083 from SandPoot/fix-mail
Fixes mail
2024-04-29 16:36:43 -04:00
SandPoot
691ac44a6a holidays is an assoc list 2024-04-29 17:04:39 -03:00
SandPoot
fa438e0c30 Merge pull request #16082 from deathride58/floorfix
Fixes floor decals and other missing signal-added overlays by making many instances of update_icon properly call its parent
2024-04-25 06:39:59 -03:00
deathride58
0517ece12a fixes floor decals and other missing signal-added overlays by making sure things properly call parent update_icon 2024-04-24 22:30:25 -04:00
deathride58
e094437056 Merge pull request #16081 from SandPoot/elevator-button
Gives Snaxi an Elevator Button, and just a TON of lift fixes so they're viable to map with. [MULTI-BEE] [:pslime: in the chat]
2024-04-24 20:07:46 -04:00
SandPoot
732a711252 Merge pull request #3 from deathride58/elevator-button
snaxi - adds elevator buttons to mining
2024-04-24 20:46:57 -03:00
deathride58
6400fe0159 snaxi - adds elevator buttons to mining 2024-04-24 19:44:19 -04:00
SandPoot
a1a80c5d4f pusher 2024-04-24 20:12:27 -03:00
deathride58
b956e0c40e Merge pull request #16080 from SandPoot/industrial-lift
[READY] for Z debug. Industrial lift (not shuttle edition)
2024-04-23 22:53:40 -04:00
SandPoot
3978809940 Merge pull request #2 from deathride58/industrial-lift
industrial-lift tweaks
2024-04-23 23:49:27 -03:00
deathride58
543daa52ac Adds lift to Snaxi, fixes industrial lifts clipping through floors 2024-04-23 22:41:25 -04:00
SandPoot
5ab5865d3e stop putting invalid things here 2024-04-23 23:15:43 -03:00
SandPoot
ae8d0493db proc_ref 2024-04-23 22:44:56 -03:00
SandPoot
0717399333 CAR!!! 2024-04-23 22:32:28 -03:00
deathride58
4d86abfa4c Merge pull request #16079 from liz-lavenza/cit-fix/more-icons
Fix issues with icons and mail bags
2024-04-16 17:02:49 -04:00
Elizabeth Lavenza
0b4dcfd73a Fix invalid gun overlays 2024-04-16 02:19:41 -04:00
Elizabeth Lavenza
e57c803e3a Fix invalid box overlays 2024-04-16 02:19:36 -04:00
Elizabeth Lavenza
62471713f1 Fix missing shipping box overlay 2024-04-16 02:18:18 -04:00
Elizabeth Lavenza
c69f30e846 Fix missing junk mail return hint 2024-04-16 02:12:46 -04:00
Elizabeth Lavenza
e74d787bf1 Fix string cell types 2024-04-16 01:14:28 -04:00
Elizabeth Lavenza
86c1a2eeaa Fix invalid gun overlays 2024-04-16 01:14:28 -04:00
Elizabeth Lavenza
b1f0eb3183 Fix mail bag not holding mail 2024-04-16 01:14:28 -04:00
Elizabeth Lavenza
497972b308 Add blank icon state to suppress modular pistol runtime 2024-04-16 01:14:28 -04:00
deathride58
3a054b8349 Merge pull request #16078 from SandPoot/tgui-dev-fix
Fix tgui dev server on Windows
2024-04-15 19:33:19 -04:00
SandPoot
1b40bf27c4 fix NOW!!! 2024-04-15 20:17:21 -03:00
deathride58
af636a30b5 Merge pull request #16077 from liz-lavenza/cit-fix/upstream-issues-04-13-2024
Upstream a number of fixes from downstream
2024-04-14 18:32:08 -04:00
Elizabeth Lavenza
7f2e5a8945 Fix nonexistent keyboard overlays 2024-04-13 20:14:19 -04:00
Elizabeth Lavenza
e37fbc72e0 Fix miniature egun overlays 2024-04-13 20:14:19 -04:00