cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-30 00:35:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2021-07-05 18:28:35 -04:00
committed by GitHub
parent ef70de4342
commit f2fe7aa004
1 changed files with 1 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/fusion/fuel_assembly/fuel_compressor.dm
+1 -25
View File
@@ -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, "<span class='warning'>It would be pointless to make a fuel rod out of [mat.use_name].</span>")
@@ -67,7 +66,7 @@
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>")
visible_message("<b>\The [src]</b> 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, "<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 e4b8407fdb... Merge pull request #10908 from MarinaGryphon/spannening
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() < FUSION_ROD_SHEET_AMT)
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(FUSION_ROD_SHEET_AMT)
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() < FUSION_ROD_SHEET_AMT)
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("<b>\The [src]</b> 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