cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 20:16:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove from map, remove from code and DME (#18764)

Browse Source
This commit is contained in:
Sinestia
2022-08-12 00:33:07 +01:00
committed by GitHub
parent ff67c07d37
commit d79242e38e
3 changed files with 1 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/RandomRuins/SpaceRuins/abandonedzoo.dmm
+1 -1
View File
@@ -679,7 +679,7 @@
/area/ruin/space/unpowered)
"bA" = (
/obj/structure/table/reinforced,
/obj/machinery/juicer,
/obj/machinery/reagentgrinder,
/turf/simulated/floor/plasteel{
icon_state = "dark"
},
code/modules/food_and_drinks/kitchen_machinery/juicer.dm
-187
View File
@@ -1,187 +0,0 @@
/obj/machinery/juicer
name = "Juicer"
icon = 'icons/obj/kitchen.dmi'
icon_state = "juicer1"
layer = 2.9
density = TRUE
anchored = FALSE
use_power = IDLE_POWER_USE
idle_power_usage = 5
active_power_usage = 100
pass_flags = PASSTABLE
var/obj/item/reagent_containers/beaker = null
var/global/list/allowed_items = list (
/obj/item/reagent_containers/food/snacks/grown/tomato = "tomatojuice",
/obj/item/reagent_containers/food/snacks/grown/carrot = "carrotjuice",
/obj/item/reagent_containers/food/snacks/grown/grapes = "grapejuice",
/obj/item/reagent_containers/food/snacks/grown/grapes/green = "grapejuice",
/obj/item/reagent_containers/food/snacks/grown/banana = "banana",
/obj/item/reagent_containers/food/snacks/grown/potato = "potato",
/obj/item/reagent_containers/food/snacks/grown/citrus/lemon = "lemonjuice",
/obj/item/reagent_containers/food/snacks/grown/citrus/orange = "orangejuice",
/obj/item/reagent_containers/food/snacks/grown/citrus/lime = "limejuice",
/obj/item/reagent_containers/food/snacks/grown/watermelon = "watermelonjuice",
/obj/item/reagent_containers/food/snacks/watermelonslice = "watermelonjuice",
/obj/item/reagent_containers/food/snacks/grown/berries/poison = "poisonberryjuice",
/obj/item/reagent_containers/food/snacks/grown/berries = "berryjuice",
/obj/item/reagent_containers/food/snacks/grown/pumpkin = "pumpkinjuice",
/obj/item/reagent_containers/food/snacks/grown/blumpkin = "blumpkinjuice",
/obj/item/reagent_containers/food/snacks/grown/pineapple = "pineapplejuice"
)
/obj/machinery/juicer/Initialize(mapload)
. = ..()
beaker = new /obj/item/reagent_containers/glass/beaker/large(src)
/obj/machinery/juicer/update_icon_state()
if(beaker)
icon_state = "juicer1"
else
icon_state = "juicer0"
/obj/machinery/juicer/attackby(obj/item/O, mob/user, params)
if(istype(O,/obj/item/reagent_containers/glass) || \
istype(O,/obj/item/reagent_containers/food/drinks/drinkingglass))
if(beaker)
return TRUE
else
if(!user.unEquip(O))
to_chat(user, "<span class='notice'>\the [O] is stuck to your hand, you cannot put it in \the [src]</span>")
return
O.forceMove(src)
beaker = O
verbs += /obj/machinery/juicer/verb/detach
update_icon(UPDATE_ICON_STATE)
updateUsrDialog()
return
if(!is_type_in_list(O, allowed_items))
to_chat(user, "It doesn't look like that contains any juice.")
return TRUE
if(!user.unEquip(O))
to_chat(user, "<span class='notice'>\the [O] is stuck to your hand, you cannot put it in \the [src]</span>")
return
O.forceMove(src)
updateUsrDialog()
return
/obj/machinery/juicer/attack_ai(mob/user)
return
/obj/machinery/juicer/attack_hand(mob/user)
user.set_machine(src)
interact(user)
/obj/machinery/juicer/interact(mob/user) // The microwave Menu
var/is_chamber_empty = FALSE
var/is_beaker_ready = FALSE
var/processing_chamber = ""
var/beaker_contents = ""
for(var/i in allowed_items)
for(var/obj/item/O in contents)
if(!istype(O,i))
continue
processing_chamber+= "some <B>[O]</B><BR>"
break
if(!processing_chamber)
is_chamber_empty = TRUE
processing_chamber = "Nothing."
if(!beaker)
beaker_contents = "\The [src] has no beaker attached."
else if(!beaker.reagents.total_volume)
beaker_contents = "\The [src] has attached an empty beaker."
is_beaker_ready = TRUE
else if(beaker.reagents.total_volume < beaker.reagents.maximum_volume)
beaker_contents = "\The [src] has attached a beaker with something."
is_beaker_ready = TRUE
else
beaker_contents = "\The [src] has attached a beaker and beaker is full!"
var/dat = {"
<b>Processing chamber contains:</b><br>
[processing_chamber]<br>
[beaker_contents]<hr>
"}
if(is_beaker_ready && !is_chamber_empty && !(stat & (NOPOWER|BROKEN)))
dat += "<A href='?src=[UID()];action=juice'>Turn on!<BR>"
if(beaker)
dat += "<A href='?src=[UID()];action=detach'>Detach a beaker!<BR>"
var/datum/browser/popup = new(user, "juicer", name, 400, 400)
popup.set_content(dat)
popup.open(0)
onclose(user, "juicer")
return
/obj/machinery/juicer/Topic(href, href_list)
if(..())
return
usr.set_machine(src)
switch(href_list["action"])
if("juice")
juice()
if("detach")
detach()
updateUsrDialog()
return
/obj/machinery/juicer/verb/detach()
set category = "Object"
set name = "Detach Beaker from the juicer"
set src in oview(1)
if(usr.stat != 0)
return
if(!beaker)
return
verbs -= /obj/machinery/juicer/verb/detach
beaker.forceMove(loc)
beaker = null
update_icon(UPDATE_ICON_STATE)
/obj/machinery/juicer/proc/get_juice_id(obj/item/reagent_containers/food/snacks/grown/O)
for (var/i in allowed_items)
if (istype(O, i))
return allowed_items[i]
/obj/machinery/juicer/proc/get_juice_amount(obj/item/reagent_containers/food/snacks/grown/O)
if(!istype(O) || !O.seed)
return 5
else if (O.seed.potency == -1)
return 5
else
return round(5*sqrt(O.seed.potency))
/obj/machinery/juicer/proc/juice()
power_change() //it is a portable machine
if(stat & (NOPOWER|BROKEN))
return
if(!beaker || beaker.reagents.total_volume >= beaker.reagents.maximum_volume)
return
playsound(loc, 'sound/machines/juicer.ogg', 50, 1)
for(var/obj/item/reagent_containers/food/snacks/O in contents)
var/r_id = get_juice_id(O)
beaker.reagents.add_reagent(r_id,get_juice_amount(O))
qdel(O)
if(beaker.reagents.total_volume >= beaker.reagents.maximum_volume)
break
/obj/structure/closet/crate/juice/populate_contents()
new/obj/machinery/juicer(src)
new/obj/item/reagent_containers/food/snacks/grown/tomato(src)
new/obj/item/reagent_containers/food/snacks/grown/carrot(src)
new/obj/item/reagent_containers/food/snacks/grown/berries(src)
new/obj/item/reagent_containers/food/snacks/grown/banana(src)
new/obj/item/reagent_containers/food/snacks/grown/grapes(src)
new/obj/item/reagent_containers/food/snacks/grown/tomato(src)
new/obj/item/reagent_containers/food/snacks/grown/carrot(src)
new/obj/item/reagent_containers/food/snacks/grown/berries(src)
new/obj/item/reagent_containers/food/snacks/grown/banana(src)
new/obj/item/reagent_containers/food/snacks/grown/grapes(src)
new/obj/item/reagent_containers/food/snacks/grown/tomato(src)
new/obj/item/reagent_containers/food/snacks/grown/carrot(src)
new/obj/item/reagent_containers/food/snacks/grown/berries(src)
new/obj/item/reagent_containers/food/snacks/grown/banana(src)
new/obj/item/reagent_containers/food/snacks/grown/grapes(src)
new/obj/item/reagent_containers/food/snacks/grown/pineapple(src)
paradise.dme
-1
View File
@@ -1649,7 +1649,6 @@
#include "code\modules\food_and_drinks\kitchen_machinery\gibber.dm"
#include "code\modules\food_and_drinks\kitchen_machinery\grill_new.dm"
#include "code\modules\food_and_drinks\kitchen_machinery\icecream_vat.dm"
#include "code\modules\food_and_drinks\kitchen_machinery\juicer.dm"
#include "code\modules\food_and_drinks\kitchen_machinery\kitchen_machine.dm"
#include "code\modules\food_and_drinks\kitchen_machinery\microwave.dm"
#include "code\modules\food_and_drinks\kitchen_machinery\monkeyrecycler.dm"