cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update fuel_compressor.dm

Browse Source
This commit is contained in:
Nadyr
2021-03-10 01:03:10 -05:00
committed by Darlantan
parent 2204cba6d8
commit e6d3089c18
1 changed files with 1 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
code/modules/power/fusion/fuel_assembly/fuel_compressor.dm
View File

@@ -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, "<span class='warning'>It would be pointless to make a fuel rod out of [mat.use_name].</span>")
@@ -83,29 +82,6 @@
else
to_chat(user, "<span class='warning'>A blitz rod is currently in progress! Either add 25 phoron sheets to complete it, or eject the supermatter sheet!</span>")
return
||||||| parent of d0ad1a4c89... Merge pull request #9756 from VOREStation/upstream-merge-7835
if(!mat.is_fusion_fuel)
to_chat(user, "<span class='warning'>It would be pointless to make a fuel rod out of [mat.use_name].</span>")
return
if(M.get_amount() < 25)
to_chat(user, "<span class='warning'>You need at least 25 [mat.sheet_plural_name] to make a fuel rod.</span>")
return
var/obj/item/weapon/fuel_assembly/F = new(get_turf(src), mat.name)
visible_message("<span class='notice'>\The [src] compresses the [mat.use_name] into a new fuel assembly.</span>")
M.use(25)
user.put_in_hands(F)
=======
if(!mat.is_fusion_fuel)
to_chat(user, "<span class='warning'>It would be pointless to make a fuel rod out of [mat.use_name].</span>")
return
if(M.get_amount() < 15)
to_chat(user, "<span class='warning'>You need at least 25 [mat.sheet_plural_name] to make a fuel rod.</span>")
return
var/obj/item/weapon/fuel_assembly/F = new(get_turf(src), mat.name)
visible_message("<span class='notice'>\The [src] compresses the [mat.use_name] into a new fuel assembly.</span>")
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
//CHOMPEdit End