[return_controls()]" + dat += "[return_safety()][return_status()]
[return_controls()]" return dat /obj/machinery/alarm/proc/return_status() @@ -337,6 +338,15 @@ Temperature: [environment.temperature] return output +/obj/machinery/alarm/proc/return_safety() + var/output = "" + if(src.emagged) + output += "NOTICE: Safety measures nonfunctional. Device may exhibit abnormal behavior.
" + else + output += "Safety measures functioning properly.
" + return output + + /obj/machinery/alarm/proc/return_controls() var/output = ""//"[alarm_zone] Air [name]
" @@ -443,13 +453,24 @@ Nitrous Oxide output += {" << Main Menu
Air machinery mode for the area:
- "}
- var/list/modes = list(
- AALARM_MODE_SCRUBBING = "Filtering",
- AALARM_MODE_VENTING = "Draught",
- AALARM_MODE_PANIC = "PANIC",
- AALARM_MODE_REPLACEMENT = "REPLACE AIR",
- AALARM_MODE_OFF = "Off",
- )
+ var/list/modes = list()
+ if(src.emagged)
+ modes = list(
+ AALARM_MODE_SCRUBBING = "Filtering",
+ AALARM_MODE_VENTING = "Draught",
+ AALARM_MODE_PANIC = "PANIC",
+ AALARM_MODE_REPLACEMENT = "REPLACE AIR",
+ AALARM_MODE_OFF = "Off",
+ AALARM_MODE_FLOOD = "FLOOD", //Below everything else because it shouldn't be there normally
+ )
+ else
+ modes = list(
+ AALARM_MODE_SCRUBBING = "Filtering",
+ AALARM_MODE_VENTING = "Draught",
+ AALARM_MODE_PANIC = "PANIC",
+ AALARM_MODE_REPLACEMENT = "REPLACE AIR",
+ AALARM_MODE_OFF = "Off",
+ )
for (var/m=1,m<=modes.len,m++)
if (mode==m)
output += {"
- [modes[m]] (selected) "} @@ -659,6 +680,17 @@ table tr:first-child th:first-child { border: none;} send_signal(device_id, list( "power"= 0 )) + if(AALARM_MODE_FLOOD) + for(var/device_id in alarm_area.air_scrub_names) + send_signal(device_id, list( + "panic_siphon"= 0, + "power"=0 + )) + for(var/device_id in alarm_area.air_vent_names) + send_signal(device_id, list( + "power"= 1, + "checks"= 0, + )) /obj/machinery/alarm/update_icon() if(panel_open) @@ -767,7 +799,7 @@ table tr:first-child th:first-child { border: none;} post_alert(new_area_danger_level) update_icon() -/obj/machinery/alarm/attackby(obj/item/W as obj, mob/user as mob) +/obj/machinery/alarm/attackby(obj/item/W as obj, mob/user as mob, params) switch(buildstage) if(2) if(istype(W, /obj/item/weapon/wirecutters) && panel_open && (wires.wires_status == 27 || wires.wires_status == 31)) //this checks for all wires to be cut, except the syphon wire which is optional. @@ -860,6 +892,15 @@ table tr:first-child th:first-child { border: none;} if(loc) update_icon() + +/obj/machinery/alarm/emag_act(mob/user as mob) + if(!emagged) + src.emagged = 1 + user.visible_message("Sparks fly out of the [src]!", "You emag the [src], disabling its safeties.") + playsound(src.loc, 'sound/effects/sparks4.ogg', 50, 1) + return + + /* AIR ALARM CIRCUIT Just a object used in constructing air alarms @@ -886,7 +927,7 @@ Code shamelessly copied from apc_frame icon_state = "alarm_bitem" flags = CONDUCT -/obj/item/alarm_frame/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/item/alarm_frame/attackby(obj/item/weapon/W as obj, mob/user as mob, params) if (istype(W, /obj/item/weapon/wrench)) new /obj/item/stack/sheet/metal( get_turf(src.loc), 2 ) qdel(src) @@ -981,10 +1022,19 @@ FIRE ALARM +/obj/machinery/firealarm/emag_act(mob/user as mob) + if(!emagged) + src.emagged = 1 + user.visible_message("Sparks fly out of the [src]!", "You emag the [src], disabling its thermal sensors.") + playsound(src.loc, 'sound/effects/sparks4.ogg', 50, 1) + return + + /obj/machinery/firealarm/temperature_expose(datum/gas_mixture/air, temperature, volume) if(src.detecting) if(temperature > T0C+200) - src.alarm() // added check of detector status here + if(!emagged) //Doesn't give off alarm when emagged + src.alarm() // added check of detector status here return /obj/machinery/firealarm/attack_ai(mob/user as mob) @@ -1000,7 +1050,7 @@ FIRE ALARM if(prob(50/severity)) alarm() ..() -/obj/machinery/firealarm/attackby(obj/item/W as obj, mob/user as mob) +/obj/machinery/firealarm/attackby(obj/item/W as obj, mob/user as mob, params) src.add_fingerprint(user) if (istype(W, /obj/item/weapon/screwdriver) && buildstage == 2) @@ -1106,12 +1156,16 @@ FIRE ALARM user.set_machine(src) var/area/A = src.loc + var/safety_warning var/d1 var/d2 var/dat = "" if (istype(user, /mob/living/carbon/human) || user.has_unlimited_silicon_privilege) A = A.loc - + if (src.emagged) + safety_warning = text("NOTICE: Thermal sensors nonfunctional. Device will not report or recognize high temperatures.") + else + safety_warning = text("Safety measures functioning properly.") if (A.fire) d1 = text("Reset - Lockdown", src) else @@ -1122,7 +1176,7 @@ FIRE ALARM d2 = text("Initiate Time Lock", src) var/second = round(src.time) % 60 var/minute = (round(src.time) - second) / 60 - dat = "[d1]
The current alert level is: [get_security_level()]
Timer System: [d2]
Time Left: - - [(minute ? "[minute]:" : null)][second] + +" + dat = "[safety_warning]
[d1]
The current alert level is: [get_security_level()]
Timer System: [d2]
Time Left: - - [(minute ? "[minute]:" : null)][second] + +" //user << browse(dat, "window=firealarm") //onclose(user, "firealarm") else @@ -1234,7 +1288,7 @@ Code shamelessly copied from apc_frame flags = CONDUCT -/obj/item/firealarm_frame/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/item/firealarm_frame/attackby(obj/item/weapon/W as obj, mob/user as mob, params) if (istype(W, /obj/item/weapon/wrench)) new /obj/item/stack/sheet/metal( get_turf(src.loc), 2 ) qdel(src) diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm index 14957d84b85..99fba02a701 100644 --- a/code/game/machinery/atmoalter/canister.dm +++ b/code/game/machinery/atmoalter/canister.dm @@ -227,7 +227,7 @@ update_flag return return -/obj/machinery/portable_atmospherics/canister/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) +/obj/machinery/portable_atmospherics/canister/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob, params) if(!istype(W, /obj/item/weapon/wrench) && !istype(W, /obj/item/weapon/tank) && !istype(W, /obj/item/device/analyzer) && !istype(W, /obj/item/device/pda)) visible_message("[user] hits \the [src] with a [W]!") investigate_log("was smacked with \a [W] by [key_name(user)]", "atmos") diff --git a/code/game/machinery/atmoalter/meter.dm b/code/game/machinery/atmoalter/meter.dm index 8758bb4aa8d..c9a7c1cf6c2 100644 --- a/code/game/machinery/atmoalter/meter.dm +++ b/code/game/machinery/atmoalter/meter.dm @@ -85,7 +85,7 @@ user << status() -/obj/machinery/meter/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) +/obj/machinery/meter/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob, params) if (istype(W, /obj/item/weapon/wrench)) playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) user << "You begin to unfasten \the [src]..." diff --git a/code/game/machinery/atmoalter/portable_atmospherics.dm b/code/game/machinery/atmoalter/portable_atmospherics.dm index 3741c13b09e..b2dac4a8317 100644 --- a/code/game/machinery/atmoalter/portable_atmospherics.dm +++ b/code/game/machinery/atmoalter/portable_atmospherics.dm @@ -62,7 +62,7 @@ /obj/machinery/portable_atmospherics/portableConnectorReturnAir() return air_contents -/obj/machinery/portable_atmospherics/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) +/obj/machinery/portable_atmospherics/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob, params) if ((istype(W, /obj/item/weapon/tank) && !( src.destroyed ))) if (src.holding) return diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index 11194f2af2c..2b82a9e7b1f 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -89,7 +89,7 @@ return -/obj/machinery/autolathe/attackby(obj/item/O, mob/user) +/obj/machinery/autolathe/attackby(obj/item/O, mob/user, params) if (busy) user << "The autolathe is busy. Please wait for completion of previous operation." return 1 diff --git a/code/game/machinery/bots/bots.dm b/code/game/machinery/bots/bots.dm index 1253c55cd19..2dddc0aeb9f 100644 --- a/code/game/machinery/bots/bots.dm +++ b/code/game/machinery/bots/bots.dm @@ -238,7 +238,7 @@ return 1 //Successful completion. Used to prevent child process() continuing if this one is ended early. -/obj/machinery/bot/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/machinery/bot/attackby(obj/item/weapon/W as obj, mob/user as mob, params) if(istype(W, /obj/item/weapon/screwdriver)) if(!locked) open = !open diff --git a/code/game/machinery/bots/cleanbot.dm b/code/game/machinery/bots/cleanbot.dm index 17051973fc4..69ed1cd26df 100644 --- a/code/game/machinery/bots/cleanbot.dm +++ b/code/game/machinery/bots/cleanbot.dm @@ -115,7 +115,7 @@ text("[on ? "On" : "Off"]")) beacon_freq = freq updateUsrDialog() -/obj/machinery/bot/cleanbot/attackby(obj/item/weapon/W, mob/user as mob) +/obj/machinery/bot/cleanbot/attackby(obj/item/weapon/W, mob/user as mob, params) if (istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda)) if(allowed(user) && !open && !emagged) locked = !locked @@ -256,7 +256,7 @@ text("[on ? "On" : "Off"]")) qdel(src) return -/obj/item/weapon/bucket_sensor/attackby(var/obj/item/W, mob/user as mob) +/obj/item/weapon/bucket_sensor/attackby(var/obj/item/W, mob/user as mob, params) ..() if(istype(W, /obj/item/robot_parts/l_arm) || istype(W, /obj/item/robot_parts/r_arm)) user.drop_item() diff --git a/code/game/machinery/bots/ed209bot.dm b/code/game/machinery/bots/ed209bot.dm index 333cefdca0c..df69dc9c78b 100644 --- a/code/game/machinery/bots/ed209bot.dm +++ b/code/game/machinery/bots/ed209bot.dm @@ -169,7 +169,7 @@ Auto Patrol[]"}, declare_arrests = !declare_arrests updateUsrDialog() -/obj/machinery/bot/ed209/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/machinery/bot/ed209/attackby(obj/item/weapon/W as obj, mob/user as mob, params) if (istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda)) if (allowed(user) && !open && !emagged) locked = !locked @@ -541,7 +541,7 @@ Auto Patrol[]"}, -/obj/item/weapon/ed209_assembly/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/item/weapon/ed209_assembly/attackby(obj/item/weapon/W as obj, mob/user as mob, params) ..() if(istype(W, /obj/item/weapon/pen)) diff --git a/code/game/machinery/bots/floorbot.dm b/code/game/machinery/bots/floorbot.dm index c740b26f02f..a2112f53b2e 100644 --- a/code/game/machinery/bots/floorbot.dm +++ b/code/game/machinery/bots/floorbot.dm @@ -132,7 +132,7 @@ return -/obj/machinery/bot/floorbot/attackby(var/obj/item/W , mob/user as mob) +/obj/machinery/bot/floorbot/attackby(var/obj/item/W , mob/user as mob, params) if(istype(W, /obj/item/stack/tile/plasteel)) var/obj/item/stack/tile/plasteel/T = W if(amount >= 50) @@ -474,7 +474,7 @@ obj/machinery/bot/floorbot/process_scan(var/scan_target) return -/obj/item/weapon/storage/toolbox/mechanical/attackby(var/obj/item/stack/tile/plasteel/T, mob/user as mob) +/obj/item/weapon/storage/toolbox/mechanical/attackby(var/obj/item/stack/tile/plasteel/T, mob/user as mob, params) if(!istype(T, /obj/item/stack/tile/plasteel)) ..() return @@ -493,7 +493,7 @@ obj/machinery/bot/floorbot/process_scan(var/scan_target) user << "You need 10 floor tiles to start building a floorbot." return -/obj/item/weapon/toolbox_tiles/attackby(var/obj/item/W, mob/user as mob) +/obj/item/weapon/toolbox_tiles/attackby(var/obj/item/W, mob/user as mob, params) ..() if(isprox(W)) qdel(W) @@ -513,7 +513,7 @@ obj/machinery/bot/floorbot/process_scan(var/scan_target) created_name = t -/obj/item/weapon/toolbox_tiles_sensor/attackby(var/obj/item/W, mob/user as mob) +/obj/item/weapon/toolbox_tiles_sensor/attackby(var/obj/item/W, mob/user as mob, params) ..() if(istype(W, /obj/item/robot_parts/l_arm) || istype(W, /obj/item/robot_parts/r_arm)) qdel(W) diff --git a/code/game/machinery/bots/medbot.dm b/code/game/machinery/bots/medbot.dm index 1a54f03895d..2dafe5746f3 100644 --- a/code/game/machinery/bots/medbot.dm +++ b/code/game/machinery/bots/medbot.dm @@ -209,7 +209,7 @@ updateUsrDialog() return -/obj/machinery/bot/medbot/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/machinery/bot/medbot/attackby(obj/item/weapon/W as obj, mob/user as mob, params) if (istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda)) if (allowed(user) && !open && !emagged) locked = !locked @@ -535,7 +535,7 @@ * Medbot Assembly -- Can be made out of all three medkits. */ -/obj/item/weapon/storage/firstaid/attackby(var/obj/item/robot_parts/S, mob/user as mob) +/obj/item/weapon/storage/firstaid/attackby(var/obj/item/robot_parts/S, mob/user as mob, params) if ((!istype(S, /obj/item/robot_parts/l_arm)) && (!istype(S, /obj/item/robot_parts/r_arm))) ..() @@ -563,7 +563,7 @@ qdel(src) -/obj/item/weapon/firstaid_arm_assembly/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/item/weapon/firstaid_arm_assembly/attackby(obj/item/weapon/W as obj, mob/user as mob, params) ..() if(istype(W, /obj/item/weapon/pen)) var/t = stripped_input(user, "Enter new robot name", name, created_name,MAX_NAME_LEN) diff --git a/code/game/machinery/bots/mulebot.dm b/code/game/machinery/bots/mulebot.dm index 914046a5649..eb580f5795c 100644 --- a/code/game/machinery/bots/mulebot.dm +++ b/code/game/machinery/bots/mulebot.dm @@ -87,7 +87,7 @@ obj/machinery/bot/mulebot/bot_reset() // screwdriver: open/close hatch // cell: insert it // other: chance to knock rider off bot -/obj/machinery/bot/mulebot/attackby(var/obj/item/I, var/mob/user) +/obj/machinery/bot/mulebot/attackby(var/obj/item/I, var/mob/user, params) if(istype(I, /obj/item/weapon/card/id) || istype(I, /obj/item/device/pda)) if(toggle_lock(user)) user << "Controls [(locked ? "locked" : "unlocked")]." diff --git a/code/game/machinery/bots/secbot.dm b/code/game/machinery/bots/secbot.dm index 2c9838cf9d5..f5bd7dada47 100644 --- a/code/game/machinery/bots/secbot.dm +++ b/code/game/machinery/bots/secbot.dm @@ -155,7 +155,7 @@ Auto Patrol: []"}, updateUsrDialog() -/obj/machinery/bot/secbot/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/machinery/bot/secbot/attackby(obj/item/weapon/W as obj, mob/user as mob, params) if(istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda)) if(allowed(user) && !open && !emagged) locked = !locked @@ -386,7 +386,7 @@ Auto Patrol: []"}, //Secbot Construction -/obj/item/clothing/head/helmet/attackby(var/obj/item/device/assembly/signaler/S, mob/user as mob) +/obj/item/clothing/head/helmet/attackby(var/obj/item/device/assembly/signaler/S, mob/user as mob, params) ..() if(!issignaler(S)) ..() @@ -405,7 +405,7 @@ Auto Patrol: []"}, else return -/obj/item/weapon/secbot_assembly/attackby(obj/item/I, mob/user) +/obj/item/weapon/secbot_assembly/attackby(obj/item/I, mob/user, params) ..() if(istype(I, /obj/item/weapon/weldingtool)) if(!build_step) diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm index ca16ad5dbc3..8a8b1836eae 100644 --- a/code/game/machinery/camera/camera.dm +++ b/code/game/machinery/camera/camera.dm @@ -124,7 +124,7 @@ add_hiddenprint(user) deactivate(user,0) -/obj/machinery/camera/attackby(W as obj, mob/living/user as mob) +/obj/machinery/camera/attackby(W as obj, mob/living/user as mob, params) var/msg = "You attach [W] into the assembly inner circuits." var/msg2 = "The camera already has that upgrade!" diff --git a/code/game/machinery/camera/camera_assembly.dm b/code/game/machinery/camera/camera_assembly.dm index cdd9cda8520..5e36e6ff1af 100644 --- a/code/game/machinery/camera/camera_assembly.dm +++ b/code/game/machinery/camera/camera_assembly.dm @@ -22,7 +22,7 @@ 4 = Screwdriver panel closed and is fully built (you cannot attach upgrades) */ -/obj/item/weapon/camera_assembly/attackby(obj/item/W as obj, mob/living/user as mob) +/obj/item/weapon/camera_assembly/attackby(obj/item/W as obj, mob/living/user as mob, params) switch(state) diff --git a/code/game/machinery/cell_charger.dm b/code/game/machinery/cell_charger.dm index 543516c36a7..59731eaa01b 100644 --- a/code/game/machinery/cell_charger.dm +++ b/code/game/machinery/cell_charger.dm @@ -32,7 +32,7 @@ if(charging) user << "Current charge: [round(charging.percent(), 1)]%" -/obj/machinery/cell_charger/attackby(obj/item/weapon/W, mob/user) +/obj/machinery/cell_charger/attackby(obj/item/weapon/W, mob/user, params) if(stat & BROKEN) return diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index 6c1586348e8..ab45982bb34 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -242,7 +242,7 @@ return //Let's unlock this early I guess. Might be too early, needs tweaking. -/obj/machinery/clonepod/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/machinery/clonepod/attackby(obj/item/weapon/W as obj, mob/user as mob, params) if(!(occupant || mess || locked)) if(default_deconstruction_screwdriver(user, "[icon_state]_maintenance", "[initial(icon_state)]",W)) return diff --git a/code/game/machinery/computer/HolodeckControl.dm b/code/game/machinery/computer/HolodeckControl.dm index 601bde71545..c96493032e7 100644 --- a/code/game/machinery/computer/HolodeckControl.dm +++ b/code/game/machinery/computer/HolodeckControl.dm @@ -275,7 +275,7 @@ icon_state = "floor" thermal_conductivity = 0 -/turf/simulated/floor/holofloor/attackby(obj/item/weapon/W as obj, mob/user as mob) +/turf/simulated/floor/holofloor/attackby(obj/item/weapon/W as obj, mob/user as mob, params) return // HOLOFLOOR DOES NOT GIVE A FUCK @@ -284,7 +284,7 @@ gender = PLURAL name = "lush grass" -/turf/simulated/floor/fancy/grass/holo/attackby(obj/item/weapon/W as obj, mob/user as mob) +/turf/simulated/floor/fancy/grass/holo/attackby(obj/item/weapon/W as obj, mob/user as mob, params) return // HOLOGRASS DOES NOT GIVE A FUCK @@ -304,7 +304,7 @@ return // HOLOTABLE DOES NOT GIVE A FUCK -/obj/structure/table/holotable/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/structure/table/holotable/attackby(obj/item/weapon/W as obj, mob/user as mob, params) if (istype(W, /obj/item/weapon/grab) && get_dist(src,user)<2) var/obj/item/weapon/grab/G = W if(G.state < GRAB_AGGRESSIVE) @@ -423,7 +423,7 @@ density = 1 throwpass = 1 -/obj/structure/holohoop/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/structure/holohoop/attackby(obj/item/weapon/W as obj, mob/user as mob, params) if (istype(W, /obj/item/weapon/grab) && get_dist(src,user)<2) var/obj/item/weapon/grab/G = W if(G.state < GRAB_AGGRESSIVE) @@ -481,7 +481,7 @@ ..() -/obj/machinery/readybutton/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/machinery/readybutton/attackby(obj/item/weapon/W as obj, mob/user as mob, params) user << "The device is a solid button, there's nothing you can do with it!" /obj/machinery/readybutton/attack_hand(mob/user as mob) diff --git a/code/game/machinery/computer/ai_core.dm b/code/game/machinery/computer/ai_core.dm index 8cd861754a4..d3b042a86b4 100644 --- a/code/game/machinery/computer/ai_core.dm +++ b/code/game/machinery/computer/ai_core.dm @@ -10,7 +10,7 @@ var/obj/item/device/mmi/brain = null -/obj/structure/AIcore/attackby(obj/item/P as obj, mob/user as mob) +/obj/structure/AIcore/attackby(obj/item/P as obj, mob/user as mob, params) switch(state) if(0) if(istype(P, /obj/item/weapon/wrench)) @@ -188,7 +188,7 @@ anchored = 1 state = 20//So it doesn't interact based on the above. Not really necessary. -/obj/structure/AIcore/deactivated/attackby(var/obj/item/A as obj, var/mob/user as mob) +/obj/structure/AIcore/deactivated/attackby(var/obj/item/A as obj, var/mob/user as mob, params) if(istype(A, /obj/item/device/aicard))//Is it? A.transfer_ai("INACTIVE","AICARD",src,user) if(istype(A, /obj/item/weapon/wrench)) diff --git a/code/game/machinery/computer/aifixer.dm b/code/game/machinery/computer/aifixer.dm index 44943554a88..35d84985fbf 100644 --- a/code/game/machinery/computer/aifixer.dm +++ b/code/game/machinery/computer/aifixer.dm @@ -13,7 +13,7 @@ ..() -/obj/machinery/computer/aifixer/attackby(I as obj, user as mob) +/obj/machinery/computer/aifixer/attackby(I as obj, user as mob, params) if(occupier && istype(I, /obj/item/weapon/screwdriver)) if(stat & (NOPOWER|BROKEN)) user << "The screws on [name]'s screen won't budge." diff --git a/code/game/machinery/computer/atmos_alert.dm b/code/game/machinery/computer/atmos_alert.dm index c7622c6344b..672624b5316 100644 --- a/code/game/machinery/computer/atmos_alert.dm +++ b/code/game/machinery/computer/atmos_alert.dm @@ -61,11 +61,13 @@ src.updateDialog() /obj/machinery/computer/atmos_alert/update_icon() + SetLuminosity(brightness_on) if(stat & BROKEN) icon_state = "alert:b" return else if (stat & NOPOWER) icon_state = "alert:O" + SetLuminosity(0) return else if(priority_alarms.len) icon_state = "alert:2" diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm index b74a49d5d28..0250b8575d7 100644 --- a/code/game/machinery/computer/buildandrepair.dm +++ b/code/game/machinery/computer/buildandrepair.dm @@ -242,7 +242,7 @@ origin_tech = "programming=1" -/obj/item/weapon/circuitboard/supplycomp/attackby(obj/item/I as obj, mob/user as mob) +/obj/item/weapon/circuitboard/supplycomp/attackby(obj/item/I as obj, mob/user as mob, params) if(istype(I,/obj/item/device/multitool)) var/catastasis = src.contraband_enabled var/opposite_catastasis @@ -264,7 +264,7 @@ user << "DERP! BUG! Report this (And what you were doing to cause it) to Agouri" return -/obj/item/weapon/circuitboard/rdconsole/attackby(obj/item/I as obj, mob/user as mob) +/obj/item/weapon/circuitboard/rdconsole/attackby(obj/item/I as obj, mob/user as mob, params) if(istype(I,/obj/item/weapon/screwdriver)) if(build_path == /obj/machinery/computer/rdconsole/core) name = "circuit board (RD Console - Robotics)" @@ -276,7 +276,7 @@ user << "Defaulting access protocols." return -/obj/item/weapon/circuitboard/libraryconsole/attackby(obj/item/I as obj, mob/user as mob) +/obj/item/weapon/circuitboard/libraryconsole/attackby(obj/item/I as obj, mob/user as mob, params) if(istype(I,/obj/item/weapon/screwdriver)) if(build_path == /obj/machinery/computer/libraryconsole/bookmanagement) name = "circuit board (Library Visitor Console)" @@ -288,7 +288,7 @@ user << "Access protocols successfully updated." return -/obj/item/weapon/circuitboard/shuttle/attackby(obj/item/I as obj, mob/user as mob) +/obj/item/weapon/circuitboard/shuttle/attackby(obj/item/I as obj, mob/user as mob, params) if(istype(I, /obj/item/device/multitool)) var/chosen_id = round(input(usr, "Choose an ID number (-1 for reset):", "Input an Integer", null) as num|null) if(chosen_id >= 0) @@ -297,7 +297,7 @@ shuttleId = initial(shuttleId) return -/obj/structure/computerframe/attackby(obj/item/P as obj, mob/user as mob) +/obj/structure/computerframe/attackby(obj/item/P as obj, mob/user as mob, params) add_fingerprint(user) switch(state) if(0) diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm index 1e138514af6..4165bc0003a 100644 --- a/code/game/machinery/computer/camera.dm +++ b/code/game/machinery/computer/camera.dm @@ -94,6 +94,7 @@ /obj/machinery/computer/security/telescreen/update_icon() icon_state = initial(icon_state) + SetLuminosity(brightness_on) if(stat & BROKEN) icon_state += "b" return diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm index f8dd1fc0ddd..acc6cccc4db 100644 --- a/code/game/machinery/computer/card.dm +++ b/code/game/machinery/computer/card.dm @@ -42,7 +42,7 @@ var/time_last_changed_position = 0 //Assoc array: "JobName" = (int)
"}, updateUsrDialog() -/obj/machinery/porta_turret_cover/attackby(obj/item/I, mob/user) +/obj/machinery/porta_turret_cover/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/weapon/wrench) && !Parent_Turret.on) if(Parent_Turret.raised) return @@ -1041,7 +1041,7 @@ Status: []
"}, //don't have to check if control_area is path, since get_area_all_atoms can take path. return -/obj/machinery/turretid/attackby(obj/item/weapon/W, mob/user) +/obj/machinery/turretid/attackby(obj/item/weapon/W, mob/user, params) if(stat & BROKEN) return if (istype(user, /mob/living/silicon)) return src.attack_hand(user) diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm index cf92f21046f..44b12faf411 100644 --- a/code/game/machinery/recharger.dm +++ b/code/game/machinery/recharger.dm @@ -9,10 +9,10 @@ var/obj/item/weapon/charging = null -/obj/machinery/recharger/attackby(obj/item/weapon/G, mob/user) +/obj/machinery/recharger/attackby(obj/item/weapon/G, mob/user, params) if(istype(user,/mob/living/silicon)) return - if(istype(G, /obj/item/weapon/gun/energy) || istype(G, /obj/item/weapon/melee/baton)) + if(istype(G, /obj/item/weapon/gun/energy) || istype(G, /obj/item/weapon/melee/baton) || istype(G, /obj/item/weapon/pickaxe/drill)) if(charging) return @@ -87,6 +87,16 @@ icon_state = "recharger2" else icon_state = "recharger3" + if(istype(charging, /obj/item/weapon/pickaxe/drill)) + var/obj/item/weapon/pickaxe/drill/D = charging + if(D.bcell) + if(D.bcell.give(D.bcell.chargerate)) + icon_state = "recharger1" + use_power(200) + else + icon_state = "recharger2" + else + icon_state = "recharger3" /obj/machinery/recharger/emp_act(severity) diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm index 0c572785c7e..7bc63ee4692 100644 --- a/code/game/machinery/rechargestation.dm +++ b/code/game/machinery/rechargestation.dm @@ -72,7 +72,7 @@ /obj/machinery/recharge_station/attack_ai(user as mob) return attack_hand(user) -/obj/machinery/recharge_station/attackby(obj/item/P as obj, mob/user as mob) +/obj/machinery/recharge_station/attackby(obj/item/P as obj, mob/user as mob, params) if(state_open) if(default_deconstruction_screwdriver(user, "borgdecon2", "borgcharger0", P)) return diff --git a/code/game/machinery/recycler.dm b/code/game/machinery/recycler.dm index c12e0534047..7c1751ff821 100644 --- a/code/game/machinery/recycler.dm +++ b/code/game/machinery/recycler.dm @@ -30,7 +30,7 @@ var/const/SAFETY_COOLDOWN = 100 update_icon() -/obj/machinery/recycler/attackby(var/obj/item/I, var/mob/user) +/obj/machinery/recycler/attackby(var/obj/item/I, var/mob/user, params) if(istype(I, /obj/item/weapon/screwdriver)) if(emagged) emagged = 0 diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm index 97d1777c00b..e357ff5cc1b 100644 --- a/code/game/machinery/requests_console.dm +++ b/code/game/machinery/requests_console.dm @@ -433,7 +433,7 @@ var/list/obj/machinery/requests_console/allConsoles = list() slip.name = "Message - [unlinkedsender]" src.luminosity = 2 -/obj/machinery/requests_console/attackby(var/obj/item/weapon/O as obj, var/mob/user as mob) +/obj/machinery/requests_console/attackby(var/obj/item/weapon/O as obj, var/mob/user as mob, params) if (istype(O, /obj/item/weapon/crowbar)) if(open) user << "You close the maintenance panel." diff --git a/code/game/machinery/robot_fabricator.dm b/code/game/machinery/robot_fabricator.dm index 8ab48a31a60..85c818f2fd8 100644 --- a/code/game/machinery/robot_fabricator.dm +++ b/code/game/machinery/robot_fabricator.dm @@ -11,7 +11,7 @@ idle_power_usage = 20 active_power_usage = 5000 -/obj/machinery/robotic_fabricator/attackby(var/obj/item/O as obj, var/mob/user as mob) +/obj/machinery/robotic_fabricator/attackby(var/obj/item/O as obj, var/mob/user as mob, params) if (istype(O, /obj/item/stack/sheet/metal)) if (src.metal_amount < 150000.0) var/count = 0 diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm index ec9bd835142..7f7a91b734a 100644 --- a/code/game/machinery/shieldgen.dm +++ b/code/game/machinery/shieldgen.dm @@ -33,7 +33,7 @@ /obj/machinery/shield/CanAtmosPass(var/turf/T) return !density -/obj/machinery/shield/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/machinery/shield/attackby(obj/item/weapon/W as obj, mob/user as mob, params) if(!istype(W)) return //Calculate damage @@ -231,7 +231,7 @@ user << "The device must first be secured to the floor." return -/obj/machinery/shieldgen/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/machinery/shieldgen/attackby(obj/item/weapon/W as obj, mob/user as mob, params) if(istype(W, /obj/item/weapon/screwdriver)) playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1) if(is_open) @@ -449,7 +449,7 @@ CF.dir = field_dir -/obj/machinery/shieldwallgen/attackby(obj/item/W, mob/user) +/obj/machinery/shieldwallgen/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/weapon/wrench)) if(active) user << "Turn off the field generator first." diff --git a/code/game/machinery/slotmachine.dm b/code/game/machinery/slotmachine.dm index 969a621e8de..0bc33615834 100644 --- a/code/game/machinery/slotmachine.dm +++ b/code/game/machinery/slotmachine.dm @@ -73,7 +73,7 @@ ..() update_icon() -/obj/machinery/computer/slot_machine/attackby(obj/item/I, mob/living/user) +/obj/machinery/computer/slot_machine/attackby(obj/item/I, mob/living/user, params) if(istype(I, /obj/item/weapon/coin)) var/obj/item/weapon/coin/C = I if(prob(2)) diff --git a/code/game/machinery/spaceheater.dm b/code/game/machinery/spaceheater.dm index 58d4ba0cf8f..223472818c6 100644 --- a/code/game/machinery/spaceheater.dm +++ b/code/game/machinery/spaceheater.dm @@ -44,7 +44,7 @@ cell.emp_act(severity) ..(severity) -/obj/machinery/space_heater/attackby(obj/item/I, mob/user) +/obj/machinery/space_heater/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/weapon/stock_parts/cell)) if(open) if(cell) diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index 16aac4c25cb..5e0c8bc7990 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -54,7 +54,11 @@ /obj/machinery/suit_storage_unit/security SUIT_TYPE = /obj/item/clothing/suit/space/hardsuit/security - MASK_TYPE = /obj/item/clothing/mask/gas + MASK_TYPE = /obj/item/clothing/mask/gas/sechailer + +/obj/machinery/suit_storage_unit/hos + SUIT_TYPE = /obj/item/clothing/suit/space/hardsuit/security/hos + MASK_TYPE = /obj/item/clothing/mask/gas/sechailer /obj/machinery/suit_storage_unit/atmos SUIT_TYPE = /obj/item/clothing/suit/space/hardsuit/atmos @@ -504,7 +508,7 @@ return -/obj/machinery/suit_storage_unit/attackby(obj/item/I as obj, mob/user as mob) +/obj/machinery/suit_storage_unit/attackby(obj/item/I as obj, mob/user as mob, params) if(!src.ispowered) if(istype(I, /obj/item/weapon/crowbar) && !isopen) if(toggle_open(user)) diff --git a/code/game/machinery/syndicatebeacon.dm b/code/game/machinery/syndicatebeacon.dm index 1b3958fbcb3..85107a4deb7 100644 --- a/code/game/machinery/syndicatebeacon.dm +++ b/code/game/machinery/syndicatebeacon.dm @@ -154,7 +154,7 @@ return -/obj/machinery/power/singularity_beacon/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/machinery/power/singularity_beacon/attackby(obj/item/weapon/W as obj, mob/user as mob, params) if(istype(W,/obj/item/weapon/screwdriver)) if(active) user << "You need to deactivate the beacon first!" diff --git a/code/game/machinery/syndicatebomb.dm b/code/game/machinery/syndicatebomb.dm index 9b04e98a683..18e6e16ebac 100644 --- a/code/game/machinery/syndicatebomb.dm +++ b/code/game/machinery/syndicatebomb.dm @@ -48,7 +48,7 @@ /obj/machinery/syndicatebomb/update_icon() icon_state = "[initial(icon_state)][active ? "-active" : "-inactive"][open_panel ? "-wires" : ""]" -/obj/machinery/syndicatebomb/attackby(var/obj/item/I, var/mob/user) +/obj/machinery/syndicatebomb/attackby(var/obj/item/I, var/mob/user, params) if(istype(I, /obj/item/weapon/wrench)) if(!anchored) if(!isturf(src.loc) || istype(src.loc, /turf/space)) diff --git a/code/game/machinery/telecomms/machine_interactions.dm b/code/game/machinery/telecomms/machine_interactions.dm index 843430a8201..f1dd4b2acb2 100644 --- a/code/game/machinery/telecomms/machine_interactions.dm +++ b/code/game/machinery/telecomms/machine_interactions.dm @@ -15,7 +15,7 @@ var/construct_op = 0 -/obj/machinery/telecomms/attackby(obj/item/P as obj, mob/user as mob) +/obj/machinery/telecomms/attackby(obj/item/P as obj, mob/user as mob, params) // Using a multitool lets you access the receiver's interface if(istype(P, /obj/item/device/multitool)) diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm index ac36d0c03ce..e04ae94a755 100644 --- a/code/game/machinery/teleporter.dm +++ b/code/game/machinery/teleporter.dm @@ -29,7 +29,7 @@ break return power_station -/obj/machinery/computer/teleporter/attackby(I as obj, mob/living/user as mob) +/obj/machinery/computer/teleporter/attackby(I as obj, mob/living/user as mob, params) if(istype(I, /obj/item/device/gps)) var/obj/item/device/gps/L = I if(L.locked_location && !(stat & (NOPOWER|BROKEN))) @@ -279,7 +279,7 @@ use_power(5000) return -/obj/machinery/teleport/hub/attackby(obj/item/W, mob/user) +/obj/machinery/teleport/hub/attackby(obj/item/W, mob/user, params) if(default_deconstruction_screwdriver(user, "tele-o", "tele0", W)) return @@ -375,7 +375,7 @@ teleporter_hub.update_icon() ..() -/obj/machinery/teleport/station/attackby(var/obj/item/weapon/W, mob/user) +/obj/machinery/teleport/station/attackby(var/obj/item/weapon/W, mob/user, params) if(istype(W, /obj/item/device/multitool) && !panel_open) var/obj/item/device/multitool/M = W if(M.buffer && istype(M.buffer, /obj/machinery/teleport/station) && M.buffer != src) diff --git a/code/game/machinery/turrets.dm b/code/game/machinery/turrets.dm index 30e11d25386..590501e4cf0 100644 --- a/code/game/machinery/turrets.dm +++ b/code/game/machinery/turrets.dm @@ -273,7 +273,7 @@ src.die() return -/obj/machinery/turret/attackby(obj/item/weapon/W, mob/user)//I can't believe no one added this before/N +/obj/machinery/turret/attackby(obj/item/weapon/W, mob/user, params)//I can't believe no one added this before/N ..() user.changeNext_move(CLICK_CD_MELEE) playsound(src.loc, 'sound/weapons/smash.ogg', 60, 1) @@ -527,7 +527,7 @@ //don't have to check if control_area is path, since get_area_all_atoms can take path. return -/obj/machinery/areaturretid/attackby(obj/item/weapon/W, mob/user) +/obj/machinery/areaturretid/attackby(obj/item/weapon/W, mob/user, params) if(stat & BROKEN) return if (istype(user, /mob/living/silicon)) return src.attack_hand(user) diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 824b74292bf..38fe88157a0 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -147,7 +147,7 @@ total += restock return total -/obj/machinery/vending/snack/attackby(obj/item/weapon/W, mob/user) +/obj/machinery/vending/snack/attackby(obj/item/weapon/W, mob/user, params) if(istype(W, /obj/item/weapon/reagent_containers/food/snacks)) if(!compartment_access_check(user)) return @@ -212,7 +212,7 @@ dish_quants[S.name] = 1 sortList(dish_quants) -/obj/machinery/vending/attackby(obj/item/weapon/W, mob/user) +/obj/machinery/vending/attackby(obj/item/weapon/W, mob/user, params) if(panel_open) if(default_unfasten_wrench(user, W, time = 60)) return @@ -765,13 +765,10 @@ icon_deny = "med-deny" product_ads = "Go save some lives!;The best stuff for your medbay.;Only the finest tools.;Natural chemicals!;This stuff saves lives.;Don't you want some?;Ping!" req_access_txt = "5" - products = list(/obj/item/weapon/reagent_containers/syringe = 12,/obj/item/stack/medical/gauze = 8,/obj/item/weapon/reagent_containers/pill/patch/styptic = 10, - /obj/item/weapon/reagent_containers/pill/patch/silver_sulf = 10,/obj/item/weapon/reagent_containers/glass/bottle/charcoal = 4, + products = list(/obj/item/weapon/reagent_containers/syringe = 12,/obj/item/stack/medical/gauze = 8,/obj/item/weapon/reagent_containers/pill/patch/styptic = 5, /obj/item/weapon/reagent_containers/pill/insulin = 10, + /obj/item/weapon/reagent_containers/pill/patch/silver_sulf = 5,/obj/item/weapon/reagent_containers/glass/bottle/charcoal = 4, /obj/item/weapon/reagent_containers/glass/bottle/epinephrine = 4,/obj/item/weapon/reagent_containers/glass/bottle/morphine = 4, - /obj/item/weapon/reagent_containers/glass/bottle/diphenhydramine = 4,/obj/item/weapon/reagent_containers/glass/bottle/potass_iodide = 3, - /obj/item/weapon/reagent_containers/glass/bottle/salglu_solution = 5,/obj/item/weapon/reagent_containers/glass/bottle/atropine = 3,/obj/item/weapon/reagent_containers/syringe/antiviral = 6, - /obj/item/weapon/reagent_containers/syringe/calomel = 10,/obj/item/weapon/reagent_containers/pill/salbutamol = 10,/obj/item/weapon/reagent_containers/pill/mannitol = 10, - /obj/item/weapon/reagent_containers/pill/mutadone = 5,/obj/item/device/healthanalyzer = 4, /obj/item/device/sensor_device = 2,/obj/item/weapon/reagent_containers/glass/bottle/toxin = 3) + /obj/item/weapon/reagent_containers/glass/bottle/toxin = 3,/obj/item/weapon/reagent_containers/syringe/antiviral = 6,/obj/item/weapon/reagent_containers/pill/salbutamol = 2,/obj/item/device/healthanalyzer = 4, /obj/item/device/sensor_device = 2) contraband = list(/obj/item/weapon/reagent_containers/pill/tox = 3,/obj/item/weapon/reagent_containers/pill/morphine = 4,/obj/item/weapon/reagent_containers/pill/charcoal = 6) diff --git a/code/game/machinery/washing_machine.dm b/code/game/machinery/washing_machine.dm index cc5b028658b..2079cf376e7 100644 --- a/code/game/machinery/washing_machine.dm +++ b/code/game/machinery/washing_machine.dm @@ -178,7 +178,7 @@ /obj/machinery/washing_machine/update_icon() icon_state = "wm_[state][panel]" -/obj/machinery/washing_machine/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/machinery/washing_machine/attackby(obj/item/weapon/W as obj, mob/user as mob, params) /*if(istype(W,/obj/item/weapon/screwdriver)) panel = !panel user << "\blue you [panel ? "open" : "close"] the [src]'s maintenance panel"*/ diff --git a/code/game/mecha/equipment/tools/tools.dm b/code/game/mecha/equipment/tools/tools.dm index 88f4c35a6f3..ac3841fcae2 100644 --- a/code/game/mecha/equipment/tools/tools.dm +++ b/code/game/mecha/equipment/tools/tools.dm @@ -1050,7 +1050,7 @@ return 0 return -/obj/item/mecha_parts/mecha_equipment/generator/attackby(weapon,mob/user) +/obj/item/mecha_parts/mecha_equipment/generator/attackby(weapon,mob/user, params) var/result = load_fuel(weapon) if(isnull(result)) user.visible_message("[user] tries to shove [weapon] into [src]. What a dumb-ass.","[fuel] traces minimal. [weapon] cannot be used as fuel.") diff --git a/code/game/mecha/mech_bay.dm b/code/game/mecha/mech_bay.dm index 4474df3f7c7..08f454d379a 100644 --- a/code/game/mecha/mech_bay.dm +++ b/code/game/mecha/mech_bay.dm @@ -65,7 +65,7 @@ recharge_console.update_icon() -/obj/machinery/mech_bay_recharge_port/attackby(obj/item/I, mob/user) +/obj/machinery/mech_bay_recharge_port/attackby(obj/item/I, mob/user, params) if(default_deconstruction_screwdriver(user, "recharge_port-o", "recharge_port", I)) return diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm index 6d47aaf0a74..4b4f714f6dd 100644 --- a/code/game/mecha/mech_fabricator.dm +++ b/code/game/mecha/mech_fabricator.dm @@ -486,7 +486,7 @@ return result -/obj/machinery/mecha_part_fabricator/attackby(obj/W as obj, mob/user as mob) +/obj/machinery/mecha_part_fabricator/attackby(obj/W as obj, mob/user as mob, params) if(default_deconstruction_screwdriver(user, "fab-o", "fab-idle", W)) return diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 616cfbe650c..3594f1d0e4a 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -662,7 +662,7 @@ obj/mecha/proc/can_use(mob/user) ////// AttackBy ////// ////////////////////// -/obj/mecha/attackby(obj/item/W as obj, mob/user as mob) +/obj/mecha/attackby(obj/item/W as obj, mob/user as mob, params) if(istype(W, /obj/item/device/mmi)) if(mmi_move_inside(W,user)) diff --git a/code/game/mecha/mecha_parts.dm b/code/game/mecha/mecha_parts.dm index 90879bad7f7..0e6d689b85f 100644 --- a/code/game/mecha/mecha_parts.dm +++ b/code/game/mecha/mecha_parts.dm @@ -15,7 +15,7 @@ icon_state = "backbone" var/datum/construction/construct -/obj/item/mecha_parts/chassis/attackby(obj/item/W as obj, mob/user as mob) +/obj/item/mecha_parts/chassis/attackby(obj/item/W as obj, mob/user as mob, params) if(!construct || !construct.action(W, user)) ..() return diff --git a/code/game/mecha/mecha_wreckage.dm b/code/game/mecha/mecha_wreckage.dm index 6d929530ee6..feeb4b6c56e 100644 --- a/code/game/mecha/mecha_wreckage.dm +++ b/code/game/mecha/mecha_wreckage.dm @@ -15,7 +15,7 @@ var/list/crowbar_salvage = list() var/salvage_num = 5 -/obj/structure/mecha_wreckage/attackby(obj/item/I, mob/user) +/obj/structure/mecha_wreckage/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/weapon/weldingtool)) if(salvage_num <= 0) user << "You don't see anything that can be cut with [I]." diff --git a/code/game/objects/buckling.dm b/code/game/objects/buckling.dm index c8dca0a0e5a..381eeb06196 100644 --- a/code/game/objects/buckling.dm +++ b/code/game/objects/buckling.dm @@ -34,6 +34,9 @@ if(!can_buckle || !istype(M) || (M.loc != loc) || M.buckled || (buckle_requires_restraints && !M.restrained())) return 0 + if (istype(M, /mob/living/carbon/slime) || istype(M, /mob/living/simple_animal/slime)) + return 0 + M.buckled = src M.dir = dir buckled_mob = M diff --git a/code/game/objects/effects/aliens.dm b/code/game/objects/effects/aliens.dm index c3c97749174..1bafea2ff6d 100644 --- a/code/game/objects/effects/aliens.dm +++ b/code/game/objects/effects/aliens.dm @@ -132,7 +132,7 @@ healthcheck() -/obj/structure/alien/resin/attackby(obj/item/I, mob/living/user) +/obj/structure/alien/resin/attackby(obj/item/I, mob/living/user, params) user.changeNext_move(CLICK_CD_MELEE) health -= I.force playsound(loc, 'sound/effects/attackblob.ogg', 100, 1) @@ -213,7 +213,7 @@ qdel(src) -/obj/structure/alien/weeds/attackby(obj/item/I, mob/user) +/obj/structure/alien/weeds/attackby(obj/item/I, mob/user, params) user.changeNext_move(CLICK_CD_MELEE) if(I.attack_verb.len) visible_message("[user] has [pick(I.attack_verb)] [src] with [I]!") @@ -369,7 +369,7 @@ healthcheck() -/obj/structure/alien/egg/attackby(obj/item/I, mob/user) +/obj/structure/alien/egg/attackby(obj/item/I, mob/user, params) if(I.attack_verb.len) visible_message("[user] has [pick(I.attack_verb)] [src] with [I]!") else diff --git a/code/game/objects/effects/anomalies.dm b/code/game/objects/effects/anomalies.dm index 70ebc8bc021..5636d376136 100644 --- a/code/game/objects/effects/anomalies.dm +++ b/code/game/objects/effects/anomalies.dm @@ -35,7 +35,7 @@ qdel(src) -/obj/effect/anomaly/attackby(obj/item/I, mob/user) +/obj/effect/anomaly/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/device/analyzer)) user << "Analyzing... [src]'s unstable field is fluctuating along frequency [aSignal.code]:[format_frequency(aSignal.frequency)]." diff --git a/code/game/objects/effects/decals/contraband.dm b/code/game/objects/effects/decals/contraband.dm index 6d60db1b4cd..e7cff56a202 100644 --- a/code/game/objects/effects/decals/contraband.dm +++ b/code/game/objects/effects/decals/contraband.dm @@ -296,7 +296,7 @@ obj/structure/sign/poster/New(serial,subtype) desc += " This is a bug, please report the circumstances under which you encountered this poster at https://github.com/NTStation/NTstation13/issues." ..() -obj/structure/sign/poster/attackby(obj/item/I, mob/user) +obj/structure/sign/poster/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/weapon/wirecutters)) playsound(loc, 'sound/items/Wirecutter.ogg', 100, 1) if(ruined) diff --git a/code/game/objects/effects/effect_system/effects_foam.dm b/code/game/objects/effects/effect_system/effects_foam.dm index b5f2e0abbab..d00614174e9 100644 --- a/code/game/objects/effects/effect_system/effects_foam.dm +++ b/code/game/objects/effects/effect_system/effects_foam.dm @@ -225,7 +225,7 @@ user << "You hit the metal foam but bounce off it." -/obj/structure/foamedmetal/attackby(var/obj/item/I, var/mob/user) +/obj/structure/foamedmetal/attackby(var/obj/item/I, var/mob/user, params) if (istype(I, /obj/item/weapon/grab)) var/obj/item/weapon/grab/G = I G.affecting.loc = src.loc diff --git a/code/game/objects/effects/glowshroom.dm b/code/game/objects/effects/glowshroom.dm index f2ff3511e2c..02712530739 100644 --- a/code/game/objects/effects/glowshroom.dm +++ b/code/game/objects/effects/glowshroom.dm @@ -112,7 +112,7 @@ floor = 1 return 1 -/obj/effect/glowshroom/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/effect/glowshroom/attackby(obj/item/weapon/W as obj, mob/user as mob, params) ..() endurance -= W.force CheckEndurance() diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm index 538e98cb003..aa9c969d34f 100644 --- a/code/game/objects/effects/spawners/lootdrop.dm +++ b/code/game/objects/effects/spawners/lootdrop.dm @@ -116,5 +116,8 @@ /obj/item/weapon/wirecutters = 1, /obj/item/weapon/wrench = 4, /obj/item/weapon/relic = 3, + /obj/item/weapon/reagent_containers/food/drinks/muriatic_acid = 3, + /obj/item/weapon/reagent_containers/food/drinks/caustic_soda = 3, + /obj/item/weapon/reagent_containers/food/drinks/hydrogen_chloride = 3, "" = 11 ) diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm index 4a4bd7ddb52..e68ef779d94 100644 --- a/code/game/objects/effects/spiders.dm +++ b/code/game/objects/effects/spiders.dm @@ -20,7 +20,7 @@ qdel(src) return -/obj/effect/spider/attackby(var/obj/item/weapon/W, var/mob/user) +/obj/effect/spider/attackby(var/obj/item/weapon/W, var/mob/user, params) if(W.attack_verb.len) visible_message("[user] has [pick(W.attack_verb)] \the [src] with \the [W]!") else diff --git a/code/game/objects/explosion.dm b/code/game/objects/explosion.dm index c91e0a1eb9a..3a68df046f1 100644 --- a/code/game/objects/explosion.dm +++ b/code/game/objects/explosion.dm @@ -88,6 +88,7 @@ proc/explosion(turf/epicenter, devastation_range, heavy_impact_range, light_impa var/dist = cheap_pythag(T.x - x0,T.y - y0) var/flame_dist = 0 + var/throw_dist = dist if(dist < flame_range) flame_dist = 1 @@ -97,7 +98,6 @@ proc/explosion(turf/epicenter, devastation_range, heavy_impact_range, light_impa else if(dist < light_impact_range) dist = 3 else dist = 0 - //------- TURF FIRES ------- if(T) @@ -106,6 +106,15 @@ proc/explosion(turf/epicenter, devastation_range, heavy_impact_range, light_impa if(dist > 0) T.ex_act(dist) + //--- THROW ITEMS AROUND --- + + var/throw_dir = get_dir(epicenter,T) + for(var/obj/item/I in T) + spawn(0) //Simultaneously not one at a time + var/throw_range = rand(throw_dist, max_range) + var/turf/throw_at = get_ranged_target_turf(I, throw_dir, throw_range) + I.throw_at(throw_at, throw_range,1) + var/took = (world.timeofday-start)/10 //You need to press the DebugGame verb to see these now....they were getting annoying and we've collected a fair bit of data. Just -test- changes to explosion code using this please so we can compare if(Debug2) world.log << "## DEBUG: Explosion([x0],[y0],[z0])(d[devastation_range],h[heavy_impact_range],l[light_impact_range]): Took [took] seconds." diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index d8998295710..cf8461e8b75 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -47,6 +47,11 @@ var/suittoggled = 0 var/hooded = 0 + //So items can have custom embedd values + var/embed_chance = EMBED_CHANCE + var/embedded_fall_chance = EMBEDDED_ITEM_FALLOUT + var/embedded_pain_chance = EMBEDDED_PAIN_CHANCE + var/list/can_be_placed_into = list( /obj/structure/table, /obj/structure/rack, @@ -191,7 +196,7 @@ // Due to storage type consolidation this should get used more now. // I have cleaned it up a little, but it could probably use more. -Sayu -/obj/item/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/item/attackby(obj/item/weapon/W as obj, mob/user as mob, params) if(istype(W,/obj/item/weapon/storage)) var/obj/item/weapon/storage/S = W if(S.use_to_pickup) @@ -408,3 +413,20 @@ armor[armour_value] = max(armor[armour_value]-acidpwr,0) if(!findtext(desc, "it looks slightly melted...")) //it looks slightly melted... it looks slightly melted... it looks slightly melted... etc. desc += " it looks slightly melted..." //needs a space at the start, formatting + + + +/obj/item/throw_impact(A) + if(istype(A, /mob/living/carbon/human)) + var/mob/living/carbon/human/H = A + if(can_embed(src)) + if(prob(embed_chance)) + var/obj/item/organ/limb/L = pick(H.organs) + L.embedded_objects |= src + add_blood(H)//it embedded itself in you, of course it's bloody! + loc = H + L.take_damage(w_class*5) + H.visible_message("\the [name] embeds itself in [H]'s [L.getDisplayName()]!","\the [name] embeds itself in your [L.getDisplayName()]!") + return + + ..() diff --git a/code/game/objects/items/apc_frame.dm b/code/game/objects/items/apc_frame.dm index 0ad3469a5c6..af2552dded1 100644 --- a/code/game/objects/items/apc_frame.dm +++ b/code/game/objects/items/apc_frame.dm @@ -7,7 +7,7 @@ icon_state = "apc_frame" flags = CONDUCT -/obj/item/apc_frame/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/item/apc_frame/attackby(obj/item/weapon/W as obj, mob/user as mob, params) ..() if (istype(W, /obj/item/weapon/wrench)) new /obj/item/stack/sheet/metal( get_turf(src.loc), 2 ) diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm index 3308b7266c1..6450218c3d8 100644 --- a/code/game/objects/items/bodybag.dm +++ b/code/game/objects/items/bodybag.dm @@ -42,7 +42,7 @@ mob_storage_capacity = 2 -/obj/structure/closet/body_bag/attackby(obj/item/I, mob/user) +/obj/structure/closet/body_bag/attackby(obj/item/I, mob/user, params) if (istype(I, /obj/item/weapon/pen)) var/t = stripped_input(user, "What would you like the label to be?", name, null, 53) if(user.get_active_hand() != I) diff --git a/code/game/objects/items/candle.dm b/code/game/objects/items/candle.dm index 18b17f4dac2..5d63211a30d 100644 --- a/code/game/objects/items/candle.dm +++ b/code/game/objects/items/candle.dm @@ -23,7 +23,7 @@ icon_state = "candle[i][lit ? "_lit" : ""]" -/obj/item/candle/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/item/candle/attackby(obj/item/weapon/W as obj, mob/user as mob, params) ..() if(istype(W, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/WT = W diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index 7a00402078e..64b328c5877 100644 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -898,7 +898,7 @@ var/global/list/obj/item/device/pda/PDAs = list() return // access to status display signals -/obj/item/device/pda/attackby(obj/item/C as obj, mob/user as mob) +/obj/item/device/pda/attackby(obj/item/C as obj, mob/user as mob, params) ..() if(istype(C, /obj/item/weapon/cartridge) && !cartridge) cartridge = C diff --git a/code/game/objects/items/devices/camera_bug.dm b/code/game/objects/items/devices/camera_bug.dm index 655c568fc94..6d5c687803b 100644 --- a/code/game/objects/items/devices/camera_bug.dm +++ b/code/game/objects/items/devices/camera_bug.dm @@ -308,7 +308,7 @@ break src.updateSelfDialog() -/obj/item/device/camera_bug/attackby(var/obj/item/W as obj,var/mob/living/user as mob) +/obj/item/device/camera_bug/attackby(var/obj/item/W as obj,var/mob/living/user as mob, params) if(istype(W,/obj/item/weapon/screwdriver) && expansion) expansion.loc = get_turf(loc) user << "You unscrew [expansion]." diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index 54a87565e31..14409f8c738 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -259,6 +259,12 @@ obj/item/device/flashlight/lamp/bananalamp item_state = "torch" on_damage = 10 +/obj/item/device/flashlight/lantern + name = "lantern" + icon_state = "lantern" + desc = "A mining lantern." + brightness_on = 6 // luminosity when on + /obj/item/device/flashlight/slime gender = PLURAL diff --git a/code/game/objects/items/devices/laserpointer.dm b/code/game/objects/items/devices/laserpointer.dm index 83d29275a4e..fc6892d28aa 100644 --- a/code/game/objects/items/devices/laserpointer.dm +++ b/code/game/objects/items/devices/laserpointer.dm @@ -44,7 +44,7 @@ /obj/item/device/laser_pointer/attack(mob/living/M, mob/user) laser_act(M, user) -/obj/item/device/laser_pointer/attackby(obj/item/W, mob/user) +/obj/item/device/laser_pointer/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/weapon/stock_parts/micro_laser)) if(!diode) user.drop_item() diff --git a/code/game/objects/items/devices/lightreplacer.dm b/code/game/objects/items/devices/lightreplacer.dm index dbb1d9a4b29..d4f37fa97e5 100644 --- a/code/game/objects/items/devices/lightreplacer.dm +++ b/code/game/objects/items/devices/lightreplacer.dm @@ -70,7 +70,7 @@ ..() user << "It has [uses] light\s remaining." -/obj/item/device/lightreplacer/attackby(obj/item/W, mob/user) +/obj/item/device/lightreplacer/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/stack/sheet/glass)) var/obj/item/stack/sheet/glass/G = W diff --git a/code/game/objects/items/devices/megaphone.dm b/code/game/objects/items/devices/megaphone.dm new file mode 100644 index 00000000000..677d1f112d8 --- /dev/null +++ b/code/game/objects/items/devices/megaphone.dm @@ -0,0 +1,63 @@ +/obj/item/device/megaphone + name = "megaphone" + desc = "A device used to project your voice. Loudly." + icon_state = "megaphone" + item_state = "radio" + w_class = 2 + flags = FPRINT + siemens_coefficient = 1 + + var/spamcheck = 0 + var/emagged = 0 + var/insults = 0 + var/list/insultmsg = list("FUCK EVERYONE!", "DEATH TO LIZARDS!", "ALL SECURITY TO SHOOT ME ON SIGHT!", "I HAVE A BOMB!", "CAPTAIN IS A COMDOM!", "FOR THE SYNDICATE!", "VIVA!", "HONK!") + +/obj/item/device/megaphone/attack_self(mob/living/carbon/human/user as mob) + if(user.client) + if(user.client.prefs.muted & MUTE_IC) + src << "You cannot speak in IC (muted)." + return + if(!ishuman(user)) + user << "You don't know how to use this!" + return + if(user.can_speak()) + user << "You find yourself unable to speak at all." + return + if(spamcheck > world.time) + user << "\The [src] needs to recharge!" + return + + var/message = copytext(sanitize(input(user, "Shout a message?", "Megaphone", null) as text),1,MAX_MESSAGE_LEN) + if(!message) + return + message = capitalize(message) + if ((src.loc == user && user.stat == 0)) + if(emagged) + if(insults) + user.audible_message("[user] broadcasts, \"[pick(insultmsg)]\"", null, 1) // 2 stands for hearable message + insults-- + else + user << "*BZZZZzzzzzt*" + else + user.audible_message("[user] broadcasts, \"[message]\"", null, 1) // 2 stands for hearable message + + playsound(loc, 'sound/items/megaphone.ogg', 100, 0, 1) + spamcheck = world.time + 50 + return + +/obj/item/device/megaphone/emag_act(mob/user) + user << "You overload \the [src]'s voice synthesizer." + emagged = 1 + insults = rand(1, 3) //to prevent dickflooding + +/obj/item/device/megaphone/sec + name = "security megaphone" + icon_state = "megaphone-sec" + +/obj/item/device/megaphone/command + name = "command megaphone" + icon_state = "megaphone-command" + +/obj/item/device/megaphone/cargo + name = "supply megaphone" + icon_state = "megaphone-cargo" \ No newline at end of file diff --git a/code/game/objects/items/devices/powersink.dm b/code/game/objects/items/devices/powersink.dm index 39d714ccc7e..746dfaea182 100644 --- a/code/game/objects/items/devices/powersink.dm +++ b/code/game/objects/items/devices/powersink.dm @@ -54,7 +54,7 @@ update_icon() SetLuminosity(0) -/obj/item/device/powersink/attackby(var/obj/item/I, var/mob/user) +/obj/item/device/powersink/attackby(var/obj/item/I, var/mob/user, params) if(istype(I, /obj/item/weapon/screwdriver)) if(mode == DISCONNECTED) var/turf/T = loc diff --git a/code/game/objects/items/devices/radio/electropack.dm b/code/game/objects/items/devices/radio/electropack.dm index 00554448925..06922665771 100644 --- a/code/game/objects/items/devices/radio/electropack.dm +++ b/code/game/objects/items/devices/radio/electropack.dm @@ -31,7 +31,7 @@ return ..() -/obj/item/device/electropack/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/item/device/electropack/attackby(obj/item/weapon/W as obj, mob/user as mob, params) ..() if(istype(W, /obj/item/clothing/head/helmet)) var/obj/item/assembly/shock_kit/A = new /obj/item/assembly/shock_kit( user ) diff --git a/code/game/objects/items/devices/radio/encryptionkey.dm b/code/game/objects/items/devices/radio/encryptionkey.dm index 4ff44ecbb84..ceec8b34cf9 100644 --- a/code/game/objects/items/devices/radio/encryptionkey.dm +++ b/code/game/objects/items/devices/radio/encryptionkey.dm @@ -13,7 +13,7 @@ /obj/item/device/encryptionkey/New() -/obj/item/device/encryptionkey/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/item/device/encryptionkey/attackby(obj/item/weapon/W as obj, mob/user as mob, params) /obj/item/device/encryptionkey/syndicate icon_state = "cypherkey" diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index 6c0de160e24..a008a70b8bb 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -200,7 +200,7 @@ /obj/item/device/radio/headset/ai/receive_range(freq, level) return ..(freq, level, 1) -/obj/item/device/radio/headset/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/item/device/radio/headset/attackby(obj/item/weapon/W as obj, mob/user as mob, params) // ..() user.set_machine(src) if (!( istype(W, /obj/item/weapon/screwdriver) || (istype(W, /obj/item/device/encryptionkey/ )))) diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index cb8854cc0e1..8b038de7814 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -488,7 +488,7 @@ else user << "[name] can not be modified or attached." -/obj/item/device/radio/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/item/device/radio/attackby(obj/item/weapon/W as obj, mob/user as mob, params) ..() user.set_machine(src) if (!( istype(W, /obj/item/weapon/screwdriver) )) @@ -536,7 +536,7 @@ ..() set_frequency(SYND_FREQ) -/obj/item/device/radio/borg/attackby(obj/item/weapon/W as obj, mob/user as mob) +/obj/item/device/radio/borg/attackby(obj/item/weapon/W as obj, mob/user as mob, params) // ..() user.set_machine(src) if (!( istype(W, /obj/item/weapon/screwdriver) || (istype(W, /obj/item/device/encryptionkey/ )))) diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index 3ad34a32c39..9a413dc59b4 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -75,8 +75,17 @@ MASS SPECTROMETER throw_range = 7 m_amt = 200 origin_tech = "magnets=1;biotech=1" - var/mode = 1; + var/mode = 1 + var/scanchems = 0 +/obj/item/device/healthanalyzer/attack_self(mob/user) + if(!scanchems) + user << "You switch the health analyzer to scan chemical contents." + scanchems = 1 + else + user << "You switch the health analyzer to check physical health." + scanchems = 0 + return /obj/item/device/healthanalyzer/attack(mob/living/M as mob, mob/living/carbon/human/user as mob) // Clumsiness/brain damage check @@ -92,7 +101,10 @@ MASS SPECTROMETER user.visible_message("[user] has analyzed [M]'s vitals.") - healthscan(user, M, mode) + if(!scanchems) + healthscan(user, M, mode) + else + chemscan(user, M) src.add_fingerprint(user) return @@ -177,6 +189,22 @@ MASS SPECTROMETER else user.show_message("Blood Level Normal: [blood_percent]% [blood_volume]cl. Type: [blood_type]") +/proc/chemscan(var/mob/living/user, var/mob/living/M) + if(ishuman(M)) + var/mob/living/carbon/human/H = M + if(H.reagents) + if(H.reagents.reagent_list.len) + user.show_message("Subject contains the following reagents:") + for(var/datum/reagent/R in H.reagents.reagent_list) + user.show_message("[R.volume]u of [R.name][R.overdosed == 1 ? " - OVERDOSING" : ".
" //ADMINVERBS -/client/proc/investigate_show( subject in list("hrefs","notes","ntsl","singulo","wires","telesci", "gravity", "records", "cargo", "supermatter", "atmos") ) +/client/proc/investigate_show( subject in list("hrefs","notes","ntsl","singulo","wires","telesci", "gravity", "records", "cargo", "supermatter", "atmos", "experimentor") ) set name = "Investigate" set category = "Admin" if(!holder) return diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index fd99c379543..4a374790b41 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -510,7 +510,7 @@ //Supply (Brown) counter = 0 jobs += "
| Supply Positions | ||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Supply Positions | ||||||||||||
| Back: | [(back && !(back.flags&ABSTRACT)) ? back : "Empty"]" - if(has_breathable_mask && istype(back, /obj/item/weapon/tank/internals)) + if(has_breathable_mask && istype(back, /obj/item/weapon/tank)) dat += " [internal ? "Disable Internals" : "Set Internals"]" dat += " | |||||||||||
| Exosuit: | [(wear_suit && !(wear_suit.flags&ABSTRACT)) ? wear_suit : "Empty"] | |||||||||||
| ↳Suit Storage: | [(s_store && !(s_store.flags&ABSTRACT)) ? s_store : "Empty"]" - if(has_breathable_mask && istype(s_store, /obj/item/weapon/tank/internals)) + if(has_breathable_mask && istype(s_store, /obj/item/weapon/tank)) dat += " [internal ? "Disable Internals" : "Set Internals"]" dat += " | |||||||||||
| ↳Belt: | ||||||||||||
| ↳Belt: | [(belt && !(belt.flags&ABSTRACT)) ? belt : "Empty"]" - if(has_breathable_mask && istype(belt, /obj/item/weapon/tank/internals)) + if(has_breathable_mask && istype(belt, /obj/item/weapon/tank)) dat += " [internal ? "Disable Internals" : "Set Internals"]" dat += " | |||||||||||
| ↳Pockets: | [(l_store && !(l_store.flags&ABSTRACT)) ? "Left (Full)" : "Left (Empty)"]"
@@ -245,6 +245,23 @@
/mob/living/carbon/human/Topic(href, href_list)
if(usr.canUseTopic(src, BE_CLOSE, NO_DEXTERY))
+
+ if(href_list["embedded_object"])
+ var/obj/item/I = locate(href_list["embedded_object"])
+ var/obj/item/organ/limb/L = locate(href_list["embedded_limb"])
+ if(!I || !L || I.loc != src) //no item, no limb, or item is not in limb (the person atleast) anymore
+ return
+ var/time_taken = 30*I.w_class
+ usr.visible_message("[usr] attempts to remove [I] from their [L.getDisplayName()]!","You attempt to remove [I] from your [L.getDisplayName()], it will take [time_taken/10] seconds.")
+ if(do_after(usr, time_taken, needhand = 1))
+ L.embedded_objects -= I
+ L.take_damage(8*I.w_class)//It hurts to rip it out, get surgery you dingus.
+ I.loc = get_turf(src)
+ usr.put_in_hands(I)
+ usr.emote("scream")
+ usr.visible_message("[usr] successfully rips [I] out of their [L.getDisplayName()]!","You successfully remove [I] from your [L.getDisplayName()]!")
+ return
+
if(href_list["item"])
var/slot = text2num(href_list["item"])
if(slot in check_obscured_slots())
@@ -631,3 +648,66 @@
if(mob_negates_gravity())
return
..()
+
+
+
+/mob/living/carbon/human/help_shake_act(mob/living/carbon/human/M)
+ if(!istype(M))
+ return
+
+ var/mob/living/carbon/human/H = src
+
+ if(health >= 0)
+ if(src == M)
+ visible_message( \
+ "[src] examines \himself.", \
+ "You check yourself for injuries.")
+
+ for(var/obj/item/organ/limb/org in H.organs)
+ var/status = ""
+ var/brutedamage = org.brute_dam
+ var/burndamage = org.burn_dam
+ if(hallucination)
+ if(prob(30))
+ brutedamage += rand(30,40)
+ if(prob(30))
+ burndamage += rand(30,40)
+
+ if(brutedamage > 0)
+ status = "bruised"
+ if(brutedamage > 20)
+ status = "bleeding"
+ if(brutedamage > 40)
+ status = "mangled"
+ if(brutedamage > 0 && burndamage > 0)
+ status += " and "
+ if(burndamage > 40)
+ status += "peeling away"
+
+ else if(burndamage > 10)
+ status += "blistered"
+ else if(burndamage > 0)
+ status += "numb"
+ if(status == "")
+ status = "OK"
+ src << "\t [status == "OK" ? "\blue" : "\red"] My [org.getDisplayName()] is [status]."
+
+ for(var/obj/item/I in org.embedded_objects)
+ src << "\t \red There is \a [I] embedded in your [org.getDisplayName()]!"
+
+ if(H.blood_max)
+ src << "You are bleeding!"
+ if(staminaloss)
+ if(staminaloss > 30)
+ src << "You're completely exhausted."
+ else
+ src << "You feel fatigued."
+ if(dna && dna.species.id && dna.species.id == "skeleton" && !H.w_uniform && !H.wear_suit)
+ H.play_xylophone()
+ else
+ if(H.wear_suit)
+ H.wear_suit.add_fingerprint(M)
+ else if(H.w_uniform)
+ H.w_uniform.add_fingerprint(M)
+
+ ..()
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index ec9914d0ad1..68dacd83a09 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -38,8 +38,10 @@
fire_alert = 0 //Reset this here, because both breathe() and handle_environment() have a chance to set it.
tinttotal = tintcheck() //here as both hud updates and status updates call it
- ..()
+ if(..())
+ //Stuff jammed in your limbs hurts
+ handle_embedded_objects()
//Update our name based on whether our face is obscured/disfigured
name = get_visible_name()
@@ -342,3 +344,17 @@
if(head.flags & BLOCK_GAS_SMOKE_EFFECT)
. = 1
return .
+/mob/living/carbon/human/proc/handle_embedded_objects()
+ for(var/obj/item/organ/limb/L in organs)
+ for(var/obj/item/I in L.embedded_objects)
+ if(prob(I.embedded_pain_chance))
+ L.take_damage(I.w_class*2)
+ src << "\the [I] embedded in your [L.getDisplayName()] hurts!"
+
+ if(prob(I.embedded_fall_chance))
+ L.take_damage(I.w_class*5)
+ L.embedded_objects -= I
+ I.loc = get_turf(src)
+ visible_message("\the [I] falls out of [name]'s [L.getDisplayName()]!","\the [I] falls out of your [L.getDisplayName()]!")
+
+#undef HUMAN_MAX_OXYLOSS
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index 15258721907..46b606ed061 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -629,8 +629,6 @@
/datum/species/proc/movement_delay(var/mob/living/carbon/human/H)
var/mspeed = 0
- if(H.status_flags & GOTTAGOFAST)
- mspeed -= 1
var/hasjetpack = 0
if(istype(H.back, /obj/item/weapon/tank/jetpack))
@@ -664,6 +662,16 @@
mspeed += speedmod
+ if(H.status_flags & IGNORESLOWDOWN)
+ mspeed = 0
+
+ if(H.status_flags & GOTTAGOFAST)
+ mspeed -= 1
+
+ if(H.status_flags & GOTTAGOREALLYFAST)
+ mspeed -= 2
+
+
return mspeed
//////////////////
diff --git a/code/modules/mob/living/carbon/slime/slime.dm b/code/modules/mob/living/carbon/slime/slime.dm
index f2c5d5eb15f..aa3af4b45ec 100644
--- a/code/modules/mob/living/carbon/slime/slime.dm
+++ b/code/modules/mob/living/carbon/slime/slime.dm
@@ -393,7 +393,7 @@
updatehealth()
return
-/mob/living/carbon/slime/attackby(obj/item/W, mob/living/user)
+/mob/living/carbon/slime/attackby(obj/item/W, mob/living/user, params)
if(istype(W,/obj/item/stack/sheet/mineral/plasma)) //Let's you feed slimes plasma.
if (user in Friends)
++Friends[user]
diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index f10979883c2..812d9705c4f 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -271,3 +271,7 @@ proc/vol_by_throwforce_and_or_w_class(var/obj/item/I)
else
M.do_attack_animation(src)
return 1
+
+/mob/living/incapacitated()
+ if(stat || paralysis || stunned || weakened || restrained())
+ return 1
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 33702682e9e..1038950db3d 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -392,7 +392,7 @@
return !cleared
-/mob/living/silicon/robot/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/mob/living/silicon/robot/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
if (istype(W, /obj/item/weapon/restraints/handcuffs)) // fuck i don't even know why isrobot() in handcuff code isn't working so this will have to do
return
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index 7e9beb74f84..1afc3eaea7f 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -95,6 +95,7 @@
modules += new /obj/item/weapon/scalpel(src)
modules += new /obj/item/weapon/circular_saw(src)
modules += new /obj/item/weapon/extinguisher/mini(src)
+ modules += new /obj/item/roller/robo(src)
emag = new /obj/item/weapon/reagent_containers/spray(src)
emag.reagents.add_reagent("facid", 250)
@@ -234,27 +235,17 @@
/obj/item/weapon/robot_module/miner/New()
..()
- var/mob/living/silicon/robot/R = loc
modules += new /obj/item/borg/sight/meson(src)
emag = new /obj/item/borg/stun(src)
modules += new /obj/item/weapon/storage/bag/ore(src)
- if(R.emagged)
- modules += new /obj/item/weapon/pickaxe/drill/diamonddrill(src)
- else
- modules += new /obj/item/weapon/pickaxe/jackhammer/borgdrill(src)
+ modules += new /obj/item/weapon/pickaxe/drill/cyborg(src)
+ modules += new /obj/item/weapon/shovel(src)
modules += new /obj/item/device/flashlight/lantern(src)
modules += new /obj/item/weapon/storage/bag/sheetsnatcher/borg(src)
modules += new /obj/item/device/t_scanner/adv_mining_scanner(src)
modules += new /obj/item/weapon/gun/energy/kinetic_accelerator(src)
fix_modules()
-/obj/item/weapon/robot_module/miner/on_emag()
- ..()
- for(var/obj/item/weapon/pickaxe/jackhammer/borgdrill/D in modules)
- qdel(D)
- modules += new /obj/item/weapon/pickaxe/drill/diamonddrill(src)
- rebuild()
-
/obj/item/weapon/robot_module/syndicate
name = "syndicate robot module"
diff --git a/code/modules/mob/living/simple_animal/friendly/butterfly.dm b/code/modules/mob/living/simple_animal/friendly/butterfly.dm
index 8a3606c10a4..ee9bdc720ac 100644
--- a/code/modules/mob/living/simple_animal/friendly/butterfly.dm
+++ b/code/modules/mob/living/simple_animal/friendly/butterfly.dm
@@ -8,7 +8,7 @@
emote_see = list("flutters")
response_help = "shoos"
response_disarm = "brushes aside"
- response_harm = "aquashes"
+ response_harm = "squashes"
speak_chance = 0
maxHealth = 2
health = 2
diff --git a/code/modules/mob/living/simple_animal/friendly/corgi.dm b/code/modules/mob/living/simple_animal/friendly/corgi.dm
index a763d6ef994..5c42668c257 100644
--- a/code/modules/mob/living/simple_animal/friendly/corgi.dm
+++ b/code/modules/mob/living/simple_animal/friendly/corgi.dm
@@ -61,7 +61,7 @@
onclose(user, "mob[real_name]")
return
-/mob/living/simple_animal/corgi/attackby(var/obj/item/O as obj, var/mob/user as mob)
+/mob/living/simple_animal/corgi/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
if(inventory_head && inventory_back)
//helmet and armor = 100% protection
if( istype(inventory_head,/obj/item/clothing/head/helmet) && istype(inventory_back,/obj/item/clothing/suit/armor) )
diff --git a/code/modules/mob/living/simple_animal/friendly/drone.dm b/code/modules/mob/living/simple_animal/friendly/drone.dm
index 875c95ffbe5..ee37b9f52a4 100644
--- a/code/modules/mob/living/simple_animal/friendly/drone.dm
+++ b/code/modules/mob/living/simple_animal/friendly/drone.dm
@@ -147,7 +147,7 @@
qdel(access_card) //Otherwise it ends up on the floor!
..()
-/mob/living/simple_animal/drone/attackby(obj/item/I, mob/user)
+/mob/living/simple_animal/drone/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/weapon/screwdriver) && stat != DEAD)
if(health < health_repair_max)
user << "You start to tighten loose screws on [src]."
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 53eb82ca79a..d976a50bf86 100644
--- a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
+++ b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
@@ -71,7 +71,7 @@
SV.eat(src)
-/mob/living/simple_animal/hostile/retaliate/goat/attackby(var/obj/item/O as obj, var/mob/user as mob)
+/mob/living/simple_animal/hostile/retaliate/goat/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
if(stat == CONSCIOUS && istype(O, /obj/item/weapon/reagent_containers/glass))
user.visible_message("[user] milks [src] using \the [O].")
var/obj/item/weapon/reagent_containers/glass/G = O
@@ -111,7 +111,7 @@
udder.my_atom = src
..()
-/mob/living/simple_animal/cow/attackby(var/obj/item/O as obj, var/mob/user as mob)
+/mob/living/simple_animal/cow/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
if(stat == CONSCIOUS && istype(O, /obj/item/weapon/reagent_containers/glass))
user.visible_message("[user] milks [src] using \the [O].")
var/obj/item/weapon/reagent_containers/glass/G = O
@@ -227,7 +227,7 @@ var/global/chicken_count = 0
..()
chicken_count -= 1
-/mob/living/simple_animal/chicken/attackby(var/obj/item/O as obj, var/mob/user as mob)
+/mob/living/simple_animal/chicken/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/grown/wheat)) //feedin' dem chickens
if(!stat && eggsleft < 8)
user.visible_message("[user] feeds [O] to [name]! It clucks happily.","You feed [O] to [name]! It clucks happily.")
diff --git a/code/modules/mob/living/simple_animal/friendly/pug.dm b/code/modules/mob/living/simple_animal/friendly/pug.dm
index ba23a49dba0..f685428fa4d 100644
--- a/code/modules/mob/living/simple_animal/friendly/pug.dm
+++ b/code/modules/mob/living/simple_animal/friendly/pug.dm
@@ -30,7 +30,7 @@
dir = i
sleep(1)
-/mob/living/simple_animal/pug/attackby(var/obj/item/O as obj, var/mob/user as mob) //Marker -Agouri
+/mob/living/simple_animal/pug/attackby(var/obj/item/O as obj, var/mob/user as mob, params) //Marker -Agouri
if(istype(O, /obj/item/weapon/newspaper))
if(!stat)
user.visible_message("[user] baps [name] on the nose with the rolled up [O]")
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
index acb15e44f7c..0e62f7f61b7 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
@@ -397,6 +397,7 @@
name = "Goliath tentacle"
icon = 'icons/mob/animal.dmi'
icon_state = "Goliath_tentacle"
+ var/latched = 0
/obj/effect/goliath_tentacle/New()
var/turftype = get_turf(src)
@@ -423,15 +424,15 @@
/obj/effect/goliath_tentacle/proc/Trip()
for(var/mob/living/M in src.loc)
- M.Weaken(5)
- visible_message("The [src.name] knocks [M.name] down!")
- qdel(src)
-
-/obj/effect/goliath_tentacle/Crossed(AM as mob|obj)
- if(isliving(AM))
- Trip()
- return
- ..()
+ M.Stun(5)
+ M.adjustBruteLoss(rand(10,15))
+ latched = 1
+ visible_message("The [src.name] grabs hold of [M.name]!")
+ if(!latched)
+ qdel(src)
+ else
+ spawn(50)
+ qdel(src)
/mob/living/simple_animal/hostile/asteroid/goliath/Die()
var/obj/item/asteroid/goliath_hide/G = new /obj/item/asteroid/goliath_hide(src.loc)
diff --git a/code/modules/mob/living/simple_animal/hostile/mushroom.dm b/code/modules/mob/living/simple_animal/hostile/mushroom.dm
index 355e7624b0a..c93b394050e 100644
--- a/code/modules/mob/living/simple_animal/hostile/mushroom.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mushroom.dm
@@ -124,7 +124,7 @@
src.visible_message("The [src.name] was bruised!")
bruised = 1
-/mob/living/simple_animal/hostile/mushroom/attackby(obj/item/I as obj, mob/user as mob)
+/mob/living/simple_animal/hostile/mushroom/attackby(obj/item/I as obj, mob/user as mob, params)
if(istype(I, /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom))
if(stat == DEAD && !recovery_cooldown)
Recover()
diff --git a/code/modules/mob/living/simple_animal/hostile/syndicate.dm b/code/modules/mob/living/simple_animal/hostile/syndicate.dm
index 1919d88db64..72b30675077 100644
--- a/code/modules/mob/living/simple_animal/hostile/syndicate.dm
+++ b/code/modules/mob/living/simple_animal/hostile/syndicate.dm
@@ -57,7 +57,7 @@
attacktext = "slashes"
status_flags = 0
-/mob/living/simple_animal/hostile/syndicate/melee/attackby(var/obj/item/O as obj, var/mob/user as mob)
+/mob/living/simple_animal/hostile/syndicate/melee/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
if(O.force)
if(prob(80))
var/damage = O.force
diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm
index b886317a3eb..d49855fc02f 100644
--- a/code/modules/mob/living/simple_animal/parrot.dm
+++ b/code/modules/mob/living/simple_animal/parrot.dm
@@ -303,7 +303,7 @@
icon_state = "parrot_fly"
//Mobs with objects
-/mob/living/simple_animal/parrot/attackby(var/obj/item/O as obj, var/mob/living/user as mob)
+/mob/living/simple_animal/parrot/attackby(var/obj/item/O as obj, var/mob/living/user as mob, params)
if(!stat && !client && !istype(O, /obj/item/stack/medical) && !istype(O,/obj/item/weapon/reagent_containers/food/snacks/cracker))
if(O.force)
if(parrot_state == PARROT_PERCH)
diff --git a/code/modules/mob/living/simple_animal/shade.dm b/code/modules/mob/living/simple_animal/shade.dm
index beb2cbe7144..ebca47633b9 100644
--- a/code/modules/mob/living/simple_animal/shade.dm
+++ b/code/modules/mob/living/simple_animal/shade.dm
@@ -38,7 +38,7 @@
return
-/mob/living/simple_animal/shade/attackby(var/obj/item/O as obj, var/mob/user as mob) //Marker -Agouri
+/mob/living/simple_animal/shade/attackby(var/obj/item/O as obj, var/mob/user as mob, params) //Marker -Agouri
if(istype(O, /obj/item/device/soulstone))
var/obj/item/device/soulstone/SS = O
SS.transfer_soul("SHADE", src, user)
diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index 333f3b8b1ab..c3f3293262c 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -327,7 +327,7 @@
updatehealth()
-/mob/living/simple_animal/attackby(var/obj/item/O as obj, var/mob/living/user as mob) //Marker -Agouri
+/mob/living/simple_animal/attackby(var/obj/item/O as obj, var/mob/living/user as mob, params) //Marker -Agouri
if(O.flags & NOBLUDGEON)
return
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 776eb11e729..ae9c3a3906c 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -229,6 +229,9 @@ var/next_mob_id = 0
/mob/proc/restrained()
return
+/mob/proc/incapacitated()
+ return
+
//This proc is called whenever someone clicks an inventory ui slot.
/mob/proc/attack_ui(slot)
var/obj/item/W = get_active_hand()
diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm
index 806f4d28237..82ce068f34a 100644
--- a/code/modules/mob/mob_movement.dm
+++ b/code/modules/mob/mob_movement.dm
@@ -138,7 +138,7 @@
if(mob.restrained()) //Why being pulled while cuffed prevents you from moving
for(var/mob/M in range(mob, 1))
if(M.pulling == mob)
- if(!M.restrained() && M.stat == 0 && M.canmove && mob.Adjacent(M))
+ if(!M.incapacitated() && mob.Adjacent(M))
src << "You're restrained! You can't move!"
return 0
else
diff --git a/code/modules/mob/new_player/login.dm b/code/modules/mob/new_player/login.dm
index 280e4e70347..979e77b2855 100644
--- a/code/modules/mob/new_player/login.dm
+++ b/code/modules/mob/new_player/login.dm
@@ -6,6 +6,9 @@
if(admin_notice)
src << "Admin Notice:\n \t [admin_notice]"
+ if(config.soft_popcap && living_player_count() >= config.soft_popcap)
+ src << "Server Notice:\n \t [config.soft_popcap_message]"
+
if(!mind)
mind = new /datum/mind(key)
mind.active = 1
diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm
index 719a038ad6a..d228a9df1b7 100644
--- a/code/modules/mob/new_player/new_player.dm
+++ b/code/modules/mob/new_player/new_player.dm
@@ -126,6 +126,10 @@
if(!ticker || ticker.current_state != GAME_STATE_PLAYING)
usr << "The round is either not ready, or has already finished..."
return
+ var/relevent_cap = max(config.hard_popcap, config.extreme_popcap)
+ if(relevent_cap && living_player_count() >= relevent_cap && !(ckey(key) in admin_datums))
+ usr << "[config.hard_popcap_message]"
+ return
LateChoices()
if(href_list["manifest"])
diff --git a/code/modules/paperwork/clipboard.dm b/code/modules/paperwork/clipboard.dm
index 78a8fe94662..ac8e32ecf63 100644
--- a/code/modules/paperwork/clipboard.dm
+++ b/code/modules/paperwork/clipboard.dm
@@ -26,7 +26,7 @@
overlays += "clipboard_over"
-/obj/item/weapon/clipboard/attackby(obj/item/weapon/W, mob/user)
+/obj/item/weapon/clipboard/attackby(obj/item/weapon/W, mob/user, params)
if(istype(W, /obj/item/weapon/paper))
user.drop_item()
W.loc = src
diff --git a/code/modules/paperwork/filingcabinet.dm b/code/modules/paperwork/filingcabinet.dm
index ccc56ce4e4c..92077b14d4a 100644
--- a/code/modules/paperwork/filingcabinet.dm
+++ b/code/modules/paperwork/filingcabinet.dm
@@ -41,7 +41,7 @@
qdel(src)
..()
-/obj/structure/filingcabinet/attackby(obj/item/P, mob/user)
+/obj/structure/filingcabinet/attackby(obj/item/P, mob/user, params)
if(istype(P, /obj/item/weapon/paper) || istype(P, /obj/item/weapon/folder) || istype(P, /obj/item/weapon/photo) || istype(P, /obj/item/documents))
user << "You put [P] in [src]."
user.drop_item()
diff --git a/code/modules/paperwork/folders.dm b/code/modules/paperwork/folders.dm
index a0ee5982c54..b75140b9c43 100644
--- a/code/modules/paperwork/folders.dm
+++ b/code/modules/paperwork/folders.dm
@@ -29,7 +29,7 @@
overlays += "folder_paper"
-/obj/item/weapon/folder/attackby(obj/item/weapon/W, mob/user)
+/obj/item/weapon/folder/attackby(obj/item/weapon/W, mob/user, params)
if(istype(W, /obj/item/weapon/paper) || istype(W, /obj/item/weapon/photo) || istype(W, /obj/item/documents))
user.drop_item()
W.loc = src
diff --git a/code/modules/paperwork/handlabeler.dm b/code/modules/paperwork/handlabeler.dm
index 67923d56280..d9a6b9527d4 100644
--- a/code/modules/paperwork/handlabeler.dm
+++ b/code/modules/paperwork/handlabeler.dm
@@ -52,7 +52,7 @@
else
user << "You turn off [src]."
-/obj/item/weapon/hand_labeler/attackby(obj/item/I as obj, mob/user as mob)
+/obj/item/weapon/hand_labeler/attackby(obj/item/I as obj, mob/user as mob, params)
..()
if(istype(I, /obj/item/hand_labeler_refill))
user << "You insert [I] into [src]."
diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm
index cb7008ca6d9..e6ed40a2164 100644
--- a/code/modules/paperwork/paper.dm
+++ b/code/modules/paperwork/paper.dm
@@ -265,16 +265,12 @@
update_icon()
-/obj/item/weapon/paper/attackby(obj/item/weapon/P, mob/living/carbon/human/user)
+/obj/item/weapon/paper/attackby(obj/item/weapon/P, mob/living/carbon/human/user, params)
..()
if(is_blind(user))
return
- var/clown = 0
- if(user.disabilities & CLUMSY)
- clown = 1
-
if(istype(P, /obj/item/weapon/pen) || istype(P, /obj/item/toy/crayon))
if(user.IsAdvancedToolUser())
user << browse(" [stamps]", "window=[name]") @@ -287,11 +283,6 @@ if(!in_range(src, usr) && loc != user && !istype(loc, /obj/item/weapon/clipboard) && loc.loc != user && user.get_active_hand() != P) return - if(istype(P, /obj/item/weapon/stamp/clown)) - if(!clown) - user << "You are totally unable to use the stamp. HONK!" - return - stamps += "  "
var/image/stampoverlay = image('icons/obj/bureaucracy.dmi')
diff --git a/code/modules/paperwork/paperbin.dm b/code/modules/paperwork/paperbin.dm
index 8f9f44e41ff..248f36b8967 100644
--- a/code/modules/paperwork/paperbin.dm
+++ b/code/modules/paperwork/paperbin.dm
@@ -62,7 +62,7 @@
add_fingerprint(user)
-/obj/item/weapon/paper_bin/attackby(obj/item/weapon/paper/i, mob/user)
+/obj/item/weapon/paper_bin/attackby(obj/item/weapon/paper/i, mob/user, params)
if(!istype(i))
return ..()
diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm
index e37f7ecfa38..2be061856d3 100644
--- a/code/modules/paperwork/pen.dm
+++ b/code/modules/paperwork/pen.dm
@@ -65,7 +65,7 @@
if(..())
if(reagents.total_volume)
if(M.reagents)
- reagents.trans_to(M, 50)
+ reagents.trans_to(M, 55)
/obj/item/weapon/pen/sleepy/New()
diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm
index 5e8763958d4..f49516e8f76 100644
--- a/code/modules/paperwork/photocopier.dm
+++ b/code/modules/paperwork/photocopier.dm
@@ -218,7 +218,7 @@
greytoggle = "Greyscale"
updateUsrDialog()
-/obj/machinery/photocopier/attackby(obj/item/O, mob/user)
+/obj/machinery/photocopier/attackby(obj/item/O, mob/user, params)
if(istype(O, /obj/item/weapon/paper))
if(copier_empty())
user.drop_item()
diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm
index 247b0356c00..f24dc009643 100644
--- a/code/modules/paperwork/photography.dm
+++ b/code/modules/paperwork/photography.dm
@@ -38,7 +38,7 @@
user.examinate(src)
-/obj/item/weapon/photo/attackby(obj/item/weapon/P, mob/user)
+/obj/item/weapon/photo/attackby(obj/item/weapon/P, mob/user, params)
if(istype(P, /obj/item/weapon/pen) || istype(P, /obj/item/toy/crayon))
var/txt = sanitize(input(user, "What would you like to write on the back?", "Photo Writing", null) as text)
txt = copytext(txt, 1, 128)
@@ -135,7 +135,7 @@
return
-/obj/item/device/camera/attackby(obj/item/I, mob/user)
+/obj/item/device/camera/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/device/camera_film))
if(pictures_left)
user << "[src] still has some film in it!"
diff --git a/code/modules/power/antimatter/control.dm b/code/modules/power/antimatter/control.dm
index b0c74c5aca3..57e815508f7 100644
--- a/code/modules/power/antimatter/control.dm
+++ b/code/modules/power/antimatter/control.dm
@@ -137,7 +137,7 @@
//No other icons for it atm
-/obj/machinery/power/am_control_unit/attackby(obj/item/W, mob/user)
+/obj/machinery/power/am_control_unit/attackby(obj/item/W, mob/user, params)
if(!istype(W) || !user) return
if(istype(W, /obj/item/weapon/wrench))
if(!anchored)
diff --git a/code/modules/power/antimatter/shielding.dm b/code/modules/power/antimatter/shielding.dm
index e30567795c0..3d4e85ace35 100644
--- a/code/modules/power/antimatter/shielding.dm
+++ b/code/modules/power/antimatter/shielding.dm
@@ -125,7 +125,7 @@ proc/cardinalrange(var/center)
else if(processing) shutdown_core()
-/obj/machinery/am_shielding/attackby(obj/item/W, mob/user)
+/obj/machinery/am_shielding/attackby(obj/item/W, mob/user, params)
if(!istype(W) || !user) return
if(W.force > 10)
stability -= W.force/2
@@ -203,7 +203,7 @@ proc/cardinalrange(var/center)
throw_range = 2
m_amt = 100
-/obj/item/device/am_shielding_container/attackby(var/obj/item/I, var/mob/user)
+/obj/item/device/am_shielding_container/attackby(var/obj/item/I, var/mob/user, params)
if(istype(I, /obj/item/device/multitool) && istype(src.loc,/turf))
new/obj/machinery/am_shielding(src.loc)
qdel(src)
diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm
index 2759983b7eb..042d4731b63 100644
--- a/code/modules/power/apc.dm
+++ b/code/modules/power/apc.dm
@@ -370,7 +370,7 @@
//attack with an item - open/close cover, insert cell, or (un)lock interface
-/obj/machinery/power/apc/attackby(obj/item/W, mob/living/user)
+/obj/machinery/power/apc/attackby(obj/item/W, mob/living/user, params)
if (istype(user, /mob/living/silicon) && get_dist(src,user)>1)
return src.attack_hand(user)
diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm
index c03819fdd88..ad6c46d0540 100644
--- a/code/modules/power/cable.dm
+++ b/code/modules/power/cable.dm
@@ -128,7 +128,7 @@ By design, d1 is the smallest direction and d2 is the highest
// - Cable coil : merge cables
// - Multitool : get the power currently passing through the cable
//
-/obj/structure/cable/attackby(obj/item/W, mob/user)
+/obj/structure/cable/attackby(obj/item/W, mob/user, params)
var/turf/T = src.loc
if(T.intact)
return
@@ -550,7 +550,7 @@ obj/structure/cable/proc/avail()
// Items usable on a cable coil :
// - Wirecutters : cut them duh !
// - Cable coil : merge cables
-/obj/item/stack/cable_coil/attackby(obj/item/weapon/W, mob/user)
+/obj/item/stack/cable_coil/attackby(obj/item/weapon/W, mob/user, params)
..()
if( istype(W, /obj/item/weapon/wirecutters) && src.amount > 1)
src.amount--
diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm
index 31b13bf9ed9..97fa83a7f47 100644
--- a/code/modules/power/cell.dm
+++ b/code/modules/power/cell.dm
@@ -67,7 +67,7 @@
SNG.drain("CELL",src,H.wear_suit)
return
-/obj/item/weapon/stock_parts/cell/attackby(obj/item/W, mob/user)
+/obj/item/weapon/stock_parts/cell/attackby(obj/item/W, mob/user, params)
..()
if(istype(W, /obj/item/weapon/reagent_containers/syringe))
var/obj/item/weapon/reagent_containers/syringe/S = W
diff --git a/code/modules/power/gravitygenerator.dm b/code/modules/power/gravitygenerator.dm
index 8a04231290f..61d2bb8a9f6 100644
--- a/code/modules/power/gravitygenerator.dm
+++ b/code/modules/power/gravitygenerator.dm
@@ -63,7 +63,7 @@ var/const/GRAV_NEEDS_WRENCH = 3
/obj/machinery/gravity_generator/part
var/obj/machinery/gravity_generator/main/main_part = null
-/obj/machinery/gravity_generator/part/attackby(obj/item/I as obj, mob/user as mob)
+/obj/machinery/gravity_generator/part/attackby(obj/item/I as obj, mob/user as mob, params)
return main_part.attackby(I, user)
/obj/machinery/gravity_generator/part/get_status()
@@ -171,7 +171,7 @@ var/const/GRAV_NEEDS_WRENCH = 3
// Interaction
// Fixing the gravity generator.
-/obj/machinery/gravity_generator/main/attackby(obj/item/I as obj, mob/user as mob)
+/obj/machinery/gravity_generator/main/attackby(obj/item/I as obj, mob/user as mob, params)
var/old_broken_state = broken_state
switch(broken_state)
if(GRAV_NEEDS_SCREWDRIVER)
diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm
index 47bc5989647..31e2944aa96 100644
--- a/code/modules/power/lighting.dm
+++ b/code/modules/power/lighting.dm
@@ -21,7 +21,7 @@
var/obj/machinery/light/newlight = null
var/sheets_refunded = 2
-/obj/item/light_fixture_frame/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/item/light_fixture_frame/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
if (istype(W, /obj/item/weapon/wrench))
new /obj/item/stack/sheet/metal( get_turf(src.loc), sheets_refunded )
qdel(src)
@@ -94,7 +94,7 @@
if(3)
user << "The casing is closed."
-/obj/machinery/light_construct/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/machinery/light_construct/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
src.add_fingerprint(user)
if (istype(W, /obj/item/weapon/wrench))
if (src.stage == 1)
@@ -328,7 +328,7 @@
// attack with item - insert light (if right type), otherwise try to break the light
-/obj/machinery/light/attackby(obj/item/W, mob/living/user)
+/obj/machinery/light/attackby(obj/item/W, mob/living/user, params)
//Light replacer code
if(istype(W, /obj/item/device/lightreplacer))
@@ -676,7 +676,7 @@
// attack bulb/tube with object
// if a syringe, can inject plasma to make it explode
-/obj/item/weapon/light/attackby(var/obj/item/I, var/mob/user)
+/obj/item/weapon/light/attackby(var/obj/item/I, var/mob/user, params)
..()
if(istype(I, /obj/item/weapon/reagent_containers/syringe))
var/obj/item/weapon/reagent_containers/syringe/S = I
diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm
index 3a5370a4bd1..28a024aa07e 100644
--- a/code/modules/power/port_gen.dm
+++ b/code/modules/power/port_gen.dm
@@ -194,7 +194,7 @@ display round(lastgen) and plasmatank amount
/obj/machinery/power/port_gen/pacman/proc/overheat()
explosion(src.loc, 2, 5, 2, -1)
-/obj/machinery/power/port_gen/pacman/attackby(var/obj/item/O as obj, var/mob/user as mob)
+/obj/machinery/power/port_gen/pacman/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
if(istype(O, sheet_path))
var/obj/item/stack/addstack = O
var/amount = min((max_sheets - sheets), addstack.amount)
diff --git a/code/modules/power/power.dm b/code/modules/power/power.dm
index 68c82ec197a..d7554e0cbb6 100644
--- a/code/modules/power/power.dm
+++ b/code/modules/power/power.dm
@@ -114,7 +114,7 @@
// attach a wire to a power machine - leads from the turf you are standing on
//almost never called, overwritten by all power machines but terminal and generator
-/obj/machinery/power/attackby(obj/item/weapon/W, mob/user)
+/obj/machinery/power/attackby(obj/item/weapon/W, mob/user, params)
if(istype(W, /obj/item/stack/cable_coil))
@@ -464,7 +464,7 @@
// return a knot cable (O-X) if one is present in the turf
// null if there's none
/turf/proc/get_cable_node()
- if(!src.cancable)
+ if(!istype(src, /turf/simulated/floor))
return null
for(var/obj/structure/cable/C in src)
if(C.d1 == 0)
diff --git a/code/modules/power/singularity/collector.dm b/code/modules/power/singularity/collector.dm
index dcbda800de8..79f25526b21 100644
--- a/code/modules/power/singularity/collector.dm
+++ b/code/modules/power/singularity/collector.dm
@@ -51,7 +51,7 @@ var/global/list/rad_collectors = list()
..()
-/obj/machinery/power/rad_collector/attackby(obj/item/W, mob/user)
+/obj/machinery/power/rad_collector/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/device/multitool))
user << "The [W.name] detects that [last_power]W were recently produced."
return 1
diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm
index 8e358e5a43c..fe3691f5415 100644
--- a/code/modules/power/singularity/emitter.dm
+++ b/code/modules/power/singularity/emitter.dm
@@ -148,7 +148,7 @@
A.fire()
-/obj/machinery/power/emitter/attackby(obj/item/W, mob/user)
+/obj/machinery/power/emitter/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/weapon/wrench))
if(active)
diff --git a/code/modules/power/singularity/field_generator.dm b/code/modules/power/singularity/field_generator.dm
index d0fdaf04d41..4e05a8f837e 100644
--- a/code/modules/power/singularity/field_generator.dm
+++ b/code/modules/power/singularity/field_generator.dm
@@ -94,7 +94,7 @@ field_generator power level display
return
-/obj/machinery/field/generator/attackby(obj/item/W, mob/user)
+/obj/machinery/field/generator/attackby(obj/item/W, mob/user, params)
if(active)
user << "The [src] needs to be off."
return
diff --git a/code/modules/power/singularity/generator.dm b/code/modules/power/singularity/generator.dm
index 0f27d92cd47..f73e3bcfa7d 100644
--- a/code/modules/power/singularity/generator.dm
+++ b/code/modules/power/singularity/generator.dm
@@ -15,7 +15,7 @@
new /obj/singularity/(T, 50)
if(src) qdel(src)
-/obj/machinery/the_singularitygen/attackby(obj/item/W, mob/user)
+/obj/machinery/the_singularitygen/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/weapon/wrench))
if(!anchored && !isinspace())
diff --git a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm
index 5c2cbfb70ce..77972f145b6 100644
--- a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm
+++ b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm
@@ -129,7 +129,7 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin
..()
-/obj/structure/particle_accelerator/attackby(obj/item/W, mob/user)
+/obj/structure/particle_accelerator/attackby(obj/item/W, mob/user, params)
if(istool(W))
if(src.process_tool_hit(W,user))
return
@@ -308,7 +308,7 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin
..()
-/obj/machinery/particle_accelerator/attackby(obj/item/W, mob/user)
+/obj/machinery/particle_accelerator/attackby(obj/item/W, mob/user, params)
if(istool(W))
if(src.process_tool_hit(W,user))
return
diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm
index 3ee6f487554..f3ace39921c 100644
--- a/code/modules/power/smes.dm
+++ b/code/modules/power/smes.dm
@@ -67,7 +67,7 @@
C += PC.maxcharge
capacity = C / (15000) * 1e6
-/obj/machinery/power/smes/attackby(obj/item/I, mob/user)
+/obj/machinery/power/smes/attackby(obj/item/I, mob/user, params)
//opening using screwdriver
if(default_deconstruction_screwdriver(user, "[initial(icon_state)]-o", initial(icon_state), I))
update_icon()
diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm
index 4bd0315f263..fa2254fd807 100644
--- a/code/modules/power/solar.dm
+++ b/code/modules/power/solar.dm
@@ -55,7 +55,7 @@
-/obj/machinery/power/solar/attackby(obj/item/weapon/W, mob/user)
+/obj/machinery/power/solar/attackby(obj/item/weapon/W, mob/user, params)
if(istype(W, /obj/item/weapon/crowbar))
playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
@@ -221,7 +221,7 @@
glass_type = null
-/obj/item/solar_assembly/attackby(var/obj/item/weapon/W, var/mob/user)
+/obj/item/solar_assembly/attackby(var/obj/item/weapon/W, var/mob/user, params)
if(!anchored && isturf(loc))
if(istype(W, /obj/item/weapon/wrench))
@@ -394,7 +394,7 @@
ui.push_data(data)
return
-/obj/machinery/power/solar_control/attackby(I as obj, user as mob)
+/obj/machinery/power/solar_control/attackby(I as obj, user as mob, params)
if(istype(I, /obj/item/weapon/screwdriver))
playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
if(do_after(user, 20))
diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm
index 03d8aab4865..6152f0e07ab 100644
--- a/code/modules/power/supermatter/supermatter.dm
+++ b/code/modules/power/supermatter/supermatter.dm
@@ -237,7 +237,7 @@
R.receive_pulse(power/10)
return
-/obj/machinery/power/supermatter_shard/attackby(obj/item/W as obj, mob/living/user as mob)
+/obj/machinery/power/supermatter_shard/attackby(obj/item/W as obj, mob/living/user as mob, params)
if(!istype(W) || (W.flags & ABSTRACT) || !istype(user))
return
if(user.drop_item(W))
diff --git a/code/modules/power/terminal.dm b/code/modules/power/terminal.dm
index f977462f7ec..834f7e3f9b3 100644
--- a/code/modules/power/terminal.dm
+++ b/code/modules/power/terminal.dm
@@ -72,7 +72,7 @@
qdel(src)
-/obj/machinery/power/terminal/attackby(obj/item/W, mob/living/user)
+/obj/machinery/power/terminal/attackby(obj/item/W, mob/living/user, params)
if(istype(W, /obj/item/weapon/wirecutters))
dismantle(user)
return
diff --git a/code/modules/power/tracker.dm b/code/modules/power/tracker.dm
index 5cf341f9fbb..9b66f6afb91 100644
--- a/code/modules/power/tracker.dm
+++ b/code/modules/power/tracker.dm
@@ -58,7 +58,7 @@
if(powernet && (powernet == control.powernet)) //update if we're still in the same powernet
control.cdir = angle
-/obj/machinery/power/tracker/attackby(var/obj/item/weapon/W, var/mob/user)
+/obj/machinery/power/tracker/attackby(var/obj/item/weapon/W, var/mob/user, params)
if(istype(W, /obj/item/weapon/crowbar))
playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
diff --git a/code/modules/power/turbine.dm b/code/modules/power/turbine.dm
index 3e82df3d402..86e3930b58a 100644
--- a/code/modules/power/turbine.dm
+++ b/code/modules/power/turbine.dm
@@ -111,7 +111,7 @@
E += M.rating
efficiency = E / 6
-/obj/machinery/power/compressor/attackby(obj/item/I, mob/user)
+/obj/machinery/power/compressor/attackby(obj/item/I, mob/user, params)
if(default_deconstruction_screwdriver(user, initial(icon_state), initial(icon_state), I))
return
@@ -281,7 +281,7 @@
interact(user)
-/obj/machinery/power/turbine/attackby(obj/item/I, mob/user)
+/obj/machinery/power/turbine/attackby(obj/item/I, mob/user, params)
if(default_deconstruction_screwdriver(user, initial(icon_state), initial(icon_state), I))
return
diff --git a/code/modules/projectiles/ammunition.dm b/code/modules/projectiles/ammunition.dm
index 608522f5e19..8793962e77f 100644
--- a/code/modules/projectiles/ammunition.dm
+++ b/code/modules/projectiles/ammunition.dm
@@ -13,7 +13,7 @@
var/obj/item/projectile/BB = null //The loaded bullet
var/pellets = 0 //Pellets for spreadshot
var/variance = 0 //Variance for inaccuracy fundamental to the casing
-
+ var/delay = 0 //Delay for energy weapons
/obj/item/ammo_casing/New()
..()
@@ -93,7 +93,7 @@
return 0
-/obj/item/ammo_box/attackby(var/obj/item/A as obj, mob/user as mob, var/silent = 0, var/replace_spent = 0)
+/obj/item/ammo_box/attackby(var/obj/item/A as obj, mob/user as mob, params, var/silent = 0, var/replace_spent = 0)
var/num_loaded = 0
if(istype(A, /obj/item/ammo_box))
var/obj/item/ammo_box/AM = A
diff --git a/code/modules/projectiles/ammunition/energy.dm b/code/modules/projectiles/ammunition/energy.dm
index 04afcf54d7f..e7c81acfbcf 100644
--- a/code/modules/projectiles/ammunition/energy.dm
+++ b/code/modules/projectiles/ammunition/energy.dm
@@ -17,6 +17,9 @@
e_cost = 83
select_name = "kill"
+/obj/item/ammo_casing/energy/laser/hos
+ e_cost = 100
+
/obj/item/ammo_casing/energy/laser/practice
projectile_type = /obj/item/projectile/beam/practice
select_name = "practice"
@@ -56,11 +59,15 @@
select_name = "stun"
fire_sound = 'sound/weapons/taser.ogg'
e_cost = 200
+ delay = 20
/obj/item/ammo_casing/energy/electrode/gun
fire_sound = 'sound/weapons/gunshot.ogg'
e_cost = 100
+/obj/item/ammo_casing/energy/electrode/hos
+ e_cost = 200
+
/obj/item/ammo_casing/energy/ion
projectile_type = /obj/item/projectile/ion
select_name = "ion"
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index 76fc0172346..722d6289a68 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -20,16 +20,18 @@
attack_verb = list("struck", "hit", "bashed")
var/fire_sound = "gunshot"
- var/suppressed = 0
+ var/suppressed = 0 //whether or not a message is displayed when fired
var/can_suppress = 0
- var/recoil = 0
+ var/recoil = 0 //boom boom shake the room
var/clumsy_check = 1
var/obj/item/ammo_casing/chambered = null
- var/trigger_guard = 1
- var/sawn_desc = null
+ var/trigger_guard = 1 //trigger guard on the weapon, hulks can't fire them with their big meaty fingers
+ var/sawn_desc = null //description change if weapon is sawn-off
var/sawn_state = SAWN_INTACT
- var/burst_size = 1
- var/fire_delay = 0
+ var/burst_size = 1 //how large a burst is
+ var/fire_delay = 0 //rate of fire for burst firing and semi auto
+ var/semicd = 0 //cooldown handler
+ var/heavy_weapon = 0
lefthand_file = 'icons/mob/inhands/guns_lefthand.dmi'
righthand_file = 'icons/mob/inhands/guns_righthand.dmi'
@@ -87,6 +89,11 @@
else
user.visible_message("[user] fires [src]!", "You fire [src]!", "You hear a [istype(src, /obj/item/weapon/gun/energy) ? "laser blast" : "gunshot"]!")
+ if(heavy_weapon)
+ if(user.get_inactive_hand())
+ if(prob(15))
+ user.visible_message("[src] flies out of [user]'s hands!", "[src] kicks out of your grip!")
+ user.drop_item()
/obj/item/weapon/gun/emp_act(severity)
for(var/obj/O in contents)
@@ -153,14 +160,40 @@
/obj/item/weapon/gun/proc/process_fire(atom/target as mob|obj|turf, mob/living/user as mob|obj, var/message = 1, params)
add_fingerprint(user)
- for(var/i = 1 to burst_size)
- if(!issilicon(user))
- if( i>1 && !(src in get_both_hands(user))) //for burst firing
+ if(semicd)
+ return
+
+ if(heavy_weapon)
+ if(user.get_inactive_hand())
+ recoil = 4 //one-handed kick
+ else
+ recoil = initial(recoil)
+
+ if(burst_size > 1)
+ for(var/i = 1 to burst_size)
+ if(!issilicon(user))
+ if( i>1 && !(src in get_both_hands(user))) //for burst firing
+ break
+ if(chambered)
+ if(!chambered.fire(target, user, params, , suppressed))
+ shoot_with_empty_chamber(user)
+ break
+ 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)
+ else
+ shoot_live_shot(user, 0, target, message)
+ else
+ shoot_with_empty_chamber(user)
break
+ process_chamber()
+ update_icon()
+ sleep(fire_delay)
+ else
if(chambered)
if(!chambered.fire(target, user, params, , suppressed))
shoot_with_empty_chamber(user)
- break
+ 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)
@@ -168,10 +201,12 @@
shoot_live_shot(user, 0, target, message)
else
shoot_with_empty_chamber(user)
- break
+ return
process_chamber()
update_icon()
- sleep(fire_delay)
+ semicd = 1
+ spawn(fire_delay)
+ semicd = 0
if(user.hand)
user.update_inv_l_hand(0)
@@ -185,7 +220,7 @@
else
return
-/obj/item/weapon/gun/attackby(var/obj/item/A as obj, mob/user as mob)
+/obj/item/weapon/gun/attackby(var/obj/item/A as obj, mob/user as mob, params)
if(istype(A, /obj/item/device/flashlight/seclite))
var/obj/item/device/flashlight/seclite/S = A
if(can_flashlight)
diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm
index b4bca248bd8..8f885b321f6 100644
--- a/code/modules/projectiles/guns/energy.dm
+++ b/code/modules/projectiles/guns/energy.dm
@@ -29,6 +29,7 @@
ammo_type[i] = shot
shot = ammo_type[select]
fire_sound = shot.fire_sound
+ fire_delay = shot.delay
update_icon()
return
@@ -36,6 +37,7 @@
/obj/item/weapon/gun/energy/afterattack(atom/target as mob|obj|turf, mob/living/user as mob|obj, params)
newshot() //prepare a new shot
..()
+
/obj/item/weapon/gun/energy/can_shoot()
var/obj/item/ammo_casing/energy/shot = ammo_type[select]
return power_supply.charge >= shot.e_cost
@@ -62,6 +64,7 @@
select = 1
var/obj/item/ammo_casing/energy/shot = ammo_type[select]
fire_sound = shot.fire_sound
+ fire_delay = shot.delay
if (shot.select_name)
user << "[src] is now set to [shot.select_name]."
update_icon()
diff --git a/code/modules/projectiles/guns/energy/nuclear.dm b/code/modules/projectiles/guns/energy/nuclear.dm
index b149e35bafc..f83123bf7c7 100644
--- a/code/modules/projectiles/guns/energy/nuclear.dm
+++ b/code/modules/projectiles/guns/energy/nuclear.dm
@@ -12,6 +12,13 @@
select_fire(user)
update_icon()
+/obj/item/weapon/gun/energy/gun/hos
+ desc = "This is a modern recreation of the antique laser gun. This gun has several unique firemodes, but lacks the ability to recharge over time, its also expensive."
+ icon_state = "hoslaser"
+ item_state = null
+ force = 10
+ ammo_type = list(/obj/item/ammo_casing/energy/electrode/hos, /obj/item/ammo_casing/energy/laser/hos, /obj/item/ammo_casing/energy/disabler)
+
/obj/item/weapon/gun/energy/gun/nuclear
name = "advanced energy gun"
desc = "An energy gun with an experimental miniaturized nuclear reactor that automatically charges the internal power cell."
@@ -20,7 +27,6 @@
var/lightfail = 0
var/charge_tick = 0
modifystate = 0
- ammo_type = list(/obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/laser)
can_flashlight = 0
pin = null
@@ -110,5 +116,14 @@
/obj/item/weapon/gun/energy/gun/turret
name = "hybrid turret gun"
- desc = "A basic hybrid energy gun with two settings: Stun and kill."
+ desc = "A heavy hybrid energy cannon with two settings: Stun and kill."
+ icon_state = "turretlaser"
+ slot_flags = null
+ w_class = 5
ammo_type = list(/obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/laser)
+ heavy_weapon = 1
+ can_flashlight = 0
+ trigger_guard = 0
+
+obj/item/weapon/gun/energy/gun/turret/update_icon()
+ icon_state = initial(icon_state)
diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm
index 83a7f26c922..9b8bb0f23ae 100644
--- a/code/modules/projectiles/guns/energy/special.dm
+++ b/code/modules/projectiles/guns/energy/special.dm
@@ -137,7 +137,7 @@
charge.range += range_add
-/obj/item/weapon/gun/energy/kinetic_accelerator/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/item/weapon/gun/energy/kinetic_accelerator/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
if(istype(W, /obj/item/weapon/screwdriver) && upgrades["screwdriver"] < 3)
upgrades["screwdriver"]++
overheat_time -= 1
diff --git a/code/modules/projectiles/guns/energy/stun.dm b/code/modules/projectiles/guns/energy/stun.dm
index 3b0b121535b..413dff9ad14 100644
--- a/code/modules/projectiles/guns/energy/stun.dm
+++ b/code/modules/projectiles/guns/energy/stun.dm
@@ -8,9 +8,8 @@
/obj/item/weapon/gun/energy/stunrevolver
name = "stun revolver"
- desc = "A high-tech revolver that fires internal, reusable stun cartidges in a revolving cylinder. Holds twice as many electrodes as a standard taser."
+ desc = "A high-tech revolver that fires internal, reusable taser cartridges in a revolving cylinder. The cartridges can be recharged using conventional rechargers."
icon_state = "stunrevolver"
- origin_tech = "combat=3;materials=3;powerstorage=2"
ammo_type = list(/obj/item/ammo_casing/energy/electrode/gun)
can_flashlight = 0
pin = null
diff --git a/code/modules/projectiles/guns/projectile.dm b/code/modules/projectiles/guns/projectile.dm
index 0205e95f426..acce8548cde 100644
--- a/code/modules/projectiles/guns/projectile.dm
+++ b/code/modules/projectiles/guns/projectile.dm
@@ -45,7 +45,7 @@
return 0
return 1
-/obj/item/weapon/gun/projectile/attackby(var/obj/item/A as obj, mob/user as mob)
+/obj/item/weapon/gun/projectile/attackby(var/obj/item/A as obj, mob/user as mob, params)
..()
if (istype(A, /obj/item/ammo_box/magazine))
var/obj/item/ammo_box/magazine/AM = A
diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm
index d758cc24516..aa1b315ef26 100644
--- a/code/modules/projectiles/guns/projectile/automatic.dm
+++ b/code/modules/projectiles/guns/projectile/automatic.dm
@@ -25,7 +25,7 @@
icon_state = "[initial(icon_state)][magazine ? "-[magazine.max_ammo]" : ""][chambered ? "" : "-e"][suppressed ? "-suppressed" : ""]"
return
-/obj/item/weapon/gun/projectile/automatic/attackby(var/obj/item/A as obj, mob/user as mob)
+/obj/item/weapon/gun/projectile/automatic/attackby(var/obj/item/A as obj, mob/user as mob, params)
. = ..()
if(.)
return
@@ -155,7 +155,7 @@
user << "You remove the magazine from [src]."
-/obj/item/weapon/gun/projectile/automatic/l6_saw/attackby(var/obj/item/A as obj, mob/user as mob)
+/obj/item/weapon/gun/projectile/automatic/l6_saw/attackby(var/obj/item/A as obj, mob/user as mob, params)
if(!cover_open)
user << "[src]'s cover is closed! You can't insert a new mag!"
return
@@ -188,11 +188,11 @@
..()
return
-/obj/item/weapon/gun/projectile/automatic/m90/attackby(var/obj/item/A, mob/user)
+/obj/item/weapon/gun/projectile/automatic/m90/attackby(var/obj/item/A, mob/user, params)
if(istype(A, /obj/item/ammo_casing))
if(istype(A, underbarrel.magazine.ammo_type))
underbarrel.attack_self()
- underbarrel.attackby(A, user)
+ underbarrel.attackby(A, user, params)
else
..()
diff --git a/code/modules/projectiles/guns/projectile/launchers.dm b/code/modules/projectiles/guns/projectile/launchers.dm
index d5929c607e4..4b05c3f86dc 100644
--- a/code/modules/projectiles/guns/projectile/launchers.dm
+++ b/code/modules/projectiles/guns/projectile/launchers.dm
@@ -10,7 +10,7 @@
fire_sound = 'sound/weapons/grenadelaunch.ogg'
w_class = 3
-/obj/item/weapon/gun/projectile/revolver/grenadelauncher/attackby(var/obj/item/A, mob/user)
+/obj/item/weapon/gun/projectile/revolver/grenadelauncher/attackby(var/obj/item/A, mob/user, params)
..()
if(istype(A, /obj/item/ammo_box) || istype(A, /obj/item/ammo_casing))
chamber_round()
@@ -68,8 +68,8 @@
/obj/item/weapon/gun/projectile/automatic/speargun/process_chamber(var/eject_casing = 0, var/empty_chamber = 1)
..()
-/obj/item/weapon/gun/projectile/automatic/speargun/attackby(var/obj/item/A, mob/user)
- var/num_loaded = magazine.attackby(A, user, 1)
+/obj/item/weapon/gun/projectile/automatic/speargun/attackby(var/obj/item/A, mob/user, params)
+ var/num_loaded = magazine.attackby(A, user, params, 1)
if(num_loaded)
user << "You load [num_loaded] spear\s into \the [src]."
update_icon()
diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm
index 2e7f07102ee..be0fa4540a0 100644
--- a/code/modules/projectiles/guns/projectile/revolver.dm
+++ b/code/modules/projectiles/guns/projectile/revolver.dm
@@ -14,8 +14,8 @@
/obj/item/weapon/gun/projectile/revolver/process_chamber()
return ..(0, 1)
-/obj/item/weapon/gun/projectile/revolver/attackby(var/obj/item/A as obj, mob/user as mob)
- var/num_loaded = magazine.attackby(A, user, 1)
+/obj/item/weapon/gun/projectile/revolver/attackby(var/obj/item/A as obj, mob/user as mob, params)
+ var/num_loaded = magazine.attackby(A, user, params, 1)
if(num_loaded)
user << "You load [num_loaded] shell\s into \the [src]."
A.update_icon()
@@ -102,7 +102,7 @@
M << "Your gun is now skinned as [choice]. Say hello to your new friend."
return 1
-/obj/item/weapon/gun/projectile/revolver/detective/attackby(var/obj/item/A as obj, mob/user as mob)
+/obj/item/weapon/gun/projectile/revolver/detective/attackby(var/obj/item/A as obj, mob/user as mob, params)
..()
if(istype(A, /obj/item/weapon/screwdriver))
if(magazine.caliber == "38")
@@ -162,7 +162,7 @@
chamber_round()
spun = 1
-/obj/item/weapon/gun/projectile/revolver/russian/attackby(var/obj/item/A as obj, mob/user as mob)
+/obj/item/weapon/gun/projectile/revolver/russian/attackby(var/obj/item/A as obj, mob/user as mob, params)
var/num_loaded = ..()
if(num_loaded)
user.visible_message("[user] loads a single bullet into the revolver and spins the chamber.", "You load a single bullet into the chamber and spin it.")
diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm
index bcae62ee0b6..8301d638c28 100644
--- a/code/modules/projectiles/guns/projectile/shotgun.dm
+++ b/code/modules/projectiles/guns/projectile/shotgun.dm
@@ -11,8 +11,8 @@
mag_type = /obj/item/ammo_box/magazine/internal/shot
var/recentpump = 0 // to prevent spammage
-/obj/item/weapon/gun/projectile/shotgun/attackby(var/obj/item/A as obj, mob/user as mob)
- var/num_loaded = magazine.attackby(A, user, 1)
+/obj/item/weapon/gun/projectile/shotgun/attackby(var/obj/item/A as obj, mob/user as mob, params)
+ var/num_loaded = magazine.attackby(A, user, params, 1)
if(num_loaded)
user << "You load [num_loaded] shell\s into \the [src]!"
A.update_icon()
@@ -81,7 +81,7 @@
mag_type = /obj/item/ammo_box/magazine/internal/shotriot
sawn_desc = "Come with me if you want to live."
-/obj/item/weapon/gun/projectile/shotgun/riot/attackby(var/obj/item/A as obj, mob/user as mob)
+/obj/item/weapon/gun/projectile/shotgun/riot/attackby(var/obj/item/A as obj, mob/user as mob, params)
..()
if(istype(A, /obj/item/weapon/circular_saw) || istype(A, /obj/item/weapon/pickaxe/plasmacutter))
sawoff(user)
@@ -113,7 +113,7 @@
update_icon() //I.E. fix the desc
return 1
-/obj/item/weapon/gun/projectile/shotgun/boltaction/attackby(var/obj/item/A as obj, mob/user as mob)
+/obj/item/weapon/gun/projectile/shotgun/boltaction/attackby(var/obj/item/A as obj, mob/user as mob, params)
if(!bolt_open)
user << "The bolt is closed!"
return
@@ -140,7 +140,7 @@
mag_type = /obj/item/ammo_box/magazine/internal/cylinder/dualshot
sawn_desc = "Omar's coming!"
-/obj/item/weapon/gun/projectile/revolver/doublebarrel/attackby(var/obj/item/A as obj, mob/user as mob)
+/obj/item/weapon/gun/projectile/revolver/doublebarrel/attackby(var/obj/item/A as obj, mob/user as mob, params)
..()
if(istype(A, /obj/item/ammo_box) || istype(A, /obj/item/ammo_casing))
chamber_round()
@@ -180,7 +180,7 @@
mag_type = /obj/item/ammo_box/magazine/internal/cylinder/improvised
sawn_desc = "I'm just here for the gasoline."
-/obj/item/weapon/gun/projectile/revolver/doublebarrel/improvised/attackby(var/obj/item/A as obj, mob/user as mob)
+/obj/item/weapon/gun/projectile/revolver/doublebarrel/improvised/attackby(var/obj/item/A as obj, mob/user as mob, params)
..()
if(istype(A, /obj/item/stack/cable_coil) && !sawn_state)
var/obj/item/stack/cable_coil/C = A
diff --git a/code/modules/reagents/Chemistry-Goon-420BlazeIt.dm b/code/modules/reagents/Chemistry-Goon-420BlazeIt.dm
index aacabb4a04d..2a0a1f7f700 100644
--- a/code/modules/reagents/Chemistry-Goon-420BlazeIt.dm
+++ b/code/modules/reagents/Chemistry-Goon-420BlazeIt.dm
@@ -143,4 +143,367 @@ datum/reagent/crank/addiction_act_stage4(var/mob/living/M as mob)
required_reagents = list("diphenhydramine" = 1, "morphine" = 1, "cleaner" = 1, "potassium" = 1, "phosphorus" = 1, "fuel" = 1)
result_amount = 6
mix_message = "The mixture dries into a pale blue powder."
- required_temp = 380
\ No newline at end of file
+ required_temp = 380
+
+/datum/reagent/methamphetamine
+ name = "Methamphetamine"
+ id = "methamphetamine"
+ description = "3x stun reduction per cycle, significant stamina regeneration buff, makes you really jittery, dramatically increases movement speed."
+ reagent_state = LIQUID
+ color = "#60A584" // rgb: 96, 165, 132
+ overdose_threshold = 20
+ addiction_threshold = 10
+ metabolization_rate = 0.6
+
+/datum/reagent/methamphetamine/on_mob_life(var/mob/living/M as mob)
+ if(!M) M = holder.my_atom
+ var/high_message = pick("You feel hyper.", "You feel like you need to go faster.", "You feel like you can run the world.")
+ if(prob(5))
+ M << "[high_message]"
+ M.AdjustParalysis(-3)
+ M.AdjustStunned(-3)
+ M.AdjustWeakened(-3)
+ M.adjustStaminaLoss(-3)
+ M.status_flags |= GOTTAGOREALLYFAST
+ M.Jitter(3)
+ M.adjustBrainLoss(0.5)
+ if(prob(5))
+ M.emote(pick("twitch", "shiver"))
+ ..()
+ return
+
+/datum/reagent/methamphetamine/overdose_process(var/mob/living/M as mob)
+ if(M.canmove && !istype(M.loc, /turf/space))
+ for(var/i = 0, i < 4, i++)
+ step(M, pick(cardinal))
+ if(prob(20))
+ M.emote("laugh")
+ if(prob(33))
+ M.visible_message("[M]'s hands flip out and flail everywhere!")
+ var/obj/item/I = M.get_active_hand()
+ if(I)
+ M.drop_item()
+ ..()
+ if(prob(20))
+ M.adjustToxLoss(5)
+ M.adjustBrainLoss(pick(0.5, 0.6, 0.7, 0.8, 0.9, 1))
+ return
+
+/datum/reagent/methamphetamine/addiction_act_stage1(var/mob/living/M as mob)
+ M.Jitter(5)
+ if(prob(20))
+ M.emote(pick("twitch","drool","moan"))
+ ..()
+ return
+/datum/reagent/methamphetamine/addiction_act_stage2(var/mob/living/M as mob)
+ M.Jitter(10)
+ M.Dizzy(10)
+ if(prob(30))
+ M.emote(pick("twitch","drool","moan"))
+ ..()
+ return
+/datum/reagent/methamphetamine/addiction_act_stage3(var/mob/living/M as mob)
+ if(M.canmove && !istype(M.loc, /turf/space))
+ for(var/i = 0, i < 4, i++)
+ step(M, pick(cardinal))
+ M.Jitter(15)
+ M.Dizzy(15)
+ if(prob(40))
+ M.emote(pick("twitch","drool","moan"))
+ ..()
+ return
+/datum/reagent/methamphetamine/addiction_act_stage4(var/mob/living/carbon/human/M as mob)
+ if(M.canmove && !istype(M.loc, /turf/space))
+ for(var/i = 0, i < 8, i++)
+ step(M, pick(cardinal))
+ M.Jitter(20)
+ M.Dizzy(20)
+ M.adjustToxLoss(5)
+ if(prob(50))
+ M.emote(pick("twitch","drool","moan"))
+ ..()
+ return
+
+/datum/chemical_reaction/methamphetamine
+ name = "methamphetamine"
+ id = "methamphetamine"
+ result = "methamphetamine"
+ required_reagents = list("ephedrine" = 1, "iodine" = 1, "phosphorous" = 1, "hydrogen" = 1)
+ result_amount = 4
+ required_temp = 374
+
+/datum/chemical_reaction/methamphetamine_two
+ name = "methamphetamine_two"
+ id = "methamphetamine_two"
+ result = "methamphetamine"
+ required_reagents = list("muriatic_acid" = 1, "caustic_soda" = 1, "hydrogen_chloride" = 1)
+ result_amount = 3
+ required_temp = 374
+
+/datum/reagent/muriatic_acid
+ name = "Muriatic Acid"
+ id = "muriatic_acid"
+ description = "A chemical compound."
+ reagent_state = LIQUID
+ color = "#60A584" // rgb: 96, 165, 132
+
+/datum/reagent/caustic_soda
+ name = "Caustic Soda"
+ id = "caustic_soda"
+ description = "A chemical compound."
+ reagent_state = LIQUID
+ color = "#60A584" // rgb: 96, 165, 132
+
+/datum/reagent/hydrogen_chloride
+ name = "Hydrogen Chloride"
+ id = "hydrogen_chloride"
+ description = "A chemical compound."
+ reagent_state = LIQUID
+ color = "#60A584" // rgb: 96, 165, 132
+
+/datum/chemical_reaction/muriatic_acid
+ name = "muriatic_acid"
+ id = "muriatic_acid"
+ result = "muriatic_acid"
+ required_reagents = list("mutadone" = 1, "sacid" = 1)
+ result_amount = 2
+ required_temp = 500
+
+/datum/chemical_reaction/caustic_soda
+ name = "caustic_soda"
+ id = "caustic_soda"
+ result = "caustic_soda"
+ required_reagents = list("sacid" = 1, "cola" = 1)
+ result_amount = 2
+ required_temp = 500
+
+/datum/chemical_reaction/hydrogen_chloride
+ name = "hydrogen_chloride"
+ id = "hydrogen_chloride"
+ result = "hydrogen_chloride"
+ required_reagents = list("hydrogen" = 1, "chlorine" = 1)
+ result_amount = 2
+ required_temp = 500
+
+/datum/chemical_reaction/saltpetre
+ name = "saltpetre"
+ id = "saltpetre"
+ result = "saltpetre"
+ required_reagents = list("potassium" = 1, "nitrogen" = 1, "oxygen" = 3)
+ result_amount = 3
+
+/datum/reagent/saltpetre
+ name = "Saltpetre"
+ id = "saltpetre"
+ description = "Volatile."
+ reagent_state = LIQUID
+ color = "#60A584" // rgb: 96, 165, 132
+
+/datum/reagent/bath_salts
+ name = "Bath Salts"
+ id = "bath_salts"
+ description = "Makes you nearly impervious to stuns and grants a stamina regeneration buff, but you will be a nearly uncontrollable tramp-bearded raving lunatic."
+ reagent_state = LIQUID
+ color = "#60A584" // rgb: 96, 165, 132
+ overdose_threshold = 20
+ addiction_threshold = 10
+
+
+/datum/reagent/bath_salts/on_mob_life(var/mob/living/M as mob)
+ if(!M) M = holder.my_atom
+ var/high_message = pick("You feel amped up.", "You feel ready.", "You feel like you can push it to the limit.")
+ if(prob(5))
+ M << "[high_message]"
+ M.AdjustParalysis(-5)
+ M.AdjustStunned(-5)
+ M.AdjustWeakened(-5)
+ M.adjustStaminaLoss(-10)
+ M.adjustBrainLoss(1)
+ M.adjustToxLoss(0.1)
+ M.hallucination += 10
+ if(M.canmove && !istype(M.loc, /turf/space))
+ step(M, pick(cardinal))
+ step(M, pick(cardinal))
+ ..()
+ return
+
+/datum/chemical_reaction/bath_salts
+ name = "bath_salts"
+ id = "bath_salts"
+ result = "bath_salts"
+ required_reagents = list("????" = 1, "saltpetre" = 1, "nutriment" = 1, "cleaner" = 1, "enzyme" = 1, "tea" = 1, "mercury" = 1)
+ result_amount = 7
+ required_temp = 374
+
+/datum/reagent/bath_salts/overdose_process(var/mob/living/M as mob)
+ M.hallucination += 10
+ if(M.canmove && !istype(M.loc, /turf/space))
+ for(var/i = 0, i < 8, i++)
+ step(M, pick(cardinal))
+ if(prob(20))
+ M.emote(pick("twitch","drool","moan"))
+ if(prob(33))
+ var/obj/item/I = M.get_active_hand()
+ if(I)
+ M.drop_item()
+ ..()
+ return
+
+/datum/reagent/bath_salts/addiction_act_stage1(var/mob/living/M as mob)
+ M.hallucination += 10
+ if(M.canmove && !istype(M.loc, /turf/space))
+ for(var/i = 0, i < 8, i++)
+ step(M, pick(cardinal))
+ M.Jitter(5)
+ M.adjustBrainLoss(10)
+ if(prob(20))
+ M.emote(pick("twitch","drool","moan"))
+ ..()
+ return
+/datum/reagent/bath_salts/addiction_act_stage2(var/mob/living/M as mob)
+ M.hallucination += 20
+ if(M.canmove && !istype(M.loc, /turf/space))
+ for(var/i = 0, i < 8, i++)
+ step(M, pick(cardinal))
+ M.Jitter(10)
+ M.Dizzy(10)
+ M.adjustBrainLoss(10)
+ if(prob(30))
+ M.emote(pick("twitch","drool","moan"))
+ ..()
+ return
+/datum/reagent/bath_salts/addiction_act_stage3(var/mob/living/M as mob)
+ M.hallucination += 30
+ if(M.canmove && !istype(M.loc, /turf/space))
+ for(var/i = 0, i < 12, i++)
+ step(M, pick(cardinal))
+ M.Jitter(15)
+ M.Dizzy(15)
+ M.adjustBrainLoss(10)
+ if(prob(40))
+ M.emote(pick("twitch","drool","moan"))
+ ..()
+ return
+/datum/reagent/bath_salts/addiction_act_stage4(var/mob/living/carbon/human/M as mob)
+ M.hallucination += 40
+ if(M.canmove && !istype(M.loc, /turf/space))
+ for(var/i = 0, i < 16, i++)
+ step(M, pick(cardinal))
+ M.Jitter(50)
+ M.Dizzy(50)
+ M.adjustToxLoss(5)
+ M.adjustBrainLoss(10)
+ if(prob(50))
+ M.emote(pick("twitch","drool","moan"))
+ ..()
+ return
+
+/datum/chemical_reaction/aranesp
+ name = "aranesp"
+ id = "aranesp"
+ result = "aranesp"
+ required_reagents = list("epinephrine" = 1, "atropine" = 1, "morphine" = 1)
+ result_amount = 3
+
+/datum/reagent/aranesp
+ name = "Aranesp"
+ id = "aranesp"
+ description = "Volatile."
+ reagent_state = LIQUID
+ color = "#60A584" // rgb: 96, 165, 132
+
+/datum/reagent/aranesp/on_mob_life(var/mob/living/M as mob)
+ if(!M) M = holder.my_atom
+ var/high_message = pick("You feel amped up.", "You feel ready.", "You feel like you can push it to the limit.")
+ if(prob(5))
+ M << "[high_message]"
+ M.adjustStaminaLoss(-35)
+ M.adjustToxLoss(1)
+ if(prob(rand(1,100)))
+ M.losebreath++
+ M.adjustOxyLoss(20)
+ ..()
+ return
+
+/obj/item/weapon/reagent_containers/food/drinks/muriatic_acid
+ name = "jug of muriatic acid"
+ desc = "We needed those cooks."
+ icon_state = "chem_jug"
+ item_state = "carton"
+ list_reagents = list("muriatic_acid" = 50)
+
+/obj/item/weapon/reagent_containers/food/drinks/caustic_soda
+ name = "jug of caustic soda"
+ desc = "We needed those cooks."
+ icon_state = "chem_jug"
+ item_state = "carton"
+ list_reagents = list("caustic_soda" = 50)
+
+/obj/item/weapon/reagent_containers/food/drinks/hydrogen_chloride
+ name = "jug of hydrogen chloride"
+ desc = "We needed those cooks."
+ icon_state = "chem_jug"
+ item_state = "carton"
+ list_reagents = list("hydrogen_chloride" = 50)
+
+datum/reagent/hotline
+ name = "Hotline"
+ id = "hotline"
+ description = "It isn't just wrong. It's dead wrong."
+ reagent_state = LIQUID
+ color = "#60A584" // rgb: 96, 165, 132
+ overdose_threshold = 15
+ addiction_threshold = 10
+
+datum/reagent/hotline/on_mob_life(var/mob/living/M as mob)
+ if(!M) M = holder.my_atom
+ var/high_message = pick("You feel alert.", "You feel like you can see everything more clearly.", "You feel like you need to relax and examine your surroundings.")
+ if(prob(5))
+ M << "[high_message]"
+ M.druggy = max(M.druggy, 15)
+ M.hallucination += 10
+ M.adjustBrainLoss(0.2)
+ M.adjustBruteLoss(-0.2)
+ M.adjustFireLoss(-0.2)
+ M.status_flags |= GOTTAGOFAST
+ M.adjustStaminaLoss(-3)
+ ..()
+ return
+datum/reagent/hotline/overdose_process(var/mob/living/M as mob)
+ M.adjustBrainLoss(rand(1,20)*REM)
+ M.adjustToxLoss(rand(1,20)*REM)
+ M.adjustBruteLoss(rand(1,20)*REM)
+ M.druggy = max(M.druggy, 30)
+ M.hallucination += 30
+ if(prob(5))
+ M << pick("Your head feels like it's ripping apart!","You wonder why the fuck did you decide to take [src.name].","It hurts so bad!","Please, end it now!","Dear [ticker.Bible_deity_name] please no it hurts!")
+ ..()
+ return
+
+datum/reagent/hotline/addiction_act_stage1(var/mob/living/M as mob)
+ M.adjustBrainLoss(rand(1,10))
+ M.hallucination += 30
+ M.druggy = max(M.druggy, 30)
+ ..()
+ return
+datum/reagent/hotline/addiction_act_stage2(var/mob/living/M as mob)
+ M.adjustBrainLoss(rand(1,20))
+ M.hallucination += 30
+ M.druggy = max(M.druggy, 30)
+ ..()
+ return
+datum/reagent/hotline/addiction_act_stage3(var/mob/living/M as mob)
+ M.adjustBrainLoss(rand(1,30))
+ M.hallucination += 30
+ M.druggy = max(M.druggy, 30)
+ ..()
+ return
+datum/reagent/hotline/addiction_act_stage4(var/mob/living/M as mob)
+ M.adjustBrainLoss(rand(1,30))
+ M.hallucination += 30
+ M.druggy = max(M.druggy, 30)
+ if(prob(1))
+ M.visible_message("[M] clutches at their chest! It looks like they're having a heart attack!")
+ M.adjustBruteLoss(80) // don't do drugs kids
+ ..()
+ return
\ No newline at end of file
diff --git a/code/modules/reagents/Chemistry-Goon-Medicine.dm b/code/modules/reagents/Chemistry-Goon-Medicine.dm
index 15390331f45..9ccbf1fd622 100644
--- a/code/modules/reagents/Chemistry-Goon-Medicine.dm
+++ b/code/modules/reagents/Chemistry-Goon-Medicine.dm
@@ -62,15 +62,15 @@ datum/reagent/styptic_powder/on_mob_life(var/mob/living/M as mob)
datum/reagent/salglu_solution
name = "Saline-Glucose Solution"
id = "salglu_solution"
- description = "33% chance per cycle of healing 3 point each of BRUTE and BURN damage."
+ description = "33% chance per cycle of healing 1 point each of BRUTE and BURN damage."
reagent_state = LIQUID
color = "#C8A5DC" // rgb: 200, 165, 220
datum/reagent/salglu_solution/on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
- if(prob(50))
- M.adjustBruteLoss(-3*REM)
- M.adjustFireLoss(-3*REM)
+ if(prob(33))
+ M.adjustBruteLoss(-1*REM)
+ M.adjustFireLoss(-1*REM)
..()
return
@@ -341,7 +341,7 @@ datum/reagent/ephedrine
datum/reagent/ephedrine/on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
- M.status_flags |= GOTTAGOFAST
+ M.status_flags |= IGNORESLOWDOWN
M.AdjustParalysis(-1)
M.AdjustStunned(-1)
M.AdjustWeakened(-1)
@@ -424,7 +424,7 @@ datum/reagent/morphine
datum/reagent/morphine/on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
- M.status_flags |= GOTTAGOFAST
+ M.status_flags |= IGNORESLOWDOWN
if(cycle_count == 36)
M.drowsyness += 1
cycle_count++
@@ -599,23 +599,15 @@ datum/reagent/epinephrine/overdose_process(var/mob/living/M as mob)
datum/reagent/strange_reagent
name = "Strange Reagent"
id = "strange_reagent"
- description = "A miracle medical chem, this little beauty can bring the dead back to life! ...Well, if you're careful that is. If the cadaver is rotten or has too much BRUTE/BURN damage, SR will gib them on use."
+ description = "A miracle medical chem, this little beauty can bring the dead back to life!"
reagent_state = LIQUID
color = "#C8A5DC" // rgb: 200, 165, 220
- metabolization_rate = 0.2
datum/reagent/strange_reagent/reaction_mob(var/mob/living/carbon/human/M as mob, var/method=TOUCH, var/volume)
if(M.stat == DEAD)
- if(M.getBruteLoss() >= 80 || M.getFireLoss() >= 80)
- if(ishuman(M) || ismonkey(M))
- var/mob/living/carbon/C_target = M
- var/obj/item/organ/brain/B = C_target.getorgan(/obj/item/organ/brain)
- if(B)
- B.loc = get_turf(C_target)
- B.transfer_identity(C_target)
- C_target.internal_organs -= B
- M.gib(M)
- return
+ if(M.getBruteLoss() >= 100 || M.getFireLoss() >= 100)
+ M.visible_message("[M]'s body convulses a bit, and then falls still once more.")
+ return
var/mob/dead/observer/ghost = M.get_ghost()
M.visible_message("[M]'s body convulses a bit.")
if(!M.suiciding && !ghost && !(NOCLONE in M.mutations))
@@ -629,7 +621,6 @@ datum/reagent/strange_reagent/reaction_mob(var/mob/living/carbon/human/M as mob,
hardset_dna(M, null, null, null, null, /datum/species/zombie)
..()
return
-
datum/reagent/strange_reagent/on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
if(prob(rand(1,100)))
@@ -664,7 +655,7 @@ datum/reagent/life
/datum/chemical_reaction/life/on_reaction(var/datum/reagents/holder, var/created_volume)
chemical_mob_spawn(holder, 1, "Life")
-proc/chemical_mob_spawn(var/datum/reagents/holder, var/amount_to_spawn, var/reaction_name)
+proc/chemical_mob_spawn(var/datum/reagents/holder, var/amount_to_spawn, var/reaction_name, var/mob_faction = "chemicalsummon")
if(holder && holder.my_atom)
var/blocked = list(/mob/living/simple_animal/hostile,
/mob/living/simple_animal/hostile/pirate,
@@ -713,7 +704,7 @@ proc/chemical_mob_spawn(var/datum/reagents/holder, var/amount_to_spawn, var/reac
for(var/i = 1, i <= amount_to_spawn, i++)
var/chosen = pick(critters)
var/mob/living/simple_animal/hostile/C = new chosen
- C.faction |= "chemicalsummon"
+ C.faction |= mob_faction
C.loc = get_turf(holder.my_atom)
if(prob(50))
for(var/j = 1, j <= rand(1, 3), j++)
@@ -798,7 +789,7 @@ datum/reagent/antihol/on_mob_life(var/mob/living/M as mob)
datum/reagent/stimulants/on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
- M.status_flags |= GOTTAGOFAST
+ M.status_flags |= IGNORESLOWDOWN
if(M.health < 50 && M.health > 0)
if(prob(50))
M.adjustOxyLoss(-5*REM)
@@ -819,3 +810,17 @@ datum/reagent/stimulants/overdose_process(var/mob/living/M as mob)
M.losebreath++
..()
return
+
+datum/reagent/insulin
+ name = "Insulin"
+ id = "insulin"
+ description = "Increases sugar depletion rates."
+ reagent_state = LIQUID
+ color = "#C8A5DC" // rgb: 200, 165, 220
+datum/reagent/insulin/on_mob_life(var/mob/living/M as mob)
+ if(!M) M = holder.my_atom
+ if(M.sleeping)
+ M.sleeping--
+ M.reagents.remove_reagent("sugar", 5)
+ ..()
+ return
diff --git a/code/modules/reagents/Chemistry-Goon-Other.dm b/code/modules/reagents/Chemistry-Goon-Other.dm
index 963e85a214c..13bb4cabef6 100644
--- a/code/modules/reagents/Chemistry-Goon-Other.dm
+++ b/code/modules/reagents/Chemistry-Goon-Other.dm
@@ -1,9 +1,10 @@
#define SOLID 1
#define LIQUID 2
#define GAS 3
-
#define REM REAGENTS_EFFECT_MULTIPLIER
+var/list/random_color_list = list("#00aedb","#a200ff","#f47835","#d41243","#d11141","#00b159","#00aedb","#f37735","#ffc425","#008744","#0057e7","#d62d20","#ffa700")
+
datum/reagent/oil
name = "Oil"
id = "oil"
@@ -39,6 +40,14 @@ datum/reagent/carpet
reagent_state = LIQUID
color = "#C8A5DC" // rgb: 200, 165, 220
+/datum/reagent/carpet/reaction_turf(var/turf/simulated/T, var/volume)
+ if(istype(T, /turf/simulated/floor/plating) || istype(T, /turf/simulated/floor/plasteel))
+ var/turf/simulated/floor/F = T
+ F.visible_message("[T] gets a layer of carpeting applied!")
+ F.ChangeTurf(/turf/simulated/floor/fancy/carpet)
+ ..()
+ return
+
datum/reagent/bromine
name = "Bromine"
id = "bromine"
@@ -81,6 +90,7 @@ datum/reagent/acetone
required_reagents = list("space_drugs" = 1, "blood" = 1)
result_amount = 2
+
/datum/chemical_reaction/oil
name = "Oil"
id = "oil"
@@ -109,7 +119,6 @@ datum/reagent/colorful_reagent
description = "A solution."
reagent_state = LIQUID
color = "#C8A5DC" // rgb: 200, 165, 220
- var/list/potential_colors = list("#FF0000","#0000FF","#008000","#FFFF00")
/datum/chemical_reaction/colorful_reagent
name = "colorful_reagent"
@@ -118,19 +127,25 @@ datum/reagent/colorful_reagent
required_reagents = list("stable_plasma" = 1, "radium" = 1, "space_drugs" = 1, "cryoxadone" = 1, "triple_citrus" = 1)
result_amount = 5
+datum/reagent/colorful_reagent/on_mob_life(var/mob/living/M as mob)
+ if(M && isliving(M))
+ M.color = pick(random_color_list)
+ ..()
+ return
+
datum/reagent/colorful_reagent/reaction_mob(var/mob/living/M, var/volume)
if(M && isliving(M))
- M.color = pick(potential_colors)
+ M.color = pick(random_color_list)
..()
return
datum/reagent/colorful_reagent/reaction_obj(var/obj/O, var/volume)
if(O)
- O.color = pick(potential_colors)
+ O.color = pick(random_color_list)
..()
return
datum/reagent/colorful_reagent/reaction_turf(var/turf/T, var/volume)
if(T)
- T.color = pick(potential_colors)
+ T.color = pick(random_color_list)
..()
return
@@ -148,3 +163,125 @@ datum/reagent/triple_citrus
result = "triple_citrus"
required_reagents = list("lemonjuice" = 1, "limejuice" = 1, "orangejuice" = 1)
result_amount = 5
+
+datum/reagent/corn_starch
+ name = "Corn Starch"
+ id = "corn_starch"
+ description = "A slippery solution."
+ reagent_state = LIQUID
+ color = "#C8A5DC" // rgb: 200, 165, 220
+
+/datum/chemical_reaction/corn_syrup
+ name = "corn_syrup"
+ id = "corn_syrup"
+ result = "corn_syrup"
+ required_reagents = list("corn_starch" = 1, "sacid" = 1)
+ result_amount = 5
+ required_temp = 374
+
+datum/reagent/corn_syrup
+ name = "Corn Syrup"
+ id = "corn_syrup"
+ description = "Decays into sugar."
+ reagent_state = LIQUID
+ color = "#C8A5DC" // rgb: 200, 165, 220
+
+datum/reagent/corn_syrup/on_mob_life(var/mob/living/M as mob)
+ if(!M) M = holder.my_atom
+ M.reagents.add_reagent("sugar", 3)
+ M.reagents.remove_reagent("corn_syrup", 1)
+ ..()
+ return
+
+/datum/chemical_reaction/corgium
+ name = "corgium"
+ id = "corgium"
+ result = "corgium"
+ required_reagents = list("nutriment" = 1, "colorful_reagent" = 1, "strange_reagent" = 1, "blood" = 1)
+ result_amount = 3
+ required_temp = 374
+
+datum/reagent/corgium
+ name = "Corgium"
+ id = "corgium"
+ description = "Creates a corgi at the reaction location."
+ reagent_state = LIQUID
+ color = "#C8A5DC" // rgb: 200, 165, 220
+
+/datum/chemical_reaction/corgium/on_reaction(var/datum/reagents/holder, var/created_volume)
+ var/location = get_turf(holder.my_atom)
+ new /mob/living/simple_animal/corgi(location)
+ ..()
+ return
+
+datum/reagent/hair_dye
+ name = "Quantum Hair Dye"
+ id = "hair_dye"
+ description = "A solution."
+ reagent_state = LIQUID
+ color = "#C8A5DC" // rgb: 200, 165, 220
+ var/list/potential_colors = list("0ad","a0f","f73","d14","d14","0b5","0ad","f73","fc2","084","05e","d22","fa0") // fucking hair code
+
+/datum/chemical_reaction/hair_dye
+ name = "hair_dye"
+ id = "hair_dye"
+ result = "hair_dye"
+ required_reagents = list("colorful_reagent" = 1, "radium" = 1, "space_drugs" = 1)
+ result_amount = 5
+
+datum/reagent/hair_dye/reaction_mob(var/mob/living/M, var/volume)
+ if(M && ishuman(M))
+ var/mob/living/carbon/human/H = M
+ H.hair_color = pick(potential_colors)
+ H.facial_hair_color = pick(potential_colors)
+ H.update_hair()
+ ..()
+ return
+
+datum/reagent/barbers_aid
+ name = "Barber's Aid"
+ id = "barbers_aid"
+ description = "A solution to hair loss across the world."
+ reagent_state = LIQUID
+ color = "#C8A5DC" // rgb: 200, 165, 220
+
+/datum/chemical_reaction/barbers_aid
+ name = "barbers_aid"
+ id = "barbers_aid"
+ result = "barbers_aid"
+ required_reagents = list("carpet" = 1, "radium" = 1, "space_drugs" = 1)
+ result_amount = 5
+
+datum/reagent/barbers_aid/reaction_mob(var/mob/living/M, var/volume)
+ if(M && ishuman(M))
+ var/mob/living/carbon/human/H = M
+ var/datum/sprite_accessory/hair/picked_hair = pick(hair_styles_list)
+ var/datum/sprite_accessory/facial_hair/picked_beard = pick(facial_hair_styles_list)
+ H.hair_style = picked_hair
+ H.facial_hair_style = picked_beard
+ H.update_hair()
+ ..()
+ return
+
+datum/reagent/concentrated_barbers_aid
+ name = "Concentrated Barber's Aid"
+ id = "concentrated_barbers_aid"
+ description = "A concentrated solution to hair loss across the world."
+ reagent_state = LIQUID
+ color = "#C8A5DC" // rgb: 200, 165, 220
+
+/datum/chemical_reaction/concentrated_barbers_aid
+ name = "concentrated_barbers_aid"
+ id = "concentrated_barbers_aid"
+ result = "concentrated_barbers_aid"
+ required_reagents = list("barbers_aid" = 1, "mutagen" = 1)
+ result_amount = 2
+
+datum/reagent/concentrated_barbers_aid/reaction_mob(var/mob/living/M, var/volume)
+ if(M && ishuman(M))
+ var/mob/living/carbon/human/H = M
+ H.hair_style = "Very Long Hair"
+ H.facial_hair_style = "Very Long Beard"
+ H.update_hair()
+ ..()
+ return
\ No newline at end of file
diff --git a/code/modules/reagents/Chemistry-Goon-Pyrotechnics.dm b/code/modules/reagents/Chemistry-Goon-Pyrotechnics.dm
index 777ec06fdf0..0d503e6164f 100644
--- a/code/modules/reagents/Chemistry-Goon-Pyrotechnics.dm
+++ b/code/modules/reagents/Chemistry-Goon-Pyrotechnics.dm
@@ -4,23 +4,16 @@
#define REM REAGENTS_EFFECT_MULTIPLIER
-/* commented out until further notice
-
/datum/reagent/clf3
name = "Chlorine Trifluoride"
id = "clf3"
description = "Makes a temporary 3x3 fireball when it comes into existence, so be careful when mixing. ClF3 applied to a surface burns things that wouldn't otherwise burn, sometimes through the very floors of the station and exposing it to the vacuum of space."
reagent_state = LIQUID
- color = "#60A584" rgb: 96, 165, 132
-
-
-/datum/reagent/clf3/on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- ..()
- return
+ color = "#60A584" // rgb: 96, 165, 132
+ metabolization_rate = 4
/datum/chemical_reaction/clf3
- name = "Chlorine Trifluoride"
+ name = "Chlorine Trifluoride"
id = "clf3"
result = "clf3"
required_reagents = list("chlorine" = 1, "fluorine" = 3)
@@ -28,47 +21,44 @@
required_temp = 424
/datum/reagent/clf3/on_mob_life(var/mob/living/M as mob)
- if(!M) M = holder.my_atom
- M.adjustFireLoss(1*REM)
+ if(!M) M = holder.my_atom
+ M.adjust_fire_stacks(5)
+ M.IgniteMob()
+ M.adjustFireLoss(5*REM)
..()
return
- /datum/chemical_reaction/clf3/on_reaction(var/datum/reagents/holder, var/created_volume)
+/datum/chemical_reaction/clf3/on_reaction(var/datum/reagents/holder, var/created_volume)
var/turf/simulated/T = get_turf(holder.my_atom)
for(var/turf/simulated/turf in range(1,T))
new /obj/effect/hotspot(turf)
+ holder.chem_temp = 1000 // hot as shit
return
/datum/reagent/clf3/reaction_turf(var/turf/simulated/T, var/volume)
- if(istype(T, /turf/simulated/floor/))
- var/turf/simulated/floor/F = T
- if(prob(66))
- F.make_plating()
- if(prob(1))
- F.ChangeTurf(/turf/space)
- if(istype(F, /turf/simulated/floor/))
- new /obj/effect/hotspot(F)
- if(istype(T, /turf/simulated/wall/))
- var/turf/simulated/wall/W = T
- if(prob(66))
- W.ChangeTurf(/turf/simulated/floor)
if(istype(T, /turf/simulated/floor/plating))
var/turf/simulated/floor/plating/F = T
if(prob(1))
F.ChangeTurf(/turf/space)
+ if(istype(T, /turf/simulated/floor/))
+ var/turf/simulated/floor/F = T
+ if(prob(volume/10))
+ F.make_plating()
+ if(istype(F, /turf/simulated/floor/))
+ new /obj/effect/hotspot(F)
+ if(istype(T, /turf/simulated/wall/))
+ var/turf/simulated/wall/W = T
+ if(prob(volume/10))
+ W.ChangeTurf(/turf/simulated/floor)
return
/datum/reagent/clf3/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume)
- if(!istype(M, /mob/living))
- return
- if(method == TOUCH)
- M.adjust_fire_stacks(20)
+ if(method == TOUCH && ishuman(M))
+ M.adjust_fire_stacks(5)
M.IgniteMob()
new /obj/effect/hotspot(M.loc)
return
-*/
-
/datum/reagent/sorium
name = "Sorium"
id = "sorium"
@@ -141,4 +131,38 @@ proc/goonchem_vortex(var/turf/simulated/T, var/setting_type, var/range, var/pull
step_away(X,T)
else
for(var/i = 0, i < pull_times, i++)
- step_towards(X,T)
\ No newline at end of file
+ step_towards(X,T)
+
+/datum/reagent/blackpowder
+ name = "Black Powder"
+ id = "blackpowder"
+ description = "Explodes. Violently."
+ reagent_state = LIQUID
+ color = "#000000" //rgb: 96, 165, 132
+ metabolization_rate = 0.05
+
+/datum/chemical_reaction/blackpowder
+ name = "Black Powder"
+ id = "blackpowder"
+ result = "blackpowder"
+ required_reagents = list("saltpetre" = 1, "charcoal" = 1, "sulfur" = 1)
+ result_amount = 3
+
+/datum/chemical_reaction/blackpowder_explosion
+ name = "Black Powder Kaboom"
+ id = "blackpowder_explosion"
+ result = null
+ required_reagents = list("blackpowder" = 1)
+ result_amount = 1
+ required_temp = 474
+ mix_message = "Sparks start flying around the black powder!"
+
+/datum/chemical_reaction/blackpowder_explosion/on_reaction(var/datum/reagents/holder, var/created_volume)
+ sleep(rand(50,100))
+ var/turf/simulated/T = get_turf(holder.my_atom)
+ var/ex_severe = round(created_volume / 10)
+ var/ex_heavy = round(created_volume / 8)
+ var/ex_light = round(created_volume / 6)
+ var/ex_flash = round(created_volume / 4)
+ explosion(T,ex_severe,ex_heavy,ex_light,ex_flash, 1)
+ return
\ No newline at end of file
diff --git a/code/modules/reagents/Chemistry-Holder.dm b/code/modules/reagents/Chemistry-Holder.dm
index 30955e51207..6041066d737 100644
--- a/code/modules/reagents/Chemistry-Holder.dm
+++ b/code/modules/reagents/Chemistry-Holder.dm
@@ -202,6 +202,9 @@ datum/reagents/proc/trans_id_to(var/obj/target, var/reagent, var/amount=1, var/p
*/
datum/reagents/proc/metabolize(var/mob/M)
+ if(M)
+ chem_temp = M.bodytemperature
+ handle_reactions()
if(last_tick == 3)
last_tick = 1
for(var/A in reagent_list)
@@ -211,6 +214,7 @@ datum/reagents/proc/metabolize(var/mob/M)
if(R.volume >= R.overdose_threshold && !R.overdosed && R.overdose_threshold > 0)
R.overdosed = 1
M << "You feel like you took too much of [R.name]!"
+ R.overdose_start(M)
if(R.volume >= R.addiction_threshold && !is_type_in_list(R, addiction_list) && R.addiction_threshold > 0)
var/datum/reagent/new_reagent = new R.type()
addiction_list.Add(new_reagent)
@@ -359,19 +363,35 @@ datum/reagents/proc/del_reagent(var/reagent)
del(A)
update_total()
my_atom.on_reagent_change()
+ check_ignoreslow(my_atom)
check_gofast(my_atom)
+ check_goreallyfast(my_atom)
return 0
return 1
+datum/reagents/proc/check_ignoreslow(var/mob/M)
+ if(istype(M, /mob))
+ if(M.reagents.has_reagent("morphine")||M.reagents.has_reagent("ephedrine"))
+ return 1
+ else
+ M.status_flags &= ~IGNORESLOWDOWN
+
datum/reagents/proc/check_gofast(var/mob/M)
if(istype(M, /mob))
- if(M.reagents.has_reagent("morphine")||M.reagents.has_reagent("unholywater")||M.reagents.has_reagent("nuka_cola"))
+ if(M.reagents.has_reagent("unholywater")||M.reagents.has_reagent("nuka_cola")||M.reagents.has_reagent("hotline"))
return 1
else
M.status_flags &= ~GOTTAGOFAST
+datum/reagents/proc/check_goreallyfast(var/mob/M)
+ if(istype(M, /mob))
+ if(M.reagents.has_reagent("methamphetamine"))
+ return 1
+ else
+ M.status_flags &= ~GOTTAGOREALLYFAST
+
datum/reagents/proc/update_total()
total_volume = 0
for(var/datum/reagent/R in reagent_list)
diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm
index 01c2b9cf303..afe348ac2a5 100644
--- a/code/modules/reagents/Chemistry-Machinery.dm
+++ b/code/modules/reagents/Chemistry-Machinery.dm
@@ -145,7 +145,7 @@
add_fingerprint(usr)
return 1 // update UIs attached to this object
-/obj/machinery/chem_dispenser/attackby(var/obj/item/weapon/reagent_containers/glass/B as obj, var/mob/user as mob)
+/obj/machinery/chem_dispenser/attackby(var/obj/item/weapon/reagent_containers/glass/B as obj, var/mob/user as mob, params)
if(isrobot(user))
return
@@ -223,7 +223,7 @@
for(i=1, i<=M.rating, i++)
dispensable_reagents = sortList(dispensable_reagents | special_reagents[i])
-/obj/machinery/chem_dispenser/constructable/attackby(var/obj/item/I, var/mob/user)
+/obj/machinery/chem_dispenser/constructable/attackby(var/obj/item/I, var/mob/user, params)
..()
if(default_deconstruction_screwdriver(user, "minidispenser-o", "minidispenser", I))
return
@@ -279,7 +279,7 @@
stat |= NOPOWER
-/obj/machinery/chem_master/attackby(var/obj/item/B as obj, var/mob/user as mob)
+/obj/machinery/chem_master/attackby(var/obj/item/B as obj, var/mob/user as mob, params)
if(default_unfasten_wrench(user, B))
return
@@ -850,7 +850,7 @@ obj/machinery/computer/pandemic/proc/replicator_cooldown(var/waittime)
return
-/obj/machinery/computer/pandemic/attackby(var/obj/I as obj, var/mob/user as mob)
+/obj/machinery/computer/pandemic/attackby(var/obj/I as obj, var/mob/user as mob, params)
if(istype(I, /obj/item/weapon/reagent_containers/glass))
if(stat & (NOPOWER|BROKEN)) return
if(src.beaker)
@@ -938,6 +938,7 @@ obj/machinery/computer/pandemic/proc/replicator_cooldown(var/waittime)
var/list/juice_items = list (
//Juicer Stuff
+ /obj/item/weapon/reagent_containers/food/snacks/grown/corn = list("corn_starch" = 0),
/obj/item/weapon/reagent_containers/food/snacks/grown/tomato = list("tomatojuice" = 0),
/obj/item/weapon/reagent_containers/food/snacks/grown/carrot = list("carrotjuice" = 0),
/obj/item/weapon/reagent_containers/food/snacks/grown/berries = list("berryjuice" = 0),
@@ -972,7 +973,7 @@ obj/machinery/computer/pandemic/proc/replicator_cooldown(var/waittime)
return
-/obj/machinery/reagentgrinder/attackby(var/obj/item/O as obj, var/mob/user as mob)
+/obj/machinery/reagentgrinder/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
if(default_unfasten_wrench(user, O))
return
@@ -1317,7 +1318,7 @@ obj/machinery/computer/pandemic/proc/replicator_cooldown(var/waittime)
idle_power_usage = 40
var/obj/item/weapon/reagent_containers/beaker = null
var/desired_temp = 300
- var/heater_coefficient = 0.15
+ var/heater_coefficient = 0.10
var/on = FALSE
/obj/machinery/chem_heater/New()
@@ -1329,7 +1330,7 @@ obj/machinery/computer/pandemic/proc/replicator_cooldown(var/waittime)
RefreshParts()
/obj/machinery/chem_heater/RefreshParts()
- heater_coefficient = 0.15
+ heater_coefficient = 0.10
for(var/obj/item/weapon/stock_parts/micro_laser/M in component_parts)
heater_coefficient *= M.rating
@@ -1340,14 +1341,14 @@ obj/machinery/computer/pandemic/proc/replicator_cooldown(var/waittime)
var/state_change = 0
if(on)
if(beaker)
- if(beaker.reagents.chem_temp != desired_temp)
- beaker.reagents.chem_temp += ((desired_temp - beaker.reagents.chem_temp) * heater_coefficient)
+ if(beaker.reagents.chem_temp > desired_temp)
+ beaker.reagents.chem_temp += min(-1, (desired_temp - beaker.reagents.chem_temp) * heater_coefficient)
+ if(beaker.reagents.chem_temp < desired_temp)
+ beaker.reagents.chem_temp += max(1, (desired_temp - beaker.reagents.chem_temp) * heater_coefficient)
+ beaker.reagents.chem_temp = round(beaker.reagents.chem_temp) //stops stuff like 456.12312312302
- beaker.reagents.chem_temp = round(beaker.reagents.chem_temp) //stops stuff like 456.12312312302
- if(beaker.reagents.chem_temp == ((desired_temp-3) || (desired_temp+3)))//need better way to stop superdecimals and rounding drops
- beaker.reagents.chem_temp = desired_temp
- beaker.reagents.handle_reactions()
- state_change = 1
+ beaker.reagents.handle_reactions()
+ state_change = 1
if(state_change)
SSnano.update_uis(src)
@@ -1368,7 +1369,7 @@ obj/machinery/computer/pandemic/proc/replicator_cooldown(var/waittime)
stat |= NOPOWER
SSnano.update_uis(src)
-/obj/machinery/chem_heater/attackby(var/obj/item/I as obj, var/mob/user as mob)
+/obj/machinery/chem_heater/attackby(var/obj/item/I as obj, var/mob/user as mob, params)
if(isrobot(user))
return
diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents.dm
index 1092aad49c7..1d5ab597f80 100644
--- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents.dm
@@ -97,6 +97,9 @@ datum/reagent/proc/on_update(var/atom/A)
datum/reagent/proc/overdose_process(var/mob/living/M as mob)
return
+datum/reagent/proc/overdose_start(var/mob/living/M as mob)
+ return
+
datum/reagent/proc/addiction_act_stage1(var/mob/living/M as mob)
if(prob(30))
M << "You feel like some [name] right about now."
@@ -117,7 +120,6 @@ datum/reagent/proc/addiction_act_stage4(var/mob/living/M as mob)
M << "You're not feeling good at all! You really need some [name]."
return
-
datum/reagent/blood
data = list("donor"=null,"viruses"=null,"blood_DNA"=null,"blood_type"=null,"resistances"=null,"trace_chem"=null,"mind"=null,"ckey"=null,"gender"=null,"real_name"=null,"cloneable"=null,"factions"=null)
name = "Blood"
diff --git a/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm
index cc00c95189d..966bcd00c57 100644
--- a/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm
@@ -52,6 +52,25 @@ datum/reagent/consumable/sugar
reagent_state = SOLID
color = "#FFFFFF" // rgb: 255, 255, 255
nutriment_factor = 10 * REAGENTS_METABOLISM
+ metabolization_rate = 2 * REAGENTS_METABOLISM
+ overdose_threshold = 200 // Hyperglycaemic shock
+
+datum/reagent/consumable/sugar/on_mob_life(var/mob/living/M as mob)
+ if(M.satiety > -200)
+ M.satiety -= 20 //eating sugar makes you more hungry over time by making your hunger drop faster.
+ M.nutrition += max(((NUTRITION_LEVEL_FED + 50) - M.nutrition )/100, 0) * nutriment_factor // sugar doesn't help your hunger if your stomach is nearly full
+ holder.remove_reagent(src.id, metabolization_rate)
+
+datum/reagent/consumable/sugar/overdose_start(var/mob/living/M as mob)
+ M << "You go into hyperglycaemic shock! Lay off the twinkies!"
+ M.sleeping += 30
+ ..()
+ return
+
+datum/reagent/consumable/sugar/overdose_process(var/mob/living/M as mob)
+ M.sleeping += 3
+ ..()
+ return
datum/reagent/consumable/virus_food
name = "Virus Food"
diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm
index cdd38bda439..2e52dc0ba70 100644
--- a/code/modules/reagents/Chemistry-Recipes.dm
+++ b/code/modules/reagents/Chemistry-Recipes.dm
@@ -183,8 +183,8 @@ silicate
name = "Sodium Chloride"
id = "sodiumchloride"
result = "sodiumchloride"
- required_reagents = list("sodium" = 1, "chlorine" = 1)
- result_amount = 2
+ required_reagents = list("water" = 1, "sodium" = 1, "chlorine" = 1)
+ result_amount = 3
/datum/chemical_reaction/flash_powder
name = "Flash powder"
@@ -603,7 +603,7 @@ datum/chemical_reaction/pestkiller
O.show_message(text("The slime extract begins to vibrate violently !"), 1)
spawn(50)
- chemical_mob_spawn(holder, 1, "Gold Slime")
+ chemical_mob_spawn(holder, 5, "Gold Slime")
/datum/chemical_reaction/slimecritlesser
name = "Slime Crit Lesser"
@@ -619,7 +619,7 @@ datum/chemical_reaction/pestkiller
O.show_message(text("The slime extract begins to vibrate violently !"), 1)
spawn(50)
- chemical_mob_spawn(holder, 1, "Lesser Gold Slime")
+ chemical_mob_spawn(holder, 1, "Lesser Gold Slime", "neutral")
//Silver
/datum/chemical_reaction/slimebork
diff --git a/code/modules/reagents/grenade_launcher.dm b/code/modules/reagents/grenade_launcher.dm
index ffe53c751d5..0ae8523e6f8 100644
--- a/code/modules/reagents/grenade_launcher.dm
+++ b/code/modules/reagents/grenade_launcher.dm
@@ -16,7 +16,7 @@
..()
user << "[grenades] / [max_grenades] grenades loaded."
-/obj/item/weapon/gun/grenadelauncher/attackby(obj/item/I as obj, mob/user as mob)
+/obj/item/weapon/gun/grenadelauncher/attackby(obj/item/I as obj, mob/user as mob, params)
if((istype(I, /obj/item/weapon/grenade)))
if(grenades.len < max_grenades)
diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm
index 43fd8047020..540db68b85c 100644
--- a/code/modules/reagents/reagent_containers/glass.dm
+++ b/code/modules/reagents/reagent_containers/glass.dm
@@ -204,7 +204,7 @@
volume = 70
flags = OPENCONTAINER
-/obj/item/weapon/reagent_containers/glass/bucket/attackby(var/obj/D, mob/user as mob)
+/obj/item/weapon/reagent_containers/glass/bucket/attackby(var/obj/D, mob/user as mob, params)
if(isprox(D))
user << "You add [D] to [src]."
qdel(D)
diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm
index 8a0afbfe290..16b8d2a05d2 100644
--- a/code/modules/reagents/reagent_containers/hypospray.dm
+++ b/code/modules/reagents/reagent_containers/hypospray.dm
@@ -91,17 +91,13 @@
else
usr << "It is spent."
-/obj/item/weapon/reagent_containers/hypospray/medipen/leporazine //basilisks
- name = "leporazine medipen"
- desc = "A rapid way to regulate your body's temperature in the event of a hardsuit malfunction at the cost of some shortness of breath."
- icon_state = "lepopen"
- list_reagents = list("leporazine" = 9, "lexorin" = 1)
-
/obj/item/weapon/reagent_containers/hypospray/medipen/stimpack //goliath kiting
- name = "ephedrine medipen"
- desc = "A rapid way to stimulate your body's adrenaline, allowing for freer movement in restrictive armor at the cost of some shortness of breath."
+ name = "stimpack medipen"
+ desc = "A rapid way to stimulate your body's adrenaline, allowing for freer movement in restrictive armor as well as a ."
icon_state = "stimpen"
- list_reagents = list("ephedrine" = 9, "lexorin" = 1)
+ volume = 20
+ amount_per_transfer_from_this = 20
+ list_reagents = list("ephedrine" = 10, "coffee" = 10)
/obj/item/weapon/reagent_containers/hypospray/medipen/morphine
name = "morphine medipen"
diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm
index dfdb24a2863..e663258acc7 100644
--- a/code/modules/reagents/reagent_containers/pill.dm
+++ b/code/modules/reagents/reagent_containers/pill.dm
@@ -134,3 +134,10 @@
icon_state = "pill5"
list_reagents = list("sal_acid" = 24)
roundstart = 1
+
+/obj/item/weapon/reagent_containers/pill/insulin
+ name = "insulin pill"
+ desc = "Handles hyperglycaemic coma."
+ icon_state = "pill5"
+ list_reagents = list("insulin" = 50)
+ roundstart = 1
\ No newline at end of file
diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm
index 6b75ddc95df..8c14b5d5b77 100644
--- a/code/modules/reagents/reagent_containers/syringes.dm
+++ b/code/modules/reagents/reagent_containers/syringes.dm
@@ -43,7 +43,7 @@
/obj/item/weapon/reagent_containers/syringe/attack_paw()
return attack_hand()
-/obj/item/weapon/reagent_containers/syringe/attackby(obj/item/I, mob/user)
+/obj/item/weapon/reagent_containers/syringe/attackby(obj/item/I, mob/user, params)
return
/obj/item/weapon/reagent_containers/syringe/afterattack(obj/target, mob/user , proximity)
diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm
index 2737d29e8e5..7d8a3147a9c 100644
--- a/code/modules/reagents/reagent_dispenser.dm
+++ b/code/modules/reagents/reagent_dispenser.dm
@@ -30,7 +30,7 @@
if(prob(50))
qdel(src)
-/obj/structure/reagent_dispensers/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/structure/reagent_dispensers/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
return
/obj/structure/reagent_dispensers/New()
@@ -153,7 +153,7 @@
user.put_in_hands(new /obj/item/weapon/reagent_containers/food/drinks/sillycup)
user.visible_message("[user] gets a cup from [src].","You get a cup from [src].")
-/obj/structure/reagent_dispensers/water_cooler/attackby(var/obj/item/I, var/mob/user)
+/obj/structure/reagent_dispensers/water_cooler/attackby(var/obj/item/I, var/mob/user, params)
if(istype(I, /obj/item/weapon/paper))
user.drop_item()
qdel(I)
diff --git a/code/modules/reagents/syringe_gun.dm b/code/modules/reagents/syringe_gun.dm
index 6e913260b32..3786555a0e8 100644
--- a/code/modules/reagents/syringe_gun.dm
+++ b/code/modules/reagents/syringe_gun.dm
@@ -58,7 +58,7 @@
return 1
-/obj/item/weapon/gun/syringe/attackby(var/obj/item/A as obj, mob/user as mob, var/show_msg = 1)
+/obj/item/weapon/gun/syringe/attackby(var/obj/item/A as obj, mob/user as mob, params, var/show_msg = 1)
if(istype(A, /obj/item/weapon/reagent_containers/syringe))
if(syringes.len < max_syringes)
user.drop_item()
diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm
index eb347345fb9..3d725cafcfd 100644
--- a/code/modules/recycling/conveyor2.dm
+++ b/code/modules/recycling/conveyor2.dm
@@ -115,7 +115,7 @@
break
// attack with item, place item on conveyor
-/obj/machinery/conveyor/attackby(var/obj/item/I, mob/user)
+/obj/machinery/conveyor/attackby(var/obj/item/I, mob/user, params)
if(istype(I, /obj/item/weapon/crowbar))
if(!(stat & BROKEN))
var/obj/item/conveyor_construct/C = new/obj/item/conveyor_construct(src.loc)
@@ -257,7 +257,7 @@
S.position = position
S.update()
-/obj/machinery/conveyor_switch/attackby(var/obj/item/I, mob/user)
+/obj/machinery/conveyor_switch/attackby(var/obj/item/I, mob/user, params)
if(istype(I, /obj/item/weapon/crowbar))
var/obj/item/conveyor_switch_construct/C = new/obj/item/conveyor_switch_construct(src.loc)
C.id = id
@@ -281,7 +281,7 @@
w_class = 4
var/id = "" //inherited by the belt
-/obj/item/conveyor_construct/attackby(obj/item/I, mob/user)
+/obj/item/conveyor_construct/attackby(obj/item/I, mob/user, params)
..()
if(istype(I, /obj/item/conveyor_switch_construct))
user << "You link the switch to the conveyor belt assembly."
diff --git a/code/modules/recycling/disposal-construction.dm b/code/modules/recycling/disposal-construction.dm
index 9cfa947a4aa..33b1ae0df0f 100644
--- a/code/modules/recycling/disposal-construction.dm
+++ b/code/modules/recycling/disposal-construction.dm
@@ -153,7 +153,7 @@
// wrench: (un)anchor
// weldingtool: convert to real pipe
-/obj/structure/disposalconstruct/attackby(var/obj/item/I, var/mob/user)
+/obj/structure/disposalconstruct/attackby(var/obj/item/I, var/mob/user, params)
var/nicetype = "pipe"
var/ispipe = is_pipe() // Indicates if we should change the level of this pipe
add_fingerprint(user)
diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm
index 6338b919ea1..f70795a8737 100644
--- a/code/modules/recycling/disposal.dm
+++ b/code/modules/recycling/disposal.dm
@@ -71,7 +71,7 @@
trunk_check()
// attack by item places it in to disposal
-/obj/machinery/disposal/attackby(var/obj/item/I, var/mob/user)
+/obj/machinery/disposal/attackby(var/obj/item/I, var/mob/user, params)
if(stat & BROKEN || !I || !user)
return
@@ -847,7 +847,7 @@
//attack by item
//weldingtool: unfasten and convert to obj/disposalconstruct
-/obj/structure/disposalpipe/attackby(var/obj/item/I, var/mob/user)
+/obj/structure/disposalpipe/attackby(var/obj/item/I, var/mob/user, params)
var/turf/T = src.loc
if(T.intact)
@@ -983,7 +983,7 @@
update()
return
-/obj/structure/disposalpipe/sortjunction/attackby(var/obj/item/I, var/mob/user)
+/obj/structure/disposalpipe/sortjunction/attackby(var/obj/item/I, var/mob/user, params)
if(..())
return
@@ -1129,7 +1129,7 @@
return
// Override attackby so we disallow trunkremoval when somethings ontop
-/obj/structure/disposalpipe/trunk/attackby(var/obj/item/I, var/mob/user)
+/obj/structure/disposalpipe/trunk/attackby(var/obj/item/I, var/mob/user, params)
//Disposal bins or chutes
/*
@@ -1280,7 +1280,7 @@
qdel(H)
return
-/obj/structure/disposaloutlet/attackby(var/obj/item/I, var/mob/user)
+/obj/structure/disposaloutlet/attackby(var/obj/item/I, var/mob/user, params)
if(!I || !user)
return
src.add_fingerprint(user)
diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm
index 30deb867d78..13f4a491588 100644
--- a/code/modules/recycling/sortingmachinery.dm
+++ b/code/modules/recycling/sortingmachinery.dm
@@ -11,6 +11,7 @@
/obj/structure/bigDelivery/attack_hand(mob/user as mob)
+ playsound(src.loc, 'sound/items/poster_ripped.ogg', 50, 1)
qdel(src)
/obj/structure/bigDelivery/Destroy()
@@ -24,7 +25,7 @@
AM.loc = T
..()
-/obj/structure/bigDelivery/attackby(obj/item/W as obj, mob/user as mob)
+/obj/structure/bigDelivery/attackby(obj/item/W as obj, mob/user as mob, params)
if(istype(W, /obj/item/device/destTagger))
var/obj/item/device/destTagger/O = W
@@ -74,11 +75,11 @@
user.put_in_hands(wrapped)
else
wrapped.loc = get_turf(src)
-
+ playsound(src.loc, 'sound/items/poster_ripped.ogg', 50, 1)
qdel(src)
-/obj/item/smallDelivery/attackby(obj/item/W as obj, mob/user as mob)
+/obj/item/smallDelivery/attackby(obj/item/W as obj, mob/user as mob, params)
if(istype(W, /obj/item/device/destTagger))
var/obj/item/device/destTagger/O = W
@@ -321,7 +322,7 @@
update()
return
-/obj/machinery/disposal/deliveryChute/attackby(var/obj/item/I, var/mob/user)
+/obj/machinery/disposal/deliveryChute/attackby(var/obj/item/I, var/mob/user, params)
if(!I || !user)
return
diff --git a/code/modules/research/circuitprinter.dm b/code/modules/research/circuitprinter.dm
index 958ed65f986..6dc2bd1375a 100644
--- a/code/modules/research/circuitprinter.dm
+++ b/code/modules/research/circuitprinter.dm
@@ -73,7 +73,7 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis).
/obj/machinery/r_n_d/circuit_imprinter/proc/TotalMaterials()
return g_amount + gold_amount + diamond_amount
-/obj/machinery/r_n_d/circuit_imprinter/attackby(var/obj/item/O as obj, var/mob/user as mob)
+/obj/machinery/r_n_d/circuit_imprinter/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
if (shocked)
shock(user,50)
if (default_deconstruction_screwdriver(user, "circuit_imprinter_t", "circuit_imprinter", O))
diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm
index 7a2f2dab5d7..d6eb361625b 100644
--- a/code/modules/research/designs.dm
+++ b/code/modules/research/designs.dm
@@ -126,16 +126,6 @@ datum/design/proc/CalcReliability(var/list/temp_techs)
/////////////////Mining//////////////////
/////////////////////////////////////////
-/datum/design/jackhammer
- name = "Sonic Jackhammer"
- desc = "Cracks rocks with sonic blasts, perfect for killing cave lizards."
- id = "jackhammer"
- req_tech = list("materials" = 3, "powerstorage" = 2, "engineering" = 2)
- build_type = PROTOLATHE
- materials = list("$metal" = 2000, "$glass" = 500, "$silver" = 500)
- build_path = /obj/item/weapon/pickaxe/jackhammer
- category = list("Mining Designs")
-
/datum/design/drill
name = "Mining Drill"
desc = "Yours is the drill that will pierce through the rock walls."
@@ -152,32 +142,32 @@ datum/design/proc/CalcReliability(var/list/temp_techs)
id = "plasmacutter"
req_tech = list("materials" = 4, "plasmatech" = 3, "engineering" = 3)
build_type = PROTOLATHE
- materials = list("$metal" = 1500, "$glass" = 500, "$gold" = 500, "$plasma" = 500)
+ materials = list("$metal" = 5000, "$glass" = 1000, "$gold" = 500, "$plasma" = 500)
reliability = 79
build_path = /obj/item/weapon/pickaxe/plasmacutter
category = list("Mining Designs")
-/datum/design/pick_diamond
- name = "Diamond Pickaxe"
- desc = "A pickaxe with a diamond pick head, this is just like minesim 2554!."
- id = "pick_diamond"
- req_tech = list("materials" = 6)
- build_type = PROTOLATHE
- materials = list("$diamond" = 3000)
- build_path = /obj/item/weapon/pickaxe/diamond
- category = list("Mining Designs")
-
/datum/design/drill_diamond
- name = "Diamond Mining Drill"
+ name = "Diamond-Tipped Mining Drill"
desc = "Yours is the drill that will pierce the heavens!"
id = "drill_diamond"
req_tech = list("materials" = 6, "powerstorage" = 4, "engineering" = 4)
build_type = PROTOLATHE
- materials = list("$metal" = 3000, "$glass" = 1000, "$diamond" = 3750) //Yes, a whole diamond is needed.
+ materials = list("$metal" = 6000, "$glass" = 1000, "$diamond" = 3750) //Yes, a whole diamond is needed.
reliability = 79
build_path = /obj/item/weapon/pickaxe/drill/diamonddrill
category = list("Mining Designs")
+/datum/design/jackhammer
+ name = "Sonic Jackhammer"
+ desc = "Essentially a handheld planet-cracker. Can drill through walls with ease as well, but has high power cost for doing so."
+ id = "jackhammer"
+ req_tech = list("materials" = 6, "powerstorage" = 6, "engineering" = 5, "magnets" = 6)
+ build_type = PROTOLATHE
+ materials = list("$metal" = 8000, "$glass" = 1500, "$silver" = 2000, "$diamond" = 6000)
+ build_path = /obj/item/weapon/pickaxe/drill/jackhammer
+ category = list("Mining Designs")
+
/////////////////////////////////////////
//////////////Blue Space/////////////////
/////////////////////////////////////////
@@ -297,6 +287,16 @@ datum/design/proc/CalcReliability(var/list/temp_techs)
build_path = /obj/item/clothing/mask/gas/welding
category = list("Equipement")
+/datum/design/air_horn
+ name = "Air Horn"
+ desc = "Damn son, where'd you find this?"
+ id = "air_horn"
+ req_tech = list("materials" = 2, "engineering" = 2)
+ build_type = PROTOLATHE
+ materials = list("$metal" = 4000, "$bananium" = 1000)
+ build_path = /obj/item/weapon/bikehorn/airhorn
+ category = list("Equipement")
+
/datum/design/mesons
name = "Optical Meson Scanners"
desc = "Used by engineering and mining staff to see basic structural and terrain layouts through walls, regardless of lighting condition."
diff --git a/code/modules/research/designs/mechfabricator_designs.dm b/code/modules/research/designs/mechfabricator_designs.dm
index e8e53971da7..b04f53bdff7 100644
--- a/code/modules/research/designs/mechfabricator_designs.dm
+++ b/code/modules/research/designs/mechfabricator_designs.dm
@@ -599,7 +599,7 @@
/////////////////////////////////////////
/datum/design/borg_upgrade_reset
- name = "Cyborg Upgrade Module (Reset Module)"
+ name = "Cyborg Upgrade (Reset Module)"
id = "borg_upgrade_reset"
build_type = MECHFAB
build_path = /obj/item/borg/upgrade/reset
@@ -608,7 +608,7 @@
category = list("Cyborg Upgrade Modules")
/datum/design/borg_upgrade_rename
- name = "Cyborg Upgrade Module (Rename Module)"
+ name = "Cyborg Upgrade (Rename Module)"
id = "borg_upgrade_rename"
build_type = MECHFAB
build_path = /obj/item/borg/upgrade/rename
@@ -617,7 +617,7 @@
category = list("Cyborg Upgrade Modules")
/datum/design/borg_upgrade_restart
- name = "Cyborg Upgrade Module (Restart Module)"
+ name = "Cyborg Upgrade (Restart Module)"
id = "borg_upgrade_restart"
build_type = MECHFAB
build_path = /obj/item/borg/upgrade/restart
@@ -626,7 +626,7 @@
category = list("Cyborg Upgrade Modules")
/datum/design/borg_upgrade_vtec
- name = "Cyborg Upgrade Module (VTEC Module)"
+ name = "Cyborg Upgrade (VTEC Module)"
id = "borg_upgrade_vtec"
build_type = MECHFAB
build_path = /obj/item/borg/upgrade/vtec
@@ -636,7 +636,7 @@
category = list("Cyborg Upgrade Modules")
/datum/design/borg_upgrade_disablercooler
- name = "Cyborg Upgrade Module (Rapid Disabler Cooling Module)"
+ name = "Cyborg Upgrade (Rapid Disabler Cooling Module)"
id = "borg_upgrade_disablercooler"
build_type = MECHFAB
build_path = /obj/item/borg/upgrade/disablercooler
@@ -646,18 +646,28 @@
category = list("Cyborg Upgrade Modules")
/datum/design/borg_upgrade_jetpack
- name = "Cyborg Upgrade Module (Mining Jetpack)"
+ name = "Cyborg Upgrade (Mining Jetpack)"
id = "borg_upgrade_jetpack"
build_type = MECHFAB
build_path = /obj/item/borg/upgrade/jetpack
req_tech = list("engineering" = 4, "power" = 4)
- materials = list("$metal"=10000,"$plasma"=12000,"$uranium" = 10000)
+ materials = list("$metal"=10000, "$plasma"=5000, "$uranium" = 6000)
+ construction_time = 120
+ category = list("Cyborg Upgrade Modules")
+
+/datum/design/borg_upgrade_diamonddrill
+ name = "Cyborg Upgrade (Diamond Drill)"
+ id = "borg_upgrade_diamonddrill"
+ build_type = MECHFAB
+ build_path = /obj/item/borg/upgrade/ddrill
+ req_tech = list("engineering" = 5, "materials" = 5)
+ materials = list("$metal"=10000, "$diamond"=3750)
construction_time = 120
category = list("Cyborg Upgrade Modules")
/datum/design/borg_syndicate_module
- name = "Borg Illegal Weapons Upgrade"
- desc = "Allows for the construction of illegal upgrades for cyborgs"
+ name = "Cyborg Illegal Upgrades Module"
+ desc = "Allows for the construction of restricted upgrades for cyborgs"
id = "borg_syndicate_module"
build_type = MECHFAB
req_tech = list("combat" = 4, "syndicate" = 3)
diff --git a/code/modules/research/designs/weapon_designs.dm b/code/modules/research/designs/weapon_designs.dm
index 5798d7eb90a..62aca6fca2a 100644
--- a/code/modules/research/designs/weapon_designs.dm
+++ b/code/modules/research/designs/weapon_designs.dm
@@ -22,27 +22,27 @@
build_path = /obj/item/device/firing_pin/implant/loyalty
category = list("Firing Pins")
+/datum/design/stunrevolver
+ name = "Stun Revolver"
+ desc = "A high-tech revolver that fires internal, reusable taser cartridges in a revolving cylinder. The cartridges can be recharged using conventional rechargers."
+ id = "stunrevolver"
+ req_tech = list("combat" = 3, "materials" = 3, "powerstorage" = 2)
+ build_type = PROTOLATHE
+ materials = list("$metal" = 4000, "$glass" = 1000)
+ build_path = /obj/item/weapon/gun/energy/stunrevolver
+ category = list("Weapons")
+
/datum/design/nuclear_gun
name = "Advanced Energy Gun"
desc = "An energy gun with an experimental miniaturized reactor."
id = "nuclear_gun"
- req_tech = list("combat" = 3, "materials" = 5, "powerstorage" = 3)
+ req_tech = list("combat" = 4, "materials" = 5, "powerstorage" = 3)
build_type = PROTOLATHE
materials = list("$metal" = 5000, "$glass" = 1000, "$uranium" = 2000)
reliability = 76
build_path = /obj/item/weapon/gun/energy/gun/nuclear
category = list("Weapons")
-/datum/design/stunrevolver
- name = "Stun Revolver"
- desc = "A high-tech revolver that fires internal, reusable stun cartridges in a revolving cylinder. The stun cartridges can be recharged using a conventional energy weapon recharger."
- id = "stunrevolver"
- req_tech = list("combat" = 3, "materials" = 3, "powerstorage" = 2)
- build_type = PROTOLATHE
- materials = list("$metal" = 4000)
- build_path = /obj/item/weapon/gun/energy/stunrevolver
- category = list("Weapons")
-
/datum/design/tele_shield
name = "Telescopic Riot Shield"
desc = "An advanced riot shield made of lightweight materials that collapses for easy storage."
diff --git a/code/modules/research/destructive_analyzer.dm b/code/modules/research/destructive_analyzer.dm
index 3bbdb2f2db6..57f36ad9179 100644
--- a/code/modules/research/destructive_analyzer.dm
+++ b/code/modules/research/destructive_analyzer.dm
@@ -37,7 +37,7 @@ Note: Must be placed within 3 tiles of the R&D Console
return temp_list
-/obj/machinery/r_n_d/destructive_analyzer/attackby(var/obj/item/O as obj, var/mob/user as mob)
+/obj/machinery/r_n_d/destructive_analyzer/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
if (shocked)
shock(user,50)
if (default_deconstruction_screwdriver(user, "d_analyzer_t", "d_analyzer", O))
diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm
index 88225c449c0..4a800fff702 100644
--- a/code/modules/research/experimentor.dm
+++ b/code/modules/research/experimentor.dm
@@ -114,7 +114,7 @@
return FALSE
return TRUE
-/obj/machinery/r_n_d/experimentor/attackby(var/obj/item/O as obj, var/mob/user as mob)
+/obj/machinery/r_n_d/experimentor/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
if (shocked)
shock(user,50)
@@ -221,7 +221,7 @@
--cloneCount
if(cloneCount == 0)
cloneMode = FALSE
- var/turf/dropturf = get_turf(pick(oview(1,src)))
+ var/turf/dropturf = get_turf(pick(view(1,src)))
if(!dropturf) //Failsafe to prevent the object being lost in the void forever.
dropturf = get_turf(src)
loaded_item.loc = dropturf
@@ -250,6 +250,7 @@
/obj/machinery/r_n_d/experimentor/proc/experiment(var/exp,var/obj/item/exp_on)
recentlyExperimented = 1
icon_state = "h_lathe_wloop"
+ var/chosenchem
var/criticalReaction = locate(exp_on) in critical_items ? TRUE : FALSE
////////////////////////////////////////////////////////////////////////////////////////////////
if(exp == SCANTYPE_POKE)
@@ -259,8 +260,9 @@
badThingCoeff++
if(prob(EFFECT_PROB_VERYLOW-badThingCoeff))
visible_message("[src] malfunctions and destroys [exp_on], lashing it's arms out at nearby people!.")
- for(var/mob/living/m in oview(1))
+ for(var/mob/living/m in oview(1, src))
m.apply_damage(15,"brute",pick("head","chest","groin"))
+ investigate_log("Experimentor dealt minor brute to [m].", "experimentor")
ejectItem(TRUE)
if(prob(EFFECT_PROB_LOW-badThingCoeff))
visible_message("[src] malfunctions!.")
@@ -270,6 +272,7 @@
var/mob/living/target = locate(/mob/living) in oview(7,src)
if(target)
var/obj/item/throwing = loaded_item
+ investigate_log("Experimentor has thrown [loaded_item] at [target]", "experimentor")
ejectItem()
if(throwing)
throwing.throw_at(target, 10, 1)
@@ -280,15 +283,17 @@
visible_message("[exp_on] has activated an unknown subroutine!")
cloneMode = TRUE
cloneCount = badThingCoeff
+ investigate_log("Experimentor has made a clone of [exp_on]", "experimentor")
ejectItem()
if(prob(EFFECT_PROB_VERYLOW-badThingCoeff))
visible_message("[src] malfunctions, melting [exp_on] and leaking radiation!.")
- for(var/mob/living/m in oview(1))
+ for(var/mob/living/m in oview(1, src))
m.apply_effect(25,IRRADIATE)
+ investigate_log("Experimentor has irradiated [m]", "experimentor") //One entry per person so we know what was irradiated.
ejectItem(TRUE)
if(prob(EFFECT_PROB_LOW-badThingCoeff))
visible_message("[src] malfunctions, spewing toxic waste!.")
- for(var/turf/T in oview(1))
+ for(var/turf/T in oview(1, src))
if(!T.density)
if(prob(EFFECT_PROB_VERYHIGH))
new /obj/effect/decal/cleanable/greenglow(T)
@@ -298,6 +303,7 @@
var/newPath = pickWeighted(valid_items)
loaded_item = new newPath(src)
visible_message("[src] malfunctions, transforming [savedName] into [loaded_item]!.")
+ investigate_log("Experimentor has transformed [savedName] into [loaded_item]", "experimentor")
if(istype(loaded_item,/obj/item/weapon/grenade/chem_grenade))
var/obj/item/weapon/grenade/chem_grenade/CG = loaded_item
CG.prime()
@@ -310,10 +316,11 @@
new /obj/item/stack/sheet/mineral/plasma(get_turf(pick(oview(1,src))))
if(prob(EFFECT_PROB_VERYLOW-badThingCoeff))
visible_message("[src] destroys [exp_on], leaking dangerous gas!.")
- var/list/chems = list("carbon","radium","toxin","condensedcapsaicin","mushroomhallucinogen","space_drugs","ethanol","beepskysmash")
+ chosenchem = pick("carbon","radium","toxin","condensedcapsaicin","mushroomhallucinogen","space_drugs","ethanol","beepskysmash")
var/datum/reagents/R = new/datum/reagents(50)
R.my_atom = src
- R.add_reagent(pick(chems) , 50)
+ R.add_reagent(chosenchem , 50)
+ investigate_log("Experimentor has released [chosenchem] smoke.", "experimentor")
var/datum/effect/effect/system/chem_smoke_spread/smoke = new
smoke.set_up(R, 1, 0, src, 0, silent = 1)
playsound(src.loc, 'sound/effects/smoke.ogg', 50, 1, -3)
@@ -322,22 +329,25 @@
ejectItem(TRUE)
if(prob(EFFECT_PROB_VERYLOW-badThingCoeff))
visible_message("[src]'s chemical chamber has sprung a leak!.")
- var/list/chems = list("mutationtoxin","nanomachines","xenomicrobes")
+ chosenchem = pick("mutationtoxin","nanomachines","xenomicrobes")
var/datum/reagents/R = new/datum/reagents(50)
R.my_atom = src
- R.add_reagent(pick(chems) , 50)
+ R.add_reagent(chosenchem , 50)
var/datum/effect/effect/system/chem_smoke_spread/smoke = new
smoke.set_up(R, 1, 0, src, 0, silent = 1)
playsound(src.loc, 'sound/effects/smoke.ogg', 50, 1, -3)
smoke.start()
R.delete()
ejectItem(TRUE)
+ warn_admins(usr, "[chosenchem] smoke")
+ investigate_log("Experimentor has released [chosenchem] smoke!", "experimentor")
if(prob(EFFECT_PROB_LOW-badThingCoeff))
visible_message("[src] malfunctions, spewing harmless gas!.")
throwSmoke(src.loc)
if(prob(EFFECT_PROB_MEDIUM-badThingCoeff))
visible_message("[src] melts [exp_on], ionizing the air around it!.")
empulse(src.loc, 4, 6)
+ investigate_log("Experimentor has generated an Electromagnetic Pulse.", "experimentor")
ejectItem(TRUE)
////////////////////////////////////////////////////////////////////////////////////////////////
if(exp == SCANTYPE_HEAT)
@@ -346,16 +356,19 @@
visible_message("[src]'s emergency coolant system gives off a small ding!")
playsound(src.loc, 'sound/machines/ding.ogg', 50, 1)
var/obj/item/weapon/reagent_containers/food/drinks/coffee/C = new /obj/item/weapon/reagent_containers/food/drinks/coffee(get_turf(pick(oview(1,src))))
- var/list/chems = list("plasma","capsaicin","ethanol")
+ chosenchem = pick("plasma","capsaicin","ethanol")
C.reagents.remove_any(25)
- C.reagents.add_reagent(pick(chems) , 50)
+ C.reagents.add_reagent(chosenchem , 50)
C.name = "Cup of Suspicious Liquid"
C.desc = "It has a large hazard symbol printed on the side in fading ink."
+ investigate_log("Experimentor has made a cup of [chosenchem] coffee.", "experimentor")
if(prob(EFFECT_PROB_VERYLOW-badThingCoeff))
var/turf/start = get_turf(src)
- var/turf/MT = get_turf(locate(/mob/living) in oview(src, 3))
+ var/mob/M = locate(/mob/living) in view(src, 3)
+ var/turf/MT = get_turf(M)
if(MT)
visible_message("[src] dangerously overheats, launching a flaming fuel orb!")
+ investigate_log("Experimentor has launched a fireball at [M]!", "experimentor")
var/obj/item/projectile/magic/fireball/FB = new /obj/item/projectile/magic/fireball(start)
FB.original = MT
FB.current = start
@@ -365,6 +378,7 @@
if(prob(EFFECT_PROB_LOW-badThingCoeff))
visible_message("[src] malfunctions, melting [exp_on] and releasing a burst of flame!.")
explosion(src.loc, -1, 0, 0, 0, 0, flame_range = 2)
+ investigate_log("Experimentor started a fire.", "experimentor")
ejectItem(TRUE)
if(prob(EFFECT_PROB_MEDIUM-badThingCoeff))
visible_message("[src] malfunctions, melting [exp_on] and leaking hot air!.")
@@ -378,12 +392,14 @@
removed.temperature = min((removed.temperature*heat_capacity + 100000)/heat_capacity, 1000)
env.merge(removed)
air_update_turf()
+ investigate_log("Experimentor has released hot air.", "experimentor")
ejectItem(TRUE)
if(prob(EFFECT_PROB_MEDIUM-badThingCoeff))
visible_message("[src] malfunctions, activating it's emergency coolant systems!.")
throwSmoke(src.loc)
- for(var/mob/living/m in oview(1))
+ for(var/mob/living/m in oview(1, src))
m.apply_damage(5,"burn",pick("head","chest","groin"))
+ investigate_log("Experimentor has dealt minor burn damage to [m]", "experimentor")
ejectItem()
////////////////////////////////////////////////////////////////////////////////////////////////
if(exp == SCANTYPE_COLD)
@@ -392,16 +408,18 @@
visible_message("[src]'s emergency coolant system gives off a small ding!")
var/obj/machinery/vending/coffee/C = new /obj/machinery/vending/coffee(get_turf(pick(oview(1,src))))
playsound(src.loc, 'sound/machines/ding.ogg', 50, 1) //Ding! Your death coffee is ready!
- var/list/chems = list("uranium","frostoil","ephedrine")
+ chosenchem = pick("uranium","frostoil","ephedrine")
C.reagents.remove_any(25)
- C.reagents.add_reagent(pick(chems) , 50)
+ C.reagents.add_reagent(chosenchem , 50)
C.name = "Cup of Suspicious Liquid"
C.desc = "It has a large hazard symbol printed on the side in fading ink."
+ investigate_log("Experimentor has made a cup of [chosenchem] coffee.", "experimentor")
if(prob(EFFECT_PROB_VERYLOW-badThingCoeff))
visible_message("[src] malfunctions, shattering [exp_on] and releasing a dangerous cloud of coolant!")
var/datum/reagents/R = new/datum/reagents(50)
R.my_atom = src
R.add_reagent("frostoil" , 50)
+ investigate_log("Experimentor has released frostoil gas.", "experimentor")
var/datum/effect/effect/system/chem_smoke_spread/smoke = new
smoke.set_up(R, 1, 0, src, 0, silent = 1)
playsound(src.loc, 'sound/effects/smoke.ogg', 50, 1, -3)
@@ -420,6 +438,7 @@
removed.temperature = (removed.temperature*heat_capacity - 75000)/heat_capacity
env.merge(removed)
air_update_turf()
+ investigate_log("Experimentor has released cold air.", "experimentor")
ejectItem(TRUE)
if(prob(EFFECT_PROB_MEDIUM-badThingCoeff))
visible_message("[src] malfunctions, releasing a flurry of chilly air as [exp_on] pops out!.")
@@ -439,6 +458,7 @@
if(prob(EFFECT_PROB_VERYLOW-badThingCoeff))
visible_message("[src]'s crusher goes way too many levels too high, crushing right through space-time!")
playsound(src.loc, 'sound/effects/supermatter.ogg', 50, 1, -3)
+ investigate_log("Experimentor has triggered the 'throw things' reaction.", "experimentor")
var/list/throwAt = list()
for(var/i in oview(7,src))
if(istype(i,/obj/item) || istype(i,/mob/living))
@@ -450,6 +470,7 @@
if(prob(EFFECT_PROB_LOW-badThingCoeff))
visible_message("[src]'s crusher goes one level too high, crushing right into space-time!.")
playsound(src.loc, 'sound/effects/supermatter.ogg', 50, 1, -3)
+ investigate_log("Experimentor has triggered the 'minor throw things' reaction.", "experimentor")
var/list/oViewStuff = oview(7,src)
var/list/throwAt = list()
for(var/i in oViewStuff)
@@ -471,6 +492,7 @@
playsound(src.loc, 'sound/effects/supermatter.ogg', 50, 3, -1)
var/obj/item/weapon/relic/R = loaded_item
R.reveal()
+ investigate_log("Experimentor has revealed a relic with [R.realProc] effect.", "experimentor")
ejectItem()
//Global reactions
@@ -486,30 +508,37 @@
if(trackedIan)
throwSmoke(trackedIan.loc)
trackedIan.loc = src.loc
+ investigate_log("Experimentor has stolen Ian!", "experimentor") //...if anyone ever fixes it...
else
new /mob/living/simple_animal/corgi(src.loc)
+ investigate_log("Experimentor has spawned a new corgi.", "experimentor")
ejectItem(TRUE)
if(globalMalf > 36 && globalMalf < 50)
visible_message("[src] improves [exp_on], drawing the life essence of those nearby!")
for(var/mob/living/m in view(4,src))
m << "You feel your flesh being torn from you, mists of blood drifting to [src]!"
m.apply_damage(50,"brute","chest")
+ investigate_log("Experimentor has taken 50 brute a blood sacrifice from [m]", "experimentor")
var/list/reqs = ConvertReqString2List(exp_on.origin_tech)
for(var/T in reqs)
reqs[T] = reqs[T] + 1
exp_on.origin_tech = list2params(reqs)
+ investigate_log("Experimentor has set the origin tech of [exp_on] to [exp_on.origin_tech]", "experimentor")
if(globalMalf > 51 && globalMalf < 75)
visible_message("[src] encounters a run-time error!")
throwSmoke(src.loc)
if(trackedRuntime)
throwSmoke(trackedRuntime.loc)
trackedRuntime.loc = src.loc
+ investigate_log("Experimentor has stolen Runtime!", "experimentor")
else
new /mob/living/simple_animal/cat(src.loc)
+ investigate_log("Experimentor failed to steal runtime, and instead spawned a new cat.", "experimentor")
ejectItem(TRUE)
if(globalMalf > 76)
visible_message("[src] begins to smoke and hiss, shaking violently!")
use_power(500000)
+ investigate_log("Experimentor has drained power from its APC", "experimentor")
spawn(resetTime)
icon_state = "h_lathe"
@@ -556,6 +585,12 @@
src.updateUsrDialog()
return
+//~~~~~~~~Admin logging proc, aka the Powergamer Alarm~~~~~~~~
+/obj/machinery/r_n_d/experimentor/proc/warn_admins(var/mob/user, var/ReactionName)
+ var/turf/T = get_turf(src)
+ message_admins("Experimentor reaction: [ReactionName] generated by [key_name(user, user.client)](?) at ([T.x],[T.y],[T.z] - JMP)",0,1)
+ log_game("Experimentor reaction: [ReactionName] generated by [user.ckey]([user]) in ([T.x],[T.y],[T.z])")
+
#undef SCANTYPE_POKE
#undef SCANTYPE_IRRADIATE
#undef SCANTYPE_GAS
@@ -632,6 +667,7 @@
playsound(src.loc, "sparks", rand(25,50), 1)
var/obj/item/weapon/grenade/flashbang/CB = new/obj/item/weapon/grenade/flashbang(get_turf(user))
CB.prime()
+ warn_admins(user, "Flash")
/obj/item/weapon/relic/proc/petSpray(var/mob/user)
visible_message("[src] begans to shake, and in the distance the sound of rampaging animals arises!")
@@ -641,6 +677,7 @@
for(counter = 1; counter < animals; counter++)
var/mobType = pick(valid_animals)
new mobType(get_turf(src))
+ warn_admins(user, "Mass Mob Spawn")
/obj/item/weapon/relic/proc/rapidDupe(var/mob/user)
visible_message("[src] emits a loud pop!")
@@ -668,6 +705,7 @@
if(src.loc == user)
visible_message("The [src]'s top opens, releasing a powerful blast!")
explosion(user.loc, -1, rand(1,5), rand(1,5), rand(1,5), rand(1,5), flame_range = 2)
+ warn_admins(user, "Explosion")
/obj/item/weapon/relic/proc/teleport(var/mob/user)
visible_message("The [src] begins to vibrate!")
@@ -677,3 +715,9 @@
throwSmoke(get_turf(user))
do_teleport(user, get_turf(user), 8, asoundin = 'sound/effects/phasein.ogg')
throwSmoke(get_turf(user))
+
+//Admin Warning proc for relics
+/obj/item/weapon/relic/proc/warn_admins(var/mob/user, var/RelicType)
+ var/turf/T = get_turf(src)
+ message_admins("[RelicType] relic activated by [key_name(user, user.client)](?) in ([T.x],[T.y],[T.z] - JMP)",0,1)
+ log_game("[RelicType] relic used by [user.ckey]([user]) in ([T.x],[T.y],[T.z])")
diff --git a/code/modules/research/protolathe.dm b/code/modules/research/protolathe.dm
index 0a9128fdfb7..ed202ccb9f5 100644
--- a/code/modules/research/protolathe.dm
+++ b/code/modules/research/protolathe.dm
@@ -94,7 +94,7 @@ Note: Must be placed west/left of and R&D console to function.
A = A / max(1, (being_built.materials[M]/efficiency_coeff))
return A
-/obj/machinery/r_n_d/protolathe/attackby(var/obj/item/O as obj, var/mob/user as mob)
+/obj/machinery/r_n_d/protolathe/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
if (shocked)
shock(user,50)
if (default_deconstruction_screwdriver(user, "protolathe_t", "protolathe", O))
diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm
index 5960753494e..1749511b743 100644
--- a/code/modules/research/rdconsole.dm
+++ b/code/modules/research/rdconsole.dm
@@ -143,7 +143,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
griefProtection()
*/
-/obj/machinery/computer/rdconsole/attackby(var/obj/item/weapon/D as obj, var/mob/user as mob)
+/obj/machinery/computer/rdconsole/attackby(var/obj/item/weapon/D as obj, var/mob/user as mob, params)
//Loading a disk into it.
if(istype(D, /obj/item/weapon/disk))
diff --git a/code/modules/research/server.dm b/code/modules/research/server.dm
index eaad476fd44..62dd6e45bac 100644
--- a/code/modules/research/server.dm
+++ b/code/modules/research/server.dm
@@ -121,7 +121,7 @@
env.merge(removed)
air_update_turf()
-/obj/machinery/r_n_d/server/attackby(var/obj/item/O as obj, var/mob/user as mob)
+/obj/machinery/r_n_d/server/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
if (disabled)
return
if (shocked)
@@ -316,7 +316,7 @@
onclose(user, "server_control")
return
-/obj/machinery/computer/rdservercontrol/attackby(var/obj/item/weapon/D as obj, var/mob/user as mob)
+/obj/machinery/computer/rdservercontrol/attackby(var/obj/item/weapon/D as obj, var/mob/user as mob, params)
..()
src.updateUsrDialog()
return
diff --git a/code/modules/security levels/keycard authentication.dm b/code/modules/security levels/keycard authentication.dm
index 54583c227ca..3d75e5a227a 100644
--- a/code/modules/security levels/keycard authentication.dm
+++ b/code/modules/security levels/keycard authentication.dm
@@ -28,7 +28,7 @@
user << "You are too primitive to use this device."
return
-/obj/machinery/keycard_auth/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/machinery/keycard_auth/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
if(stat & (NOPOWER|BROKEN))
user << "This device is not powered."
return
diff --git a/code/modules/surgery/organs/organ.dm b/code/modules/surgery/organs/organ.dm
index 6fbc2f55fbd..264f6482ca0 100644
--- a/code/modules/surgery/organs/organ.dm
+++ b/code/modules/surgery/organs/organ.dm
@@ -45,6 +45,7 @@
var/burn_dam = 0
var/max_damage = 0
var/status = ORGAN_ORGANIC
+ var/list/embedded_objects = list()
diff --git a/code/modules/surgery/remove_embedded_object.dm b/code/modules/surgery/remove_embedded_object.dm
new file mode 100644
index 00000000000..749faa22698
--- /dev/null
+++ b/code/modules/surgery/remove_embedded_object.dm
@@ -0,0 +1,44 @@
+
+
+/datum/surgery/embedded_removal
+ name = "removal of embedded objects"
+ steps = list(/datum/surgery_step/incise, /datum/surgery_step/clamp_bleeders, /datum/surgery_step/retract_skin, /datum/surgery_step/remove_object)
+ species = list(/mob/living/carbon/human)
+ location = "anywhere"
+ has_multi_loc = 1
+
+
+/datum/surgery_step/remove_object
+ time = 32
+ allowed_organs = list("r_arm","l_arm","r_leg","l_leg","chest","head")
+ accept_hand = 1
+ var/obj/item/organ/limb/L = null
+
+
+/datum/surgery_step/remove_object/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
+ L = new_organ
+ if(L)
+ user.visible_message("[user] looks for objects embedded in [target]'s [parse_zone(user.zone_sel.selecting)].")
+ else
+ user.visible_message("[user] looks for [target]'s [parse_zone(user.zone_sel.selecting)].")
+
+
+/datum/surgery_step/remove_object/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
+ if(L)
+ if(ishuman(target))
+ var/mob/living/carbon/human/H = target
+ var/objects = 0
+ for(var/obj/item/I in L.embedded_objects)
+ objects++
+ I.loc = get_turf(H)
+ L.embedded_objects -= I
+
+ if(objects > 0)
+ user.visible_message("[user] sucessfully removes [objects] objects from [H]'s [L.getDisplayName()]!")
+ else
+ user.visible_message("[user] finds no objects embedded in [H]'s [L.getDisplayName()].")
+
+ else
+ user.visible_message("[user] can't find [target]'s [parse_zone(user.zone_sel.selecting)], let alone any objects embedded in it!")
+
+ return 1
\ No newline at end of file
diff --git a/code/modules/telesci/telepad.dm b/code/modules/telesci/telepad.dm
index 7021aec8fc4..7949dcfba88 100644
--- a/code/modules/telesci/telepad.dm
+++ b/code/modules/telesci/telepad.dm
@@ -27,7 +27,7 @@
E += C.rating
efficiency = E
-/obj/machinery/telepad/attackby(obj/item/I, mob/user)
+/obj/machinery/telepad/attackby(obj/item/I, mob/user, params)
if(default_deconstruction_screwdriver(user, "pad-idle-o", "pad-idle", I))
return
@@ -54,7 +54,7 @@
idle_power_usage = 20
active_power_usage = 500
var/stage = 0
-/obj/machinery/telepad_cargo/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/machinery/telepad_cargo/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
if(istype(W, /obj/item/weapon/wrench))
anchored = 0
playsound(src, 'sound/items/Ratchet.ogg', 50, 1)
diff --git a/code/modules/telesci/telesci_computer.dm b/code/modules/telesci/telesci_computer.dm
index dee72977156..ea9d253b54f 100644
--- a/code/modules/telesci/telesci_computer.dm
+++ b/code/modules/telesci/telesci_computer.dm
@@ -53,7 +53,7 @@
user << "You are too primitive to use this computer."
return
-/obj/machinery/computer/telescience/attackby(obj/item/W, mob/user)
+/obj/machinery/computer/telescience/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/bluespace_crystal))
if(crystals.len >= max_crystals)
user << "There are not enough crystal slots."
diff --git a/config/config.txt b/config/config.txt
index 0d112194334..412245906b1 100644
--- a/config/config.txt
+++ b/config/config.txt
@@ -156,3 +156,23 @@ TICKCOMP 0
## Uncomment this to let players see their own notes (they can still be set by admins only)
#SEE_OWN_NOTES
+
+##Note: all population caps can be used with each other if desired.
+
+## Uncomment for 'soft' population caps, players will be warned while joining if the living crew exceeds the listed number.
+#SOFT_POPCAP 100
+
+## Message for soft cap
+SOFT_MESSAGE Be warned that the server is currently serving a high number of users, consider using alternative game servers.
+
+## Uncomment for 'hard' population caps, players will not be allowed to spawn if the living crew exceeds the listed number, though they may still observe or wait for the living crew to decrease in size.
+#HARD_POPCAP 150
+
+## Message for hard cap
+HARD_MESSAGE The server is currently serving a high number of users, You cannot currently join. You may wait for the number of living crew to decline, observe, or find alternative servers.
+
+## Uncomment for 'extreme' population caps, players will not be allowed to join the server if living crew exceeds the listed number.
+#EXTREME_POPCAP 200
+
+## Message for extreme cap
+EXTREME_MESSAGE The server is currently serving a high number of users, find alternative servers.
\ No newline at end of file
diff --git a/config/game_options.txt b/config/game_options.txt
index 8280e42debf..eb49184e9e1 100644
--- a/config/game_options.txt
+++ b/config/game_options.txt
@@ -215,5 +215,10 @@ SILICON_MAX_LAW_AMOUNT 12
#JOIN_WITH_MUTANT_RACE
## Uncomment to allow certain species to have custom colors
-
#MUTANT_COLORS
+
+## Assistant slot cap. Set to -1 for unlimited.
+ASSISTANT_CAP -1
+
+## Starlight for exterior walls and breaches. Uncomment for starlight!
+STARLIGHT
\ No newline at end of file
diff --git a/html/changelog.html b/html/changelog.html
index 26125b15580..2787e19d69c 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,141 @@
-->
+
+
+
25 February 2015+Cheridan updated:+
Dannno updated:+
Delimusca updated:+
Gun Hog updated:+
Iamgoofball updated:+
Incoming5643 updated:+
Mandurrh updated:+
Menshin updated:+
Paprika updated:+
RandomMarine updated:+
RemieRichards updated:+
Steelpoint updated:+
TheVekter updated:+
Xhuis updated:+
phil235 updated:+
xxalpha updated:+
18 February 2015Dannno updated:diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 87eec701043..39e182aa729 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -2574,3 +2574,164 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. a slight buff to vitamin. xxalpha: - rscadd: You now hear the voice of the chosen deity in prayers. +2015-02-25: + Cheridan: + - rscadd: Foam now carries reagents, similarly to smoke. Have fun with that. + Dannno: + - rscadd: Altered the sprite for security hardsuits. The old sprite is now a HoS + specific hardsuit. + Delimusca: + - rscadd: Turret's guns replaced by a heavy energy cannon. + - tweak: Firing a heavy weapon sindlehandedly can make it recoil out of your hands. + Gun Hog: + - tweak: Nanotrasen has released new design specifications for the prototype combination + of standard night-vision equipment and Optical Meson Scanners. We believe that + this will address the concerns many Shaft Miners have concerning visiblity in + a potentially unsafe environment. + - bugfix: Fixed malf AI's turret upgrade power not working. + Iamgoofball: + - rscadd: You can now go into hyperglycaemic shock from having over 200u of Sugar + in your body at once. Treat it with Insulin. + - rscadd: Insulin has been added. Use it to treat hyperglycaemic shock. You can + get it from medical vendors and the Cargo medicine supplies crate. + - rscadd: Medvendor contents have been reduced from medical having everything they + need at roundstart level, and toxin bottles are now back in the vendor. + - rscadd: Medical Analyzers now have 2 modes, Medical Scan and Chemical Scan. You + can swap between modes by clicking on it in hand. + - rscadd: Medical scan is default behavior. Chemical scan shows all the reagents + inside the mob at the time, along with any addictions the mob has. It will show + if a reagent is overdosing. + - rscadd: Tobacco and Space Tobacco have Nicotine in them now. + - rscadd: Adds Methamphetamine to the game. Mix it with Ephedrine, Iodine, Phosphorous, + and Hydrogen at 374K. + - rscadd: Or, look around in Maintenance for Muriatic Acid, Caustic Soda, and Hydrogen + Chloride. Recipes are also available for these. + - rscadd: Adds Saltpetre. Mix it with Potassium, Nitrogen, and Oxygen. + - rscadd: Adds Bath Salts, mix it with Bad Food, Saltpetre, Nutriment, Space Cleaner, + Universal Enzyme, Tea, and Mercury at 374K. + - rscadd: Adds Aranesp. Mix it with Epinephrine, Atropine, and Morphine. + - rscadd: Adds Hotline. Get it from Poppy plants. + - rscadd: Strange Reagent revival was changed. It now won't gib but won't do anything + above a 100 BRUTE or BURN threshold. + - rscadd: Carpet now applies carpet tiles to whatever flooring it hits. Mix it with + Space Drugs and Blood. + - rscadd: Colorful Reagent colors have been improved drastically and now are more + varied and nicer looking. + - rscadd: Corn Starch has been added. Get it from juicing Corn. + - rscadd: Corn Syrup has been added. Mix it with Corn Starch and S-Acid. + - rscadd: Corgium has been added. Mix it with Nutriment, Colorful Reagent, Strange + Reagent, and Blood at 374K. + - rscadd: Adds Quantum Hair Dye. Mix it with Colorful Reagent, Radium, and Space + Drugs. + - rscadd: Adds Barber's Aid. Mix it with Carpet, Radium, and Space Drugs. + - rscadd: Adds Concentrated Barber's Aid. Mix it with Barber's Aid and Unstable + Mutagen. + - rscadd: Re-adds Chlorine Trifluoride. Mix it with Chlorine and Fluorine at 424K. + - rscadd: Adds Black Powder. Mix it with Saltpetre, Charcoal, and Sulfur. Ignite + it for an explosion at 474K + - rscadd: Finally nerfs Salglu Solution. It's no longer tricord 2.0. + - rscadd: Salt recipe is now Water + Sodium + Chlorine due to problems with recipe + mixing. + Incoming5643: + - rscadd: A new event has been added to the wizards summon events spell that gives + the game a distictively more roleplaying flair. + - rscadd: Optional population cap functionality has been added to the game. By default + all caps are disabled. Server owners should refer to config.txt to see their + list of options. + - rscadd: Medical borgs now have access to a deployable onboard roller bed. Should + the bed become lost, any roller bed may be used in its place. + Mandurrh: + - rscadd: Added interchangeable bar signs + - rscadd: Added bays fountain machines for the bar. Soda and Beer. Allowing bartenders + to have easier access to mix drinks and making more to make their job a little + less boring + - rscadd: Added color tiles to the light up floor tiles. + - rscadd: Added metal, glass, and cable to bar back room at round start for bartender + to make colored light dance floors. + - bugfix: Fixes clown cuffing both mobs and two pairs of cuffs appearing. + - bugfix: Fixes clown not being able to use his stamp as antag so no meta. + - bugfix: Fixes sleepypen bug. Instead of only dispensing 50u it dispenses the full + 55u. + - bugfix: Fixed silicons not being able to pass through holotape. + Menshin: + - tweak: Getting into regenerative statis now puts the changeling into unconscious + state. + - bugfix: Fixed changeling 'Revive' not working. + Paprika: + - rscadd: Added an assistant cap, unlimited by default. + - tweak: Batons now slowly lose power when left on. + - rscadd: Batons, flashbangs and handcuffs can be seen when stored in a belt. + - tweak: Computers now emit light when they're on or bluescreened. + - rscadd: Added hotkeys for OOC and custom emotes. Press O and M when in hotkey + mode. Remember not to ick in ock! + - rscadd: Added megaphones for the HoS, HoP, and QM. + - tweak: Goliath tentacles no longer stun you if you cross them. They will only + stun you if you don't move away from them in time. They can do up to 15 damage + now, in addition to stunning you. + - tweak: Changed a lot of mining gear and prices. The resonator can now have up + to 3 fields active at once, but the fields need to detonate before they crush + rocks. Tweak the time before the fields detonate with a screwdriver and upgrade + the amount of fields at once with sheets of diamond. + - tweak: Overhauled straight mining tools. The sonic jackhammer is now the wall-crushing + tool, the diamond drill simply mines really fast. Borgs can now get upgraded + with the diamond mining tool with only a single sheet of diamond and an upgrade + module, they don't need illegal tech modules. + - tweak: Mining drills and the sonic jackhammer now draw power when they drill down + mineral walls. They can be recharged using any type of weapon recharger or by + replacing the cell using a screwdriver on them. + - experiment: Space now emits a dim light to adjacent tiles. + - tweak: Syndicate shotguns now start with buckshot instead of stunslugs. + - bugfix: Fixed welding tools using fuel when being switched on. + - tweak: Added a firing delay between shooting electrodes. + - tweak: Changed the stun revolver from a high-capacity taser to a disabler with + extra capacity. + - rscadd: Added a unique stun pistol for the head of security. It is a double capacity + taser with no shot delay and a loyalty pin, though it lacks a disable mode. + RandomMarine: + - rscadd: New brute treatment kit crate for cargo. + RemieRichards: + - rscadd: Explosions will now blow (throw) items away from the epicenter + - rscadd: Sharp items can now embedd themselves in a human's limbs + - rscadd: Embedded items have a chance to do some damage (based on w_class) each + life() call + - rscadd: Embedded items have a chance to fall out doing some more damage, but removing + the object + - rscadd: Adds a surgery to remove Embdedded objects + - rscadd: Adds throwing stars as an uplink item (100% chance to embedd) + - rscadd: Items placed on tables now center to exactly where you clicked. + Steelpoint: + - rscadd: SS13's Head of Security has received a new attempted 1:1 recreation of + a Old Earth weapon, the Captain's Antique Laser Gun. + - rscadd: This gun features three firing modes, Tase, Laser and Breach. However + this gun lacks the capability to recharge in the field, and is extreamly expensive. + - rscadd: The gun's Breach setting fires a low powered Pulse round, it consumes + a large amount of power, has a limited range of two tiles and deals the same + damage as a laser does. However it is effective in destroying walls, hence the + Breach title. + - rscadd: 'INTERCEPTED TRANSMISSION REPORT: The Syndicate have expressed a interest + in this new weapon, and have instructed field agents to do whatever they can + to steal this weapon.' + TheVekter: + - rscadd: Box's vault nuke has been replaced with immobile Nuclear Self-Destruct + Mechanism. + - rscadd: Vault's new green floor tiles turn flashing red when Self-Destruct is + activated. + Xhuis: + - rscadd: Syndicate contacts have discovered new ways to manipulate alarms. Malfunctioning + AIs, as well as normal emags, can now disable the safeties on air and fire alarms. + - rscadd: When one emags an air alarm, its safeties are disabled, giving it the + Flood environmental type, which disables scrubbers as well as vent pressure + checks. Burn, pigs, burn! + - rscadd: When one emags a fire alarm, its thermal sesnsors are disabled. This will + prevent automatic alerts due to the alarm being unable to recognize high temperatures. + - rscadd: Malf AIs gain two new modules, both of which disable ALL air alarm safeties + and thermal sensors. These are separate abilities. + - tweak: Air and fire alarms have notifications on their interface about the current + safety status. One only has to glance at one to see that it's been tampered + with. + phil235: + - bugfix: Fixed arcade machines being usable from inside lockers to dupe rewards. + - rscdel: Silicons can no longer be grabbed by anyone. No more silicon choking + - rscadd: Custom food can now be renamed using a pen. + xxalpha: + - rscadd: 'Added new graffiti: cyka, prolizard, antilizard' diff --git a/html/changelogs/Cheridan.yml b/html/changelogs/Cheridan.yml index d07478fd6c9..d26cc7b9ac2 100644 --- a/html/changelogs/Cheridan.yml +++ b/html/changelogs/Cheridan.yml @@ -1,4 +1,2 @@ author: Cheridan - -changes: - - rscadd: "Foam now carries reagents, similarly to smoke. Have fun with that." \ No newline at end of file +changes: [] diff --git a/html/changelogs/Gun-Hog-PR-7705.yml b/html/changelogs/Gun-Hog-PR-7705.yml deleted file mode 100644 index ee62d356d9c..00000000000 --- a/html/changelogs/Gun-Hog-PR-7705.yml +++ /dev/null @@ -1,9 +0,0 @@ - -author: Gun Hog - - -delete-after: True - - -changes: - - tweak: "Nanotrasen has released new design specifications for the prototype combination of standard night-vision equipment and Optical Meson Scanners. We believe that this will address the concerns many Shaft Miners have concerning visiblity in a potentially unsafe environment." diff --git a/html/changelogs/Mandurrh-Boozebranch.yml b/html/changelogs/Mandurrh-Boozebranch.yml deleted file mode 100644 index 46f08f2212f..00000000000 --- a/html/changelogs/Mandurrh-Boozebranch.yml +++ /dev/null @@ -1,37 +0,0 @@ -################################ -# Mandurrh Changelog File -# -# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. -# -# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) -# When it is, any changes listed below will disappear. -# -# Valid Prefixes: -# bugfix -# wip (For works in progress) -# tweak -# soundadd -# sounddel -# rscadd (general adding of nice things) -# rscdel (general deleting of nice things) -# imageadd -# imagedel -# spellcheck (typo fixes) -# experiment -# tgs (TG-ported fixes?) -################################# - -# Your name. -author: Mandurrh - -# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. -delete-after: True - -# Any changes you've made. See valid prefix list above. -# INDENT WITH TWO SPACES. NOT TABS. SPACES. -# SCREW THIS UP AND IT WON'T WORK. -# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. -# Please surround your changes in single (') or double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. -changes: - - rscadd: "Added bays fountain machines for the bar. Soda and Beer. Allowing bartenders to have easier access to mix drinks and making more to make their job a little less boring" - diff --git a/html/changelogs/Mandurrh-barsign.yml b/html/changelogs/Mandurrh-barsign.yml deleted file mode 100644 index 52ce32c68e2..00000000000 --- a/html/changelogs/Mandurrh-barsign.yml +++ /dev/null @@ -1,13 +0,0 @@ - -################################# - -# Your name. -author: Mandurrrh - -# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. -delete-after: True - - -changes: - - rscadd: "Added interchangeable bar signs" - diff --git a/html/changelogs/Mandurrh-lightupfloor.yml b/html/changelogs/Mandurrh-lightupfloor.yml deleted file mode 100644 index 6b2542b2ae1..00000000000 --- a/html/changelogs/Mandurrh-lightupfloor.yml +++ /dev/null @@ -1,10 +0,0 @@ - -author: Mandurrrh - -# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. -delete-after: True - - -changes: - - rscadd: "Added color tiles to the light up floor tiles." - - rscadd: "Added metal, glass, and cable to bar back room at round start for bartender to make colored light dance floors." diff --git a/html/changelogs/Menshin-PR-7792.yml b/html/changelogs/Menshin-PR-7792.yml deleted file mode 100644 index 718edf5a67d..00000000000 --- a/html/changelogs/Menshin-PR-7792.yml +++ /dev/null @@ -1,7 +0,0 @@ -author: Menshin - -delete-after: True - -changes: - - tweak : "Getting into regenerative statis now puts the changeling into unconscious state." - - bugfix: "Fixed changeling 'Revive' not working." diff --git a/html/changelogs/Paprka-batonshit.yml b/html/changelogs/Paprka-batonshit.yml deleted file mode 100644 index 6253da0f1e6..00000000000 --- a/html/changelogs/Paprka-batonshit.yml +++ /dev/null @@ -1,6 +0,0 @@ -author: Paprka - -delete-after: True - -changes: - - tweak: "Batons now slowly lose power when left on." \ No newline at end of file diff --git a/html/changelogs/Razharas.yml b/html/changelogs/Razharas.yml new file mode 100644 index 00000000000..b7f2e8aaf79 --- /dev/null +++ b/html/changelogs/Razharas.yml @@ -0,0 +1,15 @@ + +author: Razharas + +delete-after: False + +changes: + - rscadd: "Vines now can grow on any tiles that is not dense, including space, shuttles, centcomm tiles and so on." + - rscadd: "Added 'Bluespace' mutation to vines, makes them be able to grow through absolutely everything." + - rscadd: "Added 'Space Proofing' mutation to vines, after they grow if the tile under them is space it will become special vinetile, which is just resprited regular floor, if the vine on the vinetile dies the vineturf changes back to space." + - rscadd: "Made vines spreading speed depend on the seed's production, can be both slower and faster than current." + - rscadd: "Made vines mutation chance be 1/10th of the potency of the seed it is spawned from." + - rscadd: "Special chemicals added to vine seeds durning their growth can increase/decrease their potency and productivity." + - rscadd: "Special chemicals now can remove good, bad or neutral mutations from vine seeds while they are growing, cultivating actually helpful vines is now possible." + - rscadd: "Plant analyzers now show the vine seeds mutations." + - tweak: "Buffed numbers in some of the more useless mutations." \ No newline at end of file diff --git a/html/changelogs/phil235-PR-7786.yml b/html/changelogs/phil235-PR-7786.yml deleted file mode 100644 index f6de3917226..00000000000 --- a/html/changelogs/phil235-PR-7786.yml +++ /dev/null @@ -1,6 +0,0 @@ -author: phil235 - -delete-after: True - -changes: - - rscdel: "Silicons can no longer be grabbed by anyone. No more silicon choking" diff --git a/html/changelogs/phil235-PR-7808.yml b/html/changelogs/phil235-PR-7808.yml deleted file mode 100644 index 3a5980c9e7c..00000000000 --- a/html/changelogs/phil235-PR-7808.yml +++ /dev/null @@ -1,6 +0,0 @@ -author: phil235 - -delete-after: True - -changes: - - rscadd: "Custom food can now be renamed using a pen." diff --git a/icons/effects/crayondecal.dmi b/icons/effects/crayondecal.dmi index dc3f8f82996..21331ed175a 100644 Binary files a/icons/effects/crayondecal.dmi and b/icons/effects/crayondecal.dmi differ diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index b715a21b6ec..d732743543c 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/inhands/guns_lefthand.dmi b/icons/mob/inhands/guns_lefthand.dmi index a7e40af19df..00ef4c6b2f0 100644 Binary files a/icons/mob/inhands/guns_lefthand.dmi and b/icons/mob/inhands/guns_lefthand.dmi differ diff --git a/icons/mob/inhands/guns_righthand.dmi b/icons/mob/inhands/guns_righthand.dmi index 60f6aa556aa..6b85b55130c 100644 Binary files a/icons/mob/inhands/guns_righthand.dmi and b/icons/mob/inhands/guns_righthand.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index 999eaa7430f..b5b228e57b6 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 3063f42cdb2..37b28e21f6e 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index be66f5eac2a..59f39d363b5 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/icons/obj/device.dmi b/icons/obj/device.dmi index b359a653969..2ea63e08ba0 100644 Binary files a/icons/obj/device.dmi and b/icons/obj/device.dmi differ diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi index f6181b0638d..6c4a9a9147c 100644 Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ diff --git a/icons/obj/food.dmi b/icons/obj/food.dmi index e3aa5175068..9b05ea1d2ce 100644 Binary files a/icons/obj/food.dmi and b/icons/obj/food.dmi differ diff --git a/icons/obj/guns/energy.dmi b/icons/obj/guns/energy.dmi index 393b957c655..c71080e4e91 100644 Binary files a/icons/obj/guns/energy.dmi and b/icons/obj/guns/energy.dmi differ diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi index dbb4e8b1265..d0ed0ed12f4 100644 Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ diff --git a/icons/obj/weapons.dmi b/icons/obj/weapons.dmi index cfd7af59620..3bedbd10ad3 100644 Binary files a/icons/obj/weapons.dmi and b/icons/obj/weapons.dmi differ diff --git a/icons/turf/floors.dmi b/icons/turf/floors.dmi index e5bc983f5c5..75a11015b5f 100644 Binary files a/icons/turf/floors.dmi and b/icons/turf/floors.dmi differ diff --git a/interface/interface.dm b/interface/interface.dm index cf6ef6cfd32..d8b7cc4613c 100644 --- a/interface/interface.dm +++ b/interface/interface.dm @@ -88,7 +88,9 @@ Hotkey-Mode: (hotkey-mode must be on) \tq = drop \te = equip \tr = throw +\tm = me \tt = say +\to = OOC \tx = swap-hand \tz = activate held object (or y) \tf = cycle-intents-left diff --git a/interface/skin.dmf b/interface/skin.dmf index 3b47979826c..98f5eebf44e 100644 --- a/interface/skin.dmf +++ b/interface/skin.dmf @@ -515,6 +515,14 @@ macro "hotkeymode" name = "CTRL+G" command = "a-intent right" is-disabled = false + elem + name = "M" + command = "me" + is-disabled = false + elem + name = "O" + command = "ooc" + is-disabled = false elem name = "Q" command = ".northwest" diff --git a/sound/items/AirHorn2.ogg b/sound/items/AirHorn2.ogg new file mode 100644 index 00000000000..37ee8640af9 Binary files /dev/null and b/sound/items/AirHorn2.ogg differ diff --git a/sound/items/megaphone.ogg b/sound/items/megaphone.ogg new file mode 100644 index 00000000000..31d7a8d1ad9 Binary files /dev/null and b/sound/items/megaphone.ogg differ diff --git a/tgstation.dme b/tgstation.dme index 05330a54d85..6bce7153849 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -553,6 +553,7 @@ #include "code\game\objects\items\devices\flashlight.dm" #include "code\game\objects\items\devices\laserpointer.dm" #include "code\game\objects\items\devices\lightreplacer.dm" +#include "code\game\objects\items\devices\megaphone.dm" #include "code\game\objects\items\devices\multitool.dm" #include "code\game\objects\items\devices\paicard.dm" #include "code\game\objects\items\devices\pipe_painter.dm" @@ -939,6 +940,7 @@ #include "code\modules\events\wizard\magicarp.dm" #include "code\modules\events\wizard\petsplosion.dm" #include "code\modules\events\wizard\race.dm" +#include "code\modules\events\wizard\rpgloot.dm" #include "code\modules\events\wizard\shuffle.dm" #include "code\modules\events\wizard\summons.dm" #include "code\modules\flufftext\Dreaming.dm" @@ -1386,6 +1388,7 @@ #include "code\modules\surgery\limb augmentation.dm" #include "code\modules\surgery\lipoplasty.dm" #include "code\modules\surgery\plastic_surgery.dm" +#include "code\modules\surgery\remove_embedded_object.dm" #include "code\modules\surgery\surgery.dm" #include "code\modules\surgery\surgery_step.dm" #include "code\modules\surgery\tools.dm" |