Skip to content

Market Crash Part 1 #608

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.

Sign up for GitHub

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

Open
Ossa88 wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Market Crash Part 1 #608

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8f6b8ab
market crash
Ossa88 Feb 28, 2026
1fa31d0
longer cooldown
Ossa88 Feb 28, 2026
aee8ef8
Merge branch 'master' into market
Ossa88 Feb 28, 2026
ff5d995
fix?
Ossa88 Mar 4, 2026
363cc2f
Merge branch 'master' into market
Ossa88 Mar 4, 2026
8fd3cac
Oh I get it... the file no longer existed and you could not tell it w…
Ossa88 Mar 4, 2026
a38f4c2
Merge branch 'PentestSS13:master' into market
Ossa88 Mar 11, 2026
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
4 changes: 4 additions & 0 deletions modular_pentest/master_files/code/modules/cargo/exports/scraping.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
/datum/export/landmine
desc = "The TerraGov Frontier Command maintains an active bounty program for the disposal of UXO. Make the frontier a safer place today!"

/datum/export/thruster_ion
elasticity_coeff = 0.5
recovery_ds = 7.5 MINUTES
3 changes: 3 additions & 0 deletions modular_pentest/modules/research_development/code/designs/comp_board_designs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
/datum/design/board
materials = list(/datum/material/iron = 1000, /datum/material/glass = 1000, /datum/material/silver = 1000, /datum/material/gold = 1000)

/datum/design/board/xenobiocamera
name = "Computer Design (Xenobiology Console)"
desc = "Allows for the construction of circuit boards used to build xenobiology camera computers."
Expand Down
Loading