From e6d3089c1897bcc7b3e47ba42f79ba6bb76555a9 Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Wed, 10 Mar 2021 01:03:10 -0500
Subject: [PATCH] Update fuel_compressor.dm
---
.../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 d4b37f3492..a8c4d0445a 100644
--- a/code/modules/power/fusion/fuel_assembly/fuel_compressor.dm
+++ b/code/modules/power/fusion/fuel_assembly/fuel_compressor.dm
@@ -51,7 +51,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].")
@@ -83,29 +82,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 d0ad1a4c89... Merge pull request #9756 from VOREStation/upstream-merge-7835
- 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() < 25)
- 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(25)
- 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() < 15)
- 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(15)
- user.put_in_hands(F)
->>>>>>> d0ad1a4c89... Merge pull request #9756 from VOREStation/upstream-merge-7835
else if(do_special_fuel_compression(thing, user))
return
@@ -121,4 +97,4 @@
usr.put_in_hands(S)
verbs -= /obj/machinery/fusion_fuel_compressor/verb/eject_sheet
blitzprogress = 0
-//CHOMPEdit End
\ No newline at end of file
+//CHOMPEdit End