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

Merge Upstream 15.01.2025 #1746

Merged
merged 37 commits into from
Jan 15, 2025
Merged
Changes from 1 commit
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
41889d0
[TWEAK] Optional laws for AI and Cyborgs on Death Squad spawn. (#27663)
Drsmail Jan 12, 2025
071a13f
Now lighting is shown on photography (#27752)
Vladisvell Jan 12, 2025
16b3370
Resprites the mining ore box (#27933)
ExusA Jan 12, 2025
390ec4c
Master (#27928)
Slurge00 Jan 12, 2025
7c9f451
Resprites wind dust (#27905)
FunnyMan3595 Jan 12, 2025
2b178d1
Update ert_outfits.dm (#27869)
matttheficus Jan 12, 2025
848eea7
Borg RCD nerf + migration to new attack chain (#27857)
DGamerL Jan 12, 2025
f9c4958
Make AI automated messages log more normally. (#27837)
FunnyMan3595 Jan 12, 2025
f47f39e
Stethoscope Cracking Sounds Fix (#27823)
Bm0n Jan 12, 2025
1dcd4a6
Update cerestation.dmm (#27830)
Fordoxia Jan 12, 2025
264c305
Adds announcement of job objectives upon spawning in (#27805)
Miraviel Jan 12, 2025
3d2d730
fix fusion gauntlets failing to deploy (#27946)
warriorstar-orion Jan 12, 2025
a2bc6e1
Fixes his grace nodrop (#27935)
DGamerL Jan 12, 2025
a23f2df
Adds surgical tray crafting recipe, renames and increases cost for th…
Miraviel Jan 12, 2025
7f49c57
Resprites Mirrors, by ATPEngineer (#27927)
Alecksohs Jan 12, 2025
bcc794e
Rusting off the elements system. Makes rust appliable to turfs, adds …
Qwertytoforty Jan 12, 2025
a4a92f7
Fixes abstract items showing on mob examine (#27951)
Qwertytoforty Jan 12, 2025
5337cc1
Adjust depot loot a little and remove some irrelevant items. (#27398)
kyunkyunkyun Jan 13, 2025
7cdbcc4
Fix carbon/Destory runtime (#27959)
FunnyMan3595 Jan 13, 2025
807b7dd
Refactors a small bit of `forceMove()` code (#27961)
DGamerL Jan 13, 2025
19562b2
Update robot_mob.dm (#27964)
DGamerL Jan 13, 2025
56f78b9
[TM FIRST] 516 Prep/Fixes regarding hrefs (#27960)
Burzah Jan 13, 2025
734ec10
Updates "Check New Players" verb (#27963)
Contrabang Jan 13, 2025
879fafd
Stop MILLA lag (#27965)
FunnyMan3595 Jan 13, 2025
bb230c3
Update SIT spawn prompt (#27968)
FunnyMan3595 Jan 13, 2025
0e57d99
adds missing parentheses (#27953)
Toastical Jan 14, 2025
15e8d6c
Tweaked diona and fixed slimepeople eyes (#27950)
ExusA Jan 14, 2025
c6e1dd6
[PTBF] Adds hallucination effects to medical and reagent scanners (#2…
lewcc Jan 14, 2025
700f536
[s] Replacing Sleep with Paralyze on faint (#27977)
HMBGERDO Jan 14, 2025
e16cb74
Fixes locker breakout message showing the wrong time (#27942)
Burzah Jan 14, 2025
674c6dd
Build Rust library
paradisess13[bot] Jan 15, 2025
e1c28e3
Merge branch 'master' into merge-upstream
AyIong Jan 15, 2025
0349785
Build Rust library
paradisess13[bot] Jan 15, 2025
f3a4758
Remove rust replacement
AyIong Jan 15, 2025
c9b4594
Merge branch 'merge-upstream' of https://github.com/ss220club/Paradis…
AyIong Jan 15, 2025
88e8d57
Build Rust library
paradisess13[bot] Jan 15, 2025
76444d2
Fix linter
AyIong Jan 15, 2025
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
Prev Previous commit
Next Next commit
<!-- By ticking or leaving ticked the option "Allow edits and access to secrets by maintainers" you give permission for repository maintainers to push changes to your branch without explicitly asking. -->

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull request process. -->

## What Does This PR Do

<!-- Include a small to medium description of what your PR changes. -->
<!-- Document all changes, as not doing this may delay reviews or even discourage maintainers from merging your PR! -->
<!-- If your PR fixes an issue, add "Fixes #1234" somewhere in the PR description. This will automatically close the bug upon PR submission. -->

## Why It's Good For The Game

<!-- Add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. -->

## Images of changes

<!-- If you did not make a map or sprite edit, you may delete this section. You may include a gif or mp4 of your feature if you want. -->

## Testing

<!-- How did you test the PR, if at all? -->

<hr>

### Declaration

- [ ] I confirm that I either do not require [pre-approval](https://github.com/ParadiseSS13/Paradise/blob/master/docs/CODE_OF_CONDUCT.md#types-of-changes-that-need-approval) for this PR, or I have obtained such approval and have included a screenshot to demonstrate this below.
  <!-- Replace the box with [x] to mark as complete. -->
  <!-- Ensure there are no spaces between the x and the square brackets [] else this will not work properly. -->
<hr>

## Changelog

:cl:
add: Added new things
del: Removed old things
tweak: Tweaked a few things
fix: Fixed a few things
wip: Added a few works in progress
soundadd: Added a new sound thingy
sounddel: Removed an old sound thingy
imageadd: Added some icons and images
imagedel: Deleted some icons and images
spellcheck: Fixed a few typos
experiment: Added an experimental thingy
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. -->
<!-- If a PR has no impact on players (i.e. a code refactor that does not change functionality) then the entire Changelog heading and contents can be removed. -->
  • Loading branch information
Slurge00 authored Jan 12, 2025
commit 390ec4ce58f53b697778686e31560de7b1820b64
2 changes: 2 additions & 0 deletions code/game/machinery/vendors/generic_vendors.dm
Original file line number Diff line number Diff line change
Expand Up @@ -704,6 +704,7 @@
/obj/item/clothing/under/rank/civilian/clown/sexy = 1,
/obj/item/clothing/mask/gas/sexymime = 1,
/obj/item/clothing/under/rank/civilian/mime/sexy = 1,
/obj/item/clothing/suit/suspenders = 1,
/obj/item/clothing/mask/face/bat = 1,
/obj/item/clothing/mask/face/bee = 1,
/obj/item/clothing/mask/face/bear = 1,
Expand Down Expand Up @@ -822,6 +823,7 @@
/obj/item/clothing/under/rank/civilian/clown/sexy = 100,
/obj/item/clothing/mask/gas/sexymime = 100,
/obj/item/clothing/under/rank/civilian/mime/sexy = 100,
/obj/item/clothing/suit/suspenders = 50,
/obj/item/clothing/mask/face/bat = 100,
/obj/item/clothing/mask/face/bee = 100,
/obj/item/clothing/mask/face/bear = 100,
Expand Down