From f2fe7aa0049c84e890d22c047ac2fc0887a50807 Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Mon, 5 Jul 2021 18:28:35 -0400
Subject: [PATCH] powder that makes you say yes
---
.../fusion/fuel_assembly/fuel_compressor.dm | 26 +------------------
1 file changed, 1 insertion(+), 25 deletions(-)
diff --git a/code/modules/power/fusion/fuel_assembly/fuel_compressor.dm b/code/modules/power/fusion/fuel_assembly/fuel_compressor.dm
index cde88d74b8..fd691c65cb 100644
--- a/code/modules/power/fusion/fuel_assembly/fuel_compressor.dm
+++ b/code/modules/power/fusion/fuel_assembly/fuel_compressor.dm
@@ -52,7 +52,6 @@
if(istype(thing, /obj/item/stack/material))
var/obj/item/stack/material/M = thing
var/datum/material/mat = M.get_material()
-<<<<<<< HEAD
if(!blitzprogress)
if(!mat.is_fusion_fuel)
to_chat(user, "It would be pointless to make a fuel rod out of [mat.use_name].")
@@ -67,7 +66,7 @@
to_chat(user, "You need at least 25 [mat.sheet_plural_name] to make a fuel rod.")
return
var/obj/item/weapon/fuel_assembly/F = new(get_turf(src), mat.name)
- visible_message("\The [src] compresses the [mat.use_name] into a new fuel assembly.")
+ visible_message("\The [src] compresses \the [thing] into a new fuel assembly.")
M.use(FUSION_ROD_SHEET_AMT)
user.put_in_hands(F)
else
@@ -84,29 +83,6 @@
else
to_chat(user, "A blitz rod is currently in progress! Either add 25 phoron sheets to complete it, or eject the supermatter sheet!")
return
-||||||| parent of e4b8407fdb... Merge pull request #10908 from MarinaGryphon/spannening
- if(!mat.is_fusion_fuel)
- to_chat(user, "It would be pointless to make a fuel rod out of [mat.use_name].")
- return
- if(M.get_amount() < FUSION_ROD_SHEET_AMT)
- to_chat(user, "You need at least 25 [mat.sheet_plural_name] to make a fuel rod.")
- return
- var/obj/item/weapon/fuel_assembly/F = new(get_turf(src), mat.name)
- visible_message("\The [src] compresses the [mat.use_name] into a new fuel assembly.")
- M.use(FUSION_ROD_SHEET_AMT)
- user.put_in_hands(F)
-=======
- if(!mat.is_fusion_fuel)
- to_chat(user, "It would be pointless to make a fuel rod out of [mat.use_name].")
- return
- if(M.get_amount() < FUSION_ROD_SHEET_AMT)
- to_chat(user, "You need at least 25 [mat.sheet_plural_name] to make a fuel rod.")
- return
- var/obj/item/weapon/fuel_assembly/F = new(get_turf(src), mat.name)
- visible_message("\The [src] compresses the [mat.use_name] into a new fuel assembly.")
- M.use(FUSION_ROD_SHEET_AMT)
- user.put_in_hands(F)
->>>>>>> e4b8407fdb... Merge pull request #10908 from MarinaGryphon/spannening
else if(do_special_fuel_compression(thing, user))
return