mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-09 16:12:17 +00:00
Merge branch 'release' of https://github.com/VOREStation/VOREStation
# Conflicts: # code/game/area/Away Mission areas.dm # code/game/objects/items/weapons/stunbaton.dm # code/game/objects/items/weapons/teleportation.dm # code/modules/clothing/glasses/glasses.dm # code/modules/events/event_container_vr.dm # code/modules/mining/ore_box.dm # code/modules/paperwork/paper.dm # code/modules/rogueminer_vr/zone_console.dm # config/custom_items.txt # icons/mob/items/lefthand_suits.dmi # icons/mob/items/righthand_suits.dmi # icons/mob/species/vulpkanin/helmet.dmi # icons/mob/species/vulpkanin/suit.dmi # icons/mob/suit.dmi # icons/obj/clothing/suits.dmi # maps/tether/tether_defines.dm
This commit is contained in:
@@ -42,16 +42,16 @@
|
||||
/obj/machinery/cooker/examine()
|
||||
..()
|
||||
if(cooking_obj && Adjacent(usr))
|
||||
usr << "You can see \a [cooking_obj] inside."
|
||||
to_chat(usr, "You can see \a [cooking_obj] inside.")
|
||||
|
||||
/obj/machinery/cooker/attackby(var/obj/item/I, var/mob/user)
|
||||
|
||||
if(!cook_type || (stat & (NOPOWER|BROKEN)))
|
||||
user << "<span class='warning'>\The [src] is not working.</span>"
|
||||
to_chat(user, "<span class='warning'>\The [src] is not working.</span>")
|
||||
return
|
||||
|
||||
if(cooking)
|
||||
user << "<span class='warning'>\The [src] is running!</span>"
|
||||
to_chat(user, "<span class='warning'>\The [src] is running!</span>")
|
||||
return
|
||||
|
||||
if(default_unfasten_wrench(user, I, 20))
|
||||
@@ -62,11 +62,11 @@
|
||||
if(istype(G))
|
||||
|
||||
if(!can_cook_mobs)
|
||||
user << "<span class='warning'>That's not going to fit.</span>"
|
||||
to_chat(user, "<span class='warning'>That's not going to fit.</span>")
|
||||
return
|
||||
|
||||
if(!isliving(G.affecting))
|
||||
user << "<span class='warning'>You can't cook that.</span>"
|
||||
to_chat(user, "<span class='warning'>You can't cook that.</span>")
|
||||
return
|
||||
|
||||
cook_mob(G.affecting, user)
|
||||
@@ -75,33 +75,33 @@
|
||||
// We're trying to cook something else. Check if it's valid.
|
||||
var/obj/item/weapon/reagent_containers/food/snacks/check = I
|
||||
if(istype(check) && islist(check.cooked) && (cook_type in check.cooked))
|
||||
user << "<span class='warning'>\The [check] has already been [cook_type].</span>"
|
||||
to_chat(user, "<span class='warning'>\The [check] has already been [cook_type].</span>")
|
||||
return 0
|
||||
else if(istype(check, /obj/item/weapon/reagent_containers/glass))
|
||||
user << "<span class='warning'>That would probably break [src].</span>"
|
||||
to_chat(user, "<span class='warning'>That would probably break [src].</span>")
|
||||
return 0
|
||||
else if(istype(check, /obj/item/weapon/disk/nuclear))
|
||||
user << "Central Command would kill you if you [cook_type] that."
|
||||
to_chat(user, "Central Command would kill you if you [cook_type] that.")
|
||||
return 0
|
||||
else if(!istype(check) && !istype(check, /obj/item/weapon/holder) && !istype(check, /obj/item/organ)) //Gripper check has to go here, else it still just cuts it off. ~Mechoid
|
||||
// Is it a borg using a gripper?
|
||||
if(istype(check, /obj/item/weapon/gripper)) // Grippers. ~Mechoid.
|
||||
var/obj/item/weapon/gripper/B = check //B, for Borg.
|
||||
if(!B.wrapped)
|
||||
user << "\The [B] is not holding anything."
|
||||
to_chat(user, "\The [B] is not holding anything.")
|
||||
return 0
|
||||
else
|
||||
var/B_held = B.wrapped
|
||||
user << "You use \the [B] to put \the [B_held] into \the [src]."
|
||||
to_chat(user, "You use \the [B] to put \the [B_held] into \the [src].")
|
||||
return 0
|
||||
else
|
||||
user << "<span class='warning'>That's not edible.</span>"
|
||||
to_chat(user, "<span class='warning'>That's not edible.</span>")
|
||||
return 0
|
||||
|
||||
if(istype(I, /obj/item/organ))
|
||||
var/obj/item/organ/O = I
|
||||
if(O.robotic)
|
||||
user << "<span class='warning'>That would probably break [src].</span>"
|
||||
to_chat(user, "<span class='warning'>That would probably break [src].</span>")
|
||||
return
|
||||
|
||||
// Gotta hurt.
|
||||
@@ -203,7 +203,7 @@
|
||||
/obj/machinery/cooker/attack_hand(var/mob/user)
|
||||
|
||||
if(cooking_obj && user.Adjacent(src)) //Fixes borgs being able to teleport food in these machines to themselves.
|
||||
user << "<span class='notice'>You grab \the [cooking_obj] from \the [src].</span>"
|
||||
to_chat(user, "<span class='notice'>You grab \the [cooking_obj] from \the [src].</span>")
|
||||
user.put_in_hands(cooking_obj)
|
||||
set_cooking(FALSE)
|
||||
cooking_obj = null
|
||||
@@ -213,7 +213,7 @@
|
||||
if(output_options.len)
|
||||
|
||||
if(cooking)
|
||||
user << "<span class='warning'>\The [src] is in use!</span>"
|
||||
to_chat(user, "<span class='warning'>\The [src] is in use!</span>")
|
||||
return
|
||||
|
||||
var/choice = input("What specific food do you wish to make with \the [src]?") as null|anything in output_options+"Default"
|
||||
@@ -221,10 +221,10 @@
|
||||
return
|
||||
if(choice == "Default")
|
||||
selected_option = null
|
||||
user << "<span class='notice'>You decide not to make anything specific with \the [src].</span>"
|
||||
to_chat(user, "<span class='notice'>You decide not to make anything specific with \the [src].</span>")
|
||||
else
|
||||
selected_option = choice
|
||||
user << "<span class='notice'>You prepare \the [src] to make \a [selected_option].</span>"
|
||||
to_chat(user, "<span class='notice'>You prepare \the [src] to make \a [selected_option].</span>")
|
||||
|
||||
..()
|
||||
|
||||
|
||||
@@ -42,7 +42,7 @@
|
||||
return
|
||||
|
||||
if(!victim || !victim.Adjacent(user))
|
||||
user << "<span class='danger'>Your victim slipped free!</span>"
|
||||
to_chat(user, "<span class='danger'>Your victim slipped free!</span>")
|
||||
cooking = 0
|
||||
icon_state = off_icon
|
||||
fry_loop.stop()
|
||||
@@ -71,10 +71,10 @@
|
||||
victim.apply_damage(rand(30,40), BURN, user.zone_sel.selecting)
|
||||
|
||||
if(!nopain)
|
||||
victim << "<span class='danger'>Agony consumes you as searing hot oil scorches your [E ? E.name : "flesh"] horribly!</span>"
|
||||
to_chat(victim, "<span class='danger'>Agony consumes you as searing hot oil scorches your [E ? E.name : "flesh"] horribly!</span>")
|
||||
victim.emote("scream")
|
||||
else
|
||||
victim << "<span class='danger'>Searing hot oil scorches your [E ? E.name : "flesh"]!</span>"
|
||||
to_chat(victim, "<span class='danger'>Searing hot oil scorches your [E ? E.name : "flesh"]!</span>")
|
||||
|
||||
if(victim.client)
|
||||
add_attack_logs(user,victim,"[cook_type] in [src]")
|
||||
|
||||
Reference in New Issue
Block a user