cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-23 13:10:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

design source part 2: the torture

Browse Source
This commit is contained in:
Roxy
2025-05-05 19:35:20 -04:00
parent d83a3313bb
commit 663d2f9e6c
15 changed files with 42 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/unit_tests/designs.dm
+5
View File
@@ -38,6 +38,11 @@
var/list/all_designs = list()
var/list/exceptions = list(
/datum/design/surgery/healing, // Ignored due to the above test
// BUBBER EDIT ADDITION BEGIN - Exclude tg designs that we've removed from the techweb
/datum/design/mag_autorifle,
/datum/design/mag_autorifle/ap_mag,
/datum/design/mag_autorifle/ic_mag,
// BUBBER EDIT ADDITION END - Exclude tg designs that we've removed from the techweb
)
for (var/datum/design/design as anything in subtypesof(/datum/design))
modular_skyrat/master_files/code/modules/research/designs/AI_module_designs.dm
-10
View File
@@ -1,10 +0,0 @@
/datum/design/board/emperor
name = "Empeoror Module"
desc = "Allows for the construction of a Emperor AI Core Module."
id = "emperor"
materials = list(/datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT, /datum/material/diamond = SHEET_MATERIAL_AMOUNT, /datum/material/bluespace = HALF_SHEET_MATERIAL_AMOUNT)
build_path = /obj/item/ai_module/core/full/emperor
category = list(
RND_CATEGORY_AI + RND_SUBCATEGORY_AI_DANGEROUS_MODULES
)
departmental_flags = DEPARTMENT_BITFLAG_SCIENCE
modular_skyrat/master_files/code/modules/research/techweb/all_nodes.dm
+16 -14
View File
@@ -89,6 +89,7 @@
/datum/techweb_node/office_equip/New()
design_ids += list(
"gbp_machine",
"plastic_hair_tie",
)
return ..()
@@ -99,14 +100,6 @@
)
return ..()
/datum/techweb_node/cafeteria_equip/New()
design_ids += list(
"bowl",
"drinking_glass",
"shot_glass",
)
return ..()
/datum/techweb_node/medbay_equip/New()
design_ids += list(
"hospital_gown",
@@ -169,6 +162,12 @@
"nifsoft_hud_diagnostic",
"nifsoft_hud_cargo",
)
design_ids -= list(
"ci-medhud",
"ci-diaghud",
"ci-sechud",
)
return ..()
////////////////////////Medical////////////////////////
@@ -248,6 +247,15 @@
design_ids += list(
"multi_cell_charger",
)
design_ids -= list(
"rcd_loaded",
"rcd_ammo",
"rtd_loaded",
"weldingmask",
"magboots",
"flatpacker",
)
return ..()
/datum/techweb_node/mining/New()
@@ -295,9 +303,3 @@
"borg_upgrade_pinpointer",
)
return ..()
/datum/techweb_node/borg_mining/New()
design_ids += list(
"borg_upgrade_welding",
)
return ..()
modular_skyrat/modules/hyposprays/code/autolathe_designs.dm
-26
View File
@@ -99,29 +99,3 @@
"hypomkii_deluxe",
)
return ..()
// Tarkon and similar get enough to work with, but if they want deluxe kits/hypos they still need to trade with the station for 'em.
/datum/techweb_node/oldstation_surgery/New()
design_ids += list(
"hypokit",
"hypomkii",
)
return ..()
/// For reasons unknown, pens are included as an autolathe design here, in the hypospray module of all places.
/// I'm not touching this unless a maint asks me to because it feels weird and haunted, like the picture of a potato that bricks Source if you remove it.
/datum/design/pen
name = "Pen"
id = "pen"
build_type = AUTOLATHE | AWAY_LATHE
materials = list(
/datum/material/iron = SMALL_MATERIAL_AMOUNT,
/datum/material/glass = SMALL_MATERIAL_AMOUNT,
)
build_path = /obj/item/pen
category = list(
RND_CATEGORY_INITIAL,
RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_MISC,
)
modular_skyrat/modules/implants/code/medical_designs.dm
-17
View File
@@ -32,23 +32,6 @@
)
departmental_flags = DEPARTMENT_BITFLAG_MEDICAL | DEPARTMENT_BITFLAG_SECURITY
/datum/design/cyberimp_hacker
name = "Hacking Hand Implant"
desc = "An advanced hacking and machine modification toolkit fitted into an arm implant, designed to be installed on a subject's arm."
id = "ci-hacker"
build_type = MECHFAB
materials = list (
/datum/material/iron = SHEET_MATERIAL_AMOUNT * 2,
/datum/material/glass = HALF_SHEET_MATERIAL_AMOUNT,
/datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT,
)
construction_time = 200
build_path = /obj/item/organ/cyberimp/arm/hacker
category = list(
RND_CATEGORY_CYBERNETICS + RND_SUBCATEGORY_CYBERNETICS_IMPLANTS_UTILITY,
)
departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING
/datum/design/cyberimp_flash
name = "Photon Projector Implant"
desc = "An integrated projector mounted onto a user's arm that is able to be used as a powerful flash."
modular_skyrat/modules/implants/code/medical_nodes.dm
+7
View File
@@ -17,6 +17,13 @@
)
return ..()
/datum/techweb_node/cyber/cyber_organs_upgraded/New()
design_ids -= list(
"ci-gloweyes",
"ci-welding",
)
return ..()
/datum/techweb_node/cyber/combat_implants/New()
design_ids += list(
"ci-mantis",
modular_skyrat/modules/modular_weapons/code/pepperball_gun.dm
-14
View File
@@ -56,20 +56,6 @@
R.expose_mob(M, VAPOR, reagent_volume)
. = ..()
/datum/design/pepperballs
name = "Pepperball Ammo Box"
id = "pepperballs"
build_type = AUTOLATHE | PROTOLATHE
materials = list(
/datum/material/iron = SHEET_MATERIAL_AMOUNT * 3,
)
build_path = /obj/item/ammo_box/advanced/pepperballs
category = list(
RND_CATEGORY_INITIAL,
RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO,
)
departmental_flags = DEPARTMENT_BITFLAG_SECURITY
/obj/item/ammo_box/advanced/pepperballs
name = "pepperball ammo box"
icon = 'modular_skyrat/modules/modular_weapons/icons/obj/pepperball/ammoboxes.dmi'
modular_skyrat/modules/sec_haul/code/technode/all_nodes.dm
-11
View File
@@ -9,7 +9,6 @@
design_ids = list(
"sol40_riflstandardemag",
"solgrenade_extmag",
"sol35_shortextmag",
"ca_flech",
"ca_flechmagnesium",
"s12g_slug",
@@ -31,7 +30,6 @@
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_2_POINTS)
/datum/techweb_node/basic_arms/New()
design_ids += "sol35_shortmag"
design_ids += "c10mm_r"
design_ids += "c10mm_rihdf"
design_ids += "s12c_fslug"
@@ -52,27 +50,20 @@
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_TIER_3_POINTS)
/datum/techweb_node/sec_equip/New()
design_ids += "m45_mag"
design_ids += "s12g_rubber"
design_ids += "s12g_bslug"
design_ids += "c457_casing"
design_ids += "sol40_riflemag"
design_ids += "m9mm_mag_rubber"
design_ids += "c10mm_rl"
. = ..()
/datum/techweb_node/riot_supression/New()
design_ids += "s12g_hornet"
design_ids += "s12g_br"
design_ids += "m9mm_mag_ihdf"
design_ids += "ca_flechballpoint"
design_ids += "m9mm_mag"
design_ids += "c10mm_rincin"
design_ids += "s12g_antitide"
. = ..()
/datum/techweb_node/exotic_ammo/New()
design_ids += "s12g_incinslug"
design_ids += "ca_flechripper"
design_ids += "sol_bolt_to_rifle"
design_ids += "c10mm_rhp"
@@ -80,8 +71,6 @@
. = ..()
/datum/techweb_node/syndicate_basic/New()
design_ids += "s12g_magnum"
design_ids += "s12g_express"
design_ids += "s12g_ion"
. = ..()
modular_skyrat/modules/sec_haul/code/technode/sec_research.dm
-13
View File
@@ -521,19 +521,6 @@
departmental_flags = DEPARTMENT_BITFLAG_SECURITY
autolathe_exportable = FALSE
/datum/design/sol_smg_rapidfire_kit //this is currently un-balanced, please fix it when convenient
name = "Romulus SMG 'Shaytan' Full-Auto Conversion Kit(Very Lethal)"
desc = "The kit to brutalise your functional submachine gun into a monstrosity that fires full-auto, all the time."
id = "sol_smg_rapidfire_kit"
build_type = PROTOLATHE | AWAY_LATHE
materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT * 5, /datum/material/glass =SHEET_MATERIAL_AMOUNT, /datum/material/plastic =SHEET_MATERIAL_AMOUNT * 3.5, /datum/material/titanium =HALF_SHEET_MATERIAL_AMOUNT)
build_path = /obj/item/weaponcrafting/gunkit/sol_smg_rapidfire_kit
category = list(
RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_KITS
)
departmental_flags = DEPARTMENT_BITFLAG_SECURITY
autolathe_exportable = FALSE
/datum/design/sol_bolt_to_rifle
name = "Sol Battle rifle Conversion Part Kit(Very Lethal)"
desc = "The kit to brutalise your functional bolt action rifle into one suitable for sustained fire."
modular_skyrat/modules/shotgunrebalance/code/autolathe_design.dm
-24
View File
@@ -11,18 +11,6 @@
RND_CATEGORY_HACKED, RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO,
)
/datum/design/shotgun_slug/sec
id = "sec_shotgun_slug"
build_type = PROTOLATHE | AWAY_LATHE
materials = list(
/datum/material/iron = SHEET_MATERIAL_AMOUNT,
)
category = list(
RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO,
)
departmental_flags = DEPARTMENT_BITFLAG_SECURITY
autolathe_exportable = FALSE
/datum/design/buckshot_shell
name = "Buckshot Shell"
id = "buckshot_shell"
@@ -35,18 +23,6 @@
RND_CATEGORY_HACKED, RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO,
)
/datum/design/buckshot_shell/sec
id = "sec_buckshot_shell"
build_type = PROTOLATHE | AWAY_LATHE
materials = list(
/datum/material/iron = SHEET_MATERIAL_AMOUNT,
)
category = list(
RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO,
)
departmental_flags = DEPARTMENT_BITFLAG_SECURITY
autolathe_exportable = FALSE
//Existing Designs Discounting
/datum/design/rubbershot
modular_skyrat/modules/stasisrework/code/all_nodes.dm
+1
View File
@@ -1,5 +1,6 @@
/datum/techweb_node/cryostasis/New()
design_ids += list(
"stasisbag",
"stasissleeper",
)
return ..()
modular_zubbers/code/modules/nanites/program_designs.dm
+13 -1
View File
@@ -1,7 +1,7 @@
/datum/design/nanites
name = "None"
desc = "Warn a coder if you see this."
id = "default_nanites"
id = DESIGN_ID_IGNORE
build_type = NANITE_COMPILER
construction_time = 50
category = list()
@@ -61,12 +61,14 @@
program_type = /datum/nanite_program/nanite_debugging
category = list("Utility Nanites")
/*
/datum/design/nanites/access
name = "Subdermal ID"
desc = "The nanites store the host's ID access rights in a subdermal magnetic strip. Updates when triggered, copying the host's current access."
id = "access_nanites"
program_type = /datum/nanite_program/access
category = list("Utility Nanites")
*/
/datum/design/nanites/relay
name = "Relay"
@@ -96,6 +98,7 @@
program_type = /datum/nanite_program/emp
category = list("Utility Nanites")
/*
/datum/design/nanites/spreading
name = "Infective Exo-Locomotion"
desc = "The nanites gain the ability to survive for brief periods outside of the human body, as well as the ability to start new colonies without an integration process; \
@@ -103,6 +106,7 @@
id = "spreading_nanites"
program_type = /datum/nanite_program/spreading
category = list("Utility Nanites")
*/
/datum/design/nanites/nanite_sting
name = "Nanite Sting"
@@ -127,6 +131,7 @@
program_type = /datum/nanite_program/regenerative
category = list("Medical Nanites")
/*
/datum/design/nanites/regenerative_advanced
name = "Bio-Reconstruction"
desc = "The nanites manually repair and replace organic cells, acting much faster than normal regeneration. \
@@ -134,6 +139,7 @@
id = "regenerative_plus_nanites"
program_type = /datum/nanite_program/regenerative/advanced
category = list("Medical Nanites")
*/
/datum/design/nanites/temperature
name = "Temperature Adjustment"
@@ -239,6 +245,7 @@
////////////////////DEFECTIVE NANITES//////////////////////////////////////
/*
/datum/design/nanites/glitch
name = "Glitch"
desc = "A heavy software corruption that causes nanites to gradually break down."
@@ -294,6 +301,7 @@
id = "braindecay_nanites"
program_type = /datum/nanite_program/brain_decay
category = list("Defective Nanites")
*/
////////////////////WEAPONIZED NANITES/////////////////////////////////////
@@ -347,6 +355,7 @@
program_type = /datum/nanite_program/pyro
category = list("Weaponized Nanites")
/*
/datum/design/nanites/heart_stop
name = "Heart-Stopper"
desc = "Stops the host's heart when triggered; restarts it if triggered again."
@@ -360,6 +369,7 @@
id = "explosive_nanites"
program_type = /datum/nanite_program/explosive
category = list("Weaponized Nanites")
*/
/datum/design/nanites/mind_control
name = "Mind Control"
@@ -433,12 +443,14 @@
program_type = /datum/nanite_program/comm/voice
category = list("Suppression Nanites")
/*
/datum/design/nanites/speech
name = "Forced Speech"
desc = "The nanites force the host to say a pre-programmed sentence when triggered."
id = "speech_nanites"
program_type = /datum/nanite_program/comm/speech
category = list("Suppression Nanites")
*/
/datum/design/nanites/hallucination
name = "Hallucination"
modular_zubbers/maps/offstation/dauntless/camerabutton.dm
-9
View File
@@ -29,12 +29,3 @@
/obj/machinery/button/camkillswitch
name = "camera kill switch"
device_type = /obj/item/assembly/control/camkillswitch
/datum/design/camkillswitch
name = "Camera Kill Switch"
id = "camkillswitch"
materials = list(
/datum/material/iron = SMALL_MATERIAL_AMOUNT,
/datum/material/glass = SMALL_MATERIAL_AMOUNT,
)
build_path = /obj/item/assembly/control/camkillswitch
tgstation.dme
-1
View File
@@ -7124,7 +7124,6 @@
#include "modular_skyrat\master_files\code\modules\reagents\medicine_reagents\medicine_reagents.dm"
#include "modular_skyrat\master_files\code\modules\reagents\withdrawal\generic_addictions.dm"
#include "modular_skyrat\master_files\code\modules\religion\religious_sects.dm"
#include "modular_skyrat\master_files\code\modules\research\designs\AI_module_designs.dm"
#include "modular_skyrat\master_files\code\modules\research\designs\biogenerator_designs.dm"
#include "modular_skyrat\master_files\code\modules\research\designs\limbgrower_designs.dm"
#include "modular_skyrat\master_files\code\modules\research\designs\long_range_pda_design.dm"
tgstation_unit_test_focus_file.dm
-1
View File
@@ -1 +0,0 @@
TEST_FOCUS(/datum/unit_test/abductor_baton_spell)