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

Update fuel_compressor.dm

Browse Source
This commit is contained in:
Nadyr
2021-05-09 00:13:51 -04:00
committed by GitHub
parent ca996648dd
commit 0bff1cd7e9
1 changed files with 2 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,12 +52,11 @@
if(istype(thing, /obj/item/stack/material)) if(istype(thing, /obj/item/stack/material))
var/obj/item/stack/material/M = thing var/obj/item/stack/material/M = thing
var/datum/material/mat = M.get_material() var/datum/material/mat = M.get_material()
<<<<<<< HEAD
if(!blitzprogress) if(!blitzprogress)
if(!mat.is_fusion_fuel) 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>") to_chat(user, "<span class='warning'>It would be pointless to make a fuel rod out of [mat.use_name].</span>")
return return
if(M.get_amount() < 25) if(M.get_amount() < FUSION_ROD_SHEET_AMT)
if(mat.name=="supermatter") if(mat.name=="supermatter")
visible_message("<span class='notice'>\The [user] places the [mat.use_name] into the compressor.</span>") visible_message("<span class='notice'>\The [user] places the [mat.use_name] into the compressor.</span>")
M.use(1) M.use(1)
@@ -68,7 +67,7 @@
return return
var/obj/item/weapon/fuel_assembly/F = new(get_turf(src), mat.name) 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("<span class='notice'>\The [src] compresses the [mat.use_name] into a new fuel assembly.</span>")
M.use(25) M.use(FUSION_ROD_SHEET_AMT)
user.put_in_hands(F) user.put_in_hands(F)
else else
if(mat.name=="phoron") if(mat.name=="phoron")
@@ -84,34 +83,10 @@
else 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>") 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 return
||||||| parent of 828f6a31bb... Merge pull request #10179 from VOREStation/upstream-merge-8013
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)
=======
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)
>>>>>>> 828f6a31bb... Merge pull request #10179 from VOREStation/upstream-merge-8013
else if(do_special_fuel_compression(thing, user)) else if(do_special_fuel_compression(thing, user))
return return
<<<<<<< HEAD
return ..() return ..()
/obj/machinery/fusion_fuel_compressor/verb/eject_sheet() /obj/machinery/fusion_fuel_compressor/verb/eject_sheet()
@@ -124,10 +99,5 @@
verbs -= /obj/machinery/fusion_fuel_compressor/verb/eject_sheet verbs -= /obj/machinery/fusion_fuel_compressor/verb/eject_sheet
blitzprogress = 0 blitzprogress = 0
//CHOMPEdit End //CHOMPEdit End
||||||| parent of 828f6a31bb... Merge pull request #10179 from VOREStation/upstream-merge-8013
return ..()
=======
return ..()
#undef FUSION_ROD_SHEET_AMT #undef FUSION_ROD_SHEET_AMT
>>>>>>> 828f6a31bb... Merge pull request #10179 from VOREStation/upstream-merge-8013