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

[MIRROR] Oops, I refactored Chemistry!

Browse Source
This commit is contained in:
Chompstation Bot
2021-04-24 02:25:47 +00:00
committed by Darlantan
parent 1f33d5696f
commit ca996648dd
62 changed files with 9109 additions and 3845 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,3 +1,4 @@
#define FUSION_ROD_SHEET_AMT 15
/obj/machinery/fusion_fuel_compressor
var/blitzprogress = 0 //CHOMPEdit
name = "fuel compressor"
@@ -51,6 +52,7 @@
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>")
@@ -82,10 +84,34 @@
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 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))
return
<<<<<<< HEAD
return ..()
/obj/machinery/fusion_fuel_compressor/verb/eject_sheet()
@@ -98,3 +124,10 @@
verbs -= /obj/machinery/fusion_fuel_compressor/verb/eject_sheet
blitzprogress = 0
//CHOMPEdit End
||||||| parent of 828f6a31bb... Merge pull request #10179 from VOREStation/upstream-merge-8013
return ..()
=======
return ..()
#undef FUSION_ROD_SHEET_AMT
>>>>>>> 828f6a31bb... Merge pull request #10179 from VOREStation/upstream-merge-8013

18
code/modules/power/fusion/fusion_reagents.dm
View File

@@ -1,18 +0,0 @@
//Additional fusion reagents. These likely don't have any other use aside from the RUST, but if you want to make stuff with 'em, be my guest.
/datum/reagent/helium3
name = "helium-3"
description = "A colorless, odorless, tasteless and generally inert gas used in fusion reactors. Non-radioactive."
id = "helium-3"
reagent_state = GAS
color = "#808080"
/obj/structure/reagent_dispensers/he3
name = "fueltank"
desc = "A fueltank."
icon = 'icons/obj/objects.dmi'
icon_state = "weldtank"
amount_per_transfer_from_this = 10
New()
..()
reagents.add_reagent("helium-3",1000)