cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-15 20:12:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
62,574 Commits 27 Branches 2 Tags
2d01b675bee3c3f6f58d8dc175bc97558d91a47b
Commit Graph

29068 Commits

Author SHA1 Message Date
Alan
2d01b675be Expedition coat name hopfix (#30720) 2025-10-20 16:01:06 +00:00
Qwertytoforty
a58bdc8968 Caps the eshotgun damage multiplier from lens to 1.5 (#30663) 2025-10-19 19:25:12 +00:00
iramoye
9cc8df6583 Rewords the IPC species blurb (#30658) 
* initial commit

* GAH

i think i broke it

* i know what i'm doing

* woops

Co-authored-by: Sheep <46016730+Scribble-Sheep@users.noreply.github.com>
Signed-off-by: iramoye <projecteternal1@gmail.com>

* woops 2

Co-authored-by: Sheep <46016730+Scribble-Sheep@users.noreply.github.com>
Signed-off-by: iramoye <projecteternal1@gmail.com>

---------

Signed-off-by: iramoye <projecteternal1@gmail.com>
Co-authored-by: Sheep <46016730+Scribble-Sheep@users.noreply.github.com>
 2025-10-19 19:09:53 +00:00
iramoye
e843e15a36 Renames the IK-30 crates in the cargo console (#30615) 
* initial commit

* bye bye security
 2025-10-19 19:08:20 +00:00
CRUNCH
a6eae00439 Allows Robots and Simple Bots to Salute (#30614) 
* Update silicon_emote.dm

* Update emote_keybinds.dm
 2025-10-19 19:07:52 +00:00
PollardTheDragon
3e149e8e6b Improved Ashwalker Armory: Bone Equipment (#30600) 
* Adds Bone Sword, Bone Shield, Bone Sword Sheath. Todo: Light Bone Armor, Sword Inhand fix

* sword inhands

* Adds Light Bone Armor

* Linters

* Species sprites

* Fixes my crap grammar

* Updates belt icon sprite
 2025-10-19 19:06:58 +00:00
Ahzpy
428d34980e [MDB IGNORE] [IDB IGNORE] The Floorening (#30568) 
* New floors and decalized floor tiles.

* satisfy linter

* Add command decals, remove old "blue tile" decal

* update script number

* have ATMs put their decals on last

* add engineering decals

* update spritesheets

* lots of tile coloring fixes

* more engi tile fixes

* more tile fixes

* linters

* fixes conflict?

* fix layering issue

* fix merge conflicts

* merge conflict fix?

* box bridge fix

* holodeck fix, layering fix, chemistry is no longer yellow

chemistry is intended to be a 'light orange' to be placed atop white tiles, just as medical decals are to command decals

* rebuild tgui

* merge master into floorening

* Update 30511_turfdecalsfix.txt

* merge master into floorening

* rebuild tgui

* holodeck fix, null plating fix

* Delete 30511_turfdecalsfix.txt

* updatepaths

* rebuild tgui

* null icon fix

* Update meatpackers.dmm

---------

Co-authored-by: Alexios <skillpointHD@Gmail.com>
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
 2025-10-19 19:05:58 +00:00
Zack
0d14c0782b CE Blueprint Picture will now count for objective (#30635) 
* Update living.dm

* Update living.dm
 2025-10-19 14:21:30 +00:00
PollardTheDragon
96495fab84 Port /tg/'s spatial grid, Round 2 (#30567) 
* port /tg/'s spatial grid.

* fix lint

* fix identical variables

---------

Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
 2025-10-19 14:03:08 +00:00
Alan
ec8014fa83 Fix variety reagent secondary goal to tally smaller quantities until filled. (#30690) 
* Fix variety reagent goal to tally smaller quantities until filled. Fixes #30562

* Thanks, linters!
 2025-10-17 23:35:36 +00:00
Zack
266c490320 Fixed the name of a cherry sandwich and slime sandwichs (#30638) 
* Update sandwiches.dm

* Update sandwiches.dm
 2025-10-17 23:27:04 +00:00
Toastical
246148df8c remove pressure sight from engine goggle description (#30631) 2025-10-17 23:24:01 +00:00
Toastical
b926902d03 fix bloody writing allowing you to try writing with no blood (#30637) 2025-10-17 23:23:17 +00:00
Toastical
7816bb8e57 move hydroponics to use Initialize() (#30598) 2025-10-17 18:18:04 +00:00
CRUNCH
3210d12d56 Migrates Surgery Tools, Nuke Kits, and Nuke Cores to the New Attack Chain (#30442) 
* super

* Update theft_items.dm

* Update theft_items.dm

* Update outfit_debug.dm

* Update code/game/objects/items/theft_items.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

---------

Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2025-10-17 17:58:35 +00:00
Toastical
027146fee1 moved power machinery to use Initialize() (#30584) 2025-10-17 17:19:08 +00:00
PollardTheDragon
8ef20b664a Adds tajaran veil subtypes to loadout (#30578) 
* Adds tajaran veil subtypes to loadout

* Apply suggestions from code review

Co-authored-by: Gatchapod <20936555+Gatchapod@users.noreply.github.com>
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: Gatchapod <20936555+Gatchapod@users.noreply.github.com>
 2025-10-17 17:11:42 +00:00
Gatchapod
daa6a854ff Tajaran veils can be decorative again. (#30576) 
* Toggleable veil electronics

* Good enough

* Update code/modules/clothing/glasses/tajblind.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Gatchapod <20936555+Gatchapod@users.noreply.github.com>

---------

Signed-off-by: Gatchapod <20936555+Gatchapod@users.noreply.github.com>
Co-authored-by: Gatchapod <Gatchapod@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2025-10-17 17:08:13 +00:00
PollardTheDragon
fbd8930ff4 Securiblade Redux (#30488) 
* Securiblade Redux

* It's back

* Vars

* LINTERS

* Apply AP on burn damage

* Fixes recharger bug

* Slapper, Better code, cleanup, no damage on help intent while off or stun, sounds

* Secblade now makes a sound when turning itself off
 2025-10-17 17:00:50 +00:00
Paul
afd37f310f IPC Culinary Processing Implant (#30475) 
* add the ipc culinary implant

* add spans
 2025-10-17 16:53:11 +00:00
BiancaWilkson
9a578dbf61 The shotgun has a sprite again (#30687) 2025-10-16 19:22:47 +00:00
BiancaWilkson
08b8714dc9 Fixes mindflayers sometimes being spammed with messages when pacified (#30686) 
* fixes the message popping up when using action buttons

* Secret second bug that the first bug uncovered, fixes no messages at all
 2025-10-16 19:19:20 +00:00
Migratingcocofruit
1abb121eb7 Ports in game bug reporting from CM (#30376) 
* adds the files doesn't even compile yet WIP

* compiles now. axed some stuff we don't need

* Update skin.dmf

* It technically works

* Adds in the stylesheet as well

* makes approval work

* Update tgui.bundle.js

* changes url to para master

* Makes apostrophes work

* removes token read line

* moves bug report verb to OOC.dm and changes its name to "Report a Bug"

* Update bug_report.dm

* Update tgui.bundle.js

* Adds API token var to config.

* adds a per ckey cooldown of 5 minutes for bug reports

* tgui rebuild

* rebuild tgui

* Update tgui.bundle.js

* review changes

* better timeout check

* changes example config to include the github token

* Update tgui.bundle.js

* tgui rebuild

* add message when bug report list is empty and changes some warnings to info type messages

* move round id and byond builds to additional details

* moves initial user ref to UID. Fixes commit hash stuff adds TM list

* Update tgui.bundle.js
 2025-10-16 18:22:02 +00:00
Alan
a9c3b6d242 Update winter coats, add more, and tailor to species. (#30644) 
* Update winter coats, add more, and tailor to species.

* Add white captain coat to loadout.
 2025-10-15 11:05:58 +00:00
Deniz
c6a2097e58 [TGUI] Mulebot 3rd round (#30532) 
* null check fixed

* tgui start

* conditional autopatrol

* modification

* interact

* comment out topic

* destination name

* bundle + prettier

* punctuation

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Burzah request

* TGUI - Battery View

* Return Data, cell returns

* Mule Status

* home + suffix

* Bundle

* cleanup

* home set

* testing stash

* Bundle

* transparent

* Update mulebot.dm

* Update mulebot.dm

* Update mulebot.dm

* !!cell

Makeshit bool gone

* bundle yippie

* bundle

* image testing + nest

* image stash

* Asset deletion

* Cell Rename - Unload - Cargo Image position

* bundle

* experiment

* concluded

* bundle

* Updated format for BotMule.js

* is_ai new define

* find_crate extraction -- ui_act additions -- cargo_info--refresh_button -- !!load change -- minor /at_target() changes

* refresh button -- set home and change id moved up -- Delivery Announcement implemented -- Image location fixed -- Can load from UI

* remove commented out html part

* accidental return delete

* tgui

* Remove Divider - data comment - Add MARK - Remove Space

* import cleanup

* span/class

* JSX

* Update tgui.bundle.js

* update and lint

* window heigth

* reminder comment - dm looks good

* bundle

* bundle

* Bundle + Tab Fix

---------

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: kullanici50 <kullanici50@tago.loc>
 2025-10-13 15:50:40 +00:00
Alan
b2e0a08d0b Add a LOT of chaplain clothes from various religions. (#30483) 
* Add a LOT of chaplain clothes from various religions.

* Thanks, linter!

* Deploy vendors, box envirosuits, unaccent names

* Thanks, linters!

* Accommodate ears.

* Correct accent oversight.

* Merge branch 'master' into chaplain-outfits

Conflicts in
icons/mob/clothing/species/plasmaman/helmet.dmi
icons/obj/clothing/species/plasmaman/hats.dmi
resolved by automatic merge and modifying chaplain helmet sprites to match new format.
 2025-10-13 15:16:33 +00:00
Toastical
80f44960a3 Fix pre-written papers appearing unwritten (#30633) 
* Fix manifest papers being unwritten

* callback for updating paper
 2025-10-12 10:54:26 +00:00
JimKil3
e5832d6d1f Makes sutures and regenerative mesh craftable (#30556) 
* gauze/ointment changes
Changes gauze and ointment's recipe back to using sterilizine, nerfs their healing (they both serve other purposes)

* yummy microplastics
Makes plastic require cooling to solidify into sheets

* the rest of the PR

* oops

* what was he cooking

* Apply suggestions from code review

Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Signed-off-by: JimKil3 <47290811+JimKil3@users.noreply.github.com>

* plastic volume

---------

Signed-off-by: JimKil3 <47290811+JimKil3@users.noreply.github.com>
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
 2025-10-11 15:58:24 +00:00
PollardTheDragon
ca0dfe46f6 IPCs no longer are affected by can_breathe_gas (#29940) 
* IPCs no longer are affected by can_breathe_gas

* Fix

* Trait check
 2025-10-11 15:38:22 +00:00
Ahzpy
d2b092dad5 Round Rejoining (#30342) 
* very simple functionality test

* formatting fix

* adapt 220 code, add logging, adjust config

* fixes

* appeases review overlords

* fixes

* 25 min respawn delay, warning is more noticable

* 10 minute respawn delay, cant respawn during wiz or nukies

* more logging + logging fix

* species logging, revert accidental config change

* antag logging + formatting

* pleases review overlords again

* linters

* uses CSS for warning

Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Signed-off-by: Ahzpy <88119260+Ahzpy@users.noreply.github.com>

* deconflicts paradise.dme?

* fixes runtime with destroyed bodies

* you cant respawn for ragin mages silly

* adds respawn button to ghost hud

* standardize new ghost button coloring

* remove you are not an admin message

* muscle memory fixer

* update hud locations

---------

Signed-off-by: Ahzpy <88119260+Ahzpy@users.noreply.github.com>
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
 2025-10-11 15:37:45 +00:00
Qwertytoforty
cc7a366a1c Updates the objectives to be pick weight (#30645) 2025-10-11 06:04:13 +00:00
warriorstar-orion
82663d1c10 Add Z-Level Manager, a basic admin tool. (#30397) 
* Add Z-Level Manager, a basic admin tool.

* build bundle, use ui_module/admin

* fix type restriction

* remove unnecessary params
 2025-10-10 00:17:29 +00:00
CRUNCH
00244358c9 Update slime_extracts.dm (#30624) 2025-10-08 19:32:52 +00:00
warriorstar-orion
d9717041da don't let slimes spawn abstract burgers (#30625) 2025-10-08 19:31:47 +00:00
Qwertytoforty
cd3ee6ab90 fixes xenomicrobes (#30622) 2025-10-07 19:13:21 +00:00
Alan
71aa860711 Add better-fitting helmets for monitor heads. (#30534) 2025-10-07 17:53:04 +00:00
Alan
a7470a1d88 Change keybind to reskin tacticool envirohelm. Fixes #27342 (#30552) 2025-10-07 17:46:38 +00:00
evilmattyg
2f37aea7d3 Adds back the Bottler Unit Crate. Fixes Issue #30549 (#30553) 
* Update pack_organic.dm

* forgor endquote

* Rewording
 2025-10-07 17:45:26 +00:00
warriorstar-orion
2cbf8aedc4 fix access to ai controller debugger (#30541) 2025-10-06 18:47:46 +00:00
Qwertytoforty
3c7ca73c04 Gives many cybernetics on mob sprites. Adds synthetic skin to allow hiding of them. (#30098) 
* the first half

* rest of the skin

* duplicate

* new sprite / updated description / no more yell at me

* the rest of the owl

* oops, fixed
 2025-10-06 18:30:31 +00:00
PollardTheDragon
66d66a8f02 Adds Anomaly Refining System (#30490) 
* Adds Anomaly Refining System

* Weight class

* Linters

* Fixes delta lint

* Removes emag text on examine. Examine now tells the explosion target.

* Address code review
 2025-10-06 18:20:50 +00:00
Hayden Redacted
7f445059b8 adds the ability for large air pumps to be ordered from cargo (#30515) 2025-10-06 18:18:42 +00:00
kyunkyunkyun
9b095a559d Remove (almost) unused var/item_color from /obj/item (#30453) 
* it's black and white

* Update soft_caps.dm

* bruh

* bruh

* tweaks

* comment

* Update abduction_gear.dm

* Update paradise.dme

* Update paradise.dme

* Update paradise.dme

---------

Co-authored-by: Mason <116982774+Burzah@users.noreply.github.com>
 2025-10-06 17:59:46 +00:00
Gatchapod
3ebacb5459 HRD-MDE Legion drops loot now (#30589) 
Co-authored-by: Gatchapod <Gatchapod@users.noreply.github.com>
 2025-10-06 17:35:09 +00:00
Alan
f42455cd40 Notify cargo of incoming secondary goal crates. (#30577) 2025-10-06 17:24:32 +00:00
1080pCat
118a986373 Moves some notes in MB19 to be lore consoles (#30518) 
* lore consoles

* warrior review
 2025-10-04 17:27:23 +00:00
hyperholy
193f1a222f Fixes Preferences key binding problem Issue #29597 (#30554) 
* Copied and fixed code from issue #29597

* fixed whitespace, make linter happy?

* okay LAST whitespace

* comments with hopefully enough information + whitespace fix
 2025-10-04 17:24:17 +00:00
CRUNCH
d1d1393ee2 Adds Glass Sandwiches and Supermatter Sandwiches (#30435) 
* glass sammich

* Update cutting_board_recipes.dm

* yummy

* Update test_tiny.dmm

* Update test_tiny.dmm

* Update toxins.dm

* Update test_tiny.dmm

* Update test_tiny.dmm

* Update test_tiny.dmm

* Update test_tiny.dmm

* Revert "yummy"

This reverts commit b2a5736618.

* yummy but without test tiny shit

* Update cooking_container.dm

* isolate sliver handling to a recipe step

* fix

---------

Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
 2025-10-04 17:20:21 +00:00
Alan
99ff0ad3de Proof of concept/proposal: Add offset capability for monitor headwear, demonstrated by berets (#30555) 
* Add offset capability for monitor headwear, offset berets

* test

* Update code in line with warriorstar-orion's element method

* Apply suggestions from code review

Incorporate warriorstar-orion's updates

Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Signed-off-by: Alan <alfalfascout@users.noreply.github.com>

* Autodoc properly

Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Signed-off-by: Alan <alfalfascout@users.noreply.github.com>

---------

Signed-off-by: Alan <alfalfascout@users.noreply.github.com>
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
 2025-10-04 17:18:59 +00:00
Toastical
6344721e90 Move paperwork to use /Initialize() instead of /New() (#30586) 
* move paperwork to Initialize()

* fix photocopier

* remove spawn call
 2025-10-04 17:18:19 +00:00