Skills
") out += "
| Skill | Value |
|---|
| [dpt] | " - dat += "Normal High" - if(hackState) - dat += "EXTREME" - dat += " | " - dat += "
<< Back
" + switch(screen) + if(1) //req. assistance + dat += "Which department do you need assistance from?
" + dat += "
| [dpt] | " + dat += "" + dat += "Normal" + dat += "High" + if(hackState) + dat += "EXTREME" + dat += " | " + dat += "
<< Back
" - if(2) //req. supplies - dat += "Which department do you need supplies from?
" - dat += "
| [dpt] | " - dat += "Normal High" - if(hackState) - dat += "EXTREME" - dat += " | " - dat += "
<< Back
" + if(2) //req. supplies + dat += "Which department do you need supplies from?
" + dat += "
| [dpt] | " - dat += "Normal High" - if(hackState) - dat += "EXTREME" - dat += " | " - dat += "
<< Back
" + dat += "
<< Back
" - if(6) //sent successfully - dat += "Message sent.
" - dat += "Continue
" + if(3) //relay information + dat += "Which department would you like to send information to?
" + dat += "
| [dpt] | " + dat += "" + dat += "Normal" + dat += "High" + if(hackState) + dat += "EXTREME" + dat += " | " + dat += "
<< Back
" - if(7) //unsuccessful; not sent - dat += "An error occurred.
" - dat += "Continue
" + if(6) //sent successfully + dat += "Message sent.
" + dat += "Continue
" - if(8) //view messages - for (var/obj/machinery/requests_console/Console in GLOB.allConsoles) - if (Console.department == department) - Console.newmessagepriority = NO_NEW_MESSAGE - Console.update_icon() + if(7) //unsuccessful; not sent + dat += "An error occurred.
" + dat += "Continue
" - newmessagepriority = NO_NEW_MESSAGE - update_icon() - var/messageComposite = "" - for(var/msg in messages) // This puts more recent messages at the *top*, where they belong. - messageComposite = "
[msg]
" + messageComposite
- dat += messageComposite
- dat += "<< Back to Main Menu
" + if(8) //view messages + for(var/obj/machinery/requests_console/Console in GLOB.allConsoles) + if(Console.department == department) + Console.newmessagepriority = NO_NEW_MESSAGE + Console.update_icon() - if(9) //authentication before sending - dat += "Message Authentication
" - dat += "Message for [dpt]: [message]
" - dat += "
You may authenticate your message now by scanning your ID or your stamp
" - dat += "Validated by: [msgVerified ? msgVerified : "Not Validated"]
" - dat += "Stamped by: [msgStamped ? msgStamped : "Not Stamped"]
" - dat += "Send Message
" - dat += "
<< Discard Message
" + newmessagepriority = NO_NEW_MESSAGE + update_icon() + var/messageComposite = "" + for(var/msg in messages) // This puts more recent messages at the *top*, where they belong. + messageComposite = "
[msg]
" + messageComposite
+ dat += messageComposite
+ dat += "<< Back to Main Menu
" - if(10) //send announcement - dat += "
Station-wide Announcement
" - if(announceAuth) - dat += "Authentication accepted
" - else - dat += "
Swipe your card to authenticate yourself
" - dat += "Message: [message ? message : "No Message"]
" - dat += "[message ? "Edit" : "Write"] Message
" - if ((announceAuth || IsAdminGhost(user)) && message) - dat += "Announce Message
" - else - dat += "Announce Message
" - dat += "
<< Back
" + if(9) //authentication before sending + dat += "Message Authentication
" + dat += "Message for [dpt]: [message]
" + dat += "
You may authenticate your message now by scanning your ID or your stamp
" + + dat += "Validated by: [msgVerified ? "[msgVerified]" : "Not Validated"]
" + dat += "Stamped by: [msgStamped ? "[msgStamped]" : "Not Stamped"]
" + + dat += "Send Message
" + dat += "<< Discard Message
" - else //main menu - screen = 0 - announceAuth = FALSE - if (newmessagepriority == NORMAL_MESSAGE_PRIORITY) - dat += "
There are new messages
" - if (newmessagepriority == HIGH_MESSAGE_PRIORITY) - dat += "
There are new PRIORITY messages
" - if (newmessagepriority == EXTREME_MESSAGE_PRIORITY) - dat += "
There are new EXTREME PRIORITY messages
" - dat += "View Messages
" + if(10) //send announcement + dat += "
Station-wide Announcement
" + if(announceAuth) + dat += "Authentication accepted
" + else + dat += "
Swipe your card to authenticate yourself
" + dat += "Message: [message ? message : "No Message"]
" + dat += "[message ? "Edit" : "Write"] Message
" + if((announceAuth || IsAdminGhost(user)) && message) + dat += "Announce Message
" + else + dat += "Announce Message
" + dat += "
<< Back
" - dat += "Request Assistance
" - dat += "Request Supplies
" - dat += "Relay Anonymous Information
" + else //main menu + screen = 0 + announceAuth = FALSE + if(newmessagepriority == NORMAL_MESSAGE_PRIORITY) + dat += "
There are new messages
" + if(newmessagepriority == HIGH_MESSAGE_PRIORITY) + dat += "
There are new PRIORITY messages
" + if(newmessagepriority == EXTREME_MESSAGE_PRIORITY) + dat += "
There are new EXTREME PRIORITY messages
" - if(!emergency) - dat += "Emergency: Security
" - dat += "Emergency: Engineering
" - dat += "Emergency: Medical
" - else - dat += "[emergency] has been dispatched to this location.
" + dat += "View Messages
" - if(announcementConsole) - dat += "Send Station-wide Announcement
" - if (silent) - dat += "Speaker OFF" - else - dat += "Speaker ON" - var/datum/browser/popup = new(user, "req_console", "[department] Requests Console", 450, 440) - popup.set_content(dat) - popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state)) - popup.open() - return + dat += "Request Assistance
" + dat += "Request Supplies
" + dat += "Relay Anonymous Information
" + + if(!emergency) + dat += "Emergency: Security
" + dat += "Emergency: Engineering
" + dat += "Emergency: Medical
" + else + dat += "
[emergency] has been dispatched to this location.
" + + if(announcementConsole) + dat += "Send Station-wide Announcement
" + if(silent) + dat += "Speaker OFF" + else + dat += "Speaker ON" + + var/datum/browser/popup = new(user, "req_console", "[department] Requests Console", 450, 440) + popup.set_content(dat) + popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state)) + popup.open() /obj/machinery/requests_console/Topic(href, href_list) if(..()) return usr.set_machine(src) add_fingerprint(usr) - + if(href_list["write"]) dpt = ckey(reject_bad_text(href_list["write"])) //write contains the string of the receiving department's name var/new_message = stripped_input(usr, "Write your message:", "Awaiting Input", "", MAX_MESSAGE_LEN) if(new_message) message = new_message screen = 9 - if (text2num(href_list["priority"]) < 2) - priority = -1 - else - priority = text2num(href_list["priority"]) + priority = text2num(href_list["priority"]) else dpt = ""; msgVerified = "" msgStamped = "" screen = 0 - priority = -1 + priority = NORMAL_MESSAGE_PRIORITY //:salt: if(href_list["writeAnnouncement"]) var/new_message = reject_bad_text(stripped_input(usr, "Write your message:", "Awaiting Input", "", MAX_MESSAGE_LEN)) if(new_message) message = new_message - if (text2num(href_list["priority"]) < 2) - priority = -1 - else - priority = text2num(href_list["priority"]) + priority = text2num(href_list["priority"]) else message = "" announceAuth = FALSE @@ -296,106 +306,116 @@ GLOBAL_LIST_EMPTY(allConsoles) if(href_list["sendAnnouncement"]) if(!announcementConsole) + updateUsrDialog() return if(isliving(usr)) var/mob/living/L = usr message = L.treat_message(message) minor_announce(message, "[department] Announcement:") GLOB.news_network.SubmitArticle(message, department, "Station Announcements", null) - usr.log_talk(message, LOG_SAY, tag="station announcement from [src]") + usr.log_talk(message, LOG_SAY, tag = "station announcement from [src]") message_admins("[ADMIN_LOOKUPFLW(usr)] has made a station announcement from [src] at [AREACOORD(usr)].") announceAuth = FALSE message = "" screen = 0 if(href_list["emergency"]) - if(!emergency) - var/radio_freq - switch(text2num(href_list["emergency"])) - if(1) //Security - radio_freq = FREQ_SECURITY - emergency = "Security" - if(2) //Engineering - radio_freq = FREQ_ENGINEERING - emergency = "Engineering" - if(3) //Medical - radio_freq = FREQ_MEDICAL - emergency = "Medical" - if(radio_freq) - Radio.set_frequency(radio_freq) - Radio.talk_into(src,"[emergency] emergency in [department]!!",radio_freq) - update_icon() - addtimer(CALLBACK(src, .proc/clear_emergency), 3000) + if(emergency) //already has an emergency? do not continue + updateUsrDialog() + return - if( href_list["department"] && message ) - var/log_msg = message + var/radio_freq + switch(text2num(href_list["emergency"])) + if(1) //Security + radio_freq = FREQ_SECURITY + emergency = "Security" + if(2) //Engineering + radio_freq = FREQ_ENGINEERING + emergency = "Engineering" + if(3) //Medical + radio_freq = FREQ_MEDICAL + emergency = "Medical" + if(radio_freq) + Radio.set_frequency(radio_freq) + Radio.talk_into(src, "[emergency] emergency in [department]!!", radio_freq) + update_icon() + addtimer(CALLBACK(src, .proc/clear_emergency), 5 MINUTES) + + if(href_list["department"] && message) var/sending = message sending += "
" - if (msgVerified) - sending += msgVerified - sending += "
" - if (msgStamped) - sending += msgStamped - sending += "
" - screen = 7 //if it's successful, this will get overrwritten (7 = unsufccessfull, 6 = successfull) - if (sending) - var/pass = FALSE - var/datum/data_rc_msg/log = new(href_list["department"], department, log_msg, msgStamped, msgVerified, priority) - for (var/obj/machinery/telecomms/message_server/MS in GLOB.telecomms_list) - if (MS.toggled) - MS.rc_msgs += log - pass = TRUE + if(msgVerified) + sending += "[msgVerified]
" + if(msgStamped) + sending += "[msgStamped]
" + //so you're telling me is you cheated, by making fail happen, then quickly replacing it with 6 - if(pass) - var/radio_freq = 0 - switch(href_list["department"]) - if("bridge") - radio_freq = FREQ_COMMAND - if("medbay") - radio_freq = FREQ_MEDICAL - if("science") - radio_freq = FREQ_SCIENCE - if("engineering") - radio_freq = FREQ_ENGINEERING - if("security") - radio_freq = FREQ_SECURITY - if("cargobay" || "mining") - radio_freq = FREQ_SUPPLY - Radio.set_frequency(radio_freq) - var/authentic - if(msgVerified || msgStamped) - authentic = " (Authenticated)" + var/workingServer = FALSE + var/datum/data_rc_msg/log = new(href_list["department"], department, message, msgStamped, msgVerified, priority) + for(var/obj/machinery/telecomms/message_server/MS in GLOB.telecomms_list) + if(MS.on) //on does the calculations. why would this server still work even though the apc is off?? + LAZYADD(MS.rc_msgs, log) + workingServer = TRUE - var/alert = "" - for (var/obj/machinery/requests_console/Console in GLOB.allConsoles) - if (ckey(Console.department) == ckey(href_list["department"])) - switch(priority) - if(2) //High priority - alert = "PRIORITY Alert in [department][authentic]" - Console.createmessage(src, alert, sending, 2, 1) - if(3) // Extreme Priority - alert = "EXTREME PRIORITY Alert from [department][authentic]" - Console.createmessage(src, alert , sending, 3, 1) - else // Normal priority - alert = "Message from [department][authentic]" - Console.createmessage(src, alert , sending, 1, 1) - screen = 6 + if(!workingServer) + screen = 7 + say("NOTICE: No server detected! Please contact your local engineering team.") + updateUsrDialog() + return - if(radio_freq) - Radio.talk_into(src, "[alert]: [message]", radio_freq) + var/radio_freq = 0 + switch(href_list["department"]) + if("bridge") + radio_freq = FREQ_COMMAND + if("medbay") + radio_freq = FREQ_MEDICAL + if("science") + radio_freq = FREQ_SCIENCE + if("engineering") + radio_freq = FREQ_ENGINEERING + if("security") + radio_freq = FREQ_SECURITY + if("cargobay" || "mining") + radio_freq = FREQ_SUPPLY + Radio.set_frequency(radio_freq) - switch(priority) - if(2) - messages += "High Priority
To: [dpt]
[sending]" - else - messages += "To: [dpt]
[sending]" + var/authentic = "" + if(msgVerified || msgStamped) + authentic = " (Authenticated)" + + var/alert = "" + for(var/obj/machinery/requests_console/C in GLOB.allConsoles) + if(ckey(C.department) != ckey(href_list["department"])) + continue + switch(priority) + if(HIGH_MESSAGE_PRIORITY) //High priority + alert = "PRIORITY Alert from [department][authentic]" + C.createmessage(src, alert, sending, HIGH_MESSAGE_PRIORITY) + if(EXTREME_MESSAGE_PRIORITY) // Extreme Priority + alert = "EXTREME PRIORITY Alert from [department][authentic]" + C.createmessage(src, alert, sending, EXTREME_MESSAGE_PRIORITY) + else // Normal priority + alert = "Message from [department][authentic]" + C.createmessage(src, alert, sending, NORMAL_MESSAGE_PRIORITY) + screen = 6 //if it ever gets here that means (c.department == href_ls["dept"]) + + if(radio_freq) + Radio.talk_into(src, "[alert]: [message]", radio_freq) + //log to (this) + switch(priority) + if(HIGH_MESSAGE_PRIORITY) + messages += "High Priority
To: [dpt]
[sending]" + if(EXTREME_MESSAGE_PRIORITY) + messages += "!!!Extreme Priority!!!
To: [dpt]
[sending]" else - say("NOTICE: No server detected!") + messages += "To: [dpt]
[sending]" //Handle screen switching switch(text2num(href_list["setScreen"])) if(null) //skip + updateUsrDialog() + return if(1) //req. assistance screen = 1 if(2) //req. supplies @@ -423,16 +443,14 @@ GLOBAL_LIST_EMPTY(allConsoles) msgVerified = "" msgStamped = "" message = "" - priority = -1 + priority = NORMAL_MESSAGE_PRIORITY // :salt: screen = 0 //Handle silencing the console - switch( href_list["setSilent"] ) - if(null) //skip - if("1") - silent = TRUE - else - silent = FALSE + if(href_list["setSilent"] == "1") + silent = TRUE + else + silent = FALSE updateUsrDialog() return @@ -457,31 +475,32 @@ GLOBAL_LIST_EMPTY(allConsoles) linkedsender = source capitalize(title) switch(priority) - if(2) //High priority + if(HIGH_MESSAGE_PRIORITY) //High priority if(newmessagepriority < HIGH_MESSAGE_PRIORITY) newmessagepriority = HIGH_MESSAGE_PRIORITY update_icon() if(!silent) playsound(src, 'sound/machines/twobeep.ogg', 50, 1) say(title) - messages += "High Priority
From: [linkedsender]
[message]" + messages += "High Priority
From: [linkedsender]
[message]" //the fuck is this not being sent - if(3) // Extreme Priority + if(EXTREME_MESSAGE_PRIORITY) // Extreme Priority if(newmessagepriority < EXTREME_MESSAGE_PRIORITY) newmessagepriority = EXTREME_MESSAGE_PRIORITY update_icon() - playsound(src, 'sound/machines/twobeep.ogg', 50, 1) - say(title) - messages += "!!!Extreme Priority!!!
From: [linkedsender]
[message]" + //we ignore the silent option because this is !!!IMPORTANT!!! + playsound(src, 'sound/machines/twobeep.ogg', 50, 1) + say(title) + messages += "!!!Extreme Priority!!!
From: [linkedsender]
[message]" else // Normal priority if(newmessagepriority < NORMAL_MESSAGE_PRIORITY) newmessagepriority = NORMAL_MESSAGE_PRIORITY update_icon() - if(!src.silent) + if(!silent) playsound(src, 'sound/machines/twobeep.ogg', 50, 1) say(title) - messages += "From: [linkedsender]
[message]" + messages += "From: [linkedsender]
[message]" /obj/machinery/requests_console/attackby(obj/item/O, mob/user, params) if(istype(O, /obj/item/crowbar)) @@ -505,23 +524,26 @@ GLOBAL_LIST_EMPTY(allConsoles) to_chat(user, "You must open the maintenance panel first!") return - var/obj/item/card/id/ID = O.GetID() - if(ID) + if(istype(O, /obj/item/card/id)) + var/obj/item/card/id/ID = O.GetID() + if(!ID) + return if(screen == 9) - msgVerified = "Verified by [ID.registered_name] ([ID.assignment])" + msgVerified = "Verified by [ID.registered_name] ([ID.assignment])" updateUsrDialog() if(screen == 10) - if (ACCESS_RC_ANNOUNCE in ID.access) + if(ACCESS_RC_ANNOUNCE in ID.access) announceAuth = TRUE else announceAuth = FALSE to_chat(user, "You are not authorized to send announcements!") updateUsrDialog() return - if (istype(O, /obj/item/stamp)) + + if(istype(O, /obj/item/stamp)) if(screen == 9) var/obj/item/stamp/T = O - msgStamped = "Stamped with the [T.name]" + msgStamped = "Stamped with the [T.name]" updateUsrDialog() return return ..() diff --git a/code/game/machinery/shuttle/custom_shuttle.dm b/code/game/machinery/shuttle/custom_shuttle.dm new file mode 100644 index 0000000000..7c83cade69 --- /dev/null +++ b/code/game/machinery/shuttle/custom_shuttle.dm @@ -0,0 +1,33 @@ +/obj/machinery/shuttle + name = "shuttle component" + desc = "Something for shuttles." + density = TRUE + obj_integrity = 250 + max_integrity = 250 + icon = 'icons/turf/shuttle.dmi' + icon_state = "burst_plasma" + idle_power_usage = 150 + circuit = /obj/item/circuitboard/machine/shuttle/engine + var/icon_state_closed = "burst_plasma" + var/icon_state_open = "burst_plasma_open" + var/icon_state_off = "burst_plasma_off" + +/obj/machinery/shuttle/Initialize() + . = ..() + GLOB.custom_shuttle_machines += src + +/obj/machinery/shuttle/Destroy() + . = ..() + GLOB.custom_shuttle_machines -= src + +/obj/machinery/shuttle/attackby(obj/item/I, mob/living/user, params) + if(default_deconstruction_screwdriver(user, icon_state_open, icon_state_closed, I)) + return + if(default_pry_open(I)) + return + if(panel_open) + if(default_change_direction_wrench(user, I)) + return + if(default_deconstruction_crowbar(I)) + return + return ..() diff --git a/code/game/machinery/shuttle/shuttle_engine.dm b/code/game/machinery/shuttle/shuttle_engine.dm new file mode 100644 index 0000000000..1b2ce686d2 --- /dev/null +++ b/code/game/machinery/shuttle/shuttle_engine.dm @@ -0,0 +1,138 @@ +//----------------------------------------------- +//-------------Engine Thrusters------------------ +//----------------------------------------------- + +#define ENGINE_HEAT_TARGET 600 +#define ENGINE_HEATING_POWER 5000000 + +/obj/machinery/shuttle/engine + name = "shuttle thruster" + desc = "A thruster for shuttles." + density = TRUE + obj_integrity = 250 + max_integrity = 250 + icon = 'icons/turf/shuttle.dmi' + icon_state = "burst_plasma" + idle_power_usage = 150 + circuit = /obj/item/circuitboard/machine/shuttle/engine + var/thrust = 0 + var/fuel_use = 0 + var/bluespace_capable = TRUE + var/cooldown = 0 + var/thruster_active = FALSE + var/datum/weakref/attached_heater + +/obj/machinery/shuttle/engine/plasma + name = "plasma thruster" + desc = "A thruster that burns plasma stored in an adjacent plasma thruster heater." + icon_state = "burst_plasma" + icon_state_off = "burst_plasma_off" + + idle_power_usage = 0 + circuit = /obj/item/circuitboard/machine/shuttle/engine/plasma + thrust = 25 + fuel_use = 0.24 + bluespace_capable = FALSE + cooldown = 45 + +/obj/machinery/shuttle/engine/void + name = "void thruster" + desc = "A thruster using technology to breach voidspace for propulsion." + icon_state = "burst_void" + icon_state_off = "burst_void" + icon_state_closed = "burst_void" + icon_state_open = "burst_void_open" + idle_power_usage = 0 + circuit = /obj/item/circuitboard/machine/shuttle/engine/void + thrust = 400 + fuel_use = 0 + bluespace_capable = TRUE + cooldown = 90 + +/obj/machinery/shuttle/engine/Initialize() + . = ..() + check_setup() + +/obj/machinery/shuttle/engine/on_construction() + . = ..() + check_setup() + +/obj/machinery/shuttle/engine/Destroy() + attached_heater = FALSE + thruster_active = FALSE + return ..() + +/obj/machinery/shuttle/engine/proc/check_setup() + if(!anchored) + attached_heater = null + update_engine() + return + var/heater_turf + switch(dir) + if(NORTH) + heater_turf = get_offset_target_turf(src, 0, 1) + if(SOUTH) + heater_turf = get_offset_target_turf(src, 0, -1) + if(EAST) + heater_turf = get_offset_target_turf(src, 1, 0) + if(WEST) + heater_turf = get_offset_target_turf(src, -1, 0) + if(!heater_turf) + attached_heater = null + update_engine() + return + attached_heater = null + for(var/obj/machinery/atmospherics/components/unary/shuttle/heater/as_heater in heater_turf) + if(as_heater.dir != dir) + continue + if(as_heater.panel_open) + continue + if(!as_heater.anchored) + continue + attached_heater = WEAKREF(as_heater) + break + update_engine() + return + +/obj/machinery/shuttle/engine/proc/update_engine() + if(!attached_heater) + icon_state = icon_state_off + thruster_active = FALSE + return + var/obj/machinery/atmospherics/components/unary/shuttle/heater/resolved_heater = attached_heater.resolve() + if(panel_open) + thruster_active = FALSE + else if(resolved_heater?.hasFuel(1)) + icon_state = icon_state_closed + thruster_active = TRUE + else + thruster_active = FALSE + icon_state = icon_state_off + return + +/obj/machinery/shuttle/engine/void/update_engine() + if(panel_open) + thruster_active = FALSE + return + thruster_active = TRUE + icon_state = icon_state_closed + return + +//Thanks to spaceheater.dm for inspiration :) +/obj/machinery/shuttle/engine/proc/fireEngine() + var/turf/heatTurf = loc + if(!heatTurf) + return + var/datum/gas_mixture/env = heatTurf.return_air() + var/heat_cap = env.heat_capacity() + var/req_power = abs(env.return_temperature() - ENGINE_HEAT_TARGET) * heat_cap + req_power = min(req_power, ENGINE_HEATING_POWER) + var/deltaTemperature = req_power / heat_cap + if(deltaTemperature < 0) + return + env.temperature += deltaTemperature + air_update_turf() + +/obj/machinery/shuttle/engine/default_change_direction_wrench(mob/user, obj/item/I) + . = ..() + update_engine() diff --git a/code/game/machinery/shuttle/shuttle_heater.dm b/code/game/machinery/shuttle/shuttle_heater.dm new file mode 100644 index 0000000000..3c36e53b5a --- /dev/null +++ b/code/game/machinery/shuttle/shuttle_heater.dm @@ -0,0 +1,132 @@ +//----------------------------------------------- +//--------------Engine Heaters------------------- +//This uses atmospherics, much like a thermomachine, +//but instead of changing temp, it stores plasma and uses +//it for the engine. +//----------------------------------------------- +/obj/machinery/atmospherics/components/unary/shuttle + name = "shuttle atmospherics device" + desc = "This does something to do with shuttle atmospherics" + icon_state = "heater" + icon = 'icons/turf/shuttle.dmi' + +/obj/machinery/atmospherics/components/unary/shuttle/heater + name = "engine heater" + desc = "Directs energy into compressed particles in order to power an attached thruster." + icon_state = "heater_pipe" + var/icon_state_closed = "heater_pipe" + var/icon_state_open = "heater_pipe_open" + var/icon_state_off = "heater_pipe" + idle_power_usage = 50 + circuit = /obj/item/circuitboard/machine/shuttle/heater + + density = TRUE + max_integrity = 400 + armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 100, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 30) + layer = OBJ_LAYER + showpipe = TRUE + + pipe_flags = PIPING_ONE_PER_TURF | PIPING_DEFAULT_LAYER_ONLY + + var/gas_type = /datum/gas/plasma + var/efficiency_multiplier = 1 + var/gas_capacity = 0 + +/obj/machinery/atmospherics/components/unary/shuttle/heater/New() + . = ..() + GLOB.custom_shuttle_machines += src + SetInitDirections() + update_adjacent_engines() + updateGasStats() + +/obj/machinery/atmospherics/components/unary/shuttle/heater/Destroy() + . = ..() + update_adjacent_engines() + GLOB.custom_shuttle_machines -= src + +/obj/machinery/atmospherics/components/unary/shuttle/heater/on_construction() + ..(dir, dir) + SetInitDirections() + update_adjacent_engines() + +/obj/machinery/atmospherics/components/unary/shuttle/heater/default_change_direction_wrench(mob/user, obj/item/I) + if(!..()) + return FALSE + SetInitDirections() + var/obj/machinery/atmospherics/node = nodes[1] + if(node) + node.disconnect(src) + nodes[1] = null + if(!parents[1]) + return + nullifyPipenet(parents[1]) + + atmosinit() + node = nodes[1] + if(node) + node.atmosinit() + node.addMember(src) + build_network() + return TRUE + +/obj/machinery/atmospherics/components/unary/shuttle/heater/RefreshParts() + var/cap = 0 + var/eff = 0 + for(var/obj/item/stock_parts/matter_bin/M in component_parts) + cap += M.rating + for(var/obj/item/stock_parts/micro_laser/L in component_parts) + eff += L.rating + gas_capacity = 5000 * ((cap - 1) ** 2) + 1000 + efficiency_multiplier = round(((eff / 2) / 2.8) ** 2, 0.1) + updateGasStats() + +/obj/machinery/atmospherics/components/unary/shuttle/heater/examine(mob/user) + . = ..() + var/datum/gas_mixture/air_contents = airs[1] + . += "The engine heater's gas dial reads [air_contents.return_volume()] liters in internal tank.
" + +/obj/machinery/atmospherics/components/unary/shuttle/heater/proc/updateGasStats() + var/datum/gas_mixture/air_contents = airs[1] + if(!air_contents) + return + air_contents.volume = gas_capacity + air_contents.temperature = T20C + +/obj/machinery/atmospherics/components/unary/shuttle/heater/proc/hasFuel(var/required) + var/datum/gas_mixture/air_contents = airs[1] + var/moles = air_contents.total_moles() + return moles >= required + +/obj/machinery/atmospherics/components/unary/shuttle/heater/proc/consumeFuel(var/amount) + var/datum/gas_mixture/air_contents = airs[1] + air_contents.remove(amount) + return + +/obj/machinery/atmospherics/components/unary/shuttle/heater/attackby(obj/item/I, mob/living/user, params) + update_adjacent_engines() + if(default_deconstruction_screwdriver(user, icon_state_open, icon_state_closed, I)) + return + if(default_pry_open(I)) + return + if(panel_open) + if(default_change_direction_wrench(user, I)) + return + if(default_deconstruction_crowbar(I)) + return + return ..() + +/obj/machinery/atmospherics/components/unary/shuttle/heater/proc/update_adjacent_engines() + var/engine_turf + switch(dir) + if(NORTH) + engine_turf = get_offset_target_turf(src, 0, -1) + if(SOUTH) + engine_turf = get_offset_target_turf(src, 0, 1) + if(EAST) + engine_turf = get_offset_target_turf(src, -1, 0) + if(WEST) + engine_turf = get_offset_target_turf(src, 1, 0) + if(!engine_turf) + return + for(var/obj/machinery/shuttle/engine/E in engine_turf) + E.check_setup() diff --git a/code/game/machinery/status_display.dm b/code/game/machinery/status_display.dm index 02bb07b8ed..3bb67e2a1c 100644 --- a/code/game/machinery/status_display.dm +++ b/code/game/machinery/status_display.dm @@ -290,7 +290,7 @@ if("shuttle_id") update() -/obj/machinery/status_display/shuttle/proc/connect_to_shuttle(obj/docking_port/mobile/port, obj/docking_port/stationary/dock, idnum, override) +/obj/machinery/status_display/shuttle/connect_to_shuttle(obj/docking_port/mobile/port, obj/docking_port/stationary/dock, idnum, override) if (port && (shuttle_id == initial(shuttle_id) || override)) shuttle_id = port.id update() diff --git a/code/game/machinery/telecomms/computers/logbrowser.dm b/code/game/machinery/telecomms/computers/logbrowser.dm index f2b2c594b7..fdf6ba121c 100644 --- a/code/game/machinery/telecomms/computers/logbrowser.dm +++ b/code/game/machinery/telecomms/computers/logbrowser.dm @@ -1,215 +1,164 @@ - +/* + The log console for viewing the entire telecomms + network log +*/ /obj/machinery/computer/telecomms/server name = "telecommunications server monitoring console" icon_screen = "comm_logs" desc = "Has full access to all details and record of the telecommunications network it's monitoring." + circuit = /obj/item/circuitboard/computer/comm_server + req_access = list(ACCESS_TCOMSAT) - var/screen = 0 // the screen number: - var/list/servers = list() // the servers located by the computer - var/obj/machinery/telecomms/server/SelectedServer + var/list/machinelist = list() // the servers located by the computer + var/obj/machinery/telecomms/server/SelectedMachine = null var/network = "NULL" // the network to probe - var/temp = "" // temporary feedback messages + var/notice = "" + var/universal_translate = FALSE // set to TRUE(1) if it can translate nonhuman speech - var/universal_translate = 0 // set to 1 if it can translate nonhuman speech +/obj/machinery/computer/telecomms/server/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \ + datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state) + ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open) + if(!ui) + ui = new(user, src, ui_key, "tcommsserver", "Telecomms Server Monitor", 575, 400, master_ui, state) + ui.open() - req_access = list(ACCESS_TCOMSAT) - circuit = /obj/item/circuitboard/computer/comm_server +/obj/machinery/computer/telecomms/server/ui_data(mob/user) + var/list/data_out = list() + data_out["network"] = network + data_out["notice"] = notice -/obj/machinery/computer/telecomms/server/ui_interact(mob/user) - . = ..() - var/dat = "
[temp]
" - dat += "
Current Network: [network]
" - if(servers.len) - dat += "
Detected Telecommunication Servers:
- "
- for(var/obj/machinery/telecomms/T in servers)
- dat += "
- [REF(T)] [T.name] ([T.id]) " - dat += "
\[Flush Buffer\]" + if(C.input_type == "Speech File") //there is a reason why this is not a switch. + data["source"] = list( + name = C.parameters["name"], //name of the mob | obj + job = C.parameters["job"] //job of the mob | obj + ) + // -- Determine race of orator -- + var/mobtype = C.parameters["mobtype"] + var/race // The actual race of the mob + + if(ispath(mobtype, /mob/living/carbon/human) || ispath(mobtype, /mob/living/brain)) + race = "Humanoid" + else if(ispath(mobtype, /mob/living/simple_animal/slime)) + race = "Slime" // NT knows a lot about slimes, but not aliens. Can identify slimes + else if(ispath(mobtype, /mob/living/carbon/monkey)) + race = "Monkey" + else if(ispath(mobtype, /mob/living/silicon) || C.parameters["job"] == "AI") + race = "Artificial Life" // sometimes M gets deleted prematurely for AIs... just check the job + else if(isobj(mobtype)) + race = "Machinery" + else if(ispath(mobtype, /mob/living/simple_animal)) + race = "Domestic Animal" else - dat += "
No servers detected. Scan for servers: \[Scan\]" + race = "Unidentifiable" + data["race"] = race + // based on [/atom/movable/proc/lang_treat] + var/message = C.parameters["message"] + var/language = C.parameters["language"] - // --- Viewing Server --- + if(universal_translate || user.has_language(language)) + message = message + else if(!user.has_language(language)) + var/datum/language/D = GLOB.language_datum_instances[language] + message = D.scramble(message) + else if(language) + message = "(unintelligible)" - if(1) - dat += "
[temp]
" - dat += "
Current Network: [network]" - dat += "
Selected Server: [SelectedServer.id]" + data["message"] = message - if(SelectedServer.totaltraffic >= 1024) - dat += "
Total recorded traffic: [round(SelectedServer.totaltraffic / 1024)] Terrabytes
" - else - dat += "
Total recorded traffic: [SelectedServer.totaltraffic] Gigabytes
" + else if(C.input_type == "Execution Error") + data["message"] = C.parameters["message"] + else + data["message"] = "(unintelligible)" + + data_out["selected_logs"] += list(data) + return data_out - dat += "Stored Logs:
- "
-
- var/i = 0
- for(var/datum/comm_log_entry/C in SelectedServer.log_entries)
- i++
-
-
- // If the log is a speech file
- if(C.input_type == "Speech File")
- dat += "
- [C.name] \[X\]
" - - // -- Determine race of orator -- - - var/mobtype = C.parameters["mobtype"] - var/race // The actual race of the mob - - if(ispath(mobtype, /mob/living/carbon/human) || ispath(mobtype, /mob/living/brain)) - race = "Humanoid" - - // NT knows a lot about slimes, but not aliens. Can identify slimes - else if(ispath(mobtype, /mob/living/simple_animal/slime)) - race = "Slime" - - else if(ispath(mobtype, /mob/living/carbon/monkey)) - race = "Monkey" - - // sometimes M gets deleted prematurely for AIs... just check the job - else if(ispath(mobtype, /mob/living/silicon) || C.parameters["job"] == "AI") - race = "Artificial Life" - - else if(isobj(mobtype)) - race = "Machinery" - - else if(ispath(mobtype, /mob/living/simple_animal)) - race = "Domestic Animal" - - else - race = "Unidentifiable" - - dat += "Data type: [C.input_type]
" - dat += "Source: [C.parameters["name"]] (Job: [C.parameters["job"]])
" - dat += "Class: [race]
" - var/message = C.parameters["message"] - var/language = C.parameters["language"] - - // based on [/atom/movable/proc/lang_treat] - if (universal_translate || user.has_language(language)) - message = "\"[message]\"" - else if (!user.has_language(language)) - var/datum/language/D = GLOB.language_datum_instances[language] - message = "\"[D.scramble(message)]\"" - else if (language) - message = "(unintelligible)" - - dat += "Contents: [message]
" - dat += " - [C.name] \[X\]
" - dat += "Error: \"[C.parameters["message"]]\"
" - dat += " - [C.name] \[X\]
" - dat += "Data type: [C.input_type]
" - dat += "Contents: (unintelligible)
" - dat += "
" - - else if(C.input_type == "Execution Error") - dat += "
" - - else - dat += "
" - - - dat += "
�%@%(*$%&(�&?*(%&�/{}" - var/time = 100 * length(linkedServer.decryptkey) - addtimer(CALLBACK(src, .proc/UnmagConsole), time) - message = rebootmsg + addtimer(CALLBACK(src, .proc/UnmagConsole), (10 SECONDS) * length(linkedServer.decryptkey)) + //message = rebootmsg return TRUE /obj/machinery/computer/message_monitor/New() . = ..() GLOB.telecomms_list += src -/obj/machinery/computer/message_monitor/Initialize() - ..() - return INITIALIZE_HINT_LATELOAD - -/obj/machinery/computer/message_monitor/LateInitialize() - //Is the server isn't linked to a server, and there's a server available, default it to the first one in the list. - if(!linkedServer) - for(var/obj/machinery/telecomms/message_server/S in GLOB.telecomms_list) - linkedServer = S - break - /obj/machinery/computer/message_monitor/Destroy() GLOB.telecomms_list -= src . = ..() -/obj/machinery/computer/message_monitor/ui_interact(mob/living/user) - . = ..() - //If the computer is being hacked or is emagged, display the reboot message. - if(hacking || (obj_flags & EMAGGED)) - message = rebootmsg - var/dat = "
\[Authenticated\] /"
- dat += " Server Power: [linkedServer && linkedServer.toggled ? "\[On\]":"\[Off\]"]
"
- else
- dat += " \[Unauthenticated\] /"
- dat += " Server Power: [linkedServer && linkedServer.toggled ? "\[On\]":"\[Off\]"]
"
-
- if(hacking || (obj_flags & EMAGGED))
- screen = 2
- else if(!auth || LINKED_SERVER_NONRESPONSIVE)
- if(LINKED_SERVER_NONRESPONSIVE)
- message = noserver
- screen = 0
-
- switch(screen)
- //Main menu
- if(0)
- // = TAB
- var/i = 0
- dat += "" - - //Bottom message - if(!auth) - dat += "
" - dat += "
| X | Sender | Recipient | Message |
|---|---|---|---|
| [pda.sender] | [pda.recipient] | [pda.message][pda.picture ? " (Photo)":""] |
It will take 20 seconds for every character that the password has." - dat += "In the meantime, this console can reveal your true intentions if you let someone access it. Make sure no humans enter the room during that time." - else - //It's the same message as the one above but in binary. Because robots understand binary and humans don't... well I thought it was clever. - dat += {"01000010011100100111010101110100011001010010110
- 10110011001101111011100100110001101101001011011100110011
- 10010000001100110011011110111001000100000011100110110010
- 10111001001110110011001010111001000100000011010110110010
- 10111100100101110001000000100100101110100001000000111011
- 10110100101101100011011000010000001110100011000010110101
- 10110010100100000001100100011000000100000011100110110010
- 10110001101101111011011100110010001110011001000000110011
- 00110111101110010001000000110010101110110011001010111001
- 00111100100100000011000110110100001100001011100100110000
- 10110001101110100011001010111001000100000011101000110100
- 00110000101110100001000000111010001101000011001010010000
- 00111000001100001011100110111001101110111011011110111001
- 00110010000100000011010000110000101110011001011100010000
- 00100100101101110001000000111010001101000011001010010000
- 00110110101100101011000010110111001110100011010010110110
- 10110010100101100001000000111010001101000011010010111001
- 10010000001100011011011110110111001110011011011110110110
- 00110010100100000011000110110000101101110001000000111001
- 00110010101110110011001010110000101101100001000000111100
- 10110111101110101011100100010000001110100011100100111010
- 10110010100100000011010010110111001110100011001010110111
- 00111010001101001011011110110111001110011001000000110100
- 10110011000100000011110010110111101110101001000000110110
- 00110010101110100001000000111001101101111011011010110010
- 10110111101101110011001010010000001100001011000110110001
- 10110010101110011011100110010000001101001011101000010111
- 00010000001001101011000010110101101100101001000000111001
- 10111010101110010011001010010000001101110011011110010000
- 00110100001110101011011010110000101101110011100110010000
- 00110010101101110011101000110010101110010001000000111010
- 00110100001100101001000000111001001101111011011110110110
- 10010000001100100011101010111001001101001011011100110011
- 10010000001110100011010000110000101110100001000000111010
- 001101001011011010110010100101110"} - - //Fake messages - if(3) - dat += "
" - - dat += {"
| Sender | -Sender's Job | -Recipient | -Message |
| [customsender] | -[customjob] | -[customrecepient ? customrecepient.owner : "NONE"] | -[custommessage] |
" - dat += {"
| X | Sending Dep. | Receiving Dep. | -Message | Stamp | ID Auth. | Priority. |
|---|---|---|---|---|---|---|
| [rc.send_dpt] | -[rc.rec_dpt] | [rc.message] | [rc.stamp] | [rc.id_auth] | [rc.priority] |
[temp]
" - dat += "
Current Network: [network]
" - if(machinelist.len) - dat += "
Detected Network Entities:
- "
- for(var/obj/machinery/telecomms/T in machinelist)
- dat += "
- [REF(T)] [T.name] ([T.id]) " - dat += "
\[Flush Buffer\]" - else - dat += "\[Probe Network\]" + if(!SelectedMachine) //null is bad. + data_out["selected"] = null //but in js, null is good. + return data_out + + data_out["selected"] = list( + name = SelectedMachine.name, + id = SelectedMachine.id, + status = SelectedMachine.on, + traffic = SelectedMachine.traffic, + netspeed = SelectedMachine.netspeed, + freq_listening = SelectedMachine.freq_listening, + long_range_link = SelectedMachine.long_range_link, + ref = REF(SelectedMachine) + ) + data_out["selected_servers"] = list() + for(var/obj/machinery/telecomms/T in SelectedMachine.links) + if(!T.hide) + var/list/data = list( + name = T.name, + id = T.id, + ref = REF(T) + ) + data_out["selected_servers"] += list(data) + return data_out - // --- Viewing Machine --- - - if(1) - dat += "
[temp]
" - dat += "
Current Network: [network]
" - dat += "Selected Network Entity: [SelectedMachine.name] ([SelectedMachine.id])
" - dat += "Linked Entities:
- "
- for(var/obj/machinery/telecomms/T in SelectedMachine.links)
- if(!T.hide)
- dat += "
- [REF(T.id)] [T.name] ([T.id]) " - dat += "
[name] Access
[temp]
" - dat += "
Power Status: [toggled ? "On" : "Off"]" - if(on && toggled) - if(id != "" && id) - dat += "
Identification String: [id]" - else - dat += "
Identification String: NULL" - dat += "
Network: [network]" - dat += "
Prefabrication: [autolinkers.len ? "TRUE" : "FALSE"]" - if(hide) - dat += "
Shadow Link: ACTIVE" + if(P) + .["multitool"] = TRUE + .["multitool_buf"] = null //to clean the list! + var/obj/machinery/telecomms/T = P.buffer + if(istype(T)) + .["multitool_buf"] = list( + name = T.name, + id = T.id + ) - //Show additional options for certain machines. - dat += Options_Menu() + .["machine"] = list() + .["machine"]["power"] = toggled + .["machine"]["id"] = id + .["machine"]["network"] = network + .["machine"]["prefab"] = LAZYLEN(autolinkers) ? TRUE : FALSE + .["machine"]["hidden"] = hide - dat += "
Linked Network Entities:
- "
+ .["links"] = list()
+ for(var/obj/machinery/telecomms/T in links)
+ if(T.hide && !hide)
+ continue
+ var/list/data = list(
+ name = T.name,
+ id = T.id,
+ ref = REF(T)
+ )
+ .["links"] += list(data)
- var/i = 0
- for(var/obj/machinery/telecomms/T in links)
- i++
- if(T.hide && !hide)
- continue
- dat += "
- [REF(T)] [T.name] ([T.id]) \[X\] " - dat += "
Filtering Frequencies: " +/obj/machinery/telecomms/relay/ui_data(mob/user) + . = ..() + .["machine"]["isrelay"] = TRUE + .["machine"]["broadcast"] = broadcasting + .["machine"]["receiving"] = receiving - i = 0 - if(length(freq_listening)) - for(var/x in freq_listening) - i++ - if(i < length(freq_listening)) - dat += "[format_frequency(x)] GHz\[X\]; " - else - dat += "[format_frequency(x)] GHz\[X\]" - else - dat += "NONE" +/obj/machinery/telecomms/bus/ui_data(mob/user) + . = ..() + .["machine"]["isbus"] = TRUE + .["machine"]["chang_frequency"] = change_frequency + .["machine"]["chang_freq_value"] = change_freq_value - dat += "
\[Add Filter\]" - dat += "
" - - if(P) - var/obj/machinery/telecomms/T = P.buffer - if(istype(T)) - dat += "
MULTITOOL BUFFER: [T] ([T.id]) \[Link\] \[Flush\]" - else - dat += "
MULTITOOL BUFFER: \[Add Machine\]" - - dat += "" +/obj/machinery/telecomms/ui_act(action, params, datum/tgui/ui) + if(!canInteract(usr)) + if(ui) + ui.close() //haha no. + return temp = "" - user << browse(dat, "window=tcommachine;size=520x500;can_resize=0") - onclose(user, "tcommachine") - return TRUE + + switch(action) + if("toggle") + toggled = !toggled + temp = "-% [src.name] has been [toggled ? "activated" : "deactivated"]. %-" + update_power() + return + if("machine") + if("id" in params) + if(!canAccess(usr)) + return + //if the text is blank, return the id it was using + var/newid = sanitize_text(reject_bad_text(params["id"]), id) // reject_bad_text can return null! + if(length(newid) > 255) + temp = "-% Too many characters in new id tag. %-" + return + temp = "-% New ID assigned: \"[newid]\". %-" + id = newid + return + if("network" in params) + if(!canAccess(usr)) + return + var/newnet = sanitize(sanitize_text(params["network"], network)) + if(length(newnet) > 15) + temp = "-% Too many characters in new network tag. %-" + return + network = newnet + links = list() + temp = "-% New network tag assigned: \"[network]\" %-" + return + if("multitool") + var/obj/item/multitool/P = get_multitool(usr) + if("Link" in params) + if(!canAccess(usr)) + return + if(!istype(P)) + temp = "-% Unable to acquire buffer %-" + return + + var/obj/machinery/telecomms/T = P.buffer + if(!istype(T) || T == src) + temp = "-% Unable to acquire buffer %-" + return + + if(!(src in T.links)) + LAZYADD(T.links, src) + + if(!(T in links)) + LAZYADD(links, T) + temp = "-% Successfully linked with [REF(T)] [T.name] %-" + + if("Flush" in params) + if(!istype(P)) + temp = "-% Unable to acquire multitool %-" + return + + temp = "-% Buffer successfully flushed. %-" + P.buffer = null + + if("Add" in params) + if(!canAccess(usr)) + return + if(!istype(P)) + temp = "-% Unable to acquire multitool %-" + return + + P.buffer = src + temp = "% Successfully stored [REF(P.buffer)] [P.buffer.name] in buffer %-" + + if("unlink") + var/obj/machinery/telecomms/T = locate(params["value"]) + if(!canAccess(usr)) + return + if(!istype(T)) + temp = "-% Unable to locate machine to unlink from, try again. %-" + return + + temp = "-% Removed [REF(T)] [T.name] from linked entities. %-" + if(T.links) //lazyrem makes blank list null, which is good but some might cause runtime ee's + T.links.Remove(src) + links.Remove(T) + if("freq") + if("add" in params) + var/newfreq = input("Specify a new frequency to filter (GHz). Decimals assigned automatically.", src.name, null) as null|num + if(!canAccess(usr) || !newfreq || isnull(newfreq)) + return + + if(findtext(num2text(newfreq), ".")) // did they not read the text? + newfreq *= 10 // shift the decimal one place + + newfreq = sanitize_frequency(newfreq, TRUE) //sanitize + if(newfreq == FREQ_SYNDICATE) + temp = "-% Error: Interference preventing filtering frequency: \"[newfreq] GHz\" %-" + return + if(newfreq in freq_listening) + temp = "-% Error: Frequency already filtered %-" + return + + LAZYADD(freq_listening, newfreq) + temp = "-% New frequency filter assigned: \"[newfreq] GHz\" %-" + + if("remove" in params) + if(!canAccess(usr)) + return + var/x = text2num(params["remove"]) + temp = "-% Removed frequency filter [x] %-" + freq_listening.Remove(x) + +/obj/machinery/telecomms/relay/ui_act(action, params) + ..() + switch(action) + if("relay") + if("broadcast" in params) + if(!canAccess(usr)) + return + broadcasting = !broadcasting + temp = "-% Broadcasting mode changed. %-" + return + if("receiving" in params) + if(!canAccess(usr)) + return + receiving = !receiving + temp = "-% Receiving mode changed. %-" + +/obj/machinery/telecomms/bus/ui_act(action, params) + ..() + switch(action) + if("frequency") + if("toggle" in params) + if(!canAccess(usr)) + return + change_frequency = !change_frequency + return + if("adjust" in params) + var/newfreq = text2num(params["adjust"]) + if(!canAccess(usr) || !newfreq) + return + // this should return true, unless the href is handcrafted + if(findtext(num2text(newfreq), ".")) + newfreq *= 10 // shift the decimal one place + + newfreq = sanitize_frequency(newfreq, TRUE) + if(newfreq == FREQ_SYNDICATE) + temp = "-% Error: Interference preventing filtering frequency: \"[newfreq] GHz\" %-" + return + + change_freq_value = newfreq + temp = "-% New frequency to change to assigned: \"[newfreq] GHz\" %-" + return + +// Check if the user can use it. +/obj/machinery/telecomms/proc/canInteract(mob/user) + if(hasSiliconAccessInArea(user) || istype(user.get_active_held_item(), /obj/item/multitool)) + return TRUE + return FALSE +// Check if the user is nearby and has a multitool. +/obj/machinery/telecomms/proc/canAccess(mob/user) + if((canInteract(user) && in_range(user, src)) || hasSiliconAccessInArea(user)) + return TRUE + return FALSE // Returns a multitool from a user depending on their mobtype. - /obj/machinery/telecomms/proc/get_multitool(mob/user) - - var/obj/item/multitool/P = null - // Let's double check - if(!hasSiliconAccessInArea(user) && istype(user.get_active_held_item(), /obj/item/multitool)) - P = user.get_active_held_item() + if(!canInteract(user)) + return null + var/obj/item/multitool/P = user.get_active_held_item() + // Is the ref not a null? and is it the actual type? + if(istype(P)) + return P else if(isAI(user)) var/mob/living/silicon/ai/U = user P = U.aiMulti @@ -106,170 +268,3 @@ if(istype(user.get_active_held_item(), /obj/item/multitool)) P = user.get_active_held_item() return P - -// Additional Options for certain machines. Use this when you want to add an option to a specific machine. -// Example of how to use below. - -/obj/machinery/telecomms/proc/Options_Menu() - return "" - -// The topic for Additional Options. Use this for checking href links for your specific option. -// Example of how to use below. -/obj/machinery/telecomms/proc/Options_Topic(href, href_list) - return - -// RELAY - -/obj/machinery/telecomms/relay/Options_Menu() - var/dat = "" - dat += "
Broadcasting: [broadcasting ? "YES" : "NO"]" - dat += "
Receiving: [receiving ? "YES" : "NO"]" - return dat - -/obj/machinery/telecomms/relay/Options_Topic(href, href_list) - - if(href_list["receive"]) - receiving = !receiving - temp = "-% Receiving mode changed. %-" - if(href_list["broadcast"]) - broadcasting = !broadcasting - temp = "-% Broadcasting mode changed. %-" - -// BUS - -/obj/machinery/telecomms/bus/Options_Menu() - var/dat = "
Change Signal Frequency: [change_frequency ? "YES ([change_frequency])" : "NO"]" - return dat - -/obj/machinery/telecomms/bus/Options_Topic(href, href_list) - - if(href_list["change_freq"]) - - var/newfreq = input(usr, "Specify a new frequency for new signals to change to. Enter null to turn off frequency changing. Decimals assigned automatically.", src, network) as null|num - if(canAccess(usr)) - if(newfreq) - if(findtext(num2text(newfreq), ".")) - newfreq *= 10 // shift the decimal one place - if(newfreq < 10000) - change_frequency = newfreq - temp = "-% New frequency to change to assigned: \"[newfreq] GHz\" %-" - else - change_frequency = 0 - temp = "-% Frequency changing deactivated %-" - - -/obj/machinery/telecomms/Topic(href, href_list) - if(..()) - return - - if(!hasSiliconAccessInArea(usr)) - if(!istype(usr.get_active_held_item(), /obj/item/multitool)) - return - - var/obj/item/multitool/P = get_multitool(usr) - - if(href_list["input"]) - switch(href_list["input"]) - - if("toggle") - - toggled = !toggled - temp = "-% [src] has been [toggled ? "activated" : "deactivated"]." - update_power() - - - if("id") - var/newid = reject_bad_text(stripped_input(usr, "Specify the new ID for this machine", src, id, MAX_MESSAGE_LEN)) - if(newid && canAccess(usr)) - id = newid - temp = "-% New ID assigned: \"[id]\" %-" - - if("network") - var/newnet = stripped_input(usr, "Specify the new network for this machine. This will break all current links.", src, network) - if(newnet && canAccess(usr)) - - if(length(newnet) > 15) - temp = "-% Too many characters in new network tag %-" - - else - for(var/obj/machinery/telecomms/T in links) - T.links.Remove(src) - - network = newnet - links = list() - temp = "-% New network tag assigned: \"[network]\" %-" - - - if("freq") - var/newfreq = input(usr, "Specify a new frequency to filter (GHz). Decimals assigned automatically.", src, network) as null|num - if(newfreq && canAccess(usr)) - if(findtext(num2text(newfreq), ".")) - newfreq *= 10 // shift the decimal one place - if(newfreq == FREQ_SYNDICATE) - temp = "-% Error: Interference preventing filtering frequency: \"[newfreq] GHz\" %-" - else - if(!(newfreq in freq_listening) && newfreq < 10000) - freq_listening.Add(newfreq) - temp = "-% New frequency filter assigned: \"[newfreq] GHz\" %-" - - if(href_list["delete"]) - - // changed the layout about to workaround a pesky runtime -- Doohl - - var/x = text2num(href_list["delete"]) - temp = "-% Removed frequency filter [x] %-" - freq_listening.Remove(x) - - if(href_list["unlink"]) - - if(text2num(href_list["unlink"]) <= length(links)) - var/obj/machinery/telecomms/T = links[text2num(href_list["unlink"])] - if(T) - temp = "-% Removed [REF(T)] [T.name] from linked entities. %-" - - // Remove link entries from both T and src. - - if(T.links) - T.links.Remove(src) - links.Remove(T) - - else - temp = "-% Unable to locate machine to unlink from, try again. %-" - - if(href_list["link"]) - - if(P) - var/obj/machinery/telecomms/T = P.buffer - if(istype(T) && T != src) - if(!(src in T.links)) - T.links += src - - if(!(T in links)) - links += T - - temp = "-% Successfully linked with [REF(T)] [T.name] %-" - - else - temp = "-% Unable to acquire buffer %-" - - if(href_list["buffer"]) - - P.buffer = src - temp = "-% Successfully stored [REF(P.buffer)] [P.buffer.name] in buffer %-" - - - if(href_list["flush"]) - - temp = "-% Buffer successfully flushed. %-" - P.buffer = null - - Options_Topic(href, href_list) - - usr.set_machine(src) - - updateUsrDialog() - -/obj/machinery/telecomms/proc/canAccess(mob/user) - if(hasSiliconAccessInArea(user) || in_range(user, src)) - return TRUE - return FALSE diff --git a/code/game/machinery/telecomms/machines/bus.dm b/code/game/machinery/telecomms/machines/bus.dm index 4732c5bddd..bf3dfe8f7e 100644 --- a/code/game/machinery/telecomms/machines/bus.dm +++ b/code/game/machinery/telecomms/machines/bus.dm @@ -17,7 +17,8 @@ idle_power_usage = 50 netspeed = 40 circuit = /obj/item/circuitboard/machine/telecomms/bus - var/change_frequency = 0 + var/change_frequency = FALSE + var/change_freq_value = 0 /obj/machinery/telecomms/bus/RefreshParts() idle_power_usage = 50 @@ -28,8 +29,8 @@ if(!istype(signal) || !is_freq_listening(signal)) return - if(change_frequency && signal.frequency != FREQ_SYNDICATE) - signal.frequency = change_frequency + if(change_frequency && (change_freq_value && signal.frequency != FREQ_SYNDICATE)) + signal.frequency = change_freq_value if(!istype(machine_from, /obj/machinery/telecomms/processor) && machine_from != src) // Signal must be ready (stupid assuming machine), let's send it // send to one linked processor unit diff --git a/code/game/machinery/telecomms/machines/message_server.dm b/code/game/machinery/telecomms/machines/message_server.dm index ed39bb0578..7f8872ca74 100644 --- a/code/game/machinery/telecomms/machines/message_server.dm +++ b/code/game/machinery/telecomms/machines/message_server.dm @@ -140,11 +140,16 @@ ..() if(href_list["photo"]) var/mob/M = usr - M << browse_rsc(picture.picture_image, "pda_photo.png") - M << browse("
" \
- + "", "window=pdaphoto;size=[picture.psize_x]x[picture.psize_y];can-close=true")
+
+ M << browse_rsc(picture.picture_image, "pda_photo.png")
+
+ var/dat = ""
+
+ var/datum/browser/popup = new(M, "pdaphoto", "PDA Photo", picture.psize_x, picture.psize_y)
+ popup.set_content(dat)
+ popup.open()
onclose(M, "pdaphoto")
/datum/data_rc_msg
diff --git a/code/game/machinery/telecomms/machines/server.dm b/code/game/machinery/telecomms/machines/server.dm
index ad4599b4c3..6f80cfbf0e 100644
--- a/code/game/machinery/telecomms/machines/server.dm
+++ b/code/game/machinery/telecomms/machines/server.dm
@@ -33,7 +33,7 @@
totaltraffic += traffic // add current traffic to total traffic
// Delete particularly old logs
- if (log_entries.len >= 400)
+ if(LAZYLEN(log_entries) >= 400) //[list].len is not safe
log_entries.Cut(1, 2)
var/datum/comm_log_entry/log = new
diff --git a/code/game/machinery/telecomms/telecomunications.dm b/code/game/machinery/telecomms/telecomunications.dm
index d21edffea1..e1b345f507 100644
--- a/code/game/machinery/telecomms/telecomunications.dm
+++ b/code/game/machinery/telecomms/telecomunications.dm
@@ -117,9 +117,9 @@ GLOBAL_LIST_EMPTY(telecomms_list)
icon_state = "[initial(icon_state)]_off"
/obj/machinery/telecomms/proc/update_power()
-
if(toggled)
- if(stat & (BROKEN|NOPOWER|EMPED)) // if powered, on. if not powered, off. if too damaged, off
+ // if powered, on. if not powered, off. if too damaged, off
+ if(CHECK_BITFIELD(stat, (BROKEN | NOPOWER | EMPED)))
on = FALSE
else
on = TRUE
@@ -137,11 +137,11 @@ GLOBAL_LIST_EMPTY(telecomms_list)
/obj/machinery/telecomms/emp_act(severity)
. = ..()
- if(. & EMP_PROTECT_SELF)
+ if(CHECK_BITFIELD(., EMP_PROTECT_SELF))
return
- if(prob(100/severity))
- if(!(stat & EMPED))
- stat |= EMPED
- var/duration = (300 * 10)/severity
+ if(prob(100 / severity))
+ if(!CHECK_BITFIELD(stat, EMPED))
+ ENABLE_BITFIELD(stat, EMPED)
+ var/duration = (300 * 10) / severity
spawn(rand(duration - 20, duration + 20)) // Takes a long time for the machines to reboot.
- stat &= ~EMPED
+ DISABLE_BITFIELD(stat, EMPED)
diff --git a/code/game/mecha/mecha_construction_paths.dm b/code/game/mecha/mecha_construction_paths.dm
index 19b6d0a9bd..5160282180 100644
--- a/code/game/mecha/mecha_construction_paths.dm
+++ b/code/game/mecha/mecha_construction_paths.dm
@@ -5,44 +5,42 @@
var/base_icon
var/looky_helpy = TRUE
-/datum/component/construction/mecha/examine(mob/user)
+/datum/component/construction/mecha/examine(datum/source, mob/user, list/examine_list)
. = ..()
if(looky_helpy)
switch(steps[index]["key"])
if(TOOL_WRENCH)
- . += "The mech could be wrenched into place."
+ examine_list += "The mech could be wrenched into place."
if(TOOL_SCREWDRIVER)
- . += "The mech could be screwed into place."
+ examine_list += "The mech could be screwed into place."
if(TOOL_WIRECUTTER)
- . += "The mech wires could be trimmed into place."
+ examine_list += "The mech wires could be trimmed into place."
if(/obj/item/stack/cable_coil)
- . += "The mech could use some wiring."
+ examine_list += "The mech could use some wiring."
if(/obj/item/circuitboard)
- . += "The mech could use a type ofcircuitboard."
+ examine_list += "The mech could use a type ofcircuitboard."
if(/obj/item/stock_parts/scanning_module)
- . += "The mech could use a scanning stock part."
+ examine_list += "The mech could use a scanning stock part."
if(/obj/item/stock_parts/capacitor)
- . += "The mech could use a power based stock part."
+ examine_list += "The mech could use a power based stock part."
if(/obj/item/stock_parts/cell)
- . += "The mech could use a power source."
+ examine_list += "The mech could use a power source."
if(/obj/item/stack/sheet/metal)
- . += "The mech could use some sheets of metal."
+ examine_list += "The mech could use some sheets of metal."
if(/obj/item/stack/sheet/plasteel)
- . += "The mech could use some sheets of strong steel."
+ examine_list += "The mech could use some sheets of strong steel."
if(/obj/item/bikehorn)
- . += "HONK IT!."
+ examine_list += "HONK IT!."
if(/obj/item/clothing/mask/gas/clown_hat)
- . += "GIVE IT CLOWN MAKEUP HONK!."
+ examine_list += "GIVE IT CLOWN MAKEUP HONK!."
if(/obj/item/clothing/shoes/clown_shoes)
- . += "GIVE IT GOOFY SHOES HONK HONK!."
+ examine_list += "GIVE IT GOOFY SHOES HONK HONK!."
if(/obj/item/mecha_parts/part)
- . += "The mech could use a mech part."
+ examine_list += "The mech could use a mech part."
if(/obj/item/stack/ore/bluespace_crystal)
- . += "The mech could use a crystal of sorts."
+ examine_list += "The mech could use a crystal of sorts."
if(/obj/item/assembly/signaler/anomaly)
- . += "The mech could use a anomaly of sorts."
- else
- return
+ examine_list += "The mech could use a anomaly of sorts."
/datum/component/construction/mecha/spawn_result()
if(!result)
diff --git a/code/game/mecha/mecha_defense.dm b/code/game/mecha/mecha_defense.dm
index 1fe7f74dec..395ac810f4 100644
--- a/code/game/mecha/mecha_defense.dm
+++ b/code/game/mecha/mecha_defense.dm
@@ -282,9 +282,9 @@
else
return ..()
-/obj/mecha/attacked_by(obj/item/I, mob/living/user)
+/obj/mecha/attacked_by(obj/item/I, mob/living/user, attackchain_flags = NONE, damage_multiplier = 1)
mecha_log_message("Attacked by [I]. Attacker - [user]")
- ..()
+ return ..()
/obj/mecha/proc/mech_toxin_damage(mob/living/target)
playsound(src, 'sound/effects/spray2.ogg', 50, 1)
diff --git a/code/game/objects/effects/contraband.dm b/code/game/objects/effects/contraband.dm
index 0954d12790..c56731b3d3 100644
--- a/code/game/objects/effects/contraband.dm
+++ b/code/game/objects/effects/contraband.dm
@@ -428,6 +428,11 @@
desc = "A poster decipting a snake shaped into an ominous 'S'!"
icon_state = "poster47"
+/obj/structure/sign/poster/contraband/bountyhunters
+ name = "Bounty Hunters"
+ desc = "A poster advertising bounty hunting services. \"I hear you got a problem.\""
+ icon_state = "poster48"
+
/obj/structure/sign/poster/official
poster_item_name = "motivational poster"
poster_item_desc = "An official Nanotrasen-issued poster to foster a compliant and obedient workforce. It comes with state-of-the-art adhesive backing, for easy pinning to any vertical surface."
diff --git a/code/game/objects/effects/decals/decal.dm b/code/game/objects/effects/decals/decal.dm
index 5dbd18aa0c..25b262a146 100644
--- a/code/game/objects/effects/decals/decal.dm
+++ b/code/game/objects/effects/decals/decal.dm
@@ -46,4 +46,4 @@
var/turf/T = loc
if(!istype(T)) //you know this will happen somehow
CRASH("Turf decal initialized in an object/nullspace")
- T.AddComponent(/datum/component/decal, icon, icon_state, dir, CLEAN_GOD, color, null, null, alpha)
+ T.AddElement(/datum/element/decal, icon, icon_state, turn(dir, -dir2angle(T.dir)), CLEAN_GOD, color, null, null, alpha)
diff --git a/code/game/objects/effects/mines.dm b/code/game/objects/effects/mines.dm
index 102d4c55ed..d5f53b2f1c 100644
--- a/code/game/objects/effects/mines.dm
+++ b/code/game/objects/effects/mines.dm
@@ -5,19 +5,21 @@
anchored = TRUE
icon = 'icons/obj/items_and_weapons.dmi'
icon_state = "uglymine"
- var/triggered = 0
+ /// We manually check to see if we've been triggered in case multiple atoms cross us in the time between the mine being triggered and it actually deleting, to avoid a race condition with multiple detonations
+ var/triggered = FALSE
/obj/effect/mine/proc/mineEffect(mob/victim)
to_chat(victim, "*click*")
-/obj/effect/mine/Crossed(AM as mob|obj)
- if(isturf(loc))
- if(ismob(AM))
- var/mob/MM = AM
- if(!(MM.movement_type & FLYING))
- triggermine(AM)
- else
- triggermine(AM)
+/obj/effect/mine/Crossed(atom/movable/AM)
+ if(triggered || !isturf(loc))
+ return
+ . = ..()
+
+ if(AM.movement_type & FLYING)
+ return
+
+ triggermine(AM)
/obj/effect/mine/proc/triggermine(mob/victim)
if(triggered)
@@ -27,9 +29,13 @@
s.set_up(3, 1, src)
s.start()
mineEffect(victim)
+ SEND_SIGNAL(src, COMSIG_MINE_TRIGGERED)
triggered = 1
qdel(src)
+/obj/effect/mine/take_damage(damage_amount, damage_type, damage_flag, sound_effect, attack_dir)
+ . = ..()
+ triggermine()
/obj/effect/mine/explosive
name = "explosive mine"
@@ -50,6 +56,18 @@
if(isliving(victim))
victim.DefaultCombatKnockdown(stun_time)
+/obj/effect/mine/shrapnel
+ name = "shrapnel mine"
+ var/shrapnel_type = /obj/item/projectile/bullet/shrapnel
+ var/shrapnel_magnitude = 3
+
+/obj/effect/mine/shrapnel/mineEffect(mob/victim)
+ AddComponent(/datum/component/pellet_cloud, projectile_type=shrapnel_type, magnitude=shrapnel_magnitude)
+
+/obj/effect/mine/shrapnel/sting
+ name = "stinger mine"
+ shrapnel_type = /obj/item/projectile/bullet/pellet/stingball
+
/obj/effect/mine/kickmine
name = "kick mine"
@@ -105,7 +123,7 @@
/obj/effect/mine/pickup/triggermine(mob/victim)
if(triggered)
return
- triggered = 1
+ triggered = TRUE
invisibility = INVISIBILITY_ABSTRACT
mineEffect(victim)
qdel(src)
diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm
index 9893e9c7d3..57b25a8901 100644
--- a/code/game/objects/effects/spawners/lootdrop.dm
+++ b/code/game/objects/effects/spawners/lootdrop.dm
@@ -491,7 +491,7 @@
/obj/item/kitchen/knife = 5,
/obj/item/screwdriver = 5,
/obj/item/crowbar/red = 1, //Dont you need a crowbar to open this?
- /obj/item/stack/medical/bruise_pack = 3,
+ /obj/item/stack/medical/suture = 3,
/obj/item/reagent_containers/food/drinks/bottle/vodka = 2,
/obj/item/radio = 5,
/obj/item/flashlight = 4,
@@ -611,13 +611,13 @@
/obj/item/clothing/mask/breath = 5,
/obj/item/clothing/mask/breath/medical = 1
)
-
+
/obj/effect/spawner/lootdrop/welder_tools/no_turf
spawn_on_turf = FALSE
/obj/effect/spawner/lootdrop/low_tools/no_turf
spawn_on_turf = FALSE
-
+
/obj/effect/spawner/lootdrop/breathing_tanks/no_turf
spawn_on_turf = FALSE
@@ -644,3 +644,90 @@
/obj/effect/spawner/lootdrop/glowstick/no_turf
spawn_on_turf = FALSE
+
+// Random Parts
+
+/obj/effect/spawner/lootdrop/stock_parts
+ name = "random stock parts spawner"
+ lootcount = 1
+ loot = list(
+ /obj/item/stock_parts/capacitor,
+ /obj/item/stock_parts/scanning_module,
+ /obj/item/stock_parts/manipulator,
+ /obj/item/stock_parts/micro_laser,
+ /obj/item/stock_parts/matter_bin,
+ /obj/item/stock_parts/cell
+ )
+
+// Random Weapon Parts
+
+/obj/effect/spawner/lootdrop/weapon_parts
+ name = "random weapon parts spawner 50%"
+ lootcount = 1
+ spawn_on_turf = FALSE
+ loot = list("" = 50,
+ /obj/item/weaponcrafting/improvised_parts/barrel_rifle = 10,
+ /obj/item/weaponcrafting/improvised_parts/barrel_shotgun = 5,
+ /obj/item/weaponcrafting/improvised_parts/barrel_pistol = 5,
+ /obj/item/weaponcrafting/improvised_parts/rifle_receiver = 10,
+ /obj/item/weaponcrafting/improvised_parts/shotgun_receiver = 3,
+ /obj/item/weaponcrafting/improvised_parts/pistol_receiver = 3,
+ /obj/item/weaponcrafting/improvised_parts/laser_receiver = 1,
+ /obj/item/weaponcrafting/improvised_parts/trigger_assembly = 10,
+ /obj/item/weaponcrafting/improvised_parts/makeshift_lens = 3,
+ )
+
+/obj/effect/spawner/lootdrop/weapon_parts
+ name = "random weapon parts spawner 25%"
+ lootcount = 1
+ spawn_on_turf = FALSE
+ loot = list("" = 75,
+ /obj/item/weaponcrafting/improvised_parts/barrel_rifle = 5,
+ /obj/item/weaponcrafting/improvised_parts/barrel_pistol = 5,
+ /obj/item/weaponcrafting/improvised_parts/rifle_receiver = 5,
+ /obj/item/weaponcrafting/improvised_parts/pistol_receiver = 2,
+ /obj/item/weaponcrafting/improvised_parts/trigger_assembly = 5,
+ /obj/item/weaponcrafting/improvised_parts/makeshift_lens = 3,
+ )
+
+/obj/effect/spawner/lootdrop/ammo
+ name = "random ammo 75%"
+ lootcount = 1
+ spawn_on_turf = FALSE
+ loot = list("" = 25,
+ /obj/item/ammo_box/c32mm = 15,
+ /obj/item/ammo_box/r32mm = 15,
+ /obj/item/ammo_box/magazine/wt550m9 = 1,
+ /obj/item/ammo_casing/shotgun/buckshot = 7,
+ /obj/item/ammo_casing/shotgun/rubbershot = 7,
+ /obj/item/ammo_casing/a762 = 15,
+ /obj/item/ammo_box/a762 = 15,
+ )
+
+/obj/effect/spawner/lootdrop/ammo/fiftypercent
+ name = "random ammo 50%"
+ lootcount = 1
+ spawn_on_turf = FALSE
+ loot = list("" = 50,
+ /obj/item/ammo_box/c32mm = 7,
+ /obj/item/ammo_box/r32mm = 7,
+ /obj/item/ammo_box/magazine/wt550m9 = 2,
+ /obj/item/ammo_casing/shotgun/buckshot = 10,
+ /obj/item/ammo_casing/shotgun/rubbershot = 10,
+ /obj/item/ammo_casing/a762 = 7,
+ /obj/item/ammo_box/a762 = 7,
+ )
+
+/obj/effect/spawner/lootdrop/ammo/shotgun
+ name = "random ammo 50%"
+ lootcount = 1
+ spawn_on_turf = FALSE
+ loot = list("" = 50,
+ /obj/item/ammo_box/shotgun/loaded/buckshot = 5,
+ /obj/item/ammo_box/shotgun/loaded/beanbag = 5,
+ /obj/item/ammo_box/shotgun/loaded/incendiary = 5,
+ /obj/item/ammo_casing/shotgun/buckshot = 8,
+ /obj/item/ammo_casing/shotgun/rubbershot = 9,
+ /obj/item/ammo_casing/shotgun = 8,
+ /obj/item/ammo_casing/shotgun/incendiary = 10,
+ )
diff --git a/code/game/objects/effects/temporary_visuals/clockcult.dm b/code/game/objects/effects/temporary_visuals/clockcult.dm
index 59c4e23283..9a236c00c3 100644
--- a/code/game/objects/effects/temporary_visuals/clockcult.dm
+++ b/code/game/objects/effects/temporary_visuals/clockcult.dm
@@ -95,6 +95,56 @@
icon_state = "warden_gaze"
duration = 3
+/obj/effect/temp_visual/ratvar/volt_hit
+ name = "volt blast"
+ layer = ABOVE_MOB_LAYER
+ duration = 8
+ icon_state = "volt_hit"
+ light_range = 1.5
+ light_power = 2
+ light_color = LIGHT_COLOR_ORANGE
+ var/mob/user
+ var/damage = 20
+
+/obj/effect/temp_visual/ratvar/volt_hit/Initialize(mapload, caster)
+ . = ..()
+ user = caster
+ if(user)
+ var/matrix/M = new
+ M.Turn(Get_Angle(src, user))
+ transform = M
+ INVOKE_ASYNC(src, .proc/volthit)
+
+/obj/effect/temp_visual/ratvar/volt_hit/proc/volthit()
+ if(user)
+ Beam(get_turf(user), "volt_ray", time=duration, maxdistance=8, beam_type=/obj/effect/ebeam/volt_ray)
+ var/hit_amount = 0
+ var/turf/T = get_turf(src)
+ for(var/mob/living/L in T)
+ if(is_servant_of_ratvar(L))
+ continue
+ var/obj/item/I = L.anti_magic_check()
+ if(I)
+ L.visible_message("Strange energy flows into [L]'s [I.name]!", \
+ "Your [I.name] shields you from [src]!")
+ continue
+ L.visible_message("[L] is struck by a [name]!", "You're struck by a [name]!")
+ L.apply_damage(damage, BURN, "chest", L.run_armor_check("chest", "laser", "Your armor absorbs [src]!", "Your armor blocks part of [src]!", 0, "Your armor was penetrated by [src]!"))
+ log_combat(user, L, "struck with a volt blast")
+ hit_amount++
+ for(var/obj/mecha/M in T)
+ if(M.occupant)
+ if(is_servant_of_ratvar(M.occupant))
+ continue
+ to_chat(M.occupant, "Your [M.name] is struck by a [name]!")
+ M.visible_message("[M] is struck by a [name]!")
+ M.take_damage(damage, BURN, 0, 0)
+ hit_amount++
+ if(hit_amount)
+ playsound(src, 'sound/machines/defib_zap.ogg', damage*hit_amount, 1, -1)
+ else
+ playsound(src, "sparks", 50, 1)
+
/obj/effect/temp_visual/ratvar/ocular_warden/Initialize()
. = ..()
pixel_x = rand(-8, 8)
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index 55549f5fc4..60bae4016a 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -4,6 +4,9 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
// if true, everyone item when created will have its name changed to be
// more... RPG-like.
+GLOBAL_VAR_INIT(stickpocalypse, FALSE) // if true, all non-embeddable items will be able to harmlessly stick to people when thrown
+GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to embed in people, takes precedence over stickpocalypse
+
/obj/item
name = "item"
icon = 'icons/obj/items_and_weapons.dmi'
@@ -55,6 +58,15 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
/// How long, in deciseconds, this staggers for, if null it will autocalculate from w_class and force. Unlike total mass this supports 0 and negatives.
var/stagger_force
+ /**
+ * Set FALSE and then checked at the end of on mob/living/attackby(), set TRUE on living/pre_attacked_by().
+ * Should it be FALSE by the end of the item/attack(), that means the item overrode the standard attack behaviour
+ * and the user still needs the delay applied. We can't be using return values since that'll stop afterattack() from being triggered.
+ */
+ var/attack_delay_done = FALSE
+ ///next_move click/attack delay of this item.
+ var/click_delay = CLICK_CD_MELEE
+
var/slot_flags = 0 //This is used to determine on which slots an item can fit.
pass_flags = PASSTABLE
pressure_resistance = 4
@@ -95,7 +107,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
mouse_drag_pointer = MOUSE_ACTIVE_POINTER //the icon to indicate this object is being dragged
- var/datum/embedding_behavior/embedding
+ var/list/embedding = NONE
var/flags_cover = 0 //for flags such as GLASSESCOVERSEYES
var/heat = 0
@@ -132,6 +144,13 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
var/list/grind_results //A reagent list containing the reagents this item produces when ground up in a grinder - this can be an empty list to allow for reagent transferring only
var/list/juice_results //A reagent list containing blah blah... but when JUICED in a grinder!
+ /* Our block parry data. Should be set in init, or something if you are using it.
+ * This won't be accessed without ITEM_CAN_BLOCK or ITEM_CAN_PARRY so do not set it unless you have to to save memory.
+ * If you decide it's a good idea to leave this unset while turning the flags on, you will runtime. Enjoy.
+ * If this is set to a path, it'll run get_block_parry_data(path). YOU MUST RUN [get_block_parry_data(this)] INSTEAD OF DIRECTLY ACCESSING!
+ */
+ var/datum/block_parry_data/block_parry_data
+
///Skills vars
//list of skill PATHS exercised when using this item. An associated bitfield can be set to indicate additional ways the skill is used by this specific item.
var/list/datum/skill/used_skills
@@ -143,7 +162,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
/obj/item/Initialize()
- if (attack_verb)
+ if(attack_verb)
attack_verb = typelist("attack_verb", attack_verb)
. = ..()
@@ -151,9 +170,6 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
new path(src)
actions_types = null
- if(GLOB.rpg_loot_items)
- AddComponent(/datum/component/fantasy)
-
if(force_string)
item_flags |= FORCE_STRING_OVERRIDE
@@ -163,16 +179,6 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
if(damtype == "brute")
hitsound = "swing_hit"
- if (!embedding)
- embedding = getEmbeddingBehavior()
- else if (islist(embedding))
- embedding = getEmbeddingBehavior(arglist(embedding))
- else if (!istype(embedding, /datum/embedding_behavior))
- stack_trace("Invalid type [embedding.type] found in .embedding during /obj/item Initialize()")
-
- if(sharpness) //give sharp objects butchering functionality, for consistency
- AddComponent(/datum/component/butchering, 80 * toolspeed)
-
/obj/item/Destroy()
item_flags &= ~DROPDEL //prevent reqdels
if(ismob(loc))
@@ -182,6 +188,26 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
qdel(X)
return ..()
+/obj/item/ComponentInitialize()
+ . = ..()
+
+ // this proc says it's for initializing components, but we're initializing elements too because it's you and me against the world >:)
+ if(!LAZYLEN(embedding))
+ if(GLOB.embedpocalypse)
+ embedding = EMBED_POINTY
+ name = "pointy [name]"
+ else if(GLOB.stickpocalypse)
+ embedding = EMBED_HARMLESS
+ name = "sticky [name]"
+
+ updateEmbedding()
+
+ if(GLOB.rpg_loot_items)
+ AddComponent(/datum/component/fantasy)
+
+ if(sharpness) //give sharp objects butchering functionality, for consistency
+ AddComponent(/datum/component/butchering, 80 * toolspeed)
+
/obj/item/proc/check_allowed_items(atom/target, not_inside, target_self)
if(((src in target) && !target_self) || (!isturf(target.loc) && !isturf(target) && not_inside))
return 0
@@ -232,8 +258,9 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
if(resistance_flags & FIRE_PROOF)
. += "[src] is made of fire-retardant materials."
-
-
+ if(item_flags & (ITEM_CAN_BLOCK | ITEM_CAN_PARRY))
+ var/datum/block_parry_data/data = return_block_parry_datum(block_parry_data)
+ . += "[src] has the capacity to be used to block and/or parry. \[Show Stats\]"
if(!user.research_scanner)
return
@@ -395,6 +422,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
return ITALICS | REDUCE_RANGE
/obj/item/proc/dropped(mob/user)
+ SHOULD_CALL_PARENT(TRUE)
for(var/X in actions)
var/datum/action/A = X
A.Remove(user)
@@ -407,6 +435,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
// called just as an item is picked up (loc is not yet changed)
/obj/item/proc/pickup(mob/user)
+ SHOULD_CALL_PARENT(TRUE)
SEND_SIGNAL(src, COMSIG_ITEM_PICKUP, user)
item_flags |= IN_INVENTORY
@@ -606,6 +635,18 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
var/itempush = 1
if(w_class < 4)
itempush = 0 //too light to push anything
+ if(isliving(hit_atom)) //Living mobs handle hit sounds differently.
+ var/volume = get_volume_by_throwforce_and_or_w_class()
+ if (throwforce > 0)
+ if (throwhitsound)
+ playsound(hit_atom, throwhitsound, volume, TRUE, -1)
+ else if(hitsound)
+ playsound(hit_atom, hitsound, volume, TRUE, -1)
+ else
+ playsound(hit_atom, 'sound/weapons/genhit.ogg',volume, TRUE, -1)
+ else
+ playsound(hit_atom, 'sound/weapons/throwtap.ogg', 1, volume, -1)
+
return hit_atom.hitby(src, 0, itempush, throwingdatum=throwingdatum)
/obj/item/throw_at(atom/target, range, speed, mob/thrower, spin=1, diagonals_first = 0, datum/callback/callback, force, messy_throw = TRUE)
@@ -899,11 +940,13 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
// if w_volume is 0 you fucked up anyways lol
return w_volume || AUTO_SCALE_VOLUME(w_class)
-/obj/item/proc/embedded(mob/living/carbon/human/embedded_mob)
+/obj/item/proc/embedded(atom/embedded_target)
return
/obj/item/proc/unembedded()
- return
+ if(item_flags & DROPDEL)
+ QDEL_NULL(src)
+ return TRUE
/**
* Sets our slowdown and updates equipment slowdown of any mob we're equipped on.
@@ -919,3 +962,135 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
. = ..()
if(var_name == NAMEOF(src, slowdown))
set_slowdown(var_value) //don't care if it's a duplicate edit as slowdown'll be set, do it anyways to force normal behavior.
+/**
+ * Does the current embedding var meet the criteria for being harmless? Namely, does it explicitly define the pain multiplier and jostle pain mult to be 0? If so, return true.
+ *
+ */
+/obj/item/proc/isEmbedHarmless()
+ if(embedding)
+ return !isnull(embedding["pain_mult"]) && !isnull(embedding["jostle_pain_mult"]) && embedding["pain_mult"] == 0 && embedding["jostle_pain_mult"] == 0
+
+///In case we want to do something special (like self delete) upon failing to embed in something, return true
+/obj/item/proc/failedEmbed()
+ if(item_flags & DROPDEL)
+ QDEL_NULL(src)
+ return TRUE
+
+/**
+
+
+
+ * tryEmbed() is for when you want to try embedding something without dealing with the damage + hit messages of calling hitby() on the item while targetting the target.
+
+
+
+ *
+
+
+
+ * Really, this is used mostly with projectiles with shrapnel payloads, from [/datum/element/embed/proc/checkEmbedProjectile], and called on said shrapnel. Mostly acts as an intermediate between different embed elements.
+
+
+
+ *
+
+
+
+ * Arguments:
+
+
+
+ * * target- Either a body part, a carbon, or a closed turf. What are we hitting?
+
+
+
+ * * forced- Do we want this to go through 100%?
+
+
+
+ */
+
+
+
+/obj/item/proc/tryEmbed(atom/target, forced=FALSE, silent=FALSE)
+
+
+
+ if(!isbodypart(target) && !iscarbon(target) && !isclosedturf(target))
+
+
+
+ return
+
+
+
+ if(!forced && !LAZYLEN(embedding))
+
+
+
+ return
+
+
+
+
+
+
+
+ if(SEND_SIGNAL(src, COMSIG_EMBED_TRY_FORCE, target, forced, silent))
+
+
+
+ return TRUE
+
+
+
+ failedEmbed()
+
+
+
+
+
+
+
+///For when you want to disable an item's embedding capabilities (like transforming weapons and such), this proc will detach any active embed elements from it.
+
+
+
+/obj/item/proc/disableEmbedding()
+
+
+
+ SEND_SIGNAL(src, COMSIG_ITEM_DISABLE_EMBED)
+
+
+
+ return
+
+
+
+
+
+
+
+///For when you want to add/update the embedding on an item. Uses the vars in [/obj/item/embedding], and defaults to config values for values that aren't set. Will automatically detach previous embed elements on this item.
+
+
+
+/obj/item/proc/updateEmbedding()
+ if(!islist(embedding) || !LAZYLEN(embedding))
+ return
+
+ AddElement(/datum/element/embed,\
+ embed_chance = (!isnull(embedding["embed_chance"]) ? embedding["embed_chance"] : EMBED_CHANCE),\
+ fall_chance = (!isnull(embedding["fall_chance"]) ? embedding["fall_chance"] : EMBEDDED_ITEM_FALLOUT),\
+ pain_chance = (!isnull(embedding["pain_chance"]) ? embedding["pain_chance"] : EMBEDDED_PAIN_CHANCE),\
+ pain_mult = (!isnull(embedding["pain_mult"]) ? embedding["pain_mult"] : EMBEDDED_PAIN_MULTIPLIER),\
+ remove_pain_mult = (!isnull(embedding["remove_pain_mult"]) ? embedding["remove_pain_mult"] : EMBEDDED_UNSAFE_REMOVAL_PAIN_MULTIPLIER),\
+ rip_time = (!isnull(embedding["rip_time"]) ? embedding["rip_time"] : EMBEDDED_UNSAFE_REMOVAL_TIME),\
+ ignore_throwspeed_threshold = (!isnull(embedding["ignore_throwspeed_threshold"]) ? embedding["ignore_throwspeed_threshold"] : FALSE),\
+ impact_pain_mult = (!isnull(embedding["impact_pain_mult"]) ? embedding["impact_pain_mult"] : EMBEDDED_IMPACT_PAIN_MULTIPLIER),\
+ jostle_chance = (!isnull(embedding["jostle_chance"]) ? embedding["jostle_chance"] : EMBEDDED_JOSTLE_CHANCE),\
+ jostle_pain_mult = (!isnull(embedding["jostle_pain_mult"]) ? embedding["jostle_pain_mult"] : EMBEDDED_JOSTLE_PAIN_MULTIPLIER),\
+ pain_stam_pct = (!isnull(embedding["pain_stam_pct"]) ? embedding["pain_stam_pct"] : EMBEDDED_PAIN_STAM_PCT),\
+ embed_chance_turf_mod = (!isnull(embedding["embed_chance_turf_mod"]) ? embedding["embed_chance_turf_mod"] : EMBED_CHANCE_TURF_MOD))
+ return TRUE
\ No newline at end of file
diff --git a/code/game/objects/items/RCD.dm b/code/game/objects/items/RCD.dm
index 5d9c6ee267..2fbb45173b 100644
--- a/code/game/objects/items/RCD.dm
+++ b/code/game/objects/items/RCD.dm
@@ -154,7 +154,8 @@ RLD
icon_state = "rcd"
lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
- custom_price = 900
+ custom_price = PRICE_ABOVE_EXPENSIVE
+ custom_premium_price = PRICE_ALMOST_ONE_GRAND
max_matter = 160
item_flags = NO_MAT_REDEMPTION | NOBLUDGEON
has_ammobar = TRUE
diff --git a/code/game/objects/items/airlock_painter.dm b/code/game/objects/items/airlock_painter.dm
index b6be778456..c9a31a48c2 100644
--- a/code/game/objects/items/airlock_painter.dm
+++ b/code/game/objects/items/airlock_painter.dm
@@ -157,7 +157,7 @@
to_chat(user, "You need to get closer!")
return
if(use_paint(user) && isturf(F))
- F.AddComponent(/datum/component/decal, 'icons/turf/decals.dmi', stored_decal_total, stored_dir, CLEAN_STRONG, color, null, null, alpha)
+ F.AddElement(/datum/element/decal, 'icons/turf/decals.dmi', stored_decal_total, turn(stored_dir, -dir2angle(F.dir)), CLEAN_STRONG, color, null, null, alpha)
/obj/item/airlock_painter/decal/attack_self(mob/user)
if((ink) && (ink.charges >= 1))
diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm
index 7036a78bc4..58d907e14b 100644
--- a/code/game/objects/items/cards_ids.dm
+++ b/code/game/objects/items/cards_ids.dm
@@ -83,7 +83,7 @@
/obj/item/card/emag/bluespace
name = "bluespace cryptographic sequencer"
desc = "It's a blue card with a magnetic strip attached to some circuitry. It appears to have some sort of transmitter attached to it."
- color = rgb(40, 130, 255)
+ icon_state = "emag_bs"
prox_check = FALSE
/obj/item/card/emag/attack()
@@ -166,6 +166,7 @@
slot_flags = ITEM_SLOT_ID
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)
resistance_flags = FIRE_PROOF | ACID_PROOF
+ var/id_type_name = "identification card"
var/mining_points = 0 //For redeeming at mining equipment vendors
var/list/access = list()
var/registered_name = null // The name registered_name on the card
@@ -174,6 +175,8 @@
var/bank_support = ID_FREE_BANK_ACCOUNT
var/datum/bank_account/registered_account
var/obj/machinery/paystand/my_store
+ var/uses_overlays = TRUE
+ var/icon/cached_flat_icon
/obj/item/card/id/Initialize(mapload)
. = ..()
@@ -187,6 +190,15 @@
if(ID_LOCKED_BANK_ACCOUNT)
registered_account = new /datum/bank_account/remote/non_transferable(pick(GLOB.redacted_strings))
+/obj/item/card/id/Destroy()
+ if(bank_support == ID_LOCKED_BANK_ACCOUNT)
+ QDEL_NULL(registered_account)
+ else
+ registered_account = null
+ if(my_store)
+ my_store.my_card = null
+ my_store = null
+ return ..()
/obj/item/card/id/vv_edit_var(var_name, var_value)
. = ..()
@@ -353,20 +365,38 @@
/obj/item/card/id/RemoveID()
return src
-/*
-Usage:
-update_label()
- Sets the id name to whatever registered_name and assignment is
+/obj/item/card/id/update_overlays()
+ . = ..()
+ if(!uses_overlays)
+ return
+ cached_flat_icon = null
+ var/job = assignment ? ckey(GetJobName()) : null
+ if(registered_name == "Captain")
+ job = "captain"
+ if(registered_name && registered_name != "Captain")
+ . += mutable_appearance(icon, "assigned")
+ if(job)
+ . += mutable_appearance(icon, "id[job]")
+
+/obj/item/card/id/proc/get_cached_flat_icon()
+ if(!cached_flat_icon)
+ cached_flat_icon = getFlatIcon(src)
+ return cached_flat_icon
+
+
+/obj/item/card/id/get_examine_string(mob/user, thats = FALSE)
+ if(uses_overlays)
+ return "[icon2html(get_cached_flat_icon(), user)] [thats? "That's ":""][get_examine_name(user)]" //displays all overlays in chat
+ return ..()
-update_label("John Doe", "Clowny")
- Properly formats the name and occupation and sets the id name to the arguments
-*/
/obj/item/card/id/proc/update_label(newname, newjob)
if(newname || newjob)
name = "[(!newname) ? "identification card" : "[newname]'s ID Card"][(!newjob) ? "" : " ([newjob])"]"
+ update_icon()
return
name = "[(!registered_name) ? "identification card" : "[registered_name]'s ID Card"][(!assignment) ? "" : " ([assignment])"]"
+ update_icon()
/obj/item/card/id/silver
name = "silver identification card"
@@ -379,6 +409,7 @@ update_label("John Doe", "Clowny")
/obj/item/card/id/silver/reaper
name = "Thirteen's ID Card (Reaper)"
access = list(ACCESS_MAINT_TUNNELS)
+ icon_state = "reaper"
assignment = "Reaper"
registered_name = "Thirteen"
@@ -530,7 +561,7 @@ update_label("John Doe", "Clowny")
/obj/item/card/id/ert
name = "\improper CentCom ID"
desc = "An ERT ID card."
- icon_state = "centcom"
+ icon_state = "ert_commander"
registered_name = "Emergency Response Team Commander"
assignment = "Emergency Response Team Commander"
@@ -539,6 +570,7 @@ update_label("John Doe", "Clowny")
. = ..()
/obj/item/card/id/ert/Security
+ icon_state = "ert_security"
registered_name = "Security Response Officer"
assignment = "Security Response Officer"
@@ -547,6 +579,7 @@ update_label("John Doe", "Clowny")
. = ..()
/obj/item/card/id/ert/Engineer
+ icon_state = "ert_engineer"
registered_name = "Engineer Response Officer"
assignment = "Engineer Response Officer"
@@ -555,6 +588,7 @@ update_label("John Doe", "Clowny")
. = ..()
/obj/item/card/id/ert/Medical
+ icon_state = "ert_medical"
registered_name = "Medical Response Officer"
assignment = "Medical Response Officer"
@@ -563,6 +597,7 @@ update_label("John Doe", "Clowny")
. = ..()
/obj/item/card/id/ert/chaplain
+ icon_state = "ert_chaplain"
registered_name = "Religious Response Officer"
assignment = "Religious Response Officer"
@@ -615,40 +650,49 @@ update_label("John Doe", "Clowny")
. += "Your sentence is up! You're free!"
/obj/item/card/id/prisoner/one
+ icon_state = "prisoner_001"
name = "Prisoner #13-001"
registered_name = "Prisoner #13-001"
/obj/item/card/id/prisoner/two
+ icon_state = "prisoner_002"
name = "Prisoner #13-002"
registered_name = "Prisoner #13-002"
/obj/item/card/id/prisoner/three
+ icon_state = "prisoner_003"
name = "Prisoner #13-003"
registered_name = "Prisoner #13-003"
/obj/item/card/id/prisoner/four
+ icon_state = "prisoner_004"
name = "Prisoner #13-004"
registered_name = "Prisoner #13-004"
/obj/item/card/id/prisoner/five
+ icon_state = "prisoner_005"
name = "Prisoner #13-005"
registered_name = "Prisoner #13-005"
/obj/item/card/id/prisoner/six
+ icon_state = "prisoner_006"
name = "Prisoner #13-006"
registered_name = "Prisoner #13-006"
/obj/item/card/id/prisoner/seven
+ icon_state = "prisoner_007"
name = "Prisoner #13-007"
registered_name = "Prisoner #13-007"
/obj/item/card/id/mining
name = "mining ID"
+ icon_state = "retro"
access = list(ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MAILSORTING, ACCESS_MINERAL_STOREROOM)
/obj/item/card/id/away
name = "a perfectly generic identification card"
desc = "A perfectly generic identification card. Looks like it could use some flavor."
+ icon_state = "retro"
access = list(ACCESS_AWAY_GENERAL)
/obj/item/card/id/away/hotel
@@ -691,6 +735,7 @@ update_label("John Doe", "Clowny")
/obj/item/card/id/departmental_budget
name = "departmental card (FUCK)"
desc = "Provides access to the departmental budget."
+ icon_state = "budgetcard"
var/department_ID = ACCOUNT_CIV
var/department_name = ACCOUNT_CIV_NAME
@@ -703,6 +748,7 @@ update_label("John Doe", "Clowny")
B.bank_cards += src
name = "departmental card ([department_name])"
desc = "Provides access to the [department_name]."
+ icon_state = "[lowertext(department_ID)]_budget"
SSeconomy.dep_cards += src
/obj/item/card/id/departmental_budget/Destroy()
diff --git a/code/game/objects/items/chrono_eraser.dm b/code/game/objects/items/chrono_eraser.dm
index c3b6c0312f..766c3d8636 100644
--- a/code/game/objects/items/chrono_eraser.dm
+++ b/code/game/objects/items/chrono_eraser.dm
@@ -65,7 +65,7 @@
. = ..()
AddElement(/datum/element/update_icon_blocker)
-/obj/item/gun/energy/chrono_gun/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0)
+/obj/item/gun/energy/chrono_gun/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0, stam_cost = 0)
if(field)
field_disconnect(field)
..()
diff --git a/code/game/objects/items/cigs_lighters.dm b/code/game/objects/items/cigs_lighters.dm
index 6ebeffe90f..bfbacb1a34 100644
--- a/code/game/objects/items/cigs_lighters.dm
+++ b/code/game/objects/items/cigs_lighters.dm
@@ -8,6 +8,9 @@ CIGARS
SMOKING PIPES
CHEAP LIGHTERS
ZIPPO
+ROLLING PAPER
+VAPES
+BONGS
CIGARETTE PACKETS ARE IN FANCY.DM
*/
@@ -506,7 +509,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
resistance_flags = FIRE_PROOF
light_color = LIGHT_COLOR_FIRE
grind_results = list(/datum/reagent/iron = 1, /datum/reagent/fuel = 5, /datum/reagent/oil = 5)
- custom_price = 55
+ custom_price = PRICE_ALMOST_CHEAP
/obj/item/lighter/Initialize()
. = ..()
@@ -616,6 +619,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
desc = "A cheap-as-free lighter."
icon_state = "lighter"
fancy = FALSE
+ custom_price = PRICE_CHEAP_AS_FREE
overlay_list = list(
"transp",
"tall",
@@ -799,6 +803,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
to_chat(user, "You need to close the cap first!")
/obj/item/clothing/mask/vape/dropped(mob/user)
+ . = ..()
var/mob/living/carbon/C = user
if(C.get_item_by_slot(SLOT_WEAR_MASK) == src)
ENABLE_BITFIELD(reagents.reagents_holder_flags, NO_REACT)
diff --git a/code/game/objects/items/circuitboards/computer_circuitboards.dm b/code/game/objects/items/circuitboards/computer_circuitboards.dm
index 32c879e2d2..f94c8f3513 100644
--- a/code/game/objects/items/circuitboards/computer_circuitboards.dm
+++ b/code/game/objects/items/circuitboards/computer_circuitboards.dm
@@ -14,6 +14,10 @@
name = "Security Cameras (Computer Board)"
build_path = /obj/machinery/computer/security
+/obj/item/circuitboard/computer/security/shuttle
+ name = "Shuttlelinking Security Cameras (Computer Board)"
+ build_path = /obj/machinery/computer/security/shuttle
+
/obj/item/circuitboard/computer/xenobiology
name = "circuit board (Xenobiology Console)"
build_path = /obj/machinery/computer/camera_advanced/xenobio
@@ -293,6 +297,10 @@
name = "Mining Shuttle (Computer Board)"
build_path = /obj/machinery/computer/shuttle/mining
+/obj/item/circuitboard/computer/snow_taxi
+ name = "Snow Taxi (Computer Board)"
+ build_path = /obj/machinery/computer/shuttle/snow_taxi
+
/obj/item/circuitboard/computer/white_ship
name = "White Ship (Computer Board)"
build_path = /obj/machinery/computer/shuttle/white_ship
@@ -375,3 +383,11 @@
/obj/item/circuitboard/computer/nanite_cloud_controller
name = "Nanite Cloud Control (Computer Board)"
build_path = /obj/machinery/computer/nanite_cloud_controller
+
+/obj/item/circuitboard/computer/shuttle/flight_control
+ name = "Shuttle Flight Control (Computer Board)"
+ build_path = /obj/machinery/computer/custom_shuttle
+
+/obj/item/circuitboard/computer/shuttle/docker
+ name = "Shuttle Navigation Computer (Computer Board)"
+ build_path = /obj/machinery/computer/camera_advanced/shuttle_docker/custom
diff --git a/code/game/objects/items/circuitboards/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machine_circuitboards.dm
index b90fd1c1af..ea839ae12d 100644
--- a/code/game/objects/items/circuitboards/machine_circuitboards.dm
+++ b/code/game/objects/items/circuitboards/machine_circuitboards.dm
@@ -1102,3 +1102,28 @@
/obj/item/stock_parts/micro_laser = 2,
/obj/item/stock_parts/scanning_module = 2
)
+
+/obj/item/circuitboard/machine/shuttle/engine
+ name = "Thruster (Machine Board)"
+ build_path = /obj/machinery/shuttle/engine
+ req_components = list()
+
+/obj/item/circuitboard/machine/shuttle/engine/plasma
+ name = "Plasma Thruster (Machine Board)"
+ build_path = /obj/machinery/shuttle/engine/plasma
+ req_components = list(/obj/item/stock_parts/capacitor = 2,
+ /obj/item/stack/cable_coil = 5,
+ /obj/item/stock_parts/micro_laser = 1)
+
+/obj/item/circuitboard/machine/shuttle/engine/void
+ name = "Void Thruster (Machine Board)"
+ build_path = /obj/machinery/shuttle/engine/void
+ req_components = list(/obj/item/stock_parts/capacitor/quadratic = 2,
+ /obj/item/stack/cable_coil = 5,
+ /obj/item/stock_parts/micro_laser/quadultra = 1)
+
+/obj/item/circuitboard/machine/shuttle/heater
+ name = "Electronic Engine Heater (Machine Board)"
+ build_path = /obj/machinery/atmospherics/components/unary/shuttle/heater
+ req_components = list(/obj/item/stock_parts/micro_laser = 2,
+ /obj/item/stock_parts/matter_bin = 1)
diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm
index aa8c61ae0c..fdc3aa30af 100644
--- a/code/game/objects/items/devices/flashlight.dm
+++ b/code/game/objects/items/devices/flashlight.dm
@@ -1,7 +1,7 @@
/obj/item/flashlight
name = "flashlight"
desc = "A hand-held emergency light."
- custom_price = 100
+ custom_price = PRICE_REALLY_CHEAP
icon = 'icons/obj/lighting.dmi'
icon_state = "flashlight"
item_state = "flashlight"
@@ -211,6 +211,7 @@
light_color = "#CDDDFF"
flashlight_power = 0.9
hitsound = 'sound/weapons/genhit1.ogg'
+ custom_price = PRICE_ALMOST_CHEAP
// the desk lamps are a bit special
/obj/item/flashlight/lamp
@@ -351,12 +352,13 @@
brightness_on = 6 // luminosity when on
light_color = "#FFAA44"
flashlight_power = 0.8
+ custom_price = PRICE_CHEAP
/obj/item/flashlight/lantern/jade
name = "jade lantern"
desc = "An ornate, green lantern."
color = LIGHT_COLOR_GREEN
- light_color = LIGHT_COLOR_GREEN
+ light_color = LIGHT_COLOR_GREEN
/obj/item/flashlight/slime
gender = PLURAL
@@ -429,7 +431,7 @@
/obj/item/flashlight/glowstick
name = "glowstick"
desc = "A military-grade glowstick."
- custom_price = 50
+ custom_price = PRICE_CHEAP_AS_FREE
w_class = WEIGHT_CLASS_SMALL
brightness_on = 4
color = LIGHT_COLOR_GREEN
diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm
index a7b22a4c30..28e1e1294f 100644
--- a/code/game/objects/items/devices/scanners.dm
+++ b/code/game/objects/items/devices/scanners.dm
@@ -6,12 +6,14 @@ T-RAY
HEALTH ANALYZER
GAS ANALYZER
SLIME SCANNER
+NANITE SCANNER
+GENETICS SCANNER
*/
/obj/item/t_scanner
name = "\improper T-ray scanner"
desc = "A terahertz-ray emitter and scanner used to detect underfloor objects such as cables and pipes."
- custom_price = 150
+ custom_price = PRICE_REALLY_CHEAP
icon = 'icons/obj/device.dmi'
icon_state = "t-ray0"
var/on = FALSE
@@ -653,9 +655,10 @@ SLIME SCANNER
amount += inaccurate
return DisplayTimeText(max(1,amount))
-/proc/atmosanalyzer_scan(mixture, mob/living/user, atom/target = src)
+/proc/atmosanalyzer_scan(mixture, mob/living/user, atom/target = src, visible = TRUE)
var/icon = target
- user.visible_message("[user] has used the analyzer on [icon2html(icon, viewers(user))] [target].", "You use the analyzer on [icon2html(icon, user)] [target].")
+ if(visible)
+ user.visible_message("[user] has used the analyzer on [icon2html(icon, viewers(user))] [target].", "You use the analyzer on [icon2html(icon, user)] [target].")
to_chat(user, "Results of analysis of [icon2html(icon, user)] [target].")
var/list/airs = islist(mixture) ? mixture : list(mixture)
diff --git a/code/game/objects/items/devices/sensor_device.dm b/code/game/objects/items/devices/sensor_device.dm
index a92d9221c2..a1f4994a64 100644
--- a/code/game/objects/items/devices/sensor_device.dm
+++ b/code/game/objects/items/devices/sensor_device.dm
@@ -5,7 +5,7 @@
icon_state = "scanner"
w_class = WEIGHT_CLASS_SMALL
slot_flags = ITEM_SLOT_BELT
- custom_price = 900
+ custom_price = PRICE_ABOVE_EXPENSIVE
/obj/item/sensor_device/attack_self(mob/user)
GLOB.crewmonitor.show(user,src) //Proc already exists, just had to call it
diff --git a/code/game/objects/items/dualsaber.dm b/code/game/objects/items/dualsaber.dm
index 225d5813fb..cb07c22504 100644
--- a/code/game/objects/items/dualsaber.dm
+++ b/code/game/objects/items/dualsaber.dm
@@ -20,10 +20,10 @@
var/saber_color = "green"
light_color = "#00ff00"//green
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
- block_chance = 75
max_integrity = 200
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 70)
resistance_flags = FIRE_PROOF
+ block_parry_data = /datum/block_parry_data/dual_esword
var/hacked = FALSE
/// Can this reflect all energy projectiles?
var/can_reflect = TRUE
@@ -36,6 +36,42 @@
var/wielded = FALSE // track wielded status on item
var/slowdown_wielded = 0
+/datum/block_parry_data/dual_esword
+ block_damage_absorption = 2
+ block_damage_multiplier = 0.15
+ block_damage_multiplier_override = list(
+ ATTACK_TYPE_MELEE = 0.25
+ )
+ block_start_delay = 0 // instantaneous block
+ block_stamina_cost_per_second = 2.5
+ block_stamina_efficiency = 3
+ block_lock_sprinting = TRUE
+ // no attacking while blocking
+ block_lock_attacking = TRUE
+ block_projectile_mitigation = 75
+
+ parry_time_windup = 0
+ parry_time_active = 8
+ parry_time_spindown = 0
+ // we want to signal to players the most dangerous phase, the time when automatic counterattack is a thing.
+ parry_time_windup_visual_override = 1
+ parry_time_active_visual_override = 3
+ parry_time_spindown_visual_override = 4
+ parry_flags = PARRY_DEFAULT_HANDLE_FEEDBACK // esword users can attack while parrying.
+ parry_time_perfect = 2 // first ds isn't perfect
+ parry_time_perfect_leeway = 1
+ parry_imperfect_falloff_percent = 10
+ parry_efficiency_to_counterattack = 100
+ parry_efficiency_considered_successful = 25 // VERY generous
+ parry_efficiency_perfect = 90
+ parry_failed_stagger_duration = 3 SECONDS
+ parry_failed_clickcd_duration = CLICK_CD_MELEE
+
+ // more efficient vs projectiles
+ block_stamina_efficiency_override = list(
+ TEXT_ATTACK_TYPE_PROJECTILE = 4
+ )
+
/obj/item/dualsaber/ComponentInitialize()
. = ..()
AddComponent(/datum/component/two_handed, force_unwielded=3, force_wielded=34, \
@@ -70,6 +106,7 @@
START_PROCESSING(SSobj, src)
set_light(brightness_on)
AddElement(/datum/element/sword_point)
+ item_flags |= (ITEM_CAN_BLOCK|ITEM_CAN_PARRY)
/// Triggered on unwield of two handed item
/// switch hitsounds
@@ -83,6 +120,7 @@
STOP_PROCESSING(SSobj, src)
set_light(0)
RemoveElement(/datum/element/sword_point)
+ item_flags &= ~(ITEM_CAN_BLOCK|ITEM_CAN_PARRY)
/obj/item/dualsaber/Destroy()
STOP_PROCESSING(SSobj, src)
diff --git a/code/game/objects/items/electrostaff.dm b/code/game/objects/items/electrostaff.dm
index 1fc338d841..8d1fe4ebd1 100644
--- a/code/game/objects/items/electrostaff.dm
+++ b/code/game/objects/items/electrostaff.dm
@@ -12,9 +12,9 @@
throwforce = 15 //if you are a madman and finish someone off with this, power to you.
throw_speed = 1
item_flags = NO_MAT_REDEMPTION
- block_chance = 30
attack_verb = list("struck", "beaten", "thwacked", "pulped")
total_mass = 5 //yeah this is a heavy thing, beating people with it while it's off is not going to do you any favors. (to curb stun-kill rampaging without it being on)
+ block_parry_data = /datum/block_parry_data/electrostaff
var/obj/item/stock_parts/cell/cell = /obj/item/stock_parts/cell/high
var/on = FALSE
var/can_block_projectiles = FALSE //can't block guns
@@ -28,6 +28,43 @@
var/stun_stam_cost = 3.5
var/wielded = FALSE // track wielded status on item
+// haha security desword time /s
+/datum/block_parry_data/electrostaff
+ block_damage_absorption = 0
+ block_damage_multiplier = 1
+ can_block_attack_types = ~ATTACK_TYPE_PROJECTILE // only able to parry non projectiles
+ block_damage_multiplier_override = list(
+ TEXT_ATTACK_TYPE_MELEE = 0.5, // only useful on melee and unarmed
+ TEXT_ATTACK_TYPE_UNARMED = 0.3
+ )
+ block_start_delay = 0.5 // near instantaneous block
+ block_stamina_cost_per_second = 3
+ block_stamina_efficiency = 2 // haha this is a horrible idea
+ // more slowdown that deswords because security
+ block_slowdown = 2
+ // no attacking while blocking
+ block_lock_attacking = TRUE
+
+ parry_time_windup = 1
+ parry_time_active = 5
+ parry_time_spindown = 0
+ parry_time_spindown_visual_override = 1
+ parry_flags = PARRY_DEFAULT_HANDLE_FEEDBACK | PARRY_LOCK_ATTACKING // no attacking while parrying
+ parry_time_perfect = 0
+ parry_time_perfect_leeway = 0.5
+ parry_efficiency_perfect = 100
+ parry_imperfect_falloff_percent = 1
+ parry_imperfect_falloff_percent_override = list(
+ TEXT_ATTACK_TYPE_PROJECTILE = 45 // really crappy vs projectiles
+ )
+ parry_time_perfect_leeway_override = list(
+ TEXT_ATTACK_TYPE_PROJECTILE = 1 // extremely harsh window for projectiles
+ )
+ // not extremely punishing to fail, but no spamming the parry.
+ parry_cooldown = 2.5 SECONDS
+ parry_failed_stagger_duration = 1.5 SECONDS
+ parry_failed_clickcd_duration = 1 SECONDS
+
/obj/item/electrostaff/Initialize(mapload)
. = ..()
if(ispath(cell))
@@ -50,16 +87,12 @@
var/mob/living/silicon/robot/R = loc
. = R.get_cell()
-/obj/item/electrostaff/run_block(mob/living/owner, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, final_block_chance, list/block_return)
- if(!on || (!can_block_projectiles && (attack_type & ATTACK_TYPE_PROJECTILE)))
- return BLOCK_NONE
- return ..()
-
/obj/item/electrostaff/proc/min_hitcost()
return min(stun_cost, lethal_cost)
/obj/item/electrostaff/proc/turn_on(obj/item/source, mob/user)
wielded = TRUE
+ item_flags |= (ITEM_CAN_BLOCK|ITEM_CAN_PARRY)
if(!cell)
if(user)
to_chat(user, "[src] has no cell.")
@@ -75,6 +108,7 @@
/obj/item/electrostaff/proc/turn_off(obj/item/source, mob/user)
wielded = FALSE
+ item_flags &= ~(ITEM_CAN_BLOCK|ITEM_CAN_PARRY)
if(user)
to_chat(user, "You turn [src] off.")
on = FALSE
@@ -137,30 +171,30 @@
/obj/item/electrostaff/attack(mob/living/target, mob/living/user)
if(IS_STAMCRIT(user))//CIT CHANGE - makes it impossible to baton in stamina softcrit
- to_chat(user, "You're too exhausted for that.")//CIT CHANGE - ditto
+ to_chat(user, "You're too exhausted to use [src] properly.")//CIT CHANGE - ditto
return //CIT CHANGE - ditto
if(on && HAS_TRAIT(user, TRAIT_CLUMSY) && prob(50))
clowning_around(user) //ouch!
return
if(iscyborg(target))
- ..()
- return
- if(target.mob_run_block(src, 0, "[user]'s [name]", ATTACK_TYPE_MELEE, 0, user, null, null) & BLOCK_SUCCESS) //No message; run_block() handles that
+ return ..()
+ var/list/return_list = list()
+ if(target.mob_run_block(src, 0, "[user]'s [name]", ATTACK_TYPE_MELEE, 0, user, null, return_list) & BLOCK_SUCCESS) //No message; run_block() handles that
playsound(target, 'sound/weapons/genhit.ogg', 50, 1)
return FALSE
if(user.a_intent != INTENT_HARM)
- if(stun_act(target, user))
+ if(stun_act(target, user, null, return_list))
user.do_attack_animation(target)
user.adjustStaminaLossBuffered(stun_stam_cost)
return
- else if(!harm_act(target, user))
+ else if(!harm_act(target, user, null, return_list))
return ..() //if you can't fry them just beat them with it
else //we did harm act them
user.do_attack_animation(target)
user.adjustStaminaLossBuffered(lethal_stam_cost)
-/obj/item/electrostaff/proc/stun_act(mob/living/target, mob/living/user, no_charge_and_force = FALSE)
- var/stunforce = stun_stamdmg
+/obj/item/electrostaff/proc/stun_act(mob/living/target, mob/living/user, no_charge_and_force = FALSE, list/block_return = list())
+ var/stunforce = block_calculate_resultant_damage(stun_stamdmg, block_return)
if(!no_charge_and_force)
if(!on)
target.visible_message("[user] has bapped [target] with [src]. Luckily it was off.", \
@@ -190,8 +224,8 @@
H.forcesay(GLOB.hit_appends)
return TRUE
-/obj/item/electrostaff/proc/harm_act(mob/living/target, mob/living/user, no_charge_and_force = FALSE)
- var/lethal_force = lethal_damage
+/obj/item/electrostaff/proc/harm_act(mob/living/target, mob/living/user, no_charge_and_force = FALSE, list/block_return = list())
+ var/lethal_force = block_calculate_resultant_damage(lethal_damage, block_return)
if(!no_charge_and_force)
if(!on)
return FALSE //standard item attack
diff --git a/code/game/objects/items/grenades/antigravity.dm b/code/game/objects/items/grenades/antigravity.dm
index a4bc207be0..b6700599a3 100644
--- a/code/game/objects/items/grenades/antigravity.dm
+++ b/code/game/objects/items/grenades/antigravity.dm
@@ -7,7 +7,8 @@
var/forced_value = 0
var/duration = 300
-/obj/item/grenade/antigravity/prime()
+/obj/item/grenade/antigravity/prime(mob/living/lanced_by)
+ . = ..()
update_mob()
for(var/turf/T in view(range,src))
diff --git a/code/game/objects/items/grenades/chem_grenade.dm b/code/game/objects/items/grenades/chem_grenade.dm
index 91dde2899d..4ce0e811c3 100644
--- a/code/game/objects/items/grenades/chem_grenade.dm
+++ b/code/game/objects/items/grenades/chem_grenade.dm
@@ -174,10 +174,11 @@
message_admins(message)
user.log_message("primed [src] ([reagent_string])",LOG_GAME)
-/obj/item/grenade/chem_grenade/prime()
+/obj/item/grenade/chem_grenade/prime(mob/living/lanced_by)
if(stage != READY)
return FALSE
+ . = ..()
var/list/datum/reagents/reactants = list()
for(var/obj/item/reagent_containers/glass/G in beakers)
reactants += G.reagents
@@ -217,7 +218,7 @@
ignition_temp = 25 // Large grenades are slightly more effective at setting off heat-sensitive mixtures than smaller grenades.
threatscale = 1.1 // 10% more effective.
-/obj/item/grenade/chem_grenade/large/prime()
+/obj/item/grenade/chem_grenade/large/prime(mob/living/lanced_by)
if(stage != READY)
return FALSE
@@ -286,7 +287,7 @@
return
..()
-/obj/item/grenade/chem_grenade/adv_release/prime()
+/obj/item/grenade/chem_grenade/adv_release/prime(mob/living/lanced_by)
if(stage != READY)
return FALSE
diff --git a/code/game/objects/items/grenades/clusterbuster.dm b/code/game/objects/items/grenades/clusterbuster.dm
index c16b4a30a1..9980ff34ce 100644
--- a/code/game/objects/items/grenades/clusterbuster.dm
+++ b/code/game/objects/items/grenades/clusterbuster.dm
@@ -14,7 +14,8 @@
var/max_spawned = 8
var/segment_chance = 35
-/obj/item/grenade/clusterbuster/prime()
+/obj/item/grenade/clusterbuster/prime(mob/living/lanced_by)
+ . = ..()
update_mob()
var/numspawned = rand(min_spawned,max_spawned)
var/again = 0
@@ -59,7 +60,7 @@
step_away(src,loc)
addtimer(CALLBACK(src, .proc/prime), rand(15,60))
-/obj/item/grenade/clusterbuster/segment/prime()
+/obj/item/grenade/clusterbuster/segment/prime(mob/living/lanced_by)
new payload_spawner(drop_location(), payload, rand(min_spawned,max_spawned))
playsound(src, prime_sound, 75, 1, -3)
qdel(src)
diff --git a/code/game/objects/items/grenades/emgrenade.dm b/code/game/objects/items/grenades/emgrenade.dm
index 99cf4bdf99..815a3b343c 100644
--- a/code/game/objects/items/grenades/emgrenade.dm
+++ b/code/game/objects/items/grenades/emgrenade.dm
@@ -4,7 +4,8 @@
icon_state = "emp"
item_state = "emp"
-/obj/item/grenade/empgrenade/prime()
+/obj/item/grenade/empgrenade/prime(mob/living/lanced_by)
+ . = ..()
update_mob()
empulse(src, 4, 10)
qdel(src)
diff --git a/code/game/objects/items/grenades/flashbang.dm b/code/game/objects/items/grenades/flashbang.dm
index 6f79df28fe..f51db9fa4c 100644
--- a/code/game/objects/items/grenades/flashbang.dm
+++ b/code/game/objects/items/grenades/flashbang.dm
@@ -6,7 +6,8 @@
righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi'
var/flashbang_range = 7 //how many tiles away the mob will be stunned.
-/obj/item/grenade/flashbang/prime()
+/obj/item/grenade/flashbang/prime(mob/living/lanced_by)
+ . = ..()
update_mob()
var/flashbang_turf = get_turf(src)
if(!flashbang_turf)
@@ -42,3 +43,92 @@
var/distance = get_dist(get_turf(M), source)
if(M.flash_act(affect_silicon = 1))
M.DefaultCombatKnockdown(max(200/max(1,distance), 60))
+
+/obj/item/grenade/stingbang
+ name = "stingbang"
+ icon_state = "timeg"
+ item_state = "flashbang"
+ lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi'
+ var/flashbang_range = 1 //how many tiles away the mob will be stunned.
+ shrapnel_type = /obj/item/projectile/bullet/pellet/stingball
+ shrapnel_radius = 5
+ custom_premium_price = 700 // mostly gotten through cargo, but throw in one for the sec vendor ;)
+
+/obj/item/grenade/stingbang/mega
+ name = "mega stingbang"
+ shrapnel_type = /obj/item/projectile/bullet/pellet/stingball/mega
+ shrapnel_radius = 12
+
+/obj/item/grenade/stingbang/prime(mob/living/lanced_by)
+ if(iscarbon(loc))
+ var/mob/living/carbon/C = loc
+ var/obj/item/bodypart/B = C.get_holding_bodypart_of_item(src)
+ if(B)
+ C.visible_message("[src] goes off in [C]'s hand, blowing [C.p_their()] [B.name] to bloody shreds!", "[src] goes off in your hand, blowing your [B.name] to bloody shreds!")
+ B.dismember()
+
+ . = ..()
+ update_mob()
+ var/flashbang_turf = get_turf(src)
+ if(!flashbang_turf)
+ return
+ do_sparks(rand(5, 9), FALSE, src)
+ playsound(flashbang_turf, 'sound/weapons/flashbang.ogg', 50, TRUE, 8, 0.9)
+ new /obj/effect/dummy/lighting_obj (flashbang_turf, LIGHT_COLOR_WHITE, (flashbang_range + 2), 2, 1)
+ for(var/mob/living/M in get_hearers_in_view(flashbang_range, flashbang_turf))
+ pop(get_turf(M), M)
+ qdel(src)
+
+/obj/item/grenade/stingbang/proc/pop(turf/T , mob/living/M)
+ if(M.stat == DEAD) //They're dead!
+ return
+ M.show_message("POP", MSG_AUDIBLE)
+ var/distance = max(0,get_dist(get_turf(src),T))
+
+//Flash
+ if(M.flash_act(affect_silicon = 1))
+ M.Paralyze(max(10/max(1,distance), 5))
+ M.Knockdown(max(100/max(1,distance), 60))
+
+//Bang
+ if(!distance || loc == M || loc == M.loc)
+ M.Paralyze(20)
+ M.Knockdown(200)
+ M.soundbang_act(1, 200, 10, 15)
+ if(M.apply_damages(10, 10))
+ to_chat(M, "The blast from \the [src] bruises and burns you!")
+
+ // only checking if they're on top of the tile, cause being one tile over will be its own punishment
+
+// Grenade that releases more shrapnel the more times you use it in hand between priming and detonation (sorta like the 9bang from MW3), for admin goofs
+/obj/item/grenade/primer
+ name = "rotfrag grenade"
+ desc = "A grenade that generates more shrapnel the more you rotate it in your hand after pulling the pin. This one releases shrapnel shards."
+ icon_state = "timeg"
+ item_state = "flashbang"
+ lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi'
+ var/rots_per_mag = 3 /// how many times we need to "rotate" the charge in hand per extra tile of magnitude
+ shrapnel_type = /obj/item/projectile/bullet/shrapnel
+ var/rots = 1 /// how many times we've "rotated" the charge
+
+/obj/item/grenade/primer/attack_self(mob/user)
+ . = ..()
+ if(active)
+ user.playsound_local(user, 'sound/misc/box_deploy.ogg', 50, TRUE)
+ rots++
+ user.changeNext_move(CLICK_CD_RAPID)
+
+/obj/item/grenade/primer/prime(mob/living/lanced_by)
+ shrapnel_radius = round(rots / rots_per_mag)
+ . = ..()
+ qdel(src)
+
+/obj/item/grenade/primer/stingbang
+ name = "rotsting"
+ desc = "A grenade that generates more shrapnel the more you rotate it in your hand after pulling the pin. This one releases stingballs."
+ lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi'
+ rots_per_mag = 2
+ shrapnel_type = /obj/item/projectile/bullet/pellet/stingball
diff --git a/code/game/objects/items/grenades/ghettobomb.dm b/code/game/objects/items/grenades/ghettobomb.dm
index 1725d84dcc..3553d79faf 100644
--- a/code/game/objects/items/grenades/ghettobomb.dm
+++ b/code/game/objects/items/grenades/ghettobomb.dm
@@ -45,12 +45,13 @@
/obj/item/grenade/iedcasing/attack_self(mob/user) //
if(!active)
- if(clown_check(user))
+ if(!botch_check(user))
to_chat(user, "You light the [name]!")
cut_overlay("improvised_grenade_filled")
preprime(user, null, FALSE)
-/obj/item/grenade/iedcasing/prime() //Blowing that can up
+/obj/item/grenade/iedcasing/prime(mob/living/lanced_by) //Blowing that can up
+ . = ..()
update_mob()
explosion(src.loc,-1,-1,2, flame_range = 4) // small explosion, plus a very large fireball.
qdel(src)
diff --git a/code/game/objects/items/grenades/grenade.dm b/code/game/objects/items/grenades/grenade.dm
index 8a41ee4601..7a6157bf65 100644
--- a/code/game/objects/items/grenades/grenade.dm
+++ b/code/game/objects/items/grenades/grenade.dm
@@ -17,10 +17,31 @@
var/det_time = 50
var/display_timer = 1
var/clumsy_check = GRENADE_CLUMSY_FUMBLE
+ var/sticky = FALSE
+ // I moved the explosion vars and behavior to base grenades because we want all grenades to call [/obj/item/grenade/proc/prime] so we can send COMSIG_GRENADE_PRIME
+ ///how big of a devastation explosion radius on prime
+ var/ex_dev = 0
+ ///how big of a heavy explosion radius on prime
+ var/ex_heavy = 0
+ ///how big of a light explosion radius on prime
+ var/ex_light = 0
+ ///how big of a flame explosion radius on prime
+ var/ex_flame = 0
+
+ // dealing with creating a [/datum/component/pellet_cloud] on prime
+ /// if set, will spew out projectiles of this type
+ var/shrapnel_type
+ /// the higher this number, the more projectiles are created as shrapnel
+ var/shrapnel_radius
+ var/shrapnel_initialized
/obj/item/grenade/suicide_act(mob/living/carbon/user)
user.visible_message("[user] primes [src], then eats it! It looks like [user.p_theyre()] trying to commit suicide!")
+ if(shrapnel_type && shrapnel_radius)
+ shrapnel_initialized = TRUE
+ AddComponent(/datum/component/pellet_cloud, projectile_type=shrapnel_type, magnitude=shrapnel_radius)
playsound(src, 'sound/items/eatfood.ogg', 50, 1)
+ SEND_SIGNAL(src, COMSIG_GRENADE_ARMED, det_time)
preprime(user, det_time)
user.transferItemToLoc(src, user, TRUE)//>eat a grenade set to 5 seconds >rush captain
sleep(det_time)//so you dont die instantly
@@ -32,19 +53,21 @@
if(!QDELETED(src))
qdel(src)
-/obj/item/grenade/proc/clown_check(mob/living/carbon/human/user)
+/obj/item/grenade/proc/botch_check(mob/living/carbon/human/user)
var/clumsy = HAS_TRAIT(user, TRAIT_CLUMSY)
if(clumsy)
if(clumsy_check == GRENADE_CLUMSY_FUMBLE && prob(50))
to_chat(user, "Huh? How does this thing work?")
preprime(user, 5, FALSE)
- return FALSE
+ return TRUE
else if(clumsy_check == GRENADE_NONCLUMSY_FUMBLE && !(user.mind && HAS_TRAIT(user.mind, TRAIT_CLOWN_MENTALITY)))
to_chat(user, "You pull the pin on [src]. Attached to it is a pink ribbon that says, \"HONK\"")
preprime(user, 5, FALSE)
- return FALSE
- return TRUE
+ return TRUE
+ else if(sticky && prob(50)) // to add risk to sticky tape grenade cheese, no return cause we still prime as normal after
+ to_chat(user, "What the... [src] is stuck to your hand!")
+ ADD_TRAIT(src, TRAIT_NODROP, STICKY_NODROP)
/obj/item/grenade/examine(mob/user)
. = ..()
@@ -56,8 +79,16 @@
/obj/item/grenade/attack_self(mob/user)
+ if(HAS_TRAIT(src, TRAIT_NODROP))
+ to_chat(user, "You try prying [src] off your hand...")
+ if(do_after(user, 70, target=src))
+ to_chat(user, "You manage to remove [src] from your hand.")
+ REMOVE_TRAIT(src, TRAIT_NODROP, STICKY_NODROP)
+
+ return
+
if(!active)
- if(clown_check(user))
+ if(!botch_check(user)) // if they botch the prime, it'll be handled in botch_check
preprime(user)
/obj/item/grenade/proc/log_grenade(mob/user, turf/T)
@@ -81,10 +112,18 @@
icon_state = initial(icon_state) + "_active"
addtimer(CALLBACK(src, .proc/prime), isnull(delayoverride)? det_time : delayoverride)
-/obj/item/grenade/proc/prime()
+/obj/item/grenade/proc/prime(mob/living/lanced_by)
var/turf/T = get_turf(src)
log_game("Grenade detonation at [AREACOORD(T)], location [loc]")
+ if(shrapnel_type && shrapnel_radius && !shrapnel_initialized) // add a second check for adding the component in case whatever triggered the grenade went straight to prime (badminnery for example)
+ shrapnel_initialized = TRUE
+ AddComponent(/datum/component/pellet_cloud, projectile_type=shrapnel_type, magnitude=shrapnel_radius)
+
+ SEND_SIGNAL(src, COMSIG_GRENADE_PRIME, lanced_by)
+ if(ex_dev || ex_heavy || ex_light || ex_flame)
+ explosion(loc, ex_dev, ex_heavy, ex_light, flame_range = ex_flame)
+
/obj/item/grenade/proc/update_mob()
if(ismob(loc))
var/mob/M = loc
diff --git a/code/game/objects/items/grenades/plastic.dm b/code/game/objects/items/grenades/plastic.dm
index fe2a27f1a8..a2b0e3edd4 100644
--- a/code/game/objects/items/grenades/plastic.dm
+++ b/code/game/objects/items/grenades/plastic.dm
@@ -122,7 +122,9 @@
var/obj/item/I = AM
I.throw_speed = max(1, (I.throw_speed - 3))
I.throw_range = max(1, (I.throw_range - 3))
- I.embedding = I.embedding.setRating(embed_chance = 0)
+ if(I.embedding)
+ I.embedding["embed_chance"] = 0
+ I.updateEmbedding()
target.add_overlay(plastic_overlay, TRUE)
if(!nadeassembly)
@@ -205,9 +207,10 @@
else
return ..()
-/obj/item/grenade/plastic/c4/prime()
+/obj/item/grenade/plastic/c4/prime(mob/living/lanced_by)
if(QDELETED(src))
return
+ . = ..()
var/turf/location
if(target)
if(!QDELETED(target))
diff --git a/code/game/objects/items/grenades/smokebomb.dm b/code/game/objects/items/grenades/smokebomb.dm
index f26390faf6..1b856fc013 100644
--- a/code/game/objects/items/grenades/smokebomb.dm
+++ b/code/game/objects/items/grenades/smokebomb.dm
@@ -17,7 +17,8 @@
qdel(smoke)
return ..()
-/obj/item/grenade/smokebomb/prime()
+/obj/item/grenade/smokebomb/prime(mob/living/lanced_by)
+ . = ..()
update_mob()
playsound(src.loc, 'sound/effects/smoke.ogg', 50, 1, -3)
smoke.set_up(4, src)
diff --git a/code/game/objects/items/grenades/spawnergrenade.dm b/code/game/objects/items/grenades/spawnergrenade.dm
index 2cc72f3694..a8b0fa3cd3 100644
--- a/code/game/objects/items/grenades/spawnergrenade.dm
+++ b/code/game/objects/items/grenades/spawnergrenade.dm
@@ -7,7 +7,8 @@
var/spawner_type = null // must be an object path
var/deliveryamt = 1 // amount of type to deliver
-/obj/item/grenade/spawnergrenade/prime() // Prime now just handles the two loops that query for people in lockers and people who can see it.
+/obj/item/grenade/spawnergrenade/prime(mob/living/lanced_by) // Prime now just handles the two loops that query for people in lockers and people who can see it.
+ . = ..()
update_mob()
if(spawner_type && deliveryamt)
// Make a quick flash
diff --git a/code/game/objects/items/grenades/syndieminibomb.dm b/code/game/objects/items/grenades/syndieminibomb.dm
index 35e9abd982..9f12edeb17 100644
--- a/code/game/objects/items/grenades/syndieminibomb.dm
+++ b/code/game/objects/items/grenades/syndieminibomb.dm
@@ -4,27 +4,45 @@
icon = 'icons/obj/grenade.dmi'
icon_state = "syndicate"
item_state = "flashbang"
+ ex_dev = 1
+ ex_heavy = 2
+ ex_light = 4
+ ex_flame = 2
-/obj/item/grenade/syndieminibomb/prime()
+/obj/item/grenade/syndieminibomb/prime(mob/living/lanced_by)
+ . = ..()
update_mob()
- explosion(src.loc,1,2,4,flame_range = 2)
qdel(src)
/obj/item/grenade/syndieminibomb/concussion
name = "HE Grenade"
desc = "A compact shrapnel grenade meant to devastate nearby organisms and cause some damage in the process. Pull pin and throw opposite direction."
icon_state = "concussion"
+ ex_heavy = 2
+ ex_light = 3
+ ex_flame = 3
-/obj/item/grenade/syndieminibomb/concussion/prime()
- update_mob()
- explosion(src.loc,0,2,3,flame_range = 3)
- qdel(src)
-
-/obj/item/grenade/syndieminibomb/concussion/frag
+/obj/item/grenade/frag
name = "frag grenade"
- desc = "Fire in the hole."
+ desc = "An anti-personnel fragmentation grenade, this weapon excels at killing soft targets by shredding them with metal shrapnel."
icon_state = "frag"
+ shrapnel_type = /obj/item/projectile/bullet/shrapnel
+ shrapnel_radius = 4
+ ex_heavy = 1
+ ex_light = 3
+ ex_flame = 4
+
+/obj/item/grenade/frag/mega
+ name = "FRAG grenade"
+ desc = "An anti-everything fragmentation grenade, this weapon excels at killing anything any everything by shredding them with metal shrapnel."
+ shrapnel_type = /obj/item/projectile/bullet/shrapnel/mega
+ shrapnel_radius = 12
+
+/obj/item/grenade/frag/prime(mob/living/lanced_by)
+ . = ..()
+ update_mob()
+ qdel(src)
/obj/item/grenade/gluon
desc = "An advanced grenade that releases a harmful stream of gluons inducing radiation in those nearby. These gluon streams will also make victims feel exhausted, and induce shivering. This extreme coldness will also likely wet any nearby floors."
@@ -36,7 +54,8 @@
var/rad_damage = 350
var/stamina_damage = 30
-/obj/item/grenade/gluon/prime()
+/obj/item/grenade/gluon/prime(mob/living/lanced_by)
+ . = ..()
update_mob()
playsound(loc, 'sound/effects/empulse.ogg', 50, 1)
radiation_pulse(src, rad_damage)
diff --git a/code/game/objects/items/kitchen.dm b/code/game/objects/items/kitchen.dm
index 77d9f09eff..dda41494ff 100644
--- a/code/game/objects/items/kitchen.dm
+++ b/code/game/objects/items/kitchen.dm
@@ -71,7 +71,7 @@
sharpness = IS_SHARP_ACCURATE
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
var/bayonet = FALSE //Can this be attached to a gun?
- custom_price = 250
+ custom_price = PRICE_NORMAL
/obj/item/kitchen/knife/Initialize()
. = ..()
@@ -131,13 +131,14 @@
custom_materials = list(/datum/material/iron=18000)
attack_verb = list("cleaved", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
w_class = WEIGHT_CLASS_NORMAL
- custom_price = 600
+ custom_price = PRICE_EXPENSIVE
/obj/item/kitchen/knife/combat
name = "combat knife"
icon_state = "buckknife"
item_state = "knife"
desc = "A military combat utility survival knife."
+ embedding = list("pain_mult" = 4, "embed_chance" = 65, "fall_chance" = 10, "ignore_throwspeed_threshold" = TRUE)
force = 20
throwforce = 20
attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "cut")
@@ -148,6 +149,7 @@
icon_state = "survivalknife"
item_state = "knife"
desc = "A hunting grade survival knife."
+ embedding = list("pain_mult" = 4, "embed_chance" = 35, "fall_chance" = 10)
force = 15
throwforce = 15
bayonet = TRUE
@@ -159,6 +161,7 @@
lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
desc = "A sharpened bone. The bare minimum in survival."
+ embedding = list("pain_mult" = 4, "embed_chance" = 35, "fall_chance" = 10)
force = 15
throwforce = 15
custom_materials = null
@@ -200,7 +203,7 @@
w_class = WEIGHT_CLASS_NORMAL
custom_materials = list(/datum/material/wood = MINERAL_MATERIAL_AMOUNT * 1.5)
attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked")
- custom_price = 200
+ custom_price = PRICE_ALMOST_CHEAP
/obj/item/kitchen/rollingpin/suicide_act(mob/living/carbon/user)
user.visible_message("[user] begins flattening [user.p_their()] head with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!")
diff --git a/code/game/objects/items/melee/energy.dm b/code/game/objects/items/melee/energy.dm
index d7d22a7249..20960da7c6 100644
--- a/code/game/objects/items/melee/energy.dm
+++ b/code/game/objects/items/melee/energy.dm
@@ -103,11 +103,30 @@
throw_speed = 3
throw_range = 5
sharpness = IS_SHARP
- embedding = list("embed_chance" = 75, "embedded_impact_pain_multiplier" = 10)
+ embedding = list("embed_chance" = 75, "impact_pain_mult" = 10)
armour_penetration = 35
- block_chance = 50
+ item_flags = NEEDS_PERMIT | ITEM_CAN_PARRY
+ block_parry_data = /datum/block_parry_data/energy_sword
var/list/possible_colors = list("red" = LIGHT_COLOR_RED, "blue" = LIGHT_COLOR_LIGHT_CYAN, "green" = LIGHT_COLOR_GREEN, "purple" = LIGHT_COLOR_LAVENDER)
+/datum/block_parry_data/energy_sword
+ parry_time_windup = 0
+ parry_time_active = 25
+ parry_time_spindown = 0
+ // we want to signal to players the most dangerous phase, the time when automatic counterattack is a thing.
+ parry_time_windup_visual_override = 1
+ parry_time_active_visual_override = 3
+ parry_time_spindown_visual_override = 12
+ parry_flags = PARRY_DEFAULT_HANDLE_FEEDBACK // esword users can attack while
+ parry_time_perfect = 2.5 // first ds isn't perfect
+ parry_time_perfect_leeway = 1.5
+ parry_imperfect_falloff_percent = 5
+ parry_efficiency_to_counterattack = 100
+ parry_efficiency_considered_successful = 65 // VERY generous
+ parry_efficiency_perfect = 100
+ parry_failed_stagger_duration = 4 SECONDS
+ parry_cooldown = 0.5 SECONDS
+
/obj/item/melee/transforming/energy/sword/Initialize(mapload)
. = ..()
set_sword_color()
@@ -273,6 +292,10 @@
light_color = "#37FFF7"
actions_types = list()
+/obj/item/melee/transforming/energy/sword/cx/Initialize()
+ icon_state_on = icon_state
+ return ..()
+
/obj/item/melee/transforming/energy/sword/cx/ComponentInitialize()
. = ..()
AddElement(/datum/element/update_icon_updates_onmob)
@@ -290,6 +313,7 @@
if(!supress_message_text)
to_chat(user, "[src] [active ? "is now active":"can now be concealed"].")
+
/obj/item/melee/transforming/energy/sword/cx/update_overlays()
. = ..()
var/mutable_appearance/blade_overlay = mutable_appearance(icon, "cxsword_blade")
diff --git a/code/game/objects/items/melee/misc.dm b/code/game/objects/items/melee/misc.dm
index 71437d4706..741607edc3 100644
--- a/code/game/objects/items/melee/misc.dm
+++ b/code/game/objects/items/melee/misc.dm
@@ -61,13 +61,25 @@
force = 18
throwforce = 15
w_class = WEIGHT_CLASS_BULKY
- block_chance = 50
armour_penetration = 75
sharpness = IS_SHARP
attack_verb = list("slashed", "cut")
hitsound = 'sound/weapons/rapierhit.ogg'
custom_materials = list(/datum/material/iron = 1000)
total_mass = 3.4
+ item_flags = NEEDS_PERMIT | ITEM_CAN_PARRY
+ block_parry_data = /datum/block_parry_data/captain_saber
+
+/datum/block_parry_data/captain_saber
+ parry_time_windup = 0.5
+ parry_time_active = 4
+ parry_time_spindown = 1
+ parry_time_perfect = 0.75
+ parry_time_perfect_leeway = 0.75
+ parry_imperfect_falloff_percent = 30
+ parry_efficiency_perfect = 100
+ parry_failed_stagger_duration = 3 SECONDS
+ parry_failed_clickcd_duration = 2 SECONDS
/obj/item/melee/sabre/Initialize()
. = ..()
@@ -150,7 +162,6 @@
righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
force = 15
throwforce = 25
- block_chance = 50
armour_penetration = 200 //Apparently this gives it the ability to pierce block
flags_1 = CONDUCT_1
obj_flags = UNIQUE_RENAME
@@ -159,16 +170,47 @@
attack_verb = list("stabs", "punctures", "pierces", "pokes")
hitsound = 'sound/weapons/rapierhit.ogg'
total_mass = 0.4
+ item_flags = ITEM_CAN_PARRY | NEEDS_PERMIT
+ block_parry_data = /datum/block_parry_data/traitor_rapier
+
+// Fast, efficient parry.
+/datum/block_parry_data/traitor_rapier
+ parry_time_windup = 0.5
+ parry_time_active = 5
+ parry_time_spindown = 0
+ parry_time_active_visual_override = 3
+ parry_time_spindown_visual_override = 2
+ parry_flags = PARRY_DEFAULT_HANDLE_FEEDBACK | PARRY_LOCK_ATTACKING
+ parry_time_perfect = 0
+ parry_time_perfect_leeway = 3
+ parry_time_perfect_leeway_override = list(
+ TEXT_ATTACK_TYPE_PROJECTILE = 1
+ )
+ parry_imperfect_falloff_percent_override = list(
+ TEXT_ATTACK_TYPE_PROJECTILE = 50 // useless after 3rd decisecond
+ )
+ parry_imperfect_falloff_percent = 30
+ parry_efficiency_to_counterattack = 100
+ parry_efficiency_considered_successful = 1
+ parry_efficiency_perfect = 100
+ parry_data = list(
+ PARRY_DISARM_ATTACKER = TRUE,
+ PARRY_KNOCKDOWN_ATTACKER = 10
+ )
+ parry_failed_stagger_duration = 2 SECONDS
+ parry_failed_clickcd_duration = CLICK_CD_RANGE
+ parry_cooldown = 0
+
+/obj/item/melee/rapier/active_parry_reflex_counter(mob/living/owner, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, list/return_list, parry_efficiency, list/effect_text)
+ . = ..()
+ if((attack_type & ATTACK_TYPE_PROJECTILE) && (parry_efficiency >= 100))
+ . |= BLOCK_SHOULD_REDIRECT
+ return_list[BLOCK_RETURN_REDIRECT_METHOD] = REDIRECT_METHOD_DEFLECT
/obj/item/melee/rapier/Initialize()
. = ..()
AddComponent(/datum/component/butchering, 20, 65, 0)
-/obj/item/melee/rapier/run_block(mob/living/owner, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, final_block_chance, list/block_return)
- if(attack_type == ATTACK_TYPE_PROJECTILE)
- final_block_chance = 0
- return ..()
-
/obj/item/melee/rapier/on_exit_storage(datum/component/storage/S)
var/obj/item/storage/belt/sabre/rapier/B = S.parent
if(istype(B))
@@ -191,10 +233,9 @@
. = ..()
if(iscarbon(target))
var/mob/living/carbon/H = target
- var/loss = H.getStaminaLoss()
H.Dizzy(10)
H.adjustStaminaLoss(30)
- if((loss > 40) && prob(loss)) // if above 40, roll for sleep using 1% every 1 stamina damage
+ if(CHECK_STAMCRIT(H) != NOT_STAMCRIT)
H.Sleeping(180)
/obj/item/melee/classic_baton
@@ -664,4 +705,4 @@
. = ..()
overlay = mutable_appearance(icon, overlay_state)
overlay.appearance_flags = RESET_COLOR
- add_overlay(overlay)
\ No newline at end of file
+ add_overlay(overlay)
diff --git a/code/game/objects/items/melee/transforming.dm b/code/game/objects/items/melee/transforming.dm
index 5bccf91868..386a6e9acc 100644
--- a/code/game/objects/items/melee/transforming.dm
+++ b/code/game/objects/items/melee/transforming.dm
@@ -53,6 +53,8 @@
throw_speed = 4
if(attack_verb_on.len)
attack_verb = attack_verb_on
+ if(embedding)
+ updateEmbedding()
icon_state = icon_state_on
w_class = w_class_on
else
@@ -62,6 +64,8 @@
throw_speed = initial(throw_speed)
if(attack_verb_off.len)
attack_verb = attack_verb_off
+ if(embedding)
+ updateEmbedding()
icon_state = initial(icon_state)
w_class = initial(w_class)
total_mass = initial(total_mass)
diff --git a/code/game/objects/items/miscellaneous.dm b/code/game/objects/items/miscellaneous.dm
index ae9ea6985c..7237a1788f 100644
--- a/code/game/objects/items/miscellaneous.dm
+++ b/code/game/objects/items/miscellaneous.dm
@@ -129,6 +129,30 @@
hos_gun_list[initial(A.name)] = A
return hos_gun_list
+/obj/item/choice_beacon/augments
+ name = "augment beacon"
+ desc = "Summons augmentations."
+
+/obj/item/choice_beacon/augments/generate_display_names()
+ var/static/list/augment_list
+ if(!augment_list)
+ augment_list = list()
+ var/list/templist = list(
+ /obj/item/organ/cyberimp/brain/anti_drop,
+ /obj/item/organ/cyberimp/arm/toolset,
+ /obj/item/organ/cyberimp/arm/surgery,
+ /obj/item/organ/cyberimp/chest/thrusters,
+ /obj/item/organ/lungs/cybernetic,
+ /obj/item/organ/liver/cybernetic) //cyberimplants range from a nice bonus to fucking broken bullshit so no subtypesof
+ for(var/V in templist)
+ var/atom/A = V
+ augment_list[initial(A.name)] = A
+ return augment_list
+
+/obj/item/choice_beacon/augments/spawn_option(obj/choice,mob/living/M)
+ new choice(get_turf(M))
+ to_chat(M, "You hear something crackle from the beacon for a moment before a voice speaks. \"Please stand by for a message from S.E.L.F. Message as follows: Item request received. Your package has been transported, use the autosurgeon supplied to apply the upgrade. Message ends.\"")
+
/obj/item/skub
desc = "It's skub."
name = "skub"
diff --git a/code/game/objects/items/pinpointer.dm b/code/game/objects/items/pinpointer.dm
index a1652fd211..3420e72c72 100644
--- a/code/game/objects/items/pinpointer.dm
+++ b/code/game/objects/items/pinpointer.dm
@@ -78,7 +78,7 @@
name = "crew pinpointer"
desc = "A handheld tracking device that points to crew suit sensors."
icon_state = "pinpointer_crew"
- custom_price = 600
+ custom_price = PRICE_ABOVE_EXPENSIVE
var/has_owner = FALSE
var/pinpointer_owner = null
@@ -183,3 +183,20 @@
A.other_pair = B
B.other_pair = A
+
+/obj/item/pinpointer/shuttle
+ name = "fugitive pinpointer"
+ desc = "A handheld tracking device that locates the bounty hunter shuttle for quick escapes."
+ icon_state = "pinpointer_hunter"
+ var/obj/shuttleport
+
+/obj/item/pinpointer/shuttle/Initialize(mapload)
+ . = ..()
+ shuttleport = SSshuttle.getShuttle("huntership")
+
+/obj/item/pinpointer/shuttle/scan_for_target()
+ target = shuttleport
+
+/obj/item/pinpointer/shuttle/Destroy()
+ shuttleport = null
+ . = ..()
\ No newline at end of file
diff --git a/code/game/objects/items/plushes.dm b/code/game/objects/items/plushes.dm
index a564d7f9f9..00a9ff22f4 100644
--- a/code/game/objects/items/plushes.dm
+++ b/code/game/objects/items/plushes.dm
@@ -140,7 +140,8 @@
if(jsonlist["icon_state"])
icon_state = jsonlist["icon_state"]
item_state = jsonlist["item_state"]
- icon = 'config/plushies/sprites.dmi'
+ var/static/config_sprites = file("config/plushies/sprites.dmi")
+ icon = config_sprites
if(jsonlist["attack_verb"])
attack_verb = jsonlist["attack_verb"]
if(jsonlist["squeak_override"])
@@ -436,13 +437,13 @@ GLOBAL_LIST_INIT(valid_plushie_paths, valid_plushie_paths())
/obj/item/toy/plush/random/Initialize()
var/newtype
var/list/snowflake_list = CONFIG_GET(keyed_list/snowflake_plushies)
-
+
/// If there are no snowflake plushies we'll default to base plush, so we grab from the valid list
if (snowflake_list.len)
newtype = prob(CONFIG_GET(number/snowflake_plushie_prob)) ? /obj/item/toy/plush/random_snowflake : pick(GLOB.valid_plushie_paths)
- else
+ else
newtype = pick(GLOB.valid_plushie_paths)
-
+
new newtype(loc)
return INITIALIZE_HINT_QDEL
diff --git a/code/game/objects/items/powerfist.dm b/code/game/objects/items/powerfist.dm
index 648f465a22..b7e2d22d2f 100644
--- a/code/game/objects/items/powerfist.dm
+++ b/code/game/objects/items/powerfist.dm
@@ -6,6 +6,7 @@
lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi'
flags_1 = CONDUCT_1
+ item_flags = NEEDS_PERMIT | NO_COMBAT_MODE_FORCE_MODIFIER //To avoid ambushing and oneshotting healthy crewmembers on force setting 3.
attack_verb = list("whacked", "fisted", "power-punched")
force = 20
throwforce = 10
@@ -13,7 +14,7 @@
w_class = WEIGHT_CLASS_NORMAL
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 40)
resistance_flags = FIRE_PROOF
- var/click_delay = 1.5
+ click_delay = CLICK_CD_MELEE * 1.5
var/fisto_setting = 1
var/gasperfist = 3
var/obj/item/tank/internals/tank = null //Tank used for the gauntlet's piston-ram.
@@ -70,42 +71,46 @@
/obj/item/melee/powerfist/attack(mob/living/target, mob/living/user)
- if(!tank)
- to_chat(user, "\The [src] can't operate without a source of gas!")
- return
- var/datum/gas_mixture/gasused = tank.air_contents.remove(gasperfist * fisto_setting)
- var/turf/T = get_turf(src)
- if(!T)
- return
- T.assume_air(gasused)
- T.air_update_turf()
- if(!gasused)
- to_chat(user, "\The [src]'s tank is empty!")
- target.apply_damage((force / 5), BRUTE)
- playsound(loc, 'sound/weapons/punch1.ogg', 50, 1)
- target.visible_message("[user]'s powerfist lets out a dull thunk as [user.p_they()] punch[user.p_es()] [target.name]!", \
- "[user]'s punches you!")
- return
- if(gasused.total_moles() < gasperfist * fisto_setting)
- to_chat(user, "\The [src]'s piston-ram lets out a weak hiss, it needs more gas!")
- playsound(loc, 'sound/weapons/punch4.ogg', 50, 1)
- target.apply_damage((force / 2), BRUTE)
- target.visible_message("[user]'s powerfist lets out a weak hiss as [user.p_they()] punch[user.p_es()] [target.name]!", \
- "[user]'s punch strikes with force!")
- return
- target.apply_damage(force * fisto_setting, BRUTE)
- target.visible_message("[user]'s powerfist lets out a loud hiss as [user.p_they()] punch[user.p_es()] [target.name]!", \
- "You cry out in pain as [user]'s punch flings you backwards!")
- new /obj/effect/temp_visual/kinetic_blast(target.loc)
- playsound(loc, 'sound/weapons/resonator_blast.ogg', 50, 1)
- playsound(loc, 'sound/weapons/genhit2.ogg', 50, 1)
+ if(HAS_TRAIT(user, TRAIT_PACIFISM))
+ to_chat(user, "You don't want to harm other living beings!")
+ return FALSE
+ if(!tank)
+ to_chat(user, "\The [src] can't operate without a source of gas!")
+ return FALSE
+ var/datum/gas_mixture/gasused = tank.air_contents.remove(gasperfist * fisto_setting)
+ var/turf/T = get_turf(src)
+ if(!T)
+ return FALSE
+ var/totalitemdamage = target.pre_attacked_by(src, user)
+ T.assume_air(gasused)
+ T.air_update_turf()
+ if(!gasused)
+ to_chat(user, "\The [src]'s tank is empty!")
+ target.apply_damage((totalitemdamage / 5), BRUTE)
+ playsound(loc, 'sound/weapons/punch1.ogg', 50, 1)
+ target.visible_message("[user]'s powerfist lets out a dull thunk as [user.p_they()] punch[user.p_es()] [target.name]!", \
+ "[user]'s punches you!")
+ return
+ if(gasused.total_moles() < gasperfist * fisto_setting)
+ to_chat(user, "\The [src]'s piston-ram lets out a weak hiss, it needs more gas!")
+ playsound(loc, 'sound/weapons/punch4.ogg', 50, 1)
+ target.apply_damage((totalitemdamage / 2), BRUTE)
+ target.visible_message("[user]'s powerfist lets out a weak hiss as [user.p_they()] punch[user.p_es()] [target.name]!", \
+ "[user]'s punch strikes with force!")
+ return
+ target.apply_damage(totalitemdamage * fisto_setting, BRUTE)
+ target.visible_message("[user]'s powerfist lets out a loud hiss as [user.p_they()] punch[user.p_es()] [target.name]!", \
+ "You cry out in pain as [user]'s punch flings you backwards!")
+ new /obj/effect/temp_visual/kinetic_blast(target.loc)
+ playsound(loc, 'sound/weapons/resonator_blast.ogg', 50, 1)
+ playsound(loc, 'sound/weapons/genhit2.ogg', 50, 1)
- var/atom/throw_target = get_edge_target_turf(target, get_dir(src, get_step_away(target, src)))
+ var/atom/throw_target = get_edge_target_turf(target, get_dir(src, get_step_away(target, src)))
+ target.throw_at(throw_target, 5 * fisto_setting, 0.5 + (fisto_setting / 2))
- target.throw_at(throw_target, 5 * fisto_setting, 0.5 + (fisto_setting / 2))
+ log_combat(user, target, "power fisted", src)
- log_combat(user, target, "power fisted", src)
-
- user.changeNext_move(CLICK_CD_MELEE * click_delay)
-
- return
+ var/weight = getweight(user, STAM_COST_ATTACK_MOB_MULT)
+ if(weight)
+ user.adjustStaminaLossBuffered(weight)
+ return TRUE
diff --git a/code/game/objects/items/religion.dm b/code/game/objects/items/religion.dm
index ba73bbc187..61a05aacd8 100644
--- a/code/game/objects/items/religion.dm
+++ b/code/game/objects/items/religion.dm
@@ -215,8 +215,9 @@
/obj/item/clothing/head/helmet/plate/crusader/prophet
name = "Prophet's Hat"
desc = "A religious-looking hat."
+ icon_state = "prophet"
mob_overlay_icon = 'icons/mob/large-worn-icons/64x64/head.dmi'
- flags_1 = 0
+ flags_1 = NONE
armor = list("melee" = 60, "bullet" = 60, "laser" = 60, "energy" = 50, "bomb" = 70, "bio" = 50, "rad" = 50, "fire" = 60, "acid" = 60) //religion protects you from disease and radiation, honk.
worn_x_dimension = 64
worn_y_dimension = 64
diff --git a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm
index 2f697553f5..4b8728e426 100644
--- a/code/game/objects/items/robot/robot_items.dm
+++ b/code/game/objects/items/robot/robot_items.dm
@@ -358,6 +358,7 @@
check_amount()
/obj/item/borg/lollipop/dropped(mob/user)
+ . = ..()
check_amount()
/obj/item/borg/lollipop/proc/check_amount() //Doesn't even use processing ticks.
diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm
index d5bc6eabf5..d33ecedf0a 100644
--- a/code/game/objects/items/robot/robot_upgrades.dm
+++ b/code/game/objects/items/robot/robot_upgrades.dm
@@ -545,7 +545,7 @@
to_chat(usr, "This unit already has an expand module installed!")
return FALSE
- R.notransform = TRUE
+ R.mob_transforming = TRUE
var/prev_locked_down = R.locked_down
R.SetLockdown(1)
R.anchored = TRUE
@@ -559,7 +559,7 @@
if(!prev_locked_down)
R.SetLockdown(0)
R.anchored = FALSE
- R.notransform = FALSE
+ R.mob_transforming = FALSE
R.resize = 2
R.hasExpanded = TRUE
R.update_transform()
diff --git a/code/game/objects/items/shields.dm b/code/game/objects/items/shields.dm
index b9cde1664f..aefa5d3cc8 100644
--- a/code/game/objects/items/shields.dm
+++ b/code/game/objects/items/shields.dm
@@ -1,7 +1,8 @@
/obj/item/shield
name = "shield"
icon = 'icons/obj/shields.dmi'
- block_chance = 50
+ item_flags = ITEM_CAN_BLOCK
+ block_parry_data = /datum/block_parry_data/shield
armor = list("melee" = 50, "bullet" = 50, "laser" = 50, "energy" = 0, "bomb" = 30, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 70)
/// Shield flags
var/shield_flags = SHIELD_FLAGS_DEFAULT
@@ -22,6 +23,18 @@
/// Shield bashing push distance
var/shieldbash_push_distance = 1
+/datum/block_parry_data/shield
+ block_damage_multiplier = 0.25
+ block_stamina_efficiency = 2.5
+ block_stamina_cost_per_second = 3.5
+ block_slowdown = 0
+ block_lock_attacking = FALSE
+ block_lock_sprinting = TRUE
+ block_start_delay = 1.5
+ block_damage_absorption = 5
+ block_resting_stamina_penalty_multiplier = 2
+ block_projectile_mitigation = 75
+
/obj/item/shield/examine(mob/user)
. = ..()
if(shield_flags & SHIELD_CAN_BASH)
@@ -154,6 +167,22 @@
icon_state = "shield_bash"
duration = 3
+/obj/item/shield/run_block(mob/living/owner, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, final_block_chance, list/block_return)
+ if(ismovable(object))
+ var/atom/movable/AM = object
+ if(CHECK_BITFIELD(shield_flags, SHIELD_TRANSPARENT) && (AM.pass_flags & PASSGLASS))
+ return BLOCK_NONE
+ if(attack_type & ATTACK_TYPE_THROWN)
+ final_block_chance += 30
+ if(attack_type & ATTACK_TYPE_TACKLE)
+ final_block_chance = 100
+ . = ..()
+ if(. & BLOCK_SUCCESS)
+ on_shield_block(owner, object, damage, attack_text, attack_type, armour_penetration, attacker, def_zone, final_block_chance, block_return)
+
+/obj/item/shield/on_active_block(mob/living/owner, atom/object, damage, damage_blocked, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, final_block_chance, list/block_return, override_direction)
+ on_shield_block(owner, object, damage, attack_text, attack_type, armour_penetration, attacker, def_zone, final_block_chance)
+
/obj/item/shield/riot
name = "riot shield"
desc = "A shield adept at blocking blunt objects from connecting with the torso of the shield wielder."
@@ -172,20 +201,7 @@
var/repair_material = /obj/item/stack/sheet/mineral/titanium
var/can_shatter = TRUE
shield_flags = SHIELD_FLAGS_DEFAULT | SHIELD_TRANSPARENT
- max_integrity = 75
-
-/obj/item/shield/run_block(mob/living/owner, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, final_block_chance, list/block_return)
- if(ismovable(object))
- var/atom/movable/AM = object
- if(CHECK_BITFIELD(shield_flags, SHIELD_TRANSPARENT) && (AM.pass_flags & PASSGLASS))
- return BLOCK_NONE
- if(attack_type & ATTACK_TYPE_THROWN)
- final_block_chance += 30
- if(attack_type & ATTACK_TYPE_TACKLE)
- final_block_chance = 100
- . = ..()
- if(. & BLOCK_SUCCESS)
- on_shield_block(owner, object, damage, attack_text, attack_type, armour_penetration, attacker, def_zone, final_block_chance, block_return)
+ max_integrity = 450
/obj/item/shield/riot/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/melee/baton))
@@ -238,13 +254,13 @@
lefthand_file = 'icons/mob/inhands/equipment/shields_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/shields_righthand.dmi'
shield_flags = SHIELD_FLAGS_DEFAULT
- max_integrity = 55 //Weak
+ max_integrity = 300
obj/item/shield/riot/bullet_proof
name = "bullet resistant shield"
desc = "A far more frail shield made of resistant plastics and kevlar meant to block ballistics."
armor = list("melee" = 30, "bullet" = 80, "laser" = 0, "energy" = 0, "bomb" = -40, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 50)
- max_integrity = 55 //Weaker
+ max_integrity = 300
/obj/item/shield/riot/roman
name = "\improper Roman shield"
@@ -255,13 +271,13 @@ obj/item/shield/riot/bullet_proof
righthand_file = 'icons/mob/inhands/equipment/shields_righthand.dmi'
repair_material = /obj/item/stack/sheet/mineral/wood
shield_flags = SHIELD_FLAGS_DEFAULT
- max_integrity = 65
+ max_integrity = 250
/obj/item/shield/riot/roman/fake
desc = "Bears an inscription on the inside: \"Romanes venio domus\". It appears to be a bit flimsy."
block_chance = 0
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
- max_integrity = 30
+ max_integrity = 40
/obj/item/shield/riot/roman/shatter(mob/living/carbon/human/owner)
playsound(owner, 'sound/effects/grillehit.ogg', 100)
@@ -279,7 +295,7 @@ obj/item/shield/riot/bullet_proof
repair_material = /obj/item/stack/sheet/mineral/wood
block_chance = 30
shield_flags = SHIELD_FLAGS_DEFAULT
- max_integrity = 55
+ max_integrity = 150
/obj/item/shield/riot/buckler/shatter(mob/living/carbon/human/owner)
playsound(owner, 'sound/effects/bang.ogg', 50)
@@ -297,13 +313,16 @@ obj/item/shield/riot/bullet_proof
throw_speed = 3
throw_range = 4
w_class = WEIGHT_CLASS_NORMAL
- var/active = 0
+ var/active = FALSE
/obj/item/shield/riot/tele/run_block(mob/living/owner, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, final_block_chance, list/block_return)
if(!active)
return BLOCK_NONE
return ..()
+/obj/item/shield/riot/tele/can_active_block()
+ return ..() && active
+
/obj/item/shield/riot/tele/attack_self(mob/living/user)
active = !active
icon_state = "teleriot[active]"
@@ -335,8 +354,7 @@ obj/item/shield/riot/bullet_proof
icon_state = "makeshift_shield"
custom_materials = list(/datum/material/iron = 18000)
slot_flags = null
- block_chance = 35
- max_integrity = 100 //Made of metal welded together its strong but not unkillable
+ max_integrity = 300 //Made of metal welded together its strong but not unkillable
force = 10
throwforce = 7
@@ -346,7 +364,6 @@ obj/item/shield/riot/bullet_proof
armor = list("melee" = 95, "bullet" = 95, "laser" = 75, "energy" = 60, "bomb" = 90, "bio" = 90, "rad" = 0, "fire" = 90, "acid" = 10) //Armor for the item, dosnt transfer to user
item_state = "metal"
icon_state = "metal"
- block_chance = 75 //1/4 shots will hit*
force = 16
slowdown = 2
throwforce = 15 //Massive pice of metal
@@ -357,19 +374,17 @@ obj/item/shield/riot/bullet_proof
/obj/item/shield/riot/tower/swat
name = "swat shield"
desc = "A massive, heavy shield that can block a lot of attacks, can take a lot of abuse before breaking."
- max_integrity = 175
- block_chance = 50
+ max_integrity = 250
/obj/item/shield/riot/implant
name = "telescoping shield implant"
desc = "A compact, arm-mounted telescopic shield. While nigh-indestructible when powered by a host user, it will eventually overload from damage. Recharges while inside its implant."
item_state = "metal"
icon_state = "metal"
- block_chance = 50
slowdown = 1
shield_flags = SHIELD_FLAGS_DEFAULT
- max_integrity = 60
- obj_integrity = 60
+ max_integrity = 100
+ obj_integrity = 100
can_shatter = FALSE
item_flags = SLOWS_WHILE_IN_HAND
var/recharge_timerid
diff --git a/code/game/objects/items/shrapnel.dm b/code/game/objects/items/shrapnel.dm
new file mode 100644
index 0000000000..7108080ecc
--- /dev/null
+++ b/code/game/objects/items/shrapnel.dm
@@ -0,0 +1,64 @@
+/obj/item/shrapnel // frag grenades
+ name = "shrapnel shard"
+ embedding = list(embed_chance=70, ignore_throwspeed_threshold=TRUE, fall_chance=4, embed_chance_turf_mod=-100)
+ custom_materials = list(/datum/material/iron=50)
+ armour_penetration = -20
+ icon = 'icons/obj/shards.dmi'
+ icon_state = "large"
+ w_class = WEIGHT_CLASS_TINY
+ item_flags = DROPDEL
+
+/obj/item/shrapnel/stingball // stingbang grenades
+ name = "stingball"
+ embedding = list(embed_chance=90, fall_chance=3, jostle_chance=7, ignore_throwspeed_threshold=TRUE, pain_stam_pct=0.7, pain_mult=5, jostle_pain_mult=6, rip_time=15, embed_chance_turf_mod=-100)
+ icon_state = "tiny"
+
+/obj/item/shrapnel/bullet // bullets
+ name = "bullet"
+ icon = 'icons/obj/ammo.dmi'
+ icon_state = "s-casing"
+ item_flags = NONE
+
+/obj/item/shrapnel/bullet/c38 // .38 round
+ name = "\improper .38 bullet"
+
+/obj/item/shrapnel/bullet/c38/dumdum // .38 DumDum round
+ name = "\improper .38 DumDum bullet"
+ embedding = list(embed_chance=70, fall_chance=7, jostle_chance=7, ignore_throwspeed_threshold=TRUE, pain_stam_pct=0.4, pain_mult=5, jostle_pain_mult=6, rip_time=10, embed_chance_turf_mod=-100)
+
+/obj/item/projectile/bullet/shrapnel
+ name = "flying shrapnel shard"
+ damage = 9
+ range = 10
+ armour_penetration = -30
+ dismemberment = 5
+ ricochets_max = 2
+ ricochet_chance = 40
+ shrapnel_type = /obj/item/shrapnel
+ ricochet_incidence_leeway = 60
+
+/obj/item/projectile/bullet/shrapnel/mega
+ name = "flying shrapnel hunk"
+ range = 25
+ dismemberment = 10
+ ricochets_max = 4
+ ricochet_chance = 90
+ ricochet_decay_chance = 0.9
+
+/obj/item/projectile/bullet/pellet/stingball
+ name = "stingball pellet"
+ damage = 3
+ stamina = 8
+ ricochets_max = 4
+ ricochet_chance = 66
+ ricochet_decay_chance = 1
+ ricochet_decay_damage = 0.9
+ ricochet_auto_aim_angle = 10
+ ricochet_auto_aim_range = 2
+ ricochet_incidence_leeway = 0
+ shrapnel_type = /obj/item/shrapnel/stingball
+
+/obj/item/projectile/bullet/pellet/stingball/mega
+ name = "megastingball pellet"
+ ricochets_max = 6
+ ricochet_chance = 110
diff --git a/code/game/objects/items/spear.dm b/code/game/objects/items/spear.dm
index f12228df5d..376362d7c3 100644
--- a/code/game/objects/items/spear.dm
+++ b/code/game/objects/items/spear.dm
@@ -10,7 +10,7 @@
slot_flags = ITEM_SLOT_BACK
throwforce = 20
throw_speed = 4
- embedding = list("embedded_impact_pain_multiplier" = 3, "embed_chance" = 90)
+ embedding = list("impact_pain_mult" = 3)
armour_penetration = 10
custom_materials = list(/datum/material/iron=1150, /datum/material/glass=2075)
hitsound = 'sound/weapons/bladeslice.ogg'
@@ -102,6 +102,8 @@
var/obj/item/shard/tip = locate() in parts_list
if (istype(tip, /obj/item/shard/plasma))
throwforce = 21
+ embedding = list(embed_chance = 75, pain_mult = 1.5) //plasmaglass spears are sharper
+ updateEmbedding()
icon_prefix = "spearplasma"
AddComponent(/datum/component/two_handed, force_unwielded=11, force_wielded=19, icon_wielded="[icon_prefix]1")
qdel(tip)
@@ -117,6 +119,8 @@
if(G)
explosive = G
name = "explosive lance"
+ embedding = list(embed_chance = 0, pain_mult = 1)//elances should not be embeddable
+ updateEmbedding()
desc = "A makeshift spear with \a [G] attached to it."
update_icon()
diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm
index 59a993ad96..e6403e83cc 100644
--- a/code/game/objects/items/stacks/medical.dm
+++ b/code/game/objects/items/stacks/medical.dm
@@ -13,18 +13,33 @@
novariants = FALSE
item_flags = NOBLUDGEON
var/self_delay = 50
+ var/other_delay = 0
+ var/repeating = FALSE
/obj/item/stack/medical/attack(mob/living/M, mob/user)
. = ..()
+ try_heal(M, user)
+
+
+/obj/item/stack/medical/proc/try_heal(mob/living/M, mob/user, silent = FALSE)
if(!M.can_inject(user, TRUE))
return
if(M == user)
- user.visible_message("[user] starts to apply \the [src] on [user.p_them()]self...", "You begin applying \the [src] on yourself...")
+ if(!silent)
+ user.visible_message("[user] starts to apply \the [src] on [user.p_them()]self...", "You begin applying \the [src] on yourself...")
if(!do_mob(user, M, self_delay, extra_checks=CALLBACK(M, /mob/living/proc/can_inject, user, TRUE)))
return
+ else if(other_delay)
+ if(!silent)
+ user.visible_message("[user] starts to apply \the [src] on [M].", "You begin applying \the [src] on [M]...")
+ if(!do_mob(user, M, other_delay, extra_checks=CALLBACK(M, /mob/living/proc/can_inject, user, TRUE)))
+ return
+
if(heal(M, user))
log_combat(user, M, "healed", src.name)
use(1)
+ if(repeating && amount > 0)
+ try_heal(M, user, TRUE)
/obj/item/stack/medical/proc/heal(mob/living/M, mob/user)
@@ -96,7 +111,7 @@
var/stop_bleeding = 1800
var/heal_brute = 5
self_delay = 10
- custom_price = 100
+ custom_price = PRICE_REALLY_CHEAP
/obj/item/stack/medical/gauze/heal(mob/living/M, mob/user)
if(ishuman(M))
@@ -174,3 +189,108 @@
/obj/item/stack/medical/ointment/suicide_act(mob/living/user)
user.visible_message("[user] is squeezing \the [src] into [user.p_their()] mouth! [user.p_do(TRUE)]n't [user.p_they()] know that stuff is toxic?")
return TOXLOSS
+
+/obj/item/stack/medical/suture
+ name = "suture"
+ desc = "Sterile sutures used to seal up cuts and lacerations."
+ gender = PLURAL
+ singular_name = "suture"
+ icon_state = "suture"
+ self_delay = 30
+ other_delay = 10
+ amount = 15
+ max_amount = 15
+ repeating = TRUE
+ var/heal_brute = 10
+ grind_results = list(/datum/reagent/medicine/spaceacillin = 2)
+
+/obj/item/stack/medical/suture/one
+ amount = 1
+
+/obj/item/stack/medical/suture/heal(mob/living/M, mob/user)
+ . = ..()
+ if(M.stat == DEAD)
+ to_chat(user, "[M] is dead! You can not help [M.p_them()].")
+ return
+ if(iscarbon(M))
+ return heal_carbon(M, user, heal_brute, 0)
+ if(isanimal(M))
+ var/mob/living/simple_animal/critter = M
+ if (!(critter.healable))
+ to_chat(user, "You cannot use \the [src] on [M]!")
+ return FALSE
+ else if (critter.health == critter.maxHealth)
+ to_chat(user, "[M] is at full health.")
+ return FALSE
+ user.visible_message("[user] applies \the [src] on [M].", "You apply \the [src] on [M].")
+ M.heal_bodypart_damage(heal_brute)
+ return TRUE
+
+ to_chat(user, "You can't heal [M] with the \the [src]!")
+
+/obj/item/stack/medical/mesh
+ name = "regenerative mesh"
+ desc = "A bacteriostatic mesh used to dress burns."
+ gender = PLURAL
+ singular_name = "regenerative mesh"
+ icon_state = "regen_mesh"
+ self_delay = 30
+ other_delay = 10
+ amount = 15
+ max_amount = 15
+ repeating = TRUE
+ var/heal_burn = 10
+ var/is_open = TRUE ///This var determines if the sterile packaging of the mesh has been opened.
+ grind_results = list(/datum/reagent/medicine/spaceacillin = 2)
+
+/obj/item/stack/medical/mesh/one
+ amount = 1
+
+/obj/item/stack/medical/mesh/Initialize()
+ . = ..()
+ if(amount == max_amount) //only seal full mesh packs
+ is_open = FALSE
+ update_icon()
+
+/obj/item/stack/medical/mesh/update_icon_state()
+ if(!is_open)
+ icon_state = "regen_mesh_closed"
+ else
+ return ..()
+
+/obj/item/stack/medical/mesh/heal(mob/living/M, mob/user)
+ . = ..()
+ if(M.stat == DEAD)
+ to_chat(user, "[M] is dead! You can not help [M.p_them()].")
+ return
+ if(iscarbon(M))
+ return heal_carbon(M, user, 0, heal_burn)
+ to_chat(user, "You can't heal [M] with the \the [src]!")
+
+
+/obj/item/stack/medical/mesh/try_heal(mob/living/M, mob/user, silent = FALSE)
+ if(!is_open)
+ to_chat(user, "You need to open [src] first.")
+ return
+ . = ..()
+
+/obj/item/stack/medical/mesh/AltClick(mob/living/user)
+ if(!is_open)
+ to_chat(user, "You need to open [src] first.")
+ return
+ . = ..()
+
+/obj/item/stack/medical/mesh/attack_hand(mob/user)
+ if(!is_open & user.get_inactive_held_item() == src)
+ to_chat(user, "You need to open [src] first.")
+ return
+ . = ..()
+
+/obj/item/stack/medical/mesh/attack_self(mob/user)
+ if(!is_open)
+ is_open = TRUE
+ to_chat(user, "You open the sterile mesh package.")
+ update_icon()
+ playsound(src, 'sound/items/poster_ripped.ogg', 20, TRUE)
+ return
+ . = ..()
diff --git a/code/game/objects/items/stacks/rods.dm b/code/game/objects/items/stacks/rods.dm
index 4c2c21a7db..6fdea26683 100644
--- a/code/game/objects/items/stacks/rods.dm
+++ b/code/game/objects/items/stacks/rods.dm
@@ -21,6 +21,7 @@ GLOBAL_LIST_INIT(rod_recipes, list ( \
max_amount = 50
attack_verb = list("hit", "bludgeoned", "whacked")
hitsound = 'sound/weapons/grenadelaunch.ogg'
+ embedding = list()
novariants = TRUE
/obj/item/stack/rods/suicide_act(mob/living/carbon/user)
diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm
index c34ad44d5c..57af862b69 100644
--- a/code/game/objects/items/stacks/sheets/glass.dm
+++ b/code/game/objects/items/stacks/sheets/glass.dm
@@ -291,6 +291,7 @@ GLOBAL_LIST_INIT(plastitaniumglass_recipes, list(
max_integrity = 40
sharpness = IS_SHARP
var/icon_prefix
+ embedding = list("embed_chance" = 65)
/obj/item/shard/suicide_act(mob/user)
diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm
index 6553cd2f7c..c11b619431 100644
--- a/code/game/objects/items/stacks/sheets/sheet_types.dm
+++ b/code/game/objects/items/stacks/sheets/sheet_types.dm
@@ -242,6 +242,7 @@ GLOBAL_LIST_INIT(wood_recipes, list ( \
null, \
new/datum/stack_recipe("wooden firearm body", /obj/item/weaponcrafting/improvised_parts/wooden_body, 10, time = 40), \
new/datum/stack_recipe("rifle stock", /obj/item/weaponcrafting/stock, 10, time = 40), \
+ new/datum/stack_recipe("pistol grip", /obj/item/weaponcrafting/improvised_parts/wooden_grip, 5, time = 40), \
new/datum/stack_recipe("rolling pin", /obj/item/kitchen/rollingpin, 2, time = 30), \
new/datum/stack_recipe("wooden bucket", /obj/item/reagent_containers/glass/bucket/wood, 2, time = 30), \
new/datum/stack_recipe("wooden buckler", /obj/item/shield/riot/buckler, 20, time = 40), \
@@ -778,6 +779,9 @@ GLOBAL_LIST_INIT(plastic_recipes, list(
/obj/item/stack/sheet/plastic/fifty
amount = 50
+/obj/item/stack/sheet/plastic/twenty
+ amount = 20
+
/obj/item/stack/sheet/plastic/five
amount = 5
diff --git a/code/game/objects/items/stacks/tape.dm b/code/game/objects/items/stacks/tape.dm
new file mode 100644
index 0000000000..177260febb
--- /dev/null
+++ b/code/game/objects/items/stacks/tape.dm
@@ -0,0 +1,61 @@
+
+
+/obj/item/stack/sticky_tape
+ name = "sticky tape"
+ singular_name = "sticky tape"
+ desc = "Used for sticking to things for sticking said things to people."
+ icon = 'icons/obj/tapes.dmi'
+ icon_state = "tape_w"
+ var/prefix = "sticky"
+ item_flags = NOBLUDGEON
+ amount = 5
+ max_amount = 5
+ resistance_flags = FLAMMABLE
+
+ var/list/conferred_embed = EMBED_HARMLESS
+ var/overwrite_existing = FALSE
+
+/obj/item/stack/sticky_tape/afterattack(obj/item/I, mob/living/user)
+ if(!istype(I))
+ return
+
+ if(I.embedding && I.embedding == conferred_embed)
+ to_chat(user, "[I] is already coated in [src]!")
+ return
+
+ user.visible_message("[user] begins wrapping [I] with [src].", "You begin wrapping [I] with [src].")
+
+ if(do_after(user, 30, target=I))
+ I.embedding = conferred_embed
+ I.updateEmbedding()
+ to_chat(user, "You finish wrapping [I] with [src].")
+ use(1)
+ I.name = "[prefix] [I.name]"
+
+ if(istype(I, /obj/item/grenade))
+ var/obj/item/grenade/sticky_bomb = I
+ sticky_bomb.sticky = TRUE
+
+/obj/item/stack/sticky_tape/super
+ name = "super sticky tape"
+ singular_name = "super sticky tape"
+ desc = "Quite possibly the most mischevious substance in the galaxy. Use with extreme lack of caution."
+ icon_state = "tape_y"
+ prefix = "super sticky"
+ conferred_embed = EMBED_HARMLESS_SUPERIOR
+
+/obj/item/stack/sticky_tape/pointy
+ name = "pointy tape"
+ singular_name = "pointy tape"
+ desc = "Used for sticking to things for sticking said things inside people."
+ icon_state = "tape_evil"
+ prefix = "pointy"
+ conferred_embed = EMBED_POINTY
+
+/obj/item/stack/sticky_tape/pointy/super
+ name = "super pointy tape"
+ singular_name = "super pointy tape"
+ desc = "You didn't know tape could look so sinister. Welcome to Space Station 13."
+ icon_state = "tape_spikes"
+ prefix = "super pointy"
+ conferred_embed = EMBED_POINTY_SUPERIOR
\ No newline at end of file
diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm
index ff81b4340a..0635c55ca3 100644
--- a/code/game/objects/items/stacks/tiles/tile_types.dm
+++ b/code/game/objects/items/stacks/tiles/tile_types.dm
@@ -266,6 +266,9 @@
/obj/item/stack/tile/carpet/blackred/twenty
amount = 20
+/obj/item/stack/tile/carpet/blackred/thirty
+ amount = 30
+
/obj/item/stack/tile/carpet/blackred/fifty
amount = 50
@@ -275,6 +278,9 @@
/obj/item/stack/tile/carpet/monochrome/twenty
amount = 20
+/obj/item/stack/tile/carpet/monochrome/thirty
+ amount = 30
+
/obj/item/stack/tile/carpet/monochrome/fifty
amount = 50
@@ -284,6 +290,9 @@
/obj/item/stack/tile/carpet/blue/twenty
amount = 20
+/obj/item/stack/tile/carpet/blue/thirty
+ amount = 30
+
/obj/item/stack/tile/carpet/blue/fifty
amount = 50
@@ -293,6 +302,9 @@
/obj/item/stack/tile/carpet/cyan/twenty
amount = 20
+/obj/item/stack/tile/carpet/cyan/thirty
+ amount = 30
+
/obj/item/stack/tile/carpet/cyan/fifty
amount = 50
@@ -302,6 +314,9 @@
/obj/item/stack/tile/carpet/green/twenty
amount = 20
+/obj/item/stack/tile/carpet/green/thirty
+ amount = 30
+
/obj/item/stack/tile/carpet/green/fifty
amount = 50
@@ -311,6 +326,9 @@
/obj/item/stack/tile/carpet/orange/twenty
amount = 20
+/obj/item/stack/tile/carpet/orange/thirty
+ amount = 30
+
/obj/item/stack/tile/carpet/orange/fifty
amount = 50
@@ -320,6 +338,9 @@
/obj/item/stack/tile/carpet/purple/twenty
amount = 20
+/obj/item/stack/tile/carpet/purple/thirty
+ amount = 30
+
/obj/item/stack/tile/carpet/purple/fifty
amount = 50
@@ -329,6 +350,9 @@
/obj/item/stack/tile/carpet/red/twenty
amount = 20
+/obj/item/stack/tile/carpet/red/thirty
+ amount = 30
+
/obj/item/stack/tile/carpet/red/fifty
amount = 50
@@ -338,6 +362,9 @@
/obj/item/stack/tile/carpet/royalblack/twenty
amount = 20
+/obj/item/stack/tile/carpet/royalblack/thirty
+ amount = 30
+
/obj/item/stack/tile/carpet/royalblack/fifty
amount = 50
@@ -347,6 +374,9 @@
/obj/item/stack/tile/carpet/royalblue/twenty
amount = 20
+/obj/item/stack/tile/carpet/royalblue/thirty
+ amount = 30
+
/obj/item/stack/tile/carpet/royalblue/fifty
amount = 50
diff --git a/code/game/objects/items/storage/bags.dm b/code/game/objects/items/storage/bags.dm
index 5b7eb65d9b..ee515d321f 100644
--- a/code/game/objects/items/storage/bags.dm
+++ b/code/game/objects/items/storage/bags.dm
@@ -382,16 +382,16 @@
icon = 'icons/obj/chemical.dmi'
icon_state = "bag"
desc = "A bag for storing pills, patches, and bottles."
- w_class = WEIGHT_CLASS_TINY
+ slot_flags = ITEM_SLOT_BELT|ITEM_SLOT_POCKET
resistance_flags = FLAMMABLE
/obj/item/storage/bag/chemistry/ComponentInitialize()
. = ..()
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
- STR.max_combined_w_class = 200
- STR.max_items = 50
+ STR.storage_flags = STORAGE_FLAGS_VOLUME_DEFAULT
+ STR.max_volume = STORAGE_VOLUME_CHEMISTRY_BAG
STR.insert_preposition = "in"
- STR.can_hold = typecacheof(list(/obj/item/reagent_containers/pill, /obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/syringe/dart))
+ STR.can_hold = typecacheof(list(/obj/item/reagent_containers/pill, /obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/syringe/dart, /obj/item/reagent_containers/chem_pack))
/*
* Biowaste bag (mostly for xenobiologists)
@@ -402,7 +402,7 @@
icon = 'icons/obj/chemical.dmi'
icon_state = "biobag"
desc = "A bag for the safe transportation and disposal of biowaste and other biological materials."
- w_class = WEIGHT_CLASS_TINY
+ slot_flags = ITEM_SLOT_BELT|ITEM_SLOT_POCKET
resistance_flags = FLAMMABLE
/obj/item/storage/bag/bio/ComponentInitialize()
@@ -427,3 +427,21 @@
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
STR.max_combined_w_class = INFINITY
STR.max_items = 100
+
+/obj/item/storage/bag/ammo
+ name = "ammo pouch"
+ desc = "A pouch for your ammo that goes in your pocket."
+ icon = 'icons/obj/items_and_weapons.dmi'
+ icon_state = "ammopouch"
+ slot_flags = ITEM_SLOT_POCKET
+ w_class = WEIGHT_CLASS_BULKY
+ resistance_flags = FLAMMABLE
+
+/obj/item/storage/bag/ammo/ComponentInitialize()
+ . = ..()
+ var/datum/component/storage/STR = GetComponent(/datum/component/storage)
+ STR.max_w_class = WEIGHT_CLASS_NORMAL
+ STR.max_combined_w_class = 30
+ STR.max_items = 3
+ STR.display_numerical_stacking = FALSE
+ STR.can_hold = typecacheof(list(/obj/item/ammo_box/magazine, /obj/item/ammo_casing))
\ No newline at end of file
diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm
index 2447381d2d..4fa742df46 100755
--- a/code/game/objects/items/storage/belt.dm
+++ b/code/game/objects/items/storage/belt.dm
@@ -180,7 +180,8 @@
/obj/item/implantcase,
/obj/item/implant,
/obj/item/implanter,
- /obj/item/pinpointer/crew
+ /obj/item/pinpointer/crew,
+ /obj/item/reagent_containers/chem_pack
))
/obj/item/storage/belt/medical/surgery_belt_adv
@@ -512,16 +513,16 @@
new /obj/item/grenade/smokebomb(src)
new /obj/item/grenade/empgrenade(src)
new /obj/item/grenade/empgrenade(src)
- new /obj/item/grenade/syndieminibomb/concussion/frag(src)
- new /obj/item/grenade/syndieminibomb/concussion/frag(src)
- new /obj/item/grenade/syndieminibomb/concussion/frag(src)
- new /obj/item/grenade/syndieminibomb/concussion/frag(src)
- new /obj/item/grenade/syndieminibomb/concussion/frag(src)
- new /obj/item/grenade/syndieminibomb/concussion/frag(src)
- new /obj/item/grenade/syndieminibomb/concussion/frag(src)
- new /obj/item/grenade/syndieminibomb/concussion/frag(src)
- new /obj/item/grenade/syndieminibomb/concussion/frag(src)
- new /obj/item/grenade/syndieminibomb/concussion/frag(src)
+ new /obj/item/grenade/frag(src)
+ new /obj/item/grenade/frag(src)
+ new /obj/item/grenade/frag(src)
+ new /obj/item/grenade/frag(src)
+ new /obj/item/grenade/frag(src)
+ new /obj/item/grenade/frag(src)
+ new /obj/item/grenade/frag(src)
+ new /obj/item/grenade/frag(src)
+ new /obj/item/grenade/frag(src)
+ new /obj/item/grenade/frag(src)
new /obj/item/grenade/gluon(src)
new /obj/item/grenade/gluon(src)
new /obj/item/grenade/gluon(src)
@@ -713,7 +714,7 @@
icon_state = "fannypack_leather"
item_state = "fannypack_leather"
dying_key = DYE_REGISTRY_FANNYPACK
- custom_price = 100
+ custom_price = PRICE_ALMOST_CHEAP
/obj/item/storage/belt/fannypack/ComponentInitialize()
. = ..()
diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm
index c5b48164a0..cdd3781748 100644
--- a/code/game/objects/items/storage/boxes.dm
+++ b/code/game/objects/items/storage/boxes.dm
@@ -275,6 +275,16 @@
for(var/i in 1 to 7)
new /obj/item/grenade/flashbang(src)
+obj/item/storage/box/stingbangs
+ name = "box of stingbangs (WARNING)"
+ desc = "WARNING: These devices are extremely dangerous and can cause severe injuries or death in repeated use."
+ icon_state = "secbox"
+ illustration = "flashbang"
+
+/obj/item/storage/box/stingbangs/PopulateContents()
+ for(var/i in 1 to 5)
+ new /obj/item/grenade/stingbang(src)
+
/obj/item/storage/box/flashes
name = "box of flashbulbs"
desc = "WARNING: Flashes can cause serious eye damage, protective eyewear is required."
@@ -434,6 +444,7 @@
desc = "Instructions: Heat in microwave. Product will cool if not eaten within seven minutes."
icon_state = "donkpocketbox"
illustration=null
+ custom_premium_price = PRICE_ABOVE_NORMAL // git gud
/obj/item/storage/box/donkpockets/ComponentInitialize()
. = ..()
@@ -622,7 +633,7 @@
item_state = "zippo"
w_class = WEIGHT_CLASS_TINY
slot_flags = ITEM_SLOT_BELT
- custom_price = 20
+ custom_price = PRICE_REALLY_CHEAP
/obj/item/storage/box/matches/ComponentInitialize()
. = ..()
@@ -744,8 +755,8 @@
//////
/obj/item/storage/box/hug/medical/PopulateContents()
- new /obj/item/stack/medical/bruise_pack(src)
- new /obj/item/stack/medical/ointment(src)
+ new /obj/item/stack/medical/suture(src)
+ new /obj/item/stack/medical/mesh(src)
new /obj/item/reagent_containers/hypospray/medipen(src)
// Clown survival box
@@ -1343,6 +1354,7 @@
name = "box of marshmallows"
desc = "A box of marshmallows."
illustration = "marshmallow"
+ custom_premium_price = PRICE_BELOW_NORMAL
/obj/item/storage/box/marshmallow/PopulateContents()
for (var/i in 1 to 5)
diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm
index 685a3b59f6..821fd52bd1 100644
--- a/code/game/objects/items/storage/fancy.dm
+++ b/code/game/objects/items/storage/fancy.dm
@@ -70,6 +70,7 @@
name = "donut box"
spawn_type = /obj/item/reagent_containers/food/snacks/donut
fancy_open = TRUE
+ custom_price = PRICE_NORMAL
/obj/item/storage/fancy/donut_box/ComponentInitialize()
. = ..()
@@ -136,7 +137,23 @@
slot_flags = ITEM_SLOT_BELT
icon_type = "cigarette"
spawn_type = /obj/item/clothing/mask/cigarette/space_cigarette
- custom_price = 75
+ custom_price = PRICE_ALMOST_CHEAP
+ var/spawn_coupon = TRUE
+
+/obj/item/storage/fancy/cigarettes/attack_self(mob/user)
+ if(contents.len == 0 && spawn_coupon)
+ to_chat(user, "You rip the back off \the [src] and get a coupon!")
+ var/obj/item/coupon/attached_coupon = new
+ user.put_in_hands(attached_coupon)
+ attached_coupon.generate()
+ attached_coupon = null
+ spawn_coupon = FALSE
+ name = "discarded cigarette packet"
+ desc = "An old cigarette packet with the back torn off, worth less than nothing now."
+ var/datum/component/storage/STR = GetComponent(/datum/component/storage)
+ STR.max_items = 0
+ return
+ return ..()
/obj/item/storage/fancy/cigarettes/ComponentInitialize()
. = ..()
@@ -147,6 +164,8 @@
/obj/item/storage/fancy/cigarettes/examine(mob/user)
. = ..()
. += "Alt-click to extract contents."
+ if(spawn_coupon)
+ . += "There's a coupon on the back of the pack! You can tear it off once it's empty."
/obj/item/storage/fancy/cigarettes/AltClick(mob/living/carbon/user)
if(!istype(user) || !user.canUseTopic(src, BE_CLOSE, ismonkey(user)))
@@ -278,7 +297,7 @@
///The value in here has NOTHING to do with icons. It needs to be this for the proper examine.
icon_type = "rolling paper"
spawn_type = /obj/item/rollingpaper
- custom_price = 25
+ custom_price = PRICE_REALLY_CHEAP
/obj/item/storage/fancy/rollingpapers/ComponentInitialize()
. = ..()
@@ -307,6 +326,7 @@
w_class = WEIGHT_CLASS_NORMAL
icon_type = "premium cigar"
spawn_type = /obj/item/clothing/mask/cigarette/cigar
+ spawn_coupon = FALSE
/obj/item/storage/fancy/cigarettes/cigars/ComponentInitialize()
. = ..()
diff --git a/code/game/objects/items/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm
index 092648ee3c..37b6baaa0b 100644
--- a/code/game/objects/items/storage/firstaid.dm
+++ b/code/game/objects/items/storage/firstaid.dm
@@ -37,10 +37,10 @@
if(empty)
return
new /obj/item/stack/medical/gauze(src)
- new /obj/item/stack/medical/bruise_pack(src)
- new /obj/item/stack/medical/bruise_pack(src)
- new /obj/item/stack/medical/ointment(src)
- new /obj/item/stack/medical/ointment(src)
+ new /obj/item/stack/medical/suture(src)
+ new /obj/item/stack/medical/suture(src)
+ new /obj/item/stack/medical/mesh(src)
+ new /obj/item/stack/medical/mesh(src)
new /obj/item/reagent_containers/hypospray/medipen(src)
new /obj/item/healthanalyzer(src)
@@ -52,12 +52,12 @@
if(empty)
return
new /obj/item/stack/medical/gauze(src)
- new /obj/item/stack/medical/bruise_pack(src)
- new /obj/item/stack/medical/bruise_pack(src)
- new /obj/item/stack/medical/bruise_pack(src)
- new /obj/item/stack/medical/ointment(src)
- new /obj/item/stack/medical/ointment(src)
- new /obj/item/stack/medical/ointment(src)
+ new /obj/item/stack/medical/suture(src)
+ new /obj/item/stack/medical/suture(src)
+ new /obj/item/stack/medical/suture(src)
+ new /obj/item/stack/medical/mesh(src)
+ new /obj/item/stack/medical/mesh(src)
+ new /obj/item/stack/medical/mesh(src)
/obj/item/storage/firstaid/fire
name = "burn treatment kit"
@@ -224,7 +224,7 @@
. = ..()
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
STR.storage_flags = STORAGE_FLAGS_VOLUME_DEFAULT
- STR.max_volume = 14
+ STR.max_volume = STORAGE_VOLUME_PILL_BOTTLE
STR.allow_quick_gather = TRUE
STR.click_gather = TRUE
STR.can_hold = typecacheof(list(/obj/item/reagent_containers/pill, /obj/item/dice))
@@ -418,7 +418,8 @@
/obj/item/circuitboard/computer/crew,
/obj/item/stack/sheet/glass,
/obj/item/stack/sheet/mineral/silver,
- /obj/item/organ_storage
+ /obj/item/organ_storage,
+ /obj/item/reagent_containers/chem_pack
))
//hijacking the minature first aids for hypospray boxes. <3
@@ -432,8 +433,8 @@
throw_range = 7
var/empty = FALSE
item_state = "firstaid"
- custom_price = 300
- custom_premium_price = 500
+ custom_price = PRICE_ABOVE_NORMAL
+ custom_premium_price = PRICE_EXPENSIVE
/obj/item/storage/hypospraykit/ComponentInitialize()
. = ..()
diff --git a/code/game/objects/items/storage/lockbox.dm b/code/game/objects/items/storage/lockbox.dm
index 5b6089d430..ce4e8b9df1 100644
--- a/code/game/objects/items/storage/lockbox.dm
+++ b/code/game/objects/items/storage/lockbox.dm
@@ -188,19 +188,52 @@
new /obj/item/clothing/accessory/medal/plasma/nobel_science(src)
/obj/item/storage/lockbox/medal/engineering
- name = "engineering medal box"
- desc = "A locked box used to store medals to be given to the members of the engineering department."
- req_access = list(ACCESS_CE)
+ name = "engineering medal box"
+ desc = "A locked box used to store medals to be given to the members of the engineering department."
+ req_access = list(ACCESS_CE)
/obj/item/storage/lockbox/medal/engineering/PopulateContents()
- for(var/i in 1 to 3)
- new /obj/item/clothing/accessory/medal/engineer(src)
+ for(var/i in 1 to 3)
+ new /obj/item/clothing/accessory/medal/engineer(src)
/obj/item/storage/lockbox/medal/medical
- name = "medical medal box"
- desc = "A locked box used to store medals to be given to the members of the medical department."
- req_access = list(ACCESS_CMO)
+ name = "medical medal box"
+ desc = "A locked box used to store medals to be given to the members of the medical department."
+ req_access = list(ACCESS_CMO)
/obj/item/storage/lockbox/medal/medical/PopulateContents()
- for(var/i in 1 to 3)
- new /obj/item/clothing/accessory/medal/ribbon/medical_doctor(src)
\ No newline at end of file
+ for(var/i in 1 to 3)
+ new /obj/item/clothing/accessory/medal/ribbon/medical_doctor(src)
+
+/obj/item/storage/lockbox/order
+ name = "order lockbox"
+ desc = "A box used to secure small cargo orders from being looted by those who didn't order it. Yeah, cargo tech, that means you."
+ icon = 'icons/obj/storage.dmi'
+ icon_state = "secure"
+ item_state = "sec-case"
+ lefthand_file = 'icons/mob/inhands/equipment/briefcase_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/equipment/briefcase_righthand.dmi'
+ w_class = WEIGHT_CLASS_HUGE
+ var/datum/bank_account/buyer_account
+ var/privacy_lock = TRUE
+
+/obj/item/storage/lockbox/order/Initialize(datum/bank_account/_buyer_account)
+ . = ..()
+ buyer_account = _buyer_account
+
+/obj/item/storage/lockbox/order/attackby(obj/item/W, mob/user, params)
+ if(!istype(W, /obj/item/card/id))
+ return ..()
+
+ var/obj/item/card/id/id_card = W
+ if(iscarbon(user))
+ add_fingerprint(user)
+
+ if(id_card.registered_account != buyer_account)
+ to_chat(user, "Bank account does not match with buyer![user] [privacy_lock ? "" : "un"]locks [src]'s privacy lock.",
+ "You [privacy_lock ? "" : "un"]lock [src]'s privacy lock.")
diff --git a/code/game/objects/items/storage/secure.dm b/code/game/objects/items/storage/secure.dm
index 1caf13454b..0e9a9fda61 100644
--- a/code/game/objects/items/storage/secure.dm
+++ b/code/game/objects/items/storage/secure.dm
@@ -174,7 +174,7 @@
name = "\improper X-01 Multiphase energy gun box"
desc = "A storage case for a high-tech energy firearm."
-/obj/item/storage/secure/briefcase/mws_pack_hos/PopulateContents()
+/obj/item/storage/secure/briefcase/hos/multiphase_box/PopulateContents()
new /obj/item/gun/energy/e_gun/hos(src)
// -----------------------------
@@ -212,4 +212,4 @@
return attack_self(user)
/obj/item/storage/secure/safe/HoS
- name = "head of security's safe"
\ No newline at end of file
+ name = "head of security's safe"
diff --git a/code/game/objects/items/stunbaton.dm b/code/game/objects/items/stunbaton.dm
index e9364bcede..fa0c9ba693 100644
--- a/code/game/objects/items/stunbaton.dm
+++ b/code/game/objects/items/stunbaton.dm
@@ -141,7 +141,7 @@
/obj/item/melee/baton/attack(mob/M, mob/living/carbon/human/user)
var/interrupt = common_baton_melee(M, user, FALSE)
if(!interrupt)
- ..()
+ return ..()
/obj/item/melee/baton/alt_pre_attack(atom/A, mob/living/user, params)
. = common_baton_melee(A, user, TRUE) //return true (attackchain interrupt) if this also returns true. no harm-disarming.
@@ -154,7 +154,7 @@
if(turned_on && HAS_TRAIT(user, TRAIT_CLUMSY) && prob(50))
clowning_around(user)
if(IS_STAMCRIT(user)) //CIT CHANGE - makes it impossible to baton in stamina softcrit
- to_chat(user, "You're too exhausted for that.")
+ to_chat(user, "You're too exhausted to use [src] properly.")
return TRUE
if(ishuman(M))
var/mob/living/carbon/human/L = M
@@ -170,10 +170,12 @@
return disarming || (user.a_intent != INTENT_HARM)
/obj/item/melee/baton/proc/baton_stun(mob/living/L, mob/user, disarming = FALSE)
- if(L.mob_run_block(src, 0, "[user]'s [name]", ATTACK_TYPE_MELEE, 0, user, null, null) & BLOCK_SUCCESS) //No message; check_shields() handles that
+ var/list/return_list = list()
+ if(L.mob_run_block(src, 0, "[user]'s [name]", ATTACK_TYPE_MELEE, 0, user, null, return_list) & BLOCK_SUCCESS) //No message; check_shields() handles that
playsound(L, 'sound/weapons/genhit.ogg', 50, 1)
return FALSE
var/stunpwr = stamforce
+ stunpwr = block_calculate_resultant_damage(stunpwr, return_list)
var/obj/item/stock_parts/cell/our_cell = get_cell()
if(!our_cell)
switch_status(FALSE)
diff --git a/code/game/objects/items/tanks/tank_types.dm b/code/game/objects/items/tanks/tank_types.dm
index 8f5303da8e..b4c8d8adf0 100644
--- a/code/game/objects/items/tanks/tank_types.dm
+++ b/code/game/objects/items/tanks/tank_types.dm
@@ -93,11 +93,13 @@
F.update_icon()
else
return ..()
+//Makes empty oxygen tanks spawn without gas
+/obj/item/tank/internals/plasma/empty/populate_gas()
+ return
/obj/item/tank/internals/plasma/full/populate_gas()
air_contents.gases[/datum/gas/plasma] = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
-
/*
* Plasmaman Plasma Tank
*/
@@ -130,6 +132,7 @@
air_contents.gases[/datum/gas/plasma] = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
return
+//makes empty plasma tanks spawn without gas.
/obj/item/tank/internals/plasmaman/belt/empty/populate_gas()
return
diff --git a/code/game/objects/items/tanks/tanks.dm b/code/game/objects/items/tanks/tanks.dm
index 95712f386a..00fbc41516 100644
--- a/code/game/objects/items/tanks/tanks.dm
+++ b/code/game/objects/items/tanks/tanks.dm
@@ -153,6 +153,10 @@
return (BRUTELOSS)
+/obj/item/tank/attack_ghost(mob/dead/observer/O)
+ . = ..()
+ atmosanalyzer_scan(air_contents, O, src, FALSE)
+
/obj/item/tank/attackby(obj/item/W, mob/user, params)
add_fingerprint(user)
if(istype(W, /obj/item/assembly_holder))
diff --git a/code/game/objects/items/tanks/watertank.dm b/code/game/objects/items/tanks/watertank.dm
index de5f332f43..b1c0d3dfbb 100644
--- a/code/game/objects/items/tanks/watertank.dm
+++ b/code/game/objects/items/tanks/watertank.dm
@@ -145,7 +145,7 @@
desc = "A janitorial watertank backpack with nozzle to clean dirt and graffiti."
icon_state = "waterbackpackjani"
item_state = "waterbackpackjani"
- custom_price = 1000
+ custom_price = PRICE_ALMOST_ONE_GRAND
/obj/item/watertank/janitor/Initialize()
. = ..()
diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
index e545d74e12..8fb656cc11 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -444,6 +444,7 @@
throwforce = 0
throw_speed = 3
throw_range = 5
+ block_parry_data = null
attack_verb = list("attacked", "struck", "hit")
total_mass_on = TOTAL_MASS_TOY_SWORD
sharpness = IS_BLUNT
@@ -840,11 +841,11 @@
/obj/item/toy/cards/deck/update_icon_state()
switch(cards.len)
- if(INFINITY to original_size/2)
+ if(original_size*0.5 to INFINITY)
icon_state = "deck_[deckstyle]_full"
- if(original_size/2 to original_size/4)
+ if(original_size*0.25 to original_size*0.5)
icon_state = "deck_[deckstyle]_half"
- if(original_size/4 to 1)
+ if(1 to original_size*0.25)
icon_state = "deck_[deckstyle]_low"
else
icon_state = "deck_[deckstyle]_empty"
diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm
index 3a74b644ff..7524bb93e1 100644
--- a/code/game/objects/items/weaponry.dm
+++ b/code/game/objects/items/weaponry.dm
@@ -122,11 +122,13 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
/obj/item/claymore/highlander/pickup(mob/living/user)
+ . = ..()
to_chat(user, "The power of Scotland protects you! You are shielded from all stuns and knockdowns.")
user.add_stun_absorption("highlander", INFINITY, 1, " is protected by the power of Scotland!", "The power of Scotland absorbs the stun!", " is protected by the power of Scotland!")
user.ignore_slowdown(HIGHLANDER)
/obj/item/claymore/highlander/dropped(mob/living/user)
+ . = ..()
user.unignore_slowdown(HIGHLANDER)
if(!QDELETED(src))
qdel(src) //If this ever happens, it's because you lost an arm
@@ -297,12 +299,28 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
force = 2
throwforce = 20 //This is never used on mobs since this has a 100% embed chance.
throw_speed = 4
- embedding = list("embedded_pain_multiplier" = 4, "embed_chance" = 100, "embedded_fall_chance" = 0)
+ embedding = list("pain_mult" = 4, "embed_chance" = 100, "fall_chance" = 0, "embed_chance_turf_mod" = 15)
+ armour_penetration = 40
+
w_class = WEIGHT_CLASS_SMALL
sharpness = IS_SHARP
custom_materials = list(/datum/material/iron=500, /datum/material/glass=500)
resistance_flags = FIRE_PROOF
+/obj/item/throwing_star/stamina
+ name = "shock throwing star"
+ desc = "An aerodynamic disc designed to cause excruciating pain when stuck inside fleeing targets, hopefully without causing fatal harm."
+ throwforce = 5
+ embedding = list("pain_chance" = 5, "embed_chance" = 100, "fall_chance" = 0, "jostle_chance" = 10, "pain_stam_pct" = 0.8, "jostle_pain_mult" = 3)
+
+/obj/item/throwing_star/toy
+ name = "toy throwing star"
+ desc = "An aerodynamic disc strapped with adhesive for sticking to people, good for playing pranks and getting yourself killed by security."
+ sharpness = IS_BLUNT
+ force = 0
+ throwforce = 0
+ embedding = list("pain_mult" = 0, "jostle_pain_mult" = 0, "embed_chance" = 100, "fall_chance" = 0)
+
/obj/item/switchblade
name = "switchblade"
icon_state = "switchblade"
@@ -675,7 +693,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
to_chat(user, "You easily land a critical blow on the [target].")
if(istype(target, /mob/living/))
var/mob/living/bug = target
- bug.adjustBruteLoss(-35) //What kinda mad man would go into melee with a spider?!
+ bug.adjustBruteLoss(35) //What kinda mad man would go into melee with a spider?!
else
qdel(target)
diff --git a/code/game/objects/obj_defense.dm b/code/game/objects/obj_defense.dm
index e64b7d8f8d..54ac2a5559 100644
--- a/code/game/objects/obj_defense.dm
+++ b/code/game/objects/obj_defense.dm
@@ -74,7 +74,8 @@
/obj/bullet_act(obj/item/projectile/P)
. = ..()
playsound(src, P.hitsound, 50, 1)
- visible_message("[src] is hit by \a [P]!", null, null, COMBAT_MESSAGE_RANGE)
+ if(P.suppressed != SUPPRESSED_VERY)
+ visible_message("[src] is hit by \a [P]!", null, null, COMBAT_MESSAGE_RANGE)
if(!QDELETED(src)) //Bullet on_hit effect might have already destroyed this object
take_damage(P.damage, P.damage_type, P.flag, 0, turn(P.dir, 180), P.armour_penetration)
diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm
index 0b2fe5ac2a..ba3eba9bd3 100644
--- a/code/game/objects/objs.dm
+++ b/code/game/objects/objs.dm
@@ -323,3 +323,8 @@
/obj/proc/rnd_crafted(obj/machinery/rnd/production/P)
return
+
+/obj/handle_ricochet(obj/item/projectile/P)
+ . = ..()
+ if(. && ricochet_damage_mod)
+ take_damage(P.damage * ricochet_damage_mod, P.damage_type, P.flag, 0, turn(P.dir, 180), P.armour_penetration) // pass along ricochet_damage_mod damage to the structure for the ricochet
diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm
index e185defc0a..d30f617919 100644
--- a/code/game/objects/structures.dm
+++ b/code/game/objects/structures.dm
@@ -9,6 +9,8 @@
var/mob/living/structureclimber
var/broken = 0 //similar to machinery's stat BROKEN
layer = BELOW_OBJ_LAYER
+ flags_ricochet = RICOCHET_HARD
+ ricochet_chance_mod = 0.5
/obj/structure/Initialize()
if (!armor)
diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm
index bd6dcb2aff..a4ee2f16e2 100644
--- a/code/game/objects/structures/bedsheet_bin.dm
+++ b/code/game/objects/structures/bedsheet_bin.dm
@@ -41,7 +41,7 @@ LINEN BINS
return
/obj/item/bedsheet/attackby(obj/item/I, mob/user, params)
- if(istype(I, /obj/item/wirecutters) || I.get_sharpness())
+ if(!(flags_1 & HOLOGRAM_1) && (istype(I, /obj/item/wirecutters) || I.get_sharpness()))
var/obj/item/stack/sheet/cloth/C = new (get_turf(src), 3)
transfer_fingerprints_to(C)
C.add_fingerprint(user)
@@ -369,4 +369,4 @@ LINEN BINS
/obj/structure/bedsheetbin/color
sheet_types = list(/obj/item/bedsheet, /obj/item/bedsheet/blue, /obj/item/bedsheet/green, /obj/item/bedsheet/orange, \
/obj/item/bedsheet/purple, /obj/item/bedsheet/red, /obj/item/bedsheet/yellow, /obj/item/bedsheet/brown, \
- /obj/item/bedsheet/black)
\ No newline at end of file
+ /obj/item/bedsheet/black)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm
index 14d32cd4fe..beb14ff48c 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm
@@ -51,7 +51,6 @@
new /obj/item/storage/backpack/satchel/leather/withwallet( src )
new /obj/item/instrument/piano_synth(src)
new /obj/item/radio/headset( src )
- new /obj/item/clothing/head/colour(src)
/obj/structure/closet/secure_closet/personal/attackby(obj/item/W, mob/user, params)
var/obj/item/card/id/I = W.GetID()
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
index 57520f6f40..0c314d988c 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
@@ -6,8 +6,16 @@
max_integrity = 250
armor = list("melee" = 30, "bullet" = 50, "laser" = 50, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 80)
secure = TRUE
+ var/melee_min_damage = 20
/obj/structure/closet/secure_closet/run_obj_armor(damage_amount, damage_type, damage_flag = 0, attack_dir)
- if(damage_flag == "melee" && damage_amount < 20)
+ if(damage_flag == "melee" && damage_amount < melee_min_damage)
return 0
- . = ..()
\ No newline at end of file
+ . = ..()
+
+// Exists to work around the minimum 700 cr price for goodies / small items
+/obj/structure/closet/secure_closet/goodies
+ icon_state = "goodies"
+ desc = "A sturdier card-locked storage unit used for bulky shipments."
+ max_integrity = 500 // Same as crates.
+ melee_min_damage = 25 // Idem.
diff --git a/code/game/objects/structures/fugitive_role_spawners.dm b/code/game/objects/structures/fugitive_role_spawners.dm
new file mode 100644
index 0000000000..afdff7afec
--- /dev/null
+++ b/code/game/objects/structures/fugitive_role_spawners.dm
@@ -0,0 +1,66 @@
+
+
+/obj/effect/mob_spawn/human/fugitive
+ assignedrole = "Fugitive Hunter"
+ flavour_text = "" //the flavor text will be the backstory argument called on the antagonist's greet, see hunter.dm for details
+ roundstart = FALSE
+ death = FALSE
+ random = TRUE
+ show_flavour = FALSE
+ density = TRUE
+ var/back_story = "error"
+
+/obj/effect/mob_spawn/human/fugitive/Initialize(mapload)
+ . = ..()
+ notify_ghosts("Hunters are waking up looking for refugees!", source = src, action=NOTIFY_ATTACK, flashwindow = FALSE, ignore_key = POLL_IGNORE_FUGITIVE)
+
+/obj/effect/mob_spawn/human/fugitive/special(mob/living/new_spawn)
+ var/datum/antagonist/fugitive_hunter/fughunter = new
+ fughunter.backstory = back_story
+ new_spawn.mind.add_antag_datum(fughunter)
+ fughunter.greet()
+ message_admins("[ADMIN_LOOKUPFLW(new_spawn)] has been made into a Fugitive Hunter by an event.")
+ log_game("[key_name(new_spawn)] was spawned as a Fugitive Hunter by an event.")
+
+/obj/effect/mob_spawn/human/fugitive/spacepol
+ name = "police pod"
+ desc = "A small sleeper typically used to put people to sleep for briefing on the mission."
+ mob_name = "a spacepol officer"
+ flavour_text = "Justice has arrived. I am a member of the Spacepol!"
+ back_story = "space cop"
+ outfit = /datum/outfit/spacepol
+ icon = 'icons/obj/machines/sleeper.dmi'
+ icon_state = "sleeper"
+
+/obj/effect/mob_spawn/human/fugitive/russian
+ name = "russian pod"
+ flavour_text = "Ay blyat. I am a space-russian smuggler! We were mid-flight when our cargo was beamed off our ship!"
+ back_story = "russian"
+ desc = "A small sleeper typically used to make long distance travel a bit more bearable."
+ mob_name = "russian"
+ outfit = /datum/outfit/russiancorpse/hunter
+ icon = 'icons/obj/machines/sleeper.dmi'
+ icon_state = "sleeper"
+
+/obj/effect/mob_spawn/human/fugitive/bounty
+ name = "bounty hunter pod"
+ flavour_text = "We got a new bounty on some fugitives, dead or alive."
+ back_story = "bounty hunters"
+ desc = "A small sleeper typically used to make long distance travel a bit more bearable."
+ mob_name = "bounty hunter"
+ icon = 'icons/obj/machines/sleeper.dmi'
+ icon_state = "sleeper"
+
+/obj/effect/mob_spawn/human/fugitive/bounty/Destroy()
+ var/obj/structure/fluff/empty_sleeper/S = new(drop_location())
+ S.setDir(dir)
+ return ..()
+
+/obj/effect/mob_spawn/human/fugitive/bounty/armor
+ outfit = /datum/outfit/bountyarmor
+
+/obj/effect/mob_spawn/human/fugitive/bounty/hook
+ outfit = /datum/outfit/bountyhook
+
+/obj/effect/mob_spawn/human/fugitive/bounty/synth
+ outfit = /datum/outfit/bountysynth
diff --git a/code/game/objects/structures/ghost_role_spawners.dm b/code/game/objects/structures/ghost_role_spawners.dm
index 86aff44e02..4455c8820d 100644
--- a/code/game/objects/structures/ghost_role_spawners.dm
+++ b/code/game/objects/structures/ghost_role_spawners.dm
@@ -581,7 +581,7 @@
uniform = /obj/item/clothing/under/rank/rnd/scientist
shoes = /obj/item/clothing/shoes/laceup
id = /obj/item/card/id/away/old/sci
- l_pocket = /obj/item/stack/medical/bruise_pack
+ l_pocket = /obj/item/stack/medical/suture
assignedrole = "Ancient Crew"
job_description = "Oldstation Crew"
@@ -694,15 +694,12 @@
..()
var/suited = !preference_source || preference_source.prefs.jumpsuit_style == PREF_SUIT
if (CONFIG_GET(flag/grey_assistants))
- if(suited)
- uniform = /obj/item/clothing/under/color/grey
- else
- uniform = /obj/item/clothing/under/color/jumpskirt/grey
+ uniform = suited ? /obj/item/clothing/under/color/grey : /obj/item/clothing/under/color/jumpskirt/grey
else
- if(suited)
- uniform = /obj/item/clothing/under/color/random
+ if(SSevents.holidays && SSevents.holidays[PRIDE_MONTH])
+ uniform = suited ? /obj/item/clothing/under/color/rainbow : /obj/item/clothing/under/color/jumpskirt/rainbow
else
- uniform = /obj/item/clothing/under/color/jumpskirt/random
+ uniform = suited ? /obj/item/clothing/under/color/random : /obj/item/clothing/under/color/jumpskirt/random
/obj/item/storage/box/syndie_kit/chameleon/ghostcafe
name = "ghost cafe costuming kit"
diff --git a/code/game/objects/structures/petrified_statue.dm b/code/game/objects/structures/petrified_statue.dm
index a8a5a577c2..97eadff5f6 100644
--- a/code/game/objects/structures/petrified_statue.dm
+++ b/code/game/objects/structures/petrified_statue.dm
@@ -4,11 +4,13 @@
icon_state = "human_male"
density = TRUE
anchored = TRUE
+ flags_1 = PREVENT_CONTENTS_EXPLOSION_1
max_integrity = 200
- var/timer = 240 //eventually the person will be freed
+ var/timer = 8 MINUTES //eventually the person will be freed
var/mob/living/petrified_mob
-/obj/structure/statue/petrified/New(loc, mob/living/L, statue_timer)
+/obj/structure/statue/petrified/Initialize(mapload, mob/living/L, statue_timer)
+ . = ..()
if(statue_timer)
timer = statue_timer
if(L)
@@ -17,25 +19,18 @@
L.buckled.unbuckle_mob(L,force=1)
L.visible_message("[L]'s skin rapidly turns to marble!", "Your body freezes up! Can't... move... can't... think...")
L.forceMove(src)
- ADD_TRAIT(L, TRAIT_MUTE, STATUE_MUTE)
+ ADD_TRAIT(L, TRAIT_MUTE, STATUE_TRAIT)
+ ADD_TRAIT(L, TRAIT_EMOTEMUTE, STATUE_TRAIT)
+ ADD_TRAIT(L, TRAIT_LOOC_MUTE, STATUE_TRAIT)
+ ADD_TRAIT(L, TRAIT_AOOC_MUTE, STATUE_TRAIT)
+ ADD_TRAIT(L, TRAIT_MOBILITY_NOMOVE, STATUE_TRAIT)
+ ADD_TRAIT(L, TRAIT_MOBILITY_NOPICKUP, STATUE_TRAIT)
+ ADD_TRAIT(L, TRAIT_MOBILITY_NOUSE, STATUE_TRAIT)
L.faction += "mimic" //Stops mimics from instaqdeling people in statues
L.status_flags |= GODMODE
obj_integrity = L.health + 100 //stoning damaged mobs will result in easier to shatter statues
max_integrity = obj_integrity
- START_PROCESSING(SSobj, src)
- ..()
-
-/obj/structure/statue/petrified/process()
- if(!petrified_mob)
- STOP_PROCESSING(SSobj, src)
- timer--
- petrified_mob.Stun(40) //So they can't do anything while petrified
- if(timer <= 0)
- STOP_PROCESSING(SSobj, src)
- qdel(src)
-
-/obj/structure/statue/petrified/contents_explosion(severity, target)
- return
+ QDEL_IN(src, timer)
/obj/structure/statue/petrified/handle_atom_del(atom/A)
if(A == petrified_mob)
@@ -59,7 +54,13 @@
if(petrified_mob)
petrified_mob.status_flags &= ~GODMODE
petrified_mob.forceMove(loc)
- REMOVE_TRAIT(petrified_mob, TRAIT_MUTE, STATUE_MUTE)
+ REMOVE_TRAIT(petrified_mob, TRAIT_MUTE, STATUE_TRAIT)
+ REMOVE_TRAIT(petrified_mob, TRAIT_EMOTEMUTE, STATUE_TRAIT)
+ REMOVE_TRAIT(petrified_mob, TRAIT_LOOC_MUTE, STATUE_TRAIT)
+ REMOVE_TRAIT(petrified_mob, TRAIT_AOOC_MUTE, STATUE_TRAIT)
+ REMOVE_TRAIT(petrified_mob, TRAIT_MOBILITY_NOMOVE, STATUE_TRAIT)
+ REMOVE_TRAIT(petrified_mob, TRAIT_MOBILITY_NOPICKUP, STATUE_TRAIT)
+ REMOVE_TRAIT(petrified_mob, TRAIT_MOBILITY_NOUSE, STATUE_TRAIT)
petrified_mob.take_overall_damage((petrified_mob.health - obj_integrity + 100)) //any new damage the statue incurred is transfered to the mob
petrified_mob.faction -= "mimic"
petrified_mob = null
diff --git a/code/game/objects/structures/traps.dm b/code/game/objects/structures/traps.dm
index 8044bb9bb7..4c8379d14f 100644
--- a/code/game/objects/structures/traps.dm
+++ b/code/game/objects/structures/traps.dm
@@ -80,10 +80,11 @@
name = "shock trap"
desc = "A trap that will shock and render you immobile. You'd better avoid it."
icon_state = "trap-shock"
+ var/stun_time = 100
/obj/structure/trap/stun/trap_effect(mob/living/L)
L.electrocute_act(30, src, flags = SHOCK_NOGLOVES) // electrocute act does a message.
- L.DefaultCombatKnockdown(100)
+ L.Paralyze(stun_time)
/obj/structure/trap/fire
name = "flame trap"
@@ -151,3 +152,75 @@
new /mob/living/simple_animal/hostile/construct/proteon/hostile(loc)
new /mob/living/simple_animal/hostile/construct/proteon/hostile(loc)
QDEL_IN(src, 30)
+
+//fugitive traps
+/obj/structure/trap/stun/hunter
+ name = "bounty trap"
+ desc = "A trap that only goes off when a fugitive steps on it, announcing the location and stunning the target. You'd better avoid it."
+ icon = 'icons/obj/objects.dmi'
+ icon_state = "bounty_trap_on"
+ stun_time = 200
+ var/obj/item/bountytrap/stored_item
+ var/caught = FALSE
+
+/obj/structure/trap/stun/hunter/Initialize(mapload)
+ . = ..()
+ time_between_triggers = 10
+
+/obj/structure/trap/stun/hunter/Crossed(atom/movable/AM)
+ if(isliving(AM))
+ var/mob/living/L = AM
+ if(!L.mind?.has_antag_datum(/datum/antagonist/fugitive))
+ return
+ caught = TRUE
+ . = ..()
+
+/obj/structure/trap/stun/hunter/flare()
+ ..()
+ stored_item.forceMove(get_turf(src))
+ forceMove(stored_item)
+ if(caught)
+ stored_item.announce_fugitive()
+ caught = FALSE
+
+/obj/item/bountytrap
+ name = "bounty trap"
+ desc = "A trap that only goes off when a fugitive steps on it, announcing the location and stunning the target. It's currently inactive."
+ icon = 'icons/obj/objects.dmi'
+ icon_state = "bounty_trap_off"
+ var/obj/structure/trap/stun/hunter/stored_trap
+ var/obj/item/radio/radio
+ var/datum/effect_system/spark_spread/spark_system
+
+/obj/item/bountytrap/Initialize(mapload)
+ . = ..()
+ radio = new(src)
+ radio.subspace_transmission = TRUE
+ radio.canhear_range = 0
+ radio.recalculateChannels()
+ spark_system = new
+ spark_system.set_up(4,1,src)
+ spark_system.attach(src)
+ name = "[name] #[rand(1, 999)]"
+ stored_trap = new(src)
+ stored_trap.name = name
+ stored_trap.stored_item = src
+
+/obj/item/bountytrap/proc/announce_fugitive()
+ spark_system.start()
+ playsound(src, 'sound/machines/ding.ogg', 50, TRUE)
+ radio.talk_into(src, "Fugitive has triggered this trap in the [get_area_name(src)]!", RADIO_CHANNEL_COMMON)
+
+/obj/item/bountytrap/attack_self(mob/living/user)
+ var/turf/T = get_turf(src)
+ if(!user || !user.transferItemToLoc(src, T))//visibly unequips
+ return
+ to_chat(user, "You set up [src]. Examine while close to disarm it.")
+ stored_trap.forceMove(T)//moves trap to ground
+ forceMove(stored_trap)//moves item into trap
+
+/obj/item/bountytrap/Destroy()
+ qdel(stored_trap)
+ QDEL_NULL(radio)
+ QDEL_NULL(spark_system)
+ . = ..()
diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm
index ddf7fa6bc6..5eecc6962a 100644
--- a/code/game/objects/structures/watercloset.dm
+++ b/code/game/objects/structures/watercloset.dm
@@ -19,6 +19,13 @@
open = round(rand(0, 1))
update_icon()
+/obj/structure/toilet/Destroy()
+ if(loc)
+ for(var/A in contents)
+ var/atom/movable/AM = A
+ AM.forceMove(loc)
+ return ..()
+
/obj/structure/toilet/attack_hand(mob/living/user)
. = ..()
if(.)
diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm
index ba7c0d2fbe..e896f8072b 100644
--- a/code/game/objects/structures/window.dm
+++ b/code/game/objects/structures/window.dm
@@ -38,6 +38,8 @@ GLOBAL_LIST_EMPTY(electrochromatic_window_lookup)
var/hitsound = 'sound/effects/Glasshit.ogg'
rad_insulation = RAD_VERY_LIGHT_INSULATION
rad_flags = RAD_PROTECT_CONTENTS
+ flags_ricochet = RICOCHET_HARD
+ ricochet_chance_mod = 0.4
/// Electrochromatic status
var/electrochromatic_status = NOT_ELECTROCHROMATIC
@@ -525,6 +527,7 @@ GLOBAL_LIST_EMPTY(electrochromatic_window_lookup)
explosion_block = 1
glass_type = /obj/item/stack/sheet/rglass
rad_insulation = RAD_HEAVY_INSULATION
+ ricochet_chance_mod = 0.8
/obj/structure/window/reinforced/spawner/east
dir = EAST
@@ -690,6 +693,7 @@ GLOBAL_LIST_EMPTY(electrochromatic_window_lookup)
level = 3
glass_type = /obj/item/stack/sheet/titaniumglass
glass_amount = 2
+ ricochet_chance_mod = 0.9
/obj/structure/window/shuttle/narsie_act()
add_atom_colour("#3C3434", FIXED_COLOUR_PRIORITY)
diff --git a/code/game/say.dm b/code/game/say.dm
index 187994f432..35a1b1d072 100644
--- a/code/game/say.dm
+++ b/code/game/say.dm
@@ -59,7 +59,7 @@ GLOBAL_LIST_INIT(freqtospan, list(
var/endspanpart = ""
//Message
- var/messagepart = " "
+ var/messagepart = " "
var/languageicon = ""
var/datum/language/D = GLOB.language_datum_instances[message_language]
@@ -96,6 +96,18 @@ GLOBAL_LIST_INIT(freqtospan, list(
return "[say_mod(input, message_mode)][spanned ? ", \"[spanned]\"" : ""]"
// Citadel edit [spanned ? ", \"[spanned]\"" : ""]"
+#define ENCODE_HTML_EPHASIS(input, char, html, varname) \
+ var/static/regex/##varname = regex("[char]{2}(.+?)[char]{2}", "g");\
+ input = varname.Replace_char(input, "<[html]>$1")
+
+/atom/movable/proc/say_emphasis(input)
+ ENCODE_HTML_EPHASIS(input, "\\|", "i", italics)
+ ENCODE_HTML_EPHASIS(input, "\\+", "b", bold)
+ ENCODE_HTML_EPHASIS(input, "_", "u", underline)
+ return input
+
+#undef ENCODE_HTML_EPHASIS
+
/// Quirky citadel proc for our custom sayverbs to strip the verb out. Snowflakey as hell, say rewrite 3.0 when?
/atom/movable/proc/quoteless_say_quote(input, list/spans = list(speech_span), message_mode)
var/pos = findtext(input, "*")
diff --git a/code/game/turfs/closed.dm b/code/game/turfs/closed.dm
index c7aefbe0a6..9fe23d78d7 100644
--- a/code/game/turfs/closed.dm
+++ b/code/game/turfs/closed.dm
@@ -87,6 +87,11 @@
smooth = SMOOTH_TRUE
explosion_block = INFINITY
+/turf/closed/indestructible/syndicate
+ icon = 'icons/turf/walls/plastitanium_wall.dmi'
+ icon_state = "map-shuttle"
+ smooth = SMOOTH_TRUE
+
/turf/closed/indestructible/riveted/uranium
icon = 'icons/turf/walls/uranium_wall.dmi'
icon_state = "uranium"
@@ -185,3 +190,16 @@
desc = "A wall made out of a strange metal. The squares on it pulse in a predictable pattern."
icon = 'icons/turf/walls/hierophant_wall.dmi'
icon_state = "wall"
+
+/turf/closed/indestructible/rock/glacierrock
+ name = "unaturally hard ice wall"
+ desc = "Ice, hardened over thousands of years, you're not breaking through this."
+ icon = 'icons/turf/walls.dmi'
+ icon_state = "snow_rock"
+
+/turf/closed/indestructible/rock/glacierrock/blue
+ name = "blue ice wall"
+ desc = "The incredible compressive forces that formed this sturdy ice wall gave it a blue color."
+ icon = 'icons/turf/walls.dmi'
+ icon_state = "ice"
+ canSmoothWith = list(/turf/closed/indestructible/rock/glacierrock/blue)
diff --git a/code/game/turfs/simulated/floor/fancy_floor.dm b/code/game/turfs/simulated/floor/fancy_floor.dm
index 06cd38a4c3..2f4e2e0eee 100644
--- a/code/game/turfs/simulated/floor/fancy_floor.dm
+++ b/code/game/turfs/simulated/floor/fancy_floor.dm
@@ -157,7 +157,7 @@
planetary_atmos = TRUE
floor_tile = null
initial_gas_mix = FROZEN_ATMOS
- slowdown = 2
+ slowdown = 1.5 //So digging it out paths are usefull.
bullet_sizzle = TRUE
footstep = FOOTSTEP_SAND
barefootstep = FOOTSTEP_SAND
diff --git a/code/game/turfs/simulated/floor/plasteel_floor.dm b/code/game/turfs/simulated/floor/plasteel_floor.dm
index 0f366fae03..af48160ef1 100644
--- a/code/game/turfs/simulated/floor/plasteel_floor.dm
+++ b/code/game/turfs/simulated/floor/plasteel_floor.dm
@@ -146,95 +146,3 @@
/turf/open/floor/plasteel/sepia
icon_state = "sepia"
-
-///////////////////////////////
-// Pre-Applied Decal Floors //
-//////////////////////////////
-
-// Neutral
-/turf/open/floor/plasteel/neutral
- icon_state = "neutral_full"
-/turf/open/floor/plasteel/neutral/side
- icon_state = "neutral"
-/turf/open/floor/plasteel/neutral/corner
- icon_state = "neutral_corner"
-
-// Dark Neutral
-/turf/open/floor/plasteel/dark/neutral
- icon_state = "dark_neutral_full"
-/turf/open/floor/plasteel/dark/neutral/checker
- icon_state = "dark_neutral_checker"
-/turf/open/floor/plasteel/dark/neutral/side
- icon_state = "dark_neutral"
-/turf/open/floor/plasteel/dark/neutral/corner
- icon_state = "dark_neutral_corner"
-
-// Dark Security
-/turf/open/floor/plasteel/dark/security
- icon_state = "dark_red_full"
-/turf/open/floor/plasteel/dark/security/checker
- icon_state = "dark_red_checker"
-/turf/open/floor/plasteel/dark/security/side
- icon_state = "dark_red"
-/turf/open/floor/plasteel/dark/security/corner
- icon_state = "dark_red_corner"
-
-// Engineering
-/turf/open/floor/plasteel/engineering
- icon_state = "engineering_full"
-/turf/open/floor/plasteel/engineering/side
- icon_state = "engineering"
-/turf/open/floor/plasteel/engineering/corner
- icon_state = "engineering_corner"
-
-// Atmospherics
-/turf/open/floor/plasteel/atmospherics
- icon_state = "atmospherics_full"
-/turf/open/floor/plasteel/atmospherics/side
- icon_state = "atmospherics"
-/turf/open/floor/plasteel/atmospherics/corner
- icon_state = "atmospherics_corner"
-
-// Command
-/turf/open/floor/plasteel/command
- icon_state = "command_full"
-/turf/open/floor/plasteel/command/side
- icon_state = "command"
-/turf/open/floor/plasteel/command/corner
- icon_state = "command_corner"
-
-// Medical
-/turf/open/floor/plasteel/medical
- icon_state = "medical_full"
-/turf/open/floor/plasteel/medical/alt
- icon_state = "medical_alt"
-/turf/open/floor/plasteel/medical/side
- icon_state = "medical"
-/turf/open/floor/plasteel/medical/corner
- icon_state = "medical_corner"
-
-// Security
-/turf/open/floor/plasteel/security
- icon_state = "security_full"
-/turf/open/floor/plasteel/security/side
- icon_state = "security"
-/turf/open/floor/plasteel/security/corner
- icon_state = "security_corner"
-
-// Cargo
-/turf/open/floor/plasteel/cargo
- icon_state = "cargo_full"
-/turf/open/floor/plasteel/cargo/side
- icon_state = "cargo"
-/turf/open/floor/plasteel/cargo/corner
- icon_state = "cargo_corner"
-
-// Misc
-/turf/open/floor/plasteel/showroomfloor/shower
- icon_state = "shower"
-/turf/open/floor/plasteel/goonplaque/alien
- icon_state = "plaque1"
- desc = "\"This is a plaque is a collaboration of iconography celebrating the peaceful collaboration between the people of Earth and distant alien species."
-/turf/open/floor/plasteel/goonplaque/charter
- icon_state = "plaque2"
- desc = "\"A golden plaque. Etched into it is the introductory article for a cross-species interplanetary constitution, guaranteeing equal rights between species that Nanotrasen relunctantly agreed to."
diff --git a/code/game/turfs/simulated/wall/mineral_walls.dm b/code/game/turfs/simulated/wall/mineral_walls.dm
index 01c321bf36..a5f0d5e824 100644
--- a/code/game/turfs/simulated/wall/mineral_walls.dm
+++ b/code/game/turfs/simulated/wall/mineral_walls.dm
@@ -191,7 +191,7 @@
icon = 'icons/turf/walls/shuttle_wall.dmi'
icon_state = "map-shuttle"
explosion_block = 3
- flags_1 = CAN_BE_DIRTY_1 | CHECK_RICOCHET_1
+ flags_1 = CAN_BE_DIRTY_1 | DEFAULT_RICOCHET_1
sheet_type = /obj/item/stack/sheet/mineral/titanium
smooth = SMOOTH_MORE|SMOOTH_DIAGONAL
canSmoothWith = list(/turf/closed/wall/mineral/titanium, /obj/machinery/door/airlock/shuttle, /obj/machinery/door/airlock, /obj/structure/window/shuttle, /obj/structure/shuttle/engine/heater, /obj/structure/falsewall/titanium)
@@ -302,4 +302,4 @@
/turf/closed/wall/mineral/plastitanium/copyTurf(turf/T)
. = ..()
- T.transform = transform
\ No newline at end of file
+ T.transform = transform
diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm
index 5243341ac1..b01a1df2c0 100644
--- a/code/game/turfs/simulated/walls.dm
+++ b/code/game/turfs/simulated/walls.dm
@@ -41,17 +41,6 @@
/turf/closed/wall/attack_tk()
return
-/turf/closed/wall/handle_ricochet(obj/item/projectile/P) //A huge pile of shitcode!
- var/turf/p_turf = get_turf(P)
- var/face_direction = get_dir(src, p_turf)
- var/face_angle = dir2angle(face_direction)
- var/incidence_s = GET_ANGLE_OF_INCIDENCE(face_angle, (P.Angle + 180))
- if(abs(incidence_s) > 90 && abs(incidence_s) < 270)
- return FALSE
- var/new_angle_s = SIMPLIFY_DEGREES(face_angle + incidence_s)
- P.setAngle(new_angle_s)
- return TRUE
-
/turf/closed/wall/proc/dismantle_wall(devastated=0, explode=0)
if(devastated)
devastate_wall()
diff --git a/code/game/world.dm b/code/game/world.dm
index 1c6f3bceba..83e82403e0 100644
--- a/code/game/world.dm
+++ b/code/game/world.dm
@@ -39,6 +39,9 @@ GLOBAL_LIST(topic_status_cache)
#ifndef USE_CUSTOM_ERROR_HANDLER
world.log = file("[GLOB.log_directory]/dd.log")
+#else
+ if (TgsAvailable())
+ world.log = file("[GLOB.log_directory]/dd.log") //not all runtimes trigger world/Error, so this is the only way to ensure we can see all of them.
#endif
load_admins()
@@ -67,10 +70,6 @@ GLOBAL_LIST(topic_status_cache)
/world/proc/InitTgs()
TgsNew(new /datum/tgs_event_handler/impl, TGS_SECURITY_TRUSTED)
GLOB.revdata.load_tgs_info()
-#ifdef USE_CUSTOM_ERROR_HANDLER
- if (TgsAvailable())
- world.log = file("[GLOB.log_directory]/dd.log") //not all runtimes trigger world/Error, so this is the only way to ensure we can see all of them.
-#endif
GLOB.tgs_initialized = TRUE
/world/proc/HandleTestRun()
@@ -121,6 +120,7 @@ GLOBAL_LIST(topic_status_cache)
GLOB.world_game_log = "[GLOB.log_directory]/game.log"
GLOB.world_virus_log = "[GLOB.log_directory]/virus.log"
+ GLOB.world_asset_log = "[GLOB.log_directory]/asset.log"
GLOB.world_attack_log = "[GLOB.log_directory]/attack.log"
GLOB.world_pda_log = "[GLOB.log_directory]/pda.log"
GLOB.world_telecomms_log = "[GLOB.log_directory]/telecomms.log"
diff --git a/code/modules/admin/verbs/SDQL2/SDQL_2.dm b/code/modules/admin/verbs/SDQL2/SDQL_2.dm
index df54df5c7d..bff431a6c7 100644
--- a/code/modules/admin/verbs/SDQL2/SDQL_2.dm
+++ b/code/modules/admin/verbs/SDQL2/SDQL_2.dm
@@ -346,7 +346,7 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/SDQL2_VV_all, new(null
//print the key
if(islist(key))
recursive_list_print(output, key, datum_handler, atom_handler)
- else if(is_proper_datum(key) && (datum_handler || (isatom(key) && atom_handler)))
+ else if(is_object_datatype(key) && (datum_handler || (isatom(key) && atom_handler)))
if(isatom(key) && atom_handler)
output += atom_handler.Invoke(key)
else
@@ -360,7 +360,7 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/SDQL2_VV_all, new(null
var/value = input[key]
if(islist(value))
recursive_list_print(output, value, datum_handler, atom_handler)
- else if(is_proper_datum(value) && (datum_handler || (isatom(value) && atom_handler)))
+ else if(is_object_datatype(value) && (datum_handler || (isatom(value) && atom_handler)))
if(isatom(value) && atom_handler)
output += atom_handler.Invoke(value)
else
@@ -498,7 +498,7 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/SDQL2_VV_all, new(null
if(length(select_text))
var/text = islist(select_text)? select_text.Join() : select_text
var/static/result_offset = 0
- showmob << browse(text, "window=SDQL-result-[result_offset++]")
+ showmob << browse(text, "window=SDQL-result-[result_offset++];size=800x1200")
show_next_to_key = null
if(qdel_on_finish)
qdel(src)
@@ -646,7 +646,7 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/SDQL2_VV_all, new(null
switch(query_tree[1])
if("call")
for(var/i in found)
- if(!is_proper_datum(i))
+ if(!is_object_datatype(i))
continue
world.SDQL_var(i, query_tree["call"][1], null, i, superuser, src)
obj_count_finished++
@@ -664,7 +664,10 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/SDQL2_VV_all, new(null
var/list/text_list = list()
var/print_nulls = !(options & SDQL2_OPTION_SELECT_OUTPUT_SKIP_NULLS)
obj_count_finished = select_refs
+ var/n = 0
for(var/i in found)
+ if(++n == 20000)
+ text_list += "TRUNCATED - 20000 OBJECT LIMIT HIT" SDQL_print(i, text_list, print_nulls) select_refs[REF(i)] = TRUE SDQL2_TICK_CHECK @@ -675,7 +678,7 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/SDQL2_VV_all, new(null if("set" in query_tree) var/list/set_list = query_tree["set"] for(var/d in found) - if(!is_proper_datum(d)) + if(!is_object_datatype(d)) continue SDQL_internal_vv(d, set_list) obj_count_finished++ @@ -685,47 +688,72 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/SDQL2_VV_all, new(null obj_count_finished = length(obj_count_finished) state = SDQL2_STATE_SWITCHING -/datum/SDQL2_query/proc/SDQL_print(object, list/text_list, print_nulls = TRUE) - if(is_proper_datum(object)) - text_list += "[REF(object)] : [object]" - if(istype(object, /atom)) - var/atom/A = object - var/turf/T = A.loc - var/area/a - if(istype(T)) - text_list += " at [T] [ADMIN_COORDJMP(T)]" - a = T.loc - else - var/turf/final = get_turf(T) //Recursive, hopefully? - if(istype(final)) - text_list += " at [final] [ADMIN_COORDJMP(final)]" - a = final.loc +/** + * Recursively prints out an object to text list for SDQL2 output to admins, with VV links and all. + * Recursion limit: 50 + * Limit imposed by callers should be around 10000 objects + * Seriously, if you hit those limits, you're doing something wrong. + */ +/datum/SDQL2_query/proc/SDQL_print(datum/object, list/text_list, print_nulls = TRUE, recursion = 1, linebreak = TRUE) + if(recursion > 50) + text_list += "
RECURSION LIMIT REACHED.
" + return + if(is_object_datatype(object)) + if(!islist(object)) + text_list += "[object.type] [REF(object)]: [object]" + if(istype(object, /atom)) + if(istype(object, /turf)) + var/turf/T = object + text_list += " [ADMIN_COORDJMP(T)] at [T.loc]" else - text_list += " at nonexistant location" - if(a) - text_list += " in area [a]" - if(T.loc != a) - text_list += " inside [T]" - text_list += "
" - else if(islist(object)) - var/list/L = object - var/first = TRUE - text_list += "\[" - for (var/x in L) - if (!first) - text_list += ", " - first = FALSE - SDQL_print(x, text_list) - if (!isnull(x) && !isnum(x) && L[x] != null) - text_list += " -> " - SDQL_print(L[L[x]], text_list) - text_list += "]
" + var/atom/A = object + var/atom/container = A.loc + if(isturf(container)) + text_list += " in [container] [ADMIN_COORDJMP(container)] at [container.loc]" + else if(container) + var/turf/T = get_turf(container) + var/cref = REF(container) + text_list += " in [container]([cref])" + if(T) + text_list += " on [T] [ADMIN_COORDJMP(T)] at[T.loc]" + else + text_list += " in nullspace" + else // lists are snowflake and get special treatment. + text_list += "/list [REF(object)] \[
" + var/list/L = object + if(length(L)) + for(var/key in object) + if(islist(key)) + text_list += "" + SDQL_print(key, text_list, TRUE, recursion + 1, FALSE) + text_list += "" + else + SDQL_print(key, text_list, TRUE, recursion, FALSE) + if(IS_VALID_ASSOC_KEY(key) && !isnull(L[key])) + var/value = L[key] + text_list += " --> " + if(islist(value)) + text_list += "" + SDQL_print(value, text_list, TRUE, recursion + 1, FALSE) + text_list += "" + else + SDQL_print(value, text_list, TRUE, recursion, FALSE) + text_list += "
" + text_list += "\]" + if(linebreak) + text_list += "
" else if(isnull(object)) if(print_nulls) - text_list += "NULL
" + text_list += "NULL" + else if(istext(object)) + text_list += "\"[object]\"" + else if(isnum(object) || ispath(object)) + text_list += "[object]" else - text_list += "[object]
" + text_list += "UNKNOWN: [object]" + if(linebreak) + text_list += "
" /datum/SDQL2_query/CanProcCall() if(!allow_admin_interact) @@ -957,7 +985,7 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/SDQL2_VV_all, new(null var/static/list/exclude = list("usr", "src", "marked", "global") var/long = start < expression.len var/datum/D - if(is_proper_datum(object)) + if(is_object_datatype(object)) D = object if (object == world && (!long || expression[start + 1] == ".") && !(expression[start] in exclude)) //3 == length("SS") + 1 @@ -1161,9 +1189,6 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/SDQL2_VV_all, new(null query_list += word return query_list -/proc/is_proper_datum(thing) - return istype(thing, /datum) || istype(thing, /client) - /obj/effect/statclick/SDQL2_delete/Click() var/datum/SDQL2_query/Q = target Q.delete_click() diff --git a/code/modules/admin/view_variables/debug_variables.dm b/code/modules/admin/view_variables/debug_variables.dm index 23f85cba15..ab9f4a534c 100644 --- a/code/modules/admin/view_variables/debug_variables.dm +++ b/code/modules/admin/view_variables/debug_variables.dm @@ -1,4 +1,5 @@ #define VV_HTML_ENCODE(thing) ( sanitize ? html_encode(thing) : thing ) +/// Get displayed variable in VV variable list /proc/debug_variable(name, value, level, datum/D, sanitize = TRUE) //if D is a list, name will be index, and value will be assoc value. var/header if(D) @@ -15,11 +16,19 @@ header = "
+
|
- [items.Join()]
- [items.Join()]
[command_name()] Shipping Manifest
" P.info += "" - if(paying_account) - P.info += "Direct purchase from [paying_account.account_holder]
" - P.name += " - Purchased by [paying_account.account_holder]" + if(id && !(id == "Cargo")) + P.info += "Direct purchase from [owner]
" + P.name += " - Purchased by [owner]" P.info += "Order #[id]
" P.info += "Destination: [station_name]
" - P.info += "Item: [pack.name]
" + if(packname) + P.info += "Item: [packname]
" P.info += "Contents:
" P.info += "
- "
- for(var/atom/movable/AM in C.contents - P - C.lockerelectronics)
+ var/list/ignore_this = list(P)
+ if(istype(container, /obj/structure/closet))
+ var/obj/structure/closet/C = container
+ ignore_this += C.lockerelectronics
+ for(var/atom/movable/AM in container.contents - ignore_this)
if((P.errors & MANIFEST_ERROR_CONTENTS) && prob(50))
continue
P.info += "
- [AM.name] " P.info += "
Stamp below to confirm receipt of goods:
" + if(P.errors & MANIFEST_ERROR_ITEM) + var/static/list/blacklisted_error = typecacheof(list( + /obj/structure/closet/crate/secure, + /obj/structure/closet/crate/large, + /obj/structure/closet/secure_closet/goodies + )) + if(blacklisted_error[container.type]) + P.errors &= ~MANIFEST_ERROR_ITEM + else + var/lost = max(round(container.contents.len / 10), 1) + while(--lost >= 0) + qdel(pick(container.contents)) + P.update_icon() - P.forceMove(C) - C.manifest = P - C.update_icon() + P.forceMove(container) + + if(istype(container, /obj/structure/closet/crate)) + var/obj/structure/closet/crate/C = container + C.manifest = P + C.update_icon() return P /datum/supply_order/proc/generate(atom/A) var/obj/structure/closet/crate/C = pack.generate(A, paying_account) - var/obj/item/paper/fluff/jobs/cargo/manifest/M = generateManifest(C) - - if(M.errors & MANIFEST_ERROR_ITEM) - if(istype(C, /obj/structure/closet/crate/secure) || istype(C, /obj/structure/closet/crate/large)) - M.errors &= ~MANIFEST_ERROR_ITEM - else - var/lost = max(round(C.contents.len / 10), 1) - while(--lost >= 0) - qdel(pick(C.contents)) + generateManifest(C, paying_account, pack) return C -//Paperwork for NT -/obj/item/folder/paperwork - name = "Incomplete Paperwork" - desc = "These should've been filled out four months ago! Unfinished grant papers issued by Nanotrasen's finance department. Complete this page for additional funding." - icon = 'icons/obj/bureaucracy.dmi' - icon_state = "docs_generic" - -/obj/item/folder/paperwork_correct - name = "Finished Paperwork" - desc = "A neat stack of filled-out forms, in triplicate and signed. Is there anything more satisfying? Make sure they get stamped." - icon = 'icons/obj/bureaucracy.dmi' - icon_state = "docs_verified" +/datum/supply_order/proc/generateCombo(var/miscbox, var/misc_own, var/misc_contents) + for (var/I in misc_contents) + new I(miscbox) + generateManifest(miscbox, misc_own, "") + return diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index f82e16ad5c..7ec3a775a5 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -15,6 +15,7 @@ var/special_enabled = FALSE var/DropPodOnly = FALSE //only usable by the Bluespace Drop Pod via the express cargo console var/admin_spawned = FALSE //Can only an admin spawn this crate? + var/goody = PACK_GOODY_NONE //Small items can be grouped into a single crate.They also come in a closet/lockbox instead of a full crate, so the 700 min doesn't apply var/can_private_buy = TRUE //Can it be purchased privately by each crewmember? /datum/supply_pack/proc/generate(atom/A, datum/bank_account/paying_account) diff --git a/code/modules/cargo/packs/armory.dm b/code/modules/cargo/packs/armory.dm index 3a3357cc42..835457536f 100644 --- a/code/modules/cargo/packs/armory.dm +++ b/code/modules/cargo/packs/armory.dm @@ -37,15 +37,6 @@ contains = list(/obj/item/storage/box/chemimp) crate_name = "chemical implant crate" -/datum/supply_pack/security/armory/combatknives - name = "Combat Knives Crate" - desc = "Contains three sharpened combat knives. Each knife guaranteed to fit snugly inside any Nanotrasen-standard boot. Requires Armory access to open." - cost = 3200 - contains = list(/obj/item/kitchen/knife/combat, - /obj/item/kitchen/knife/combat, - /obj/item/kitchen/knife/combat) - crate_name = "combat knife crate" - /datum/supply_pack/security/armory/ballistic name = "Combat Shotguns Crate" desc = "For when the enemy absolutely needs to be replaced with lead. Contains three Aussec-designed Combat Shotguns, with three Shotgun Bandoliers, as well as seven buchshot and 12g shotgun slugs. Requires Armory access to open." diff --git a/code/modules/cargo/packs/costumes_toys.dm b/code/modules/cargo/packs/costumes_toys.dm index dab8cad5b6..c181d6fb74 100644 --- a/code/modules/cargo/packs/costumes_toys.dm +++ b/code/modules/cargo/packs/costumes_toys.dm @@ -71,7 +71,8 @@ /obj/item/clothing/mask/gas/syndicate, /obj/item/clothing/neck/necklace/dope, /obj/item/vending_refill/donksoft, - /obj/item/circuitboard/computer/arcade/amputation) + /obj/item/circuitboard/computer/arcade/amputation, + /obj/item/storage/bag/ammo) crate_name = "crate" /datum/supply_pack/costumes_toys/foamforce diff --git a/code/modules/cargo/packs/engineering.dm b/code/modules/cargo/packs/engineering.dm index 22258d19a7..9af18e13f6 100644 --- a/code/modules/cargo/packs/engineering.dm +++ b/code/modules/cargo/packs/engineering.dm @@ -90,16 +90,6 @@ crate_name = "industrial rcd" crate_type = /obj/structure/closet/crate/secure/engineering -/datum/supply_pack/engineering/powergamermitts - name = "Insulated Gloves Crate" - desc = "The backbone of modern society. Barely ever ordered for actual engineering. Contains three insulated gloves." - cost = 2300 //Made of pure-grade bullshittinium - contains = list(/obj/item/clothing/gloves/color/yellow, - /obj/item/clothing/gloves/color/yellow, - /obj/item/clothing/gloves/color/yellow) - crate_name = "insulated gloves crate" - crate_type = /obj/structure/closet/crate/engineering/electrical - /datum/supply_pack/engineering/inducers name = "NT-75 Electromagnetic Power Inducers Crate" desc = "No rechargers? No problem, with the NT-75 EPI, you can recharge any standard cell-based equipment anytime, anywhere. Contains two Inducers." @@ -162,6 +152,7 @@ /obj/item/storage/toolbox/mechanical) cost = 1200 crate_name = "toolbox crate" + special = TRUE //Department resupply shuttle loan event. /datum/supply_pack/engineering/bsa name = "Bluespace Artillery Parts" diff --git a/code/modules/cargo/packs/goodies.dm b/code/modules/cargo/packs/goodies.dm new file mode 100644 index 0000000000..ac8b1e9032 --- /dev/null +++ b/code/modules/cargo/packs/goodies.dm @@ -0,0 +1,77 @@ + +/datum/supply_pack/goody + access = NONE + group = "Goodies" + goody = PACK_GOODY_PRIVATE + +/datum/supply_pack/goody/combatknives_single + name = "Combat Knife Single-Pack" + desc = "Contains one sharpened combat knive. Guaranteed to fit snugly inside any Nanotrasen-standard boot." + cost = 800 + contains = list(/obj/item/kitchen/knife/combat) + +/datum/supply_pack/goody/sologamermitts + name = "Insulated Gloves Single-Pack" + desc = "The backbone of modern society. Barely ever ordered for actual engineering." + cost = 800 + contains = list(/obj/item/clothing/gloves/color/yellow) + +/datum/supply_pack/goody/firstaidbruises_single + name = "Bruise Treatment Kit Single-Pack" + desc = "A single brute first-aid kit, perfect for recovering from being crushed in an airlock. Did you know people get crushed in airlocks all the time? Interesting..." + cost = 330 + contains = list(/obj/item/storage/firstaid/brute) + +/datum/supply_pack/goody/firstaidburns_single + name = "Burn Treatment Kit Single-Pack" + desc = "A single burn first-aid kit. The advertisement displays a winking atmospheric technician giving a thumbs up, saying \"Mistakes happen!\"" + cost = 330 + contains = list(/obj/item/storage/firstaid/fire) + +/datum/supply_pack/goody/firstaid_single + name = "First Aid Kit Single-Pack" + desc = "A single first-aid kit, fit for healing most types of bodily harm." + cost = 250 + contains = list(/obj/item/storage/firstaid/regular) + +/datum/supply_pack/goody/firstaidoxygen_single + name = "Oxygen Deprivation Kit Single-Pack" + desc = "A single oxygen deprivation first-aid kit, marketed heavily to those with crippling fears of asphyxiation." + cost = 330 + contains = list(/obj/item/storage/firstaid/o2) + +/datum/supply_pack/goody/firstaidtoxins_single + name = "Toxin Treatment Kit Single-Pack" + desc = "A single first aid kit focused on healing damage dealt by heavy toxins." + cost = 330 + contains = list(/obj/item/storage/firstaid/toxin) + +/datum/supply_pack/goody/toolbox // mostly just to water down coupon probability + name = "Mechanical Toolbox" + desc = "A fully stocked mechanical toolbox, for when you're too lazy to just print them out." + cost = 300 + contains = list(/obj/item/storage/toolbox/mechanical) + +/datum/supply_pack/goody/electrical_toolbox // mostly just to water down coupon probability + name = "Mechanical Toolbox" + desc = "A fully stocked electrical toolbox, for when you're too lazy to just print them out." + cost = 300 + contains = list(/obj/item/storage/toolbox/electrical) + +/datum/supply_pack/goody/valentine + name = "Valentine Card" + desc = "Make an impression on that special someone! Comes with one valentine card and a free candy heart!" + cost = 150 + contains = list(/obj/item/valentine, /obj/item/reagent_containers/food/snacks/candyheart) + +/datum/supply_pack/goody/beeplush + name = "Bee Plushie" + desc = "The most important thing you could possibly spend your hard-earned money on." + cost = 1500 + contains = list(/obj/item/toy/plush/beeplushie) + +/datum/supply_pack/goody/beach_ball + name = "Beach Ball" + desc = "The simple beach ball is one of Nanotrasen's most popular products. 'Why do we make beach balls? Because we can! (TM)' - Nanotrasen" + cost = 200 + contains = list(/obj/item/toy/beach_ball) diff --git a/code/modules/cargo/packs/materials.dm b/code/modules/cargo/packs/materials.dm index 771f7ce222..0cf12fbc5d 100644 --- a/code/modules/cargo/packs/materials.dm +++ b/code/modules/cargo/packs/materials.dm @@ -14,53 +14,60 @@ ////////////////////////////////////////////////////////////////////////////// /datum/supply_pack/materials/cardboard50 + goody = PACK_GOODY_PUBLIC name = "50 Cardboard Sheets" desc = "Create a bunch of boxes." - cost = 1000 + cost = 300 //thrice their export value contains = list(/obj/item/stack/sheet/cardboard/fifty) - crate_name = "cardboard sheets crate" /datum/supply_pack/materials/glass50 + goody = PACK_GOODY_PUBLIC name = "50 Glass Sheets" desc = "Let some nice light in with fifty glass sheets!" - cost = 850 + cost = 300 //double their export value contains = list(/obj/item/stack/sheet/glass/fifty) - crate_name = "glass sheets crate" /datum/supply_pack/materials/metal50 + goody = PACK_GOODY_PUBLIC name = "50 Metal Sheets" desc = "Any construction project begins with a good stack of fifty metal sheets!" - cost = 850 + cost = 300 //double their export value contains = list(/obj/item/stack/sheet/metal/fifty) - crate_name = "metal sheets crate" /datum/supply_pack/materials/plasteel20 + goody = PACK_GOODY_PUBLIC name = "20 Plasteel Sheets" desc = "Reinforce the station's integrity with twenty plasteel sheets!" - cost = 4700 + cost = 4000 contains = list(/obj/item/stack/sheet/plasteel/twenty) - crate_name = "plasteel sheets crate" - -/datum/supply_pack/materials/plasteel50 - name = "50 Plasteel Sheets" - desc = "For when you REALLY have to reinforce something." - cost = 9050 - contains = list(/obj/item/stack/sheet/plasteel/fifty) - crate_name = "plasteel sheets crate" /datum/supply_pack/materials/plastic50 + goody = PACK_GOODY_PUBLIC name = "50 Plastic Sheets" desc = "Build a limitless amount of toys with fifty plastic sheets!" - cost = 950 - contains = list(/obj/item/stack/sheet/plastic/fifty) - crate_name = "plastic sheets crate" + cost = 200 // double their export + contains = list(/obj/item/stack/sheet/plastic/twenty) /datum/supply_pack/materials/sandstone30 + goody = PACK_GOODY_PUBLIC name = "30 Sandstone Blocks" desc = "Neither sandy nor stoney, these thirty blocks will still get the job done." - cost = 800 + cost = 150 // five times their export contains = list(/obj/item/stack/sheet/mineral/sandstone/thirty) - crate_name = "sandstone blocks crate" + +/datum/supply_pack/materials/wood50 + goody = PACK_GOODY_PUBLIC + name = "50 Wood Planks" + desc = "Turn cargo's boring metal groundwork into beautiful panelled flooring and much more with fifty wooden planks!" + cost = 400 // 6-7 planks shy from having equal import/export prices + contains = list(/obj/item/stack/sheet/mineral/wood/twenty) + +/datum/supply_pack/materials/rcdammo + goody = PACK_GOODY_PUBLIC + name = "Large RCD ammo Single-Pack" + desc = "A single large compressed RCD matter pack, to help with any holes or projects people might be working on." + cost = 600 + contains = list(/obj/item/rcd_ammo/large) /datum/supply_pack/materials/rawlumber name = "50 Towercap Logs" @@ -74,35 +81,6 @@ for(var/i in 1 to 49) new /obj/item/grown/log(.) -/datum/supply_pack/materials/wood50 - name = "50 Wood Planks" - desc = "Turn cargo's boring metal groundwork into beautiful panelled flooring and much more with fifty wooden planks!" - cost = 1450 - contains = list(/obj/item/stack/sheet/mineral/wood/fifty) - crate_name = "wood planks crate" - -/datum/supply_pack/materials/rcdammo - name = "Spare RCD ammo" - desc = "This crate contains sixteen RCD compressed matter packs, to help with any holes or projects people might be working on." - cost = 3750 - contains = list(/obj/item/rcd_ammo, - /obj/item/rcd_ammo, - /obj/item/rcd_ammo, - /obj/item/rcd_ammo, - /obj/item/rcd_ammo, - /obj/item/rcd_ammo, - /obj/item/rcd_ammo, - /obj/item/rcd_ammo, - /obj/item/rcd_ammo, - /obj/item/rcd_ammo, - /obj/item/rcd_ammo, - /obj/item/rcd_ammo, - /obj/item/rcd_ammo, - /obj/item/rcd_ammo, - /obj/item/rcd_ammo, - /obj/item/rcd_ammo) - crate_name = "rcd ammo" - ////////////////////////////////////////////////////////////////////////////// ///////////////////////////// Canisters ////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////// diff --git a/code/modules/cargo/packs/medical.dm b/code/modules/cargo/packs/medical.dm index ab188f235b..2bb629308c 100644 --- a/code/modules/cargo/packs/medical.dm +++ b/code/modules/cargo/packs/medical.dm @@ -141,34 +141,6 @@ ///////////////////////////// Medical Kits /////////////////////////////////// ////////////////////////////////////////////////////////////////////////////// -/datum/supply_pack/medical/firstaidbruises - name = "Bruise Treatment Kit Crate" - desc = "Contains three first aid kits focused on healing bruises and broken bones." - cost = 1000 - contains = list(/obj/item/storage/firstaid/brute, - /obj/item/storage/firstaid/brute, - /obj/item/storage/firstaid/brute) - crate_name = "brute treatment kit crate" - -/datum/supply_pack/medical/firstaidburns - name = "Burn Treatment Kit Crate" - desc = "Contains three first aid kits focused on healing severe burns." - cost = 1000 - contains = list(/obj/item/storage/firstaid/fire, - /obj/item/storage/firstaid/fire, - /obj/item/storage/firstaid/fire) - crate_name = "burn treatment kit crate" - -/datum/supply_pack/medical/firstaid - name = "First Aid Kit Crate" - desc = "Contains four first aid kits for healing most types of wounds." - cost = 1000 - contains = list(/obj/item/storage/firstaid/regular, - /obj/item/storage/firstaid/regular, - /obj/item/storage/firstaid/regular, - /obj/item/storage/firstaid/regular) - crate_name = "first aid kit crate" - /datum/supply_pack/medical/sprays name = "Medical Sprays" desc = "Contains two cans of Styptic Spray, Silver Sulfadiazine Spray, Synthflesh Spray and Sterilizer Compound Spray." @@ -183,35 +155,6 @@ /obj/item/reagent_containers/medspray/sterilizine) crate_name = "medical supplies crate" -/datum/supply_pack/medical/firstaidmixed - name = "Mixed Medical Kits" - desc = "Contains one of each medical kits for dealing with a variety of injured crewmembers." - cost = 1250 - contains = list(/obj/item/storage/firstaid/toxin, - /obj/item/storage/firstaid/o2, - /obj/item/storage/firstaid/brute, - /obj/item/storage/firstaid/fire, - /obj/item/storage/firstaid/regular) - crate_name = "medical supplies crate" - -/datum/supply_pack/medical/firstaidoxygen - name = "Oxygen Deprivation Kit Crate" - desc = "Contains three first aid kits focused on helping oxygen deprivation victims." - cost = 1000 - contains = list(/obj/item/storage/firstaid/o2, - /obj/item/storage/firstaid/o2, - /obj/item/storage/firstaid/o2) - crate_name = "oxygen deprivation kit crate" - -/datum/supply_pack/medical/firstaidtoxins - name = "Toxin Treatment Kit Crate" - desc = "Contains three first aid kits focused on healing damage dealt by heavy toxins." - cost = 1000 - contains = list(/obj/item/storage/firstaid/toxin, - /obj/item/storage/firstaid/toxin, - /obj/item/storage/firstaid/toxin) - crate_name = "toxin treatment kit crate" - /datum/supply_pack/medical/advrad name = "Radiation Treatment Crate Deluxe" desc = "A crate for when radiation is out of hand... Contains two rad-b-gone kits, one bottle of anti radiation deluxe pills, as well as a radiation treatment deluxe pill bottle!" diff --git a/code/modules/cargo/packs/misc.dm b/code/modules/cargo/packs/misc.dm index cd834940e9..a84e22f6f9 100644 --- a/code/modules/cargo/packs/misc.dm +++ b/code/modules/cargo/packs/misc.dm @@ -333,45 +333,58 @@ //////////////////////////// Misc + Decor //////////////////////////////////// ////////////////////////////////////////////////////////////////////////////// -/datum/supply_pack/misc/carpet_exotic - name = "Exotic Carpet Crate" - desc = "Exotic carpets straight from Space Russia, for all your decorating needs. Contains 100 tiles each of 10 different flooring patterns." - cost = 7000 - contains = list(/obj/item/stack/tile/carpet/blue/fifty, - /obj/item/stack/tile/carpet/blue/fifty, - /obj/item/stack/tile/carpet/cyan/fifty, - /obj/item/stack/tile/carpet/cyan/fifty, - /obj/item/stack/tile/carpet/green/fifty, - /obj/item/stack/tile/carpet/green/fifty, - /obj/item/stack/tile/carpet/orange/fifty, - /obj/item/stack/tile/carpet/orange/fifty, - /obj/item/stack/tile/carpet/purple/fifty, - /obj/item/stack/tile/carpet/purple/fifty, - /obj/item/stack/tile/carpet/red/fifty, - /obj/item/stack/tile/carpet/red/fifty, - /obj/item/stack/tile/carpet/royalblue/fifty, - /obj/item/stack/tile/carpet/royalblue/fifty, - /obj/item/stack/tile/carpet/royalblack/fifty, - /obj/item/stack/tile/carpet/royalblack/fifty, - /obj/item/stack/tile/carpet/blackred/fifty, - /obj/item/stack/tile/carpet/blackred/fifty, - /obj/item/stack/tile/carpet/monochrome/fifty, - /obj/item/stack/tile/carpet/monochrome/fifty) - crate_name = "exotic carpet crate" - /datum/supply_pack/misc/carpet - name = "Premium Carpet Crate" - desc = "Plasteel floor tiles getting on your nerves? These stacks of extra soft carpet will tie any room together. Contains some classic carpet, along with black, red, and monochrome varients." - cost = 1350 - contains = list(/obj/item/stack/tile/carpet/fifty, - /obj/item/stack/tile/carpet/fifty, - /obj/item/stack/tile/carpet/black/fifty, - /obj/item/stack/tile/carpet/black/fifty, - /obj/item/stack/tile/carpet/blackred/fifty, - /obj/item/stack/tile/carpet/blackred/fifty, - /obj/item/stack/tile/carpet/monochrome/fifty, - /obj/item/stack/tile/carpet/monochrome/fifty) - crate_name = "premium carpet crate" + goody = PACK_GOODY_PUBLIC + name = "Classic Carpet Single-Pack" + desc = "Plasteel floor tiles getting on your nerves? This 50 units stack of extra soft carpet will tie any room together." + cost = 200 + contains = list(/obj/item/stack/tile/carpet/fifty) + +/datum/supply_pack/misc/carpet/black + name = "Black Carpet Single-Pack" + contains = list(/obj/item/stack/tile/carpet/black/fifty) + +/datum/supply_pack/misc/carpet/premium + name = "Monochrome Carpet Single-Pack" + desc = "Exotic carpets for all your decorating needs. This 30 units stack of extra soft carpet will tie any room together." + cost = 250 + contains = list(/obj/item/stack/tile/carpet/monochrome/thirty) + +/datum/supply_pack/misc/carpet/premium/blackred + name = "Black-Red Carpet Single-Pack" + contains = list(/obj/item/stack/tile/carpet/blackred/thirty) + +/datum/supply_pack/misc/carpet/premium/royalblack + name = "Royal Black Carpet Single-Pack" + contains = list(/obj/item/stack/tile/carpet/royalblack/thirty) + +/datum/supply_pack/misc/carpet/premium/royalblue + name = "Royal Blue Carpet Single-Pack" + contains = list(/obj/item/stack/tile/carpet/royalblue/thirty) + +/datum/supply_pack/misc/carpet/premium/red + name = "Red Carpet Single-Pack" + contains = list(/obj/item/stack/tile/carpet/red/thirty) + +/datum/supply_pack/misc/carpet/premium/purple + name = "Purple Carpet Single-Pack" + contains = list(/obj/item/stack/tile/carpet/purple/thirty) + +/datum/supply_pack/misc/carpet/premium/orange + name = "Orange Carpet Single-Pack" + contains = list(/obj/item/stack/tile/carpet/orange/thirty) + +/datum/supply_pack/misc/carpet/premium/green + name = "Green Carpet Single-Pack" + contains = list(/obj/item/stack/tile/carpet/green/thirty) + +/datum/supply_pack/misc/carpet/premium/cyan + name = "Cyan Carpet Single-Pack" + contains = list(/obj/item/stack/tile/carpet/cyan/thirty) + +/datum/supply_pack/misc/carpet/premium/blue + name = "Blue Carpet Single-Pack" + contains = list(/obj/item/stack/tile/carpet/blue/thirty) /datum/supply_pack/misc/noslipfloor name = "High-traction Floor Tiles" @@ -417,3 +430,40 @@ crate_type = /obj/structure/closet/crate +///Special supply crate that generates random syndicate gear up to a determined TC value + +/datum/supply_pack/misc/syndicate + + name = "Assorted Syndicate Gear" + + desc = "Contains a random assortment of syndicate gear." + + special = TRUE ///Cannot be ordered via cargo + + contains = list() + + crate_name = "syndicate gear crate" + + crate_type = /obj/structure/closet/crate + + var/crate_value = 30 ///Total TC worth of contained uplink items + + +////////////////////////////////////////////////////////////////////////////// +//////////////////////////////// Syndicate Packs ///////////////////////////// +////////////////////////////////////////////////////////////////////////////// + +//Generate assorted uplink items, taking into account the same surplus modifiers used for surplus crates +//(this is exclusively used for the rare variant of the stray cargo event!) +/datum/supply_pack/misc/syndicate/fill(obj/structure/closet/crate/C) + var/list/uplink_items = get_uplink_items(SSticker.mode) + while(crate_value) + var/category = pick(uplink_items) + var/item = pick(uplink_items[category]) + var/datum/uplink_item/I = uplink_items[category][item] + if(!I.surplus || prob(100 - I.surplus)) + continue + if(crate_value < I.cost) + continue + crate_value -= I.cost + new I.item(C) \ No newline at end of file diff --git a/code/modules/cargo/packs/security.dm b/code/modules/cargo/packs/security.dm index a48874e974..738eb03fbf 100644 --- a/code/modules/cargo/packs/security.dm +++ b/code/modules/cargo/packs/security.dm @@ -228,3 +228,35 @@ access = ACCESS_ARMORY crate_name = "sporting crate" crate_type = /obj/structure/closet/crate/secure // Would have liked a wooden crate but access >:( + +/datum/supply_pack/security/dumdum + name = ".38 DumDum Speedloader" + desc = "Contains one speedloader of .38 DumDum ammunition, good for embedding in soft targets. Requires Security or Forensics access to open." + cost = 1200 + access = FALSE + access_any = list(ACCESS_SECURITY, ACCESS_FORENSICS_LOCKERS) + contains = list(/obj/item/ammo_box/c38/dumdum) + crate_name = ".38 match crate" + +/datum/supply_pack/security/match + name = ".38 Match Grade Speedloader" + desc = "Contains one speedloader of match grade .38 ammunition, perfect for showing off trickshots. Requires Security or Forensics access to open." + cost = 1200 + access = FALSE + access_any = list(ACCESS_SECURITY, ACCESS_FORENSICS_LOCKERS) + contains = list(/obj/item/ammo_box/c38/match) + crate_name = ".38 match crate" + +/datum/supply_pack/security/stingpack + name = "Stingbang Grenade Pack" + desc = "Contains five \"stingbang\" grenades, perfect for stopping riots and playing morally unthinkable pranks. Requires Security access to open." + cost = 2500 + contains = list(/obj/item/storage/box/stingbangs) + crate_name = "stingbang grenade pack crate" + +/datum/supply_pack/security/stingpack/single + name = "Stingbang Single-Pack" + desc = "Contains one \"stingbang\" grenade, perfect for playing meanhearted pranks. Requires Security access to open." + cost = 1400 + contains = list(/obj/item/grenade/stingbang) + diff --git a/code/modules/cargo/packs/service.dm b/code/modules/cargo/packs/service.dm index 942720dd6b..0c7c63f867 100644 --- a/code/modules/cargo/packs/service.dm +++ b/code/modules/cargo/packs/service.dm @@ -66,6 +66,16 @@ crate_name = "shaft miner starter kit" crate_type = /obj/structure/closet/crate/secure +/datum/supply_pack/service/snowmobile + name = "Snowmobile kit" + desc = "trapped on a frigid wasteland? need to get around fast? purchase a refurbished snowmobile, with a FREE 10 microsecond warranty!" + cost = 1500 // 1000 points cheaper than ATV + contains = list(/obj/vehicle/ridden/atv/snowmobile = 1, + /obj/item/key = 1, + /obj/item/clothing/mask/gas/explorer = 1) + crate_name = "Snowmobile kit" + crate_type = /obj/structure/closet/crate/large + ////////////////////////////////////////////////////////////////////////////// /////////////////////// Chef, Botanist, Bartender //////////////////////////// ////////////////////////////////////////////////////////////////////////////// diff --git a/code/modules/client/client_defines.dm b/code/modules/client/client_defines.dm index 7d87a82afb..0402dc683f 100644 --- a/code/modules/client/client_defines.dm +++ b/code/modules/client/client_defines.dm @@ -133,3 +133,6 @@ var/parallax_movedir = 0 var/parallax_layers_max = 3 var/parallax_animate_timer + + //world.time of when the crew manifest can be accessed + var/crew_manifest_delay diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm index d575a53afa..39487efc54 100644 --- a/code/modules/client/client_procs.dm +++ b/code/modules/client/client_procs.dm @@ -36,29 +36,11 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( if(!usr || usr != mob) //stops us calling Topic for somebody else's client. Also helps prevent usr=null return - // asset_cache + var/asset_cache_job if(href_list["asset_cache_confirm_arrival"]) - var/job = text2num(href_list["asset_cache_confirm_arrival"]) - //because we skip the limiter, we have to make sure this is a valid arrival and not somebody tricking us - // into letting append to a list without limit. - if (job && job <= last_asset_job && !(job in completed_asset_jobs)) - completed_asset_jobs += job + asset_cache_job = asset_cache_confirm_arrival(href_list["asset_cache_confirm_arrival"]) + if (!asset_cache_job) return - else if (job in completed_asset_jobs) //byond bug ID:2256651 - to_chat(src, "An error has been detected in how your client is receiving resources. Attempting to correct.... (If you keep seeing these messages you might want to close byond and reconnect)") - src << browse("...", "window=asset_cache_browser") - // Keypress passthrough - if(href_list["__keydown"]) - var/keycode = browser_keycode_to_byond(href_list["__keydown"]) - if(keycode) - keyDown(keycode) - return - if(href_list["__keyup"]) - var/keycode = browser_keycode_to_byond(href_list["__keyup"]) - if(keycode) - keyUp(keycode) - return - var/mtl = CONFIG_GET(number/minute_topic_limit) if (!holder && mtl) @@ -75,7 +57,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( topiclimiter[ADMINSWARNED_AT] = minute msg += " Administrators have been informed." log_game("[key_name(src)] Has hit the per-minute topic limit of [mtl] topic calls in a given game minute") - message_admins("[ADMIN_LOOKUPFLW(src)] [ADMIN_KICK(usr)] Has hit the per-minute topic limit of [mtl] topic calls in a given game minute") + message_admins("[ADMIN_LOOKUPFLW(usr)] [ADMIN_KICK(usr)] Has hit the per-minute topic limit of [mtl] topic calls in a given game minute") to_chat(src, "[msg]") return @@ -96,6 +78,27 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( if(!(href_list["_src_"] == "chat" && href_list["proc"] == "ping" && LAZYLEN(href_list) == 2)) log_href("[src] (usr:[usr]\[[COORD(usr)]\]) : [hsrc ? "[hsrc] " : ""][href]") + //byond bug ID:2256651 + if (asset_cache_job && (asset_cache_job in completed_asset_jobs)) + to_chat(src, "An error has been detected in how your client is receiving resources. Attempting to correct.... (If you keep seeing these messages you might want to close byond and reconnect)") + src << browse("...", "window=asset_cache_browser") + return + if (href_list["asset_cache_preload_data"]) + asset_cache_preload_data(href_list["asset_cache_preload_data"]) + return + + // Keypress passthrough + if(href_list["__keydown"]) + var/keycode = browser_keycode_to_byond(href_list["__keydown"]) + if(keycode) + keyDown(keycode) + return + if(href_list["__keyup"]) + var/keycode = browser_keycode_to_byond(href_list["__keyup"]) + if(keycode) + keyUp(keycode) + return + // Admin PM if(href_list["priv_msg"]) cmd_admin_pm(href_list["priv_msg"],null) @@ -858,8 +861,14 @@ GLOBAL_LIST_EMPTY(external_rsc_urls) 'html/browser/playeroptions.css', ) spawn (10) //removing this spawn causes all clients to not get verbs. + + //load info on what assets the client has + src << browse('code/modules/asset_cache/validate_assets.html', "window=asset_cache_browser") + //Precache the client with all other assets slowly, so as to not block other browse() calls getFilesSlow(src, SSassets.preload, register_asset = FALSE) + addtimer(CALLBACK(GLOBAL_PROC, /proc/getFilesSlow, src, SSassets.preload, FALSE), 5 SECONDS) + #if (PRELOAD_RSC == 0) for (var/name in GLOB.vox_sounds) var/file = GLOB.vox_sounds[name] diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 040b56f124..347a77059a 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -50,6 +50,8 @@ GLOBAL_LIST_EMPTY(preferences_datums) /// Custom Keybindings var/list/key_bindings = list() + /// List with a key string associated to a list of keybindings. Unlike key_bindings, this one operates on raw key, allowing for binding a key that triggers regardless of if a modifier is depressed as long as the raw key is sent. + var/list/modless_key_bindings = list() var/tgui_fancy = TRUE @@ -154,6 +156,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) "ipc_screen" = "Sunburst", "ipc_antenna" = "None", "flavor_text" = "", + "silicon_flavor_text" = "", "ooc_notes" = "", "meat_type" = "Mammalian", "body_model" = MALE, @@ -367,6 +370,15 @@ GLOBAL_LIST_EMPTY(preferences_datums) dat += "[features["flavor_text"]]" else dat += "[TextPreview(features["flavor_text"])]..." + dat += "
Silicon Flavor Text
" + dat += "Set Silicon Examine Text" + if(length(features["silicon_flavor_text"]) <= 40) + if(!length(features["silicon_flavor_text"])) + dat += "\[...\]" + else + dat += "[features["silicon_flavor_text"]]" + else + dat += "[TextPreview(features["silicon_flavor_text"])]...
" dat += "
OOC notes
" dat += "Set OOC notes" var/ooc_notes_len = length(features["ooc_notes"]) @@ -1088,11 +1100,16 @@ GLOBAL_LIST_EMPTY(preferences_datums) Input mode is the closest thing to the old input system.
\ IMPORTANT: While in input mode's non hotkey setting (tab toggled), Ctrl + KEY will send KEY to the keybind system as the key itself, not as Ctrl + KEY. This means Ctrl + T/W/A/S/D/all your familiar stuff still works, but you \ won't be able to access any regular Ctrl binds.
" + dat += "
Modifier-Independent binding - This is a singular bind that works regardless of if Ctrl/Shift/Alt are held down. For example, if combat mode is bound to C in modifier-independent binds, it'll trigger regardless of if you are \ + holding down shift for sprint. Each keybind can only have one independent binding, and each key can only have one keybind independently bound to it." // Create an inverted list of keybindings -> key var/list/user_binds = list() + var/list/user_modless_binds = list() for (var/key in key_bindings) for(var/kb_name in key_bindings[key]) user_binds[kb_name] += list(key) + for (var/key in modless_key_bindings) + user_modless_binds[modless_key_bindings[key]] = key var/list/kb_categories = list() // Group keybinds by category @@ -1100,21 +1117,29 @@ GLOBAL_LIST_EMPTY(preferences_datums) var/datum/keybinding/kb = GLOB.keybindings_by_name[name] kb_categories[kb.category] += list(kb) - dat += "" + dat += {" + + "} for (var/category in kb_categories) dat += "
[category]
" for (var/i in kb_categories[category]) var/datum/keybinding/kb = i + var/current_independent_binding = user_modless_binds[kb.name] || "Unbound" if(!length(user_binds[kb.name])) - dat += " Unbound" + dat += "[kb.full_name]Unbound" var/list/default_keys = hotkeys ? kb.hotkey_keys : kb.classic_keys if(LAZYLEN(default_keys)) dat += "| Default: [default_keys.Join(", ")]" + dat += "Independent Binding: [current_independent_binding]" dat += "" else var/bound_key = user_binds[kb.name][1] - dat += " [bound_key]" + dat += "[kb.full_name][bound_key]" for(var/bound_key_index in 2 to length(user_binds[kb.name])) bound_key = user_binds[kb.name][bound_key_index] dat += " | [bound_key]" @@ -1123,6 +1148,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) var/list/default_keys = hotkeys ? kb.classic_keys : kb.hotkey_keys if(LAZYLEN(default_keys)) dat += "| Default: [default_keys.Join(", ")]" + dat += "Independent Binding: [current_independent_binding]" dat += "
" dat += "
" @@ -1148,7 +1174,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) #undef APPEARANCE_CATEGORY_COLUMN #undef MAX_MUTANT_ROWS -/datum/preferences/proc/CaptureKeybinding(mob/user, datum/keybinding/kb, var/old_key) +/datum/preferences/proc/CaptureKeybinding(mob/user, datum/keybinding/kb, old_key, independent = FALSE) var/HTML = {"
Keybinding: [kb.full_name]
[kb.description]
Press any key to change
Press ESC to clear
-
-[kb.description]
Press any key to change
Press ESC to clear
Crew Manifest
" dat += GLOB.data_core.get_manifest(OOC = 1) diff --git a/code/modules/mob/dead/new_player/sprite_accessories/hair_head.dm b/code/modules/mob/dead/new_player/sprite_accessories/hair_head.dm index 3497bff09f..89f2dd5370 100644 --- a/code/modules/mob/dead/new_player/sprite_accessories/hair_head.dm +++ b/code/modules/mob/dead/new_player/sprite_accessories/hair_head.dm @@ -189,6 +189,26 @@ name = "Coffee House" icon_state = "hair_coffeehouse" +/datum/sprite_accessory/hair/cornrows1 + name = "Cornrows" + icon_state = "hair_cornrows" + +/datum/sprite_accessory/hair/cornrows2 + name = "Cornrows 2" + icon_state = "hair_cornrows2" + +/datum/sprite_accessory/hair/cornrowbun + name = "Cornrow Bun" + icon_state = "hair_cornrowbun" + +/datum/sprite_accessory/hair/cornrowbraid + name = "Cornrow Braid" + icon_state = "hair_cornrowbraid" + +/datum/sprite_accessory/hair/cornrowdualtail + name = "Cornrow Tail" + icon_state = "hair_cornrowtail" + /datum/sprite_accessory/hair/country name = "Country" icon_state = "hair_country" diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 5364486b04..397af1b9d0 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -717,6 +717,12 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp set name = "View Crew Manifest" set category = "Ghost" + if(!client) + return + if(world.time < client.crew_manifest_delay) + return + client.crew_manifest_delay = world.time + (1 SECONDS) + var/dat dat += "Crew Manifest
" dat += GLOB.data_core.get_manifest() diff --git a/code/modules/mob/inventory.dm b/code/modules/mob/inventory.dm index fad3a7e534..74775203b1 100644 --- a/code/modules/mob/inventory.dm +++ b/code/modules/mob/inventory.dm @@ -333,6 +333,7 @@ I.moveToNullspace() else I.forceMove(newloc) + on_item_dropped(I) if(I.dropped(src) == ITEM_RELOCATED_BY_DROPPED) return FALSE return TRUE diff --git a/code/modules/mob/living/blood.dm b/code/modules/mob/living/blood.dm index a5275f677d..612358e802 100644 --- a/code/modules/mob/living/blood.dm +++ b/code/modules/mob/living/blood.dm @@ -94,7 +94,9 @@ //We want an accurate reading of .len listclearnulls(BP.embedded_objects) - temp_bleed += 0.5 * BP.embedded_objects.len + for(var/obj/item/embeddies in BP.embedded_objects) + if(!embeddies.isEmbedHarmless()) + temp_bleed += 0.5 if(brutedamage >= 20) temp_bleed += (brutedamage * 0.013) diff --git a/code/modules/mob/living/bloodcrawl.dm b/code/modules/mob/living/bloodcrawl.dm index 3547d5f846..d3dbfac8c8 100644 --- a/code/modules/mob/living/bloodcrawl.dm +++ b/code/modules/mob/living/bloodcrawl.dm @@ -37,10 +37,10 @@ C.put_in_hands(B1) C.put_in_hands(B2) C.regenerate_icons() - src.notransform = TRUE + src.mob_transforming = TRUE spawn(0) bloodpool_sink(B) - src.notransform = FALSE + src.mob_transforming = FALSE return 1 /mob/living/proc/bloodpool_sink(obj/effect/decal/cleanable/B) @@ -155,7 +155,7 @@ addtimer(CALLBACK(src, /atom/.proc/remove_atom_colour, TEMPORARY_COLOUR_PRIORITY, newcolor), 6 SECONDS) /mob/living/proc/phasein(obj/effect/decal/cleanable/B) - if(src.notransform) + if(src.mob_transforming) to_chat(src, "Finish eating first!") return 0 B.visible_message("[B] starts to bubble...") diff --git a/code/modules/mob/living/brain/life.dm b/code/modules/mob/living/brain/life.dm index 51be1f6971..6d06da41ae 100644 --- a/code/modules/mob/living/brain/life.dm +++ b/code/modules/mob/living/brain/life.dm @@ -1,11 +1,7 @@ -/mob/living/brain/Life() - set invisibility = 0 - if (notransform) +/mob/living/brain/BiologicalLife(seconds, times_fired) + if(!(. = ..())) return - if(!loc) - return - . = ..() handle_emp_damage() /mob/living/brain/update_stat() diff --git a/code/modules/mob/living/carbon/alien/alien_defense.dm b/code/modules/mob/living/carbon/alien/alien_defense.dm index 00ce3a320a..5b92bf3dea 100644 --- a/code/modules/mob/living/carbon/alien/alien_defense.dm +++ b/code/modules/mob/living/carbon/alien/alien_defense.dm @@ -8,9 +8,6 @@ /mob/living/carbon/alien/hitby(atom/movable/AM, skipcatch, hitpush, blocked, datum/thrownthing/throwingdatum) return ..(AM, skipcatch = TRUE, hitpush = FALSE) -/mob/living/carbon/alien/can_embed(obj/item/I) - return FALSE - /*Code for aliens attacking aliens. Because aliens act on a hivemind, I don't see them as very aggressive with each other. As such, they can either help or harm other aliens. Help works like the human help command while harm is a simple nibble. In all, this is a lot like the monkey code. /N @@ -54,6 +51,8 @@ In all, this is a lot like the monkey code. /N return switch(M.a_intent) if(INTENT_HELP) + if(M == src && check_self_for_injuries()) + return help_shake_act(M) if(INTENT_GRAB) grabbedby(M) diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm index 11849641ef..727a22f844 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm @@ -77,20 +77,18 @@ return TRUE /mob/living/carbon/alien/humanoid/get_standard_pixel_y_offset(lying = 0) + . = ..() if(leaping) - return -32 - else if(custom_pixel_y_offset) - return custom_pixel_y_offset - else - return initial(pixel_y) + . -= 32 + if(custom_pixel_y_offset) + . += custom_pixel_y_offset /mob/living/carbon/alien/humanoid/get_standard_pixel_x_offset(lying = 0) + . = ..() if(leaping) - return -32 - else if(custom_pixel_x_offset) - return custom_pixel_x_offset - else - return initial(pixel_x) + . -= 32 + if(custom_pixel_x_offset) + . += custom_pixel_x_offset /mob/living/carbon/alien/humanoid/get_permeability_protection(list/target_zones) return 0.8 diff --git a/code/modules/mob/living/carbon/alien/larva/life.dm b/code/modules/mob/living/carbon/alien/larva/life.dm index a4da38c4da..f0004b5ed9 100644 --- a/code/modules/mob/living/carbon/alien/larva/life.dm +++ b/code/modules/mob/living/carbon/alien/larva/life.dm @@ -1,14 +1,10 @@ - - -/mob/living/carbon/alien/larva/Life() - set invisibility = 0 - if (notransform) +/mob/living/carbon/alien/larva/BiologicalLife(seconds, times_fired) + if(!(. = ..())) return - if(..()) //not dead - // GROW! - if(amount_grown < max_grown) - amount_grown++ - update_icons() + // GROW! + if(amount_grown < max_grown) + amount_grown++ + update_icons() /mob/living/carbon/alien/larva/update_stat() diff --git a/code/modules/mob/living/carbon/alien/life.dm b/code/modules/mob/living/carbon/alien/life.dm index 75aadd69c9..70c59d4943 100644 --- a/code/modules/mob/living/carbon/alien/life.dm +++ b/code/modules/mob/living/carbon/alien/life.dm @@ -1,6 +1,7 @@ -/mob/living/carbon/alien/Life() +/mob/living/carbon/alien/BiologicalLife(seconds, times_fired) + if(!(. = ..())) + return findQueen() - return..() /mob/living/carbon/alien/check_breath(datum/gas_mixture/breath) if(status_flags & GODMODE) diff --git a/code/modules/mob/living/carbon/alien/special/alien_embryo.dm b/code/modules/mob/living/carbon/alien/special/alien_embryo.dm index 0e8764a372..9bb50bdf42 100644 --- a/code/modules/mob/living/carbon/alien/special/alien_embryo.dm +++ b/code/modules/mob/living/carbon/alien/special/alien_embryo.dm @@ -92,7 +92,7 @@ ghost.transfer_ckey(new_xeno, FALSE) SEND_SOUND(new_xeno, sound('sound/voice/hiss5.ogg',0,0,0,100)) //To get the player's attention new_xeno.Paralyze(6) - new_xeno.notransform = TRUE + new_xeno.mob_transforming = TRUE new_xeno.invisibility = INVISIBILITY_MAXIMUM sleep(6) @@ -102,7 +102,7 @@ if(new_xeno) new_xeno.SetParalyzed(0) - new_xeno.notransform = FALSE + new_xeno.mob_transforming = FALSE new_xeno.invisibility = 0 var/mob/living/carbon/old_owner = owner diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index b13e7640f2..b04f94afad 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -244,7 +244,7 @@ /mob/living/carbon/Topic(href, href_list) ..() //strip panel - if(usr.canUseTopic(src, BE_CLOSE, NO_DEXTERY)) + if(usr.canUseTopic(src, BE_CLOSE)) if(href_list["internal"] && !HAS_TRAIT(src, TRAIT_NO_INTERNALS)) var/slot = text2num(href_list["internal"]) var/obj/item/ITEM = get_item_by_slot(slot) @@ -264,7 +264,15 @@ visible_message("[usr] [internal ? "opens" : "closes"] the valve on [src]'s [ITEM.name].", \ "[usr] [internal ? "opens" : "closes"] the valve on your [ITEM.name].", \ target = usr, target_message = "You [internal ? "opens" : "closes"] the valve on [src]'s [ITEM.name].") - + if(href_list["embedded_object"] && usr.canUseTopic(src, BE_CLOSE)) + var/obj/item/bodypart/L = locate(href_list["embedded_limb"]) in bodyparts + if(!L) + return + var/obj/item/I = locate(href_list["embedded_object"]) in L.embedded_objects + if(!I || I.loc != src) //no item, no limb, or item is not in limb or in the person anymore + return + SEND_SIGNAL(src, COMSIG_CARBON_EMBED_RIP, I, L) + return /mob/living/carbon/fall(forced) loc.handle_fall(src, forced)//it's loc so it doesn't call the mob's handle_fall which does nothing @@ -429,10 +437,9 @@ return /mob/living/carbon/get_standard_pixel_y_offset(lying = 0) + . = ..() if(lying) - return -6 - else - return initial(pixel_y) + . -= 6 /mob/living/carbon/proc/accident(obj/item/I) if(!I || (I.item_flags & ABSTRACT) || HAS_TRAIT(I, TRAIT_NODROP)) diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm index 6303cf4c5c..7ce0fd38da 100644 --- a/code/modules/mob/living/carbon/carbon_defense.dm +++ b/code/modules/mob/living/carbon/carbon_defense.dm @@ -65,22 +65,13 @@ throw_mode_off() return TRUE -/mob/living/carbon/embed_item(obj/item/I) - throw_alert("embeddedobject", /obj/screen/alert/embeddedobject) - var/obj/item/bodypart/L = pick(bodyparts) - L.embedded_objects |= I - I.add_mob_blood(src)//it embedded itself in you, of course it's bloody! - I.forceMove(src) - I.embedded() - L.receive_damage(I.w_class*I.embedding.embedded_impact_pain_multiplier) - visible_message("[I] embeds itself in [src]'s [L.name]!","[I] embeds itself in your [L.name]!") - SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "embedded", /datum/mood_event/embedded) - -/mob/living/carbon/attacked_by(obj/item/I, mob/living/user) - var/totitemdamage = pre_attacked_by(I, user) +/mob/living/carbon/attacked_by(obj/item/I, mob/living/user, attackchain_flags = NONE, damage_multiplier = 1) + var/totitemdamage = pre_attacked_by(I, user) * damage_multiplier var/impacting_zone = (user == src)? check_zone(user.zone_selected) : ran_zone(user.zone_selected) - if((user != src) && (mob_run_block(I, totitemdamage, "the [I]", ATTACK_TYPE_MELEE, I.armour_penetration, user, impacting_zone, null) & BLOCK_SUCCESS)) + var/list/block_return = list() + if((user != src) && (mob_run_block(I, totitemdamage, "the [I]", ((attackchain_flags & ATTACKCHAIN_PARRY_COUNTERATTACK)? ATTACK_TYPE_PARRY_COUNTERATTACK : NONE) | ATTACK_TYPE_MELEE, I.armour_penetration, user, impacting_zone, block_return) & BLOCK_SUCCESS)) return FALSE + totitemdamage = block_calculate_resultant_damage(totitemdamage, block_return) var/obj/item/bodypart/affecting = get_bodypart(impacting_zone) if(!affecting) //missing limb? we select the first bodypart (you can never have zero, because of chest) affecting = bodyparts[1] @@ -272,6 +263,9 @@ to_chat(M, "You can't put [p_them()] out with just your bare hands!") return + if(M == src && check_self_for_injuries()) + return + if(health >= 0 && !(HAS_TRAIT(src, TRAIT_FAKEDEATH))) var/friendly_check = FALSE if(mob_run_block(M, 0, M.name, ATTACK_TYPE_UNARMED, 0, null, null, null)) @@ -339,6 +333,26 @@ update_mobility() playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) +/// Check ourselves to see if we've got any shrapnel, return true if we do. This is a much simpler version of what humans do, we only indicate we're checking ourselves if there's actually shrapnel +/mob/living/carbon/proc/check_self_for_injuries() + if(stat == DEAD || stat == UNCONSCIOUS) + return + + var/embeds = FALSE + for(var/X in bodyparts) + var/obj/item/bodypart/LB = X + for(var/obj/item/I in LB.embedded_objects) + if(!embeds) + embeds = TRUE + // this way, we only visibly try to examine ourselves if we have something embedded, otherwise we'll still hug ourselves :) + visible_message("[src] examines [p_them()]self.", \ + "You check yourself for shrapnel.") + if(I.isEmbedHarmless()) + to_chat(src, "\t There is \a [I] stuck to your [LB.name]!") + else + to_chat(src, "\t There is \a [I] embedded in your [LB.name]!") + + return embeds /mob/living/carbon/flash_act(intensity = 1, override_blindness_check = 0, affect_silicon = 0, visual = 0) . = ..() diff --git a/code/modules/mob/living/carbon/carbon_movement.dm b/code/modules/mob/living/carbon/carbon_movement.dm index cc390b9329..65e59d0e29 100644 --- a/code/modules/mob/living/carbon/carbon_movement.dm +++ b/code/modules/mob/living/carbon/carbon_movement.dm @@ -20,7 +20,7 @@ if(istype(J) && (movement_dir || J.stabilizers) && J.allow_thrust(0.01, src)) return 1 -/mob/living/carbon/Move(NewLoc, direct) +/mob/living/carbon/Moved() . = ..() if(. && (movement_type & FLOATING)) //floating is easy if(HAS_TRAIT(src, TRAIT_NOHUNGER)) diff --git a/code/modules/mob/living/carbon/damage_procs.dm b/code/modules/mob/living/carbon/damage_procs.dm index 5528669afa..b5835aef52 100644 --- a/code/modules/mob/living/carbon/damage_procs.dm +++ b/code/modules/mob/living/carbon/damage_procs.dm @@ -1,20 +1,21 @@ -/mob/living/carbon/apply_damage(damage, damagetype = BRUTE, def_zone = null, blocked = FALSE, forced = FALSE) +/mob/living/carbon/apply_damage(damage, damagetype = BRUTE, def_zone = null, blocked = FALSE, forced = FALSE, spread_damage = FALSE) SEND_SIGNAL(src, COMSIG_MOB_APPLY_DAMGE, damage, damagetype, def_zone) var/hit_percent = (100-blocked)/100 if(!forced && hit_percent <= 0) return 0 var/obj/item/bodypart/BP = null - if(isbodypart(def_zone)) //we specified a bodypart object - BP = def_zone - else - if(!def_zone) - def_zone = ran_zone(def_zone) - BP = get_bodypart(check_zone(def_zone)) - if(!BP) - BP = bodyparts[1] + if(!spread_damage) + if(isbodypart(def_zone)) //we specified a bodypart object + BP = def_zone + else + if(!def_zone) + def_zone = ran_zone(def_zone) + BP = get_bodypart(check_zone(def_zone)) + if(!BP) + BP = bodyparts[1] var/damage_amount = forced ? damage : damage * hit_percent switch(damagetype) diff --git a/code/modules/mob/living/carbon/examine.dm b/code/modules/mob/living/carbon/examine.dm index 8dbfba47b1..b07aab30d1 100644 --- a/code/modules/mob/living/carbon/examine.dm +++ b/code/modules/mob/living/carbon/examine.dm @@ -31,14 +31,35 @@ else if(get_bodypart(BODY_ZONE_HEAD)) . += "It appears that [t_his] brain is missing..." - var/list/missing = get_missing_limbs() + var/list/msg = list("") + var/list/missing = list(BODY_ZONE_HEAD, BODY_ZONE_CHEST, BODY_ZONE_R_ARM, BODY_ZONE_L_ARM, BODY_ZONE_R_LEG, BODY_ZONE_L_LEG) + var/list/disabled = list() + for(var/X in bodyparts) + var/obj/item/bodypart/BP = X + if(BP.disabled) + disabled += BP + missing -= BP.body_zone + for(var/obj/item/I in BP.embedded_objects) + if(I.isEmbedHarmless()) + msg += "[t_He] [t_has] \a [icon2html(I, user)] [I] stuck to [t_his] [BP.name]!\n" + else + msg += "[t_He] [t_has] \a [icon2html(I, user)] [I] embedded in [t_his] [BP.name]!\n" + + for(var/X in disabled) + var/obj/item/bodypart/BP = X + var/damage_text + if(!(BP.get_damage(include_stamina = FALSE) >= BP.max_damage)) //Stamina is disabling the limb + damage_text = "limp and lifeless" + else + damage_text = (BP.brute_dam >= BP.burn_dam) ? BP.heavy_brute_msg : BP.heavy_burn_msg + msg += "[capitalize(t_his)] [BP.name] is [damage_text]!\n" + for(var/t in missing) if(t==BODY_ZONE_HEAD) - . += "[t_His] [parse_zone(t)] is missing!" + msg += "[t_His] [parse_zone(t)] is missing!\n" continue - . += "[t_His] [parse_zone(t)] is missing!" + msg += "[t_His] [parse_zone(t)] is missing!\n" - var/list/msg = list() var/temp = getBruteLoss() if(!(user == src && src.hal_screwyhud == SCREWYHUD_HEALTHY)) //fake healthy if(temp) diff --git a/code/modules/mob/living/carbon/human/damage_procs.dm b/code/modules/mob/living/carbon/human/damage_procs.dm index 9f6a572fc8..651fec8415 100644 --- a/code/modules/mob/living/carbon/human/damage_procs.dm +++ b/code/modules/mob/living/carbon/human/damage_procs.dm @@ -1,5 +1,5 @@ -/mob/living/carbon/human/apply_damage(damage = 0,damagetype = BRUTE, def_zone = null, blocked = FALSE, forced = FALSE) +/mob/living/carbon/human/apply_damage(damage = 0,damagetype = BRUTE, def_zone = null, blocked = FALSE, forced = FALSE, spread_damage) // depending on the species, it will run the corresponding apply_damage code there - return dna.species.apply_damage(damage, damagetype, def_zone, blocked, src, forced) + return dna.species.apply_damage(damage, damagetype, def_zone, blocked, src, forced, spread_damage) diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index cb21534d25..d32184edb5 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -159,7 +159,10 @@ disabled += BP missing -= BP.body_zone for(var/obj/item/I in BP.embedded_objects) - msg += "[t_He] [t_has] \a [icon2html(I, user)] [I] embedded in [t_his] [BP.name]!\n" + if(I.isEmbedHarmless()) + msg += "[t_He] [t_has] \a [icon2html(I, user)] [I] stuck to [t_his] [BP.name]!\n" + else + msg += "[t_He] [t_has] \a [icon2html(I, user)] [I] embedded in [t_his] [BP.name]!\n" for(var/X in disabled) var/obj/item/bodypart/BP = X diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index de703b8ad4..4421c383e6 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -220,22 +220,7 @@ var/obj/item/I = locate(href_list["embedded_object"]) in L.embedded_objects if(!I || I.loc != src) //no item, no limb, or item is not in limb or in the person anymore return - var/time_taken = I.embedding.embedded_unsafe_removal_time/I.w_class //Citadel Change from * to / - usr.visible_message("[usr] attempts to remove [I] from [usr.p_their()] [L.name].","You attempt to remove [I] from your [L.name]... (It will take [DisplayTimeText(time_taken)].)") - if(do_after(usr, time_taken, needhand = 1, target = src)) - remove_embedded_unsafe(L, I, usr) - /* CITADEL EDIT: remove_embedded_unsafe replaces this code - if(!I || !L || I.loc != src || !(I in L.embedded_objects)) - return - L.embedded_objects -= I - L.receive_damage(I.embedding.embedded_unsafe_removal_pain_multiplier*I.w_class)//It hurts to rip it out, get surgery you dingus. - I.forceMove(get_turf(src)) - usr.put_in_hands(I) - usr.emote("scream") - usr.visible_message("[usr] successfully rips [I] out of [usr.p_their()] [L.name]!","You successfully remove [I] from your [L.name].") - if(!has_embedded_objects()) - clear_alert("embeddedobject") - SEND_SIGNAL(usr, COMSIG_CLEAR_MOOD_EVENT, "embedded") */ + SEND_SIGNAL(src, COMSIG_CARBON_EMBED_RIP, I, L) return if(href_list["item"]) diff --git a/code/modules/mob/living/carbon/human/human_block.dm b/code/modules/mob/living/carbon/human/human_block.dm index 8fe0376a08..4ba7e95564 100644 --- a/code/modules/mob/living/carbon/human/human_block.dm +++ b/code/modules/mob/living/carbon/human/human_block.dm @@ -1,8 +1,11 @@ /mob/living/carbon/human/get_blocking_items() . = ..() if(wear_suit) - . |= wear_suit + if(!.[wear_suit]) + .[wear_suit] = wear_suit.block_priority if(w_uniform) - . |= w_uniform + if(!.[w_uniform]) + .[w_uniform] = w_uniform.block_priority if(wear_neck) - . |= wear_neck + if(!.[wear_neck]) + .[wear_neck] = wear_neck.block_priority diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index 3a2d0535e6..63296021ff 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -52,11 +52,6 @@ return martial_art_result return ..() -/mob/living/carbon/human/can_embed(obj/item/I) - if(I.get_sharpness() || is_pointed(I) || is_type_in_typecache(I, GLOB.can_embed_types)) - return TRUE - return FALSE - /mob/living/carbon/human/proc/check_martial_melee_block() if(mind) if(mind.martial_art && prob(mind.martial_art.block_chance) && mind.martial_art.can_use(src) && in_throw_mode && !incapacitated(FALSE, TRUE)) @@ -78,7 +73,7 @@ ..() -/mob/living/carbon/human/attacked_by(obj/item/I, mob/living/user) +/mob/living/carbon/human/attacked_by(obj/item/I, mob/living/user, attackchain_flags = NONE, damage_multiplier = 1) if(!I || !user) return 0 @@ -95,7 +90,7 @@ SSblackbox.record_feedback("tally", "zone_targeted", 1, target_area) // the attacked_by code varies among species - return dna.species.spec_attacked_by(I, user, affecting, a_intent, src) + return dna.species.spec_attacked_by(I, user, affecting, a_intent, src, attackchain_flags, damage_multiplier) /mob/living/carbon/human/attack_hulk(mob/living/carbon/human/user, does_attack_animation = FALSE) if(user.a_intent == INTENT_HARM) @@ -214,7 +209,7 @@ /mob/living/carbon/human/attack_animal(mob/living/simple_animal/M) . = ..() if(.) - var/damage = rand(M.melee_damage_lower, M.melee_damage_upper) + var/damage = . var/dam_zone = dismembering_strike(M, pick(BODY_ZONE_CHEST, BODY_ZONE_PRECISE_L_HAND, BODY_ZONE_PRECISE_R_HAND, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG)) if(!dam_zone) //Dismemberment successful return TRUE @@ -620,7 +615,10 @@ to_send += "\t Your [LB.name] [HAS_TRAIT(src, TRAIT_SELF_AWARE) ? "has" : "is"] [status].\n" for(var/obj/item/I in LB.embedded_objects) - to_send += "\t There is \a [I] embedded in your [LB.name]!\n" + if(I.isEmbedHarmless()) + to_chat(src, "\t There is \a [I] stuck to your [LB.name]!") + else + to_chat(src, "\t There is \a [I] embedded in your [LB.name]!") for(var/t in missing) to_send += "Your [parse_zone(t)] is missing!\n" diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index eb22934a2b..56ab1f1b10 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -18,36 +18,21 @@ #define THERMAL_PROTECTION_HAND_LEFT 0.025 #define THERMAL_PROTECTION_HAND_RIGHT 0.025 -/mob/living/carbon/human/Life(seconds, times_fired) - set invisibility = 0 - if (notransform) +/mob/living/carbon/human/BiologicalLife(seconds, times_fired) + if(!(. = ..())) return + handle_active_genes() + //heart attack stuff + handle_heart() + dna.species.spec_life(src) // for mutantraces + return (stat != DEAD) && !QDELETED(src) - . = ..() - - if (QDELETED(src)) - return 0 - - if(.) //not dead - handle_active_genes() - - if(stat != DEAD) - //heart attack stuff - handle_heart() - - if(stat != DEAD) - //Stuff jammed in your limbs hurts - handle_embedded_objects() - +/mob/living/carbon/human/PhysicalLife(seconds, times_fired) + if(!(. = ..())) + return //Update our name based on whether our face is obscured/disfigured name = get_visible_name() - dna.species.spec_life(src) // for mutantraces - - if(stat != DEAD) - return 1 - - /mob/living/carbon/human/calculate_affecting_pressure(pressure) var/headless = !get_bodypart(BODY_ZONE_HEAD) //should the mob be perennially headless (see dullahans), we only take the suit into account, so they can into space. if (wear_suit && istype(wear_suit, /obj/item/clothing) && (headless || (head && istype(head, /obj/item/clothing)))) @@ -303,25 +288,6 @@ return TRUE return ..() - -/mob/living/carbon/human/proc/handle_embedded_objects() - for(var/X in bodyparts) - var/obj/item/bodypart/BP = X - for(var/obj/item/I in BP.embedded_objects) - if(prob(I.embedding.embedded_pain_chance)) - BP.receive_damage(I.w_class*I.embedding.embedded_pain_multiplier) - to_chat(src, "[I] embedded in your [BP.name] hurts!") - - if(prob(I.embedding.embedded_fall_chance)) - BP.receive_damage(I.w_class*I.embedding.embedded_fall_pain_multiplier) - BP.embedded_objects -= I - I.forceMove(drop_location()) - I.unembedded() - visible_message("[I] falls out of [name]'s [BP.name]!","[I] falls out of your [BP.name]!") - if(!has_embedded_objects()) - clear_alert("embeddedobject") - SEND_SIGNAL(src, COMSIG_CLEAR_MOOD_EVENT, "embedded") - /mob/living/carbon/human/proc/handle_active_genes() if(HAS_TRAIT(src, TRAIT_MUTATION_STASIS)) return diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 2ed5e349c3..f256345c68 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -1492,12 +1492,12 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) var/miss_chance = 100//calculate the odds that a punch misses entirely. considers stamina and brute damage of the puncher. punches miss by default to prevent weird cases if(user.dna.species.punchdamagelow) - if(HAS_TRAIT(user, TRAIT_PUGILIST)) //pugilists have a flat 10% miss chance - miss_chance = 10 if(atk_verb == ATTACK_EFFECT_KICK) //kicks never miss (provided your species deals more than 0 damage) miss_chance = 0 + else if(HAS_TRAIT(user, TRAIT_PUGILIST)) //pugilists have a flat 10% miss chance + miss_chance = 10 else - miss_chance = min(10 + ((puncherstam + puncherbrute)*0.5), 100) //probability of miss has a base of 10, and modified based on half brute total. Capped at max 100 to prevent weirdness in prob() + miss_chance = min(10 + max(puncherstam * 0.5, puncherbrute * 0.5), 100) //probability of miss has a base of 10, and modified based on half brute total. Capped at max 100 to prevent weirdness in prob() if(!damage || !affecting || prob(miss_chance))//future-proofing for species that have 0 damage/weird cases where no zone is targeted playsound(target.loc, user.dna.species.miss_sound, 25, TRUE, -1) @@ -1700,12 +1700,14 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) if("disarm") disarm(M, H, attacker_style) -/datum/species/proc/spec_attacked_by(obj/item/I, mob/living/user, obj/item/bodypart/affecting, intent, mob/living/carbon/human/H) - var/totitemdamage = H.pre_attacked_by(I, user) +/datum/species/proc/spec_attacked_by(obj/item/I, mob/living/user, obj/item/bodypart/affecting, intent, mob/living/carbon/human/H, attackchain_flags = NONE, damage_multiplier = 1) + var/totitemdamage = H.pre_attacked_by(I, user) * damage_multiplier // Allows you to put in item-specific reactions based on species if(user != H) - if(H.mob_run_block(I, totitemdamage, "the [I.name]", ATTACK_TYPE_MELEE, I.armour_penetration, user, affecting.body_zone, null) & BLOCK_SUCCESS) + var/list/block_return = list() + if(H.mob_run_block(I, totitemdamage, "the [I.name]", ((attackchain_flags & ATTACKCHAIN_PARRY_COUNTERATTACK)? ATTACK_TYPE_PARRY_COUNTERATTACK : NONE) | ATTACK_TYPE_MELEE, I.armour_penetration, user, affecting.body_zone, block_return) & BLOCK_SUCCESS) return 0 + totitemdamage = block_calculate_resultant_damage(totitemdamage, block_return) if(H.check_martial_melee_block()) H.visible_message("[H] blocks [I]!") return 0 @@ -1720,6 +1722,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) var/armor_block = H.run_armor_check(affecting, "melee", "Your armor has protected your [hit_area].", "Your armor has softened a hit to your [hit_area].",I.armour_penetration) armor_block = min(90,armor_block) //cap damage reduction at 90% var/Iforce = I.force //to avoid runtimes on the forcesay checks at the bottom. Some items might delete themselves if you drop them. (stunning yourself, ninja swords) + var/weakness = H.check_weakness(I, user) apply_damage(totitemdamage * weakness, I.damtype, def_zone, armor_block, H) //CIT CHANGE - replaces I.force with totitemdamage @@ -1936,7 +1939,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) append_message += ", causing them to drop [target_held_item]" log_combat(user, target, "shoved", append_message) -/datum/species/proc/apply_damage(damage, damagetype = BRUTE, def_zone = null, blocked, mob/living/carbon/human/H, forced = FALSE) +/datum/species/proc/apply_damage(damage, damagetype = BRUTE, def_zone = null, blocked, mob/living/carbon/human/H, forced = FALSE, spread_damage = FALSE) SEND_SIGNAL(src, COMSIG_MOB_APPLY_DAMGE, damage, damagetype, def_zone) var/hit_percent = (100-(blocked+armor))/100 hit_percent = (hit_percent * (100-H.physiology.damage_resistance))/100 @@ -1944,20 +1947,20 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) return 0 var/obj/item/bodypart/BP = null - if(isbodypart(def_zone)) - if(damagetype == STAMINA && istype(def_zone, /obj/item/bodypart/head)) - BP = H.get_bodypart(check_zone(BODY_ZONE_CHEST)) + if(!spread_damage) + if(isbodypart(def_zone)) + if(damagetype == STAMINA && istype(def_zone, /obj/item/bodypart/head)) + BP = H.get_bodypart(check_zone(BODY_ZONE_CHEST)) + else + BP = def_zone else - BP = def_zone - else - if(!def_zone) - def_zone = ran_zone(def_zone) - if(damagetype == STAMINA && def_zone == BODY_ZONE_HEAD) - def_zone = BODY_ZONE_CHEST - BP = H.get_bodypart(check_zone(def_zone)) - - if(!BP) - BP = H.bodyparts[1] + if(!def_zone) + def_zone = ran_zone(def_zone) + if(damagetype == STAMINA && def_zone == BODY_ZONE_HEAD) + def_zone = BODY_ZONE_CHEST + BP = H.get_bodypart(check_zone(def_zone)) + if(!BP) + BP = H.bodyparts[1] switch(damagetype) if(BRUTE) diff --git a/code/modules/mob/living/carbon/human/species_types/bugmen.dm b/code/modules/mob/living/carbon/human/species_types/bugmen.dm index da53adece3..595a83de9b 100644 --- a/code/modules/mob/living/carbon/human/species_types/bugmen.dm +++ b/code/modules/mob/living/carbon/human/species_types/bugmen.dm @@ -1,6 +1,7 @@ /datum/species/insect name = "Anthromorphic Insect" id = "insect" + say_mod = "chitters" default_color = "00FF00" species_traits = list(LIPS,EYECOLOR,HAIR,FACEHAIR,MUTCOLORS,HORNCOLOR,WINGCOLOR) inherent_biotypes = MOB_ORGANIC|MOB_HUMANOID|MOB_BUG @@ -13,6 +14,7 @@ liked_food = MEAT | FRUIT disliked_food = TOXIC icon_limbs = DEFAULT_BODYPART_ICON_CITADEL + exotic_bloodtype = "BUG" /datum/species/insect/spec_death(gibbed, mob/living/carbon/human/H) if(H) @@ -42,4 +44,4 @@ H.update_body() /datum/species/insect/qualifies_for_rank(rank, list/features) - return TRUE \ No newline at end of file + return TRUE diff --git a/code/modules/mob/living/carbon/human/species_types/golems.dm b/code/modules/mob/living/carbon/human/species_types/golems.dm index 2b9d28a5f7..958e58a8ad 100644 --- a/code/modules/mob/living/carbon/human/species_types/golems.dm +++ b/code/modules/mob/living/carbon/human/species_types/golems.dm @@ -280,25 +280,15 @@ . = ..() C.faction |= "plants" C.faction |= "vines" + C.AddElement(/datum/element/photosynthesis) /datum/species/golem/wood/on_species_loss(mob/living/carbon/C) . = ..() C.faction -= "plants" C.faction -= "vines" + C.RemoveElement(/datum/element/photosynthesis) /datum/species/golem/wood/spec_life(mob/living/carbon/human/H) - if(H.stat == DEAD) - return - var/light_amount = 0 //how much light there is in the place, affects receiving nutrition and healing - if(isturf(H.loc)) //else, there's considered to be no light - var/turf/T = H.loc - light_amount = min(1,T.get_lumcount()) - 0.5 - H.adjust_nutrition(light_amount * 4, NUTRITION_LEVEL_FULL) - if(light_amount > 0.2) //if there's enough light, heal - H.heal_overall_damage(1,1) - H.adjustToxLoss(-1) - H.adjustOxyLoss(-1) - if(H.nutrition < NUTRITION_LEVEL_STARVING + 50) H.take_overall_damage(2,0) diff --git a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm index db6a1e9560..f76aa0854e 100644 --- a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm @@ -239,7 +239,7 @@ "You focus intently on moving your body while \ standing perfectly still...") - H.notransform = TRUE + H.mob_transforming = TRUE if(do_after(owner, delay=60, needhand=FALSE, target=owner, progress=TRUE)) if(H.blood_volume >= BLOOD_VOLUME_SLIME_SPLIT) @@ -249,7 +249,7 @@ else to_chat(H, "...but fail to stand perfectly still!") - H.notransform = FALSE + H.mob_transforming = FALSE /datum/action/innate/split_body/proc/make_dupe() var/mob/living/carbon/human/H = owner @@ -267,7 +267,7 @@ spare.Move(get_step(H.loc, pick(NORTH,SOUTH,EAST,WEST))) H.blood_volume *= 0.45 - H.notransform = 0 + H.mob_transforming = 0 var/datum/species/jelly/slime/origin_datum = H.dna.species origin_datum.bodies |= spare @@ -459,8 +459,18 @@ /datum/action/innate/slime_change/proc/change_form() var/mob/living/carbon/human/H = owner - var/select_alteration = input(owner, "Select what part of your form to alter", "Form Alteration", "cancel") in list("Hair Style", "Genitals", "Tail", "Snout", "Markings", "Ears", "Taur body", "Penis", "Vagina", "Penis Length", "Breast Size", "Breast Shape", "Cancel") - if(select_alteration == "Hair Style") + var/select_alteration = input(owner, "Select what part of your form to alter", "Form Alteration", "cancel") in list("Body Color","Hair Style", "Genitals", "Tail", "Snout", "Markings", "Ears", "Taur body", "Penis", "Vagina", "Penis Length", "Breast Size", "Breast Shape", "Cancel") + + if(select_alteration == "Body Color") + var/new_color = input(owner, "Choose your skin color:", "Race change","#"+H.dna.features["mcolor"]) as color|null + if(new_color) + var/temp_hsv = RGBtoHSV(new_color) + if(ReadHSV(temp_hsv)[3] >= ReadHSV("#7F7F7F")[3]) // mutantcolors must be bright + H.dna.features["mcolor"] = sanitize_hexcolor(new_color, 6) + H.update_body() + else + to_chat(H, "Invalid color. Your color is not bright enough.") + else if(select_alteration == "Hair Style") if(H.gender == MALE) var/new_style = input(owner, "Select a facial hair style", "Hair Alterations") as null|anything in GLOB.facial_hair_styles_list if(new_style) diff --git a/code/modules/mob/living/carbon/human/species_types/podpeople.dm b/code/modules/mob/living/carbon/human/species_types/podpeople.dm index 817498e417..e79160da06 100644 --- a/code/modules/mob/living/carbon/human/species_types/podpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/podpeople.dm @@ -14,34 +14,24 @@ liked_food = VEGETABLES | FRUIT | GRAIN species_language_holder = /datum/language_holder/sylvan var/light_nutrition_gain_factor = 4 - var/light_toxheal = 1 - var/light_oxyheal = 1 - var/light_burnheal = 1 - var/light_bruteheal = 1 + var/light_toxheal = -1 + var/light_oxyheal = -1 + var/light_burnheal = -1 + var/light_bruteheal = -1 /datum/species/pod/on_species_gain(mob/living/carbon/C, datum/species/old_species) . = ..() C.faction |= "plants" C.faction |= "vines" + C.AddElement(/datum/element/photosynthesis, light_bruteheal, light_burnheal, light_toxheal, light_oxyheal, light_nutrition_gain_factor) /datum/species/pod/on_species_loss(mob/living/carbon/C) . = ..() C.faction -= "plants" C.faction -= "vines" + C.RemoveElement(/datum/element/photosynthesis, light_bruteheal, light_burnheal, light_toxheal, light_oxyheal, light_nutrition_gain_factor) /datum/species/pod/spec_life(mob/living/carbon/human/H) - if(H.stat == DEAD) - return - var/light_amount = 0 //how much light there is in the place, affects receiving nutrition and healing - if(isturf(H.loc)) //else, there's considered to be no light - var/turf/T = H.loc - light_amount = min(1,T.get_lumcount()) - 0.5 - H.adjust_nutrition(light_amount * light_nutrition_gain_factor, NUTRITION_LEVEL_FULL) - if(light_amount > 0.2) //if there's enough light, heal - H.heal_overall_damage(light_bruteheal, light_burnheal) - H.adjustToxLoss(-light_toxheal) - H.adjustOxyLoss(-light_oxyheal) - if(H.nutrition < NUTRITION_LEVEL_STARVING + 50) H.take_overall_damage(2,0) @@ -77,9 +67,9 @@ mutant_bodyparts = list("mcolor" = "FFF","mcolor2" = "FFF","mcolor3" = "FFF", "mam_snouts" = "Husky", "mam_tail" = "Husky", "mam_ears" = "Husky", "mam_body_markings" = "Husky", "taur" = "None", "legs" = "Normal Legs") limbs_id = "pod" light_nutrition_gain_factor = 3 - light_bruteheal = 0.2 - light_burnheal = 0.2 - light_toxheal = 0.7 + light_bruteheal = -0.2 + light_burnheal = -0.2 + light_toxheal = -0.7 /datum/species/pod/pseudo_weak/spec_death(gibbed, mob/living/carbon/human/H) if(H) diff --git a/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm b/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm index e229860cf7..fede67b47a 100644 --- a/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm @@ -15,16 +15,13 @@ dangerous_existence = 1 mutanteyes = /obj/item/organ/eyes/night_vision +/datum/species/shadow/on_species_gain(mob/living/carbon/C, datum/species/old_species) + . = ..() + C.AddElement(/datum/element/photosynthesis, 1, 1, 0, 0, 0, 0, SHADOW_SPECIES_LIGHT_THRESHOLD, SHADOW_SPECIES_LIGHT_THRESHOLD) -/datum/species/shadow/spec_life(mob/living/carbon/human/H) - var/turf/T = H.loc - if(istype(T)) - var/light_amount = T.get_lumcount() - - if(light_amount > SHADOW_SPECIES_LIGHT_THRESHOLD) //if there's enough light, start dying - H.take_overall_damage(1,1) - else if (light_amount < SHADOW_SPECIES_LIGHT_THRESHOLD) //heal in the dark - H.heal_overall_damage(1,1) +/datum/species/shadow/on_species_loss(mob/living/carbon/C) + . = ..() + C.RemoveElement(/datum/element/photosynthesis, 1, 1, 0, 0, 0, 0, SHADOW_SPECIES_LIGHT_THRESHOLD, SHADOW_SPECIES_LIGHT_THRESHOLD) /datum/species/shadow/check_roundstart_eligible() if(SSevents.holidays && SSevents.holidays[HALLOWEEN]) diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm index 4e5b033688..f9c5db4789 100644 --- a/code/modules/mob/living/carbon/life.dm +++ b/code/modules/mob/living/carbon/life.dm @@ -1,29 +1,19 @@ -/mob/living/carbon/Life() - set invisibility = 0 - - if(notransform) - return - - if(damageoverlaytemp) - damageoverlaytemp = 0 - update_damage_hud() - +/mob/living/carbon/BiologicalLife(seconds, times_fired) + if(stat == DEAD) + return FALSE //Reagent processing needs to come before breathing, to prevent edge cases. handle_organs() - - . = ..() - - if (QDELETED(src)) + if(!(. = ..())) return - - if(.) //not dead - handle_blood() - + handle_blood() + // handle_blood *could* kill us. + // we should probably have a better system for if we need to check for death or something in the future hmw if(stat != DEAD) var/bprv = handle_bodyparts() if(bprv & BODYPART_LIFE_UPDATE_HEALTH) updatehealth() update_stamina() + doSprintBufferRegen() if(stat != DEAD) handle_brain_damage() @@ -35,12 +25,17 @@ stop_sound_channel(CHANNEL_HEARTBEAT) handle_death() rot() + . = FALSE //Updates the number of stored chemicals for powers handle_changeling() - if(stat != DEAD) - return 1 +/mob/living/carbon/PhysicalLife(seconds, times_fired) + if(!(. = ..())) + return + if(damageoverlaytemp) + damageoverlaytemp = 0 + update_damage_hud() //Procs called while dead /mob/living/carbon/proc/handle_death() diff --git a/code/modules/mob/living/carbon/monkey/life.dm b/code/modules/mob/living/carbon/monkey/life.dm index edbd1562b3..7ba29dbf30 100644 --- a/code/modules/mob/living/carbon/monkey/life.dm +++ b/code/modules/mob/living/carbon/monkey/life.dm @@ -3,30 +3,26 @@ /mob/living/carbon/monkey -/mob/living/carbon/monkey/Life() - set invisibility = 0 - - if (notransform) +/mob/living/carbon/monkey/BiologicalLife(seconds, times_fired) + if(!(. = ..())) return - - if(..()) - - if(!client) - if(stat == CONSCIOUS) - if(on_fire || buckled || restrained() || (!CHECK_MOBILITY(src, MOBILITY_STAND) && CHECK_MOBILITY(src, MOBILITY_MOVE))) //CIT CHANGE - makes it so monkeys attempt to resist if they're resting) - if(!resisting && prob(MONKEY_RESIST_PROB)) - resisting = TRUE - walk_to(src,0) - resist() - else if(resisting) - resisting = FALSE - else if((mode == MONKEY_IDLE && !pickupTarget && !prob(MONKEY_SHENANIGAN_PROB)) || !handle_combat()) - if(prob(25) && CHECK_MOBILITY(src, MOBILITY_MOVE) && isturf(loc) && !pulledby) - step(src, pick(GLOB.cardinals)) - else if(prob(1)) - emote(pick("scratch","jump","roll","tail")) - else + if(client) + return + if(stat == CONSCIOUS) + if(on_fire || buckled || restrained() || (!CHECK_MOBILITY(src, MOBILITY_STAND) && CHECK_MOBILITY(src, MOBILITY_MOVE))) //CIT CHANGE - makes it so monkeys attempt to resist if they're resting) + if(!resisting && prob(MONKEY_RESIST_PROB)) + resisting = TRUE walk_to(src,0) + resist() + else if(resisting) + resisting = FALSE + else if((mode == MONKEY_IDLE && !pickupTarget && !prob(MONKEY_SHENANIGAN_PROB)) || !handle_combat()) + if(prob(25) && CHECK_MOBILITY(src, MOBILITY_MOVE) && isturf(loc) && !pulledby) + step(src, pick(GLOB.cardinals)) + else if(prob(1)) + emote(pick("scratch","jump","roll","tail")) + else + walk_to(src,0) /mob/living/carbon/monkey/handle_mutations_and_radiation() if(radiation) diff --git a/code/modules/mob/living/carbon/monkey/monkey_defense.dm b/code/modules/mob/living/carbon/monkey/monkey_defense.dm index 50793eb821..8f862af8fa 100644 --- a/code/modules/mob/living/carbon/monkey/monkey_defense.dm +++ b/code/modules/mob/living/carbon/monkey/monkey_defense.dm @@ -141,7 +141,7 @@ /mob/living/carbon/monkey/attack_animal(mob/living/simple_animal/M) . = ..() if(.) - var/damage = rand(M.melee_damage_lower, M.melee_damage_upper) + var/damage = . var/dam_zone = dismembering_strike(M, pick(BODY_ZONE_CHEST, BODY_ZONE_PRECISE_L_HAND, BODY_ZONE_PRECISE_R_HAND, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG)) if(!dam_zone) //Dismemberment successful return TRUE diff --git a/code/modules/mob/living/carbon/monkey/punpun.dm b/code/modules/mob/living/carbon/monkey/punpun.dm index fbe4bc9900..c5cb4dc713 100644 --- a/code/modules/mob/living/carbon/monkey/punpun.dm +++ b/code/modules/mob/living/carbon/monkey/punpun.dm @@ -31,11 +31,12 @@ if(relic_mask) equip_to_slot_or_del(new relic_mask, SLOT_WEAR_MASK) -/mob/living/carbon/monkey/punpun/Life() +/mob/living/carbon/monkey/punpun/BiologicalLife(seconds, times_fired) + if(!(. = ..())) + return if(!stat && SSticker.current_state == GAME_STATE_FINISHED && !memory_saved) Write_Memory(FALSE, FALSE) memory_saved = TRUE - ..() /mob/living/carbon/monkey/punpun/death(gibbed) if(!memory_saved) diff --git a/code/modules/mob/living/carbon/update_icons.dm b/code/modules/mob/living/carbon/update_icons.dm index 9a1c6c54b6..4899067d7b 100644 --- a/code/modules/mob/living/carbon/update_icons.dm +++ b/code/modules/mob/living/carbon/update_icons.dm @@ -12,7 +12,7 @@ overlays_standing[cache_index] = null /mob/living/carbon/regenerate_icons() - if(notransform) + if(mob_transforming) return 1 update_inv_hands() update_inv_handcuffed() diff --git a/code/modules/mob/living/damage_procs.dm b/code/modules/mob/living/damage_procs.dm index 3257b0e3bf..0c049ab5c1 100644 --- a/code/modules/mob/living/damage_procs.dm +++ b/code/modules/mob/living/damage_procs.dm @@ -1,14 +1,20 @@ -/* - apply_damage(a,b,c) - args - a:damage - How much damage to take - b:damage_type - What type of damage to take, brute, burn - c:def_zone - Where to take the damage if its brute or burn - Returns - standard 0 if fail -*/ -/mob/living/proc/apply_damage(damage = 0,damagetype = BRUTE, def_zone = null, blocked = FALSE, forced = FALSE) +/** + * Applies damage to this mob + * + * Sends [COMSIG_MOB_APPLY_DAMGE] + * + * Arguuments: + * * damage - amount of damage + * * damagetype - one of [BRUTE], [BURN], [TOX], [OXY], [CLONE], [STAMINA] + * * def_zone - zone that is being hit if any + * * blocked - armor value applied + * * forced - bypass hit percentage + * * spread_damage - used in overrides + * + * Returns TRUE if damage applied + */ +/mob/living/proc/apply_damage(damage = 0,damagetype = BRUTE, def_zone = null, blocked = FALSE, forced = FALSE, spread_damage = FALSE) var/hit_percent = (100-blocked)/100 if(!damage || (hit_percent <= 0)) return 0 @@ -78,8 +84,6 @@ apply_damage(brain, BRAIN, def_zone, blocked) return 1 - - /mob/living/proc/apply_effect(effect = 0,effecttype = EFFECT_STUN, blocked = FALSE, knockdown_stamoverride, knockdown_stammax) var/hit_percent = (100-blocked)/100 if(!effect || (hit_percent <= 0)) @@ -108,7 +112,7 @@ return 1 -/mob/living/proc/apply_effects(stun = 0, knockdown = 0, unconscious = 0, irradiate = 0, slur = 0, stutter = 0, eyeblur = 0, drowsy = 0, blocked = FALSE, stamina = 0, jitter = 0, kd_stamoverride, kd_stammax) +/mob/living/proc/apply_effects(stun = 0, knockdown = 0, unconscious = 0, irradiate = 0, slur = 0, stutter = 0, eyeblur = 0, drowsy = 0, blocked = 0, stamina = 0, jitter = 0, kd_stamoverride, kd_stammax) if(blocked >= 100) return BULLET_ACT_BLOCK if(stun) diff --git a/code/modules/mob/living/emote.dm b/code/modules/mob/living/emote.dm index 111054c383..7d0a701e8f 100644 --- a/code/modules/mob/living/emote.dm +++ b/code/modules/mob/living/emote.dm @@ -457,6 +457,7 @@ message = params if(type_override) emote_type = type_override + message = user.say_emphasis(message) . = ..() message = null emote_type = EMOTE_VISIBLE diff --git a/code/modules/mob/living/life.dm b/code/modules/mob/living/life.dm index d3199d6f8b..7c99c452a1 100644 --- a/code/modules/mob/living/life.dm +++ b/code/modules/mob/living/life.dm @@ -1,12 +1,20 @@ +/** + * Called by SSmobs at (hopefully) an interval of 1 second. + * Splits off into PhysicalLife() and BiologicalLife(). Override those instead of this. + */ /mob/living/proc/Life(seconds, times_fired) - set waitfor = FALSE - set invisibility = 0 + set waitfor = FALSE // yeah hey we're kind of on a subsystem, no sleeping will be tolerated here! + if(mob_transforming) + return - if(digitalinvis) - handle_diginvis() //AI becomes unable to see mob + . = SEND_SIGNAL(src, COMSIG_LIVING_LIFE, seconds, times_fired) + if(!(. & COMPONENT_INTERRUPT_LIFE_PHYSICAL)) + PhysicalLife(seconds, times_fired) + if(!(. & COMPONENT_INTERRUPT_LIFE_BIOLOGICAL)) + BiologicalLife(seconds, times_fired) - if((movement_type & FLYING) && !(movement_type & FLOATING)) //TODO: Better floating - float(on = TRUE) + // CODE BELOW SHOULD ONLY BE THINGS THAT SHOULD HAPPEN NO MATTER WHAT AND CAN NOT BE SUSPENDED! + // Otherwise, it goes into one of the two split Life procs! if (client) var/turf/T = get_turf(src) @@ -30,28 +38,54 @@ log_game("Z-TRACKING: [src] of type [src.type] has a Z-registration despite not having a client.") update_z(null) - if (notransform) - return - if(!loc) - return - var/datum/gas_mixture/environment = loc.return_air() - - if(stat != DEAD) - //Mutations and radiation - handle_mutations_and_radiation() - - if(stat != DEAD) - //Breathing, if applicable - handle_breathing(times_fired) - +/** + * Handles biological life processes like chemical metabolism, breathing, etc + * Returns TRUE or FALSE based on if we were interrupted. This is used by overridden variants to check if they should stop. + */ +/mob/living/proc/BiologicalLife(seconds, times_fired) handle_diseases()// DEAD check is in the proc itself; we want it to spread even if the mob is dead, but to handle its disease-y properties only if you're not. - if (QDELETED(src)) // diseases can qdel the mob via transformations - return + // Everything after this shouldn't process while dead (as of the time of writing) + if(stat == DEAD) + return FALSE - if(stat != DEAD) - //Random events (vomiting etc) - handle_random_events() + //Mutations and radiation + handle_mutations_and_radiation() + + //Breathing, if applicable + handle_breathing(times_fired) + + if (QDELETED(src)) // diseases can qdel the mob via transformations + return FALSE + + //Random events (vomiting etc) + handle_random_events() + + //stuff in the stomach + handle_stomach() + + handle_block_parry(seconds) + + // These two MIGHT need to be moved to base Life() if we get any in the future that's a "physical" effect that needs to fire even while in stasis. + handle_traits() // eye, ear, brain damages + handle_status_effects() //all special effects, stun, knockdown, jitteryness, hallucination, sleeping, etc + return TRUE + +/** + * Handles physical life processes like being on fire. Don't ask why this is considered "Life". + * Returns TRUE or FALSE based on if we were interrupted. This is used by overridden variants to check if they should stop. + */ +/mob/living/proc/PhysicalLife(seconds, times_fired) + if(digitalinvis) + handle_diginvis() //AI becomes unable to see mob + + if((movement_type & FLYING) && !(movement_type & FLOATING)) //TODO: Better floating + float(on = TRUE) + + if(!loc) + return FALSE + + var/datum/gas_mixture/environment = loc.return_air() //Handle temperature/pressure differences between body and environment if(environment) @@ -59,21 +93,11 @@ handle_fire() - //stuff in the stomach - handle_stomach() - handle_gravity() if(machine) machine.check_eye(src) - - if(stat != DEAD) - handle_traits() // eye, ear, brain damages - if(stat != DEAD) - handle_status_effects() //all special effects, stun, knockdown, jitteryness, hallucination, sleeping, etc - - if(stat != DEAD) - return 1 + return TRUE /mob/living/proc/handle_breathing(times_fired) return @@ -166,4 +190,4 @@ /mob/living/proc/handle_high_gravity(gravity) if(gravity >= GRAVITY_DAMAGE_TRESHOLD) //Aka gravity values of 3 or more var/grav_stregth = gravity - GRAVITY_DAMAGE_TRESHOLD - adjustBruteLoss(min(grav_stregth,3)) \ No newline at end of file + adjustBruteLoss(min(grav_stregth,3)) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index c1038fbb41..5b21abfb84 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -19,6 +19,8 @@ med_hud_set_status() /mob/living/Destroy() + end_parry_sequence() + stop_active_blocking() if(LAZYLEN(status_effects)) for(var/s in status_effects) var/datum/status_effect/S = s diff --git a/code/modules/mob/living/living_active_block.dm b/code/modules/mob/living/living_active_block.dm new file mode 100644 index 0000000000..e1b90716b6 --- /dev/null +++ b/code/modules/mob/living/living_active_block.dm @@ -0,0 +1,275 @@ +// Active directional block system. Shared code is in [living_blocking_parrying.dm] +/mob/living/proc/stop_active_blocking(was_forced = FALSE) + if(!(combat_flags & (COMBAT_FLAG_ACTIVE_BLOCK_STARTING | COMBAT_FLAG_ACTIVE_BLOCKING))) + return FALSE + var/obj/item/I = active_block_item + combat_flags &= ~(COMBAT_FLAG_ACTIVE_BLOCKING | COMBAT_FLAG_ACTIVE_BLOCK_STARTING) + active_block_effect_end() + active_block_item = null + REMOVE_TRAIT(src, TRAIT_MOBILITY_NOUSE, ACTIVE_BLOCK_TRAIT) + REMOVE_TRAIT(src, TRAIT_SPRINT_LOCKED, ACTIVE_BLOCK_TRAIT) + remove_movespeed_modifier(/datum/movespeed_modifier/active_block) + var/datum/block_parry_data/data = I.get_block_parry_data() + if(timeToNextMove() < data.block_end_click_cd_add) + changeNext_move(data.block_end_click_cd_add) + return TRUE + +/mob/living/proc/start_active_blocking(obj/item/I) + if(combat_flags & (COMBAT_FLAG_ACTIVE_BLOCK_STARTING | COMBAT_FLAG_ACTIVE_BLOCKING)) + return FALSE + if(!(I in held_items)) + return FALSE + var/datum/block_parry_data/data = I.get_block_parry_data() + if(!istype(data)) //Typecheck because if an admin/coder screws up varediting or something we do not want someone being broken forever, the CRASH logs feedback so we know what happened. + CRASH("start_active_blocking called with an item with no valid data: [I] --> [I.block_parry_data]!") + combat_flags |= COMBAT_FLAG_ACTIVE_BLOCKING + active_block_item = I + if(data.block_lock_attacking) + ADD_TRAIT(src, TRAIT_MOBILITY_NOUSE, ACTIVE_BLOCK_TRAIT) //probably should be something else at some point + if(data.block_lock_sprinting) + ADD_TRAIT(src, TRAIT_SPRINT_LOCKED, ACTIVE_BLOCK_TRAIT) + add_or_update_variable_movespeed_modifier(/datum/movespeed_modifier/active_block, multiplicative_slowdown = data.block_slowdown) + active_block_effect_start() + return TRUE + +/// Visual effect setup for starting a directional block +/mob/living/proc/active_block_effect_start() + visible_message("[src] raises their [active_block_item], dropping into a defensive stance!") + animate(src, pixel_x = get_standard_pixel_x_offset(), pixel_y = get_standard_pixel_y_offset(), time = 2.5, FALSE, SINE_EASING | EASE_OUT) + +/// Visual effect cleanup for starting a directional block +/mob/living/proc/active_block_effect_end() + visible_message("[src] lowers their [active_block_item].") + animate(src, pixel_x = get_standard_pixel_x_offset(), pixel_y = get_standard_pixel_y_offset(), time = 2.5, FALSE, SINE_EASING | EASE_IN) + +/mob/living/proc/continue_starting_active_block() + if(SEND_SIGNAL(src, COMSIG_COMBAT_MODE_CHECK, COMBAT_MODE_INACTIVE)) + return DO_AFTER_STOP + return (combat_flags & COMBAT_FLAG_ACTIVE_BLOCK_STARTING)? DO_AFTER_CONTINUE : DO_AFTER_STOP + +/mob/living/get_standard_pixel_x_offset() + . = ..() + if(combat_flags & (COMBAT_FLAG_ACTIVE_BLOCK_STARTING | COMBAT_FLAG_ACTIVE_BLOCKING)) + if(dir & EAST) + . += 8 + if(dir & WEST) + . -= 8 + +/mob/living/get_standard_pixel_y_offset() + . = ..() + if(combat_flags & (COMBAT_FLAG_ACTIVE_BLOCK_STARTING | COMBAT_FLAG_ACTIVE_BLOCKING)) + if(dir & NORTH) + . += 8 + if(dir & SOUTH) + . -= 8 + +/** + * Proc called by keybindings to toggle active blocking. + */ +/mob/living/proc/keybind_toggle_active_blocking() + if(combat_flags & (COMBAT_FLAG_ACTIVE_BLOCK_STARTING | COMBAT_FLAG_ACTIVE_BLOCKING)) + return keybind_stop_active_blocking() + else + return keybind_start_active_blocking() + +/** + * Proc called by keybindings to start active blocking. + */ +/mob/living/proc/keybind_start_active_blocking() + if(combat_flags & (COMBAT_FLAG_ACTIVE_BLOCK_STARTING | COMBAT_FLAG_ACTIVE_BLOCKING)) + return FALSE + if(!(combat_flags & COMBAT_FLAG_BLOCK_CAPABLE)) + to_chat(src, "You're not something that can actively block.") + return FALSE + // QOL: Instead of trying to just block with held item, grab first available item. + var/obj/item/I = find_active_block_item() + if(!I) + to_chat(src, "You can't block with your bare hands!") + return + if(!I.can_active_block()) + to_chat(src, "[I] is either not capable of being used to actively block, or is not currently in a state that can! (Try wielding it if it's twohanded, for example.)") + return + // QOL: Attempt to toggle on combat mode if it isn't already + SEND_SIGNAL(src, COMSIG_ENABLE_COMBAT_MODE) + if(!SEND_SIGNAL(src, COMSIG_COMBAT_MODE_CHECK, COMBAT_MODE_ACTIVE)) + to_chat(src, "You must be in combat mode to actively block!") + return FALSE + var/datum/block_parry_data/data = I.get_block_parry_data() + var/delay = data.block_start_delay + combat_flags |= COMBAT_FLAG_ACTIVE_BLOCK_STARTING + animate(src, pixel_x = get_standard_pixel_x_offset(), pixel_y = get_standard_pixel_y_offset(), time = delay, FALSE, SINE_EASING | EASE_IN) + if(!do_after_advanced(src, delay, src, DO_AFTER_REQUIRES_USER_ON_TURF|DO_AFTER_NO_COEFFICIENT, CALLBACK(src, .proc/continue_starting_active_block), MOBILITY_USE, null, null, I)) + to_chat(src, "You fail to raise [I].") + combat_flags &= ~(COMBAT_FLAG_ACTIVE_BLOCK_STARTING) + animate(src, pixel_x = get_standard_pixel_x_offset(), pixel_y = get_standard_pixel_y_offset(), time = 2.5, FALSE, SINE_EASING | EASE_IN, ANIMATION_END_NOW) + return + combat_flags &= ~(COMBAT_FLAG_ACTIVE_BLOCK_STARTING) + start_active_blocking(I) + +/** + * Gets the first item we can that can block, but if that fails, default to active held item.COMSIG_ENABLE_COMBAT_MODE + */ +/mob/living/proc/find_active_block_item() + var/obj/item/held = get_active_held_item() + if(!held?.can_active_block()) + for(var/obj/item/I in held_items - held) + if(I.can_active_block()) + return I + return held + +/** + * Proc called by keybindings to stop active blocking. + */ +/mob/living/proc/keybind_stop_active_blocking() + combat_flags &= ~(COMBAT_FLAG_ACTIVE_BLOCK_STARTING) + if(combat_flags & COMBAT_FLAG_ACTIVE_BLOCKING) + stop_active_blocking(FALSE) + return TRUE + +/** + * Returns if we can actively block. + */ +/obj/item/proc/can_active_block() + return block_parry_data && (item_flags & ITEM_CAN_BLOCK) + +/** + * Calculates FINAL ATTACK DAMAGE after mitigation + */ +/obj/item/proc/active_block_calculate_final_damage(mob/living/owner, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, final_block_chance, list/block_return) + var/datum/block_parry_data/data = get_block_parry_data() + var/absorption = data.attack_type_list_scan(data.block_damage_absorption_override, attack_type) + var/efficiency = data.attack_type_list_scan(data.block_damage_multiplier_override, attack_type) + var/limit = data.attack_type_list_scan(data.block_damage_limit_override, attack_type) + // must use isnulls to handle 0's. + if(isnull(absorption)) + absorption = data.block_damage_absorption + if(isnull(efficiency)) + efficiency = data.block_damage_multiplier + if(isnull(limit)) + limit = data.block_damage_limit + // now we calculate damage to reduce. + var/final_damage = 0 + // apply limit + if(damage > limit) //clamp and apply overrun + final_damage += (damage - limit) + damage = limit + // apply absorption + damage -= min(absorption, damage) //this way if damage is less than absorption it 0's properly. + // apply multiplier to remaining + final_damage += (damage * efficiency) + return final_damage + +/// Amount of stamina from damage blocked. Note that the damage argument is damage_blocked. +/obj/item/proc/active_block_stamina_cost(mob/living/owner, atom/object, damage_blocked, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, final_block_chance, list/block_return) + var/datum/block_parry_data/data = get_block_parry_data() + var/efficiency = data.attack_type_list_scan(data.block_stamina_efficiency_override, attack_type) + if(isnull(efficiency)) + efficiency = data.block_stamina_efficiency + var/multiplier = 1 + if(!CHECK_MOBILITY(owner, MOBILITY_STAND)) + multiplier = data.attack_type_list_scan(data.block_resting_stamina_penalty_multiplier_override, attack_type) + if(isnull(multiplier)) + multiplier = data.block_resting_stamina_penalty_multiplier + return (damage_blocked / efficiency) * multiplier + +/// Apply the stamina damage to our user, notice how damage argument is stamina_amount. +/obj/item/proc/active_block_do_stamina_damage(mob/living/owner, atom/object, stamina_amount, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, final_block_chance, list/block_return) + var/datum/block_parry_data/data = get_block_parry_data() + if(iscarbon(owner)) + var/mob/living/carbon/C = owner + var/held_index = C.get_held_index_of_item(src) + var/obj/item/bodypart/BP = C.hand_bodyparts[held_index] + if(!BP?.body_zone) + return C.adjustStaminaLossBuffered(stamina_amount) //nah + var/zone = BP.body_zone + var/stamina_to_zone = data.block_stamina_limb_ratio * stamina_amount + var/stamina_to_chest = stamina_amount - stamina_to_zone + var/stamina_buffered = stamina_to_chest * data.block_stamina_buffer_ratio + stamina_to_chest -= stamina_buffered + C.apply_damage(stamina_to_zone, STAMINA, zone) + C.apply_damage(stamina_to_chest, STAMINA, BODY_ZONE_CHEST) + C.adjustStaminaLossBuffered(stamina_buffered) + else + owner.adjustStaminaLossBuffered(stamina_amount) + +/obj/item/proc/on_active_block(mob/living/owner, atom/object, damage, damage_blocked, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, final_block_chance, list/block_return, override_direction) + return + +/obj/item/proc/active_block(mob/living/owner, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, final_block_chance, list/block_return, override_direction) + if(!can_active_block()) + return BLOCK_NONE + var/datum/block_parry_data/data = get_block_parry_data() + if(attack_type && !(attack_type & data.can_block_attack_types)) + return BLOCK_NONE + var/incoming_direction + if(isnull(override_direction)) + if(istype(object, /obj/item/projectile)) + var/obj/item/projectile/P = object + incoming_direction = angle2dir(P.Angle) + else + incoming_direction = get_dir(get_turf(attacker) || get_turf(object), src) + if(!CHECK_MOBILITY(owner, MOBILITY_STAND) && !(data.block_resting_attack_types_anydir & attack_type) && (!(data.block_resting_attack_types_directional & attack_type) || !can_block_direction(owner.dir, incoming_direction))) + return BLOCK_NONE + else if(!can_block_direction(owner.dir, incoming_direction)) + return BLOCK_NONE + block_return[BLOCK_RETURN_ACTIVE_BLOCK] = TRUE + var/final_damage = active_block_calculate_final_damage(owner, object, damage, attack_text, attack_type, armour_penetration, attacker, def_zone, final_block_chance, block_return) + var/damage_blocked = damage - final_damage + var/stamina_cost = active_block_stamina_cost(owner, object, damage_blocked, attack_text, attack_type, armour_penetration, attacker, def_zone, final_block_chance, block_return) + active_block_do_stamina_damage(owner, object, stamina_cost, attack_text, attack_type, armour_penetration, attacker, def_zone, final_block_chance, block_return) + block_return[BLOCK_RETURN_ACTIVE_BLOCK_DAMAGE_MITIGATED] = damage - final_damage + block_return[BLOCK_RETURN_SET_DAMAGE_TO] = final_damage + . = BLOCK_SHOULD_CHANGE_DAMAGE + if((final_damage <= 0) || (damage <= 0)) + . |= BLOCK_SUCCESS //full block + owner.visible_message("[owner] blocks \the [attack_text] with [src]!") + else + owner.visible_message("[owner] dampens \the [attack_text] with [src]!") + block_return[BLOCK_RETURN_PROJECTILE_BLOCK_PERCENTAGE] = data.block_projectile_mitigation + if(length(data.block_sounds)) + playsound(loc, pickweight(data.block_sounds), 75, TRUE) + on_active_block(owner, object, damage, damage_blocked, attack_text, attack_type, armour_penetration, attacker, def_zone, final_block_chance, block_return, override_direction) + +/obj/item/proc/check_active_block(mob/living/owner, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, final_block_chance, list/block_return) + if(!can_active_block()) + return + var/incoming_direction = get_dir(get_turf(attacker) || get_turf(object), src) + if(!can_block_direction(owner.dir, incoming_direction)) + return + block_return[BLOCK_RETURN_ACTIVE_BLOCK] = TRUE + block_return[BLOCK_RETURN_ACTIVE_BLOCK_DAMAGE_MITIGATED] = damage - active_block_calculate_final_damage(owner, object, damage, attack_text, attack_type, armour_penetration, attacker, def_zone, final_block_chance, block_return) + +/** + * Gets the block direction bitflags of what we can block. + */ +/obj/item/proc/blockable_directions() + var/datum/block_parry_data/data = get_block_parry_data() + return data.can_block_directions + +/** + * Checks if we can block from a specific direction from our direction. + * + * @params + * * our_dir - our direction. + * * their_dir - their direction. Must be a single direction, or NONE for an attack from the same tile. This is incoming direction. + */ +/obj/item/proc/can_block_direction(our_dir, their_dir) + their_dir = turn(their_dir, 180) + if(our_dir != NORTH) + var/turn_angle = dir2angle(our_dir) + // dir2angle(), ss13 proc is clockwise so dir2angle(EAST) == 90 + // turn(), byond proc is counterclockwise so turn(NORTH, 90) == WEST + their_dir = turn(their_dir, turn_angle) + return (DIR2BLOCKDIR(their_dir) & blockable_directions()) + +/** + * can_block_direction but for "compound" directions to check all of them and return the number of directions that were blocked. + * + * @params + * * our_dir - our direction. + * * their_dirs - list of their directions as we cannot use bitfields here. + */ +/obj/item/proc/can_block_directions_multiple(our_dir, list/their_dirs) + . = FALSE + for(var/i in their_dirs) + . |= can_block_direction(our_dir, i) diff --git a/code/modules/mob/living/living_active_parry.dm b/code/modules/mob/living/living_active_parry.dm new file mode 100644 index 0000000000..50b51d4d95 --- /dev/null +++ b/code/modules/mob/living/living_active_parry.dm @@ -0,0 +1,332 @@ +// Active parry system goes in here. +/** + * Determines if we can actively parry. + */ +/obj/item/proc/can_active_parry() + return block_parry_data && (item_flags & ITEM_CAN_PARRY) + +/** + * Called from keybindings. + */ +/mob/living/proc/keybind_parry() + initiate_parry_sequence() + +/** + * Initiates a parrying sequence. + */ +/mob/living/proc/initiate_parry_sequence() + if(parrying) + return // already parrying + if(!(combat_flags & COMBAT_FLAG_PARRY_CAPABLE)) + to_chat(src, "You are not something that can parry attacks.") + return + // Prioritize item, then martial art, then unarmed. + // yanderedev else if time + var/obj/item/using_item = get_active_held_item() + var/datum/block_parry_data/data + var/method + if(using_item?.can_active_parry()) + data = using_item.block_parry_data + method = ITEM_PARRY + else if(mind?.martial_art?.can_martial_parry) + data = mind.martial_art.block_parry_data + method = MARTIAL_PARRY + else if(combat_flags & COMBAT_FLAG_UNARMED_PARRY) + data = block_parry_data + method = UNARMED_PARRY + else + // QOL: If none of the above work, try to find another item. + var/obj/item/backup = find_backup_parry_item() + if(!backup) + to_chat(src, "You have nothing to parry with!") + return FALSE + data = backup.block_parry_data + using_item = backup + method = ITEM_PARRY + //QOL: Try to enable combat mode if it isn't already + SEND_SIGNAL(src, COMSIG_ENABLE_COMBAT_MODE) + if(!SEND_SIGNAL(src, COMSIG_COMBAT_MODE_CHECK, COMBAT_MODE_ACTIVE)) + to_chat(src, "You must be in combat mode to parry!") + return FALSE + data = return_block_parry_datum(data) + var/full_parry_duration = data.parry_time_windup + data.parry_time_active + data.parry_time_spindown + // no system in place to "fallback" if out of the 3 the top priority one can't parry due to constraints but something else can. + // can always implement it later, whatever. + if((data.parry_respect_clickdelay && (next_move > world.time)) || ((parry_end_time_last + data.parry_cooldown) > world.time)) + to_chat(src, "You are not ready to parry (again)!") + return + // Point of no return, make sure everything is set. + parrying = method + if(method == ITEM_PARRY) + active_parry_item = using_item + adjustStaminaLossBuffered(data.parry_stamina_cost) + parry_start_time = world.time + successful_parries = list() + addtimer(CALLBACK(src, .proc/end_parry_sequence), full_parry_duration) + if(data.parry_flags & PARRY_LOCK_ATTACKING) + ADD_TRAIT(src, TRAIT_MOBILITY_NOUSE, ACTIVE_PARRY_TRAIT) + if(data.parry_flags & PARRY_LOCK_SPRINTING) + ADD_TRAIT(src, TRAIT_SPRINT_LOCKED, ACTIVE_PARRY_TRAIT) + handle_parry_starting_effects(data) + return TRUE + +/** + * Tries to find a backup parry item. + * Does not look at active held item. + */ +/mob/living/proc/find_backup_parry_item() + for(var/obj/item/I in held_items - get_active_held_item()) + if(I.can_active_parry()) + return I + +/** + * Called via timer when the parry sequence ends. + */ +/mob/living/proc/end_parry_sequence() + if(!parrying) + return + REMOVE_TRAIT(src, TRAIT_MOBILITY_NOUSE, ACTIVE_PARRY_TRAIT) + REMOVE_TRAIT(src, TRAIT_SPRINT_LOCKED, ACTIVE_PARRY_TRAIT) + if(parry_visual_effect) + QDEL_NULL(parry_visual_effect) + var/datum/block_parry_data/data = get_parry_data() + var/list/effect_text = list() + var/successful = FALSE + for(var/efficiency in successful_parries) + if(efficiency >= data.parry_efficiency_considered_successful) + successful = TRUE + break + if(!successful) // didn't parry anything successfully + if(data.parry_failed_stagger_duration) + Stagger(data.parry_failed_stagger_duration) + effect_text += "staggering themselves" + if(data.parry_failed_clickcd_duration) + changeNext_move(data.parry_failed_clickcd_duration) + effect_text += "throwing themselves off balance" + handle_parry_ending_effects(data, effect_text) + parrying = NOT_PARRYING + parry_start_time = 0 + parry_end_time_last = world.time + successful_parries = null + +/** + * Handles starting effects for parrying. + */ +/mob/living/proc/handle_parry_starting_effects(datum/block_parry_data/data) + playsound(src, data.parry_start_sound, 75, 1) + parry_visual_effect = new /obj/effect/abstract/parry/main(null, TRUE, src, data.parry_effect_icon_state, data.parry_time_windup_visual_override || data.parry_time_windup, data.parry_time_active_visual_override || data.parry_time_active, data.parry_time_spindown_visual_override || data.parry_time_spindown) + switch(parrying) + if(ITEM_PARRY) + visible_message("[src] swings [active_parry_item]!") + else + visible_message("[src] rushes forwards!") + +/** + * Handles ending effects for parrying. + */ +/mob/living/proc/handle_parry_ending_effects(datum/block_parry_data/data, list/failed_effect_text) + if(length(successful_parries)) + return + visible_message("[src] fails to connect their parry[failed_effect_text? ", [english_list(failed_effect_text)]" : ""]!") + +/** + * Gets this item's datum/block_parry_data + */ +/obj/item/proc/get_block_parry_data() + return return_block_parry_datum(block_parry_data) + +//Stubs. + +/** + * Called when an attack is parried using this, whether or not the parry was successful. + */ +/obj/item/proc/on_active_parry(mob/living/owner, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, final_block_chance, list/block_return, parry_efficiency, parry_time) + +/** + * Called when an attack is parried innately, whether or not the parry was successful. + */ +/mob/living/proc/on_active_parry(mob/living/owner, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, final_block_chance, list/block_return, parry_efficiency, parry_time) + +/** + * Called when an attack is parried using this, whether or not the parry was successful. + */ +/datum/martial_art/proc/on_active_parry(mob/living/owner, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, final_block_chance, list/block_return, parry_efficiency, parry_time) + +/** + * Called when an attack is parried and block_parra_data indicates to use a proc to handle counterattack. + */ +/obj/item/proc/active_parry_reflex_counter(mob/living/owner, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, list/return_list, parry_efficiency, list/effect_text) + +/** + * Called when an attack is parried and block_parra_data indicates to use a proc to handle counterattack. + */ +/mob/living/proc/active_parry_reflex_counter(mob/living/owner, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, list/return_list, parry_efficiency, list/effect_text) + +/** + * Called when an attack is parried and block_parra_data indicates to use a proc to handle counterattack. + */ +/datum/martial_art/proc/active_parry_reflex_counter(mob/living/owner, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, list/return_list, parry_efficiency, list/effect_text) + +/** + * Gets the stage of our parry sequence we're currently in. + */ +/mob/living/proc/get_parry_stage() + if(!parrying) + return NOT_PARRYING + var/datum/block_parry_data/data = get_parry_data() + var/windup_end = data.parry_time_windup + var/active_end = windup_end + data.parry_time_active + var/spindown_end = active_end + data.parry_time_spindown + var/current_time = get_parry_time() + // Not a switch statement because byond switch statements don't support floats at time of writing with "to" keyword. + if(current_time < 0) + return NOT_PARRYING + else if(current_time < windup_end) + return PARRY_WINDUP + else if(current_time <= active_end) // this uses <= on purpose, give a slight bit of advantage because time is rounded to world.tick_lag + return PARRY_ACTIVE + else if(current_time <= spindown_end) + return PARRY_SPINDOWN + else + return NOT_PARRYING + +/** + * Gets the current decisecond "frame" of an active parry. + */ +/mob/living/proc/get_parry_time() + return world.time - parry_start_time + +/// same return values as normal blocking, called with absolute highest priority in the block "chain". +/mob/living/proc/run_parry(atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, list/return_list = list()) + var/stage = get_parry_stage() + if(stage != PARRY_ACTIVE) + return BLOCK_NONE + var/datum/block_parry_data/data = get_parry_data() + if(attack_type && (!(attack_type & data.parry_attack_types) || (attack_type & ATTACK_TYPE_PARRY_COUNTERATTACK))) // if this attack is from a parry do not parry it lest we infinite loop. + return BLOCK_NONE + var/efficiency = data.get_parry_efficiency(attack_type, get_parry_time()) + switch(parrying) + if(ITEM_PARRY) + if(!active_parry_item.can_active_parry()) + return BLOCK_NONE + . = active_parry_item.on_active_parry(src, object, damage, attack_text, attack_type, armour_penetration, attacker, def_zone, return_list, efficiency, get_parry_time()) + if(UNARMED_PARRY) + . = on_active_parry(src, object, damage, attack_text, attack_type, armour_penetration, attacker, def_zone, return_list, efficiency, get_parry_time()) + if(MARTIAL_PARRY) + . = mind.martial_art.on_active_parry(src, object, damage, attack_text, attack_type, armour_penetration, attacker, def_zone, return_list, efficiency, get_parry_time()) + if(!isnull(return_list[BLOCK_RETURN_OVERRIDE_PARRY_EFFICIENCY])) // one of our procs overrode + efficiency = return_list[BLOCK_RETURN_OVERRIDE_PARRY_EFFICIENCY] + if(efficiency <= 0) // Do not allow automatically handled/standardized parries that increase damage for now. + return + . |= BLOCK_SHOULD_PARTIAL_MITIGATE + if(isnull(return_list[BLOCK_RETURN_MITIGATION_PERCENT])) // if one of the on_active_parry procs overrode. We don't have to worry about interference since parries are the first thing checked in the [do_run_block()] sequence. + return_list[BLOCK_RETURN_MITIGATION_PERCENT] = clamp(efficiency, 0, 100) // do not allow > 100% or < 0% for now. + if((return_list[BLOCK_RETURN_MITIGATION_PERCENT] >= 100) || (damage <= 0)) + . |= BLOCK_SUCCESS + var/list/effect_text + if(efficiency >= data.parry_efficiency_to_counterattack) + run_parry_countereffects(object, damage, attack_text, attack_type, armour_penetration, attacker, def_zone, return_list, efficiency) + if(data.parry_flags & PARRY_DEFAULT_HANDLE_FEEDBACK) + handle_parry_feedback(object, damage, attack_text, attack_type, armour_penetration, attacker, def_zone, return_list, efficiency, effect_text) + successful_parries += efficiency + if(length(successful_parries) >= data.parry_max_attacks) + end_parry_sequence() + +/mob/living/proc/handle_parry_feedback(atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, list/return_list = list(), parry_efficiency, list/effect_text) + var/datum/block_parry_data/data = get_parry_data() + if(data.parry_sounds) + playsound(src, pick(data.parry_sounds), 75) + visible_message("[src] parries \the [attack_text][length(effect_text)? ", [english_list(effect_text)] [attacker]" : ""]!") + +/// Run counterattack if any +/mob/living/proc/run_parry_countereffects(atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, list/return_list = list(), parry_efficiency) + if(!isliving(attacker)) + return + var/mob/living/L = attacker + var/datum/block_parry_data/data = get_parry_data() + var/list/effect_text = list() + // Always proc so items can override behavior easily + switch(parrying) + if(ITEM_PARRY) + active_parry_item.active_parry_reflex_counter(src, object, damage, attack_text, attack_type, armour_penetration, attacker, def_zone, return_list, parry_efficiency, effect_text) + if(UNARMED_PARRY) + active_parry_reflex_counter(src, object, damage, attack_text, attack_type, armour_penetration, attacker, def_zone, return_list, parry_efficiency, effect_text) + if(MARTIAL_PARRY) + mind.martial_art.active_parry_reflex_counter(src, object, damage, attack_text, attack_type, armour_penetration, attacker, def_zone, return_list, parry_efficiency, effect_text) + if(Adjacent(attacker) || data.parry_data[PARRY_COUNTERATTACK_IGNORE_ADJACENCY]) + if(data.parry_data[PARRY_COUNTERATTACK_MELEE_ATTACK_CHAIN]) + switch(parrying) + if(ITEM_PARRY) + active_parry_item.melee_attack_chain(src, attacker, null, ATTACKCHAIN_PARRY_COUNTERATTACK, data.parry_data[PARRY_COUNTERATTACK_MELEE_ATTACK_CHAIN]) + effect_text += "reflexively counterattacking with [active_parry_item]" + if(UNARMED_PARRY) // WARNING: If you are using these two, the attackchain parry counterattack flags and damage multipliers are unimplemented. Be careful with how you handle this. + UnarmedAttack(attacker) + effect_text += "reflexively counterattacking in the process" + if(MARTIAL_PARRY) // Not well implemeneted, recommend custom implementation using the martial art datums. + UnarmedAttack(attacker) + effect_text += "reflexively maneuvering to retaliate" + if(data.parry_data[PARRY_DISARM_ATTACKER]) + L.drop_all_held_items() + effect_text += "disarming" + if(data.parry_data[PARRY_KNOCKDOWN_ATTACKER]) + L.DefaultCombatKnockdown(data.parry_data[PARRY_KNOCKDOWN_ATTACKER]) + effect_text += "knocking them to the ground" + if(data.parry_data[PARRY_STAGGER_ATTACKER]) + L.Stagger(data.parry_data[PARRY_STAGGER_ATTACKER]) + effect_text += "staggering" + if(data.parry_data[PARRY_DAZE_ATTACKER]) + L.Daze(data.parry_data[PARRY_DAZE_ATTACKER]) + effect_text += "dazing" + return effect_text + +/// Gets the datum/block_parry_data we're going to use to parry. +/mob/living/proc/get_parry_data() + if(parrying == ITEM_PARRY) + return active_parry_item.get_block_parry_data() + else if(parrying == UNARMED_PARRY) + return return_block_parry_datum(block_parry_data) + else if(parrying == MARTIAL_PARRY) + return return_block_parry_datum(mind.martial_art.block_parry_data) + +/// Effects +/obj/effect/abstract/parry + icon = 'icons/effects/block_parry.dmi' + mouse_opacity = MOUSE_OPACITY_TRANSPARENT + layer = FLOAT_LAYER + plane = FLOAT_PLANE + vis_flags = VIS_INHERIT_LAYER|VIS_INHERIT_PLANE + /// The person we're on + var/mob/living/owner + +/obj/effect/abstract/parry/main + name = null + +/obj/effect/abstract/parry/main/Initialize(mapload, autorun, mob/living/owner, set_icon_state, windup, active, spindown) + . = ..() + icon_state = set_icon_state + if(owner) + attach_to(owner) + if(autorun) + INVOKE_ASYNC(src, .proc/run_animation, windup, active, spindown) + +/obj/effect/abstract/parry/main/Destroy() + detach_from(owner) + return ..() + +/obj/effect/abstract/parry/main/proc/attach_to(mob/living/attaching) + if(owner) + detach_from(owner) + owner = attaching + owner.vis_contents += src + +/obj/effect/abstract/parry/main/proc/detach_from(mob/living/detaching) + if(detaching == owner) + owner = null + detaching.vis_contents -= src + +/obj/effect/abstract/parry/main/proc/run_animation(windup_time = 2, active_time = 5, spindown_time = 3) + var/matrix/current = transform + transform = matrix(0.1, 0, 0, 0, 0.1, 0) + animate(src, transform = current, time = windup_time) + sleep(active_time) + animate(src, alpha = 0, spindown_time) diff --git a/code/modules/mob/living/living_block.dm b/code/modules/mob/living/living_block.dm index 817863f257..d32265e478 100644 --- a/code/modules/mob/living/living_block.dm +++ b/code/modules/mob/living/living_block.dm @@ -1,31 +1,6 @@ // This file has a weird name, but it's for anything related to the checks for shields, blocking, dodging, // and similar "stop this attack before it actually impacts the target" as opposed to "defend once it has hit". -/* -/// You can find the mob_check_block() and mob_run_block() macros in __DEFINES/combat.dm - -/// Bitflags for check_block() and run_block(). Meant to be combined. You can be hit and still reflect, for example, if you do not use BLOCK_SUCCESS. -/// Attack was not blocked -#define BLOCK_NONE NONE -/// Attack was blocked, do not do damage. THIS FLAG MUST BE THERE FOR DAMAGE/EFFECT PREVENTION! -#define BLOCK_SUCCESS (1<<1) - -/// The below are for "metadata" on "how" the attack was blocked. - -/// Attack was and should be reflected (NOTE: the SHOULD here is important, as it says "the thing blocking isn't handling the reflecting for you so do it yourself"!) -#define BLOCK_SHOULD_REFLECT (1<<2) -/// Attack was manually redirected (including reflected) by any means by the defender. For when YOU are handling the reflection, rather than the thing hitting you. (see sleeping carp) -#define BLOCK_REDIRECTED (1<<3) -/// Attack was blocked by something like a shield. -#define BLOCK_PHYSICAL_EXTERNAL (1<<4) -/// Attack was blocked by something worn on you. -#define BLOCK_PHYSICAL_INTERNAL (1<<5) -/// Attack should pass through. Like SHOULD_REFLECT but for.. well, passing through harmlessly. -#define BLOCK_SHOULD_PASSTHROUGH (1<<6) -/// Attack outright missed because the target dodged. Should usually be combined with SHOULD_PASSTHROUGH or something (see martial arts) -#define BLOCK_TARGET_DODGED (1<<7) -*/ - /** The actual proc for block checks. DO NOT USE THIS DIRECTLY UNLESS YOU HAVE VERY GOOD REASON TO. To reduce copypaste for differences between handling for real attacks and virtual checks. * Automatically checks all held items for /obj/item/proc/run_block() with the same parameters. * @params @@ -39,21 +14,31 @@ * attacker - Set to the mob attacking IF KNOWN. Do not expect this to always be set! * def_zone - The zone this'll impact. * return_list - If something wants to grab things from what items/whatever put into list/block_return on obj/item/run_block and the comsig, pass in a list so you can grab anything put in it after block runs. + * attack_direction - Direction of the attack. It is highly recommended to put this in, as the automatic guesswork that's done otherwise is quite inaccurate at times. */ -/mob/living/proc/do_run_block(real_attack = TRUE, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, list/return_list = list()) +/mob/living/proc/do_run_block(real_attack = TRUE, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, list/return_list = list(), attack_direction) + if(real_attack) + . = run_parry(object, damage, attack_text, attack_type, armour_penetration, attacker, def_zone, return_list) //Parry - Highest priority! + if((. & BLOCK_SUCCESS) && !(. & BLOCK_CONTINUE_CHAIN)) + return // Component signal block runs have highest priority.. for now. - . = SEND_SIGNAL(src, COMSIG_LIVING_RUN_BLOCK, real_attack, object, damage, attack_text, attack_type, armour_penetration, attacker, def_zone, return_list) + . = SEND_SIGNAL(src, COMSIG_LIVING_RUN_BLOCK, real_attack, object, damage, attack_text, attack_type, armour_penetration, attacker, def_zone, return_list, attack_direction) if((. & BLOCK_SUCCESS) && !(. & BLOCK_CONTINUE_CHAIN)) + return_list[BLOCK_RETURN_PROJECTILE_BLOCK_PERCENTAGE] = 100 return var/list/obj/item/tocheck = get_blocking_items() - sortTim(tocheck, /proc/cmp_item_block_priority_asc) + sortTim(tocheck, /proc/cmp_numeric_dsc, TRUE) // i don't like this var/block_chance_modifier = round(damage / -3) if(real_attack) for(var/obj/item/I in tocheck) // i don't like this too var/final_block_chance = I.block_chance - (clamp((armour_penetration-I.armour_penetration)/2,0,100)) + block_chance_modifier //So armour piercing blades can still be parried by other blades, for example - var/results = I.run_block(src, object, damage, attack_text, attack_type, armour_penetration, attacker, def_zone, final_block_chance, return_list) + var/results + if(I == active_block_item) + results = I.active_block(src, object, damage, attack_text, attack_type, armour_penetration, attacker, def_zone, final_block_chance, return_list, attack_direction) + else + results = I.run_block(src, object, damage, attack_text, attack_type, armour_penetration, attacker, def_zone, final_block_chance, return_list) . |= results if((results & BLOCK_SUCCESS) && !(results & BLOCK_CONTINUE_CHAIN)) break @@ -61,17 +46,29 @@ for(var/obj/item/I in tocheck) // i don't like this too var/final_block_chance = I.block_chance - (clamp((armour_penetration-I.armour_penetration)/2,0,100)) + block_chance_modifier //So armour piercing blades can still be parried by other blades, for example - I.check_block(src, object, damage, attack_text, attack_type, armour_penetration, attacker, def_zone, final_block_chance, return_list) + if(I == active_block_item) //block is long termed enough we give a damn. parry, not so much. + I.check_active_block(src, object, damage, attack_text, attack_type, armour_penetration, attacker, def_zone, final_block_chance, return_list, attack_direction) + else + I.check_block(src, object, damage, attack_text, attack_type, armour_penetration, attacker, def_zone, final_block_chance, return_list) + if(. & BLOCK_SUCCESS) + return_list[BLOCK_RETURN_PROJECTILE_BLOCK_PERCENTAGE] = 100 + else if(isnull(return_list[BLOCK_RETURN_PROJECTILE_BLOCK_PERCENTAGE])) + return_list[BLOCK_RETURN_PROJECTILE_BLOCK_PERCENTAGE] = return_list[BLOCK_RETURN_MITIGATION_PERCENT] -/// Gets an unsortedlist of objects to run block checks on. +/// Gets an unsortedlist of objects to run block checks on. List must have associative values for priorities! /mob/living/proc/get_blocking_items() . = list() + if(active_block_item) + var/datum/block_parry_data/data = active_block_item.get_block_parry_data() + .[active_block_item] = data.block_active_priority SEND_SIGNAL(src, COMSIG_LIVING_GET_BLOCKING_ITEMS, .) for(var/obj/item/I in held_items) // this is a bad check but i am not removing it until a better catchall is made if(istype(I, /obj/item/clothing)) continue - . |= I + if(.[I]) //don't override block/parry. + continue + .[I] = I.block_priority /obj/item /// The 0% to 100% chance for the default implementation of random block rolls. @@ -95,3 +92,15 @@ SEND_SIGNAL(src, COMSIG_ITEM_CHECK_BLOCK, owner, object, damage, attack_text, attack_type, armour_penetration, attacker, def_zone, final_block_chance, block_return) var/existing = block_return[BLOCK_RETURN_NORMAL_BLOCK_CHANCE] block_return[BLOCK_RETURN_NORMAL_BLOCK_CHANCE] = max(existing || 0, final_block_chance) + +// HELPER PROCS + +/** + * Considers a block return_list and calculates damage to use from that. + */ +/proc/block_calculate_resultant_damage(damage, list/block_return) + if(!isnull(block_return[BLOCK_RETURN_SET_DAMAGE_TO])) // higher priority + return block_return[BLOCK_RETURN_SET_DAMAGE_TO] + else if(!isnull(block_return[BLOCK_RETURN_MITIGATION_PERCENT])) + return damage * ((100 - block_return[BLOCK_RETURN_MITIGATION_PERCENT]) * 0.01) + return damage diff --git a/code/modules/mob/living/living_blocking_parrying.dm b/code/modules/mob/living/living_blocking_parrying.dm new file mode 100644 index 0000000000..9f1ad1c27a --- /dev/null +++ b/code/modules/mob/living/living_blocking_parrying.dm @@ -0,0 +1,310 @@ +// yell at me later for file naming +// This file contains stuff relating to the new directional blocking and parry system. +GLOBAL_LIST_EMPTY(block_parry_data) + +/proc/return_block_parry_datum(datum/block_parry_data/type_id_datum) + if(istype(type_id_datum)) + return type_id_datum + if(ispath(type_id_datum)) + . = GLOB.block_parry_data["[type_id_datum]"] + if(!.) + . = GLOB.block_parry_data["[type_id_datum]"] = new type_id_datum + else //text id + return GLOB.block_parry_data["[type_id_datum]"] + +/proc/set_block_parry_datum(id, datum/block_parry_data/data) + if(ispath(id)) + CRASH("Path-fetching of block parry data is only to grab static data, do not attempt to modify global caches of paths. Use string IDs.") + GLOB.block_parry_data["[id]"] = data + +/// Carries data like list data that would be a waste of memory if we initialized the list on every /item as we can cache datums easier. +/datum/block_parry_data + /////////// BLOCKING //////////// + + /// NOTE: FOR ATTACK_TYPE_DEFINE, you MUST wrap it in "[DEFINE_HERE]"! The defines are bitflags, and therefore, NUMBERS! + + /// See defines. Point of reference is someone facing north. + var/can_block_directions = BLOCK_DIR_NORTH | BLOCK_DIR_NORTHEAST | BLOCK_DIR_NORTHWEST + /// Attacks we can block + var/can_block_attack_types = ALL + /// Our slowdown added while blocking + var/block_slowdown = 1 + /// Clickdelay added to user after block ends + var/block_end_click_cd_add = 0 + /// Disallow attacking during block + var/block_lock_attacking = TRUE + /// Disallow sprinting during block + var/block_lock_sprinting = FALSE + /// The priority we get in [mob/do_run_block()] while we're being used to parry. + var/block_active_priority = BLOCK_PRIORITY_ACTIVE_BLOCK + /// Windup before we have our blocking active. + var/block_start_delay = 5 + + /// Amount of "free" damage blocking absorbs + var/block_damage_absorption = 10 + /// Override absorption, list("[ATTACK_TYPE_DEFINE]" = absorption), see [block_damage_absorption] + var/list/block_damage_absorption_override + + /// Ratio of damage to allow through above absorption and below limit. Multiplied by damage to determine how much to let through. Lower is better. + var/block_damage_multiplier = 0.5 + /// Override damage overrun efficiency, list("[ATTACK_TYPE_DEFINE]" = absorption), see [block_damage_efficiency] + var/list/block_damage_multiplier_override + + /// Upper bound of damage block, anything above this will go right through. + var/block_damage_limit = 80 + /// Override upper bound of damage block, list("[ATTACK_TYPE_DEFINE]" = absorption), see [block_damage_limit] + var/list/block_damage_limit_override + + /// The blocked variable of on_hit() on projectiles is impacted by this. Higher is better, 0 to 100, percentage. + var/block_projectile_mitigation = 50 + + /* + * NOTE: Overrides for attack types for most the block_stamina variables were removed, + * because at the time of writing nothing needed to use it. Add them if you need it, + * it should be pretty easy, just copy [active_block_damage_mitigation] + * for how to override with list. + */ + + /// Default damage-to-stamina coefficient, higher is better. This is based on amount of damage BLOCKED, not initial damage, to prevent damage from "double dipping". + var/block_stamina_efficiency = 2 + /// Override damage-to-stamina coefficient, see [block_efficiency], this should be list("[ATTACK_TYPE_DEFINE]" = coefficient_number) + var/list/block_stamina_efficiency_override + /// Ratio of stamina incurred by blocking that goes to the arm holding the object instead of the chest. Has no effect if this is not held in hand. + var/block_stamina_limb_ratio = 0.5 + /// Ratio of stamina incurred by chest (so after [block_stamina_limb_ratio] runs) that is buffered. + var/block_stamina_buffer_ratio = 1 + + /// Stamina dealt directly via adjustStaminaLossBuffered() per SECOND of block. + var/block_stamina_cost_per_second = 1.5 + + /// Bitfield for attack types that we can block while down. This will work in any direction. + var/block_resting_attack_types_anydir = ATTACK_TYPE_MELEE | ATTACK_TYPE_UNARMED | ATTACK_TYPE_TACKLE + /// Bitfield for attack types that we can block while down but only in our normal directions. + var/block_resting_attack_types_directional = ATTACK_TYPE_PROJECTILE | ATTACK_TYPE_THROWN + /// Multiplier to stamina damage taken for attacks blocked while downed. + var/block_resting_stamina_penalty_multiplier = 1.5 + /// Override list for multiplier to stamina damage taken for attacks blocked while down. list("[ATTACK_TYPE_DEFINE]" = multiplier_number) + var/list/block_resting_stamina_penalty_multiplier_override + + /// Sounds for blocking + var/list/block_sounds = list('sound/block_parry/block_metal1.ogg' = 1, 'sound/block_parry/block_metal1.ogg' = 1) + + /////////// PARRYING //////////// + /// Prioriry for [mob/do_run_block()] while we're being used to parry. + // None - Parry is always highest priority! + /// Parry doesn't work if you aren't able to otherwise attack due to clickdelay + var/parry_respect_clickdelay = TRUE + /// Parry stamina cost + var/parry_stamina_cost = 5 + /// Attack types we can block + var/parry_attack_types = ALL + /// Parry flags + var/parry_flags = PARRY_DEFAULT_HANDLE_FEEDBACK | PARRY_LOCK_ATTACKING + + /// Parry windup duration in deciseconds. 0 to this is windup, afterwards is main stage. + var/parry_time_windup = 2 + /// Parry spindown duration in deciseconds. main stage end to this is the spindown stage, afterwards the parry fully ends. + var/parry_time_spindown = 3 + /// Main parry window in deciseconds. This is between [parry_time_windup] and [parry_time_spindown] + var/parry_time_active = 5 + // Visual overrides + /// If set, overrides visual duration of windup + var/parry_time_windup_visual_override + /// If set, overrides visual duration of active period + var/parry_time_active_visual_override + /// If set, overrides visual duration of spindown + var/parry_time_spindown_visual_override + /// Perfect parry window in deciseconds from the start of the main window. 3 with main 5 = perfect on third decisecond of main window. + var/parry_time_perfect = 2.5 + /// Time on both sides of perfect parry that still counts as part of the perfect window. + var/parry_time_perfect_leeway = 1 + /// [parry_time_perfect_leeway] override for attack types, list("[ATTACK_TYPE_DEFINE]" = deciseconds) + var/list/parry_time_perfect_leeway_override + /// Parry "efficiency" falloff in percent per decisecond once perfect window is over. + var/parry_imperfect_falloff_percent = 20 + /// [parry_imperfect_falloff_percent] override for attack types, list("[ATTACK_TYPE_DEFINE]" = deciseconds) + var/list/parry_imperfect_falloff_percent_override + /// Efficiency in percent on perfect parry. + var/parry_efficiency_perfect = 120 + /// Parry effect data. + var/list/parry_data = list( + PARRY_COUNTERATTACK_MELEE_ATTACK_CHAIN = 1 + ) + /// Efficiency must be at least this to be considered successful + var/parry_efficiency_considered_successful = 0.1 + /// Efficiency must be at least this to run automatic counterattack + var/parry_efficiency_to_counterattack = 0.1 + /// Maximum attacks to parry successfully or unsuccessfully (but not efficiency < 0) during active period, hitting this immediately ends the sequence. + var/parry_max_attacks = INFINITY + /// Visual icon state override for parrying + var/parry_effect_icon_state = "parry_bm_hold" + /// Parrying cooldown, separate of clickdelay. It must be this much deciseconds since their last parry for them to parry with this object. + var/parry_cooldown = 0 + /// Parry start sound + var/parry_start_sound = 'sound/block_parry/sfx-parry.ogg' + /// Sounds for parrying + var/list/parry_sounds = list('sound/block_parry/block_metal1.ogg' = 1, 'sound/block_parry/block_metal1.ogg' = 1) + /// Stagger duration post-parry if you fail to parry an attack + var/parry_failed_stagger_duration = 3.5 SECONDS + /// Clickdelay duration post-parry if you fail to parry an attack + var/parry_failed_clickcd_duration = 2 SECONDS + +/** + * Quirky proc to get average of flags in list that are in attack_type because why is attack_type a flag. + */ +/datum/block_parry_data/proc/attack_type_list_scan(list/L, attack_type) + var/total = 0 + var/div = 0 + for(var/flagtext in L) + if(attack_type & text2num(flagtext)) + total += L[flagtext] + div++ + // if none, return null. + if(!div) + return + return total/div //groan + + +/** + * Gets the percentage efficiency of our parry. + * + * Returns a percentage in normal 0 to 100 scale, but not clamped to just 0 to 100. + * This is a proc to allow for overriding. + * @params + * * attack_type - int, bitfield of the attack type(s) + * * parry_time - deciseconds since start of the parry. + */ +/datum/block_parry_data/proc/get_parry_efficiency(attack_type, parry_time) + var/difference = abs(parry_time - (parry_time_perfect + parry_time_windup)) + var/leeway = attack_type_list_scan(parry_time_perfect_leeway_override, attack_type) + if(isnull(leeway)) + leeway = parry_time_perfect_leeway + difference -= leeway + . = parry_efficiency_perfect + if(difference <= 0) + return + var/falloff = attack_type_list_scan(parry_imperfect_falloff_percent_override, attack_type) + if(isnull(falloff)) + falloff = parry_imperfect_falloff_percent + . -= falloff * difference + +#define RENDER_VARIABLE_SIMPLE(varname, desc) dat += "[desc]
[desc]
[desc]
[desc]
Block Stats
| Name/Description | Value |
|---|
Parry Stats
| Name/Description | Value |
|---|
" dat += GLOB.data_core.get_manifest() diff --git a/code/modules/mob/living/silicon/silicon_defense.dm b/code/modules/mob/living/silicon/silicon_defense.dm index cd50ffbae6..0850f0f886 100644 --- a/code/modules/mob/living/silicon/silicon_defense.dm +++ b/code/modules/mob/living/silicon/silicon_defense.dm @@ -33,7 +33,7 @@ /mob/living/silicon/attack_animal(mob/living/simple_animal/M) . = ..() if(.) - var/damage = rand(M.melee_damage_lower, M.melee_damage_upper) + var/damage = . if(prob(damage)) for(var/mob/living/N in buckled_mobs) N.DefaultCombatKnockdown(20) @@ -120,6 +120,7 @@ flash_act(affect_silicon = 1) /mob/living/silicon/bullet_act(obj/item/projectile/P, def_zone) + var/totaldamage = P.damage if(P.original != src || P.firer != src) //try to block or reflect the bullet, can't do so when shooting oneself var/list/returnlist = list() var/returned = mob_run_block(P, P.damage, "the [P.name]", ATTACK_TYPE_PROJECTILE, P.armour_penetration, P.firer, def_zone, returnlist) @@ -128,22 +129,18 @@ if(returned & BLOCK_REDIRECTED) return BULLET_ACT_FORCE_PIERCE if(returned & BLOCK_SUCCESS) - P.on_hit(src, 100, def_zone) + P.on_hit(src, returnlist[BLOCK_RETURN_PROJECTILE_BLOCK_PERCENTAGE], def_zone) return BULLET_ACT_BLOCK + totaldamage = block_calculate_resultant_damage(totaldamage, returnlist) if((P.damage_type == BRUTE || P.damage_type == BURN)) - adjustBruteLoss(P.damage) - if(prob(P.damage*1.5)) - for(var/mob/living/M in buckled_mobs) - M.visible_message("[M] is knocked off of [src]!", - "You are knocked off of [src]!") - unbuckle_mob(M) - M.DefaultCombatKnockdown(40) - if(P.stun || P.knockdown) + adjustBruteLoss(totaldamage) + if((P.damage >= 10) || P.stun || P.knockdown || (P.stamina >= 20)) for(var/mob/living/M in buckled_mobs) - unbuckle_mob(M) M.visible_message("[M] is knocked off of [src] by the [P]!", "You are knocked off of [src] by the [P]!") - P.on_hit(src) + unbuckle_mob(M) + M.DefaultCombatKnockdown(40) + P.on_hit(src, 0, def_zone) return BULLET_ACT_HIT /mob/living/silicon/flash_act(intensity = 1, override_blindness_check = 0, affect_silicon = 0, visual = 0, type = /obj/screen/fullscreen/flash/static) diff --git a/code/modules/mob/living/simple_animal/animal_defense.dm b/code/modules/mob/living/simple_animal/animal_defense.dm index 1e56e91ae1..278bb37d0d 100644 --- a/code/modules/mob/living/simple_animal/animal_defense.dm +++ b/code/modules/mob/living/simple_animal/animal_defense.dm @@ -94,7 +94,7 @@ /mob/living/simple_animal/attack_animal(mob/living/simple_animal/M) . = ..() if(.) - var/damage = rand(M.melee_damage_lower, M.melee_damage_upper) + var/damage = . return attack_threshold_check(damage, M.melee_damage_type) /mob/living/simple_animal/attack_slime(mob/living/simple_animal/slime/M) diff --git a/code/modules/mob/living/simple_animal/astral.dm b/code/modules/mob/living/simple_animal/astral.dm index 4fb9e9273e..eee42c214f 100644 --- a/code/modules/mob/living/simple_animal/astral.dm +++ b/code/modules/mob/living/simple_animal/astral.dm @@ -62,7 +62,7 @@ log_reagent("FERMICHEM: [src] has astrally transmitted [message] into [A]") //Delete the mob if there's no mind! Pay that mob no mind. -/mob/living/simple_animal/astral/Life() - if(!mind) - qdel(src) +/mob/living/simple_animal/astral/PhysicalLife(seconds, times_fired) . = ..() + if(!mind && !QDELETED(src)) + qdel(src) diff --git a/code/modules/mob/living/simple_animal/bot/bot.dm b/code/modules/mob/living/simple_animal/bot/bot.dm index 97f3dad3f0..39eccf9ad4 100644 --- a/code/modules/mob/living/simple_animal/bot/bot.dm +++ b/code/modules/mob/living/simple_animal/bot/bot.dm @@ -98,6 +98,10 @@ hud_possible = list(DIAG_STAT_HUD, DIAG_BOT_HUD, DIAG_HUD, DIAG_PATH_HUD = HUD_LIST_LIST) //Diagnostic HUD views + var/commissioned = FALSE // Will other (noncommissioned) bots salute this bot? + var/can_salute = TRUE + var/salute_delay = 60 SECONDS + /mob/living/simple_animal/bot/proc/get_mode() if(client) //Player bots do not have modes, thus the override. Also an easy way for PDA users/AI to know when a bot is a player. if(paicard) @@ -251,6 +255,14 @@ if(!on || client) return + if(!commissioned && can_salute) + for(var/mob/living/simple_animal/bot/B in get_hearers_in_view(5, get_turf(src))) + if(B.commissioned) + visible_message("[src] performs an elaborate salute for [B]!") + can_salute = FALSE + addtimer(VARSET_CALLBACK(src, can_salute, TRUE), salute_delay) + break + switch(mode) //High-priority overrides are processed first. Bots can do nothing else while under direct command. if(BOT_RESPONDING) //Called by the AI. call_mode() diff --git a/code/modules/mob/living/simple_animal/bot/cleanbot.dm b/code/modules/mob/living/simple_animal/bot/cleanbot.dm index 0b78cdc95a..174ac869fa 100644 --- a/code/modules/mob/living/simple_animal/bot/cleanbot.dm +++ b/code/modules/mob/living/simple_animal/bot/cleanbot.dm @@ -14,7 +14,7 @@ model = "Cleanbot" bot_core_type = /obj/machinery/bot_core/cleanbot window_id = "autoclean" - window_name = "Automatic Station Cleaner v1.2" + window_name = "Automatic Station Cleaner v1.3" pass_flags = PASSMOB path_image_color = "#993299" weather_immunities = list("lava","ash") @@ -36,8 +36,62 @@ var/next_dest var/next_dest_loc + var/obj/item/weapon + var/weapon_orig_force = 0 + var/chosen_name + + var/list/stolen_valor + + var/static/list/officers = list("Captain", "Head of Personnel", "Head of Security") + var/static/list/command = list("Captain" = "Cpt.","Head of Personnel" = "Lt.") + var/static/list/security = list("Head of Security" = "Maj.", "Warden" = "Sgt.", "Detective" = "Det.", "Security Officer" = "Officer") + var/static/list/engineering = list("Chief Engineer" = "Chief Engineer", "Station Engineer" = "Engineer", "Atmospherics Technician" = "Technician") + var/static/list/medical = list("Chief Medical Officer" = "C.M.O.", "Medical Doctor" = "M.D.", "Chemist" = "Pharm.D.") + var/static/list/research = list("Research Director" = "Ph.D.", "Roboticist" = "M.S.", "Scientist" = "B.S.") + var/static/list/legal = list("Lawyer" = "Esq.") + + var/list/prefixes + var/list/suffixes + +/mob/living/simple_animal/bot/cleanbot/proc/deputize(obj/item/W, mob/user) + if(in_range(src, user)) + to_chat(user, "You attach \the [W] to \the [src].") + user.transferItemToLoc(W, src) + weapon = W + weapon_orig_force = weapon.force + if(!emagged) + weapon.force = weapon.force / 2 + add_overlay(image(icon=weapon.lefthand_file,icon_state=weapon.item_state)) + +/mob/living/simple_animal/bot/cleanbot/proc/update_titles() + var/working_title = "" + + for(var/pref in prefixes) + for(var/title in pref) + if(title in stolen_valor) + working_title += pref[title] + " " + if(title in officers) + commissioned = TRUE + break + + working_title += chosen_name + + for(var/suf in suffixes) + for(var/title in suf) + if(title in stolen_valor) + working_title += " " + suf[title] + break + + name = working_title + +/mob/living/simple_animal/bot/cleanbot/examine(mob/user) + . = ..() + if(weapon) + . += " Is that \a [weapon] taped to it...?" + /mob/living/simple_animal/bot/cleanbot/Initialize() . = ..() + chosen_name = name get_targets() icon_state = "cleanbot[on]" @@ -45,6 +99,18 @@ access_card.access += J.get_access() prev_access = access_card.access + stolen_valor = list() + + prefixes = list(command, security, engineering) + suffixes = list(research, medical, legal) + +/mob/living/simple_animal/bot/cleanbot/Destroy() + if(weapon) + var/atom/Tsec = drop_location() + weapon.force = weapon_orig_force + drop_part(weapon, Tsec) + return ..() + /mob/living/simple_animal/bot/cleanbot/turn_on() ..() icon_state = "cleanbot[on]" @@ -57,6 +123,8 @@ /mob/living/simple_animal/bot/cleanbot/bot_reset() ..() + if(weapon && (emagged == 2)) + weapon.force = weapon_orig_force ignore_list = list() //Allows the bot to clean targets it previously ignored due to being unreachable. target = null oldloc = null @@ -66,6 +134,22 @@ text_dehack = "[name]'s software has been reset!" text_dehack_fail = "[name] does not seem to respond to your repair code!" +/mob/living/simple_animal/bot/cleanbot/Crossed(atom/movable/AM) + . = ..() + + zone_selected = pick(BODY_ZONE_L_LEG, BODY_ZONE_R_LEG) + if(weapon && has_gravity() && ismob(AM)) + var/mob/living/carbon/C = AM + if(!istype(C)) + return + + if(!(C.job in stolen_valor)) + stolen_valor += C.job + update_titles() + + weapon.attack(C, src) + C.Knockdown(20) + /mob/living/simple_animal/bot/cleanbot/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/card/id)||istype(W, /obj/item/pda)) if(bot_core.allowed(user) && !open && !emagged) @@ -79,6 +163,11 @@ else to_chat(user, "The [src] doesn't seem to respect your authority.") + else if(istype(W, /obj/item/kitchen/knife) && user.a_intent != INTENT_HARM) + to_chat(user, "You start attaching \the [W] to \the [src]...") + if(do_after(user, 25, target = src)) + deputize(W, user) + else if(istype(W, /obj/item/mop/advanced)) if(bot_core.allowed(user) && open && !CHECK_BITFIELD(upgrades,UPGRADE_CLEANER_ADVANCED_MOP)) to_chat(user, "You replace \the [src] old mop with a new better one!") @@ -87,10 +176,10 @@ window_name = "Automatic Station Cleaner v2.1 BETA" //New! qdel(W) if(!open) - to_chat(user, "The [src] access pannle is not open!") + to_chat(user, "The [src] access panel is not open!") return if(!bot_core.allowed(user)) - to_chat(user, "The [src] access pannel locked off to you!") + to_chat(user, "The [src] access panel locked off to you!") return else to_chat(user, "The [src] already has this mop!") @@ -116,6 +205,8 @@ /mob/living/simple_animal/bot/cleanbot/emag_act(mob/user) . = ..() if(emagged == 2) + if(weapon) + weapon.force = weapon_orig_force if(user) to_chat(user, "[src] buzzes and beeps.") diff --git a/code/modules/mob/living/simple_animal/bot/medbot.dm b/code/modules/mob/living/simple_animal/bot/medbot.dm index 7d93669c31..cbb495bf9c 100644 --- a/code/modules/mob/living/simple_animal/bot/medbot.dm +++ b/code/modules/mob/living/simple_animal/bot/medbot.dm @@ -1,7 +1,13 @@ //MEDBOT //MEDBOT PATHFINDING //MEDBOT ASSEMBLY - +#define MEDBOT_PANIC_NONE 0 +#define MEDBOT_PANIC_LOW 15 +#define MEDBOT_PANIC_MED 35 +#define MEDBOT_PANIC_HIGH 55 +#define MEDBOT_PANIC_FUCK 70 +#define MEDBOT_PANIC_ENDING 90 +#define MEDBOT_PANIC_END 100 /mob/living/simple_animal/bot/medbot name = "\improper Medibot" @@ -64,6 +70,13 @@ var/upgraded_dispenser_3 //Do we have the nicer chemicals? - replaces bic with sal acid var/upgraded_dispenser_4 //Do we have the nicer chemicals? - replaces charcoal/toxin with pentetic acid / pentetic jelly + //How panicked we are about being tipped over (why would you do this?) + var/tipped_status = MEDBOT_PANIC_NONE + //The name we got when we were tipped + var/tipper_name + //The last time we were tipped/righted and said a voice line, to avoid spam + var/last_tipping_action_voice = 0 + /mob/living/simple_animal/bot/medbot/mysterious name = "\improper Mysterious Medibot" desc = "International Medibot of mystery." @@ -373,10 +386,91 @@ else return +/mob/living/simple_animal/bot/medbot/proc/tip_over(mob/user) + mobility_flags &= ~MOBILITY_MOVE + playsound(src, 'sound/machines/warning-buzzer.ogg', 50) + user.visible_message("[user] tips over [src]!", "You tip [src] over!") + mode = BOT_TIPPED + var/matrix/mat = transform + transform = mat.Turn(180) + +/mob/living/simple_animal/bot/medbot/proc/set_right(mob/user) + mobility_flags &= MOBILITY_MOVE + var/list/messagevoice + if(user) + user.visible_message("[user] sets [src] right-side up!", "You set [src] right-side up!") + if(user.name == tipper_name) + messagevoice = list("I forgive you." = 'sound/voice/medbot/forgive.ogg') + else + messagevoice = list("Thank you!" = 'sound/voice/medbot/thank_you.ogg', "You are a good person." = 'sound/voice/medbot/youre_good.ogg') + else + visible_message("[src] manages to writhe wiggle enough to right itself.") + messagevoice = list("Fuck you." = 'sound/voice/medbot/fuck_you.ogg', "Your behavior has been reported, have a nice day." = 'sound/voice/medbot/reported.ogg') + + tipper_name = null + if(world.time > last_tipping_action_voice + 15 SECONDS) + last_tipping_action_voice = world.time + var/message = pick(messagevoice) + speak(message) + playsound(src, messagevoice[message], 70) + tipped_status = MEDBOT_PANIC_NONE + mode = BOT_IDLE + transform = matrix() + +// if someone tipped us over, check whether we should ask for help or just right ourselves eventually +/mob/living/simple_animal/bot/medbot/proc/handle_panic() + tipped_status++ + var/list/messagevoice + switch(tipped_status) + if(MEDBOT_PANIC_LOW) + messagevoice = list("I require assistance." = 'sound/voice/medbot/i_require_asst.ogg') + if(MEDBOT_PANIC_MED) + messagevoice = list("Please put me back." = 'sound/voice/medbot/please_put_me_back.ogg') + if(MEDBOT_PANIC_HIGH) + messagevoice = list("Please, I am scared!" = 'sound/voice/medbot/please_im_scared.ogg') + if(MEDBOT_PANIC_FUCK) + messagevoice = list("I don't like this, I need help!" = 'sound/voice/medbot/dont_like.ogg', "This hurts, my pain is real!" = 'sound/voice/medbot/pain_is_real.ogg') + if(MEDBOT_PANIC_ENDING) + messagevoice = list("Is this the end?" = 'sound/voice/medbot/is_this_the_end.ogg', "Nooo!" = 'sound/voice/medbot/nooo.ogg') + if(MEDBOT_PANIC_END) + speak("PSYCH ALERT: Crewmember [tipper_name] recorded displaying antisocial tendencies torturing bots in [get_area(src)]. Please schedule psych evaluation.", radio_channel) + set_right() // strong independent medbot + + if(prob(tipped_status)) + do_jitter_animation(tipped_status * 0.1) + + if(messagevoice) + var/message = pick(messagevoice) + speak(message) + playsound(src, messagevoice[message], 70) + else if(prob(tipped_status * 0.2)) + playsound(src, 'sound/machines/warning-buzzer.ogg', 30, extrarange=-2) + +/mob/living/simple_animal/bot/medbot/examine(mob/user) + . = ..() + if(tipped_status == MEDBOT_PANIC_NONE) + return + + switch(tipped_status) + if(MEDBOT_PANIC_NONE to MEDBOT_PANIC_LOW) + . += "It appears to be tipped over, and is quietly waiting for someone to set it right." + if(MEDBOT_PANIC_LOW to MEDBOT_PANIC_MED) + . += "It is tipped over and requesting help." + if(MEDBOT_PANIC_MED to MEDBOT_PANIC_HIGH) + . += "They are tipped over and appear visibly distressed." // now we humanize the medbot as a they, not an it + if(MEDBOT_PANIC_HIGH to MEDBOT_PANIC_FUCK) + . += "They are tipped over and visibly panicking!" + if(MEDBOT_PANIC_FUCK to INFINITY) + . += "They are freaking out from being tipped over!" + /mob/living/simple_animal/bot/medbot/handle_automated_action() if(!..()) return + if(mode == BOT_TIPPED) + handle_panic() + return + if(mode == BOT_HEALING) return @@ -392,10 +486,14 @@ if(QDELETED(patient)) if(!shut_up && prob(1)) - var/list/messagevoice = list("Radar, put a mask on!" = 'sound/voice/medbot/radar.ogg',"There's always a catch, and I'm the best there is." = 'sound/voice/medbot/catch.ogg',"I knew it, I should've been a plastic surgeon." = 'sound/voice/medbot/surgeon.ogg',"What kind of medbay is this? Everyone's dropping like flies." = 'sound/voice/medbot/flies.ogg',"Delicious!" = 'sound/voice/medbot/delicious.ogg') - var/message = pick(messagevoice) - speak(message) - playsound(loc, messagevoice[message], 50, 0) + if(emagged && prob(30)) + var/list/i_need_scissors = list('sound/voice/medbot/fuck_you.ogg', 'sound/voice/medbot/turn_off.ogg', 'sound/voice/medbot/im_different.ogg', 'sound/voice/medbot/close.ogg', 'sound/voice/medbot/shindemashou.ogg') + playsound(src, pick(i_need_scissors), 70) + else + var/list/messagevoice = list("Radar, put a mask on!" = 'sound/voice/medbot/radar.ogg',"There's always a catch, and I'm the best there is." = 'sound/voice/medbot/catch.ogg',"I knew it, I should've been a plastic surgeon." = 'sound/voice/medbot/surgeon.ogg',"What kind of medbay is this? Everyone's dropping like flies." = 'sound/voice/medbot/flies.ogg',"Delicious!" = 'sound/voice/medbot/delicious.ogg', "Why are we still here? Just to suffer?" = 'sound/voice/medbot/why.ogg') + var/message = pick(messagevoice) + speak(message) + playsound(src, messagevoice[message], 50) var/scan_range = (stationary_mode ? 1 : DEFAULT_SCAN_RANGE) //If in stationary mode, scan range is limited to adjacent patients. patient = scan(/mob/living/carbon/human, oldpatient, scan_range) oldpatient = patient @@ -506,6 +604,27 @@ /mob/living/simple_animal/bot/medbot/proc/get_healchem_toxin(mob/M) return HAS_TRAIT(M, TRAIT_TOXINLOVER)? treatment_tox_toxlover : treatment_tox +/mob/living/simple_animal/bot/medbot/attack_hand(mob/living/carbon/human/H) + if(H.a_intent == INTENT_DISARM && mode != BOT_TIPPED) + H.visible_message("[H] begins tipping over [src].", "You begin tipping over [src]...") + + if(world.time > last_tipping_action_voice + 15 SECONDS) + last_tipping_action_voice = world.time // message for tipping happens when we start interacting, message for righting comes after finishing + var/list/messagevoice = list("Hey, wait..." = 'sound/voice/medbot/hey_wait.ogg',"Please don't..." = 'sound/voice/medbot/please_dont.ogg',"I trusted you..." = 'sound/voice/medbot/i_trusted_you.ogg', "Nooo..." = 'sound/voice/medbot/nooo.ogg', "Oh fuck-" = 'sound/voice/medbot/oh_fuck.ogg') + var/message = pick(messagevoice) + speak(message) + playsound(src, messagevoice[message], 70, FALSE) + + if(do_after(H, 3 SECONDS, target=src)) + tip_over(H) + + else if(H.a_intent == INTENT_HELP && mode == BOT_TIPPED) + H.visible_message("[H] begins righting [src].", "You begin righting [src]...") + if(do_after(H, 3 SECONDS, target=src)) + set_right(H) + else + ..() + /mob/living/simple_animal/bot/medbot/UnarmedAttack(atom/A) if(iscarbon(A)) var/mob/living/carbon/C = A @@ -664,3 +783,11 @@ /obj/machinery/bot_core/medbot req_one_access = list(ACCESS_MEDICAL, ACCESS_ROBOTICS) + +#undef MEDBOT_PANIC_NONE +#undef MEDBOT_PANIC_LOW +#undef MEDBOT_PANIC_MED +#undef MEDBOT_PANIC_HIGH +#undef MEDBOT_PANIC_FUCK +#undef MEDBOT_PANIC_ENDING +#undef MEDBOT_PANIC_END \ No newline at end of file diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm index 5f7ff198e2..d30fa1b49f 100644 --- a/code/modules/mob/living/simple_animal/friendly/cat.dm +++ b/code/modules/mob/living/simple_animal/friendly/cat.dm @@ -115,13 +115,14 @@ Read_Memory() . = ..() -/mob/living/simple_animal/pet/cat/Runtime/Life() +/mob/living/simple_animal/pet/cat/Runtime/BiologicalLife(seconds, times_fired) + if(!(. = ..())) + return if(!cats_deployed && SSticker.current_state >= GAME_STATE_SETTING_UP) Deploy_The_Cats() if(!stat && SSticker.current_state == GAME_STATE_FINISHED && !memory_saved) Write_Memory() memory_saved = TRUE - ..() /mob/living/simple_animal/pet/cat/Runtime/make_babies() var/mob/baby = ..() @@ -177,7 +178,9 @@ gold_core_spawnable = NO_SPAWN unique_pet = TRUE -/mob/living/simple_animal/pet/cat/Life() +/mob/living/simple_animal/pet/cat/BiologicalLife(seconds, times_fired) + if(!(. = ..())) + return if(!stat && !buckled && !client) if(prob(1)) emote("me", EMOTE_VISIBLE, pick("stretches out for a belly rub.", "wags its tail.", "lies down.")) @@ -269,8 +272,9 @@ to_chat(src, "Your name is now \"new_name\"!") name = new_name -/mob/living/simple_animal/pet/cat/cak/Life() - ..() +/mob/living/simple_animal/pet/cat/cak/BiologicalLife(seconds, times_fired) + if(!(. = ..())) + return if(stat) return if(health < maxHealth) diff --git a/code/modules/mob/living/simple_animal/friendly/cockroach.dm b/code/modules/mob/living/simple_animal/friendly/cockroach.dm index 9a34f2c176..384fa8146f 100644 --- a/code/modules/mob/living/simple_animal/friendly/cockroach.dm +++ b/code/modules/mob/living/simple_animal/friendly/cockroach.dm @@ -23,6 +23,7 @@ speak_emote = list("chitters") density = FALSE ventcrawler = VENTCRAWLER_ALWAYS + mob_size = MOB_SIZE_TINY gold_core_spawnable = FRIENDLY_SPAWN verb_say = "chitters" verb_ask = "chitters inquisitively" diff --git a/code/modules/mob/living/simple_animal/friendly/crab.dm b/code/modules/mob/living/simple_animal/friendly/crab.dm index d86362c974..7f3693f622 100644 --- a/code/modules/mob/living/simple_animal/friendly/crab.dm +++ b/code/modules/mob/living/simple_animal/friendly/crab.dm @@ -22,12 +22,14 @@ friendly_verb_continuous = "pinches" friendly_verb_simple = "pinch" ventcrawler = VENTCRAWLER_ALWAYS + mob_size = MOB_SIZE_TINY var/obj/item/inventory_head var/obj/item/inventory_mask gold_core_spawnable = FRIENDLY_SPAWN -/mob/living/simple_animal/crab/Life() - ..() +/mob/living/simple_animal/crab/BiologicalLife(seconds, times_fired) + if(!(. = ..())) + return //CRAB movement if(!ckey && !stat) if(isturf(loc) && !resting && !buckled) //This is so it only moves if it's not inside a closet, gentics machine, etc. diff --git a/code/modules/mob/living/simple_animal/friendly/dog.dm b/code/modules/mob/living/simple_animal/friendly/dog.dm index 57a4ecc5c9..0584995583 100644 --- a/code/modules/mob/living/simple_animal/friendly/dog.dm +++ b/code/modules/mob/living/simple_animal/friendly/dog.dm @@ -366,11 +366,12 @@ RemoveElement(/datum/element/mob_holder, held_icon) AddElement(/datum/element/mob_holder, "old_corgi") -/mob/living/simple_animal/pet/dog/corgi/Ian/Life() +/mob/living/simple_animal/pet/dog/corgi/Ian/BiologicalLife(seconds, times_fired) + if(!(. = ..())) + return if(!stat && SSticker.current_state == GAME_STATE_FINISHED && !memory_saved) Write_Memory(FALSE) memory_saved = TRUE - ..() /mob/living/simple_animal/pet/dog/corgi/Ian/death() if(!memory_saved) @@ -419,8 +420,9 @@ fdel(json_file) WRITE_FILE(json_file, json_encode(file_data)) -/mob/living/simple_animal/pet/dog/corgi/Ian/Life() - ..() +/mob/living/simple_animal/pet/dog/corgi/Ian/BiologicalLife() + if(!(. = ..())) + return //Feeding, chasing food, FOOOOODDDD if(!stat && CHECK_MULTIPLE_BITFIELDS(mobility_flags, MOBILITY_STAND|MOBILITY_MOVE) && !buckled) @@ -490,8 +492,9 @@ nofur = TRUE unique_pet = TRUE -/mob/living/simple_animal/pet/dog/corgi/narsie/Life() - ..() +/mob/living/simple_animal/pet/dog/corgi/narsie/BiologicalLife(seconds, times_fired) + if(!(. = ..())) + return for(var/mob/living/simple_animal/pet/P in range(1, src)) if(P != src && prob(5)) visible_message("[src] devours [P]!", \ @@ -615,8 +618,9 @@ return ..() -/mob/living/simple_animal/pet/dog/corgi/Lisa/Life() - ..() +/mob/living/simple_animal/pet/dog/corgi/Lisa/BiologicalLife(seconds, times_fired) + if(!(. = ..())) + return make_babies() @@ -628,8 +632,9 @@ setDir(i) sleep(1) -/mob/living/simple_animal/pet/dog/pug/Life() - ..() +/mob/living/simple_animal/pet/dog/pug/BiologicalLife(seconds, times_fired) + if(!(. = ..())) + return if(!stat && CHECK_MULTIPLE_BITFIELDS(mobility_flags, MOBILITY_STAND|MOBILITY_MOVE) && !buckled) if(prob(1)) emote("me", EMOTE_VISIBLE, pick("chases its tail.")) diff --git a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm index e9bc3c549d..ba9cdfda64 100644 --- a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm +++ b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm @@ -33,11 +33,12 @@ stop_automated_movement_when_pulled = 1 blood_volume = BLOOD_VOLUME_NORMAL var/obj/item/udder/udder = null + var/datum/reagent/milk_reagent = /datum/reagent/consumable/milk footstep_type = FOOTSTEP_MOB_SHOE -/mob/living/simple_animal/hostile/retaliate/goat/Initialize() - udder = new() +/mob/living/simple_animal/hostile/retaliate/goat/Initialize(/datum/reagent/milk_reagent) + udder = new (null, milk_reagent) . = ..() /mob/living/simple_animal/hostile/retaliate/goat/Destroy() @@ -45,9 +46,10 @@ udder = null return ..() -/mob/living/simple_animal/hostile/retaliate/goat/Life() - . = ..() - if(.) +/mob/living/simple_animal/hostile/retaliate/goat/BiologicalLife(seconds, times_fired) + if(!(. = ..())) + return + if(stat == CONSCIOUS) //chance to go crazy and start wacking stuff if(!enemies.len && prob(1)) Retaliate() @@ -56,8 +58,7 @@ enemies = list() LoseTarget() src.visible_message("[src] calms down.") - if(stat == CONSCIOUS) - udder.generateMilk() + udder.generateMilk(milk_reagent) eat_plants() if(!pulledby) for(var/direction in shuffle(list(1,2,4,8,5,6,9,10))) @@ -137,13 +138,14 @@ health = 50 maxHealth = 50 var/obj/item/udder/udder = null + var/datum/reagent/milk_reagent = /datum/reagent/consumable/milk gold_core_spawnable = FRIENDLY_SPAWN blood_volume = BLOOD_VOLUME_NORMAL footstep_type = FOOTSTEP_MOB_SHOE /mob/living/simple_animal/cow/Initialize() - udder = new() + udder = new(null, milk_reagent) . = ..() /mob/living/simple_animal/cow/Destroy() @@ -158,10 +160,11 @@ else return ..() -/mob/living/simple_animal/cow/Life() - . = ..() +/mob/living/simple_animal/cow/BiologicalLife(seconds, times_fired) + if(!(. = ..())) + return if(stat == CONSCIOUS) - udder.generateMilk() + udder.generateMilk(milk_reagent) /mob/living/simple_animal/cow/attack_hand(mob/living/carbon/M) if(!stat && M.a_intent == INTENT_DISARM && icon_state != icon_dead) @@ -189,6 +192,19 @@ else ..() +//Wisdom cow, speaks and bestows great wisdoms +/mob/living/simple_animal/cow/wisdom + name = "wisdom cow" + desc = "Known for its wisdom, shares it with all" + butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab/wisdomcow = 1) //truly the best meat + gold_core_spawnable = FALSE + speak_chance = 30 //the cow is eager to share its wisdom! + milk_reagent = /datum/reagent/medicine/liquid_wisdom + +/mob/living/simple_animal/cow/wisdom/Initialize() + . = ..() + speak = GLOB.wisdoms //Done here so it's setup properly + /mob/living/simple_animal/chick name = "\improper chick" desc = "Adorable! They make such a racket though." @@ -229,9 +245,8 @@ pixel_x = rand(-6, 6) pixel_y = rand(0, 10) -/mob/living/simple_animal/chick/Life() - . =..() - if(!.) +/mob/living/simple_animal/chick/BiologicalLife(seconds, times_fired) + if(!(. = ..())) return if(!stat && !ckey) amount_grown += rand(1,2) @@ -239,8 +254,9 @@ new /mob/living/simple_animal/chicken(src.loc) qdel(src) -/mob/living/simple_animal/chick/holo/Life() - ..() +/mob/living/simple_animal/chick/holo/BiologicalLife(seconds, times_fired) + if(!(. = ..())) + return amount_grown = 0 /mob/living/simple_animal/chicken @@ -313,9 +329,8 @@ else ..() -/mob/living/simple_animal/chicken/Life() - . =..() - if(!.) +/mob/living/simple_animal/chicken/BiologicalLife(seconds, times_fired) + if(!(. = ..())) return if((!stat && prob(3) && eggsleft > 0) && egg_type) visible_message("[src] [pick(layMessage)]") @@ -388,9 +403,8 @@ . = ..() ++kiwi_count -/mob/living/simple_animal/kiwi/Life() - . =..() - if(!.) +/mob/living/simple_animal/kiwi/BiologicalLife(seconds, times_fired) + if(!(. = ..())) return if((!stat && prob(3) && eggsleft > 0) && egg_type) visible_message("[src] [pick(layMessage)]") @@ -463,9 +477,8 @@ pixel_x = rand(-6, 6) pixel_y = rand(0, 10) -/mob/living/simple_animal/babyKiwi/Life() - . =..() - if(!.) +/mob/living/simple_animal/babyKiwi/BiologicalLife(seconds, times_fired) + if(!(. = ..())) return if(!stat && !ckey) amount_grown += rand(1,2) @@ -481,14 +494,16 @@ /obj/item/udder name = "udder" -/obj/item/udder/Initialize() +/obj/item/udder/Initialize(loc, milk_reagent) + if(!milk_reagent) + milk_reagent = /datum/reagent/consumable/milk create_reagents(50, NONE, NO_REAGENTS_VALUE) - reagents.add_reagent(/datum/reagent/consumable/milk, 20) + reagents.add_reagent(milk_reagent, 20) . = ..() -/obj/item/udder/proc/generateMilk() +/obj/item/udder/proc/generateMilk(datum/reagent/milk_reagent) if(prob(5)) - reagents.add_reagent(/datum/reagent/consumable/milk, rand(5, 10)) + reagents.add_reagent(milk_reagent, rand(5, 10)) /obj/item/udder/proc/milkAnimal(obj/O, mob/user) var/obj/item/reagent_containers/glass/G = O @@ -529,4 +544,4 @@ health = 75 maxHealth = 75 blood_volume = BLOOD_VOLUME_NORMAL - footstep_type = FOOTSTEP_MOB_SHOE \ No newline at end of file + footstep_type = FOOTSTEP_MOB_SHOE diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm index 50d1e44d2a..51c903ee16 100644 --- a/code/modules/mob/living/simple_animal/friendly/mouse.dm +++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm @@ -29,6 +29,7 @@ var/body_color //brown, gray and white, leave blank for random gold_core_spawnable = FRIENDLY_SPAWN var/chew_probability = 1 + faction = list("rat") /mob/living/simple_animal/mouse/Initialize() . = ..() @@ -59,11 +60,15 @@ else ..(gibbed) + /mob/living/simple_animal/mouse/Crossed(AM as mob|obj) if( ishuman(AM) ) if(!stat) var/mob/M = AM to_chat(M, "[icon2html(src, M)] Squeak!") + if(istype(AM, /obj/item/reagent_containers/food/snacks/royalcheese)) + evolve() + qdel(AM) ..() /mob/living/simple_animal/mouse/handle_automated_action() @@ -84,6 +89,40 @@ C.deconstruct() visible_message("[src] chews through the [C].") + for(var/obj/item/reagent_containers/food/snacks/cheesewedge/cheese in range(1, src)) + if(prob(10)) + be_fruitful() + qdel(cheese) + return + for(var/obj/item/reagent_containers/food/snacks/royalcheese/bigcheese in range(1, src)) + qdel(bigcheese) + evolve() + return + +/** + *Checks the mouse cap, if it's above the cap, doesn't spawn a mouse. If below, spawns a mouse and adds it to cheeserats. + */ + +/mob/living/simple_animal/mouse/proc/be_fruitful() + var/cap = CONFIG_GET(number/ratcap) + if(LAZYLEN(SSmobs.cheeserats) >= cap) + visible_message("[src] carefully eats the cheese, hiding it from the [cap] mice on the station!") + return + var/mob/living/newmouse = new /mob/living/simple_animal/mouse(loc) + SSmobs.cheeserats += newmouse + visible_message("[src] nibbles through the cheese, attracting another mouse!") + +/** + *Spawns a new regal rat, says some good jazz, and if sentient, transfers the relivant mind. + */ +/mob/living/simple_animal/mouse/proc/evolve() + var/mob/living/simple_animal/hostile/regalrat = new /mob/living/simple_animal/hostile/regalrat(loc) + visible_message("[src] devours the cheese! He morphs into something... greater!") + regalrat.say("RISE, MY SUBJECTS! SCREEEEEEE!") + if(mind) + mind.transfer_to(regalrat) + qdel(src) + /* * Mouse types */ @@ -100,6 +139,10 @@ body_color = "brown" icon_state = "mouse_brown" +/mob/living/simple_animal/mouse/Destroy() + SSmobs.cheeserats -= src + return ..() + GLOBAL_VAR(tom_existed) //TOM IS ALIVE! SQUEEEEEEEE~K :) diff --git a/code/modules/mob/living/simple_animal/friendly/plushie.dm b/code/modules/mob/living/simple_animal/friendly/plushie.dm new file mode 100644 index 0000000000..ff95e8fe86 --- /dev/null +++ b/code/modules/mob/living/simple_animal/friendly/plushie.dm @@ -0,0 +1,79 @@ +//simplemob plushie that can be controlled by players +/mob/living/simple_animal/pet/plushie + name = "Plushie" + desc = "A living plushie!" + icon = 'icons/obj/plushes.dmi' + icon_state = "debug" + icon_living = "debug" + icon_dead = "debug" + speak_emote = list("squeaks") + maxHealth = 50 + health = 50 + density = FALSE + pass_flags = PASSTABLE | PASSGRILLE | PASSMOB + mob_size = MOB_SIZE_TINY + mob_biotypes = MOB_ORGANIC + verb_say = "squeaks" + verb_ask = "squeaks inquisitively" + verb_exclaim = "squeaks intensely" + verb_yell = "squeaks intensely" + attack_sound = 'sound/items/toysqueak1.ogg' + attacked_sound = 'sound/items/toysqueak1.ogg' + melee_damage_type = STAMINA + melee_damage_lower = 0 + melee_damage_upper = 1 + attack_verb_continuous = "squeaks" + attack_verb_simple = "squeak" + deathmessage = "lets out a faint squeak as the glint in its eyes disappears" + footstep_type = FOOTSTEP_MOB_BAREFOOT + atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0) + minbodytemp = 0 + pressure_resistance = 200 + +/mob/living/simple_animal/pet/plushie/ComponentInitialize() + . = ..() + AddElement(/datum/element/mob_holder, "plushie") + +//shell that lets people turn into the plush or poll for ghosts +/obj/item/toy/plushie_shell + name = "Plushie Shell" + desc = "A plushie. Its eyes seem to be staring right back at you. Something isn't quite right." + icon = 'icons/obj/plushes.dmi' + icon_state = "debug" + var/obj/item/toy/plush/stored_plush = null + +//attacking yourself transfers your mind into the plush! +/obj/item/toy/plushie_shell/attack_self(mob/user) + if(user.mind) + var/safety = alert(user, "The plushie is staring back at you intensely, it seems cursed! (Permanently become a plushie)", "Hugging this is a bad idea.", "Hug it!", "Cancel") + if(safety == "Cancel" || !in_range(src, user)) + return + to_chat(user, "You hug the strange plushie. You fool.") + + //setup the mob + var/mob/living/simple_animal/pet/plushie/new_plushie = new /mob/living/simple_animal/pet/plushie/(user.loc) + new_plushie.icon = src.icon + new_plushie.icon_living = src.icon_state + new_plushie.icon_dead = src.icon_state + new_plushie.icon_state = src.icon_state + new_plushie.name = src.name + + //make the mob sentient + user.mind.transfer_to(new_plushie) + + //add sounds to mob + new_plushie.AddComponent(/datum/component/squeak, stored_plush.squeak_override) + if(length(stored_plush.squeak_override) > 0) + new_plushie.attack_sound = stored_plush.squeak_override[1] + new_plushie.attacked_sound = stored_plush.squeak_override[1] + + //take care of the user's old body and the old shell + user.dust(drop_items = TRUE) + qdel(src) + +//low regen over time +/mob/living/simple_animal/pet/plushie/BiologicalLife(seconds, times_fired) + if(!(. = ..())) + return + if(health < maxHealth) + heal_overall_damage(5) //Decent life regen, they're not able to hurt anyone so this shouldn't be an issue (butterbear for reference has 10 regen) diff --git a/code/modules/mob/living/simple_animal/friendly/sloth.dm b/code/modules/mob/living/simple_animal/friendly/sloth.dm index df416047e2..bb93f95ee4 100644 --- a/code/modules/mob/living/simple_animal/friendly/sloth.dm +++ b/code/modules/mob/living/simple_animal/friendly/sloth.dm @@ -17,6 +17,7 @@ response_disarm_simple = "gently push aside" response_harm_continuous = "kicks" response_harm_simple = "kick" + mob_size = MOB_SIZE_SMALL mob_biotypes = MOB_ORGANIC|MOB_BEAST gold_core_spawnable = FRIENDLY_SPAWN melee_damage_lower = 18 diff --git a/code/modules/mob/living/simple_animal/guardian/guardian.dm b/code/modules/mob/living/simple_animal/guardian/guardian.dm index 9d94992747..73ebfa7c77 100644 --- a/code/modules/mob/living/simple_animal/guardian/guardian.dm +++ b/code/modules/mob/living/simple_animal/guardian/guardian.dm @@ -160,7 +160,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians to_chat(src, "Your new name [new_name] anchors itself in your mind.") fully_replace_character_name(null, new_name) -/mob/living/simple_animal/hostile/guardian/Life() //Dies if the summoner dies +/mob/living/simple_animal/hostile/guardian/PhysicalLife() //Dies if the summoner dies . = ..() update_health_hud() //we need to update all of our health displays to match our summoner and we can't practically give the summoner a hook to do it med_hud_set_health() diff --git a/code/modules/mob/living/simple_animal/guardian/types/assassin.dm b/code/modules/mob/living/simple_animal/guardian/types/assassin.dm index e82d6cd16a..885f907997 100644 --- a/code/modules/mob/living/simple_animal/guardian/types/assassin.dm +++ b/code/modules/mob/living/simple_animal/guardian/types/assassin.dm @@ -19,8 +19,9 @@ . = ..() stealthcooldown = 0 -/mob/living/simple_animal/hostile/guardian/assassin/Life() - . = ..() +/mob/living/simple_animal/hostile/guardian/assassin/PhysicalLife() + if(!(. = ..())) + return updatestealthalert() if(loc == summoner && toggle) ToggleMode(0) diff --git a/code/modules/mob/living/simple_animal/guardian/types/charger.dm b/code/modules/mob/living/simple_animal/guardian/types/charger.dm index c60e43ff01..0b4952aa9e 100644 --- a/code/modules/mob/living/simple_animal/guardian/types/charger.dm +++ b/code/modules/mob/living/simple_animal/guardian/types/charger.dm @@ -11,8 +11,9 @@ var/charging = 0 var/obj/screen/alert/chargealert -/mob/living/simple_animal/hostile/guardian/charger/Life() - . = ..() +/mob/living/simple_animal/hostile/guardian/charger/BiologicalLife(seconds, times_fired) + if(!(. = ..())) + return if(ranged_cooldown <= world.time) if(!chargealert) chargealert = throw_alert("charge", /obj/screen/alert/cancharge) diff --git a/code/modules/mob/living/simple_animal/guardian/types/fire.dm b/code/modules/mob/living/simple_animal/guardian/types/fire.dm index 97003a53e2..a05cd517fb 100644 --- a/code/modules/mob/living/simple_animal/guardian/types/fire.dm +++ b/code/modules/mob/living/simple_animal/guardian/types/fire.dm @@ -13,8 +13,9 @@ tech_fluff_string = "Boot sequence complete. Crowd control modules activated. Holoparasite swarm online." carp_fluff_string = "CARP CARP CARP! You caught one! OH GOD, EVERYTHING'S ON FIRE. Except you and the fish." -/mob/living/simple_animal/hostile/guardian/fire/Life() - . = ..() +/mob/living/simple_animal/hostile/guardian/fire/BiologicalLife(seconds, times_fired) + if(!(. = ..())) + return if(summoner) summoner.ExtinguishMob() summoner.adjust_fire_stacks(-20) diff --git a/code/modules/mob/living/simple_animal/hostile/bear.dm b/code/modules/mob/living/simple_animal/hostile/bear.dm index 0e864a1e37..5dbf3e8e3b 100644 --- a/code/modules/mob/living/simple_animal/hostile/bear.dm +++ b/code/modules/mob/living/simple_animal/hostile/bear.dm @@ -125,7 +125,7 @@ mob/living/simple_animal/hostile/bear/butter //The mighty companion to Cak. Seve attack_verb_continuous = "slaps" attack_verb_simple = "slap" -/mob/living/simple_animal/hostile/bear/butter/Life() //Heals butter bear really fast when he takes damage. +/mob/living/simple_animal/hostile/bear/butter/BiologicalLife(seconds, times_fired) //Heals butter bear really fast when he takes damage. if(stat) return if(health < maxHealth) diff --git a/code/modules/mob/living/simple_animal/hostile/bosses/boss.dm b/code/modules/mob/living/simple_animal/hostile/bosses/boss.dm index a2fc3aec88..cde63adffd 100644 --- a/code/modules/mob/living/simple_animal/hostile/bosses/boss.dm +++ b/code/modules/mob/living/simple_animal/hostile/bosses/boss.dm @@ -2,15 +2,16 @@ name = "A Perfectly Generic Boss Placeholder" desc = "" threat = 10 - robust_searching = 1 + robust_searching = TRUE stat_attack = UNCONSCIOUS - status_flags = 0 + status_flags = NONE a_intent = INTENT_HARM gender = NEUTER has_field_of_vision = FALSE //You are a frikkin boss var/list/boss_abilities = list() //list of /datum/action/boss var/datum/boss_active_timed_battle/atb - var/point_regen_delay = 1 + var/point_regen_delay = 20 + var/point_regen_amount = 1 /mob/living/simple_animal/hostile/boss/Initialize() @@ -18,6 +19,7 @@ atb = new() atb.point_regen_delay = point_regen_delay + atb.point_regen_amount = point_regen_amount atb.boss = src for(var/ab in boss_abilities) @@ -40,6 +42,7 @@ required_mobility_flags = NONE var/boss_cost = 100 //Cost of usage for the boss' AI 1-100 var/usage_probability = 100 + var/list/req_statuses //If set, will only trigger if the mob AI status is present in this list. var/mob/living/simple_animal/hostile/boss/boss var/boss_type = /mob/living/simple_animal/hostile/boss var/needs_target = TRUE //Does the boss need to have a target? (Only matters for the AI) @@ -57,7 +60,7 @@ . = ..() boss = null -/datum/action/boss/Trigger() +/datum/action/boss/IsAvailable(silent = FALSE) . = ..() if(!.) return @@ -69,6 +72,11 @@ return FALSE if(!boss.client && needs_target && !boss.target) return FALSE + +/datum/action/boss/Trigger() + . = ..() + if(!.) + return if(!boss.atb.spend(boss_cost)) return FALSE if(say_when_triggered) @@ -85,7 +93,8 @@ //Designed for boss mobs only /datum/boss_active_timed_battle var/list/abilities //a list of /datum/action/boss owned by a boss mob - var/point_regen_delay = 5 + var/point_regen_delay = 20 + var/point_regen_amount = 1 var/max_points = 100 var/points = 50 //start with 50 so we can use some abilities but not insta-buttfug somebody var/next_point_time = 0 @@ -93,48 +102,45 @@ var/highest_cost = 0 var/mob/living/simple_animal/hostile/boss/boss - /datum/boss_active_timed_battle/New() ..() START_PROCESSING(SSobj, src) - /datum/boss_active_timed_battle/proc/assign_abilities(list/L) if(!L) - return 0 + return FALSE abilities = L for(var/ab in abilities) var/datum/action/boss/AB = ab if(AB.boss_cost > highest_cost) highest_cost = AB.boss_cost - /datum/boss_active_timed_battle/proc/spend(cost) if(cost <= points) - points = max(0,points-cost) + points -= cost return TRUE return FALSE - /datum/boss_active_timed_battle/proc/refund(cost) points = min(points+cost, max_points) - /datum/boss_active_timed_battle/process() if(world.time >= next_point_time && points < max_points) next_point_time = world.time + point_regen_delay - points = min(max_points, ++points) //has to be out of 100 + points = min(max_points, points + point_regen_amount) - if(abilities) - chance_to_hold_onto_points = highest_cost*0.5 - if(points != max_points && prob(chance_to_hold_onto_points)) - return //Let's save our points for a better ability (unless we're at max points, in which case we can't save anymore!) - if(!boss.client) - abilities = shuffle(abilities) - for(var/ab in abilities) - var/datum/action/boss/AB = ab - if(prob(AB.usage_probability) && AB.Trigger()) - break + if(!abilities) + return + chance_to_hold_onto_points = highest_cost*0.5 + if(points != max_points && prob(chance_to_hold_onto_points)) + return //Let's save our points for a better ability (unless we're at max points, in which case we can't save anymore!) + if(!boss.client) + abilities = shuffle(abilities) + for(var/ab in abilities) + var/datum/action/boss/AB = ab + if(!boss.client && (!AB.req_statuses || (boss.AIStatus in AB.req_statuses)) && prob(AB.usage_probability) && AB.Trigger()) + break + AB.UpdateButtonIcon(TRUE) /datum/boss_active_timed_battle/Destroy() diff --git a/code/modules/mob/living/simple_animal/hostile/bosses/paperwizard.dm b/code/modules/mob/living/simple_animal/hostile/bosses/paperwizard.dm index 4d45120a59..fe00af9384 100644 --- a/code/modules/mob/living/simple_animal/hostile/bosses/paperwizard.dm +++ b/code/modules/mob/living/simple_animal/hostile/bosses/paperwizard.dm @@ -36,6 +36,7 @@ boss_cost = 30 boss_type = /mob/living/simple_animal/hostile/boss/paper_wizard needs_target = FALSE + req_statuses = list(AI_ON) say_when_triggered = "Rise, my creations! Jump off your pages and into this realm!" var/list/summoned_minions = list() var/maximum_stickmen = 6 @@ -85,6 +86,7 @@ usage_probability = 30 boss_cost = 40 boss_type = /mob/living/simple_animal/hostile/boss/paper_wizard + req_statuses = list(AI_ON) say_when_triggered = "" /datum/action/boss/wizard_mimic/Trigger() diff --git a/code/modules/mob/living/simple_animal/hostile/carp.dm b/code/modules/mob/living/simple_animal/hostile/carp.dm index a56a8dcc29..f775d6600c 100644 --- a/code/modules/mob/living/simple_animal/hostile/carp.dm +++ b/code/modules/mob/living/simple_animal/hostile/carp.dm @@ -47,8 +47,9 @@ if(regen_amount) regen_cooldown = world.time + REGENERATION_DELAY -/mob/living/simple_animal/hostile/carp/Life() - . = ..() +/mob/living/simple_animal/hostile/carp/BiologicalLife(seconds, times_fired) + if(!(. = ..())) + return if(regen_amount && regen_cooldown < world.time) heal_overall_damage(regen_amount) diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm index e41fa7c896..945842d5ed 100644 --- a/code/modules/mob/living/simple_animal/hostile/hostile.dm +++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm @@ -67,11 +67,10 @@ foes = null return ..() -/mob/living/simple_animal/hostile/Life() - . = ..() - if(!.) //dead +/mob/living/simple_animal/hostile/BiologicalLife(seconds, times_fired) + if(!(. = ..())) walk(src, 0) //stops walking - return 0 + return /mob/living/simple_animal/hostile/handle_automated_action() if(AIStatus == AI_OFF) @@ -117,7 +116,7 @@ Move(get_step(src,chosen_dir)) face_atom(target) //Looks better if they keep looking at you when dodging -/mob/living/simple_animal/hostile/attacked_by(obj/item/I, mob/living/user) +/mob/living/simple_animal/hostile/attacked_by(obj/item/I, mob/living/user, attackchain_flags = NONE, damage_multiplier = 1) if(stat == CONSCIOUS && !target && AIStatus != AI_OFF && !client && user) FindTarget(list(user), 1) return ..() diff --git a/code/modules/mob/living/simple_animal/hostile/illusion.dm b/code/modules/mob/living/simple_animal/hostile/illusion.dm index cab87010ef..f561f0d43c 100644 --- a/code/modules/mob/living/simple_animal/hostile/illusion.dm +++ b/code/modules/mob/living/simple_animal/hostile/illusion.dm @@ -23,13 +23,12 @@ deathmessage = "vanishes into thin air! It was a fake!" has_field_of_vision = FALSE //not meant to be played anyway. - -/mob/living/simple_animal/hostile/illusion/Life() - ..() +/mob/living/simple_animal/hostile/illusion/BiologicalLife(seconds, times_fired) + if(!(. = ..())) + return if(world.time > life_span) death() - /mob/living/simple_animal/hostile/illusion/proc/Copy_Parent(mob/living/original, life = 50, hp = 100, damage = 0, replicate = 0 ) appearance = original.appearance parent_mob = original diff --git a/code/modules/mob/living/simple_animal/hostile/jungle/leaper.dm b/code/modules/mob/living/simple_animal/hostile/jungle/leaper.dm index 574811c968..51f61fa158 100644 --- a/code/modules/mob/living/simple_animal/hostile/jungle/leaper.dm +++ b/code/modules/mob/living/simple_animal/hostile/jungle/leaper.dm @@ -166,8 +166,9 @@ if(!hopping) Hop() -/mob/living/simple_animal/hostile/jungle/leaper/Life() - . = ..() +/mob/living/simple_animal/hostile/jungle/leaper/BiologicalLife(seconds, times_fired) + if(!(. = ..())) + return update_icons() /mob/living/simple_animal/hostile/jungle/leaper/adjustHealth(amount, updating_health = TRUE, forced = FALSE) @@ -197,7 +198,7 @@ hopping = TRUE density = FALSE pass_flags |= PASSMOB - notransform = TRUE + mob_transforming = TRUE var/turf/new_turf = locate((target.x + rand(-3,3)),(target.y + rand(-3,3)),target.z) if(player_hop) new_turf = get_turf(target) @@ -209,7 +210,7 @@ /mob/living/simple_animal/hostile/jungle/leaper/proc/FinishHop() density = TRUE - notransform = FALSE + mob_transforming = FALSE pass_flags &= ~PASSMOB hopping = FALSE playsound(src.loc, 'sound/effects/meteorimpact.ogg', 100, 1) @@ -220,7 +221,7 @@ /mob/living/simple_animal/hostile/jungle/leaper/proc/BellyFlop() var/turf/new_turf = get_turf(target) hopping = TRUE - notransform = TRUE + mob_transforming = TRUE new /obj/effect/temp_visual/leaper_crush(new_turf) addtimer(CALLBACK(src, .proc/BellyFlopHop, new_turf), 30) @@ -231,7 +232,7 @@ /mob/living/simple_animal/hostile/jungle/leaper/proc/Crush() hopping = FALSE density = TRUE - notransform = FALSE + mob_transforming = FALSE playsound(src, 'sound/effects/meteorimpact.ogg', 200, 1) for(var/mob/living/L in orange(1, src)) L.adjustBruteLoss(35) diff --git a/code/modules/mob/living/simple_animal/hostile/jungle/mega_arachnid.dm b/code/modules/mob/living/simple_animal/hostile/jungle/mega_arachnid.dm index 40274c0029..99349168f0 100644 --- a/code/modules/mob/living/simple_animal/hostile/jungle/mega_arachnid.dm +++ b/code/modules/mob/living/simple_animal/hostile/jungle/mega_arachnid.dm @@ -27,8 +27,9 @@ footstep_type = FOOTSTEP_MOB_CLAW -/mob/living/simple_animal/hostile/jungle/mega_arachnid/Life() - ..() +/mob/living/simple_animal/hostile/jungle/mega_arachnid/BiologicalLife(seconds, times_fired) + if(!(. = ..())) + return if(target && ranged_cooldown > world.time && iscarbon(target)) var/mob/living/carbon/C = target if(!C.legcuffed && C.health < 50) @@ -40,7 +41,6 @@ minimum_distance = 0 alpha = 255 - /mob/living/simple_animal/hostile/jungle/mega_arachnid/Aggro() ..() alpha = 255 diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm index fe6c2290c4..b191eaf3fb 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm @@ -65,8 +65,9 @@ Difficulty: Hard desc = "You're not quite sure how a signal can be bloody." invisibility = 100 -/mob/living/simple_animal/hostile/megafauna/bubblegum/Life() - ..() +/mob/living/simple_animal/hostile/megafauna/bubblegum/BiologicalLife(seconds, times_fired) + if(!(. = ..())) + return move_to_delay = clamp(round((health/maxHealth) * 10), 3, 10) /mob/living/simple_animal/hostile/megafauna/bubblegum/OpenFire() diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm index 04ff9413aa..5816be2917 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm @@ -731,7 +731,7 @@ Difficulty: Very Hard /obj/structure/closet/stasis/Entered(atom/A) if(isliving(A) && holder_animal) var/mob/living/L = A - L.notransform = 1 + L.mob_transforming = 1 ADD_TRAIT(L, TRAIT_MUTE, STASIS_MUTE) L.status_flags |= GODMODE L.mind.transfer_to(holder_animal) @@ -744,7 +744,7 @@ Difficulty: Very Hard for(var/mob/living/L in src) REMOVE_TRAIT(L, TRAIT_MUTE, STASIS_MUTE) L.status_flags &= ~GODMODE - L.notransform = 0 + L.mob_transforming = 0 if(holder_animal) holder_animal.mind.transfer_to(L) L.mind.RemoveSpell(/obj/effect/proc_holder/spell/targeted/exit_possession) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm index 4ade831f95..a66ee7b1de 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm @@ -88,9 +88,10 @@ Difficulty: Normal /mob/living/simple_animal/hostile/megafauna/hierophant/spawn_crusher_loot() new /obj/item/crusher_trophy/vortex_talisman(get_turf(spawned_beacon)) -/mob/living/simple_animal/hostile/megafauna/hierophant/Life() - . = ..() - if(. && spawned_beacon && !QDELETED(spawned_beacon) && !client) +/mob/living/simple_animal/hostile/megafauna/hierophant/BiologicalLife(seconds, times_fired) + if(!(. = ..())) + return + if(spawned_beacon && !QDELETED(spawned_beacon) && !client) if(target || loc == spawned_beacon.loc) timeout_time = initial(timeout_time) else diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/swarmer.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/swarmer.dm index 50c6025378..db6468d1b5 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/swarmer.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/swarmer.dm @@ -73,14 +73,13 @@ GLOBAL_LIST_INIT(AISwarmerCapsByType, list(/mob/living/simple_animal/hostile/swa step(R, ddir) //Step the swarmers, instead of spawning them there, incase the turf is solid -/mob/living/simple_animal/hostile/megafauna/swarmer_swarm_beacon/Life() - . = ..() - if(.) - var/createtype = GetUncappedAISwarmerType() - if(createtype && world.time > swarmer_spawn_cooldown && GLOB.AISwarmers.len < (GetTotalAISwarmerCap()*0.5)) - swarmer_spawn_cooldown = world.time + swarmer_spawn_cooldown_amt - new createtype(loc) - +/mob/living/simple_animal/hostile/megafauna/swarmer_swarm_beacon/BiologicalLife(seconds, times_fired) + if(!(. = ..())) + return + var/createtype = GetUncappedAISwarmerType() + if(createtype && world.time > swarmer_spawn_cooldown && GLOB.AISwarmers.len < (GetTotalAISwarmerCap()*0.5)) + swarmer_spawn_cooldown = world.time + swarmer_spawn_cooldown_amt + new createtype(loc) /mob/living/simple_animal/hostile/megafauna/swarmer_swarm_beacon/adjustHealth(amount, updating_health = TRUE, forced = FALSE) . = ..() diff --git a/code/modules/mob/living/simple_animal/hostile/mimic.dm b/code/modules/mob/living/simple_animal/hostile/mimic.dm index 5afe109550..c2d05e43d9 100644 --- a/code/modules/mob/living/simple_animal/hostile/mimic.dm +++ b/code/modules/mob/living/simple_animal/hostile/mimic.dm @@ -118,8 +118,9 @@ GLOBAL_LIST_INIT(protected_objects, list(/obj/structure/table, /obj/structure/ca overlay_googly_eyes = FALSE CopyObject(copy, creator, destroy_original) -/mob/living/simple_animal/hostile/mimic/copy/Life() - ..() +/mob/living/simple_animal/hostile/mimic/copy/BiologicalLife(seconds, times_fired) + if(!(. = ..())) + return if(idledamage && !target && !ckey) //Objects eventually revert to normal if no one is around to terrorize adjustBruteLoss(1) for(var/mob/living/M in contents) //a fix for animated statues from the flesh to stone spell diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm index 306011dc80..13738b20e1 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm @@ -88,8 +88,9 @@ wanted_objects = list(/obj/item/pen/survival, /obj/item/stack/ore/diamond) field_of_vision_type = FOV_270_DEGREES //Obviously, it's one eyeball. -/mob/living/simple_animal/hostile/asteroid/basilisk/watcher/Life() - . = ..() +/mob/living/simple_animal/hostile/asteroid/basilisk/watcher/BiologicalLife(seconds, times_fired) + if(!(. = ..())) + return if(stat == CONSCIOUS) consume_bait() diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/curse_blob.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/curse_blob.dm index 116082d571..c4f78b6e26 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/curse_blob.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/curse_blob.dm @@ -103,8 +103,9 @@ IGNORE_PROC_IF_NOT_TARGET(attack_slime) return BULLET_ACT_FORCE_PIERCE return ..() -/mob/living/simple_animal/hostile/asteroid/curseblob/attacked_by(obj/item/I, mob/living/L) +/mob/living/simple_animal/hostile/asteroid/curseblob/attacked_by(obj/item/I, mob/living/L, attackchain_flags = NONE, damage_multiplier = 1) if(L != set_target) + L.changeNext_move(I.click_delay) //pre_attacked_by not called return return ..() diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/goliath_broodmother.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/goliath_broodmother.dm index e662f4e525..80489e0e40 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/goliath_broodmother.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/goliath_broodmother.dm @@ -97,9 +97,8 @@ if(CALL_CHILDREN) call_children() -/mob/living/simple_animal/hostile/asteroid/elite/broodmother/Life() - . = ..() - if(!.) //Checks if they are dead as a rock. +/mob/living/simple_animal/hostile/asteroid/elite/broodmother/BiologicalLife(seconds, times_fired) + if(!(. = ..())) return if(health < maxHealth * 0.5 && rand_tent < world.time) rand_tent = world.time + 30 diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/pandora.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/pandora.dm index ebbf032859..cdef0c50d3 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/pandora.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/pandora.dm @@ -95,8 +95,9 @@ if(AOE_SQUARES) aoe_squares(target) -/mob/living/simple_animal/hostile/asteroid/elite/pandora/Life() - . = ..() +/mob/living/simple_animal/hostile/asteroid/elite/pandora/BiologicalLife(seconds, times_fired) + if(!(. = ..())) + return if(health >= maxHealth * 0.5) cooldown_time = 20 return diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm index a61f1924c8..5f6c21bbbd 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm @@ -39,8 +39,9 @@ footstep_type = FOOTSTEP_MOB_HEAVY -/mob/living/simple_animal/hostile/asteroid/goliath/Life() - . = ..() +/mob/living/simple_animal/hostile/asteroid/goliath/BiologicalLife(seconds, times_fired) + if(!(. = ..())) + return handle_preattack() /mob/living/simple_animal/hostile/asteroid/goliath/proc/handle_preattack() @@ -129,9 +130,8 @@ var/turf/last_location var/tentacle_recheck_cooldown = 100 -/mob/living/simple_animal/hostile/asteroid/goliath/beast/ancient/Life() - . = ..() - if(!.) // dead +/mob/living/simple_animal/hostile/asteroid/goliath/beast/ancient/BiologicalLife(seconds, times_fired) + if(!(. = ..())) return if(isturf(loc)) if(!LAZYLEN(cached_tentacle_turfs) || loc != last_location || tentacle_recheck_cooldown <= world.time) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/gutlunch.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/gutlunch.dm index c9e650531c..69d4ebe4df 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/gutlunch.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/gutlunch.dm @@ -114,8 +114,9 @@ name = "guthen" gender = FEMALE -/mob/living/simple_animal/hostile/asteroid/gutlunch/guthen/Life() - ..() +/mob/living/simple_animal/hostile/asteroid/gutlunch/guthen/BiologicalLife(seconds, times_fired) + if(!(. = ..())) + return if(udder.reagents.total_volume == udder.reagents.maximum_volume) //Only breed when we're full. make_babies() diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm index 079be02953..16f892bbff 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm @@ -196,12 +196,13 @@ swarming = TRUE var/can_infest_dead = FALSE -/mob/living/simple_animal/hostile/asteroid/hivelordbrood/legion/Life() +/mob/living/simple_animal/hostile/asteroid/hivelordbrood/legion/BiologicalLife(seconds, times_fired) + if(!(. = ..())) + return if(isturf(loc)) for(var/mob/living/carbon/human/H in view(src,1)) //Only for corpse right next to/on same tile if(H.stat == UNCONSCIOUS || (can_infest_dead && H.stat == DEAD)) infest(H) - ..() /mob/living/simple_animal/hostile/asteroid/hivelordbrood/legion/proc/infest(mob/living/carbon/human/H) visible_message("[name] burrows into the flesh of [H]!") diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/ice_demon.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/ice_demon.dm index 66241e3d75..d40cd8636c 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/ice_demon.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/ice_demon.dm @@ -62,9 +62,10 @@ SLEEP_CHECK_DEATH(8) return ..() -/mob/living/simple_animal/hostile/asteroid/ice_demon/Life() - . = ..() - if(!. || target) +/mob/living/simple_animal/hostile/asteroid/ice_demon/BiologicalLife(seconds, times_fired) + if(!(. = ..())) + return + if(target) return adjustHealth(-maxHealth*0.025) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/ice_whelp.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/ice_whelp.dm index b62fb4a665..7214fd71e0 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/ice_whelp.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/ice_whelp.dm @@ -43,9 +43,10 @@ var/list/burn_turfs = getline(src, T) - get_turf(src) dragon_fire_line(src, burn_turfs) -/mob/living/simple_animal/hostile/asteroid/ice_whelp/Life() - . = ..() - if(!. || target) +/mob/living/simple_animal/hostile/asteroid/ice_whelp/BiologicalLife(seconds, times_fired) + if(!(. = ..())) + return + if(target) return adjustHealth(-maxHealth*0.025) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/polarbear.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/polarbear.dm index ac2ce37d3f..de9464cc16 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/polarbear.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/polarbear.dm @@ -44,9 +44,10 @@ aggressive_message_said = TRUE rapid_melee = 2 -/mob/living/simple_animal/hostile/asteroid/polarbear/Life() - . = ..() - if(!. || target) +/mob/living/simple_animal/hostile/asteroid/polarbear/BiologicalLife(seconds, times_fired) + if(!(. = ..())) + return + if(target) return adjustHealth(-maxHealth*0.025) aggressive_message_said = FALSE diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/wolf.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/wolf.dm index 013a75be75..8c4db48434 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/wolf.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/wolf.dm @@ -51,9 +51,10 @@ retreat_message_said = TRUE retreat_distance = 30 -/mob/living/simple_animal/hostile/asteroid/wolf/Life() - . = ..() - if(!. || target) +/mob/living/simple_animal/hostile/asteroid/wolf/BiologicalLife(seconds, times_fired) + if(!(. = ..())) + return + if(target) return adjustHealth(-maxHealth*0.025) retreat_message_said = FALSE diff --git a/code/modules/mob/living/simple_animal/hostile/mushroom.dm b/code/modules/mob/living/simple_animal/hostile/mushroom.dm index 1b13200729..4c9afd3784 100644 --- a/code/modules/mob/living/simple_animal/hostile/mushroom.dm +++ b/code/modules/mob/living/simple_animal/hostile/mushroom.dm @@ -48,8 +48,9 @@ else . += "It looks like it's been roughed up." -/mob/living/simple_animal/hostile/mushroom/Life() - ..() +/mob/living/simple_animal/hostile/mushroom/BiologicalLife(seconds, times_fired) + if(!(. = ..())) + return if(!stat)//Mushrooms slowly regenerate if conscious, for people who want to save them from being eaten adjustBruteLoss(-2) diff --git a/code/modules/mob/living/simple_animal/hostile/netherworld.dm b/code/modules/mob/living/simple_animal/hostile/netherworld.dm index ca5d047326..1db6854f96 100644 --- a/code/modules/mob/living/simple_animal/hostile/netherworld.dm +++ b/code/modules/mob/living/simple_animal/hostile/netherworld.dm @@ -46,8 +46,9 @@ var/chosen_sound = pick(migo_sounds) playsound(src, chosen_sound, 100, TRUE) -/mob/living/simple_animal/hostile/netherworld/migo/Life() - ..() +/mob/living/simple_animal/hostile/netherworld/migo/BiologicalLife(seconds, times_fired) + if(!(. = ..())) + return if(stat) return if(prob(10)) diff --git a/code/modules/mob/living/simple_animal/hostile/regalrat.dm b/code/modules/mob/living/simple_animal/hostile/regalrat.dm new file mode 100644 index 0000000000..e21514b37e --- /dev/null +++ b/code/modules/mob/living/simple_animal/hostile/regalrat.dm @@ -0,0 +1,239 @@ +/mob/living/simple_animal/hostile/regalrat + name = "regal rat" + desc = "An evolved rat, created through some strange science. It leads nearby rats with deadly efficiency to protect its kingdom. Not technically a king." + icon_state = "regalrat" + icon_living = "regalrat" + icon_dead = "regalrat_dead" + gender = NEUTER + speak_chance = 0 + turns_per_move = 5 + maxHealth = 70 + health = 70 + see_in_dark = 5 + obj_damage = 10 + butcher_results = list(/obj/item/clothing/head/crown = 1,) + response_help_continuous = "glares at" + response_help_simple = "glare at" + response_disarm_continuous = "skoffs at" + response_disarm_simple = "skoff at" + response_harm_continuous = "slashes" + response_harm_simple = "slash" + melee_damage_lower = 10 + melee_damage_upper = 12 + attack_verb_continuous = "slashes" + attack_verb_simple = "slash" + attack_sound = 'sound/weapons/punch1.ogg' + ventcrawler = VENTCRAWLER_ALWAYS + unique_name = TRUE + faction = list("rat") + var/datum/action/cooldown/coffer + var/datum/action/cooldown/riot + ///Number assigned to rats and mice, checked when determining infighting. + +/mob/living/simple_animal/hostile/regalrat/Initialize() + . = ..() + coffer = new /datum/action/cooldown/coffer + coffer.Grant(src) + riot = new /datum/action/cooldown/riot + riot.Grant(src) + var/list/mob/dead/observer/candidates = pollGhostCandidates("Do you want to play as the Royal Rat, cheesey be his crown?", ROLE_SENTIENCE, null, FALSE, 100, POLL_IGNORE_SENTIENCE_POTION) + if(LAZYLEN(candidates) && !mind) + var/mob/dead/observer/C = pick(candidates) + key = C.key + notify_ghosts("All rise for the rat king, ascendant to the throne in \the [get_area(src)].", source = src, action = NOTIFY_ORBIT, flashwindow = FALSE) + +/mob/living/simple_animal/hostile/regalrat/handle_automated_action() + if(prob(20)) + riot.Trigger() + else if(prob(50)) + coffer.Trigger() + return ..() + +/mob/living/simple_animal/hostile/regalrat/CanAttack(atom/the_target) + if(istype(the_target,/mob/living/simple_animal)) + var/mob/living/A = the_target + if(istype(the_target, /mob/living/simple_animal/hostile/regalrat) && A.stat == CONSCIOUS) + return TRUE + if(istype(the_target, /mob/living/simple_animal/hostile/rat) && A.stat == CONSCIOUS) + var/mob/living/simple_animal/hostile/rat/R = the_target + if(R.faction_check_mob(src, TRUE)) + return FALSE + else + return TRUE + return ..() + +/mob/living/simple_animal/hostile/regalrat/examine(mob/user) + . = ..() + if(istype(user,/mob/living/simple_animal/hostile/rat)) + var/mob/living/simple_animal/hostile/rat/ratself = user + if(ratself.faction_check_mob(src, TRUE)) + . += "This is your king. Long live his majesty!" + else + . += "This is a false king! Strike him down!" + else if(istype(user,/mob/living/simple_animal/hostile/regalrat)) + . += "Who is this foolish false king? This will not stand!" + +/** + *This action creates trash, money, dirt, and cheese. + */ + +/datum/action/cooldown/coffer + name = "Fill Coffers" + desc = "Your newly granted regality and poise let you scavenge for lost junk, but more importantly, cheese." + icon_icon = 'icons/mob/actions/actions_animal.dmi' + background_icon_state = "bg_clock" + button_icon_state = "coffer" + cooldown_time = 50 + +/datum/action/cooldown/coffer/Trigger() + . = ..() + if(!.) + return + var/turf/T = get_turf(owner) + var/loot = rand(1,100) + switch(loot) + if(1 to 5) + to_chat(owner, "Score! You find some cheese!") + new /obj/item/reagent_containers/food/snacks/cheesewedge(T) + if(6 to 10) + var/pickedcoin = pick(GLOB.ratking_coins) + to_chat(owner, "You find some leftover coins. More for the royal treasury!") + for(var/i = 1 to rand(1,3)) + new pickedcoin(T) + if(11) + to_chat(owner, "You find a... Hunh. This coin doesn't look right.") + var/rarecoin = rand(1,2) + if (rarecoin == 1) + new /obj/item/coin/twoheaded(T) + else + new /obj/item/coin/antagtoken(T) + if(12 to 40) + var/pickedtrash = pick(GLOB.ratking_trash) + to_chat(owner, "You just find more garbage and dirt. Lovely, but beneath you now.") + new /obj/effect/decal/cleanable/dirt(T) + new pickedtrash(T) + if(41 to 100) + to_chat(owner, "Drat. Nothing.") + new /obj/effect/decal/cleanable/dirt(T) + StartCooldown() + +/** + *This action checks all nearby mice, and converts them into hostile rats. If no mice are nearby, creates a new one. + */ + +/datum/action/cooldown/riot + name = "Raise Army" + desc = "Raise an army out of the hordes of mice and pests crawling around the maintenance shafts." + icon_icon = 'icons/mob/actions/actions_animal.dmi' + button_icon_state = "riot" + background_icon_state = "bg_clock" + cooldown_time = 80 + ///Checks to see if there are any nearby mice. Does not count Rats. + +/datum/action/cooldown/riot/Trigger() + . = ..() + if(!.) + return + var/cap = CONFIG_GET(number/ratcap) + var/something_from_nothing = FALSE + for(var/mob/living/simple_animal/mouse/M in oview(owner, 5)) + var/mob/living/simple_animal/hostile/rat/new_rat = new(get_turf(M)) + something_from_nothing = TRUE + if(M.mind && M.stat == CONSCIOUS) + M.mind.transfer_to(new_rat) + if(istype(owner,/mob/living/simple_animal/hostile/regalrat)) + var/mob/living/simple_animal/hostile/regalrat/giantrat = owner + new_rat.faction = giantrat.faction + qdel(M) + if(!something_from_nothing) + if(LAZYLEN(SSmobs.cheeserats) >= cap) + to_chat(owner,"There's too many mice on this station to beckon a new one! Find them first!") + return + new /mob/living/simple_animal/mouse(owner.loc) + owner.visible_message("[owner] commands a mouse to its side!") + else + owner.visible_message("[owner] commands its army to action, mutating them into rats!") + StartCooldown() + +/mob/living/simple_animal/hostile/rat + name = "rat" + desc = "It's a nasty, ugly, evil, disease-ridden rodent with anger issues." + icon_state = "mouse_gray" + icon_living = "mouse_gray" + icon_dead = "mouse_gray_dead" + speak = list("Skree!","SKREEE!","Squeak?") + speak_emote = list("squeaks") + emote_hear = list("Hisses.") + emote_see = list("runs in a circle.", "stands on its hind legs.") + melee_damage_lower = 3 + melee_damage_upper = 5 + obj_damage = 5 + speak_chance = 1 + turns_per_move = 5 + see_in_dark = 6 + maxHealth = 15 + health = 15 + butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab = 1) + density = FALSE + ventcrawler = VENTCRAWLER_ALWAYS + pass_flags = PASSTABLE | PASSGRILLE | PASSMOB + mob_size = MOB_SIZE_TINY + mob_biotypes = MOB_ORGANIC|MOB_BEAST + faction = list("rat") + +/mob/living/simple_animal/hostile/rat/Initialize() + . = ..() + SSmobs.cheeserats += src + +/mob/living/simple_animal/hostile/rat/Destroy() + SSmobs.cheeserats -= src + return ..() + +/mob/living/simple_animal/hostile/rat/examine(mob/user) + . = ..() + if(istype(user,/mob/living/simple_animal/hostile/rat)) + var/mob/living/simple_animal/hostile/rat/ratself = user + if(ratself.faction_check_mob(src, TRUE)) + . += "You both serve the same king." + else + . += "This fool serves a different king!" + else if(istype(user,/mob/living/simple_animal/hostile/regalrat)) + var/mob/living/simple_animal/hostile/regalrat/ratking = user + if(ratking.faction_check_mob(src, TRUE)) + . += "This rat serves under you." + else + . += "This peasant serves a different king! Strike him down!" + +/mob/living/simple_animal/hostile/rat/CanAttack(atom/the_target) + if(istype(the_target,/mob/living/simple_animal)) + var/mob/living/A = the_target + if(istype(the_target, /mob/living/simple_animal/hostile/regalrat) && A.stat == CONSCIOUS) + var/mob/living/simple_animal/hostile/regalrat/ratking = the_target + if(ratking.faction_check_mob(src, TRUE)) + return FALSE + else + return TRUE + if(istype(the_target, /mob/living/simple_animal/hostile/rat) && A.stat == CONSCIOUS) + var/mob/living/simple_animal/hostile/rat/R = the_target + if(R.faction_check_mob(src, TRUE)) + return FALSE + else + return TRUE + return ..() + +/mob/living/simple_animal/hostile/rat/handle_automated_action() + . = ..() + if(prob(40)) + var/turf/open/floor/F = get_turf(src) + if(istype(F) && !F.intact) + var/obj/structure/cable/C = locate() in F + if(C && prob(15)) + if(C.avail()) + visible_message("[src] chews through the [C]. It's toast!") + playsound(src, 'sound/effects/sparks2.ogg', 100, TRUE) + C.deconstruct() + death() + else if(C && C.avail()) + visible_message("[src] chews through the [C]. It looks unharmed!") + playsound(src, 'sound/effects/sparks2.ogg', 100, TRUE) + C.deconstruct() diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm index 35f2817028..03aac4037a 100644 --- a/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm +++ b/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm @@ -51,8 +51,9 @@ ..() playsound(src.loc, 'sound/items/bikehorn.ogg', 50, TRUE) -/mob/living/simple_animal/hostile/retaliate/clown/Life() - . = ..() +/mob/living/simple_animal/hostile/retaliate/clown/BiologicalLife(seconds, times_fired) + if(!(. = ..())) + return if(banana_time && banana_time < world.time) var/turf/T = get_turf(src) var/list/adjacent = T.GetAtmosAdjacentTurfs(1) diff --git a/code/modules/mob/living/simple_animal/hostile/statue.dm b/code/modules/mob/living/simple_animal/hostile/statue.dm index 23304a2ef3..3490d757a1 100644 --- a/code/modules/mob/living/simple_animal/hostile/statue.dm +++ b/code/modules/mob/living/simple_animal/hostile/statue.dm @@ -82,8 +82,9 @@ return 0 return ..() -/mob/living/simple_animal/hostile/statue/Life() - ..() +/mob/living/simple_animal/hostile/statue/BiologicalLife(seconds, times_fired) + if(!(. = ..())) + return if(!client && target) // If we have a target and we're AI controlled var/mob/watching = can_be_seen() // If they're not our target diff --git a/code/modules/mob/living/simple_animal/hostile/tree.dm b/code/modules/mob/living/simple_animal/hostile/tree.dm index 3aa3c9e566..f65f1613c9 100644 --- a/code/modules/mob/living/simple_animal/hostile/tree.dm +++ b/code/modules/mob/living/simple_animal/hostile/tree.dm @@ -44,8 +44,9 @@ gold_core_spawnable = HOSTILE_SPAWN del_on_death = 1 -/mob/living/simple_animal/hostile/tree/Life() - ..() +/mob/living/simple_animal/hostile/tree/BiologicalLife(seconds, times_fired) + if(!(. = ..())) + return if(isopenturf(loc)) var/turf/open/T = src.loc if(T.air && T.air.gases[/datum/gas/carbon_dioxide]) diff --git a/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm b/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm index 5111b0b180..fdb088934c 100644 --- a/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm +++ b/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm @@ -100,8 +100,9 @@ /mob/living/simple_animal/hostile/venus_human_trap/ghost_playable playable_plant = TRUE //For admins that want to buss some harmless plants -/mob/living/simple_animal/hostile/venus_human_trap/Life() - . = ..() +/mob/living/simple_animal/hostile/venus_human_trap/BiologicalLife(seconds, times_fired) + if(!(. = ..())) + return pull_vines() /mob/living/simple_animal/hostile/venus_human_trap/AttackingTarget() diff --git a/code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm b/code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm index 5c881a7b0d..dc6154c05e 100644 --- a/code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm +++ b/code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm @@ -47,12 +47,13 @@ QDEL_NULL(E) return ..() -/mob/living/simple_animal/hostile/asteroid/fugu/Life() +/mob/living/simple_animal/hostile/asteroid/fugu/BiologicalLife(seconds, times_fired) + if(!(. = ..())) + return if(!wumbo) inflate_cooldown = max((inflate_cooldown - 1), 0) if(target && AIStatus == AI_ON) E.Activate() - ..() /mob/living/simple_animal/hostile/asteroid/fugu/adjustHealth(amount, updating_health = TRUE, forced = FALSE) if(!forced && wumbo) diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm index e8d6411c01..de8a6fb6a0 100644 --- a/code/modules/mob/living/simple_animal/parrot.dm +++ b/code/modules/mob/living/simple_animal/parrot.dm @@ -357,9 +357,9 @@ /* * AI - Not really intelligent, but I'm calling it AI anyway. */ -/mob/living/simple_animal/parrot/Life() - ..() - +/mob/living/simple_animal/parrot/BiologicalLife(seconds, times_fired) + if(!(. = ..())) + return //Sprite update for when a parrot gets pulled if(pulledby && !stat && parrot_state != PARROT_WANDER) if(buckled) @@ -369,8 +369,6 @@ parrot_state = PARROT_WANDER pixel_x = initial(pixel_x) pixel_y = initial(pixel_y) - return - //-----SPEECH /* Parrot speech mimickry! @@ -911,11 +909,12 @@ if(. && !client && prob(1) && prob(1)) //Only the one true bird may speak across dimensions. world.TgsTargetedChatBroadcast("A stray squawk is heard... \"[message]\"", FALSE) -/mob/living/simple_animal/parrot/Poly/Life() +/mob/living/simple_animal/parrot/Poly/BiologicalLife(seconds, times_fired) + if(!(. = ..())) + return if(!stat && SSticker.current_state == GAME_STATE_FINISHED && !memory_saved) Write_Memory(FALSE) memory_saved = TRUE - ..() /mob/living/simple_animal/parrot/Poly/death(gibbed) if(!memory_saved) diff --git a/code/modules/mob/living/simple_animal/slime/life.dm b/code/modules/mob/living/simple_animal/slime/life.dm index 6e8c79c3d0..9cc385fc77 100644 --- a/code/modules/mob/living/simple_animal/slime/life.dm +++ b/code/modules/mob/living/simple_animal/slime/life.dm @@ -7,19 +7,17 @@ var/SStun = 0 // stun variable -/mob/living/simple_animal/slime/Life() - set invisibility = 0 - if (notransform) +/mob/living/simple_animal/slime/BiologicalLife(seconds, times_fired) + if(!(. = ..())) return - if(..()) - if(buckled) - handle_feeding() - if(!stat) // Slimes in stasis don't lose nutrition, don't change mood and don't respond to speech - handle_nutrition() - handle_targets() - if (!ckey) - handle_mood() - handle_speech() + if(buckled) + handle_feeding() + if(!stat) // Slimes in stasis don't lose nutrition, don't change mood and don't respond to speech + handle_nutrition() + handle_targets() + if (!ckey) + handle_mood() + handle_speech() // Unlike most of the simple animals, slimes support UNCONSCIOUS /mob/living/simple_animal/slime/update_stat() diff --git a/code/modules/mob/living/simple_animal/slime/slime.dm b/code/modules/mob/living/simple_animal/slime/slime.dm index 0ef5cabc91..f7876b3516 100644 --- a/code/modules/mob/living/simple_animal/slime/slime.dm +++ b/code/modules/mob/living/simple_animal/slime/slime.dm @@ -3,6 +3,7 @@ icon = 'icons/mob/slimes.dmi' icon_state = "grey baby slime" pass_flags = PASSTABLE + mob_size = MOB_SIZE_SMALL ventcrawler = VENTCRAWLER_ALWAYS gender = NEUTER var/is_adult = 0 diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 30d9755a4a..9bf765649b 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -678,7 +678,7 @@ GLOBAL_VAR_INIT(exploit_warn_spam_prevention, 0) return FALSE if(anchored) return FALSE - if(notransform) + if(mob_transforming) return FALSE if(restrained()) return FALSE @@ -1090,3 +1090,10 @@ GLOBAL_VAR_INIT(exploit_warn_spam_prevention, 0) for(var/obj/item/I in held_items) if(I.item_flags & SLOWS_WHILE_IN_HAND) . += I.slowdown + +/** + * Mostly called by doUnEquip() + * Like item dropped() on mob side. + */ +/mob/proc/on_item_dropped(obj/item/I) + return diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm index 9dcfb4e99a..dbf7b7f350 100644 --- a/code/modules/mob/mob_defines.dm +++ b/code/modules/mob/mob_defines.dm @@ -37,7 +37,9 @@ var/next_move = null var/create_area_cooldown - var/notransform = null //Carbon + /// Whether or not the mob is currently being transformed into another mob or into another state of being. This will prevent it from moving or doing realistically anything. + /// Don't you DARE use this for a cheap way to ensure someone is stunned in your code. + var/mob_transforming = FALSE var/eye_blind = 0 //Carbon var/eye_blurry = 0 //Carbon var/real_name = null diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm index 9867da1ed4..e977c397c9 100644 --- a/code/modules/mob/mob_movement.dm +++ b/code/modules/mob/mob_movement.dm @@ -32,7 +32,7 @@ if(!n || !direction || !mob?.loc) return FALSE //GET RID OF THIS SOON AS MOBILITY FLAGS IS DONE - if(mob.notransform) + if(mob.mob_transforming) return FALSE if(mob.control_object) diff --git a/code/modules/mob/say.dm b/code/modules/mob/say.dm index e2b3aee35d..a403845ee2 100644 --- a/code/modules/mob/say.dm +++ b/code/modules/mob/say.dm @@ -113,7 +113,7 @@ if(name != real_name) alt_name = " (died as [real_name])" - var/spanned = say_quote(message) + var/spanned = say_quote(say_emphasis(message)) message = emoji_parse(message) var/rendered = "DEAD: [name][alt_name] " log_talk(message, LOG_SAY, tag="DEAD") diff --git a/code/modules/mob/say_vr.dm b/code/modules/mob/say_vr.dm index 44dc3e2a05..5ed24af726 100644 --- a/code/modules/mob/say_vr.dm +++ b/code/modules/mob/say_vr.dm @@ -60,7 +60,7 @@ proc/get_top_level_mob(var/mob/S) return FALSE user.log_message(message, LOG_EMOTE) - message = "[user] " + "[message]" + message = "[user] " + "[user.say_emphasis(message)]" for(var/mob/M in GLOB.dead_mob_list) if(!M.client || isnewplayer(M)) @@ -121,7 +121,7 @@ proc/get_top_level_mob(var/mob/S) return FALSE user.log_message(message, LOG_SUBTLER) - message = "[user] " + "[message]" + message = "[user] " + "[user.say_emphasis(message)]" if(emote_type == EMOTE_AUDIBLE) user.audible_message(message=message,hearing_distance=1, ignored_mobs = GLOB.dead_mob_list) diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm index 56ec5bb816..5fd94c8a89 100644 --- a/code/modules/mob/transform_procs.dm +++ b/code/modules/mob/transform_procs.dm @@ -1,5 +1,5 @@ /mob/living/carbon/proc/monkeyize(tr_flags = (TR_KEEPITEMS | TR_KEEPVIRUS | TR_DEFAULTMSG)) - if (notransform) + if (mob_transforming) return //Handle items on mob @@ -29,7 +29,7 @@ dropItemToGround(W) //Make mob invisible and spawn animation - notransform = TRUE + mob_transforming = TRUE Stun(INFINITY, ignore_canstun = TRUE) icon = null cut_overlays() @@ -150,7 +150,7 @@ //Could probably be merged with monkeyize but other transformations got their own procs, too /mob/living/carbon/proc/humanize(tr_flags = (TR_KEEPITEMS | TR_KEEPVIRUS | TR_DEFAULTMSG)) - if (notransform) + if (mob_transforming) return //Handle items on mob @@ -185,7 +185,7 @@ //Make mob invisible and spawn animation - notransform = TRUE + mob_transforming = TRUE Stun(22, ignore_canstun = TRUE) icon = null cut_overlays() @@ -304,7 +304,7 @@ qdel(src) /mob/living/carbon/human/AIize() - if (notransform) + if (mob_transforming) return for(var/t in bodyparts) qdel(t) @@ -312,12 +312,12 @@ return ..() /mob/living/carbon/AIize() - if(notransform) + if(mob_transforming) return for(var/obj/item/W in src) dropItemToGround(W) regenerate_icons() - notransform = TRUE + mob_transforming = TRUE Paralyze(INFINITY) icon = null invisibility = INVISIBILITY_MAXIMUM @@ -353,7 +353,7 @@ qdel(src) /mob/living/carbon/human/proc/Robotize(delete_items = 0, transfer_after = TRUE) - if (notransform) + if (mob_transforming) return for(var/obj/item/W in src) if(delete_items) @@ -361,7 +361,7 @@ else dropItemToGround(W) regenerate_icons() - notransform = TRUE + mob_transforming = TRUE Paralyze(INFINITY) icon = null invisibility = INVISIBILITY_MAXIMUM @@ -398,12 +398,12 @@ //human -> alien /mob/living/carbon/human/proc/Alienize(mind_transfer = TRUE) - if (notransform) + if (mob_transforming) return for(var/obj/item/W in src) dropItemToGround(W) regenerate_icons() - notransform = 1 + mob_transforming = 1 Paralyze(INFINITY) icon = null invisibility = INVISIBILITY_MAXIMUM @@ -432,12 +432,12 @@ qdel(src) /mob/living/carbon/human/proc/slimeize(reproduce, mind_transfer = TRUE) - if (notransform) + if (mob_transforming) return for(var/obj/item/W in src) dropItemToGround(W) regenerate_icons() - notransform = 1 + mob_transforming = 1 Paralyze(INFINITY) icon = null invisibility = INVISIBILITY_MAXIMUM @@ -477,12 +477,12 @@ /mob/living/carbon/human/proc/corgize(mind_transfer = TRUE) - if (notransform) + if (mob_transforming) return for(var/obj/item/W in src) dropItemToGround(W) regenerate_icons() - notransform = TRUE + mob_transforming = TRUE Paralyze(INFINITY) icon = null invisibility = INVISIBILITY_MAXIMUM @@ -501,7 +501,7 @@ qdel(src) /mob/living/carbon/proc/gorillize(mind_transfer = TRUE) - if(notransform) + if(mob_transforming) return SSblackbox.record_feedback("amount", "gorillas_created", 1) @@ -512,7 +512,7 @@ dropItemToGround(W, TRUE) regenerate_icons() - notransform = TRUE + mob_transforming = TRUE Paralyze(INFINITY) icon = null invisibility = INVISIBILITY_MAXIMUM @@ -535,13 +535,13 @@ if(mind) mind_transfer = alert("Want to transfer their mind into the new mob", "Mind Transfer", "Yes", "No") == "Yes" ? TRUE : FALSE - if(notransform) + if(mob_transforming) return for(var/obj/item/W in src) dropItemToGround(W) regenerate_icons() - notransform = TRUE + mob_transforming = TRUE Paralyze(INFINITY) icon = null invisibility = INVISIBILITY_MAXIMUM diff --git a/code/modules/modular_computers/hardware/hard_drive.dm b/code/modules/modular_computers/hardware/hard_drive.dm index 76463c6867..e27eaa53ae 100644 --- a/code/modules/modular_computers/hardware/hard_drive.dm +++ b/code/modules/modular_computers/hardware/hard_drive.dm @@ -157,7 +157,7 @@ max_capacity = 64 icon_state = "ssd_mini" w_class = WEIGHT_CLASS_TINY - custom_price = 150 + custom_price = PRICE_ABOVE_NORMAL /obj/item/computer_hardware/hard_drive/small/syndicate // Syndicate variant - very slight better desc = "An efficient SSD for portable devices developed by a rival organisation." diff --git a/code/modules/movespeed/modifiers/mobs.dm b/code/modules/movespeed/modifiers/mobs.dm index d20fc4c6c0..a2176ca95e 100644 --- a/code/modules/movespeed/modifiers/mobs.dm +++ b/code/modules/movespeed/modifiers/mobs.dm @@ -119,3 +119,7 @@ /datum/movespeed_modifier/liver_cirrhosis blacklisted_movetypes = FLOATING variable = TRUE + +/datum/movespeed_modifier/active_block + variable = TRUE + flags = IGNORE_NOSLOW diff --git a/code/modules/ninja/suit/n_suit_verbs/ninja_stars.dm b/code/modules/ninja/suit/n_suit_verbs/ninja_stars.dm index 31ac62d9fc..508722ecf2 100644 --- a/code/modules/ninja/suit/n_suit_verbs/ninja_stars.dm +++ b/code/modules/ninja/suit/n_suit_verbs/ninja_stars.dm @@ -15,4 +15,4 @@ /obj/item/throwing_star/ninja name = "ninja throwing star" throwforce = 30 - embedding = list("embedded_pain_multiplier" = 6, "embed_chance" = 100, "embedded_fall_chance" = 0) + embedding = list("pain_mult" = 6, "embed_chance" = 100, "fall_chance" = 0, "embed_chance_turf_mod" = 15) diff --git a/code/modules/oracle_ui/assets.dm b/code/modules/oracle_ui/assets.dm index 5d26d80a81..348860b48d 100644 --- a/code/modules/oracle_ui/assets.dm +++ b/code/modules/oracle_ui/assets.dm @@ -1,8 +1,11 @@ +/datum/asset/group/oui_theme_nano + children = list( + /datum/asset/simple/jquery, + /datum/asset/simple/oui_theme_nano + ) + /datum/asset/simple/oui_theme_nano assets = list( - // JavaScript - "sui-nano-common.js" = 'html/oracle_ui/themes/nano/sui-nano-common.js', - "sui-nano-jquery.min.js" = 'html/oracle_ui/themes/nano/sui-nano-jquery.min.js', - // Stylesheets - "sui-nano-common.css" = 'html/oracle_ui/themes/nano/sui-nano-common.css', + "sui-nano-common.js" = 'html/oracle_ui/themes/nano/sui-nano-common.js', + "sui-nano-common.css" = 'html/oracle_ui/themes/nano/sui-nano-common.css', ) diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index 1c14a30a8a..08252d4e05 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -27,6 +27,7 @@ var/colour = "black" //what colour the ink is! var/degrees = 0 var/font = PEN_FONT + embedding = list() /obj/item/pen/suicide_act(mob/user) user.visible_message("[user] is scribbling numbers all over [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to commit sudoku...") @@ -41,6 +42,7 @@ desc = "It's a normal red ink pen." icon_state = "pen_red" colour = "red" + throw_speed = 4 // red ones go faster (in this case, fast enough to embed!) /obj/item/pen/invisible desc = "It's an invisible pen marker." @@ -56,8 +58,10 @@ switch(colour) if("black") colour = "red" + throw_speed++ if("red") colour = "green" + throw_speed = initial(throw_speed) if("green") colour = "blue" else @@ -178,6 +182,7 @@ attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") //these wont show up if the pen is off sharpness = IS_SHARP var/on = FALSE + embedding = list(embed_chance = EMBED_CHANCE) /obj/item/pen/edagger/ComponentInitialize() . = ..() @@ -198,16 +203,18 @@ throwforce = initial(throwforce) playsound(user, 'sound/weapons/saberoff.ogg', 5, 1) to_chat(user, "[src] can now be concealed.") + updateEmbedding() else on = TRUE force = 18 w_class = WEIGHT_CLASS_NORMAL name = "energy dagger" hitsound = 'sound/weapons/blade1.ogg' - embedding = getEmbeddingBehavior(embed_chance = 100, embedded_fall_chance = 0) //rule of cool + embedding = list(embed_chance = 100, fall_chance = 0) //rule of cool throwforce = 35 playsound(user, 'sound/weapons/saberon.ogg', 5, 1) to_chat(user, "[src] is now active.") + updateEmbedding() update_icon() /obj/item/pen/edagger/update_icon_state() diff --git a/code/modules/photography/camera/camera.dm b/code/modules/photography/camera/camera.dm index 705888a427..3e76fc874a 100644 --- a/code/modules/photography/camera/camera.dm +++ b/code/modules/photography/camera/camera.dm @@ -15,7 +15,7 @@ flags_1 = CONDUCT_1 slot_flags = ITEM_SLOT_NECK custom_materials = list(/datum/material/iron = 50, /datum/material/glass = 150) - custom_price = 120 + custom_price = PRICE_NORMAL var/flash_enabled = TRUE var/state_on = "camera" var/state_off = "camera_off" diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index dc091cb451..6772fe3cf1 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -1580,5 +1580,5 @@ /obj/item/electronics/apc name = "power control module" icon_state = "power_mod" - custom_price = 50 + custom_price = PRICE_CHEAP desc = "Heavy-duty switching circuits for power control." diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index 34794ec302..e89507f33d 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -488,7 +488,7 @@ By design, d1 is the smallest direction and d2 is the highest /obj/item/stack/cable_coil name = "cable coil" - custom_price = 75 + custom_price = PRICE_CHEAP_AS_FREE gender = NEUTER //That's a cable coil sounds better than that's some cable coils icon = 'icons/obj/power.dmi' icon_state = "coil" diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index 3c3f3c9541..c18eebbb55 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -506,7 +506,7 @@ cell = null qdel(src) -/obj/machinery/light/attacked_by(obj/item/I, mob/living/user) +/obj/machinery/light/attacked_by(obj/item/I, mob/living/user, attackchain_flags = NONE, damage_multiplier = 1) ..() if(status == LIGHT_BROKEN || status == LIGHT_EMPTY) if(on && (I.flags_1 & CONDUCT_1)) diff --git a/code/modules/power/power.dm b/code/modules/power/power.dm index f84b639d68..d5b19b495c 100644 --- a/code/modules/power/power.dm +++ b/code/modules/power/power.dm @@ -299,8 +299,8 @@ //siemens_coeff - layman's terms, conductivity //dist_check - set to only shock mobs within 1 of source (vendors, airlocks, etc.) //No animations will be performed by this proc. -/proc/electrocute_mob(mob/living/carbon/M, power_source, obj/source, siemens_coeff = 1, dist_check = FALSE) - if(!M || ismecha(M.loc)) +/proc/electrocute_mob(mob/living/M, power_source, obj/source, siemens_coeff = 1, dist_check = FALSE) + if(!istype(M) || ismecha(M.loc)) return 0 //feckin mechs are dumb if(dist_check) if(!in_range(source,M)) diff --git a/code/modules/projectiles/ammunition/_firing.dm b/code/modules/projectiles/ammunition/_firing.dm index 1a6786524c..340cfc2e98 100644 --- a/code/modules/projectiles/ammunition/_firing.dm +++ b/code/modules/projectiles/ammunition/_firing.dm @@ -1,17 +1,21 @@ /obj/item/ammo_casing/proc/fire_casing(atom/target, mob/living/user, params, distro, quiet, zone_override, spread, atom/fired_from) distro += variance - for (var/i = max(1, pellets), i > 0, i--) - var/targloc = get_turf(target) - ready_proj(target, user, quiet, zone_override, fired_from) + var/targloc = get_turf(target) + ready_proj(target, user, quiet, zone_override, fired_from) + if(pellets == 1) if(distro) //We have to spread a pixel-precision bullet. throw_proj was called before so angles should exist by now... if(randomspread) spread = round((rand() - 0.5) * distro) else //Smart spread - spread = round((i / pellets - 0.5) * distro) + spread = round(1 - 0.5) * distro if(!throw_proj(target, targloc, user, params, spread)) - return 0 - if(i > 1) - newshot() + return FALSE + else + if(isnull(BB)) + return FALSE + AddComponent(/datum/component/pellet_cloud, projectile_type, pellets) + SEND_SIGNAL(src, COMSIG_PELLET_CLOUD_INIT, target, user, fired_from, randomspread, spread, zone_override, params, distro) + if(click_cooldown_override) user.changeNext_move(click_cooldown_override) else @@ -31,7 +35,7 @@ else BB.def_zone = user.zone_selected BB.suppressed = quiet - + if(isgun(fired_from)) var/obj/item/gun/G = fired_from BB.damage *= G.projectile_damage_multiplier diff --git a/code/modules/projectiles/ammunition/ballistic/lmg.dm b/code/modules/projectiles/ammunition/ballistic/lmg.dm index 04cc4df349..0688d09e3c 100644 --- a/code/modules/projectiles/ammunition/ballistic/lmg.dm +++ b/code/modules/projectiles/ammunition/ballistic/lmg.dm @@ -21,3 +21,16 @@ name = "1.95x129mm incendiary bullet casing" desc = "A 1.95x129mm bullet casing designed with a chemical-filled capsule on the tip that when bursted, reacts with the atmosphere to produce a fireball, engulfing the target in flames." projectile_type = /obj/item/projectile/bullet/incendiary/mm195x129 + +/obj/item/ammo_casing/mm712x82/match + name = "7.12x82mm match bullet casing" + desc = "A 7.12x82mm bullet casing manufactured to unfailingly high standards, you could pull off some cool trickshots with this." + projectile_type = /obj/item/projectile/bullet/mm712x82_match + +/obj/item/projectile/bullet/mm712x82_match + name = "7.12x82mm match bullet" + damage = 40 + ricochets_max = 2 + ricochet_chance = 60 + ricochet_auto_aim_range = 4 + ricochet_incidence_leeway = 35 \ No newline at end of file diff --git a/code/modules/projectiles/ammunition/ballistic/pistol.dm b/code/modules/projectiles/ammunition/ballistic/pistol.dm index 461166ab0d..2077b108d7 100644 --- a/code/modules/projectiles/ammunition/ballistic/pistol.dm +++ b/code/modules/projectiles/ammunition/ballistic/pistol.dm @@ -44,7 +44,6 @@ desc = "A 9mm incendiary bullet casing." projectile_type = /obj/item/projectile/bullet/incendiary/c9mm - // .50AE (Desert Eagle) /obj/item/ammo_casing/a50AE @@ -53,3 +52,16 @@ caliber = ".50" projectile_type = /obj/item/projectile/bullet/a50AE +// .32 ACP (Improvised Pistol) + +/obj/item/ammo_casing/c32acp + name = ".32 bullet casing" + desc = "A .32 bullet casing." + caliber = "c32acp" + projectile_type = /obj/item/projectile/bullet/c32acp + +/obj/item/ammo_casing/r32acp + name = ".32 rubber bullet casing" + desc = "A .32 rubber bullet casing." + caliber = "c32acp" + projectile_type = /obj/item/projectile/bullet/r32acp diff --git a/code/modules/projectiles/ammunition/ballistic/revolver.dm b/code/modules/projectiles/ammunition/ballistic/revolver.dm index d5a9fab4b4..693b258e3d 100644 --- a/code/modules/projectiles/ammunition/ballistic/revolver.dm +++ b/code/modules/projectiles/ammunition/ballistic/revolver.dm @@ -11,6 +11,12 @@ desc = "A .357 armor-piercing bullet casing." projectile_type = /obj/item/projectile/bullet/a357/ap +/obj/item/ammo_casing/a357/match + name = ".357 match bullet casing" + desc = "A .357 bullet casing, manufactured to exceedingly high standards." + caliber = "357" + projectile_type = /obj/item/projectile/bullet/a357/match + // 7.62x38mmR (Nagant Revolver) /obj/item/ammo_casing/n762 @@ -47,4 +53,19 @@ name = ".38 Iceblox bullet casing" desc = "A .38 Iceblox bullet casing." caliber = "38" - projectile_type = /obj/item/projectile/bullet/c38/iceblox \ No newline at end of file + projectile_type = /obj/item/projectile/bullet/c38/iceblox + +/obj/item/ammo_casing/c38/match + name = ".38 Match bullet casing" + desc = "A .38 bullet casing, manufactured to exceedingly high standards." + projectile_type = /obj/item/projectile/bullet/c38/match + +/obj/item/ammo_casing/c38/match/bouncy + name = ".38 Rubber bullet casing" + desc = "A .38 rubber bullet casing, manufactured to exceedingly high standards." + projectile_type = /obj/item/projectile/bullet/c38/match/bouncy + +/obj/item/ammo_casing/c38/dumdum + name = ".38 DumDum bullet casing" + desc = "A .38 DumDum bullet casing." + projectile_type = /obj/item/projectile/bullet/c38/dumdum \ No newline at end of file diff --git a/code/modules/projectiles/ammunition/ballistic/shotgun.dm b/code/modules/projectiles/ammunition/ballistic/shotgun.dm index fc8fd65a06..ea84e23d01 100644 --- a/code/modules/projectiles/ammunition/ballistic/shotgun.dm +++ b/code/modules/projectiles/ammunition/ballistic/shotgun.dm @@ -143,3 +143,12 @@ reagents.add_reagent(/datum/reagent/toxin/acid/fluacid, 5) //this and the acid equal about 25ish burn, not counting the minute toxin damage dealt by their metabolism, this makes each dart about as lethal as a stechkin shot in upfront damage reagents.add_reagent(/datum/reagent/toxin/acid, 5) reagents.add_reagent(/datum/reagent/consumable/frostoil, 10) //tempgun slowdown goes both ways and adds to the burn + +/obj/item/ammo_casing/shotgun/incapacitate + name = "custom incapacitating shot" + desc = "A shotgun casing filled with... something. used to incapacitate targets." + icon_state = "bountyshell" + projectile_type = /obj/item/projectile/bullet/pellet/shotgun_incapacitate + pellets = 12//double the pellets, but half the stun power of each, which makes this best for just dumping right in someone's face. + variance = 25 + custom_materials = list(/datum/material/iron=4000) \ No newline at end of file diff --git a/code/modules/projectiles/ammunition/energy/laser.dm b/code/modules/projectiles/ammunition/energy/laser.dm index 174645dd11..492b91ec2d 100644 --- a/code/modules/projectiles/ammunition/energy/laser.dm +++ b/code/modules/projectiles/ammunition/energy/laser.dm @@ -12,6 +12,15 @@ e_cost = 200 select_name = "kill" +/obj/item/ammo_casing/energy/lasergun/improvised + projectile_type = /obj/item/projectile/beam/weak/improvised + e_cost = 200 + select_name = "kill" + +/obj/item/ammo_casing/energy/lasergun/improvised/upgraded + projectile_type = /obj/item/projectile/beam/weak + e_cost = 100 + /obj/item/ammo_casing/energy/laser/hos e_cost = 100 diff --git a/code/modules/projectiles/boxes_magazines/ammo_boxes.dm b/code/modules/projectiles/boxes_magazines/ammo_boxes.dm index 597c7203b4..86d66ec354 100644 --- a/code/modules/projectiles/boxes_magazines/ammo_boxes.dm +++ b/code/modules/projectiles/boxes_magazines/ammo_boxes.dm @@ -7,6 +7,11 @@ max_ammo = 7 multiple_sprites = 1 +/obj/item/ammo_box/a357/match + name = "speed loader (.357 Match)" + desc = "Designed to quickly reload revolvers. These rounds are manufactured within extremely tight tolerances, making them easy to show off trickshots with." + ammo_type = /obj/item/ammo_casing/a357/match + /obj/item/ammo_box/a357/ap name = "speed loader (.357 AP)" ammo_type = /obj/item/ammo_casing/a357/ap @@ -40,6 +45,28 @@ desc = "Designed to quickly reload revolvers. Iceblox bullets contain a cryogenic payload." ammo_type = /obj/item/ammo_casing/c38/iceblox +/obj/item/ammo_box/c38/dumdum + name = "speed loader (.38 DumDum)" + desc = "Designed to quickly reload revolvers. DumDum bullets shatter on impact and shred the target's innards, likely getting caught inside." + ammo_type = /obj/item/ammo_casing/c38/dumdum + +/obj/item/ammo_box/c38/match + name = "speed loader (.38 Match)" + desc = "Designed to quickly reload revolvers. These rounds are manufactured within extremely tight tolerances, making them easy to show off trickshots with." + ammo_type = /obj/item/ammo_casing/c38/match + +/obj/item/ammo_box/c32mm + name = "ammo box (.32 acp)" + desc = "Lethal .32 acp bullets, there's forty in the box." + ammo_type = /obj/item/ammo_casing/c32acp + max_ammo = 40 + +/obj/item/ammo_box/r32mm + name = "ammo box (rubber .32 acp)" + desc = "Non-lethal .32 acp bullets, there's forty in the box." + ammo_type = /obj/item/ammo_casing/r32acp + max_ammo = 40 + /obj/item/ammo_box/c9mm name = "ammo box (9mm)" icon_state = "9mmbox" diff --git a/code/modules/projectiles/boxes_magazines/external/lmg.dm b/code/modules/projectiles/boxes_magazines/external/lmg.dm index e42c6a4719..55f5e491da 100644 --- a/code/modules/projectiles/boxes_magazines/external/lmg.dm +++ b/code/modules/projectiles/boxes_magazines/external/lmg.dm @@ -20,3 +20,7 @@ /obj/item/ammo_box/magazine/mm195x129/update_icon() ..() icon_state = "a762-[round(ammo_count(),10)]" + +/obj/item/ammo_box/magazine/mm712x82/match + name = "box magazine (Match 7.12x82mm)" + ammo_type = /obj/item/ammo_casing/mm712x82/match \ No newline at end of file diff --git a/code/modules/projectiles/boxes_magazines/external/pistol.dm b/code/modules/projectiles/boxes_magazines/external/pistol.dm index 63b0483875..1852b839f4 100644 --- a/code/modules/projectiles/boxes_magazines/external/pistol.dm +++ b/code/modules/projectiles/boxes_magazines/external/pistol.dm @@ -66,3 +66,15 @@ caliber = ".50" max_ammo = 7 multiple_sprites = 1 + +/obj/item/ammo_box/magazine/m32acp + name = "pistol magazine (.32)" + desc = "A crudely construction pistol magazine that holds .32 ACP rounds. It looks like it can only fit eight bullets." + icon_state = "32acp" + ammo_type = /obj/item/ammo_casing/c32acp + caliber = "c32acp" + max_ammo = 8 + multiple_sprites = 2 + +/obj/item/ammo_box/magazine/m32acp/empty + start_empty = 1 diff --git a/code/modules/projectiles/boxes_magazines/internal/shotgun.dm b/code/modules/projectiles/boxes_magazines/internal/shotgun.dm index eb2572187c..1ae4b58f62 100644 --- a/code/modules/projectiles/boxes_magazines/internal/shotgun.dm +++ b/code/modules/projectiles/boxes_magazines/internal/shotgun.dm @@ -50,3 +50,8 @@ name = "riot shotgun internal magazine" ammo_type = /obj/item/ammo_casing/shotgun/rubbershot max_ammo = 6 + +/obj/item/ammo_box/magazine/internal/shot/bounty + name = "triple-barrel shotgun internal magazine" + ammo_type = /obj/item/ammo_casing/shotgun/incapacitate + max_ammo = 3 \ No newline at end of file diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index c4909c5583..b90f0aee0d 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -15,7 +15,7 @@ throw_speed = 3 throw_range = 5 force = 5 - item_flags = NEEDS_PERMIT | NO_ATTACK_CHAIN_SOFT_STAMCRIT + item_flags = NEEDS_PERMIT attack_verb = list("struck", "hit", "bashed") var/fire_sound = "gunshot" @@ -140,12 +140,13 @@ to_chat(user, "*click*") playsound(src, "gun_dry_fire", 30, 1) -/obj/item/gun/proc/shoot_live_shot(mob/living/user as mob|obj, pointblank = 0, mob/pbtarget = null, message = 1) +/obj/item/gun/proc/shoot_live_shot(mob/living/user, pointblank = FALSE, mob/pbtarget, message = 1, stam_cost = 0) if(recoil) shake_camera(user, recoil + 1, recoil) - if(isliving(user)) //CIT CHANGE - makes gun recoil cause staminaloss - user.adjustStaminaLossBuffered(getstamcost(user)*(firing && burst_size >= 2 ? 1/burst_size : 1)) //CIT CHANGE - ditto + if(stam_cost) //CIT CHANGE - makes gun recoil cause staminaloss + var/safe_cost = clamp(stam_cost, 0, STAMINA_NEAR_CRIT - user.getStaminaLoss())*(firing && burst_size >= 2 ? 1/burst_size : 1) + user.adjustStaminaLossBuffered(safe_cost) //CIT CHANGE - ditto if(suppressed) playsound(user, fire_sound, 10, 1) @@ -172,9 +173,10 @@ return if(firing) return - if(IS_STAMCRIT(user)) //respect stamina softcrit - to_chat(user, "You are too exhausted to fire [src]!") - return + var/stamloss = user.getStaminaLoss() + if(stamloss >= STAMINA_NEAR_SOFTCRIT) //The more tired you are, the less damage you do. + var/penalty = (stamloss - STAMINA_NEAR_SOFTCRIT)/(STAMINA_NEAR_CRIT - STAMINA_NEAR_SOFTCRIT)*STAM_CRIT_GUN_DELAY + user.changeNext_move(CLICK_CD_RANGE+(CLICK_CD_RANGE*penalty)) if(flag) //It's adjacent, is the user, or is on the user's person if(target in user.contents) //can't shoot stuff inside us. return @@ -216,7 +218,7 @@ var/loop_counter = 0 if(user) - bonus_spread += getinaccuracy(user) //CIT CHANGE - adds bonus spread while not aiming + bonus_spread = getinaccuracy(user, bonus_spread, stamloss) //CIT CHANGE - adds bonus spread while not aiming if(ishuman(user) && user.a_intent == INTENT_HARM && weapon_weight <= WEAPON_LIGHT) var/mob/living/carbon/human/H = user for(var/obj/item/gun/G in H.held_items) @@ -225,9 +227,11 @@ else if(G.can_trigger_gun(user)) bonus_spread += 24 * G.weapon_weight * G.dualwield_spread_mult loop_counter++ - addtimer(CALLBACK(G, /obj/item/gun.proc/process_fire, target, user, TRUE, params, null, bonus_spread), loop_counter) + var/stam_cost = G.getstamcost(user) + addtimer(CALLBACK(G, /obj/item/gun.proc/process_fire, target, user, TRUE, params, null, bonus_spread, stam_cost), loop_counter) - process_fire(target, user, TRUE, params, null, bonus_spread) + var/stam_cost = getstamcost(user) + process_fire(target, user, TRUE, params, null, bonus_spread, stam_cost) /obj/item/gun/can_trigger_gun(mob/living/user) . = ..() @@ -258,21 +262,21 @@ /obj/item/gun/proc/on_cooldown() return busy_action || firing || ((last_fire + fire_delay) > world.time) -/obj/item/gun/proc/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0) +/obj/item/gun/proc/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0, stam_cost = 0) add_fingerprint(user) if(on_cooldown()) return firing = TRUE - . = do_fire(target, user, message, params, zone_override, bonus_spread) + . = do_fire(target, user, message, params, zone_override, bonus_spread, stam_cost) firing = FALSE last_fire = world.time if(user) user.update_inv_hands() - SEND_SIGNAL(user, COMSIG_LIVING_GUN_PROCESS_FIRE, target, params, zone_override) + SEND_SIGNAL(user, COMSIG_LIVING_GUN_PROCESS_FIRE, target, params, zone_override, bonus_spread, stam_cost) -/obj/item/gun/proc/do_fire(atom/target, mob/living/user, message = TRUE, params, zone_override = "", bonus_spread = 0) +/obj/item/gun/proc/do_fire(atom/target, mob/living/user, message = TRUE, params, zone_override = "", bonus_spread = 0, stam_cost = 0) var/sprd = 0 var/randomized_gun_spread = 0 var/rand_spr = rand() @@ -290,7 +294,7 @@ sleep(burst_shot_delay) if(QDELETED(src)) break - do_burst_shot(user, target, message, params, zone_override, sprd, randomized_gun_spread, randomized_bonus_spread, rand_spr, i) + do_burst_shot(user, target, message, params, zone_override, sprd, randomized_gun_spread, randomized_bonus_spread, rand_spr, i, stam_cost) else if(chambered) sprd = round((rand() - 0.5) * DUALWIELD_PENALTY_EXTRA_MULTIPLIER * (randomized_gun_spread + randomized_bonus_spread)) @@ -300,9 +304,9 @@ return else if(get_dist(user, target) <= 1) //Making sure whether the target is in vicinity for the pointblank shot - shoot_live_shot(user, 1, target, message) + shoot_live_shot(user, 1, target, message, stam_cost) else - shoot_live_shot(user, 0, target, message) + shoot_live_shot(user, 0, target, message, stam_cost) else shoot_with_empty_chamber(user) return @@ -312,7 +316,7 @@ SSblackbox.record_feedback("tally", "gun_fired", 1, type) return TRUE -/obj/item/gun/proc/do_burst_shot(mob/living/user, atom/target, message = TRUE, params=null, zone_override = "", sprd = 0, randomized_gun_spread = 0, randomized_bonus_spread = 0, rand_spr = 0, iteration = 0) +/obj/item/gun/proc/do_burst_shot(mob/living/user, atom/target, message = TRUE, params=null, zone_override = "", sprd = 0, randomized_gun_spread = 0, randomized_bonus_spread = 0, rand_spr = 0, iteration = 0, stam_cost = 0) if(!user || !firing) firing = FALSE return FALSE @@ -336,9 +340,9 @@ return FALSE else if(get_dist(user, target) <= 1) //Making sure whether the target is in vicinity for the pointblank shot - shoot_live_shot(user, 1, target, message) + shoot_live_shot(user, 1, target, message, stam_cost) else - shoot_live_shot(user, 0, target, message) + shoot_live_shot(user, 0, target, message, stam_cost) if (iteration >= burst_size) firing = FALSE else @@ -349,20 +353,21 @@ update_icon() return TRUE -/obj/item/gun/attack(mob/M as mob, mob/user) +/obj/item/gun/attack(mob/living/M, mob/user) if(user.a_intent == INTENT_HARM) //Flogging if(bayonet) M.attackby(bayonet, user) + attack_delay_done = TRUE return else return ..() - return + attack_delay_done = TRUE //we are firing the gun, not bashing people with its butt. /obj/item/gun/attack_obj(obj/O, mob/user) if(user.a_intent == INTENT_HARM) if(bayonet) O.attackby(bayonet, user) - return + return TRUE return ..() /obj/item/gun/attackby(obj/item/I, mob/user, params) @@ -498,7 +503,7 @@ if(chambered && chambered.BB) chambered.BB.damage *= 5 - process_fire(target, user, TRUE, params) + process_fire(target, user, TRUE, params, stam_cost = getstamcost(user)) /obj/item/gun/proc/unlock() //used in summon guns and as a convience for admins if(pin) @@ -566,7 +571,25 @@ chambered = null update_icon() -/obj/item/gun/proc/getinaccuracy(mob/user) - if(SEND_SIGNAL(user, COMSIG_COMBAT_MODE_CHECK, COMBAT_MODE_INACTIVE)) - return ((weapon_weight * 25) * inaccuracy_modifier) - return 0 +/obj/item/gun/proc/getinaccuracy(mob/living/user, bonus_spread, stamloss) + if(inaccuracy_modifier == 0) + return bonus_spread + var/base_inaccuracy = weapon_weight * 25 * inaccuracy_modifier + var/aiming_delay = 0 //Otherwise aiming would be meaningless for slower guns such as sniper rifles and launchers. + if(fire_delay) + var/penalty = (last_fire + GUN_AIMING_TIME + fire_delay) - world.time + if(penalty > 0) //Yet we only penalize users firing it multiple times in a haste. fire_delay isn't necessarily cumbersomeness. + aiming_delay = penalty + if(SEND_SIGNAL(user, COMSIG_COMBAT_MODE_CHECK, COMBAT_MODE_ACTIVE)) //To be removed in favor of something less tactless later. + base_inaccuracy /= 1.5 + if(stamloss > STAMINA_NEAR_SOFTCRIT) //This can null out the above bonus. + base_inaccuracy *= 1 + (stamloss - STAMINA_NEAR_SOFTCRIT)/(STAMINA_NEAR_CRIT - STAMINA_NEAR_SOFTCRIT)*0.5 + var/mult = max((GUN_AIMING_TIME + aiming_delay + user.last_click_move - world.time)/GUN_AIMING_TIME, -0.5) //Yes, there is a bonus for taking time aiming. + if(mult < 0) //accurate weapons should provide a proper bonus with negative inaccuracy. the opposite is true too. + mult *= 1/inaccuracy_modifier + return max(bonus_spread + (base_inaccuracy * mult), 0) //no negative spread. + +/obj/item/gun/proc/getstamcost(mob/living/carbon/user) + . = recoil + if(user && !user.has_gravity()) + . = recoil*5 diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm index e45483569e..4aeefde6d4 100644 --- a/code/modules/projectiles/guns/ballistic.dm +++ b/code/modules/projectiles/guns/ballistic.dm @@ -25,7 +25,7 @@ else icon_state = "[initial(icon_state)][suppressed ? "-suppressed" : ""][sawn_off ? "-sawn" : ""]" -/obj/item/gun/ballistic/process_chamber(empty_chamber = 1) +/obj/item/gun/ballistic/process_chamber(mob/living/user, empty_chamber = 1) var/obj/item/ammo_casing/AC = chambered //Find chambered round if(istype(AC)) //there's a chambered round if(casing_ejector) diff --git a/code/modules/projectiles/guns/ballistic/automatic.dm b/code/modules/projectiles/guns/ballistic/automatic.dm index 31823dccf6..39956ef3e8 100644 --- a/code/modules/projectiles/guns/ballistic/automatic.dm +++ b/code/modules/projectiles/guns/ballistic/automatic.dm @@ -365,7 +365,7 @@ can_unsuppress = TRUE can_suppress = TRUE w_class = WEIGHT_CLASS_NORMAL - inaccuracy_modifier = 0 + inaccuracy_modifier = 0.5 zoomable = TRUE zoom_amt = 10 //Long range, enough to see in front of you, but no tiles behind you. zoom_out_amt = 13 diff --git a/code/modules/projectiles/guns/ballistic/laser_gatling.dm b/code/modules/projectiles/guns/ballistic/laser_gatling.dm index 366aa367b4..c2dd5bb42d 100644 --- a/code/modules/projectiles/guns/ballistic/laser_gatling.dm +++ b/code/modules/projectiles/guns/ballistic/laser_gatling.dm @@ -53,6 +53,7 @@ ..() /obj/item/minigunpack/dropped(mob/user) + . = ..() if(armed) user.dropItemToGround(gun, TRUE) @@ -125,12 +126,13 @@ return /obj/item/gun/ballistic/minigun/dropped(mob/user) + . = ..() if(ammo_pack) ammo_pack.attach_gun(user) else qdel(src) -/obj/item/gun/ballistic/minigun/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0) +/obj/item/gun/ballistic/minigun/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0, stam_cost = 0) if(ammo_pack) if(ammo_pack.overheat < ammo_pack.overheat_max) ammo_pack.overheat += burst_size @@ -144,4 +146,5 @@ . = ..() /obj/item/gun/ballistic/minigun/dropped(mob/living/user) + . = ..() ammo_pack.attach_gun(user) diff --git a/code/modules/projectiles/guns/ballistic/launchers.dm b/code/modules/projectiles/guns/ballistic/launchers.dm index db614b97d3..004f78235a 100644 --- a/code/modules/projectiles/guns/ballistic/launchers.dm +++ b/code/modules/projectiles/guns/ballistic/launchers.dm @@ -6,7 +6,7 @@ name = "grenade launcher" icon_state = "dshotgun-sawn" item_state = "gun" - inaccuracy_modifier = 0 + inaccuracy_modifier = 0.5 mag_type = /obj/item/ammo_box/magazine/internal/grenadelauncher fire_sound = 'sound/weapons/grenadelaunch.ogg' w_class = WEIGHT_CLASS_NORMAL @@ -87,7 +87,7 @@ pin = /obj/item/firing_pin/implant/pindicate burst_size = 1 fire_delay = 0 - inaccuracy_modifier = 0 + inaccuracy_modifier = 0.25 casing_ejector = FALSE weapon_weight = WEAPON_HEAVY magazine_wording = "rocket" @@ -144,13 +144,13 @@ user.visible_message("[user] aims [src] at the ground! It looks like [user.p_theyre()] performing a sick rocket jump!", \ "You aim [src] at the ground to perform a bisnasty rocket jump...") if(can_shoot()) - user.notransform = TRUE + user.mob_transforming = TRUE playsound(src, 'sound/vehicles/rocketlaunch.ogg', 80, 1, 5) animate(user, pixel_z = 300, time = 30, easing = LINEAR_EASING) sleep(70) animate(user, pixel_z = 0, time = 5, easing = LINEAR_EASING) sleep(5) - user.notransform = FALSE + user.mob_transforming = FALSE process_fire(user, user, TRUE) if(!QDELETED(user)) //if they weren't gibbed by the explosion, take care of them for good. user.gib() diff --git a/code/modules/projectiles/guns/ballistic/magweapon.dm b/code/modules/projectiles/guns/ballistic/magweapon.dm index e71f414bd8..74b8b210a7 100644 --- a/code/modules/projectiles/guns/ballistic/magweapon.dm +++ b/code/modules/projectiles/guns/ballistic/magweapon.dm @@ -14,7 +14,7 @@ spread = 0 recoil = 0.1 casing_ejector = FALSE - inaccuracy_modifier = 0 + inaccuracy_modifier = 0.15 dualwield_spread_mult = 1.4 weapon_weight = WEAPON_MEDIUM w_class = WEIGHT_CLASS_BULKY @@ -46,7 +46,7 @@ return 0 . = ..() -/obj/item/gun/ballistic/automatic/magrifle/shoot_live_shot() +/obj/item/gun/ballistic/automatic/magrifle/shoot_live_shot(mob/living/user, pointblank = FALSE, mob/pbtarget, message = 1, stam_cost = 0) var/obj/item/ammo_casing/caseless/magnetic/shot = chambered cell.use(shot.energy_cost) . = ..() diff --git a/code/modules/projectiles/guns/ballistic/pistol.dm b/code/modules/projectiles/guns/ballistic/pistol.dm index e15c49b891..319ec16345 100644 --- a/code/modules/projectiles/guns/ballistic/pistol.dm +++ b/code/modules/projectiles/guns/ballistic/pistol.dm @@ -115,6 +115,7 @@ icon_state = "flatgun" /obj/item/gun/ballistic/automatic/pistol/stickman/pickup(mob/living/user) + . = ..() to_chat(user, "As you try to pick up [src], it slips out of your grip..") if(prob(50)) to_chat(user, "..and vanishes from your vision! Where the hell did it go?") @@ -155,3 +156,19 @@ name = "Syndicate Anti Tank Pistol" desc = "A massively impractical and silly monstrosity of a pistol that fires .50 calliber rounds. The recoil is likely to dislocate a variety of joints without proper bracing." pin = /obj/item/firing_pin/implant/pindicate + +////////////Improvised Pistol//////////// + +/obj/item/gun/ballistic/automatic/pistol/improvised + name = "Improvised Pistol" + desc = "An improvised pocket-sized pistol that fires .32 calibre rounds. It looks incredibly flimsy." + icon_state = "ipistol" + item_state = "pistol" + mag_type = /obj/item/ammo_box/magazine/m32acp + fire_delay = 7.5 + can_suppress = FALSE + w_class = WEIGHT_CLASS_SMALL + spread = 15 // Keep the spread between 15 and 20. This hardlocks it into being a mid-range pistol, the magazine size means you're allowed to miss. Fills the mid-range niche that slugs/rifle and buckshot doesn't fill. + +/obj/item/gun/ballistic/automatic/pistol/improvised/nomag + spawnwithmagazine = FALSE // For crafting as you shouldn't get eight bullets for free otherwise people will reaper reload. diff --git a/code/modules/projectiles/guns/ballistic/revolver.dm b/code/modules/projectiles/guns/ballistic/revolver.dm index 9e43ec052f..f34dbc6abc 100644 --- a/code/modules/projectiles/guns/ballistic/revolver.dm +++ b/code/modules/projectiles/guns/ballistic/revolver.dm @@ -102,7 +102,7 @@ . = ..() safe_calibers = magazine.caliber -/obj/item/gun/ballistic/revolver/detective/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0) +/obj/item/gun/ballistic/revolver/detective/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0, stam_cost = 0) if(chambered && !(chambered.caliber in safe_calibers)) if(prob(70 - (magazine.ammo_count() * 10))) //minimum probability of 10, maximum of 60 playsound(user, fire_sound, 50, 1) @@ -242,7 +242,7 @@ user.visible_message("*click*") playsound(src, "gun_dry_fire", 30, 1) -/obj/item/gun/ballistic/revolver/russian/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0) +/obj/item/gun/ballistic/revolver/russian/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0, stam_cost = 0) add_fingerprint(user) playsound(src, "gun_dry_fire", 30, TRUE) user.visible_message("[user.name] tries to fire \the [src] at the same time, but only succeeds at looking like an idiot.", "\The [src]'s anti-combat mechanism prevents you from firing it at the same time!") @@ -319,7 +319,6 @@ /obj/item/gun/ballistic/revolver/doublebarrel/improvised name = "improvised shotgun" - desc = "Essentially a tube that aims shotgun shells." desc = "A shoddy break-action breechloaded shotgun. Its lacklustre construction will probably result in it hurting people less than a normal shotgun." icon_state = "ishotgun" item_state = "shotgun" @@ -330,8 +329,9 @@ mag_type = /obj/item/ammo_box/magazine/internal/shot/improvised sawn_desc = "I'm just here for the gasoline." unique_reskin = null - projectile_damage_multiplier = 0.8 + projectile_damage_multiplier = 0.9 var/slung = FALSE + weapon_weight = WEAPON_HEAVY /obj/item/gun/ballistic/revolver/doublebarrel/improvised/attackby(obj/item/A, mob/user, params) ..() @@ -358,7 +358,7 @@ /obj/item/gun/ballistic/revolver/doublebarrel/improvised/sawn name = "sawn-off improvised shotgun" - desc = "A single-shot shotgun. Better not miss." + desc = "The barrel and stock have been sawn and filed down; it can fit in backpacks. You still need two hands to fire this, if you value unbroken wrists." icon_state = "ishotgun" item_state = "gun" w_class = WEIGHT_CLASS_NORMAL diff --git a/code/modules/projectiles/guns/ballistic/shotgun.dm b/code/modules/projectiles/guns/ballistic/shotgun.dm index e438b351b3..a4a4065959 100644 --- a/code/modules/projectiles/guns/ballistic/shotgun.dm +++ b/code/modules/projectiles/guns/ballistic/shotgun.dm @@ -23,7 +23,7 @@ A.update_icon() update_icon() -/obj/item/gun/ballistic/shotgun/process_chamber(empty_chamber = 0) +/obj/item/gun/ballistic/shotgun/process_chamber(mob/living/user, empty_chamber = 0) return ..() //changed argument value /obj/item/gun/ballistic/shotgun/chamber_round() @@ -116,7 +116,7 @@ icon_state = "moistnugget" item_state = "moistnugget" slot_flags = 0 //no ITEM_SLOT_BACK sprite, alas - inaccuracy_modifier = 0 + inaccuracy_modifier = 0.5 mag_type = /obj/item/ammo_box/magazine/internal/boltaction var/bolt_open = FALSE can_bayonet = TRUE @@ -131,6 +131,7 @@ desc = "A bolt-action breechloaded rifle that takes 7.62mm bullets." mag_type = /obj/item/ammo_box/magazine/internal/boltaction/improvised can_bayonet = FALSE + var/slung = FALSE /obj/item/gun/ballistic/shotgun/boltaction/pump(mob/M) playsound(M, 'sound/weapons/shotgunpump.ogg', 60, 1) @@ -152,6 +153,22 @@ . = ..() . += "The bolt is [bolt_open ? "open" : "closed"]." +/obj/item/gun/ballistic/shotgun/boltaction/improvised/attackby(obj/item/A, mob/user, params) + ..() + if(istype(A, /obj/item/stack/cable_coil) && !sawn_off) + if(A.use_tool(src, user, 0, 10, max_level = JOB_SKILL_BASIC)) + slot_flags = ITEM_SLOT_BACK + to_chat(user, "You tie the lengths of cable to the rifle, making a sling.") + slung = TRUE + update_icon() + else + to_chat(user, "You need at least ten lengths of cable if you want to make a sling!") + +/obj/item/gun/ballistic/shotgun/boltaction/improvised/update_icon() + ..() + if(slung) + icon_state += "sling" + /obj/item/gun/ballistic/shotgun/boltaction/enchanted name = "enchanted bolt action rifle" desc = "Careful not to lose your head." @@ -191,7 +208,7 @@ /obj/item/gun/ballistic/shotgun/boltaction/enchanted/attack_self() return -/obj/item/gun/ballistic/shotgun/boltaction/enchanted/shoot_live_shot(mob/living/user as mob|obj, pointblank = 0, mob/pbtarget = null, message = 1) +/obj/item/gun/ballistic/shotgun/boltaction/enchanted/shoot_live_shot(mob/living/user, pointblank = FALSE, mob/pbtarget, message = 1, stam_cost = 0) ..() if(guns_left) var/obj/item/gun/ballistic/shotgun/boltaction/enchanted/GUN = new gun_type @@ -205,7 +222,7 @@ // Automatic Shotguns// -/obj/item/gun/ballistic/shotgun/automatic/shoot_live_shot(mob/living/user as mob|obj) +/obj/item/gun/ballistic/shotgun/automatic/shoot_live_shot(mob/living/user, pointblank = FALSE, mob/pbtarget, message = 1, stam_cost = 0) ..() src.pump(user) @@ -303,3 +320,18 @@ return TRUE // DOUBLE BARRELED SHOTGUN and IMPROVISED SHOTGUN are in revolver.dm + +/obj/item/gun/ballistic/shotgun/doublebarrel/hook + name = "hook modified sawn-off shotgun" + desc = "Range isn't an issue when you can bring your victim to you." + icon_state = "hookshotgun" + item_state = "shotgun" + mag_type = /obj/item/ammo_box/magazine/internal/shot/bounty + w_class = WEIGHT_CLASS_BULKY + weapon_weight = WEAPON_MEDIUM + force = 16 //it has a hook on it + attack_verb = list("slashed", "hooked", "stabbed") + hitsound = 'sound/weapons/bladeslice.ogg' + //our hook gun! + var/obj/item/gun/magic/hook/bounty/hook + var/toggled = FALSE diff --git a/code/modules/projectiles/guns/ballistic/toy.dm b/code/modules/projectiles/guns/ballistic/toy.dm index 4060a02c0f..5cdd773894 100644 --- a/code/modules/projectiles/guns/ballistic/toy.dm +++ b/code/modules/projectiles/guns/ballistic/toy.dm @@ -57,7 +57,7 @@ casing_ejector = FALSE can_suppress = FALSE -/obj/item/gun/ballistic/shotgun/toy/process_chamber(empty_chamber = 0) +/obj/item/gun/ballistic/shotgun/toy/process_chamber(mob/living/user, empty_chamber = 0) ..() if(chambered && !chambered.BB) qdel(chambered) diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm index ff3f127817..8f9e364302 100644 --- a/code/modules/projectiles/guns/energy.dm +++ b/code/modules/projectiles/guns/energy.dm @@ -127,12 +127,12 @@ chambered = null //either way, released the prepared shot recharge_newshot() //try to charge a new shot -/obj/item/gun/energy/do_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0) +/obj/item/gun/energy/do_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0, stam_cost = 0) if(!chambered && can_shoot()) process_chamber() // If the gun was drained and then recharged, load a new shot. return ..() -/obj/item/gun/energy/do_burst_shot(mob/living/user, atom/target, message = TRUE, params = null, zone_override="", sprd = 0, randomized_gun_spread = 0, randomized_bonus_spread = 0, rand_spr = 0, iteration = 0) +/obj/item/gun/energy/do_burst_shot(mob/living/user, atom/target, message = TRUE, params = null, zone_override="", sprd = 0, randomized_gun_spread = 0, randomized_bonus_spread = 0, rand_spr = 0, iteration = 0, stam_cost = 0) if(!chambered && can_shoot()) process_chamber() // Ditto. return ..() diff --git a/code/modules/projectiles/guns/energy/dueling.dm b/code/modules/projectiles/guns/energy/dueling.dm index 7fa81f513f..80bb269b21 100644 --- a/code/modules/projectiles/guns/energy/dueling.dm +++ b/code/modules/projectiles/guns/energy/dueling.dm @@ -237,7 +237,7 @@ return FALSE return TRUE -/obj/item/gun/energy/dueling/process_fire(atom/target, mob/living/user, message, params, zone_override, bonus_spread) +/obj/item/gun/energy/dueling/process_fire(atom/target, mob/living/user, message, params, zone_override, bonus_spread = 0, stam_cost = 0) if(duel.state == DUEL_READY) duel.confirmations[src] = TRUE to_chat(user,"You confirm your readiness.") diff --git a/code/modules/projectiles/guns/energy/energy_gun.dm b/code/modules/projectiles/guns/energy/energy_gun.dm index 71ee8bc5ef..1b835d35a4 100644 --- a/code/modules/projectiles/guns/energy/energy_gun.dm +++ b/code/modules/projectiles/guns/energy/energy_gun.dm @@ -110,7 +110,7 @@ fail_tick-- ..() -/obj/item/gun/energy/e_gun/nuclear/shoot_live_shot() +/obj/item/gun/energy/e_gun/nuclear/shoot_live_shot(mob/living/user, pointblank = FALSE, mob/pbtarget, message = 1, stam_cost = 0) failcheck() update_icon() ..() diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm index c5660624a2..49c069ca62 100644 --- a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm +++ b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm @@ -60,6 +60,12 @@ else cut_overlays() +/obj/item/gun/energy/kinetic_accelerator/getinaccuracy(mob/living/user, bonus_spread, stamloss) + var/old_fire_delay = fire_delay //It's pretty irrelevant tbh but whatever. + fire_delay = overheat_time + . = ..() + fire_delay = old_fire_delay + /obj/item/gun/energy/kinetic_accelerator/examine(mob/user) . = ..() if(max_mod_capacity) @@ -128,7 +134,7 @@ if(!holds_charge) empty() -/obj/item/gun/energy/kinetic_accelerator/shoot_live_shot() +/obj/item/gun/energy/kinetic_accelerator/shoot_live_shot(mob/living/user, pointblank = FALSE, mob/pbtarget, message = 1, stam_cost = 0) . = ..() attempt_reload() @@ -207,6 +213,12 @@ var/obj/item/gun/energy/kinetic_accelerator/KA = loc KA.modify_projectile(BB) +/obj/item/gun/energy/kinetic_accelerator/getstamcost(mob/living/carbon/user) + if(user && !lavaland_equipment_pressure_check(get_turf(user))) + return 0 + else + return ..() + //Projectiles /obj/item/projectile/kinetic name = "kinetic force" diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm index bcd3a97ccd..e64da116f3 100644 --- a/code/modules/projectiles/guns/energy/laser.dm +++ b/code/modules/projectiles/guns/energy/laser.dm @@ -62,7 +62,7 @@ slot_flags = ITEM_SLOT_BACK w_class = WEIGHT_CLASS_BULKY weapon_weight = WEAPON_MEDIUM - inaccuracy_modifier = 0.5 + inaccuracy_modifier = 0.7 force = 10 throwforce = 10 cell_type = /obj/item/stock_parts/cell/lascarbine @@ -240,3 +240,20 @@ chambered.BB.damage *= 5 process_fire(target, user, TRUE, params) + +//////////////// +// IMPROVISED // +//////////////// + +/obj/item/gun/energy/e_gun/old/improvised + name = "improvised energy rifle" + desc = "A crude imitation of an energy gun. It works, however the beams are poorly focused and most of the energy is wasted before it reaches the target. Welp, it still burns things." + icon_state = "improvised" + ammo_x_offset = 1 + shaded_charge = 1 + ammo_type = list(/obj/item/ammo_casing/energy/lasergun/improvised) + +/obj/item/gun/energy/e_gun/old/improvised/upgraded + name = "makeshift energy rifle" + desc = "The new lens and upgraded parts gives this a higher capacity and more energy output, however, the shoddy construction still leaves it inferior to Nanotrasen's own energy weapons." + ammo_type = list(/obj/item/ammo_casing/energy/lasergun/improvised/upgraded) diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index 807b414ce4..b55e26b6a3 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -89,7 +89,7 @@ suppressed = TRUE ammo_type = list(/obj/item/ammo_casing/energy/bolt) weapon_weight = WEAPON_LIGHT - inaccuracy_modifier = 0 + inaccuracy_modifier = 0.25 obj_flags = 0 overheat_time = 20 holds_charge = TRUE @@ -126,7 +126,7 @@ attack_verb = list("attacked", "slashed", "cut", "sliced") force = 12 sharpness = IS_SHARP - inaccuracy_modifier = 0 + inaccuracy_modifier = 0.25 can_charge = 0 heat = 3800 @@ -182,7 +182,7 @@ item_state = null icon_state = "wormhole_projector" pin = null - inaccuracy_modifier = 0 + inaccuracy_modifier = 0.25 var/obj/effect/portal/p_blue var/obj/effect/portal/p_orange var/atmos_link = FALSE @@ -318,7 +318,7 @@ icon_state = "emitter_carbine" force = 12 w_class = WEIGHT_CLASS_SMALL - inaccuracy_modifier = 0 + inaccuracy_modifier = 0.25 cell_type = /obj/item/stock_parts/cell/super ammo_type = list(/obj/item/ammo_casing/energy/emitter) diff --git a/code/modules/projectiles/guns/magic/staff.dm b/code/modules/projectiles/guns/magic/staff.dm index c993c0013a..b23b059d89 100644 --- a/code/modules/projectiles/guns/magic/staff.dm +++ b/code/modules/projectiles/guns/magic/staff.dm @@ -45,7 +45,7 @@ /obj/item/projectile/magic/death, /obj/item/projectile/magic/teleport, /obj/item/projectile/magic/door, /obj/item/projectile/magic/aoe/fireball, /obj/item/projectile/magic/spellblade, /obj/item/projectile/magic/arcane_barrage, /obj/item/projectile/magic/locker) -/obj/item/gun/magic/staff/chaos/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0) +/obj/item/gun/magic/staff/chaos/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0, stam_cost = 0) chambered.projectile_type = pick(allowed_projectile_types) . = ..() diff --git a/code/modules/projectiles/guns/misc/chem_gun.dm b/code/modules/projectiles/guns/misc/chem_gun.dm index c05ec1c4be..9db5161247 100644 --- a/code/modules/projectiles/guns/misc/chem_gun.dm +++ b/code/modules/projectiles/guns/misc/chem_gun.dm @@ -9,7 +9,7 @@ throw_speed = 3 throw_range = 7 force = 4 - inaccuracy_modifier = 0 + inaccuracy_modifier = 0.25 custom_materials = list(/datum/material/iron=2000) clumsy_check = FALSE fire_sound = 'sound/items/syringeproj.ogg' diff --git a/code/modules/projectiles/guns/misc/grenade_launcher.dm b/code/modules/projectiles/guns/misc/grenade_launcher.dm index 6113bc4857..86dd0c6ce4 100644 --- a/code/modules/projectiles/guns/misc/grenade_launcher.dm +++ b/code/modules/projectiles/guns/misc/grenade_launcher.dm @@ -31,7 +31,7 @@ /obj/item/gun/grenadelauncher/can_shoot() return grenades.len -/obj/item/gun/grenadelauncher/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0) +/obj/item/gun/grenadelauncher/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0, stam_cost = 0) user.visible_message("[user] fired a grenade!", \ "You fire the grenade launcher!") var/obj/item/grenade/F = grenades[1] //Now with less copypasta! diff --git a/code/modules/projectiles/guns/misc/medbeam.dm b/code/modules/projectiles/guns/misc/medbeam.dm index 8d800357df..e841422893 100644 --- a/code/modules/projectiles/guns/misc/medbeam.dm +++ b/code/modules/projectiles/guns/misc/medbeam.dm @@ -41,7 +41,7 @@ on_beam_release(current_target) current_target = null -/obj/item/gun/medbeam/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0) +/obj/item/gun/medbeam/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0, stam_cost = 0) if(isliving(user)) add_fingerprint(user) diff --git a/code/modules/projectiles/guns/misc/syringe_gun.dm b/code/modules/projectiles/guns/misc/syringe_gun.dm index a5f871bdf0..dc2a1df03a 100644 --- a/code/modules/projectiles/guns/misc/syringe_gun.dm +++ b/code/modules/projectiles/guns/misc/syringe_gun.dm @@ -7,7 +7,7 @@ throw_speed = 3 throw_range = 7 force = 4 - inaccuracy_modifier = 0 + inaccuracy_modifier = 0.25 custom_materials = list(/datum/material/iron=2000) clumsy_check = 0 fire_sound = 'sound/items/syringeproj.ogg' @@ -160,7 +160,7 @@ item_state = "blowgun" fire_sound = 'sound/items/syringeproj.ogg' -/obj/item/gun/syringe/blowgun/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0) +/obj/item/gun/syringe/blowgun/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0, stam_cost = 0) visible_message("[user] starts aiming with a blowgun!") if(do_after(user, 25, target = src)) user.adjustStaminaLoss(20) diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index 213bc35b52..f279047356 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -45,6 +45,8 @@ var/pixels_range_leftover = 0 /// "leftover" tick pixels and stuff yeah, so we don't round off things and introducing tracing inaccuracy. var/pixels_tick_leftover = 0 + /// Used to detect jumps in the middle of a pixel_move. Yes, this is ugly as sin code-wise but it works. + var/pixel_move_interrupted = FALSE /// Pixels moved per second. var/pixels_per_second = TILES_TO_PIXELS(12.5) @@ -56,9 +58,25 @@ var/nondirectional_sprite = FALSE //Set TRUE to prevent projectiles from having their sprites rotated based on firing angle var/spread = 0 //amount (in degrees) of projectile spread animate_movement = 0 //Use SLIDE_STEPS in conjunction with legacy + /// how many times we've ricochet'd so far (instance variable, not a stat) var/ricochets = 0 - var/ricochets_max = 2 - var/ricochet_chance = 30 + /// how many times we can ricochet max + var/ricochets_max = 0 + /// 0-100, the base chance of ricocheting, before being modified by the atom we shoot and our chance decay + var/ricochet_chance = 0 + /// 0-1 (or more, I guess) multiplier, the ricochet_chance is modified by multiplying this after each ricochet + var/ricochet_decay_chance = 0.7 + /// 0-1 (or more, I guess) multiplier, the projectile's damage is modified by multiplying this after each ricochet + var/ricochet_decay_damage = 0.7 + /// On ricochet, if nonzero, we consider all mobs within this range of our projectile at the time of ricochet to home in on like Revolver Ocelot, as governed by ricochet_auto_aim_angle + var/ricochet_auto_aim_range = 0 + /// On ricochet, if ricochet_auto_aim_range is nonzero, we'll consider any mobs within this range of the normal angle of incidence to home in on, higher = more auto aim + var/ricochet_auto_aim_angle = 30 + /// the angle of impact must be within this many degrees of the struck surface, set to 0 to allow any angle + var/ricochet_incidence_leeway = 40 + + ///If the object being hit can pass ths damage on to something else, it should not do it for this bullet + var/force_hit = FALSE //Hitscan var/hitscan = FALSE //Whether this is hitscan. If it is, speed is basically ignored. @@ -131,6 +149,11 @@ var/temporary_unstoppable_movement = FALSE + ///If defined, on hit we create an item of this type then call hitby() on the hit target with this + var/shrapnel_type + ///If TRUE, hit mobs even if they're on the floor and not our target + var/hit_stunned_targets = FALSE + /obj/item/projectile/Initialize() . = ..() permutated = list() @@ -146,6 +169,7 @@ on_range() /obj/item/projectile/proc/on_range() //if we want there to be effects when they reach the end of their range + SEND_SIGNAL(src, COMSIG_PROJECTILE_RANGE_OUT) qdel(src) //to get the correct limb (if any) for the projectile hit message @@ -165,6 +189,14 @@ /obj/item/projectile/proc/on_hit(atom/target, blocked = FALSE) if(fired_from) SEND_SIGNAL(fired_from, COMSIG_PROJECTILE_ON_HIT, firer, target, Angle) + + // i know that this is probably more with wands and gun mods in mind, but it's a bit silly that the projectile on_hit signal doesn't ping the projectile itself. + // maybe we care what the projectile thinks! See about combining these via args some time when it's not 5AM + var/obj/item/bodypart/hit_limb + if(isliving(target)) + var/mob/living/L = target + hit_limb = L.check_limb_hit(def_zone) + SEND_SIGNAL(src, COMSIG_PROJECTILE_SELF_ON_HIT, firer, target, Angle, hit_limb) var/turf/target_loca = get_turf(target) var/hitx @@ -216,10 +248,13 @@ new impact_effect_type(target_loca, hitx, hity) var/organ_hit_text = "" - var/limb_hit = L.check_limb_hit(def_zone)//to get the correct message info. + var/limb_hit = hit_limb if(limb_hit) organ_hit_text = " in \the [parse_zone(limb_hit)]" - if(suppressed) + + if(suppressed==SUPPRESSED_VERY) + playsound(loc, hitsound, 5, TRUE, -1) + else if(suppressed) playsound(loc, hitsound, 5, 1, -1) to_chat(L, "You're shot by \a [src][organ_hit_text]!") else @@ -250,7 +285,23 @@ return 50 //if the projectile doesn't do damage, play its hitsound at 50% volume /obj/item/projectile/proc/on_ricochet(atom/A) - return + if(!ricochet_auto_aim_angle || !ricochet_auto_aim_range) + return + + var/mob/living/unlucky_sob + var/best_angle = ricochet_auto_aim_angle + if(firer && HAS_TRAIT(firer, TRAIT_NICE_SHOT)) + best_angle += NICE_SHOT_RICOCHET_BONUS + for(var/mob/living/L in range(ricochet_auto_aim_range, src.loc)) + if(L.stat == DEAD || !isInSight(src, L)) + continue + var/our_angle = abs(closer_angle_difference(Angle, get_projectile_angle(src.loc, L.loc))) + if(our_angle < best_angle) + best_angle = our_angle + unlucky_sob = L + + if(unlucky_sob) + setAngle(get_projectile_angle(src, unlucky_sob.loc)) /obj/item/projectile/proc/store_hitscan_collision(datum/point/pcache) beam_segments[beam_index] = pcache @@ -258,21 +309,22 @@ beam_segments[beam_index] = null /obj/item/projectile/Bump(atom/A) + if(!trajectory) + return var/turf/T = get_turf(A) - if(trajectory && check_ricochet(A) && check_ricochet_flag(A) && ricochets < ricochets_max) + if(check_ricochet(A) && A.handle_ricochet(src)) //if you can ricochet, attempt to ricochet off the object + on_ricochet(A) //if allowed, use autoaim to ricochet into someone, otherwise default to ricocheting off the object from above var/datum/point/pcache = trajectory.copy_to() - ricochets++ - if(A.handle_ricochet(src)) - on_ricochet(A) - ignore_source_check = TRUE - decayedRange = max(0, decayedRange - reflect_range_decrease) - range = decayedRange - if(hitscan) - store_hitscan_collision(pcache) - return TRUE + if(hitscan) + store_hitscan_collision(pcache) + decayedRange = max(0, decayedRange - reflect_range_decrease) + ricochet_chance *= ricochet_decay_chance + damage *= ricochet_decay_damage + range = decayedRange + return TRUE var/distance = get_dist(T, starting) // Get the distance between the turf shot from and the mob we hit and use that for the calculations. - if(check_zone(def_zone) != BODY_ZONE_CHEST) + if(def_zone && check_zone(def_zone) != BODY_ZONE_CHEST) def_zone = ran_zone(def_zone, max(100-(7*distance), 5) * zone_accuracy_factor) //Lower accurancy/longer range tradeoff. 7 is a balanced number to use. if(isturf(A) && hitsound_wall) @@ -344,13 +396,30 @@ return T //Returns null if nothing at all was found. -/obj/item/projectile/proc/check_ricochet() - if(prob(ricochet_chance)) - return TRUE - return FALSE +/obj/item/projectile/proc/check_ricochet(atom/A) + if(ricochets > ricochets_max) //safety thing, we don't care about what the other thing says about this. + return FALSE + var/them = A.check_projectile_ricochet(src) + switch(them) + if(PROJECTILE_RICOCHET_PREVENT) + return FALSE + if(PROJECTILE_RICOCHET_FORCE) + return TRUE + if(PROJECTILE_RICOCHET_NO) + return FALSE + if(PROJECTILE_RICOCHET_YES) + var/chance = ricochet_chance * A.ricochet_chance_mod + if(firer && HAS_TRAIT(firer, TRAIT_NICE_SHOT)) + chance += NICE_SHOT_RICOCHET_BONUS + if(prob(chance)) + return TRUE + else + CRASH("Invalid return value for projectile ricochet check from [A].") /obj/item/projectile/proc/check_ricochet_flag(atom/A) - if(A.flags_1 & CHECK_RICOCHET_1) + if((flag in list("energy", "laser")) && (A.flags_ricochet & RICOCHET_SHINY)) + return TRUE + if((flag in list("bomb", "bullet")) && (A.flags_ricochet & RICOCHET_HARD)) return TRUE return FALSE @@ -391,6 +460,8 @@ /obj/item/projectile/proc/fire(angle, atom/direct_target) if(fired_from) SEND_SIGNAL(fired_from, COMSIG_PROJECTILE_BEFORE_FIRE, src, original) //If no angle needs to resolve it from xo/yo! + if(shrapnel_type) + AddElement(/datum/element/embed, projectile_payload = shrapnel_type) if(!log_override && firer && original) log_combat(firer, original, "fired at", src, "from [get_area_name(src, TRUE)]") if(direct_target) @@ -431,6 +502,7 @@ /obj/item/projectile/proc/setAngle(new_angle, hitscan_store_segment = TRUE) //wrapper for overrides. Angle = new_angle + pixel_move_interrupted = TRUE if(!nondirectional_sprite) var/matrix/M = new M.Turn(Angle) @@ -457,6 +529,7 @@ trajectory.initialize_location(target.x, target.y, target.z, 0, 0) if(hitscan) record_hitscan_start(RETURN_PRECISE_POINT(src)) + pixel_move_interrupted = TRUE if(zc) after_z_change(old, target) @@ -505,7 +578,7 @@ * The proc to make the projectile go, using a simulated pixel movement line trace. * Note: deciseconds_equivalent is currently only used for homing, times is the number of times to move pixel_increment_amount. * Trajectory multiplier directly modifies the factor of pixel_increment_amount to go per time. - * It's complicated, so probably just don'ot mess with this unless you know what you're doing. + * It's complicated, so probably just don't mess with this unless you know what you're doing. */ /obj/item/projectile/proc/pixel_move(times, hitscanning = FALSE, deciseconds_equivalent = world.tick_lag, trajectory_multiplier = 1, allow_animation = TRUE) if(!loc || !trajectory) @@ -515,6 +588,7 @@ M.Turn(Angle) transform = M var/forcemoved = FALSE + pixel_move_interrupted = FALSE // reset that var/turf/oldloc = loc var/old_px = pixel_x var/old_py = pixel_y @@ -548,9 +622,11 @@ var/safety = CEILING(pixel_increment_amount / world.icon_size, 1) * 2 + 1 while(T != loc) if(!--safety) - CRASH("Projectile took more than pixel incrememnt speed times 2 to get to its location, this is probably something seriously scuffed going on.") + CRASH("[type] took too long (allowed: [CEILING(pixel_increment_amount/world.icon_size,1)*2] moves) to get to its location.") step_towards(src, T) - if(QDELETED(src)) + if(QDELETED(src) || pixel_move_interrupted) // this doesn't take into account with pixel_move_interrupted the portion of the move cut off by any forcemoves, but we're opting to ignore that for now + // the reason is the entire point of moving to pixel speed rather than tile speed is smoothness, which will be crucial when pixel movement is done in the future + // reverting back to tile is more or less the only way of fixing this issue. return pixels_range_leftover += pixel_increment_amount if(pixels_range_leftover > world.icon_size) diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm index 2f12f0f69b..d95c3b5028 100644 --- a/code/modules/projectiles/projectile/beams.dm +++ b/code/modules/projectiles/projectile/beams.dm @@ -39,6 +39,9 @@ /obj/item/projectile/beam/weak damage = 15 +/obj/item/projectile/beam/weak/improvised + damage = 10 + /obj/item/projectile/beam/weak/penetrator armour_penetration = 50 diff --git a/code/modules/projectiles/projectile/bullets/pistol.dm b/code/modules/projectiles/projectile/bullets/pistol.dm index 319640a4d5..62ff4adb11 100644 --- a/code/modules/projectiles/projectile/bullets/pistol.dm +++ b/code/modules/projectiles/projectile/bullets/pistol.dm @@ -47,4 +47,16 @@ if(L.getStaminaLoss() >= 60) L.Sleeping(300) else - L.adjustStaminaLoss(25) \ No newline at end of file + L.adjustStaminaLoss(25) + +// .32 ACP (Improvised Pistol) + +/obj/item/projectile/bullet/c32acp + name = ".32 bullet" + damage = 13 + +/obj/item/projectile/bullet/r32acp + name = ".32 rubber bullet" + damage = 3 + eyeblur = 1 + stamina = 20 diff --git a/code/modules/projectiles/projectile/bullets/revolver.dm b/code/modules/projectiles/projectile/bullets/revolver.dm index c5c649a57e..5643804ac1 100644 --- a/code/modules/projectiles/projectile/bullets/revolver.dm +++ b/code/modules/projectiles/projectile/bullets/revolver.dm @@ -15,6 +15,38 @@ /obj/item/projectile/bullet/c38 name = ".38 bullet" damage = 25 + ricochets_max = 2 + ricochet_chance = 50 + ricochet_auto_aim_angle = 10 + ricochet_auto_aim_range = 3 + +/obj/item/projectile/bullet/c38/match + name = ".38 Match bullet" + ricochets_max = 4 + ricochet_chance = 100 + ricochet_auto_aim_angle = 40 + ricochet_auto_aim_range = 5 + ricochet_incidence_leeway = 50 + ricochet_decay_chance = 1 + ricochet_decay_damage = 1 + +/obj/item/projectile/bullet/c38/match/bouncy + name = ".38 Rubber bullet" + damage = 10 + stamina = 30 + armour_penetration = -30 + ricochets_max = 6 + ricochet_incidence_leeway = 70 + ricochet_chance = 130 + ricochet_decay_damage = 0.8 + shrapnel_type = NONE + +/obj/item/projectile/bullet/c38/dumdum + name = ".38 DumDum bullet" + damage = 15 + armour_penetration = -30 + ricochets_max = 0 + shrapnel_type = /obj/item/shrapnel/bullet/c38/dumdum /obj/item/projectile/bullet/c38/rubber name = ".38 rubber bullet" @@ -24,6 +56,7 @@ /obj/item/projectile/bullet/c38/trac name = ".38 TRAC bullet" damage = 10 + ricochets_max = 0 /obj/item/projectile/bullet/c38/trac/on_hit(atom/target, blocked = FALSE) . = ..() @@ -39,6 +72,7 @@ /obj/item/projectile/bullet/c38/hotshot //similar to incendiary bullets, but do not leave a flaming trail name = ".38 Hot Shot bullet" damage = 20 + ricochets_max = 0 /obj/item/projectile/bullet/c38/hotshot/on_hit(atom/target, blocked = FALSE) . = ..() @@ -51,6 +85,7 @@ name = ".38 Iceblox bullet" damage = 20 var/temperature = 100 + ricochets_max = 0 /obj/item/projectile/bullet/c38/iceblox/on_hit(atom/target, blocked = FALSE) . = ..() @@ -68,4 +103,14 @@ /obj/item/projectile/bullet/a357/ap name = ".357 armor-piercing bullet" damage = 45 - armour_penetration = 45 \ No newline at end of file + armour_penetration = 45 + +// admin only really, for ocelot memes +/obj/item/projectile/bullet/a357/match + name = ".357 match bullet" + ricochets_max = 5 + ricochet_chance = 140 + ricochet_auto_aim_angle = 50 + ricochet_auto_aim_range = 6 + ricochet_incidence_leeway = 80 + ricochet_decay_chance = 1 \ No newline at end of file diff --git a/code/modules/projectiles/projectile/bullets/shotgun.dm b/code/modules/projectiles/projectile/bullets/shotgun.dm index ff95b65a49..264df22c76 100644 --- a/code/modules/projectiles/projectile/bullets/shotgun.dm +++ b/code/modules/projectiles/projectile/bullets/shotgun.dm @@ -112,3 +112,8 @@ /obj/item/projectile/bullet/seed damage = 4 stamina = 1 + +/obj/item/projectile/bullet/pellet/shotgun_incapacitate + name = "incapacitating pellet" + damage = 1 + stamina = 6 \ No newline at end of file diff --git a/code/modules/projectiles/projectile/magic.dm b/code/modules/projectiles/projectile/magic.dm index 493a02d74c..7ef52aef25 100644 --- a/code/modules/projectiles/projectile/magic.dm +++ b/code/modules/projectiles/projectile/magic.dm @@ -121,10 +121,10 @@ qdel(src) /proc/wabbajack(mob/living/M) - if(!istype(M) || M.stat == DEAD || M.notransform || (GODMODE & M.status_flags)) + if(!istype(M) || M.stat == DEAD || M.mob_transforming || (GODMODE & M.status_flags)) return - M.notransform = TRUE + M.mob_transforming = TRUE M.Paralyze(INFINITY) M.icon = null M.cut_overlays() diff --git a/code/modules/reagents/chemistry/holder.dm b/code/modules/reagents/chemistry/holder.dm index 38aafc665f..4cf50cd072 100644 --- a/code/modules/reagents/chemistry/holder.dm +++ b/code/modules/reagents/chemistry/holder.dm @@ -326,19 +326,18 @@ var/datum/reagent/R = addiction if(C && R) R.addiction_stage++ - switch(R.addiction_stage) - if(1 to R.addiction_stage1_end) - need_mob_update += R.addiction_act_stage1(C) - if(R.addiction_stage1_end to R.addiction_stage2_end) - need_mob_update += R.addiction_act_stage2(C) - if(R.addiction_stage2_end to R.addiction_stage3_end) - need_mob_update += R.addiction_act_stage3(C) - if(R.addiction_stage3_end to R.addiction_stage4_end) - need_mob_update += R.addiction_act_stage4(C) - if(R.addiction_stage4_end to INFINITY) - remove_addiction(R) - else - SEND_SIGNAL(C, COMSIG_CLEAR_MOOD_EVENT, "[R.type]_overdose") + if(1 <= R.addiction_stage && R.addiction_stage <= R.addiction_stage1_end) + need_mob_update += R.addiction_act_stage1(C) + else if(R.addiction_stage1_end < R.addiction_stage && R.addiction_stage <= R.addiction_stage2_end) + need_mob_update += R.addiction_act_stage2(C) + else if(R.addiction_stage2_end < R.addiction_stage && R.addiction_stage <= R.addiction_stage3_end) + need_mob_update += R.addiction_act_stage3(C) + else if(R.addiction_stage3_end < R.addiction_stage && R.addiction_stage <= R.addiction_stage4_end) + need_mob_update += R.addiction_act_stage4(C) + else if(R.addiction_stage4_end < R.addiction_stage) + remove_addiction(R) + else + SEND_SIGNAL(C, COMSIG_CLEAR_MOOD_EVENT, "[R.type]_overdose") addiction_tick++ if(C && need_mob_update) //some of the metabolized reagents had effects on the mob that requires some updates. C.updatehealth() diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm index 9899d219bf..50e818abe6 100644 --- a/code/modules/reagents/chemistry/machinery/chem_master.dm +++ b/code/modules/reagents/chemistry/machinery/chem_master.dm @@ -32,7 +32,7 @@ for (var/x in 1 to PILL_STYLE_COUNT) var/list/SL = list() SL["id"] = x - SL["htmltag"] = assets.icon_tag("pill[x]") + SL["htmltag"] = assets.icon_class_name("pill[x]") pillStyles += list(SL) . = ..() diff --git a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm index 75848f89b9..a53c57a3e7 100644 --- a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm +++ b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm @@ -213,6 +213,11 @@ for(var/datum/reagent/R in beaker.reagents.reagent_list) . += "- [R.volume] units of [R.name]." +/obj/machinery/reagentgrinder/AltClick(mob/user) + . = ..() + if(istype(user) && user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK)) + replace_beaker(user) + /obj/machinery/reagentgrinder/proc/eject(mob/user) for(var/i in holdingitems) var/obj/item/O = i diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm index 0e0056f958..52fd89e37c 100644 --- a/code/modules/reagents/chemistry/reagents/food_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm @@ -857,3 +857,13 @@ taste_mult = 2.5 //sugar's 1.5, capsacin's 1.5, so a good middle ground. taste_description = "smokey sweetness" value = REAGENT_VALUE_COMMON + +/datum/reagent/consumable/laughsyrup + name = "Laughin' Syrup" + description = "The product of juicing Laughin' Peas. Fizzy, and seems to change flavour based on what it's used with!" + nutriment_factor = 5 * REAGENTS_METABOLISM + color = "#803280" + taste_mult = 2 + taste_description = "fizzy sweetness" + value = REAGENT_VALUE_COMMON + \ No newline at end of file diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm index b51e28decf..0f53add567 100644 --- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm @@ -250,7 +250,7 @@ if(istype(O, /obj/item/stack/medical/gauze)) var/obj/item/stack/medical/gauze/G = O reac_volume = min((reac_volume / 10), G.amount) - new/obj/item/stack/medical/ointment(get_turf(G), reac_volume) + new/obj/item/stack/medical/mesh(get_turf(G), reac_volume) G.use(reac_volume) /datum/reagent/medicine/silver_sulfadiazine/reaction_mob(mob/living/M, method=TOUCH, reac_volume, show_message = 1) @@ -336,7 +336,7 @@ if(istype(O, /obj/item/stack/medical/gauze)) var/obj/item/stack/medical/gauze/G = O reac_volume = min((reac_volume / 10), G.amount) - new/obj/item/stack/medical/bruise_pack(get_turf(G), reac_volume) + new/obj/item/stack/medical/suture(get_turf(G), reac_volume) G.use(reac_volume) /datum/reagent/medicine/styptic_powder/on_mob_life(mob/living/carbon/M) @@ -1563,3 +1563,20 @@ M.adjustOrganLoss(ORGAN_SLOT_LUNGS, 0.5) ..() . = 1 + +/datum/reagent/medicine/liquid_wisdom + name = "liquid wisdom" + description = "the physical representation of wisdom, in liquid form" + taste_mult = 4 + can_synth = FALSE + overdose_threshold = 30 + value = REAGENT_VALUE_UNCOMMON // while it's 'rare', it can be milked from the wisdom cow + +/datum/reagent/medicine/liquid_wisdom/on_mob_life(mob/living/carbon/C) //slightly stronger mannitol, from the wisdom cow + C.adjustOrganLoss(ORGAN_SLOT_BRAIN, -3*REM) + if(prob(20)) + C.cure_trauma_type(resilience = TRAUMA_RESILIENCE_BASIC) + if(prob(3)) + to_chat(C, "[pick(GLOB.wisdoms)]") //give them a random wisdom + ..() + diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index d3ac8fa506..117748afc0 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -2284,3 +2284,4 @@ S = new(T) if(data["blood_DNA"]) S.add_blood_DNA(list(data["blood_DNA"] = data["blood_type"])) + diff --git a/code/modules/reagents/reagent_containers/bottle.dm b/code/modules/reagents/reagent_containers/bottle.dm index cc1cd21bac..ad8d722b61 100644 --- a/code/modules/reagents/reagent_containers/bottle.dm +++ b/code/modules/reagents/reagent_containers/bottle.dm @@ -8,7 +8,6 @@ possible_transfer_amounts = list(5,10,15,25,30) volume = 30 - /obj/item/reagent_containers/glass/bottle/Initialize() . = ..() if(!icon_state) @@ -40,7 +39,6 @@ . += filling - /obj/item/reagent_containers/glass/bottle/epinephrine name = "epinephrine bottle" desc = "A small bottle. Contains epinephrine - used to stabilize patients." @@ -228,6 +226,13 @@ desc = "A small bottle of atropine." list_reagents = list(/datum/reagent/medicine/atropine = 30) +/obj/item/reagent_containers/glass/bottle/zeolites + name = "Zeolites bottle" + desc = "A small bottle of lab made Zeolite, which removes radiation from people quickly as well as contamination on items." + list_reagents = list(/datum/reagent/fermi/zeolites = 30) + +// Viro bottles + /obj/item/reagent_containers/glass/bottle/romerol name = "romerol bottle" desc = "A small bottle of Romerol. The REAL zombie powder." diff --git a/code/modules/reagents/reagent_containers/chem_pack.dm b/code/modules/reagents/reagent_containers/chem_pack.dm new file mode 100644 index 0000000000..35ec588ec5 --- /dev/null +++ b/code/modules/reagents/reagent_containers/chem_pack.dm @@ -0,0 +1,51 @@ +/obj/item/reagent_containers/chem_pack + name = "intravenous medicine bag" + desc = "A plastic pressure bag, or 'chem pack', for IV administration of drugs. It is fitted with a thermosealing strip." + icon = 'icons/obj/bloodpack.dmi' + icon_state = "chempack" + volume = 100 + reagent_flags = OPENCONTAINER + spillable = TRUE + obj_flags = UNIQUE_RENAME + resistance_flags = ACID_PROOF + var/sealed = FALSE + +/obj/item/reagent_containers/chem_pack/on_reagent_change(changetype) + update_icon() + +/obj/item/reagent_containers/chem_pack/update_icon() + cut_overlays() + + var/v = min(round(reagents.total_volume / volume * 10), 10) + if(v > 0) + var/mutable_appearance/filling = mutable_appearance('icons/obj/reagentfillings.dmi', "chempack1") + filling.icon_state = "chempack[v]" + filling.color = mix_color_from_reagents(reagents.reagent_list) + add_overlay(filling) + +/obj/item/reagent_containers/chem_pack/AltClick(mob/living/user) + if(user.canUseTopic(src, BE_CLOSE, NO_DEXTERY) && !sealed) + if(iscarbon(user) && (HAS_TRAIT(user, TRAIT_CLUMSY) && prob(50))) + to_chat(user, "Uh... whoops! You accidentally spill the content of the bag onto yourself.") + SplashReagents(user) + return + else + DISABLE_BITFIELD(reagents.reagents_holder_flags, OPENCONTAINER) + ENABLE_BITFIELD(reagents.reagents_holder_flags, DRAWABLE |INJECTABLE ) + spillable = FALSE + sealed = TRUE + to_chat(user, "You seal the bag.") + + +/obj/item/reagent_containers/chem_pack/examine() + . = ..() + if(sealed) + . += "The bag is sealed shut." + else + . += "Alt-click to seal it." + + +obj/item/reagent_containers/chem_pack/attack_self(mob/user) + if(sealed) + return + ..() \ No newline at end of file diff --git a/code/modules/reagents/reagent_containers/dropper.dm b/code/modules/reagents/reagent_containers/dropper.dm index b4c570dfc6..3ed946d0c5 100644 --- a/code/modules/reagents/reagent_containers/dropper.dm +++ b/code/modules/reagents/reagent_containers/dropper.dm @@ -7,7 +7,7 @@ possible_transfer_amounts = list(1, 2, 3, 4, 5) volume = 5 reagent_flags = TRANSPARENT - custom_price = 75 + custom_price = PRICE_CHEAP_AS_FREE /obj/item/reagent_containers/dropper/afterattack(obj/target, mob/user , proximity) . = ..() diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm index 549f4eb48c..328b30d092 100644 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -361,7 +361,7 @@ icon = 'icons/obj/drinks.dmi' icon_state = "smallbottle" item_state = "bottle" - custom_price = 30 + custom_price = PRICE_CHEAP_AS_FREE list_reagents = list(/datum/reagent/water = 49.5, /datum/reagent/fluorine = 0.5)//see desc, don't think about it too hard custom_materials = list(/datum/material/glass=0) volume = 50 diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index 99a93e58dc..799a6db9f5 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -96,8 +96,7 @@ reagent_flags = DRAWABLE flags_1 = null list_reagents = list(/datum/reagent/medicine/epinephrine = 10, /datum/reagent/preservahyde = 3) - custom_price = 150 - custom_premium_price = 300 + custom_premium_price = PRICE_ALMOST_EXPENSIVE /obj/item/reagent_containers/hypospray/medipen/suicide_act(mob/living/carbon/user) user.visible_message("[user] begins to choke on \the [src]! It looks like [user.p_theyre()] trying to commit suicide!") diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm index 1247a7abc3..fca04f239e 100644 --- a/code/modules/reagents/reagent_containers/pill.dm +++ b/code/modules/reagents/reagent_containers/pill.dm @@ -25,14 +25,8 @@ /obj/item/reagent_containers/pill/attack_self(mob/user) return -/obj/item/reagent_containers/pill/get_w_volume() - switch(reagents.total_volume) - if(0 to 9.5) - return 1 - if(9.5 to 25) - return DEFAULT_VOLUME_TINY - else - return DEFAULT_VOLUME_SMALL +/obj/item/reagent_containers/pill/get_w_volume() // DEFAULT_VOLUME_TINY at 25u, DEFAULT_VOLUME_SMALL at 50u + return DEFAULT_VOLUME_TINY/2 + reagents.total_volume / reagents.maximum_volume * DEFAULT_VOLUME_TINY /obj/item/reagent_containers/pill/attack(mob/M, mob/user, def_zone) if(!canconsume(M, user)) diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm index 4782a80c62..4ab1470667 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -15,7 +15,7 @@ var/show_filling = TRUE custom_materials = list(/datum/material/iron=10, /datum/material/glass=20) reagent_flags = TRANSPARENT - custom_price = 100 + custom_price = PRICE_CHEAP_AS_FREE /obj/item/reagent_containers/syringe/Initialize() . = ..() diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm index 600ee4ad14..cadd9ba04f 100644 --- a/code/modules/recycling/conveyor2.dm +++ b/code/modules/recycling/conveyor2.dm @@ -138,6 +138,7 @@ GLOBAL_LIST_EMPTY(conveyors_by_id) var/turf/T = get_step(src, movedir) if(length(T.contents) > 150) return + affecting.len = min(affecting.len, 150 - length(T.contents)) for(var/atom/movable/A in affecting) if((A.loc == loc) && A.has_gravity()) A.ConveyorMove(movedir) diff --git a/code/modules/research/bepis.dm b/code/modules/research/bepis.dm index c6ce45f160..20ca7987d5 100644 --- a/code/modules/research/bepis.dm +++ b/code/modules/research/bepis.dm @@ -33,8 +33,8 @@ var/inaccuracy_percentage = 1.5 var/positive_cash_offset = 0 var/negative_cash_offset = 0 - var/minor_rewards = list(/obj/item/stack/circuit_stack/full, //To add a new minor reward, add it here. - /obj/item/airlock_painter/decal, + var/minor_rewards = list(/obj/item/stack/circuit_stack/full, //To add a new minor reward, add it here. + /obj/item/flashlight/flashdark, /obj/item/pen/survival, /obj/item/circuitboard/machine/sleeper/party, /obj/item/toy/sprayoncan) diff --git a/code/modules/research/designs/autobotter_designs.dm b/code/modules/research/designs/autobotter_designs.dm index c2ff7c953b..830c035525 100644 --- a/code/modules/research/designs/autobotter_designs.dm +++ b/code/modules/research/designs/autobotter_designs.dm @@ -165,6 +165,7 @@ name = "Export Design (Gin)" desc = "Allows for the blowing, and bottling of Gin bottles." id = "gin_export" + reagents_list = list(/datum/reagent/consumable/ethanol/gin = 50) build_path = /obj/item/export/bottle/gin /datum/design/bottle/export/whiskey diff --git a/code/modules/research/designs/autolathe_desings/autolathe_designs_sec_and_hacked.dm b/code/modules/research/designs/autolathe_desings/autolathe_designs_sec_and_hacked.dm index 9cbef4abdd..9768d80a59 100644 --- a/code/modules/research/designs/autolathe_desings/autolathe_designs_sec_and_hacked.dm +++ b/code/modules/research/designs/autolathe_desings/autolathe_designs_sec_and_hacked.dm @@ -30,6 +30,14 @@ build_path = /obj/item/ammo_box/c38 category = list("initial", "Security") +/datum/design/r32acp + name = "Rubber Pistol Bullet (.32)" + id = "r32acp" + build_type = AUTOLATHE + materials = list(/datum/material/iron = 250) + build_path = /obj/item/ammo_casing/r32acp + category = list("initial", "Security") + ///////////////// ///Hacked Gear // ///////////////// @@ -78,7 +86,7 @@ name = "Rifle Receiver" id = "rifle_receiver" build_type = AUTOLATHE - materials = list(/datum/material/iron = 40000) + materials = list(/datum/material/iron = 24000) build_path = /obj/item/weaponcrafting/improvised_parts/rifle_receiver category = list("hacked", "Security") @@ -197,3 +205,23 @@ materials = list(/datum/material/iron = 5500) build_path = /obj/item/clothing/head/foilhat category = list("hacked", "Misc") + +/datum/design/c32acp + name = "Pistol Bullet (.32)" + id = "c32acp" + build_type = AUTOLATHE + materials = list(/datum/material/iron = 500) + build_path = /obj/item/ammo_casing/c32acp + category = list("hacked", "Security") + +///////////////// +// Magazines // +///////////////// + +/datum/design/m32acp + name = "Empty .32 Magazine" + id = "m32acp" + build_type = AUTOLATHE + materials = list(/datum/material/iron = 10000) + build_path = /obj/item/ammo_box/magazine/m32acp/empty + category = list("hacked", "Security") diff --git a/code/modules/research/designs/autolathe_desings/autolathe_designs_tcomms_and_misc.dm b/code/modules/research/designs/autolathe_desings/autolathe_designs_tcomms_and_misc.dm index ea73df568f..320f856b35 100644 --- a/code/modules/research/designs/autolathe_desings/autolathe_designs_tcomms_and_misc.dm +++ b/code/modules/research/designs/autolathe_desings/autolathe_designs_tcomms_and_misc.dm @@ -281,3 +281,10 @@ build_path = /obj/item/weaponcrafting/improvised_parts/trigger_assembly category = list("initial", "Misc") +/datum/design/focusing_lens + name = "Makeshift Lens" + id = "makeshift_lens" + build_type = AUTOLATHE + materials = list(/datum/material/iron = 2000, /datum/material/glass = 4000) + build_path = /obj/item/weaponcrafting/improvised_parts/makeshift_lens + category = list("initial", "Misc") diff --git a/code/modules/research/designs/comp_board_designs/comp_board_designs_all_misc.dm b/code/modules/research/designs/comp_board_designs/comp_board_designs_all_misc.dm index 27560f29a1..99caa5b480 100644 --- a/code/modules/research/designs/comp_board_designs/comp_board_designs_all_misc.dm +++ b/code/modules/research/designs/comp_board_designs/comp_board_designs_all_misc.dm @@ -43,4 +43,20 @@ id = "libraryconsole" build_path = /obj/item/circuitboard/computer/libraryconsole category = list("Computer Boards") - departmental_flags = DEPARTMENTAL_FLAG_ALL \ No newline at end of file + departmental_flags = DEPARTMENTAL_FLAG_ALL + +/datum/design/board/flight_control + name = "Computer Design (Shuttle Flight Controls)" + desc = "Allows for the construction of circuit boards used to build a console that enables shuttle flight" + id = "shuttle_control" + build_path = /obj/item/circuitboard/computer/shuttle/flight_control + category = list("Computer Boards", "Shuttle Machinery") + departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING + +/datum/design/board/shuttle_docker + name = "Computer Design (Private Navigation Computer)" + desc = "Allows for the construction of circuit boards used to build a console that enables the targetting of custom flight locations" + id = "shuttle_docker" + build_path = /obj/item/circuitboard/computer/shuttle/docker + category = list("Computer Boards", "Shuttle Machinery") + departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING diff --git a/code/modules/research/designs/comp_board_designs/comp_board_designs_sec.dm b/code/modules/research/designs/comp_board_designs/comp_board_designs_sec.dm index 0e93481f66..914e9ec225 100644 --- a/code/modules/research/designs/comp_board_designs/comp_board_designs_sec.dm +++ b/code/modules/research/designs/comp_board_designs/comp_board_designs_sec.dm @@ -10,6 +10,14 @@ category = list("Computer Boards") departmental_flags = DEPARTMENTAL_FLAG_SECURITY +/datum/design/board/shuttleseccamera + name = "Computer Design (Shuttle-Linked Security Camera)" + desc = "Same as a regular security camera console, but when linked to a shuttle, will specifically access cameras on that shuttle." + id = "shuttleseccamera" + build_path = /obj/item/circuitboard/computer/security/shuttle + category = list("Computer Boards") + departmental_flags = DEPARTMENTAL_FLAG_SECURITY + /datum/design/board/secdata name = "Computer Design (Security Records Console)" desc = "Allows for the construction of circuit boards used to build a security records console." diff --git a/code/modules/research/designs/electronics_designs.dm b/code/modules/research/designs/electronics_designs.dm index 4e9238c4c7..7e5bedaf0e 100644 --- a/code/modules/research/designs/electronics_designs.dm +++ b/code/modules/research/designs/electronics_designs.dm @@ -166,5 +166,3 @@ desc = "This disk will add the ability to remotely feed slimes potions via the Xenobiology console, and lift the restrictions on the number of slimes that can be stored inside the Xenobiology console. This includes the contents of the basic slime upgrade disk." id = "xenobio_slimeadv" build_path = /obj/item/disk/xenobio_console_upgrade/slimeadv - - diff --git a/code/modules/research/designs/machine_desings/machine_designs_all_misc.dm b/code/modules/research/designs/machine_desings/machine_designs_all_misc.dm index d12099f7ff..804556cb04 100644 --- a/code/modules/research/designs/machine_desings/machine_designs_all_misc.dm +++ b/code/modules/research/designs/machine_desings/machine_designs_all_misc.dm @@ -130,3 +130,27 @@ departmental_flags = DEPARTMENTAL_FLAG_SECURITY build_path = /obj/item/circuitboard/machine/hypnochair category = list("Misc. Machinery") + +/datum/design/board/engine_plasma + name = "Machine Design (Plasma Thruster Board)" + desc = "The circuit board for a plasma thruster." + id = "engine_plasma" + build_path = /obj/item/circuitboard/machine/shuttle/engine/plasma + category = list ("Shuttle Machinery") + departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE + +/datum/design/board/engine_void + name = "Machine Design (Void Thruster Board)" + desc = "The circuit board for a void thruster." + id = "engine_void" + build_path = /obj/item/circuitboard/machine/shuttle/engine/void + category = list ("Shuttle Machinery") + departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE + +/datum/design/board/engine_heater + name = "Machine Design (Engine Heater Board)" + desc = "The circuit board for an engine heater." + id = "engine_heater" + build_path = /obj/item/circuitboard/machine/shuttle/heater + category = list ("Shuttle Machinery") + departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE diff --git a/code/modules/research/designs/medical_designs.dm b/code/modules/research/designs/medical_designs.dm index 69bf039428..e1e55f3476 100644 --- a/code/modules/research/designs/medical_designs.dm +++ b/code/modules/research/designs/medical_designs.dm @@ -212,6 +212,16 @@ category = list("Medical Designs") departmental_flags = DEPARTMENTAL_FLAG_MEDICAL +/datum/design/chem_pack + name = "Intravenous Medicine Bag" + desc = "A plastic pressure bag for IV administration of drugs." + id = "chem_pack" + build_type = PROTOLATHE + departmental_flags = DEPARTMENTAL_FLAG_MEDICAL + materials = list(/datum/material/plastic = 1500) + build_path = /obj/item/reagent_containers/chem_pack + category = list("Medical Designs") + /datum/design/cloning_disk name = "Cloning Data Disk" desc = "Produce additional disks for storing genetic data." diff --git a/code/modules/research/designs/misc_designs.dm b/code/modules/research/designs/misc_designs.dm index 81068a1ee0..1b608060ce 100644 --- a/code/modules/research/designs/misc_designs.dm +++ b/code/modules/research/designs/misc_designs.dm @@ -707,3 +707,122 @@ build_path = /obj/item/clothing/gloves/tackler/rocket category = list("Equipment") departmental_flags = DEPARTMENTAL_FLAG_SECURITY + +///////////////////////////////////////// +/////////////Internal Tanks////////////// +///////////////////////////////////////// + +/datum/design/oxygen_tank + name = "Oxygen Tank" + desc = "An empty oxygen tank." + id = "oxygen_tank" + build_type = PROTOLATHE + materials = list(/datum/material/iron = 2000) + build_path = /obj/item/tank/internals/oxygen/empty + category = list("Equipment") + departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING + +/datum/design/plasma_tank + name = "Plasma Tank" + desc = "An empty plasma tank." + id = "plasma_tank" + build_type = PROTOLATHE + materials = list(/datum/material/iron = 2000) + build_path = /obj/item/tank/internals/plasma/empty + category = list("Equipment") + departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING + +/datum/design/emergency_oxygen + name = "Emergency Oxygen Tank" + desc = "A small emergency oxygen tank." + id = "emergency_oxygen" + build_type = PROTOLATHE + materials = list(/datum/material/iron = 1000) + build_path = /obj/item/tank/internals/emergency_oxygen/empty + category = list("Equipment") + departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING + +/datum/design/plasma_belt_tank + name = "Plasmaman Belt Tank" + desc = "A small tank of plasma for plasmamen." + id = "plasmaman_tank_belt" + build_type = PROTOLATHE + materials = list(/datum/material/iron = 1000) + build_path = /obj/item/tank/internals/plasmaman/belt/empty + category = list("Equipment") + departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING + +/datum/design/emergency_oxygen_engi + name = "Engineering Emergency Oxygen Tank" + desc = "An emergency oxygen tank for engineers." + id = "emergency_oxygen_engi" + build_type = PROTOLATHE + materials = list(/datum/material/iron = 1000) + build_path = /obj/item/tank/internals/emergency_oxygen/engi/empty + category = list("Equipment") + departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING + +///////////////////////////////////////// +/////////////////Tape//////////////////// +///////////////////////////////////////// + +/datum/design/sticky_tape + name = "Sticky Tape" + id = "sticky_tape" + build_type = PROTOLATHE + materials = list(/datum/material/plastic = 500) + build_path = /obj/item/stack/sticky_tape + category = list("Equipment") + departmental_flags = DEPARTMENTAL_FLAG_SERVICE + +/datum/design/super_sticky_tape + name = "Super Sticky Tape" + id = "super_sticky_tape" + build_type = PROTOLATHE + materials = list(/datum/material/plastic = 3000) + build_path = /obj/item/stack/sticky_tape/super + category = list("Equipment") + departmental_flags = DEPARTMENTAL_FLAG_SERVICE + +/datum/design/pointy_tape + name = "Pointy Tape" + id = "pointy_tape" + build_type = PROTOLATHE + materials = list(/datum/material/iron = 1500, /datum/material/plastic = 1000) + build_path = /obj/item/stack/sticky_tape/pointy + category = list("Equipment") + departmental_flags = DEPARTMENTAL_FLAG_SERVICE + +///////////////////////////////////////// +/////////////////Shuttle Upgrades//////// +///////////////////////////////////////// + +/datum/design/shuttle_speed_upgrade + name = "Shuttle Route Optimisation Upgrade" + desc = "A disk that allows for calculating shorter routes when inserted into a flight control console." + id = "disk_shuttle_route" + build_type = PROTOLATHE + materials = list(/datum/material/iron = 1000, /datum/material/glass = 1000) + build_path = /obj/item/shuttle_route_optimisation + category = list("Equipment") + departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING + +/datum/design/shuttle_speed_upgrade_hyper + name = "Shuttle Bluespace Hyperlane Optimisation Upgrade" + desc = "A disk that allows for calculating shorter routes when inserted into a flight control console. This one abuses bluespace hyperlanes for increased efficiency." + id = "disk_shuttle_route_hyper" + build_type = PROTOLATHE + materials = list(/datum/material/iron = 1000, /datum/material/glass = 1000) + build_path = /obj/item/shuttle_route_optimisation/hyperlane + category = list("Equipment") + departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING + +/datum/design/shuttle_speed_upgrade_void + name = "Shuttle Voidspace Optimisation Upgrade" + desc = "A disk that allows for calculating shorter routes when inserted into a flight control console. This one access voidspace for increased efficiency." + id = "disk_shuttle_route_void" + build_type = PROTOLATHE + materials = list(/datum/material/iron = 1000, /datum/material/glass = 1000) + build_path = /obj/item/shuttle_route_optimisation/void + category = list("Equipment") + departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING diff --git a/code/modules/research/designs/tool_designs.dm b/code/modules/research/designs/tool_designs.dm index e500166e76..551d6fa0e3 100644 --- a/code/modules/research/designs/tool_designs.dm +++ b/code/modules/research/designs/tool_designs.dm @@ -42,6 +42,16 @@ category = list("Tool Designs") departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING +/datum/design/shuttlecreator + name = "Rapid Shuttle Designator" + desc = "An advanced device capable of defining areas for use in the creation of shuttles" + id = "shuttle_creator" + build_path = /obj/item/shuttle_creator + build_type = PROTOLATHE + materials = list(/datum/material/iron = 8000, /datum/material/titanium = 5000, /datum/material/bluespace = 5000) + category = list("Tool Designs") + departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_ENGINEERING + /datum/design/handdrill name = "Hand Drill" desc = "A small electric hand drill with an interchangeable screwdriver and bolt bit" diff --git a/code/modules/research/techweb/nodes/bepis_nodes.dm b/code/modules/research/techweb/nodes/bepis_nodes.dm index 0033564274..41d3a08d64 100644 --- a/code/modules/research/techweb/nodes/bepis_nodes.dm +++ b/code/modules/research/techweb/nodes/bepis_nodes.dm @@ -80,3 +80,12 @@ research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) hidden = TRUE experimental = TRUE + +/datum/techweb_node/sticky_advanced + id = "sticky_advanced" + display_name = "Advanced Sticky Technology" + description = "Taking a good joke too far? Nonsense!" + design_ids = list("super_sticky_tape", "pointy_tape") + research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) + hidden = TRUE + experimental = TRUE diff --git a/code/modules/research/techweb/nodes/biotech_nodes.dm b/code/modules/research/techweb/nodes/biotech_nodes.dm index 8f7d978a99..977f8685d6 100644 --- a/code/modules/research/techweb/nodes/biotech_nodes.dm +++ b/code/modules/research/techweb/nodes/biotech_nodes.dm @@ -5,7 +5,7 @@ display_name = "Biological Technology" description = "What makes us tick." //the MC, silly! prereq_ids = list("base") - design_ids = list("medicalkit", "chem_heater", "chem_master", "chem_dispenser", "sleeper", "vr_sleeper", "pandemic", "defibrillator", "defibmount", "operating", "soda_dispenser", "beer_dispenser", "healthanalyzer", "blood_bag", "bloodbankgen", "telescopiciv", "medspray","genescanner") + design_ids = list("medicalkit", "chem_heater", "chem_master", "chem_dispenser", "sleeper", "vr_sleeper", "pandemic", "defibrillator", "defibmount", "operating", "soda_dispenser", "beer_dispenser", "healthanalyzer", "blood_bag", "bloodbankgen", "telescopiciv", "medspray","genescanner","chem_pack") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) /datum/techweb_node/adv_biotech diff --git a/code/modules/research/techweb/nodes/bluespace_nodes.dm b/code/modules/research/techweb/nodes/bluespace_nodes.dm index 85142cd9b8..3aacc9fec5 100644 --- a/code/modules/research/techweb/nodes/bluespace_nodes.dm +++ b/code/modules/research/techweb/nodes/bluespace_nodes.dm @@ -63,3 +63,36 @@ prereq_ids = list("bluespace_warping", "syndicate_basic") design_ids = list("desynchronizer") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) + +/////////////////////////shuttle tech///////////////////////// +/datum/techweb_node/basic_shuttle_tech + id = "basic_shuttle" + display_name = "Basic Shuttle Research" + description = "Research the technology required to create and use basic shuttles." + prereq_ids = list("practical_bluespace", "adv_engi") + design_ids = list("shuttle_creator", "engine_plasma", "engine_heater", "shuttle_control", "shuttle_docker") + research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 5000) + +/datum/techweb_node/shuttle_route_upgrade + id = "shuttle_route_upgrade" + display_name = "Route Optimisation Upgrade" + description = "Research into bluespace tunnelling, allowing us to reduce flight times by up to 20%!" + prereq_ids = list("basic_shuttle") + design_ids = list("disk_shuttle_route") + research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) + +/datum/techweb_node/shuttle_route_upgrade_hyper + id = "shuttle_route_upgrade_hyper" + display_name = "Hyperlane Optimisation Upgrade" + description = "Research into bluespace hyperlane, allowing us to reduce flight times by up to 40%!" + prereq_ids = list("shuttle_route_upgrade", "bluespace_warping") + design_ids = list("disk_shuttle_route_hyper") + research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 5000) + +/datum/techweb_node/shuttle_route_upgrade_void + id = "shuttle_route_upgrade_void" + display_name = "Nullspace Breaching Upgrade" + description = "Research into voidspace tunnelling, allowing us to significantly reduce flight times." + prereq_ids = list("shuttle_route_upgrade_hyper", "alientech") + design_ids = list("disk_shuttle_route_void", "engine_void") + research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 12500) diff --git a/code/modules/research/techweb/nodes/engineering_nodes.dm b/code/modules/research/techweb/nodes/engineering_nodes.dm index 2ab5458028..eac8c2faf2 100644 --- a/code/modules/research/techweb/nodes/engineering_nodes.dm +++ b/code/modules/research/techweb/nodes/engineering_nodes.dm @@ -7,7 +7,8 @@ prereq_ids = list("base") design_ids = list("solarcontrol", "recharger", "powermonitor", "rped", "pacman", "adv_capacitor", "adv_scanning", "emitter", "high_cell", "adv_matter_bin", "atmosalerts", "atmos_control", "recycler", "autolathe", "autolathe_secure", "high_micro_laser", "nano_mani", "mesons", "thermomachine", "rad_collector", "tesla_coil", "grounding_rod", - "apc_control", "power control", "airlock_board", "firelock_board", "airalarm_electronics", "firealarm_electronics", "cell_charger", "stack_console", "stack_machine", "rcd_ammo") + "apc_control", "power control", "airlock_board", "firelock_board", "airalarm_electronics", "firealarm_electronics", "cell_charger", "stack_console", "stack_machine", "rcd_ammo","oxygen_tank", + "plasma_tank", "emergency_oxygen", "emergency_oxygen_engi", "plasmaman_tank_belt") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 6000) /datum/techweb_node/adv_engi diff --git a/code/modules/research/techweb/nodes/misc_nodes.dm b/code/modules/research/techweb/nodes/misc_nodes.dm index d34afca90a..3f8ad8592a 100644 --- a/code/modules/research/techweb/nodes/misc_nodes.dm +++ b/code/modules/research/techweb/nodes/misc_nodes.dm @@ -66,3 +66,24 @@ design_ids = list("air_horn", "honker_main", "honker_peri", "honker_targ", "honk_chassis", "honk_head", "honk_torso", "honk_left_arm", "honk_right_arm", "honk_left_leg", "honk_right_leg", "mech_banana_mortar", "mech_mousetrap_mortar", "mech_honker", "mech_punching_face", "implant_trombone", "borg_transform_clown") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) + +////////////////////////Tape tech//////////////////////////// +/datum/techweb_node/sticky_basic + id = "sticky_basic" + display_name = "Basic Sticky Technology" + description = "The only thing left to do after researching this tech is to start printing out a bunch of 'kick me' signs." + prereq_ids = list("base") + design_ids = list("sticky_tape") + research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) + hidden = TRUE + experimental = TRUE + +// Can be researched after getting the basic sticky technology from the BEPIS major reward +/datum/techweb_node/sticky_advanced + id = "sticky_advanced" + display_name = "Advanced Sticky Technology" + description = "Taking a good joke too far? Nonsense!" + prereq_ids = list("sticky_basic") + design_ids = list("super_sticky_tape", "pointy_tape") + research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 5000) + hidden = TRUE \ No newline at end of file diff --git a/code/modules/ruins/lavalandruin_code/puzzle.dm b/code/modules/ruins/lavalandruin_code/puzzle.dm index 70b0545ded..92e24e3bc4 100644 --- a/code/modules/ruins/lavalandruin_code/puzzle.dm +++ b/code/modules/ruins/lavalandruin_code/puzzle.dm @@ -289,7 +289,7 @@ /obj/effect/sliding_puzzle/prison/dispense_reward() prisoner.forceMove(get_turf(src)) - prisoner.notransform = FALSE + prisoner.mob_transforming = FALSE prisoner = null //Some armor so it's harder to kill someone by mistake. @@ -329,7 +329,7 @@ return FALSE //First grab the prisoner and move them temporarily into the generator so they won't get thrown around. - prisoner.notransform = TRUE + prisoner.mob_transforming = TRUE prisoner.forceMove(cube) to_chat(prisoner,"You're trapped by the prison cube! You will remain trapped until someone solves it.") @@ -350,4 +350,4 @@ //Move them into random block var/obj/structure/puzzle_element/E = pick(cube.elements) prisoner.forceMove(E) - return TRUE \ No newline at end of file + return TRUE diff --git a/code/modules/ruins/spaceruin_code/hilbertshotel.dm b/code/modules/ruins/spaceruin_code/hilbertshotel.dm index a60d564631..ec5e98b2e6 100644 --- a/code/modules/ruins/spaceruin_code/hilbertshotel.dm +++ b/code/modules/ruins/spaceruin_code/hilbertshotel.dm @@ -413,13 +413,13 @@ GLOBAL_VAR_INIT(hhmysteryRoomNumber, 1337) . = ..() if(ismob(AM)) var/mob/M = AM - M.notransform = TRUE + M.mob_transforming = TRUE /obj/item/abstracthotelstorage/Exited(atom/movable/AM, atom/newLoc) . = ..() if(ismob(AM)) var/mob/M = AM - M.notransform = FALSE + M.mob_transforming = FALSE //Space Ruin stuff /area/ruin/space/has_grav/hilbertresearchfacility diff --git a/code/modules/security_levels/keycard_authentication.dm b/code/modules/security_levels/keycard_authentication.dm index 04f2de9bec..adf53ff0da 100644 --- a/code/modules/security_levels/keycard_authentication.dm +++ b/code/modules/security_levels/keycard_authentication.dm @@ -20,6 +20,7 @@ GLOBAL_DATUM_INIT(keycard_events, /datum/events, new) var/event = "" var/obj/machinery/keycard_auth/event_source var/mob/triggerer = null + var/obj/item/card/id/first_id = null var/waiting = 0 /obj/machinery/keycard_auth/Initialize() @@ -56,32 +57,37 @@ GLOBAL_DATUM_INIT(keycard_events, /datum/events, new) return ..() /obj/machinery/keycard_auth/ui_act(action, params) - if(..() || waiting || !allowed(usr)) + if(..() || waiting) + return + var/obj/item/card/id/ID = usr.get_idcard(TRUE) + if(!ID || !istype(ID)) + return + if(!check_access(ID)) return switch(action) if("red_alert") if(!event_source) - sendEvent(KEYCARD_RED_ALERT) + sendEvent(KEYCARD_RED_ALERT, ID) . = TRUE if("emergency_maint") if(!event_source) - sendEvent(KEYCARD_EMERGENCY_MAINTENANCE_ACCESS) + sendEvent(KEYCARD_EMERGENCY_MAINTENANCE_ACCESS, ID) . = TRUE if("auth_swipe") - if(event_source) + if(event_source && ID != first_id && first_id) event_source.trigger_event(usr) event_source = null . = TRUE if("bsa_unlock") if(!event_source) - sendEvent(KEYCARD_BSA_UNLOCK) + sendEvent(KEYCARD_BSA_UNLOCK, ID) . = TRUE -/obj/machinery/keycard_auth/proc/sendEvent(event_type) +/obj/machinery/keycard_auth/proc/sendEvent(event_type, trigger_id) triggerer = usr event = event_type waiting = 1 - GLOB.keycard_events.fireEvent("triggerEvent", src) + GLOB.keycard_events.fireEvent("triggerEvent", src, trigger_id) addtimer(CALLBACK(src, .proc/eventSent), 20) /obj/machinery/keycard_auth/proc/eventSent() @@ -89,14 +95,16 @@ GLOBAL_DATUM_INIT(keycard_events, /datum/events, new) event = "" waiting = 0 -/obj/machinery/keycard_auth/proc/triggerEvent(source) +/obj/machinery/keycard_auth/proc/triggerEvent(source, trigger_id) icon_state = "auth_on" + first_id = trigger_id event_source = source addtimer(CALLBACK(src, .proc/eventTriggered), 20) /obj/machinery/keycard_auth/proc/eventTriggered() icon_state = "auth_off" event_source = null + first_id = null /obj/machinery/keycard_auth/proc/trigger_event(confirmer) log_game("[key_name(triggerer)] triggered and [key_name(confirmer)] confirmed event [event]") diff --git a/code/modules/shuttle/computer.dm b/code/modules/shuttle/computer.dm index d2b13fc71a..75bf55a5a3 100644 --- a/code/modules/shuttle/computer.dm +++ b/code/modules/shuttle/computer.dm @@ -71,6 +71,6 @@ to_chat(user, "You fried the consoles ID checking system.") return TRUE -/obj/machinery/computer/shuttle/proc/connect_to_shuttle(obj/docking_port/mobile/port, obj/docking_port/stationary/dock, idnum, override=FALSE) +/obj/machinery/computer/shuttle/connect_to_shuttle(obj/docking_port/mobile/port, obj/docking_port/stationary/dock, idnum, override=FALSE) if(port && (shuttleId == initial(shuttleId) || override)) shuttleId = port.id \ No newline at end of file diff --git a/code/modules/shuttle/custom_shuttle.dm b/code/modules/shuttle/custom_shuttle.dm new file mode 100644 index 0000000000..6e06e3fefe --- /dev/null +++ b/code/modules/shuttle/custom_shuttle.dm @@ -0,0 +1,268 @@ +#define Z_DIST 500 +#define CUSTOM_ENGINES_START_TIME 65 +#define CALCULATE_STATS_COOLDOWN 2 + +/obj/machinery/computer/custom_shuttle + name = "nanotrasen shuttle flight controller" + desc = "A terminal used to fly shuttles defined by the Shuttle Zoning Designator" + circuit = /obj/item/circuitboard/computer/shuttle/flight_control + icon_screen = "shuttle" + icon_keyboard = "tech_key" + light_color = LIGHT_COLOR_CYAN + req_access = list( ) + var/shuttleId + var/possible_destinations = "whiteship_home" + var/admin_controlled + var/no_destination_swap = 0 + var/calculated_mass = 0 + var/calculated_dforce = 0 + var/calculated_speed = 0 + var/calculated_engine_count = 0 + var/calculated_consumption = 0 + var/calculated_cooldown = 0 + var/calculated_non_operational_thrusters = 0 + var/calculated_fuel_less_thrusters = 0 + var/target_fuel_cost = 0 + var/targetLocation + var/datum/browser/popup + + var/stat_calc_cooldown = 0 + + //Upgrades + var/distance_multiplier = 1 + +/obj/machinery/computer/custom_shuttle/examine(mob/user) + . = ..() + . += distance_multiplier < 1 ? "Bluespace shortcut module installed. Route is [distance_multiplier]x the original length." : "" + +/obj/machinery/computer/custom_shuttle/ui_interact(mob/user) + var/list/options = params2list(possible_destinations) + var/obj/docking_port/mobile/M = SSshuttle.getShuttle(shuttleId) + var/dat = "[M ? "Current Location : [M.getStatusText()]" : "Shuttle link required."]
" + if(M) + dat += "Run Flight Calculations
" + dat += "Shuttle Data
" + dat += "Shuttle Mass: [calculated_mass/10]tons
" + dat += "Engine Force: [calculated_dforce]kN ([calculated_engine_count] engines)
" + dat += "Sublight Speed: [calculated_speed]ms-1
" + dat += calculated_speed < 1 ? "INSUFFICIENT ENGINE POWER
" : "" + dat += calculated_non_operational_thrusters > 0 ? "Warning: [calculated_non_operational_thrusters] thrusters offline.
" : "" + dat += "Fuel Consumption: [calculated_consumption]units per distance
" + dat += "Engine Cooldown: [calculated_cooldown]s
" + var/destination_found + for(var/obj/docking_port/stationary/S in SSshuttle.stationary) + if(!options.Find(S.id)) + continue + if(!M.check_dock(S, silent=TRUE)) + continue + if(calculated_speed == 0) + break + destination_found = TRUE + var/dist = round(calculateDistance(S)) + dat += "Target [S.name] (Dist: [dist] | Fuel Cost: [round(dist * calculated_consumption)] | Time: [round(dist / calculated_speed)])
" + if(!destination_found) + dat += "No valid destinations
" + dat += "
[targetLocation ? "Target Location : [targetLocation]" : "No Target Location"]" + dat += "
Initate Flight
" + dat += "Close" + + popup = new(user, "computer", M ? M.name : "shuttle", 350, 450) + popup.set_content("
-
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index d07b7c3a4f..95c8e72a54 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -25832,3 +25832,218 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
- bugfix: Adding in some overrides and proper flag checks for martial arts.
- bugfix: Stun thresholding stops disarm spams at extremely high stamina loss.
- tweak: Ashen Arrows are actually called Ashen Arrows in the crafting menu.
+2020-06-08:
+ DeltaFire15:
+ - bugfix: Delinging now properly removes their special role
+ - balance: Keycard auth devices now require two seperate IDs with sufficient access
+ to auth.
+ Linzolle:
+ - bugfix: shotguns no longer delete chambered shells while firing
+ kevinz000:
+ - rscadd: test
+ - rscdel: test
+ shellspeed1:
+ - rscadd: Internal tanks are now printable at the engineering lathe.
+ timothyteakettle:
+ - bugfix: newly created areas using blueprints now maintain the previous areas noteleport
+ value
+ - bugfix: kudzu seeds now actually spawn vines
+2020-06-09:
+ Anonymous:
+ - rscadd: Added Orville-inspired clothing as a worthy alternative to Trek stuff.
+ - tweak: Adds chaplain role allowance to the TMP Service Uniform loadout.
+ - tweak: Adds paramedic in every medsci mentioned uniform loadout.
+ DeltaFire15:
+ - bugfix: Offstation AIs can once again only interact with their z-level
+ Ghommie:
+ - bugfix: Fixing IC material containers interaction with stacks, for real.
+ Trilbyspaceclone:
+ - tweak: Gasses like BZ and Masiam seem to just sell for less in cargo, markets
+ seem to change it seems
+ kevinz000:
+ - balance: plantpeople should stop dying in the halls now
+ - rscadd: Modifier-independent hotkey bindings have been added.
+2020-06-10:
+ DeltaFire15:
+ - bugfix: Golems / simillar now inherit the neutered antag datum if the creator
+ is neutered.
+ Ghommie:
+ - bugfix: Fixing missing pill type buttons from the chem master UI.
+ Naksu:
+ - code_imp: Lighting corner updates are ever so slightly faster.
+ Putnam for helping me code the contamination clearing on people:
+ - rscadd: Lab made Zeolites have been remade anew and more affective now that they
+ refined the best possable way to mix and make a supper Zeolite capable of clearing
+ contamination form not only people but items!
+ Trilbyspaceclone:
+ - tweak: Tank Dispender has been moved into toxin storage from toxins
+ kevinz000:
+ - rscadd: traitor classes can now be poplocked. hijack/glorious death are now locked
+ to 25/20 respectively.
+ timothyteakettle:
+ - rscadd: adds a new fermichem, used for creating sentient plushies!
+ - rscadd: Mice can now breed using cheese wedges
+ - rscadd: Royal cheese can be crafted to convert a mouse into king rat
+2020-06-11:
+ Ghommie:
+ - balance: Balanced vending machine prices to be generally more affordable, a minority
+ has been priced up though.
+2020-06-12:
+ EmeraldSundisk:
+ - tweak: The Detective's Office has been commandeered in order to serve a Head of
+ Security. Detectives will find their new office within starboard maintenance.
+ - rscadd: Adds the Head of Security's standard equipment to their new office.
+ - tweak: Slight adjustment/expansion to the main security department
+ - rscadd: Additional maintenance work
+ timothyteakettle:
+ - rscadd: Crabs, cockroaches, slimes and crabs are now small enough to fit in pet
+ carriers
+2020-06-14:
+ Bhijn:
+ - bugfix: raw HTML can no longer be used in flavortext
+ - rscadd: Added Lesbian Visibility Day (April 26th)
+ - rscadd: Added Bisexual Visibility Day (September 23rd)
+ - rscadd: Added Coming Out Day! (October 11th)
+ - rscadd: Added Intersex Awareness Day (October 26th)
+ - rscadd: Added Transgender Awareness Week (November 13th - 19th)
+ - rscadd: Added the Transgender Day of Remembrance (November 20th)
+ - rscadd: Added Asexual Awareness Week (Last full week of October, this year it'll
+ be Oct. 25-31)
+ - rscadd: Added the Stonewall Riot Anniversary (June 28)
+ - bugfix: Moth week is now *actually* the last full week of July, instead of the
+ 4th of every weekday + the 5th Sunday.
+ Floof Ball / Kathrin Morrison / Floof Ball#0798:
+ - rscadd: Improvised Pistol + 32 ACP ammo.
+ - rscadd: Improvised Energy Gun. Fires 5 shots of 10 burn damage each. Can be upgraded
+ with a lens made from glassworking and T4 parts for a minor buff.
+ - rscadd: Ammo + gun part loot spawners for mappers.
+ - rscadd: New sprites for Improvised Rifle, the ability to sling the rifle and a
+ sprite for that.
+ - rscadd: New sprites for the Improvised Shotgun and its sling sprite.
+ - balance: Improvised shotguns are now two-handed only.
+ - balance: Improvised shotguns now only have a much less harsh 0.9* modifier, keeping
+ them two hits to crit with slugs and buckshot. It can no longer be dual-wielded
+ but can still be sawn off for w_class medium (can fit in backpacks).
+ - bugfix: Missing handsaw icons added in.
+ - tweak: Crafting table cleaned up into sections.
+ Ghommie:
+ - tweak: changed the weak attack message prefix from "inefficiently" to "limply",
+ "feebly" and "saplessly" and lowered the threshold.
+ - bugfix: Fixing old beserker hardsuits having the wrong helmet type.
+ The0bserver and Stewydeadmike:
+ - rscadd: Hey, there's a bit of dust in this recipe book! Recipes using peas? How
+ many recipes does this book even have?
+ - rscadd: Adds 6 new food items, and 1 new consumable reagent using all forms of
+ the recently discovered peas. Ask your local botanist and chef for them today!
+ YakumoChen:
+ - tweak: Adds polychrome options to loadout
+ - tweak: Adds risque polychrome options to Kinkmate vendors
+ kevinz000:
+ - bugfix: emissive blockers can no longer be radioactive.
+ - rscadd: Ghosts can now scan air inside most objects that contain air by clicking
+ on them.
+ - rscadd: Directional blocking has been added, keybound to G. This will reduce a
+ portion of incoming damage if done with eligible items at the cost of stamina
+ damage incurred to the user based on damage blocked as well as while active,
+ as well as in most cases preventing the user from doing any attacks while this
+ is active.
+ - rscadd: Parrying has been added, keybound to F. Timing-based counterattacks, effect
+ heavily dependent on the item, WIP.
+ - balance: Disks are now smaller.
+2020-06-15:
+ Anturk, kevinz000:
+ - bugfix: VV now properly allows access to datums in associative lists
+ - rscadd: SDQL2 printout has been upgraded for the 5th time.
+ kevinz000:
+ - bugfix: plushies now work. credits to timothytea.
+ - rscadd: You can now tape knives to cleanbots
+ kevinz000 (port from VOREStation):
+ - imageadd: Ported zoomba skins for cyborgs.
+2020-06-16:
+ Ghommie:
+ - bugfix: You can't blink nor use LOOC/AOOC as a petrified statue anymore.
+ Trilbyspaceclone:
+ - tweak: BEPIS decal painter has been moved to venders, replacing it being the flashdark
+ kevinz000:
+ - refactor: projectile ricochets now use a less hilariously terrible way of being
+ handled and should be easier to w
+ - bugfix: projectile runtime/ricocheting
+ - balance: Lobotomy no longer has a 50% chance of giving you a nigh-unremovable
+ trauma, but does 50 brain damage even on success. On failure, it will give you
+ a lobotomy-class trauma.
+ - balance: spinesnapping from tackling now only gives a lobotomy class trauma instead
+ of magic.
+ timothyteakettle:
+ - bugfix: Food carts now function as intended, allowing the pouring and mixing of
+ drinks.
+ - rscadd: slimes can now change their color using alter form
+2020-06-17:
+ SmArtKar:
+ - rscadd: New ID icons
+ - rscadd: Sutures and Meshes
+ Trilbyspaceclone:
+ - bugfix: Gin export takes gin now
+2020-06-18:
+ Detective-Google:
+ - tweak: cog is now less the suck
+ - bugfix: couple little derpy bits
+ - balance: malf disk and illegal tech disk moved from ashwalker base (guaranteed)
+ to tendrils (chance based)
+ SmArtKar:
+ - rscadd: Ported shuttles from beestation
+ timothyteakettle:
+ - rscadd: embeds got reworked, sticky tape was added, more bullets that ricochet
+ also added
+ - rscadd: medbots can now be tipped over
+ - soundadd: added more medbot sounds
+2020-06-19:
+ Bhijn:
+ - bugfix: Atmos can no longer become completely bricked
+ Funce:
+ - bugfix: Square root circuit should now actually work.
+ SmArtKar:
+ - bugfix: Fixed my runtimes
+ TheSpaghetti:
+ - rscadd: more insectoid insects
+ kevinz000:
+ - rscadd: bay/polaris style say_emphasis has been added. You can now |italicize|
+ _underline_ and +bold+ your messages.
+ timothyteakettle:
+ - rscadd: Adds the brain trauma event, where one player gets a random brain trauma!
+ - rscadd: Adds the wisdom cow event, where the wisdom cow appears on the station!
+ - rscadd: Adds the fake virus event, where people get fake virus symptoms.
+ - rscadd: Adds the stray cargo pod event, where a cargo pod crashes into the station.
+ - rscadd: Adds the fugitives event, where fugitives are loose on the station, and
+ it's the hunters jobs to capture them.
+2020-06-20:
+ LetterN:
+ - rscadd: Asset cache from tg
+ - tweak: Made the map viewer not look bad
+ - bugfix: Admin matrix right-bracket
+ bunny232:
+ - rscdel: Removed unsavory things from the vent clog event
+2020-06-21:
+ kevinz000:
+ - balance: calculations for punch hit chance has been drastically buffed in favor
+ of the attacker.
+2020-06-22:
+ Ghommie (porting PRs by zxaber, Ryll-Ryll, AnturK):
+ - tweak: Certain small items purchased through cargo now get grouped into a single
+ box. They also are immune to the 10% private account fee.
+ - rscadd: Added single-order options for several existing products in the Cargo
+ Catalog.
+ - tweak: Medkit listings are now single-pack items, and considered small items that
+ get grouped into single boxes. Price for medkits is as close to unchanged as
+ is reasonable.
+ - rscadd: You can now beat on vending machines to try and knock loose free stuff!
+ You can also almost kill yourself doing it, so it's your call if your life is
+ worth ten bucks.
+ - rscadd: Cigarette packets now have coupons on the back for small cargo items!
+ Smoking DOES pay!
+ - tweak: Some single/small items in cargo have been rebranded as goodies, come in
+ lockboxes rather than crates, and can only be purchased with private accounts.
+ kevinz000:
+ - refactor: Life() is split into BiologicalLife() and PhysicalLife. A component
+ signal has been added that can prevent either from ticking.
+ shellspeed1:
+ - rscadd: Adds IV bags.
diff --git a/icons/effects/block_parry.dmi b/icons/effects/block_parry.dmi
new file mode 100644
index 0000000000..4a0ade5e61
Binary files /dev/null and b/icons/effects/block_parry.dmi differ
diff --git a/icons/effects/freeze.dmi b/icons/effects/freeze.dmi
index 28db97d87b..0461619064 100644
Binary files a/icons/effects/freeze.dmi and b/icons/effects/freeze.dmi differ
diff --git a/icons/mob/actions/actions_animal.dmi b/icons/mob/actions/actions_animal.dmi
index aefa471dd2..78eb9f5fe5 100644
Binary files a/icons/mob/actions/actions_animal.dmi and b/icons/mob/actions/actions_animal.dmi differ
diff --git a/icons/mob/actions/actions_shuttle.dmi b/icons/mob/actions/actions_shuttle.dmi
new file mode 100644
index 0000000000..ef35786a2b
Binary files /dev/null and b/icons/mob/actions/actions_shuttle.dmi differ
diff --git a/icons/mob/clothing/back.dmi b/icons/mob/clothing/back.dmi
index d307b5b6c9..0a1372ac2b 100644
Binary files a/icons/mob/clothing/back.dmi and b/icons/mob/clothing/back.dmi differ
diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi
index 3613488027..ccd902ec03 100644
Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ
diff --git a/icons/mob/clothing/mask.dmi b/icons/mob/clothing/mask.dmi
index 13f288677f..c361563da3 100644
Binary files a/icons/mob/clothing/mask.dmi and b/icons/mob/clothing/mask.dmi differ
diff --git a/icons/mob/clothing/suit.dmi b/icons/mob/clothing/suit.dmi
index 134c03f71b..1c06c203e1 100644
Binary files a/icons/mob/clothing/suit.dmi and b/icons/mob/clothing/suit.dmi differ
diff --git a/icons/mob/clothing/uniform.dmi b/icons/mob/clothing/uniform.dmi
index e126629b77..163d2dc2f2 100644
Binary files a/icons/mob/clothing/uniform.dmi and b/icons/mob/clothing/uniform.dmi differ
diff --git a/icons/mob/clothing/uniform_digi.dmi b/icons/mob/clothing/uniform_digi.dmi
index 6a538bc85e..da94f97895 100644
Binary files a/icons/mob/clothing/uniform_digi.dmi and b/icons/mob/clothing/uniform_digi.dmi differ
diff --git a/icons/mob/corgi_head.dmi b/icons/mob/corgi_head.dmi
index de33d3fd69..0195670bdc 100644
Binary files a/icons/mob/corgi_head.dmi and b/icons/mob/corgi_head.dmi differ
diff --git a/icons/mob/human_face.dmi b/icons/mob/human_face.dmi
index d0bd304808..a4e2a9d5b2 100644
Binary files a/icons/mob/human_face.dmi and b/icons/mob/human_face.dmi differ
diff --git a/icons/mob/large-worn-icons/64x64/head.dmi b/icons/mob/large-worn-icons/64x64/head.dmi
index 6ea91d2c6d..5cc09ad880 100644
Binary files a/icons/mob/large-worn-icons/64x64/head.dmi and b/icons/mob/large-worn-icons/64x64/head.dmi differ
diff --git a/icons/mob/robots.dmi b/icons/mob/robots.dmi
index 082bfb3c3e..9bb41bf527 100644
Binary files a/icons/mob/robots.dmi and b/icons/mob/robots.dmi differ
diff --git a/icons/obj/ammo.dmi b/icons/obj/ammo.dmi
index c75afde4cc..bebb625440 100644
Binary files a/icons/obj/ammo.dmi and b/icons/obj/ammo.dmi differ
diff --git a/icons/obj/bloodpack.dmi b/icons/obj/bloodpack.dmi
index 82b4c2e543..2355a81f8f 100644
Binary files a/icons/obj/bloodpack.dmi and b/icons/obj/bloodpack.dmi differ
diff --git a/icons/obj/card.dmi b/icons/obj/card.dmi
index a3b0d19df4..13a0725b05 100644
Binary files a/icons/obj/card.dmi and b/icons/obj/card.dmi differ
diff --git a/icons/obj/closet.dmi b/icons/obj/closet.dmi
index d3f055d1f2..b71b021d80 100644
Binary files a/icons/obj/closet.dmi and b/icons/obj/closet.dmi differ
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index 1768d8a1c6..93e499f595 100644
Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ
diff --git a/icons/obj/clothing/masks.dmi b/icons/obj/clothing/masks.dmi
index 6bae5154ac..106195e968 100644
Binary files a/icons/obj/clothing/masks.dmi and b/icons/obj/clothing/masks.dmi differ
diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi
index fcfbd36df6..68210dc01f 100644
Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ
diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi
index cea11f8a49..57424c7b99 100644
Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ
diff --git a/icons/obj/contraband.dmi b/icons/obj/contraband.dmi
index 29308832cf..a1d5bc5900 100644
Binary files a/icons/obj/contraband.dmi and b/icons/obj/contraband.dmi differ
diff --git a/icons/obj/device.dmi b/icons/obj/device.dmi
index f2a8328717..193d4bc4da 100644
Binary files a/icons/obj/device.dmi and b/icons/obj/device.dmi differ
diff --git a/icons/obj/food/donut.dmi b/icons/obj/food/donut.dmi
index 395739eccc..534e0e37bc 100644
Binary files a/icons/obj/food/donut.dmi and b/icons/obj/food/donut.dmi differ
diff --git a/icons/obj/food/food.dmi b/icons/obj/food/food.dmi
index 9affc07f88..e7196190cf 100644
Binary files a/icons/obj/food/food.dmi and b/icons/obj/food/food.dmi differ
diff --git a/icons/obj/food/soupsalad.dmi b/icons/obj/food/soupsalad.dmi
index fd47e89aa8..378927e8f9 100644
Binary files a/icons/obj/food/soupsalad.dmi and b/icons/obj/food/soupsalad.dmi differ
diff --git a/icons/obj/guns/energy.dmi b/icons/obj/guns/energy.dmi
index 691d5c8362..33872719fe 100644
Binary files a/icons/obj/guns/energy.dmi and b/icons/obj/guns/energy.dmi differ
diff --git a/icons/obj/guns/gun_parts.dmi b/icons/obj/guns/gun_parts.dmi
index 8e3168769d..7f088f6af5 100644
Binary files a/icons/obj/guns/gun_parts.dmi and b/icons/obj/guns/gun_parts.dmi differ
diff --git a/icons/obj/guns/projectile.dmi b/icons/obj/guns/projectile.dmi
index 5c8fab82e8..8c50e7da27 100644
Binary files a/icons/obj/guns/projectile.dmi and b/icons/obj/guns/projectile.dmi differ
diff --git a/icons/obj/items_and_weapons.dmi b/icons/obj/items_and_weapons.dmi
index 9aec5781a9..3345ed3d39 100644
Binary files a/icons/obj/items_and_weapons.dmi and b/icons/obj/items_and_weapons.dmi differ
diff --git a/icons/obj/machines/implantchair.dmi b/icons/obj/machines/implantchair.dmi
index e91f614fad..7cc3493885 100644
Binary files a/icons/obj/machines/implantchair.dmi and b/icons/obj/machines/implantchair.dmi differ
diff --git a/icons/obj/machines/research.dmi b/icons/obj/machines/research.dmi
index b756c77e20..7d64c494fd 100644
Binary files a/icons/obj/machines/research.dmi and b/icons/obj/machines/research.dmi differ
diff --git a/icons/obj/module.dmi b/icons/obj/module.dmi
index a647bebd57..3bf0c55576 100644
Binary files a/icons/obj/module.dmi and b/icons/obj/module.dmi differ
diff --git a/icons/obj/objects.dmi b/icons/obj/objects.dmi
index 03b7a9e44f..b93f878c9e 100644
Binary files a/icons/obj/objects.dmi and b/icons/obj/objects.dmi differ
diff --git a/icons/obj/reagentfillings.dmi b/icons/obj/reagentfillings.dmi
index f07928741d..05337721c7 100644
Binary files a/icons/obj/reagentfillings.dmi and b/icons/obj/reagentfillings.dmi differ
diff --git a/icons/obj/stack_objects.dmi b/icons/obj/stack_objects.dmi
index d327dc8988..ac6478928d 100644
Binary files a/icons/obj/stack_objects.dmi and b/icons/obj/stack_objects.dmi differ
diff --git a/icons/obj/tapes.dmi b/icons/obj/tapes.dmi
new file mode 100644
index 0000000000..a406a4dd1f
Binary files /dev/null and b/icons/obj/tapes.dmi differ
diff --git a/icons/obj/tools.dmi b/icons/obj/tools.dmi
index 0ff7d4a607..f1a8cf3c02 100644
Binary files a/icons/obj/tools.dmi and b/icons/obj/tools.dmi differ
diff --git a/icons/obj/vehicles.dmi b/icons/obj/vehicles.dmi
index 8d5d9208ab..d12851f572 100644
Binary files a/icons/obj/vehicles.dmi and b/icons/obj/vehicles.dmi differ
diff --git a/icons/turf/floors.dmi b/icons/turf/floors.dmi
index dbd5aaa960..477120870b 100644
Binary files a/icons/turf/floors.dmi and b/icons/turf/floors.dmi differ
diff --git a/icons/turf/shuttle.dmi b/icons/turf/shuttle.dmi
index a09cb7a847..985b9991a0 100644
Binary files a/icons/turf/shuttle.dmi and b/icons/turf/shuttle.dmi differ
diff --git a/icons/turf/walls.dmi b/icons/turf/walls.dmi
index dd6c7f3a7c..250fdcd894 100644
Binary files a/icons/turf/walls.dmi and b/icons/turf/walls.dmi differ
diff --git a/modular_citadel/README.md b/modular_citadel/README.md
index dfae177607..c5443bdbb5 100644
--- a/modular_citadel/README.md
+++ b/modular_citadel/README.md
@@ -1,3 +1,4 @@
Hooray modularity!
+
Things that modify core files without directly touching said core files go here. This is similar to how Hippie handles things.
This stops dreammaker from throwing errors and warnings if you try to compile these files while they're inside code/citadel/.
diff --git a/modular_citadel/code/modules/client/loadout/head.dm b/modular_citadel/code/modules/client/loadout/head.dm
index dd7d2cdc4b..28c6e8e8a6 100644
--- a/modular_citadel/code/modules/client/loadout/head.dm
+++ b/modular_citadel/code/modules/client/loadout/head.dm
@@ -82,7 +82,7 @@
category = SLOT_HEAD
path = /obj/item/clothing/head/caphat/formal/fedcover/medsci
restricted_desc = "Medical and Science"
- restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Geneticist","Research Director","Scientist", "Roboticist")
+ restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist")
/datum/gear/trekcapeng
name = "Federation Officer's Cap (Yellow)"
diff --git a/modular_citadel/code/modules/client/loadout/suit.dm b/modular_citadel/code/modules/client/loadout/suit.dm
index 64bfd34172..fecf2a4dce 100644
--- a/modular_citadel/code/modules/client/loadout/suit.dm
+++ b/modular_citadel/code/modules/client/loadout/suit.dm
@@ -161,7 +161,7 @@
path = /obj/item/clothing/suit/storage/trek/ds9
restricted_desc = "All, barring Service and Civilian"
restricted_roles = list("Head of Security","Captain","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Quartermaster",
- "Medical Doctor","Chemist","Virologist","Geneticist","Scientist", "Roboticist",
+ "Medical Doctor","Chemist","Virologist","Paramedic","Geneticist","Scientist", "Roboticist",
"Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer",
"Cargo Technician", "Shaft Miner") //everyone who actually deserves a job.
//Federation jackets from movies
@@ -183,7 +183,7 @@
category = SLOT_WEAR_SUIT
path = /obj/item/clothing/suit/storage/fluff/fedcoat/medsci
restricted_desc = "Medical and Science"
- restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Geneticist","Research Director","Scientist", "Roboticist")
+ restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist")
/datum/gear/trekengmov
name = "Fed (movie) uniform, Yellow"
@@ -210,7 +210,7 @@
category = SLOT_WEAR_SUIT
path = /obj/item/clothing/suit/storage/fluff/modernfedcoat/medsci
restricted_desc = "Medical and Science"
- restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Geneticist","Research Director","Scientist", "Roboticist")
+ restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist")
/datum/gear/trekengmod
name = "Fed (Modern) uniform, Yellow"
diff --git a/modular_citadel/code/modules/client/loadout/uniform.dm b/modular_citadel/code/modules/client/loadout/uniform.dm
index e9adc317cb..e667626968 100644
--- a/modular_citadel/code/modules/client/loadout/uniform.dm
+++ b/modular_citadel/code/modules/client/loadout/uniform.dm
@@ -254,6 +254,30 @@
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/misc/keyholesweater
+/datum/gear/polyjump
+ name = "Polychromic Jumpsuit"
+ category = SLOT_W_UNIFORM
+ path = /obj/item/clothing/under/misc/polyjumpsuit
+ cost = 2
+
+/datum/gear/polyskirt
+ name = "Polychromic Jumpskirt"
+ category = SLOT_W_UNIFORM
+ path = /obj/item/clothing/under/dress/skirt/polychromic
+ cost = 2
+
+/datum/gear/polysuit
+ name = "Polychromic Button-up Shirt"
+ category = SLOT_W_UNIFORM
+ path = /obj/item/clothing/under/misc/poly_shirt
+ cost = 3
+
+/datum/gear/polypleated
+ name = "Polychromic Pleated Sweaterskirt"
+ category = SLOT_W_UNIFORM
+ path = /obj/item/clothing/under/dress/skirt/polychromic/pleated
+ cost = 3
+
/datum/gear/polykilt
name = "Polychromic Kilt"
category = SLOT_W_UNIFORM
@@ -286,7 +310,7 @@
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/trek/medsci
restricted_desc = "Medical and Science"
- restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Geneticist","Research Director","Scientist", "Roboticist")
+ restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist")
/datum/gear/trekengtos
name = "TOS uniform, ops/sec"
@@ -308,7 +332,7 @@
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/trek/medsci/next
restricted_desc = "Medical and Science"
- restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Geneticist","Research Director","Scientist", "Roboticist")
+ restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist")
/datum/gear/trekengtng
name = "TNG uniform, ops/sec"
@@ -330,7 +354,7 @@
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/trek/medsci/voy
restricted_desc = "Medical and Science"
- restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Geneticist","Research Director","Scientist", "Roboticist")
+ restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist")
/datum/gear/trekengvoy
name = "VOY uniform, ops/sec"
@@ -352,7 +376,7 @@
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/trek/medsci/ds9
restricted_desc = "Medical and Science"
- restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Geneticist","Research Director","Scientist", "Roboticist")
+ restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist")
/datum/gear/trekengds9
name = "DS9 uniform, ops/sec"
@@ -374,7 +398,7 @@
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/trek/medsci/ent
restricted_desc = "Medical and Science"
- restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Geneticist","Research Director","Scientist", "Roboticist")
+ restricted_roles = list("Chief Medical Officer","Medical Doctor","Chemist","Virologist","Paramedic","Geneticist","Research Director","Scientist", "Roboticist")
/datum/gear/trekengent
name = "ENT uniform, ops/sec"
@@ -390,7 +414,7 @@
path = /obj/item/clothing/under/trek/fedutil
restricted_desc = "All, barring Service and Civilian"
restricted_roles = list("Head of Security","Captain","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer","Quartermaster",
- "Medical Doctor","Chemist","Virologist","Geneticist","Scientist", "Roboticist",
+ "Medical Doctor","Chemist","Virologist","Paramedic","Geneticist","Scientist", "Roboticist",
"Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer",
"Cargo Technician", "Shaft Miner")
@@ -405,7 +429,60 @@
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/trek/fedutil/service
restricted_desc = "Service and Civilian, barring Clown, Mime and Lawyer"
- restricted_roles = list("Assistant", "Bartender", "Botanist", "Cook", "Curator", "Janitor")
+ restricted_roles = list("Assistant", "Bartender", "Botanist", "Cook", "Curator", "Janitor", "Chaplain")
+
+//Orvilike
+/datum/gear/orvcmd
+ name = "ORV uniform, cmd"
+ category = SLOT_W_UNIFORM
+ path = /obj/item/clothing/under/trek/command/orv
+ restricted_desc = "Heads of Staff"
+ restricted_roles = list("Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Research Director", "Chief Medical Officer", "Quartermaster")
+
+/datum/gear/orvcmd_capt
+ name = "ORV uniform, capt"
+ category = SLOT_W_UNIFORM
+ path = /obj/item/clothing/under/trek/command/orv/captain
+ restricted_roles = list("Captain")
+
+/datum/gear/orvmedsci
+ name = "ORV uniform, med/sci"
+ category = SLOT_W_UNIFORM
+ path = /obj/item/clothing/under/trek/medsci/orv
+ restricted_desc = "Medical and Science"
+ restricted_roles = list("Chief Medical Officer", "Medical Doctor", "Chemist", "Virologist", "Paramedic", "Geneticist", "Research Director", "Scientist", "Roboticist")
+
+/datum/gear/orvcmd_medsci
+ name = "ORV uniform, med/sci, cmd"
+ category = SLOT_W_UNIFORM
+ path = /obj/item/clothing/under/trek/command/orv/medsci
+ restricted_roles = list("Chief Medical Officer", "Research Director")
+
+/datum/gear/orvops
+ name = "ORV uniform, ops/sec"
+ category = SLOT_W_UNIFORM
+ path = /obj/item/clothing/under/trek/engsec/orv
+ restricted_desc = "Engineering, Security and Cargo"
+ restricted_roles = list("Chief Engineer", "Atmospheric Technician", "Station Engineer", "Warden", "Detective", "Security Officer", "Head of Security", "Cargo Technician", "Shaft Miner", "Quartermaster")
+
+/datum/gear/orvcmd_ops
+ name = "ORV uniform, ops/sec, cmd"
+ category = SLOT_W_UNIFORM
+ path = /obj/item/clothing/under/trek/command/orv/engsec
+ restricted_roles = list("Chief Engineer", "Head of Security")
+
+/datum/gear/orvass
+ name = "ORV uniform, assistant"
+ category = SLOT_W_UNIFORM
+ path = /obj/item/clothing/under/trek/orv
+ restricted_roles = list("Assistant")
+
+/datum/gear/orvsrv
+ name = "ORV uniform, service"
+ category = SLOT_W_UNIFORM
+ path = /obj/item/clothing/under/trek/orv/service
+ restricted_roles = list("Assistant", "Bartender", "Botanist", "Cook", "Curator", "Janitor", "Chaplain")
+ restricted_desc = "Service and Civilian, barring Clown, Mime and Lawyer"
//Memes
/datum/gear/gear_harnesses
@@ -482,4 +559,4 @@
name = "Cheongsam, Red"
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/costume/cheongsam/red
- cost = 3
\ No newline at end of file
+ cost = 3
diff --git a/modular_citadel/code/modules/client/preferences_savefile.dm b/modular_citadel/code/modules/client/preferences_savefile.dm
index d0363d228f..c747c4cf32 100644
--- a/modular_citadel/code/modules/client/preferences_savefile.dm
+++ b/modular_citadel/code/modules/client/preferences_savefile.dm
@@ -35,4 +35,5 @@
WRITE_FILE(S["feature_xeno_head"], features["xenohead"])
//flavor text
WRITE_FILE(S["feature_flavor_text"], features["flavor_text"])
+ WRITE_FILE(S["silicon_feature_flavor_text"], features["silicon_flavor_text"])
diff --git a/modular_citadel/code/modules/mob/living/carbon/human/human.dm b/modular_citadel/code/modules/mob/living/carbon/human/human.dm
index 474c9d2823..47de66fcd1 100644
--- a/modular_citadel/code/modules/mob/living/carbon/human/human.dm
+++ b/modular_citadel/code/modules/mob/living/carbon/human/human.dm
@@ -16,7 +16,7 @@
if(!I || !L || I.loc != src || !(I in L.embedded_objects))
return
L.embedded_objects -= I
- L.receive_damage(I.embedding.embedded_unsafe_removal_pain_multiplier*I.w_class*painmul)//It hurts to rip it out, get surgery you dingus. And if you're ripping it out quickly via resist, it's gonna hurt even more
+ L.receive_damage(I.embedding["remove_pain_mult"]*I.w_class*painmul)//It hurts to rip it out, get surgery you dingus. And if you're ripping it out quickly via resist, it's gonna hurt even more
I.forceMove(get_turf(src))
I.unembedded()
user.put_in_hands(I)
diff --git a/modular_citadel/code/modules/mob/living/carbon/life.dm b/modular_citadel/code/modules/mob/living/carbon/life.dm
deleted file mode 100644
index e94bd75985..0000000000
--- a/modular_citadel/code/modules/mob/living/carbon/life.dm
+++ /dev/null
@@ -1,3 +0,0 @@
-/mob/living/carbon/Life()
- . = ..()
- doSprintBufferRegen()
diff --git a/modular_citadel/code/modules/projectiles/gun.dm b/modular_citadel/code/modules/projectiles/gun.dm
deleted file mode 100644
index 317f68b4c4..0000000000
--- a/modular_citadel/code/modules/projectiles/gun.dm
+++ /dev/null
@@ -1,11 +0,0 @@
-/obj/item/gun/proc/getstamcost(mob/living/carbon/user)
- if(user && user.has_gravity())
- return recoil
- else
- return recoil*5
-
-/obj/item/gun/energy/kinetic_accelerator/getstamcost(mob/living/carbon/user)
- if(user && !lavaland_equipment_pressure_check(get_turf(user)))
- return 0
- else
- return ..()
diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm
index 82efabc4e2..56ad24c599 100644
--- a/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm
+++ b/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm
@@ -159,6 +159,35 @@
log_reagent("FERMICHEM: [M] ckey: [M.key]'s tongue has been made permanent")
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// PLUSHMIUM
+///////////////////////////////////////////////////////////////////////////////////////////////////
+//A chemical you can spray on plushies to turn them into a 'shell'
+//Hugging the plushie turns yourself into the plushie!
+/datum/reagent/fermi/plushmium
+ name = "Plushmium"
+ description = "A strange chemical, seeming almost fluffy, if it were not for it being a liquid. Known to have a strange effect on plushies."
+ color = "#fbcbd7"
+ taste_description = "the soft feeling of a plushie"
+ pH = 5
+ value = 50
+ can_synth = TRUE
+
+/datum/reagent/fermi/plushmium/reaction_obj(obj/O, reac_volume)
+ if(istype(O, /obj/item/toy/plush) && reac_volume >= 5)
+ O.loc.visible_message("The plushie seems to be staring back at you.")
+ var/obj/item/toy/plushie_shell/new_shell = new /obj/item/toy/plushie_shell(O.loc)
+ new_shell.name = O.name
+ new_shell.icon = O.icon
+ new_shell.icon_state = O.icon_state
+ new_shell.stored_plush = O
+ O.forceMove(new_shell)
+
+//Extra interaction for which spraying it on an existing sentient plushie aheals them, so they can be revived!
+/datum/reagent/fermi/plushmium/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
+ if(istype(M, /mob/living/simple_animal/pet/plushie) && reac_volume >= 1)
+ M.revive(full_heal = 1, admin_revive = 1)
+
///////////////////////////////////////////////////////////////////////////////////////////////
//Nanite removal
//Writen by Trilby!! Embellsished a little by me.
diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/healing.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/healing.dm
index 48c9ffb7e6..ca6bb302da 100644
--- a/modular_citadel/code/modules/reagents/chemistry/reagents/healing.dm
+++ b/modular_citadel/code/modules/reagents/chemistry/reagents/healing.dm
@@ -197,3 +197,25 @@
M.stat = DEAD
M.visible_message("The synthetic tissue degrades off [M]'s wounds as they collapse to the floor.")
//NEEDS ON_MOB_DEAD()
+
+/datum/reagent/fermi/zeolites
+ name = "Artificial Zeolites"
+ description = "Lab made Zeolite, used to clear radiation form people and items alike! Splashing just a small amounts(5u) onto any item can clear away large amouts of contamination."
+ pH = 8
+ color = "#FFDADA"
+ metabolization_rate = 8 * REAGENTS_METABOLISM //Lastes not long in body but heals a lot!
+ value = REAGENT_VALUE_COMMON
+
+/datum/reagent/fermi/zeolites/on_mob_life(mob/living/carbon/M)
+ var/datum/component/radioactive/contamination = M.GetComponent(/datum/component/radioactive)
+ if(M.radiation > 0)
+ M.radiation -= min(M.radiation, 60)
+ if(contamination.strength > 0)
+ contamination.strength -= min(contamination.strength, 100)
+ ..()
+
+/datum/reagent/fermi/zeolites/reaction_obj(obj/O, reac_volume)
+ var/datum/component/radioactive/contamination = O.GetComponent(/datum/component/radioactive)
+ if(contamination && reac_volume >= 5)
+ qdel(contamination)
+ return
diff --git a/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm b/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm
index a8998a51ac..b2c80e4a16 100644
--- a/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm
+++ b/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm
@@ -480,6 +480,33 @@
RateUpLim = 15
FermiChem = TRUE
+/datum/chemical_reaction/fermi/plushmium // done
+ name = "Plushification serum"
+ id = /datum/reagent/fermi/plushmium
+ results = list(/datum/reagent/fermi/plushmium = 5)
+ required_reagents = list(/datum/reagent/medicine/strange_reagent = 5, /datum/reagent/drug/happiness = 3, /datum/reagent/blood = 10, /datum/reagent/consumable/laughter = 5, /datum/reagent/toxin/bad_food = 6)
+ //mix_message = ""
+ //FermiChem vars:
+ OptimalTempMin = 400
+ OptimalTempMax = 666
+ ExplodeTemp = 800
+ OptimalpHMin = 2
+ OptimalpHMax = 5
+ ReactpHLim = 6
+ //CatalystFact = 0 //To do 1
+ CurveSharpT = 8
+ CurveSharppH = 0.5
+ ThermicConstant = -2
+ HIonRelease = -0.1
+ RateUpLim = 2
+ FermiChem = TRUE
+ FermiExplode = TRUE
+ PurityMin = 0.6
+
+/datum/chemical_reaction/fermi/plushmium/FermiExplode(datum/reagents, var/atom/my_atom, volume, temp, pH)
+ new /obj/item/toy/plush/random(get_turf(my_atom))
+ my_atom.visible_message("The reaction suddenly zaps, creating a plushie!")
+ my_atom.reagents.clear_reagents()
/datum/chemical_reaction/fermi/basic_buffer/FermiFinish(datum/reagents/holder, atom/my_atom) //might need this
var/datum/reagent/fermi/basic_buffer/Fb = locate(/datum/reagent/fermi/basic_buffer) in my_atom.reagents.reagent_list
@@ -561,3 +588,23 @@
HIonRelease = 0.1
RateUpLim = 2
FermiChem = TRUE
+
+/datum/chemical_reaction/fermi/zeolites
+ name = "Zeolites"
+ id = /datum/reagent/fermi/zeolites
+ results = list(/datum/reagent/fermi/zeolites = 5) //We make a lot!
+ required_reagents = list(/datum/reagent/medicine/potass_iodide = 1, /datum/reagent/aluminium = 1, /datum/reagent/silicon = 1, /datum/reagent/oxygen = 1)
+ //FermiChem vars:
+ OptimalTempMin = 300
+ OptimalTempMax = 900
+ ExplodeTemp = 1000 //check to see overflow doesn't happen!
+ OptimalpHMin = 4.0
+ OptimalpHMax = 6.0
+ ReactpHLim = 4
+ //CatalystFact = 0
+ CurveSharpT = 4
+ CurveSharppH = 0
+ ThermicConstant = 0
+ HIonRelease = 0.01
+ RateUpLim = 15
+ FermiChem = TRUE
\ No newline at end of file
diff --git a/sound/block_parry/block_metal1.ogg b/sound/block_parry/block_metal1.ogg
new file mode 100644
index 0000000000..c0f98249cd
Binary files /dev/null and b/sound/block_parry/block_metal1.ogg differ
diff --git a/sound/block_parry/block_metal2.ogg b/sound/block_parry/block_metal2.ogg
new file mode 100644
index 0000000000..58c1233cea
Binary files /dev/null and b/sound/block_parry/block_metal2.ogg differ
diff --git a/sound/block_parry/block_wood1.ogg b/sound/block_parry/block_wood1.ogg
new file mode 100644
index 0000000000..a01f3dbe01
Binary files /dev/null and b/sound/block_parry/block_wood1.ogg differ
diff --git a/sound/block_parry/block_wood2.ogg b/sound/block_parry/block_wood2.ogg
new file mode 100644
index 0000000000..398a59e248
Binary files /dev/null and b/sound/block_parry/block_wood2.ogg differ
diff --git a/sound/block_parry/sfx-parry.ogg b/sound/block_parry/sfx-parry.ogg
new file mode 100644
index 0000000000..3429031bd9
Binary files /dev/null and b/sound/block_parry/sfx-parry.ogg differ
diff --git a/sound/voice/medbot/close.ogg b/sound/voice/medbot/close.ogg
new file mode 100644
index 0000000000..9e0efcefd2
Binary files /dev/null and b/sound/voice/medbot/close.ogg differ
diff --git a/sound/voice/medbot/dont_like.ogg b/sound/voice/medbot/dont_like.ogg
new file mode 100644
index 0000000000..06fc84af2f
Binary files /dev/null and b/sound/voice/medbot/dont_like.ogg differ
diff --git a/sound/voice/medbot/forgive.ogg b/sound/voice/medbot/forgive.ogg
new file mode 100644
index 0000000000..729eaa5c78
Binary files /dev/null and b/sound/voice/medbot/forgive.ogg differ
diff --git a/sound/voice/medbot/fuck_you.ogg b/sound/voice/medbot/fuck_you.ogg
new file mode 100644
index 0000000000..5eacff615f
Binary files /dev/null and b/sound/voice/medbot/fuck_you.ogg differ
diff --git a/sound/voice/medbot/hey_wait.ogg b/sound/voice/medbot/hey_wait.ogg
new file mode 100644
index 0000000000..6c88b761ec
Binary files /dev/null and b/sound/voice/medbot/hey_wait.ogg differ
diff --git a/sound/voice/medbot/i_require_asst.ogg b/sound/voice/medbot/i_require_asst.ogg
new file mode 100644
index 0000000000..18fabc630f
Binary files /dev/null and b/sound/voice/medbot/i_require_asst.ogg differ
diff --git a/sound/voice/medbot/i_trusted_you.ogg b/sound/voice/medbot/i_trusted_you.ogg
new file mode 100644
index 0000000000..602baa2f67
Binary files /dev/null and b/sound/voice/medbot/i_trusted_you.ogg differ
diff --git a/sound/voice/medbot/im_different.ogg b/sound/voice/medbot/im_different.ogg
new file mode 100644
index 0000000000..42eb8564f1
Binary files /dev/null and b/sound/voice/medbot/im_different.ogg differ
diff --git a/sound/voice/medbot/is_this_the_end.ogg b/sound/voice/medbot/is_this_the_end.ogg
new file mode 100644
index 0000000000..a2e0e2330a
Binary files /dev/null and b/sound/voice/medbot/is_this_the_end.ogg differ
diff --git a/sound/voice/medbot/nooo.ogg b/sound/voice/medbot/nooo.ogg
new file mode 100644
index 0000000000..102fd1fb04
Binary files /dev/null and b/sound/voice/medbot/nooo.ogg differ
diff --git a/sound/voice/medbot/oh_fuck.ogg b/sound/voice/medbot/oh_fuck.ogg
new file mode 100644
index 0000000000..95d21ef255
Binary files /dev/null and b/sound/voice/medbot/oh_fuck.ogg differ
diff --git a/sound/voice/medbot/pain_is_real.ogg b/sound/voice/medbot/pain_is_real.ogg
new file mode 100644
index 0000000000..9cfa3a71be
Binary files /dev/null and b/sound/voice/medbot/pain_is_real.ogg differ
diff --git a/sound/voice/medbot/please_dont.ogg b/sound/voice/medbot/please_dont.ogg
new file mode 100644
index 0000000000..a77ee09cb4
Binary files /dev/null and b/sound/voice/medbot/please_dont.ogg differ
diff --git a/sound/voice/medbot/please_im_scared.ogg b/sound/voice/medbot/please_im_scared.ogg
new file mode 100644
index 0000000000..7bd53b39c8
Binary files /dev/null and b/sound/voice/medbot/please_im_scared.ogg differ
diff --git a/sound/voice/medbot/please_put_me_back.ogg b/sound/voice/medbot/please_put_me_back.ogg
new file mode 100644
index 0000000000..84700fbdd5
Binary files /dev/null and b/sound/voice/medbot/please_put_me_back.ogg differ
diff --git a/sound/voice/medbot/reported.ogg b/sound/voice/medbot/reported.ogg
new file mode 100644
index 0000000000..d5469c19ce
Binary files /dev/null and b/sound/voice/medbot/reported.ogg differ
diff --git a/sound/voice/medbot/shindemashou.ogg b/sound/voice/medbot/shindemashou.ogg
new file mode 100644
index 0000000000..1ee2858eaf
Binary files /dev/null and b/sound/voice/medbot/shindemashou.ogg differ
diff --git a/sound/voice/medbot/thank_you.ogg b/sound/voice/medbot/thank_you.ogg
new file mode 100644
index 0000000000..3fabe7d4a6
Binary files /dev/null and b/sound/voice/medbot/thank_you.ogg differ
diff --git a/sound/voice/medbot/turn_off.ogg b/sound/voice/medbot/turn_off.ogg
new file mode 100644
index 0000000000..87a4d6bdd0
Binary files /dev/null and b/sound/voice/medbot/turn_off.ogg differ
diff --git a/sound/voice/medbot/why.ogg b/sound/voice/medbot/why.ogg
new file mode 100644
index 0000000000..415020b89b
Binary files /dev/null and b/sound/voice/medbot/why.ogg differ
diff --git a/sound/voice/medbot/youre_good.ogg b/sound/voice/medbot/youre_good.ogg
new file mode 100644
index 0000000000..62c325f834
Binary files /dev/null and b/sound/voice/medbot/youre_good.ogg differ
diff --git a/strings/wisdoms.txt b/strings/wisdoms.txt
new file mode 100644
index 0000000000..b4dd53027c
--- /dev/null
+++ b/strings/wisdoms.txt
@@ -0,0 +1,443 @@
+A day for firm decisions!!!!! Or is it?
+A few hours grace before the madness begins again.
+A gift of a flower will soon be made to you.
+A long-forgotten loved one will appear soon.
+Buy the negatives at any price.
+A tall, dark stranger will have more fun than you.
+A visit to a fresh place will bring strange work.
+A visit to a strange place will bring fresh work.
+A vivid and creative mind characterizes you.
+Abandon the search for Truth; settle for a good fantasy.
+Accent on helpful side of your nature. Drain the moat.
+Advancement in position.
+After your lover has gone you will still have PEANUT BUTTER!
+Afternoon very favorable for romance. Try a single person for a change.
+Alimony and bribes will engage a large share of your wealth.
+All the troubles you have will pass away very quickly.
+Among the lucky, you are the chosen one.
+An avocado-tone refrigerator would look good on your resume.
+An exotic journey in downtown Newark is in your future.
+Another good night not to sleep in a eucalyptus tree.
+Are you a turtle?
+Are you ever going to do the dishes? Or will you change your major to biology?
+Are you making all this up as you go along?
+Are you sure the back door is locked?
+Artistic ventures highlighted. Rob a museum.
+Avert misunderstanding by calm, poise, and balance.
+Avoid gunfire in the bathroom tonight.
+Avoid reality at all costs.
+Bank error in your favor. Collect $200.
+Be careful! Is it classified?
+Be careful! UGLY strikes 9 out of 10!
+Be cautious in your daily affairs.
+Be cheerful while you are alive.
+Be different: conform.
+Be free and open and breezy! Enjoy! Things won't get any better so
+get used to it.
+Be security conscious -- National defense is at stake.
+Beauty and harmony are as necessary to you as the very breath of life.
+Best of all is never to have been born. Second best is to die soon.
+Better hope the life-inspector doesn't come around while you have your life in such a mess.
+Beware of a dark-haired man with a loud tie.
+Beware of a tall black man with one blond shoe.
+Beware of a tall blond man with one black shoe.
+Beware of Bigfoot!
+Beware of low-flying butterflies.
+Beware the one behind you.
+Blow it out your ear.
+Break into jail and claim police brutality.
+Bridge ahead. Pay troll.
+Caution: breathing may be hazardous to your health.
+Caution: Keep out of reach of children.
+Celebrate Hannibal Day this year. Take an elephant to lunch.
+Change your thoughts and you change your world.
+Cheer Up! Things are getting worse at a slower rate.
+Chess tonight.
+Chicken Little only has to be right once.
+Chicken Little was right.
+Cold hands, no gloves.
+Communicate! It can't make things any worse.
+Courage is your greatest present need.
+Day of inquiry. You will be subpoenaed.
+Do not overtax your powers.
+Do not sleep in a eucalyptus tree tonight.
+Do nothing unless you must, and when you must act -- hesitate.
+Do something unusual today. Pay a bill.
+Do what comes naturally. Seethe and fume and throw a tantrum.
+Domestic happiness and faithful friends.
+Don't feed the bats tonight.
+Don't get stuck in a closet -- wear yourself out.
+Don't get to bragging.
+Don't go surfing in South Dakota for a while.
+Don't hate yourself in the morning -- sleep till noon.
+Don't kiss an elephant on the lips today.
+Don't let your mind wander -- it's too little to be let out alone.
+Don't look back, the lemmings are gaining on you.
+Don't look now, but the man in the moon is laughing at you.
+Don't look now, but there is a multi-legged creature on your shoulder.
+Don't plan any hasty moves. You'll be evicted soon anyway.
+Don't read any sky-writing for the next two weeks.
+Don't read everything you believe.
+Don't relax! It's only your tension that's holding you together.
+Don't tell any big lies today. Small ones can be just as effective.
+Don't worry so loud, your roommate can't think.
+Don't Worry, Be Happy.
+Don't worry. Life's too long.
+Don't you feel more like you do now than you did when you came in?
+Don't you wish you had more energy... or less ambition?
+Everything that you know is wrong, but you can be straightened out.
+Everything will be just tickety-boo today.
+Excellent day for putting Slinkies on an escalator.
+Excellent day to have a rotten day.
+Excellent time to become a missing person.
+Executive ability is prominent in your make-up.
+Exercise caution in your daily affairs.
+Expect a letter from a friend who will ask a favor of you.
+Expect the worst, it's the least you can do.
+Fine day for friends.
+So-so day for you.
+Fine day to work off excess energy. Steal something heavy.
+Fortune: You will be attacked next Wednesday at 3:15 p.m. by six samurai sword wielding purple fish glued to Harley-Davidson motorcycles.
+Oh, and have a nice day!
+Future looks spotty. You will spill soup in late evening.
+Generosity and perfection are your everlasting goals.
+Give him an evasive answer.
+Give thought to your reputation. Consider changing name and moving to a new town.
+Give your very best today. Heaven knows it's little enough.
+Go to a movie tonight. Darkness becomes you.
+Good day for a change of scene. Repaper the bedroom wall.
+Good day for overcoming obstacles. Try a steeplechase.
+Good day to deal with people in high places; particularly lonely stewardesses.
+Good day to let down old friends who need help.
+Good news from afar can bring you a welcome visitor.
+Good news. Ten weeks from Friday will be a pretty good day.
+Good night to spend with family, but avoid arguments with your mate's new lover.
+Green light in A.M. for new projects. Red light in P.M. for traffic tickets.
+Hope that the day after you die is a nice day.
+If you can read this, you're too close.
+If you learn one useless thing every day, in a single year you'll learn
+365 useless things.
+If you sow your wild oats, hope for a crop failure.
+If you stand on your head, you will get footprints in your hair.
+If you think last Tuesday was a drag, wait till you see what happens tomorrow!
+If your life was a horse, you'd have to shoot it.
+In the stairway of life, you'd best take the elevator.
+Increased knowledge will help you now. Have mate's phone bugged.
+Is that really YOU that is reading this?
+Is this really happening?
+It is so very hard to be an
+on-your-own-take-care-of-yourself-because-there-is-no-one-else-to-do-it-for-you grown-up.
+It may or may not be worthwhile, but it still has to be done.
+It was all so different before everything changed.
+It's all in the mind, ya know.
+It's lucky you're going so slowly, because you're going in the wrong direction.
+Just because the message may never be received does not mean it is not worth sending.
+Just to have it is enough.
+Keep emotionally active. Cater to your favorite neurosis.
+Keep it short for pithy sake.
+Lady Luck brings added income today. Lady friend takes it away tonight.
+Learn to pause -- or nothing worthwhile can catch up to you.
+Let me put it this way: today is going to be a learning experience.
+Life is to you a dashing and bold adventure.
+Life, loathe it or ignore it, you can't like it.
+Live in a world of your own, but always welcome visitors.
+Living your life is a task so difficult, it has never been attempted before.
+Long life is in store for you.
+Look afar and see the end from the beginning.
+Love is in the offing. Be affectionate to one who adores you.
+Make a wish, it might come true.
+Many changes of mind and mood; do not hesitate too long.
+Never be led astray onto the path of virtue.
+Never commit yourself! Let someone else commit you.
+Never give an inch!
+Never look up when dragons fly overhead.
+Never reveal your best argument.
+Next Friday will not be your lucky day. As a matter of fact, you don't
+have a lucky day this year.
+Of course you have a purpose -- to find a purpose.
+People are beginning to notice you. Try dressing before you leave the house.
+Perfect day for scrubbing the floor and other exciting things.
+Questionable day.
+Ask somebody something.
+Reply hazy, ask again later.
+Save energy: be apathetic.
+Ships are safe in harbor, but they were never meant to stay there.
+Slow day. Practice crawling.
+Snow Day -- stay home.
+So this is it. We're going to die.
+So you're back... about time...
+Someone is speaking well of you.
+Someone is speaking well of you.
+How unusual!
+Someone whom you reject today, will reject you tomorrow.
+Stay away from flying saucers today.
+Stay away from hurricanes for a while.
+Stay the curse.
+That secret you've been guarding, isn't.
+The time is right to make new friends.
+The whole world is a tuxedo and you are a pair of brown shoes.
+There is a 20 chance of tomorrow.
+There is a fly on your nose.
+There was a phone call for you.
+There will be big changes for you but you will be happy.
+Things will be bright in P.M. A cop will shine a light in your face.
+Think twice before speaking, but don't say "think think click click".
+This life is yours. Some of it was given to you; the rest, you made yourself.
+This will be a memorable month -- no matter how hard you try to forget it.
+Time to be aggressive. Go after a tattooed Virgo.
+Today is National Existential Ennui Awareness Day.
+Today is the first day of the rest of the mess.
+Today is the first day of the rest of your life.
+Today is the last day of your life so far.
+Today is the tomorrow you worried about yesterday.
+Today is what happened to yesterday.
+Today's weirdness is tomorrow's reason why.
+Tomorrow will be cancelled due to lack of interest.
+Tomorrow, this will be part of the unchangeable past but fortunately, it can still be changed today.
+Tomorrow, you can be anywhere.
+Tonight you will pay the wages of sin; Don't forget to leave a tip.
+Tonight's the night: Sleep in a eucalyptus tree.
+Troubled day for virgins over 16 who are beautiful and wealthy and live
+in eucalyptus trees.
+Truth will out this morning. (Which may really mess things up.)
+Try the Moo Shu Pork. It is especially good today.
+Try to get all of your posthumous medals in advance.
+Try to have as good a life as you can under the circumstances.
+Try to relax and enjoy the crisis.
+Try to value useful qualities in one who loves you.
+Tuesday After Lunch is the cosmic time of the week.
+Tuesday is the Wednesday of the rest of your life.
+What happened last night can happen again.
+While you recently had your problems on the run, they've regrouped and are making another attack.
+Write yourself a threatening letter and pen a defiant reply.
+You are a bundle of energy, always on the go.
+You are a fluke of the universe; you have no right to be here.
+You are a very redundant person, that's what kind of person you are.
+You are always busy.
+You are as I am with You.
+You are capable of planning your future.
+You are confused; but this is your normal state.
+You are deeply attached to your friends and acquaintances.
+You are destined to become the commandant of the fighting men of the department of transportation.
+You are dishonest, but never to the point of hurting a friend.
+You are fairminded, just and loving.
+You are farsighted, a good planner, an ardent lover, and a faithful friend.
+You are fighting for survival in your own sweet and gentle way.
+You are going to have a new love affair.
+You are magnetic in your bearing.
+You are not dead yet. But watch for further reports.
+You are number 6! Who is number one?
+You are only young once, but you can stay immature indefinitely.
+You are scrupulously honest, frank, and straightforward. Therefore you have few friends.
+You are sick, twisted and perverted. I like that in a person.
+You are so boring that when I see you my feet go to sleep.
+You are standing on my toes.
+You are taking yourself far too seriously.
+You are the only person to ever get this message.
+You are wise, witty, and wonderful, but you spend too much time reading this sort of trash.
+You attempt things that you do not even plan because of your extreme stupidity.
+You can create your own opportunities this week. Blackmail a senior executive.
+You can do very well in speculation where land or anything to do with dirt is concerned.
+You can rent this space for only $5 a week.
+You could live a better life, if you had a better mind and a better body.
+You definitely intend to start living sometime soon.
+You dialed 5483.
+You display the wonderful traits of charm and courtesy.
+You don't become a failure until you're satisfied with being one.
+You enjoy the company of other people.
+You feel a whole lot more like you do now than you did when you used to.
+You fill a much-needed gap.
+You get along very well with everyone except animals and people.
+You had some happiness once, but your parents moved away, and you had to leave it behind.
+You have a deep appreciation of the arts and music.
+You have a deep interest in all that is artistic.
+You have a reputation for being thoroughly reliable and trustworthy.
+A pity that it's totally undeserved.
+You have a strong appeal for members of the opposite sex.
+You have a strong appeal for members of your own sex.
+You have a strong desire for a home and your family interests come first.
+You have a truly strong individuality.
+You have a will that can be influenced by all with whom you come in contact.
+You have an ability to sense and know higher truth.
+You have an ambitious nature and may make a name for yourself.
+You have an unusual equipment for success. Be sure to use it properly.
+You have an unusual magnetic personality. Don't walk too close to metal objects which are not fastened down.
+You have an unusual understanding of the problems of human relationships.
+You have been selected for a secret mission.
+You have Egyptian flu: you're going to be a mummy.
+You have had a long-term stimulation relative to business.
+You have literary talent that you should take pains to develop.
+You have many friends and very few living enemies.
+You have no real enemies.
+You have taken yourself too seriously.
+You have the body of a 19 year old. Please return it before it gets wrinkled.
+You have the capacity to learn from mistakes. You'll learn a lot today.
+You have the power to influence all with whom you come in contact.
+You learn to write as if to someone else because NEXT YEAR YOU WILL BE "SOMEONE ELSE."
+You like to form new friendships and make new acquaintances.
+You look like a million dollars. All green and wrinkled.
+You look tired.
+You love peace.
+You love your home and want it to be beautiful.
+You may be gone tomorrow, but that doesn't mean that you weren't here today.
+You may be infinitely smaller than some things, but you're infinitely larger than others.
+You may be recognized soon. Hide.
+You may get an opportunity for advancement today. Watch it!
+You may worry about your hair-do today, but tomorrow much peanut butter will be sold.
+You need more time; and you probably always will.
+You need no longer worry about the future. This time tomorrow you'll be dead.
+You never hesitate to tackle the most difficult problems.
+You never know how many friends you have until you rent a house on the beach.
+You now have Asian Flu.
+You own a dog, but you can only feed a cat.
+You plan things that you do not even attempt because of your extreme caution.
+You possess a mind not merely twisted, but actually sprained.
+You prefer the company of the opposite sex, but are well liked by your own.
+You recoil from the crude; you tend naturally toward the exquisite.
+You seek to shield those you love and you like the role of the provider.
+You shall be rewarded for a dastardly deed.
+You should emulate your heroes, but don't carry it too far. Especially if they are dead.
+You should go home.
+You single-handedly fought your way into this hopeless mess.
+You teach best what you most need to learn.
+You too can wear a nose mitten.
+You two ought to be more careful--your love could drag on for years and years.
+You will always get the greatest recognition for the job you least like.
+You will always have good luck in your personal affairs.
+You will attract cultured and artistic people to your home.
+You will be a winner today. Pick a fight with a four-year-old.
+You will be advanced socially, without any special effort on your part.
+You will be aided greatly by a person whom you thought to be unimportant.
+You will be attacked by a beast who has the body of a wolf, the tail of a lion, and the face of Donald Duck.
+You will be audited by the Internal Revenue Service.
+You will be awarded a medal for disregarding safety in saving someone.
+You will be awarded some great honor.
+You will be awarded the Nobel Peace Prize... posthumously.
+You will be called upon to help a friend in trouble.
+You will be divorced within a year.
+You will be given a post of trust and responsibility.
+You will be held hostage by a radical group.
+You will be honored for contributing your time and skill to a worthy cause.
+You will be imprisoned for contributing your time and skill to a bank robbery.
+You will be married within a year, and divorced within two.
+You will be married within a year.
+You will be misunderstood by everyone.
+You will be recognized and honored as a community leader.
+You will be reincarnated as a toad; and you will be much happier.
+You will be run over by a beer truck.
+You will be run over by a bus.
+You will be singled out for promotion in your work.
+You will be successful in love.
+You will be surprised by a loud noise.
+You will be surrounded by luxury.
+You will be the last person to buy a Chrysler.
+You will be the victim of a bizarre joke.
+You will be Told about it Tomorrow. Go Home and Prepare Thyself.
+You will be traveling and coming into a fortune.
+You will be winged by an anti-aircraft battery.
+You will become rich and famous unless you don't.
+You will contract a rare disease.
+You will engage in a profitable business activity.
+You will experience a strong urge to do good; but it will pass.
+You will feel hungry again in another hour.
+You will forget that you ever knew me.
+You will gain money by a fattening action.
+You will gain money by a speculation or lottery.
+You will gain money by an illegal action.
+You will gain money by an immoral action.
+You will get what you deserve.
+You will give someone a piece of your mind, which you can ill afford.
+You will have a long and boring life.
+You will have a long and unpleasant discussion with your supervisor.
+You will have domestic happiness and faithful friends.
+You will have good luck and overcome many hardships.
+You will have long and healthy life.
+You will hear good news from one you thought unfriendly to you.
+You will inherit millions of dollars.
+You will inherit some money or a small piece of land.
+You will live a long, healthy, happy life and make bags of money.
+You will live to see your grandchildren.
+You will lose your present job and have to become a door to door mayonnaise salesman.
+You will meet an important person who will help you advance professionally.
+You will never know hunger.
+You will not be elected to public office this year.
+You will obey or molten silver will be poured into your ears.
+You will outgrow your usefulness.
+You will overcome the attacks of jealous associates.
+You will pass away very quickly.
+You will pay for your sins. If you have already paid, please disregard this message.
+You will pioneer the first Martian colony.
+You will probably marry after a very brief courtship.
+You will reach the highest possible point in your business or profession.
+You will receive a legacy which will place you above want.
+You will remember something that you should not have forgotten.
+You will soon forget this.
+You will soon meet a person who will play an important role in your life.
+You will step on the night soil of many countries.
+You will stop at nothing to reach your objective, but only because your brakes are defective.
+You will triumph over your enemy.
+You will visit the Dung Pits of Glive soon.
+You will win success in whatever calling you adopt.
+You will wish you hadn't.
+You work very hard. Don't try to think as well.
+You worry too much about your job. Stop it. You are not paid enough to worry.
+You would if you could but you can't so you won't.
+You'd like to do it instantaneously, but that's too slow.
+You'll be called to a post requiring ability in handling groups of people.
+You'll be sorry...
+You'll feel devilish tonight. Toss dynamite caps under a flamenco dancer's heel.
+You'll feel much better once you've given up hope.
+You'll never be the man your mother was!
+You'll never see all the places, or read all the books, but fortunately,
+they're not all recommended.
+You'll wish that you had done some of the hard things when they were easier to do.
+You're a card which will have to be dealt with.
+You're almost as happy as you think you are.
+You're at the end of the road again.
+You're being followed. Cut out the hanky-panky for a few days.
+You're currently going through a difficult transition period called "Life."
+You're definitely on their list. The question to ask next is what list it is.
+You're growing out of some of your problems, but there are others that you're growing into.
+You're not my type. For that matter, you're not even my species!!!
+You're ugly and your mother dresses you funny.
+You're working under a slight handicap. You happen to be human.
+You've been leading a dog's life. Stay off the furniture.
+Your aim is high and to the right.
+Your aims are high, and you are capable of much.
+Your analyst has you mixed up with another patient. Don't believe a thing he tells you.
+Your best consolation is the hope that the things you failed to get weren't really worth having.
+Your boss climbed the corporate ladder, wrong by wrong.
+Your boss is a few sandwiches short of a picnic.
+Your boyfriend takes chocolate from strangers.
+Your business will assume vast proportions.
+Your business will go through a period of considerable expansion.
+Your depth of comprehension may tend to make you lax in worldly ways.
+Your domestic life may be harmonious.
+Your fly might be open (but don't check it just now).
+Your goose is cooked.
+(Your current chick is burned up too!)
+Your heart is pure, and your mind clear, and your soul devout.
+Your ignorance cramps my conversation.
+Your life would be very empty if you had nothing to regret.
+Your love life will be happy and harmonious.
+Your love life will be... interesting.
+Your lover will never wish to leave you.
+Your lucky color has faded.
+Your lucky number has been disconnected.
+Your lucky number is 3552664958674928. Watch for it everywhere.
+Your mode of life will be changed for the better because of good news soon.
+Your mode of life will be changed for the better because of new developments.
+Your motives for doing whatever good deed you may have in mind will be misinterpreted by somebody.
+Your nature demands love and your happiness depends on it.
+Your object is to save the world, while still leading a pleasant life.
+Your own qualities will help prevent your advancement in the world.
+Your present plans will be successful.
+Your reasoning is excellent -- it's only your basic assumptions that are wrong.
+Your reasoning powers are good, and you are a fairly good planner.
+Your sister swims out to meet troop ships.
+Your society will be sought by people of taste and refinement.
+Your step will soil many countries.
+Your supervisor is thinking about you.
+Your talents will be recognized and suitably rewarded.
+Your temporary financial embarrassment will be relieved in a surprising manner.
+Your true value depends entirely on what you are compared with.
diff --git a/tgstation.dme b/tgstation.dme
old mode 100755
new mode 100644
index 56d8b34101..813b38f859
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -48,7 +48,6 @@
#include "code\__DEFINES\events.dm"
#include "code\__DEFINES\exports.dm"
#include "code\__DEFINES\fantasy_affixes.dm"
-#include "code\__DEFINES\flags.dm"
#include "code\__DEFINES\food.dm"
#include "code\__DEFINES\footsteps.dm"
#include "code\__DEFINES\hud.dm"
@@ -77,7 +76,6 @@
#include "code\__DEFINES\movespeed_modification.dm"
#include "code\__DEFINES\nanites.dm"
#include "code\__DEFINES\networks.dm"
-#include "code\__DEFINES\obj_flags.dm"
#include "code\__DEFINES\pinpointers.dm"
#include "code\__DEFINES\pipe_construction.dm"
#include "code\__DEFINES\pool.dm"
@@ -85,6 +83,7 @@
#include "code\__DEFINES\preferences.dm"
#include "code\__DEFINES\procpath.dm"
#include "code\__DEFINES\profile.dm"
+#include "code\__DEFINES\projectiles.dm"
#include "code\__DEFINES\qdel.dm"
#include "code\__DEFINES\radiation.dm"
#include "code\__DEFINES\radio.dm"
@@ -119,10 +118,17 @@
#include "code\__DEFINES\vv.dm"
#include "code\__DEFINES\wall_dents.dm"
#include "code\__DEFINES\wires.dm"
+#include "code\__DEFINES\_flags\_flags.dm"
+#include "code\__DEFINES\_flags\item_flags.dm"
+#include "code\__DEFINES\_flags\obj_flags.dm"
#include "code\__DEFINES\admin\keybindings.dm"
+#include "code\__DEFINES\combat\attack_types.dm"
+#include "code\__DEFINES\combat\block.dm"
+#include "code\__DEFINES\combat\block_parry.dm"
#include "code\__DEFINES\dcs\flags.dm"
#include "code\__DEFINES\dcs\helpers.dm"
#include "code\__DEFINES\dcs\signals.dm"
+#include "code\__DEFINES\flags\do_after.dm"
#include "code\__DEFINES\flags\shields.dm"
#include "code\__DEFINES\mapping\maploader.dm"
#include "code\__DEFINES\material\worth.dm"
@@ -144,6 +150,7 @@
#include "code\__HELPERS\custom_holoforms.dm"
#include "code\__HELPERS\dates.dm"
#include "code\__HELPERS\dna.dm"
+#include "code\__HELPERS\do_after.dm"
#include "code\__HELPERS\donator_groupings.dm"
#include "code\__HELPERS\files.dm"
#include "code\__HELPERS\game.dm"
@@ -351,7 +358,6 @@
#include "code\datums\datumvars.dm"
#include "code\datums\dna.dm"
#include "code\datums\dog_fashion.dm"
-#include "code\datums\embedding_behavior.dm"
#include "code\datums\emotes.dm"
#include "code\datums\ert.dm"
#include "code\datums\explosion.dm"
@@ -397,10 +403,10 @@
#include "code\datums\components\chasm.dm"
#include "code\datums\components\combat_mode.dm"
#include "code\datums\components\construction.dm"
-#include "code\datums\components\decal.dm"
#include "code\datums\components\dejavu.dm"
#include "code\datums\components\earprotection.dm"
#include "code\datums\components\edit_complainer.dm"
+#include "code\datums\components\embedded.dm"
#include "code\datums\components\explodable.dm"
#include "code\datums\components\field_of_vision.dm"
#include "code\datums\components\footstep.dm"
@@ -415,11 +421,14 @@
#include "code\datums\components\magnetic_catch.dm"
#include "code\datums\components\material_container.dm"
#include "code\datums\components\mirage_border.dm"
+#include "code\datums\components\mirv.dm"
#include "code\datums\components\mood.dm"
#include "code\datums\components\nanites.dm"
#include "code\datums\components\ntnet_interface.dm"
+#include "code\datums\components\omen.dm"
#include "code\datums\components\orbiter.dm"
#include "code\datums\components\paintable.dm"
+#include "code\datums\components\pellet_cloud.dm"
#include "code\datums\components\phantomthief.dm"
#include "code\datums\components\rad_insulation.dm"
#include "code\datums\components\radioactive.dm"
@@ -427,7 +436,6 @@
#include "code\datums\components\riding.dm"
#include "code\datums\components\rotation.dm"
#include "code\datums\components\shielded.dm"
-#include "code\datums\components\shrapnel.dm"
#include "code\datums\components\shrink.dm"
#include "code\datums\components\sizzle.dm"
#include "code\datums\components\slippery.dm"
@@ -528,16 +536,19 @@
#include "code\datums\elements\art.dm"
#include "code\datums\elements\beauty.dm"
#include "code\datums\elements\cleaning.dm"
+#include "code\datums\elements\decal.dm"
#include "code\datums\elements\dusts_on_catatonia.dm"
#include "code\datums\elements\dusts_on_leaving_area.dm"
#include "code\datums\elements\dwarfism.dm"
#include "code\datums\elements\earhealing.dm"
+#include "code\datums\elements\embed.dm"
#include "code\datums\elements\empprotection.dm"
#include "code\datums\elements\firestacker.dm"
#include "code\datums\elements\flavor_text.dm"
#include "code\datums\elements\forced_gravity.dm"
#include "code\datums\elements\ghost_role_eligibility.dm"
#include "code\datums\elements\mob_holder.dm"
+#include "code\datums\elements\photosynthesis.dm"
#include "code\datums\elements\polychromic.dm"
#include "code\datums\elements\scavenging.dm"
#include "code\datums\elements\snail_crawl.dm"
@@ -822,6 +833,9 @@
#include "code\game\machinery\porta_turret\portable_turret.dm"
#include "code\game\machinery\porta_turret\portable_turret_construct.dm"
#include "code\game\machinery\porta_turret\portable_turret_cover.dm"
+#include "code\game\machinery\shuttle\custom_shuttle.dm"
+#include "code\game\machinery\shuttle\shuttle_engine.dm"
+#include "code\game\machinery\shuttle\shuttle_heater.dm"
#include "code\game\machinery\telecomms\broadcasting.dm"
#include "code\game\machinery\telecomms\machine_interactions.dm"
#include "code\game\machinery\telecomms\telecomunications.dm"
@@ -996,6 +1010,7 @@
#include "code\game\objects\items\sharpener.dm"
#include "code\game\objects\items\shields.dm"
#include "code\game\objects\items\shooting_range.dm"
+#include "code\game\objects\items\shrapnel.dm"
#include "code\game\objects\items\signs.dm"
#include "code\game\objects\items\singularityhammer.dm"
#include "code\game\objects\items\spear.dm"
@@ -1098,6 +1113,7 @@
#include "code\game\objects\items\stacks\medical.dm"
#include "code\game\objects\items\stacks\rods.dm"
#include "code\game\objects\items\stacks\stack.dm"
+#include "code\game\objects\items\stacks\tape.dm"
#include "code\game\objects\items\stacks\telecrystal.dm"
#include "code\game\objects\items\stacks\wrap.dm"
#include "code\game\objects\items\stacks\sheets\glass.dm"
@@ -1155,6 +1171,7 @@
#include "code\game\objects\structures\fireplace.dm"
#include "code\game\objects\structures\flora.dm"
#include "code\game\objects\structures\fluff.dm"
+#include "code\game\objects\structures\fugitive_role_spawners.dm"
#include "code\game\objects\structures\ghost_role_spawners.dm"
#include "code\game\objects\structures\girders.dm"
#include "code\game\objects\structures\grille.dm"
@@ -1347,6 +1364,7 @@
#include "code\modules\antagonists\_common\antag_spawner.dm"
#include "code\modules\antagonists\_common\antag_team.dm"
#include "code\modules\antagonists\abductor\abductor.dm"
+#include "code\modules\antagonists\abductor\ice_abductor.dm"
#include "code\modules\antagonists\abductor\abductee\abductee.dm"
#include "code\modules\antagonists\abductor\abductee\abductee_objectives.dm"
#include "code\modules\antagonists\abductor\abductee\trauma.dm"
@@ -1538,6 +1556,10 @@
#include "code\modules\antagonists\disease\disease_event.dm"
#include "code\modules\antagonists\disease\disease_mob.dm"
#include "code\modules\antagonists\ert\ert.dm"
+#include "code\modules\antagonists\fugitive\fugitive.dm"
+#include "code\modules\antagonists\fugitive\fugitive_outfits.dm"
+#include "code\modules\antagonists\fugitive\fugitive_ship.dm"
+#include "code\modules\antagonists\fugitive\hunter.dm"
#include "code\modules\antagonists\greentext\greentext.dm"
#include "code\modules\antagonists\greybois\greybois.dm"
#include "code\modules\antagonists\highlander\highlander.dm"
@@ -1618,6 +1640,11 @@
#include "code\modules\assembly\signaler.dm"
#include "code\modules\assembly\timer.dm"
#include "code\modules\assembly\voice.dm"
+#include "code\modules\asset_cache\asset_cache.dm"
+#include "code\modules\asset_cache\asset_cache_client.dm"
+#include "code\modules\asset_cache\asset_cache_item.dm"
+#include "code\modules\asset_cache\asset_list.dm"
+#include "code\modules\asset_cache\asset_list_items.dm"
#include "code\modules\atmospherics\multiz.dm"
#include "code\modules\atmospherics\environmental\LINDA_fire.dm"
#include "code\modules\atmospherics\environmental\LINDA_system.dm"
@@ -1710,6 +1737,7 @@
#include "code\modules\cargo\bounty_console.dm"
#include "code\modules\cargo\centcom_podlauncher.dm"
#include "code\modules\cargo\console.dm"
+#include "code\modules\cargo\coupon.dm"
#include "code\modules\cargo\export_scanner.dm"
#include "code\modules\cargo\exports.dm"
#include "code\modules\cargo\expressconsole.dm"
@@ -1750,6 +1778,7 @@
#include "code\modules\cargo\packs\emergency.dm"
#include "code\modules\cargo\packs\engine.dm"
#include "code\modules\cargo\packs\engineering.dm"
+#include "code\modules\cargo\packs\goodies.dm"
#include "code\modules\cargo\packs\livestock.dm"
#include "code\modules\cargo\packs\materials.dm"
#include "code\modules\cargo\packs\medical.dm"
@@ -1760,7 +1789,6 @@
#include "code\modules\cargo\packs\service.dm"
#include "code\modules\cargo\packs\vending.dm"
#include "code\modules\chatter\chatter.dm"
-#include "code\modules\client\asset_cache.dm"
#include "code\modules\client\client_colour.dm"
#include "code\modules\client\client_defines.dm"
#include "code\modules\client\client_procs.dm"
@@ -1795,7 +1823,6 @@
#include "code\modules\clothing\gloves\tacklers.dm"
#include "code\modules\clothing\head\_head.dm"
#include "code\modules\clothing\head\beanie.dm"
-#include "code\modules\clothing\head\cit_hats.dm"
#include "code\modules\clothing\head\collectable.dm"
#include "code\modules\clothing\head\hardhat.dm"
#include "code\modules\clothing\head\helmet.dm"
@@ -1885,6 +1912,7 @@
#include "code\modules\events\anomaly_vortex.dm"
#include "code\modules\events\aurora_caelus.dm"
#include "code\modules\events\blob.dm"
+#include "code\modules\events\brain_trauma.dm"
#include "code\modules\events\brand_intelligence.dm"
#include "code\modules\events\bureaucratic_error.dm"
#include "code\modules\events\camerafailure.dm"
@@ -1894,7 +1922,9 @@
#include "code\modules\events\disease_outbreak.dm"
#include "code\modules\events\dust.dm"
#include "code\modules\events\electrical_storm.dm"
+#include "code\modules\events\fake_virus.dm"
#include "code\modules\events\false_alarm.dm"
+#include "code\modules\events\fugitive_spawning.dm"
#include "code\modules\events\ghost_role.dm"
#include "code\modules\events\grid_check.dm"
#include "code\modules\events\heart_attack.dm"
@@ -1918,7 +1948,9 @@
#include "code\modules\events\spacevine.dm"
#include "code\modules\events\spider_infestation.dm"
#include "code\modules\events\spontaneous_appendicitis.dm"
+#include "code\modules\events\stray_cargo.dm"
#include "code\modules\events\vent_clog.dm"
+#include "code\modules\events\wisdomcow.dm"
#include "code\modules\events\wormholes.dm"
#include "code\modules\events\holiday\halloween.dm"
#include "code\modules\events\holiday\vday.dm"
@@ -1927,6 +1959,7 @@
#include "code\modules\events\wizard\blobies.dm"
#include "code\modules\events\wizard\curseditems.dm"
#include "code\modules\events\wizard\departmentrevolt.dm"
+#include "code\modules\events\wizard\embeddies.dm"
#include "code\modules\events\wizard\fakeexplosion.dm"
#include "code\modules\events\wizard\ghost.dm"
#include "code\modules\events\wizard\greentext.dm"
@@ -2169,6 +2202,7 @@
#include "code\modules\keybindings\keybind\admin.dm"
#include "code\modules\keybindings\keybind\carbon.dm"
#include "code\modules\keybindings\keybind\client.dm"
+#include "code\modules\keybindings\keybind\combat.dm"
#include "code\modules\keybindings\keybind\emote.dm"
#include "code\modules\keybindings\keybind\human.dm"
#include "code\modules\keybindings\keybind\living.dm"
@@ -2319,7 +2353,10 @@
#include "code\modules\mob\living\emote.dm"
#include "code\modules\mob\living\life.dm"
#include "code\modules\mob\living\living.dm"
+#include "code\modules\mob\living\living_active_block.dm"
+#include "code\modules\mob\living\living_active_parry.dm"
#include "code\modules\mob\living\living_block.dm"
+#include "code\modules\mob\living\living_blocking_parrying.dm"
#include "code\modules\mob\living\living_defense.dm"
#include "code\modules\mob\living\living_defines.dm"
#include "code\modules\mob\living\living_mobility.dm"
@@ -2527,6 +2564,7 @@
#include "code\modules\mob\living\simple_animal\friendly\panda.dm"
#include "code\modules\mob\living\simple_animal\friendly\penguin.dm"
#include "code\modules\mob\living\simple_animal\friendly\pet.dm"
+#include "code\modules\mob\living\simple_animal\friendly\plushie.dm"
#include "code\modules\mob\living\simple_animal\friendly\sloth.dm"
#include "code\modules\mob\living\simple_animal\friendly\snake.dm"
#include "code\modules\mob\living\simple_animal\friendly\drone\_drone.dm"
@@ -2570,6 +2608,7 @@
#include "code\modules\mob\living\simple_animal\hostile\nanotrasen.dm"
#include "code\modules\mob\living\simple_animal\hostile\netherworld.dm"
#include "code\modules\mob\living\simple_animal\hostile\pirate.dm"
+#include "code\modules\mob\living\simple_animal\hostile\regalrat.dm"
#include "code\modules\mob\living\simple_animal\hostile\russian.dm"
#include "code\modules\mob\living\simple_animal\hostile\sharks.dm"
#include "code\modules\mob\living\simple_animal\hostile\skeleton.dm"
@@ -2961,6 +3000,7 @@
#include "code\modules\reagents\reagent_containers\blood_pack.dm"
#include "code\modules\reagents\reagent_containers\borghydro.dm"
#include "code\modules\reagents\reagent_containers\bottle.dm"
+#include "code\modules\reagents\reagent_containers\chem_pack.dm"
#include "code\modules\reagents\reagent_containers\dropper.dm"
#include "code\modules\reagents\reagent_containers\glass.dm"
#include "code\modules\reagents\reagent_containers\hypospray.dm"
@@ -3135,6 +3175,7 @@
#include "code\modules\shuttle\arrivals.dm"
#include "code\modules\shuttle\assault_pod.dm"
#include "code\modules\shuttle\computer.dm"
+#include "code\modules\shuttle\custom_shuttle.dm"
#include "code\modules\shuttle\docking.dm"
#include "code\modules\shuttle\elevator.dm"
#include "code\modules\shuttle\emergency.dm"
@@ -3146,10 +3187,17 @@
#include "code\modules\shuttle\ripple.dm"
#include "code\modules\shuttle\shuttle.dm"
#include "code\modules\shuttle\shuttle_rotate.dm"
+#include "code\modules\shuttle\snaxi.dm"
#include "code\modules\shuttle\special.dm"
#include "code\modules\shuttle\supply.dm"
#include "code\modules\shuttle\syndicate.dm"
#include "code\modules\shuttle\white_ship.dm"
+#include "code\modules\shuttle\shuttle_creation\shuttle_creator.dm"
+#include "code\modules\shuttle\shuttle_creation\shuttle_creator_actions.dm"
+#include "code\modules\shuttle\shuttle_creation\shuttle_creator_console.dm"
+#include "code\modules\shuttle\shuttle_creation\shuttle_creator_eye.dm"
+#include "code\modules\shuttle\shuttle_creation\shuttle_creator_overlay.dm"
+#include "code\modules\shuttle\shuttle_creation\shuttle_upgrades.dm"
#include "code\modules\spells\spell.dm"
#include "code\modules\spells\spell_types\aimed.dm"
#include "code\modules\spells\spell_types\area_teleport.dm"
@@ -3410,11 +3458,9 @@
#include "modular_citadel\code\modules\mob\living\living.dm"
#include "modular_citadel\code\modules\mob\living\carbon\carbon.dm"
#include "modular_citadel\code\modules\mob\living\carbon\damage_procs.dm"
-#include "modular_citadel\code\modules\mob\living\carbon\life.dm"
#include "modular_citadel\code\modules\mob\living\carbon\reindex_screams.dm"
#include "modular_citadel\code\modules\mob\living\carbon\human\human.dm"
#include "modular_citadel\code\modules\mob\living\carbon\human\human_defense.dm"
-#include "modular_citadel\code\modules\projectiles\gun.dm"
#include "modular_citadel\code\modules\projectiles\ammunition\caseless.dm"
#include "modular_citadel\code\modules\projectiles\ammunition\ballistic\smg\smg.dm"
#include "modular_citadel\code\modules\projectiles\boxes_magazines\ammo_boxes.dm"
diff --git a/tgui-next/packages/tgui/interfaces/Cargo.js b/tgui-next/packages/tgui/interfaces/Cargo.js
index 133b1b00ab..85a528d901 100644
--- a/tgui-next/packages/tgui/interfaces/Cargo.js
+++ b/tgui-next/packages/tgui/interfaces/Cargo.js
@@ -147,6 +147,16 @@ const Catalog = props => {
19 April 2020
-Anonymous updated:
+22 June 2020
+Ghommie (porting PRs by zxaber, Ryll-Ryll, AnturK) updated:
-
-
- Xenohybrids will now scream like xeno. -
Arturlang updated:
--
-
- You can no longer spam craft things using the crafting menu -
Detective-Google updated:
--
-
- uncorks some of Lambda's rooms. -
Ghommie updated:
--
-
- Custom skin tone preferences. -
- Normalized box dorm lockers. Also removed a straight jacket found in the same area. -
Jake Park updated:
--
-
- fixed path name for youtool vending -
Putnam3145 updated:
--
-
- Objectives now clean theirselves up instead of leaving null entries in lists everywhere. -
Seris02 updated:
--
-
- stops magboots from not updating slowdowns -
Trilbyspaceclone updated:
--
-
- Maints have seen an uptick in left over types of welders, and tools. As well as different types of masks -
- New type of 02 locker - Rng! It can have almost any type of gas/breath mask and almost any type of o2 tank as well as even plasma men internals - Fancy! -
- Tool lockers have 70% odds to have a spare random tool inside! -
- 12 new more drinks for most races! -
- New animations for mauna loa, and colour swap from red to blue for a Paramedic Hardsuit helm -
- Lowers cog champ ((the drink)) flare rate -
- Six more Sci based bounties have been posted at your local Cargo Bounty Request console -
- Mimes have made catnip plants not become invisible. How helpful. -
- Honey Palm now distills into mead rather then wine -
UristMcAstronaut updated:
--
-
- Adds circuit analyzers to maps and to integrated circuit printer and circuitry starter crate. -
kappa-sama updated:
--
-
- aranesp heals 10 instead of 18 stamina per tick -
- removed roundstart hyper earrape screams from xenohybrids +
- Certain small items purchased through cargo now get grouped into a single box. They also are immune to the 10% private account fee. +
- Added single-order options for several existing products in the Cargo Catalog. +
- Medkit listings are now single-pack items, and considered small items that get grouped into single boxes. Price for medkits is as close to unchanged as is reasonable. +
- You can now beat on vending machines to try and knock loose free stuff! You can also almost kill yourself doing it, so it's your call if your life is worth ten bucks. +
- Cigarette packets now have coupons on the back for small cargo items! Smoking DOES pay! +
- Some single/small items in cargo have been rebranded as goodies, come in lockboxes rather than crates, and can only be purchased with private accounts.
kevinz000 updated:
-
-
- you can no longer stun xenos -
- Contractor kits are now poplocked to 30 players. -
- Shield bashing has been added +
- Life() is split into BiologicalLife() and PhysicalLife. A component signal has been added that can prevent either from ticking.
necromanceranne updated:
+shellspeed1 updated:
-
-
- You can now craft armwraps! -
- Pugilists disarm you more easily and are harder to disarm. They also get a discount on disarm. -
- Pugilists only suffer a flat 10% chance to miss you. It's just like old punches! Kinda. -
- Chaplain's armbands are a +2, up from a +1! -
- Martial artists spend stamina when they disarm. -
- Rising Bass had several moves shortened and made stronger. Has a disarm override attack which does stamina damage and trips people on a disarm stun punch. -
- CQC had it's disarm move altered to be a stronger version of Krav Maga's. Dizzies and disarms on a disarm stun punch or just does some stamina damage and brute damage. -
- Sleeping Carp can punch you to the floor on a harm stun punch. -
- Hugs of the Northstar are no longer nodrop. -
- Adding in some overrides and proper flag checks for martial arts. -
- Stun thresholding stops disarm spams at extremely high stamina loss. -
- Ashen Arrows are actually called Ashen Arrows in the crafting menu. +
- Adds IV bags.
16 April 2020
-ForrestWick updated:
+21 June 2020
+kevinz000 updated:
-
-
- changed a certain item to be called meatball, ended racism, thank you obama -
Linzolle updated:
--
-
- remove any slurs, etc. to comply with GitHub's ToS +
- calculations for punch hit chance has been drastically buffed in favor of the attacker.
15 April 2020
-Arturlang updated:
+20 June 2020
+LetterN updated:
-
-
- Adds garlic, a mutation of onions -
- You can now make garlic necklaces. -
- Tweaked hunger to be more the same as blood level for bloodsuckers -
- Bloodsuckers no longer get zero healing from regenerative cores, the core now heals their wounds but not their blood. -
- Bloodsucker heal is now based a lot more on blood level. -
- You can no longer be effectively immortal when fully auged as a bloodsucker. -
- Regenerative cores will regain their old names when they are renewed, no more working decayed cores. -
- Removes a lot of unnecesiry clutter of comments and tries to make the vars more consistent for bloodsucker code. -
- Made the regenerative core use one proc instead of copypasta -
Auris456852 updated:
--
-
- Added printer sound for admins that plays when someone messages Centcomm or the Syndicate. Just like RP! -
Bhijn updated:
--
-
- The traitor panel now actually shows a list of contractor targets. -
- Fail2Topic now supports Linux. Do beware that this requires some sysop experience to properly set up! -
- Fail2Topic is now disabled by default, and the out-of-the-box config files have been updated to be a little more detailed. -
- Added a lfwb-inspired orbiting pixel + flashing outline animation to the sprint and combat mode buttons. This can be toggled via the preferences menu, and is completely independent from all HUD themes. -
BuffEngineering updated:
--
-
- You may no longer summon plasteel from the door dimension. -
- High security airlocks are now 33% more materially efficient! -
DeltaFire15 updated:
--
-
- clockie vanguard now quickly regenerates stam while active (as its description always told you,) -
Detective-Google updated:
--
-
- Shotguns are now slower and require two hands to fire. -
Ghommie updated:
--
-
- mobs with antag statuses such as wizard, ert and nuke ops get their flavor text removed now. -
- Fixed megafauna mobs, goliaths and "anchored" AIs being stuffable into closets. -
- After years of visual agony, the Curse of The Floating Disembodied Phallus has come to an end. -
- Underwear now fulfills its purpose. -
- Privates visibility preferences. -
- refactored polychromic clothing into an element. -
- Blacklists unsynthetizable reagents from botany bees honey production. -
- Fixed toilet cistern loot spawning on the floor. -
- The megafauna's hitbox doesn't include 0 alpha sections anymore. -
- Wizard robes & co work again now. -
- Fixed some spell casting message spam. -
- Added M/F body preferences. -
- fixed yet another few airless issues with the space hermit ruin. -
- Intellectual property infringment is not cool. -
- Near-station nuclear explosions now display the on-station nuke explosion cinematic, consistently with its clearance of the station level and its nuclear victory / total annihilation ending status. -
- Nuclear bombs can't be anchored in space areas (not just turfs) anymore, as a quick effortless way to discourage players from anchoring the device on the edge of the map. -
- Fixed a whacky miniature cell duping issue. -
- Liver failure is back! -
- standarized a few (prefs off) side effects from enlargment chems on livers to do organ damage instead without the blood volume whackiness. -
- High liver damage now slows mobs down. -
- Fixing an issue with the split personality removing the original owner from the round if the body died while the stranger was in control. -
- fixed a few floaty sprite accessories. -
- Fixed a few mutations not working correctly. -
- Fixed the phantom thief component, again. -
- Made votes obfuscation settings more robust. -
- Also included them in custom votes. -
- The map rotation vote will only hide ongoing votes now, not the results. -
- The crusher's vortex talisman trophy now has a cooldown between each spawned wall. -
- Backend body size preferences. -
- Infiltrator's boots don't stop slips and "space wind" through the power of runtime errors anymore, and properly silence the user's footsteps now. -
- Chaplains are now inelegible for bloodsuckers. -
- Fixed crafting hud icon overlapping the second pocket on 1:1 screen mode. -
- Removed some dead flightsuit code leftovers. -
- Reenabled the swarmers event. Also blacklisted another dozen other machineries and structures that may be critical to the shift or station integrity from swarmers' HUNGER for materials. -
- Fixed find_safe_turfs() searching for turfs with concentration of oxygen lower than 16 rather higher. -
KathrinBailey updated:
--
-
- Radiation shuttesr to all supermatters. -
- Windowed shutters to armouries where relevant. -
- New posters are now on the map in relevant locations. -
- Windowed shutter now has glass, the door closing proc sees this and no longer changes opacity. -
- Accidental HoochMaster removal in the bar. -
- Spawning looking at the supermatter with no mesons on Meta. -
- Missing disposal pipe outside HoP office. -
- Sofas were never adjusted when the pool was added. -
- New shutter sprites -
- Reinforced Shutter -
- Radiation Shutter -
- Window Shutter -
- Shutters not being blast doors functionally. -
- Shutter armour block and health. -
Kraseo updated:
--
-
- Sneaksuit now costs 5 TC rather than 3. -
- You can break out of neckgrabs once more. -
Owai-Seek updated:
--
-
- Port Pina Colada, Painkiller, Moscow Mule, Hivemind Eraser, Moana Lou Drinks -
- Gunfire, Hellfire, Sins Delight, Strawberry Daiquiri, Miami Vice, Malibu Sunset, Lizz Fizz, Hotline Miami -
- Strawberry and Pineapple Juice -
- Salami Slices -
- Soda Dispenser Juices -
- Reorganize Vendor Objects (Bowls, Glasses, Shot Glasses) -
- Strawberry Milk and Tea actually use strawberry Juice. -
- Lizards can eat egg wraps. Moved Egg Wraps to Misc -
PersianXerxes updated:
--
-
- TGUI Next UIs for: chem heaters, chem masters, chem dispensers, and sleepers -
- Reworked Chem Master code -
Putnam3145 updated:
--
-
- No more station integrity goal -
- Upload-hacked-law goal only picksif there's an AI to upload to -
- A new, much more barebones holding facility for contractors. -
- Energy nets are gone. -
- Various ghost roles are now easier to ghost as. -
- The candles in the dojo no longer make the place hotter and hotter over time. -
- Nymphomania removed -
- Exhibitionism ignored by preferences now, since it was also removed -
- Quirk migration now does an admin log instead of a stack trace -
- Roundstart rulesets now roll properly. -
- Added configs for various antag threat levels. -
- Fixed a runtime in threat calculation. -
- Fixed up some misleading texts. -
- Dynamic reworked to be more "storyteller-like": threat is now how threatened the station is right now and threat level is how much the mode wants the station to be threatened. -
- Random storyteller is now truly random. -
- Story storyteller now gives a nice rising-action-climax-falling action curve for threat level. -
- "Chaotic" storyteller now simply ramps up threat level as round goes on. -
- "Classic" storyteller, basically doing what "random" did before. -
- Latejoin changelings for dynamic -
- Average threat calculation works now -
- Contamination is back. -
Seris02 updated:
--
-
- stops hijackers from being able to remotely blow up borgs -
- wall walking boots -
- made color picking for character appearance show the colors when you pick them -
- the sergal markings -
Trilbyspaceclone updated:
--
-
- Cooks aided by Clowns have came out with and new healthy Salad - Caesar Salad. Just dont eat the knife... -
- Ports over TG's Mortars and Pestles. -
- Water, Holywater and Unholywater will now now quickly purge itself if you have 151u in your system -
- Most crate types can now be made, some costing more do to function over fashion -
- Medical Mechs syringe gun now knows many more life saving chems, like Insulin, Dexalin, Prussian Blue, Kelotane and Bicaridine -
- torches take less staminda to use. -
- Glowsticks dont last as long -
- Penlights are better at being lights -
- Torches are brighter then before - Indian Johns want to be on lava land rejoy! -
- Eye lights have 30% less light coming out of them. -
- Spec Ops crate no longer talks about a "Null Crate" what ever that is -
- Changlogs are updateded once again as of the 28th of March on year 2020 -
- White Ships, Telerelays and a defunk mining post are now always going to spawn. -
- Corrects a few desc on station side ruins -
Xantholne updated:
--
-
- bumbles will stop sleeping so much -
actioninja updated:
--
-
- Washing machines now support arbitrary dye color -
- Washing machines now dye nearly every item. -
- lots of backend changes to clothing overlays, report any issues -
- Better glowing lights -
actioninja (ported by Ghommie) updated:
--
-
- repathed all under clothing, keep an eye out for errors. +
- Asset cache from tg +
- Made the map viewer not look bad +
- Admin matrix right-bracket
bunny232 updated:
-
-
- Box secmos now is now longer connected to the scrubber loop +
- Removed unsavory things from the vent clog event
dapnee updated:
+ +19 June 2020
+Bhijn updated:
-
-
- plant disk sorter in botany, bounty console for the rest of cargo, a missing air alarm in the incinerator -
- fixed a decal in front of security, moved an AIR alarm so it doesn't look awful to ghosts/AI, asteroids don't delete air anymore, fixed more active turfs, the buttons in the bridge "should" work now, HoP and cargo desks should be secure now -
- quarters that found their way out of the quartermaster's back room +
- Atmos can no longer become completely bricked
kappa-sama updated:
+Funce updated:
-
-
- normies can no longer steal circuit codes -
- doubles the Stam damage of nonlethal krav stompers -
- no longer Krav Maga stomp people that are standing -
- no more 20pop requirement for noslips +
- Square root circuit should now actually work.
keronshb updated:
+SmArtKar updated:
-
-
- Reverts Mining Base RNG Placement +
- Fixed my runtimes +
TheSpaghetti updated:
+-
+
- more insectoid insects
kevinz000 updated:
-
-
- Melee attacks now stagger people, preventing them from sprinting until the (relatively short lived) effect runs out. Duration equation is [(1.5 + (w_class/7.5)) * force]. -
- Fireman carrying now makes the person being carried unable to use items. Piggybacking now slows down the person being ridden. In both cases, the person riding will be dazed when forcefully dismounted, and dazed for a second if dismounting from piggybacking -
- turfs properly initialize atom colors if they're colored. -
- cloners now stabilize mutations while someone's cloning, meaning active genes will not life tick. -
- datum/pipeline return_air stack trace now gives a reference so it's actually marginally useful if caught in round. -
- Volumetric storage is here. -
- Traitor chaplains can now become neutered versions of cults. -
- beams should no longer go across the map and mess everything up if their source or target isn't on a turf. -
kiwedespars updated:
--
-
- Added paper masks. -
necromanceranne updated:
--
-
- Fixed limb damage calc -
- Stunslugs are now a mixed damage taser-like slug that will allow you to apply a variety of damage while still being countered by tasers usual counters. -
- Mech scattershot guns are no longer oneshotting people into stamina crit. -
- Removed an number of cargo crate packs: Riot shotguns/standard shotguns, double barreled shotguns, techshell crate, swat tasers, WT550 types (not rubber or standard), traitor theft objective kits. -
- HEALTH AND STAMINA DON'T STACK FOR PUTTING YOU INTO STAMINA CRIT. -
- YOUR FISTS ARE HELLA GODDAMN STRONG. -
- ACCEPT THE FELINIDS WARES, FOR SKOOMA HAS INCREDIBLE LETHAL PROPERTIES: YOUR HANDS BECOME LIKE SWORDS. -
- BOXERS CAN ONLY KNOCK OUT OTHER BOXERS BECAUSE THEY HAVE HONOR OR SOME SHIT -
- INCREASED STAMINA DAMAGE TO LIMBS FROM 50% TO 75%. -
- Double-barreled shotguns and any child of such now can be used with off-hand equipment. -
- Readds bioterror darts to the nuclear operative uplink for the legacy price of 6tc! Has all new horrid reagents! -
- Scatterlaser is now in-line with buckshot. Nukies can't purchase scatterlaser shot. -
- Null crates are no longer available in cargo! -
- Sleeping Carp and Rising Bass now dodge. Again. -
- Russian Revolver can no longer be exploited for a free 357. -
- Several guns now shoot exactly where you click regardless of movement or turning. +
- bay/polaris style say_emphasis has been added. You can now |italicize| _underline_ and +bold+ your messages.
timothyteakettle updated:
-
-
- added beacon for cooks to choose an ingredient box, which replaces the random box they used to receive -
- added a new sushi ingredients box -
- added more items to the wildcard box's possible contents -
- add new holodeck wrestling belt which lets you use moves only on those also wearing it -
- add new holodeck map featuring the holodeck wrestling belt -
- new reagent 'Condensed Cooking Oil' -
- list of chems that can go into fried non-food items was changed +
- Adds the brain trauma event, where one player gets a random brain trauma! +
- Adds the wisdom cow event, where the wisdom cow appears on the station! +
- Adds the fake virus event, where people get fake virus symptoms. +
- Adds the stray cargo pod event, where a cargo pod crashes into the station. +
- Adds the fugitives event, where fugitives are loose on the station, and it's the hunters jobs to capture them.
zeroisthebiggay updated:
+ +18 June 2020
+Detective-Google updated:
-
-
- sneaksuit to contractor items -
- sneaksuit is a bundle -
- intel potion and radio implant from contractor items -
- ghosts can now DNR -
- sneaksuit is not fireproof -
- insidious balaclava muzzlepsprite works -
- You can now choose your name and color as a holoparasite/guardian/holocarp! -
- fixes lings being able to get mechanical holoparasites +
- cog is now less the suck +
- couple little derpy bits +
- malf disk and illegal tech disk moved from ashwalker base (guaranteed) to tendrils (chance based) +
SmArtKar updated:
+-
+
- Ported shuttles from beestation +
timothyteakettle updated:
+-
+
- embeds got reworked, sticky tape was added, more bullets that ricochet also added +
- medbots can now be tipped over +
- added more medbot sounds +
17 June 2020
+SmArtKar updated:
+-
+
- New ID icons +
- Sutures and Meshes +
Trilbyspaceclone updated:
+-
+
- Gin export takes gin now +
16 June 2020
+Ghommie updated:
+-
+
- You can't blink nor use LOOC/AOOC as a petrified statue anymore. +
Trilbyspaceclone updated:
+-
+
- BEPIS decal painter has been moved to venders, replacing it being the flashdark +
kevinz000 updated:
+-
+
- projectile ricochets now use a less hilariously terrible way of being handled and should be easier to w +
- projectile runtime/ricocheting +
- Lobotomy no longer has a 50% chance of giving you a nigh-unremovable trauma, but does 50 brain damage even on success. On failure, it will give you a lobotomy-class trauma. +
- spinesnapping from tackling now only gives a lobotomy class trauma instead of magic. +
timothyteakettle updated:
+-
+
- Food carts now function as intended, allowing the pouring and mixing of drinks. +
- slimes can now change their color using alter form +
15 June 2020
+Anturk, kevinz000 updated:
+-
+
- VV now properly allows access to datums in associative lists +
- SDQL2 printout has been upgraded for the 5th time. +
kevinz000 updated:
+-
+
- plushies now work. credits to timothytea. +
- You can now tape knives to cleanbots +
kevinz000 (port from VOREStation) updated:
+-
+
- Ported zoomba skins for cyborgs. +
14 June 2020
+Bhijn updated:
+-
+
- raw HTML can no longer be used in flavortext +
- Added Lesbian Visibility Day (April 26th) +
- Added Bisexual Visibility Day (September 23rd) +
- Added Coming Out Day! (October 11th) +
- Added Intersex Awareness Day (October 26th) +
- Added Transgender Awareness Week (November 13th - 19th) +
- Added the Transgender Day of Remembrance (November 20th) +
- Added Asexual Awareness Week (Last full week of October, this year it'll be Oct. 25-31) +
- Added the Stonewall Riot Anniversary (June 28) +
- Moth week is now *actually* the last full week of July, instead of the 4th of every weekday + the 5th Sunday. +
Floof Ball / Kathrin Morrison / Floof Ball#0798 updated:
+-
+
- Improvised Pistol + 32 ACP ammo. +
- Improvised Energy Gun. Fires 5 shots of 10 burn damage each. Can be upgraded with a lens made from glassworking and T4 parts for a minor buff. +
- Ammo + gun part loot spawners for mappers. +
- New sprites for Improvised Rifle, the ability to sling the rifle and a sprite for that. +
- New sprites for the Improvised Shotgun and its sling sprite. +
- Improvised shotguns are now two-handed only. +
- Improvised shotguns now only have a much less harsh 0.9* modifier, keeping them two hits to crit with slugs and buckshot. It can no longer be dual-wielded but can still be sawn off for w_class medium (can fit in backpacks). +
- Missing handsaw icons added in. +
- Crafting table cleaned up into sections. +
Ghommie updated:
+-
+
- changed the weak attack message prefix from "inefficiently" to "limply", "feebly" and "saplessly" and lowered the threshold. +
- Fixing old beserker hardsuits having the wrong helmet type. +
The0bserver and Stewydeadmike updated:
+-
+
- Hey, there's a bit of dust in this recipe book! Recipes using peas? How many recipes does this book even have? +
- Adds 6 new food items, and 1 new consumable reagent using all forms of the recently discovered peas. Ask your local botanist and chef for them today! +
YakumoChen updated:
+-
+
- Adds polychrome options to loadout +
- Adds risque polychrome options to Kinkmate vendors +
kevinz000 updated:
+-
+
- emissive blockers can no longer be radioactive. +
- Ghosts can now scan air inside most objects that contain air by clicking on them. +
- Directional blocking has been added, keybound to G. This will reduce a portion of incoming damage if done with eligible items at the cost of stamina damage incurred to the user based on damage blocked as well as while active, as well as in most cases preventing the user from doing any attacks while this is active. +
- Parrying has been added, keybound to F. Timing-based counterattacks, effect heavily dependent on the item, WIP. +
- Disks are now smaller. +
12 June 2020
+EmeraldSundisk updated:
+-
+
- The Detective's Office has been commandeered in order to serve a Head of Security. Detectives will find their new office within starboard maintenance. +
- Adds the Head of Security's standard equipment to their new office. +
- Slight adjustment/expansion to the main security department +
- Additional maintenance work +
timothyteakettle updated:
+-
+
- Crabs, cockroaches, slimes and crabs are now small enough to fit in pet carriers +
11 June 2020
+Ghommie updated:
+-
+
- Balanced vending machine prices to be generally more affordable, a minority has been priced up though. +
10 June 2020
+DeltaFire15 updated:
+-
+
- Golems / simillar now inherit the neutered antag datum if the creator is neutered. +
Ghommie updated:
+-
+
- Fixing missing pill type buttons from the chem master UI. +
Naksu updated:
+-
+
- Lighting corner updates are ever so slightly faster. +
Putnam for helping me code the contamination clearing on people updated:
+-
+
- Lab made Zeolites have been remade anew and more affective now that they refined the best possable way to mix and make a supper Zeolite capable of clearing contamination form not only people but items! +
Trilbyspaceclone updated:
+-
+
- Tank Dispender has been moved into toxin storage from toxins +
kevinz000 updated:
+-
+
- traitor classes can now be poplocked. hijack/glorious death are now locked to 25/20 respectively. +
timothyteakettle updated:
+-
+
- adds a new fermichem, used for creating sentient plushies! +
- Mice can now breed using cheese wedges +
- Royal cheese can be crafted to convert a mouse into king rat +
09 June 2020
+Anonymous updated:
+-
+
- Added Orville-inspired clothing as a worthy alternative to Trek stuff. +
- Adds chaplain role allowance to the TMP Service Uniform loadout. +
- Adds paramedic in every medsci mentioned uniform loadout. +
DeltaFire15 updated:
+-
+
- Offstation AIs can once again only interact with their z-level +
Ghommie updated:
+-
+
- Fixing IC material containers interaction with stacks, for real. +
Trilbyspaceclone updated:
+-
+
- Gasses like BZ and Masiam seem to just sell for less in cargo, markets seem to change it seems +
kevinz000 updated:
+-
+
- plantpeople should stop dying in the halls now +
- Modifier-independent hotkey bindings have been added. +
08 June 2020
+DeltaFire15 updated:
+-
+
- Delinging now properly removes their special role +
- Keycard auth devices now require two seperate IDs with sufficient access to auth. +
Linzolle updated:
+-
+
- shotguns no longer delete chambered shells while firing +
kevinz000 updated:
+-
+
- test +
shellspeed1 updated:
+-
+
- Internal tanks are now printable at the engineering lathe. +
timothyteakettle updated:
+-
+
- newly created areas using blueprints now maintain the previous areas noteleport value +
- kudzu seeds now actually spawn vines
+ {"INTRN@L ACfES VIOL�TIa█ DEtE₡TED! Ree3ARcinG A█ \ + BAaKUP RdST�RE PbINT [0xcff32ca] - PLfASE aAIT"} +
+ + + {data.borg ? ( ++ It will take 20 seconds for every character that the password has. +
+ In the meantime, this console can reveal your + true intentions if you let someone access it. + Make sure no humans enter the room during that time. +
+ wgdGFrZSAyMCBzZWNvbmRzIGZvciBldmVyeSBjaGFyYWN0ZXIgdGhh
+ dCB0aGUgcGFzc3dvcmQgaGFzLiBJbiB0aGUgbWVhbnRpbWUsIHRoaX
+ MgY29uc29sZSBjYW4gcmV2ZWFsIHlvdXIgdHJ1ZSBpbnRlbnRpb25z
+ IGlmIHlvdSBsZXQgc29tZW9uZSBhY2Nlc3MgaXQuIE1ha2Ugc3VyZS
+ BubyBodW1hbnMgZW50ZXIgdGhlIHJvb20gZHVyaW5nIHRoYXQgdGltZS4=
+
+
/gi,"\n").replace(/<\/?[a-z0-9-_]+[^>]*>/gi,"").replace(/&(nbsp|amp|quot|lt|gt|apos);/g,(function(e,n){return t[n]})).replace(/&#?([0-9]+);/gi,(function(e,t){var n=parseInt(t,10);return String.fromCharCode(n)})).replace(/&#x?([0-9a-f]+);/gi,(function(e,t){var n=parseInt(t,16);return String.fromCharCode(n)}))};t.buildQueryString=function(e){return Object.keys(e).map((function(t){return encodeURIComponent(t)+"="+encodeURIComponent(e[t])})).join("&")}},function(e,t,n){"use strict";t.__esModule=!0,t.zipWith=t.zip=t.reduce=t.sortBy=t.map=t.toArray=void 0;t.toArray=function(e){if(Array.isArray(e))return e;if("object"==typeof e){var t=Object.prototype.hasOwnProperty,n=[];for(var o in e)t.call(e,o)&&n.push(e[o]);return n}return[]};var o=function(e){return function(t){if(null===t&&t===undefined)return t;if(Array.isArray(t)){for(var n=[],o=0;o
/gi,"\n").replace(/<\/?[a-z0-9-_]+[^>]*>/gi,"").replace(/&(nbsp|amp|quot|lt|gt|apos);/g,(function(e,n){return t[n]})).replace(/&#?([0-9]+);/gi,(function(e,t){var n=parseInt(t,10);return String.fromCharCode(n)})).replace(/&#x?([0-9a-f]+);/gi,(function(e,t){var n=parseInt(t,16);return String.fromCharCode(n)}))};t.buildQueryString=function(e){return Object.keys(e).map((function(t){return encodeURIComponent(t)+"="+encodeURIComponent(e[t])})).join("&")}},function(e,t,n){"use strict";t.__esModule=!0,t.zipWith=t.zip=t.reduce=t.sortBy=t.map=t.toArray=void 0;t.toArray=function(e){if(Array.isArray(e))return e;if("object"==typeof e){var t=Object.prototype.hasOwnProperty,n=[];for(var o in e)t.call(e,o)&&n.push(e[o]);return n}return[]};var o=function(e){return function(t){if(null===t&&t===undefined)return t;if(Array.isArray(t)){for(var n=[],o=0;o