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

Merge branch 'master' of https://github.com/tgstation/tgstation into upstream-sync

Browse Source
This commit is contained in:
xPokee
2025-09-24 10:13:01 -04:00
parent ae8d35f963 5fdb6d3618
commit b308ee9d78
313 changed files with 6548 additions and 4624 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/research/designs/autolathe/security_designs.dm
+1 -1
View File
@@ -27,7 +27,7 @@
id = "c38"
build_type = AUTOLATHE
materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*3)
build_path = /obj/item/ammo_box/c38
build_path = /obj/item/ammo_box/speedloader/c38
category = list(
RND_CATEGORY_INITIAL,
RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO,
code/modules/research/designs/weapon_designs.dm
+6 -6
View File
@@ -21,7 +21,7 @@
/datum/material/silver = HALF_SHEET_MATERIAL_AMOUNT * 1.5,
/datum/material/gold = HALF_SHEET_MATERIAL_AMOUNT,
)
build_path = /obj/item/ammo_box/c38/trac
build_path = /obj/item/ammo_box/speedloader/c38/trac
category = list(
RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO
)
@@ -36,7 +36,7 @@
/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT * 3,
/datum/material/plasma = HALF_SHEET_MATERIAL_AMOUNT * 1.5,
)
build_path = /obj/item/ammo_box/c38/hotshot
build_path = /obj/item/ammo_box/speedloader/c38/hotshot
category = list(
RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO
)
@@ -51,7 +51,7 @@
/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT * 3,
/datum/material/plasma = HALF_SHEET_MATERIAL_AMOUNT * 1.5,
)
build_path = /obj/item/ammo_box/c38/iceblox
build_path = /obj/item/ammo_box/speedloader/c38/iceblox
category = list(
RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO
)
@@ -63,7 +63,7 @@
id = "c38_rubber"
build_type = PROTOLATHE | AWAY_LATHE
materials = list(/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT * 3)
build_path = /obj/item/ammo_box/c38/match/bouncy
build_path = /obj/item/ammo_box/speedloader/c38/match/bouncy
category = list(
RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO
)
@@ -78,7 +78,7 @@
/datum/material/iron = HALF_SHEET_MATERIAL_AMOUNT * 3,
/datum/material/bluespace = HALF_SHEET_MATERIAL_AMOUNT * 1.5,
)
build_path = /obj/item/ammo_box/c38/true
build_path = /obj/item/ammo_box/speedloader/c38/true
category = list(
RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO
)
@@ -94,7 +94,7 @@
/datum/material/uranium = HALF_SHEET_MATERIAL_AMOUNT,
/datum/material/gold = HALF_SHEET_MATERIAL_AMOUNT,
)
build_path = /obj/item/ammo_box/c38/flare
build_path = /obj/item/ammo_box/speedloader/c38/flare
category = list(
RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO
)
code/modules/research/server.dm
+5 -5
View File
@@ -146,13 +146,13 @@
if(HDD_PANEL_CLOSED)
. += "The front panel is closed. You can see some recesses which may have <b>screws</b>."
if(HDD_PANEL_OPEN)
. += "The front panel is dangling open. The hdd is in a secure housing. Looks like you'll have to <b>pry</b> it loose."
. += "The front panel is dangling open. The HDD is in a secure housing. Looks like you'll have to <b>pry</b> it loose."
if(HDD_PRIED)
. += "The front panel is dangling open. The hdd has been pried from its housing. It is still connected by <b>wires</b>."
. += "The front panel is dangling open. The HDD has been pried from its housing. It is still connected by <b>wires</b>."
if(HDD_CUT_LOOSE)
. += "The front panel is dangling open. All you can see inside are cut wires and mangled metal."
if(HDD_OVERLOADED)
. += "The front panel is dangling open. The hdd inside is destroyed and the wires are all burned."
. += "The front panel is dangling open. The HDD inside is destroyed and the wires are all burned."
/obj/machinery/rnd/server/master/tool_act(mob/living/user, obj/item/tool, list/modifiers)
if(!tool.tool_behaviour)
@@ -175,10 +175,10 @@
balloon_alert(user, "you weren't trained to install this!")
return TRUE
if(HDD_PRIED)
balloon_alert(user, "the hdd housing is completely broken, it won't fit!")
balloon_alert(user, "the HDD housing is completely broken, it won't fit!")
return TRUE
if(HDD_CUT_LOOSE)
balloon_alert(user, "the hdd housing is completely broken and all the wires are cut!")
balloon_alert(user, "the HDD housing is completely broken and all the wires are cut!")
return TRUE
if(HDD_OVERLOADED)
balloon_alert(user, "the inside is scorched and all the wires are burned!")