cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 20:16:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

CSI Eridani: Detective content update (#27512)

Browse Source 
* Ports Bay/ss220 detective work

* Removs detective scanner from circulation

* forensic supply crate

* Ports Bay/ss220 detective work

* Removs detective scanner from circulation

* forensic supply crate

* Mapping changes

* Mapping changes

* Ports Bay/ss220 detective work

* Removs detective scanner from circulation

* makes linters work

* i hate vscode

* fixes some nonsence

* may fix CI

* restore maps to CURRENT

* QOL

* makes gunshot residue actually work.

* fixes cursed logic

* adds scene cards again

* scene cards but real!

* fix med records, breaks attack chain

* Revives the PR

* fixes swabs

* TGUI update

* lewc and dgl first reviews

* dna medical records

* LINTERS FIX

* linter fix 2

* blood fix and linters again

* oops

* updated but broke

* help

* Chuga suggestion

* Fix shoes ending up with a null blood_DNA entry

* replace astype() because linters are still in the stone age

* 2 fixes, adds fingerprint cards to HOP locker.

* check user intent instead of target intent when swabbing

* adds 2 boxes of swabs to the det drobe

* comma important

* adds new det tools to sec belt

* Chuga review

* fuckin github

* should fix TM

* oops

* how about now

* also fixes cere

* fixes mobvars

* Update code/modules/detective_work/swabs.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Silverplate <118299273+silverplatedelta@users.noreply.github.com>

* Update code/game/objects/effects/decals/cleanable.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Silverplate <118299273+silverplatedelta@users.noreply.github.com>

* Update code/game/objects/structures/crates_lockers/closets/secure/security_lockers.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Silverplate <118299273+silverplatedelta@users.noreply.github.com>

* Lewc review easy changes

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Silverplate <118299273+silverplatedelta@users.noreply.github.com>

* Updated related bugfixes

* add swab to lathe

* fix metastation

* Fixes scene_cards

* fix cerestation

* fixes forensic kits

* Changes and fixes forensic_machines

* changes /obj/item/sample to use initialize

* spaces

* fix initialize to use a capital I

* mapload

* fixes linters probably

* meta fix

* swab fix maybe

* oops

* actual fix probably

* ma ybe

* bundle rebuild

* fixes fingerprint cards

* remove duplicate proc call

* /obj/item/sample migration

* /obj/item/forensics migration

* microscope and dnaforensics machines migrated

* I FORGOT DA VARS

* linter fix

* linter fix 2

* Funny review part 1

Co-authored-by: Charlie Nolan <funnyman3595@gmail.com>
Signed-off-by: Silverplate <118299273+silverplatedelta@users.noreply.github.com>

* bundle update

* contra/funny review

* fixes CI probably

* CI fix

* cere mapping fix yipee

* screwdriver panel fixes

* improve forensic machine interactions

* improve open panel msg

* pollard review

Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Signed-off-by: Silverplate <118299273+silverplatedelta@users.noreply.github.com>

* linter fix

* Apply suggestions from pope review

Co-authored-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>
Signed-off-by: Silverplate <118299273+silverplatedelta@users.noreply.github.com>

* rebuild

* rebuild

* Detective Rework

---------

Signed-off-by: Silverplate <118299273+silverplatedelta@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Chuga <98280110+chuga-git@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Arthri <41360489+a@users.noreply.github.com>
Co-authored-by: Toastical <20125180+Toastical@users.noreply.github.com>
Co-authored-by: Charlie Nolan <funnyman3595@gmail.com>
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>
This commit is contained in:
Silverplate
2025-08-23 15:27:38 +00:00
committed by GitHub
co-authored by Luc Charlie Nolan PollardTheDragon PopeDaveThe3th Burzah Chuga Arthri Toastical
parent ff457fb613
commit bf750135d0
31 changed files with 859 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/jobs/job/security_jobs.dm
-1
View File
@@ -180,7 +180,6 @@
pda = /obj/item/pda/detective
backpack_contents = list(
/obj/item/storage/box/evidence = 1,
/obj/item/detective_scanner = 1,
/obj/item/melee/classic_baton/telescopic = 1
)
code/game/machinery/computer/medical_records.dm
+1
View File
@@ -106,6 +106,7 @@
"ref" = "\ref[R]",
"name" = R.fields["name"],
"id" = R.fields["id"],
"dna" = R.fields["b_dna"],
"rank" = R.fields["rank"],
"p_stat" = R.fields["p_stat"],
"m_stat" = R.fields["m_stat"])
code/game/machinery/machine_frame.dm
+20
View File
@@ -1261,3 +1261,23 @@ to destroy them and players will be able to make replacements.
/obj/item/stock_parts/micro_laser = 1,
/obj/item/stock_parts/manipulator = 1,
)
// Detective machines
/obj/item/circuitboard/dnaforensics
name = "circuit board (DNA analyzer)"
build_path = /obj/machinery/dnaforensics
board_type = "machine"
origin_tech = "programming=2;combat=2"
req_components = list(
/obj/item/stock_parts/micro_laser = 2,
/obj/item/stock_parts/manipulator = 1)
/obj/item/circuitboard/microscope
name = "circuit board (Microscope)"
build_path = /obj/machinery/microscope
board_type = "machine"
origin_tech = "programming=2;combat=2"
req_components = list(
/obj/item/stock_parts/micro_laser = 1,
/obj/item/stack/sheet/glass = 1)
code/game/machinery/vendors/wardrobe_vendors.dm
Vendored
+4 -2
View File
@@ -127,7 +127,8 @@
/obj/item/reagent_containers/drinks/flask/detflask = 2,
/obj/item/storage/fancy/cigarettes/dromedaryco = 5,
/obj/item/clothing/head/helmet/space/plasmaman/white = 2,
/obj/item/clothing/under/plasmaman/enviroslacks = 2)
/obj/item/clothing/under/plasmaman/enviroslacks = 2,
/obj/item/storage/box/swabs = 2)
prices = list(/obj/item/clothing/under/rank/security/detective = 50,
/obj/item/clothing/under/rank/security/detective/black = 75,
@@ -151,7 +152,8 @@
/obj/item/reagent_containers/drinks/flask/detflask = 50,
/obj/item/storage/fancy/cigarettes/dromedaryco = 5,
/obj/item/clothing/head/helmet/space/plasmaman/white = 60,
/obj/item/clothing/under/plasmaman/enviroslacks = 60)
/obj/item/clothing/under/plasmaman/enviroslacks = 60,
/obj/item/storage/box/swabs = 20)
contraband = list(/obj/item/toy/figure/crew/detective = 1)
code/game/objects/effects/decals/cleanable.dm
+2 -2
View File
@@ -53,8 +53,8 @@
bloodiness -= add_blood
S.bloody_shoes[blood_state] = min(MAX_SHOE_BLOODINESS, S.bloody_shoes[blood_state] + add_blood)
S.bloody_shoes[BLOOD_BASE_ALPHA] = BLOODY_FOOTPRINT_BASE_ALPHA * (alpha/255)
if(blood_DNA && length(blood_DNA))
S.add_blood(H.blood_DNA, basecolor)
if(length(blood_DNA))
S.add_blood(blood_DNA, basecolor)
S.blood_state = blood_state
S.blood_color = basecolor
update_icon()
code/game/objects/items/weapons/storage/belt.dm
+3
View File
@@ -324,6 +324,9 @@
/obj/item/restraints/legcuffs/bola,
/obj/item/clothing/mask/gas/sechailer,
/obj/item/detective_scanner,
/obj/item/sample/print,
/obj/item/forensics/swab,
/obj/item/forensics/sample_kit,
)
/obj/item/storage/belt/security/full/populate_contents()
code/game/objects/structures/crates_lockers/closets/secure/security_lockers.dm
+3 -1
View File
@@ -36,6 +36,7 @@
new /obj/item/reagent_containers/drinks/mug/hop(src)
new /obj/item/clothing/accessory/medal/service(src)
new /obj/item/storage/bag/garment/head_of_personnel(src)
new /obj/item/storage/box/fingerprints(src) // used for fingerprinting new arrivals
/obj/structure/closet/secure_closet/hos
name = "head of security's locker"
@@ -195,7 +196,6 @@
new /obj/item/ammo_box/magazine/detective/speedcharger(src)
new /obj/item/clipboard(src)
new /obj/item/clothing/gloves/color/latex(src)
new /obj/item/detective_scanner(src)
new /obj/item/flash(src)
new /obj/item/flashlight/seclite(src)
new /obj/item/holosign_creator/detective(src)
@@ -205,8 +205,10 @@
new /obj/item/storage/bag/garment/detective(src)
new /obj/item/storage/belt/security(src)
new /obj/item/storage/box/evidence(src)
new /obj/item/taperecorder(src)
new /obj/item/storage/box/tapes(src)
new /obj/item/taperecorder(src)
new /obj/item/storage/briefcase/crimekit(src)
/obj/structure/closet/secure_closet/injection
name = "lethal injections locker"