cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 12:43:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge conflict

Browse Source
This commit is contained in:
Raeschen
2023-06-23 20:55:47 +02:00
committed by GitHub
parent 9a2457d5aa
commit 8a87af209a
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/power/port_gen_vr.dm
View File

@@ -411,9 +411,6 @@
name = "c-type rotary electric generator" name = "c-type rotary electric generator"
circuit = /obj/item/weapon/circuitboard/machine/reg_c circuit = /obj/item/weapon/circuitboard/machine/reg_c
default_power_gen = 500000 //Half power default_power_gen = 500000 //Half power
<<<<<<< HEAD
nutrition_drain = 0.5 //for half cost - EQUIVALENT EXCHANGE >:O
=======
nutrition_drain = 0.5 //for half cost - EQUIVALENT EXCHANGE >:O nutrition_drain = 0.5 //for half cost - EQUIVALENT EXCHANGE >:O
@@ -501,4 +498,3 @@
add_overlay("alteviangen-fuel-66") add_overlay("alteviangen-fuel-66")
else if(sheets > 0) else if(sheets > 0)
add_overlay("alteviangen-fuel-33") add_overlay("alteviangen-fuel-33")
>>>>>>> b01d197e4e... Merge pull request #15070 from Heroman3003/altevian-props