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

Reverting changes to shotgun ammo names in the autolathe.

Browse Source 
No point calling it 12G when there's no 20G anymore.
This commit is contained in:
KathrinBailey
2020-05-22 11:11:00 +01:00
parent 497f35f0cc
commit 207e9fccd4
4 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/components/crafting/guncrafting.dm
+2 -8
View File
@@ -6,19 +6,13 @@
icon = 'icons/obj/improvised.dmi'
icon_state = "riflestock"
/obj/item/weaponcrafting/silkstring
name = "silkstring"
desc = "A long piece of silk with some resemblance to cable coil."
icon = 'icons/obj/improvised.dmi'
icon_state = "silkstring"
////////////////////////////////
// KAT IMPROVISED WEAPON PARTS//
////////////////////////////////
/obj/item/weaponcrafting/improvised_parts
name = "Nuclear Syndicate Hyper Giga-Operative Undercover 5th-Dimensional Super-Tank"
desc = "An undercover hypno sissification operative attempting to make Nanotrasen homosexual. Report this to Central immediately. Something is off here."
name = "Eerie bunch of coloured dots."
desc = "You feel the urge to report to Central that the parent type of guncrafting, which should never appear in this reality, has appeared. Whatever that means."
icon = 'icons/obj/guns/gun_parts.dmi'
icon_state = "palette"
code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm
+1 -1
View File
@@ -449,7 +449,7 @@
/datum/crafting_recipe/trigger_assembly
name = "Trigger Assembly"
result = /obj/item/weaponcrafting/improvised_parts/trigger_assembly
reqs = list(/obj/item/stack/sheet/metal = 5,
reqs = list(/obj/item/stack/sheet/metal = 3,
/obj/item/assembly/igniter = 1)
tools = list(TOOL_SCREWDRIVER, TOOL_WELDER)
time = 150
code/modules/research/designs/autolathe_desings/autolathe_designs_sec_and_hacked.dm
+4 -5
View File
@@ -16,7 +16,6 @@
/datum/design/rubbershot
name = "Rubber Shot"
name = "12g Rubber Shot"
id = "rubber_shot"
build_type = AUTOLATHE
materials = list(/datum/material/iron = 4000)
@@ -85,14 +84,14 @@
/datum/design/shotgun_slug
name = "Shotgun Slug"
id = "12g shotgun_slug"
id = "shotgun_slug"
build_type = AUTOLATHE | NO_PUBLIC_LATHE
materials = list(/datum/material/iron = 4000)
build_path = /obj/item/ammo_casing/shotgun
category = list("hacked", "Security")
/datum/design/buckshot_shell
name = "12g Buckshot Shell"
name = "Buckshot Shell"
id = "buckshot_shell"
build_type = AUTOLATHE | NO_PUBLIC_LATHE
materials = list(/datum/material/iron = 4000)
@@ -100,7 +99,7 @@
category = list("hacked", "Security")
/datum/design/shotgun_dart
name = "12g Shotgun Dart"
name = "Shotgun Dart"
id = "shotgun_dart"
build_type = AUTOLATHE | NO_PUBLIC_LATHE
materials = list(/datum/material/iron = 4000)
@@ -108,7 +107,7 @@
category = list("hacked", "Security")
/datum/design/incendiary_slug
name = "12g Incendiary Slug"
name = "Incendiary Slug"
id = "incendiary_slug"
build_type = AUTOLATHE | NO_PUBLIC_LATHE
materials = list(/datum/material/iron = 4000)
code/modules/research/designs/autolathe_desings/autolathe_designs_tcomms_and_misc.dm
+1 -1
View File
@@ -277,7 +277,7 @@
name = "Trigger Assembly"
id = "trigger_assembly"
build_type = AUTOLATHE
materials = list(/datum/material/iron = 10500, /datum/material/glass = 50)
materials = list(/datum/material/iron = 6500, /datum/material/glass = 50)
build_path = /obj/item/weaponcrafting/improvised_parts/trigger_assembly
category = list("initial", "Misc")