mirror of
https://github.com/KabKebab/GS13.git
synced 2026-07-11 07:59:08 +01:00
added a fattening tile
related to the new WG mineral, this tile wil fatten up anyone who steps on it (other changes: had to comment out some stuff that I won't work on for now, it was producing errors)
This commit is contained in:
@@ -385,7 +385,7 @@
|
||||
name = "Calorit"
|
||||
id = MAT_CALORIT
|
||||
sheet_type = /obj/item/stack/sheet/mineral/calorit
|
||||
coin_type = /obj/item/coin/calorit
|
||||
// coin_type = /obj/item/coin/calorit
|
||||
|
||||
/datum/material/titanium
|
||||
name = "Titanium"
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
var/item_recycle_sound = 'sound/items/welder.ogg'
|
||||
|
||||
/obj/machinery/recycler/Initialize()
|
||||
AddComponent(/datum/component/material_container, list(MAT_METAL, MAT_GLASS, MAT_PLASMA, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_URANIUM, MAT_BANANIUM, MAT_CALORIT MAT_TITANIUM, MAT_BLUESPACE, MAT_PLASTIC), INFINITY, FALSE, null, null, null, TRUE)
|
||||
AddComponent(/datum/component/material_container, list(MAT_METAL, MAT_GLASS, MAT_PLASMA, MAT_SILVER, MAT_GOLD, MAT_DIAMOND, MAT_URANIUM, MAT_BANANIUM, MAT_CALORIT, MAT_TITANIUM, MAT_BLUESPACE, MAT_PLASTIC), INFINITY, FALSE, null, null, null, TRUE)
|
||||
AddComponent(/datum/component/butchering, 1, amount_produced,amount_produced/5)
|
||||
. = ..()
|
||||
update_icon()
|
||||
|
||||
@@ -296,7 +296,7 @@ GLOBAL_LIST_INIT(bananium_recipes, list ( \
|
||||
|
||||
GLOBAL_LIST_INIT(calorit_recipes, list ( \
|
||||
new/datum/stack_recipe("calorit tile", /obj/item/stack/tile/mineral/calorit, 1, 4, 20), \
|
||||
// new/datum/stack_recipe("Fatty Statue", /obj/structure/statue/calorit/fatty, 5, one_per_turf = 1, on_floor = 1), \
|
||||
// new/datum/stack_recipe("Fatty Statue", /obj/structure/statue/calorit/fatty, 5, one_per_turf = 1, on_floor = 1),
|
||||
))
|
||||
|
||||
/obj/item/stack/sheet/mineral/calorit/Initialize(mapload, new_amount, merge = TRUE)
|
||||
|
||||
@@ -216,14 +216,14 @@
|
||||
mineral = "bananium"
|
||||
glass_type = /obj/machinery/door/airlock/bananium/glass
|
||||
|
||||
/obj/structure/door_assembly/door_assembly_calorit //GS13
|
||||
name = "calorit airlock assembly"
|
||||
desc = "Very inviting."
|
||||
icon = 'icons/obj/doors/airlocks/station/calorit.dmi'
|
||||
base_name = "calorit airlock"
|
||||
airlock_type = /obj/machinery/door/airlock/calorit
|
||||
mineral = "calorit"
|
||||
glass_type = /obj/machinery/door/airlock/calorit/glass
|
||||
// /obj/structure/door_assembly/door_assembly_calorit //GS13
|
||||
// name = "calorit airlock assembly"
|
||||
// desc = "Very inviting."
|
||||
// icon = 'icons/obj/doors/airlocks/station/calorit.dmi'
|
||||
// base_name = "calorit airlock"
|
||||
// airlock_type = /obj/machinery/door/airlock/calorit
|
||||
// mineral = "calorit"
|
||||
// glass_type = /obj/machinery/door/airlock/calorit/glass
|
||||
|
||||
/obj/structure/door_assembly/door_assembly_sandstone
|
||||
name = "sandstone airlock assembly"
|
||||
|
||||
@@ -263,14 +263,14 @@
|
||||
walltype = /turf/closed/wall/mineral/bananium
|
||||
canSmoothWith = list(/obj/structure/falsewall/bananium, /turf/closed/wall/mineral/bananium)
|
||||
|
||||
/obj/structure/falsewall/calorit //GS13
|
||||
name = "calorit wall"
|
||||
desc = "A wall with calorit plating. Burp."
|
||||
icon = 'icons/turf/walls/calorit_wall.dmi'
|
||||
icon_state = "calorit"
|
||||
mineral = /obj/item/stack/sheet/mineral/calorit
|
||||
walltype = /turf/closed/wall/mineral/calorit
|
||||
canSmoothWith = list(/obj/structure/falsewall/calorit, /turf/closed/wall/mineral/calorit)
|
||||
// /obj/structure/falsewall/calorit //GS13
|
||||
// name = "calorit wall"
|
||||
// desc = "A wall with calorit plating. Burp."
|
||||
// icon = 'icons/turf/walls/calorit_wall.dmi'
|
||||
// icon_state = "calorit"
|
||||
// mineral = /obj/item/stack/sheet/mineral/calorit
|
||||
// walltype = /turf/closed/wall/mineral/calorit
|
||||
// canSmoothWith = list(/obj/structure/falsewall/calorit, /turf/closed/wall/mineral/calorit)
|
||||
|
||||
|
||||
/obj/structure/falsewall/sandstone
|
||||
|
||||
@@ -215,38 +215,9 @@
|
||||
var/last_event = 0
|
||||
var/active = null
|
||||
|
||||
/turf/open/floor/mineral/calorit/Entered(var/mob/AM)
|
||||
.=..()
|
||||
if(!.)
|
||||
if(istype(AM))
|
||||
fatten()
|
||||
|
||||
/turf/open/floor/mineral/calorit/attackby(obj/item/W, mob/user, params)
|
||||
.=..()
|
||||
if(!.)
|
||||
fatten()
|
||||
|
||||
/turf/open/floor/mineral/calorit/attack_hand(mob/user)
|
||||
.=..()
|
||||
if(!.)
|
||||
fatten()
|
||||
|
||||
/turf/open/floor/mineral/calorit/attack_paw(mob/user)
|
||||
.=..()
|
||||
if(!.)
|
||||
fatten()
|
||||
|
||||
/turf/open/floor/mineral/calorit/proc/fatten()
|
||||
if(!active)
|
||||
if(world.time > last_event+15)
|
||||
active = 1
|
||||
radiation_pulse(src, 10)
|
||||
for(var/turf/open/floor/mineral/calorit/T in orange(1,src))
|
||||
T.radiate()
|
||||
last_event = world.time
|
||||
active = 0
|
||||
return
|
||||
|
||||
/turf/open/floor/mineral/calorit/Entered(mob/living/carbon/M)
|
||||
M.fatness = M.fatness + 50
|
||||
return ..()
|
||||
|
||||
//DIAMOND
|
||||
|
||||
|
||||
@@ -355,12 +355,12 @@
|
||||
spread = 0
|
||||
scan_state = "rock_Bananium"
|
||||
|
||||
/turf/closed/mineral/calorit //GS13
|
||||
mineralType = /obj/item/stack/ore/calorit
|
||||
mineralAmt = 3
|
||||
spreadChance = 1
|
||||
spread = 0
|
||||
scan_state = "rock_Calorit"
|
||||
// /turf/closed/mineral/calorit //GS13
|
||||
// mineralType = /obj/item/stack/ore/calorit
|
||||
// mineralAmt = 3
|
||||
// spreadChance = 1
|
||||
// spread = 0
|
||||
// scan_state = "rock_Calorit"
|
||||
|
||||
/turf/closed/mineral/bscrystal
|
||||
mineralType = /obj/item/stack/ore/bluespace_crystal
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 340 KiB After Width: | Height: | Size: 336 KiB |
Reference in New Issue
Block a user