Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Port of Upstream Digi Legs #38

Closed
wants to merge 111 commits into from
Closed
Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
111 commits
Select commit Hold shift + click to select a range
9744cd0
Update mob.dm
KillianKirilenko Sep 19, 2023
cf6ea34
convert throwmode messages to prefbased
KillianKirilenko Sep 20, 2023
74748cf
Adds raptor vore mobs
SatinIsle Sep 25, 2023
f6c839c
Makes sprite update on nutrition gain past 900
SatinIsle Sep 26, 2023
2841145
Reworks Borg belly overlay system
ReoDaProtovali Sep 27, 2023
8e24048
Vore panel adjustments and fixes
ReoDaProtovali Sep 28, 2023
2a29ae5
Makes bellies always round instead of CEILING above 1 fullness
ReoDaProtovali Sep 28, 2023
ad7d63d
Fixes island radiation
SatinIsle Sep 30, 2023
d62009d
Merge pull request #15427 from SatinIsle/Fix-islands
Heroman3003 Sep 30, 2023
9a94306
Refactors tool typechecks, refactors transforming tools, makes Altevi…
Heroman3003 Sep 30, 2023
cb75ed1
Juice that makes DreamChecker say yes
ReoDaProtovali Sep 30, 2023
3ce4fce
Juice that makes DreamChecker say yes 2
ReoDaProtovali Sep 30, 2023
f8bf22e
Merge pull request #15428 from Heroman3003/big-tool-refactor
Heroman3003 Oct 1, 2023
fb94aad
Merge pull request #15423 from SatinIsle/dinos
Heroman3003 Oct 1, 2023
f1da58c
Regular Map Swap
Heroman3003 Oct 1, 2023
8008f86
Merge pull request #15430 from Heroman3003/mapswpa
Heroman3003 Oct 1, 2023
b255b1a
Fixes belts and pouches not being able to hold power tools
Heroman3003 Oct 2, 2023
f13f395
Altevian Adjustments - Descriptions & Small Tweaks
Enzo-Leon Oct 2, 2023
7958ee6
Merge pull request #15433 from Heroman3003/powertoolfix
Heroman3003 Oct 2, 2023
241a40a
Merge pull request #15425 from ReoDaProtovali/Borg-belly-naming-change
Heroman3003 Oct 2, 2023
f5cc531
Feedback adjustments for improved sentence structue.
Enzo-Leon Oct 2, 2023
818d9be
Submap Compile Fix
Novacat Oct 4, 2023
17e1cc5
Bump pillow from 9.3.0 to 10.0.1 in /tools/mapmerge2
dependabot[bot] Oct 4, 2023
a45a6f0
Adds approved fluff medal
Heroman3003 Oct 4, 2023
4f153b0
Merge pull request #15436 from VOREStation/dependabot/pip/tools/mapme…
Heroman3003 Oct 4, 2023
fa3585b
Merge pull request #15435 from Novacat/nova-basicfixes
Heroman3003 Oct 4, 2023
aa29834
Merge pull request #15434 from Enzo-Leon/altevian
Heroman3003 Oct 4, 2023
0db86c9
Merge pull request #15437 from Heroman3003/fluffi
Heroman3003 Oct 4, 2023
24f7a1c
Fixes conveyors + Ports speed changing
ReoDaProtovali Oct 5, 2023
cf2734d
Merge pull request #15440 from ReoDaProtovali/Missed-a-spot
Oct 6, 2023
9e82c1d
Bump stefanzweifel/git-auto-commit-action from 4 to 5
dependabot[bot] Oct 6, 2023
67e094d
New Mob: Scel
SatinIsle Oct 6, 2023
f626c74
Merge pull request #15442 from SatinIsle/Scel
Very-Soft Oct 7, 2023
8adc368
NanoMap Auto-Update (Sat Oct 7 18:49:53 UTC 2023)
actions-user Oct 7, 2023
9107f59
Fixes transforming tools being unable to interact with item bank and …
Heroman3003 Oct 7, 2023
a143877
Merge pull request #15445 from Heroman3003/toolfix
Oct 8, 2023
ed97f5b
Back to Tether
Very-Soft Oct 9, 2023
2c2b01e
Merge pull request #15446 from Very-Soft/backtotether
Very-Soft Oct 9, 2023
0a8e919
Merge pull request #15441 from VOREStation/dependabot/github_actions/…
Oct 9, 2023
35797d6
Merge pull request #15444 from VOREStation/nanomaps_generation
Oct 9, 2023
a9854ab
Scel and lunging.
SatinIsle Oct 9, 2023
fda4d7c
Update mob.dm
KillianKirilenko Oct 9, 2023
f468e50
Update paper.dm
KillianKirilenko Oct 10, 2023
67e9885
Merge pull request #15449 from KillianKirilenko/kk-mini2
Oct 10, 2023
f77a4cc
Merge pull request #15448 from SatinIsle/Scel
Oct 10, 2023
9c05084
Merge pull request #15405 from KillianKirilenko/kk-throwies
Oct 10, 2023
c297ebb
Absorb message filter & general radio colour
Kashargul Oct 10, 2023
3539e90
Merge pull request #15450 from Kashargul/AbsorbMessageFilter
Oct 11, 2023
641857a
They're out there man, I seen em'
Very-Soft Oct 11, 2023
268c10a
Update config/alienwhitelist.txt
Very-Soft Oct 11, 2023
0d167ca
Merge pull request #15451 from Very-Soft/aliens
Very-Soft Oct 11, 2023
d10d0d7
Fixes timestamp sorting incompatibility.
Kashargul Oct 11, 2023
79c1139
Update mob.dm
Kashargul Oct 11, 2023
a6d6fe2
Merge pull request #15454 from Kashargul/TimestampImprovements
Novacat Oct 12, 2023
f623e11
Docking Code Changes
Novacat Oct 12, 2023
9d3c6e9
Vore Panel Health Check
SatinIsle Oct 13, 2023
db2e87d
Jaffa cakes
SatinIsle Oct 13, 2023
88e24bc
Changes the conditions to be a single message instead.
SatinIsle Oct 15, 2023
3dcac9d
Back to SD
Very-Soft Oct 15, 2023
222d2de
Merge pull request #15456 from SatinIsle/vore-health
Very-Soft Oct 15, 2023
90108af
Merge pull request #15457 from SatinIsle/jaffa-cakes
Very-Soft Oct 15, 2023
1905b7f
Merge pull request #15455 from Novacat/nova-basicfixes
Very-Soft Oct 15, 2023
281fda3
Merge pull request #15458 from Very-Soft/backtosd
Very-Soft Oct 15, 2023
27a75ce
NanoMap Auto-Update (Sun Oct 15 16:24:28 UTC 2023)
actions-user Oct 15, 2023
d933304
Merge pull request #15459 from VOREStation/nanomaps_generation
Oct 17, 2023
5aeca09
Fixes Jaffa Cake crate
SatinIsle Oct 18, 2023
fa1db41
Merge pull request #15462 from SatinIsle/jaffa-cakes
Oct 18, 2023
f278dbe
Whitelist updates
Heroman3003 Oct 19, 2023
ee6c686
Also adds Liquidfirefly to Protean whitelist
Heroman3003 Oct 20, 2023
cd1cc30
Merge pull request #15465 from Heroman3003/ferros-mimexeno
Oct 20, 2023
3e82757
Attempt to prevent players joining with neither OOC notes nor flavour
Kashargul Oct 21, 2023
504c409
-> Removed the robot flavour requirement again.
Kashargul Oct 21, 2023
501db78
remove the no longer needed comments.
Kashargul Oct 21, 2023
786589e
Avii's Borg Event Map
Oct 22, 2023
be2b290
Map swap
Very-Soft Oct 22, 2023
f61f90b
Merge pull request #15469 from Very-Soft/backtotether
Very-Soft Oct 22, 2023
0776b7d
tweak(paper): Changes bundle naming logic to be general
Runa-Dacino Oct 23, 2023
e30f35d
add(fax): check to prompt renaming when sending to admin
Runa-Dacino Oct 23, 2023
cc6c813
fix(ahelp): Makes pressing "handle" actually use webhook
Runa-Dacino Oct 23, 2023
6af3b17
add(preference): Toggle seeing subtles/whispers
Runa-Dacino Oct 23, 2023
53be50c
Fixed airlock name error
Oct 23, 2023
4911f92
Adds PIPES and VENTS
Oct 24, 2023
b7e47ff
Adds New Antler Ears + Variant (and fixes previous antler sprite)
probbrie Oct 24, 2023
e891740
Adds atmos to science
Oct 24, 2023
cb0e482
error fix
Oct 24, 2023
8f04cb0
VerySoft Fluff Item!
Very-Soft Oct 24, 2023
696b24f
Merge pull request #15476 from Very-Soft/backtotether
Very-Soft Oct 25, 2023
4f6efb9
Merge pull request #15468 from Wulfestwulf/BorgEventStuff
Heroman3003 Oct 25, 2023
d10cc6e
Merge pull request #15474 from Jonnatonne/AntlerChanges
Heroman3003 Oct 25, 2023
9f94787
Merge pull request #15472 from Runa-Dacino/handlingbutton
Heroman3003 Oct 25, 2023
2b32547
Merge pull request #15473 from Runa-Dacino/ghostears
Heroman3003 Oct 25, 2023
6c6193d
Merge pull request #15467 from Kashargul/Flavour&OOCEnforcementImprov…
Heroman3003 Oct 25, 2023
5e3f867
Desatti Catering
SatinIsle Oct 27, 2023
ee4e829
Adds nifsoft uploaders for Mass Alteration
Heroman3003 Oct 28, 2023
3c8481d
Fixed shrimps and bananas pack
SatinIsle Oct 28, 2023
ad26365
Merge pull request #15479 from SatinIsle/jaffa-cakes
Heroman3003 Oct 28, 2023
6072b06
Fixes constant runtimes in mob.dm
Heroman3003 Oct 29, 2023
ec8d7bd
Back to SD
Very-Soft Oct 29, 2023
ccc48bd
Merge pull request #15483 from Very-Soft/backtosd
Very-Soft Oct 29, 2023
b835931
Merge pull request #15481 from Heroman3003/sizesoft
Heroman3003 Oct 29, 2023
a8009ee
Merge pull request #15482 from Heroman3003/clfix
Heroman3003 Oct 29, 2023
74b82bd
Merge pull request #15471 from Runa-Dacino/faxpaperthingy
Heroman3003 Oct 29, 2023
6551144
digitigrade legs port wip
KillianKirilenko Oct 19, 2023
6e848be
Desatti vending machine
SatinIsle Oct 30, 2023
9817587
Update whitelist
Heroman3003 Oct 31, 2023
ec18eed
Merge pull request #15486 from Heroman3003/wl2
Oct 31, 2023
68c6af2
Adds allergens
SatinIsle Oct 31, 2023
da408ad
Merge pull request #15487 from SatinIsle/desatti-foods
Heroman3003 Nov 1, 2023
3157df5
Update clothing.dm
KillianKirilenko Nov 1, 2023
2cc25e3
Merge remote-tracking branch 'upstream/master' into kk-leggies
KillianKirilenko Nov 1, 2023
c56cfb8
Merge remote-tracking branch 'kk/kk-leggies' into leggies
Arokha Nov 3, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 43 additions & 0 deletions code/modules/paperwork/faxmachine.dm
Original file line number Diff line number Diff line change
Expand Up @@ -220,9 +220,18 @@ var/list/adminfaxes = list() //cache for faxes that have been sent to admins
return

switch(action)
if("rename")
if(copyitem)
var/new_name = tgui_input_text(usr, "Enter new paper title", "This will show up in the preview for staff chat on discord when sending \
to central.", copyitem.name, MAX_NAME_LEN)
if(!new_name)
return
copyitem.name = new_name
if("send")
if(copyitem)
if (destination in admin_departments)
if(check_if_default_title_and_rename())
return
send_admin_fax(usr, destination)
else
sendfax(destination)
Expand All @@ -239,6 +248,40 @@ var/list/adminfaxes = list() //cache for faxes that have been sent to admins

return TRUE


/obj/machinery/photocopier/faxmachine/proc/check_if_default_title_and_rename()
/*
Returns TRUE only on "Cancel" or invalid newname, else returns null/false
Extracted to its own procedure for easier logic handling with paper bundles.
*/
var/question_text = "Your fax is set to its default name. It's advisable to rename it to something self-explanatory to"

if(istype(copyitem, /obj/item/weapon/paper_bundle))
var/obj/item/weapon/paper_bundle/B = copyitem
if(B.name != initial(B.name))
var/atom/page1 = B.pages[1] //atom is enough for us to ensure it has name var. would've used ?. opertor, but linter doesnt like.
var/atom/page2 = B.pages[2]
if((istype(page1) && B.name == page1.name) || (istype(page2) && B.name == page2.name) )
question_text = "Your fax is set to use the title of its first or second page. It's advisable to rename it to something \
summarizing the entire bundle succintly to"
else
return FALSE
else if(copyitem.name != initial(copyitem.name))
return FALSE

var/choice = tgui_alert(usr, "[question_text] improve response time from staff when sending to discord. \
Renaming it changes its preview in staff chat.", \
"Default name detected", list("Change Title","Continue", "Cancel"))
if(choice == "Cancel")
return TRUE
else if(choice == "Change Title")
var/new_name = tgui_input_text(usr, "Enter new fax title", "This will show up in the preview for staff chat on discord when sending \
to central.", copyitem.name, MAX_NAME_LEN)
if(!new_name)
return TRUE
copyitem.name = new_name


/obj/machinery/photocopier/faxmachine/attackby(obj/item/O as obj, mob/user as mob)
if(istype(O, /obj/item/weapon/card/id) && !scan)
user.drop_from_inventory(O)
Expand Down
4 changes: 2 additions & 2 deletions code/modules/paperwork/paper.dm
Original file line number Diff line number Diff line change
Expand Up @@ -549,9 +549,9 @@
add_fingerprint(user)
return
var/obj/item/weapon/paper_bundle/B = new(src.loc)
if (name != "paper")
if (name != initial(name))
B.name = name
else if (P.name != "paper" && P.name != "photo")
else if (P.name != initial(P.name))
B.name = P.name
user.drop_from_inventory(P)
if (istype(user, /mob/living/carbon/human))
Expand Down
10 changes: 9 additions & 1 deletion tgui/packages/tgui/interfaces/Fax.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,15 @@ export const FaxContent = (props, context) => {
<Box mt={1}>
<LabeledList>
<LabeledList.Item label="Currently Sending">
{copyItem}
{copyItem}{' '}
<Button
icon="pen"
onClick={() => act('rename')}
tooltip={
'Renames the paper. This changes its preview in staff chat when sending to centcom/job board/supply (admin departments).\
It is advisable to name your faxes something self-explanatory for quick response.'
}
/>
</LabeledList.Item>
<LabeledList.Item label="Sending To">
<Button
Expand Down
2 changes: 1 addition & 1 deletion tgui/public/tgui.bundle.js

Large diffs are not rendered by default.