From 975a1a968cd62a79f2be35129421691725e39aaf Mon Sep 17 00:00:00 2001 From: Sishen Date: Sun, 1 Dec 2019 05:03:18 -0700 Subject: [PATCH 1/3] n --- code/modules/research/designs/misc_designs.dm | 19 +++++++++ .../research/designs/weapon_designs.dm | 40 +++++++++++++++++++ 2 files changed, 59 insertions(+) diff --git a/code/modules/research/designs/misc_designs.dm b/code/modules/research/designs/misc_designs.dm index 5f7648b245..630268feab 100644 --- a/code/modules/research/designs/misc_designs.dm +++ b/code/modules/research/designs/misc_designs.dm @@ -41,6 +41,7 @@ build_path = /obj/item/clothing/glasses/hud/security category = list("Equipment") departmental_flags = DEPARTMENTAL_FLAG_SECURITY + dangerous_construction = TRUE /datum/design/security_hud_prescription name = "Prescription Security HUD" @@ -51,6 +52,7 @@ build_path = /obj/item/clothing/glasses/hud/security/prescription category = list("Equipment") departmental_flags = DEPARTMENTAL_FLAG_SECURITY + dangerous_construction = TRUE /datum/design/security_hud_night name = "Night Vision Security HUD" @@ -61,6 +63,7 @@ build_path = /obj/item/clothing/glasses/hud/security/night category = list("Equipment") departmental_flags = DEPARTMENTAL_FLAG_SECURITY + dangerous_construction = TRUE /datum/design/diagnostic_hud name = "Diagnostic HUD" @@ -171,6 +174,7 @@ build_path = /obj/item/clothing/glasses/meson/night category = list("Equipment") departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_CARGO + dangerous_construction = TRUE /datum/design/night_vision_goggles name = "Night Vision Goggles" @@ -181,6 +185,7 @@ build_path = /obj/item/clothing/glasses/night category = list("Equipment") departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_SECURITY + dangerous_construction = TRUE /datum/design/night_vision_goggles_glasses name = "Prescription Night Vision Goggles" @@ -191,6 +196,7 @@ build_path = /obj/item/clothing/glasses/night/prescription category = list("Equipment") departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_SECURITY | DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_ENGINEERING + dangerous_construction = TRUE ///////////////////////////////////////// //////////////////Misc/////////////////// @@ -388,6 +394,7 @@ build_path = /obj/item/rcd_upgrade category = list("Equipment") departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING + dangerous_construction = TRUE /datum/design/exwelder name = "Experimental Welding Tool" @@ -398,6 +405,7 @@ build_path = /obj/item/weldingtool/experimental category = list("Equipment") departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING + dangerous_construction = TRUE /datum/design/handdrill name = "Hand Drill" @@ -408,6 +416,7 @@ build_path = /obj/item/screwdriver/power category = list("Equipment") departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING + dangerous_construction = TRUE /datum/design/jawsoflife name = "Jaws of Life" @@ -418,6 +427,7 @@ materials = list(MAT_METAL = 4500, MAT_SILVER = 2500, MAT_TITANIUM = 3500) category = list("Equipment") departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING + dangerous_construction = TRUE /datum/design/alienwrench name = "Alien Wrench" @@ -428,6 +438,7 @@ materials = list(MAT_METAL = 5000, MAT_SILVER = 2500, MAT_PLASMA = 1000, MAT_TITANIUM = 2000, MAT_DIAMOND = 2000) category = list("Equipment") departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING + dangerous_construction = TRUE /datum/design/alienwirecutters name = "Alien Wirecutters" @@ -438,6 +449,7 @@ materials = list(MAT_METAL = 5000, MAT_SILVER = 2500, MAT_PLASMA = 1000, MAT_TITANIUM = 2000, MAT_DIAMOND = 2000) category = list("Equipment") departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING + dangerous_construction = TRUE /datum/design/alienscrewdriver name = "Alien Screwdriver" @@ -448,6 +460,7 @@ materials = list(MAT_METAL = 5000, MAT_SILVER = 2500, MAT_PLASMA = 1000, MAT_TITANIUM = 2000, MAT_DIAMOND = 2000) category = list("Equipment") departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING + dangerous_construction = TRUE /datum/design/aliencrowbar name = "Alien Crowbar" @@ -458,6 +471,7 @@ materials = list(MAT_METAL = 5000, MAT_SILVER = 2500, MAT_PLASMA = 1000, MAT_TITANIUM = 2000, MAT_DIAMOND = 2000) category = list("Equipment") departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING + dangerous_construction = TRUE /datum/design/alienwelder name = "Alien Welding Tool" @@ -468,6 +482,7 @@ materials = list(MAT_METAL = 5000, MAT_SILVER = 2500, MAT_PLASMA = 5000, MAT_TITANIUM = 2000, MAT_DIAMOND = 2000) category = list("Equipment") departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING + dangerous_construction = TRUE /datum/design/alienmultitool name = "Alien Multitool" @@ -478,6 +493,7 @@ materials = list(MAT_METAL = 5000, MAT_SILVER = 2500, MAT_PLASMA = 5000, MAT_TITANIUM = 2000, MAT_DIAMOND = 2000) category = list("Equipment") departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING + dangerous_construction = TRUE /datum/design/quantum_keycard name = "Quantum Keycard" @@ -488,6 +504,7 @@ build_path = /obj/item/quantum_keycard category = list("Equipment") departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING + dangerous_construction = TRUE /datum/design/anomaly_neutralizer name = "Anomaly Neutralizer" @@ -498,6 +515,7 @@ build_path = /obj/item/anomaly_neutralizer category = list("Equipment") departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING + dangerous_construction = TRUE /datum/design/pHmeter name = "Chemical Analyser" @@ -522,6 +540,7 @@ build_path = /obj/item/reactive_armour_shell category = list("Equipment") departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING + dangerous_construction = TRUE ///////////////////////////////////////// ////////////Meteor/////////////////////// diff --git a/code/modules/research/designs/weapon_designs.dm b/code/modules/research/designs/weapon_designs.dm index fde795d87c..5d0a35c1ac 100644 --- a/code/modules/research/designs/weapon_designs.dm +++ b/code/modules/research/designs/weapon_designs.dm @@ -11,11 +11,13 @@ build_type = PROTOLATHE category = list("Ammo") departmental_flags = DEPARTMENTAL_FLAG_SECURITY + dangerous_construction = TRUE /datum/design/c38/sec/lethal name = "Speed Loader (.38)" id = "sec_38lethal" build_path = /obj/item/ammo_box/c38/lethal + dangerous_construction = TRUE /datum/design/c38_trac name = "Speed Loader (.38 TRAC)" @@ -26,6 +28,7 @@ build_path = /obj/item/ammo_box/c38/trac category = list("Ammo") departmental_flags = DEPARTMENTAL_FLAG_SECURITY + dangerous_construction = TRUE /datum/design/c38_hotshot name = "Speed Loader (.38 Hot Shot)" @@ -36,6 +39,7 @@ build_path = /obj/item/ammo_box/c38/hotshot category = list("Ammo") departmental_flags = DEPARTMENTAL_FLAG_SECURITY + dangerous_construction = TRUE /datum/design/c38_iceblox name = "Speed Loader (.38 Iceblox)" @@ -46,6 +50,7 @@ build_path = /obj/item/ammo_box/c38/iceblox category = list("Ammo") departmental_flags = DEPARTMENTAL_FLAG_SECURITY + dangerous_construction = TRUE ////////////// //WT550 Mags// @@ -60,6 +65,7 @@ build_path = /obj/item/ammo_box/magazine/wt550m9 category = list("Ammo") departmental_flags = DEPARTMENTAL_FLAG_SECURITY + dangerous_construction = TRUE /datum/design/mag_oldsmg/ap_mag name = "WT-550 Semi-Auto SMG Armour Piercing Magazine (4.6x30mm AP)" @@ -68,6 +74,7 @@ materials = list(MAT_METAL = 6000, MAT_SILVER = 600) build_path = /obj/item/ammo_box/magazine/wt550m9/wtap departmental_flags = DEPARTMENTAL_FLAG_SECURITY + dangerous_construction = TRUE /datum/design/mag_oldsmg/ic_mag name = "WT-550 Semi-Auto SMG Incendiary Magazine (4.6x30mm IC)" @@ -76,6 +83,7 @@ materials = list(MAT_METAL = 6000, MAT_SILVER = 600, MAT_GLASS = 1000) build_path = /obj/item/ammo_box/magazine/wt550m9/wtic departmental_flags = DEPARTMENTAL_FLAG_SECURITY + dangerous_construction = TRUE /datum/design/mag_oldsmg/tx_mag name = "WT-550 Semi-Auto SMG Uranium Magazine (4.6x30mm TX)" @@ -84,6 +92,7 @@ materials = list(MAT_METAL = 6000, MAT_SILVER = 600, MAT_URANIUM = 2000) build_path = /obj/item/ammo_box/magazine/wt550m9/wttx departmental_flags = DEPARTMENTAL_FLAG_SECURITY + dangerous_construction = TRUE /datum/design/mag_oldsmg/rubber_mag name = "WT-550 Semi-Auto SMG rubberbullets Magazine (4.6x30mm rubber)" @@ -92,6 +101,7 @@ materials = list(MAT_METAL = 6000) build_path = /obj/item/ammo_box/magazine/wt550m9/wtrubber departmental_flags = DEPARTMENTAL_FLAG_SECURITY + dangerous_construction = TRUE ////////////// //Ammo Shells/ @@ -102,36 +112,42 @@ build_type = PROTOLATHE category = list("Ammo") departmental_flags = DEPARTMENTAL_FLAG_SECURITY + dangerous_construction = TRUE /datum/design/rubbershot/sec id = "sec_rshot" build_type = PROTOLATHE category = list("Ammo") departmental_flags = DEPARTMENTAL_FLAG_SECURITY + dangerous_construction = TRUE /datum/design/shotgun_slug/sec id = "sec_slug" build_type = PROTOLATHE category = list("Ammo") departmental_flags = DEPARTMENTAL_FLAG_SECURITY + dangerous_construction = TRUE /datum/design/buckshot_shell/sec id = "sec_bshot" build_type = PROTOLATHE category = list("Ammo") departmental_flags = DEPARTMENTAL_FLAG_SECURITY + dangerous_construction = TRUE /datum/design/shotgun_dart/sec id = "sec_dart" build_type = PROTOLATHE category = list("Ammo") departmental_flags = DEPARTMENTAL_FLAG_SECURITY + dangerous_construction = TRUE /datum/design/incendiary_slug/sec id = "sec_Islug" build_type = PROTOLATHE category = list("Ammo") departmental_flags = DEPARTMENTAL_FLAG_SECURITY + dangerous_construction = TRUE /datum/design/stunshell name = "Stun Shell" @@ -142,6 +158,7 @@ build_path = /obj/item/ammo_casing/shotgun/stunslug category = list("Ammo") departmental_flags = DEPARTMENTAL_FLAG_SECURITY | DEPARTMENTAL_FLAG_SCIENCE + dangerous_construction = TRUE /datum/design/techshell name = "Unloaded Technological Shotshell" @@ -152,6 +169,7 @@ build_path = /obj/item/ammo_casing/shotgun/techshell category = list("Ammo") departmental_flags = DEPARTMENTAL_FLAG_SECURITY | DEPARTMENTAL_FLAG_SCIENCE + dangerous_construction = TRUE /datum/design/cryostatis_shotgun_dart name = "Cryostasis Shotgun Dart" @@ -162,6 +180,7 @@ build_path = /obj/item/ammo_casing/shotgun/dart/noreact category = list("Ammo") departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + dangerous_construction = TRUE ////////////// //Firing Pins/ @@ -176,6 +195,7 @@ build_path = /obj/item/firing_pin/test_range category = list("Firing Pins") departmental_flags = DEPARTMENTAL_FLAG_SECURITY | DEPARTMENTAL_FLAG_SCIENCE + dangerous_construction = TRUE /datum/design/pin_mindshield name = "Mindshield Firing Pin" @@ -186,6 +206,7 @@ build_path = /obj/item/firing_pin/implant/mindshield category = list("Firing Pins") departmental_flags = DEPARTMENTAL_FLAG_SECURITY + dangerous_construction = TRUE ////////////// //Guns//////// @@ -200,6 +221,7 @@ build_path = /obj/item/gun/energy/laser/carbine/nopin category = list("Weapons") departmental_flags = DEPARTMENTAL_FLAG_SECURITY + dangerous_construction = TRUE /datum/design/stunrevolver name = "Tesla Revolver" @@ -210,6 +232,7 @@ build_path = /obj/item/gun/energy/tesla_revolver category = list("Weapons") departmental_flags = DEPARTMENTAL_FLAG_SECURITY + dangerous_construction = TRUE /datum/design/nuclear_gun name = "Advanced Energy Gun" @@ -220,6 +243,7 @@ build_path = /obj/item/gun/energy/e_gun/nuclear category = list("Weapons") departmental_flags = DEPARTMENTAL_FLAG_SECURITY + dangerous_construction = TRUE /datum/design/beamrifle name = "Beam Marksman Rifle" @@ -230,6 +254,7 @@ build_path = /obj/item/gun/energy/beam_rifle category = list("Weapons") departmental_flags = DEPARTMENTAL_FLAG_SECURITY + dangerous_construction = TRUE /datum/design/decloner name = "Decloner" @@ -241,6 +266,7 @@ build_path = /obj/item/gun/energy/decloner category = list("Weapons") departmental_flags = DEPARTMENTAL_FLAG_SECURITY + dangerous_construction = TRUE /datum/design/rapidsyringe name = "Rapid Syringe Gun" @@ -251,6 +277,7 @@ build_path = /obj/item/gun/syringe/rapidsyringe category = list("Weapons") departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + dangerous_construction = TRUE /datum/design/temp_gun name = "Temperature Gun" @@ -261,6 +288,7 @@ build_path = /obj/item/gun/energy/temperature category = list("Weapons") departmental_flags = DEPARTMENTAL_FLAG_SECURITY + dangerous_construction = TRUE /datum/design/flora_gun name = "Floral Somatoray" @@ -272,6 +300,7 @@ build_path = /obj/item/gun/energy/floragun category = list("Weapons") departmental_flags = DEPARTMENTAL_FLAG_SERVICE | DEPARTMENTAL_FLAG_SCIENCE + dangerous_construction = TRUE /datum/design/xray name = "X-ray Laser Gun" @@ -282,6 +311,7 @@ build_path = /obj/item/gun/energy/xray category = list("Weapons") departmental_flags = DEPARTMENTAL_FLAG_SECURITY + dangerous_construction = TRUE /datum/design/ioncarbine name = "Ion Carbine" @@ -292,6 +322,7 @@ build_path = /obj/item/gun/energy/ionrifle/carbine category = list("Weapons") departmental_flags = DEPARTMENTAL_FLAG_SECURITY + dangerous_construction = TRUE /datum/design/wormhole_projector name = "Bluespace Wormhole Projector" @@ -302,6 +333,7 @@ build_path = /obj/item/gun/energy/wormhole_projector category = list("Weapons") departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + dangerous_construction = TRUE /datum/design/gravitygun name = "One-point Bluespace-gravitational Manipulator" @@ -312,6 +344,7 @@ build_path = /obj/item/gun/energy/gravity_gun category = list("Weapons") departmental_flags = DEPARTMENTAL_FLAG_SCIENCE + dangerous_construction = TRUE /datum/design/largecrossbow name = "Energy Crossbow" @@ -322,6 +355,7 @@ build_path = /obj/item/gun/energy/kinetic_accelerator/crossbow/large category = list("Weapons") departmental_flags = DEPARTMENTAL_FLAG_SECURITY + dangerous_construction = TRUE /////////// //Grenades/ @@ -336,6 +370,7 @@ build_path = /obj/item/grenade/chem_grenade/large category = list("Weapons") departmental_flags = DEPARTMENTAL_FLAG_SECURITY | DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE + dangerous_construction = TRUE /datum/design/pyro_grenade name = "Pyro Grenade" @@ -346,6 +381,7 @@ build_path = /obj/item/grenade/chem_grenade/pyro category = list("Weapons") departmental_flags = DEPARTMENTAL_FLAG_SECURITY | DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE + dangerous_construction = TRUE /datum/design/cryo_grenade name = "Cryo Grenade" @@ -356,6 +392,7 @@ build_path = /obj/item/grenade/chem_grenade/cryo category = list("Weapons") departmental_flags = DEPARTMENTAL_FLAG_SECURITY | DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE + dangerous_construction = TRUE /datum/design/adv_grenade name = "Advanced Release Grenade" @@ -366,6 +403,7 @@ build_path = /obj/item/grenade/chem_grenade/adv_release category = list("Weapons") departmental_flags = DEPARTMENTAL_FLAG_SECURITY | DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE + dangerous_construction = TRUE ////////// //MISC//// @@ -380,6 +418,7 @@ build_path = /obj/item/shield/riot/tele category = list("Weapons") departmental_flags = DEPARTMENTAL_FLAG_SECURITY + dangerous_construction = TRUE /datum/design/suppressor name = "Suppressor" @@ -390,3 +429,4 @@ build_path = /obj/item/suppressor category = list("Weapons") departmental_flags = DEPARTMENTAL_FLAG_SECURITY + dangerous_construction = TRUE From 3ac863d0acf08cf2f879e68154f5d6c2aa09df8f Mon Sep 17 00:00:00 2001 From: Sishen Date: Sun, 1 Dec 2019 05:09:34 -0700 Subject: [PATCH 2/3] Revert "n" This reverts commit 975a1a968cd62a79f2be35129421691725e39aaf. --- code/modules/research/designs/misc_designs.dm | 19 --------- .../research/designs/weapon_designs.dm | 40 ------------------- 2 files changed, 59 deletions(-) diff --git a/code/modules/research/designs/misc_designs.dm b/code/modules/research/designs/misc_designs.dm index 630268feab..5f7648b245 100644 --- a/code/modules/research/designs/misc_designs.dm +++ b/code/modules/research/designs/misc_designs.dm @@ -41,7 +41,6 @@ build_path = /obj/item/clothing/glasses/hud/security category = list("Equipment") departmental_flags = DEPARTMENTAL_FLAG_SECURITY - dangerous_construction = TRUE /datum/design/security_hud_prescription name = "Prescription Security HUD" @@ -52,7 +51,6 @@ build_path = /obj/item/clothing/glasses/hud/security/prescription category = list("Equipment") departmental_flags = DEPARTMENTAL_FLAG_SECURITY - dangerous_construction = TRUE /datum/design/security_hud_night name = "Night Vision Security HUD" @@ -63,7 +61,6 @@ build_path = /obj/item/clothing/glasses/hud/security/night category = list("Equipment") departmental_flags = DEPARTMENTAL_FLAG_SECURITY - dangerous_construction = TRUE /datum/design/diagnostic_hud name = "Diagnostic HUD" @@ -174,7 +171,6 @@ build_path = /obj/item/clothing/glasses/meson/night category = list("Equipment") departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_CARGO - dangerous_construction = TRUE /datum/design/night_vision_goggles name = "Night Vision Goggles" @@ -185,7 +181,6 @@ build_path = /obj/item/clothing/glasses/night category = list("Equipment") departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_SECURITY - dangerous_construction = TRUE /datum/design/night_vision_goggles_glasses name = "Prescription Night Vision Goggles" @@ -196,7 +191,6 @@ build_path = /obj/item/clothing/glasses/night/prescription category = list("Equipment") departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_SECURITY | DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_ENGINEERING - dangerous_construction = TRUE ///////////////////////////////////////// //////////////////Misc/////////////////// @@ -394,7 +388,6 @@ build_path = /obj/item/rcd_upgrade category = list("Equipment") departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING - dangerous_construction = TRUE /datum/design/exwelder name = "Experimental Welding Tool" @@ -405,7 +398,6 @@ build_path = /obj/item/weldingtool/experimental category = list("Equipment") departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING - dangerous_construction = TRUE /datum/design/handdrill name = "Hand Drill" @@ -416,7 +408,6 @@ build_path = /obj/item/screwdriver/power category = list("Equipment") departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING - dangerous_construction = TRUE /datum/design/jawsoflife name = "Jaws of Life" @@ -427,7 +418,6 @@ materials = list(MAT_METAL = 4500, MAT_SILVER = 2500, MAT_TITANIUM = 3500) category = list("Equipment") departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING - dangerous_construction = TRUE /datum/design/alienwrench name = "Alien Wrench" @@ -438,7 +428,6 @@ materials = list(MAT_METAL = 5000, MAT_SILVER = 2500, MAT_PLASMA = 1000, MAT_TITANIUM = 2000, MAT_DIAMOND = 2000) category = list("Equipment") departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING - dangerous_construction = TRUE /datum/design/alienwirecutters name = "Alien Wirecutters" @@ -449,7 +438,6 @@ materials = list(MAT_METAL = 5000, MAT_SILVER = 2500, MAT_PLASMA = 1000, MAT_TITANIUM = 2000, MAT_DIAMOND = 2000) category = list("Equipment") departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING - dangerous_construction = TRUE /datum/design/alienscrewdriver name = "Alien Screwdriver" @@ -460,7 +448,6 @@ materials = list(MAT_METAL = 5000, MAT_SILVER = 2500, MAT_PLASMA = 1000, MAT_TITANIUM = 2000, MAT_DIAMOND = 2000) category = list("Equipment") departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING - dangerous_construction = TRUE /datum/design/aliencrowbar name = "Alien Crowbar" @@ -471,7 +458,6 @@ materials = list(MAT_METAL = 5000, MAT_SILVER = 2500, MAT_PLASMA = 1000, MAT_TITANIUM = 2000, MAT_DIAMOND = 2000) category = list("Equipment") departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING - dangerous_construction = TRUE /datum/design/alienwelder name = "Alien Welding Tool" @@ -482,7 +468,6 @@ materials = list(MAT_METAL = 5000, MAT_SILVER = 2500, MAT_PLASMA = 5000, MAT_TITANIUM = 2000, MAT_DIAMOND = 2000) category = list("Equipment") departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING - dangerous_construction = TRUE /datum/design/alienmultitool name = "Alien Multitool" @@ -493,7 +478,6 @@ materials = list(MAT_METAL = 5000, MAT_SILVER = 2500, MAT_PLASMA = 5000, MAT_TITANIUM = 2000, MAT_DIAMOND = 2000) category = list("Equipment") departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING - dangerous_construction = TRUE /datum/design/quantum_keycard name = "Quantum Keycard" @@ -504,7 +488,6 @@ build_path = /obj/item/quantum_keycard category = list("Equipment") departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING - dangerous_construction = TRUE /datum/design/anomaly_neutralizer name = "Anomaly Neutralizer" @@ -515,7 +498,6 @@ build_path = /obj/item/anomaly_neutralizer category = list("Equipment") departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING - dangerous_construction = TRUE /datum/design/pHmeter name = "Chemical Analyser" @@ -540,7 +522,6 @@ build_path = /obj/item/reactive_armour_shell category = list("Equipment") departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING - dangerous_construction = TRUE ///////////////////////////////////////// ////////////Meteor/////////////////////// diff --git a/code/modules/research/designs/weapon_designs.dm b/code/modules/research/designs/weapon_designs.dm index 5d0a35c1ac..fde795d87c 100644 --- a/code/modules/research/designs/weapon_designs.dm +++ b/code/modules/research/designs/weapon_designs.dm @@ -11,13 +11,11 @@ build_type = PROTOLATHE category = list("Ammo") departmental_flags = DEPARTMENTAL_FLAG_SECURITY - dangerous_construction = TRUE /datum/design/c38/sec/lethal name = "Speed Loader (.38)" id = "sec_38lethal" build_path = /obj/item/ammo_box/c38/lethal - dangerous_construction = TRUE /datum/design/c38_trac name = "Speed Loader (.38 TRAC)" @@ -28,7 +26,6 @@ build_path = /obj/item/ammo_box/c38/trac category = list("Ammo") departmental_flags = DEPARTMENTAL_FLAG_SECURITY - dangerous_construction = TRUE /datum/design/c38_hotshot name = "Speed Loader (.38 Hot Shot)" @@ -39,7 +36,6 @@ build_path = /obj/item/ammo_box/c38/hotshot category = list("Ammo") departmental_flags = DEPARTMENTAL_FLAG_SECURITY - dangerous_construction = TRUE /datum/design/c38_iceblox name = "Speed Loader (.38 Iceblox)" @@ -50,7 +46,6 @@ build_path = /obj/item/ammo_box/c38/iceblox category = list("Ammo") departmental_flags = DEPARTMENTAL_FLAG_SECURITY - dangerous_construction = TRUE ////////////// //WT550 Mags// @@ -65,7 +60,6 @@ build_path = /obj/item/ammo_box/magazine/wt550m9 category = list("Ammo") departmental_flags = DEPARTMENTAL_FLAG_SECURITY - dangerous_construction = TRUE /datum/design/mag_oldsmg/ap_mag name = "WT-550 Semi-Auto SMG Armour Piercing Magazine (4.6x30mm AP)" @@ -74,7 +68,6 @@ materials = list(MAT_METAL = 6000, MAT_SILVER = 600) build_path = /obj/item/ammo_box/magazine/wt550m9/wtap departmental_flags = DEPARTMENTAL_FLAG_SECURITY - dangerous_construction = TRUE /datum/design/mag_oldsmg/ic_mag name = "WT-550 Semi-Auto SMG Incendiary Magazine (4.6x30mm IC)" @@ -83,7 +76,6 @@ materials = list(MAT_METAL = 6000, MAT_SILVER = 600, MAT_GLASS = 1000) build_path = /obj/item/ammo_box/magazine/wt550m9/wtic departmental_flags = DEPARTMENTAL_FLAG_SECURITY - dangerous_construction = TRUE /datum/design/mag_oldsmg/tx_mag name = "WT-550 Semi-Auto SMG Uranium Magazine (4.6x30mm TX)" @@ -92,7 +84,6 @@ materials = list(MAT_METAL = 6000, MAT_SILVER = 600, MAT_URANIUM = 2000) build_path = /obj/item/ammo_box/magazine/wt550m9/wttx departmental_flags = DEPARTMENTAL_FLAG_SECURITY - dangerous_construction = TRUE /datum/design/mag_oldsmg/rubber_mag name = "WT-550 Semi-Auto SMG rubberbullets Magazine (4.6x30mm rubber)" @@ -101,7 +92,6 @@ materials = list(MAT_METAL = 6000) build_path = /obj/item/ammo_box/magazine/wt550m9/wtrubber departmental_flags = DEPARTMENTAL_FLAG_SECURITY - dangerous_construction = TRUE ////////////// //Ammo Shells/ @@ -112,42 +102,36 @@ build_type = PROTOLATHE category = list("Ammo") departmental_flags = DEPARTMENTAL_FLAG_SECURITY - dangerous_construction = TRUE /datum/design/rubbershot/sec id = "sec_rshot" build_type = PROTOLATHE category = list("Ammo") departmental_flags = DEPARTMENTAL_FLAG_SECURITY - dangerous_construction = TRUE /datum/design/shotgun_slug/sec id = "sec_slug" build_type = PROTOLATHE category = list("Ammo") departmental_flags = DEPARTMENTAL_FLAG_SECURITY - dangerous_construction = TRUE /datum/design/buckshot_shell/sec id = "sec_bshot" build_type = PROTOLATHE category = list("Ammo") departmental_flags = DEPARTMENTAL_FLAG_SECURITY - dangerous_construction = TRUE /datum/design/shotgun_dart/sec id = "sec_dart" build_type = PROTOLATHE category = list("Ammo") departmental_flags = DEPARTMENTAL_FLAG_SECURITY - dangerous_construction = TRUE /datum/design/incendiary_slug/sec id = "sec_Islug" build_type = PROTOLATHE category = list("Ammo") departmental_flags = DEPARTMENTAL_FLAG_SECURITY - dangerous_construction = TRUE /datum/design/stunshell name = "Stun Shell" @@ -158,7 +142,6 @@ build_path = /obj/item/ammo_casing/shotgun/stunslug category = list("Ammo") departmental_flags = DEPARTMENTAL_FLAG_SECURITY | DEPARTMENTAL_FLAG_SCIENCE - dangerous_construction = TRUE /datum/design/techshell name = "Unloaded Technological Shotshell" @@ -169,7 +152,6 @@ build_path = /obj/item/ammo_casing/shotgun/techshell category = list("Ammo") departmental_flags = DEPARTMENTAL_FLAG_SECURITY | DEPARTMENTAL_FLAG_SCIENCE - dangerous_construction = TRUE /datum/design/cryostatis_shotgun_dart name = "Cryostasis Shotgun Dart" @@ -180,7 +162,6 @@ build_path = /obj/item/ammo_casing/shotgun/dart/noreact category = list("Ammo") departmental_flags = DEPARTMENTAL_FLAG_MEDICAL - dangerous_construction = TRUE ////////////// //Firing Pins/ @@ -195,7 +176,6 @@ build_path = /obj/item/firing_pin/test_range category = list("Firing Pins") departmental_flags = DEPARTMENTAL_FLAG_SECURITY | DEPARTMENTAL_FLAG_SCIENCE - dangerous_construction = TRUE /datum/design/pin_mindshield name = "Mindshield Firing Pin" @@ -206,7 +186,6 @@ build_path = /obj/item/firing_pin/implant/mindshield category = list("Firing Pins") departmental_flags = DEPARTMENTAL_FLAG_SECURITY - dangerous_construction = TRUE ////////////// //Guns//////// @@ -221,7 +200,6 @@ build_path = /obj/item/gun/energy/laser/carbine/nopin category = list("Weapons") departmental_flags = DEPARTMENTAL_FLAG_SECURITY - dangerous_construction = TRUE /datum/design/stunrevolver name = "Tesla Revolver" @@ -232,7 +210,6 @@ build_path = /obj/item/gun/energy/tesla_revolver category = list("Weapons") departmental_flags = DEPARTMENTAL_FLAG_SECURITY - dangerous_construction = TRUE /datum/design/nuclear_gun name = "Advanced Energy Gun" @@ -243,7 +220,6 @@ build_path = /obj/item/gun/energy/e_gun/nuclear category = list("Weapons") departmental_flags = DEPARTMENTAL_FLAG_SECURITY - dangerous_construction = TRUE /datum/design/beamrifle name = "Beam Marksman Rifle" @@ -254,7 +230,6 @@ build_path = /obj/item/gun/energy/beam_rifle category = list("Weapons") departmental_flags = DEPARTMENTAL_FLAG_SECURITY - dangerous_construction = TRUE /datum/design/decloner name = "Decloner" @@ -266,7 +241,6 @@ build_path = /obj/item/gun/energy/decloner category = list("Weapons") departmental_flags = DEPARTMENTAL_FLAG_SECURITY - dangerous_construction = TRUE /datum/design/rapidsyringe name = "Rapid Syringe Gun" @@ -277,7 +251,6 @@ build_path = /obj/item/gun/syringe/rapidsyringe category = list("Weapons") departmental_flags = DEPARTMENTAL_FLAG_MEDICAL - dangerous_construction = TRUE /datum/design/temp_gun name = "Temperature Gun" @@ -288,7 +261,6 @@ build_path = /obj/item/gun/energy/temperature category = list("Weapons") departmental_flags = DEPARTMENTAL_FLAG_SECURITY - dangerous_construction = TRUE /datum/design/flora_gun name = "Floral Somatoray" @@ -300,7 +272,6 @@ build_path = /obj/item/gun/energy/floragun category = list("Weapons") departmental_flags = DEPARTMENTAL_FLAG_SERVICE | DEPARTMENTAL_FLAG_SCIENCE - dangerous_construction = TRUE /datum/design/xray name = "X-ray Laser Gun" @@ -311,7 +282,6 @@ build_path = /obj/item/gun/energy/xray category = list("Weapons") departmental_flags = DEPARTMENTAL_FLAG_SECURITY - dangerous_construction = TRUE /datum/design/ioncarbine name = "Ion Carbine" @@ -322,7 +292,6 @@ build_path = /obj/item/gun/energy/ionrifle/carbine category = list("Weapons") departmental_flags = DEPARTMENTAL_FLAG_SECURITY - dangerous_construction = TRUE /datum/design/wormhole_projector name = "Bluespace Wormhole Projector" @@ -333,7 +302,6 @@ build_path = /obj/item/gun/energy/wormhole_projector category = list("Weapons") departmental_flags = DEPARTMENTAL_FLAG_SCIENCE - dangerous_construction = TRUE /datum/design/gravitygun name = "One-point Bluespace-gravitational Manipulator" @@ -344,7 +312,6 @@ build_path = /obj/item/gun/energy/gravity_gun category = list("Weapons") departmental_flags = DEPARTMENTAL_FLAG_SCIENCE - dangerous_construction = TRUE /datum/design/largecrossbow name = "Energy Crossbow" @@ -355,7 +322,6 @@ build_path = /obj/item/gun/energy/kinetic_accelerator/crossbow/large category = list("Weapons") departmental_flags = DEPARTMENTAL_FLAG_SECURITY - dangerous_construction = TRUE /////////// //Grenades/ @@ -370,7 +336,6 @@ build_path = /obj/item/grenade/chem_grenade/large category = list("Weapons") departmental_flags = DEPARTMENTAL_FLAG_SECURITY | DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE - dangerous_construction = TRUE /datum/design/pyro_grenade name = "Pyro Grenade" @@ -381,7 +346,6 @@ build_path = /obj/item/grenade/chem_grenade/pyro category = list("Weapons") departmental_flags = DEPARTMENTAL_FLAG_SECURITY | DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE - dangerous_construction = TRUE /datum/design/cryo_grenade name = "Cryo Grenade" @@ -392,7 +356,6 @@ build_path = /obj/item/grenade/chem_grenade/cryo category = list("Weapons") departmental_flags = DEPARTMENTAL_FLAG_SECURITY | DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE - dangerous_construction = TRUE /datum/design/adv_grenade name = "Advanced Release Grenade" @@ -403,7 +366,6 @@ build_path = /obj/item/grenade/chem_grenade/adv_release category = list("Weapons") departmental_flags = DEPARTMENTAL_FLAG_SECURITY | DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE - dangerous_construction = TRUE ////////// //MISC//// @@ -418,7 +380,6 @@ build_path = /obj/item/shield/riot/tele category = list("Weapons") departmental_flags = DEPARTMENTAL_FLAG_SECURITY - dangerous_construction = TRUE /datum/design/suppressor name = "Suppressor" @@ -429,4 +390,3 @@ build_path = /obj/item/suppressor category = list("Weapons") departmental_flags = DEPARTMENTAL_FLAG_SECURITY - dangerous_construction = TRUE From a4323b2e4ec96a79342b1e019cbd31bff9f993f6 Mon Sep 17 00:00:00 2001 From: Sishen Date: Sun, 1 Dec 2019 05:10:30 -0700 Subject: [PATCH 3/3] Update _production.dm --- code/modules/research/machinery/_production.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/research/machinery/_production.dm b/code/modules/research/machinery/_production.dm index 836b574f86..78f636d948 100644 --- a/code/modules/research/machinery/_production.dm +++ b/code/modules/research/machinery/_production.dm @@ -81,7 +81,6 @@ /obj/machinery/rnd/production/proc/do_print(path, amount, list/matlist, notify_admins, mob/user) if(notify_admins) - investigate_log("[key_name(user)] built [amount] of [path] at [src]([type]).", INVESTIGATE_RESEARCH) message_admins("[ADMIN_LOOKUPFLW(user)] has built [amount] of [path] at a [src]([type]).") for(var/i in 1 to amount) var/obj/O = new path(get_turf(src)) @@ -89,6 +88,7 @@ var/obj/item/I = O I.materials = matlist.Copy() SSblackbox.record_feedback("nested tally", "item_printed", amount, list("[type]", "[path]")) + investigate_log("[key_name(user)] built [amount] of [path] at [src]([type]).", INVESTIGATE_RESEARCH) /obj/machinery/rnd/production/proc/check_mat(datum/design/being_built, M) // now returns how many times the item can be built with the material if (!materials.mat_container) // no connected silo