mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-22 11:37:40 +01:00
Revert #3316 from BEF due to compile errors and (assumed) missing files.
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
This commit is contained in:
@@ -103,9 +103,6 @@ var/global/list/datum/stack_recipe/uranium_recipes = list ( \
|
||||
origin_tech = "plasmatech=2;materials=2"
|
||||
perunit = 2000
|
||||
sheettype = "plasma"
|
||||
fire_min_burn_temp = 500
|
||||
fire_burn_multiplier = 3 //made of burnium
|
||||
fire_fuel_worth = 0
|
||||
|
||||
var/global/list/datum/stack_recipe/plasma_recipes = list ( \
|
||||
new/datum/stack_recipe("plasma door", /obj/structure/mineral_door/transparent/plasma, 10, one_per_turf = 1, on_floor = 1), \
|
||||
@@ -117,18 +114,6 @@ var/global/list/datum/stack_recipe/plasma_recipes = list ( \
|
||||
pixel_y = rand(0,4)-4
|
||||
..()
|
||||
|
||||
/obj/item/stack/sheet/mineral/plasma/fire_burn()
|
||||
//get location and check if it is in a proper ZAS zone
|
||||
var/turf/simulated/floor/S = loc
|
||||
if(S.zone)
|
||||
var/datum/gas_mixture/air_contents = S.return_air()
|
||||
if(air_contents)
|
||||
air_contents.toxins += 20
|
||||
air_contents.update_values()
|
||||
amount -= 1
|
||||
if(amount <= 0)
|
||||
del src
|
||||
|
||||
/obj/item/stack/sheet/mineral/plastic
|
||||
name = "Plastic"
|
||||
icon_state = "sheet-plastic"
|
||||
@@ -139,6 +124,7 @@ var/global/list/datum/stack_recipe/plasma_recipes = list ( \
|
||||
throw_range = 3
|
||||
origin_tech = "materials=3"
|
||||
perunit = 2000
|
||||
sheettype = "plastic"
|
||||
|
||||
var/global/list/datum/stack_recipe/plastic_recipes = list ( \
|
||||
new/datum/stack_recipe("plastic crate", /obj/structure/closet/pcrate, 10, one_per_turf = 1, on_floor = 1), \
|
||||
@@ -268,4 +254,4 @@ var/global/list/datum/stack_recipe/silver_recipes = list ( \
|
||||
throw_speed = 3
|
||||
throw_range = 3
|
||||
origin_tech = "materials=4"
|
||||
perunit = 2000
|
||||
perunit = 2000
|
||||
|
||||
@@ -20,10 +20,6 @@
|
||||
var/construction_cost = list("metal"=750,"glass"=75)
|
||||
var/construction_time=100
|
||||
|
||||
fire_min_burn_temp = 1000
|
||||
fire_burn_multiplier = 0.75
|
||||
fire_fuel_worth = 0
|
||||
|
||||
suicide_act(mob/user)
|
||||
viewers(user) << "\red <b>[user] is licking the electrodes of the [src.name]! It looks like \he's trying to commit suicide.</b>"
|
||||
return (FIRELOSS)
|
||||
@@ -118,7 +114,9 @@
|
||||
g_amt = 0
|
||||
|
||||
/obj/item/weapon/cell/fire_burn()
|
||||
viewers(src) << "\red <b>Charge: [src.charge]</b>"
|
||||
var/radius = round( (sqrt(charge)/30)+0.5, 1 )
|
||||
viewers(src) << "\red <b>Radius: [radius]</b>"
|
||||
if (radius >= 1)
|
||||
explosion(src.loc,0,0,radius)
|
||||
..()
|
||||
..()
|
||||
|
||||
@@ -16,11 +16,6 @@
|
||||
var/integrity = 3
|
||||
var/volume = 70
|
||||
|
||||
m_amt = 3750
|
||||
fire_min_burn_temp = 800
|
||||
fire_burn_multiplier = 0.75
|
||||
fire_fuel_worth = 0
|
||||
|
||||
/obj/item/weapon/tank/New()
|
||||
..()
|
||||
|
||||
@@ -266,11 +261,4 @@
|
||||
integrity--
|
||||
|
||||
else if(integrity < 3)
|
||||
integrity++
|
||||
|
||||
/obj/item/weapon/tank/fire_burn()
|
||||
//get location and check if it is in a proper ZAS zone
|
||||
var/turf/simulated/floor/S = loc
|
||||
if(S.zone)
|
||||
S.assume_air(air_contents)
|
||||
..()
|
||||
integrity++
|
||||
Reference in New Issue
Block a user