Subject Status:
"
var/scanner_status
var/temp_html
- if(connected)
+ if(connected && connected.is_operational())
if(connected.occupant) //set occupant_status message
viable_occupant = connected.occupant
if(check_dna_integrity(viable_occupant) && (!(NOCLONE in viable_occupant.mutations) || (connected.scan_level == 3))) //occupent is viable for dna modification
diff --git a/code/game/gamemodes/nuclear/pinpointer.dm b/code/game/gamemodes/nuclear/pinpointer.dm
index 0b07f069680..16d32663163 100644
--- a/code/game/gamemodes/nuclear/pinpointer.dm
+++ b/code/game/gamemodes/nuclear/pinpointer.dm
@@ -77,7 +77,7 @@
point_at(location)
if(mode == 2)
point_at(target)
- usr << "You activate the pinpointer.,/span>"
+ usr << "You activate the pinpointer."
else
active = 0
icon_state = "pinoff"
@@ -89,6 +89,9 @@
set name = "Toggle Pinpointer Mode"
set src in view(1)
+ if(usr.stat || usr.restrained() || !usr.canmove)
+ return
+
active = 0
icon_state = "pinoff"
target=null
diff --git a/code/game/gamemodes/objective_items.dm b/code/game/gamemodes/objective_items.dm
index b0e35a07051..0390064db5c 100644
--- a/code/game/gamemodes/objective_items.dm
+++ b/code/game/gamemodes/objective_items.dm
@@ -33,6 +33,12 @@ datum/objective_item/steal/jetpack
targetitem = /obj/item/weapon/tank/jetpack
difficulty = 3
+datum/objective_item/steal/defib
+ name = "a defibrillator"
+ targetitem = /obj/item/weapon/defibrillator
+ difficulty = 4
+ excludefromjob = list("Chief Medical Officer", "Medical Doctor")
+
datum/objective_item/steal/magboots
name = "the chief engineer's advanced magnetic boots"
targetitem = /obj/item/clothing/shoes/magboots/advance
diff --git a/code/game/machinery/PDApainter.dm b/code/game/machinery/PDApainter.dm
index f59ff9c6f1e..5bc8aeaa702 100644
--- a/code/game/machinery/PDApainter.dm
+++ b/code/game/machinery/PDApainter.dm
@@ -80,6 +80,9 @@
set category = "Object"
set src in oview(1)
+ if(usr.stat || usr.restrained() || !usr.canmove)
+ return
+
if(storedpda)
storedpda.loc = get_turf(src.loc)
storedpda = null
diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm
index c3f36fd31d5..f046c5a538f 100644
--- a/code/game/machinery/Sleeper.dm
+++ b/code/game/machinery/Sleeper.dm
@@ -11,8 +11,9 @@
icon_state = "sleeper-open"
density = 0
anchored = 1
- var/efficiency
+ interact_offline = 1
state_open = 1
+ var/efficiency
var/initial_bin_rating = 1
var/min_health = 25
var/list/injection_chems = list() //list of injectable chems except inaprovaline, coz inaprovaline is always avalible
@@ -133,11 +134,17 @@
open_machine()
/obj/machinery/sleeper/attack_hand(mob/user)
- if(stat & (BROKEN|NOPOWER))
+ if(..())
+ return
+
+ //powerless interaction
+ if(!is_operational())
+ user.unset_machine()//essential to prevent infinite loops of opening/closing the machine
if(state_open)
close_machine()
else
open_machine()
+
else
sleeperUI(user)
@@ -234,6 +241,8 @@
..(target)
/obj/machinery/sleeper/proc/inject_chem(mob/user, chem)
+ if(!is_operational())
+ return
if(occupant && occupant.reagents)
if(chem in injection_chems + "inaprovaline")
if(occupant.reagents.get_reagent_amount(chem) + 10 <= 20 * efficiency)
diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm
index 401410e2040..9345d395957 100644
--- a/code/game/machinery/autolathe.dm
+++ b/code/game/machinery/autolathe.dm
@@ -247,13 +247,13 @@ var/global/list/autolathe_recipes_hidden = list( \
if(istype(template, /obj/item/stack))
src.m_amount -= template.m_amt*multiplier
src.g_amount -= template.g_amt*multiplier
- var/obj/new_item = new template.type(T)
+ var/obj/item/new_item = new template.type(T)
var/obj/item/stack/S = new_item
S.amount = multiplier
else
src.m_amount -= template.m_amt/coeff
src.g_amount -= template.g_amt/coeff
- var/obj/new_item = new template.type(T)
+ var/obj/item/new_item = new template.type(T)
new_item.m_amt /= coeff
new_item.g_amt /= coeff
if(src.m_amount < 0)
@@ -287,7 +287,7 @@ var/global/list/autolathe_recipes_hidden = list( \
objs += src.L
if(src.hacked)
objs += src.LL
- for(var/obj/t in objs)
+ for(var/obj/item/t in objs)
if(disabled || m_amount[t] ", "The ", "")
else
diff --git a/code/game/machinery/bots/bots.dm b/code/game/machinery/bots/bots.dm
index 5251edb79fe..693363a8577 100644
--- a/code/game/machinery/bots/bots.dm
+++ b/code/game/machinery/bots/bots.dm
@@ -84,7 +84,6 @@
"Waiting for clear path","Calculating navigation path","Pinging beacon network","Unable to reach destination")
//This holds text for what the bot is mode doing, reported on the AI's bot control interface.
-
/obj/machinery/bot/proc/turn_on()
if(stat) return 0
on = 1
@@ -98,11 +97,13 @@
/obj/machinery/bot/New()
..()
+ aibots += src //Global bot list
botcard = new /obj/item/weapon/card/id(src)
set_custom_texts()
Radio = new /obj/item/device/radio(src)
Radio.listening = 0 //Makes bot radios transmit only so no one hears things while adjacent to one.
+
/obj/machinery/bot/proc/add_to_beacons(bot_filter) //Master filter control for bots. Must be placed in the bot's local New() to support map spawned bots.
if(radio_controller)
radio_controller.add_object(src, beacon_freq, filter = RADIO_NAVBEACONS)
@@ -110,6 +111,7 @@
radio_controller.add_object(src, control_freq, filter = bot_filter)
/obj/machinery/bot/proc/explode()
+ aibots -= src
qdel(src)
/obj/machinery/bot/proc/healthcheck()
@@ -212,7 +214,7 @@
else
return 0
-/obj/machinery/bot/process() //Master process which handles code common across most bots.
+/obj/machinery/bot/proc/bot_process() //Master process which handles code common across most bots.
set background = BACKGROUND_ENABLED
@@ -236,34 +238,36 @@
user << "Maintenance panel is now [open ? "opened" : "closed"]."
else
user << "Maintenance panel is locked."
- else if(istype(W, /obj/item/weapon/weldingtool) && user.a_intent != "harm")
- if(health < maxhealth)
- if(open)
- var/obj/item/weapon/weldingtool/WT = W
- if(!WT.isOn())
- user << "The welder must be on for this task."
- health = min(maxhealth, health+10)
- user.visible_message("[user] repairs [src]!","You repair [src]!")
- else
- user << "Unable to repair with the maintenance panel closed."
- else
- user << "[src] does not need a repair."
else if (istype(W, /obj/item/weapon/card/emag) && emagged < 2)
Emag(user)
else
user.changeNext_move(CLICK_CD_MELEE)
- if(W.force) //if force is non-zero
- var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
- s.set_up(5, 1, src)
- switch(W.damtype)
- if("fire")
- health -= W.force * fire_dam_coeff
- s.start()
- if("brute")
- health -= W.force * brute_dam_coeff
- s.start()
- ..()
- healthcheck()
+ if(istype(W, /obj/item/weapon/weldingtool) && user.a_intent != "harm")
+ if(health >= maxhealth)
+ user << "[src] does not need a repair."
+ return
+ if(!open)
+ user << "Unable to repair with the maintenance panel closed."
+ return
+ var/obj/item/weapon/weldingtool/WT = W
+ if(WT.remove_fuel(0, user))
+ health = min(maxhealth, health+10)
+ user.visible_message("[user] repairs [src]!","You repair [src]!")
+ else
+ user << "The welder must be on for this task."
+ else
+ if(W.force) //if force is non-zero
+ var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
+ s.set_up(5, 1, src)
+ switch(W.damtype)
+ if("fire")
+ health -= W.force * fire_dam_coeff
+ s.start()
+ if("brute")
+ health -= W.force * brute_dam_coeff
+ s.start()
+ ..()
+ healthcheck()
/obj/machinery/bot/bullet_act(var/obj/item/projectile/Proj)
diff --git a/code/game/machinery/bots/cleanbot.dm b/code/game/machinery/bots/cleanbot.dm
index 8a3b033d149..0508cfedb88 100644
--- a/code/game/machinery/bots/cleanbot.dm
+++ b/code/game/machinery/bots/cleanbot.dm
@@ -141,7 +141,7 @@ text("[on ? "On" : "Off"]"))
if(istype(D, T))
return D
-/obj/machinery/bot/cleanbot/process()
+/obj/machinery/bot/cleanbot/bot_process()
if (!..())
return
diff --git a/code/game/machinery/bots/ed209bot.dm b/code/game/machinery/bots/ed209bot.dm
index fd42c38f7b1..489075161f6 100644
--- a/code/game/machinery/bots/ed209bot.dm
+++ b/code/game/machinery/bots/ed209bot.dm
@@ -206,7 +206,7 @@ Auto Patrol[]"},
icon_state = "[lasercolor]ed209[on]"
set_weapon()
-/obj/machinery/bot/ed209/process()
+/obj/machinery/bot/ed209/bot_process()
if (!..())
return
@@ -351,14 +351,14 @@ Auto Patrol[]"},
last_found = world.time
frustration = 0
spawn(0)
- process() //ensure bot quickly responds
+ bot_process() //ensure bot quickly responds
/obj/machinery/bot/ed209/proc/back_to_hunt()
anchored = 0
frustration = 0
mode = BOT_HUNT
spawn(0)
- process() //ensure bot quickly responds
+ bot_process() //ensure bot quickly responds
// look for a criminal in view of the bot
@@ -387,7 +387,7 @@ Auto Patrol[]"},
visible_message("[src] points at [C.name]!")
mode = BOT_HUNT
spawn(0)
- process() // ensure bot quickly responds to a perp
+ bot_process() // ensure bot quickly responds to a perp
break
else
continue
diff --git a/code/game/machinery/bots/floorbot.dm b/code/game/machinery/bots/floorbot.dm
index 889bd774238..ae644a52f42 100644
--- a/code/game/machinery/bots/floorbot.dm
+++ b/code/game/machinery/bots/floorbot.dm
@@ -117,6 +117,7 @@
dat += "Make pieces of metal into tiles when empty: [maketiles ? "Yes" : "No"]
" dat += "Transmit notice when empty: [nag_on_empty ? "Yes" : "No"]
" dat += "Repair damaged tiles and platings: [fixfloors ? "Yes" : "No"]
" + dat += "Traction Magnets: [anchored ? "Engaged" : "Disengaged"]
" dat += "Patrol Station: [auto_patrol ? "Yes" : "No"]
" var/bmode if (targetdirection) @@ -181,6 +182,8 @@ autotile = !autotile if("emptynag") nag_on_empty = !nag_on_empty + if("anchor") + anchored = !anchored if("bridgemode") var/setdir = input("Select construction direction:") as null|anything in list("north","east","south","west","disable") @@ -197,7 +200,7 @@ targetdirection = null updateUsrDialog() -/obj/machinery/bot/floorbot/process() +/obj/machinery/bot/floorbot/bot_process() if (!..()) return @@ -230,30 +233,23 @@ else //Find a space tile farther way! target = scan(/turf/space, oldtarget) - anchored = 1 process_type = BRIDGE_MODE - return if(!target) process_type = HULL_BREACH //Ensures the floorbot does not try to "fix" space areas or shuttle docking zones. target = scan(/turf/space, oldtarget) - anchored = 1 //Prevent the floorbot being blown off-course while trying to reach a hull breach. - return if(!target && replacetiles) //Finds a floor without a tile and gives it one. process_type = REPLACE_TILE //The target must be the floor and not a tile. The floor must not already have a floortile. - //target = scan(/turf/simulated/floor, oldtarget) - return + target = scan(/turf/simulated/floor, oldtarget) if(!target && fixfloors) //Repairs damaged floors and tiles. process_type = FIX_TILE target = scan(/turf/simulated/floor, oldtarget) - return if(!target && emagged == 2) //We are emagged! Time to rip up the floors! process_type = TILE_EMAG target = scan(/turf/simulated/floor, oldtarget) - return if(!target) @@ -336,9 +332,11 @@ obj/machinery/bot/floorbot/process_scan(var/scan_target) if(HULL_BREACH) //The most common job, patching breaches in the station's hull. if(is_hull_breach(scan_target)) //Ensure that the targeted space turf is actually part of the station, and not random space. result = scan_target + anchored = 1 //Prevent the floorbot being blown off-course while trying to reach a hull breach. if(BRIDGE_MODE) //Only space turfs in our chosen direction are considered. if(get_dir(src, scan_target) == targetdirection) result = scan_target + anchored = 1 if(REPLACE_TILE) F = scan_target if(istype(F, /turf/simulated/floor/plating)) //The floor must not already have a tile. diff --git a/code/game/machinery/bots/medbot.dm b/code/game/machinery/bots/medbot.dm index 7fe74099a1a..ff55f572225 100644 --- a/code/game/machinery/bots/medbot.dm +++ b/code/game/machinery/bots/medbot.dm @@ -273,7 +273,7 @@ else return -/obj/machinery/bot/medbot/process() +/obj/machinery/bot/medbot/bot_process() if (!..()) return diff --git a/code/game/machinery/bots/mulebot.dm b/code/game/machinery/bots/mulebot.dm index e796be551c6..0c151a22ab0 100644 --- a/code/game/machinery/bots/mulebot.dm +++ b/code/game/machinery/bots/mulebot.dm @@ -78,9 +78,6 @@ var/global/mulebot_count = 0 name = "\improper Mulebot ([suffix])" - verbs -= /atom/movable/verb/pull - - // attack by item // emag : lock/unlock, @@ -496,7 +493,7 @@ var/global/mulebot_count = 0 pathset = 1 //Indicates the AI's custom path is initialized. start() -/obj/machinery/bot/mulebot/process() +/obj/machinery/bot/mulebot/bot_process() if(!has_power()) on = 0 return diff --git a/code/game/machinery/bots/secbot.dm b/code/game/machinery/bots/secbot.dm index 25c76ba6872..25b6073a389 100644 --- a/code/game/machinery/bots/secbot.dm +++ b/code/game/machinery/bots/secbot.dm @@ -189,7 +189,7 @@ Auto Patrol: []"}, declare_arrests = 0 icon_state = "secbot[on]" -/obj/machinery/bot/secbot/process() +/obj/machinery/bot/secbot/bot_process() if (!..()) return @@ -314,14 +314,14 @@ Auto Patrol: []"}, last_found = world.time frustration = 0 spawn(0) - process() //ensure bot quickly responds + bot_process() //ensure bot quickly responds /obj/machinery/bot/secbot/proc/back_to_hunt() anchored = 0 frustration = 0 mode = BOT_HUNT spawn(0) - process() //ensure bot quickly responds + bot_process() //ensure bot quickly responds // look for a criminal in view of the bot /obj/machinery/bot/secbot/proc/look_for_perp() @@ -346,7 +346,7 @@ Auto Patrol: []"}, visible_message("[src] points at [C.name]!") mode = BOT_HUNT spawn(0) - process() // ensure bot quickly responds to a perp + bot_process() // ensure bot quickly responds to a perp break else continue diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index f9c26d959bd..34564627552 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -112,7 +112,7 @@ /obj/machinery/clonepod/attack_paw(mob/user as mob) return attack_hand(user) /obj/machinery/clonepod/attack_hand(mob/user as mob) - if ((isnull(src.occupant)) || (stat & NOPOWER)) + if (isnull(src.occupant) || !is_operational()) return if ((!isnull(src.occupant)) && (src.occupant.stat != 2)) var/completion = (100 * ((src.occupant.health + 100) / (src.heal_level + 100))) @@ -205,7 +205,7 @@ //Grow clones to maturity then kick them out. FREELOADERS /obj/machinery/clonepod/process() - if(stat & NOPOWER) //Autoeject if power is lost + if(!is_operational()) //Autoeject if power is lost if (src.occupant) src.locked = 0 src.go_out() @@ -302,7 +302,7 @@ if(!usr) return - if (usr.stat != 0) + if(usr.stat || !usr.canmove || usr.restrained()) return src.go_out() add_fingerprint(usr) diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index 6b5ad607a94..e7d1b3e7c67 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -23,8 +23,11 @@ /obj/item/toy/prize/mauler = 1, /obj/item/toy/prize/odysseus = 1, /obj/item/toy/prize/phazon = 1, + /obj/item/toy/prize/reticence = 1, /obj/item/toy/cards/deck = 2, - /obj/item/toy/nuke = 2 + /obj/item/toy/nuke = 2, + /obj/item/toy/minimeteor = 2, + /obj/item/toy/carpplushie = 2 ) /obj/machinery/computer/arcade/New() diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index 6fbba86fd4d..5d49b12a1e5 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -54,12 +54,12 @@ // Try to find a scanner in that direction scannerf = locate(/obj/machinery/dna_scannernew, get_step(src, dir)) - // If found, then we break, and return the scanner - if (!isnull(scannerf)) - break + // If found and operational, return the scanner + if (!isnull(scannerf) && scannerf.is_operational()) + return scannerf // If no scanner was found, it will return null - return scannerf + return null /obj/machinery/computer/cloning/proc/findcloner() var/obj/machinery/clonepod/podf = null @@ -68,10 +68,10 @@ podf = locate(/obj/machinery/clonepod, get_step(src, dir)) - if (!isnull(podf)) - break + if (!isnull(podf) && podf.is_operational()) + return podf - return podf + return null /obj/machinery/computer/cloning/attackby(obj/item/W as obj, mob/user as mob) if (istype(W, /obj/item/weapon/disk/data)) //INSERT SOME DISKETTES @@ -233,25 +233,25 @@ if("stopautoprocess") autoprocess = 0 - else if ((href_list["scan"]) && (!isnull(src.scanner))) + else if ((href_list["scan"]) && !isnull(scanner) && scanner.is_operational()) scantemp = "" loading = 1 src.updateUsrDialog() spawn(20) - src.scan_mob(src.scanner.occupant) + src.scan_mob(scanner.occupant) loading = 0 src.updateUsrDialog() //No locking an open scanner. - else if ((href_list["lock"]) && (!isnull(src.scanner))) - if ((!src.scanner.locked) && (src.scanner.occupant)) - src.scanner.locked = 1 + else if ((href_list["lock"]) && !isnull(scanner) && scanner.is_operational()) + if ((!scanner.locked) && (scanner.occupant)) + scanner.locked = 1 else - src.scanner.locked = 0 + scanner.locked = 0 else if(href_list["view_rec"]) src.active_record = find_record("id", href_list["view_rec"], records) diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm index ab3182f0219..bface7aae31 100644 --- a/code/game/machinery/computer/medical.dm +++ b/code/game/machinery/computer/medical.dm @@ -268,6 +268,7 @@ src.temp = text("Are you sure you wish to delete all records?
\n\tYes
\n\tNo
", src, src) else if (href_list["del_all2"]) + investigate_log("[usr.name] ([usr.key]) has deleted all medical records.", "records") data_core.medical.Cut() src.temp = "All records deleted." @@ -415,6 +416,7 @@ src.temp = text("Are you sure you wish to delete the record (Medical Portion Only)?
\n\tYes
\n\tNo
", src, src) else if (href_list["del_r2"]) + investigate_log("[usr.name] ([usr.key]) has deleted the medical records for [active1.fields["name"]].", "records") if(active2) data_core.medical -= active2 active2 = null diff --git a/code/game/machinery/computer/message.dm b/code/game/machinery/computer/message.dm index 04226b689d2..0790775530f 100644 --- a/code/game/machinery/computer/message.dm +++ b/code/game/machinery/computer/message.dm @@ -114,8 +114,10 @@ else dat += " [++i]. View Message Logs
"
dat += " [++i]. View Request Console Logs "
+ dat += " [++i]. View Chatroom Logs "
dat += " [++i]. Clear Message Logs
"
dat += " [++i]. Clear Request Console Logs
"
+ dat += " [++i]. Clear Chatroom Logs
"
dat += " [++i]. Set Custom Key
"
dat += " [++i]. Send Admin Message
"
else
@@ -236,6 +238,24 @@
[rc.rec_dpt] [rc.message] [rc.stamp] [rc.id_auth] [rc.priority] "}
dat += ""
+ //Chatroom Logs
+ if(5)
+
+ var/index = 0
+ //var/sender = "Anon"
+ //var/channel = "ss13"
+ //var/message = "Blank"
+ dat += "Back - Refresh
" + dat += "
"
+
message = defaultmsg
//user << browse(dat, "window=message;size=700x700")
//onclose(user, "message")
@@ -321,6 +341,14 @@
if(auth)
src.linkedServer.rc_msgs = list()
message = "NOTICE: Logs cleared."
+ //Clears the chatroom logs - KEY REQUIRED
+ if (href_list["clearc"])
+ if(!linkedServer || (src.linkedServer.stat & (NOPOWER|BROKEN)))
+ message = noserver
+ else
+ if(auth)
+ src.linkedServer.chat_msgs = list()
+ message = "NOTICE: Logs cleared."
//Change the password - KEY REQUIRED
if (href_list["pass"])
if(!linkedServer || (src.linkedServer.stat & (NOPOWER|BROKEN)))
@@ -464,6 +492,13 @@
else
if(auth)
src.screen = 4
+ //Chatroom Logs - KEY REQUIRED
+ if(href_list["viewc"])
+ if(src.linkedServer == null || (src.linkedServer.stat & (NOPOWER|BROKEN)))
+ message = noserver
+ else
+ if(auth)
+ src.screen = 5
//usr << href_list["select"]
diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm
index ad296e20065..3372945212b 100644
--- a/code/game/machinery/computer/security.dm
+++ b/code/game/machinery/computer/security.dm
@@ -122,7 +122,7 @@
for(var/datum/data/record/R in sortRecord(data_core.general, sortBy, order))
var/crimstat = ""
for(var/datum/data/record/E in data_core.security)
- if ((E.fields["name"] == R.fields["name"] && E.fields["id"] == R.fields["id"]))
+ if ((E.fields["name"] == R.fields["name"]) && (E.fields["id"] == R.fields["id"]))
crimstat = E.fields["criminal"]
var/background
switch(crimstat)
@@ -413,8 +413,10 @@ What a mess.*/
temp += "No"
if ("Purge All Records")
+ investigate_log("[usr.name] ([usr.key]) has purged all the security records.", "records")
for(var/datum/data/record/R in data_core.security)
del(R)
+ data_core.security.Cut()
temp = "All Security records deleted."
if ("Add Entry")
@@ -460,6 +462,7 @@ What a mess.*/
screen = 3
if ("New Record (General)")
+ //General Record
var/datum/data/record/G = new /datum/data/record()
G.fields["name"] = "New Record"
G.fields["id"] = "[num2hex(rand(1, 1.6777215E7), 6)]"
@@ -472,6 +475,7 @@ What a mess.*/
data_core.general += G
active1 = G
+ //Security Record
var/datum/data/record/R = new /datum/data/record()
R.fields["name"] = active1.fields["name"]
R.fields["id"] = active1.fields["id"]
@@ -483,7 +487,7 @@ What a mess.*/
data_core.security += R
active2 = R
- //Medical Record
+ //Medical Record
var/datum/data/record/M = new /datum/data/record()
M.fields["id"] = active1.fields["id"]
M.fields["name"] = active1.fields["name"]
@@ -506,13 +510,17 @@ What a mess.*/
if ("Edit Field")
var/a1 = active1
var/a2 = active2
+
switch(href_list["field"])
if("name")
- if (istype(active1, /datum/data/record))
+ if (istype(active1, /datum/data/record) || istype(active2, /datum/data/record))
var/t1 = input("Please input name:", "Secure. records", active1.fields["name"], null) as text
if ((!( t1 ) || !length(trim(t1)) || !( authenticated ) || usr.stat || usr.restrained() || (!in_range(src, usr) && (!istype(usr, /mob/living/silicon)))) || active1 != a1)
return
- active1.fields["name"] = t1
+ if(istype(active1, /datum/data/record))
+ active1.fields["name"] = t1
+ if(istype(active2, /datum/data/record))
+ active2.fields["name"] = t1
if("id")
if(istype(active2,/datum/data/record) || istype(active1,/datum/data/record))
var/t1 = copytext(sanitize(input("Please input id:", "Secure. records", active1.fields["id"], null) as text),1,MAX_MESSAGE_LEN)
@@ -607,6 +615,7 @@ What a mess.*/
if ("Change Criminal Status")
if (active2)
+ var/old_field = active2.fields["criminal"]
switch(href_list["criminal2"])
if("none")
active2.fields["criminal"] = "None"
@@ -618,19 +627,27 @@ What a mess.*/
active2.fields["criminal"] = "Parolled"
if("released")
active2.fields["criminal"] = "Discharged"
+ investigate_log("[active1.fields["name"]] has been set from [old_field] to [active2.fields["criminal"]] by [usr.name] ([usr.key]).", "records")
if ("Delete Record (Security) Execute")
+ investigate_log("[usr.name] ([usr.key]) has deleted the security records for [active1.fields["name"]].", "records")
if (active2)
+ data_core.security -= active2
del(active2)
if ("Delete Record (ALL) Execute")
if (active1)
+ investigate_log("[usr.name] ([usr.key]) has deleted all records for [active1.fields["name"]].", "records")
for(var/datum/data/record/R in data_core.medical)
if ((R.fields["name"] == active1.fields["name"] || R.fields["id"] == active1.fields["id"]))
+ data_core.medical -= R
del(R)
- else
+ break
+ data_core.general -= active1
del(active1)
+
if (active2)
+ data_core.security -= active2
del(active2)
else
temp = "This function does not appear to be working at the moment. Our apologies."
diff --git a/code/game/machinery/cryo.dm b/code/game/machinery/cryo.dm
index e5acc1ea5af..4ea9ea6993d 100644
--- a/code/game/machinery/cryo.dm
+++ b/code/game/machinery/cryo.dm
@@ -4,6 +4,7 @@
icon_state = "cell-off"
density = 1
anchored = 1.0
+ interact_offline = 1
layer = 4
var/on = 0
@@ -45,7 +46,7 @@
/obj/machinery/atmospherics/unary/cryo_cell/process()
..()
- if(!node)
+ if(!node || !is_operational())
return
if(!on)
updateDialog()
@@ -97,11 +98,17 @@
user << "Seems empty."
/obj/machinery/atmospherics/unary/cryo_cell/attack_hand(mob/user)
- if(stat & (NOPOWER|BROKEN))
- if(state_open == 1)
+ if(..())
+ return
+
+ //powerless interaction
+ if(!is_operational())
+ user.unset_machine()//essential to prevent infinite loops of opening/closing the machine
+ if(state_open)
close_machine()
else
open_machine()
+
else
ui_interact(user)
@@ -258,7 +265,7 @@
if(state_open)
icon_state = "cell-open"
return
- if(on)
+ if(on && is_operational())
if(occupant)
icon_state = "cell-occupied"
else
@@ -266,6 +273,9 @@
else
icon_state = "cell-off"
+/obj/machinery/atmospherics/unary/cryo_cell/power_change()
+ ..()
+ update_icon()
/obj/machinery/atmospherics/unary/cryo_cell/proc/process_occupant()
if(air_contents.total_moles() < 10)
diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index 0a642258374..62c86d3a5ad 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -245,7 +245,7 @@
name = "bananium airlock"
desc = "Honkhonkhonk"
icon = 'icons/obj/doors/Doorbananium.dmi'
- var/mineral = "clown"
+ var/mineral = "bananium"
doortype = /obj/structure/door_assembly/door_assembly_clown
/obj/machinery/door/airlock/sandstone
diff --git a/code/game/machinery/doppler_array.dm b/code/game/machinery/doppler_array.dm
index 910feb64a41..7e3d588f5f5 100644
--- a/code/game/machinery/doppler_array.dm
+++ b/code/game/machinery/doppler_array.dm
@@ -38,7 +38,7 @@ var/list/doppler_arrays = list()
if(!usr || !isturf(usr.loc))
return
- if(usr.stat || usr.restrained())
+ if(usr.stat || usr.restrained() || !usr.canmove)
return
src.dir = turn(src.dir, 90)
return
diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm
index 44be02fadac..3e1b2cc3ca2 100644
--- a/code/game/machinery/machinery.dm
+++ b/code/game/machinery/machinery.dm
@@ -84,6 +84,8 @@ Class Procs:
process() 'game/machinery/machine.dm'
Called by the 'master_controller' once per game tick for each machine that is listed in the 'machines' list.
+ is_operational()
+ Returns 0 if the machine is unpowered, broken or undergoing maintenance, 1 if not
Compiled by Aygar
*/
@@ -209,6 +211,11 @@ Class Procs:
add_fingerprint(usr)
return 0
+/obj/machinery/proc/is_operational()
+ return !(stat & (NOPOWER|BROKEN|MAINT))
+
+////////////////////////////////////////////////////////////////////////////////////////////
+
/mob/proc/canUseTopic() //TODO: once finished, place these procs on the respective mob files
return
@@ -302,7 +309,7 @@ Class Procs:
var/obj/machinery/constructable_frame/machine_frame/M = new /obj/machinery/constructable_frame/machine_frame(src.loc)
M.state = 2
M.icon_state = "box_1"
- for(var/obj/I in component_parts)
+ for(var/obj/item/I in component_parts)
if(I.reliability != 100 && crit_fail)
I.crit_fail = 1
I.loc = src.loc
diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm
index 14d7ba74d1e..0f77735ac02 100644
--- a/code/game/machinery/newscaster.dm
+++ b/code/game/machinery/newscaster.dm
@@ -2,6 +2,11 @@
//################### NEWSCASTERS BE HERE! ####
//###-Agouri###################################
+/datum/feed_comment
+ var/author = ""
+ var/body = ""
+ var/time_stamp = ""
+
/datum/feed_message
var/author =""
var/body =""
@@ -11,6 +16,9 @@
var/is_admin_message = 0
var/icon/img = null
var/time_stamp = ""
+ var/list/datum/feed_comment/comments = list()
+ var/locked = 0
+ var/caption = ""
/datum/feed_channel
var/channel_name=""
@@ -29,6 +37,7 @@
src.backup_body = ""
src.backup_author = ""
src.img = null
+ src.locked = 0
/datum/feed_channel/proc/clear()
src.channel_name = ""
@@ -54,14 +63,16 @@
newChannel.is_admin_channel = adminChannel
network_channels += newChannel
-/datum/feed_network/proc/SubmitArticle(var/msg, var/author, var/channel_name, var/obj/item/weapon/photo/photo, var/adminMessage = 0)
+/datum/feed_network/proc/SubmitArticle(var/msg, var/author, var/channel_name, var/obj/item/weapon/photo/photo, var/adminMessage = 0, var/allow_comments = 1)
var/datum/feed_message/newMsg = new /datum/feed_message
newMsg.author = author
newMsg.body = msg
newMsg.time_stamp = "[worldtime2text()]"
newMsg.is_admin_message = adminMessage
+ newMsg.locked = !allow_comments
if(photo)
newMsg.img = photo.img
+ newMsg.caption = photo.scribble
for(var/datum/feed_channel/FC in network_channels)
if(FC.channel_name == channel_name)
FC.messages += newMsg //Adding message to the network's appropriate feed_channel
@@ -151,6 +162,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co
var/c_locked=0; //Will our new channel be locked to public submissions?
var/hitstaken = 0 //Death at 3 hits from an item with force>=15
var/datum/feed_channel/viewing_channel = null
+ var/allow_comments = 1
luminosity = 0
anchored = 1
@@ -293,6 +305,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co
dat+="Message Author: [src.scanned_user]
" dat+="Message Body: [src.msg]
" dat+="Attach Photo: [(src.photo ? "Photo Attached" : "No Photo")]" + dat+="Comments [allow_comments ? "Enabled" : "Disabled"]
" dat+="
Submit
Cancel
" if(4) dat+="Feed story successfully submitted to [src.channel_name].
" @@ -362,8 +375,18 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co dat+="-[MESSAGE.body]
" if(MESSAGE.img) usr << browse_rsc(MESSAGE.img, "tmp_photo[i].png") - dat+="
" + dat+="
" + if(MESSAGE.caption) + dat+="[MESSAGE.caption]
" + dat+="
" dat+="\[Story by [MESSAGE.author] \] - ([MESSAGE.time_stamp])
" + dat+="[MESSAGE.comments.len] comment[MESSAGE.comments.len > 1 ? "s" : ""]
" + for(var/datum/feed_comment/comment in MESSAGE.comments) + dat+="[comment.body]
[comment.author] [comment.time_stamp]
" + if(MESSAGE.locked) + dat+="Comments locked
" + else + dat+="Comment
" dat+="
Refresh" dat+="
Back" if(10) @@ -400,6 +423,9 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co for(var/datum/feed_message/MESSAGE in src.viewing_channel.messages) dat+="-[MESSAGE.body]
\[Story by [MESSAGE.author]\]
" dat+="[(MESSAGE.body == "\[REDACTED\]") ? ("Undo story censorship") : ("Censor story")] - [(MESSAGE.author == "\[REDACTED\]") ? ("Undo Author Censorship") : ("Censor message Author")]
" + dat+="[MESSAGE.comments.len] comment[MESSAGE.comments.len > 1 ? "s" : ""]: [MESSAGE.locked ? "Unlock" : "Lock"]
" + for(var/datum/feed_comment/comment in MESSAGE.comments) + dat+="[comment.body] X
[comment.author] [comment.time_stamp]
" dat+="
Back" if(13) dat+="[src.viewing_channel.channel_name]: \[ created by: [src.viewing_channel.author] \]
" @@ -550,7 +576,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co if(src.msg =="" || src.msg=="\[REDACTED\]" || src.scanned_user == "Unknown" || src.channel_name == "" ) src.screen=6 else - news_network.SubmitArticle(msg, scanned_user, channel_name, photo) + news_network.SubmitArticle(msg, scanned_user, channel_name, photo, allow_comments) feedback_inc("newscaster_stories",1) src.screen=4 src.updateUsrDialog() @@ -728,6 +754,34 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co src.screen = 12 src.updateUsrDialog() + else if(href_list["new_comment"]) + var/datum/feed_message/FM = locate(href_list["new_comment"]) + var/cominput = copytext(stripped_input(usr, "Write your message:", "New comment", null),1,141) + if(cominput) + var/datum/feed_comment/FC = new/datum/feed_comment + FC.author = scanned_user + FC.body = cominput + FC.time_stamp = worldtime2text() + FM.comments += FC + log_comment("[usr]/([usr.ckey]) as [scanned_user] commented on message [FM.body] -- [FC.body]") + updateUsrDialog() + + else if(href_list["del_comment"]) + var/datum/feed_comment/FC = locate(href_list["del_comment"]) + var/datum/feed_message/FM = locate(href_list["del_comment_msg"]) + FM.comments -= FC + qdel(FC) + updateUsrDialog() + + else if(href_list["lock_comment"]) + var/datum/feed_message/FM = locate(href_list["lock_comment"]) + FM.locked ^= 1 + updateUsrDialog() + + else if(href_list["set_comment"]) + allow_comments ^= 1 + updateUsrDialog() + else if(href_list["refresh"]) src.updateUsrDialog() diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm index 7120b1d1550..6f4a0e8cb25 100644 --- a/code/game/machinery/pipe/construction.dm +++ b/code/game/machinery/pipe/construction.dm @@ -155,7 +155,7 @@ Buildable meters set name = "Rotate Pipe" set src in view(1) - if ( usr.stat || usr.restrained() ) + if ( usr.stat || usr.restrained() || !usr.canmove ) return src.dir = turn(src.dir, -90) @@ -169,7 +169,7 @@ Buildable meters set name = "Flip Pipe" set src in view(1) - if ( usr.stat || usr.restrained() ) + if ( usr.stat || usr.restrained() || !usr.canmove ) return if (pipe_type in list(PIPE_GAS_FILTER, PIPE_GAS_MIXER)) diff --git a/code/game/machinery/telecomms/machine_interactions.dm b/code/game/machinery/telecomms/machine_interactions.dm index f3d1796d3a2..bfb60668ac4 100644 --- a/code/game/machinery/telecomms/machine_interactions.dm +++ b/code/game/machinery/telecomms/machine_interactions.dm @@ -65,7 +65,7 @@ // Drop all the component stuff if(component_parts) - for(var/obj/I in component_parts) + for(var/obj/item/I in component_parts) if(I.reliability != 100 && crit_fail) I.crit_fail = 1 I.loc = src.loc diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index a5342f470df..3427f8a655d 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -648,9 +648,16 @@ product_ads = "Probably not bad for you!;Don't believe the scientists!;It's good for you!;Don't quit, buy more!;Smoke!;Nicotine heaven.;Best cigarettes since 2150.;Award-winning cigs." vend_delay = 34 icon_state = "cigs" - products = list(/obj/item/weapon/storage/fancy/cigarettes = 10,/obj/item/weapon/storage/box/matches = 10,/obj/item/weapon/lighter/random = 4,/obj/item/weapon/storage/fancy/rollingpapers = 5) + products = list(/obj/item/weapon/storage/fancy/cigarettes = 5, + /obj/item/weapon/storage/fancy/cigarettes/cigpack_uplift = 3, + /obj/item/weapon/storage/fancy/cigarettes/cigpack_robust = 2, + /obj/item/weapon/storage/fancy/cigarettes/cigpack_carp = 3, + /obj/item/weapon/storage/fancy/cigarettes/cigpack_midori = 1, + /obj/item/weapon/storage/box/matches = 10, + /obj/item/weapon/lighter/random = 4, + /obj/item/weapon/storage/fancy/rollingpapers = 5) contraband = list(/obj/item/weapon/lighter/zippo = 4) - premium = list(/obj/item/clothing/mask/cigarette/cigar/havana = 2) + premium = list(/obj/item/clothing/mask/cigarette/cigar/havana = 2, /obj/item/weapon/storage/fancy/cigarettes/cigpack_robustgold = 1) refill_canister = /obj/item/weapon/vending_refill/cigarette diff --git a/code/game/machinery/washing_machine.dm b/code/game/machinery/washing_machine.dm index fcd17eea035..1a45add5d88 100644 --- a/code/game/machinery/washing_machine.dm +++ b/code/game/machinery/washing_machine.dm @@ -28,6 +28,9 @@ set category = "Object" set src in oview(1) + if(usr.stat || usr.restrained() || !usr.canmove) + return + if( state != 4 ) usr << "The washing machine cannot run in this state." return diff --git a/code/game/mecha/combat/combat.dm b/code/game/mecha/combat/combat.dm index 65b49cca717..b1e60d07b28 100644 --- a/code/game/mecha/combat/combat.dm +++ b/code/game/mecha/combat/combat.dm @@ -4,7 +4,6 @@ var/melee_can_hit = 1 var/list/destroyable_obj = list(/obj/mecha, /obj/structure/window, /obj/structure/grille, /turf/simulated/wall) internal_damage_threshold = 50 - maint_access = 0 damage_absorption = list("brute"=0.7,"fire"=1,"bullet"=0.7,"laser"=0.85,"energy"=1,"bomb"=0.8) var/am = "d3c2fbcadca903a41161ccc9df9cf948" diff --git a/code/game/mecha/combat/durand.dm b/code/game/mecha/combat/durand.dm index 66a5036a9a7..3a49c11433a 100644 --- a/code/game/mecha/combat/durand.dm +++ b/code/game/mecha/combat/durand.dm @@ -38,7 +38,7 @@ set name = "Toggle defence mode" set src = usr.loc set popup_menu = 0 - if(usr!=src.occupant) + if(!can_use(usr)) return defence = !defence if(defence) diff --git a/code/game/mecha/combat/gygax.dm b/code/game/mecha/combat/gygax.dm index 79ae3333d63..722b576f134 100644 --- a/code/game/mecha/combat/gygax.dm +++ b/code/game/mecha/combat/gygax.dm @@ -56,7 +56,7 @@ set name = "Toggle leg actuators overload" set src = usr.loc set popup_menu = 0 - if(usr!=src.occupant) + if(!can_use(usr)) return if(overload) overload = 0 diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 829f3c94ec1..c9edcc339b0 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -32,7 +32,7 @@ var/list/log = new var/last_message = 0 var/add_req_access = 1 - var/maint_access = 1 + var/maint_access = 0 var/dna //dna-locking the mech var/list/proc_res = list() //stores proc owners, like proc_res["functionname"] = owner reference var/datum/effect/effect/system/spark_spread/spark_system = new @@ -85,7 +85,6 @@ add_cell() add_iterators() removeVerb(/obj/mecha/verb/disconnect_from_port) - removeVerb(/atom/movable/verb/pull) log_message("[src.name] created.") mechas_list += src //global mech list return @@ -201,6 +200,13 @@ return 1 +obj/mecha/proc/can_use(mob/user) + if(user != src.occupant) + return 0 + if(user && ismob(user)) + if(!usr.stat && !usr.restrained() && usr.canmove) + return 1 + return 0 /obj/mecha/examine(mob/user) ..() @@ -523,8 +529,8 @@ src.visible_message("The [A] fastens firmly to [src].") return if(prob(src.deflect_chance) || istype(A, /mob)) - src.occupant_message("The [A] bounces off the armor.") - src.visible_message("The [A] bounces off the [src.name] armor") + src.occupant_message("[A] bounces off the armor.") + src.visible_message("[A] bounces off the [src.name] armor") src.log_append_to_last("Armor saved.") if(istype(A, /mob/living)) var/mob/living/M = A @@ -673,7 +679,7 @@ return if(istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda)) if(add_req_access || maint_access) - if(internals_access_allowed(usr)) + if(internals_access_allowed(user)) var/obj/item/weapon/card/id/id_card if(istype(W, /obj/item/weapon/card/id)) id_card = W @@ -683,9 +689,9 @@ output_maintenance_dialog(id_card, user) return else - user << "Invalid ID: Access denied." + user << "Invalid ID: Access denied." else - user << "Maintenance protocols disabled by operator." + user << "Maintenance protocols disabled by operator." else if(istype(W, /obj/item/weapon/wrench)) if(state==1) state = 2 @@ -741,19 +747,22 @@ return else if(istype(W, /obj/item/weapon/weldingtool) && user.a_intent != "harm") + user.changeNext_move(CLICK_CD_MELEE) var/obj/item/weapon/weldingtool/WT = W - if (WT.remove_fuel(0,user)) - if (hasInternalDamage(MECHA_INT_TANK_BREACH)) - clearInternalDamage(MECHA_INT_TANK_BREACH) - user << "You repair the damaged gas tank." - else - return if(src.healthYou repair some damage to [src.name]."
- src.health += min(10, initial(src.health)-src.health)
+ if (WT.remove_fuel(0,user))
+ if (hasInternalDamage(MECHA_INT_TANK_BREACH))
+ clearInternalDamage(MECHA_INT_TANK_BREACH)
+ user << "You repair the damaged gas tank."
+ else
+ user.visible_message("[user] repairs some damage to [src.name].")
+ src.health += min(10, initial(src.health)-src.health)
+ else
+ user << "The welder must be on for this task."
+ return 1
else
- user << "The [src.name] is at full integrity"
- return
+ user << "The [src.name] is at full integrity."
+ return 1
else if(istype(W, /obj/item/mecha_parts/mecha_tracking))
if(!user.unEquip(W))
@@ -869,8 +878,8 @@
set src = usr.loc
set popup_menu = 0
- if(usr.stat) return
- if(usr != src.occupant) return
+ if(!can_use(usr))
+ return
var/obj/machinery/atmospherics/portables_connector/possible_port = locate(/obj/machinery/atmospherics/portables_connector/) in loc
if(possible_port)
@@ -892,8 +901,8 @@
set src = usr.loc
set popup_menu = 0
- if(usr.stat) return
- if(usr != src.occupant) return
+ if(!can_use(usr))
+ return
if(disconnect())
src.occupant_message("[name] disconnects from the port.")
@@ -908,8 +917,8 @@
set src = usr.loc
set popup_menu = 0
- if(usr.stat) return
- if(usr != occupant) return
+ if(!can_use(usr))
+ return
lights = !lights
if(lights) AddLuminosity(lights_power)
@@ -925,8 +934,8 @@
set src = usr.loc
set popup_menu = 0
- if(usr.stat) return
- if(usr != src.occupant) return
+ if(!can_use(usr))
+ return
use_internal_tank = !use_internal_tank
src.occupant_message("Now taking air from [use_internal_tank?"internal airtank":"environment"].")
@@ -1014,7 +1023,7 @@
//Added a message here since people assume their first click failed or something./N
// user << "Installing MMI, please stand by."
- visible_message("[usr] starts to insert an MMI into [src.name]")
+ visible_message("[user] starts to insert an MMI into [src.name]")
if(enter_after(40,user))
if(!occupant)
@@ -1062,7 +1071,8 @@
set category = "Exosuit Interface"
set src = usr.loc
set popup_menu = 0
- if(usr!=src.occupant)
+
+ if(!can_use(usr))
return
//pr_update_stats.start()
src.occupant << browse(src.get_stats_html(), "window=exosuit")
@@ -1083,7 +1093,8 @@
set src = usr.loc
set popup_menu = 0
- if(usr != src.occupant) return
+ if(!can_use(usr))
+ return
src.go_out()
add_fingerprint(usr)
@@ -1153,39 +1164,15 @@
////// Access stuff /////
/////////////////////////
-/obj/mecha/proc/operation_allowed(mob/living/carbon/human/H)
- for(var/ID in list(H.get_active_hand(), H.wear_id, H.belt))
- if(src.check_access(ID,src.operation_req_access))
- return 1
- return 0
+/obj/mecha/proc/operation_allowed(mob/M)
+ req_access = operation_req_access
+ req_one_access = list()
+ return allowed(M)
-
-/obj/mecha/proc/internals_access_allowed(mob/living/carbon/human/H)
- for(var/atom/ID in list(H.get_active_hand(), H.wear_id, H.belt))
- if(src.check_access(ID,src.internals_req_access))
- return 1
- return 0
-
-
-/obj/mecha/check_access(obj/item/weapon/card/id/I, list/access_list)
- if(!istype(access_list))
- return 1
- if(!access_list.len) //no requirements
- return 1
- if(istype(I, /obj/item/device/pda))
- var/obj/item/device/pda/pda = I
- I = pda.id
- if(!istype(I) || !I.access) //not ID or no access
- return 0
- if(access_list==src.operation_req_access)
- for(var/req in access_list)
- if(!(req in I.access)) //doesn't have this access
- return 0
- else if(access_list==src.internals_req_access)
- for(var/req in access_list)
- if(req in I.access)
- return 1
- return 1
+/obj/mecha/proc/internals_access_allowed(mob/M)
+ req_one_access = internals_req_access
+ req_access = list()
+ return allowed(M)
////////////////////////////////////
@@ -1423,6 +1410,8 @@ var/year_integer = text2num(year) // = 2013???
/obj/mecha/Topic(href, href_list)
..()
+ if(!usr.canUseTopic(src))
+ return
if(href_list["update_content"])
if(usr != src.occupant) return
send_byjax(src.occupant,"exosuit.browser","content",src.get_stats_part())
diff --git a/code/game/objects/effects/glowshroom.dm b/code/game/objects/effects/glowshroom.dm
index 8e79d87bb6b..949d04d20ad 100644
--- a/code/game/objects/effects/glowshroom.dm
+++ b/code/game/objects/effects/glowshroom.dm
@@ -140,4 +140,10 @@
/obj/effect/glowshroom/proc/CheckEndurance()
if(endurance <= 0)
- qdel(src)
\ No newline at end of file
+ qdel(src)
+
+/obj/effect/glowshroom/acid_act(var/acidpwr, var/toxpwr, var/acid_volume)
+ visible_message("[src] melts away!")
+ var/obj/effect/decal/cleanable/molten_item/I = new (get_turf(src))
+ I.desc = "Looks like this was \an [src] some time ago."
+ qdel(src)
\ No newline at end of file
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index 14391a20387..be405a167fb 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -28,13 +28,18 @@
var/permeability_coefficient = 1 // for chemicals/diseases
var/siemens_coefficient = 1 // for electrical admittance/conductance (electrocution checks and shit)
var/slowdown = 0 // How much clothing is slowing you down. Negative values speeds you up
- var/armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
+ var/list/armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
var/list/allowed = null //suit storage stuff.
var/obj/item/device/uplink/hidden/hidden_uplink = null // All items can have an uplink hidden inside, just remember to add the triggers.
var/reflect_chance = 0 //This var dictates what % of a time an object will reflect an energy based weapon's shot
var/strip_delay = 40
var/put_on_delay = 20
+ var/m_amt = 0 // metal
+ var/g_amt = 0 // glass
+ var/reliability = 100 //Used by SOME devices to determine how reliable they are.
+ var/origin_tech = null //Used by R&D to determine what research bonuses it grants.
+ var/list/attack_verb = list() //Used in attackby() to say how something was attacked "[x] has been [z.attack_verb] by [y] with [z]"
var/list/species_exception = list() // even if a species cannot put items in a certain slot, if the species id is in the item's exception list, it will be able to wear that item
/obj/item/device
@@ -80,7 +85,7 @@
set category = "Object"
set src in oview(1)
- if(!istype(src.loc, /turf) || usr.stat || usr.restrained() )
+ if(!istype(src.loc, /turf) || usr.stat || usr.restrained() || !usr.canmove)
return
var/turf/T = src.loc
@@ -379,6 +384,26 @@
/obj/item/singularity_pull(S, current_size)
spawn(0) //this is needed or multiple items will be thrown sequentially and not simultaneously
- if(current_size >= 7)
+ if(current_size >= STAGE_FOUR)
throw_at(S,14,3)
- else ..()
\ No newline at end of file
+ else ..()
+
+/obj/item/acid_act(var/acidpwr, var/toxpwr, var/acid_volume)
+ . = 1
+ for(var/V in armor)
+ if(armor[V] > 0)
+ .-- //it survives the acid...
+ break
+ if(.)
+ var/turf/T = get_turf(src)
+ T.visible_message("[src] melts away!")
+ var/obj/effect/decal/cleanable/molten_item/I = new (get_turf(src))
+ I.pixel_x = rand(1,16)
+ I.pixel_y = rand(1,16)
+ I.desc = "Looks like this was \an [src] some time ago."
+ qdel(src)
+ else
+ for(var/armour_value in armor) //but is weakened
+ armor[armour_value] = max(armor[armour_value]-acidpwr,0)
+ if(!findtext(desc, "it looks slightly melted...")) //it looks slightly melted... it looks slightly melted... it looks slightly melted... etc.
+ desc += " it looks slightly melted..." //needs a space at the start, formatting
diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm
index 89021490262..ac5181f751f 100644
--- a/code/game/objects/items/devices/PDA/PDA.dm
+++ b/code/game/objects/items/devices/PDA/PDA.dm
@@ -44,6 +44,12 @@ var/global/list/obj/item/device/pda/PDAs = list()
var/obj/item/device/paicard/pai = null // A slot for a personal AI device
+ var/chat_channel = "#ss13" //name of our current NTRC channel
+ var/nick = "" //our NTRC nick
+ var/list/ntrclog = list() //NTRC message log
+
+ var/noreturn = 0 //whether the PDA can use the Return button, used for the aiPDA chatroom
+
/obj/item/device/pda/medical
default_cartridge = /obj/item/weapon/cartridge/medical
icon_state = "pda-medical"
@@ -186,13 +192,15 @@ var/global/list/obj/item/device/pda/PDAs = list()
/obj/item/device/pda/ai
icon_state = "NONE"
ttone = "data"
+ mode = 5
+ noreturn = 1
detonate = 0
/obj/item/device/pda/ai/attack_self(mob/user as mob)
if ((honkamt > 0) && (prob(60)))//For clown virus.
honkamt--
playsound(loc, 'sound/items/bikehorn.ogg', 30, 1)
- return
+ ..()
/obj/item/device/pda/ai/pai
ttone = "assist"
@@ -257,7 +265,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
if ((!isnull(cartridge)) && (mode == 0))
dat += " | 
Eject [cartridge]"
- if (mode)
+ if (mode && !noreturn)
dat += " | 
Return"
dat += " | 
Refresh"
@@ -283,7 +291,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
dat += "
" dat += "Transmit notice when empty: [nag_on_empty ? "Yes" : "No"]
" dat += "Repair damaged tiles and platings: [fixfloors ? "Yes" : "No"]
" + dat += "Traction Magnets: [anchored ? "Engaged" : "Disengaged"]
" dat += "Patrol Station: [auto_patrol ? "Yes" : "No"]
" var/bmode if (targetdirection) @@ -181,6 +182,8 @@ autotile = !autotile if("emptynag") nag_on_empty = !nag_on_empty + if("anchor") + anchored = !anchored if("bridgemode") var/setdir = input("Select construction direction:") as null|anything in list("north","east","south","west","disable") @@ -197,7 +200,7 @@ targetdirection = null updateUsrDialog() -/obj/machinery/bot/floorbot/process() +/obj/machinery/bot/floorbot/bot_process() if (!..()) return @@ -230,30 +233,23 @@ else //Find a space tile farther way! target = scan(/turf/space, oldtarget) - anchored = 1 process_type = BRIDGE_MODE - return if(!target) process_type = HULL_BREACH //Ensures the floorbot does not try to "fix" space areas or shuttle docking zones. target = scan(/turf/space, oldtarget) - anchored = 1 //Prevent the floorbot being blown off-course while trying to reach a hull breach. - return if(!target && replacetiles) //Finds a floor without a tile and gives it one. process_type = REPLACE_TILE //The target must be the floor and not a tile. The floor must not already have a floortile. - //target = scan(/turf/simulated/floor, oldtarget) - return + target = scan(/turf/simulated/floor, oldtarget) if(!target && fixfloors) //Repairs damaged floors and tiles. process_type = FIX_TILE target = scan(/turf/simulated/floor, oldtarget) - return if(!target && emagged == 2) //We are emagged! Time to rip up the floors! process_type = TILE_EMAG target = scan(/turf/simulated/floor, oldtarget) - return if(!target) @@ -336,9 +332,11 @@ obj/machinery/bot/floorbot/process_scan(var/scan_target) if(HULL_BREACH) //The most common job, patching breaches in the station's hull. if(is_hull_breach(scan_target)) //Ensure that the targeted space turf is actually part of the station, and not random space. result = scan_target + anchored = 1 //Prevent the floorbot being blown off-course while trying to reach a hull breach. if(BRIDGE_MODE) //Only space turfs in our chosen direction are considered. if(get_dir(src, scan_target) == targetdirection) result = scan_target + anchored = 1 if(REPLACE_TILE) F = scan_target if(istype(F, /turf/simulated/floor/plating)) //The floor must not already have a tile. diff --git a/code/game/machinery/bots/medbot.dm b/code/game/machinery/bots/medbot.dm index 7fe74099a1a..ff55f572225 100644 --- a/code/game/machinery/bots/medbot.dm +++ b/code/game/machinery/bots/medbot.dm @@ -273,7 +273,7 @@ else return -/obj/machinery/bot/medbot/process() +/obj/machinery/bot/medbot/bot_process() if (!..()) return diff --git a/code/game/machinery/bots/mulebot.dm b/code/game/machinery/bots/mulebot.dm index e796be551c6..0c151a22ab0 100644 --- a/code/game/machinery/bots/mulebot.dm +++ b/code/game/machinery/bots/mulebot.dm @@ -78,9 +78,6 @@ var/global/mulebot_count = 0 name = "\improper Mulebot ([suffix])" - verbs -= /atom/movable/verb/pull - - // attack by item // emag : lock/unlock, @@ -496,7 +493,7 @@ var/global/mulebot_count = 0 pathset = 1 //Indicates the AI's custom path is initialized. start() -/obj/machinery/bot/mulebot/process() +/obj/machinery/bot/mulebot/bot_process() if(!has_power()) on = 0 return diff --git a/code/game/machinery/bots/secbot.dm b/code/game/machinery/bots/secbot.dm index 25c76ba6872..25b6073a389 100644 --- a/code/game/machinery/bots/secbot.dm +++ b/code/game/machinery/bots/secbot.dm @@ -189,7 +189,7 @@ Auto Patrol: []"}, declare_arrests = 0 icon_state = "secbot[on]" -/obj/machinery/bot/secbot/process() +/obj/machinery/bot/secbot/bot_process() if (!..()) return @@ -314,14 +314,14 @@ Auto Patrol: []"}, last_found = world.time frustration = 0 spawn(0) - process() //ensure bot quickly responds + bot_process() //ensure bot quickly responds /obj/machinery/bot/secbot/proc/back_to_hunt() anchored = 0 frustration = 0 mode = BOT_HUNT spawn(0) - process() //ensure bot quickly responds + bot_process() //ensure bot quickly responds // look for a criminal in view of the bot /obj/machinery/bot/secbot/proc/look_for_perp() @@ -346,7 +346,7 @@ Auto Patrol: []"}, visible_message("[src] points at [C.name]!") mode = BOT_HUNT spawn(0) - process() // ensure bot quickly responds to a perp + bot_process() // ensure bot quickly responds to a perp break else continue diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index f9c26d959bd..34564627552 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -112,7 +112,7 @@ /obj/machinery/clonepod/attack_paw(mob/user as mob) return attack_hand(user) /obj/machinery/clonepod/attack_hand(mob/user as mob) - if ((isnull(src.occupant)) || (stat & NOPOWER)) + if (isnull(src.occupant) || !is_operational()) return if ((!isnull(src.occupant)) && (src.occupant.stat != 2)) var/completion = (100 * ((src.occupant.health + 100) / (src.heal_level + 100))) @@ -205,7 +205,7 @@ //Grow clones to maturity then kick them out. FREELOADERS /obj/machinery/clonepod/process() - if(stat & NOPOWER) //Autoeject if power is lost + if(!is_operational()) //Autoeject if power is lost if (src.occupant) src.locked = 0 src.go_out() @@ -302,7 +302,7 @@ if(!usr) return - if (usr.stat != 0) + if(usr.stat || !usr.canmove || usr.restrained()) return src.go_out() add_fingerprint(usr) diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index 6b5ad607a94..e7d1b3e7c67 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -23,8 +23,11 @@ /obj/item/toy/prize/mauler = 1, /obj/item/toy/prize/odysseus = 1, /obj/item/toy/prize/phazon = 1, + /obj/item/toy/prize/reticence = 1, /obj/item/toy/cards/deck = 2, - /obj/item/toy/nuke = 2 + /obj/item/toy/nuke = 2, + /obj/item/toy/minimeteor = 2, + /obj/item/toy/carpplushie = 2 ) /obj/machinery/computer/arcade/New() diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index 6fbba86fd4d..5d49b12a1e5 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -54,12 +54,12 @@ // Try to find a scanner in that direction scannerf = locate(/obj/machinery/dna_scannernew, get_step(src, dir)) - // If found, then we break, and return the scanner - if (!isnull(scannerf)) - break + // If found and operational, return the scanner + if (!isnull(scannerf) && scannerf.is_operational()) + return scannerf // If no scanner was found, it will return null - return scannerf + return null /obj/machinery/computer/cloning/proc/findcloner() var/obj/machinery/clonepod/podf = null @@ -68,10 +68,10 @@ podf = locate(/obj/machinery/clonepod, get_step(src, dir)) - if (!isnull(podf)) - break + if (!isnull(podf) && podf.is_operational()) + return podf - return podf + return null /obj/machinery/computer/cloning/attackby(obj/item/W as obj, mob/user as mob) if (istype(W, /obj/item/weapon/disk/data)) //INSERT SOME DISKETTES @@ -233,25 +233,25 @@ if("stopautoprocess") autoprocess = 0 - else if ((href_list["scan"]) && (!isnull(src.scanner))) + else if ((href_list["scan"]) && !isnull(scanner) && scanner.is_operational()) scantemp = "" loading = 1 src.updateUsrDialog() spawn(20) - src.scan_mob(src.scanner.occupant) + src.scan_mob(scanner.occupant) loading = 0 src.updateUsrDialog() //No locking an open scanner. - else if ((href_list["lock"]) && (!isnull(src.scanner))) - if ((!src.scanner.locked) && (src.scanner.occupant)) - src.scanner.locked = 1 + else if ((href_list["lock"]) && !isnull(scanner) && scanner.is_operational()) + if ((!scanner.locked) && (scanner.occupant)) + scanner.locked = 1 else - src.scanner.locked = 0 + scanner.locked = 0 else if(href_list["view_rec"]) src.active_record = find_record("id", href_list["view_rec"], records) diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm index ab3182f0219..bface7aae31 100644 --- a/code/game/machinery/computer/medical.dm +++ b/code/game/machinery/computer/medical.dm @@ -268,6 +268,7 @@ src.temp = text("Are you sure you wish to delete all records?
\n\tYes
\n\tNo
", src, src) else if (href_list["del_all2"]) + investigate_log("[usr.name] ([usr.key]) has deleted all medical records.", "records") data_core.medical.Cut() src.temp = "All records deleted." @@ -415,6 +416,7 @@ src.temp = text("Are you sure you wish to delete the record (Medical Portion Only)?
\n\tYes
\n\tNo
", src, src) else if (href_list["del_r2"]) + investigate_log("[usr.name] ([usr.key]) has deleted the medical records for [active1.fields["name"]].", "records") if(active2) data_core.medical -= active2 active2 = null diff --git a/code/game/machinery/computer/message.dm b/code/game/machinery/computer/message.dm index 04226b689d2..0790775530f 100644 --- a/code/game/machinery/computer/message.dm +++ b/code/game/machinery/computer/message.dm @@ -114,8 +114,10 @@ else dat += "
" + dat += "
| X | Channel | Nick | Message |
|---|---|---|---|
| [msg.channel] | [msg.sender] | [msg.message] |
" dat+="Message Body: [src.msg]
" dat+="Attach Photo: [(src.photo ? "Photo Attached" : "No Photo")]" + dat+="Comments [allow_comments ? "Enabled" : "Disabled"]
" dat+="
Submit
Cancel
" if(4) dat+="Feed story successfully submitted to [src.channel_name].
" @@ -362,8 +375,18 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co dat+="-[MESSAGE.body]
" if(MESSAGE.img) usr << browse_rsc(MESSAGE.img, "tmp_photo[i].png") - dat+="
" + dat+="
" + if(MESSAGE.caption) + dat+="[MESSAGE.caption]
" + dat+="
" dat+="\[Story by [MESSAGE.author] \] - ([MESSAGE.time_stamp])
" + dat+="[MESSAGE.comments.len] comment[MESSAGE.comments.len > 1 ? "s" : ""]
" + for(var/datum/feed_comment/comment in MESSAGE.comments) + dat+="[comment.body]
[comment.author] [comment.time_stamp]
" + if(MESSAGE.locked) + dat+="Comments locked
" + else + dat+="Comment
" dat+="
Refresh" dat+="
Back" if(10) @@ -400,6 +423,9 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co for(var/datum/feed_message/MESSAGE in src.viewing_channel.messages) dat+="-[MESSAGE.body]
\[Story by [MESSAGE.author]\]
" dat+="[(MESSAGE.body == "\[REDACTED\]") ? ("Undo story censorship") : ("Censor story")] - [(MESSAGE.author == "\[REDACTED\]") ? ("Undo Author Censorship") : ("Censor message Author")]
" + dat+="[MESSAGE.comments.len] comment[MESSAGE.comments.len > 1 ? "s" : ""]: [MESSAGE.locked ? "Unlock" : "Lock"]
" + for(var/datum/feed_comment/comment in MESSAGE.comments) + dat+="[comment.body] X
[comment.author] [comment.time_stamp]
" dat+="
Back" if(13) dat+="[src.viewing_channel.channel_name]: \[ created by: [src.viewing_channel.author] \]
" @@ -550,7 +576,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co if(src.msg =="" || src.msg=="\[REDACTED\]" || src.scanned_user == "Unknown" || src.channel_name == "" ) src.screen=6 else - news_network.SubmitArticle(msg, scanned_user, channel_name, photo) + news_network.SubmitArticle(msg, scanned_user, channel_name, photo, allow_comments) feedback_inc("newscaster_stories",1) src.screen=4 src.updateUsrDialog() @@ -728,6 +754,34 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co src.screen = 12 src.updateUsrDialog() + else if(href_list["new_comment"]) + var/datum/feed_message/FM = locate(href_list["new_comment"]) + var/cominput = copytext(stripped_input(usr, "Write your message:", "New comment", null),1,141) + if(cominput) + var/datum/feed_comment/FC = new/datum/feed_comment + FC.author = scanned_user + FC.body = cominput + FC.time_stamp = worldtime2text() + FM.comments += FC + log_comment("[usr]/([usr.ckey]) as [scanned_user] commented on message [FM.body] -- [FC.body]") + updateUsrDialog() + + else if(href_list["del_comment"]) + var/datum/feed_comment/FC = locate(href_list["del_comment"]) + var/datum/feed_message/FM = locate(href_list["del_comment_msg"]) + FM.comments -= FC + qdel(FC) + updateUsrDialog() + + else if(href_list["lock_comment"]) + var/datum/feed_message/FM = locate(href_list["lock_comment"]) + FM.locked ^= 1 + updateUsrDialog() + + else if(href_list["set_comment"]) + allow_comments ^= 1 + updateUsrDialog() + else if(href_list["refresh"]) src.updateUsrDialog() diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm index 7120b1d1550..6f4a0e8cb25 100644 --- a/code/game/machinery/pipe/construction.dm +++ b/code/game/machinery/pipe/construction.dm @@ -155,7 +155,7 @@ Buildable meters set name = "Rotate Pipe" set src in view(1) - if ( usr.stat || usr.restrained() ) + if ( usr.stat || usr.restrained() || !usr.canmove ) return src.dir = turn(src.dir, -90) @@ -169,7 +169,7 @@ Buildable meters set name = "Flip Pipe" set src in view(1) - if ( usr.stat || usr.restrained() ) + if ( usr.stat || usr.restrained() || !usr.canmove ) return if (pipe_type in list(PIPE_GAS_FILTER, PIPE_GAS_MIXER)) diff --git a/code/game/machinery/telecomms/machine_interactions.dm b/code/game/machinery/telecomms/machine_interactions.dm index f3d1796d3a2..bfb60668ac4 100644 --- a/code/game/machinery/telecomms/machine_interactions.dm +++ b/code/game/machinery/telecomms/machine_interactions.dm @@ -65,7 +65,7 @@ // Drop all the component stuff if(component_parts) - for(var/obj/I in component_parts) + for(var/obj/item/I in component_parts) if(I.reliability != 100 && crit_fail) I.crit_fail = 1 I.loc = src.loc diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index a5342f470df..3427f8a655d 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -648,9 +648,16 @@ product_ads = "Probably not bad for you!;Don't believe the scientists!;It's good for you!;Don't quit, buy more!;Smoke!;Nicotine heaven.;Best cigarettes since 2150.;Award-winning cigs." vend_delay = 34 icon_state = "cigs" - products = list(/obj/item/weapon/storage/fancy/cigarettes = 10,/obj/item/weapon/storage/box/matches = 10,/obj/item/weapon/lighter/random = 4,/obj/item/weapon/storage/fancy/rollingpapers = 5) + products = list(/obj/item/weapon/storage/fancy/cigarettes = 5, + /obj/item/weapon/storage/fancy/cigarettes/cigpack_uplift = 3, + /obj/item/weapon/storage/fancy/cigarettes/cigpack_robust = 2, + /obj/item/weapon/storage/fancy/cigarettes/cigpack_carp = 3, + /obj/item/weapon/storage/fancy/cigarettes/cigpack_midori = 1, + /obj/item/weapon/storage/box/matches = 10, + /obj/item/weapon/lighter/random = 4, + /obj/item/weapon/storage/fancy/rollingpapers = 5) contraband = list(/obj/item/weapon/lighter/zippo = 4) - premium = list(/obj/item/clothing/mask/cigarette/cigar/havana = 2) + premium = list(/obj/item/clothing/mask/cigarette/cigar/havana = 2, /obj/item/weapon/storage/fancy/cigarettes/cigpack_robustgold = 1) refill_canister = /obj/item/weapon/vending_refill/cigarette diff --git a/code/game/machinery/washing_machine.dm b/code/game/machinery/washing_machine.dm index fcd17eea035..1a45add5d88 100644 --- a/code/game/machinery/washing_machine.dm +++ b/code/game/machinery/washing_machine.dm @@ -28,6 +28,9 @@ set category = "Object" set src in oview(1) + if(usr.stat || usr.restrained() || !usr.canmove) + return + if( state != 4 ) usr << "The washing machine cannot run in this state." return diff --git a/code/game/mecha/combat/combat.dm b/code/game/mecha/combat/combat.dm index 65b49cca717..b1e60d07b28 100644 --- a/code/game/mecha/combat/combat.dm +++ b/code/game/mecha/combat/combat.dm @@ -4,7 +4,6 @@ var/melee_can_hit = 1 var/list/destroyable_obj = list(/obj/mecha, /obj/structure/window, /obj/structure/grille, /turf/simulated/wall) internal_damage_threshold = 50 - maint_access = 0 damage_absorption = list("brute"=0.7,"fire"=1,"bullet"=0.7,"laser"=0.85,"energy"=1,"bomb"=0.8) var/am = "d3c2fbcadca903a41161ccc9df9cf948" diff --git a/code/game/mecha/combat/durand.dm b/code/game/mecha/combat/durand.dm index 66a5036a9a7..3a49c11433a 100644 --- a/code/game/mecha/combat/durand.dm +++ b/code/game/mecha/combat/durand.dm @@ -38,7 +38,7 @@ set name = "Toggle defence mode" set src = usr.loc set popup_menu = 0 - if(usr!=src.occupant) + if(!can_use(usr)) return defence = !defence if(defence) diff --git a/code/game/mecha/combat/gygax.dm b/code/game/mecha/combat/gygax.dm index 79ae3333d63..722b576f134 100644 --- a/code/game/mecha/combat/gygax.dm +++ b/code/game/mecha/combat/gygax.dm @@ -56,7 +56,7 @@ set name = "Toggle leg actuators overload" set src = usr.loc set popup_menu = 0 - if(usr!=src.occupant) + if(!can_use(usr)) return if(overload) overload = 0 diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 829f3c94ec1..c9edcc339b0 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -32,7 +32,7 @@ var/list/log = new var/last_message = 0 var/add_req_access = 1 - var/maint_access = 1 + var/maint_access = 0 var/dna //dna-locking the mech var/list/proc_res = list() //stores proc owners, like proc_res["functionname"] = owner reference var/datum/effect/effect/system/spark_spread/spark_system = new @@ -85,7 +85,6 @@ add_cell() add_iterators() removeVerb(/obj/mecha/verb/disconnect_from_port) - removeVerb(/atom/movable/verb/pull) log_message("[src.name] created.") mechas_list += src //global mech list return @@ -201,6 +200,13 @@ return 1 +obj/mecha/proc/can_use(mob/user) + if(user != src.occupant) + return 0 + if(user && ismob(user)) + if(!usr.stat && !usr.restrained() && usr.canmove) + return 1 + return 0 /obj/mecha/examine(mob/user) ..() @@ -523,8 +529,8 @@ src.visible_message("The [A] fastens firmly to [src].") return if(prob(src.deflect_chance) || istype(A, /mob)) - src.occupant_message("The [A] bounces off the armor.") - src.visible_message("The [A] bounces off the [src.name] armor") + src.occupant_message("[A] bounces off the armor.") + src.visible_message("[A] bounces off the [src.name] armor") src.log_append_to_last("Armor saved.") if(istype(A, /mob/living)) var/mob/living/M = A @@ -673,7 +679,7 @@ return if(istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda)) if(add_req_access || maint_access) - if(internals_access_allowed(usr)) + if(internals_access_allowed(user)) var/obj/item/weapon/card/id/id_card if(istype(W, /obj/item/weapon/card/id)) id_card = W @@ -683,9 +689,9 @@ output_maintenance_dialog(id_card, user) return else - user << "Invalid ID: Access denied." + user << "Invalid ID: Access denied." else - user << "Maintenance protocols disabled by operator." + user << "Maintenance protocols disabled by operator." else if(istype(W, /obj/item/weapon/wrench)) if(state==1) state = 2 @@ -741,19 +747,22 @@ return else if(istype(W, /obj/item/weapon/weldingtool) && user.a_intent != "harm") + user.changeNext_move(CLICK_CD_MELEE) var/obj/item/weapon/weldingtool/WT = W - if (WT.remove_fuel(0,user)) - if (hasInternalDamage(MECHA_INT_TANK_BREACH)) - clearInternalDamage(MECHA_INT_TANK_BREACH) - user << "You repair the damaged gas tank." - else - return if(src.health
Eject [cartridge]"
- if (mode)
+ if (mode && !noreturn)
dat += " | Return"
dat += " | Refresh"
@@ -283,7 +291,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
dat += "- "
dat += "
Notekeeper "
dat += "
Messenger "
- //dat += "
Nanotrasen Relay Chat "
+ dat += "- Nanotrasen Relay Chat "
if (cartridge)
if (cartridge.access_clown)
@@ -433,16 +441,18 @@ var/global/list/obj/item/device/pda/PDAs = list()
dat += "
- "
- for(var/datum/chatroom/C in chatrooms)
- dat += "#[html_encode(lowertext(C.name))]"
- if(C.password != "")
- dat += "
"
- dat += " "
-
+ if(!nick) //first time join
+ nick = copytext(sanitize(owner), 1, 9)
+ var/datum/chatroom/C = chatchannels[chat_channel]
+ C.parse_msg(src, nick, "/join [chat_channel]")
+ dat += " - Everything now drifts in space, not just mobs. +
- Mechs are just as maneuverable in space as you are. +
- Being weightless now slows movement down by a lot rather than speeding it up. Having your hands full will make movement even slower. +
- Removed spaceslipping (You slipped! x1000) +
- Jetpacking after being thrown out a mass driver will cancel out your momentum. +
- Shooting a gun causes you to drift the other direction like spraying a fire extinguisher. +
" if (5) - dat += "
Nanotrasen Relay Chat
"
-
- dat += " Detected Channels
: SS13 Nanotrasen Relay Chat Network
"
+ dat += "[nick] | "
+ dat += "[chat_channel] | "
+ dat += "Write message | "
+ dat += "Help" + if(chat_channel) + dat += ntrclog[chat_channel] else//Else it links to the cart menu proc. Although, it really uses menu hub 4--menu 4 doesn't really exist as it simply redirects to hub. dat += cart @@ -510,7 +520,7 @@ var/global/list/obj/item/device/pda/PDAs = list() mode = 3 if("4")//Redirects to hub mode = 0 - if("chatroom") // chatroom hub + if("5")//Chatroom mode = 5 @@ -615,6 +625,53 @@ var/global/list/obj/item/device/pda/PDAs = list() return +//CHATROOM FUNCTIONS==================================== + + if("Set Nick") + var/t = stripped_input(U, "Please enter nickname", name, null) as text + nick = copytext(sanitize(t), 1, 9) + + if("Set Channel") + var/t = stripped_input(U, "Please enter channel", name, (chat_channel)) as text + + if(t) + ntrclog[chat_channel] = "
" + ntrclog[chat_channel] + var/datum/chatroom/C = chatchannels[chat_channel] + if(!findtext(t,"#",1,2)) + t = "#" + t + chat_channel = t + C.parse_msg(src, nick, "/join [chat_channel]") + + if("NTRC Message") + var/t = msg_input(U) as text + var/datum/chatroom/C = chatchannels[chat_channel] + if(C) + var/lt = text2list(t, " ") + if(lt[1] == "/join") + if(!findtext(lt[2],"#",1,2)) + lt[2] = "#" + lt[2] + var/ret = C.parse_msg(src,nick,t) + if(findtextEx(ret,"ERR_",1,5)) + ntrclog[chat_channel] = "[ret]
" + ntrclog[chat_channel] + else + if(ret == 0) + ntrclog[chat_channel] = "Failure
" + ntrclog[chat_channel] + else + if(lt[1] == "/join") + chat_channel = lt[2] + + if("NTRC Help") + var/helptext = "NTRC reference:
" + helptext += "General commands
" + helptext += "/join #channel
/part
/log amountoflines
/who
/topic
/register
" + helptext += "Moderation commands
" + helptext += "/ban targetnick
/unban targetnick
/kick targetnick
/mute targetnick
" + helptext += "Management commands
" + helptext += "/topic topictext
/op targetnick
/deop targetnick
/delchannel" + usr << browse(helptext, "window=ntrchelp;size=400x444;border=1;can_resize=1;can_close=1;can_minimize=0") + + + //SYNDICATE FUNCTIONS=================================== if("Toggle Door") @@ -675,8 +732,9 @@ var/global/list/obj/item/device/pda/PDAs = list() else//Cartridge menu linking mode = text2num(href_list["choice"]) - cartridge.mode = mode - cartridge.unlock() + if(cartridge) + cartridge.mode = mode + cartridge.unlock() else//If not in range, can't interact or not using the pda. U.unset_machine() U << browse(null, "window=pda") @@ -708,40 +766,39 @@ var/global/list/obj/item/device/pda/PDAs = list() id.loc = get_turf(src) id = null -/obj/item/device/pda/proc/create_message(var/mob/living/U = usr, var/obj/item/device/pda/P) - +/obj/item/device/pda/proc/msg_input(var/mob/living/U = usr) var/t = input(U, "Please enter message", name, null) as text t = copytext(sanitize(t), 1, MAX_MESSAGE_LEN) - if (!t || !istype(P)) + if (!t || toff) return if (!in_range(src, U) && loc != U) return - - if (isnull(P)||P.toff || toff) + if(!can_use(U)) return + if(emped) + t = Gibberish(t, 100) + return t + +/obj/item/device/pda/proc/create_message(var/mob/living/U = usr, var/obj/item/device/pda/P) + + var/t = msg_input(U) if (last_text && world.time < last_text + 5) return - if(!can_use(U)) + if (isnull(P) || P.toff || !istype(P)) return last_text = world.time - // check if telecomms I/O route 1459 is stable - //var/telecomms_intact = telecomms_process(P.owner, owner, t) var/obj/machinery/message_server/useMS = null if(message_servers) for (var/obj/machinery/message_server/MS in message_servers) //PDAs are now dependant on the Message Server. if(MS.active) useMS = MS - break var/datum/signal/signal = src.telecomms_process() - if(emped) - t = Gibberish(t, 100) - var/useTC = 0 if(signal) if(signal.data["done"]) @@ -763,7 +820,8 @@ var/global/list/obj/item/device/pda/PDAs = list() P.tnote += "← From [owner] ([ownjob]):
[t]
" if (!P.silent) - P.loc.audible_message("\icon[P] *[P.ttone]*", null, 3) + playsound(P.loc, 'sound/machines/twobeep.ogg', 50, 1) + P.loc.audible_message("\icon[P] *[P.ttone]*", null, 3) //Search for holder of the PDA. var/mob/living/L = null if(P.loc && isliving(P.loc)) @@ -781,7 +839,6 @@ var/global/list/obj/item/device/pda/PDAs = list() else U << "ERROR: Server isn't responding." - /obj/item/device/pda/verb/verb_remove_id() set category = "Object" set name = "Remove id" @@ -1044,6 +1101,18 @@ var/global/list/obj/item/device/pda/PDAs = list() else usr << "You do not have a PDA. You should make an issue report about this." +/mob/living/silicon/ai/verb/cmd_use_chatroom() + set category = "AI Commands" + set name = "PDA - Chatrooms" + if(usr.stat == 2) + usr << "You can't do that because you are dead!" + return + if(!isnull(aiPDA)) + aiPDA.mode = 5 + aiPDA.attack_self(src) + else + usr << "You do not have a PDA. You should make an issue report about this." + /mob/living/silicon/ai/proc/cmd_show_message_log(mob/user as mob) if(user.stat == 2) user << "You can't do that because you are dead!" @@ -1084,10 +1153,21 @@ var/global/list/obj/item/device/pda/PDAs = list() spawn(200 * severity) emped -= 1 +//ntrc handler proc +/obj/item/device/pda/proc/msg_chat(channel as text, sender as text, message as text) + var/msg = "[strip_html_properly(sender)]| [strip_html_properly(message)]
" + if(!channel) + for(var/C in ntrclog) + ntrclog[C] = msg + ntrclog[C] + else + ntrclog[channel] = msg + ntrclog[channel] + if (!silent) + loc.audible_message("\icon[src] *[ttone]*", null, 3) + /proc/get_viewable_pdas() . = list() // Returns a list of PDAs which can be viewed from another PDA/message monitor. for(var/obj/item/device/pda/P in PDAs) if(!P.owner || P.toff || P.hidden) continue . += P - return . + return . diff --git a/code/game/objects/items/devices/PDA/chatroom.dm b/code/game/objects/items/devices/PDA/chatroom.dm index 007d3892c20..1ba6a4c5813 100644 --- a/code/game/objects/items/devices/PDA/chatroom.dm +++ b/code/game/objects/items/devices/PDA/chatroom.dm @@ -1,16 +1,212 @@ -var/list/chatrooms = list() +var/datum/chatroom/default_ntrc_chatroom = new("") +var/list/chatchannels = list(default_ntrc_chatroom.name = default_ntrc_chatroom) + +//procs that can be used directly: +//channel.parse_msg /datum/chatroom - var/name = "Generic Chatroom" - var/list/logged_in = list() + var/name = "#ss13" + var/topic = "Welcome to the best NTRC channel in this sector of the galaxy!" // topic message for the chatroom + var/list/operators = list() // chat operators var/list/logs = list() // chat logs + var/list/muted = list() // muted users var/list/banned = list() // banned users - var/list/whitelist = list() // whitelisted users - var/list/muted = list() - var/topic = "" // topic message for the chatroom - var/password = "" // blank for no password. - var/operator = "" // name of the operator + var/list/auth = list() // authenticated clients + var/list/users = list() // current users + var/datum/events/events = new () + var/list/datum/event/evlist = list() -/datum/chatroom/proc/attempt_connect(var/obj/item/device/pda/device, var/obj/password) - if(!device) - return +//parse_msg() is the exposed interface chat +//clients should interact with parse_msg() and parse_msg() only + +/datum/chatroom/proc/parse_msg(client,nick,message) + var/obj/machinery/message_server/MS = check_server(client) + if(!MS) + return "ERR_TCOM" + + if(!nick || length(nick) > 8) + return "ERR_NICK" + + MS.send_chat_message(nick,name,message) + + if(findtext(message,"/",1,2)) + return handle_command(client,nick,copytext(message,2)) + + else + return send_message(client,nick,message) + +//the following are for internal use only + +/datum/chatroom/proc/check_server(client) + var/atom/C = client + var/turf/CT = get_turf(C) + if(message_servers) + for (var/obj/machinery/message_server/MS in message_servers) + var/turf/T = get_turf(MS) + if(MS.active && (T.z == CT.z)) + return MS + return 0 + +/datum/chatroom/proc/handle_command(client,nick,command) //command parser + var/list/cmd=text2list(command, " ") + + if(!get_auth(client,nick)) + return "ERR_AUTH" + + switch(cmd[1]) //argument-less commmands + if("topic") + if(cmd.len == 1) + return get_topic(client) + else + return set_topic(client,nick,cmd[2]) + if("part") + return channel_part(client,nick) + if("delchannel") + return delete_channel(client,nick) + if("who") + return get_who(client, nick) + if("register") + return register_auth(client,nick) + + if(cmd.len == 1) + return "ERR_ARGS" + + switch(cmd[1]) //commands with 1 arg + if("join") + return channel_join(client,nick,cmd[2]) + if("log") + return get_log(client,nick,cmd[2]) + if("op") + return make_op(client,nick,cmd[2]) + if("deop") + return deop(client,nick,cmd[2]) + if("ban") + return ban(client,nick,cmd[2]) + if("unban") + return unban(client,nick,cmd[2]) + if("kick") + return kick(client,nick,cmd[2]) + if("mute") + return mute_nick(client,nick,cmd[2]) + + return "ERR_WCMD" + +/datum/chatroom/proc/send_message(client,nick,message) //standard message + if(nick in muted) + return "ERR_MUTE" + if(!message) + return "ERR_BLNK" + logs += "[strip_html_properly(nick)]> [strip_html_properly(message)]" + log_chat("[usr]/([usr.ckey]) as [nick] sent to [name]: [message]") + events.fireEvent("msg_chat",name,nick,message) + return 1 + +/datum/chatroom/proc/get_auth(client,nick) //check auth + if((!(nick in auth)) || (auth[nick] == client)) + return 1 + return 0 + +//chat commands go here +/datum/chatroom/proc/register_auth(client,nick) //register + if(!get_auth(client,nick)) + return 0 + auth[nick] = client + return 1 + +/datum/chatroom/proc/delete_channel(client,nick) //delchannel + if(nick in operators) + for(var/event in events.events) + events.clearEvent("msg_chat",event) + qdel(src) + return 1 + return 0 + +/datum/chatroom/proc/channel_join(client,nick,channel) //join + if(!findtext(channel,"#",1,2)) + channel = "#" + channel + if(channel == name) + if((nick in banned) || (nick in users)) + return 0 + users += nick + get_topic(client,nick) + evlist[nick] = events.addEvent("msg_chat",client,"msg_chat") + return 1 + else + if(!(channel in chatchannels)) + var/ret = new_channel(client,nick,channel) + if(!ret) + return 0 + channel_part(client,nick) + var/datum/chatroom/C = chatchannels[channel] + return C.parse_msg(client,nick,"/join [channel]") + +/datum/chatroom/proc/channel_part(client,nick) //part + users -= nick + events.clearEvent("msg_chat",evlist[nick]) + return 1 + +/datum/chatroom/proc/make_op(client,nick,target) //op + if(nick in operators) + operators += target + return 1 + return 0 + +/datum/chatroom/proc/deop(client,nick,target) //deop + if(nick in operators) + operators -= target + return 1 + return 0 + +/datum/chatroom/proc/ban(client,nick,target) //ban + if(nick in operators) + banned += target + return 1 + return 0 + +/datum/chatroom/proc/unban(client,nick,target) //unban + if(nick in operators) + banned -= target + return 1 + return 0 + +/datum/chatroom/proc/kick(client,nick,target) //kick + if(nick in operators) + channel_part(null,nick) + return 1 + return 0 + +/datum/chatroom/proc/set_topic(client,nick,newtopic) //topic + if(nick in operators) + topic = strip_html_properly(newtopic) + return 1 + return 0 + +/datum/chatroom/proc/get_topic(client,nick) //topic + call(client,"msg_chat")(name,"NTbot","TOPIC: [topic]") + return 1 + +/datum/chatroom/proc/get_who(client,nick) //who + for(var/user in users) + call(client,"msg_chat")(name,"NTbot","WHO: [user]") + return 1 + +/datum/chatroom/proc/get_log(client,nick,lines) //log + for(var/i=0;i
" dat+="\[Story by [MESSAGE.author]\]
" + dat+="[MESSAGE.comments.len] comment[MESSAGE.comments.len > 1 ? "s" : ""]:
" + for(var/datum/feed_comment/comment in MESSAGE.comments) + dat+="[comment.body]
[comment.author] [comment.time_stamp]
" + dat+="
" dat+="
Refresh" dat+="
Back" if(10) @@ -287,6 +291,9 @@ var/global/floorIsLava = 0 for(var/datum/feed_message/MESSAGE in src.admincaster_feed_channel.messages) dat+="-[MESSAGE.body]
\[Story by [MESSAGE.author]\]
" dat+="[(MESSAGE.body == "\[REDACTED\]") ? ("Undo story censorship") : ("Censor story")] - [(MESSAGE.author == "\[REDACTED\]") ? ("Undo Author Censorship") : ("Censor message Author")]
" + dat+="[MESSAGE.comments.len] comment[MESSAGE.comments.len > 1 ? "s" : ""]: [MESSAGE.locked ? "Unlock" : "Lock"]
" + for(var/datum/feed_comment/comment in MESSAGE.comments) + dat+="[comment.body] X
[comment.author] [comment.time_stamp]
" dat+="
Back" if(13) dat+="[src.admincaster_feed_channel.channel_name]: \[ created by: [src.admincaster_feed_channel.author] \]
" @@ -300,7 +307,6 @@ var/global/floorIsLava = 0 else for(var/datum/feed_message/MESSAGE in src.admincaster_feed_channel.messages) dat+="-[MESSAGE.body]
\[Story by [MESSAGE.author]\]
" - dat+="
Back" if(14) dat+="Wanted Issue Handler:" diff --git a/code/modules/admin/admin_investigate.dm b/code/modules/admin/admin_investigate.dm index 5af2ebb0d14..b9e4b830b69 100644 --- a/code/modules/admin/admin_investigate.dm +++ b/code/modules/admin/admin_investigate.dm @@ -22,12 +22,12 @@ F << "[time2text(world.timeofday,"hh:mm")] \ref[src] ([x],[y],[z]) || [src] [message]
" //ADMINVERBS -/client/proc/investigate_show( subject in list("hrefs","notes","ntsl","singulo","wires","telesci", "gravity") ) +/client/proc/investigate_show( subject in list("hrefs","notes","ntsl","singulo","wires","telesci", "gravity", "records", "cargo") ) set name = "Investigate" set category = "Admin" if(!holder) return switch(subject) - if("singulo", "ntsl", "wires", "telesci", "gravity") //general one-round-only stuff + if("singulo", "ntsl", "wires", "telesci", "gravity", "records", "cargo") //general one-round-only stuff var/F = investigate_subject2file(subject) if(!F) src << "Error: admin_investigate: [INVESTIGATE_DIR][subject] is an invalid path or cannot be accessed." diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index fa48db048c4..9edbb034971 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -57,7 +57,8 @@ var/list/admin_verbs_admin = list( /client/proc/cmd_admin_direct_narrate, /*send text directly to a player with no padding. Useful for narratives and fluff-text*/ /client/proc/cmd_admin_world_narrate, /*sends text to all players with no padding*/ /client/proc/cmd_admin_create_centcom_report, - /client/proc/check_words /*displays cult-words*/ + /client/proc/check_words, /*displays cult-words*/ + /client/proc/reset_all_tcs /*resets all telecomms scripts*/ ) var/list/admin_verbs_ban = list( /client/proc/unban_panel, @@ -186,7 +187,8 @@ var/list/admin_verbs_hideable = list( /client/proc/enable_debug_verbs, /proc/possess, /proc/release, - /client/proc/reload_admins + /client/proc/reload_admins, + /client/proc/reset_all_tcs ) /client/proc/add_admin_verbs() diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 767627aa68a..5c1d89c4642 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -2273,3 +2273,15 @@ else if(href_list["ac_set_signature"]) src.admincaster_signature = adminscrub(input(usr, "Provide your desired signature", "Network Identity Handler", "")) src.access_news_network() + + else if(href_list["ac_del_comment"]) + var/datum/feed_comment/FC = locate(href_list["ac_del_comment"]) + var/datum/feed_message/FM = locate(href_list["ac_del_comment_msg"]) + FM.comments -= FC + qdel(FC) + src.access_news_network() + + else if(href_list["ac_lock_comment"]) + var/datum/feed_message/FM = locate(href_list["ac_lock_comment"]) + FM.locked ^= 1 + src.access_news_network() diff --git a/code/modules/admin/verbs/onlyone.dm b/code/modules/admin/verbs/onlyone.dm index 1b2c4bdf428..c9ff2d065b9 100644 --- a/code/modules/admin/verbs/onlyone.dm +++ b/code/modules/admin/verbs/onlyone.dm @@ -12,7 +12,7 @@ var/datum/objective/steal/steal_objective = new steal_objective.owner = H.mind - steal_objective.set_target("nuclear authentication disk") + steal_objective.set_target(new /datum/objective_item/steal/nukedisc) H.mind.objectives += steal_objective var/datum/objective/hijack/hijack_objective = new diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 67d8d55ff8a..74655bac1fa 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -766,3 +766,21 @@ Traitors and the like can also be revived with the previous role mostly intact. usr << "Random events disabled" message_admins("Admin [key_name_admin(usr)] has disabled random events.") feedback_add_details("admin_verb","TRE") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + + +/client/proc/reset_all_tcs() + set category = "Admin" + set name = "Reset Telecomms Scripts" + set desc = "Blanks all telecomms scripts from all telecomms servers" + if(!holder) + usr << "Admin only." + return + for(var/obj/machinery/telecomms/server/S in telecomms_list) + var/datum/TCS_Compiler/C = S.Compiler + S.rawcode = "" + C.Compile("") + for(var/obj/machinery/computer/telecomms/traffic/T in machines) + T.storedcode = "" + log_admin("[key_name(usr)] blanked all telecomms scripts.") + message_admins("[key_name_admin(usr)] blanked all telecomms scripts.") + feedback_add_details("admin_verb","RAT") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! diff --git a/code/modules/assembly/infrared.dm b/code/modules/assembly/infrared.dm index 4b7d57e45ca..5bcc194d824 100644 --- a/code/modules/assembly/infrared.dm +++ b/code/modules/assembly/infrared.dm @@ -130,6 +130,9 @@ set category = "Object" set src in usr + if(usr.stat || !usr.canmove || usr.restrained()) + return + dir = turn(dir, 90) return diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm index f64d1590071..ae95989af85 100644 --- a/code/modules/client/client procs.dm +++ b/code/modules/client/client procs.dm @@ -259,6 +259,7 @@ var/next_external_rsc = 0 'icons/pda_icons/pda_blank.png', 'icons/pda_icons/pda_boom.png', 'icons/pda_icons/pda_bucket.png', + 'icons/pda_icons/pda_chatroom.png', 'icons/pda_icons/pda_medbot.png', 'icons/pda_icons/pda_floorbot.png', 'icons/pda_icons/pda_cleanbot.png', @@ -305,4 +306,4 @@ var/next_external_rsc = 0 'icons/stamp_icons/large_stamp-cap.png', 'icons/stamp_icons/large_stamp-qm.png', 'icons/stamp_icons/large_stamp-law.png' - ) \ No newline at end of file + ) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 8605854a4df..ac23b8954fa 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -42,7 +42,8 @@ datum/preferences //character preferences var/real_name //our character's name - var/be_random_name = 0 //whether we are a random name every round + var/be_random_name = 0 //whether we'll have a random name every round + var/be_random_body = 0 //whether we'll have a random body every round var/gender = MALE //gender of character (well duh) var/age = 30 //age of character var/blood_type = "A+" //blood type (not-chooseable) @@ -163,7 +164,8 @@ datum/preferences dat += "" dat += "
Body
" - dat += "Random Body" + dat += "Random Body " + dat += "Always Random Body: [be_random_body ? "Yes" : "No"]
" dat += "
| "
@@ -270,7 +272,7 @@ datum/preferences
dat += ""
//user << browse(dat, "window=preferences;size=560x560")
- var/datum/browser/popup = new(user, "preferences", " Character Setup ", 580, 600)
+ var/datum/browser/popup = new(user, "preferences", "Character Setup ", 580, 620)
popup.set_content(dat)
popup.open(0)
@@ -744,6 +746,9 @@ datum/preferences
if("name")
be_random_name = !be_random_name
+ if("all")
+ be_random_body = !be_random_body
+
if("hear_midis")
toggles ^= SOUND_MIDI
@@ -791,6 +796,9 @@ datum/preferences
if(be_random_name)
real_name = random_name(gender)
+ if(be_random_body)
+ random_character(gender)
+
if(config.humans_need_surnames)
var/firstspace = findtext(real_name, " ")
var/name_length = length(real_name)
diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm
index ffd49d228d0..74562dc81e5 100644
--- a/code/modules/client/preferences_savefile.dm
+++ b/code/modules/client/preferences_savefile.dm
@@ -169,6 +169,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
S["OOC_Notes"] >> metadata
S["real_name"] >> real_name
S["name_is_always_random"] >> be_random_name
+ S["body_is_always_random"] >> be_random_body
S["gender"] >> gender
S["age"] >> age
S["hair_color"] >> hair_color
@@ -205,6 +206,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
mutant_color = "#FFF"
if(!real_name) real_name = random_name(gender)
be_random_name = sanitize_integer(be_random_name, 0, 1, initial(be_random_name))
+ be_random_body = sanitize_integer(be_random_body, 0, 1, initial(be_random_body))
gender = sanitize_gender(gender)
if(gender == MALE)
hair_style = sanitize_inlist(hair_style, hair_styles_male_list)
@@ -250,6 +252,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
S["OOC_Notes"] << metadata
S["real_name"] << real_name
S["name_is_always_random"] << be_random_name
+ S["body_is_always_random"] << be_random_body
S["gender"] << gender
S["age"] << age
S["hair_color"] << hair_color
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index 1308e85cc05..3de1b0b4916 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -3,8 +3,8 @@
var/flash_protect = 0 //Malk: What level of bright light protection item has. 1 = Flashers, Flashes, & Flashbangs | 2 = Welding | -1 = OH GOD WELDING BURNT OUT MY RETINAS
var/tint = 0 //Malk: Sets the item's level of visual impairment tint, normally set to the same as flash_protect
var/up = 0 // but seperated to allow items to protect but not impair vision, like space helmets
- var/visor_flags = null
- var/visor_flags_inv = null
+ var/visor_flags = 0 // flags that are added/removed when an item is adjusted up/down
+ var/visor_flags_inv = 0 // same as visor_flags, but for flags_inv
//Ears: currently only used for headsets and earmuffs
/obj/item/clothing/ears
@@ -102,8 +102,8 @@ BLIND // can't see anything
src.icon_state = initial(icon_state)
gas_transfer_coefficient = initial(gas_transfer_coefficient)
permeability_coefficient = initial(permeability_coefficient)
- flags = initial(flags)
- flags_inv = initial(flags_inv)
+ flags |= visor_flags
+ flags_inv |= visor_flags_inv
usr << "You push \the [src] back into place."
src.mask_adjusted = 0
else
@@ -111,8 +111,8 @@ BLIND // can't see anything
usr << "You push \the [src] out of the way."
gas_transfer_coefficient = null
permeability_coefficient = null
- flags = null
- flags_inv = null
+ flags &= ~visor_flags
+ flags_inv &= ~visor_flags_inv
src.mask_adjusted = 1
usr.update_inv_wear_mask()
@@ -266,8 +266,10 @@ atom/proc/generate_female_clothing(index,t_color,icon)
set category = "Object"
set src in usr
var/mob/M = usr
- if (istype(M, /mob/dead/)) return
- if (usr.stat) return
+ if (istype(M, /mob/dead/))
+ return
+ if (!can_use(usr))
+ return
if(src.has_sensor >= 2)
usr << "The controls are locked."
return 0
@@ -292,7 +294,7 @@ atom/proc/generate_female_clothing(index,t_color,icon)
set name = "Adjust Jumpsuit Style"
set category = "Object"
set src in usr
- if(usr.stat)
+ if(!can_use(usr))
return
if(!can_adjust)
usr << "You cannot wear this suit any differently."
@@ -313,8 +315,10 @@ atom/proc/generate_female_clothing(index,t_color,icon)
set name = "Remove Accessory"
set category = "Object"
set src in usr
- if(!istype(usr, /mob/living)) return
- if(usr.stat) return
+ if(!istype(usr, /mob/living))
+ return
+ if(!can_use(usr))
+ return
if(hastie)
hastie.transform *= 2
@@ -336,7 +340,7 @@ atom/proc/generate_female_clothing(index,t_color,icon)
..()
/obj/item/clothing/proc/weldingvisortoggle() //Malk: proc to toggle welding visors on helmets, masks, goggles, etc.
- if(usr.canmove && !usr.stat && !usr.restrained())
+ if(can_use(usr))
if(up)
up = !up
flags |= (visor_flags)
@@ -360,3 +364,9 @@ atom/proc/generate_female_clothing(index,t_color,icon)
usr.update_inv_glasses(0)
if(istype(src, /obj/item/clothing/mask))
usr.update_inv_wear_mask(0)
+
+/obj/item/clothing/proc/can_use(mob/user)
+ if(user && ismob(user))
+ if(!user.stat && user.canmove && !user.restrained())
+ return 1
+ return 0
diff --git a/code/modules/clothing/masks/boxing.dm b/code/modules/clothing/masks/boxing.dm
index b17e41c0ef1..78f76f8d971 100644
--- a/code/modules/clothing/masks/boxing.dm
+++ b/code/modules/clothing/masks/boxing.dm
@@ -5,6 +5,7 @@
item_state = "balaclava"
flags = BLOCKHAIR
flags_inv = HIDEFACE
+ visor_flags_inv = HIDEFACE
w_class = 2
action_button_name = "Adjust Balaclava"
ignore_maskadjust = 0
diff --git a/code/modules/clothing/masks/breath.dm b/code/modules/clothing/masks/breath.dm
index 32c6702102b..739dc16581a 100644
--- a/code/modules/clothing/masks/breath.dm
+++ b/code/modules/clothing/masks/breath.dm
@@ -5,6 +5,7 @@
item_state = "m_mask"
body_parts_covered = 0
flags = MASKCOVERSMOUTH | MASKINTERNALS
+ visor_flags = MASKCOVERSMOUTH | MASKINTERNALS
w_class = 2
gas_transfer_coefficient = 0.10
permeability_coefficient = 0.50
diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm
index 4fa595fdc2c..295298df882 100644
--- a/code/modules/clothing/masks/gasmask.dm
+++ b/code/modules/clothing/masks/gasmask.dm
@@ -87,8 +87,10 @@
set category = "Object"
set name = "HALT"
set src in usr
- if(!istype(usr, /mob/living)) return
- if(usr.stat) return
+ if(!istype(usr, /mob/living))
+ return
+ if(!can_use(usr))
+ return
var/phrase = 0 //selects which phrase to use
var/phrase_text = null
diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm
index 4e459567d7a..59acfbd631d 100644
--- a/code/modules/clothing/masks/miscellaneous.dm
+++ b/code/modules/clothing/masks/miscellaneous.dm
@@ -24,6 +24,8 @@
w_class = 1
flags = MASKCOVERSMOUTH
flags_inv = HIDEFACE
+ visor_flags = MASKCOVERSMOUTH
+ visor_flags_inv = HIDEFACE
gas_transfer_coefficient = 0.90
permeability_coefficient = 0.01
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 25, rad = 0)
diff --git a/code/modules/clothing/shoes/magboots.dm b/code/modules/clothing/shoes/magboots.dm
index efe04465a36..d7d2414ff68 100644
--- a/code/modules/clothing/shoes/magboots.dm
+++ b/code/modules/clothing/shoes/magboots.dm
@@ -14,6 +14,8 @@
set name = "Toggle Magboots"
set category = "Object"
set src in usr
+ if(!can_use(usr))
+ return
attack_self(usr)
@@ -49,4 +51,4 @@
desc = "Reverse-engineered magnetic boots that have a heavy magnetic pull. Property of Gorlex Marauders."
name = "blood-red magboots"
icon_state = "syndiemag0"
- magboot_state = "syndiemag"
+ magboot_state = "syndiemag"
diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm
index 496fd90507f..bdf0b2ed3ba 100644
--- a/code/modules/clothing/shoes/miscellaneous.dm
+++ b/code/modules/clothing/shoes/miscellaneous.dm
@@ -52,6 +52,7 @@
icon_state = "wizard"
strip_delay = 50
put_on_delay = 50
+ unacidable = 1
/obj/item/clothing/shoes/sandal/marisa
desc = "A pair of magic black shoes."
diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm
index 8fe70226fa3..f3fc2721928 100644
--- a/code/modules/clothing/spacesuits/hardsuit.dm
+++ b/code/modules/clothing/spacesuits/hardsuit.dm
@@ -138,6 +138,7 @@
armor = list(melee = 40, bullet = 20, laser = 20, energy = 20, bomb = 35, bio = 100, rad = 50)
heat_protection = HEAD //Uncomment to enable firesuit protection
max_heat_protection_temperature = FIRE_HELM_MAX_TEMP_PROTECT
+ unacidable = 1
/obj/item/clothing/suit/space/hardsuit/wizard
icon_state = "hardsuit-wiz"
@@ -151,6 +152,7 @@
allowed = list(/obj/item/weapon/teleportation_scroll,/obj/item/weapon/tank/emergency_oxygen)
heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS //Uncomment to enable firesuit protection
max_heat_protection_temperature = FIRE_SUIT_MAX_TEMP_PROTECT
+ unacidable = 1
//Medical hardsuit
diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm
index 4fac7f71965..32d90013168 100644
--- a/code/modules/clothing/suits/armor.dm
+++ b/code/modules/clothing/suits/armor.dm
@@ -120,6 +120,7 @@
slowdown = 1
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
action_button_name = "Toggle Armor"
+ unacidable = 1
/obj/item/clothing/suit/armor/reactive/IsShield()
if(active)
diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm
index e3b75febb8b..076dc6cc927 100644
--- a/code/modules/clothing/suits/labcoat.dm
+++ b/code/modules/clothing/suits/labcoat.dm
@@ -14,7 +14,7 @@
set category = "Object"
set src in usr
- if(!usr.canmove || usr.stat || usr.restrained())
+ if(!can_use(usr))
return 0
open = !open
@@ -28,6 +28,12 @@
icon_state = "labcoat_cmo"
item_state = "labcoat_cmo"
+/obj/item/clothing/suit/labcoat/emt
+ name = "EMT's jacket"
+ desc = "A dark blue jacket with reflective strips for emergency medical technicians."
+ icon_state = "labcoat_emt"
+ item_state = "labcoat_cmo"
+
/obj/item/clothing/suit/labcoat/mad
name = "\improper The Mad's labcoat"
desc = "It makes you look capable of konking someone on the noggin and shooting them into space."
diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm
index c2373675872..b0ec44c0d58 100644
--- a/code/modules/clothing/suits/miscellaneous.dm
+++ b/code/modules/clothing/suits/miscellaneous.dm
@@ -228,7 +228,7 @@
set category = "Object"
set src in usr
- if(!usr.canmove || usr.stat || usr.restrained())
+ if(!can_use(usr))
return 0
if(src.icon_state == "suitjacket_blue_open") //no god no
diff --git a/code/modules/clothing/suits/wiz_robe.dm b/code/modules/clothing/suits/wiz_robe.dm
index de249c00557..df88c830561 100644
--- a/code/modules/clothing/suits/wiz_robe.dm
+++ b/code/modules/clothing/suits/wiz_robe.dm
@@ -7,6 +7,7 @@
armor = list(melee = 30, bullet = 20, laser = 20, energy = 20, bomb = 20, bio = 20, rad = 20)
strip_delay = 50
put_on_delay = 50
+ unacidable = 1
/obj/item/clothing/head/wizard/red
name = "red wizard hat"
@@ -51,6 +52,7 @@
flags_inv = HIDEJUMPSUIT
strip_delay = 50
put_on_delay = 50
+ unacidable = 1
/obj/item/clothing/suit/wizrobe/red
@@ -92,6 +94,7 @@
gas_transfer_coefficient = 1
permeability_coefficient = 1
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
+ unacidable = 0
/obj/item/clothing/head/wizard/marisa/fake
name = "witch hat"
@@ -100,6 +103,7 @@
gas_transfer_coefficient = 1
permeability_coefficient = 1
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
+ unacidable = 0
/obj/item/clothing/suit/wizrobe/marisa/fake
name = "witch robe"
@@ -109,3 +113,4 @@
gas_transfer_coefficient = 1
permeability_coefficient = 1
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
+ unacidable = 0
\ No newline at end of file
diff --git a/code/modules/clothing/under/jobs/medsci.dm b/code/modules/clothing/under/jobs/medsci.dm
index d56b94e60bb..351a97b5ee1 100644
--- a/code/modules/clothing/under/jobs/medsci.dm
+++ b/code/modules/clothing/under/jobs/medsci.dm
@@ -3,20 +3,29 @@
*/
/obj/item/clothing/under/rank/research_director
desc = "It's a suit worn by those with the know-how to achieve the position of \"Research Director\". Its fabric provides minor protection from biological contaminants."
- name = "research director's suit"
+ name = "research director's vest suit"
icon_state = "director"
item_state = "g_suit"
item_color = "director"
- armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
+ armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 10, bio = 10, rad = 0)
can_adjust = 0
/obj/item/clothing/under/rank/research_director/alt
desc = "Maybe you'll engineer your own half-man, half-pig creature some day. Its fabric provides minor protection from biological contaminants."
- name = "research director's suit"
+ name = "research director's tan suit"
icon_state = "rdwhimsy"
item_state = "rdwhimsy"
item_color = "rdwhimsy"
- armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 10, rad = 0)
+ armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 10, bio = 10, rad = 0)
+ can_adjust = 1
+
+/obj/item/clothing/under/rank/research_director/turtleneck
+ desc = "A dark purple turtleneck and tan khakis, for a director with a superior sense of style."
+ name = "research director's turtleneck"
+ icon_state = "rdturtle"
+ item_state = "p_suit"
+ item_color = "rdturtle"
+ armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 10, bio = 10, rad = 0)
can_adjust = 1
/obj/item/clothing/under/rank/scientist
diff --git a/code/modules/detectivework/footprints_and_rag.dm b/code/modules/detectivework/footprints_and_rag.dm
index 7781afff461..779a9800be2 100644
--- a/code/modules/detectivework/footprints_and_rag.dm
+++ b/code/modules/detectivework/footprints_and_rag.dm
@@ -43,7 +43,7 @@
if(ismob(target) && target.reagents && reagents.total_volume)
user.visible_message("\The [target] has been smothered with \the [src] by \the [user]!", "You smother \the [target] with \the [src]!", "You hear some struggling and muffled cries of surprise")
src.reagents.reaction(target, TOUCH)
- spawn(5) src.reagents.clear_reagents()
+ src.reagents.clear_reagents()
return
else
..()
diff --git a/code/modules/food&drinks/food/condiment.dm b/code/modules/food&drinks/food/condiment.dm
index 21ec47ce544..7ef596d303a 100644
--- a/code/modules/food&drinks/food/condiment.dm
+++ b/code/modules/food&drinks/food/condiment.dm
@@ -6,7 +6,7 @@
//Food items that aren't eaten normally and leave an empty container behind.
/obj/item/weapon/reagent_containers/food/condiment
- name = "Condiment Container"
+ name = "condiment container"
desc = "Just your average condiment container."
icon = 'icons/obj/food.dmi'
icon_state = "emptycondiment"
@@ -14,7 +14,16 @@
possible_transfer_amounts = list(1,5,10)
volume = 50
//Possible_states has the reagent id as key and a list of, in order, the icon_state, the name and the desc as values. Used in the on_reagent_change() to change names, descs and sprites.
- var/list/possible_states = list("ketchup" = list("ketchup", "Ketchup", "You feel more American already."), "capsaicin" = list("hotsauce", "Hotsauce", "You can almost TASTE the stomach ulcers now!"), "enzyme" = list("enzyme", "Universal Enzyme", "Used in cooking various dishes"), "soysauce" = list("soysauce", "Soy Sauce", "A salty soy-based flavoring"), "frostoil" = list("coldsauce", "Coldsauce", "Leaves the tongue numb in it's passage"), "sodiumchloride" = list("saltshaker", "Salt Shaker", "Salt. From space oceans, presumably"), "blackpepper" = list("pepermillsmall", "Pepper Mill", "Often used to flavor food or make people sneeze"), "cornoil" = list("oliveoil", "Corn Oil", "A delicious oil used in cooking. Made from corn"), "sugar" = list("emptycondiment", "Sugar", "Tasty spacey sugar!"))
+ var/list/possible_states = list(
+ "ketchup" = list("ketchup", "ketchup bottle", "You feel more American already."),
+ "capsaicin" = list("hotsauce", "hotsauce bottle", "You can almost TASTE the stomach ulcers now!"),
+ "enzyme" = list("enzyme", "universal enzyme bottle", "Used in cooking various dishes"),
+ "soysauce" = list("soysauce", "soy sauce bottle", "A salty soy-based flavoring"),
+ "frostoil" = list("coldsauce", "coldsauce bottle", "Leaves the tongue numb in it's passage"),
+ "sodiumchloride" = list("saltshaker", "salt shaker", "Salt. From space oceans, presumably"),
+ "blackpepper" = list("pepermillsmall", "pepper mill", "Often used to flavor food or make people sneeze"),
+ "cornoil" = list("oliveoil", "corn oil bottle", "A delicious oil used in cooking. Made from corn"),
+ "sugar" = list("emptycondiment", "sugar bottle", "Tasty spacey sugar!"))
/obj/item/weapon/reagent_containers/food/condiment/attackby(obj/item/weapon/W as obj, mob/user as mob)
return
@@ -41,10 +50,10 @@
playsound(M.loc,'sound/items/drink.ogg', rand(10,50), 1)
return 1
- else if( istype(M, /mob/living/carbon/human) )
- visible_message("[user] attempts to feed [M] [src].")
+ else
+ user.visible_message("[user] attempts to feed [M] from [src].")
if(!do_mob(user, M)) return
- visible_message("[user] feeds [M] [src].")
+ user.visible_message("[user] feeds [M] from [src].")
add_logs(user, M, "fed", object="[reagentlist(src)]")
@@ -98,7 +107,7 @@
desc = temp_list[3]
else
- name = "misc Condiment Bottle"
+ name = "condiment bottle"
main_reagent = reagents.get_master_reagent_name()
if (reagents.reagent_list.len==1)
desc = "Looks like it is [lowertext(main_reagent)], but you are not sure."
@@ -107,12 +116,12 @@
icon_state = "mixedcondiments"
else
icon_state = "emptycondiment"
- name = "condiment Bottle"
+ name = "condiment bottle"
desc = "An empty condiment bottle."
return
/obj/item/weapon/reagent_containers/food/condiment/enzyme
- name = "Universal Enzyme"
+ name = "universal enzyme"
desc = "Used in cooking various dishes."
icon_state = "enzyme"
@@ -127,7 +136,7 @@
reagents.add_reagent("sugar", 50)
/obj/item/weapon/reagent_containers/food/condiment/saltshaker //Seperate from above since it's a small shaker rather then
- name = "Salt Shaker" // a large one.
+ name = "salt shaker" // a large one.
desc = "Salt. From space oceans, presumably."
icon_state = "saltshakersmall"
possible_transfer_amounts = list(1,20) //for clown turning the lid off
@@ -139,7 +148,7 @@
reagents.add_reagent("sodiumchloride", 20)
/obj/item/weapon/reagent_containers/food/condiment/peppermill
- name = "Pepper Mill"
+ name = "pepper mill"
desc = "Often used to flavor food or make people sneeze."
icon_state = "peppermillsmall"
possible_transfer_amounts = list(1,20) //for clown turning the lid off
diff --git a/code/modules/food&drinks/food/snacks.dm b/code/modules/food&drinks/food/snacks.dm
index 27f81278994..3cdea87cb8e 100644
--- a/code/modules/food&drinks/food/snacks.dm
+++ b/code/modules/food&drinks/food/snacks.dm
@@ -218,1020 +218,7 @@
// reagents.add_reagent("nutriment", 2) // this line of code for all the contents.
// bitesize = 3 //This is the amount each bite consumes.
-
-////////////////////////////////////////////SALAD////////////////////////////////////////////
-
-/obj/item/weapon/reagent_containers/food/snacks/aesirsalad
- name = "\improper Aesir salad"
- desc = "Probably too incredible for mortal men to fully enjoy."
- icon_state = "aesirsalad"
- trash = /obj/item/trash/snack_bowl
-
-/obj/item/weapon/reagent_containers/food/snacks/aesirsalad/New()
- ..()
- eatverb = pick("crunch","devour","nibble","gnaw","gobble","chomp")
- reagents.add_reagent("nutriment", 8)
- reagents.add_reagent("tricordrazine", 8)
- bitesize = 3
-
-/obj/item/weapon/reagent_containers/food/snacks/herbsalad
- name = "herb salad"
- desc = "A tasty salad with apples on top."
- icon_state = "herbsalad"
- trash = /obj/item/trash/snack_bowl
-
-/obj/item/weapon/reagent_containers/food/snacks/herbsalad/New()
- ..()
- reagents.add_reagent("nutriment", 8)
- bitesize = 3
-
-/obj/item/weapon/reagent_containers/food/snacks/validsalad
- name = "valid salad"
- desc = "It's just an herb salad with meatballs and fried potato slices. Nothing suspicious about it."
- icon_state = "validsalad"
- trash = /obj/item/trash/snack_bowl
-
-/obj/item/weapon/reagent_containers/food/snacks/validsalad/New()
- ..()
- reagents.add_reagent("nutriment", 8)
- reagents.add_reagent("doctorsdelight", 5)
- bitesize = 3
-
-////////////////////////////////////////////DONUTS////////////////////////////////////////////
-
-
-/obj/item/weapon/reagent_containers/food/snacks/donut
- name = "donut"
- icon_state = "donut1"
-
-/obj/item/weapon/reagent_containers/food/snacks/donut/normal
- desc = "Goes great with Robust Coffee."
-
-/obj/item/weapon/reagent_containers/food/snacks/donut/normal/New()
- ..()
- reagents.add_reagent("nutriment", 3)
- reagents.add_reagent("sprinkles", 1)
- src.bitesize = 3
- if(prob(30))
- src.icon_state = "donut2"
- src.name = "frosted donut"
- reagents.add_reagent("sprinkles", 2)
-
-/obj/item/weapon/reagent_containers/food/snacks/donut/chaos
- name = "chaos donut"
- desc = "Like life, it never quite tastes the same."
-
-/obj/item/weapon/reagent_containers/food/snacks/donut/chaos/New()
- ..()
- reagents.add_reagent("nutriment", 2)
- reagents.add_reagent("sprinkles", 1)
- bitesize = 10
- switch(rand(1,10))
- if(1)
- reagents.add_reagent("nutriment", 3)
- if(2)
- reagents.add_reagent("capsaicin", 3)
- if(3)
- reagents.add_reagent("frostoil", 3)
- if(4)
- reagents.add_reagent("sprinkles", 3)
- if(5)
- reagents.add_reagent("plasma", 3)
- if(6)
- reagents.add_reagent("coco", 3)
- if(7)
- reagents.add_reagent("slimejelly", 3)
- if(8)
- reagents.add_reagent("banana", 3)
- if(9)
- reagents.add_reagent("berryjuice", 3)
- if(10)
- reagents.add_reagent("tricordrazine", 3)
- if(prob(30))
- icon_state = "donut2"
- name = "frosted chaos donut"
- reagents.add_reagent("sprinkles", 2)
-
-
-/obj/item/weapon/reagent_containers/food/snacks/donut/jelly
- name = "jelly donut"
- desc = "You jelly?"
- icon_state = "jdonut1"
- bitesize = 5
-
-/obj/item/weapon/reagent_containers/food/snacks/donut/jelly/New()
- ..()
- reagents.add_reagent("nutriment", 3)
- reagents.add_reagent("sprinkles", 1)
- reagents.add_reagent("berryjuice", 5)
- if(prob(30))
- icon_state = "jdonut2"
- name = "Frosted Jelly Donut"
- reagents.add_reagent("sprinkles", 2)
-
-/obj/item/weapon/reagent_containers/food/snacks/donut/slimejelly
- name = "jelly donut"
- desc = "You jelly?"
- icon_state = "jdonut1"
- bitesize = 5
-
-/obj/item/weapon/reagent_containers/food/snacks/donut/slimejelly/New()
- ..()
- reagents.add_reagent("nutriment", 3)
- reagents.add_reagent("sprinkles", 1)
- reagents.add_reagent("slimejelly", 5)
- bitesize = 5
- if(prob(30))
- icon_state = "jdonut2"
- name = "Frosted Jelly Donut"
- reagents.add_reagent("sprinkles", 2)
-
-/obj/item/weapon/reagent_containers/food/snacks/donut/cherryjelly
- name = "jelly donut"
- desc = "You jelly?"
- icon_state = "jdonut1"
- bitesize = 5
-
-/obj/item/weapon/reagent_containers/food/snacks/donut/cherryjelly/New()
- ..()
- reagents.add_reagent("nutriment", 3)
- reagents.add_reagent("sprinkles", 1)
- reagents.add_reagent("cherryjelly", 5)
- if(prob(30))
- icon_state = "jdonut2"
- name = "Frosted Jelly Donut"
- reagents.add_reagent("sprinkles", 2)
-
-////////////////////////////////////////////WAFFLES////////////////////////////////////////////
-
-/obj/item/weapon/reagent_containers/food/snacks/waffles
- name = "waffles"
- desc = "Mmm, waffles."
- icon_state = "waffles"
- trash = /obj/item/trash/waffles
-
-/obj/item/weapon/reagent_containers/food/snacks/waffles/New()
- ..()
- reagents.add_reagent("nutriment", 8)
- bitesize = 2
-
-/obj/item/weapon/reagent_containers/food/snacks/soylentgreen
- name = "\improper Soylent Green"
- desc = "Not made of people. Honest." //Totally people.
- icon_state = "soylent_green"
- trash = /obj/item/trash/waffles
-
-/obj/item/weapon/reagent_containers/food/snacks/soylentgreen/New()
- ..()
- reagents.add_reagent("nutriment", 10)
- bitesize = 2
-
-/obj/item/weapon/reagent_containers/food/snacks/soylenviridians
- name = "\improper Soylent Virdians"
- desc = "Not made of people. Honest." //Actually honest for once.
- icon_state = "soylent_yellow"
- trash = /obj/item/trash/waffles
-
-/obj/item/weapon/reagent_containers/food/snacks/soylenviridians/New()
- ..()
- reagents.add_reagent("nutriment", 10)
- bitesize = 2
-
-/obj/item/weapon/reagent_containers/food/snacks/rofflewaffles
- name = "roffle waffles"
- desc = "Waffles from Roffle. Co."
- icon_state = "rofflewaffles"
- trash = /obj/item/trash/waffles
-
-/obj/item/weapon/reagent_containers/food/snacks/rofflewaffles/New()
- ..()
- reagents.add_reagent("nutriment", 8)
- reagents.add_reagent("mushroomhallucinogen", 8)
- bitesize = 4
-
-////////////////////////////////////////////FISH////////////////////////////////////////////
-
-/obj/item/weapon/reagent_containers/food/snacks/cubancarp
- name = "\improper Cuban carp"
- desc = "A grifftastic sandwich that burns your tongue and then leaves it numb!"
- icon_state = "cubancarp"
- trash = /obj/item/trash/plate
-
-/obj/item/weapon/reagent_containers/food/snacks/cubancarp/New()
- ..()
- reagents.add_reagent("nutriment", 6)
- reagents.add_reagent("carpotoxin", 3)
- reagents.add_reagent("capsaicin", 3)
- bitesize = 3
-
-/obj/item/weapon/reagent_containers/food/snacks/carpmeat
- name = "carp fillet"
- desc = "A fillet of spess carp meat."
- icon_state = "fishfillet"
-
-/obj/item/weapon/reagent_containers/food/snacks/carpmeat/New()
- ..()
- eatverb = pick("bite","chew","choke down","gnaw","swallow","chomp")
- reagents.add_reagent("nutriment", 3)
- reagents.add_reagent("carpotoxin", 3)
- bitesize = 6
-
-/obj/item/weapon/reagent_containers/food/snacks/carpmeat/imitation
- name = "imitation carp fillet"
- desc = "Almost just like the real thing, kinda."
-
-/obj/item/weapon/reagent_containers/food/snacks/fishfingers
- name = "fish fingers"
- desc = "A finger of fish."
- icon_state = "fishfingers"
-
-/obj/item/weapon/reagent_containers/food/snacks/fishfingers/New()
- ..()
- reagents.add_reagent("nutriment", 4)
- reagents.add_reagent("carpotoxin", 3)
- bitesize = 3
-
-/obj/item/weapon/reagent_containers/food/snacks/fishandchips
- name = "fish and chips"
- desc = "I do say so myself chap."
- icon_state = "fishandchips"
-
-/obj/item/weapon/reagent_containers/food/snacks/fishandchips/New()
- ..()
- reagents.add_reagent("nutriment", 6)
- reagents.add_reagent("carpotoxin", 3)
- bitesize = 3
-
-////////////////////////////////////////////EGGS////////////////////////////////////////////
-
-/obj/item/weapon/reagent_containers/food/snacks/chocolateegg
- name = "chocolate egg"
- desc = "Such, sweet, fattening food."
- icon_state = "chocolateegg"
-
-/obj/item/weapon/reagent_containers/food/snacks/chocolateegg/New()
- ..()
- reagents.add_reagent("nutriment", 4)
- reagents.add_reagent("sugar", 2)
- reagents.add_reagent("coco", 2)
- bitesize = 2
-
-/obj/item/weapon/reagent_containers/food/snacks/egg
- name = "egg"
- desc = "An egg!"
- icon_state = "egg"
-
-/obj/item/weapon/reagent_containers/food/snacks/egg/New()
- ..()
- reagents.add_reagent("nutriment", 1)
-
-/obj/item/weapon/reagent_containers/food/snacks/egg/throw_impact(atom/hit_atom)
- ..()
- new/obj/effect/decal/cleanable/egg_smudge(src.loc)
- reagents.reaction(hit_atom, TOUCH)
- del(src) // Not qdel, because it'll hit other mobs then the floor for runtimes.
-
-/obj/item/weapon/reagent_containers/food/snacks/egg/attackby(obj/item/weapon/W as obj, mob/user as mob)
- if(istype( W, /obj/item/toy/crayon ))
- var/obj/item/toy/crayon/C = W
- var/clr = C.colourName
-
- if(!(clr in list("blue", "green", "mime", "orange", "purple", "rainbow", "red", "yellow")))
- usr << "[src] refuses to take on this colour!"
- return
-
- usr << "You colour [src] [clr]."
- icon_state = "egg-[clr]"
- item_color = clr
- else
- ..()
-
-/obj/item/weapon/reagent_containers/food/snacks/egg/blue
- icon_state = "egg-blue"
- item_color = "blue"
-
-/obj/item/weapon/reagent_containers/food/snacks/egg/green
- icon_state = "egg-green"
- item_color = "green"
-
-/obj/item/weapon/reagent_containers/food/snacks/egg/mime
- icon_state = "egg-mime"
- item_color = "mime"
-
-/obj/item/weapon/reagent_containers/food/snacks/egg/orange
- icon_state = "egg-orange"
- item_color = "orange"
-
-/obj/item/weapon/reagent_containers/food/snacks/egg/purple
- icon_state = "egg-purple"
- item_color = "purple"
-
-/obj/item/weapon/reagent_containers/food/snacks/egg/rainbow
- icon_state = "egg-rainbow"
- item_color = "rainbow"
-
-/obj/item/weapon/reagent_containers/food/snacks/egg/red
- icon_state = "egg-red"
- item_color = "red"
-
-/obj/item/weapon/reagent_containers/food/snacks/egg/yellow
- icon_state = "egg-yellow"
- item_color = "yellow"
-
-/obj/item/weapon/reagent_containers/food/snacks/friedegg
- name = "fried egg"
- desc = "A fried egg, with a touch of salt and pepper."
- icon_state = "friedegg"
-
-/obj/item/weapon/reagent_containers/food/snacks/friedegg/New()
- ..()
- reagents.add_reagent("nutriment", 2)
- reagents.add_reagent("sodiumchloride", 1)
- reagents.add_reagent("blackpepper", 1)
- bitesize = 1
-
-/obj/item/weapon/reagent_containers/food/snacks/boiledegg
- name = "boiled egg"
- desc = "A hard boiled egg."
- icon_state = "egg"
-
-/obj/item/weapon/reagent_containers/food/snacks/boiledegg/New()
- ..()
- reagents.add_reagent("nutriment", 2)
-
-/obj/item/weapon/reagent_containers/food/snacks/omelette //FUCK THIS
- name = "omelette du fromage"
- desc = "That's all you can say!"
- icon_state = "omelette"
- trash = /obj/item/trash/plate
-
-/obj/item/weapon/reagent_containers/food/snacks/omelette/New()
- ..()
- reagents.add_reagent("nutriment", 8)
- bitesize = 1
-
-/obj/item/weapon/reagent_containers/food/snacks/omelette/attackby(obj/item/weapon/W, mob/user)
- if(istype(W,/obj/item/weapon/kitchen/utensil/fork))
- if(W.icon_state == "forkloaded")
- user << "You already have omelette on your fork."
- return
- W.icon_state = "forkloaded"
- user.visible_message( \
- "[user] takes a piece of omelette with their fork!", \
- "You take a piece of omelette with your fork!" \
- )
- reagents.remove_reagent("nutriment", 1)
- if(reagents.total_volume <= 0)
- qdel(src)
-
-/obj/item/weapon/reagent_containers/food/snacks/benedict
- name = "eggs benedict"
- desc = "There is only one egg on this, how rude."
- icon_state = "benedict"
-
-/obj/item/weapon/reagent_containers/food/snacks/benedict/New()
- ..()
- reagents.add_reagent("nutriment", 6)
- bitesize = 3
-
-////////////////////////////////////////////MUFFINS////////////////////////////////////////////
-
-/obj/item/weapon/reagent_containers/food/snacks/muffin
- name = "muffin"
- desc = "A delicious and spongy little cake."
- icon_state = "muffin"
-
-/obj/item/weapon/reagent_containers/food/snacks/muffin/New()
- ..()
- reagents.add_reagent("nutriment", 6)
- bitesize = 2
-
-/obj/item/weapon/reagent_containers/food/snacks/muffin/berry
- name = "berry muffin"
- icon_state = "berrymuffin"
- desc = "A delicious and spongy little cake, with berries."
-
-/obj/item/weapon/reagent_containers/food/snacks/muffin/booberry
- name = "booberry muffin"
- icon_state = "berrymuffin"
- alpha = 125
- desc = "My stomach is a graveyard! No living being can quench my bloodthirst!"
-
-////////////////////////////////////////////OTHER////////////////////////////////////////////
-
-/obj/item/weapon/reagent_containers/food/snacks/candy
- name = "candy"
- desc = "Nougat love it or hate it."
- icon_state = "candy"
- trash = /obj/item/trash/candy
-
-/obj/item/weapon/reagent_containers/food/snacks/candy/New()
- ..()
- reagents.add_reagent("nutriment", 1)
- reagents.add_reagent("sugar", 3)
- bitesize = 2
-
-/obj/item/weapon/reagent_containers/food/snacks/candy_corn
- name = "candy corn"
- desc = "It's a handful of candy corn. Can be stored in a detective's hat."
- icon_state = "candy_corn"
-
-/obj/item/weapon/reagent_containers/food/snacks/candy_corn/New()
- ..()
- reagents.add_reagent("nutriment", 4)
- reagents.add_reagent("sugar", 2)
- bitesize = 2
-
-/obj/item/weapon/reagent_containers/food/snacks/chips
- name = "chips"
- desc = "Commander Riker's What-The-Crisps"
- icon_state = "chips"
- trash = /obj/item/trash/chips
-
-/obj/item/weapon/reagent_containers/food/snacks/chips/New()
- ..()
- reagents.add_reagent("nutriment", 3)
- bitesize = 1
-
-/obj/item/weapon/reagent_containers/food/snacks/cookie
- name = "cookie"
- desc = "COOKIE!!!"
- icon_state = "COOKIE!!!"
-
-/obj/item/weapon/reagent_containers/food/snacks/cookie/New()
- ..()
- reagents.add_reagent("nutriment", 5)
- bitesize = 1
-
-/obj/item/weapon/reagent_containers/food/snacks/chocolatebar
- name = "chocolate bar"
- desc = "Such, sweet, fattening food."
- icon_state = "chocolatebarunwrapped"
- wrapped = 0
- bitesize = 2
-
-/obj/item/weapon/reagent_containers/food/snacks/chocolatebar/New()
- ..()
- reagents.add_reagent("nutriment", 3)
- reagents.add_reagent("sugar", 2)
- reagents.add_reagent("coco", 2)
-
-/obj/item/weapon/reagent_containers/food/snacks/chocolatebar/attack_self(mob/user)
- if(wrapped)
- Unwrap(user)
- else
- ..()
-
-/obj/item/weapon/reagent_containers/food/snacks/chocolatebar/proc/Unwrap(mob/user)
- icon_state = "chocolatebarunwrapped"
- desc = "It won't make you all sticky."
- user << "You remove the foil."
- wrapped = 0
-
-
-/obj/item/weapon/reagent_containers/food/snacks/chocolatebar/wrapped
- desc = "It's wrapped in some foil."
- icon_state = "chocolatebar"
- wrapped = 1
-
-/obj/item/weapon/reagent_containers/food/snacks/tofu
- name = "tofu"
- desc = "We all love tofu."
- icon_state = "tofu"
-
-/obj/item/weapon/reagent_containers/food/snacks/tofu/New()
- ..()
- reagents.add_reagent("nutriment", 3)
- bitesize = 3
-
-/obj/item/weapon/reagent_containers/food/snacks/hugemushroomslice
- name = "huge mushroom slice"
- desc = "A slice from a huge mushroom."
- icon_state = "hugemushroomslice"
-
-/obj/item/weapon/reagent_containers/food/snacks/hugemushroomslice/New()
- ..()
- reagents.add_reagent("nutriment", 3)
- src.bitesize = 3
-
-/obj/item/weapon/reagent_containers/food/snacks/tomatomeat
- name = "tomato slice"
- desc = "A slice from a huge tomato."
- icon_state = "tomatomeat"
-
-/obj/item/weapon/reagent_containers/food/snacks/tomatomeat/New()
- ..()
- reagents.add_reagent("nutriment", 3)
- src.bitesize = 3
-
-/obj/item/weapon/reagent_containers/food/snacks/bearmeat
- name = "bear meat"
- desc = "A very manly slab of meat."
- icon_state = "bearmeat"
-
-/obj/item/weapon/reagent_containers/food/snacks/bearmeat/New()
- ..()
- reagents.add_reagent("nutriment", 12)
- reagents.add_reagent("hyperzine", 5)
- src.bitesize = 3
-
-/obj/item/weapon/reagent_containers/food/snacks/xenomeat
- name = "meat"
- desc = "A slab of meat"
- icon_state = "xenomeat"
-
-/obj/item/weapon/reagent_containers/food/snacks/xenomeat/New()
- ..()
- reagents.add_reagent("nutriment", 3)
- src.bitesize = 3
-
-/obj/item/weapon/reagent_containers/food/snacks/spidermeat
- name = "spider meat"
- desc = "A slab of spider meat."
- icon_state = "spidermeat"
-
-/obj/item/weapon/reagent_containers/food/snacks/spidermeat/New()
- ..()
- reagents.add_reagent("nutriment", 3)
- reagents.add_reagent("toxin", 3)
- bitesize = 3
-
-/obj/item/weapon/reagent_containers/food/snacks/spiderleg
- name = "spider leg"
- desc = "A still twitching leg of a giant spider... you don't really want to eat this, do you?"
- icon_state = "spiderleg"
-
-/obj/item/weapon/reagent_containers/food/snacks/spiderleg/New()
- ..()
- reagents.add_reagent("nutriment", 2)
- reagents.add_reagent("toxin", 2)
- bitesize = 2
-
-/obj/item/weapon/reagent_containers/food/snacks/cornedbeef
- name = "corned beef and cabbage"
- desc = "Now you can feel like a real tourist vacationing in Ireland."
- icon_state = "cornedbeef"
- trash = /obj/item/trash/plate
-
-/obj/item/weapon/reagent_containers/food/snacks/cornedbeef/New()
- ..()
- reagents.add_reagent("nutriment", 6)
- bitesize = 3
-
-/obj/item/weapon/reagent_containers/food/snacks/faggot
- name = "faggot"
- desc = "A great meal all round. Not a cord of wood."
- icon_state = "faggot"
-
-/obj/item/weapon/reagent_containers/food/snacks/faggot/New()
- ..()
- reagents.add_reagent("nutriment", 3)
- bitesize = 2
-
-/obj/item/weapon/reagent_containers/food/snacks/sausage
- name = "sausage"
- desc = "A piece of mixed, long meat."
- icon_state = "sausage"
-
-/obj/item/weapon/reagent_containers/food/snacks/sausage/New()
- ..()
- eatverb = pick("bite","chew","nibble","deep throat","gobble","chomp")
- reagents.add_reagent("nutriment", 6)
- bitesize = 2
-
-/obj/item/weapon/reagent_containers/food/snacks/donkpocket
- name = "\improper Donk-pocket"
- desc = "The food of choice for the seasoned traitor."
- icon_state = "donkpocket"
- var/warm = 0
-
-/obj/item/weapon/reagent_containers/food/snacks/donkpocket/New()
- ..()
- reagents.add_reagent("nutriment", 4)
-
-
-
-/obj/item/weapon/reagent_containers/food/snacks/donkpocket/proc/cooltime() //Not working, derp?
- if(warm)
- spawn(4200) //ew
- warm = 0
- reagents.del_reagent("tricordrazine")
- name = initial(name)
- return
-
-/obj/item/weapon/reagent_containers/food/snacks/wingfangchu
- name = "wing fang chu"
- desc = "A savory dish of alien wing wang in soy."
- icon_state = "wingfangchu"
- trash = /obj/item/trash/snack_bowl
-
-/obj/item/weapon/reagent_containers/food/snacks/wingfangchu/New()
- ..()
- reagents.add_reagent("nutriment", 6)
- bitesize = 2
-
-/obj/item/weapon/reagent_containers/food/snacks/human/kebab
- name = "-kebab"
- icon_state = "kebab"
- desc = "A human meat, on a stick."
- trash = /obj/item/stack/rods
-
-/obj/item/weapon/reagent_containers/food/snacks/human/kebab/New()
- ..()
- reagents.add_reagent("nutriment", 8)
- bitesize = 2
-
-/obj/item/weapon/reagent_containers/food/snacks/monkeykebab
- name = "meat-kebab"
- icon_state = "kebab"
- desc = "Delicious meat, on a stick."
- trash = /obj/item/stack/rods
-
-/obj/item/weapon/reagent_containers/food/snacks/monkeykebab/New()
- ..()
- reagents.add_reagent("nutriment", 8)
- bitesize = 2
-
-/obj/item/weapon/reagent_containers/food/snacks/tofukebab
- name = "tofu-kebab"
- icon_state = "kebab"
- desc = "Vegan meat, on a stick."
- trash = /obj/item/stack/rods
-
-/obj/item/weapon/reagent_containers/food/snacks/tofukebab/New()
- ..()
- reagents.add_reagent("nutriment", 8)
- bitesize = 2
-
-/obj/item/weapon/reagent_containers/food/snacks/popcorn
- name = "popcorn"
- desc = "Now let's find some cinema."
- icon_state = "popcorn"
- trash = /obj/item/trash/popcorn
- var/unpopped = 0
-
-/obj/item/weapon/reagent_containers/food/snacks/popcorn/New()
- ..()
- eatverb = pick("bite","crunch","nibble","gnaw","gobble","chomp")
- unpopped = rand(1,10)
- reagents.add_reagent("nutriment", 2)
- bitesize = 0.1 //this snack is supposed to be eating during looooong time. And this it not dinner food! --rastaf0
-
-/obj/item/weapon/reagent_containers/food/snacks/popcorn/On_Consume()
- if(prob(unpopped)) //lol ...what's the point? << AINT SO POINTLESS NO MORE
- usr << "You bite down on an un-popped kernel, and it hurts your teeth!"
- unpopped = max(0, unpopped-1)
- reagents.add_reagent("sacid",0.1) //only a little tingle.
- ..()
-
-
-/obj/item/weapon/reagent_containers/food/snacks/sosjerky
- name = "\improper Scaredy's Private Reserve Beef Jerky"
- icon_state = "sosjerky"
- desc = "Beef jerky made from the finest space cows."
- trash = /obj/item/trash/sosjerky
-
-/obj/item/weapon/reagent_containers/food/snacks/sosjerky/New()
- ..()
- reagents.add_reagent("nutriment", 4)
- bitesize = 2
-
-/obj/item/weapon/reagent_containers/food/snacks/no_raisin
- name = "4no raisins"
- icon_state = "4no_raisins"
- desc = "Best raisins in the universe. Not sure why."
- trash = /obj/item/trash/raisins
-
-/obj/item/weapon/reagent_containers/food/snacks/no_raisin/New()
- ..()
- reagents.add_reagent("nutriment", 6)
-
-/obj/item/weapon/reagent_containers/food/snacks/spacetwinkie
- name = "space twinkie"
- icon_state = "space_twinkie"
- desc = "Guaranteed to survive longer than you will."
-
-/obj/item/weapon/reagent_containers/food/snacks/spacetwinkie/New()
- ..()
- reagents.add_reagent("sugar", 4)
- bitesize = 2
-
-/obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers
- name = "cheesie honkers"
- desc = "Bite sized cheesie snacks that will honk all over your mouth."
- icon_state = "cheesie_honkers"
- trash = /obj/item/trash/cheesie
-
-/obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers/New()
- ..()
- reagents.add_reagent("nutriment", 4)
- bitesize = 2
-
-/obj/item/weapon/reagent_containers/food/snacks/syndicake
- name = "syndi-cakes"
- icon_state = "syndi_cakes"
- desc = "An extremely moist snack cake that tastes just as good after being nuked."
- trash = /obj/item/trash/syndi_cakes
-
-/obj/item/weapon/reagent_containers/food/snacks/syndicake/New()
- ..()
- reagents.add_reagent("nutriment", 4)
- reagents.add_reagent("doctorsdelight", 5)
- bitesize = 3
-
-/obj/item/weapon/reagent_containers/food/snacks/loadedbakedpotato
- name = "loaded baked potato"
- desc = "Totally baked."
- icon_state = "loadedbakedpotato"
-
-/obj/item/weapon/reagent_containers/food/snacks/loadedbakedpotato/New()
- ..()
- reagents.add_reagent("nutriment", 6)
- bitesize = 2
-
-/obj/item/weapon/reagent_containers/food/snacks/fries
- name = "space fries"
- desc = "AKA: French Fries, Freedom Fries, etc."
- icon_state = "fries"
- trash = /obj/item/trash/plate
-
-/obj/item/weapon/reagent_containers/food/snacks/fries/New()
- ..()
- reagents.add_reagent("nutriment", 4)
- bitesize = 2
-
-/obj/item/weapon/reagent_containers/food/snacks/soydope
- name = "soy dope"
- desc = "Dope from a soy."
- icon_state = "soydope"
- trash = /obj/item/trash/plate
-
-/obj/item/weapon/reagent_containers/food/snacks/soydope/New()
- ..()
- reagents.add_reagent("nutriment", 2)
- bitesize = 2
-
-/obj/item/weapon/reagent_containers/food/snacks/cheesyfries
- name = "cheesy fries"
- desc = "Fries. Covered in cheese. Duh."
- icon_state = "cheesyfries"
- trash = /obj/item/trash/plate
-
-/obj/item/weapon/reagent_containers/food/snacks/cheesyfries/New()
- ..()
- reagents.add_reagent("nutriment", 6)
- bitesize = 2
-
-/obj/item/weapon/reagent_containers/food/snacks/fortunecookie
- name = "fortune cookie"
- desc = "A true prophecy in each cookie!"
- icon_state = "fortune_cookie"
-
-/obj/item/weapon/reagent_containers/food/snacks/fortunecookie/New()
- ..()
- reagents.add_reagent("nutriment", 3)
- bitesize = 2
-
-/obj/item/weapon/reagent_containers/food/snacks/badrecipe
- name = "burned mess"
- desc = "Someone should be demoted from chef for this."
- icon_state = "badrecipe"
-
-/obj/item/weapon/reagent_containers/food/snacks/badrecipe/New()
- ..()
- eatverb = pick("choke down","nibble","gnaw","chomp")
- reagents.add_reagent("toxin", 1)
- reagents.add_reagent("carbon", 3)
- bitesize = 2
-
-/obj/item/weapon/reagent_containers/food/snacks/meatsteak
- name = "meat steak"
- desc = "A piece of hot spicy meat."
- icon_state = "meatsteak"
- trash = /obj/item/trash/plate
-
-/obj/item/weapon/reagent_containers/food/snacks/meatsteak/New()
- ..()
- reagents.add_reagent("nutriment", 4)
- reagents.add_reagent("sodiumchloride", 1)
- reagents.add_reagent("blackpepper", 1)
- bitesize = 3
-
-/obj/item/weapon/reagent_containers/food/snacks/spacylibertyduff
- name = "spacy liberty duff"
- desc = "Jello gelatin, from Alfred Hubbard's cookbook."
- icon_state = "spacylibertyduff"
- trash = /obj/item/trash/snack_bowl
-
-/obj/item/weapon/reagent_containers/food/snacks/spacylibertyduff/New()
- ..()
- reagents.add_reagent("nutriment", 6)
- reagents.add_reagent("mushroomhallucinogen", 6)
- bitesize = 3
-
-/obj/item/weapon/reagent_containers/food/snacks/amanitajelly
- name = "amanita jelly"
- desc = "Looks curiously toxic."
- icon_state = "amanitajelly"
- trash = /obj/item/trash/snack_bowl
-
-/obj/item/weapon/reagent_containers/food/snacks/amanitajelly/New()
- ..()
- reagents.add_reagent("nutriment", 6)
- reagents.add_reagent("amatoxin", 6)
- reagents.add_reagent("mushroomhallucinogen", 3)
- bitesize = 3
-
-/obj/item/weapon/reagent_containers/food/snacks/poppypretzel
- name = "poppy pretzel"
- desc = "It's all twisted up!"
- icon_state = "poppypretzel"
- bitesize = 2
-
-/obj/item/weapon/reagent_containers/food/snacks/poppypretzel/New()
- ..()
- reagents.add_reagent("nutriment", 5)
- bitesize = 2
-
-/* No more of this
-/obj/item/weapon/reagent_containers/food/snacks/telebacon
- name = "tele bacon"
- desc = "It tastes a little odd but it is still delicious."
- icon_state = "bacon"
- var/obj/item/device/radio/beacon/bacon/baconbeacon
- bitesize = 2
-
-/obj/item/weapon/reagent_containers/food/snacks/telebacon/New()
- ..()
- reagents.add_reagent("nutriment", 4)
- baconbeacon = new /obj/item/device/radio/beacon/bacon(src)
-/obj/item/weapon/reagent_containers/food/snacks/telebacon/On_Consume()
- if(!reagents.total_volume)
- baconbeacon.loc = usr
- baconbeacon.digest_delay()
-*/
-
-/obj/item/weapon/reagent_containers/food/snacks/monkeycube
- name = "monkey cube"
- desc = "Just add water!"
- icon_state = "monkeycube"
- bitesize = 12
- wrapped = 0
-
-/obj/item/weapon/reagent_containers/food/snacks/monkeycube/New()
- ..()
- reagents.add_reagent("nutriment",10)
-
-/obj/item/weapon/reagent_containers/food/snacks/monkeycube/afterattack(obj/O, mob/user,proximity)
- if(!proximity) return
- if(istype(O,/obj/structure/sink) && !wrapped)
- user << "You place [src] under a stream of water..."
- user.drop_item()
- loc = get_turf(O)
- return Expand()
- ..()
-
-/obj/item/weapon/reagent_containers/food/snacks/monkeycube/attack_self(mob/user)
- if(wrapped)
- Unwrap(user)
-
-/obj/item/weapon/reagent_containers/food/snacks/monkeycube/proc/Expand()
- visible_message("[src] expands!")
- new /mob/living/carbon/monkey(get_turf(src))
- qdel(src)
-
-/obj/item/weapon/reagent_containers/food/snacks/monkeycube/proc/Unwrap(mob/user)
- icon_state = "monkeycube"
- desc = "Just add water!"
- user << "You unwrap the cube."
- wrapped = 0
-
-
-/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped
- desc = "Still wrapped in some paper."
- icon_state = "monkeycubewrap"
- wrapped = 1
-
-/obj/item/weapon/reagent_containers/food/snacks/enchiladas
- name = "enchiladas"
- desc = "Viva La Mexico!"
- icon_state = "enchiladas"
-
-/obj/item/weapon/reagent_containers/food/snacks/enchiladas/New()
- ..()
- reagents.add_reagent("nutriment",8)
- reagents.add_reagent("capsaicin", 6)
- bitesize = 4
-
-/obj/item/weapon/reagent_containers/food/snacks/stew
- name = "stew"
- desc = "A nice and warm stew. Healthy and strong."
- icon_state = "stew"
- trash = /obj/item/trash/snack_bowl
-
-/obj/item/weapon/reagent_containers/food/snacks/stew/New()
- ..()
- eatverb = pick("slurp","sip","suck","inhale","drink")
- reagents.add_reagent("nutriment", 10)
- reagents.add_reagent("tomatojuice", 5)
- reagents.add_reagent("imidazoline", 5)
- reagents.add_reagent("water", 5)
- bitesize = 10
-
-/obj/item/weapon/reagent_containers/food/snacks/stewedsoymeat
- name = "stewed soy meat"
- desc = "Even non-vegetarians will LOVE this!"
- icon_state = "stewedsoymeat"
- trash = /obj/item/trash/plate
-
-/obj/item/weapon/reagent_containers/food/snacks/stewedsoymeat/New()
- ..()
- eatverb = pick("slurp","sip","suck","inhale","drink")
- reagents.add_reagent("nutriment", 8)
- bitesize = 2
-
-/obj/item/weapon/reagent_containers/food/snacks/carrotfries
- name = "carrot fries"
- desc = "Tasty fries from fresh Carrots."
- icon_state = "carrotfries"
- trash = /obj/item/trash/plate
-
-/obj/item/weapon/reagent_containers/food/snacks/carrotfries/New()
- ..()
- reagents.add_reagent("nutriment", 3)
- reagents.add_reagent("imidazoline", 3)
- bitesize = 2
-
-/obj/item/weapon/reagent_containers/food/snacks/candiedapple
- name = "candied apple"
- desc = "An apple coated in sugary sweetness."
- icon_state = "candiedapple"
-
-/obj/item/weapon/reagent_containers/food/snacks/candiedapple/New()
- ..()
- reagents.add_reagent("nutriment", 3)
- bitesize = 3
-
-/*
-/obj/item/weapon/reagent_containers/food/snacks/boiledslimecore
- name = "Boiled slime Core"
- desc = "A boiled red thing."
- icon_state = "boiledslimecore"
-
-/obj/item/weapon/reagent_containers/food/snacks/boiledslimecore/New()
- ..()
- reagents.add_reagent("slimejelly", 5)
- bitesize = 3
-*/
-/obj/item/weapon/reagent_containers/food/snacks/mint
- name = "mint"
- desc = "it is only wafer thin."
- icon_state = "mint"
-
-/obj/item/weapon/reagent_containers/food/snacks/mint/New()
- ..()
- reagents.add_reagent("minttoxin", 1)
- bitesize = 1
-
-/obj/item/weapon/reagent_containers/food/snacks/plumphelmetbiscuit
- name = "plump helmet biscuit"
- desc = "This is a finely-prepared plump helmet biscuit. The ingredients are exceptionally minced plump helmet, and well-minced dwarven wheat flour."
- icon_state = "phelmbiscuit"
-
-/obj/item/weapon/reagent_containers/food/snacks/plumphelmetbiscuit/New()
- ..()
- if(prob(10))
- name = "exceptional plump helmet biscuit"
- desc = "Microwave is taken by a fey mood! It has cooked an exceptional plump helmet biscuit!"
- reagents.add_reagent("nutriment", 8)
- reagents.add_reagent("tricordrazine", 5)
- bitesize = 2
- else
- reagents.add_reagent("nutriment", 5)
- bitesize = 2
-
-/obj/item/weapon/reagent_containers/food/snacks/chawanmushi
- name = "chawanmushi"
- desc = "A legendary egg custard that makes friends out of enemies. Probably too hot for a cat to eat."
- icon_state = "chawanmushi"
- trash = /obj/item/trash/snack_bowl
-
-/obj/item/weapon/reagent_containers/food/snacks/chawanmushi/New()
- ..()
- reagents.add_reagent("nutriment", 5)
- bitesize = 1
-
-/obj/item/weapon/reagent_containers/food/snacks/appletart
- name = "golden apple streusel tart"
- desc = "A tasty dessert that won't make it through a metal detector."
- icon_state = "gappletart"
- trash = /obj/item/trash/plate
-
-/obj/item/weapon/reagent_containers/food/snacks/appletart/New()
- ..()
- reagents.add_reagent("nutriment", 8)
- reagents.add_reagent("gold", 5)
- bitesize = 3
+//All foods (except slicable, since they have unique procs) are distributed among various categories. Use common sense.
/////////////////////////////////////////////////Sliceable////////////////////////////////////////
// All the food items that can be sliced into smaller bits like Meatbread and Cheesewheels
@@ -1278,115 +265,4 @@
name = "watermelon slice"
desc = "A slice of watery goodness."
icon_state = "watermelonslice"
- bitesize = 2
-
-/obj/item/weapon/reagent_containers/food/snacks/cracker
- name = "cracker"
- desc = "It's a salted cracker."
- icon_state = "cracker"
-
-/obj/item/weapon/reagent_containers/food/snacks/cracker/New()
- ..()
- reagents.add_reagent("nutriment", 1)
-
-
-////////////////////////////////FOOD ADDITIONS////////////////////////////////////////////
-
-/obj/item/weapon/reagent_containers/food/snacks/wrap
- name = "egg wrap"
- desc = "The precursor to Pigs in a Blanket."
- icon_state = "wrap"
-
-/obj/item/weapon/reagent_containers/food/snacks/wrap/New()
- ..()
- reagents.add_reagent("nutriment", 5)
- bitesize = 2
-
-/obj/item/weapon/reagent_containers/food/snacks/beans
- name = "tin of beans"
- desc = "Musical fruit in a slightly less musical container."
- icon_state = "beans"
-
-/obj/item/weapon/reagent_containers/food/snacks/beans/New()
- ..()
- reagents.add_reagent("nutriment", 10)
- bitesize = 2
-
-/obj/item/weapon/reagent_containers/food/snacks/hotdog
- name = "hotdog"
- desc = "Fresh footlong ready to go down on."
- icon_state = "hotdog"
-
-/obj/item/weapon/reagent_containers/food/snacks/hotdog/New()
- ..()
- reagents.add_reagent("nutriment", 6)
- reagents.add_reagent("ketchup", 3)
- bitesize = 3
-
-/obj/item/weapon/reagent_containers/food/snacks/meatbun
- name = "meat bun"
- desc = "Has the potential to not be Dog."
- icon_state = "meatbun"
-
-/obj/item/weapon/reagent_containers/food/snacks/meatbun/New()
- ..()
- reagents.add_reagent("nutriment", 6)
- bitesize = 6
-
-/obj/item/weapon/reagent_containers/food/snacks/sugarcookie
- name = "sugar cookie"
- desc = "Just like your little sister used to make."
- icon_state = "sugarcookie"
-
-/obj/item/weapon/reagent_containers/food/snacks/sugarcookie/New()
- ..()
- reagents.add_reagent("nutriment", 2)
- reagents.add_reagent("sugar", 5)
- bitesize = 2
-
-/obj/item/weapon/reagent_containers/food/snacks/boiledspiderleg
- name = "boiled spider leg"
- desc = "A giant spider's leg that's still twitching after being cooked. Gross!"
- icon_state = "spiderlegcooked"
- trash = /obj/item/trash/plate
-
-/obj/item/weapon/reagent_containers/food/snacks/boiledspiderleg/New()
- ..()
- reagents.add_reagent("nutriment", 3)
- reagents.add_reagent("toxin", 2)
- bitesize = 3
-
-/obj/item/weapon/reagent_containers/food/snacks/spidereggs
- name = "spider eggs"
- desc = "A cluster of juicy spider eggs. A great side dish for when you care not for your health."
- icon_state = "spidereggs"
-
-/obj/item/weapon/reagent_containers/food/snacks/spidereggs/New()
- ..()
- reagents.add_reagent("nutriment", 2)
- reagents.add_reagent("toxin", 3)
- bitesize = 2
-
-/obj/item/weapon/reagent_containers/food/snacks/spidereggsham
- name = "green eggs and ham"
- desc = "Would you eat them on a train? Would you eat them on a plane? Would you eat them on a state of the art corporate deathtrap floating through space?"
- icon_state = "spidereggsham"
- trash = /obj/item/trash/plate
-
-/obj/item/weapon/reagent_containers/food/snacks/spidereggsham/New()
- ..()
- reagents.add_reagent("nutriment", 6)
- reagents.add_reagent("sodiumchloride", 1)
- reagents.add_reagent("toxin", 3)
- bitesize = 4
-
-/obj/item/weapon/reagent_containers/food/snacks/sashimi
- name = "carp sashimi"
- desc = "Celebrate surviving attack from hostile alien lifeforms by hospitalising yourself."
- icon_state = "sashimi"
-
-/obj/item/weapon/reagent_containers/food/snacks/sashimi/New()
- ..()
- reagents.add_reagent("nutriment", 6)
- reagents.add_reagent("toxin", 5)
- bitesize = 3
+ bitesize = 2
\ No newline at end of file
diff --git a/code/modules/food&drinks/food/snacks_egg.dm b/code/modules/food&drinks/food/snacks_egg.dm
new file mode 100644
index 00000000000..fccf13f8e11
--- /dev/null
+++ b/code/modules/food&drinks/food/snacks_egg.dm
@@ -0,0 +1,132 @@
+
+////////////////////////////////////////////EGGS////////////////////////////////////////////
+
+/obj/item/weapon/reagent_containers/food/snacks/chocolateegg
+ name = "chocolate egg"
+ desc = "Such, sweet, fattening food."
+ icon_state = "chocolateegg"
+
+/obj/item/weapon/reagent_containers/food/snacks/chocolateegg/New()
+ ..()
+ reagents.add_reagent("nutriment", 4)
+ reagents.add_reagent("sugar", 2)
+ reagents.add_reagent("coco", 2)
+ bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/egg
+ name = "egg"
+ desc = "An egg!"
+ icon_state = "egg"
+
+/obj/item/weapon/reagent_containers/food/snacks/egg/New()
+ ..()
+ reagents.add_reagent("nutriment", 1)
+
+/obj/item/weapon/reagent_containers/food/snacks/egg/throw_impact(atom/hit_atom)
+ ..()
+ new/obj/effect/decal/cleanable/egg_smudge(src.loc)
+ reagents.reaction(hit_atom, TOUCH)
+ del(src) // Not qdel, because it'll hit other mobs then the floor for runtimes.
+
+/obj/item/weapon/reagent_containers/food/snacks/egg/attackby(obj/item/weapon/W as obj, mob/user as mob)
+ if(istype( W, /obj/item/toy/crayon ))
+ var/obj/item/toy/crayon/C = W
+ var/clr = C.colourName
+
+ if(!(clr in list("blue", "green", "mime", "orange", "purple", "rainbow", "red", "yellow")))
+ usr << "[src] refuses to take on this colour!"
+ return
+
+ usr << "You colour [src] [clr]."
+ icon_state = "egg-[clr]"
+ item_color = clr
+ else
+ ..()
+
+/obj/item/weapon/reagent_containers/food/snacks/egg/blue
+ icon_state = "egg-blue"
+ item_color = "blue"
+
+/obj/item/weapon/reagent_containers/food/snacks/egg/green
+ icon_state = "egg-green"
+ item_color = "green"
+
+/obj/item/weapon/reagent_containers/food/snacks/egg/mime
+ icon_state = "egg-mime"
+ item_color = "mime"
+
+/obj/item/weapon/reagent_containers/food/snacks/egg/orange
+ icon_state = "egg-orange"
+ item_color = "orange"
+
+/obj/item/weapon/reagent_containers/food/snacks/egg/purple
+ icon_state = "egg-purple"
+ item_color = "purple"
+
+/obj/item/weapon/reagent_containers/food/snacks/egg/rainbow
+ icon_state = "egg-rainbow"
+ item_color = "rainbow"
+
+/obj/item/weapon/reagent_containers/food/snacks/egg/red
+ icon_state = "egg-red"
+ item_color = "red"
+
+/obj/item/weapon/reagent_containers/food/snacks/egg/yellow
+ icon_state = "egg-yellow"
+ item_color = "yellow"
+
+/obj/item/weapon/reagent_containers/food/snacks/friedegg
+ name = "fried egg"
+ desc = "A fried egg, with a touch of salt and pepper."
+ icon_state = "friedegg"
+
+/obj/item/weapon/reagent_containers/food/snacks/friedegg/New()
+ ..()
+ reagents.add_reagent("nutriment", 2)
+ reagents.add_reagent("sodiumchloride", 1)
+ reagents.add_reagent("blackpepper", 1)
+ bitesize = 1
+
+/obj/item/weapon/reagent_containers/food/snacks/boiledegg
+ name = "boiled egg"
+ desc = "A hard boiled egg."
+ icon_state = "egg"
+
+/obj/item/weapon/reagent_containers/food/snacks/boiledegg/New()
+ ..()
+ reagents.add_reagent("nutriment", 2)
+
+/obj/item/weapon/reagent_containers/food/snacks/omelette //FUCK THIS
+ name = "omelette du fromage"
+ desc = "That's all you can say!"
+ icon_state = "omelette"
+ trash = /obj/item/trash/plate
+
+/obj/item/weapon/reagent_containers/food/snacks/omelette/New()
+ ..()
+ reagents.add_reagent("nutriment", 8)
+ bitesize = 1
+
+/obj/item/weapon/reagent_containers/food/snacks/omelette/attackby(obj/item/weapon/W, mob/user)
+ if(istype(W,/obj/item/weapon/kitchen/utensil/fork))
+ if(W.icon_state == "forkloaded")
+ user << "You already have omelette on your fork."
+ return
+ W.icon_state = "forkloaded"
+ user.visible_message( \
+ "[user] takes a piece of omelette with their fork!", \
+ "You take a piece of omelette with your fork!" \
+ )
+ reagents.remove_reagent("nutriment", 1)
+ if(reagents.total_volume <= 0)
+ qdel(src)
+
+/obj/item/weapon/reagent_containers/food/snacks/benedict
+ name = "eggs benedict"
+ desc = "There is only one egg on this, how rude."
+ icon_state = "benedict"
+
+/obj/item/weapon/reagent_containers/food/snacks/benedict/New()
+ ..()
+ reagents.add_reagent("nutriment", 6)
+ bitesize = 3
diff --git a/code/modules/food&drinks/food/snacks_meat.dm b/code/modules/food&drinks/food/snacks_meat.dm
new file mode 100644
index 00000000000..2402a138050
--- /dev/null
+++ b/code/modules/food&drinks/food/snacks_meat.dm
@@ -0,0 +1,346 @@
+//Not only meat, actually, but also snacks that are almost meat, such as fish meat or tofu
+
+
+////////////////////////////////////////////FISH////////////////////////////////////////////
+
+/obj/item/weapon/reagent_containers/food/snacks/cubancarp
+ name = "\improper Cuban carp"
+ desc = "A grifftastic sandwich that burns your tongue and then leaves it numb!"
+ icon_state = "cubancarp"
+ trash = /obj/item/trash/plate
+
+/obj/item/weapon/reagent_containers/food/snacks/cubancarp/New()
+ ..()
+ reagents.add_reagent("nutriment", 6)
+ reagents.add_reagent("carpotoxin", 3)
+ reagents.add_reagent("capsaicin", 3)
+ bitesize = 3
+
+/obj/item/weapon/reagent_containers/food/snacks/carpmeat
+ name = "carp fillet"
+ desc = "A fillet of spess carp meat."
+ icon_state = "fishfillet"
+
+/obj/item/weapon/reagent_containers/food/snacks/carpmeat/New()
+ ..()
+ eatverb = pick("bite","chew","choke down","gnaw","swallow","chomp")
+ reagents.add_reagent("nutriment", 3)
+ reagents.add_reagent("carpotoxin", 3)
+ bitesize = 6
+
+/obj/item/weapon/reagent_containers/food/snacks/carpmeat/imitation
+ name = "imitation carp fillet"
+ desc = "Almost just like the real thing, kinda."
+
+/obj/item/weapon/reagent_containers/food/snacks/fishfingers
+ name = "fish fingers"
+ desc = "A finger of fish."
+ icon_state = "fishfingers"
+
+/obj/item/weapon/reagent_containers/food/snacks/fishfingers/New()
+ ..()
+ reagents.add_reagent("nutriment", 4)
+ reagents.add_reagent("carpotoxin", 3)
+ bitesize = 3
+
+/obj/item/weapon/reagent_containers/food/snacks/fishandchips
+ name = "fish and chips"
+ desc = "I do say so myself chap."
+ icon_state = "fishandchips"
+
+/obj/item/weapon/reagent_containers/food/snacks/fishandchips/New()
+ ..()
+ reagents.add_reagent("nutriment", 6)
+ reagents.add_reagent("carpotoxin", 3)
+ bitesize = 3
+
+////////////////////////////////////////////MEATS AND ALIKE////////////////////////////////////////////
+
+/obj/item/weapon/reagent_containers/food/snacks/tofu
+ name = "tofu"
+ desc = "We all love tofu."
+ icon_state = "tofu"
+
+/obj/item/weapon/reagent_containers/food/snacks/tofu/New()
+ ..()
+ reagents.add_reagent("nutriment", 3)
+ bitesize = 3
+
+
+/obj/item/weapon/reagent_containers/food/snacks/tomatomeat
+ name = "tomato slice"
+ desc = "A slice from a huge tomato."
+ icon_state = "tomatomeat"
+
+/obj/item/weapon/reagent_containers/food/snacks/tomatomeat/New()
+ ..()
+ reagents.add_reagent("nutriment", 3)
+ src.bitesize = 3
+
+/obj/item/weapon/reagent_containers/food/snacks/bearmeat
+ name = "bear meat"
+ desc = "A very manly slab of meat."
+ icon_state = "bearmeat"
+
+/obj/item/weapon/reagent_containers/food/snacks/bearmeat/New()
+ ..()
+ reagents.add_reagent("nutriment", 12)
+ reagents.add_reagent("hyperzine", 5)
+ src.bitesize = 3
+
+/obj/item/weapon/reagent_containers/food/snacks/xenomeat
+ name = "meat"
+ desc = "A slab of meat"
+ icon_state = "xenomeat"
+
+/obj/item/weapon/reagent_containers/food/snacks/xenomeat/New()
+ ..()
+ reagents.add_reagent("nutriment", 3)
+ src.bitesize = 3
+
+/obj/item/weapon/reagent_containers/food/snacks/spidermeat
+ name = "spider meat"
+ desc = "A slab of spider meat."
+ icon_state = "spidermeat"
+
+/obj/item/weapon/reagent_containers/food/snacks/spidermeat/New()
+ ..()
+ reagents.add_reagent("nutriment", 3)
+ reagents.add_reagent("toxin", 3)
+ bitesize = 3
+
+/obj/item/weapon/reagent_containers/food/snacks/spiderleg
+ name = "spider leg"
+ desc = "A still twitching leg of a giant spider... you don't really want to eat this, do you?"
+ icon_state = "spiderleg"
+
+/obj/item/weapon/reagent_containers/food/snacks/spiderleg/New()
+ ..()
+ reagents.add_reagent("nutriment", 2)
+ reagents.add_reagent("toxin", 2)
+ bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/cornedbeef
+ name = "corned beef and cabbage"
+ desc = "Now you can feel like a real tourist vacationing in Ireland."
+ icon_state = "cornedbeef"
+ trash = /obj/item/trash/plate
+
+/obj/item/weapon/reagent_containers/food/snacks/cornedbeef/New()
+ ..()
+ reagents.add_reagent("nutriment", 6)
+ bitesize = 3
+
+/obj/item/weapon/reagent_containers/food/snacks/faggot
+ name = "faggot"
+ desc = "A great meal all round. Not a cord of wood."
+ icon_state = "faggot"
+
+/obj/item/weapon/reagent_containers/food/snacks/faggot/New()
+ ..()
+ reagents.add_reagent("nutriment", 3)
+ bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/sausage
+ name = "sausage"
+ desc = "A piece of mixed, long meat."
+ icon_state = "sausage"
+
+/obj/item/weapon/reagent_containers/food/snacks/sausage/New()
+ ..()
+ eatverb = pick("bite","chew","nibble","deep throat","gobble","chomp")
+ reagents.add_reagent("nutriment", 6)
+ bitesize = 2
+
+
+/obj/item/weapon/reagent_containers/food/snacks/wingfangchu
+ name = "wing fang chu"
+ desc = "A savory dish of alien wing wang in soy."
+ icon_state = "wingfangchu"
+ trash = /obj/item/trash/snack_bowl
+
+/obj/item/weapon/reagent_containers/food/snacks/wingfangchu/New()
+ ..()
+ reagents.add_reagent("nutriment", 6)
+ bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/human/kebab
+ name = "-kebab"
+ icon_state = "kebab"
+ desc = "A human meat, on a stick."
+ trash = /obj/item/stack/rods
+
+/obj/item/weapon/reagent_containers/food/snacks/human/kebab/New()
+ ..()
+ reagents.add_reagent("nutriment", 8)
+ bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/monkeykebab
+ name = "meat-kebab"
+ icon_state = "kebab"
+ desc = "Delicious meat, on a stick."
+ trash = /obj/item/stack/rods
+
+/obj/item/weapon/reagent_containers/food/snacks/monkeykebab/New()
+ ..()
+ reagents.add_reagent("nutriment", 8)
+ bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/tofukebab
+ name = "tofu-kebab"
+ icon_state = "kebab"
+ desc = "Vegan meat, on a stick."
+ trash = /obj/item/stack/rods
+
+/obj/item/weapon/reagent_containers/food/snacks/tofukebab/New()
+ ..()
+ reagents.add_reagent("nutriment", 8)
+ bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/meatsteak
+ name = "meat steak"
+ desc = "A piece of hot spicy meat."
+ icon_state = "meatsteak"
+ trash = /obj/item/trash/plate
+
+/obj/item/weapon/reagent_containers/food/snacks/meatsteak/New()
+ ..()
+ reagents.add_reagent("nutriment", 4)
+ reagents.add_reagent("sodiumchloride", 1)
+ reagents.add_reagent("blackpepper", 1)
+ bitesize = 3
+
+/obj/item/weapon/reagent_containers/food/snacks/monkeycube
+ name = "monkey cube"
+ desc = "Just add water!"
+ icon_state = "monkeycube"
+ bitesize = 12
+ wrapped = 0
+
+/obj/item/weapon/reagent_containers/food/snacks/monkeycube/New()
+ ..()
+ reagents.add_reagent("nutriment",10)
+
+/obj/item/weapon/reagent_containers/food/snacks/monkeycube/afterattack(obj/O, mob/user,proximity)
+ if(!proximity) return
+ if(istype(O,/obj/structure/sink) && !wrapped)
+ user << "You place [src] under a stream of water..."
+ user.drop_item()
+ loc = get_turf(O)
+ return Expand()
+ ..()
+
+/obj/item/weapon/reagent_containers/food/snacks/monkeycube/attack_self(mob/user)
+ if(wrapped)
+ Unwrap(user)
+
+/obj/item/weapon/reagent_containers/food/snacks/monkeycube/proc/Expand()
+ visible_message("[src] expands!")
+ new /mob/living/carbon/monkey(get_turf(src))
+ qdel(src)
+
+/obj/item/weapon/reagent_containers/food/snacks/monkeycube/proc/Unwrap(mob/user)
+ icon_state = "monkeycube"
+ desc = "Just add water!"
+ user << "You unwrap the cube."
+ wrapped = 0
+
+
+/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped
+ desc = "Still wrapped in some paper."
+ icon_state = "monkeycubewrap"
+ wrapped = 1
+
+/obj/item/weapon/reagent_containers/food/snacks/enchiladas
+ name = "enchiladas"
+ desc = "Viva La Mexico!"
+ icon_state = "enchiladas"
+
+/obj/item/weapon/reagent_containers/food/snacks/enchiladas/New()
+ ..()
+ reagents.add_reagent("nutriment",8)
+ reagents.add_reagent("capsaicin", 6)
+ bitesize = 4
+
+/obj/item/weapon/reagent_containers/food/snacks/stew
+ name = "stew"
+ desc = "A nice and warm stew. Healthy and strong."
+ icon_state = "stew"
+ trash = /obj/item/trash/snack_bowl
+
+/obj/item/weapon/reagent_containers/food/snacks/stew/New()
+ ..()
+ eatverb = pick("slurp","sip","suck","inhale","drink")
+ reagents.add_reagent("nutriment", 10)
+ reagents.add_reagent("tomatojuice", 5)
+ reagents.add_reagent("imidazoline", 5)
+ reagents.add_reagent("water", 5)
+ bitesize = 10
+
+/obj/item/weapon/reagent_containers/food/snacks/stewedsoymeat
+ name = "stewed soy meat"
+ desc = "Even non-vegetarians will LOVE this!"
+ icon_state = "stewedsoymeat"
+ trash = /obj/item/trash/plate
+
+/obj/item/weapon/reagent_containers/food/snacks/stewedsoymeat/New()
+ ..()
+ eatverb = pick("slurp","sip","suck","inhale","drink")
+ reagents.add_reagent("nutriment", 8)
+ bitesize = 2
+
+
+/* No more of this
+/obj/item/weapon/reagent_containers/food/snacks/telebacon
+ name = "tele bacon"
+ desc = "It tastes a little odd but it is still delicious."
+ icon_state = "bacon"
+ var/obj/item/device/radio/beacon/bacon/baconbeacon
+ bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/telebacon/New()
+ ..()
+ reagents.add_reagent("nutriment", 4)
+ baconbeacon = new /obj/item/device/radio/beacon/bacon(src)
+/obj/item/weapon/reagent_containers/food/snacks/telebacon/On_Consume()
+ if(!reagents.total_volume)
+ baconbeacon.loc = usr
+ baconbeacon.digest_delay()
+*/
+
+
+/obj/item/weapon/reagent_containers/food/snacks/boiledspiderleg
+ name = "boiled spider leg"
+ desc = "A giant spider's leg that's still twitching after being cooked. Gross!"
+ icon_state = "spiderlegcooked"
+ trash = /obj/item/trash/plate
+
+/obj/item/weapon/reagent_containers/food/snacks/boiledspiderleg/New()
+ ..()
+ reagents.add_reagent("nutriment", 3)
+ reagents.add_reagent("toxin", 2)
+ bitesize = 3
+
+/obj/item/weapon/reagent_containers/food/snacks/spidereggsham
+ name = "green eggs and ham"
+ desc = "Would you eat them on a train? Would you eat them on a plane? Would you eat them on a state of the art corporate deathtrap floating through space?"
+ icon_state = "spidereggsham"
+ trash = /obj/item/trash/plate
+
+/obj/item/weapon/reagent_containers/food/snacks/spidereggsham/New()
+ ..()
+ reagents.add_reagent("nutriment", 6)
+ reagents.add_reagent("sodiumchloride", 1)
+ reagents.add_reagent("toxin", 3)
+ bitesize = 4
+
+/obj/item/weapon/reagent_containers/food/snacks/sashimi
+ name = "carp sashimi"
+ desc = "Celebrate surviving attack from hostile alien lifeforms by hospitalising yourself."
+ icon_state = "sashimi"
+
+/obj/item/weapon/reagent_containers/food/snacks/sashimi/New()
+ ..()
+ reagents.add_reagent("nutriment", 6)
+ reagents.add_reagent("toxin", 5)
+ bitesize = 3
diff --git a/code/modules/food&drinks/food/snacks_other.dm b/code/modules/food&drinks/food/snacks_other.dm
new file mode 100644
index 00000000000..4a4380cfeea
--- /dev/null
+++ b/code/modules/food&drinks/food/snacks_other.dm
@@ -0,0 +1,232 @@
+
+////////////////////////////////////////////OTHER////////////////////////////////////////////
+
+/obj/item/weapon/reagent_containers/food/snacks/candy_corn
+ name = "candy corn"
+ desc = "It's a handful of candy corn. Can be stored in a detective's hat."
+ icon_state = "candy_corn"
+
+/obj/item/weapon/reagent_containers/food/snacks/candy_corn/New()
+ ..()
+ reagents.add_reagent("nutriment", 4)
+ reagents.add_reagent("sugar", 2)
+ bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/chocolatebar
+ name = "chocolate bar"
+ desc = "Such, sweet, fattening food."
+ icon_state = "chocolatebarunwrapped"
+ wrapped = 0
+ bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/chocolatebar/New()
+ ..()
+ reagents.add_reagent("nutriment", 3)
+ reagents.add_reagent("sugar", 2)
+ reagents.add_reagent("coco", 2)
+
+/obj/item/weapon/reagent_containers/food/snacks/chocolatebar/attack_self(mob/user)
+ if(wrapped)
+ Unwrap(user)
+ else
+ ..()
+
+/obj/item/weapon/reagent_containers/food/snacks/chocolatebar/proc/Unwrap(mob/user)
+ icon_state = "chocolatebarunwrapped"
+ desc = "It won't make you all sticky."
+ user << "You remove the foil."
+ wrapped = 0
+
+
+/obj/item/weapon/reagent_containers/food/snacks/chocolatebar/wrapped
+ desc = "It's wrapped in some foil."
+ icon_state = "chocolatebar"
+ wrapped = 1
+
+/obj/item/weapon/reagent_containers/food/snacks/hugemushroomslice
+ name = "huge mushroom slice"
+ desc = "A slice from a huge mushroom."
+ icon_state = "hugemushroomslice"
+
+/obj/item/weapon/reagent_containers/food/snacks/hugemushroomslice/New()
+ ..()
+ reagents.add_reagent("nutriment", 3)
+ src.bitesize = 3
+
+
+/obj/item/weapon/reagent_containers/food/snacks/popcorn
+ name = "popcorn"
+ desc = "Now let's find some cinema."
+ icon_state = "popcorn"
+ trash = /obj/item/trash/popcorn
+ var/unpopped = 0
+
+/obj/item/weapon/reagent_containers/food/snacks/popcorn/New()
+ ..()
+ eatverb = pick("bite","crunch","nibble","gnaw","gobble","chomp")
+ unpopped = rand(1,10)
+ reagents.add_reagent("nutriment", 2)
+ bitesize = 0.1 //this snack is supposed to be eating during looooong time. And this it not dinner food! --rastaf0
+
+/obj/item/weapon/reagent_containers/food/snacks/popcorn/On_Consume()
+ if(prob(unpopped)) //lol ...what's the point? << AINT SO POINTLESS NO MORE
+ usr << "You bite down on an un-popped kernel, and it hurts your teeth!"
+ unpopped = max(0, unpopped-1)
+ reagents.add_reagent("sacid",0.1) //only a little tingle.
+ ..()
+
+/obj/item/weapon/reagent_containers/food/snacks/loadedbakedpotato
+ name = "loaded baked potato"
+ desc = "Totally baked."
+ icon_state = "loadedbakedpotato"
+
+/obj/item/weapon/reagent_containers/food/snacks/loadedbakedpotato/New()
+ ..()
+ reagents.add_reagent("nutriment", 6)
+ bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/fries
+ name = "space fries"
+ desc = "AKA: French Fries, Freedom Fries, etc."
+ icon_state = "fries"
+ trash = /obj/item/trash/plate
+
+/obj/item/weapon/reagent_containers/food/snacks/fries/New()
+ ..()
+ reagents.add_reagent("nutriment", 4)
+ bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/soydope
+ name = "soy dope"
+ desc = "Dope from a soy."
+ icon_state = "soydope"
+ trash = /obj/item/trash/plate
+
+/obj/item/weapon/reagent_containers/food/snacks/soydope/New()
+ ..()
+ reagents.add_reagent("nutriment", 2)
+ bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/cheesyfries
+ name = "cheesy fries"
+ desc = "Fries. Covered in cheese. Duh."
+ icon_state = "cheesyfries"
+ trash = /obj/item/trash/plate
+
+/obj/item/weapon/reagent_containers/food/snacks/cheesyfries/New()
+ ..()
+ reagents.add_reagent("nutriment", 6)
+ bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/badrecipe
+ name = "burned mess"
+ desc = "Someone should be demoted from chef for this."
+ icon_state = "badrecipe"
+
+/obj/item/weapon/reagent_containers/food/snacks/badrecipe/New()
+ ..()
+ eatverb = pick("choke down","nibble","gnaw","chomp")
+ reagents.add_reagent("toxin", 1)
+ reagents.add_reagent("carbon", 3)
+ bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/spacylibertyduff
+ name = "spacy liberty duff"
+ desc = "Jello gelatin, from Alfred Hubbard's cookbook."
+ icon_state = "spacylibertyduff"
+ trash = /obj/item/trash/snack_bowl
+
+/obj/item/weapon/reagent_containers/food/snacks/spacylibertyduff/New()
+ ..()
+ reagents.add_reagent("nutriment", 6)
+ reagents.add_reagent("mushroomhallucinogen", 6)
+ bitesize = 3
+
+/obj/item/weapon/reagent_containers/food/snacks/amanitajelly
+ name = "amanita jelly"
+ desc = "Looks curiously toxic."
+ icon_state = "amanitajelly"
+ trash = /obj/item/trash/snack_bowl
+
+/obj/item/weapon/reagent_containers/food/snacks/amanitajelly/New()
+ ..()
+ reagents.add_reagent("nutriment", 6)
+ reagents.add_reagent("amatoxin", 6)
+ reagents.add_reagent("mushroomhallucinogen", 3)
+ bitesize = 3
+
+/obj/item/weapon/reagent_containers/food/snacks/carrotfries
+ name = "carrot fries"
+ desc = "Tasty fries from fresh Carrots."
+ icon_state = "carrotfries"
+ trash = /obj/item/trash/plate
+
+/obj/item/weapon/reagent_containers/food/snacks/carrotfries/New()
+ ..()
+ reagents.add_reagent("nutriment", 3)
+ reagents.add_reagent("imidazoline", 3)
+ bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/candiedapple
+ name = "candied apple"
+ desc = "An apple coated in sugary sweetness."
+ icon_state = "candiedapple"
+
+/obj/item/weapon/reagent_containers/food/snacks/candiedapple/New()
+ ..()
+ reagents.add_reagent("nutriment", 3)
+ bitesize = 3
+
+/*
+/obj/item/weapon/reagent_containers/food/snacks/boiledslimecore
+ name = "Boiled slime Core"
+ desc = "A boiled red thing."
+ icon_state = "boiledslimecore"
+
+/obj/item/weapon/reagent_containers/food/snacks/boiledslimecore/New()
+ ..()
+ reagents.add_reagent("slimejelly", 5)
+ bitesize = 3
+*/
+/obj/item/weapon/reagent_containers/food/snacks/mint
+ name = "mint"
+ desc = "it is only wafer thin."
+ icon_state = "mint"
+
+/obj/item/weapon/reagent_containers/food/snacks/mint/New()
+ ..()
+ reagents.add_reagent("minttoxin", 1)
+ bitesize = 1
+
+////////////////////////////////FOOD ADDITIONS////////////////////////////////////////////
+
+/obj/item/weapon/reagent_containers/food/snacks/wrap
+ name = "egg wrap"
+ desc = "The precursor to Pigs in a Blanket."
+ icon_state = "wrap"
+
+/obj/item/weapon/reagent_containers/food/snacks/wrap/New()
+ ..()
+ reagents.add_reagent("nutriment", 5)
+ bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/beans
+ name = "tin of beans"
+ desc = "Musical fruit in a slightly less musical container."
+ icon_state = "beans"
+
+/obj/item/weapon/reagent_containers/food/snacks/beans/New()
+ ..()
+ reagents.add_reagent("nutriment", 10)
+ bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/spidereggs
+ name = "spider eggs"
+ desc = "A cluster of juicy spider eggs. A great side dish for when you care not for your health."
+ icon_state = "spidereggs"
+
+/obj/item/weapon/reagent_containers/food/snacks/spidereggs/New()
+ ..()
+ reagents.add_reagent("nutriment", 2)
+ reagents.add_reagent("toxin", 3)
+ bitesize = 2
diff --git a/code/modules/food&drinks/food/snacks_pastry.dm b/code/modules/food&drinks/food/snacks_pastry.dm
new file mode 100644
index 00000000000..1c55584b00b
--- /dev/null
+++ b/code/modules/food&drinks/food/snacks_pastry.dm
@@ -0,0 +1,309 @@
+//Pastry is a food that is made from dough which is made from wheat or rye flour.
+//This file contains pastries that don't fit any existing categories.
+
+////////////////////////////////////////////DONUTS////////////////////////////////////////////
+
+/obj/item/weapon/reagent_containers/food/snacks/donut
+ name = "donut"
+ icon_state = "donut1"
+
+/obj/item/weapon/reagent_containers/food/snacks/donut/normal
+ desc = "Goes great with Robust Coffee."
+
+/obj/item/weapon/reagent_containers/food/snacks/donut/normal/New()
+ ..()
+ reagents.add_reagent("nutriment", 3)
+ reagents.add_reagent("sprinkles", 1)
+ src.bitesize = 3
+ if(prob(30))
+ src.icon_state = "donut2"
+ src.name = "frosted donut"
+ reagents.add_reagent("sprinkles", 2)
+
+/obj/item/weapon/reagent_containers/food/snacks/donut/chaos
+ name = "chaos donut"
+ desc = "Like life, it never quite tastes the same."
+
+/obj/item/weapon/reagent_containers/food/snacks/donut/chaos/New()
+ ..()
+ reagents.add_reagent("nutriment", 2)
+ reagents.add_reagent("sprinkles", 1)
+ bitesize = 10
+ switch(rand(1,10))
+ if(1)
+ reagents.add_reagent("nutriment", 3)
+ if(2)
+ reagents.add_reagent("capsaicin", 3)
+ if(3)
+ reagents.add_reagent("frostoil", 3)
+ if(4)
+ reagents.add_reagent("sprinkles", 3)
+ if(5)
+ reagents.add_reagent("plasma", 3)
+ if(6)
+ reagents.add_reagent("coco", 3)
+ if(7)
+ reagents.add_reagent("slimejelly", 3)
+ if(8)
+ reagents.add_reagent("banana", 3)
+ if(9)
+ reagents.add_reagent("berryjuice", 3)
+ if(10)
+ reagents.add_reagent("tricordrazine", 3)
+ if(prob(30))
+ icon_state = "donut2"
+ name = "frosted chaos donut"
+ reagents.add_reagent("sprinkles", 2)
+
+
+/obj/item/weapon/reagent_containers/food/snacks/donut/jelly
+ name = "jelly donut"
+ desc = "You jelly?"
+ icon_state = "jdonut1"
+ bitesize = 5
+
+/obj/item/weapon/reagent_containers/food/snacks/donut/jelly/New()
+ ..()
+ reagents.add_reagent("nutriment", 3)
+ reagents.add_reagent("sprinkles", 1)
+ reagents.add_reagent("berryjuice", 5)
+ if(prob(30))
+ icon_state = "jdonut2"
+ name = "Frosted Jelly Donut"
+ reagents.add_reagent("sprinkles", 2)
+
+/obj/item/weapon/reagent_containers/food/snacks/donut/slimejelly
+ name = "jelly donut"
+ desc = "You jelly?"
+ icon_state = "jdonut1"
+ bitesize = 5
+
+/obj/item/weapon/reagent_containers/food/snacks/donut/slimejelly/New()
+ ..()
+ reagents.add_reagent("nutriment", 3)
+ reagents.add_reagent("sprinkles", 1)
+ reagents.add_reagent("slimejelly", 5)
+ bitesize = 5
+ if(prob(30))
+ icon_state = "jdonut2"
+ name = "Frosted Jelly Donut"
+ reagents.add_reagent("sprinkles", 2)
+
+/obj/item/weapon/reagent_containers/food/snacks/donut/cherryjelly
+ name = "jelly donut"
+ desc = "You jelly?"
+ icon_state = "jdonut1"
+ bitesize = 5
+
+/obj/item/weapon/reagent_containers/food/snacks/donut/cherryjelly/New()
+ ..()
+ reagents.add_reagent("nutriment", 3)
+ reagents.add_reagent("sprinkles", 1)
+ reagents.add_reagent("cherryjelly", 5)
+ if(prob(30))
+ icon_state = "jdonut2"
+ name = "Frosted Jelly Donut"
+ reagents.add_reagent("sprinkles", 2)
+
+
+////////////////////////////////////////////MUFFINS////////////////////////////////////////////
+
+/obj/item/weapon/reagent_containers/food/snacks/muffin
+ name = "muffin"
+ desc = "A delicious and spongy little cake."
+ icon_state = "muffin"
+
+/obj/item/weapon/reagent_containers/food/snacks/muffin/New()
+ ..()
+ reagents.add_reagent("nutriment", 6)
+ bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/muffin/berry
+ name = "berry muffin"
+ icon_state = "berrymuffin"
+ desc = "A delicious and spongy little cake, with berries."
+
+/obj/item/weapon/reagent_containers/food/snacks/muffin/booberry
+ name = "booberry muffin"
+ icon_state = "berrymuffin"
+ alpha = 125
+ desc = "My stomach is a graveyard! No living being can quench my bloodthirst!"
+
+/obj/item/weapon/reagent_containers/food/snacks/chawanmushi
+ name = "chawanmushi"
+ desc = "A legendary egg custard that makes friends out of enemies. Probably too hot for a cat to eat."
+ icon_state = "chawanmushi"
+ trash = /obj/item/trash/snack_bowl
+
+/obj/item/weapon/reagent_containers/food/snacks/chawanmushi/New()
+ ..()
+ reagents.add_reagent("nutriment", 5)
+ bitesize = 1
+////////////////////////////////////////////WAFFLES////////////////////////////////////////////
+
+/obj/item/weapon/reagent_containers/food/snacks/waffles
+ name = "waffles"
+ desc = "Mmm, waffles."
+ icon_state = "waffles"
+ trash = /obj/item/trash/waffles
+
+/obj/item/weapon/reagent_containers/food/snacks/waffles/New()
+ ..()
+ reagents.add_reagent("nutriment", 8)
+ bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/soylentgreen
+ name = "\improper Soylent Green"
+ desc = "Not made of people. Honest." //Totally people.
+ icon_state = "soylent_green"
+ trash = /obj/item/trash/waffles
+
+/obj/item/weapon/reagent_containers/food/snacks/soylentgreen/New()
+ ..()
+ reagents.add_reagent("nutriment", 10)
+ bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/soylenviridians
+ name = "\improper Soylent Virdians"
+ desc = "Not made of people. Honest." //Actually honest for once.
+ icon_state = "soylent_yellow"
+ trash = /obj/item/trash/waffles
+
+/obj/item/weapon/reagent_containers/food/snacks/soylenviridians/New()
+ ..()
+ reagents.add_reagent("nutriment", 10)
+ bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/rofflewaffles
+ name = "roffle waffles"
+ desc = "Waffles from Roffle. Co."
+ icon_state = "rofflewaffles"
+ trash = /obj/item/trash/waffles
+
+/obj/item/weapon/reagent_containers/food/snacks/rofflewaffles/New()
+ ..()
+ reagents.add_reagent("nutriment", 8)
+ reagents.add_reagent("mushroomhallucinogen", 8)
+ bitesize = 4
+
+////////////////////////////////////////////OTHER////////////////////////////////////////////
+
+/obj/item/weapon/reagent_containers/food/snacks/cookie
+ name = "cookie"
+ desc = "COOKIE!!!"
+ icon_state = "COOKIE!!!"
+
+/obj/item/weapon/reagent_containers/food/snacks/cookie/New()
+ ..()
+ reagents.add_reagent("nutriment", 5)
+ bitesize = 1
+
+/obj/item/weapon/reagent_containers/food/snacks/donkpocket
+ name = "\improper Donk-pocket"
+ desc = "The food of choice for the seasoned traitor."
+ icon_state = "donkpocket"
+ var/warm = 0
+
+/obj/item/weapon/reagent_containers/food/snacks/donkpocket/New()
+ ..()
+ reagents.add_reagent("nutriment", 4)
+
+/obj/item/weapon/reagent_containers/food/snacks/donkpocket/proc/cooltime() //Not working, derp?
+ if(warm)
+ spawn(4200) //ew
+ warm = 0
+ reagents.del_reagent("tricordrazine")
+ name = initial(name)
+ return
+
+/obj/item/weapon/reagent_containers/food/snacks/fortunecookie
+ name = "fortune cookie"
+ desc = "A true prophecy in each cookie!"
+ icon_state = "fortune_cookie"
+
+/obj/item/weapon/reagent_containers/food/snacks/fortunecookie/New()
+ ..()
+ reagents.add_reagent("nutriment", 3)
+ bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/poppypretzel
+ name = "poppy pretzel"
+ desc = "It's all twisted up!"
+ icon_state = "poppypretzel"
+ bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/poppypretzel/New()
+ ..()
+ reagents.add_reagent("nutriment", 5)
+ bitesize = 2
+
+
+/obj/item/weapon/reagent_containers/food/snacks/plumphelmetbiscuit
+ name = "plump helmet biscuit"
+ desc = "This is a finely-prepared plump helmet biscuit. The ingredients are exceptionally minced plump helmet, and well-minced dwarven wheat flour."
+ icon_state = "phelmbiscuit"
+
+/obj/item/weapon/reagent_containers/food/snacks/plumphelmetbiscuit/New()
+ ..()
+ if(prob(10))
+ name = "exceptional plump helmet biscuit"
+ desc = "Microwave is taken by a fey mood! It has cooked an exceptional plump helmet biscuit!"
+ reagents.add_reagent("nutriment", 8)
+ reagents.add_reagent("tricordrazine", 5)
+ bitesize = 2
+ else
+ reagents.add_reagent("nutriment", 5)
+ bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/appletart
+ name = "golden apple streusel tart"
+ desc = "A tasty dessert that won't make it through a metal detector."
+ icon_state = "gappletart"
+ trash = /obj/item/trash/plate
+
+/obj/item/weapon/reagent_containers/food/snacks/appletart/New()
+ ..()
+ reagents.add_reagent("nutriment", 8)
+ reagents.add_reagent("gold", 5)
+ bitesize = 3
+
+/obj/item/weapon/reagent_containers/food/snacks/cracker
+ name = "cracker"
+ desc = "It's a salted cracker."
+ icon_state = "cracker"
+
+/obj/item/weapon/reagent_containers/food/snacks/cracker/New()
+ ..()
+ reagents.add_reagent("nutriment", 1)
+
+/obj/item/weapon/reagent_containers/food/snacks/hotdog
+ name = "hotdog"
+ desc = "Fresh footlong ready to go down on."
+ icon_state = "hotdog"
+
+/obj/item/weapon/reagent_containers/food/snacks/hotdog/New()
+ ..()
+ reagents.add_reagent("nutriment", 6)
+ reagents.add_reagent("ketchup", 3)
+ bitesize = 3
+
+/obj/item/weapon/reagent_containers/food/snacks/meatbun
+ name = "meat bun"
+ desc = "Has the potential to not be Dog."
+ icon_state = "meatbun"
+
+/obj/item/weapon/reagent_containers/food/snacks/meatbun/New()
+ ..()
+ reagents.add_reagent("nutriment", 6)
+ bitesize = 6
+
+/obj/item/weapon/reagent_containers/food/snacks/sugarcookie
+ name = "sugar cookie"
+ desc = "Just like your little sister used to make."
+ icon_state = "sugarcookie"
+
+/obj/item/weapon/reagent_containers/food/snacks/sugarcookie/New()
+ ..()
+ reagents.add_reagent("nutriment", 2)
+ reagents.add_reagent("sugar", 5)
+ bitesize = 2
\ No newline at end of file
diff --git a/code/modules/food&drinks/food/snacks_pies.dm b/code/modules/food&drinks/food/snacks_pie.dm
similarity index 100%
rename from code/modules/food&drinks/food/snacks_pies.dm
rename to code/modules/food&drinks/food/snacks_pie.dm
diff --git a/code/modules/food&drinks/food/snacks_salad.dm b/code/modules/food&drinks/food/snacks_salad.dm
new file mode 100644
index 00000000000..8b8cb86b799
--- /dev/null
+++ b/code/modules/food&drinks/food/snacks_salad.dm
@@ -0,0 +1,38 @@
+//this category is very little but I think that it has great potential to grow
+////////////////////////////////////////////SALAD////////////////////////////////////////////
+
+/obj/item/weapon/reagent_containers/food/snacks/aesirsalad
+ name = "\improper Aesir salad"
+ desc = "Probably too incredible for mortal men to fully enjoy."
+ icon_state = "aesirsalad"
+ trash = /obj/item/trash/snack_bowl
+
+/obj/item/weapon/reagent_containers/food/snacks/aesirsalad/New()
+ ..()
+ eatverb = pick("crunch","devour","nibble","gnaw","gobble","chomp")
+ reagents.add_reagent("nutriment", 8)
+ reagents.add_reagent("tricordrazine", 8)
+ bitesize = 3
+
+/obj/item/weapon/reagent_containers/food/snacks/herbsalad
+ name = "herb salad"
+ desc = "A tasty salad with apples on top."
+ icon_state = "herbsalad"
+ trash = /obj/item/trash/snack_bowl
+
+/obj/item/weapon/reagent_containers/food/snacks/herbsalad/New()
+ ..()
+ reagents.add_reagent("nutriment", 8)
+ bitesize = 3
+
+/obj/item/weapon/reagent_containers/food/snacks/validsalad
+ name = "valid salad"
+ desc = "It's just an herb salad with meatballs and fried potato slices. Nothing suspicious about it."
+ icon_state = "validsalad"
+ trash = /obj/item/trash/snack_bowl
+
+/obj/item/weapon/reagent_containers/food/snacks/validsalad/New()
+ ..()
+ reagents.add_reagent("nutriment", 8)
+ reagents.add_reagent("doctorsdelight", 5)
+ bitesize = 3
\ No newline at end of file
diff --git a/code/modules/food&drinks/food/snacks_vend.dm b/code/modules/food&drinks/food/snacks_vend.dm
new file mode 100644
index 00000000000..465c33d925e
--- /dev/null
+++ b/code/modules/food&drinks/food/snacks_vend.dm
@@ -0,0 +1,81 @@
+////////////////////////////////////////////SNACKS FROM VENDING MACHINES////////////////////////////////////////////
+//in other words: junk food
+//don't even bother looking for recipes for these
+
+/obj/item/weapon/reagent_containers/food/snacks/candy
+ name = "candy"
+ desc = "Nougat love it or hate it."
+ icon_state = "candy"
+ trash = /obj/item/trash/candy
+
+/obj/item/weapon/reagent_containers/food/snacks/candy/New()
+ ..()
+ reagents.add_reagent("nutriment", 1)
+ reagents.add_reagent("sugar", 3)
+ bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/sosjerky
+ name = "\improper Scaredy's Private Reserve Beef Jerky"
+ icon_state = "sosjerky"
+ desc = "Beef jerky made from the finest space cows."
+ trash = /obj/item/trash/sosjerky
+
+/obj/item/weapon/reagent_containers/food/snacks/sosjerky/New()
+ ..()
+ reagents.add_reagent("nutriment", 4)
+ bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/chips
+ name = "chips"
+ desc = "Commander Riker's What-The-Crisps"
+ icon_state = "chips"
+ trash = /obj/item/trash/chips
+
+/obj/item/weapon/reagent_containers/food/snacks/chips/New()
+ ..()
+ reagents.add_reagent("nutriment", 3)
+ bitesize = 1
+
+/obj/item/weapon/reagent_containers/food/snacks/no_raisin
+ name = "4no raisins"
+ icon_state = "4no_raisins"
+ desc = "Best raisins in the universe. Not sure why."
+ trash = /obj/item/trash/raisins
+
+/obj/item/weapon/reagent_containers/food/snacks/no_raisin/New()
+ ..()
+ reagents.add_reagent("nutriment", 6)
+
+/obj/item/weapon/reagent_containers/food/snacks/spacetwinkie
+ name = "space twinkie"
+ icon_state = "space_twinkie"
+ desc = "Guaranteed to survive longer than you will."
+
+/obj/item/weapon/reagent_containers/food/snacks/spacetwinkie/New()
+ ..()
+ reagents.add_reagent("sugar", 4)
+ bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers
+ name = "cheesie honkers"
+ desc = "Bite sized cheesie snacks that will honk all over your mouth."
+ icon_state = "cheesie_honkers"
+ trash = /obj/item/trash/cheesie
+
+/obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers/New()
+ ..()
+ reagents.add_reagent("nutriment", 4)
+ bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/syndicake
+ name = "syndi-cakes"
+ icon_state = "syndi_cakes"
+ desc = "An extremely moist snack cake that tastes just as good after being nuked."
+ trash = /obj/item/trash/syndi_cakes
+
+/obj/item/weapon/reagent_containers/food/snacks/syndicake/New()
+ ..()
+ reagents.add_reagent("nutriment", 4)
+ reagents.add_reagent("doctorsdelight", 5)
+ bitesize = 3
+
diff --git a/code/modules/food&drinks/kitchen machinery/gibber.dm b/code/modules/food&drinks/kitchen machinery/gibber.dm
index c43c4bec814..654b4c9c7d9 100644
--- a/code/modules/food&drinks/kitchen machinery/gibber.dm
+++ b/code/modules/food&drinks/kitchen machinery/gibber.dm
@@ -110,7 +110,7 @@
set name = "empty gibber"
set src in oview(1)
- if (usr.stat != 0)
+ if(usr.stat || !usr.canmove || usr.restrained())
return
src.go_out()
add_fingerprint(usr)
diff --git a/code/modules/food&drinks/kitchen machinery/juicer.dm b/code/modules/food&drinks/kitchen machinery/juicer.dm
index 80ba39354a3..94696028027 100644
--- a/code/modules/food&drinks/kitchen machinery/juicer.dm
+++ b/code/modules/food&drinks/kitchen machinery/juicer.dm
@@ -126,7 +126,7 @@
set category = "Object"
set name = "Detach Beaker from the juicer"
set src in oview(1)
- if (usr.stat != 0)
+ if(usr.stat || !usr.canmove || usr.restrained())
return
if (!beaker)
return
diff --git a/code/modules/food&drinks/kitchen machinery/microwave.dm b/code/modules/food&drinks/kitchen machinery/microwave.dm
index 247b6721383..b44170fd2da 100644
--- a/code/modules/food&drinks/kitchen machinery/microwave.dm
+++ b/code/modules/food&drinks/kitchen machinery/microwave.dm
@@ -122,11 +122,12 @@
return 1
else if(istype(O, /obj/item/weapon/soap/)) // If they're trying to clean it then let them
+ var/obj/item/weapon/soap/P = O
user.visible_message( \
"[user] starts to clean the microwave.", \
"You start to clean the microwave." \
)
- if (do_after(user,20))
+ if (do_after(user, P.cleanspeed))
user.visible_message( \
"[user] has cleaned the microwave.", \
"You have cleaned the microwave." \
diff --git a/code/modules/food&drinks/kitchen machinery/processor.dm b/code/modules/food&drinks/kitchen machinery/processor.dm
index 7ec3d44356e..8ef77de2a02 100644
--- a/code/modules/food&drinks/kitchen machinery/processor.dm
+++ b/code/modules/food&drinks/kitchen machinery/processor.dm
@@ -157,7 +157,7 @@
set name = "Eject Contents"
set src in oview(1)
- if (usr.stat != 0)
+ if(usr.stat || !usr.canmove || usr.restrained())
return
src.empty()
add_fingerprint(usr)
diff --git a/code/modules/food&drinks/recipes/microwave/recipes.dm b/code/modules/food&drinks/recipes/microwave/recipes.dm
index 17c76c10d25..4bf797f5bf7 100644
--- a/code/modules/food&drinks/recipes/microwave/recipes.dm
+++ b/code/modules/food&drinks/recipes/microwave/recipes.dm
@@ -1,334 +1,6 @@
// see code/datums/recipe.dm
-////////////////////////////////////////////////EGG RECIPE's////////////////////////////////////////////////
-
-/datum/recipe/egg/fried
- reagents = list("sodiumchloride" = 1, "blackpepper" = 1)
- items = list(
- /obj/item/weapon/reagent_containers/food/snacks/egg
- )
- result = /obj/item/weapon/reagent_containers/food/snacks/friedegg
-
-/datum/recipe/egg/boiled
- reagents = list("water" = 5)
- items = list(
- /obj/item/weapon/reagent_containers/food/snacks/egg
- )
- result = /obj/item/weapon/reagent_containers/food/snacks/boiledegg
-
-/datum/recipe/egg/omelette
- items = list(
- /obj/item/weapon/reagent_containers/food/snacks/egg,
- /obj/item/weapon/reagent_containers/food/snacks/egg,
- /obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
- /obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
- )
- result = /obj/item/weapon/reagent_containers/food/snacks/omelette
-
-/datum/recipe/egg/chocolate
- items = list(
- /obj/item/weapon/reagent_containers/food/snacks/egg,
- /obj/item/weapon/reagent_containers/food/snacks/chocolatebar,
- )
- result = /obj/item/weapon/reagent_containers/food/snacks/chocolateegg
-
-/datum/recipe/egg/benedict
- items = list(
- /obj/item/weapon/reagent_containers/food/snacks/friedegg,
- /obj/item/weapon/reagent_containers/food/snacks/meatsteak,
- /obj/item/weapon/reagent_containers/food/snacks/breadslice,
- )
- result = /obj/item/weapon/reagent_containers/food/snacks/benedict
-
-////////////////////////////////////////////////DONUTS////////////////////////////////////////////////
-
-/datum/recipe/donut
- reagents = list("flour" = 5)
- items = list(
- /obj/item/weapon/reagent_containers/food/snacks/egg
- )
- result = /obj/item/weapon/reagent_containers/food/snacks/donut/normal
-
-/datum/recipe/donut/jelly
- reagents = list("berryjuice" = 5, "flour" = 5)
- items = list(
- /obj/item/weapon/reagent_containers/food/snacks/egg
- )
- result = /obj/item/weapon/reagent_containers/food/snacks/donut/jelly
-
-/datum/recipe/donut/jelly/slime
- reagents = list("slimejelly" = 5, "flour" = 5)
- result = /obj/item/weapon/reagent_containers/food/snacks/donut/slimejelly
-
-/datum/recipe/donut/jelly/cherry
- reagents = list("cherryjelly" = 5, "flour" = 5)
- result = /obj/item/weapon/reagent_containers/food/snacks/donut/cherryjelly
-
-/datum/recipe/chaosdonut
- reagents = list("frostoil" = 5, "capsaicin" = 5, "flour" = 5)
- items = list(
- /obj/item/weapon/reagent_containers/food/snacks/egg
- )
- result = /obj/item/weapon/reagent_containers/food/snacks/donut/chaos
-
-
-////////////////////////////////////////////////WAFFLES////////////////////////////////////////////////
-
-/datum/recipe/waffles
- reagents = list("flour" = 10)
- items = list(
- /obj/item/weapon/reagent_containers/food/snacks/egg,
- /obj/item/weapon/reagent_containers/food/snacks/egg,
- )
- result = /obj/item/weapon/reagent_containers/food/snacks/waffles
-
-
-/datum/recipe/waffles/soylenviridians
- reagents = list("flour" = 15)
- items = list(
- /obj/item/weapon/reagent_containers/food/snacks/grown/soybeans
- )
- result = /obj/item/weapon/reagent_containers/food/snacks/soylenviridians
-
-/datum/recipe/waffles/soylentgreen
- reagents = list("flour" = 15)
- items = list(
- /obj/item/weapon/reagent_containers/food/snacks/meat/human,
- /obj/item/weapon/reagent_containers/food/snacks/meat/human,
- )
- result = /obj/item/weapon/reagent_containers/food/snacks/soylentgreen
-
-
-/datum/recipe/waffles/roffle
- reagents = list("mushroomhallucinogen" = 5, "flour" = 10)
- items = list(
- /obj/item/weapon/reagent_containers/food/snacks/egg,
- /obj/item/weapon/reagent_containers/food/snacks/egg,
- )
- result = /obj/item/weapon/reagent_containers/food/snacks/rofflewaffles
-
-
-////////////////////////////////////////////////DONKPOCCKETS////////////////////////////////////////////////
-
-/datum/recipe/donkpocket
- reagents = list("flour" = 5)
- items = list(
- /obj/item/weapon/reagent_containers/food/snacks/faggot,
- )
- result = /obj/item/weapon/reagent_containers/food/snacks/donkpocket //SPECIAL
- proc/warm_up(var/obj/item/weapon/reagent_containers/food/snacks/donkpocket/being_cooked)
- being_cooked.warm = 1
- being_cooked.reagents.add_reagent("tricordrazine", 5)
- being_cooked.bitesize = 6
- being_cooked.name = "Warm " + being_cooked.name
- being_cooked.cooltime()
- make_food(var/obj/container as obj)
- var/obj/item/weapon/reagent_containers/food/snacks/donkpocket/being_cooked = ..(container)
- warm_up(being_cooked)
- return being_cooked
-
-/datum/recipe/donkpocket/warm
- reagents = list() //This is necessary since this is a child object of the above recipe and we don't want donk pockets to need flour
- items = list(
- /obj/item/weapon/reagent_containers/food/snacks/donkpocket
- )
- result = /obj/item/weapon/reagent_containers/food/snacks/donkpocket //SPECIAL
- make_food(var/obj/container as obj)
- var/obj/item/weapon/reagent_containers/food/snacks/donkpocket/being_cooked = locate() in container
- if(being_cooked && !being_cooked.warm)
- warm_up(being_cooked)
- return being_cooked
-
-
-////////////////////////////////////////////////MUFFINS////////////////////////////////////////////////
-
-/datum/recipe/muffin
- reagents = list("milk" = 5, "flour" = 5)
- items = list(
- /obj/item/weapon/reagent_containers/food/snacks/egg,
- )
- result = /obj/item/weapon/reagent_containers/food/snacks/muffin
-
-/datum/recipe/muffin/berry
- reagents = list("milk" = 5, "flour" = 5)
- items = list(
- /obj/item/weapon/reagent_containers/food/snacks/egg,
- /obj/item/weapon/reagent_containers/food/snacks/grown/berries
- )
- result = /obj/item/weapon/reagent_containers/food/snacks/muffin/berry
-
-/datum/recipe/muffin/booberry
- reagents = list("milk" = 5, "flour" = 5)
- items = list(
- /obj/item/weapon/reagent_containers/food/snacks/egg,
- /obj/item/weapon/reagent_containers/food/snacks/grown/berries,
- /obj/item/weapon/ectoplasm
- )
- result = /obj/item/weapon/reagent_containers/food/snacks/muffin/booberry
-
-/datum/recipe/muffin/chawanmushi
- reagents = list("water" = 5, "soysauce" = 5)
- items = list(
- /obj/item/weapon/reagent_containers/food/snacks/egg,
- /obj/item/weapon/reagent_containers/food/snacks/egg,
- /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/chanterelle,
- )
- result = /obj/item/weapon/reagent_containers/food/snacks/chawanmushi
-
-
-
-////////////////////////////////////////////////KEBABS NO REMOVE////////////////////////////////////////////////
-
-/datum/recipe/kebab/human
- items = list(
- /obj/item/stack/rods,
- /obj/item/weapon/reagent_containers/food/snacks/meat/human,
- /obj/item/weapon/reagent_containers/food/snacks/meat/human,
- )
- result = /obj/item/weapon/reagent_containers/food/snacks/human/kebab
-
-/datum/recipe/kebab/monkey
- items = list(
- /obj/item/stack/rods,
- /obj/item/weapon/reagent_containers/food/snacks/meat/monkey,
- /obj/item/weapon/reagent_containers/food/snacks/meat/monkey,
- )
- result = /obj/item/weapon/reagent_containers/food/snacks/monkeykebab
-
-/datum/recipe/kebab/tofu
- items = list(
- /obj/item/stack/rods,
- /obj/item/weapon/reagent_containers/food/snacks/tofu,
- /obj/item/weapon/reagent_containers/food/snacks/tofu,
- )
- result = /obj/item/weapon/reagent_containers/food/snacks/tofukebab
-
-////////////////////////////////////////////////FISH////////////////////////////////////////////////
-
-/datum/recipe/carpmeat
- reagents = list("carpotoxin" = 5)
- items = list(
- /obj/item/weapon/reagent_containers/food/snacks/tofu
- )
- result = /obj/item/weapon/reagent_containers/food/snacks/carpmeat/imitation
-
-/datum/recipe/cubancarp
- reagents = list("flour" = 5)
- items = list(
- /obj/item/weapon/reagent_containers/food/snacks/grown/chili,
- /obj/item/weapon/reagent_containers/food/snacks/carpmeat,
- )
- result = /obj/item/weapon/reagent_containers/food/snacks/cubancarp
-
-/datum/recipe/fishandchips
- items = list(
- /obj/item/weapon/reagent_containers/food/snacks/fries,
- /obj/item/weapon/reagent_containers/food/snacks/carpmeat,
- )
- result = /obj/item/weapon/reagent_containers/food/snacks/fishandchips
-
-/datum/recipe/fishfingers
- reagents = list("flour" = 10)
- items = list(
- /obj/item/weapon/reagent_containers/food/snacks/egg,
- /obj/item/weapon/reagent_containers/food/snacks/carpmeat,
- )
- result = /obj/item/weapon/reagent_containers/food/snacks/fishfingers
-
-/datum/recipe/sashimi
- reagents = list("soysauce" = 5)
- items = list(
- /obj/item/weapon/reagent_containers/food/snacks/spidereggs,
- /obj/item/weapon/reagent_containers/food/snacks/carpmeat,
- )
- result = /obj/item/weapon/reagent_containers/food/snacks/sashimi
-
-////////////////////////////////////////////////PIZZA!!!////////////////////////////////////////////////
-
-/datum/recipe/pizza/margherita
- reagents = list("flour" = 10)
- items = list(
- /obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
- /obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
- /obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
- /obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
- /obj/item/weapon/reagent_containers/food/snacks/grown/tomato,
- )
- result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/margherita
-
-/datum/recipe/pizza/meat
- reagents = list("flour" = 10)
- items = list(
- /obj/item/weapon/reagent_containers/food/snacks/meat,
- /obj/item/weapon/reagent_containers/food/snacks/meat,
- /obj/item/weapon/reagent_containers/food/snacks/meat,
- /obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
- /obj/item/weapon/reagent_containers/food/snacks/grown/tomato,
- )
- result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/meatpizza
-
-/datum/recipe/pizza/mushroom
- reagents = list("flour" = 10)
- items = list(
- /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom,
- /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom,
- /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom,
- /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom,
- /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom,
- )
- result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/mushroompizza
-
-/datum/recipe/pizza/vegetable
- reagents = list("flour" = 10)
- items = list(
- /obj/item/weapon/reagent_containers/food/snacks/grown/eggplant,
- /obj/item/weapon/reagent_containers/food/snacks/grown/carrot,
- /obj/item/weapon/reagent_containers/food/snacks/grown/corn,
- /obj/item/weapon/reagent_containers/food/snacks/grown/tomato,
- )
- result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/vegetablepizza
-
-
-
-////////////////////////////////////////////////SALADS////////////////////////////////////////////////
-
-/datum/recipe/salad/herb
- items = list(
- /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia/vulgaris,
- /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia/vulgaris,
- /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia/vulgaris,
- /obj/item/weapon/reagent_containers/food/snacks/grown/apple,
- )
- result = /obj/item/weapon/reagent_containers/food/snacks/herbsalad
- make_food(var/obj/container as obj)
- var/obj/item/weapon/reagent_containers/food/snacks/herbsalad/being_cooked = ..(container)
- being_cooked.reagents.del_reagent("toxin")
- return being_cooked
-
-/datum/recipe/salad/aesir
- items = list(
- /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia/deus,
- /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia/deus,
- /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia/deus,
- /obj/item/weapon/reagent_containers/food/snacks/grown/apple/gold,
- )
- result = /obj/item/weapon/reagent_containers/food/snacks/aesirsalad
-
-/datum/recipe/salad/valid
- items = list(
- /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia/vulgaris,
- /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia/vulgaris,
- /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia/vulgaris,
- /obj/item/weapon/reagent_containers/food/snacks/grown/potato,
- /obj/item/weapon/reagent_containers/food/snacks/faggot,
- )
- result = /obj/item/weapon/reagent_containers/food/snacks/validsalad
- make_food(var/obj/container as obj)
- var/obj/item/weapon/reagent_containers/food/snacks/validsalad/being_cooked = ..(container)
- being_cooked.reagents.del_reagent("toxin")
- return being_cooked
-
////////////////////////////////////////////////FOOD ADDITTIONS////////////////////////////////////////////////
/datum/recipe/wrap
@@ -347,62 +19,8 @@
)
result = /obj/item/weapon/reagent_containers/food/snacks/beans
-/datum/recipe/hotdog
- reagents = list("ketchup" = 5)
- items = list(
- /obj/item/weapon/reagent_containers/food/snacks/breadslice,
- /obj/item/weapon/reagent_containers/food/snacks/sausage,
- )
- result = /obj/item/weapon/reagent_containers/food/snacks/hotdog
-
-/datum/recipe/meatbun
- reagents = list("soysauce" = 5, "flour" = 5)
- items = list(
- /obj/item/weapon/reagent_containers/food/snacks/faggot,
- /obj/item/weapon/reagent_containers/food/snacks/grown/cabbage,
- )
- result = /obj/item/weapon/reagent_containers/food/snacks/meatbun
-
-/datum/recipe/sugarcookie
- reagents = list("flour" = 5, "sugar" = 5)
- items = list(
- /obj/item/weapon/reagent_containers/food/snacks/egg,
- )
- result = /obj/item/weapon/reagent_containers/food/snacks/sugarcookie
-
-/datum/recipe/boiledspiderleg
- reagents = list("water" = 10)
- items = list(
- /obj/item/weapon/reagent_containers/food/snacks/spiderleg,
- )
- result = /obj/item/weapon/reagent_containers/food/snacks/boiledspiderleg
-
-/datum/recipe/spidereggsham
- reagents = list("sodiumchloride" = 1)
- items = list(
- /obj/item/weapon/reagent_containers/food/snacks/spidereggs,
- /obj/item/weapon/reagent_containers/food/snacks/spidermeat,
- )
- result = /obj/item/weapon/reagent_containers/food/snacks/spidereggsham
-
////////////////////////////////////////////////MISC RECIPE's////////////////////////////////////////////////
-/datum/recipe/cornedbeef
- reagents = list("sodiumchloride" = 5)
- items = list(
- /obj/item/weapon/reagent_containers/food/snacks/meat,
- /obj/item/weapon/reagent_containers/food/snacks/grown/cabbage,
- /obj/item/weapon/reagent_containers/food/snacks/grown/cabbage,
- )
- result = /obj/item/weapon/reagent_containers/food/snacks/cornedbeef
-
-/datum/recipe/wingfangchu
- reagents = list("soysauce" = 5)
- items = list(
- /obj/item/weapon/reagent_containers/food/snacks/xenomeat,
- )
- result = /obj/item/weapon/reagent_containers/food/snacks/wingfangchu
-
/datum/recipe/loadedbakedpotato
items = list(
/obj/item/weapon/reagent_containers/food/snacks/grown/potato,
@@ -423,28 +41,6 @@
)
result = /obj/item/weapon/reagent_containers/food/snacks/popcorn
-/datum/recipe/fortunecookie
- reagents = list("flour" = 5)
- items = list(
- /obj/item/weapon/reagent_containers/food/snacks/egg,
- /obj/item/weapon/paper,
- )
- result = /obj/item/weapon/reagent_containers/food/snacks/fortunecookie
-/datum/recipe/fortunecookie/make_food(var/obj/container as obj)
- var/obj/item/weapon/paper/paper = locate() in container
- paper.loc = null //prevent deletion
- var/obj/item/weapon/reagent_containers/food/snacks/fortunecookie/being_cooked = ..(container)
- paper.loc = being_cooked
- being_cooked.trash = paper //so the paper is left behind as trash without special-snowflake(TM Nodrak) code ~carn
- return being_cooked
-
-/datum/recipe/meatsteak
- reagents = list("sodiumchloride" = 1, "blackpepper" = 1)
- items = list(
- /obj/item/weapon/reagent_containers/food/snacks/meat
- )
- result = /obj/item/weapon/reagent_containers/food/snacks/meatsteak
-
/datum/recipe/spacylibertyduff
reagents = list("water" = 5, "vodka" = 5)
items = list(
@@ -467,73 +63,9 @@
being_cooked.reagents.del_reagent("amatoxin")
return being_cooked
-/datum/recipe/enchiladas
- items = list(
- /obj/item/weapon/reagent_containers/food/snacks/meat,
- /obj/item/weapon/reagent_containers/food/snacks/grown/chili,
- /obj/item/weapon/reagent_containers/food/snacks/grown/chili,
- /obj/item/weapon/reagent_containers/food/snacks/grown/corn,
- )
- result = /obj/item/weapon/reagent_containers/food/snacks/enchiladas
-
-/datum/recipe/stew
- reagents = list("water" = 10)
- items = list(
- /obj/item/weapon/reagent_containers/food/snacks/grown/tomato,
- /obj/item/weapon/reagent_containers/food/snacks/meat,
- /obj/item/weapon/reagent_containers/food/snacks/grown/potato,
- /obj/item/weapon/reagent_containers/food/snacks/grown/carrot,
- /obj/item/weapon/reagent_containers/food/snacks/grown/eggplant,
- /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom,
- )
- result = /obj/item/weapon/reagent_containers/food/snacks/stew
-
-/datum/recipe/stewedsoymeat
- items = list(
- /obj/item/weapon/reagent_containers/food/snacks/soydope,
- /obj/item/weapon/reagent_containers/food/snacks/soydope,
- /obj/item/weapon/reagent_containers/food/snacks/grown/carrot,
- /obj/item/weapon/reagent_containers/food/snacks/grown/tomato,
- )
- result = /obj/item/weapon/reagent_containers/food/snacks/stewedsoymeat
-
-/datum/recipe/poppypretzel
- reagents = list("flour" = 5)
- items = list(
- /obj/item/seeds/poppyseed,
- /obj/item/weapon/reagent_containers/food/snacks/egg,
- )
- result = /obj/item/weapon/reagent_containers/food/snacks/poppypretzel
-
/datum/recipe/candiedapple
reagents = list("water" = 5, "sugar" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/grown/apple
)
result = /obj/item/weapon/reagent_containers/food/snacks/candiedapple
-
-/datum/recipe/sausage
- items = list(
- /obj/item/weapon/reagent_containers/food/snacks/faggot,
- /obj/item/weapon/reagent_containers/food/snacks/meat,
- )
- result = /obj/item/weapon/reagent_containers/food/snacks/sausage
-
-/datum/recipe/plumphelmetbiscuit
- reagents = list("flour" = 5)
- items = list(
- /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/plumphelmet,
- )
- result = /obj/item/weapon/reagent_containers/food/snacks/plumphelmetbiscuit
-
-/datum/recipe/appletart
- reagents = list("sugar" = 5, "milk" = 5, "flour" = 15)
- items = list(
- /obj/item/weapon/reagent_containers/food/snacks/egg,
- /obj/item/weapon/reagent_containers/food/snacks/grown/apple/gold,
- )
- result = /obj/item/weapon/reagent_containers/food/snacks/appletart
-
-/datum/recipe/cracker
- reagents = list("flour" = 5, "sodiumchloride" = 1)
- result = /obj/item/weapon/reagent_containers/food/snacks/cracker
diff --git a/code/modules/food&drinks/recipes/microwave/recipes_burgers.dm b/code/modules/food&drinks/recipes/microwave/recipes_burger.dm
similarity index 100%
rename from code/modules/food&drinks/recipes/microwave/recipes_burgers.dm
rename to code/modules/food&drinks/recipes/microwave/recipes_burger.dm
diff --git a/code/modules/food&drinks/recipes/microwave/recipes_cakes.dm b/code/modules/food&drinks/recipes/microwave/recipes_cake.dm
similarity index 100%
rename from code/modules/food&drinks/recipes/microwave/recipes_cakes.dm
rename to code/modules/food&drinks/recipes/microwave/recipes_cake.dm
diff --git a/code/modules/food&drinks/recipes/microwave/recipes_egg.dm b/code/modules/food&drinks/recipes/microwave/recipes_egg.dm
new file mode 100644
index 00000000000..7797053ffbf
--- /dev/null
+++ b/code/modules/food&drinks/recipes/microwave/recipes_egg.dm
@@ -0,0 +1,40 @@
+
+////////////////////////////////////////////////EGG RECIPE's////////////////////////////////////////////////
+
+/datum/recipe/egg/fried
+ reagents = list("sodiumchloride" = 1, "blackpepper" = 1)
+ items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/egg
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/friedegg
+
+/datum/recipe/egg/boiled
+ reagents = list("water" = 5)
+ items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/egg
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/boiledegg
+
+/datum/recipe/egg/omelette
+ items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/egg,
+ /obj/item/weapon/reagent_containers/food/snacks/egg,
+ /obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
+ /obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/omelette
+
+/datum/recipe/egg/chocolate
+ items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/egg,
+ /obj/item/weapon/reagent_containers/food/snacks/chocolatebar,
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/chocolateegg
+
+/datum/recipe/egg/benedict
+ items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/friedegg,
+ /obj/item/weapon/reagent_containers/food/snacks/meatsteak,
+ /obj/item/weapon/reagent_containers/food/snacks/breadslice,
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/benedict
diff --git a/code/modules/food&drinks/recipes/microwave/recipes_meat.dm b/code/modules/food&drinks/recipes/microwave/recipes_meat.dm
new file mode 100644
index 00000000000..81506429ae0
--- /dev/null
+++ b/code/modules/food&drinks/recipes/microwave/recipes_meat.dm
@@ -0,0 +1,145 @@
+
+////////////////////////////////////////////////KEBABS NO REMOVE////////////////////////////////////////////////
+
+/datum/recipe/kebab/human
+ items = list(
+ /obj/item/stack/rods,
+ /obj/item/weapon/reagent_containers/food/snacks/meat/human,
+ /obj/item/weapon/reagent_containers/food/snacks/meat/human,
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/human/kebab
+
+/datum/recipe/kebab/monkey
+ items = list(
+ /obj/item/stack/rods,
+ /obj/item/weapon/reagent_containers/food/snacks/meat/monkey,
+ /obj/item/weapon/reagent_containers/food/snacks/meat/monkey,
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/monkeykebab
+
+/datum/recipe/kebab/tofu
+ items = list(
+ /obj/item/stack/rods,
+ /obj/item/weapon/reagent_containers/food/snacks/tofu,
+ /obj/item/weapon/reagent_containers/food/snacks/tofu,
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/tofukebab
+
+////////////////////////////////////////////////FISH////////////////////////////////////////////////
+
+/datum/recipe/carpmeat
+ reagents = list("carpotoxin" = 5)
+ items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/tofu
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/carpmeat/imitation
+
+/datum/recipe/cubancarp
+ reagents = list("flour" = 5)
+ items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/grown/chili,
+ /obj/item/weapon/reagent_containers/food/snacks/carpmeat,
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/cubancarp
+
+/datum/recipe/fishandchips
+ items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/fries,
+ /obj/item/weapon/reagent_containers/food/snacks/carpmeat,
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/fishandchips
+
+/datum/recipe/fishfingers
+ reagents = list("flour" = 10)
+ items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/egg,
+ /obj/item/weapon/reagent_containers/food/snacks/carpmeat,
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/fishfingers
+
+/datum/recipe/sashimi
+ reagents = list("soysauce" = 5)
+ items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/spidereggs,
+ /obj/item/weapon/reagent_containers/food/snacks/carpmeat,
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/sashimi
+
+////////////////////////////////////////////////MR SPIDER////////////////////////////////////////////////
+
+/datum/recipe/boiledspiderleg
+ reagents = list("water" = 10)
+ items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/spiderleg,
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/boiledspiderleg
+
+/datum/recipe/spidereggsham
+ reagents = list("sodiumchloride" = 1)
+ items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/spidereggs,
+ /obj/item/weapon/reagent_containers/food/snacks/spidermeat,
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/spidereggsham
+
+////////////////////////////////////////////////MISC RECIPE's////////////////////////////////////////////////
+
+/datum/recipe/cornedbeef
+ reagents = list("sodiumchloride" = 5)
+ items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/meat,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/cabbage,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/cabbage,
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/cornedbeef
+
+/datum/recipe/wingfangchu
+ reagents = list("soysauce" = 5)
+ items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/xenomeat,
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/wingfangchu
+
+/datum/recipe/meatsteak
+ reagents = list("sodiumchloride" = 1, "blackpepper" = 1)
+ items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/meat
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/meatsteak
+
+/datum/recipe/enchiladas
+ items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/meat,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/chili,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/chili,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/corn,
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/enchiladas
+
+/datum/recipe/stew
+ reagents = list("water" = 10)
+ items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/grown/tomato,
+ /obj/item/weapon/reagent_containers/food/snacks/meat,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/potato,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/carrot,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/eggplant,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom,
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/stew
+
+/datum/recipe/stewedsoymeat
+ items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/soydope,
+ /obj/item/weapon/reagent_containers/food/snacks/soydope,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/carrot,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/tomato,
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/stewedsoymeat
+
+/datum/recipe/sausage
+ items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/faggot,
+ /obj/item/weapon/reagent_containers/food/snacks/meat,
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/sausage
diff --git a/code/modules/food&drinks/recipes/microwave/recipes_pastry.dm b/code/modules/food&drinks/recipes/microwave/recipes_pastry.dm
new file mode 100644
index 00000000000..f4a37c243bb
--- /dev/null
+++ b/code/modules/food&drinks/recipes/microwave/recipes_pastry.dm
@@ -0,0 +1,200 @@
+
+////////////////////////////////////////////////DONUTS////////////////////////////////////////////////
+
+/datum/recipe/donut
+ reagents = list("flour" = 5)
+ items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/egg
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/donut/normal
+
+/datum/recipe/donut/jelly
+ reagents = list("berryjuice" = 5, "flour" = 5)
+ items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/egg
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/donut/jelly
+
+/datum/recipe/donut/jelly/slime
+ reagents = list("slimejelly" = 5, "flour" = 5)
+ result = /obj/item/weapon/reagent_containers/food/snacks/donut/slimejelly
+
+/datum/recipe/donut/jelly/cherry
+ reagents = list("cherryjelly" = 5, "flour" = 5)
+ result = /obj/item/weapon/reagent_containers/food/snacks/donut/cherryjelly
+
+/datum/recipe/chaosdonut
+ reagents = list("frostoil" = 5, "capsaicin" = 5, "flour" = 5)
+ items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/egg
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/donut/chaos
+
+
+////////////////////////////////////////////////WAFFLES////////////////////////////////////////////////
+
+/datum/recipe/waffles
+ reagents = list("flour" = 10)
+ items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/egg,
+ /obj/item/weapon/reagent_containers/food/snacks/egg,
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/waffles
+
+
+/datum/recipe/waffles/soylenviridians
+ reagents = list("flour" = 15)
+ items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/grown/soybeans
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/soylenviridians
+
+/datum/recipe/waffles/soylentgreen
+ reagents = list("flour" = 15)
+ items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/meat/human,
+ /obj/item/weapon/reagent_containers/food/snacks/meat/human,
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/soylentgreen
+
+
+/datum/recipe/waffles/roffle
+ reagents = list("mushroomhallucinogen" = 5, "flour" = 10)
+ items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/egg,
+ /obj/item/weapon/reagent_containers/food/snacks/egg,
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/rofflewaffles
+
+////////////////////////////////////////////////DONKPOCCKETS////////////////////////////////////////////////
+
+/datum/recipe/donkpocket
+ reagents = list("flour" = 5)
+ items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/faggot,
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/donkpocket //SPECIAL
+ proc/warm_up(var/obj/item/weapon/reagent_containers/food/snacks/donkpocket/being_cooked)
+ being_cooked.warm = 1
+ being_cooked.reagents.add_reagent("tricordrazine", 5)
+ being_cooked.bitesize = 6
+ being_cooked.name = "Warm " + being_cooked.name
+ being_cooked.cooltime()
+ make_food(var/obj/container as obj)
+ var/obj/item/weapon/reagent_containers/food/snacks/donkpocket/being_cooked = ..(container)
+ warm_up(being_cooked)
+ return being_cooked
+
+/datum/recipe/donkpocket/warm
+ reagents = list() //This is necessary since this is a child object of the above recipe and we don't want donk pockets to need flour
+ items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/donkpocket
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/donkpocket //SPECIAL
+ make_food(var/obj/container as obj)
+ var/obj/item/weapon/reagent_containers/food/snacks/donkpocket/being_cooked = locate() in container
+ if(being_cooked && !being_cooked.warm)
+ warm_up(being_cooked)
+ return being_cooked
+
+////////////////////////////////////////////////MUFFINS////////////////////////////////////////////////
+
+/datum/recipe/muffin
+ reagents = list("milk" = 5, "flour" = 5)
+ items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/egg,
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/muffin
+
+/datum/recipe/muffin/berry
+ reagents = list("milk" = 5, "flour" = 5)
+ items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/egg,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/berries
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/muffin/berry
+
+/datum/recipe/muffin/booberry
+ reagents = list("milk" = 5, "flour" = 5)
+ items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/egg,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/berries,
+ /obj/item/weapon/ectoplasm
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/muffin/booberry
+
+/datum/recipe/muffin/chawanmushi
+ reagents = list("water" = 5, "soysauce" = 5)
+ items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/egg,
+ /obj/item/weapon/reagent_containers/food/snacks/egg,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/chanterelle,
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/chawanmushi
+
+////////////////////////////////////////////OTHER////////////////////////////////////////////
+
+/datum/recipe/hotdog
+ reagents = list("ketchup" = 5)
+ items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/breadslice,
+ /obj/item/weapon/reagent_containers/food/snacks/sausage,
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/hotdog
+
+/datum/recipe/meatbun
+ reagents = list("soysauce" = 5, "flour" = 5)
+ items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/faggot,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/cabbage,
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/meatbun
+
+/datum/recipe/sugarcookie
+ reagents = list("flour" = 5, "sugar" = 5)
+ items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/egg,
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/sugarcookie
+
+/datum/recipe/fortunecookie
+ reagents = list("flour" = 5)
+ items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/egg,
+ /obj/item/weapon/paper,
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/fortunecookie
+/datum/recipe/fortunecookie/make_food(var/obj/container as obj)
+ var/obj/item/weapon/paper/paper = locate() in container
+ paper.loc = null //prevent deletion
+ var/obj/item/weapon/reagent_containers/food/snacks/fortunecookie/being_cooked = ..(container)
+ paper.loc = being_cooked
+ being_cooked.trash = paper //so the paper is left behind as trash without special-snowflake(TM Nodrak) code ~carn
+ return being_cooked
+
+/datum/recipe/poppypretzel
+ reagents = list("flour" = 5)
+ items = list(
+ /obj/item/seeds/poppyseed,
+ /obj/item/weapon/reagent_containers/food/snacks/egg,
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/poppypretzel
+
+/datum/recipe/plumphelmetbiscuit
+ reagents = list("flour" = 5)
+ items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/plumphelmet,
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/plumphelmetbiscuit
+
+/datum/recipe/appletart
+ reagents = list("sugar" = 5, "milk" = 5, "flour" = 15)
+ items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/egg,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/apple/gold,
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/appletart
+
+/datum/recipe/cracker
+ reagents = list("flour" = 5, "sodiumchloride" = 1)
+ result = /obj/item/weapon/reagent_containers/food/snacks/cracker
diff --git a/code/modules/food&drinks/recipes/microwave/recipes_pies.dm b/code/modules/food&drinks/recipes/microwave/recipes_pie.dm
similarity index 100%
rename from code/modules/food&drinks/recipes/microwave/recipes_pies.dm
rename to code/modules/food&drinks/recipes/microwave/recipes_pie.dm
diff --git a/code/modules/food&drinks/recipes/microwave/recipes_pizza.dm b/code/modules/food&drinks/recipes/microwave/recipes_pizza.dm
new file mode 100644
index 00000000000..6aee67ae111
--- /dev/null
+++ b/code/modules/food&drinks/recipes/microwave/recipes_pizza.dm
@@ -0,0 +1,47 @@
+
+////////////////////////////////////////////////PIZZA!!!////////////////////////////////////////////////
+
+/datum/recipe/pizza/margherita
+ reagents = list("flour" = 10)
+ items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
+ /obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
+ /obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
+ /obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/tomato,
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/margherita
+
+/datum/recipe/pizza/meat
+ reagents = list("flour" = 10)
+ items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/meat,
+ /obj/item/weapon/reagent_containers/food/snacks/meat,
+ /obj/item/weapon/reagent_containers/food/snacks/meat,
+ /obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/tomato,
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/meatpizza
+
+/datum/recipe/pizza/mushroom
+ reagents = list("flour" = 10)
+ items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom,
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/mushroompizza
+
+/datum/recipe/pizza/vegetable
+ reagents = list("flour" = 10)
+ items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/grown/eggplant,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/carrot,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/corn,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/tomato,
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/vegetablepizza
+
+
diff --git a/code/modules/food&drinks/recipes/microwave/recipes_salad.dm b/code/modules/food&drinks/recipes/microwave/recipes_salad.dm
new file mode 100644
index 00000000000..2ad41f702e8
--- /dev/null
+++ b/code/modules/food&drinks/recipes/microwave/recipes_salad.dm
@@ -0,0 +1,37 @@
+////////////////////////////////////////////////SALADS////////////////////////////////////////////////
+
+/datum/recipe/salad/herb
+ items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia/vulgaris,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia/vulgaris,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia/vulgaris,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/apple,
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/herbsalad
+ make_food(var/obj/container as obj)
+ var/obj/item/weapon/reagent_containers/food/snacks/herbsalad/being_cooked = ..(container)
+ being_cooked.reagents.del_reagent("toxin")
+ return being_cooked
+
+/datum/recipe/salad/aesir
+ items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia/deus,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia/deus,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia/deus,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/apple/gold,
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/aesirsalad
+
+/datum/recipe/salad/valid
+ items = list(
+ /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia/vulgaris,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia/vulgaris,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia/vulgaris,
+ /obj/item/weapon/reagent_containers/food/snacks/grown/potato,
+ /obj/item/weapon/reagent_containers/food/snacks/faggot,
+ )
+ result = /obj/item/weapon/reagent_containers/food/snacks/validsalad
+ make_food(var/obj/container as obj)
+ var/obj/item/weapon/reagent_containers/food/snacks/validsalad/being_cooked = ..(container)
+ being_cooked.reagents.del_reagent("toxin")
+ return being_cooked
\ No newline at end of file
diff --git a/code/modules/hydroponics/biogenerator.dm b/code/modules/hydroponics/biogenerator.dm
index dce78028dd3..511c5807572 100644
--- a/code/modules/hydroponics/biogenerator.dm
+++ b/code/modules/hydroponics/biogenerator.dm
@@ -127,6 +127,9 @@
if("void")
dat += "Error: No growns inside. "
menustat = "menu"
+ if("nobeakerspace")
+ dat += "Please, put growns into reactor. Not enough space left in container. Unable to create product. "
+ menustat = "menu"
if(beaker)
dat += "Biomass: [points] units. " dat += "ActivateDetach Container" @@ -203,13 +206,20 @@ updateUsrDialog() return 0 +/obj/machinery/biogenerator/proc/check_container_volume(var/reagent_amount) + if(beaker.reagents.total_volume + reagent_amount > beaker.reagents.maximum_volume) + menustat = "nobeakerspace" + return 1 + /obj/machinery/biogenerator/proc/create_product(var/create) switch(create) if("milk") - if (check_cost(20/efficiency)) return 0 + if(check_container_volume(10)) return 0 + else if (check_cost(20/efficiency)) return 0 else beaker.reagents.add_reagent("milk",10) if("cream") - if (check_cost(30/efficiency)) return 0 + if(check_container_volume(10)) return 0 + else if (check_cost(30/efficiency)) return 0 else beaker.reagents.add_reagent("cream",10) if("meat") if (check_cost(250/efficiency)) return 0 @@ -278,12 +288,11 @@ else if(href_list["create"]) var/amount = (text2num(href_list["amount"])) var/i = amount - var/cost = (text2num(href_list["cost"])) var/C = href_list["create"] if(i <= 0) return while(i >= 1) - create_product(C, cost, i) + create_product(C) i-- updateUsrDialog() diff --git a/code/modules/library/lib_machines.dm b/code/modules/library/lib_machines.dm index 7cad50f8d9d..0919fe955ac 100644 --- a/code/modules/library/lib_machines.dm +++ b/code/modules/library/lib_machines.dm @@ -461,14 +461,20 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f icon_state = "binder" anchored = 1 density = 1 + var/busy = 0 /obj/machinery/bookbinder/attackby(var/obj/O as obj, var/mob/user as mob) if(istype(O, /obj/item/weapon/paper)) + if(busy) + user << "The book binder is busy. Please wait for completion of previous operation." + return user.drop_item() O.loc = src user.visible_message("[user] loads some paper into [src].", "You load some paper into [src].") src.visible_message("[src] begins to hum as it warms up its printing drums.") + busy = 1 sleep(rand(200,400)) + busy = 0 src.visible_message("[src] whirs as it prints and binds a new book.") var/obj/item/weapon/book/b = new(src.loc) b.dat = O:info diff --git a/code/modules/mining/equipment_locker.dm b/code/modules/mining/equipment_locker.dm index fbc21838808..9ee25e2f3db 100644 --- a/code/modules/mining/equipment_locker.dm +++ b/code/modules/mining/equipment_locker.dm @@ -232,17 +232,18 @@ var/list/prize_list = list( new /datum/data/mining_equipment("Stimpack MediPen", /obj/item/weapon/reagent_containers/hypospray/medipen/stimpack, 50), new /datum/data/mining_equipment("Leporazine MediPen", /obj/item/weapon/reagent_containers/hypospray/medipen/leporazine, 50), + new /datum/data/mining_equipment("MediPen Bundle", /obj/item/weapon/storage/box/medipens/utility, 200), new /datum/data/mining_equipment("Whiskey", /obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey, 100), new /datum/data/mining_equipment("Cigar", /obj/item/clothing/mask/cigarette/cigar/havana, 150), new /datum/data/mining_equipment("Soap", /obj/item/weapon/soap/nanotrasen, 200), new /datum/data/mining_equipment("Jaunter", /obj/item/device/wormhole_jaunter, 250), - new /datum/data/mining_equipment("Advanced Scanner", /obj/item/device/t_scanner/adv_mining_scanner, 400), + new /datum/data/mining_equipment("Advanced Scanner", /obj/item/device/t_scanner/adv_mining_scanner, 300), new /datum/data/mining_equipment("Laser Pointer", /obj/item/device/laser_pointer, 400), new /datum/data/mining_equipment("Alien Toy", /obj/item/clothing/mask/facehugger/toy, 450), new /datum/data/mining_equipment("Mining Drone", /mob/living/simple_animal/hostile/mining_drone/, 500), + new /datum/data/mining_equipment("Resonator", /obj/item/weapon/resonator, 650), + new /datum/data/mining_equipment("Kinetic Accelerator", /obj/item/weapon/gun/energy/kinetic_accelerator, 650), new /datum/data/mining_equipment("Sonic Jackhammer", /obj/item/weapon/pickaxe/jackhammer, 800), - new /datum/data/mining_equipment("Resonator", /obj/item/weapon/resonator, 1000), - new /datum/data/mining_equipment("Kinetic Accelerator", /obj/item/weapon/gun/energy/kinetic_accelerator, 1000), new /datum/data/mining_equipment("Lazarus Injector", /obj/item/weapon/lazarus_injector, 1000), new /datum/data/mining_equipment("Jetpack", /obj/item/weapon/tank/jetpack/carbondioxide/mining, 2000), new /datum/data/mining_equipment("Space Cash", /obj/item/weapon/spacecash/c1000, 5000), @@ -470,7 +471,7 @@ icon = 'icons/obj/items.dmi' icon_state = "resonator" item_state = "resonator" - desc = "A handheld device that creates small fields of energy that resonate until they detonate, crushing rock. It can also be activated without a target to create a field at the user's location, to act as a delayed time trap. It's more effective in a vaccuum." + desc = "A handheld device that creates small fields of energy that resonate until they detonate, crushing rock. It can also be activated without a target to create a field at the user's location, to act as a delayed time trap. It's more effective in a vacuum." w_class = 3 force = 10 throwforce = 10 diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm index 82ec0a9e4fa..c39d03f38ac 100644 --- a/code/modules/mining/mine_turfs.dm +++ b/code/modules/mining/mine_turfs.dm @@ -99,7 +99,7 @@ new/turf/simulated/floor/plating/asteroid/airless/cave(src) if("Gibtonite") M = new/turf/simulated/mineral/gibtonite(src) - if("Clown") + if("Bananium") M = new/turf/simulated/mineral/clown(src) /*if("Adamantine") M = new/turf/simulated/mineral/adamantine(src)*/ @@ -178,7 +178,7 @@ /turf/simulated/mineral/clown name = "bananium deposit" icon_state = "rock_Clown" - mineralName = "Clown" + mineralName = "Bananium" mineralAmt = 3 spreadChance = 0 spread = 0 @@ -416,7 +416,7 @@ new /obj/item/weapon/ore/plasma(src) if (src.mineralName == "Diamond") new /obj/item/weapon/ore/diamond(src) - if (src.mineralName == "Clown") + if (src.mineralName == "Bananium") new /obj/item/weapon/ore/bananium(src) var/turf/simulated/floor/plating/asteroid/airless/N = ChangeTurf(/turf/simulated/floor/plating/asteroid/airless) N.fullUpdateMineralOverlays() diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 9274b09145d..f7da665c052 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -293,3 +293,11 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp return 1 +//this is a mob verb instead of atom for performance reasons +//see /mob/verb/examinate() in mob.dm for more info +//overriden here and in /mob/living for different point span classes and sanity checks +/mob/dead/observer/pointed(atom/A as mob|obj|turf in view()) + if(!..()) + return 0 + usr.visible_message("[src] points to [A]") + return 1 diff --git a/code/modules/mob/living/carbon/alien/special/facehugger.dm b/code/modules/mob/living/carbon/alien/special/facehugger.dm index bc11bcd2490..aa64f72e5b1 100644 --- a/code/modules/mob/living/carbon/alien/special/facehugger.dm +++ b/code/modules/mob/living/carbon/alien/special/facehugger.dm @@ -229,6 +229,9 @@ var/const/MAX_ACTIVE_TIME = 400 /proc/CanHug(var/mob/M) + if(M.stat == DEAD) + return 0 + if(iscorgi(M) || ismonkey(M)) return 1 diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index beea8cfa2e3..b98ad128879 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -499,6 +499,7 @@ if(R) if(istype(H.glasses, /obj/item/clothing/glasses/hud/security) || istype(H.glasses, /obj/item/clothing/glasses/hud/security/sunglasses)) if(setcriminal != "Cancel") + investigate_log("[src.key] has been set from [R.fields["criminal"]] to [setcriminal] by [usr.name] ([usr.key]).", "records") R.fields["criminal"] = setcriminal spawn() @@ -721,7 +722,7 @@ return(gain) /mob/living/carbon/human/singularity_pull(S, current_size) - if(current_size >= 5) + if(current_size >= STAGE_THREE) var/list/handlist = list(l_hand, r_hand) for(var/obj/item/hand in handlist) if(prob(current_size * 5) && hand.w_class >= ((11-current_size)/2) && unEquip(hand)) diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index 80cfc7010cb..a54e388c7f6 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -229,3 +229,95 @@ emp_act L.take_damage(0,5) src.Stun(5) ..() + + +/mob/living/carbon/human/acid_act(var/acidpwr, var/toxpwr, var/acid_volume) + var/list/damaged = list() + + if(head) + if(!head.unacidable) + head.acid_act(acidpwr) + update_inv_head() + else + src << "Your [head.name] protects your head from the acid!" + else + if(wear_mask) + if(!wear_mask.unacidable) + wear_mask.acid_act(acidpwr) + update_inv_wear_mask() + else + src << "Your [wear_mask.name] protects your head from the acid!" + else + if(glasses) + if(!glasses.unacidable) + glasses.acid_act(acidpwr) + update_inv_glasses() + else + src << "Your [glasses.name] protects your head from the acid!" + else + . = get_organ("head") + if(.) + damaged += . + + if(wear_suit) + if(!wear_suit.unacidable) + wear_suit.acid_act(acidpwr) + update_inv_wear_suit() + else + src << "Your [wear_suit.name] protects your body from the acid!" + else + if(w_uniform) + if(!w_uniform.unacidable) + w_uniform.acid_act(acidpwr) + update_inv_w_uniform() + else + src << "Your [w_uniform.name] protects your body from the acid!" + else + . = get_organ("chest") + if(.) + damaged += . + + if(gloves) + if(!gloves.unacidable) + gloves.acid_act(acidpwr) + update_inv_gloves() + else + src << "Your [gloves.name] protects your arms from the acid!" + else + . = get_organ("r_arm") + if(.) + damaged += . + . = get_organ("l_arm") + if(.) + damaged += . + + + if(shoes) + if(!shoes.unacidable) + shoes.acid_act(acidpwr) + update_inv_shoes() + else + src << "Your [shoes.name] protects your legs from the acid!" + else + . = get_organ("r_leg") + if(.) + damaged += . + . = get_organ("l_leg") + if(.) + damaged += . + + + for(var/obj/item/organ/limb/affecting in damaged) + affecting.take_damage(4*toxpwr, 2*toxpwr) + + if(affecting.name == "head") + affecting.take_damage(4*toxpwr, 2*toxpwr) + if(prob(2*acidpwr)) //Applies disfigurement + emote("scream") + facial_hair_style = "Shaved" + hair_style = "Bald" + update_hair() + status_flags |= DISFIGURED + + update_damage_overlays() + diff --git a/code/modules/mob/living/carbon/monkey/monkey.dm b/code/modules/mob/living/carbon/monkey/monkey.dm index 9a7dea0277d..82628f186a9 100644 --- a/code/modules/mob/living/carbon/monkey/monkey.dm +++ b/code/modules/mob/living/carbon/monkey/monkey.dm @@ -410,3 +410,16 @@ /mob/living/carbon/monkey/SpeciesCanConsume() return 1 // Monkeys can eat, drink, and be forced to do so + + +/mob/living/carbon/monkey/acid_act(var/acidpwr, var/toxpwr, var/acid_volume) + if(wear_mask) + if(!wear_mask.unacidable) + wear_mask.acid_act(acidpwr) + update_inv_wear_mask() + else + src << "Your mask protects you from the acid." + return + + if(!unacidable) + take_organ_damage(min(6*toxpwr, acid_volume * toxpwr)) diff --git a/code/modules/mob/living/carbon/slime/emote.dm b/code/modules/mob/living/carbon/slime/emote.dm index d6b41afbee2..0693aaba88f 100644 --- a/code/modules/mob/living/carbon/slime/emote.dm +++ b/code/modules/mob/living/carbon/slime/emote.dm @@ -51,6 +51,8 @@ else src << "Unusable emote '[act]'. Say *help for a list." if ((message && src.stat == 0)) + if(client) + log_emote("[name]/[key] : [message]") if (m_type & 1) visible_message(message) else diff --git a/code/modules/mob/living/carbon/slime/slime.dm b/code/modules/mob/living/carbon/slime/slime.dm index e805dd595ea..5982e83a054 100644 --- a/code/modules/mob/living/carbon/slime/slime.dm +++ b/code/modules/mob/living/carbon/slime/slime.dm @@ -236,6 +236,9 @@ /mob/living/carbon/slime/unEquip(obj/item/W as obj) return +/mob/living/carbon/slime/start_pulling(var/atom/movable/AM) + return + /mob/living/carbon/slime/attack_ui(slot) return diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index ada80a01043..a566eeea566 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -10,6 +10,27 @@ ..() del(src) +//mob verbs are a lot faster than object verbs +//for more info on why this is not atom/pull, see examinate() in mob.dm +/mob/living/verb/pulled(atom/movable/AM as mob|obj in oview(1)) + set name = "Pull" + set category = "Object" + + if(AM.Adjacent(src)) + src.start_pulling(AM) + return + +//same as above +/mob/living/pointed(atom/A as mob|obj|turf in view()) + if(src.stat || !src.canmove || src.restrained()) + return 0 + if(src.status_flags & FAKEDEATH) + return 0 + if(!..()) + return 0 + usr.visible_message("[src] points to [A]") + return 1 + /mob/living/verb/succumb(var/whispered as null) set hidden = 1 if (InCritical()) @@ -640,7 +661,7 @@ /mob/living/singularity_pull(S) step_towards(src,S) -mob/living/proc/do_attack_animation() +/mob/living/proc/do_attack_animation() var/pixel_x_diff = 0 var/pixel_y_diff = 0 switch(src.dir) diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index e903b7cef30..b063e139c50 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -106,4 +106,9 @@ proc/vol_by_throwforce_and_or_w_class(var/obj/item/I) adjust_fire_stacks(0.5) IgniteMob() -//Mobs on Fire end \ No newline at end of file +//Mobs on Fire end + + +/mob/living/acid_act(var/acidpwr, var/toxpwr, var/acid_volume) + if(!unacidable) + take_organ_damage(min(6*toxpwr, acid_volume * toxpwr)) \ No newline at end of file diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index f4f1e8f1761..b70d03a9f31 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -364,7 +364,7 @@ var/list/ai_list = list() return if (href_list["callbot"]) //Command a bot to move to a selected location. - Bot = locate(href_list["callbot"]) in machines + Bot = locate(href_list["callbot"]) in aibots if(!Bot || Bot.remote_disabled || src.control_disabled) return //True if there is no bot found, the bot is manually emagged, or the AI is carded with wireless off. waypoint_mode = 1 @@ -372,7 +372,7 @@ var/list/ai_list = list() return if (href_list["interface"]) //Remotely connect to a bot! - Bot = locate(href_list["interface"]) in machines + Bot = locate(href_list["interface"]) in aibots if(!Bot || Bot.remote_disabled || src.control_disabled) return Bot.attack_ai(src) @@ -492,7 +492,7 @@ var/list/ai_list = list() d += "Query network status " d += "
|