"
return dat
/obj/machinery/autolathe/proc/category_win(mob/user,var/selected_category)
- var/dat = "
Browsing [selected_category]:
"
+ var/dat = "
"
+ dat += ""
+ dat += " Return to main menu"
+ dat += " Browsing [selected_category]:"
dat += " Metal amount: [src.m_amount] / [max_m_amount] cm 3"
dat += " Glass amount: [src.g_amount] / [max_g_amount] cm 3
"
@@ -289,19 +458,44 @@
dat += "[get_design_cost(D)] "
dat += " | "
+ dat += get_queue()
+ dat += "
"
return dat
-/obj/machinery/autolathe/proc/can_build(var/datum/design/D)
- var/coeff = (ispath(D.build_path,/obj/item/stack) ? 1 : 2 ** prod_coeff)
+/obj/machinery/autolathe/proc/search_win(mob/user)
+ var/dat = "
"
+ dat += ""
+ dat += " Return to main menu"
+ dat += " Search results:"
+ dat += " Metal amount: [src.m_amount] / [max_m_amount] cm 3"
+ dat += " Glass amount: [src.g_amount] / [max_g_amount] cm 3
"
- if(D.materials["$metal"] && (m_amount < (D.materials["$metal"] / coeff)))
- return 0
- if(D.materials["$glass"] && (g_amount < (D.materials["$glass"] / coeff)))
- return 0
- return 1
+ for(var/datum/design/D in matching_designs)
+ if(disabled || !can_build(D))
+ dat += " [D.name]"
+ else
+ dat += " [D.name]"
+
+ if(ispath(D.build_path, /obj/item/stack))
+ var/max_multiplier = min(50, D.materials["$metal"] ?round(m_amount/D.materials["$metal"]):INFINITY,D.materials["$glass"]?round(g_amount/D.materials["$glass"]):INFINITY)
+ if (max_multiplier>10 && !disabled)
+ dat += " x10"
+ if (max_multiplier>25 && !disabled)
+ dat += " x25"
+ if(max_multiplier > 0 && !disabled)
+ dat += " x[max_multiplier]"
+
+ dat += "[get_design_cost(D)] "
+
+ dat += " | "
+ dat += get_queue()
+ dat += "
"
+ return dat
/obj/machinery/autolathe/proc/get_design_cost(var/datum/design/D)
- var/coeff = (ispath(D.build_path,/obj/item/stack) ? 1 : 2 ** prod_coeff)
+ var/coeff = get_coeff(D)
var/dat
if(D.materials["$metal"])
dat += "[D.materials["$metal"] / coeff] metal "
@@ -327,7 +521,7 @@
if(hack)
for(var/datum/design/D in files.possible_designs)
- if((D.build_type & 4) && ("hacked" in D.category))
+ if((D.build_type & AUTOLATHE) && ("hacked" in D.category))
files.known_designs += D
else
for(var/datum/design/D in files.known_designs)
diff --git a/code/game/machinery/bees_apiary.dm b/code/game/machinery/bees_apiary.dm
index d4e6aa6307e..9021c4ba84d 100644
--- a/code/game/machinery/bees_apiary.dm
+++ b/code/game/machinery/bees_apiary.dm
@@ -43,7 +43,7 @@
..()
return
-/obj/machinery/apiary/attackby(var/obj/item/O as obj, var/mob/user as mob)
+/obj/machinery/apiary/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
if(istype(O, /obj/item/queen_bee))
if(health > 0)
user << "\red There is already a queen in there."
diff --git a/code/game/machinery/bees_items.dm b/code/game/machinery/bees_items.dm
index 01ed5bfa407..01e5d96ac02 100644
--- a/code/game/machinery/bees_items.dm
+++ b/code/game/machinery/bees_items.dm
@@ -65,7 +65,6 @@
name = "bottle of BeezEez"
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle17"
- flags = FPRINT | TABLEPASS
New()
src.pixel_x = rand(-5.0, 5)
src.pixel_y = rand(-5.0, 5)
diff --git a/code/game/machinery/biogenerator.dm b/code/game/machinery/biogenerator.dm
index f834719c9e0..bf53df74ecf 100644
--- a/code/game/machinery/biogenerator.dm
+++ b/code/game/machinery/biogenerator.dm
@@ -50,17 +50,17 @@
icon_state = "biogen-work"
return
-/obj/machinery/biogenerator/attackby(var/obj/item/O as obj, var/mob/user as mob)
+/obj/machinery/biogenerator/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
if(istype(O, /obj/item/weapon/reagent_containers/glass) && !panel_open)
if(beaker)
user << "
A container is already loaded into the machine."
else
- user.before_take_item(O)
+ user.unEquip(O)
O.loc = src
beaker = O
user << "
You add the container to the machine."
updateUsrDialog()
-
+
if(!processing)
if(default_deconstruction_screwdriver(user, "biogen-empty-o", "biogen-empty", O))
if(beaker)
@@ -72,7 +72,7 @@
if(exchange_parts(user, O))
return
- else if(istype(O, /obj/item/weapon/crowbar))
+ else if(istype(O, /obj/item/weapon/crowbar))
else if(panel_open)
user << "
Close the maintenance panel first."
else if(processing)
@@ -105,13 +105,13 @@
if(i >= 10)
user << "
The biogenerator is full! Activate it."
else
- user.before_take_item(O)
+ user.unEquip(O)
O.loc = src
user << "
You put [O.name] in [src.name]"
- default_deconstruction_crowbar(O)
-
+ default_deconstruction_crowbar(O)
+
update_icon()
return
@@ -246,14 +246,14 @@
if(in_beaker)
if(check_container_volume(10)) return 0
else beaker.reagents.add_reagent("left4zed",10)
- else
+ else
new/obj/item/weapon/reagent_containers/glass/fertilizer/l4z(src.loc)
if("rh")
if (check_cost(25/efficiency)) return 0
if(in_beaker)
if(check_container_volume(10)) return 0
else beaker.reagents.add_reagent("robustharvest",10)
- else
+ else
new/obj/item/weapon/reagent_containers/glass/fertilizer/rh(src.loc)
if("wallet")
if (check_cost(100/efficiency)) return 0
@@ -298,7 +298,7 @@
/obj/machinery/biogenerator/Topic(href, href_list)
if(..() || panel_open)
- return
+ return 1
usr.set_machine(src)
@@ -324,7 +324,7 @@
else if(href_list["menu"])
menustat = "menu"
updateUsrDialog()
-
+
else if(href_list["inbeaker"])
in_beaker = !in_beaker
updateUsrDialog()
\ No newline at end of file
diff --git a/code/game/machinery/bots/bots.dm b/code/game/machinery/bots/bots.dm
index 539dd775b0f..89281d06dcd 100644
--- a/code/game/machinery/bots/bots.dm
+++ b/code/game/machinery/bots/bots.dm
@@ -29,7 +29,6 @@
var/remote_disabled = 0 //If enabled, the AI cannot *Remotely* control a bot. It can still control it through cameras.
var/mob/living/silicon/ai/calling_ai //Links a bot to the AI calling it.
var/obj/item/device/radio/Radio //The bot's radio, for speaking to people.
- var/radio_frequency //The bot's default radio speaking freqency. Recommended to be on a department frequency.
var/radio_name = "Common"
//var/emagged = 0 //Urist: Moving that var to the general /bot tree as it's used by most bots
var/auto_patrol = 0// set to make bot automatically patrol
@@ -146,6 +145,8 @@
user << "[src] is in pristine condition."
/obj/machinery/bot/attack_alien(var/mob/living/carbon/alien/user as mob)
+ user.changeNext_move(CLICK_CD_MELEE)
+ user.do_attack_animation(src)
health -= rand(15,30)*brute_dam_coeff
visible_message("
[user] has slashed [src]!")
playsound(loc, 'sound/weapons/slice.ogg', 25, 1, -1)
@@ -155,6 +156,7 @@
/obj/machinery/bot/attack_animal(var/mob/living/simple_animal/M as mob)
+ M.do_attack_animation(src)
if(M.melee_damage_upper == 0)
return
health -= M.melee_damage_upper
@@ -230,15 +232,13 @@
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
user << "
Maintenance panel is now [open ? "opened" : "closed"]."
else
user << "
Maintenance panel is locked."
- else if (istype(W, /obj/item/weapon/card/emag) && emagged < 2)
- Emag(user)
else
if(istype(W, /obj/item/weapon/weldingtool) && user.a_intent != "harm")
if(health >= maxhealth)
@@ -267,7 +267,10 @@
..()
healthcheck()
-
+/obj/machinery/bot/emag_act(user as mob)
+ if (emagged < 2)
+ Emag(user)
+
/obj/machinery/bot/bullet_act(var/obj/item/projectile/Proj)
if((Proj.damage_type == BRUTE || Proj.damage_type == BURN))
health -= Proj.damage
@@ -338,11 +341,9 @@
/obj/machinery/bot/attack_ai(mob/user as mob)
attack_hand(user)
-/obj/machinery/bot/proc/speak(var/message, freq, var/freqname = null) //Pass a message to have the bot say() it. Pass a frequency to say it on the radio.
+/obj/machinery/bot/proc/speak(var/message, var/freqname = null) //Pass a message to have the bot say() it. Pass a frequency to say it on the radio.
if((!on) || (!message))
return
- if(freq)
- Radio.set_frequency(radio_frequency)
if(freqname)
Radio.autosay(message, src.name, freqname, list(src.z))
else
@@ -373,6 +374,8 @@ obj/machinery/bot/proc/scan(var/scan_type, var/old_target, var/scan_range)
final_result = scan_result
else
continue //The current element failed assessment, move on to the next.
+ else
+ continue
return final_result
//When the scan finds a target, run bot specific processing to select it for the next step. Empty by default.
@@ -583,7 +586,7 @@ obj/machinery/bot/proc/start_patrol()
new_destination = "__nearest__"
post_signal(beacon_freq, "findbeacon", "patrol")
awaiting_beacon = 1
- spawn(150)
+ spawn(200)
awaiting_beacon = 0
if(nearest_beacon)
set_destination(nearest_beacon)
@@ -653,7 +656,7 @@ obj/machinery/bot/proc/start_patrol()
botcard.access = user_access + prev_access //Adds the user's access, if any.
mode = BOT_SUMMON
calc_summon_path()
- speak("Responding.", radio_frequency, radio_name)
+ speak("Responding.", radio_name)
return
// receive response from beacon
@@ -740,7 +743,7 @@ obj/machinery/bot/proc/bot_summon()
check_bot_access()
path = AStar(loc, summon_target, /turf/proc/CardinalTurfsWithAccess, /turf/proc/Distance_cardinal, 0, 150, id=botcard, exclude=avoid)
if(!path || tries >= 5) //Cannot reach target. Give up and announce the issue.
- speak("Summon command failed, destination unreachable.", radio_frequency, radio_name)
+ speak("Summon command failed, destination unreachable.", radio_name)
bot_reset()
/obj/machinery/bot/proc/summon_step()
diff --git a/code/game/machinery/bots/cleanbot.dm b/code/game/machinery/bots/cleanbot.dm
index 5c4d3bf9200..7bd66b6838f 100644
--- a/code/game/machinery/bots/cleanbot.dm
+++ b/code/game/machinery/bots/cleanbot.dm
@@ -38,7 +38,6 @@
var/failed_steps
var/next_dest
var/next_dest_loc
- radio_frequency = SRV_FREQ //Service
radio_name = "Service"
bot_type = CLEAN_BOT
bot_type_name = "Cleanbot"
@@ -117,7 +116,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(usr) && !open && !emagged)
locked = !locked
@@ -263,7 +262,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()
@@ -272,7 +271,7 @@ text("
[on ? "On" : "Off"]"))
var/obj/machinery/bot/cleanbot/A = new /obj/machinery/bot/cleanbot(T)
A.name = created_name
user << "
You add the robot arm to the bucket and sensor assembly. Beep boop!"
- user.before_take_item(src, 1)
+ user.unEquip(src, 1)
qdel(src)
else if (istype(W, /obj/item/weapon/pen))
diff --git a/code/game/machinery/bots/ed209bot.dm b/code/game/machinery/bots/ed209bot.dm
index 6fb65f8a705..2c9055e29c4 100644
--- a/code/game/machinery/bots/ed209bot.dm
+++ b/code/game/machinery/bots/ed209bot.dm
@@ -33,7 +33,6 @@
var/arrest_type = 0 //If true, don't handcuff
var/projectile = /obj/item/projectile/energy/electrode //Holder for projectile type
var/shoot_sound = 'sound/weapons/Taser.ogg'
- radio_frequency = SEC_FREQ
radio_name = "Security"
bot_type = SEC_BOT
bot_type_name = "ED-209"
@@ -171,7 +170,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
@@ -258,7 +257,7 @@ Auto Patrol[]"},
icon_state = "[lasercolor]ed209[on]"
var/mob/living/carbon/M = target
if(istype(M, /mob/living/carbon/human))
- if( M.stuttering < 5 && !(M_HULK in M.mutations) )
+ if( M.stuttering < 5 && !(HULK in M.mutations) )
M.stuttering = 5
M.Stun(5)
M.Weaken(5)
@@ -269,7 +268,7 @@ Auto Patrol[]"},
if(declare_arrests)
var/area/location = get_area(src)
- speak("[arrest_type ? "Detaining" : "Arresting"] level [threatlevel] scumbag
[target] in [location].",radio_frequency, radio_name)
+ speak("[arrest_type ? "Detaining" : "Arresting"] level [threatlevel] scumbag
[target] in [location].", radio_name)
target.visible_message("
[target] has been stunned by [src]!",\
"
[target] has been stunned by [src]!")
@@ -299,16 +298,15 @@ Auto Patrol[]"},
if(!arrest_type)
if(!target.handcuffed) //he's not cuffed? Try to cuff him!
mode = BOT_ARREST
- playsound(loc, 'sound/weapons/handcuffs.ogg', 30, 1, -2)
- target.visible_message("
[src] is trying to put handcuffs on [target]!",\
- "
[src] is trying to put handcuffs on [target]!")
-
+ playsound(loc, 'sound/weapons/cablecuff.ogg', 30, 1, -2)
+ target.visible_message("
[src] is trying to put zipties on [target]!",\
+ "
[src] is trying to put zipties on [target]!")
spawn(30)
if( !Adjacent(target) || !isturf(target.loc) ) //if he's in a closet or not adjacent, we cancel cuffing.
return
if(!target.handcuffed)
- target.handcuffed = new /obj/item/weapon/handcuffs(target)
- target.update_inv_handcuffed(0) //update the handcuffs overlay
+ target.handcuffed = new /obj/item/weapon/restraints/handcuffs/cable/zipties/used(target)
+ target.update_inv_handcuffed(1) //update the handcuffs overlay
back_to_idle()
else
back_to_idle()
@@ -540,7 +538,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))
@@ -665,14 +663,14 @@ Auto Patrol[]"},
user << "
Taser gun attached."
if(9)
- if(istype(W, /obj/item/weapon/cell))
+ if(istype(W, /obj/item/weapon/stock_parts/cell))
build_step++
user << "
You complete the ED-209."
var/turf/T = get_turf(src)
new /obj/machinery/bot/ed209(T,created_name,lasercolor)
user.drop_item()
qdel(W)
- user.before_take_item(src, 1)
+ user.unEquip(src, 1)
qdel(src)
diff --git a/code/game/machinery/bots/farmbot.dm b/code/game/machinery/bots/farmbot.dm
index f2981c70fe1..c8775c7f5ca 100644
--- a/code/game/machinery/bots/farmbot.dm
+++ b/code/game/machinery/bots/farmbot.dm
@@ -161,7 +161,7 @@
src.updateUsrDialog()
return
-/obj/machinery/bot/farmbot/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/machinery/bot/farmbot/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 (src.allowed(user))
src.locked = !src.locked
@@ -531,7 +531,7 @@
new /obj/structure/reagent_dispensers/watertank(src)
-/obj/structure/reagent_dispensers/watertank/attackby(var/obj/item/robot_parts/S, mob/user as mob)
+/obj/structure/reagent_dispensers/watertank/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)))
..()
@@ -544,30 +544,30 @@
A.loc = src.loc
user << "You add the robot arm to the [src]"
src.loc = A //Place the water tank into the assembly, it will be needed for the finished bot
- user.u_equip(S)
+ user.unEquip(S)
del(S)
-/obj/item/weapon/farmbot_arm_assembly/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/item/weapon/farmbot_arm_assembly/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
..()
if((istype(W, /obj/item/device/analyzer/plant_analyzer)) && (!src.build_step))
src.build_step++
user << "You add the plant analyzer to [src]!"
src.name = "farmbot assembly"
- user.u_equip(W)
+ user.unEquip(W)
del(W)
else if(( istype(W, /obj/item/weapon/reagent_containers/glass/bucket)) && (src.build_step == 1))
src.build_step++
user << "You add a bucket to [src]!"
src.name = "farmbot assembly with bucket"
- user.u_equip(W)
+ user.unEquip(W)
del(W)
else if(( istype(W, /obj/item/weapon/minihoe)) && (src.build_step == 2))
src.build_step++
user << "You add a minihoe to [src]!"
src.name = "farmbot assembly with bucket and minihoe"
- user.u_equip(W)
+ user.unEquip(W)
del(W)
else if((isprox(W)) && (src.build_step == 3))
@@ -579,13 +579,13 @@
S.tank = wTank
S.loc = get_turf(src)
S.name = src.created_name
- user.u_equip(W)
+ user.unEquip(W)
del(W)
del(src)
else if(istype(W, /obj/item/weapon/pen))
var/t = input(user, "Enter new robot name", src.name, src.created_name) as text
- t = copytext(sanitize(t), 1, MAX_NAME_LEN)
+ t = sanitize(copytext(t), 1, MAX_NAME_LEN)
if (!t)
return
if (!in_range(src, usr) && src.loc != usr)
diff --git a/code/game/machinery/bots/floorbot.dm b/code/game/machinery/bots/floorbot.dm
index eede1892d76..a962d81d6e4 100644
--- a/code/game/machinery/bots/floorbot.dm
+++ b/code/game/machinery/bots/floorbot.dm
@@ -49,7 +49,6 @@
var/oldloc = null
req_one_access = list(access_construction, access_robotics)
var/targetdirection
- radio_frequency = ENG_FREQ //Engineering channel
radio_name = "Engineering"
bot_type = FLOOR_BOT
bot_type_name = "Floorbot"
@@ -134,7 +133,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)
@@ -245,7 +244,7 @@
if(!target && replacetiles) //Finds a floor without a tile and gives it one.
process_type = REPLACE_TILE //The target must be the floor and not a tile. The floor must not already have a floortile.
target = scan(/turf/simulated/floor, oldtarget)
-
+
if(!target && fixfloors) //Repairs damaged floors and tiles.
process_type = FIX_TILE
target = scan(/turf/simulated/floor, oldtarget)
@@ -288,6 +287,8 @@
target = null
mode = BOT_IDLE
return
+
+ ignore_list = list() // Reset the ignore list
if(loc == target || loc == target.loc)
if(istype(target, /obj/item/stack/tile/plasteel))
@@ -318,7 +319,7 @@
/obj/machinery/bot/floorbot/proc/nag() //Annoy everyone on the channel to refill us!
if(!nagged)
var/area/location = get_area(src)
- speak("Requesting refill at
[location]!", radio_frequency, radio_name)
+ speak("Requesting refill at
[location]!", radio_name)
nagged = 1
/obj/machinery/bot/floorbot/proc/is_hull_breach(var/turf/t) //Ignore space tiles not considered part of a structure, also ignores shuttle docking areas.
@@ -478,7 +479,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
@@ -491,13 +492,13 @@ obj/machinery/bot/floorbot/process_scan(var/scan_target)
var/obj/item/weapon/toolbox_tiles/B = new /obj/item/weapon/toolbox_tiles
user.put_in_hands(B)
user << "
You add the tiles into the empty toolbox. They protrude from the top."
- user.before_take_item(src, 1)
+ user.unEquip(src, 1)
qdel(src)
else
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)
@@ -505,7 +506,7 @@ obj/machinery/bot/floorbot/process_scan(var/scan_target)
B.created_name = created_name
user.put_in_hands(B)
user << "
You add the sensor to the toolbox and tiles!"
- user.before_take_item(src, 1)
+ user.unEquip(src, 1)
qdel(src)
else if (istype(W, /obj/item/weapon/pen))
@@ -517,7 +518,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)
@@ -525,7 +526,7 @@ obj/machinery/bot/floorbot/process_scan(var/scan_target)
var/obj/machinery/bot/floorbot/A = new /obj/machinery/bot/floorbot(T)
A.name = created_name
user << "
You add the robot arm to the odd looking toolbox assembly! Boop beep!"
- user.before_take_item(src, 1)
+ user.unEquip(src, 1)
qdel(src)
else 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/medbot.dm b/code/game/machinery/bots/medbot.dm
index c77a5477e13..078d9fff2b9 100644
--- a/code/game/machinery/bots/medbot.dm
+++ b/code/game/machinery/bots/medbot.dm
@@ -30,7 +30,6 @@
var/declare_crit = 1 //If active, the bot will transmit a critical patient alert to MedHUD users.
var/declare_cooldown = 0 //Prevents spam of critical patient alerts.
var/stationary_mode = 0 //If enabled, the Medibot will not move automatically.
- radio_frequency = MED_FREQ //Medical frequency
radio_name = "Medical"
//Setting which reagents to use to treat what by default. By id.
var/treatment_brute = "tricordrazine"
@@ -221,7 +220,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
@@ -533,7 +532,7 @@
if((skin == "bezerk"))
return
var/area/location = get_area(src)
- speak("Medical emergency! [crit_patient ? "
[crit_patient]" : "A patient"] is in critical condition at [location]!",radio_frequency, radio_name)
+ speak("Medical emergency! [crit_patient ? "
[crit_patient]" : "A patient"] is in critical condition at [location]!", radio_name)
declare_cooldown = 1
spawn(200) //Twenty seconds
declare_cooldown = 0
@@ -542,7 +541,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)))
..()
@@ -564,11 +563,11 @@
qdel(S)
user.put_in_hands(A)
user << "
You add the robot arm to the first aid kit."
- user.before_take_item(src, 1)
+ user.unEquip(src, 1)
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)
@@ -598,5 +597,5 @@
var/obj/machinery/bot/medbot/S = new /obj/machinery/bot/medbot(T)
S.skin = skin
S.name = created_name
- user.before_take_item(src, 1)
+ user.unEquip(src, 1)
qdel(src)
\ No newline at end of file
diff --git a/code/game/machinery/bots/mulebot.dm b/code/game/machinery/bots/mulebot.dm
index bd1ee21a88c..93342641732 100644
--- a/code/game/machinery/bots/mulebot.dm
+++ b/code/game/machinery/bots/mulebot.dm
@@ -43,7 +43,7 @@ var/global/mulebot_count = 0
var/auto_pickup = 1 // true if auto-pickup at beacon
var/report_delivery = 1 // true if bot will announce an arrival to a location.
- var/obj/item/weapon/cell/cell
+ var/obj/item/weapon/stock_parts/cell/cell
var/datum/wires/mulebot/wires = null
// the installed power cell
@@ -86,18 +86,13 @@ var/global/mulebot_count = 0
// 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)
- if(istype(I,/obj/item/weapon/card/emag))
- locked = !locked
- user << "
You [locked ? "lock" : "unlock"] the mulebot's controls!"
- flick("mulebot-emagged", src)
- playsound(loc, 'sound/effects/sparks1.ogg', 100, 0)
- else if(istype(I, /obj/item/weapon/card/id) || istype(I, /obj/item/device/pda))
+/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")]."
updateUsrDialog()
- else if(istype(I,/obj/item/weapon/cell) && open && !cell)
- var/obj/item/weapon/cell/C = I
+ else if(istype(I,/obj/item/weapon/stock_parts/cell) && open && !cell)
+ var/obj/item/weapon/stock_parts/cell/C = I
user.drop_item()
C.loc = src
cell = C
@@ -139,7 +134,12 @@ var/global/mulebot_count = 0
..()
return
-
+/obj/machinery/bot/mulebot/emag_act(user as mob)
+ locked = !locked
+ user << "
You [locked ? "lock" : "unlock"] the mulebot's controls!"
+ flick("mulebot-emagged", src)
+ playsound(loc, 'sound/effects/sparks1.ogg', 100, 0)
+
/obj/machinery/bot/mulebot/ex_act(var/severity)
unload(0)
switch(severity)
@@ -238,7 +238,7 @@ var/global/mulebot_count = 0
//user << browse("
M.U.L.E. Mk. III [suffix ? "([suffix])" : ""][dat]", "window=mulebot;size=350x500")
//onclose(user, "mulebot")
- var/datum/browser/popup = new(user, "mulebot", "M.U.L.E. Mk. V [suffix ? "([suffix])" : ""]", 350, 535)
+ var/datum/browser/popup = new(user, "mulebot", "M.U.L.E. Mk. V [suffix ? "([suffix])" : ""]", 350, 620)
popup.set_content(dat)
popup.set_title_image(user.browse_rsc_icon(icon, icon_state))
popup.open()
@@ -286,7 +286,7 @@ var/global/mulebot_count = 0
if("cellinsert")
if(open && !cell)
- var/obj/item/weapon/cell/C = usr.get_active_hand()
+ var/obj/item/weapon/stock_parts/cell/C = usr.get_active_hand()
if(istype(C))
usr.drop_item()
cell = C
@@ -313,6 +313,8 @@ var/global/mulebot_count = 0
updateDialog()
if("destination")
+ if(!delivery_beacons.len)
+ post_signal(beacon_freq, "findbeacon", "delivery")
refresh=0
var/new_dest = input("Select M.U.L.E. Destination", "Mulebot [suffix ? "([suffix])" : ""]", destination) as null|anything in delivery_beacons
refresh=1
@@ -322,7 +324,7 @@ var/global/mulebot_count = 0
if("setid")
refresh=0
- var/new_id = copytext(sanitize(input("Enter new bot ID", "Mulebot [suffix ? "([suffix])" : ""]", suffix) as text|null),1,MAX_NAME_LEN)
+ var/new_id = sanitize(copytext(input("Enter new bot ID", "Mulebot [suffix ? "([suffix])" : ""]", suffix) as text|null,1,MAX_NAME_LEN))
refresh=1
if(new_id)
suffix = new_id
@@ -683,7 +685,6 @@ var/global/mulebot_count = 0
// called when bot reaches current target
/obj/machinery/bot/mulebot/proc/at_target()
if(!reached_target)
- radio_frequency = SUP_FREQ //Supply channel
radio_name = "Supply"
Radio.config(list("[radio_name]" = 0))
visible_message("[src] makes a chiming sound!", "You hear a chime.")
@@ -696,12 +697,11 @@ var/global/mulebot_count = 0
calling_ai << "
\icon[src] [src] wirelessly plays a chiming sound!"
playsound(calling_ai, 'sound/machines/chime.ogg',40, 0)
calling_ai = null
- radio_frequency = AIPRIV_FREQ //Report on AI Private instead if the AI is controlling us.
radio_name = "AI Private"
Radio.config(list("[radio_name]" = 0))
if(load) // if loaded, unload at target
- speak("Destination
[destination] reached. Unloading [load].", radio_frequency, radio_name)
+ speak("Destination
[destination] reached. Unloading [load].", radio_name)
unload(loaddir)
else
// not loaded
@@ -717,7 +717,7 @@ var/global/mulebot_count = 0
if(AM)
load(AM)
if(report_delivery)
- speak("Now loading [load] at
[get_area(src)].", radio_frequency, radio_name)
+ speak("Now loading [load] at
[get_area(src)].", radio_name)
// whatever happened, check to see if we return home
if(auto_return && destination != home_destination)
diff --git a/code/game/machinery/bots/secbot.dm b/code/game/machinery/bots/secbot.dm
index fecf5cdcb26..a790767c851 100644
--- a/code/game/machinery/bots/secbot.dm
+++ b/code/game/machinery/bots/secbot.dm
@@ -25,7 +25,6 @@
var/arrest_type = 0 //If true, don't handcuff
var/harmbaton = 0
var/base_icon = "secbot"
- radio_frequency = SEC_FREQ //Security channel
radio_name = "Security"
bot_type = SEC_BOT
bot_type_name = "Secbot"
@@ -50,9 +49,8 @@
/obj/machinery/bot/secbot/pingsky
name = "Officer Pingsky"
desc = "It's Officer Pingsky! Delegated to satellite guard duty for harbouring anti-human sentiment."
- radio_frequency = AIPRIV_FREQ
radio_name = "AI Private"
-
+
/obj/machinery/bot/secbot/ofitser
name = "Prison Ofitser"
desc = "It's Prison Ofitser! Powered by the tears and sweat of prisoners."
@@ -177,7 +175,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
@@ -243,7 +241,7 @@ Auto Patrol: []"},
icon_state = "[base_icon][on]"
var/mob/living/carbon/M = target
if(istype(M, /mob/living/carbon/human))
- if( M.stuttering < 5 && !(M_HULK in M.mutations) )
+ if( M.stuttering < 5 && !(HULK in M.mutations) )
M.stuttering = 5
if(harmbaton) // Bots with harmbaton enabled become shitcurity. - Dave
M.apply_damage(10)
@@ -256,7 +254,7 @@ Auto Patrol: []"},
if(declare_arrests)
var/area/location = get_area(src)
- speak("[arrest_type ? "Detaining" : "Arresting"] level [threatlevel] scumbag
[target] in [location].",radio_frequency, radio_name)
+ speak("[arrest_type ? "Detaining" : "Arresting"] level [threatlevel] scumbag
[target] in [location].", radio_name)
target.visible_message("
[target] has been [harmbaton ? "beaten" : "stunned"] by [src]!",\
"
[target] has been [harmbaton ? "beaten" : "stunned"] by [src]!")
@@ -286,15 +284,15 @@ Auto Patrol: []"},
if(!arrest_type)
if(!target.handcuffed) //he's not cuffed? Try to cuff him!
mode = BOT_ARREST
- playsound(loc, 'sound/weapons/handcuffs.ogg', 30, 1, -2)
- target.visible_message("
[src] is trying to put handcuffs on [target]!",\
- "
[src] is trying to put handcuffs on [target]!")
- spawn(60)
+ playsound(loc, 'sound/weapons/cablecuff.ogg', 30, 1, -2)
+ target.visible_message("
[src] is trying to put zipties on [target]!",\
+ "
[src] is trying to put zipties on [target]!")
+ spawn(30)
if( !Adjacent(target) || !isturf(target.loc) ) //if he's in a closet or not adjacent, we cancel cuffing.
return
if(!target.handcuffed)
- target.handcuffed = new /obj/item/weapon/handcuffs(target)
- target.update_inv_handcuffed(0) //update the handcuffs overlay
+ target.handcuffed = new /obj/item/weapon/restraints/handcuffs/cable/zipties/used(target)
+ target.update_inv_handcuffed(1) //update the handcuffs overlay
playsound(loc, pick('sound/voice/bgod.ogg', 'sound/voice/biamthelaw.ogg', 'sound/voice/bsecureday.ogg', 'sound/voice/bradio.ogg', 'sound/voice/binsult.ogg', 'sound/voice/bcreep.ogg'), 50, 0)
back_to_idle()
else
@@ -414,7 +412,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))
..()
@@ -428,12 +426,12 @@ Auto Patrol: []"},
var/obj/item/weapon/secbot_assembly/A = new /obj/item/weapon/secbot_assembly
user.put_in_hands(A)
user << "
You add the signaler to the helmet."
- user.before_take_item(src, 1)
+ user.unEquip(src, 1)
qdel(src)
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 977c1bd3d3e..e60921e700b 100644
--- a/code/game/machinery/camera/camera.dm
+++ b/code/game/machinery/camera/camera.dm
@@ -14,11 +14,10 @@
var/c_tag_order = 999
var/status = 1.0
anchored = 1.0
+ var/start_active = 0 //If it ignores the random chance to start broken on round start
var/invuln = null
- var/bugged = 0
+ var/obj/item/device/camera_bug/bug = null
var/obj/item/weapon/camera_assembly/assembly = null
- var/watcherslist = list()
- var/obj/item/device/camera_bug/hasbug = null
//OTHER
@@ -28,26 +27,40 @@
var/light_disabled = 0
var/alarm_on = 0
var/busy = 0
- var/indestructible = 0 // If set, prevents aliens from destroying it
+ var/emped = 0 //Number of consecutive EMP's on this camera
/obj/machinery/camera/New()
wires = new(src)
assembly = new(src)
assembly.state = 4
+ assembly.anchored = 1
+ assembly.update_icon()
+
/* // Use this to look for cameras that have the same c_tag.
- for(var/obj/machinery/camera/C in cameranet.viewpoints)
+ for(var/obj/machinery/camera/C in cameranet.cameras)
var/list/tempnetwork = C.network&src.network
if(C != src && C.c_tag == src.c_tag && tempnetwork.len)
world.log << "[src.c_tag] [src.x] [src.y] [src.z] conflicts with [C.c_tag] [C.x] [C.y] [C.z]"
*/
- if(!src.network || src.network.len < 1)
- if(loc)
- error("[src.name] in [get_area(src)] (x:[src.x] y:[src.y] z:[src.z] has errored. [src.network?"Empty network list":"Null network list"]")
- else
- error("[src.name] in [get_area(src)]has errored. [src.network?"Empty network list":"Null network list"]")
- ASSERT(src.network)
- ASSERT(src.network.len > 0)
+ ..()
+
+/obj/machinery/camera/initialize()
+ if(z == 1 && prob(3) && !start_active)
+ deactivate()
+
+/obj/machinery/camera/Destroy()
+ deactivate(null, 0) //kick anyone viewing out
+ if(assembly)
+ qdel(assembly)
+ assembly = null
+ if(istype(bug))
+ bug.bugged_cameras -= src.c_tag
+ if(bug.current == src)
+ bug.current = null
+ bug = null
+ del(wires)
+ cameranet.removeCamera(src) //Will handle removal from the camera network and the chunks, so we don't need to worry about that
..()
/obj/machinery/camera/emp_act(severity)
@@ -60,30 +73,35 @@
stat |= EMPED
SetLuminosity(0)
triggerCameraAlarm()
+ emped = emped+1 //Increase the number of consecutive EMP's
+ var/thisemp = emped //Take note of which EMP this proc is for
spawn(900)
- network = previous_network
- icon_state = initial(icon_state)
- stat &= ~EMPED
- cancelCameraAlarm()
- if(can_use())
- cameranet.addCamera(src)
+ if(loc) //qdel limbo
+ if(emped == thisemp) //Only fix it if the camera hasn't been EMP'd again
+ network = previous_network
+ icon_state = initial(icon_state)
+ stat &= ~EMPED
+ cancelCameraAlarm()
+ if(can_use())
+ cameranet.addCamera(src)
+ emped = 0 //Resets the consecutive EMP count
for(var/mob/O in mob_list)
- if(O.client && O.client.eye == src)
+ if (O.client && O.client.eye == src)
O.unset_machine()
O.reset_view(null)
O << "The screen bursts into static."
..()
-/obj/machinery/camera/ex_act(severity)
+/obj/machinery/camera/ex_act(severity, target)
if(src.invuln)
return
else
- ..(severity)
+ ..()
return
/obj/machinery/camera/blob_act()
- del(src)
+ qdel(src)
return
/obj/machinery/camera/proc/setViewRange(var/num = 7)
@@ -98,8 +116,7 @@
/obj/machinery/camera/attack_paw(mob/living/carbon/alien/humanoid/user as mob)
if(!istype(user))
return
- if(indestructible)
- return
+ user.do_attack_animation(src)
status = 0
visible_message("
\The [user] slashes at [src]!")
playsound(src.loc, 'sound/weapons/slash.ogg', 100, 1)
@@ -107,7 +124,9 @@
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!"
// DECONSTRUCTION
if(istype(W, /obj/item/weapon/screwdriver))
@@ -123,11 +142,38 @@
else if(istype(W, /obj/item/weapon/weldingtool) && wires.CanDeconstruct())
if(weld(W, user))
- if(assembly)
- assembly.loc = src.loc
- assembly.state = 1
- del(src)
+ user << "You unweld the camera leaving it as just a frame screwed to the wall."
+ if(!assembly)
+ assembly = new()
+ assembly.loc = src.loc
+ assembly.state = 1
+ assembly.dir = src.dir
+ assembly.update_icon()
+ assembly = null
+ qdel(src)
+ return
+ else if(istype(W, /obj/item/device/analyzer) && panel_open) //XRay
+ if(!isXRay())
+ upgradeXRay()
+ qdel(W)
+ user << "[msg]"
+ else
+ user << "[msg2]"
+ else if(istype(W, /obj/item/stack/sheet/mineral/plasma) && panel_open)
+ if(!isEmpProof())
+ upgradeEmpProof()
+ user << "[msg]"
+ qdel(W)
+ else
+ user << "[msg2]"
+ else if(istype(W, /obj/item/device/assembly/prox_sensor) && panel_open)
+ if(!isMotion())
+ upgradeMotion()
+ user << "[msg]"
+ qdel(W)
+ else
+ user << "[msg2]"
// OTHER
else if ((istype(W, /obj/item/weapon/paper) || istype(W, /obj/item/device/pda)) && isliving(user))
@@ -145,37 +191,29 @@
P = W
itemname = P.name
info = P.notehtml
- U << "You hold \a [itemname] up to the camera ..."
- for(var/mob/living/silicon/ai/O in living_mob_list)
- if(!O.client) continue
- if(U.name == "Unknown") O << "
[U] holds \a [itemname] up to one of your cameras ..."
- else O << "
[U] holds \a [itemname] up to one of your cameras ..."
- O << browse(text("
[][]", itemname, info), text("window=[]", itemname))
+ U << "You hold \the [itemname] up to the camera ..."
+ U.changeNext_move(CLICK_CD_MELEE)
for(var/mob/O in player_list)
- if(O.client && O.client.eye == src)
- O.unset_machine()
- O.reset_view(null)
- O << "[U] holds \a [itemname] up to the camera..."
- O << browse("
[itemname][info]","window=[itemname]")
- else if (istype(W, /obj/item/device/camera_bug) && panel_open)
+ if(istype(O, /mob/living/silicon/ai))
+ var/mob/living/silicon/ai/AI = O
+ if(U.name == "Unknown") AI << "
[U] holds
\a [itemname] up to one of your cameras ..."
+ else AI << "
[U] holds
\a [itemname] up to one of your cameras ..."
+ AI.last_paper_seen = "
[itemname][info]"
+ else if (O.client && O.client.eye == src)
+ O << "[U] holds \a [itemname] up to one of the cameras ..."
+ O << browse(text("
[][]", itemname, info), text("window=[]", itemname))
+ else if (istype(W, /obj/item/device/camera_bug))
if (!src.can_use())
- user << "\blue Camera non-functional"
+ user << "
Camera non-functional."
return
+ if(istype(src.bug))
+ user << "
Camera bug removed."
+ src.bug.bugged_cameras -= src.c_tag
+ src.bug = null
else
- user << "\blue Camera bugged."
- user.drop_item(W)
- hasbug = W
- contents += W
- if(prob(15))
- spawn(30)
- if(src.can_use() && hasbug)
- desc += "
The power light on the camera is blinking"
- triggerCameraAlarm()
- else if (iscrowbar(W) && panel_open && src.hasbug)
- user << "\blue You retrieve \the [hasbug]"
- user.put_in_hands(hasbug)
- hasbug = null
- deactivatebug(user)
+ user << "
Camera bugged."
+ src.bug = W
+ src.bug.bugged_cameras[src.c_tag] = src
else if(istype(W, /obj/item/weapon/melee/energy/blade))//Putting it here last since it's a special case. I wonder if there is a better way to do these than type casting.
deactivate(user,2)//Here so that you can disconnect anyone viewing the camera, regardless if it's on or off.
var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread()
@@ -183,49 +221,41 @@
spark_system.start()
playsound(loc, 'sound/weapons/blade1.ogg', 50, 1)
playsound(loc, "sparks", 50, 1)
- visible_message("\blue The camera has been sliced apart by [] with an energy blade!")
- del(src)
+ visible_message("
[user] has sliced the camera apart with an energy blade!")
+ qdel(src)
else if(istype(W, /obj/item/device/laser_pointer))
var/obj/item/device/laser_pointer/L = W
L.laser_act(src, user)
else
..()
return
-/obj/machinery/camera/proc/deactivatebug(user as mob)
- for(var/mob/O in player_list)
- if(istype(O.machine, /obj/item/device/handtv))
- var/obj/item/device/handtv/S = O.machine
- if (S.current == src)
- O.unset_machine()
- O.reset_view(null)
- O << "The screen bursts into static."
/obj/machinery/camera/proc/deactivate(user as mob, var/choice = 1)
if(choice==1)
status = !( src.status )
if (!(src.status))
if(user)
- visible_message("\red [user] has deactivated [src]!")
+ visible_message("
[user] deactivates [src]!")
add_hiddenprint(user)
else
- visible_message("\red \The [src] deactivates!")
+ visible_message("
\The [src] deactivates!")
playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1)
icon_state = "[initial(icon_state)]1"
- add_hiddenprint(user)
+
else
if(user)
- visible_message("\red [user] has reactivated [src]!")
+ visible_message("
[user] reactivates [src]!")
add_hiddenprint(user)
else
- visible_message("\red \the [src] reactivates!")
+ visible_message("
\The [src] reactivates!")
playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1)
icon_state = initial(icon_state)
- add_hiddenprint(user)
+
// now disconnect anyone using the camera
//Apparently, this will disconnect anyone even if the camera was re-activated.
//I guess that doesn't matter since they can't use it anyway?
for(var/mob/O in player_list)
- if(O.client && O.client.eye == src)
+ if (O.client && O.client.eye == src)
O.unset_machine()
O.reset_view(null)
O << "The screen bursts into static."
@@ -239,7 +269,7 @@
/obj/machinery/camera/proc/cancelCameraAlarm()
alarm_on = 0
for(var/mob/living/silicon/S in mob_list)
- S.cancelAlarm("Camera", get_area(src), list(src), src)
+ S.cancelAlarm("Camera", get_area(src), src)
/obj/machinery/camera/proc/can_use()
if(!status)
@@ -301,7 +331,7 @@
return 0
// Do after stuff here
- user << "
You start to weld the [src].."
+ user << "
You start to weld [src]."
playsound(src.loc, 'sound/items/Welder.ogg', 50, 1)
WT.eyecheck(user)
busy = 1
diff --git a/code/game/machinery/camera/camera_assembly.dm b/code/game/machinery/camera/camera_assembly.dm
index 9f6eb2210af..f91565511f5 100644
--- a/code/game/machinery/camera/camera_assembly.dm
+++ b/code/game/machinery/camera/camera_assembly.dm
@@ -1,16 +1,15 @@
/obj/item/weapon/camera_assembly
name = "camera assembly"
- desc = "The basic construction for Nanotrasen-Always-Watching-You cameras."
+ desc = "A pre-fabricated security camera kit, ready to be assembled and mounted to a surface."
icon = 'icons/obj/monitors.dmi'
icon_state = "cameracase"
w_class = 2
anchored = 0
-
- m_amt = 700
- g_amt = 300
+ m_amt = 400
+ g_amt = 250
// Motion, EMP-Proof, X-Ray
- var/list/obj/item/possible_upgrades = list(/obj/item/device/assembly/prox_sensor, /obj/item/stack/sheet/mineral/plasma, /obj/item/weapon/reagent_containers/food/snacks/grown/carrot)
+ var/list/obj/item/possible_upgrades = list(/obj/item/device/assembly/prox_sensor, /obj/item/stack/sheet/mineral/plasma, /obj/item/device/analyzer)
var/list/upgrades = list()
var/state = 0
var/busy = 0
@@ -22,7 +21,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)
@@ -59,8 +58,10 @@
if(iscoil(W))
var/obj/item/stack/cable_coil/C = W
if(C.use(2))
- user << "You add wires to the assembly."
+ user << "
You add wires to the assembly."
state = 3
+ else
+ user << "
You need 2 coils of wire to wire the assembly."
return
else if(iswelder(W))
@@ -87,7 +88,8 @@
usr << "No network found please hang up and try your call again."
return
- var/temptag = "[get_area(src)] ([rand(1, 999)])"
+ var/area/camera_area = get_area(src)
+ var/temptag = "[sanitize(camera_area.name)] ([rand(1, 999)])"
input = strip_html(input(usr, "How would you like to name the camera?", "Set Camera Name", temptag))
state = 4
@@ -98,7 +100,7 @@
C.auto_turn()
C.network = uniquelist(tempnetwork)
- tempnetwork = difflist(C.network,RESTRICTED_CAMERA_NETWORKS)
+ tempnetwork = difflist(C.network,restricted_camera_networks)
if(!tempnetwork.len)//Camera isn't on any open network - remove its chunk from AI visibility.
cameranet.removeCamera(C)
@@ -124,7 +126,7 @@
// Upgrades!
if(is_type_in_list(W, possible_upgrades) && !is_type_in_list(W, upgrades)) // Is a possible upgrade and isn't in the camera already.
- user << "You attach the [W] into the assembly inner circuits."
+ user << "You attach \the [W] into the assembly inner circuits."
upgrades += W
user.drop_item(W)
W.loc = src
@@ -169,4 +171,4 @@
return 0
return 1
busy = 0
- return 0
\ No newline at end of file
+ return 0
diff --git a/code/game/machinery/camera/motion.dm b/code/game/machinery/camera/motion.dm
index 588ab5005ce..0c6f7d95a7f 100644
--- a/code/game/machinery/camera/motion.dm
+++ b/code/game/machinery/camera/motion.dm
@@ -8,6 +8,8 @@
/obj/machinery/camera/process()
// motion camera event loop
+ if (stat & (EMPED|NOPOWER))
+ return
if(!isMotion())
. = PROCESS_KILL
return
@@ -40,16 +42,20 @@
cancelAlarm()
/obj/machinery/camera/proc/cancelAlarm()
+ if (!status || (stat & NOPOWER))
+ return 0
if (detectTime == -1)
for (var/mob/living/silicon/aiPlayer in player_list)
- if (status) aiPlayer.cancelAlarm("Motion", src.loc.loc)
+ aiPlayer.cancelAlarm("Motion", get_area(src), src)
detectTime = 0
return 1
/obj/machinery/camera/proc/triggerAlarm()
+ if (!status || (stat & NOPOWER))
+ return 0
if (!detectTime) return 0
for (var/mob/living/silicon/aiPlayer in player_list)
- if (status) aiPlayer.triggerAlarm("Motion", src.loc.loc, src)
+ aiPlayer.triggerAlarm("Motion", get_area(src), list(src), src)
detectTime = -1
return 1
diff --git a/code/game/machinery/camera/presets.dm b/code/game/machinery/camera/presets.dm
index 0ee0e622b8b..84ec6734e1b 100644
--- a/code/game/machinery/camera/presets.dm
+++ b/code/game/machinery/camera/presets.dm
@@ -57,7 +57,7 @@
return O
/obj/machinery/camera/proc/isXRay()
- var/O = locate(/obj/item/weapon/reagent_containers/food/snacks/grown/carrot) in assembly.upgrades
+ var/O = locate(/obj/item/device/analyzer) in assembly.upgrades
return O
/obj/machinery/camera/proc/isMotion()
@@ -68,10 +68,21 @@
/obj/machinery/camera/proc/upgradeEmpProof()
assembly.upgrades.Add(new /obj/item/stack/sheet/mineral/plasma(assembly))
+ setPowerUsage()
/obj/machinery/camera/proc/upgradeXRay()
- assembly.upgrades.Add(new /obj/item/weapon/reagent_containers/food/snacks/grown/carrot(assembly))
+ assembly.upgrades.Add(new /obj/item/device/analyzer(assembly))
+ setPowerUsage()
// If you are upgrading Motion, and it isn't in the camera's New(), add it to the machines list.
/obj/machinery/camera/proc/upgradeMotion()
- assembly.upgrades.Add(new /obj/item/device/assembly/prox_sensor(assembly))
\ No newline at end of file
+ assembly.upgrades.Add(new /obj/item/device/assembly/prox_sensor(assembly))
+ setPowerUsage()
+
+/obj/machinery/camera/proc/setPowerUsage()
+ var/mult = 1
+ if (isXRay())
+ mult++
+ if (isMotion())
+ mult++
+ active_power_usage = mult*initial(active_power_usage)
diff --git a/code/game/machinery/camera/tracking.dm b/code/game/machinery/camera/tracking.dm
index 47b2edf9fac..dd7c175ce4d 100644
--- a/code/game/machinery/camera/tracking.dm
+++ b/code/game/machinery/camera/tracking.dm
@@ -1,16 +1,25 @@
+/mob/living/silicon/ai/var/max_locations = 10
+/mob/living/silicon/ai/var/stored_locations[0]
+
+/mob/living/silicon/ai/proc/InvalidTurf(turf/T as turf)
+ if(!T)
+ return 1
+ if((T.z in config.admin_levels))
+ return 1
+ if(T.z > 6)
+ return 1
+ return 0
+
/mob/living/silicon/ai/proc/get_camera_list()
+
if(src.stat == 2)
return
- var/list/L = list()
- for (var/obj/machinery/camera/C in cameranet.viewpoints)
- L.Add(C)
-
- camera_sort(L)
+ cameranet.process_sort()
var/list/T = list()
T["Cancel"] = "Cancel"
- for (var/obj/machinery/camera/C in L)
+ for (var/obj/machinery/camera/C in cameranet.cameras)
var/list/tempnetwork = C.network&src.network
if (tempnetwork.len)
T[text("[][]", C.c_tag, (C.can_use() ? null : " (Deactivated)"))] = C
@@ -19,20 +28,76 @@
track.cameras = T
return T
+
/mob/living/silicon/ai/proc/ai_camera_list(var/camera in get_camera_list())
+ set category = "AI Commands"
+ set name = "Show Camera List"
+
if(src.stat == 2)
src << "You can't list the cameras because you are dead!"
return
if (!camera || camera == "Cancel")
return 0
-
+
var/obj/machinery/camera/C = track.cameras[camera]
- track = null
src.eyeobj.setLoc(C)
return
+/mob/living/silicon/ai/proc/ai_store_location(loc as text)
+ set category = "AI Commands"
+ set name = "Store Camera Location"
+ set desc = "Stores your current camera location by the given name"
+
+ loc = sanitize(copytext(loc, 1, MAX_MESSAGE_LEN))
+ if(!loc)
+ src << "\red Must supply a location name"
+ return
+
+ if(stored_locations.len >= max_locations)
+ src << "\red Cannot store additional locations. Remove one first"
+ return
+
+ if(loc in stored_locations)
+ src << "\red There is already a stored location by this name"
+ return
+
+ var/L = src.eyeobj.getLoc()
+ if (InvalidTurf(get_turf(L)))
+ src << "\red Unable to store this location"
+ return
+
+ stored_locations[loc] = L
+ src << "Location '[loc]' stored"
+
+/mob/living/silicon/ai/proc/sorted_stored_locations()
+ return sortList(stored_locations)
+
+/mob/living/silicon/ai/proc/ai_goto_location(loc in sorted_stored_locations())
+ set category = "AI Commands"
+ set name = "Goto Camera Location"
+ set desc = "Returns to the selected camera location"
+
+ if (!(loc in stored_locations))
+ src << "\red Location [loc] not found"
+ return
+
+ var/L = stored_locations[loc]
+ src.eyeobj.setLoc(L)
+
+/mob/living/silicon/ai/proc/ai_remove_location(loc in sorted_stored_locations())
+ set category = "AI Commands"
+ set name = "Delete Camera Location"
+ set desc = "Deletes the selected camera location"
+
+ if (!(loc in stored_locations))
+ src << "\red Location [loc] not found"
+ return
+
+ stored_locations.Remove(loc)
+ src << "Location [loc] removed"
+
// Used to allow the AI is write in mob names/camera name from the CMD line.
/datum/trackable
var/list/names = list()
@@ -50,12 +115,7 @@
for(var/mob/living/M in mob_list)
// Easy checks first.
// Don't detect mobs on Centcom. Since the wizard den is on Centcomm, we only need this.
- var/turf/T = get_turf(M)
- if(!T)
- continue
- if(T.z == 2)
- continue
- if(T.z > 6)
+ if(InvalidTurf(get_turf(M)))
continue
if(M == usr)
continue
@@ -72,11 +132,8 @@
//Cameras can't track people wearing an agent card or a ninja hood.
if(H.wear_id && istype(H.wear_id.GetID(), /obj/item/weapon/card/id/syndicate))
continue
- if(istype(H.head, /obj/item/clothing/head/helmet/space/space_ninja))
- var/obj/item/clothing/head/helmet/space/space_ninja/hood = H.head
- if(!hood.canremove)
- continue
-
+ if(istype(H.head, /obj/item/clothing/head/helmet/space/space_ninja) && (H.head.flags & NODROP))
+ continue
// Now, are they viewable by a camera? (This is last because it's the most intensive check)
if(!near_camera(M))
continue
@@ -98,6 +155,10 @@
return targets
/mob/living/silicon/ai/proc/ai_camera_track(var/target_name in trackable_mobs())
+ set category = "AI Commands"
+ set name = "Track With Camera"
+ set desc = "Select who you would like to track."
+
if(src.stat == 2)
src << "You can't track with camera because you are dead!"
return
@@ -108,61 +169,18 @@
src.track = null
ai_actual_track(target)
-/mob/living/silicon/ai/proc/open_nearest_door(mob/living/target as mob)
- if(!istype(target)) return
- spawn(0)
- if(istype(target, /mob/living/carbon/human))
- var/mob/living/carbon/human/H = target
- if(H.wear_id && istype(H.wear_id.GetID(), /obj/item/weapon/card/id/syndicate))
- src << "Unable to locate an airlock"
- return
- if(H.wear_id && istype(H.wear_id.GetID(), /obj/item/weapon/card/id/syndicate))
- src << "Unable to locate an airlock"
- return
- if(istype(H.head, /obj/item/clothing/head/helmet/space/space_ninja) && !H.head.canremove)
- src << "Unable to locate an airlock"
- return
- if(H.digitalcamo)
- src << "Unable to locate an airlock"
- return
- if (!near_camera(target))
- src << "Target is not near any active cameras."
- return
- var/obj/machinery/door/airlock/tobeopened
- var/dist = -1
- for(var/obj/machinery/door/airlock/D in range(3,target))
- if(!D.density) continue
- if(dist < 0)
- dist = get_dist(D, target)
- //world << dist
- tobeopened = D
- else
- if(dist > get_dist(D, target))
- dist = get_dist(D, target)
- //world << dist
- tobeopened = D
- //world << "found [tobeopened.name] closer"
- else
- //world << "[D.name] not close enough | [get_dist(D, target)] | [dist]"
- if(tobeopened)
- switch(alert(src, "Do you want to open \the [tobeopened] for [target]?","Doorknob_v2a.exe","Yes","No"))
- if("Yes")
- var/nhref = "src=\ref[tobeopened];aiEnable=7"
- tobeopened.Topic(nhref, params2list(nhref), tobeopened, 1)
- src << "\blue You've opened \the [tobeopened] for [target]."
- if("No")
- src << "\red You deny the request."
- else
- src << "\red You've failed to open an airlock for [target]"
+/mob/living/silicon/ai/proc/ai_cancel_tracking(var/forced = 0)
+ if(!cameraFollow)
return
-/mob/living/silicon/ai/proc/ai_actual_track(atom/target as mob|obj)
+
+ src << "Follow camera mode [forced ? "terminated" : "ended"]."
+ cameraFollow = null
+
+/mob/living/silicon/ai/proc/ai_actual_track(atom/movable/target as mob|obj)
if(!istype(target)) return
var/mob/living/silicon/ai/U = usr
U.cameraFollow = target
- //U << text("Now tracking [] on camera.", target.name)
- //if (U.machine == null)
- // U.machine = U
U << "Now tracking [target.name] on camera."
spawn (0)
@@ -172,30 +190,26 @@
if (istype(target, /mob/living/carbon/human))
var/mob/living/carbon/human/H = target
if(H.wear_id && istype(H.wear_id.GetID(), /obj/item/weapon/card/id/syndicate))
- U << "Follow camera mode terminated."
- U.cameraFollow = null
+ U.ai_cancel_tracking(1)
return
-/* if(istype(H.head, /obj/item/clothing/head/helmet/space/space_ninja) && !H.head.canremove)
- U << "Follow camera mode terminated."
- U.cameraFollow = null
- return*/
if(H.digitalcamo)
- U << "Follow camera mode terminated."
- U.cameraFollow = null
+ U.ai_cancel_tracking(1)
+ return
+ if(H.head && istype(H.head, /obj/item/clothing/head/helmet/space/space_ninja) && (H.head.flags & NODROP))
+ U.ai_cancel_tracking(1)
return
if(istype(target.loc,/obj/effect/dummy))
- U << "Follow camera mode ended."
- U.cameraFollow = null
+ U.ai_cancel_tracking()
return
- if (!near_camera(target))
+ if (!trackable(target))
U << "Target is not near any active cameras."
sleep(100)
continue
if(U.eyeobj)
- U.eyeobj.setLoc(get_turf(target))
+ U.eyeobj.setLoc(get_turf(target), 0)
else
view_core()
return
@@ -212,6 +226,12 @@
return 0
return 1
+/proc/trackable(atom/movable/M)
+ var/turf/T = get_turf(M)
+ if(T && (T.z in config.contact_levels))
+ return 1
+
+ return near_camera(M)
/obj/machinery/camera/attack_ai(var/mob/living/silicon/ai/user as mob)
if (!istype(user))
@@ -223,19 +243,3 @@
/mob/living/silicon/ai/attack_ai(var/mob/user as mob)
ai_camera_list()
-
-/proc/camera_sort(list/L)
- var/obj/machinery/camera/a
- var/obj/machinery/camera/b
-
- for (var/i = L.len, i > 0, i--)
- for (var/j = 1 to i - 1)
- a = L[j]
- b = L[j + 1]
- if (a.c_tag_order != b.c_tag_order)
- if (a.c_tag_order > b.c_tag_order)
- L.Swap(j, j + 1)
- else
- if (sorttext(a.c_tag, b.c_tag) < 0)
- L.Swap(j, j + 1)
- return L
diff --git a/code/game/machinery/cell_charger.dm b/code/game/machinery/cell_charger.dm
index 16c39585dfa..823671c2019 100644
--- a/code/game/machinery/cell_charger.dm
+++ b/code/game/machinery/cell_charger.dm
@@ -8,7 +8,7 @@
idle_power_usage = 5
active_power_usage = 60
power_channel = EQUIP
- var/obj/item/weapon/cell/charging = null
+ var/obj/item/weapon/stock_parts/cell/charging = null
var/chargelevel = -1
proc
updateicon()
@@ -34,11 +34,11 @@
if(charging)
usr << "Current charge: [charging.charge]"
- attackby(obj/item/weapon/W, mob/user)
+ attackby(obj/item/weapon/W, mob/user, params)
if(stat & BROKEN)
return
- if(istype(W, /obj/item/weapon/cell) && anchored)
+ if(istype(W, /obj/item/weapon/stock_parts/cell) && anchored)
if(charging)
user << "\red There is already a cell in the charger."
return
diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm
index f7eb7803fd4..27e16c1be95 100644
--- a/code/game/machinery/cloning.dm
+++ b/code/game/machinery/cloning.dm
@@ -328,7 +328,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 (istype(W, /obj/item/weapon/screwdriver))
if(occupant || mess || locked)
user << "
The maintenance panel is locked."
diff --git a/code/game/machinery/computer/HolodeckControl.dm b/code/game/machinery/computer/HolodeckControl.dm
index cd78210b41f..a14da59c097 100644
--- a/code/game/machinery/computer/HolodeckControl.dm
+++ b/code/game/machinery/computer/HolodeckControl.dm
@@ -161,45 +161,17 @@
-/obj/machinery/computer/HolodeckControl/attackby(var/obj/item/weapon/D as obj, var/mob/user as mob)
-//Warning, uncommenting this can have concequences. For example, deconstructing the computer may cause holographic eswords to never derez
-
-/* if(istype(D, /obj/item/weapon/screwdriver))
- playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
- if(do_after(user, 20))
- if (src.stat & BROKEN)
- user << "\blue The broken glass falls out."
- var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc )
- new /obj/item/weapon/shard( src.loc )
- var/obj/item/weapon/circuitboard/comm_traffic/M = new /obj/item/weapon/circuitboard/comm_traffic( A )
- for (var/obj/C in src)
- C.loc = src.loc
- A.circuit = M
- A.state = 3
- A.icon_state = "3"
- A.anchored = 1
- del(src)
- else
- user << "\blue You disconnect the monitor."
- var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc )
- var/obj/item/weapon/circuitboard/comm_traffic/M = new /obj/item/weapon/circuitboard/comm_traffic( A )
- for (var/obj/C in src)
- C.loc = src.loc
- A.circuit = M
- A.state = 4
- A.icon_state = "4"
- A.anchored = 1
- del(src)
-
-*/
- if(istype(D, /obj/item/weapon/card/emag) && !emagged)
+/obj/machinery/computer/HolodeckControl/attackby(var/obj/item/weapon/D as obj, var/mob/user as mob, params)
+ return
+
+/obj/machinery/computer/HolodeckControl/emag_act(user as mob)
+ if(!emagged)
playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1)
emagged = 1
user << "\blue You vastly increase projector power and override the safety and security protocols."
user << "Warning. Automatic shutoff and derezing protocols have been corrupted. Please call Nanotrasen maintenance and do not use the simulator."
log_game("[key_name(usr)] emagged the Holodeck Control Computer")
- src.updateUsrDialog()
- return
+ src.updateUsrDialog()
/obj/machinery/computer/HolodeckControl/New()
..()
@@ -269,8 +241,7 @@
if(isobj(obj))
var/mob/M = obj.loc
if(ismob(M))
- M.u_equip(obj)
- M.update_icons() //so their overlays update
+ M.unEquip(obj, 1) //Holoweapons should always drop.
if(!silent)
var/obj/oldobj = obj
@@ -394,7 +365,7 @@
var/turf/simulated/floor/FF = get_step(src,direction)
FF.update_icon() //so siding get updated properly
-/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
@@ -431,7 +402,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<2)
@@ -489,7 +460,7 @@
throw_range = 5
throwforce = 0
w_class = 2.0
- flags = FPRINT | TABLEPASS | NOSHIELD
+ flags = NOSHIELD
var/active = 0
/obj/item/weapon/holo/esword/green
@@ -551,7 +522,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<2)
@@ -609,7 +580,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/Operating.dm b/code/game/machinery/computer/Operating.dm
index bfd979025be..9f73b206443 100644
--- a/code/game/machinery/computer/Operating.dm
+++ b/code/game/machinery/computer/Operating.dm
@@ -73,7 +73,7 @@
/obj/machinery/computer/operating/Topic(href, href_list)
if(..())
- return
+ return 1
if ((usr.contents.Find(src) || (in_range(src, usr) && istype(src.loc, /turf))) || (istype(usr, /mob/living/silicon)))
usr.set_machine(src)
return
diff --git a/code/game/machinery/computer/ai_core.dm b/code/game/machinery/computer/ai_core.dm
index 99751ab3296..d408d934c25 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))
@@ -174,8 +174,12 @@
icon_state = "ai-empty"
anchored = 1
state = 20//So it doesn't interact based on the above. Not really necessary.
+
+/obj/structure/AIcore/deactivated/Destroy()
+ empty_playable_ai_cores -= src
+ ..()
-/obj/structure/AIcore/deactivated/attackby(var/obj/item/W, var/mob/user)
+/obj/structure/AIcore/deactivated/attackby(var/obj/item/W, var/mob/user, params)
if(istype(W, /obj/item/device/aicard))//Is it?
var/obj/item/device/aicard/card = W
card.transfer_ai("INACTIVE","AICARD",src,user)
diff --git a/code/game/machinery/computer/aifixer.dm b/code/game/machinery/computer/aifixer.dm
index 7a45f1a8114..51c8626c1d1 100644
--- a/code/game/machinery/computer/aifixer.dm
+++ b/code/game/machinery/computer/aifixer.dm
@@ -13,7 +13,7 @@
src.overlays += image('icons/obj/computer.dmi', "ai-fixer-empty")
-/obj/machinery/computer/aifixer/attackby(I as obj, user as mob)
+/obj/machinery/computer/aifixer/attackby(I as obj, user as mob, params)
if(istype(I, /obj/item/device/aicard))
if(stat & (NOPOWER|BROKEN))
user << "This terminal isn't functioning right now, get it working!"
@@ -79,7 +79,7 @@
/obj/machinery/computer/aifixer/Topic(href, href_list)
if(..())
- return
+ return 1
if (href_list["fix"])
src.active = 1
src.overlays += image('icons/obj/computer.dmi', "ai-fixer-on")
diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm
index a3402129d88..7831bfc8f87 100644
--- a/code/game/machinery/computer/arcade.dm
+++ b/code/game/machinery/computer/arcade.dm
@@ -31,6 +31,8 @@
/obj/item/toy/carpplushie = 2,
/obj/item/toy/minimeteor = 2,
/obj/item/toy/redbutton = 2,
+ /obj/item/toy/owl = 2,
+ /obj/item/toy/griffin = 2,
/obj/item/clothing/head/blob = 2,
/obj/item/weapon/id_decal/gold = 2,
/obj/item/weapon/id_decal/silver = 2,
@@ -144,7 +146,10 @@
/obj/machinery/computer/arcade/battle/Topic(href, href_list)
if(..())
- return
+ return 1
+
+ if(usr.machine != src)
+ return 0
if (!src.blocked && !src.gameover)
if (href_list["attack"])
@@ -269,8 +274,8 @@
return
-/obj/machinery/computer/arcade/battle/attackby(I as obj, user as mob)
- if(istype(I, /obj/item/weapon/card/emag) && !emagged)
+/obj/machinery/computer/arcade/battle/emag_act(user as mob)
+ if(!emagged)
temp = "If you die in the game, you die for real!"
player_hp = 30
player_mp = 10
@@ -284,14 +289,7 @@
enemy_name = "Cuban Pete"
name = "Outbomb Cuban Pete"
-
src.updateUsrDialog()
- else
-
- ..()
-
-
-
/obj/machinery/computer/arcade/orion_trail
name = "The Orion Trail"
@@ -405,7 +403,9 @@
/obj/machinery/computer/arcade/orion_trail/Topic(href, href_list)
if(..())
- return
+ return 1
+ if(usr.machine != src)
+ return 0
if(href_list["close"])
usr.unset_machine()
usr << browse(null, "window=arcade")
@@ -566,4 +566,5 @@
/obj/machinery/computer/arcade/orion_trail/proc/win()
playing = 0
+ turns = 0
prizevend()
diff --git a/code/game/machinery/computer/atmos_alert.dm b/code/game/machinery/computer/atmos_alert.dm
index 9a0ff286700..5e9bb34866b 100644
--- a/code/game/machinery/computer/atmos_alert.dm
+++ b/code/game/machinery/computer/atmos_alert.dm
@@ -23,8 +23,10 @@
var/zone = signal.data["zone"]
var/severity = signal.data["alert"]
+ var/hidden = signal.data["hidden"]
if(!zone || !severity) return
+ if(hidden) return
minor_alarms -= zone
priority_alarms -= zone
@@ -98,7 +100,7 @@
/obj/machinery/computer/atmos_alert/Topic(href, href_list)
if(..())
- return
+ return 1
if(href_list["priority_clear"])
var/removing_zone = href_list["priority_clear"]
diff --git a/code/game/machinery/computer/atmos_control.dm b/code/game/machinery/computer/atmos_control.dm
index df9a3cbef9e..bce0006f488 100644
--- a/code/game/machinery/computer/atmos_control.dm
+++ b/code/game/machinery/computer/atmos_control.dm
@@ -37,15 +37,16 @@
return ui_interact(user)
-/obj/machinery/computer/atmoscontrol/attackby(var/obj/item/I as obj, var/mob/user as mob)
- if(istype(I, /obj/item/weapon/card/emag) && !emagged)
- user.visible_message("\red \The [user] swipes \a [I] through \the [src], causing the screen to flash!",\
- "\red You swipe your [I] through \the [src], the screen flashing as you gain full control.",\
+/obj/machinery/computer/atmoscontrol/emag_act(user as mob)
+ if(!emagged)
+ if(!ishuman(user))
+ return
+ var/mob/living/carbon/human/H = user
+ H.visible_message("\red \The [user] swipes \a card through \the [src], causing the screen to flash!",\
+ "\red You swipe your card through \the [src], the screen flashing as you gain full control.",\
"You hear the swipe of a card through a reader, and an electronic warble.")
emagged = 1
overridden = 1
- return
- return ..()
/obj/machinery/computer/atmoscontrol/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null)
if(user.stat && !isobserver(user))
@@ -115,7 +116,7 @@
//a bunch of this is copied from atmos alarms
/obj/machinery/computer/atmoscontrol/Topic(href, href_list)
if(..())
- return
+ return 1
if(href_list["reset"])
current = null
diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm
index eb8efc36264..23743ffc10c 100644
--- a/code/game/machinery/computer/buildandrepair.dm
+++ b/code/game/machinery/computer/buildandrepair.dm
@@ -233,7 +233,7 @@
board_type = "honkcomputer"
-/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
@@ -255,7 +255,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))
user.visible_message("\blue \the [user] adjusts the jumper on the [src]'s access protocol pins.", "\blue You adjust the jumper on the access protocol pins.")
if(src.build_path == "/obj/machinery/computer/rdconsole/core")
@@ -268,7 +268,7 @@
user << "\blue Access protocols set to default."
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)
switch(state)
if(0)
if(istype(P, /obj/item/weapon/wrench))
@@ -379,7 +379,7 @@
name = "Bananium Computer-frame"
icon = 'icons/obj/machines/HONKputer.dmi'
-/obj/structure/computerframe/HONKputer/attackby(obj/item/P as obj, mob/user as mob)
+/obj/structure/computerframe/HONKputer/attackby(obj/item/P as obj, mob/user as mob, params)
switch(state)
if(0)
if(istype(P, /obj/item/weapon/wrench))
diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm
index 7bc376580b8..8370dd40f3c 100644
--- a/code/game/machinery/computer/camera.dm
+++ b/code/game/machinery/computer/camera.dm
@@ -1,3 +1,7 @@
+/proc/invalidateCameraCache()
+ for(var/obj/machinery/computer/security/s in world)
+ s.camera_cache = null
+
/obj/machinery/computer/security
name = "Camera Monitor"
desc = "Used to access the various cameras networks on the station."
@@ -12,6 +16,7 @@
var/list/tempnets[0]
var/list/data[0]
var/list/access[0]
+ var/camera_cache = null
New() // Lists existing networks and their required access. Format: networks[
] = list()
networks["SS13"] = list(access_hos,access_captain)
@@ -48,27 +53,23 @@
return 1
// Network configuration
- attackby(I as obj, user as mob)
+ attackby(I as obj, user as mob, params)
access = list()
- if(istype(I,/obj/item/weapon/card/emag)) // If hit by an emag.
- var/obj/item/weapon/card/emag/E = I
- if(!emagged)
- if(E.uses)
- E.uses--
- emagged = 1
- user << "\blue You have authorized full network access!"
- ui_interact(user)
- else
- ui_interact(user)
- else
- ui_interact(user)
- else if(istype(I,/obj/item/weapon/card/id)) // If hit by a regular ID card.
+ if(istype(I,/obj/item/weapon/card/id)) // If hit by a regular ID card.
var/obj/item/weapon/card/id/E = I
access = E.access
ui_interact(user)
else
..()
+ emag_act(user as mob)
+ if(!emagged)
+ emagged = 1
+ user << "\blue You have authorized full network access!"
+ ui_interact(user)
+ else
+ ui_interact(user)
+
ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
if(src.z > 6) return
if(stat & (NOPOWER|BROKEN)) return
@@ -76,14 +77,15 @@
var/data[0]
+
data["current"] = null
var/list/L = list()
- for (var/obj/machinery/camera/C in cameranet.viewpoints)
+ for (var/obj/machinery/camera/C in cameranet.cameras)
if(can_access_camera(C))
L.Add(C)
- camera_sort(L)
+ cameranet.process_sort()
var/cameras[0]
for(var/obj/machinery/camera/C in L)
@@ -106,7 +108,7 @@
if(emagged)
access = list(access_captain) // Assume captain level access when emagged
data["emagged"] = 1
- if(isAI(user) || isrobot (user))
+ if(isAI(user) || isrobot(user))
access = list(access_captain) // Assume captain level access when AI
// Loop through the ID's permission, and check which networks the ID has access to.
@@ -119,7 +121,7 @@
tempnets.Add(list(list("name" = l, "active" = 0)))
break
data["networks"] = tempnets
-
+
ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
if (!ui)
ui = new(user, src, ui_key, "sec_camera.tmpl", "Camera Console", 900, 800)
@@ -137,7 +139,7 @@
if(href_list["switchTo"])
if(src.z>6 || stat&(NOPOWER|BROKEN)) return
if(usr.stat || ((get_dist(usr, src) > 1 || !( usr.canmove ) || usr.blinded) && !istype(usr, /mob/living/silicon))) return
- var/obj/machinery/camera/C = locate(href_list["switchTo"]) in cameranet.viewpoints
+ var/obj/machinery/camera/C = locate(href_list["switchTo"]) in cameranet.cameras
if(!C) return
switch_to_camera(usr, C)
@@ -197,6 +199,9 @@
else
if(isAI(user))
var/mob/living/silicon/ai/A = user
+ // Only allow non-carded AIs to view because the interaction with the eye gets all wonky otherwise.
+ if(!A.is_in_chassis())
+ return 0
A.eyeobj.setLoc(get_turf(C))
A.client.eye = A.eyeobj
else
diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm
index 6298f0d7d89..73931aa0183 100644
--- a/code/game/machinery/computer/card.dm
+++ b/code/game/machinery/computer/card.dm
@@ -55,7 +55,7 @@
usr << "There is nothing to remove from the console."
return
-/obj/machinery/computer/card/attackby(obj/item/weapon/card/id/id_card, mob/user)
+/obj/machinery/computer/card/attackby(obj/item/weapon/card/id/id_card, mob/user, params)
if(!istype(id_card))
return ..()
@@ -198,7 +198,7 @@
if (is_authenticated() && modify)
var/t1 = href_list["assign_target"]
if(t1 == "Custom")
- var/temp_t = copytext(sanitize(input("Enter a custom job assignment.","Assignment")),1,MAX_MESSAGE_LEN)
+ var/temp_t = sanitize(copytext(input("Enter a custom job assignment.","Assignment"),1,MAX_MESSAGE_LEN))
//let custom jobs function as an impromptu alt title, mainly for sechuds
if(temp_t && modify)
modify.assignment = temp_t
diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm
index c8ae03e2c26..bf28014c6e9 100644
--- a/code/game/machinery/computer/cloning.dm
+++ b/code/game/machinery/computer/cloning.dm
@@ -73,7 +73,7 @@
return podf
-/obj/machinery/computer/cloning/attackby(obj/item/W as obj, mob/user as mob)
+/obj/machinery/computer/cloning/attackby(obj/item/W as obj, mob/user as mob, params)
if (istype(W, /obj/item/weapon/disk/data)) //INSERT SOME DISKETTES
if (!src.diskette)
user.drop_item()
@@ -155,7 +155,7 @@
/obj/machinery/computer/cloning/Topic(href, href_list)
if(..())
- return
+ return 1
if(loading)
return
@@ -329,7 +329,7 @@
scantemp = "Error: Mental interface failure."
nanomanager.update_uis(src)
return
- if ((M_NOCLONE in subject.mutations) && src.scanner.scan_level < 2)
+ if ((NOCLONE in subject.mutations) && src.scanner.scan_level < 2)
scantemp = "Error: Mental interface failure."
nanomanager.update_uis(src)
return
diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm
index e4ecdb12efa..e5aeabf72ae 100644
--- a/code/game/machinery/computer/communications.dm
+++ b/code/game/machinery/computer/communications.dm
@@ -55,14 +55,20 @@ var/shuttle_call/shuttle_calls[0]
var/stat_msg1
var/stat_msg2
var/display_type="blank"
+
+ var/datum/announcement/priority/crew_announcement = new
l_color = "#0000FF"
+
+/obj/machinery/computer/communications/New()
+ ..()
+ crew_announcement.newscast = 1
/obj/machinery/computer/communications/Topic(href, href_list)
if(..(href, href_list))
- return
+ return 1
- if (!(src.z in list(STATION_Z,CENTCOMM_Z)))
+ if ((!(src.z in config.station_levels) && !(src.z in config.admin_levels)))
usr << "\red Unable to establish a connection: \black You're too far away from the station!"
return
@@ -83,10 +89,12 @@ var/shuttle_call/shuttle_calls[0]
if (I && istype(I))
if(src.check_access(I))
authenticated = 1
- if(20 in I.access)
+ if(access_captain in I.access)
authenticated = 2
+ crew_announcement.announcer = GetNameAndAssignmentFromId(I)
if("logout")
authenticated = 0
+ crew_announcement.announcer = ""
setMenuState(usr,COMM_SCREEN_MAIN)
// ALART LAVUL
@@ -127,14 +135,14 @@ var/shuttle_call/shuttle_calls[0]
usr << "You need to swipe your ID."
if("announce")
- if(src.authenticated==2 && !issilicon(usr))
- if(message_cooldown) return
- var/input = stripped_input(usr, "Please choose a message to announce to the station crew.", "What?")
+ if(src.authenticated==2)
+ if(message_cooldown)
+ usr << "Please allow at least one minute to pass between announcements"
+ return
+ var/input = input(usr, "Please write a message to announce to the station crew.", "Priority Announcement")
if(!input || !(usr in view(1,src)))
return
- captain_announce(input)//This should really tell who is, IE HoP, CE, HoS, RD, Captain
- log_say("[key_name(usr)] has made a captain announcement: [input]")
- message_admins("[key_name_admin(usr)] has made a captain announcement.", 1)
+ crew_announcement.Announce(input)
message_cooldown = 1
spawn(600)//One minute cooldown
message_cooldown = 0
@@ -204,7 +212,7 @@ var/shuttle_call/shuttle_calls[0]
if(centcomm_message_cooldown)
usr << "Arrays recycling. Please stand by."
return
- var/input = stripped_input(usr, "Please choose a message to transmit to Centcomm via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response.", "To abort, send an empty message.", "")
+ var/input = input(usr, "Please choose a message to transmit to Centcomm via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response.", "To abort, send an empty message.", "")
if(!input || !(usr in view(1,src)))
return
Centcomm_announce(input, usr)
@@ -240,12 +248,11 @@ var/shuttle_call/shuttle_calls[0]
return 1
-/obj/machinery/computer/communications/attackby(var/obj/I as obj, var/mob/user as mob)
- if(istype(I,/obj/item/weapon/card/emag/))
+/obj/machinery/computer/communications/emag_act(user as mob)
+ if(!emagged)
src.emagged = 1
user << "You scramble the communication routing circuits!"
- ..()
-
+
/obj/machinery/computer/communications/attack_ai(var/mob/user as mob)
return src.attack_hand(user)
@@ -399,7 +406,7 @@ var/shuttle_call/shuttle_calls[0]
return
if(emergency_shuttle.going_to_centcom())
- user << "The shuttle may not be called while returning to CentCom."
+ user << "The shuttle may not be called while returning to Central Command."
return
if(emergency_shuttle.online())
@@ -409,11 +416,11 @@ var/shuttle_call/shuttle_calls[0]
// if force is 0, some things may stop the shuttle call
if(!force)
if(emergency_shuttle.deny_shuttle)
- user << "Centcom does not currently have a shuttle available in your sector. Please try again later."
+ user << "Central Command does not currently have a shuttle available in your sector. Please try again later."
return
if(sent_strike_team == 1)
- user << "Centcom will not allow the shuttle to be called. Consider all contracts terminated."
+ user << "Central Command will not allow the shuttle to be called. Consider all contracts terminated."
return
if(world.time < 54000) // 30 minute grace period to let the game get going
@@ -427,8 +434,6 @@ var/shuttle_call/shuttle_calls[0]
emergency_shuttle.call_transfer()
log_game("[key_name(user)] has called the shuttle.")
message_admins("[key_name_admin(user)] has called the shuttle - [formatJumpTo(user)].", 1)
- captain_announce("A crew transfer has been initiated. The shuttle has been called. It will arrive in [round(emergency_shuttle.estimate_arrival_time()/60)] minutes.")
-
return
diff --git a/code/game/machinery/computer/computer.dm b/code/game/machinery/computer/computer.dm
index 9dab90e6ed3..14011f549b5 100644
--- a/code/game/machinery/computer/computer.dm
+++ b/code/game/machinery/computer/computer.dm
@@ -102,8 +102,20 @@
stat |= BROKEN
update_icon()
+/obj/machinery/computer/proc/decode(text)
+ // Adds line breaks
+ text = replacetext(text, "\n", "
")
+ return text
+
+/obj/machinery/computer/attack_ghost(user as mob)
+ return src.attack_hand(user)
-/obj/machinery/computer/attackby(I as obj, user as mob)
+/obj/machinery/computer/attack_hand(user as mob)
+ /* Observers can view computers, but not actually use them via Topic*/
+ if(istype(user, /mob/dead/observer)) return 0
+ return ..()
+
+/obj/machinery/computer/attackby(I as obj, user as mob, params)
if(istype(I, /obj/item/weapon/screwdriver) && circuit)
playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
if(do_after(user, 20))
@@ -127,8 +139,30 @@
src.attack_hand(user)
return
+/obj/machinery/computer/attack_paw(mob/living/user)
+ user.changeNext_move(CLICK_CD_MELEE)
+ user.do_attack_animation(src)
+ if(circuit)
+ if(prob(10))
+ user.visible_message("[user.name] smashes the [src.name] with its paws.",\
+ "You smash the [src.name] with your paws.",\
+ "You hear a smashing sound.")
+ set_broken()
+ return
+ user.visible_message("[user.name] smashes against the [src.name] with its paws.",\
+ "You smash against the [src.name] with your paws.",\
+ "You hear a clicking sound.")
-
-
-
-
+/obj/machinery/computer/attack_alien(mob/living/user)
+ user.changeNext_move(CLICK_CD_MELEE)
+ user.do_attack_animation(src)
+ if(circuit)
+ if(prob(80))
+ user.visible_message("[user.name] smashes the [src.name] with its claws.",\
+ "You smash the [src.name] with your claws.",\
+ "You hear a smashing sound.")
+ set_broken()
+ return
+ user.visible_message("[user.name] smashes against the [src.name] with its claws.",\
+ "You smash against the [src.name] with your claws.",\
+ "You hear a clicking sound.")
diff --git a/code/game/machinery/computer/crew.dm b/code/game/machinery/computer/crew.dm
index a007c324ac4..084eb974688 100644
--- a/code/game/machinery/computer/crew.dm
+++ b/code/game/machinery/computer/crew.dm
@@ -1,18 +1,15 @@
/obj/machinery/computer/crew
- name = "Crew Monitoring Computer"
+ name = "crew monitoring computer"
desc = "Used to monitor active health sensors built into most of the crew's uniforms."
icon_state = "crew"
use_power = 1
idle_power_usage = 250
active_power_usage = 500
circuit = "/obj/item/weapon/circuitboard/crew"
- var/list/tracked = list( )
-
- l_color = "#0000FF"
-
+ var/obj/nano_module/crew_monitor/crew_monitor
/obj/machinery/computer/crew/New()
- tracked = list()
+ crew_monitor = new(src)
..()
@@ -27,6 +24,8 @@
return
ui_interact(user)
+/obj/machinery/computer/crew/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
+ crew_monitor.ui_interact(user, ui_key, ui, force_open)
/obj/machinery/computer/crew/update_icon()
@@ -40,99 +39,5 @@
icon_state = initial(icon_state)
stat &= ~NOPOWER
-
-/obj/machinery/computer/crew/Topic(href, href_list)
- if(..()) return
- if (src.z > 6)
- usr << "\red Unable to establish a connection: \black You're too far away from the station!"
- return 0
- if( href_list["close"] )
- var/mob/user = usr
- var/datum/nanoui/ui = nanomanager.get_open_ui(user, src, "main")
- usr.unset_machine()
- ui.close()
- return 0
- if(href_list["update"])
- src.updateDialog()
- return 1
-
/obj/machinery/computer/crew/interact(mob/user)
- ui_interact(user)
-
-/obj/machinery/computer/crew/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
- if(stat & (BROKEN|NOPOWER))
- return
- user.set_machine(src)
- src.scan()
-
- var/data[0]
- var/list/crewmembers = list()
-
- for(var/obj/item/clothing/under/C in src.tracked)
-
-
- var/turf/pos = get_turf(C)
-
- if((C) && (C.has_sensor) && (pos) && (pos.z == src.z) && C.sensor_mode)
- if(istype(C.loc, /mob/living/carbon/human))
-
- var/mob/living/carbon/human/H = C.loc
-
- var/list/crewmemberData = list()
-
- crewmemberData["sensor_type"] = C.sensor_mode
- crewmemberData["dead"] = H.stat > 1
- crewmemberData["oxy"] = round(H.getOxyLoss(), 1)
- crewmemberData["tox"] = round(H.getToxLoss(), 1)
- crewmemberData["fire"] = round(H.getFireLoss(), 1)
- crewmemberData["brute"] = round(H.getBruteLoss(), 1)
-
- crewmemberData["name"] = "Unknown"
- crewmemberData["rank"] = "Unknown"
- if(H.wear_id && istype(H.wear_id, /obj/item/weapon/card/id) )
- var/obj/item/weapon/card/id/I = H.wear_id
- crewmemberData["name"] = I.name
- crewmemberData["rank"] = I.rank
- else if(H.wear_id && istype(H.wear_id, /obj/item/device/pda) )
- var/obj/item/device/pda/P = H.wear_id
- crewmemberData["name"] = (P.id ? P.id.name : "Unknown")
- crewmemberData["rank"] = (P.id ? P.id.rank : "Unknown")
- var/area/A = get_area(H)
- crewmemberData["area"] = sanitize(A.name)
- crewmemberData["x"] = pos.x
- crewmemberData["y"] = pos.y
-
- // Works around list += list2 merging lists; it's not pretty but it works
- crewmembers += "temporary item"
- crewmembers[crewmembers.len] = crewmemberData
-
- crewmembers = sortByKey(crewmembers, "name")
-
- data["crewmembers"] = crewmembers
-
- ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
- if(!ui)
- ui = new(user, src, ui_key, "crew_monitor.tmpl", "Crew Monitoring Computer", 900, 800)
-
- // adding a template with the key "mapContent" enables the map ui functionality
- ui.add_template("mapContent", "crew_monitor_map_content.tmpl")
- // adding a template with the key "mapHeader" replaces the map header content
- ui.add_template("mapHeader", "crew_monitor_map_header.tmpl")
-
- // we want to show the map by default
- ui.set_show_map(1)
-
- ui.set_initial_data(data)
- ui.open()
-
- // should make the UI auto-update; doesn't seem to?
- ui.set_auto_update(1)
-
-
-/obj/machinery/computer/crew/proc/scan()
- for(var/mob/living/carbon/human/H in mob_list)
- if(istype(H.w_uniform, /obj/item/clothing/under))
- var/obj/item/clothing/under/C = H.w_uniform
- if (C.has_sensor)
- tracked |= C
- return 1
+ crew_monitor.ui_interact(user)
\ No newline at end of file
diff --git a/code/game/machinery/computer/hologram.dm b/code/game/machinery/computer/hologram.dm
index e57aa56fe78..ecb3ba58b3d 100644
--- a/code/game/machinery/computer/hologram.dm
+++ b/code/game/machinery/computer/hologram.dm
@@ -57,7 +57,7 @@
/obj/machinery/computer/hologram_comp/Topic(href, href_list)
if(..())
- return
+ return 1
if (in_range(src, usr))
flick("holo_console1", src)
if (href_list["power"])
diff --git a/code/game/machinery/computer/honkputer.dm b/code/game/machinery/computer/honkputer.dm
index a5efb1dd2a9..bd9d0344a2c 100644
--- a/code/game/machinery/computer/honkputer.dm
+++ b/code/game/machinery/computer/honkputer.dm
@@ -16,8 +16,8 @@
/obj/machinery/computer/HONKputer/Topic(href, href_list)
if(..())
- return
- if (src.z > 1)
+ return 1
+ if (!(src.z in config.station_levels))
usr << "\red Unable to establish a connection: \black You're too far away from the station!"
return
usr.set_machine(src)
@@ -57,12 +57,10 @@
src.updateUsrDialog()
-/obj/machinery/computer/HONKputer/attackby(var/obj/I as obj, var/mob/user as mob)
- if(istype(I,/obj/item/weapon/card/emag/))
+/obj/machinery/computer/HONKputer/emag_act(user as mob)
+ if(!emagged)
src.emagged = 1
user << "You scramble the login circuits, allowing anyone to use the console!"
- ..()
-
/obj/machinery/computer/HONKputer/attack_hand(var/mob/user as mob)
if(..())
@@ -92,7 +90,7 @@
onclose(user, "honkputer")
-/obj/machinery/computer/HONKputer/attackby(I as obj, user as mob)
+/obj/machinery/computer/HONKputer/attackby(I as obj, user as mob, params)
if(istype(I, /obj/item/weapon/screwdriver) && circuit)
playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
if(do_after(user, 20))
diff --git a/code/game/machinery/computer/law.dm b/code/game/machinery/computer/law.dm
index 47a0951b20e..4802e855af2 100644
--- a/code/game/machinery/computer/law.dm
+++ b/code/game/machinery/computer/law.dm
@@ -26,7 +26,7 @@
return
- attackby(obj/item/weapon/O as obj, mob/user as mob)
+ attackby(obj/item/weapon/O as obj, mob/user as mob, params)
if (user.z > 6)
user << "\red Unable to establish a connection: \black You're too far away from the station!"
return
@@ -53,7 +53,8 @@
usr << "[src.current.name] selected for law changes."
return
-
+ attack_ghost(user as mob)
+ return 1
/obj/machinery/computer/borgupload
name = "Cyborg Upload"
@@ -63,7 +64,7 @@
var/mob/living/silicon/robot/current = null
- attackby(obj/item/weapon/aiModule/module as obj, mob/user as mob)
+ attackby(obj/item/weapon/aiModule/module as obj, mob/user as mob, params)
if(istype(module, /obj/item/weapon/aiModule))
module.install(src)
else
@@ -85,3 +86,6 @@
else
usr << "[src.current.name] selected for law changes."
return
+
+ attack_ghost(user as mob)
+ return 1
diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm
index 1d9cee6a55b..23a8c3ed16f 100644
--- a/code/game/machinery/computer/medical.dm
+++ b/code/game/machinery/computer/medical.dm
@@ -128,7 +128,7 @@
/obj/machinery/computer/med_data/Topic(href, href_list)
if(..())
- return
+ return 1
if (!( data_core.general.Find(src.active1) ))
src.active1 = null
diff --git a/code/game/machinery/computer/message.dm b/code/game/machinery/computer/message.dm
index 73c469d6db4..3cf15c5308a 100644
--- a/code/game/machinery/computer/message.dm
+++ b/code/game/machinery/computer/message.dm
@@ -36,29 +36,11 @@
l_color = "#50AB00"
-/obj/machinery/computer/message_monitor/attackby(obj/item/weapon/O as obj, mob/living/user as mob)
+/obj/machinery/computer/message_monitor/attackby(obj/item/weapon/O as obj, mob/living/user as mob, params)
if(stat & (NOPOWER|BROKEN))
return
if(!istype(user))
return
- if(istype(O,/obj/item/weapon/card/emag/))
- // Will create sparks and print out the console's password. You will then have to wait a while for the console to be back online.
- // It'll take more time if there's more characters in the password..
- if(!emag)
- if(!isnull(src.linkedServer))
- icon_state = hack_icon // An error screen I made in the computers.dmi
- emag = 1
- screen = 2
- spark_system.set_up(5, 0, src)
- src.spark_system.start()
- var/obj/item/weapon/paper/monitorkey/MK = new/obj/item/weapon/paper/monitorkey
- MK.loc = src.loc
- // Will help make emagging the console not so easy to get away with.
- MK.info += "
£%@%(*$%&(£&?*(%&£/{}"
- spawn(100*length(src.linkedServer.decryptkey)) UnmagConsole()
- message = rebootmsg
- else
- user << "A no server error appears on the screen."
if(isscrewdriver(O) && emag)
//Stops people from just unscrewing the monitor and putting it back to get the console working again.
user << "It is too hot to mess with!"
@@ -66,6 +48,25 @@
..()
return
+
+/obj/machinery/computer/message_monitor/emag_act(user as mob)
+ // Will create sparks and print out the console's password. You will then have to wait a while for the console to be back online.
+ // It'll take more time if there's more characters in the password..
+ if(!emag)
+ if(!isnull(src.linkedServer))
+ icon_state = hack_icon // An error screen I made in the computers.dmi
+ emag = 1
+ screen = 2
+ spark_system.set_up(5, 0, src)
+ src.spark_system.start()
+ var/obj/item/weapon/paper/monitorkey/MK = new/obj/item/weapon/paper/monitorkey
+ MK.loc = src.loc
+ // Will help make emagging the console not so easy to get away with.
+ MK.info += "
£%@%(*$%&(£&?*(%&£/{}"
+ spawn(100*length(src.linkedServer.decryptkey)) UnmagConsole()
+ message = rebootmsg
+ else
+ user << "A no server error appears on the screen."
/obj/machinery/computer/message_monitor/update_icon()
..()
@@ -274,7 +275,7 @@
/obj/machinery/computer/message_monitor/Topic(href, href_list)
if(..())
- return
+ return 1
if(stat & (NOPOWER|BROKEN))
return
if(!istype(usr, /mob/living))
@@ -421,7 +422,7 @@
//Enter message
if("Message")
custommessage = input(usr, "Please enter your message.") as text|null
- custommessage = copytext(sanitize(custommessage), 1, MAX_MESSAGE_LEN)
+ custommessage = sanitize(copytext(custommessage, 1, MAX_MESSAGE_LEN))
//Send message
if("Send")
diff --git a/code/game/machinery/computer/pod.dm b/code/game/machinery/computer/pod.dm
index 2f408817802..69c68ecf8aa 100644
--- a/code/game/machinery/computer/pod.dm
+++ b/code/game/machinery/computer/pod.dm
@@ -50,7 +50,7 @@
return
/*
-/obj/machinery/computer/pod/attackby(I as obj, user as mob)
+/obj/machinery/computer/pod/attackby(I as obj, user as mob, params)
if(istype(I, /obj/item/weapon/screwdriver))
playsound(loc, 'sound/items/Screwdriver.ogg', 50, 1)
if(do_after(user, 20))
@@ -163,7 +163,7 @@
/obj/machinery/computer/pod/Topic(href, href_list)
if(..())
- return
+ return 1
if((usr.contents.Find(src) || (in_range(src, usr) && istype(loc, /turf))) || (istype(usr, /mob/living/silicon)))
usr.set_machine(src)
if(href_list["power"])
diff --git a/code/game/machinery/computer/power.dm b/code/game/machinery/computer/power.dm
index 65eb7ce4bc3..06f8cfe5692 100644
--- a/code/game/machinery/computer/power.dm
+++ b/code/game/machinery/computer/power.dm
@@ -23,15 +23,14 @@
if(isturf(T))
attached = locate() in T
if(attached)
- powernet = attached.get_powernet()
-
-
+ powernet = attached.get_powernet()
+
/obj/machinery/power/monitor/attack_ai(mob/user)
add_fingerprint(user)
if(stat & (BROKEN|NOPOWER))
return
- interact(user)
+ interact(user)
/obj/machinery/power/monitor/attack_hand(mob/user)
add_fingerprint(user)
@@ -40,7 +39,7 @@
return
interact(user)
-/obj/machinery/power/monitor/attackby(I as obj, user as mob)
+/obj/machinery/power/monitor/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))
@@ -133,7 +132,8 @@
/obj/machinery/power/monitor/Topic(href, href_list)
- ..()
+ if(..())
+ return 1
if( href_list["close"] )
usr << browse(null, "window=powcomp")
usr.unset_machine()
diff --git a/code/game/machinery/computer/prisoner.dm b/code/game/machinery/computer/prisoner.dm
index 11b71274ca6..7b4b37665b0 100644
--- a/code/game/machinery/computer/prisoner.dm
+++ b/code/game/machinery/computer/prisoner.dm
@@ -65,7 +65,7 @@
if(!T.implanted) continue
var/loc_display = "Unknown"
var/mob/living/carbon/M = T.imp_in
- if(M.z == 1 && !istype(M.loc, /turf/space))
+ if((M.z in config.station_levels) && !istype(M.loc, /turf/space))
var/turf/mob_loc = get_turf_loc(M)
loc_display = mob_loc.loc
if(T.malfunction)
@@ -129,7 +129,7 @@
usr << "Unauthorized Access."
else if(href_list["warn"])
- var/warning = copytext(sanitize(input(usr,"Message:","Enter your message here!","")),1,MAX_MESSAGE_LEN)
+ var/warning = sanitize(copytext(input(usr,"Message:","Enter your message here!",""),1,MAX_MESSAGE_LEN))
if(!warning) return
var/obj/item/weapon/implant/I = locate(href_list["warn"])
if((I)&&(I.imp_in))
diff --git a/code/game/machinery/computer/prisonshuttle.dm b/code/game/machinery/computer/prisonshuttle.dm
index 9ce03c4630d..a5837969741 100644
--- a/code/game/machinery/computer/prisonshuttle.dm
+++ b/code/game/machinery/computer/prisonshuttle.dm
@@ -22,7 +22,7 @@ var/prison_shuttle_timeleft = 0
var/prison_break = 0
- attackby(I as obj, user as mob)
+ attackby(I as obj, user as mob, params)
return src.attack_hand(user)
@@ -34,7 +34,7 @@ var/prison_shuttle_timeleft = 0
return src.attack_hand(user)
- attackby(I as obj, user as mob)
+ 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/game/machinery/computer/robot.dm b/code/game/machinery/computer/robot.dm
index 35552231640..7692b31e3e4 100644
--- a/code/game/machinery/computer/robot.dm
+++ b/code/game/machinery/computer/robot.dm
@@ -106,7 +106,7 @@
/obj/machinery/computer/robotics/Topic(href, href_list)
if(..())
- return
+ return 1
if ((usr.contents.Find(src) || (in_range(src, usr) && istype(src.loc, /turf))) || (istype(usr, /mob/living/silicon)))
usr.set_machine(src)
@@ -123,7 +123,7 @@
if (istype(I))
if(src.check_access(I))
if (!status)
- message_admins("\blue [key_name_admin(usr)] has initiated the global cyborg killswitch!")
+ msg_admin_attack("\blue [key_name_admin(usr)] has initiated the global cyborg killswitch!")
log_game("\blue [key_name(usr)] has initiated the global cyborg killswitch!")
use_log += text("\[[time_stamp()]\] [usr.name] ([usr.ckey]) has initiated the global cyborg killswitch!")
src.status = 1
@@ -169,7 +169,7 @@
R.ResetSecurityCodes()
else
- message_admins("\blue [key_name_admin(usr)] detonated [R.name]!")
+ msg_admin_attack("\blue [key_name_admin(usr)] detonated [R.name]!")
log_game("\blue [key_name_admin(usr)] detonated [R.name]!")
use_log += text("\[[time_stamp()]\] [usr.name] ([usr.ckey]) detonated [R.name] ([R.ckey])!")
R.self_destruct()
@@ -183,7 +183,7 @@
var/choice = input("Are you certain you wish to [R.canmove ? "lock down" : "release"] [R.name]?") in list("Confirm", "Abort")
if(choice == "Confirm")
if(R && istype(R))
- message_admins("\blue [key_name_admin(usr)] [R.canmove ? "locked down" : "released"] [R.name]!")
+ msg_admin_attack("\blue [key_name_admin(usr)] [R.canmove ? "locked down" : "released"] [R.name]!")
log_game("[key_name(usr)] [R.canmove ? "locked down" : "released"] [R.name]!")
R.canmove = !R.canmove
if (R.lockcharge)
@@ -208,7 +208,7 @@
var/choice = input("Are you certain you wish to hack [R.name]?") in list("Confirm", "Abort")
if(choice == "Confirm")
if(R && istype(R))
-// message_admins("\blue [key_name_admin(usr)] emagged [R.name] using robotic console!")
+ msg_admin_attack("\blue [key_name_admin(usr)] emagged [R.name] using robotic console!")
log_game("[key_name(usr)] emagged [R.name] using robotic console!")
R.emagged = 1
if(R.hud_used)
diff --git a/code/game/machinery/computer/salvage_ship.dm b/code/game/machinery/computer/salvage_ship.dm
index a54340da4de..5e0feda0c20 100644
--- a/code/game/machinery/computer/salvage_ship.dm
+++ b/code/game/machinery/computer/salvage_ship.dm
@@ -36,7 +36,7 @@
return 1
-/obj/machinery/computer/salvage_ship/attackby(obj/item/I as obj, mob/user as mob)
+/obj/machinery/computer/salvage_ship/attackby(obj/item/I as obj, mob/user as mob, params)
return attack_hand(user)
/obj/machinery/computer/salvage_ship/attack_ai(mob/user as mob)
@@ -75,6 +75,8 @@
/obj/machinery/computer/salvage_ship/Topic(href, href_list)
+ if(..())
+ return 1
if(!isliving(usr)) return
var/mob/living/user = usr
diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm
index ce9b239da49..1094ede2762 100644
--- a/code/game/machinery/computer/security.dm
+++ b/code/game/machinery/computer/security.dm
@@ -25,7 +25,7 @@
l_color = "#B40000"
-/obj/machinery/computer/secure_data/attackby(obj/item/O as obj, user as mob)
+/obj/machinery/computer/secure_data/attackby(obj/item/O as obj, user as mob, params)
if(istype(O, /obj/item/weapon/card/id) && !scan)
usr.drop_item()
O.loc = src
@@ -208,7 +208,7 @@ I can't be bothered to look more of the actual code outside of switch but that p
What a mess.*/
/obj/machinery/computer/secure_data/Topic(href, href_list)
if(..())
- return
+ return 1
if (!( data_core.general.Find(active1) ))
active1 = null
if (!( data_core.security.Find(active2) ))
diff --git a/code/game/machinery/computer/shuttle.dm b/code/game/machinery/computer/shuttle.dm
index 0815cf7932a..ee4a88fb89b 100644
--- a/code/game/machinery/computer/shuttle.dm
+++ b/code/game/machinery/computer/shuttle.dm
@@ -8,7 +8,7 @@
l_color = "#7BF9FF"
- attackby(var/obj/item/weapon/card/W as obj, var/mob/user as mob)
+ attackby(var/obj/item/weapon/card/W as obj, var/mob/user as mob, params)
if(stat & (BROKEN|NOPOWER)) return
if ((!( istype(W, /obj/item/weapon/card) ) || !( ticker ) || emergency_shuttle.location() || !( user ))) return
if (istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda))
@@ -56,11 +56,13 @@
world << "\blue All authorizations to shortening time for shuttle launch have been revoked!"
src.authorized.len = 0
src.authorized = list( )
-
- else if (istype(W, /obj/item/weapon/card/emag) && !emagged)
+ return
+
+ emag_act(user as mob)
+ if (!emagged)
var/choice = alert(user, "Would you like to launch the shuttle?","Shuttle control", "Launch", "Cancel")
- if(!emagged && !emergency_shuttle.location() && user.get_active_hand() == W)
+ if(!emagged && !emergency_shuttle.location())
switch(choice)
if("Launch")
world << "\blue Alert: Shuttle launch time shortened to 10 seconds!"
@@ -68,4 +70,3 @@
emagged = 1
if("Cancel")
return
- return
diff --git a/code/game/machinery/computer/skills.dm b/code/game/machinery/computer/skills.dm
index 3b6a530f490..9f1781519ae 100644
--- a/code/game/machinery/computer/skills.dm
+++ b/code/game/machinery/computer/skills.dm
@@ -22,7 +22,7 @@
var/order = 1 // -1 = Descending - 1 = Ascending
-/obj/machinery/computer/skills/attackby(obj/item/O as obj, user as mob)
+/obj/machinery/computer/skills/attackby(obj/item/O as obj, user as mob, params)
if(istype(O, /obj/item/weapon/card/id) && !scan)
usr.drop_item()
O.loc = src
@@ -151,7 +151,7 @@ I can't be bothered to look more of the actual code outside of switch but that p
What a mess.*/
/obj/machinery/computer/skills/Topic(href, href_list)
if(..())
- return
+ return 1
if (!( data_core.general.Find(active1) ))
active1 = null
if ((usr.contents.Find(src) || (in_range(src, usr) && istype(loc, /turf))) || (istype(usr, /mob/living/silicon)))
diff --git a/code/game/machinery/computer/specops_shuttle.dm b/code/game/machinery/computer/specops_shuttle.dm
index bdfa06eeba4..68ded19320d 100644
--- a/code/game/machinery/computer/specops_shuttle.dm
+++ b/code/game/machinery/computer/specops_shuttle.dm
@@ -252,7 +252,7 @@ var/specops_shuttle_timeleft = 0
/obj/machinery/computer/specops_shuttle/attack_paw(var/mob/user as mob)
return attack_hand(user)
-/obj/machinery/computer/specops_shuttle/attackby(I as obj, user as mob)
+/obj/machinery/computer/specops_shuttle/attackby(I as obj, user as mob, params)
if(istype(I,/obj/item/weapon/card/emag))
user << "\blue The electronic systems in this console are far too advanced for your primitive hacking peripherals."
else
@@ -287,7 +287,7 @@ var/specops_shuttle_timeleft = 0
/obj/machinery/computer/specops_shuttle/Topic(href, href_list)
if(..())
- return
+ return 1
if ((usr.contents.Find(src) || (in_range(src, usr) && istype(loc, /turf))) || (istype(usr, /mob/living/silicon)))
usr.machine = src
diff --git a/code/game/machinery/computer/store.dm b/code/game/machinery/computer/store.dm
index 31981544e62..9ab45f15d94 100644
--- a/code/game/machinery/computer/store.dm
+++ b/code/game/machinery/computer/store.dm
@@ -128,7 +128,7 @@ td.cost.toomuch {
/obj/machinery/computer/merch/Topic(href, href_list)
if(..())
- return
+ return 1
//testing(href)
diff --git a/code/game/machinery/computer/syndicate_specops_shuttle.dm b/code/game/machinery/computer/syndicate_specops_shuttle.dm
index a095dc495f0..288fa2dfdf6 100644
--- a/code/game/machinery/computer/syndicate_specops_shuttle.dm
+++ b/code/game/machinery/computer/syndicate_specops_shuttle.dm
@@ -176,7 +176,7 @@ var/syndicate_elite_shuttle_timeleft = 0
if(syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership) return 0
else return 1
-/obj/machinery/computer/syndicate_elite_shuttle/attackby(I as obj, user as mob)
+/obj/machinery/computer/syndicate_elite_shuttle/attackby(I as obj, user as mob, params)
return attack_hand(user)
/obj/machinery/computer/syndicate_elite_shuttle/attack_ai(var/mob/user as mob)
@@ -186,7 +186,7 @@ var/syndicate_elite_shuttle_timeleft = 0
/obj/machinery/computer/syndicate_elite_shuttle/attack_paw(var/mob/user as mob)
return attack_hand(user)
-/obj/machinery/computer/syndicate_elite_shuttle/attackby(I as obj, user as mob)
+/obj/machinery/computer/syndicate_elite_shuttle/attackby(I as obj, user as mob, params)
if(istype(I,/obj/item/weapon/card/emag))
user << "\blue The electronic systems in this console are far too advanced for your primitive hacking peripherals."
else
@@ -220,7 +220,7 @@ var/syndicate_elite_shuttle_timeleft = 0
/obj/machinery/computer/syndicate_elite_shuttle/Topic(href, href_list)
if(..())
- return
+ return 1
if ((usr.contents.Find(src) || (in_range(src, usr) && istype(loc, /turf))) || (istype(usr, /mob/living/silicon)))
usr.set_machine(src)
diff --git a/code/game/machinery/computer/telecrystalconsoles.dm b/code/game/machinery/computer/telecrystalconsoles.dm
index ae076b34349..f65ad4aae49 100644
--- a/code/game/machinery/computer/telecrystalconsoles.dm
+++ b/code/game/machinery/computer/telecrystalconsoles.dm
@@ -29,7 +29,7 @@ var/list/possible_uplinker_IDs = list("Alfa","Bravo","Charlie","Delta","Echo","F
name = "[name] [rand(1,999)]"
-/obj/machinery/computer/telecrystals/uplinker/attackby(var/obj/item/O as obj, var/mob/user as mob)
+/obj/machinery/computer/telecrystals/uplinker/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
if(istype(O, /obj/item))
if(uplinkholder)
@@ -106,7 +106,7 @@ var/list/possible_uplinker_IDs = list("Alfa","Bravo","Charlie","Delta","Echo","F
/obj/machinery/computer/telecrystals/uplinker/Topic(href, href_list)
if(..())
- return
+ return 1
if(href_list["donate1"])
donateTC(1)
diff --git a/code/game/machinery/computer/xenos_shuttle.dm b/code/game/machinery/computer/xenos_shuttle.dm
index 1944274965a..343c2717b76 100644
--- a/code/game/machinery/computer/xenos_shuttle.dm
+++ b/code/game/machinery/computer/xenos_shuttle.dm
@@ -85,7 +85,7 @@
return 1
-/obj/machinery/computer/xenos_station/attackby(obj/item/I as obj, mob/user as mob)
+/obj/machinery/computer/xenos_station/attackby(obj/item/I as obj, mob/user as mob, params)
return attack_hand(user)
/obj/machinery/computer/xenos_station/attack_ai(mob/user as mob)
@@ -93,6 +93,9 @@
/obj/machinery/computer/xenos_station/attack_paw(mob/user as mob)
return attack_hand(user)
+
+/obj/machinery/computer/xenos_station/attack_alien(mob/user as mob)
+ return attack_hand(user)
/obj/machinery/computer/xenos_station/attack_hand(mob/user as mob)
if(!allowed(user))
@@ -123,6 +126,9 @@
/obj/machinery/computer/xenos_station/Topic(href, href_list)
+ if(..())
+ return 1
+
if(!isliving(usr)) return
var/mob/living/user = usr
diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm
index c108e02822c..546b5956f0b 100644
--- a/code/game/machinery/constructable_frame.dm
+++ b/code/game/machinery/constructable_frame.dm
@@ -92,7 +92,7 @@
else
desc += "."
-/obj/machinery/constructable_frame/machine_frame/attackby(obj/item/P as obj, mob/user as mob)
+/obj/machinery/constructable_frame/machine_frame/attackby(obj/item/P as obj, mob/user as mob, params)
if(P.crit_fail)
user << "This part is faulty, you cannot add this to the machine!"
return
@@ -270,7 +270,7 @@ to destroy them and players will be able to make replacements.
/obj/machinery/vending/suitdispenser = "Suitlord 9000",
/obj/machinery/vending/shoedispenser = "Shoelord 9000")
-/obj/item/weapon/circuitboard/vendor/attackby(obj/item/I, mob/user)
+/obj/item/weapon/circuitboard/vendor/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/weapon/screwdriver))
set_type(pick(names_paths), user)
@@ -289,7 +289,7 @@ to destroy them and players will be able to make replacements.
frame_desc = "Requires 5 pieces of cable, 5 Power Cells and 1 Capacitor."
req_components = list(
/obj/item/stack/cable_coil = 5,
- /obj/item/weapon/cell = 5,
+ /obj/item/weapon/stock_parts/cell = 5,
/obj/item/weapon/stock_parts/capacitor = 1)
@@ -306,7 +306,7 @@ to destroy them and players will be able to make replacements.
/obj/item/stack/cable_coil = 1,
/obj/item/weapon/stock_parts/console_screen = 1)
-/obj/item/weapon/circuitboard/thermomachine/attackby(obj/item/I, mob/user)
+/obj/item/weapon/circuitboard/thermomachine/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/weapon/screwdriver))
if(build_path == /obj/machinery/atmospherics/unary/cold_sink/freezer)
build_path = /obj/machinery/atmospherics/unary/heat_reservoir/heater
@@ -361,7 +361,7 @@ to destroy them and players will be able to make replacements.
/obj/item/weapon/stock_parts/capacitor = 1,
/obj/item/weapon/stock_parts/manipulator = 1,
/obj/item/weapon/stock_parts/console_screen = 1,
- /obj/item/weapon/cell = 1)
+ /obj/item/weapon/stock_parts/cell = 1)
/obj/item/weapon/circuitboard/destructive_analyzer
name = "Circuit board (Destructive Analyzer)"
@@ -583,7 +583,7 @@ obj/item/weapon/circuitboard/rdserver
frame_desc = "Requires 2 Capacitors, 1 Power Cell and 1 Manipulator."
req_components = list(
/obj/item/weapon/stock_parts/capacitor = 2,
- /obj/item/weapon/cell = 1,
+ /obj/item/weapon/stock_parts/cell = 1,
/obj/item/weapon/stock_parts/manipulator = 1)
// Telecomms circuit boards:
diff --git a/code/game/machinery/cryo.dm b/code/game/machinery/cryo.dm
index dc738ad2139..0d92be24127 100644
--- a/code/game/machinery/cryo.dm
+++ b/code/game/machinery/cryo.dm
@@ -5,6 +5,7 @@
density = 1
anchored = 1.0
layer = 2.8
+ interact_offline = 1
var/on = 0
var/temperature_archived
@@ -77,7 +78,7 @@
return
if(user.restrained() || user.stat || user.weakened || user.stunned || user.paralysis || user.resting) //are you cuffed, dying, lying, stunned or other
return
- if(O.anchored || get_dist(user, src) > 1 || get_dist(user, O) > 1 || user.contents.Find(src)) // is the mob anchored, too far away from you, or are you too far away from the source
+ if(get_dist(user, src) > 1 || get_dist(user, O) > 1 || user.contents.Find(src)) // is the mob anchored, too far away from you, or are you too far away from the source
return
if(!ismob(O)) //humans only
return
@@ -125,7 +126,6 @@
if(!node)
return
if(!on)
- updateUsrDialog()
return
if(occupant)
@@ -140,7 +140,6 @@
if(abs(temperature_archived-air_contents.temperature) > 1)
network.update = 1
- updateUsrDialog()
return 1
@@ -220,12 +219,14 @@
for(var/datum/reagent/R in beaker.reagents.reagent_list)
data["beakerVolume"] += R.volume
+ data["autoeject"] = autoeject
+
// update the ui if it exists, returns null if no ui is passed/found
ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
if (!ui)
// the ui does not exist, so we'll create a new() one
// for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm
- ui = new(user, src, ui_key, "cryo.tmpl", "Cryo Cell Control System", 520, 410)
+ ui = new(user, src, ui_key, "cryo.tmpl", "Cryo Cell Control System", 520, 420)
// when the ui is first opened this is the data it will use
ui.set_initial_data(data)
// open the new ui window
@@ -267,7 +268,7 @@
add_fingerprint(usr)
return 1 // update UIs attached to this object
-/obj/machinery/atmospherics/unary/cryo_cell/attackby(var/obj/item/weapon/G as obj, var/mob/user as mob)
+/obj/machinery/atmospherics/unary/cryo_cell/attackby(var/obj/item/weapon/G as obj, var/mob/user as mob, params)
if(istype(G, /obj/item/weapon/reagent_containers/glass))
if(beaker)
user << "\red A beaker is already loaded into the machine."
@@ -303,7 +304,6 @@
var/mob/M = G:affecting
if(put_mob(M))
del(G)
- updateUsrDialog()
return
/obj/machinery/atmospherics/unary/cryo_cell/update_icon()
diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm
index 91dbbae40b3..dec81660ef4 100644
--- a/code/game/machinery/cryopod.dm
+++ b/code/game/machinery/cryopod.dm
@@ -65,9 +65,8 @@
onclose(user, "cryopod_console")
/obj/machinery/computer/cryopod/Topic(href, href_list)
-
if(..())
- return
+ return 1
var/mob/user = usr
@@ -200,7 +199,7 @@
/obj/item/clothing/shoes/magboots,
/obj/item/blueprints,
/obj/item/clothing/head/helmet/space,
- /obj/item/weapon/tank
+ /obj/item/weapon/storage/internal
)
/obj/machinery/cryopod/right
@@ -284,7 +283,7 @@
/obj/machinery/cryopod/robot/despawn_occupant()
var/mob/living/silicon/robot/R = occupant
if(!istype(R)) return ..()
-
+
R.contents -= R.mmi
del(R.mmi)
for(var/obj/item/I in R.module) // the tools the borg has; metal, glass, guns etc
@@ -300,7 +299,7 @@
/obj/machinery/cryopod/proc/despawn_occupant()
//Drop all items into the pod.
for(var/obj/item/W in occupant)
- occupant.drop_from_inventory(W)
+ occupant.unEquip(W)
W.loc = src
if(W.contents.len) //Make sure we catch anything not handled by del() on the items.
@@ -389,7 +388,7 @@
//Make an announcement and log the person entering storage.
control_computer.frozen_crew += "[occupant.real_name]"
-
+
var/ailist[] = list()
for (var/mob/living/silicon/ai/A in living_mob_list)
ailist += A
@@ -398,7 +397,7 @@
announcer.say(";[occupant.real_name] [on_store_message]")
else
announce.autosay("[occupant.real_name] [on_store_message]", "[on_store_name]")
-
+
visible_message("\The [src] hums and hisses as it moves [occupant.real_name] into storage.", 3)
// Delete the mob.
@@ -407,7 +406,7 @@
name = initial(name)
-/obj/machinery/cryopod/attackby(var/obj/item/weapon/G as obj, var/mob/user as mob)
+/obj/machinery/cryopod/attackby(var/obj/item/weapon/G as obj, var/mob/user as mob, params)
if(istype(G, /obj/item/weapon/grab))
@@ -461,7 +460,7 @@
//Despawning occurs when process() is called with an occupant without a client.
src.add_fingerprint(M)
-
+
/obj/machinery/cryopod/MouseDrop_T(atom/movable/O as mob|obj, mob/user as mob)
@@ -469,7 +468,7 @@
return
if(user.restrained() || user.stat || user.weakened || user.stunned || user.paralysis || user.resting) //are you cuffed, dying, lying, stunned or other
return
- if(O.anchored || get_dist(user, src) > 1 || get_dist(user, O) > 1 || user.contents.Find(src)) // is the mob anchored, too far away from you, or are you too far away from the source
+ if(get_dist(user, src) > 1 || get_dist(user, O) > 1 || user.contents.Find(src)) // is the mob anchored, too far away from you, or are you too far away from the source
return
if(!ismob(O)) //humans only
return
diff --git a/code/game/machinery/deployable.dm b/code/game/machinery/deployable.dm
index c00668a7276..8cde409e649 100644
--- a/code/game/machinery/deployable.dm
+++ b/code/game/machinery/deployable.dm
@@ -65,7 +65,7 @@ for reference:
var/health = 100.0
var/maxhealth = 100.0
- attackby(obj/item/W as obj, mob/user as mob)
+ attackby(obj/item/W as obj, mob/user as mob, params)
if (istype(W, /obj/item/stack/sheet/wood))
if (src.health < src.maxhealth)
visible_message("\red [user] begins to repair the [src]!")
@@ -157,8 +157,8 @@ for reference:
src.icon_state = "barrier[src.locked]"
- attackby(obj/item/weapon/W as obj, mob/user as mob)
- if (istype(W, /obj/item/weapon/card/id/))
+ attackby(obj/item/weapon/W as obj, mob/user as mob, params)
+ if (istype(W, /obj/item/weapon/card/id))
if (src.allowed(user))
if (src.emagged < 2.0)
src.locked = !src.locked
@@ -177,24 +177,6 @@ for reference:
visible_message("\red BZZzZZzZZzZT")
return
return
- else if (istype(W, /obj/item/weapon/card/emag))
- if (src.emagged == 0)
- src.emagged = 1
- src.req_access = null
- user << "You break the ID authentication lock on the [src]."
- var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
- s.set_up(2, 1, src)
- s.start()
- visible_message("\red BZZzZZzZZzZT")
- return
- else if (src.emagged == 1)
- src.emagged = 2
- user << "You short out the anchoring mechanism on the [src]."
- var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
- s.set_up(2, 1, src)
- s.start()
- visible_message("\red BZZzZZzZZzZT")
- return
else if (istype(W, /obj/item/weapon/wrench))
if (src.health < src.maxhealth)
src.health = src.maxhealth
@@ -218,6 +200,23 @@ for reference:
if (src.health <= 0)
src.explode()
..()
+
+ emag_act(user as mob)
+ if (!emagged)
+ emagged = 1
+ req_access = null
+ user << "You break the ID authentication lock on the [src]."
+ var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
+ s.set_up(2, 1, src)
+ s.start()
+ visible_message("\red BZZzZZzZZzZT")
+ else if (src.emagged == 1)
+ src.emagged = 2
+ user << "You short out the anchoring mechanism on the [src]."
+ var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
+ s.set_up(2, 1, src)
+ s.start()
+ visible_message("\red BZZzZZzZZzZT")
ex_act(severity)
switch(severity)
diff --git a/code/game/machinery/door_control.dm b/code/game/machinery/door_control.dm
index 2dcb0c0b2e0..50d6eb49a0f 100644
--- a/code/game/machinery/door_control.dm
+++ b/code/game/machinery/door_control.dm
@@ -40,7 +40,7 @@
/obj/machinery/door_control/attack_paw(mob/user as mob)
return src.attack_hand(user)
-/obj/machinery/door_control/attackby(obj/item/weapon/W, mob/user as mob)
+/obj/machinery/door_control/attackby(obj/item/weapon/W, mob/user as mob, params)
/* For later implementation
if (istype(W, /obj/item/weapon/screwdriver))
{
@@ -57,11 +57,14 @@
*/
if(istype(W, /obj/item/device/detective_scanner))
return
- if(istype(W, /obj/item/weapon/card/emag))
+ return src.attack_hand(user)
+
+/obj/machinery/door_control/emag_act(user as mob)
+ if(!emagged)
+ emagged = 1
req_access = list()
req_one_access = list()
playsound(src.loc, "sparks", 100, 1)
- return src.attack_hand(user)
/obj/machinery/door_control/attack_hand(mob/user as mob)
src.add_fingerprint(usr)
@@ -139,7 +142,7 @@
/obj/machinery/driver_button/attack_paw(mob/user as mob)
return src.attack_hand(user)
-/obj/machinery/driver_button/attackby(obj/item/weapon/W, mob/user as mob)
+/obj/machinery/driver_button/attackby(obj/item/weapon/W, mob/user as mob, params)
if(istype(W, /obj/item/device/detective_scanner))
return
diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index 9ec64ff61c5..1582c0cd6a7 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -258,6 +258,10 @@
icon = 'icons/obj/doors/Doorbananium.dmi'
mineral = "clown"
+/obj/machinery/door/airlock/mime
+ name = "Airlock"
+ icon = 'icons/obj/doors/Doorfreezer.dmi'
+
/obj/machinery/door/airlock/sandstone
name = "Sandstone Airlock"
icon = 'icons/obj/doors/Doorsand.dmi'
@@ -298,7 +302,7 @@
user << "You do not know how to operate this airlock's mechanism."
return
-/obj/machinery/door/airlock/alien/attackby(C as obj, mob/user as mob)
+/obj/machinery/door/airlock/alien/attackby(C as obj, mob/user as mob, params)
if(isalien(user) || isrobot(user) || isAI(user))
..(C, user)
else
@@ -358,7 +362,7 @@ About the new airlock wires panel:
return ((src.aiControlDisabled==1) && (!hackProof) && (!src.isAllPowerLoss()));
/obj/machinery/door/airlock/proc/arePowerSystemsOn()
- if (stat & NOPOWER)
+ if (stat & (NOPOWER|BROKEN))
return 0
return (src.secondsMainPowerLost==0 || src.secondsBackupPowerLost==0)
@@ -473,7 +477,8 @@ About the new airlock wires panel:
if("spark")
flick("door_spark", src)
if("deny")
- flick("door_deny", src)
+ if(density && src.arePowerSystemsOn())
+ flick("door_deny", src)
return
/obj/machinery/door/airlock/attack_ai(mob/user as mob)
@@ -695,16 +700,13 @@ About the new airlock wires panel:
//AI
//aiDisable - 1 idscan, 2 disrupt main power, 3 disrupt backup power, 4 drop door bolts, 5 un-electrify door, 7 close door, 8 door safties, 9 door speed, 11 emergency access
//aiEnable - 1 idscan, 4 raise door bolts, 5 electrify door for 30 seconds, 6 electrify door indefinitely, 7 open door, 8 door safties, 9 door speed, 11 emergency access
- if(!nowindow)
- ..()
- if(usr.stat || usr.restrained()|| usr.small)
- return
- add_fingerprint(usr)
+ if(..())
+ return 1
if(href_list["close"])
usr << browse(null, "window=airlock")
if(usr.machine==src)
usr.unset_machine()
- return
+ return 1
if((in_range(src, usr) && istype(src.loc, /turf)) && src.p_open)
usr.set_machine(src)
@@ -753,7 +755,7 @@ About the new airlock wires panel:
if(istype(usr, /mob/living/silicon))
if (!check_synth_access(usr))
- return
+ return 1
//AI
//aiDisable - 1 idscan, 2 disrupt main power, 3 disrupt backup power, 4 drop door bolts, 5 un-electrify door, 7 close door, 8 door safties, 9 door speed
@@ -943,9 +945,9 @@ About the new airlock wires panel:
update_icon()
if(!nowindow)
updateUsrDialog()
- return
+ return 0
-/obj/machinery/door/airlock/attackby(C as obj, mob/user as mob)
+/obj/machinery/door/airlock/attackby(C as obj, mob/user as mob, params)
//world << text("airlock attackby src [] obj [] mob []", src, C, user)
if(!istype(usr, /mob/living/silicon))
if(src.isElectrified())
@@ -1031,26 +1033,26 @@ About the new airlock wires panel:
if(density)
if(beingcrowbarred == 0) //being fireaxe'd
var/obj/item/weapon/twohanded/fireaxe/F = C
- if(F:wielded)
+ if(F.wielded)
spawn(0) open(1)
else
- user << "\red You need to be wielding the Fire axe to do that."
+ user << "\red You need to be wielding \the [C] to do that."
else
spawn(0) open(1)
else
if(beingcrowbarred == 0)
var/obj/item/weapon/twohanded/fireaxe/F = C
- if(F:wielded)
+ if(F.wielded)
spawn(0) close(1)
else
- user << "\red You need to be wielding the Fire axe to do that."
+ user << "\red You need to be wielding \the [C] to do that."
else
spawn(0) close(1)
else
..()
return
-/obj/machinery/door/airlock/plasma/attackby(C as obj, mob/user as mob)
+/obj/machinery/door/airlock/plasma/attackby(C as obj, mob/user as mob, params)
if(C)
ignite(is_hot(C))
..()
@@ -1068,6 +1070,7 @@ About the new airlock wires panel:
playsound(src.loc, 'sound/machines/windowdoor.ogg', 100, 1)
else if(istype(src, /obj/machinery/door/airlock/clown))
playsound(src.loc, 'sound/items/bikehorn.ogg', 30, 1)
+ else if(istype(src, /obj/machinery/door/airlock/mime))
else
playsound(src.loc, 'sound/machines/airlock.ogg', 30, 1)
if(src.closeOther != null && istype(src.closeOther, /obj/machinery/door/airlock/) && !src.closeOther.density)
@@ -1104,6 +1107,7 @@ About the new airlock wires panel:
playsound(src.loc, 'sound/machines/windowdoor.ogg', 30, 1)
else if(istype(src, /obj/machinery/door/airlock/clown))
playsound(src.loc, 'sound/items/bikehorn.ogg', 30, 1)
+ else if(istype(src, /obj/machinery/door/airlock/mime))
else
playsound(get_turf(src), 'sound/machines/airlock.ogg', 30, 1)
@@ -1176,7 +1180,7 @@ About the new airlock wires panel:
return
-/obj/machinery/door/airlock/hatch/gamma/attackby(C as obj, mob/user as mob)
+/obj/machinery/door/airlock/hatch/gamma/attackby(C as obj, mob/user as mob, params)
//world << text("airlock attackby src [] obj [] mob []", src, C, user)
if(!istype(usr, /mob/living/silicon))
if(src.isElectrified())
@@ -1209,7 +1213,7 @@ About the new airlock wires panel:
return
-/obj/machinery/door/airlock/highsecurity/red/attackby(C as obj, mob/user as mob)
+/obj/machinery/door/airlock/highsecurity/red/attackby(C as obj, mob/user as mob, params)
//world << text("airlock attackby src [] obj [] mob []", src, C, user)
if(!istype(usr, /mob/living/silicon))
if(src.isElectrified())
diff --git a/code/game/machinery/doors/airlock_control.dm b/code/game/machinery/doors/airlock_control.dm
index 498d7449a36..fef0ef7d66b 100644
--- a/code/game/machinery/doors/airlock_control.dm
+++ b/code/game/machinery/doors/airlock_control.dm
@@ -8,11 +8,6 @@ obj/machinery/door/airlock
var/datum/radio_frequency/radio_connection
var/cur_command = null //the command the door is currently attempting to complete
-obj/machinery/door/airlock/proc/can_radio()
- if(!arePowerSystemsOn())
- return 0
- return 1
-
obj/machinery/door/airlock/process()
..()
if (arePowerSystemsOn())
@@ -21,14 +16,13 @@ obj/machinery/door/airlock/process()
obj/machinery/door/airlock/receive_signal(datum/signal/signal)
if (!arePowerSystemsOn()) return //no power
- if (!can_radio()) return //no radio
-
if(!signal || signal.encryption) return
if(id_tag != signal.data["tag"] || !signal.data["command"]) return
cur_command = signal.data["command"]
- execute_current_command()
+ spawn()
+ execute_current_command()
obj/machinery/door/airlock/proc/execute_current_command()
if(operating)
@@ -94,7 +88,7 @@ obj/machinery/door/airlock/proc/command_completed(var/command)
return 1 //Unknown command. Just assume it's completed.
-obj/machinery/door/airlock/proc/send_status()
+obj/machinery/door/airlock/proc/send_status(var/bumped = 0)
if(radio_connection)
var/datum/signal/signal = new
signal.transmission_method = 1 //radio signal
@@ -103,6 +97,9 @@ obj/machinery/door/airlock/proc/send_status()
signal.data["door_status"] = density?("closed"):("open")
signal.data["lock_status"] = locked?("locked"):("unlocked")
+
+ if (bumped)
+ signal.data["bumped_with_access"] = 1
radio_connection.post_signal(src, signal, range = AIRLOCK_CONTROL_RANGE, filter = RADIO_AIRLOCK)
@@ -122,17 +119,7 @@ obj/machinery/door/airlock/Bumped(atom/AM)
if(istype(AM, /obj/mecha))
var/obj/mecha/mecha = AM
if(density && radio_connection && mecha.occupant && (src.allowed(mecha.occupant) || src.check_access_list(mecha.operation_req_access)))
- var/datum/signal/signal = new
- signal.transmission_method = 1 //radio signal
- signal.data["tag"] = id_tag
- signal.data["timestamp"] = world.time
-
- signal.data["door_status"] = density?("closed"):("open")
- signal.data["lock_status"] = locked?("locked"):("unlocked")
-
- signal.data["bumped_with_access"] = 1
-
- radio_connection.post_signal(src, signal, range = AIRLOCK_CONTROL_RANGE, filter = RADIO_AIRLOCK)
+ send_status(1)
return
obj/machinery/door/airlock/proc/set_frequency(new_frequency)
@@ -258,6 +245,12 @@ obj/machinery/access_button/update_icon()
else
icon_state = "access_button_off"
+obj/machinery/access_button/attackby(obj/item/I as obj, mob/user as mob, params)
+ //Swiping ID on the access button
+ if (istype(I, /obj/item/weapon/card/id) || istype(I, /obj/item/device/pda))
+ attack_hand(user)
+ return
+ ..()
obj/machinery/access_button/attack_hand(mob/user)
add_fingerprint(usr)
@@ -296,4 +289,4 @@ obj/machinery/access_button/airlock_interior
obj/machinery/access_button/airlock_exterior
frequency = 1379
- command = "cycle_exterior"
+ command = "cycle_exterior"
\ No newline at end of file
diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm
index 88d72fbf8b9..30122e4d4b7 100644
--- a/code/game/machinery/doors/door.dm
+++ b/code/game/machinery/doors/door.dm
@@ -20,6 +20,7 @@
var/heat_proof = 0 // For glass airlocks/opacity firedoors
var/emergency = 0
var/air_properties_vary_with_direction = 0
+ var/block_air_zones = 1 //If set, air zones cannot merge across the door even when it is opened.
//Multi-tile doors
dir = EAST
@@ -96,7 +97,7 @@
/obj/machinery/door/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
- if(air_group) return 0
+ if(air_group) return !block_air_zones
if(istype(mover) && mover.checkpass(PASSGLASS))
return !opacity
return !density
@@ -143,7 +144,7 @@
return
..()
-/obj/machinery/door/attackby(obj/item/I as obj, mob/user as mob)
+/obj/machinery/door/attackby(obj/item/I as obj, mob/user as mob, params)
if(istype(I, /obj/item/device/detective_scanner))
return
if(src.operating || isrobot(user)) return //borgs can't attack doors open because it conflicts with their AI-like interaction with them.
@@ -153,10 +154,7 @@
if(!src.requiresID())
user = null
if(src.density && (istype(I, /obj/item/weapon/card/emag)||istype(I, /obj/item/weapon/melee/energy/blade)))
- flick("door_spark", src)
- sleep(6)
- open()
- operating = -1
+ emag_act(user)
return 1
if(src.allowed(user) || src.emergency == 1)
if(src.density)
@@ -168,6 +166,13 @@
flick("door_deny", src)
return
+/obj/machinery/door/emag_act(user as mob)
+ if(density)
+ flick("door_spark", src)
+ sleep(6)
+ open()
+ operating = -1
+ return 1
/obj/machinery/door/blob_act()
if(prob(40))
diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm
index a6609c03ec1..968f5b8575e 100644
--- a/code/game/machinery/doors/firedoor.dm
+++ b/code/game/machinery/doors/firedoor.dm
@@ -60,6 +60,10 @@
opacity = 0
density = 0
+ //These are frequenly used with windows, so make sure zones can pass.
+ //Generally if a firedoor is at a place where there should be a zone boundery then there will be a regular door underneath it.
+ block_air_zones = 0
+
var/blocked = 0
var/lockdown = 0 // When the door has detected a problem, it locks.
var/pdiff_alert = 0
@@ -106,7 +110,7 @@
/obj/machinery/door/firedoor/examine()
set src in view()
. = ..()
-
+
if(pdiff >= FIREDOOR_MAX_PRESSURE_DIFF)
usr << "WARNING: Current pressure differential is [pdiff]kPa! Opening door may result in injury!"
@@ -169,7 +173,7 @@
/obj/machinery/door/firedoor/attack_hand(mob/user as mob)
return attackby(null, user)
-/obj/machinery/door/firedoor/attackby(obj/item/weapon/C as obj, mob/user as mob)
+/obj/machinery/door/firedoor/attackby(obj/item/weapon/C as obj, mob/user as mob, params)
add_fingerprint(user)
if(operating)
return//Already doing something.
@@ -287,7 +291,7 @@
/obj/machinery/door/firedoor/attack_ai(mob/user as mob)
if(operating)
- return //Already doing something.
+ return //Already doing something.
if(blocked)
user << "\red \The [src] is welded solid!"
@@ -295,11 +299,11 @@
var/area/A = get_area_master(src)
ASSERT(istype(A)) // This worries me.
- var/alarmed = A.air_doors_activated || A.fire
+ var/alarmed = A.air_doors_activated || A.fire
var/access_granted = 0
if(isAI(user) || isrobot(user))
- access_granted = 1
+ access_granted = 1
if(access_granted == 1)
user.visible_message("\blue \The [src] [density ? "open" : "close"]s for \the [user].",\
@@ -320,7 +324,7 @@
spawn(50)
if(alarmed)
nextstate = CLOSED
-
+
// CHECK PRESSURE
/obj/machinery/door/firedoor/process()
..()
diff --git a/code/game/machinery/doors/poddoor.dm b/code/game/machinery/doors/poddoor.dm
index eeceaf2de18..2495dbfc4bc 100644
--- a/code/game/machinery/doors/poddoor.dm
+++ b/code/game/machinery/doors/poddoor.dm
@@ -25,7 +25,7 @@
else
return 0
-/obj/machinery/door/poddoor/attackby(obj/item/weapon/C as obj, mob/user as mob)
+/obj/machinery/door/poddoor/attackby(obj/item/weapon/C as obj, mob/user as mob, params)
src.add_fingerprint(user)
if (!( istype(C, /obj/item/weapon/crowbar) || (istype(C, /obj/item/weapon/twohanded/fireaxe) && C:wielded == 1) ))
return
diff --git a/code/game/machinery/doors/shutters.dm b/code/game/machinery/doors/shutters.dm
index 8f54535c8fe..d8f751ec89e 100644
--- a/code/game/machinery/doors/shutters.dm
+++ b/code/game/machinery/doors/shutters.dm
@@ -13,7 +13,7 @@
density = 0
opacity = 0
-/obj/machinery/door/poddoor/shutters/attackby(obj/item/weapon/C as obj, mob/user as mob)
+/obj/machinery/door/poddoor/shutters/attackby(obj/item/weapon/C as obj, mob/user as mob, params)
add_fingerprint(user)
if(!(istype(C, /obj/item/weapon/crowbar) || (istype(C, /obj/item/weapon/twohanded/fireaxe) && C:wielded == 1) ))
return
diff --git a/code/game/machinery/doors/unpowered.dm b/code/game/machinery/doors/unpowered.dm
index dce2ab37bda..8e03e874a71 100644
--- a/code/game/machinery/doors/unpowered.dm
+++ b/code/game/machinery/doors/unpowered.dm
@@ -10,7 +10,7 @@
return
- attackby(obj/item/I as obj, mob/user as mob)
+ attackby(obj/item/I as obj, mob/user as mob, params)
if(istype(I, /obj/item/weapon/card/emag)||istype(I, /obj/item/weapon/melee/energy/blade)) return
if(src.locked) return
..()
diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm
index 84563748126..a8ebd55930a 100644
--- a/code/game/machinery/doors/windowdoor.dm
+++ b/code/game/machinery/doors/windowdoor.dm
@@ -195,12 +195,15 @@
/obj/machinery/door/window/proc/attack_generic(mob/user as mob, damage = 0)
if(src.operating)
return
+ user.changeNext_move(CLICK_CD_MELEE)
+ user.do_attack_animation(src)
playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1)
user.visible_message("[user] smashes against the [src.name].", \
"[user] smashes against the [src.name].")
take_damage(damage)
/obj/machinery/door/window/attack_alien(mob/living/user as mob)
+
if(islarva(user))
return
attack_generic(user, 25)
@@ -225,21 +228,13 @@
/obj/machinery/door/window/attack_hand(mob/user as mob)
return src.attackby(user, user)
-/obj/machinery/door/window/attackby(obj/item/weapon/I as obj, mob/living/user as mob)
-
- //If it's in the process of opening/closing, ignore the click
- if (src.operating)
- return
-
- add_fingerprint(user)
-
- //Emags and ninja swords? You may pass.
- if (src.density && (istype(I, /obj/item/weapon/card/emag)||istype(I, /obj/item/weapon/melee/energy/blade)))
+/obj/machinery/door/window/emag_act(user as mob, weapon as obj)
+ if(density)
src.operating = -1
flick("[src.base_state]spark", src)
sleep(6)
desc += "
Its access panel is smoking slightly."
- if(istype(I, /obj/item/weapon/melee/energy/blade))
+ if(istype(weapon, /obj/item/weapon/melee/energy/blade))
var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread()
spark_system.set_up(5, 0, src.loc)
spark_system.start()
@@ -252,6 +247,19 @@
open()
emagged = 1
return 1
+
+/obj/machinery/door/window/attackby(obj/item/weapon/I as obj, mob/living/user as mob, params)
+
+ //If it's in the process of opening/closing, ignore the click
+ if (src.operating)
+ return
+
+ add_fingerprint(user)
+
+ //Ninja swords? You may pass.
+ if (src.density && (istype(I, /obj/item/weapon/card/emag)||istype(I, /obj/item/weapon/melee/energy/blade)))
+ emag_act(user,I)
+ return 1
if(istype(I, /obj/item/weapon/screwdriver))
if(src.density || src.operating)
@@ -325,6 +333,8 @@
//If it's a weapon, smash windoor. Unless it's an id card, agent card, ect.. then ignore it (Cards really shouldnt damage a door anyway)
if(src.density && istype(I, /obj/item/weapon) && !istype(I, /obj/item/weapon/card) )
+ user.changeNext_move(CLICK_CD_MELEE)
+ user.do_attack_animation(src)
if( (I.flags&NOBLUDGEON) || !I.force )
return
var/aforce = I.force
diff --git a/code/game/machinery/doppler_array.dm b/code/game/machinery/doppler_array.dm
index 9866dc54502..840ed1133c2 100644
--- a/code/game/machinery/doppler_array.dm
+++ b/code/game/machinery/doppler_array.dm
@@ -19,7 +19,7 @@ var/list/doppler_arrays = list()
/obj/machinery/doppler_array/process()
return PROCESS_KILL
-/obj/machinery/doppler_array/attackby(var/obj/item/O as obj, var/mob/user as mob)
+/obj/machinery/doppler_array/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
if(istype(O, /obj/item/weapon/wrench))
playsound(loc, 'sound/items/Ratchet.ogg', 50, 1)
anchored = !anchored
diff --git a/code/game/machinery/drying_rack.dm b/code/game/machinery/drying_rack.dm
index d776fc3bef3..f8c76de25ff 100644
--- a/code/game/machinery/drying_rack.dm
+++ b/code/game/machinery/drying_rack.dm
@@ -31,11 +31,11 @@
-/obj/machinery/drying_rack/attackby(var/obj/item/W as obj, var/mob/user as mob)
+/obj/machinery/drying_rack/attackby(var/obj/item/W as obj, var/mob/user as mob, params)
if(is_type_in_list(W,accepted))
if(!running)
if(istype(W,/obj/item/weapon/reagent_containers/food/snacks/meat))
- user.u_equip(W)
+ user.unEquip(W)
del(W)
user << "You add the meat to the drying rack."
src.running = 1
@@ -48,7 +48,7 @@
src.running = 0
return
if(istype(W,/obj/item/weapon/reagent_containers/food/snacks/grown/grapes))
- user.u_equip(W)
+ user.unEquip(W)
del(W)
user << "You add the grapes to the drying rack."
src.running = 1
@@ -61,7 +61,7 @@
src.running = 0
return
if(istype(W,/obj/item/weapon/reagent_containers/food/snacks/grown/greengrapes))
- user.u_equip(W)
+ user.unEquip(W)
del(W)
user << "You add the green grapes to the drying rack."
src.running = 1
@@ -79,7 +79,7 @@
var/obj/item/weapon/reagent_containers/food/snacks/grown/B = W
B.reagents.trans_to(src, B.reagents.total_volume)
user << "You add the [W] to the drying rack."
- user.u_equip(W)
+ user.unEquip(W)
del(W)
src.running = 1
use_power = 2
diff --git a/code/game/machinery/embedded_controller/airlock_controllers.dm b/code/game/machinery/embedded_controller/airlock_controllers.dm
index 4a2a9c5e56e..fb909dee555 100644
--- a/code/game/machinery/embedded_controller/airlock_controllers.dm
+++ b/code/game/machinery/embedded_controller/airlock_controllers.dm
@@ -1,13 +1,15 @@
//base type for controllers of two-door systems
/obj/machinery/embedded_controller/radio/airlock
// Setup parameters only
+ radio_filter = RADIO_AIRLOCK
var/tag_exterior_door
var/tag_interior_door
var/tag_airpump
var/tag_chamber_sensor
var/tag_exterior_sensor
var/tag_interior_sensor
- var/tag_mech_sensor
+ var/tag_airlock_mech_sensor
+ var/tag_shuttle_mech_sensor
var/tag_secure = 0
/obj/machinery/embedded_controller/radio/airlock/initialize()
diff --git a/code/game/machinery/embedded_controller/airlock_program.dm b/code/game/machinery/embedded_controller/airlock_program.dm
index 90a2ca57206..8cb3abb9980 100644
--- a/code/game/machinery/embedded_controller/airlock_program.dm
+++ b/code/game/machinery/embedded_controller/airlock_program.dm
@@ -1,8 +1,9 @@
//Handles the control of airlocks
-#define STATE_WAIT 0
-#define STATE_DEPRESSURIZE 1
-#define STATE_PRESSURIZE 2
+#define STATE_IDLE 0
+#define STATE_PREPARE 1
+#define STATE_DEPRESSURIZE 2
+#define STATE_PRESSURIZE 3
#define TARGET_NONE 0
#define TARGET_INOPEN -1
@@ -16,9 +17,10 @@
var/tag_chamber_sensor
var/tag_exterior_sensor
var/tag_interior_sensor
- var/tag_mech_sensor
+ var/tag_airlock_mech_sensor
+ var/tag_shuttle_mech_sensor
- var/state = STATE_WAIT
+ var/state = STATE_IDLE
var/target_state = TARGET_NONE
/datum/computer/file/embedded_program/airlock/New(var/obj/machinery/embedded_controller/M)
@@ -42,7 +44,8 @@
tag_chamber_sensor = controller.tag_chamber_sensor? controller.tag_chamber_sensor : "[id_tag]_sensor"
tag_exterior_sensor = controller.tag_exterior_sensor
tag_interior_sensor = controller.tag_interior_sensor
- tag_mech_sensor = controller.tag_mech_sensor? controller.tag_mech_sensor : "[id_tag]_mech"
+ tag_airlock_mech_sensor = controller.tag_airlock_mech_sensor? controller.tag_airlock_mech_sensor : "[id_tag]_airlock_mech"
+ tag_shuttle_mech_sensor = controller.tag_shuttle_mech_sensor? controller.tag_shuttle_mech_sensor : "[id_tag]_shuttle_mech"
memory["secure"] = controller.tag_secure
spawn(10)
@@ -157,7 +160,7 @@
/datum/computer/file/embedded_program/airlock/process()
- if(!state)
+ if(!state) //Idle
if(target_state)
switch(target_state)
if(TARGET_INOPEN)
@@ -168,38 +171,45 @@
//lock down the airlock before activating pumps
close_doors()
- var/chamber_pressure = memory["chamber_sensor_pressure"]
- var/target_pressure = memory["target_pressure"]
-
- if(memory["purge"])
- target_pressure = 0
-
- if(chamber_pressure <= target_pressure)
- state = STATE_PRESSURIZE
- signalPump(tag_airpump, 1, 1, target_pressure) //send a signal to start pressurizing
-
- else if(chamber_pressure > target_pressure)
- state = STATE_DEPRESSURIZE
- signalPump(tag_airpump, 1, 0, target_pressure) //send a signal to start depressurizing
-
- //Check for vacuum - this is set after the pumps so the pumps are aiming for 0
- if(!memory["target_pressure"])
- memory["target_pressure"] = ONE_ATMOSPHERE * 0.05
+ state = STATE_PREPARE
else
//make sure to return to a sane idle state
if(memory["pump_status"] != "off") //send a signal to stop pumping
signalPump(tag_airpump, 0)
- //the airlock will not allow itself to continue to cycle when any of the doors are forced open.
- if (state && !check_doors_secured())
+ if ((state == STATE_PRESSURIZE || state == STATE_DEPRESSURIZE) && !check_doors_secured())
+ //the airlock will not allow itself to continue to cycle when any of the doors are forced open.
stop_cycling()
switch(state)
+ if(STATE_PREPARE)
+ if (check_doors_secured())
+ var/chamber_pressure = memory["chamber_sensor_pressure"]
+ var/target_pressure = memory["target_pressure"]
+
+ if(memory["purge"])
+ target_pressure = 0
+
+ if(memory["purge"])
+ target_pressure = 0
+
+ if(chamber_pressure <= target_pressure)
+ state = STATE_PRESSURIZE
+ signalPump(tag_airpump, 1, 1, target_pressure) //send a signal to start pressurizing
+
+ else if(chamber_pressure > target_pressure)
+ state = STATE_DEPRESSURIZE
+ signalPump(tag_airpump, 1, 0, target_pressure) //send a signal to start depressurizing
+
+ //Check for vacuum - this is set after the pumps so the pumps are aiming for 0
+ if(!memory["target_pressure"])
+ memory["target_pressure"] = ONE_ATMOSPHERE * 0.05
+
if(STATE_PRESSURIZE)
if(memory["chamber_sensor_pressure"] >= memory["target_pressure"] * 0.95)
cycleDoors(target_state)
- state = STATE_WAIT
+ state = STATE_IDLE
target_state = TARGET_NONE
if(memory["pump_status"] != "off")
@@ -216,7 +226,7 @@
else if(memory["chamber_sensor_pressure"] <= memory["target_pressure"] * 1.05)
cycleDoors(target_state)
- state = STATE_WAIT
+ state = STATE_IDLE
target_state = TARGET_NONE
//send a signal to stop pumping
@@ -231,11 +241,11 @@
//these are here so that other types don't have to make so many assuptions about our implementation
/datum/computer/file/embedded_program/airlock/proc/begin_cycle_in()
- state = STATE_WAIT
+ state = STATE_IDLE
target_state = TARGET_INOPEN
/datum/computer/file/embedded_program/airlock/proc/begin_cycle_out()
- state = STATE_WAIT
+ state = STATE_IDLE
target_state = TARGET_OUTOPEN
/datum/computer/file/embedded_program/airlock/proc/close_doors()
@@ -243,11 +253,11 @@
toggleDoor(memory["exterior_status"], tag_exterior_door, 1, "close")
/datum/computer/file/embedded_program/airlock/proc/stop_cycling()
- state = STATE_WAIT
+ state = STATE_IDLE
target_state = TARGET_NONE
/datum/computer/file/embedded_program/airlock/proc/done_cycling()
- return (state == STATE_WAIT && target_state == TARGET_NONE)
+ return (state == STATE_IDLE && target_state == TARGET_NONE)
//are the doors closed and locked?
/datum/computer/file/embedded_program/airlock/proc/check_exterior_door_secured()
@@ -265,7 +275,7 @@
var/datum/signal/signal = new
signal.data["tag"] = tag
signal.data["command"] = command
- post_signal(signal)
+ post_signal(signal, RADIO_AIRLOCK)
/datum/computer/file/embedded_program/airlock/proc/signalPump(var/tag, var/power, var/direction, var/pressure)
var/datum/signal/signal = new
@@ -295,11 +305,19 @@
signalDoor(tag_exterior_door, command)
signalDoor(tag_interior_door, command)
+datum/computer/file/embedded_program/airlock/proc/signal_mech_sensor(var/command, var/sensor)
+ var/datum/signal/signal = new
+ signal.data["tag"] = sensor
+ signal.data["command"] = command
+ post_signal(signal)
+
/datum/computer/file/embedded_program/airlock/proc/enable_mech_regulation()
- signalDoor(tag_mech_sensor, "enable")
+ signal_mech_sensor("enable", tag_shuttle_mech_sensor)
+ signal_mech_sensor("enable", tag_airlock_mech_sensor)
/datum/computer/file/embedded_program/airlock/proc/disable_mech_regulation()
- signalDoor(tag_mech_sensor, "disable")
+ signal_mech_sensor("disable", tag_shuttle_mech_sensor)
+ signal_mech_sensor("disable", tag_airlock_mech_sensor)
/*----------------------------------------------------------
toggleDoor()
@@ -355,7 +373,7 @@ send an additional command to open the door again.
signalDoor(doorTag, doorCommand)
-#undef STATE_WAIT
+#undef STATE_IDLE
#undef STATE_DEPRESSURIZE
#undef STATE_PRESSURIZE
diff --git a/code/game/machinery/embedded_controller/embedded_controller_base.dm b/code/game/machinery/embedded_controller/embedded_controller_base.dm
index a9a8b40ed58..ec411753803 100644
--- a/code/game/machinery/embedded_controller/embedded_controller_base.dm
+++ b/code/game/machinery/embedded_controller/embedded_controller_base.dm
@@ -3,6 +3,9 @@
name = "Embedded Controller"
anchored = 1
+
+ use_power = 1
+ idle_power_usage = 10
var/on = 1
@@ -43,8 +46,10 @@
density = 0
var/id_tag
+ //var/radio_power_use = 50 //power used to xmit signals
var/frequency = 1379
+ var/radio_filter = null
var/datum/radio_frequency/radio_connection
unacidable = 1
@@ -60,14 +65,15 @@
else
icon_state = "airlock_control_off"
-/obj/machinery/embedded_controller/radio/post_signal(datum/signal/signal)
+/obj/machinery/embedded_controller/radio/post_signal(datum/signal/signal, var/filter = null)
signal.transmission_method = TRANSMISSION_RADIO
if(radio_connection)
- return radio_connection.post_signal(src, signal)
+ //use_power(radio_power_use) //neat idea, but causes way too much lag.
+ return radio_connection.post_signal(src, signal, filter)
else
del(signal)
/obj/machinery/embedded_controller/radio/proc/set_frequency(new_frequency)
radio_controller.remove_object(src, frequency)
frequency = new_frequency
- radio_connection = radio_controller.add_object(src, frequency)
\ No newline at end of file
+ radio_connection = radio_controller.add_object(src, frequency, radio_filter)
\ No newline at end of file
diff --git a/code/game/machinery/flasher.dm b/code/game/machinery/flasher.dm
index d51f29655de..148e1b53322 100644
--- a/code/game/machinery/flasher.dm
+++ b/code/game/machinery/flasher.dm
@@ -38,7 +38,7 @@
// src.sd_SetLuminosity(0)
//Don't want to render prison breaks impossible
-/obj/machinery/flasher/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/machinery/flasher/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
if (istype(W, /obj/item/weapon/wirecutters))
add_fingerprint(user)
src.disable = !src.disable
@@ -107,7 +107,7 @@
if ((M.m_intent != "walk") && (src.anchored))
src.flash()
-/obj/machinery/flasher/portable/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/machinery/flasher/portable/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
if (istype(W, /obj/item/weapon/wrench))
add_fingerprint(user)
src.anchored = !src.anchored
@@ -126,7 +126,7 @@
/obj/machinery/flasher_button/attack_paw(mob/user as mob)
return src.attack_hand(user)
-/obj/machinery/flasher_button/attackby(obj/item/weapon/W, mob/user as mob)
+/obj/machinery/flasher_button/attackby(obj/item/weapon/W, mob/user as mob, params)
return src.attack_hand(user)
/obj/machinery/flasher_button/attack_hand(mob/user as mob)
diff --git a/code/game/machinery/floodlight.dm b/code/game/machinery/floodlight.dm
index b7203be245d..b6da9e11d95 100644
--- a/code/game/machinery/floodlight.dm
+++ b/code/game/machinery/floodlight.dm
@@ -4,9 +4,10 @@
name = "Emergency Floodlight"
icon = 'icons/obj/machines/floodlight.dmi'
icon_state = "flood00"
+ anchored = 0
density = 1
var/on = 0
- var/obj/item/weapon/cell/high/cell = null
+ var/obj/item/weapon/stock_parts/cell/high/cell = null
var/use = 5
var/unlocked = 0
var/open = 0
@@ -62,7 +63,22 @@
updateicon()
-/obj/machinery/floodlight/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/machinery/floodlight/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
+ if(istype(W, /obj/item/weapon/wrench))
+ if (!anchored && !isinspace())
+ playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
+ user.visible_message( \
+ "[user] tightens \the [src]'s casters.", \
+ " You have tightened \the [src]'s casters.", \
+ "You hear ratchet.")
+ anchored = 1
+ else if(anchored)
+ playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
+ user.visible_message( \
+ "[user] loosens \the [src]'s casters.", \
+ " You have loosened \the [src]'s casters.", \
+ "You hear ratchet.")
+ anchored = 0
if (istype(W, /obj/item/weapon/screwdriver))
if (!open)
if(unlocked)
@@ -83,7 +99,7 @@
open = 1
user << "You remove the battery panel."
- if (istype(W, /obj/item/weapon/cell))
+ if (istype(W, /obj/item/weapon/stock_parts/cell))
if(open)
if(cell)
user << "There is a power cell already installed."
diff --git a/code/game/machinery/guestpass.dm b/code/game/machinery/guestpass.dm
index ee93ac74799..83cf1682bd8 100644
--- a/code/game/machinery/guestpass.dm
+++ b/code/game/machinery/guestpass.dm
@@ -54,7 +54,7 @@
var/list/internal_log = list()
var/mode = 0 // 0 - making pass, 1 - viewing logs
-/obj/machinery/computer/guestpass/attackby(obj/O, mob/user)
+/obj/machinery/computer/guestpass/attackby(obj/O, mob/user, params)
if(istype(O, /obj/item/weapon/card/id))
if(!giver)
user.drop_item()
@@ -105,7 +105,7 @@
/obj/machinery/computer/guestpass/Topic(href, href_list)
if(..())
- return
+ return 1
usr.set_machine(src)
if (href_list["mode"])
mode = text2num(href_list["mode"])
diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm
index 265145b4a04..a04ed3f2053 100644
--- a/code/game/machinery/hologram.dm
+++ b/code/game/machinery/hologram.dm
@@ -81,13 +81,20 @@ var/const/HOLOPAD_MODE = 0
/*This is the proc for special two-way communication between AI and holopad/people talking near holopad.
For the other part of the code, check silicon say.dm. Particularly robot talk.*/
-/obj/machinery/hologram/holopad/hear_talk(mob/living/M, text, verb)
+/obj/machinery/hologram/holopad/hear_talk(mob/living/M, text, verb, datum/language/speaking)
if(M&&hologram&&master)//Master is mostly a safety in case lag hits or something.
- if(!master.say_understands(M))//The AI will be able to understand most mobs talking through the holopad.
- text = stars(text)
+ if(!master.say_understands(M, speaking))//The AI will be able to understand most mobs talking through the holopad.
+ if(speaking)
+ text = speaking.scramble(text)
+ else
+ text = stars(text)
var/name_used = M.GetVoice()
//This communication is imperfect because the holopad "filters" voices and is only designed to connect to the master only.
- var/rendered = "Holopad received, [name_used] [verb], \"[text]\""
+ var/rendered
+ if(speaking)
+ rendered = "Holopad received, [name_used] [speaking.format_message(text, verb)]"
+ else
+ rendered = "Holopad received, [name_used] [verb], \"[text]\""
master.show_message(rendered, 2)
return
diff --git a/code/game/machinery/holosign.dm b/code/game/machinery/holosign.dm
index 073973cdee7..cd1e5a85e62 100644
--- a/code/game/machinery/holosign.dm
+++ b/code/game/machinery/holosign.dm
@@ -50,7 +50,7 @@
obj/machinery/holosign_switch/attack_paw(mob/user as mob)
return src.attack_hand(user)
-/obj/machinery/holosign_switch/attackby(obj/item/weapon/W, mob/user as mob)
+/obj/machinery/holosign_switch/attackby(obj/item/weapon/W, mob/user as mob, params)
if(istype(W, /obj/item/device/detective_scanner))
return
return src.attack_hand(user)
diff --git a/code/game/machinery/hydroponics.dm b/code/game/machinery/hydroponics.dm
index 58d52bc992b..ef9a7d29150 100644
--- a/code/game/machinery/hydroponics.dm
+++ b/code/game/machinery/hydroponics.dm
@@ -664,7 +664,7 @@
return
-/obj/machinery/portable_atmospherics/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob)
+/obj/machinery/portable_atmospherics/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
if(exchange_parts(user, O))
return
@@ -958,7 +958,7 @@
use_power = 0
draw_warnings = 0
-/obj/machinery/portable_atmospherics/hydroponics/soil/attackby(var/obj/item/O as obj, var/mob/user as mob)
+/obj/machinery/portable_atmospherics/hydroponics/soil/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
if(istype(O, /obj/item/weapon/shovel))
user << "You clear up [src]!"
del(src)
diff --git a/code/game/machinery/igniter.dm b/code/game/machinery/igniter.dm
index 7aba3dc25f1..9577a539203 100755
--- a/code/game/machinery/igniter.dm
+++ b/code/game/machinery/igniter.dm
@@ -71,7 +71,7 @@
icon_state = "[base_state]-p"
// src.sd_SetLuminosity(0)
-/obj/machinery/sparker/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/machinery/sparker/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
if(istype(W, /obj/item/device/detective_scanner))
return
if (istype(W, /obj/item/weapon/screwdriver))
@@ -125,7 +125,7 @@
/obj/machinery/ignition_switch/attack_paw(mob/user as mob)
return src.attack_hand(user)
-/obj/machinery/ignition_switch/attackby(obj/item/weapon/W, mob/user as mob)
+/obj/machinery/ignition_switch/attackby(obj/item/weapon/W, mob/user as mob, params)
return src.attack_hand(user)
/obj/machinery/ignition_switch/attack_hand(mob/user as mob)
diff --git a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm
index 17127b65378..31b41770259 100644
--- a/code/game/machinery/iv_drip.dm
+++ b/code/game/machinery/iv_drip.dm
@@ -37,6 +37,13 @@
/obj/machinery/iv_drip/MouseDrop(over_object, src_location, over_location)
..()
+
+ if(!ishuman(usr) && !isrobot(usr))
+ return
+
+ var/turf/T = get_turf(src)
+ if(!usr in range(1, T))
+ return
if(attached)
visible_message("[src.attached] is detached from \the [src]")
@@ -50,7 +57,7 @@
src.update_icon()
-/obj/machinery/iv_drip/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/machinery/iv_drip/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
if (istype(W, /obj/item/weapon/reagent_containers))
if(!isnull(src.beaker))
user << "There is already a reagent container loaded!"
@@ -103,7 +110,7 @@
if(!istype(T)) return
if(!T.dna)
return
- if(M_NOCLONE in T.mutations)
+ if(NOCLONE in T.mutations)
return
if(T.species && T.species.flags & NO_BLOOD)
@@ -133,6 +140,7 @@
/obj/machinery/iv_drip/verb/toggle_mode()
set name = "Toggle Mode"
+ set category = "Object"
set src in view(1)
if(!istype(usr, /mob/living))
diff --git a/code/game/machinery/kitchen/gibber.dm b/code/game/machinery/kitchen/gibber.dm
index d5510dbbd26..8e657b6b53f 100644
--- a/code/game/machinery/kitchen/gibber.dm
+++ b/code/game/machinery/kitchen/gibber.dm
@@ -78,7 +78,7 @@
else
src.startgibbing(user)
-/obj/machinery/gibber/attackby(obj/item/weapon/grab/G as obj, mob/user as mob)
+/obj/machinery/gibber/attackby(obj/item/weapon/grab/G as obj, mob/user as mob, params)
if(src.occupant)
user << "\red The gibber is full, empty it first!"
return
diff --git a/code/game/machinery/kitchen/icecream_vat.dm b/code/game/machinery/kitchen/icecream_vat.dm
index ab39761b3da..711e2020361 100644
--- a/code/game/machinery/kitchen/icecream_vat.dm
+++ b/code/game/machinery/kitchen/icecream_vat.dm
@@ -89,7 +89,7 @@ var/list/ingredients_source = list(
user << browse(dat,"window=icecreamvat;size=600x400")
-/obj/machinery/icecream_vat/attackby(var/obj/item/O as obj, var/mob/user as mob)
+/obj/machinery/icecream_vat/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
if(istype(O, /obj/item/weapon/reagent_containers))
if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/icecream))
var/obj/item/weapon/reagent_containers/food/snacks/icecream/I = O
diff --git a/code/game/machinery/kitchen/juicer.dm b/code/game/machinery/kitchen/juicer.dm
index b237f8223f6..86d59679f76 100644
--- a/code/game/machinery/kitchen/juicer.dm
+++ b/code/game/machinery/kitchen/juicer.dm
@@ -31,13 +31,15 @@
return
-/obj/machinery/juicer/attackby(var/obj/item/O as obj, var/mob/user as mob)
+/obj/machinery/juicer/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
if (istype(O,/obj/item/weapon/reagent_containers/glass) || \
istype(O,/obj/item/weapon/reagent_containers/food/drinks/drinkingglass))
if (beaker)
return 1
else
- user.before_take_item(O)
+ if(!user.unEquip(O))
+ user << "\the [O] is stuck to your hand, you cannot put it in \the [src]"
+ return 0
O.loc = src
beaker = O
src.verbs += /obj/machinery/juicer/verb/detach
@@ -45,9 +47,11 @@
src.updateUsrDialog()
return 0
if (!is_type_in_list(O, allowed_items))
- user << "It looks as not containing any juice."
+ user << "It doesn't look like that contains any juice."
return 1
- user.before_take_item(O)
+ if(!user.unEquip(O))
+ user << "\the [O] is stuck to your hand, you cannot put it in \the [src]"
+ return 0
O.loc = src
src.updateUsrDialog()
return 0
diff --git a/code/game/machinery/kitchen/microwave.dm b/code/game/machinery/kitchen/microwave.dm
index 0268755bb1a..cd8e806fbb0 100644
--- a/code/game/machinery/kitchen/microwave.dm
+++ b/code/game/machinery/kitchen/microwave.dm
@@ -49,7 +49,7 @@
component_parts += new /obj/item/weapon/stock_parts/micro_laser(null)
component_parts += new /obj/item/weapon/stock_parts/console_screen(null)
component_parts += new /obj/item/stack/cable_coil(null, 2)
- RefreshParts()
+ RefreshParts()
/obj/machinery/microwave/upgraded/New()
@@ -59,19 +59,19 @@
component_parts += new /obj/item/weapon/stock_parts/micro_laser/ultra(null)
component_parts += new /obj/item/weapon/stock_parts/console_screen(null)
component_parts += new /obj/item/stack/cable_coil(null, 2)
- RefreshParts()
+ RefreshParts()
/obj/machinery/microwave/RefreshParts()
var/E
for(var/obj/item/weapon/stock_parts/micro_laser/M in component_parts)
E += M.rating
- efficiency = E
-
+ efficiency = E
+
/*******************
* Item Adding
********************/
-/obj/machinery/microwave/attackby(var/obj/item/O as obj, var/mob/user as mob)
+/obj/machinery/microwave/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
if(operating)
return
if(!broken && dirty < 100)
@@ -87,11 +87,11 @@
return
else if(!anchored)
anchored = 1
- user << "The [src] is now secured."
+ user << "The [src] is now secured."
return
-
+
default_deconstruction_crowbar(O)
-
+
if(src.broken > 0)
if(src.broken == 2 && istype(O, /obj/item/weapon/screwdriver)) // If it's broken and they're using a screwdriver
user.visible_message( \
@@ -150,8 +150,10 @@
"\blue [user] has added one of [O] to \the [src].", \
"\blue You add one of [O] to \the [src].")
else
- // user.before_take_item(O) //This just causes problems so far as I can tell. -Pete
- user.drop_item()
+ // user.unEquip(O) //This just causes problems so far as I can tell. -Pete
+ if(!user.drop_item())
+ user << "\the [O] is stuck to your hand, you cannot put it in \the [src]"
+ return 0
O.loc = src
user.visible_message( \
"\blue [user] has added \the [O] to \the [src].", \
diff --git a/code/game/machinery/kitchen/monkeyrecycler.dm b/code/game/machinery/kitchen/monkeyrecycler.dm
index f4b373e8eab..9342e6530b3 100644
--- a/code/game/machinery/kitchen/monkeyrecycler.dm
+++ b/code/game/machinery/kitchen/monkeyrecycler.dm
@@ -12,7 +12,7 @@
var/grinded = 0
-/obj/machinery/monkey_recycler/attackby(var/obj/item/O as obj, var/mob/user as mob)
+/obj/machinery/monkey_recycler/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
if (src.stat != 0) //NOPOWER etc
return
if (istype(O, /obj/item/weapon/grab))
diff --git a/code/game/machinery/kitchen/processor.dm b/code/game/machinery/kitchen/processor.dm
index aea4592faae..f466149d8d1 100644
--- a/code/game/machinery/kitchen/processor.dm
+++ b/code/game/machinery/kitchen/processor.dm
@@ -104,7 +104,7 @@
return P
return 0
-/obj/machinery/processor/attackby(var/obj/item/O as obj, var/mob/user as mob)
+/obj/machinery/processor/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
if(src.processing)
user << "\red The processor is in the process of processing."
return 1
diff --git a/code/game/machinery/kitchen/smartfridge.dm b/code/game/machinery/kitchen/smartfridge.dm
index 7f8ba253582..397ee26b20a 100644
--- a/code/game/machinery/kitchen/smartfridge.dm
+++ b/code/game/machinery/kitchen/smartfridge.dm
@@ -75,7 +75,7 @@
* Item Adding
********************/
-/obj/machinery/smartfridge/attackby(var/obj/item/O as obj, var/mob/user as mob)
+/obj/machinery/smartfridge/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
if(!src.ispowered)
user << "\The [src] is unpowered and useless."
return
@@ -85,7 +85,9 @@
user << "\The [src] is full."
return 1
else
- user.before_take_item(O)
+ if(!user.unEquip(O))
+ usr << "\the [O] is stuck to your hand, you cannot put it in \the [src]"
+ return
O.loc = src
if(item_quants[O.name])
item_quants[O.name]++
diff --git a/code/game/machinery/laprecharger.dm b/code/game/machinery/laprecharger.dm
new file mode 100644
index 00000000000..cafd5e3d297
--- /dev/null
+++ b/code/game/machinery/laprecharger.dm
@@ -0,0 +1,101 @@
+//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31
+
+/obj/machinery/laprecharger
+ name = "laptop recharger"
+ icon = 'icons/obj/stationobjs.dmi'
+ icon_state = "recharger0"
+ anchored = 1
+ use_power = 1
+ idle_power_usage = 40
+ active_power_usage = 2500
+ var/obj/item/charging = null
+ var/icon_state_charged = "recharger2"
+ var/icon_state_charging = "recharger1"
+ var/icon_state_idle = "recharger0"
+
+/obj/machinery/laprecharger/attackby(obj/item/weapon/G as obj, mob/user as mob, params)
+ if(istype(user,/mob/living/silicon))
+ return
+ if(istype(G, /obj/item/weapon/gun/energy) || istype(G, /obj/item/weapon/melee/baton))
+ user << "\red The laptop recharger blinks red as you try to insert the item!"
+ return
+ if(istype(G,/obj/item/device/laptop))
+ if(charging)
+ return
+
+
+ // Checks to make sure he's not in space doing it, and that the area got proper power.
+ var/area/a = get_area(src)
+ if(!isarea(a))
+ user << "\red The [name] blinks red as you try to insert the item!"
+ return
+ if(a.power_equip == 0)
+ user << "\red The [name] blinks red as you try to insert the item!"
+ return
+
+ if(istype(G, /obj/item/device/laptop))
+ var/obj/item/device/laptop/L = G
+ if(!L.stored_computer.battery)
+ user << "There's no battery in it!"
+ return
+ user.drop_item()
+ G.loc = src
+ charging = G
+ use_power = 2
+ update_icon()
+ else if(istype(G, /obj/item/weapon/wrench))
+ if(charging)
+ user << "\red Remove the laptop first!"
+ return
+ anchored = !anchored
+ user << "You [anchored ? "attached" : "detached"] the recharger."
+ playsound(loc, 'sound/items/Ratchet.ogg', 75, 1)
+
+/obj/machinery/laprecharger/attack_hand(mob/user as mob)
+ add_fingerprint(user)
+
+ if(charging)
+ charging.update_icon()
+ charging.loc = loc
+ charging = null
+ use_power = 1
+ update_icon()
+
+/obj/machinery/laprecharger/attack_paw(mob/user as mob)
+ return attack_hand(user)
+
+/obj/machinery/laprecharger/process()
+ if(stat & (NOPOWER|BROKEN) || !anchored)
+ return
+
+ if(charging)
+ if(istype(charging, /obj/item/device/laptop))
+ var/obj/item/device/laptop/L = charging
+ if(L.stored_computer.battery.charge < L.stored_computer.battery.maxcharge)
+ L.stored_computer.battery.give(1000)
+ icon_state = icon_state_charging
+ use_power(2500)
+ else
+ icon_state = icon_state_charged
+ return
+
+
+/obj/machinery/laprecharger/emp_act(severity)
+ if(stat & (NOPOWER|BROKEN) || !anchored)
+ ..(severity)
+ return
+
+/obj/machinery/laprecharger/update_icon() //we have an update_icon() in addition to the stuff in process to make it feel a tiny bit snappier.
+ if(charging)
+ icon_state = icon_state_charging
+ else
+ icon_state = icon_state_idle
+
+// Atlantis: No need for that copy-pasta code, just use var to store icon_states instead.
+obj/machinery/laprecharger/wallcharger
+ name = "wall laptop recharger"
+ icon = 'icons/obj/stationobjs.dmi'
+ icon_state = "wrecharger0"
+ icon_state_idle = "wrecharger0"
+ icon_state_charging = "wrecharger1"
+ icon_state_charged = "wrecharger2"
diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm
index 5e69e5701af..6a0bcbf496f 100644
--- a/code/game/machinery/machinery.dm
+++ b/code/game/machinery/machinery.dm
@@ -184,37 +184,21 @@ Class Procs:
use_power(active_power_usage,power_channel, 1)
return 1
-/obj/machinery/Topic(href, href_list)
+/obj/machinery/CanUseTopic(var/mob/user, var/be_close)
+ if(!interact_offline && (stat & (NOPOWER|BROKEN)))
+ return STATUS_CLOSE
+
+ return ..()
+
+/obj/machinery/CouldUseTopic(var/mob/user)
..()
- if(!interact_offline && stat & (NOPOWER|BROKEN))
- return 1
- if(usr.restrained() || usr.lying || usr.stat)
- return 1
- if ( ! (istype(usr, /mob/living/carbon/human) || \
- istype(usr, /mob/living/silicon) || \
- istype(usr, /mob/living/carbon/monkey) && ticker && ticker.mode.name == "monkey") )
- usr << "\red You don't have the dexterity to do this!"
- return 1
+ user.set_machine(src)
- var/norange = 0
- if(istype(usr, /mob/living/carbon/human))
- var/mob/living/carbon/human/H = usr
- if(istype(H.l_hand, /obj/item/tk_grab))
- norange = 1
- else if(istype(H.r_hand, /obj/item/tk_grab))
- norange = 1
-
- if(!norange)
- if ((!in_range(src, usr) || !istype(src.loc, /turf)) && !istype(usr, /mob/living/silicon))
- return 1
-
- src.add_fingerprint(usr)
-
- var/area/A = get_area(src)
- A.powerupdate = 1
-
- return 0
+/obj/machinery/CouldNotUseTopic(var/mob/user)
+ usr.unset_machine()
+////////////////////////////////////////////////////////////////////////////////////////////
+
/obj/machinery/attack_ai(var/mob/user as mob)
if(isAI(user))
var/mob/living/silicon/ai/A = user
@@ -351,22 +335,6 @@ Class Procs:
user << "[A.name] replaced with [B.name]."
shouldplaysound = 1
break
- // Power cell snowflake
- for(var/obj/item/weapon/cell/A in component_parts)
- for(var/D in CB.req_components)
- if(ispath(A.type, D))
- P = D
- break
- for(var/obj/item/weapon/cell/B in W.contents)
- if(istype(B, P) && istype(A, P))
- if(B.rating > A.rating)
- W.remove_from_storage(B, src)
- W.handle_item_insertion(A, 1)
- component_parts -= A
- component_parts += B
- B.loc = null
- user << "[A.name] replaced with [B.name]."
- break
RefreshParts()
else
user << "Following parts detected in the machine:"
@@ -389,3 +357,51 @@ Class Procs:
I.loc = loc
del(src)
return 1
+
+/obj/machinery/proc/on_assess_perp(mob/living/carbon/human/perp)
+ return 0
+
+/obj/machinery/proc/is_assess_emagged()
+ return emagged
+
+/obj/machinery/proc/assess_perp(mob/living/carbon/human/perp, var/auth_weapons, var/check_records, var/check_arrest)
+ var/threatcount = 0 //the integer returned
+
+ if(is_assess_emagged())
+ return 10 //if emagged, always return 10.
+
+ threatcount += on_assess_perp(perp)
+ if(threatcount >= 10)
+ return threatcount
+
+ //Agent cards lower threatlevel.
+ var/obj/item/weapon/card/id/id = GetIdCard(perp)
+ if(id && istype(id, /obj/item/weapon/card/id/syndicate))
+ threatcount -= 2
+
+ if(auth_weapons && !src.allowed(perp))
+ if(istype(perp.l_hand, /obj/item/weapon/gun) || istype(perp.l_hand, /obj/item/weapon/melee))
+ threatcount += 4
+
+ if(istype(perp.r_hand, /obj/item/weapon/gun) || istype(perp.r_hand, /obj/item/weapon/melee))
+ threatcount += 4
+
+ if(istype(perp.belt, /obj/item/weapon/gun) || istype(perp.belt, /obj/item/weapon/melee))
+ threatcount += 2
+
+ if(perp.species.name != "Human") //beepsky so racist.
+ threatcount += 2
+
+ if(check_records || check_arrest)
+ var/perpname = perp.name
+ if(id)
+ perpname = id.registered_name
+
+ var/datum/data/record/R = find_security_record("name", perpname)
+ if(check_records && !R)
+ threatcount += 4
+
+ if(check_arrest && R && (R.fields["criminal"] == "*Arrest*"))
+ threatcount += 4
+
+ return threatcount
diff --git a/code/game/machinery/magnet.dm b/code/game/machinery/magnet.dm
index a2dd432d991..8569ede3fd7 100644
--- a/code/game/machinery/magnet.dm
+++ b/code/game/machinery/magnet.dm
@@ -323,7 +323,7 @@
if(speed <= 0)
speed = 1
if("setpath")
- var/newpath = copytext(sanitize(input(usr, "Please define a new path!",,path) as text|null),1,MAX_MESSAGE_LEN)
+ var/newpath = sanitize(copytext(input(usr, "Please define a new path!",,path) as text|null,1,MAX_MESSAGE_LEN))
if(newpath && newpath != "")
moving = 0 // stop moving
path = newpath
diff --git a/code/game/machinery/metaldetector.dm b/code/game/machinery/metaldetector.dm
index 3d7ccb4ab3b..95e76eaa2c5 100644
--- a/code/game/machinery/metaldetector.dm
+++ b/code/game/machinery/metaldetector.dm
@@ -26,12 +26,7 @@
return 0
return 1
-/obj/machinery/metaldetector/attackby(obj/item/W as obj, mob/user as mob)
- if(istype(W, /obj/item/weapon/card/emag))
- if(!src.emagged)
- src.emagged = 1
- user << "\blue You short out the circuitry."
- return
+/obj/machinery/metaldetector/attackby(obj/item/W as obj, mob/user as mob, params)
if(istype(W, /obj/item/weapon/card))
for(var/ID in list(user.equipped(), user:wear_id, user:belt))
if(src.check_access(ID,list("20")))
@@ -46,6 +41,12 @@
else
user << "\red You lack access to the control panel!"
return
+
+/obj/machinery/metaldetector/emag_act(user as mob)
+ if(!emagged)
+ emagged = 1
+ user << "\blue You short out the circuitry."
+ return
/obj/machinery/metaldetector/Crossed(AM as mob|obj)
if(emagged)
diff --git a/code/game/machinery/navbeacon.dm b/code/game/machinery/navbeacon.dm
index 59bf0f2ea17..a8f39a4597e 100644
--- a/code/game/machinery/navbeacon.dm
+++ b/code/game/machinery/navbeacon.dm
@@ -101,7 +101,7 @@
frequency.post_signal(src, signal, filter = RADIO_NAVBEACONS)
-/obj/machinery/navbeacon/attackby(var/obj/item/I, var/mob/user)
+/obj/machinery/navbeacon/attackby(var/obj/item/I, var/mob/user, params)
var/turf/T = loc
if(T.intact)
return // prevent intraction when T-scanner revealed
@@ -193,7 +193,7 @@ Transponder Codes:"}
updateDialog()
else if(href_list["locedit"])
- var/newloc = copytext(sanitize(input("Enter New Location", "Navigation Beacon", location) as text|null),1,MAX_MESSAGE_LEN)
+ var/newloc = sanitize(copytext(input("Enter New Location", "Navigation Beacon", location) as text|null,1,MAX_MESSAGE_LEN))
if(newloc)
location = newloc
updateDialog()
diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm
index fcb2412c122..248908ed824 100644
--- a/code/game/machinery/newscaster.dm
+++ b/code/game/machinery/newscaster.dm
@@ -5,6 +5,7 @@
/datum/feed_message
var/author =""
var/body =""
+ var/message_type ="Story"
//var/parent_channel
var/backup_body =""
var/backup_author =""
@@ -39,6 +40,12 @@
src.backup_author = ""
src.censored = 0
src.is_admin_channel = 0
+
+/datum/feed_channel/proc/announce_news()
+ return "Breaking news from [channel_name]!"
+
+/datum/feed_channel/station/announce_news()
+ return "New Station Announcement Available"
/datum/feed_network
var/list/datum/feed_channel/network_channels = list()
@@ -213,7 +220,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co
switch(screen)
if(0)
dat += {"Welcome to Newscasting Unit #[src.unit_no].
Interface & News networks Operational.
-
Property of Nanotransen Inc"}
+
Property of Nanotrasen"}
if(news_network.wanted_issue)
dat+= "
Read Wanted Issue"
dat+= {"
Create Feed Channel
@@ -248,7 +255,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co
dat+="No feed messages found in channel...
"
else
for(var/datum/feed_message/MESSAGE in CHANNEL.messages)
- dat+="-[MESSAGE.body]
\[Story by [MESSAGE.author]\]
"*/
+ dat+="-[MESSAGE.body]
\[[MESSAGE.message_type] by [MESSAGE.author]\]
"*/
dat+="
Refresh"
dat+="
Back"
@@ -334,7 +341,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co
if(MESSAGE.img)
usr << browse_rsc(MESSAGE.img, "tmp_photo[i].png")
dat+="
"
- dat+="\[Story by [MESSAGE.author]\]
"
+ dat+="\[[MESSAGE.message_type] by [MESSAGE.author]\]
"
dat+="
Refresh"
dat+="
Back"
if(10)
@@ -369,7 +376,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co
dat+="No feed messages found in channel...
"
else
for(var/datum/feed_message/MESSAGE in src.viewing_channel.messages)
- dat+="-[MESSAGE.body]
\[Story by [MESSAGE.author]\]
"
+ dat+="-[MESSAGE.body]
\[[MESSAGE.message_type] by [MESSAGE.author]\]
"
dat+="[(MESSAGE.body == "\[REDACTED\]") ? ("Undo story censorship") : ("Censor story")] - [(MESSAGE.author == "\[REDACTED\]") ? ("Undo Author Censorship") : ("Censor message Author")]
"
dat+="
Back"
if(13)
@@ -383,7 +390,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co
dat+="No feed messages found in channel...
"
else
for(var/datum/feed_message/MESSAGE in src.viewing_channel.messages)
- dat+="-[MESSAGE.body]
\[Story by [MESSAGE.author]\]
"
+ dat+="-[MESSAGE.body]
\[[MESSAGE.message_type] by [MESSAGE.author]\]
"
dat+="
Back"
if(14)
@@ -460,7 +467,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co
/obj/machinery/newscaster/Topic(href, href_list)
if(..())
- return
+ return 1
if ((usr.contents.Find(src) || ((get_dist(src, usr) <= 1) && istype(src.loc, /turf))) || (istype(usr, /mob/living/silicon)))
usr.set_machine(src)
if(href_list["set_channel_name"])
@@ -516,7 +523,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co
src.updateUsrDialog()
else if(href_list["set_new_message"])
- src.msg = strip_html(input(usr, "Write your Feed story", "Network Channel Handler", ""))
+ src.msg = strip_html(input(usr, "Write your feed story", "Network Channel Handler", ""))
while (findtext(src.msg," ") == 1)
src.msg = copytext(src.msg,2,lentext(src.msg)+1)
src.updateUsrDialog()
@@ -535,13 +542,15 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co
if(photo)
newMsg.img = photo.img
feedback_inc("newscaster_stories",1)
+ var/announcement = ""
for(var/datum/feed_channel/FC in news_network.network_channels)
if(FC.channel_name == src.channel_name)
FC.messages += newMsg //Adding message to the network's appropriate feed_channel
+ announcement = FC.announce_news()
break
src.screen=4
for(var/obj/machinery/newscaster/NEWSCASTER in allCasters)
- NEWSCASTER.newsAlert(src.channel_name)
+ NEWSCASTER.newsAlert(announcement)
src.updateUsrDialog()
@@ -727,7 +736,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co
src.updateUsrDialog()
-/obj/machinery/newscaster/attackby(obj/item/I as obj, mob/user as mob)
+/obj/machinery/newscaster/attackby(obj/item/I as obj, mob/living/user as mob, params)
if(istype(I, /obj/item/weapon/wrench))
user << "Now [anchored ? "un" : ""]securing [name]"
playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
@@ -929,13 +938,13 @@ obj/item/weapon/newspaper/Topic(href, href_list)
src.attack_self(src.loc)
-obj/item/weapon/newspaper/attackby(obj/item/weapon/W as obj, mob/user as mob)
+obj/item/weapon/newspaper/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
if(istype(W, /obj/item/weapon/pen))
if(src.scribble_page == src.curr_page)
user << "There's already a scribble in this page... You wouldn't want to make things too cluttered, would you?"
else
var/s = strip_html( input(user, "Write something", "Newspaper", "") )
- s = copytext(sanitize(s), 1, MAX_MESSAGE_LEN)
+ s = sanitize(copytext(s, 1, MAX_MESSAGE_LEN))
if (!s)
return
if (!in_range(src, usr) && src.loc != usr)
@@ -986,11 +995,11 @@ obj/item/weapon/newspaper/attackby(obj/item/weapon/W as obj, mob/user as mob)
///obj/machinery/newscaster/process() //Was thinking of doing the icon update through process, but multiple iterations per second does not
// return //bode well with a newscaster network of 10+ machines. Let's just return it, as it's added in the machines list.
-/obj/machinery/newscaster/proc/newsAlert(channel) //This isn't Agouri's work, for it is ugly and vile.
+/obj/machinery/newscaster/proc/newsAlert(var/news_call) //This isn't Agouri's work, for it is ugly and vile.
var/turf/T = get_turf(src) //Who the fuck uses spawn(600) anyway, jesus christ
- if(channel)
+ if(news_call)
for(var/mob/O in hearers(world.view-1, T))
- O.show_message("[src.name] beeps, \"Breaking news from [channel]!\"",2)
+ O.show_message("[src.name] beeps, \"[news_call]\"",2)
src.alert = 1
src.update_icon()
spawn(300)
diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm
index c1cbc65c297..21e66517422 100644
--- a/code/game/machinery/pipe/construction.dm
+++ b/code/game/machinery/pipe/construction.dm
@@ -56,7 +56,6 @@ Buildable meters
icon = 'icons/obj/pipe-item.dmi'
icon_state = "simple"
item_state = "buildpipe"
- flags = TABLEPASS|FPRINT
w_class = 3
level = 2
@@ -389,7 +388,7 @@ Buildable meters
/obj/item/pipe/attack_self(mob/user as mob)
return rotate()
-/obj/item/pipe/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
+/obj/item/pipe/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob, params)
..()
//*
if (!istype(W, /obj/item/weapon/wrench))
@@ -432,7 +431,7 @@ Buildable meters
if (P.node2)
P.node2.initialize()
P.node2.build_network()
-
+
if(PIPE_SUPPLY_STRAIGHT, PIPE_SUPPLY_BENT)
var/obj/machinery/atmospherics/pipe/simple/hidden/supply/P = new( src.loc )
P.color = color
@@ -546,7 +545,7 @@ Buildable meters
if (M.node3)
M.node3.initialize()
M.node3.build_network()
-
+
if(PIPE_SUPPLY_MANIFOLD) //manifold
var/obj/machinery/atmospherics/pipe/manifold/hidden/supply/M = new( src.loc )
M.color = color
@@ -618,7 +617,7 @@ Buildable meters
if (M.node4)
M.node4.initialize()
M.node4.build_network()
-
+
if(PIPE_SUPPLY_MANIFOLD4W) //4-way manifold
var/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply/M = new( src.loc )
M.color = color
@@ -904,7 +903,7 @@ Buildable meters
if(C.node)
C.node.initialize()
C.node.build_network()
-
+
if(PIPE_SUPPLY_CAP)
var/obj/machinery/atmospherics/pipe/cap/hidden/supply/C = new(src.loc)
C.dir = dir
@@ -1039,10 +1038,9 @@ Buildable meters
icon = 'icons/obj/pipe-item.dmi'
icon_state = "meter"
item_state = "buildpipe"
- flags = TABLEPASS|FPRINT
w_class = 4
-/obj/item/pipe_meter/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
+/obj/item/pipe_meter/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob, params)
..()
if (!istype(W, /obj/item/weapon/wrench))
diff --git a/code/game/machinery/pipe/pipe_dispenser.dm b/code/game/machinery/pipe/pipe_dispenser.dm
index e52737efd8f..959df353b38 100644
--- a/code/game/machinery/pipe/pipe_dispenser.dm
+++ b/code/game/machinery/pipe/pipe_dispenser.dm
@@ -87,7 +87,7 @@
wait = 0
return
-/obj/machinery/pipedispenser/attackby(var/obj/item/W as obj, var/mob/user as mob)
+/obj/machinery/pipedispenser/attackby(var/obj/item/W as obj, var/mob/user as mob, params)
src.add_fingerprint(usr)
if (istype(W, /obj/item/pipe) || istype(W, /obj/item/pipe_meter))
usr << "\blue You put [W] back to [src]."
diff --git a/code/game/machinery/podmen.dm b/code/game/machinery/podmen.dm
index 4a698e2a4e2..58dc6dc7888 100644
--- a/code/game/machinery/podmen.dm
+++ b/code/game/machinery/podmen.dm
@@ -27,7 +27,7 @@ Growing it to term with nothing injected will grab a ghost from the observers. *
var/found_player = 0
var/beingharvested = 0
-/obj/item/seeds/replicapod/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/item/seeds/replicapod/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
if(istype(W,/obj/item/weapon/reagent_containers))
diff --git a/code/game/machinery/portable_tag_turret.dm b/code/game/machinery/portable_tag_turret.dm
new file mode 100644
index 00000000000..c6da942645a
--- /dev/null
+++ b/code/game/machinery/portable_tag_turret.dm
@@ -0,0 +1,124 @@
+#define TURRET_PRIORITY_TARGET 2
+#define TURRET_SECONDARY_TARGET 1
+#define TURRET_NOT_TARGET 0
+
+/obj/machinery/porta_turret/tag
+ // Reasonable defaults, in case someone manually spawns us
+ var/lasercolor = "r" //Something to do with lasertag turrets, blame Sieve for not adding a comment.
+ installation = /obj/item/weapon/gun/energy/laser/redtag
+
+/obj/machinery/porta_turret/tag/red
+
+/obj/machinery/porta_turret/tag/blue
+ lasercolor = "b"
+ installation = /obj/item/weapon/gun/energy/laser/bluetag
+
+/obj/machinery/porta_turret/tag/New()
+ ..()
+ icon_state = "[lasercolor]grey_target_prism"
+
+/obj/machinery/porta_turret/tag/weapon_setup(var/obj/item/weapon/gun/energy/E)
+ switch(E.type)
+ if(/obj/item/weapon/gun/energy/laser/bluetag)
+ eprojectile = /obj/item/weapon/gun/energy/laser/bluetag
+ lasercolor = "b"
+ req_access = list(access_maint_tunnels, access_theatre)
+ check_arrest = 0
+ check_records = 0
+ check_weapons = 1
+ check_access = 0
+ check_anomalies = 0
+ shot_delay = 30
+
+ if(/obj/item/weapon/gun/energy/laser/redtag)
+ eprojectile = /obj/item/weapon/gun/energy/laser/redtag
+ lasercolor = "r"
+ req_access = list(access_maint_tunnels, access_theatre)
+ check_arrest = 0
+ check_records = 0
+ check_weapons = 1
+ check_access = 0
+ check_anomalies = 0
+ shot_delay = 30
+ iconholder = 1
+
+/obj/machinery/porta_turret/tag/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
+ var/data[0]
+ data["access"] = !isLocked(user)
+ data["locked"] = locked
+ data["enabled"] = enabled
+ data["is_lethal"] = 0
+
+ ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
+ if (!ui)
+ ui = new(user, src, ui_key, "turret_control.tmpl", "Turret Controls", 500, 300)
+ ui.set_initial_data(data)
+ ui.open()
+ ui.set_auto_update(1)
+
+/obj/machinery/porta_turret/tag/update_icon()
+ if(!anchored)
+ icon_state = "turretCover"
+ return
+ if(stat & BROKEN)
+ icon_state = "[lasercolor]destroyed_target_prism"
+ else
+ if(powered())
+ if(enabled)
+ if(iconholder)
+ //lasers have a orange icon
+ icon_state = "[lasercolor]orange_target_prism"
+ else
+ //almost everything has a blue icon
+ icon_state = "[lasercolor]target_prism"
+ else
+ icon_state = "[lasercolor]grey_target_prism"
+ else
+ icon_state = "[lasercolor]grey_target_prism"
+
+/obj/machinery/porta_turret/tag/bullet_act(obj/item/projectile/Proj)
+ ..()
+
+ if(lasercolor == "b" && disabled == 0)
+ if(istype(Proj, /obj/item/weapon/gun/energy/laser/redtag))
+ disabled = 1
+ del(Proj) // qdel
+ sleep(100)
+ disabled = 0
+ if(lasercolor == "r" && disabled == 0)
+ if(istype(Proj, /obj/item/weapon/gun/energy/laser/bluetag))
+ disabled = 1
+ del(Proj) // qdel
+ sleep(100)
+ disabled = 0
+
+/obj/machinery/porta_turret/tag/assess_living(var/mob/living/L)
+ if(!L)
+ return TURRET_NOT_TARGET
+
+ if(L.lying)
+ return TURRET_NOT_TARGET
+
+ var/target_suit
+ var/target_weapon
+ switch(lasercolor)
+ if("b")
+ target_suit = /obj/item/clothing/suit/redtag
+ target_weapon = /obj/item/weapon/gun/energy/laser/redtag
+ if("r")
+ target_suit = /obj/item/clothing/suit/bluetag
+ target_weapon = /obj/item/weapon/gun/energy/laser/bluetag
+
+
+ if(target_suit)//Lasertag turrets target the opposing team, how great is that? -Sieve
+ if((istype(L.r_hand, target_weapon)) || (istype(L.l_hand, target_weapon)))
+ return TURRET_PRIORITY_TARGET
+
+ if(istype(L, /mob/living/carbon/human))
+ var/mob/living/carbon/human/H = L
+ if(istype(H.wear_suit, target_suit))
+ return TURRET_PRIORITY_TARGET
+ if(istype(H.belt, target_weapon))
+ return TURRET_SECONDARY_TARGET
+
+ return TURRET_NOT_TARGET
\ No newline at end of file
diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm
index 84d6915556c..e7a064ff077 100644
--- a/code/game/machinery/portable_turret.dm
+++ b/code/game/machinery/portable_turret.dm
@@ -1,636 +1,589 @@
-/*
- Portable Turrets:
-
+/* Portable Turrets:
Constructed from metal, a gun of choice, and a prox sensor.
- Gun can be a taser or laser or energy gun.
-
This code is slightly more documented than normal, as requested by XSI on IRC.
-
*/
-
/obj/machinery/porta_turret
name = "turret"
icon = 'icons/obj/turrets.dmi'
icon_state = "grey_target_prism"
anchored = 1
layer = 3
- invisibility = INVISIBILITY_LEVEL_TWO // the turret is invisible if it's inside its cover
+ invisibility = INVISIBILITY_LEVEL_TWO //the turret is invisible if it's inside its cover
density = 1
- use_power = 1 // this turret uses and requires power
- idle_power_usage = 50 // when inactive, this turret takes up constant 50 Equipment power
- active_power_usage = 300// when active, this turret takes up constant 300 Equipment power
- req_access = list(access_security)
- power_channel = EQUIP // drains power from the EQUIPMENT channel
+ use_power = 1 //this turret uses and requires power
+ idle_power_usage = 50 //when inactive, this turret takes up constant 50 Equipment power
+ active_power_usage = 300 //when active, this turret takes up constant 300 Equipment power
+ req_access = null
+ req_one_access = list(access_security, access_heads)
+ power_channel = EQUIP //drains power from the EQUIPMENT channel
- var/lasercolor = "" // Something to do with lasertag turrets, blame Sieve for not adding a comment.
- var/raised = 0 // if the turret cover is "open" and the turret is raised
- var/raising= 0 // if the turret is currently opening or closing its cover
- var/health = 80 // the turret's health
- var/locked = 1 // if the turret's behaviour control access is locked
+ var/raised = 0 //if the turret cover is "open" and the turret is raised
+ var/raising= 0 //if the turret is currently opening or closing its cover
+ var/health = 80 //the turret's health
+ var/locked = 1 //if the turret's behaviour control access is locked
+ var/controllock = 0 //if the turret responds to control panels
- var/installation // the type of weapon installed
- var/gun_charge = 0 // the charge of the gun inserted
+ var/installation = /obj/item/weapon/gun/energy/gun/turret //the type of weapon installed
+ var/gun_charge = 0 //the charge of the gun inserted
var/projectile = null //holder for bullettype
- var/eprojectile = null//holder for the shot when emagged
- var/reqpower = 0 //holder for power needed
- var/sound = null//So the taser can have sound
- var/iconholder = null//holder for the icon_state
- var/egun = null//holder to handle certain guns switching bullettypes
+ var/eprojectile = null //holder for the shot when emagged
+ var/reqpower = 500 //holder for power needed
+ var/iconholder = null //holder for the icon_state. 1 for orange sprite, null for blue.
+ var/egun = null //holder to handle certain guns switching bullettypes
- var/obj/machinery/porta_turret_cover/cover = null // the cover that is covering this turret
- var/last_fired = 0 // 1: if the turret is cooling down from a shot, 0: turret is ready to fire
- var/shot_delay = 15 // 1.5 seconds between each shot
+ var/obj/machinery/porta_turret_cover/cover = null //the cover that is covering this turret
+ var/last_fired = 0 //1: if the turret is cooling down from a shot, 0: turret is ready to fire
+ var/shot_delay = 15 //1.5 seconds between each shot
- var/check_records = 1 // checks if it can use the security records
- var/criminals = 1 // checks if it can shoot people on arrest
- var/auth_weapons = 0 // checks if it can shoot people that have a weapon they aren't authorized to have
- var/stun_all = 0 // if this is active, the turret shoots everything that isn't security or head of staff
- var/check_anomalies = 1 // checks if it can shoot at unidentified lifeforms (ie xenos)
- var/ai = 0 // if active, will shoot at anything not an AI or cyborg
+ var/check_arrest = 1 //checks if the perp is set to arrest
+ var/check_records = 1 //checks if a security record exists at all
+ var/check_weapons = 0 //checks if it can shoot people that have a weapon they aren't authorized to have
+ var/check_access = 1 //if this is active, the turret shoots everything that does not meet the access requirements
+ var/check_anomalies = 1 //checks if it can shoot at unidentified lifeforms (ie xenos)
+ var/check_synth = 0 //if active, will shoot at anything not an AI or cyborg
+ var/ailock = 0 // AI cannot use this
- var/attacked = 0 // if set to 1, the turret gets pissed off and shoots at people nearby (unless they have sec access!)
+ var/attacked = 0 //if set to 1, the turret gets pissed off and shoots at people nearby (unless they have sec access!)
- //var/emagged = 0 // 1: emagged, 0: not emagged
- var/on = 1 // determines if the turret is on
+ var/enabled = 1 //determines if the turret is on
+ var/lethal = 0 //whether in lethal or stun mode
var/disabled = 0
- var/datum/effect/effect/system/spark_spread/spark_system // the spark system, used for generating... sparks?
+ var/shot_sound //what sound should play when the turret fires
+ var/eshot_sound //what sound should play when the emagged turret fires
- New()
- ..()
- icon_state = "[lasercolor]grey_target_prism"
- // Sets up a spark system
- spark_system = new /datum/effect/effect/system/spark_spread
- spark_system.set_up(5, 0, src)
- spark_system.attach(src)
- sleep(10)
- if(!installation)// if for some reason the turret has no gun (ie, admin spawned) it resorts to basic taser shots
- projectile = /obj/item/projectile/energy/electrode//holder for the projectile, here it is being set
- eprojectile = /obj/item/projectile/beam//holder for the projectile when emagged, if it is different
- reqpower = 200
- sound = 1
+ var/datum/effect/effect/system/spark_spread/spark_system //the spark system, used for generating... sparks?
+
+ var/wrenching = 0
+ var/last_target //last target fired at, prevents turrets from erratically firing at all valid targets in range
+
+/obj/machinery/porta_turret/stationary
+ lethal = 1
+ installation = /obj/item/weapon/gun/energy/laser
+
+/obj/machinery/porta_turret/New()
+ ..()
+ icon_state = "grey_target_prism"
+ //Sets up a spark system
+ spark_system = new /datum/effect/effect/system/spark_spread
+ spark_system.set_up(5, 0, src)
+ spark_system.attach(src)
+
+ cover = new /obj/machinery/porta_turret_cover(loc)
+ cover.Parent_Turret = src
+ setup()
+
+/obj/machinery/porta_turret/proc/setup()
+ var/obj/item/weapon/gun/energy/E = installation //All energy-based weapons are applicable
+ //var/obj/item/ammo_casing/shottype = E.projectile_type
+
+ projectile = initial(E.projectile_type)
+ eprojectile = projectile
+ shot_sound = initial(E.fire_sound)
+ eshot_sound = shot_sound
+
+ weapon_setup(installation)
+
+/obj/machinery/porta_turret/proc/weapon_setup(var/guntype)
+ switch(guntype)
+ if(/obj/item/weapon/gun/energy/laser/practice)
iconholder = 1
- else
- var/obj/item/weapon/gun/energy/E=new installation
- // All energy-based weapons are applicable
- switch(E.type)
- if(/obj/item/weapon/gun/energy/laser/bluetag)
- projectile = /obj/item/projectile/lasertag/blue
- eprojectile = /obj/item/projectile/lasertag/omni//This bolt will stun ERRYONE with a vest
- iconholder = null
- reqpower = 100
- lasercolor = "b"
- req_access = list(access_maint_tunnels)
- check_records = 0
- criminals = 0
- auth_weapons = 1
- stun_all = 0
- check_anomalies = 0
- shot_delay = 30
+ eprojectile = /obj/item/projectile/beam
- if(/obj/item/weapon/gun/energy/laser/redtag)
- projectile = /obj/item/projectile/lasertag/red
- eprojectile = /obj/item/projectile/lasertag/omni
- iconholder = null
- reqpower = 100
- lasercolor = "r"
- req_access = list(access_maint_tunnels)
- check_records = 0
- criminals = 0
- auth_weapons = 1
- stun_all = 0
- check_anomalies = 0
- shot_delay = 30
+// if(/obj/item/weapon/gun/energy/laser/practice/sc_laser)
+// iconholder = 1
+// eprojectile = /obj/item/projectile/beam
- if(/obj/item/weapon/gun/energy/laser/practice)
- projectile = /obj/item/projectile/practice
- eprojectile = /obj/item/projectile/beam
- iconholder = null
- reqpower = 100
+ if(/obj/item/weapon/gun/energy/laser/retro)
+ iconholder = 1
- if(/obj/item/weapon/gun/energy/pulse_rifle)
- projectile = /obj/item/projectile/beam/pulse
- eprojectile = projectile
- iconholder = null
- reqpower = 700
+// if(/obj/item/weapon/gun/energy/retro/sc_retro)
+// iconholder = 1
- if(/obj/item/weapon/gun/energy/staff)
- projectile = /obj/item/projectile/change
- eprojectile = projectile
- iconholder = 1
- reqpower = 700
+ if(/obj/item/weapon/gun/energy/laser/captain)
+ iconholder = 1
- if(/obj/item/weapon/gun/energy/ionrifle)
- projectile = /obj/item/projectile/ion
- eprojectile = projectile
- iconholder = 1
- reqpower = 700
+ if(/obj/item/weapon/gun/energy/lasercannon)
+ iconholder = 1
- if(/obj/item/weapon/gun/energy/advtaser)
- projectile = /obj/item/projectile/energy/electrode
- eprojectile = projectile
- iconholder = 1
- reqpower = 200
+ if(/obj/item/weapon/gun/energy/taser)
+ eprojectile = /obj/item/projectile/beam
+ eshot_sound = 'sound/weapons/Laser.ogg'
- if(/obj/item/weapon/gun/energy/stunrevolver)
- projectile = /obj/item/projectile/energy/electrode
- eprojectile = projectile
- iconholder = 1
- reqpower = 200
+ if(/obj/item/weapon/gun/energy/stunrevolver)
+ eprojectile = /obj/item/projectile/beam
+ eshot_sound = 'sound/weapons/Laser.ogg'
- if(/obj/item/weapon/gun/energy/lasercannon)
- projectile = /obj/item/projectile/beam/heavylaser
- eprojectile = projectile
- iconholder = null
- reqpower = 600
+ if(/obj/item/weapon/gun/energy/gun)
+ eprojectile = /obj/item/projectile/beam //If it has, going to kill mode
+ eshot_sound = 'sound/weapons/Laser.ogg'
+ egun = 1
- if(/obj/item/weapon/gun/energy/decloner)
- projectile = /obj/item/projectile/energy/declone
- eprojectile = projectile
- iconholder = null
- reqpower = 600
-
- if(/obj/item/weapon/gun/energy/kinetic_accelerator/crossbow/large)
- projectile = /obj/item/projectile/energy/bolt/large
- eprojectile = projectile
- iconholder = null
- reqpower = 125
-
- if(/obj/item/weapon/gun/energy/kinetic_accelerator/crossbow)
- projectile = /obj/item/projectile/energy/bolt
- eprojectile = projectile
- iconholder = null
- reqpower = 50
-
- if(/obj/item/weapon/gun/energy/laser)
- projectile = /obj/item/projectile/beam
- eprojectile = projectile
- iconholder = null
- reqpower = 500
-
- else // Energy gun shots
- projectile = /obj/item/projectile/energy/electrode// if it hasn't been emagged, it uses normal taser shots
- eprojectile = /obj/item/projectile/beam//If it has, going to kill mode
- iconholder = 1
- egun = 1
- reqpower = 200
-
- Destroy()
- // deletes its own cover with it
- del(cover)
- ..()
-
-
-/obj/machinery/porta_turret/attack_ai(mob/user as mob)
- return attack_hand(user)
-
-/obj/machinery/porta_turret/attack_hand(mob/user as mob)
- . = ..()
- if (.)
- return
- var/dat
-
- // The browse() text, similar to ED-209s and beepskies.
- if(!(src.lasercolor))//Lasertag turrets have less options
- dat += text({"
-Automatic Portable Turret Installation
-Status: []
-Behaviour controls are [src.locked ? "locked" : "unlocked"]"},
-
-"[src.on ? "On" : "Off"]" )
-
- if(!src.locked)
- dat += text({"
-Check for Weapon Authorization: []
-Check Security Records: []
-Neutralize Identified Criminals: []
-Neutralize All Non-Security and Non-Command Personnel: []
-Neutralize All Unidentified Life Signs: []
"},
-
-"[src.auth_weapons ? "Yes" : "No"]",
-"[src.check_records ? "Yes" : "No"]",
-"[src.criminals ? "Yes" : "No"]",
-"[stun_all ? "Yes" : "No"]",
-"[check_anomalies ? "Yes" : "No"]" )
- else
- if(istype(user,/mob/living/carbon/human))
- var/mob/living/carbon/human/H = user
- if(((src.lasercolor) == "b") && (istype(H.wear_suit, /obj/item/clothing/suit/redtag)))
- return
- if(((src.lasercolor) == "r") && (istype(H.wear_suit, /obj/item/clothing/suit/bluetag)))
- return
- dat += text({"
-Automatic Portable Turret Installation
-Status: []
"},
-
-"[src.on ? "On" : "Off"]" )
-
-
- user << browse("Automatic Portable Turret Installation[dat]", "window=autosec")
- onclose(user, "autosec")
- return
-
-/obj/machinery/porta_turret/Topic(href, href_list)
- if (..())
- return
- usr.set_machine(src)
- src.add_fingerprint(usr)
- if ((href_list["power"]) && (src.allowed(usr)))
- if(anchored) // you can't turn a turret on/off if it's not anchored/secured
- on = !on // toggle on/off
- else
- usr << "\red It has to be secured first!"
-
- updateUsrDialog()
- return
-
- switch(href_list["operation"])
- // toggles customizable behavioural protocols
-
- if ("authweapon")
- src.auth_weapons = !src.auth_weapons
- if ("checkrecords")
- src.check_records = !src.check_records
- if ("shootcrooks")
- src.criminals = !src.criminals
- if("shootall")
- stun_all = !stun_all
- updateUsrDialog()
-
-
-/obj/machinery/porta_turret/power_change()
+ if(/obj/item/weapon/gun/energy/gun/nuclear)
+ eprojectile = /obj/item/projectile/beam //If it has, going to kill mode
+ eshot_sound = 'sound/weapons/Laser.ogg'
+ egun = 1
+
+ if(/obj/item/weapon/gun/energy/gun/turret)
+ eprojectile = /obj/item/projectile/beam //If it has, going to copypaste mode
+ eshot_sound = 'sound/weapons/Laser.ogg'
+ egun = 1
+/obj/machinery/porta_turret/update_icon()
if(!anchored)
icon_state = "turretCover"
return
if(stat & BROKEN)
- icon_state = "[lasercolor]destroyed_target_prism"
+ icon_state = "destroyed_target_prism"
else
- if( powered() )
- if (on)
- if (installation == /obj/item/weapon/gun/energy/laser || installation == /obj/item/weapon/gun/energy/pulse_rifle)
- // laser guns and pulse rifles have an orange icon
- icon_state = "[lasercolor]orange_target_prism"
+ if(powered())
+ if(enabled)
+ if(iconholder)
+ //lasers have a orange icon
+ icon_state = "orange_target_prism"
else
- // anything else has a blue icon
- icon_state = "[lasercolor]target_prism"
+ //almost everything has a blue icon
+ icon_state = "target_prism"
else
- icon_state = "[lasercolor]grey_target_prism"
- stat &= ~NOPOWER
+ icon_state = "grey_target_prism"
else
- spawn(rand(0, 15))
- src.icon_state = "[lasercolor]grey_target_prism"
- stat |= NOPOWER
+ icon_state = "grey_target_prism"
+
+/obj/machinery/porta_turret/Destroy()
+ //deletes its own cover with it
+ qdel(cover) // qdel
+ ..()
+
+/obj/machinery/porta_turret/proc/isLocked(mob/user)
+ if(ailock && (isrobot(user) || isAI(user)))
+ user << "There seems to be a firewall preventing you from accessing this device."
+ return 1
+
+ if(locked && !(isrobot(user) || isAI(user)))
+ user << "Access denied."
+ return 1
+
+ return 0
+
+/obj/machinery/porta_turret/attack_ai(mob/user)
+ if(isLocked(user))
+ return
+
+ ui_interact(user)
+
+/obj/machinery/porta_turret/attack_hand(mob/user)
+ if(isLocked(user))
+ return
+
+ ui_interact(user)
+
+/obj/machinery/porta_turret/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
+ var/data[0]
+ data["access"] = !isLocked(user)
+ data["locked"] = locked
+ data["enabled"] = enabled
+ data["is_lethal"] = 1
+ data["lethal"] = lethal
+
+ if(data["access"])
+ var/settings[0]
+ settings[++settings.len] = list("category" = "Neutralize All Non-Synthetics", "setting" = "check_synth", "value" = check_synth)
+ settings[++settings.len] = list("category" = "Check Weapon Authorization", "setting" = "check_weapons", "value" = check_weapons)
+ settings[++settings.len] = list("category" = "Check Security Records", "setting" = "check_records", "value" = check_records)
+ settings[++settings.len] = list("category" = "Check Arrest Status", "setting" = "check_arrest", "value" = check_arrest)
+ settings[++settings.len] = list("category" = "Check Access Authorization", "setting" = "check_access", "value" = check_access)
+ settings[++settings.len] = list("category" = "Check Misc. Lifeforms", "setting" = "check_anomalies", "value" = check_anomalies)
+ data["settings"] = settings
+
+ ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
+ if (!ui)
+ ui = new(user, src, ui_key, "turret_control.tmpl", "Turret Controls", 500, 300)
+ ui.set_initial_data(data)
+ ui.open()
+ ui.set_auto_update(1)
+
+/obj/machinery/porta_turret/proc/HasController()
+ var/area/A = get_area(src)
+ return A && A.turret_controls.len > 0
+
+/obj/machinery/porta_turret/CanUseTopic(var/mob/user)
+ if(HasController())
+ user << "Turrets can only be controlled using the assigned turret controller."
+ return STATUS_CLOSE
+
+ if(isLocked(user))
+ return STATUS_CLOSE
+
+ if(!anchored)
+ usr << "\The [src] has to be secured first!"
+ return STATUS_CLOSE
+
+ return STATUS_INTERACTIVE
+
+/obj/machinery/porta_turret/Topic(href, href_list, var/nowindow = 0)
+ if(..())
+ return 1
+
+ if(href_list["command"] && href_list["value"])
+ var/value = text2num(href_list["value"])
+ if(href_list["command"] == "enable")
+ enabled = value
+ else if(href_list["command"] == "lethal")
+ lethal = value
+ else if(href_list["command"] == "check_synth")
+ check_synth = value
+ else if(href_list["command"] == "check_weapons")
+ check_weapons = value
+ else if(href_list["command"] == "check_records")
+ check_records = value
+ else if(href_list["command"] == "check_arrest")
+ check_arrest = value
+ else if(href_list["command"] == "check_access")
+ check_access = value
+ else if(href_list["command"] == "check_anomalies")
+ check_anomalies = value
+
+ return 1
+
+/obj/machinery/porta_turret/power_change()
+ if(powered())
+ stat &= ~NOPOWER
+ update_icon()
+ else
+ spawn(rand(0, 15))
+ stat |= NOPOWER
+ update_icon()
-
-/obj/machinery/porta_turret/attackby(obj/item/W as obj, mob/user as mob)
+/obj/machinery/porta_turret/attackby(obj/item/I, mob/user)
if(stat & BROKEN)
- if(istype(W, /obj/item/weapon/crowbar))
+ if(istype(I, /obj/item/weapon/crowbar))
+ //If the turret is destroyed, you can remove it with a crowbar to
+ //try and salvage its components
+ user << "You begin prying the metal coverings off."
+ if(do_after(user, 20))
+ if(prob(70))
+ user << "You remove the turret and salvage some components."
+ if(installation)
+ var/obj/item/weapon/gun/energy/Gun = new installation(loc)
+ Gun.power_supply.charge = gun_charge
+ Gun.update_icon()
+ if(prob(50))
+ new /obj/item/stack/sheet/metal(loc, rand(1,4))
+ if(prob(50))
+ new /obj/item/device/assembly/prox_sensor(loc)
+ else
+ user << "You remove the turret but did not manage to salvage anything."
+ qdel(src) // qdel
- // If the turret is destroyed, you can remove it with a crowbar to
- // try and salvage its components
- user << "You begin prying the metal coverings off."
- sleep(20)
- if(prob(70))
- user << "You remove the turret and salvage some components."
- if(installation)
- var/obj/item/weapon/gun/energy/Gun = new installation(src.loc)
- Gun.power_supply.charge=gun_charge
- Gun.update_icon()
- lasercolor = null
- if(prob(50)) new /obj/item/stack/sheet/metal( loc, rand(1,4))
- if(prob(50)) new /obj/item/device/assembly/prox_sensor(locate(x,y,z))
- else
- user << "You remove the turret but did not manage to salvage anything."
- del(src)
+ else if((istype(I, /obj/item/weapon/wrench)))
+ if(enabled || raised)
+ user << "You cannot unsecure an active turret!"
+ return
+ if(wrenching)
+ user << "Someone is already [anchored ? "un" : ""]securing the turret!"
+ return
+ if(!anchored && isinspace())
+ user << "Cannot secure turrets in space!"
+ return
+ user.visible_message( \
+ "[user] begins [anchored ? "un" : ""]securing the turret.", \
+ "You begin [anchored ? "un" : ""]securing the turret." \
+ )
- if ((istype(W, /obj/item/weapon/card/emag)) && (!src.emagged))
- // Emagging the turret makes it go bonkers and stun everyone. It also makes
- // the turret shoot much, much faster.
+ wrenching = 1
+ if(do_after(user, 50))
+ //This code handles moving the turret around. After all, it's a portable turret!
+ if(!anchored)
+ playsound(loc, 'sound/items/Ratchet.ogg', 100, 1)
+ anchored = 1
+ invisibility = INVISIBILITY_LEVEL_TWO
+ update_icon()
+ user << "You secure the exterior bolts on the turret."
+ create_cover()
+ else if(anchored)
+ playsound(loc, 'sound/items/Ratchet.ogg', 100, 1)
+ anchored = 0
+ user << "You unsecure the exterior bolts on the turret."
+ invisibility = 0
+ update_icon()
+ qdel(cover) //deletes the cover, and the turret instance itself becomes its own cover. - qdel
+ wrenching = 0
- user << "\red You short out [src]'s threat assessment circuits."
- spawn(0)
- for(var/mob/O in hearers(src, null))
- O.show_message("\red [src] hums oddly...", 1)
- emagged = 1
- src.on = 0 // turns off the turret temporarily
- sleep(60) // 6 seconds for the traitor to gtfo of the area before the turret decides to ruin his shit
- on = 1 // turns it back on. The cover popUp() popDown() are automatically called in process(), no need to define it here
-
- else if((istype(W, /obj/item/weapon/wrench)) && (!on))
- if(raised) return
- // This code handles moving the turret around. After all, it's a portable turret!
-
- if(!anchored)
- anchored = 1
- invisibility = INVISIBILITY_LEVEL_TWO
- icon_state = "[lasercolor]grey_target_prism"
- user << "You secure the exterior bolts on the turret."
- cover=new/obj/machinery/porta_turret_cover(src.loc) // create a new turret. While this is handled in process(), this is to workaround a bug where the turret becomes invisible for a split second
- cover.Parent_Turret = src // make the cover's parent src
+ else if(istype(I, /obj/item/weapon/card/id)||istype(I, /obj/item/device/pda))
+ //Behavior lock/unlock mangement
+ if(allowed(user))
+ locked = !locked
+ user << "Controls are now [locked ? "locked" : "unlocked"]."
+ updateUsrDialog()
else
- anchored = 0
- user << "You unsecure the exterior bolts on the turret."
- icon_state = "turretCover"
- invisibility = 0
- del(cover) // deletes the cover, and the turret instance itself becomes its own cover.
-
- else if (istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda))
- // Behavior lock/unlock mangement
- if (allowed(user))
- locked = !src.locked
- user << "Controls are now [locked ? "locked." : "unlocked."]"
- else
- user << "\red Access denied."
+ user << "Access denied."
else
- // if the turret was attacked with the intention of harming it:
- src.health -= W.force * 0.5
- if (src.health <= 0)
- src.die()
- if ((W.force * 0.5) > 1) // if the force of impact dealt at least 1 damage, the turret gets pissed off
+ //if the turret was attacked with the intention of harming it:
+ user.changeNext_move(CLICK_CD_MELEE)
+ take_damage(I.force * 0.5)
+ playsound(src.loc, 'sound/weapons/smash.ogg', 60, 1)
+ if(I.force * 0.5 > 1) //if the force of impact dealt at least 1 damage, the turret gets pissed off
if(!attacked && !emagged)
attacked = 1
spawn()
sleep(60)
attacked = 0
+
..()
+
+/obj/machinery/porta_turret/emag_act(user as mob)
+ if(!emagged)
+ //Emagging the turret makes it go bonkers and stun everyone. It also makes
+ //the turret shoot much, much faster.
+ user << "You short out [src]'s threat assessment circuits."
+ visible_message("[src] hums oddly...")
+ emagged = 1
+ iconholder = 1
+ controllock = 1
+ enabled = 0 //turns off the turret temporarily
+ sleep(60) //6 seconds for the traitor to gtfo of the area before the turret decides to ruin his shit
+ enabled = 1 //turns it back on. The cover popUp() popDown() are automatically called in process(), no need to define it here
+/obj/machinery/porta_turret/proc/take_damage(var/force)
+ health -= force
+ if (force > 5 && prob(45))
+ spark_system.start()
+ if(health <= 0)
+ die() //the death process :(
+/obj/machinery/porta_turret/bullet_act(obj/item/projectile/Proj)
-/obj/machinery/porta_turret/bullet_act(var/obj/item/projectile/Proj)
- if(on)
+ if(Proj.damage_type == HALLOSS || Proj.damage_type == STAMINA)
+ return
+
+ if(enabled)
if(!attacked && !emagged)
attacked = 1
spawn()
sleep(60)
attacked = 0
- if((Proj.damage_type == BRUTE || Proj.damage_type == BURN))
- health -= Proj.damage
-
..()
- if(prob(45) && Proj.damage > 0) src.spark_system.start()
- if (src.health <= 0)
- src.die() // the death process :(
- if((src.lasercolor == "b") && (src.disabled == 0))
- if(istype(Proj, /obj/item/projectile/lasertag/red))
- src.disabled = 1
- del (Proj)
- sleep(100)
- src.disabled = 0
- if((src.lasercolor == "r") && (src.disabled == 0))
- if(istype(Proj, /obj/item/projectile/lasertag/blue))
- src.disabled = 1
- del (Proj)
- sleep(100)
- src.disabled = 0
- return
+ if((Proj.damage_type == BRUTE || Proj.damage_type == BURN))
+ take_damage(Proj.damage)
/obj/machinery/porta_turret/emp_act(severity)
- if(on)
- // if the turret is on, the EMP no matter how severe disables the turret for a while
- // and scrambles its settings, with a slight chance of having an emag effect
- check_records=pick(0,1)
- criminals=pick(0,1)
- auth_weapons=pick(0,1)
- stun_all=pick(0,0,0,0,1) // stun_all is a pretty big deal, so it's least likely to get turned on
- if(prob(5)) emagged=1
- on=0
+ if(enabled)
+ //if the turret is on, the EMP no matter how severe disables the turret for a while
+ //and scrambles its settings, with a slight chance of having an emag effect
+ check_arrest = prob(50)
+ check_records = prob(50)
+ check_weapons = prob(50)
+ check_access = prob(20) // check_access is a pretty big deal, so it's least likely to get turned on
+ check_anomalies = prob(50)
+ if(prob(5))
+ emagged = 1
+
+ enabled=0
sleep(rand(60,600))
- if(!on)
- on=1
+ if(!enabled)
+ enabled=1
..()
/obj/machinery/porta_turret/ex_act(severity)
- if(severity >= 3) // turret dies if an explosion touches it!
- qdel(src)
- else
- src.die()
-
-/obj/machinery/porta_turret/proc/die() // called when the turret dies, ie, health <= 0
- src.health = 0
- src.density = 0
- src.stat |= BROKEN // enables the BROKEN bit
- src.icon_state = "[lasercolor]destroyed_target_prism"
- invisibility=0
- src.spark_system.start() // creates some sparks because they look cool
- src.density=1
- qdel(cover) // deletes the cover - no need on keeping it there!
+ switch (severity)
+ if (1)
+ qdel(src)
+ if (2)
+ if (prob(25))
+ qdel(src)
+ else
+ take_damage(150) //should instakill most turrets
+ if (3)
+ take_damage(50)
+/obj/machinery/porta_turret/proc/die() //called when the turret dies, ie, health <= 0
+ health = 0
+ density = 0
+ stat |= BROKEN //enables the BROKEN bit
+ invisibility = 0
+ spark_system.start() //creates some sparks because they look cool
+ density = 1
+ update_icon()
+ del(cover) //deletes the cover - no need on keeping it there! - del
+/obj/machinery/porta_turret/proc/create_cover()
+ if(cover == null && anchored)
+ cover = new /obj/machinery/porta_turret_cover(loc) //if the turret has no cover and is anchored, give it a cover
+ cover.Parent_Turret = src //assign the cover its Parent_Turret, which would be this (src)
/obj/machinery/porta_turret/process()
- // the main machinery process
+ //the main machinery process
- //set background = 1
+ set background = BACKGROUND_ENABLED
- if(src.cover==null && anchored) // if it has no cover and is anchored
- if (stat & BROKEN) // if the turret is borked
- del(cover) // delete its cover, assuming it has one. Workaround for a pesky little bug
+ if(cover == null && anchored) //if it has no cover and is anchored
+ if(stat & BROKEN) //if the turret is borked
+ qdel(cover) //delete its cover, assuming it has one. Workaround for a pesky little bug - qdel
else
-
- src.cover = new /obj/machinery/porta_turret_cover(src.loc) // if the turret has no cover and is anchored, give it a cover
- src.cover.Parent_Turret = src // assign the cover its Parent_Turret, which would be this (src)
+ create_cover()
if(stat & (NOPOWER|BROKEN))
- // if the turret has no power or is broken, make the turret pop down if it hasn't already
+ //if the turret has no power or is broken, make the turret pop down if it hasn't already
popDown()
return
- if(!on)
- // if the turret is off, make it pop down
+ if(!enabled)
+ //if the turret is off, make it pop down
popDown()
return
- var/list/targets = list() // list of primary targets
- var/list/secondarytargets = list() // targets that are least important
+ var/list/targets = list() //list of primary targets
+ var/list/secondarytargets = list() //targets that are least important
- if(src.check_anomalies) // if its set to check for xenos/carps, check for non-mob "crittersssss"(And simple_animals)
- for(var/mob/living/simple_animal/C in view(7,src))
- if(C.stat)
- continue
- // Ignore lazarus-injected mobs.
- if(C.faction == "lazarus")
- continue
- targets += C
+ for(var/obj/mecha/ME in view(7,src))
+ assess_and_assign(ME.occupant, targets, secondarytargets)
- for (var/mob/living/carbon/C in view(7,src)) // loops through all living carbon-based lifeforms in view(12)
- if(istype(C, /mob/living/carbon/alien) && src.check_anomalies) // git those fukken xenos
- if(!C.stat) // if it's dead/dying, there's no need to keep shooting at it.
- targets += C
+ for(var/obj/spacepod/SP in view(7,src))
+ assess_and_assign(SP.occupant, targets, secondarytargets)
+
+ for(var/obj/vehicle/train/T in view(7,src))
+ assess_and_assign(T.load, targets, secondarytargets)
- else
- if(emagged) // if emagged, HOLY SHIT EVERYONE IS DANGEROUS beep boop beep
- targets += C
- else
- if (C.stat || C.handcuffed) // if the perp is handcuffed or dead/dying, no need to bother really
- continue // move onto next potential victim!
+ for(var/mob/living/C in view(7,src)) //loops through all living lifeforms in view
+ assess_and_assign(C, targets, secondarytargets)
- var/dst = get_dist(src, C) // if it's too far away, why bother?
- if (dst > 7)
- continue
+ if(!tryToShootAt(targets))
+ if(!tryToShootAt(secondarytargets)) // if no valid targets, go for secondary targets
+ spawn()
+ popDown() // no valid targets, close the cover
- if(ai) // If it's set to attack all nonsilicons, target them!
- if(C.lying)
- if(lasercolor)
- continue
- else
- secondarytargets += C
- continue
- else
- targets += C
- continue
+/obj/machinery/porta_turret/proc/assess_and_assign(var/mob/living/L, var/list/targets, var/list/secondarytargets)
+ switch(assess_living(L))
+ if(TURRET_PRIORITY_TARGET)
+ targets += L
+ if(TURRET_SECONDARY_TARGET)
+ secondarytargets += L
- if (istype(C, /mob/living/carbon/human)) // if the target is a human, analyze threat level
- if(src.assess_perp(C)<4)
- continue // if threat level < 4, keep going
+/obj/machinery/porta_turret/proc/assess_living(var/mob/living/L)
+ if(!istype(L))
+ return TURRET_NOT_TARGET
- else if (istype(C, /mob/living/carbon/monkey))
- continue // Don't target monkeys or borgs/AIs you dumb shit
+ if(L.invisibility >= INVISIBILITY_LEVEL_ONE) // Cannot see him. see_invisible is a mob-var
+ return TURRET_NOT_TARGET
- if (C.lying) // if the perp is lying down, it's still a target but a less-important target
- secondarytargets += C
- continue
+ if(!L)
+ return TURRET_NOT_TARGET
- targets += C // if the perp has passed all previous tests, congrats, it is now a "shoot-me!" nominee
+ // If emagged not even the dead get a rest
+ if(emagged)
+ return L.stat ? TURRET_SECONDARY_TARGET : TURRET_PRIORITY_TARGET
- if (targets.len>0) // if there are targets to shoot
+ if(issilicon(L)) // Don't target silica
+ return TURRET_NOT_TARGET
- var/atom/t = pick(targets) // pick a perp from the list of targets. Targets go first because they are the most important
+ if(L.stat) //if the perp is dead/dying, no need to bother really
+ return TURRET_NOT_TARGET //move onto next potential victim!
- if (istype(t, /mob/living)) // if a mob
- var/mob/living/M = t // simple typecasting
- if (M.stat!=2) // if the target is not dead
- spawn() popUp() // pop the turret up if it's not already up.
- dir=get_dir(src,M) // even if you can't shoot, follow the target
- spawn() shootAt(M) // shoot the target, finally
+ var/dst = get_dist(src, L) //if it's too far away, why bother?
+ if(dst > 7)
+ return 0
- else
- if(secondarytargets.len>0) // if there are no primary targets, go for secondary targets
- var/mob/t = pick(secondarytargets)
- if (istype(t, /mob/living))
- if (t.stat!=2)
- spawn() popUp()
- dir=get_dir(src,t)
- shootAt(t)
- else
- spawn() popDown()
+ if(check_synth) //If it's set to attack all non-silicons, target them!
+ if(L.lying)
+ return lethal ? TURRET_SECONDARY_TARGET : TURRET_NOT_TARGET
+ return TURRET_PRIORITY_TARGET
-/obj/machinery/porta_turret/proc
- popUp() // pops the turret up
- if(disabled)
- return
- if(raising || raised) return
- if(stat & BROKEN) return
- invisibility=0
- raising=1
- flick("popup",cover)
- sleep(5)
- sleep(5)
- raising=0
- cover.icon_state="openTurretCover"
- raised=1
- layer=4
+ if(iscuffed(L)) // If the target is handcuffed, leave it alone
+ return TURRET_NOT_TARGET
- popDown() // pops the turret down
- if(disabled)
- return
- if(raising || !raised) return
- if(stat & BROKEN) return
- layer=3
- raising=1
- flick("popdown",cover)
- sleep(10)
- raising=0
- cover.icon_state="turretCover"
- raised=0
- invisibility=2
- icon_state="[lasercolor]grey_target_prism"
+ if(isanimal(L) || ismonkey(L)) // Animals are not so dangerous
+ return check_anomalies ? TURRET_SECONDARY_TARGET : TURRET_NOT_TARGET
+ if(isalien(L)) // Xenos are dangerous
+ return check_anomalies ? TURRET_PRIORITY_TARGET : TURRET_NOT_TARGET
+ if(ishuman(L)) //if the target is a human, analyze threat level
+ if(assess_perp(L, check_weapons, check_records, check_arrest) < 4)
+ return TURRET_NOT_TARGET //if threat level < 4, keep going
-/obj/machinery/porta_turret/proc/assess_perp(mob/living/carbon/human/perp as mob)
- var/threatcount = 0 // the integer returned
+ if(L.lying) //if the perp is lying down, it's still a target but a less-important target
+ return lethal ? TURRET_SECONDARY_TARGET : TURRET_NOT_TARGET
- if(src.emagged) return 10 // if emagged, always return 10.
+ return TURRET_PRIORITY_TARGET //if the perp has passed all previous tests, congrats, it is now a "shoot-me!" nominee
- if((stun_all && !src.allowed(perp)) || attacked && !src.allowed(perp))
- // if the turret has been attacked or is angry, target all non-sec people
- if(!src.allowed(perp))
- return 10
+/obj/machinery/porta_turret/proc/tryToShootAt(var/list/mob/living/targets)
+ if(targets.len && last_target && (last_target in targets) && target(last_target))
+ return 1
- if(auth_weapons) // check for weapon authorization
- if((isnull(perp.wear_id)) || (istype(perp.wear_id.GetID(), /obj/item/weapon/card/id/syndicate)))
-
- if((src.allowed(perp)) && !(src.lasercolor)) // if the perp has security access, return 0
- return 0
-
- if((istype(perp.l_hand, /obj/item/weapon/gun) && !istype(perp.l_hand, /obj/item/weapon/gun/projectile/shotgun)) || istype(perp.l_hand, /obj/item/weapon/melee/baton))
- threatcount += 4
-
- if((istype(perp.r_hand, /obj/item/weapon/gun) && !istype(perp.r_hand, /obj/item/weapon/gun/projectile/shotgun)) || istype(perp.r_hand, /obj/item/weapon/melee/baton))
- threatcount += 4
-
- if(istype(perp.belt, /obj/item/weapon/gun) || istype(perp.belt, /obj/item/weapon/melee/baton))
- threatcount += 2
-
- if((src.lasercolor) == "b")//Lasertag turrets target the opposing team, how great is that? -Sieve
- threatcount = 0//But does not target anyone else
- if(istype(perp.wear_suit, /obj/item/clothing/suit/redtag))
- threatcount += 4
- if((istype(perp.r_hand,/obj/item/weapon/gun/energy/laser/redtag)) || (istype(perp.l_hand,/obj/item/weapon/gun/energy/laser/redtag)))
- threatcount += 4
- if(istype(perp.belt, /obj/item/weapon/gun/energy/laser/redtag))
- threatcount += 2
-
- if((src.lasercolor) == "r")
- threatcount = 0
- if(istype(perp.wear_suit, /obj/item/clothing/suit/bluetag))
- threatcount += 4
- if((istype(perp.r_hand,/obj/item/weapon/gun/energy/laser/bluetag)) || (istype(perp.l_hand,/obj/item/weapon/gun/energy/laser/bluetag)))
- threatcount += 4
- if(istype(perp.belt, /obj/item/weapon/gun/energy/laser/bluetag))
- threatcount += 2
-
- if (src.check_records) // if the turret can check the records, check if they are set to *Arrest* on records
- for (var/datum/data/record/E in data_core.general)
-
- var/perpname = perp.name
- if (perp.wear_id)
- var/obj/item/weapon/card/id/id = perp.wear_id.GetID()
- if (id)
- perpname = id.registered_name
-
- if (E.fields["name"] == perpname)
- for (var/datum/data/record/R in data_core.security)
- if ((R.fields["id"] == E.fields["id"]) && (R.fields["criminal"] == "*Arrest*"))
- threatcount = 4
- break
-
-
-
- return threatcount
-
-
-
-
-
-/obj/machinery/porta_turret/proc/shootAt(var/atom/movable/target) // shoots at a target
+ while(targets.len > 0)
+ var/mob/living/M = pick(targets)
+ targets -= M
+ if(target(M))
+ return 1
+
+/obj/machinery/porta_turret/proc/popUp() //pops the turret up
if(disabled)
return
+ if(raising || raised)
+ return
+ if(stat & BROKEN)
+ return
+ playsound(get_turf(src), 'sound/effects/turret/open.wav', 60, 1)
+ invisibility = 0
+ raising = 1
+ flick("popup", cover)
+ sleep(10)
+ raising = 0
+ cover.icon_state = "openTurretCover"
+ raised = 1
+ layer = 4
+ update_icon()
- if(lasercolor && (istype(target,/mob/living/carbon/human)))
- var/mob/living/carbon/human/H = target
- if(H.lying)
+/obj/machinery/porta_turret/proc/popDown() //pops the turret down
+ last_target = null
+ if(disabled)
+ return
+ if(raising || !raised)
+ return
+ if(stat & BROKEN)
+ return
+ playsound(get_turf(src), 'sound/effects/turret/open.wav', 60, 1)
+ layer = 3
+ raising = 1
+ flick("popdown", cover)
+ sleep(10)
+ raising = 0
+ cover.icon_state = "turretCover"
+ raised = 0
+ invisibility = INVISIBILITY_LEVEL_TWO
+ update_icon()
+
+/obj/machinery/porta_turret/on_assess_perp(mob/living/carbon/human/perp)
+ if((check_access || attacked) && !allowed(perp))
+ //if the turret has been attacked or is angry, target all non-authorized personnel, see req_access
+ return 10
+
+ return ..()
+
+/obj/machinery/porta_turret/proc/target(var/mob/living/target)
+ if(disabled)
+ return
+ if(target)
+ last_target = target
+ spawn()
+ popUp() //pop the turret up if it's not already up.
+ dir = get_dir(src, target) //even if you can't shoot, follow the target
+ spawn()
+ shootAt(target)
+ return 1
+ return
+
+/obj/machinery/porta_turret/proc/shootAt(var/mob/living/target)
+ //any emagged turrets will shoot extremely fast! This not only is deadly, but drains a lot power!
+ if(!emagged) //if it hasn't been emagged, it has to obey a cooldown rate
+ if(last_fired || !raised) //prevents rapid-fire shooting, unless it's been emagged
return
-
- if(!emagged) // if it hasn't been emagged, it has to obey a cooldown rate
- if(last_fired || !raised) return // prevents rapid-fire shooting, unless it's been emagged
last_fired = 1
spawn()
sleep(shot_delay)
@@ -638,47 +591,65 @@ Status: []
"},
var/turf/T = get_turf(src)
var/turf/U = get_turf(target)
- if (!istype(T) || !istype(U))
+ if(!istype(T) || !istype(U))
return
- if (!raised) // the turret has to be raised in order to fire - makes sense, right?
+ if(!raised) //the turret has to be raised in order to fire - makes sense, right?
return
- // any emagged turrets will shoot extremely fast! This not only is deadly, but drains a lot power!
-
- if(iconholder)
- icon_state = "[lasercolor]target_prism"
- else
- icon_state = "[lasercolor]orange_target_prism"
- if(sound)
- playsound(src.loc, 'sound/weapons/Taser.ogg', 75, 1)
+ update_icon()
var/obj/item/projectile/A
- if(emagged)
- A = new eprojectile( loc )
+ if(emagged || lethal)
+ A = new eprojectile(loc)
+ playsound(loc, eshot_sound, 75, 1)
else
- A = new projectile( loc )
- A.original = target.loc
- if(!emagged)
- use_power(reqpower)
- else
- use_power((reqpower*2))
- // Shooting Code:
+ A = new projectile(loc)
+ playsound(loc, shot_sound, 75, 1)
+ A.original = target
+
+ // Lethal/emagged turrets use twice the power due to higher energy beams
+ // Emagged turrets again use twice as much power due to higher firing rates
+ use_power(reqpower * (2 * (emagged || lethal)) * (2 * emagged))
+
+ //Shooting Code:
A.current = T
A.yo = U.y - T.y
A.xo = U.x - T.x
- spawn( 1 )
+ spawn(1)
A.process()
- return
+/datum/turret_checks
+ var/enabled
+ var/lethal
+ var/check_synth
+ var/check_access
+ var/check_records
+ var/check_arrest
+ var/check_weapons
+ var/check_anomalies
+ var/ailock
+/obj/machinery/porta_turret/proc/setState(var/datum/turret_checks/TC)
+ if(controllock)
+ return
+ src.enabled = TC.enabled
+ src.lethal = TC.lethal
+ src.iconholder = TC.lethal
+
+ check_synth = TC.check_synth
+ check_access = TC.check_access
+ check_records = TC.check_records
+ check_arrest = TC.check_arrest
+ check_weapons = TC.check_weapons
+ check_anomalies = TC.check_anomalies
+ ailock = TC.ailock
+
+ src.power_change()
/*
-
Portable turret constructions
-
Known as "turret frame"s
-
*/
/obj/machinery/porta_turret_construct
@@ -686,66 +657,66 @@ Status: []
"},
icon = 'icons/obj/turrets.dmi'
icon_state = "turret_frame"
density=1
- var/build_step = 0 // the current step in the building process
- var/finish_name="turret" // the name applied to the product turret
- var/installation = null // the gun type installed
- var/gun_charge = 0 // the gun charge of the gun type installed
+ var/target_type = /obj/machinery/porta_turret // The type we intend to build
+ var/build_step = 0 //the current step in the building process
+ var/finish_name="turret" //the name applied to the product turret
+ var/installation = null //the gun type installed
+ var/gun_charge = 0 //the gun charge of the gun type installed
-
-/obj/machinery/porta_turret_construct/attackby(obj/item/W as obj, mob/user as mob)
-
- // this is a bit unweildy but self-explanitory
+/obj/machinery/porta_turret_construct/attackby(obj/item/I, mob/user)
+ //this is a bit unwieldy but self-explanatory
switch(build_step)
- if(0) // first step
- if(istype(W, /obj/item/weapon/wrench) && !anchored)
- playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1)
- user << "\blue You secure the external bolts."
+ if(0) //first step
+ if(istype(I, /obj/item/weapon/wrench) && !anchored)
+ playsound(loc, 'sound/items/Ratchet.ogg', 100, 1)
+ user << "You secure the external bolts."
anchored = 1
build_step = 1
return
- else if(istype(W, /obj/item/weapon/crowbar) && !anchored)
- playsound(src.loc, 'sound/items/Crowbar.ogg', 75, 1)
- user << "You dismantle the turret construction."
+ else if(istype(I, /obj/item/weapon/crowbar) && !anchored)
+ playsound(loc, 'sound/items/Crowbar.ogg', 75, 1)
+ user << "You dismantle the turret construction."
new /obj/item/stack/sheet/metal( loc, 5)
- del(src)
+ qdel(src) // qdel
return
if(1)
- if(istype(W, /obj/item/stack/sheet/metal))
- if(W:amount>=2) // requires 2 metal sheets
- user << "\blue You add some metal armor to the interior frame."
+ if(istype(I, /obj/item/stack/sheet/metal))
+ var/obj/item/stack/sheet/metal/M = I
+ if(M.use(2))
+ user << "You add some metal armor to the interior frame."
build_step = 2
- W:amount -= 2
icon_state = "turret_frame2"
- if(W:amount <= 0)
- del(W)
- return
+ else
+ user << "You need two sheets of metal to continue construction."
+ return
- else if(istype(W, /obj/item/weapon/wrench))
- playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1)
- user << "You unfasten the external bolts."
+ else if(istype(I, /obj/item/weapon/wrench))
+ playsound(loc, 'sound/items/Ratchet.ogg', 75, 1)
+ user << "You unfasten the external bolts."
anchored = 0
build_step = 0
return
if(2)
- if(istype(W, /obj/item/weapon/wrench))
- playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1)
- user << "\blue You bolt the metal armor into place."
+ if(istype(I, /obj/item/weapon/wrench))
+ playsound(loc, 'sound/items/Ratchet.ogg', 100, 1)
+ user << "You bolt the metal armor into place."
build_step = 3
return
- else if(istype(W, /obj/item/weapon/weldingtool))
- var/obj/item/weapon/weldingtool/WT = W
- if(!WT.isOn()) return
- if (WT.get_fuel() < 5) // uses up 5 fuel.
- user << "\red You need more fuel to complete this task."
+ else if(istype(I, /obj/item/weapon/weldingtool))
+ var/obj/item/weapon/weldingtool/WT = I
+ if(!WT.isOn())
+ return
+ if(WT.get_fuel() < 5) //uses up 5 fuel.
+ user << "You need more fuel to complete this task."
return
- playsound(src.loc, pick('sound/items/Welder.ogg', 'sound/items/Welder2.ogg'), 50, 1)
+ playsound(loc, pick('sound/items/Welder.ogg', 'sound/items/Welder2.ogg'), 50, 1)
if(do_after(user, 20))
if(!src || !WT.remove_fuel(5, user)) return
build_step = 1
@@ -755,130 +726,143 @@ Status: []
"},
if(3)
- if(istype(W, /obj/item/weapon/gun/energy)) // the gun installation part
+ if(istype(I, /obj/item/weapon/gun/energy)) //the gun installation part
+
+ if(isrobot(user))
+ return
+ var/obj/item/weapon/gun/energy/E = I //typecasts the item to an energy gun
+ if(!user.unEquip(I))
+ user << "\the [I] is stuck to your hand, you cannot put it in \the [src]"
+ return
+ installation = I.type //installation becomes I.type
+ gun_charge = E.power_supply.charge //the gun's charge is stored in gun_charge
+ user << "You add [I] to the turret."
+
+ if(istype(installation, /obj/item/weapon/gun/energy/laser/bluetag) || istype(installation, /obj/item/weapon/gun/energy/laser/redtag))
+ target_type = /obj/machinery/porta_turret/tag
+ else
+ target_type = /obj/machinery/porta_turret
- var/obj/item/weapon/gun/energy/E = W // typecasts the item to an energy gun
- installation = W.type // installation becomes W.type
- gun_charge = E.power_supply.charge // the gun's charge is stored in src.gun_charge
- user << "\blue You add \the [W] to the turret."
build_step = 4
- del(W) // delete the gun :(
+ qdel(I) //delete the gun :( qdel
return
- else if(istype(W, /obj/item/weapon/wrench))
- playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1)
- user << "You remove the turret's metal armor bolts."
+ else if(istype(I, /obj/item/weapon/wrench))
+ playsound(loc, 'sound/items/Ratchet.ogg', 100, 1)
+ user << "You remove the turret's metal armor bolts."
build_step = 2
return
if(4)
- if(isprox(W))
+ if(isprox(I))
+ if(!user.unEquip(I))
+ user << "\the [I] is stuck to your hand, you cannot put it in \the [src]"
+ return
build_step = 5
- user << "\blue You add the prox sensor to the turret."
- del(W)
+ qdel(I) // qdel
+ user << "You add the prox sensor to the turret."
return
- // attack_hand() removes the gun
+ //attack_hand() removes the gun
if(5)
- if(istype(W, /obj/item/weapon/screwdriver))
- playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1)
+ if(istype(I, /obj/item/weapon/screwdriver))
+ playsound(loc, 'sound/items/Screwdriver.ogg', 100, 1)
build_step = 6
- user << "\blue You close the internal access hatch."
+ user << "You close the internal access hatch."
return
- // attack_hand() removes the prox sensor
+ //attack_hand() removes the prox sensor
if(6)
- if(istype(W, /obj/item/stack/sheet/metal))
- if(W:amount>=2)
- user << "\blue You add some metal armor to the exterior frame."
+ if(istype(I, /obj/item/stack/sheet/metal))
+ var/obj/item/stack/sheet/metal/M = I
+ if(M.use(2))
+ user << "You add some metal armor to the exterior frame."
build_step = 7
- W:amount -= 2
- if(W:amount <= 0)
- del(W)
- return
+ else
+ user << "You need two sheets of metal to continue construction."
+ return
- else if(istype(W, /obj/item/weapon/screwdriver))
- playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1)
+ else if(istype(I, /obj/item/weapon/screwdriver))
+ playsound(loc, 'sound/items/Screwdriver.ogg', 100, 1)
build_step = 5
- user << "You open the internal access hatch."
+ user << "You open the internal access hatch."
return
if(7)
- if(istype(W, /obj/item/weapon/weldingtool))
- var/obj/item/weapon/weldingtool/WT = W
+ if(istype(I, /obj/item/weapon/weldingtool))
+ var/obj/item/weapon/weldingtool/WT = I
if(!WT.isOn()) return
- if (WT.get_fuel() < 5)
- user << "\red You need more fuel to complete this task."
+ if(WT.get_fuel() < 5)
+ user << "You need more fuel to complete this task."
- playsound(src.loc, pick('sound/items/Welder.ogg', 'sound/items/Welder2.ogg'), 50, 1)
+ playsound(loc, pick('sound/items/Welder.ogg', 'sound/items/Welder2.ogg'), 50, 1)
if(do_after(user, 30))
- if(!src || !WT.remove_fuel(5, user)) return
+ if(!src || !WT.remove_fuel(5, user))
+ return
build_step = 8
- user << "\blue You weld the turret's armor down."
+ user << "You weld the turret's armor down."
- // The final step: create a full turret
- var/obj/machinery/porta_turret/Turret = new/obj/machinery/porta_turret(locate(x,y,z))
+ //The final step: create a full turret
+ var/obj/machinery/porta_turret/Turret = new target_type(loc)
Turret.name = finish_name
- Turret.installation = src.installation
- Turret.gun_charge = src.gun_charge
+ Turret.installation = installation
+ Turret.gun_charge = gun_charge
+ Turret.enabled = 0
+ Turret.setup()
-// Turret.cover=new/obj/machinery/porta_turret_cover(src.loc)
+// Turret.cover=new/obj/machinery/porta_turret_cover(loc)
// Turret.cover.Parent_Turret=Turret
// Turret.cover.name = finish_name
- Turret.New()
- del(src)
+ qdel(src) // qdel
- else if(istype(W, /obj/item/weapon/crowbar))
- playsound(src.loc, 'sound/items/Crowbar.ogg', 75, 1)
- user << "You pry off the turret's exterior armor."
- new /obj/item/stack/sheet/metal( loc, 2)
+ else if(istype(I, /obj/item/weapon/crowbar))
+ playsound(loc, 'sound/items/Crowbar.ogg', 75, 1)
+ user << "You pry off the turret's exterior armor."
+ new /obj/item/stack/sheet/metal(loc, 2)
build_step = 6
return
- if (istype(W, /obj/item/weapon/pen)) // you can rename turrets like bots!
- var/t = input(user, "Enter new turret name", src.name, src.finish_name) as text
- t = copytext(sanitize(t), 1, MAX_MESSAGE_LEN)
- if (!t)
+ if(istype(I, /obj/item/weapon/pen)) //you can rename turrets like bots!
+ var/t = input(user, "Enter new turret name", name, finish_name) as text
+ t = sanitize(copytext(t, 1, MAX_MESSAGE_LEN))
+ if(!t)
return
- if (!in_range(src, usr) && src.loc != usr)
+ if(!in_range(src, usr) && loc != usr)
return
- src.finish_name = t
+ finish_name = t
return
..()
-
-/obj/machinery/porta_turret_construct/attack_hand(mob/user as mob)
+/obj/machinery/porta_turret_construct/attack_hand(mob/user)
switch(build_step)
if(4)
- if(!installation) return
+ if(!installation)
+ return
build_step = 3
- var/obj/item/weapon/gun/energy/Gun = new installation(src.loc)
- Gun.power_supply.charge=gun_charge
+ var/obj/item/weapon/gun/energy/Gun = new installation(loc)
+ Gun.power_supply.charge = gun_charge
Gun.update_icon()
installation = null
gun_charge = 0
- user << "You remove \the [Gun] from the turret frame."
+ user << "You remove [Gun] from the turret frame."
if(5)
- user << "You remove the prox sensor from the turret frame."
- new/obj/item/device/assembly/prox_sensor(locate(x,y,z))
+ user << "You remove the prox sensor from the turret frame."
+ new /obj/item/device/assembly/prox_sensor(loc)
build_step = 4
+/obj/machinery/porta_turret_construct/attack_ai()
+ return
-
-
-
-
-
-
-
-
+/************************
+* PORTABLE TURRET COVER *
+************************/
/obj/machinery/porta_turret_cover
name = "turret"
@@ -889,179 +873,14 @@ Status: []
"},
density = 0
var/obj/machinery/porta_turret/Parent_Turret = null
+/obj/machinery/porta_turret_cover/attack_ai(mob/user)
+ return attack_hand(user)
-
-// The below code is pretty much just recoded from the initial turret object. It's necessary but uncommented because it's exactly the same!
-
-/obj/machinery/porta_turret_cover/attack_ai(mob/user as mob)
- . = ..()
- if (.)
- return
- var/dat
- if(!(Parent_Turret.lasercolor))
- dat += text({"
-Automatic Portable Turret Installation
-Status: []
-Behaviour controls are [Parent_Turret.locked ? "locked" : "unlocked"]"},
-
-"[Parent_Turret.on ? "On" : "Off"]" )
-
-
- dat += text({"
-Check for Weapon Authorization: []
-Check Security Records: []
-Neutralize Identified Criminals: []
-Neutralize All Non-Security and Non-Command Personnel: []
-Neutralize All Unidentified Life Signs: []
"},
-
-"[Parent_Turret.auth_weapons ? "Yes" : "No"]",
-"[Parent_Turret.check_records ? "Yes" : "No"]",
-"[Parent_Turret.criminals ? "Yes" : "No"]",
-"[Parent_Turret.stun_all ? "Yes" : "No"]" ,
-"[Parent_Turret.check_anomalies ? "Yes" : "No"]" )
- else
- dat += text({"
-Automatic Portable Turret Installation
-Status: []
"},
-
-"[Parent_Turret.on ? "On" : "Off"]" )
-
- user << browse("Automatic Portable Turret Installation[dat]", "window=autosec")
- onclose(user, "autosec")
- return
-
-/obj/machinery/porta_turret_cover/attack_hand(mob/user as mob)
- . = ..()
- if (.)
- return
- var/dat
- if(!(Parent_Turret.lasercolor))
- dat += text({"
-Automatic Portable Turret Installation
-Status: []
-Behaviour controls are [Parent_Turret.locked ? "locked" : "unlocked"]"},
-
-"[Parent_Turret.on ? "On" : "Off"]" )
-
- if(!Parent_Turret.locked)
- dat += text({"
-Check for Weapon Authorization: []
-Check Security Records: []
-Neutralize Identified Criminals: []
-Neutralize All Non-Security and Non-Command Personnel: []
-Neutralize All Unidentified Life Signs: []
"},
-
-"[Parent_Turret.auth_weapons ? "Yes" : "No"]",
-"[Parent_Turret.check_records ? "Yes" : "No"]",
-"[Parent_Turret.criminals ? "Yes" : "No"]",
-"[Parent_Turret.stun_all ? "Yes" : "No"]" ,
-"[Parent_Turret.check_anomalies ? "Yes" : "No"]" )
- else
- if(istype(user,/mob/living/carbon/human))
- var/mob/living/carbon/human/H = user
- if(((Parent_Turret.lasercolor) == "b") && (istype(H.wear_suit, /obj/item/clothing/suit/redtag)))
- return
- if(((Parent_Turret.lasercolor) == "r") && (istype(H.wear_suit, /obj/item/clothing/suit/bluetag)))
- return
- dat += text({"
-Automatic Portable Turret Installation
-Status: []
"},
-
-"[Parent_Turret.on ? "On" : "Off"]" )
-
-
-
- user << browse("Automatic Portable Turret Installation[dat]", "window=autosec")
- onclose(user, "autosec")
- return
+/obj/machinery/porta_turret_cover/attack_hand(mob/user)
+ return Parent_Turret.attack_hand(user)
/obj/machinery/porta_turret_cover/Topic(href, href_list)
- if (..())
- return
- usr.set_machine(src)
- Parent_Turret.add_fingerprint(usr)
- src.add_fingerprint(usr)
- if ((href_list["power"]) && (Parent_Turret.allowed(usr)))
- if(Parent_Turret.anchored)
- if (Parent_Turret.on)
- Parent_Turret.on=0
- else
- Parent_Turret.on=1
- else
- usr << "\red It has to be secured first!"
+ Parent_Turret.Topic(href, href_list, 1) // Calling another object's Topic requires that we claim to not have a window, otherwise BYOND's base proc will runtime.
- updateUsrDialog()
- return
-
- switch(href_list["operation"])
- if ("authweapon")
- Parent_Turret.auth_weapons = !Parent_Turret.auth_weapons
- if ("checkrecords")
- Parent_Turret.check_records = !Parent_Turret.check_records
- if ("shootcrooks")
- Parent_Turret.criminals = !Parent_Turret.criminals
- if("shootall")
- Parent_Turret.stun_all = !Parent_Turret.stun_all
- if("checkxenos")
- Parent_Turret.check_anomalies = !Parent_Turret.check_anomalies
-
- updateUsrDialog()
-
-
-
-/obj/machinery/porta_turret_cover/attackby(obj/item/W as obj, mob/user as mob)
-
- if ((istype(W, /obj/item/weapon/card/emag)) && (!Parent_Turret.emagged))
- user << "\red You short out [Parent_Turret]'s threat assessment circuits."
- spawn(0)
- for(var/mob/O in hearers(Parent_Turret, null))
- O.show_message("\red [Parent_Turret] hums oddly...", 1)
- Parent_Turret.emagged = 1
- Parent_Turret.on = 0
- sleep(40)
- Parent_Turret.on = 1
-
- else if((istype(W, /obj/item/weapon/wrench)) && (!Parent_Turret.on))
- if(Parent_Turret.raised) return
-
- if(!Parent_Turret.anchored)
- Parent_Turret.anchored = 1
- Parent_Turret.invisibility = INVISIBILITY_LEVEL_TWO
- Parent_Turret.icon_state = "grey_target_prism"
- user << "You secure the exterior bolts on the turret."
- else
- Parent_Turret.anchored = 0
- user << "You unsecure the exterior bolts on the turret."
- Parent_Turret.icon_state = "turretCover"
- Parent_Turret.invisibility = 0
- del(src)
-
- else if (istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda))
- if (Parent_Turret.allowed(user))
- Parent_Turret.locked = !Parent_Turret.locked
- user << "Controls are now [Parent_Turret.locked ? "locked." : "unlocked."]"
- updateUsrDialog()
- else
- user << "\red Access denied."
-
- else
- Parent_Turret.health -= W.force * 0.5
- if (Parent_Turret.health <= 0)
- Parent_Turret.die()
- if ((W.force * 0.5) > 2)
- if(!Parent_Turret.attacked && !Parent_Turret.emagged)
- Parent_Turret.attacked = 1
- spawn()
- sleep(30)
- Parent_Turret.attacked = 0
- ..()
-
-
-
-
-/obj/machinery/porta_turret/stationary
- emagged = 1
-
- New()
- installation = new/obj/item/weapon/gun/energy/laser(src.loc)
- ..()
+/obj/machinery/porta_turret_cover/attackby(obj/item/I, mob/user)
+ Parent_Turret.attackby(I, user)
diff --git a/code/game/machinery/programmable_unloader.dm b/code/game/machinery/programmable_unloader.dm
index c481d6fa32c..291b5849d2f 100644
--- a/code/game/machinery/programmable_unloader.dm
+++ b/code/game/machinery/programmable_unloader.dm
@@ -144,7 +144,7 @@
/obj/machinery/programmable/Topic(href, href_list)
if(..())
- return
+ return 1
usr.set_machine(src)
add_fingerprint(usr)
switch(href_list["operation"])
@@ -195,20 +195,7 @@
updateUsrDialog()
return
-/obj/machinery/programmable/attackby(obj/item/I as obj, mob/user as mob)
- if(istype(I,/obj/item/weapon/card/emag))
- if(emagged)
- return
- user << "You swipe the unloader with your card. After a moment's grinding, it beeps in a sinister fashion."
- playsound(src.loc, 'sound/machines/twobeep.ogg', 50, 0)
- emagged = 1
- overrides += emag_overrides
-
- var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
- s.set_up(2, 1, src)
- s.start()
-
- return
+/obj/machinery/programmable/attackby(obj/item/I as obj, mob/user as mob, params)
if(istype(I,/obj/item/weapon/wrench)) // code borrowed from pipe dispenser
if (unwrenched==0)
playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
@@ -281,7 +268,18 @@
I.loc = src
RefreshParts()
+/obj/machinery/programmable/emag_act(user as mob)
+ if(emagged)
+ return
+ user << "You swipe the unloader with your card. After a moment's grinding, it beeps in a sinister fashion."
+ playsound(src.loc, 'sound/machines/twobeep.ogg', 50, 0)
+ emagged = 1
+ overrides += emag_overrides
+ var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
+ s.set_up(2, 1, src)
+ s.start()
+ return
/obj/machinery/programmable/process()
if (!output || !input)
@@ -512,7 +510,7 @@
return
playsound(loc, "punch", 25, 1, -1)
- if(M_HULK in H.mutations) damage += 5
+ if(HULK in H.mutations) damage += 5
if(damage < 5)
visible_message("[H] gives \the [src] a weak punch.")
@@ -582,7 +580,7 @@
..()
resetlists()
- attackby(obj/item/I as obj, mob/user as mob)
+ attackby(obj/item/I as obj, mob/user as mob, params)
if(istype(I,/obj/item/device/multitool))
hacking = (hacking?0:1)
if(hacking)
diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm
index 758b76814ab..8f79948d09c 100644
--- a/code/game/machinery/recharger.dm
+++ b/code/game/machinery/recharger.dm
@@ -13,7 +13,7 @@
var/icon_state_charging = "recharger1"
var/icon_state_idle = "recharger0"
-/obj/machinery/recharger/attackby(obj/item/weapon/G as obj, mob/user as mob)
+/obj/machinery/recharger/attackby(obj/item/weapon/G as obj, mob/user as mob, params)
if(istype(user,/mob/living/silicon))
return
if(istype(G, /obj/item/weapon/gun/energy) || istype(G, /obj/item/weapon/melee/baton) || istype(G,/obj/item/device/laptop))
diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm
index eea611886da..6b26c084997 100644
--- a/code/game/machinery/rechargestation.dm
+++ b/code/game/machinery/rechargestation.dm
@@ -19,17 +19,20 @@
component_parts += new /obj/item/weapon/stock_parts/capacitor(src)
component_parts += new /obj/item/weapon/stock_parts/capacitor(src)
component_parts += new /obj/item/weapon/stock_parts/manipulator(src)
- component_parts += new /obj/item/weapon/cell/high(src)
+ component_parts += new /obj/item/weapon/stock_parts/cell/high(src)
RefreshParts()
build_icon()
/obj/machinery/recharge_station/upgraded/New()
..()
+ component_parts = list()
+ component_parts += new /obj/item/weapon/circuitboard/cyborgrecharger(src)
component_parts += new /obj/item/weapon/stock_parts/capacitor/super(src)
component_parts += new /obj/item/weapon/stock_parts/capacitor/super(src)
component_parts += new /obj/item/weapon/stock_parts/manipulator/pico(src)
- component_parts += new /obj/item/weapon/cell/hyper(src)
+ component_parts += new /obj/item/weapon/stock_parts/cell/hyper(src)
RefreshParts()
+ build_icon()
/obj/machinery/recharge_station/RefreshParts()
recharge_speed = 0
@@ -38,7 +41,7 @@
recharge_speed += C.rating * 100
for(var/obj/item/weapon/stock_parts/manipulator/M in component_parts)
repairs += M.rating - 1
- for(var/obj/item/weapon/cell/C in component_parts)
+ for(var/obj/item/weapon/stock_parts/cell/C in component_parts)
recharge_speed *= C.maxcharge / 10000
/obj/machinery/recharge_station/process()
@@ -76,7 +79,7 @@
else
icon_state = "borgcharger0"
-/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 (istype(P, /obj/item/weapon/screwdriver))
if(src.occupant)
user << "The maintenance panel is locked."
diff --git a/code/game/machinery/recycler.dm b/code/game/machinery/recycler.dm
index 27e46c668b5..3cc7919424b 100644
--- a/code/game/machinery/recycler.dm
+++ b/code/game/machinery/recycler.dm
@@ -31,14 +31,8 @@ var/const/SAFETY_COOLDOWN = 100
update_icon()
-/obj/machinery/recycler/attackby(var/obj/item/I, var/mob/user)
- if(istype(I, /obj/item/weapon/card/emag) && !emagged)
- emagged = 1
- if(safety_mode)
- safety_mode = 0
- update_icon()
- playsound(src.loc, "sparks", 75, 1, -1)
- else if(istype(I, /obj/item/weapon/screwdriver) && emagged)
+/obj/machinery/recycler/attackby(var/obj/item/I, var/mob/user, params)
+ if(istype(I, /obj/item/weapon/screwdriver) && emagged)
emagged = 0
update_icon()
user << "You reset the crusher to its default factory settings."
@@ -46,6 +40,14 @@ var/const/SAFETY_COOLDOWN = 100
..()
return
add_fingerprint(user)
+
+/obj/machinery/recycler/emag_act(user as mob)
+ if(!emagged)
+ emagged = 1
+ if(safety_mode)
+ safety_mode = 0
+ update_icon()
+ playsound(src.loc, "sparks", 75, 1, -1)
/obj/machinery/recycler/update_icon()
..()
@@ -138,7 +140,7 @@ var/const/SAFETY_COOLDOWN = 100
// Remove and recycle the equipped items.
for(var/obj/item/I in L.get_equipped_items())
- if(L.u_equip(I))
+ if(L.unEquip(I))
recycle(I, 0)
// Instantly lie down, also go unconscious from the pain, before you die.
diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm
index d358e39c67f..ed6e201a3ff 100644
--- a/code/game/machinery/requests_console.dm
+++ b/code/game/machinery/requests_console.dm
@@ -55,6 +55,7 @@ var/list/obj/machinery/requests_console/allConsoles = list()
var/dpt = ""; //the department which will be receiving the message
var/priority = -1 ; //Priority of the message being sent
luminosity = 0
+ var/datum/announcement/announcement = new
/obj/machinery/requests_console/power_change()
..()
@@ -70,6 +71,10 @@ var/list/obj/machinery/requests_console/allConsoles = list()
/obj/machinery/requests_console/New()
..()
+
+ announcement.title = "[department] announcement"
+ announcement.newscast = 1
+
name = "[department] Requests Console"
allConsoles += src
//req_console_departments += department
@@ -189,7 +194,7 @@ var/list/obj/machinery/requests_console/allConsoles = list()
else //main menu
screen = 0
- announceAuth = 0
+ reset_announce()
if (newmessagepriority == 1)
dat += text("There are new messages
")
if (newmessagepriority == 2)
@@ -240,17 +245,13 @@ var/list/obj/machinery/requests_console/allConsoles = list()
if("2") priority = 2
else priority = -1
else
- message = ""
- announceAuth = 0
+ reset_announce()
screen = 0
if(href_list["sendAnnouncement"])
if(!announcementConsole) return
- for(var/mob/M in player_list)
- if(!istype(M,/mob/new_player))
- M << "[department] announcement: [message]"
- announceAuth = 0
- message = ""
+ announcement.Announce(message)
+ reset_announce()
screen = 0
if( href_list["department"] && message )
@@ -357,7 +358,7 @@ var/list/obj/machinery/requests_console/allConsoles = list()
return
//err... hacking code, which has no reason for existing... but anyway... it's supposed to unlock priority 3 messanging on that console (EXTREME priority...) the code for that actually exists.
-/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)
@@ -389,8 +390,9 @@ var/list/obj/machinery/requests_console/allConsoles = list()
var/obj/item/weapon/card/id/ID = O
if (access_RC_announce in ID.GetAccess())
announceAuth = 1
+ announcement.announcer = ID.assignment ? "[ID.assignment] [ID.registered_name]" : ID.registered_name
else
- announceAuth = 0
+ reset_announce()
user << "\red You are not authorized to send announcements."
updateUsrDialog()
if (istype(O, /obj/item/weapon/stamp))
@@ -399,3 +401,8 @@ var/list/obj/machinery/requests_console/allConsoles = list()
msgStamped = text("Stamped with the [T.name]")
updateUsrDialog()
return
+
+/obj/machinery/requests_console/proc/reset_announce()
+ announceAuth = 0
+ message = ""
+ announcement.announcer = ""
diff --git a/code/game/machinery/robot_fabricator.dm b/code/game/machinery/robot_fabricator.dm
index 65f31c94c0d..504f7ef8956 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/seed_extractor.dm b/code/game/machinery/seed_extractor.dm
index dbb5a9d2712..f2e45ccdc41 100644
--- a/code/game/machinery/seed_extractor.dm
+++ b/code/game/machinery/seed_extractor.dm
@@ -6,7 +6,7 @@
density = 1
anchored = 1
-obj/machinery/seed_extractor/attackby(var/obj/item/O as obj, var/mob/user as mob)
+obj/machinery/seed_extractor/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
// Fruits and vegetables.
if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/grown) || istype(O, /obj/item/weapon/grown))
diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm
index e6225f648d7..07570114f00 100644
--- a/code/game/machinery/shieldgen.dm
+++ b/code/game/machinery/shieldgen.dm
@@ -25,16 +25,7 @@
if(!height || air_group) return 0
else return ..()
-//Looks like copy/pasted code... I doubt 'need_rebuild' is even used here - Nodrak
-/obj/machinery/shield/proc/update_nearby_tiles(need_rebuild)
- if(!air_master) return 0
-
- air_master.mark_for_update(get_turf(src))
-
- return 1
-
-
-/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
@@ -47,7 +38,7 @@
if (src.health <= 0)
- visible_message("\blue The [src] dissapates")
+ visible_message("\blue The [src] dissipates")
del(src)
return
@@ -60,7 +51,7 @@
src.health -= max_health*0.75 //3/4 health as damage
if(src.health <= 0)
- visible_message("\blue The [src] dissapates")
+ visible_message("\blue The [src] dissipates")
del(src)
return
@@ -72,7 +63,7 @@
health -= Proj.damage
..()
if(health <=0)
- visible_message("\blue The [src] dissapates")
+ visible_message("\blue The [src] dissipates")
del(src)
return
opacity = 1
@@ -121,7 +112,7 @@
//Handle the destruction of the shield
if (src.health <= 0)
- visible_message("\blue The [src] dissapates")
+ visible_message("\blue The [src] dissipates")
del(src)
return
@@ -250,7 +241,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/card/emag))
malfunction = 1
update_icon()
@@ -335,7 +326,7 @@
// var/maxshieldload = 200
var/obj/structure/cable/attached // the attached cable
var/storedpower = 0
- flags = FPRINT | CONDUCT
+ flags = CONDUCT
use_power = 0
/obj/machinery/shieldwallgen/proc/power()
@@ -470,7 +461,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."
@@ -498,8 +489,8 @@
user << "\red Access denied."
else
- src.add_fingerprint(user)
- visible_message("\red The [src.name] has been hit with the [W.name] by [user.name]!")
+ add_fingerprint(user)
+ ..()
/obj/machinery/shieldwallgen/proc/cleanup(var/NSEW)
var/obj/machinery/shieldwall/F
diff --git a/code/game/machinery/slotmachine.dm b/code/game/machinery/slotmachine.dm
index d2d93afba2c..54355179c8e 100644
--- a/code/game/machinery/slotmachine.dm
+++ b/code/game/machinery/slotmachine.dm
@@ -1,3 +1,4 @@
+var/datum/announcement/minor/slotmachine_announcement = new(do_log = 0)
/obj/machinery/slot_machine
name = "Slot Machine"
desc = "Gambling for the antisocial."
@@ -55,7 +56,7 @@
if (roll == 1)
for(var/mob/O in hearers(src, null))
O.show_message(text("[] says, 'JACKPOT! You win [src.money]!'", src), 1)
- command_alert("Congratulations [usr.name] on winning the Jackpot!", "Jackpot Winner")
+ slotmachine_announcement.Announce("Congratulations [usr.name] on winning the Jackpot!", "Jackpot Winner")
usr.mind.initial_account.money += src.money
src.money = 0
else if (roll > 1 && roll <= 10)
diff --git a/code/game/machinery/spaceheater.dm b/code/game/machinery/spaceheater.dm
index 9a6849dcdf4..9877ac6f138 100644
--- a/code/game/machinery/spaceheater.dm
+++ b/code/game/machinery/spaceheater.dm
@@ -5,13 +5,12 @@
icon_state = "sheater0"
name = "space heater"
desc = "Made by Space Amish using traditional space techniques, this heater is guaranteed not to set the station on fire."
- var/obj/item/weapon/cell/cell
+ var/obj/item/weapon/stock_parts/cell/cell
var/on = 0
var/open = 0
var/set_temperature = 50 // in celcius, add T0C for kelvin
var/heating_power = 40000
- flags = FPRINT
New()
@@ -51,15 +50,15 @@
cell.emp_act(severity)
..(severity)
- attackby(obj/item/I, mob/user)
- if(istype(I, /obj/item/weapon/cell))
+ attackby(obj/item/I, mob/user, params)
+ if(istype(I, /obj/item/weapon/stock_parts/cell))
if(open)
if(cell)
user << "There is already a power cell inside."
return
else
// insert cell
- var/obj/item/weapon/cell/C = usr.get_active_hand()
+ var/obj/item/weapon/stock_parts/cell/C = usr.get_active_hand()
if(istype(C))
user.drop_item()
cell = C
@@ -120,8 +119,8 @@
Topic(href, href_list)
- if (usr.stat)
- return
+ if (..())
+ return 1
if ((in_range(src, usr) && istype(src.loc, /turf)) || (istype(usr, /mob/living/silicon)))
usr.set_machine(src)
@@ -144,7 +143,7 @@
if("cellinstall")
if(open && !cell)
- var/obj/item/weapon/cell/C = usr.get_active_hand()
+ var/obj/item/weapon/stock_parts/cell/C = usr.get_active_hand()
if(istype(C))
usr.drop_item()
cell = C
diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm
index 0b81ccabbeb..66c26a8b654 100644
--- a/code/game/machinery/suit_storage_unit.dm
+++ b/code/game/machinery/suit_storage_unit.dm
@@ -153,7 +153,7 @@
/obj/machinery/suit_storage_unit/Topic(href, href_list) //I fucking HATE this proc
if(..())
- return
+ return 1
if ((usr.contents.Find(src) || ((get_dist(src, usr) <= 1) && istype(src.loc, /turf))) || (istype(usr, /mob/living/silicon/ai)))
usr.set_machine(src)
if (href_list["toggleUV"])
@@ -470,7 +470,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)
return
if(istype(I, /obj/item/weapon/screwdriver))
@@ -631,7 +631,7 @@
user << "\blue The console controls are far too complicated for your tiny brain!"
return
-/obj/machinery/suit_cycler/attackby(obj/item/I as obj, mob/user as mob)
+/obj/machinery/suit_cycler/attackby(obj/item/I as obj, mob/user as mob, params)
if(electrified != 0)
if(src.shock(user, 100))
@@ -681,24 +681,6 @@
src.updateUsrDialog()
return
- else if(istype(I,/obj/item/weapon/card/emag))
-
- if(emagged)
- user << "\red The cycler has already been subverted."
- return
-
- var/obj/item/weapon/card/emag/E = I
- src.updateUsrDialog()
- E.uses--
-
- //Clear the access reqs, disable the safeties, and open up all paintjobs.
- user << "\red You run the sequencer across the interface, corrupting the operating protocols."
- departments = list("Engineering","Mining","Medical","Security","Atmos","^%###^%$")
- emagged = 1
- safeties = 0
- req_access = list()
- return
-
else if(istype(I,/obj/item/clothing/head/helmet/space))
if(locked)
@@ -748,6 +730,19 @@
return
..()
+
+/obj/machinery/suit_cycler/emag_act(user as mob)
+ if(emagged)
+ user << "\red The cycler has already been subverted."
+ return
+
+ //Clear the access reqs, disable the safeties, and open up all paintjobs.
+ user << "\red You run the sequencer across the interface, corrupting the operating protocols."
+ departments = list("Engineering","Mining","Medical","Security","Atmos","^%###^%$")
+ emagged = 1
+ safeties = 0
+ req_access = list()
+ return
/obj/machinery/suit_cycler/attack_hand(mob/user as mob)
diff --git a/code/game/machinery/syndicatebeacon.dm b/code/game/machinery/syndicatebeacon.dm
index a4cc791bff9..916ae1a23af 100644
--- a/code/game/machinery/syndicatebeacon.dm
+++ b/code/game/machinery/syndicatebeacon.dm
@@ -39,6 +39,8 @@
onclose(user, "syndbeacon")
Topic(href, href_list)
+ if(..())
+ return 1
if(href_list["betraitor"])
if(charges < 1)
src.updateUsrDialog()
@@ -154,7 +156,7 @@
return
- attackby(obj/item/weapon/W as obj, mob/user as mob)
+ attackby(obj/item/weapon/W as obj, mob/user as mob, params)
if(istype(W,/obj/item/weapon/screwdriver))
if(active)
user << "\red You need to deactivate the beacon first!"
diff --git a/code/game/machinery/syndicatebomb.dm b/code/game/machinery/syndicatebomb.dm
index fcce1742ff9..314f14e0ffa 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))
@@ -138,7 +138,7 @@
var/turf/bombturf = get_turf(src)
var/area/A = get_area(bombturf)
if(payload && !istype(payload, /obj/item/weapon/bombcore/training))
- message_admins("[key_name(user)]? has primed a [name] ([payload]) for detonation at [A.name] (JMP).")
+ msg_admin_attack("[key_name(user)]? has primed a [name] ([payload]) for detonation at [A.name] (JMP).")
log_game("[key_name(user)] has primed a [name] ([payload]) for detonation at [A.name]([bombturf.x],[bombturf.y],[bombturf.z])")
payload.adminlog = "The [src.name] that [key_name(user)] had primed detonated!"
diff --git a/code/game/machinery/telecomms/broadcaster.dm b/code/game/machinery/telecomms/broadcaster.dm
index d2dbe48ce03..995bfe7afac 100644
--- a/code/game/machinery/telecomms/broadcaster.dm
+++ b/code/game/machinery/telecomms/broadcaster.dm
@@ -20,7 +20,6 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
use_power = 1
idle_power_usage = 25
machinetype = 5
- heatgen = 0
delay = 7
circuitboard = "/obj/item/weapon/circuitboard/telecomms/broadcaster"
@@ -59,7 +58,9 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
signal.data["vmask"], signal.data["vmessage"],
signal.data["radio"], signal.data["message"],
signal.data["name"], signal.data["job"],
- signal.data["realname"], signal.data["vname"],, signal.data["compression"], signal.data["level"], signal.frequency)
+ signal.data["realname"], signal.data["vname"],,
+ signal.data["compression"], signal.data["level"], signal.frequency,
+ signal.data["verb"], signal.data["language"] )
/** #### - Simple Broadcast - #### **/
@@ -84,7 +85,8 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
signal.data["vmask"], signal.data["vmessage"],
signal.data["radio"], signal.data["message"],
signal.data["name"], signal.data["job"],
- signal.data["realname"], signal.data["vname"], 4, signal.data["compression"], signal.data["level"], signal.frequency)
+ signal.data["realname"], signal.data["vname"], 4, signal.data["compression"], signal.data["level"], signal.frequency,
+ signal.data["verb"], signal.data["language"])
if(!message_delay)
message_delay = 1
@@ -95,7 +97,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
/* --- Do a snazzy animation! --- */
flick("broadcaster_send", src)
-/obj/machinery/telecomms/broadcaster/Destroy()
+/obj/machinery/telecomms/broadcaster/Del()
// In case message_delay is left on 1, otherwise it won't reset the list and people can't say the same thing twice anymore.
if(message_delay)
message_delay = 0
@@ -117,7 +119,6 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
use_power = 0
idle_power_usage = 0
machinetype = 6
- heatgen = 0
var/intercept = 0 // if nonzero, broadcasts all messages to syndicate channel
/obj/machinery/telecomms/allinone/receive_signal(datum/signal/signal)
@@ -142,19 +143,21 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
var/datum/radio_frequency/connection = signal.data["connection"]
- if(connection.frequency == SYND_FREQ) // if syndicate broadcast, just
+ if(connection.frequency in ANTAG_FREQS) // if antag broadcast, just
Broadcast_Message(signal.data["connection"], signal.data["mob"],
signal.data["vmask"], signal.data["vmessage"],
signal.data["radio"], signal.data["message"],
signal.data["name"], signal.data["job"],
- signal.data["realname"], signal.data["vname"],, signal.data["compression"], list(0), connection.frequency)
+ signal.data["realname"], signal.data["vname"],, signal.data["compression"], list(0), connection.frequency,
+ signal.data["verb"], signal.data["language"])
else
if(intercept)
Broadcast_Message(signal.data["connection"], signal.data["mob"],
signal.data["vmask"], signal.data["vmessage"],
signal.data["radio"], signal.data["message"],
signal.data["name"], signal.data["job"],
- signal.data["realname"], signal.data["vname"], 3, signal.data["compression"], list(0), connection.frequency)
+ signal.data["realname"], signal.data["vname"], 3, signal.data["compression"], list(0), connection.frequency,
+ signal.data["verb"], signal.data["language"])
@@ -218,7 +221,8 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
/proc/Broadcast_Message(var/datum/radio_frequency/connection, var/mob/M,
var/vmask, var/vmessage, var/obj/item/device/radio/radio,
var/message, var/name, var/job, var/realname, var/vname,
- var/data, var/compression, var/list/level, var/freq)
+ var/data, var/compression, var/list/level, var/freq, var/verbage = "says", var/datum/language/speaking = null)
+
/* ###### Prepare the radio connection ###### */
@@ -246,16 +250,14 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
if(R.receive_range(display_freq, level) > -1)
radios += R
- // --- Broadcast to syndicate radio! ---
+ // --- Broadcast to antag radios! ---
else if(data == 3)
-
- var/datum/radio_frequency/syndicateconnection = radio_controller.return_frequency(SYND_FREQ)
-
- for (var/obj/item/device/radio/R in syndicateconnection.devices["[RADIO_CHAT]"])
-
- if(R.receive_range(SYND_FREQ, level) > -1)
- radios += R
+ for(var/antag_freq in ANTAG_FREQS)
+ var/datum/radio_frequency/antag_connection = radio_controller.return_frequency(antag_freq)
+ for (var/obj/item/device/radio/R in antag_connection.devices["[RADIO_CHAT]"])
+ if(R.receive_range(antag_freq, level) > -1)
+ radios += R
// --- Broadcast to ALL radio devices ---
@@ -283,6 +285,8 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
/* --- Loop through the receivers and categorize them --- */
+ if (R.client && !(R.client.prefs.toggles & CHAT_RADIO)) //Adminning with 80 people on can be fun when you're trying to talk and all you can hear is radios.
+ continue
if(istype(R, /mob/new_player)) // we don't want new players to hear messages. rare but generates runtimes.
continue
@@ -324,88 +328,17 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
if (length(heard_masked) || length(heard_normal) || length(heard_voice) || length(heard_garbled) || length(heard_gibberish))
/* --- Some miscellaneous variables to format the string output --- */
- var/part_a = "" // goes in the actual output
- var/freq_text // the name of the channel
-
- // --- Set the name of the channel ---
- switch(display_freq)
-
- if(SYND_FREQ)
- freq_text = "#unkn"
- if(COMM_FREQ)
- freq_text = "Command"
- if(1351)
- freq_text = "Science"
- if(1355)
- freq_text = "Medical"
- if(1357)
- freq_text = "Engineering"
- if(1359)
- freq_text = "Security"
- if(1347)
- freq_text = "Supply"
- if(1349)
- freq_text = "Service"
- if(1441)
- freq_text = "Special Ops"
- if(1443)
- freq_text = "Response Team"
- if(1447)
- freq_text = "AI Private"
- //There's probably a way to use the list var of channels in code\game\communications.dm to make the dept channels non-hardcoded, but I wasn't in an experimentive mood. --NEO
-
-
- // --- If the frequency has not been assigned a name, just use the frequency as the name ---
-
- if(!freq_text)
- freq_text = format_frequency(display_freq)
-
- // --- Some more pre-message formatting ---
+ var/freq_text = get_frequency_name(display_freq)
var/part_b_extra = ""
if(data == 3) // intercepted radio message
part_b_extra = " (Intercepted)"
- var/part_b = " \icon[radio]\[[freq_text]\][part_b_extra] " // Tweaked for security headsets -- TLE
+ var/part_a = "\icon[radio]\[[freq_text]\][part_b_extra] " // goes in the actual output
+
+ // --- Some more pre-message formatting ---
+ var/part_b = " " // Tweaked for security headsets -- TLE
var/part_c = ""
- // syndies!
- if (display_freq == SYND_FREQ)
- part_a = ""
-
- // centcomm channels (deathsquid and ert)
- else if (display_freq in CENT_FREQS)
- part_a = ""
-
- // command channel
- else if (display_freq == COMM_FREQ)
- part_a = ""
-
- // AI private channel
- else if (display_freq == 1447)
- part_a = ""
-
- // department radio formatting (poorly optimized, ugh)
- else if (display_freq == SEC_FREQ)
- part_a = ""
-
- else if (display_freq == ENG_FREQ)
- part_a = ""
-
- else if (display_freq == SCI_FREQ)
- part_a = ""
-
- else if (display_freq == MED_FREQ)
- part_a = ""
-
- else if (display_freq == SUP_FREQ) // cargo
- part_a = ""
-
- else if (display_freq == SRV_FREQ) // cargo
- part_a = ""
- // If all else fails and it's a dept_freq, color me purple!
- else if (display_freq in DEPT_FREQS)
- part_a = ""
-
// --- Filter the message; place it in quotes apply a verb ---
@@ -424,133 +357,67 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
//BR.messages_admin += blackbox_admin_msg
if(istype(blackbox))
switch(display_freq)
- if(1459)
+ if(PUB_FREQ)
blackbox.msg_common += blackbox_msg
- if(1351)
+ if(SCI_FREQ)
blackbox.msg_science += blackbox_msg
- if(1353)
+ if(COMM_FREQ)
blackbox.msg_command += blackbox_msg
- if(1355)
+ if(MED_FREQ)
blackbox.msg_medical += blackbox_msg
- if(1357)
+ if(ENG_FREQ)
blackbox.msg_engineering += blackbox_msg
- if(1359)
+ if(SEC_FREQ)
blackbox.msg_security += blackbox_msg
- if(1441)
+ if(DTH_FREQ)
blackbox.msg_deathsquad += blackbox_msg
- if(1213)
+ if(SYND_FREQ)
blackbox.msg_syndicate += blackbox_msg
- if(1347)
+ if(SUP_FREQ)
blackbox.msg_cargo += blackbox_msg
- if(1349)
+ if(SRV_FREQ)
blackbox.msg_service += blackbox_msg
else
blackbox.messages += blackbox_msg
//End of research and feedback code.
- var/aitrack = ""
- var/aiopen = ""
/* ###### Send the message ###### */
/* --- Process all the mobs that heard a masked voice (understood) --- */
if (length(heard_masked))
- var/N = name
- var/J = job
- var/rendered = "[part_a][N][part_b][quotedmsg][part_c]"
for (var/mob/R in heard_masked)
- aitrack = ""
- aiopen = "\[OPEN\] "
- if(data == 4)
- aitrack = ""
-
- if(istype(R, /mob/living/silicon/ai))
- R.show_message("[part_a][aitrack][N] ([J]) [aiopen][part_b][quotedmsg][part_c]", 2)
- else
- R.show_message(rendered, 2)
+ R.hear_radio(message,verbage, speaking, part_a, part_b, M, 0, name)
/* --- Process all the mobs that heard the voice normally (understood) --- */
if (length(heard_normal))
- var/rendered = "[part_a][realname][part_b][quotedmsg][part_c]"
-
for (var/mob/R in heard_normal)
- aitrack = ""
- aiopen = "\[OPEN\] "
- if(data == 4)
- aitrack = ""
-
- if(istype(R, /mob/living/silicon/ai))
- R.show_message("[part_a][aitrack][realname] ([job]) [aiopen][part_b][quotedmsg][part_c]", 2)
- else
- R.show_message(rendered, 2)
+ R.hear_radio(message, verbage, speaking, part_a, part_b, M, 0, realname)
/* --- Process all the mobs that heard the voice normally (did not understand) --- */
if (length(heard_voice))
- var/rendered = "[part_a][vname][part_b][vmessage][part_c]"
-
for (var/mob/R in heard_voice)
- aitrack = ""
- aiopen = "\[OPEN\] "
- if(data == 4)
- aitrack = ""
-
-
- if(istype(R, /mob/living/silicon/ai))
- R.show_message("[part_a][aitrack][vname] ([job]) [aiopen][part_b][vmessage]][part_c]", 2)
- else
- R.show_message(rendered, 2)
+ R.hear_radio(message,verbage, speaking, part_a, part_b, M,0, vname)
/* --- Process all the mobs that heard a garbled voice (did not understand) --- */
// Displays garbled message (ie "f*c* **u, **i*er!")
if (length(heard_garbled))
- if(M)
- quotedmsg = M.say_quote(stars(message))
- else
- quotedmsg = stars(quotedmsg)
-
- var/rendered = "[part_a][vname][part_b][quotedmsg][part_c]"
-
for (var/mob/R in heard_garbled)
- aitrack = ""
- aiopen = "\[OPEN\] "
- if(data == 4)
- aitrack = ""
-
-
- if(istype(R, /mob/living/silicon/ai))
- R.show_message("[part_a][aitrack][vname][aiopen][part_b][quotedmsg][part_c]", 2)
- else
- R.show_message(rendered, 2)
+ R.hear_radio(message, verbage, speaking, part_a, part_b, M, 1, vname)
/* --- Complete gibberish. Usually happens when there's a compressed message --- */
if (length(heard_gibberish))
- if(M)
- quotedmsg = M.say_quote(Gibberish(message, compression + 50))
- else
- quotedmsg = Gibberish(quotedmsg, compression + 50)
-
- var/rendered = "[part_a][Gibberish(name, compression + 50)][part_b][quotedmsg][part_c]"
-
for (var/mob/R in heard_gibberish)
- aitrack = ""
- aiopen = "\[OPEN\] "
- if(data == 4)
- aitrack = ""
-
-
- if(istype(R, /mob/living/silicon/ai))
- R.show_message("[part_a][aitrack][Gibberish(realname, compression + 50)] ([Gibberish(job, compression + 50)]) [aiopen][part_b][quotedmsg][part_c]", 2)
- else
- R.show_message(rendered, 2)
-
+ R.hear_radio(message, verbage, speaking, part_a, part_b, M, 1)
+ return 1
/proc/Broadcast_SimpleMessage(var/source, var/frequency, var/text, var/data, var/mob/M, var/compression, var/level)
@@ -588,15 +455,15 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
receive |= R.send_hear(display_freq)
- // --- Broadcast to syndicate radio! ---
+ // --- Broadcast to antag radios! ---
else if(data == 3)
- var/datum/radio_frequency/syndicateconnection = radio_controller.return_frequency(SYND_FREQ)
-
- for (var/obj/item/device/radio/R in syndicateconnection.devices["[RADIO_CHAT]"])
- var/turf/position = get_turf(R)
- if(position && position.z == level)
- receive |= R.send_hear(SYND_FREQ)
+ for(var/freq in ANTAG_FREQS)
+ var/datum/radio_frequency/antag_connection = radio_controller.return_frequency(freq)
+ for (var/obj/item/device/radio/R in antag_connection.devices["[RADIO_CHAT]"])
+ var/turf/position = get_turf(R)
+ if(position && position.z == level)
+ receive |= R.send_hear(freq)
// --- Broadcast to ALL radio devices ---
@@ -621,6 +488,8 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
/* --- Loop through the receivers and categorize them --- */
+ if (R.client && !(R.client.prefs.toggles & CHAT_RADIO)) //Adminning with 80 people on can be fun when you're trying to talk and all you can hear is radios.
+ continue
// --- Check for compression ---
@@ -648,34 +517,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
/* --- Some miscellaneous variables to format the string output --- */
var/part_a = "" // goes in the actual output
- var/freq_text // the name of the channel
-
- // --- Set the name of the channel ---
- switch(display_freq)
-
- if(SYND_FREQ)
- freq_text = "#unkn"
- if(COMM_FREQ)
- freq_text = "Command"
- if(1351)
- freq_text = "Science"
- if(1355)
- freq_text = "Medical"
- if(1357)
- freq_text = "Engineering"
- if(1359)
- freq_text = "Security"
- if(1347)
- freq_text = "Supply"
- if(1349)
- freq_text = "Service"
- //There's probably a way to use the list var of channels in code\game\communications.dm to make the dept channels non-hardcoded, but I wasn't in an experimentive mood. --NEO
-
-
- // --- If the frequency has not been assigned a name, just use the frequency as the name ---
-
- if(!freq_text)
- freq_text = format_frequency(display_freq)
+ var/freq_text = get_frequency_name(display_freq)
// --- Some more pre-message formatting ---
@@ -689,7 +531,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
var/part_b = " \icon[radio]\[[freq_text]\][part_b_extra] " // Tweaked for security headsets -- TLE
var/part_c = ""
- if (display_freq==SYND_FREQ)
+ if (display_freq in ANTAG_FREQS)
part_a = ""
else if (display_freq==COMM_FREQ)
part_a = ""
@@ -705,25 +547,25 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
//BR.messages_admin += blackbox_admin_msg
if(istype(blackbox))
switch(display_freq)
- if(1459)
+ if(PUB_FREQ)
blackbox.msg_common += blackbox_msg
- if(1351)
+ if(SCI_FREQ)
blackbox.msg_science += blackbox_msg
- if(1353)
+ if(COMM_FREQ)
blackbox.msg_command += blackbox_msg
- if(1355)
+ if(MED_FREQ)
blackbox.msg_medical += blackbox_msg
- if(1357)
+ if(ENG_FREQ)
blackbox.msg_engineering += blackbox_msg
- if(1359)
+ if(SEC_FREQ)
blackbox.msg_security += blackbox_msg
- if(1441)
+ if(DTH_FREQ)
blackbox.msg_deathsquad += blackbox_msg
- if(1213)
+ if(SYND_FREQ)
blackbox.msg_syndicate += blackbox_msg
- if(1347)
+ if(SUP_FREQ)
blackbox.msg_cargo += blackbox_msg
- if(1349)
+ if(SRV_FREQ)
blackbox.msg_service += blackbox_msg
else
blackbox.messages += blackbox_msg
@@ -767,7 +609,7 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
var/turf/position = get_turf(src)
return (position.z in signal.data["level"] && signal.data["done"])
-/atom/proc/telecomms_process()
+/atom/proc/telecomms_process(var/do_sleep = 1)
// First, we want to generate a new radio signal
var/datum/signal/signal = new
@@ -785,13 +627,14 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
"done" = 0,
"level" = pos.z // The level it is being broadcasted at.
)
- signal.frequency = 1459// Common channel
+ signal.frequency = PUB_FREQ// Common channel
//#### Sending the signal to all subspace receivers ####//
for(var/obj/machinery/telecomms/receiver/R in telecomms_list)
R.receive_signal(signal)
- sleep(rand(10,25))
+ if(do_sleep)
+ sleep(rand(10,25))
//world.log << "Level: [signal.data["level"]] - Done: [signal.data["done"]]"
diff --git a/code/game/machinery/telecomms/logbrowser.dm b/code/game/machinery/telecomms/logbrowser.dm
index 9bd46e57ce7..2fb2cd3cc69 100644
--- a/code/game/machinery/telecomms/logbrowser.dm
+++ b/code/game/machinery/telecomms/logbrowser.dm
@@ -217,7 +217,7 @@
updateUsrDialog()
return
- attackby(var/obj/item/weapon/D as obj, var/mob/user as mob)
+ attackby(var/obj/item/weapon/D as obj, var/mob/user as mob, params)
if(istype(D, /obj/item/weapon/screwdriver))
playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
if(do_after(user, 20))
@@ -244,9 +244,11 @@
A.icon_state = "4"
A.anchored = 1
del(src)
- else if(istype(D, /obj/item/weapon/card/emag) && !emagged)
+ src.updateUsrDialog()
+ return
+
+ emag_act(user as mob)
+ if(!emagged)
playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1)
emagged = 1
user << "\blue You you disable the security protocols"
- src.updateUsrDialog()
- return
diff --git a/code/game/machinery/telecomms/machine_interactions.dm b/code/game/machinery/telecomms/machine_interactions.dm
index af05db47db6..55a4e604e0f 100644
--- a/code/game/machinery/telecomms/machine_interactions.dm
+++ b/code/game/machinery/telecomms/machine_interactions.dm
@@ -13,7 +13,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/telecomms/presets.dm b/code/game/machinery/telecomms/presets.dm
index c1bc006e4b3..5d14fc2f9bc 100644
--- a/code/game/machinery/telecomms/presets.dm
+++ b/code/game/machinery/telecomms/presets.dm
@@ -29,7 +29,7 @@
hide = 1
toggled = 1
//anchored = 1
- //use_power = 0
+ use_power = 0
//idle_power_usage = 0
heatgen = 0
autolinkers = list("c_relay")
@@ -42,6 +42,13 @@
autolinkers = list("hub", "relay", "c_relay", "s_relay", "m_relay", "r_relay", "science", "medical",
"supply", "service", "common", "command", "engineering", "security",
"receiverA", "receiverB", "broadcasterA", "broadcasterB")
+
+/obj/machinery/telecomms/hub/preset_cent
+ id = "CentComm Hub"
+ network = "tcommsat"
+ use_power = 0
+ autolinkers = list("hub_cent", "c_relay", "s_relay", "m_relay", "r_relay",
+ "centcomm", "receiverCent", "broadcasterCent")
//Receivers
@@ -67,7 +74,13 @@
for(var/i = 1441, i < 1489, i += 2)
freq_listening |= i
..()
-
+
+/obj/machinery/telecomms/receiver/preset_cent
+ id = "CentComm Receiver"
+ network = "tcommsat"
+ use_power = 0
+ autolinkers = list("receiverCent")
+ freq_listening = list(ERT_FREQ, DTH_FREQ)
//Buses
@@ -99,6 +112,13 @@
for(var/i = 1441, i < 1489, i += 2)
freq_listening |= i
..()
+
+/obj/machinery/telecomms/bus/preset_cent
+ id = "CentComm Bus"
+ network = "tcommsat"
+ use_power = 0
+ freq_listening = list(ERT_FREQ, DTH_FREQ)
+ autolinkers = list("processorCent", "centcomm")
//Processors
@@ -121,6 +141,12 @@
id = "Processor 4"
network = "tcommsat"
autolinkers = list("processor4")
+
+/obj/machinery/telecomms/processor/preset_cent
+ id = "CentComm Processor"
+ network = "tcommsat"
+ use_power = 0
+ autolinkers = list("processorCent")
//Servers
@@ -175,6 +201,11 @@
freq_listening = list(1359)
autolinkers = list("security")
+/obj/machinery/telecomms/server/presets/centcomm
+ id = "CentComm Server"
+ freq_listening = list(ERT_FREQ, DTH_FREQ)
+ use_power = 0
+ autolinkers = list("centcomm")
//Broadcasters
@@ -191,3 +222,9 @@
id = "Broadcaster B"
network = "tcommsat"
autolinkers = list("broadcasterB")
+
+/obj/machinery/telecomms/broadcaster/preset_cent
+ id = "CentComm Broadcaster"
+ network = "tcommsat"
+ use_power = 0
+ autolinkers = list("broadcasterCent")
\ No newline at end of file
diff --git a/code/game/machinery/telecomms/telemonitor.dm b/code/game/machinery/telecomms/telemonitor.dm
index 995d0fc239f..23969177606 100644
--- a/code/game/machinery/telecomms/telemonitor.dm
+++ b/code/game/machinery/telecomms/telemonitor.dm
@@ -126,7 +126,7 @@
updateUsrDialog()
return
- attackby(var/obj/item/weapon/D as obj, var/mob/user as mob)
+ attackby(var/obj/item/weapon/D as obj, var/mob/user as mob, params)
if(istype(D, /obj/item/weapon/screwdriver))
playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
if(do_after(user, 20))
@@ -153,9 +153,11 @@
A.icon_state = "4"
A.anchored = 1
del(src)
- else if(istype(D, /obj/item/weapon/card/emag) && !emagged)
- playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1)
- emagged = 1
- user << "\blue You you disable the security protocols"
src.updateUsrDialog()
return
+
+ emag_act(user as mob)
+ if(!emagged)
+ playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1)
+ emagged = 1
+ user << "\blue You you disable the security protocols"
\ No newline at end of file
diff --git a/code/game/machinery/telecomms/traffic_control.dm b/code/game/machinery/telecomms/traffic_control.dm
index fed56a35124..889623b60e6 100644
--- a/code/game/machinery/telecomms/traffic_control.dm
+++ b/code/game/machinery/telecomms/traffic_control.dm
@@ -206,7 +206,7 @@
return
-/obj/machinery/computer/telecomms/traffic/attackby(var/obj/item/weapon/D as obj, var/mob/user as mob)
+/obj/machinery/computer/telecomms/traffic/attackby(var/obj/item/weapon/D as obj, var/mob/user as mob, params)
if(istype(D, /obj/item/weapon/screwdriver))
playsound(get_turf(src), 'sound/items/Screwdriver.ogg', 50, 1)
if(do_after(user, 20))
@@ -233,12 +233,14 @@
A.icon_state = "4"
A.anchored = 1
del(src)
- else if(istype(D, /obj/item/weapon/card/emag) && !emagged)
+ src.updateUsrDialog()
+ return
+
+/obj/machinery/computer/telecomms/traffic/emag_act(user as mob)
+ if(!emagged)
playsound(get_turf(src), 'sound/effects/sparks4.ogg', 75, 1)
emagged = 1
user << "\blue You you disable the security protocols"
- src.updateUsrDialog()
- return
/obj/machinery/computer/telecomms/traffic/proc/canAccess(var/mob/user)
if(issilicon(user) || in_range(user, src))
diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm
index 9e18e2ce265..9d30d7207af 100644
--- a/code/game/machinery/teleporter.dm
+++ b/code/game/machinery/teleporter.dm
@@ -30,20 +30,13 @@
break
return power_station
-/obj/machinery/computer/teleporter/attackby(I as obj, mob/living/user as mob)
- if(istype(I,/obj/item/weapon/card/emag)) // If hit by an emag.
- var/obj/item/weapon/card/emag/E = I
- if(!emagged)
- if(E.uses)
- E.uses--
- emagged = 1
- user << "\blue The teleporter can now lock on to Syndicate beacons!"
- else
- ui_interact(user)
- else if(istype(I, /obj/item/device/gps))
+/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)))
- user.before_take_item(L)
+ if(!user.unEquip(L))
+ user << "\the [I] is stuck to your hand, you cannot put it in \the [src]"
+ return
L.loc = src
locked = L
user << "You insert the GPS device into the [name]'s slot."
@@ -53,6 +46,13 @@
else
..()
return
+
+/obj/machinery/computer/teleporter/emag_act(user as mob)
+ if(!emagged)
+ emagged = 1
+ user << "\blue The teleporter can now lock on to Syndicate beacons!"
+ else
+ ui_interact(user)
/obj/machinery/computer/teleporter/attack_paw(mob/user)
usr << "You are too primitive to use this computer."
@@ -80,7 +80,8 @@
data["calibrated"] = null
data["accurate"] = null
data["regime"] = regime_set
- data["target"] = (!target) ? "None" : get_area(target)
+ var/area/targetarea = get_area(target)
+ data["target"] = (!target) ? "None" : sanitize(targetarea.name)
data["calibrating"] = calibrating
data["locked"] = locked
@@ -93,7 +94,7 @@
/obj/machinery/computer/teleporter/Topic(href, href_list)
if(..())
- return
+ return 1
if(href_list["eject"])
eject()
@@ -179,7 +180,7 @@
var/turf/T = get_turf(R)
if (!T)
continue
- if(T.z == 2 || T.z > 7)
+ if((T.z in config.admin_levels) || T.z > 7)
continue
if(R.syndicate == 1 && emagged == 0)
continue
@@ -200,7 +201,7 @@
continue
var/turf/T = get_turf(M)
if(!T) continue
- if(T.z == 2) continue
+ if((T.z in config.admin_levels)) continue
var/tmpname = M.real_name
if(areaindex[tmpname])
tmpname = "[tmpname] ([++areaindex[tmpname]])"
@@ -222,7 +223,7 @@
var/turf/T = get_turf(R)
if (!T || !R.teleporter_hub || !R.teleporter_console)
continue
- if(T.z == 2 || T.z > 7)
+ if((T.z in config.admin_levels) || T.z > 7)
continue
var/tmpname = T.loc.name
if(areaindex[tmpname])
@@ -279,7 +280,7 @@
component_parts += new /obj/item/bluespace_crystal/artificial(null)
component_parts += new /obj/item/weapon/stock_parts/matter_bin(null)
RefreshParts()
-
+
/obj/machinery/teleport/hub/upgraded/New()
..()
component_parts = list()
@@ -328,7 +329,7 @@
//--FalseIncarnate
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
@@ -413,7 +414,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/turret_control.dm b/code/game/machinery/turret_control.dm
new file mode 100644
index 00000000000..83bd5b5217d
--- /dev/null
+++ b/code/game/machinery/turret_control.dm
@@ -0,0 +1,221 @@
+////////////////////////
+//Turret Control Panel//
+////////////////////////
+
+/area
+ // Turrets use this list to see if individual power/lethal settings are allowed
+ var/list/turret_controls = list()
+
+/obj/machinery/turretid
+ name = "turret control panel"
+ desc = "Used to control a room's automated defenses."
+ icon = 'icons/obj/machines/turret_control.dmi'
+ icon_state = "control_standby"
+ anchored = 1
+ density = 0
+ var/enabled = 0
+ var/lethal = 0
+ var/locked = 1
+ var/area/control_area //can be area name, path or nothing.
+
+ var/check_arrest = 1 //checks if the perp is set to arrest
+ var/check_records = 1 //checks if a security record exists at all
+ var/check_weapons = 0 //checks if it can shoot people that have a weapon they aren't authorized to have
+ var/check_access = 1 //if this is active, the turret shoots everything that does not meet the access requirements
+ var/check_anomalies = 1 //checks if it can shoot at unidentified lifeforms (ie xenos)
+ var/check_synth = 0 //if active, will shoot at anything not an AI or cyborg
+ var/ailock = 0 //Silicons cannot use this
+
+ req_access = list(access_ai_upload)
+
+/obj/machinery/turretid/stun
+ enabled = 1
+ icon_state = "control_stun"
+
+/obj/machinery/turretid/lethal
+ enabled = 1
+ lethal = 1
+ icon_state = "control_kill"
+
+/obj/machinery/turretid/Del()
+ if(control_area)
+ var/area/A = control_area
+ if(A && istype(A))
+ A.turret_controls -= src
+ ..()
+
+/obj/machinery/turretid/initialize()
+ if(!control_area)
+ var/area/CA = get_area(src)
+ control_area = CA.master
+ else if(istext(control_area))
+ for(var/area/A in world)
+ if(A.name && A.name==control_area)
+ control_area = A.master
+ break
+
+ if(control_area)
+ var/area/A = control_area
+ if(istype(A))
+ A.turret_controls += src
+ else
+ control_area = null
+
+ power_change() //Checks power and initial settings
+ return
+
+/obj/machinery/turretid/proc/isLocked(mob/user)
+ if(ailock && (isrobot(user) || isAI(user)))
+ user << "There seems to be a firewall preventing you from accessing this device."
+ return 1
+
+ if(locked && !(isrobot(user) || isAI(user)))
+ user << "Access denied."
+ return 1
+
+ return 0
+
+/obj/machinery/turretid/attackby(obj/item/weapon/W, mob/user)
+ if(stat & BROKEN)
+ return
+
+ if(istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda))
+ if(src.allowed(usr))
+ if(emagged)
+ user << "The turret control is unresponsive."
+ else
+ locked = !locked
+ user << "You [ locked ? "lock" : "unlock"] the panel."
+ return
+ return ..()
+
+/obj/machinery/turretid/emag_act(user as mob)
+ if(!emagged)
+ user << "You short out the turret controls' access analysis module."
+ emagged = 1
+ locked = 0
+ ailock = 0
+ return
+
+/obj/machinery/turretid/attack_ai(mob/user as mob)
+ if(isLocked(user))
+ return
+
+ ui_interact(user)
+
+/obj/machinery/turretid/attack_hand(mob/user as mob)
+ if(isLocked(user))
+ return
+
+ ui_interact(user)
+
+/obj/machinery/turretid/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
+ var/data[0]
+ data["access"] = !isLocked(user)
+ data["locked"] = locked
+ data["enabled"] = enabled
+ data["is_lethal"] = 1
+ data["lethal"] = lethal
+
+ if(data["access"])
+ var/settings[0]
+ settings[++settings.len] = list("category" = "Neutralize All Non-Synthetics", "setting" = "check_synth", "value" = check_synth)
+ settings[++settings.len] = list("category" = "Check Weapon Authorization", "setting" = "check_weapons", "value" = check_weapons)
+ settings[++settings.len] = list("category" = "Check Security Records", "setting" = "check_records", "value" = check_records)
+ settings[++settings.len] = list("category" = "Check Arrest Status", "setting" = "check_arrest", "value" = check_arrest)
+ settings[++settings.len] = list("category" = "Check Access Authorization", "setting" = "check_access", "value" = check_access)
+ settings[++settings.len] = list("category" = "Check Misc. Lifeforms", "setting" = "check_anomalies", "value" = check_anomalies)
+ data["settings"] = settings
+
+ ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
+ if (!ui)
+ ui = new(user, src, ui_key, "turret_control.tmpl", "Turret Controls", 500, 300)
+ ui.set_initial_data(data)
+ ui.open()
+ ui.set_auto_update(1)
+
+/obj/machinery/turretid/Topic(href, href_list, var/nowindow = 0)
+ if(..())
+ return 1
+
+ if(isLocked(usr))
+ return 1
+
+ if(href_list["command"] && href_list["value"])
+ var/value = text2num(href_list["value"])
+ if(href_list["command"] == "enable")
+ enabled = value
+ else if(href_list["command"] == "lethal")
+ lethal = value
+ else if(href_list["command"] == "check_synth")
+ check_synth = value
+ else if(href_list["command"] == "check_weapons")
+ check_weapons = value
+ else if(href_list["command"] == "check_records")
+ check_records = value
+ else if(href_list["command"] == "check_arrest")
+ check_arrest = value
+ else if(href_list["command"] == "check_access")
+ check_access = value
+ else if(href_list["command"] == "check_anomalies")
+ check_anomalies = value
+
+ updateTurrets()
+ return 1
+
+/obj/machinery/turretid/proc/updateTurrets()
+ var/datum/turret_checks/TC = new
+ TC.enabled = enabled
+ TC.lethal = lethal
+ TC.check_synth = check_synth
+ TC.check_access = check_access
+ TC.check_records = check_records
+ TC.check_arrest = check_arrest
+ TC.check_weapons = check_weapons
+ TC.check_anomalies = check_anomalies
+ TC.ailock = ailock
+
+ if(istype(control_area))
+ for(var/area/sub_area in control_area.related)
+ for (var/obj/machinery/porta_turret/aTurret in sub_area)
+ aTurret.setState(TC)
+
+ update_icon()
+
+/obj/machinery/turretid/power_change()
+ ..()
+ updateTurrets()
+ update_icon()
+
+/obj/machinery/turretid/update_icon()
+ ..()
+ if(stat & NOPOWER)
+ icon_state = "control_off"
+ else if (enabled)
+ if (lethal)
+ icon_state = "control_kill"
+ else
+ icon_state = "control_stun"
+ else
+ icon_state = "control_standby"
+
+/obj/machinery/turretid/emp_act(severity)
+ if(enabled)
+ //if the turret is on, the EMP no matter how severe disables the turret for a while
+ //and scrambles its settings, with a slight chance of having an emag effect
+
+ check_arrest = pick(0, 1)
+ check_records = pick(0, 1)
+ check_weapons = pick(0, 1)
+ check_access = pick(0, 0, 0, 0, 1) // check_access is a pretty big deal, so it's least likely to get turned on
+ check_anomalies = pick(0, 1)
+
+ enabled=0
+ updateTurrets()
+
+ sleep(rand(60,600))
+ if(!enabled)
+ enabled=1
+ updateTurrets()
+
+ ..()
diff --git a/code/game/machinery/turrets.dm b/code/game/machinery/turrets.dm
index 507d0c1dfe7..171586d255a 100644
--- a/code/game/machinery/turrets.dm
+++ b/code/game/machinery/turrets.dm
@@ -299,7 +299,8 @@
/obj/machinery/turret/attackby(obj/item/weapon/W, mob/user)//I can't believe no one added this before/N
..()
- playsound(get_turf(src), 'sound/weapons/smash.ogg', 60, 1)
+ user.changeNext_move(CLICK_CD_MELEE)
+ playsound(src.loc, 'sound/weapons/smash.ogg', 60, 1)
src.spark_system.start()
src.health -= W.force * 0.5
if (src.health <= 0)
@@ -330,127 +331,31 @@
spawn(13)
qdel(src)
-/obj/machinery/turretid
- name = "turret deactivation control"
- icon = 'icons/obj/device.dmi'
- icon_state = "control_stun"
- anchored = 1
- density = 0
- var/enabled = 1
- var/lethal = 0
- var/locked = 1
- var/control_area //can be area name, path or nothing.
- var/ailock = 0 // AI cannot use this
- req_access = list(access_ai_upload)
-
-/obj/machinery/turretid/New()
- ..()
- if(!control_area)
- var/area/CA = get_area(src)
- if(CA.master && CA.master != CA)
- control_area = CA.master
- else
- control_area = CA
- else if(istext(control_area))
- for(var/area/A in world)
- if(A.name && A.name==control_area)
- control_area = A
- break
- //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)
- if(stat & BROKEN) return
- if (istype(user, /mob/living/silicon))
- return src.attack_hand(user)
-
- if (istype(W, /obj/item/weapon/card/emag) && !emagged)
- user << "\red You short out the turret controls' access analysis module."
- emagged = 1
- locked = 0
- if(user.machine==src)
- src.attack_hand(user)
-
- return
-
- else if( get_dist(src, user) == 0 ) // trying to unlock the interface
- if (src.allowed(usr))
- if(emagged)
- user << "The turret control is unresponsive."
- return
-
- locked = !locked
- user << "You [ locked ? "lock" : "unlock"] the panel."
- if (locked)
- if (user.machine==src)
- user.unset_machine()
- user << browse(null, "window=turretid")
- else
- if (user.machine==src)
- src.attack_hand(user)
- else
- user << "Access denied."
-
-/obj/machinery/turretid/attack_ai(mob/user as mob)
- if(!ailock)
- return attack_hand(user)
- else
- user << "There seems to be a firewall preventing you from accessing this device."
-
-/obj/machinery/turretid/attack_hand(mob/user as mob)
- if ( get_dist(src, user) > 0 )
- if ( !issilicon(user) )
- user << "You are too far away."
- user.unset_machine()
- user << browse(null, "window=turretid;size=500x250")
- return
-
- user.set_machine(src)
- var/loc = src.loc
- if (istype(loc, /turf))
- loc = loc:loc
- if (!istype(loc, /area))
- user << text("Turret badly positioned - loc.loc is [].", loc)
- return
- var/area/area = loc
- var/t = ""
-
- if(src.locked && (!istype(user, /mob/living/silicon)))
- t += "Swipe ID card to unlock interface
"
- else
- if (!istype(user, /mob/living/silicon))
- t += "Swipe ID card to lock interface
"
- t += text("Turrets [] - []?
\n", src.enabled?"activated":"deactivated", src, src.enabled?"Disable":"Enable")
- t += text("Currently set for [] - Change to []?
\n", src.lethal?"lethal":"stun repeatedly", src, src.lethal?"Stun repeatedly":"Lethal")
-
- //user << browse(t, "window=turretid;size=500x250")
- //onclose(user, "turretid")
- var/datum/browser/popup = new(user, "turretid", "Turret Control Panel ([area.name])", 500, 250)
- popup.set_content(t)
- popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state))
- popup.open()
-
-
+
/obj/machinery/turret/attack_animal(mob/living/simple_animal/M as mob)
+ M.changeNext_move(CLICK_CD_MELEE)
+ M.do_attack_animation(src)
if(M.melee_damage_upper == 0) return
if(!(stat & BROKEN))
- visible_message("\red [M] [M.attacktext] [src]!")
- M.attack_log += text("\[[time_stamp()]\] attacked [src.name]")
+ visible_message("[M] [M.attacktext] [src]!")
+ add_logs(M, src, "attacked", admin=0)
//src.attack_log += text("\[[time_stamp()]\] was attacked by [M.name] ([M.ckey])")
src.health -= M.melee_damage_upper
if (src.health <= 0)
src.die()
else
- M << "\red That object is useless to you."
+ M << "That object is useless to you."
return
/obj/machinery/turret/attack_alien(mob/living/carbon/alien/humanoid/M as mob)
+ M.changeNext_move(CLICK_CD_MELEE)
+ M.do_attack_animation(src)
if(!(stat & BROKEN))
- playsound(get_turf(src), 'sound/weapons/slash.ogg', 25, 1, -1)
- visible_message("\red [] has slashed at []!", M, src)
+ playsound(src.loc, 'sound/weapons/slash.ogg', 25, 1, -1)
+ visible_message("[M] has slashed at [src]!")
src.health -= 15
if (src.health <= 0)
src.die()
@@ -460,9 +365,9 @@
-/obj/machinery/turretid/Topic(href, href_list)
- if(..())
- return
+/obj/machinery/turretid/Topic(href, href_list, var/nowindow = 0)
+ if(..(href, href_list))
+ return 1
if (src.locked)
if (!istype(usr, /mob/living/silicon))
usr << "Control panel is locked!"
@@ -473,13 +378,8 @@
else if (href_list["toggleLethal"])
src.lethal = !src.lethal
src.updateTurrets()
- src.attack_hand(usr)
-
-/obj/machinery/turretid/proc/updateTurrets()
- if(control_area)
- for (var/obj/machinery/turret/aTurret in get_area_all_atoms(control_area))
- aTurret.setState(enabled, lethal)
- src.update_icons()
+ if(!nowindow)
+ src.attack_hand(usr)
/obj/machinery/turretid/proc/update_icons()
if (src.enabled)
@@ -558,8 +458,9 @@
/obj/machinery/gun_turret/bullet_act(var/obj/item/projectile/Proj)
- take_damage(Proj.damage)
- return
+ if((Proj.damage_type == BRUTE || Proj.damage_type == BURN))
+ take_damage(Proj.damage)
+ return
/obj/machinery/gun_turret/proc/die()
state = 2
@@ -572,7 +473,10 @@
return attack_hand(user)
-/obj/machinery/gun_turret/attack_alien(mob/user as mob)
+/obj/machinery/gun_turret/attack_alien(mob/living/user as mob)
+ user.changeNext_move(CLICK_CD_MELEE)
+ user.do_attack_animation(src)
+ playsound(src.loc, 'sound/weapons/slash.ogg', 25, 1, -1)
user.visible_message("[user] slashes at [src]", "You slash at [src]")
take_damage(15)
return
diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm
index 348456523eb..c8987cccad0 100644
--- a/code/game/machinery/vending.dm
+++ b/code/game/machinery/vending.dm
@@ -1,17 +1,39 @@
-#define CAT_NORMAL 0
-#define CAT_HIDDEN 1
-#define CAT_COIN 2
+#define CAT_NORMAL 1
+#define CAT_HIDDEN 2 // also used in corresponding wires/vending.dm
+#define CAT_COIN 4
+/**
+ * Datum used to hold information about a product in a vending machine
+ */
/datum/data/vending_product
- var/product_name = "generic"
+ var/product_name = "generic" // Display name for the product
var/product_path = null
- var/amount = 0
+ var/amount = 0 // Amount held in the vending machine
var/max_amount = 0
- var/price = 0
- var/display_color = "blue"
- var/category = CAT_NORMAL
+ var/price = 0 // Price to buy one
+ var/display_color = null // Display color for vending machine listing
+ var/category = CAT_NORMAL // CAT_HIDDEN for contraband, CAT_COIN for premium
+/datum/data/vending_product/New(var/path, var/name = null, var/amount = 1, var/price = 0, var/color = null, var/category = CAT_NORMAL)
+ ..()
+ src.product_path = path
+
+ if(!name)
+ var/atom/tmp = new path
+ src.product_name = initial(tmp.name)
+ del(tmp)
+ else
+ src.product_name = name
+
+ src.amount = amount
+ src.price = price
+ src.display_color = color
+ src.category = category
+
+/**
+ * A vending machine
+ */
/obj/machinery/vending
name = "Vendomat"
desc = "A generic vending machine."
@@ -20,11 +42,23 @@
layer = 2.9
anchored = 1
density = 1
+
+ var/icon_vend //Icon_state when vending
+ var/icon_deny //Icon_state when denying access
+
+ // Power
+ use_power = 1
+ idle_power_usage = 10
+ var/vend_power_usage = 150
+
+ // Vending-related
var/active = 1 //No sales pitches if off!
- var/delay_product_spawn // If set, uses sleep() in product spawn proc (mostly for seeds to retrieve correct names).
var/vend_ready = 1 //Are we ready to vend?? Is it time??
var/vend_delay = 10 //How long does it take to vend?
- var/datum/data/vending_product/currently_vending = null // A /datum/data/vending_product instance of what we're paying for right now.
+ var/categories = CAT_NORMAL // Bitmask of cats we're currently showing
+ var/datum/data/vending_product/currently_vending = null // What we're requesting payment for right now
+ var/status_message = "" // Status screen messages like "insufficient funds", displayed in NanoUI
+ var/status_error = 0 // Set to 1 if status_message is an error
// To be filled out at compile time
var/list/products = list() // For each, use the following pattern:
@@ -32,27 +66,33 @@
var/list/premium = list() // No specified amount = only one in stock
var/list/prices = list() // Prices for each item, list(/type/path = price), items not in the list don't have a price.
- var/product_slogans = "" //String of slogans separated by semicolons, optional
- var/product_ads = "" //String of small ad messages in the vending screen - random chance
+ // List of vending_product items available.
var/list/product_records = list()
var/list/hidden_records = list()
- var/list/coin_records = list()
+
+ // // Variables used to initialize advertising
+ var/product_slogans = "" //String of slogans separated by semicolons, optional
+ var/product_ads = "" //String of small ad messages in the vending screen - random chance
+
+ var/list/ads_list = list()
+
+ // Stuff relating vocalizations
var/list/slogan_list = list()
- var/list/small_ads = list() //Small ad messages in the vending screen - random chance of popping up whenever you open it
var/vend_reply //Thank you for shopping!
+ var/shut_up = 0 //Stop spouting those godawful pitches!
var/last_reply = 0
- var/obj/item/weapon/vending_refill/refill_canister = null //The type of refill canisters used by this machine.
var/last_slogan = 0 //When did we last pitch?
var/slogan_delay = 6000 //How long until we can pitch again?
- var/icon_vend //Icon_state when vending!
- var/icon_deny //Icon_state when vending!
- //var/emagged = 0 //Ignores if somebody doesn't have card access to that machine.
+
+ var/obj/item/weapon/vending_refill/refill_canister = null //The type of refill canisters used by this machine.
+
+ // Things that can go wrong
+ emagged = 0 //Ignores if somebody doesn't have card access to that machine.
var/seconds_electrified = 0 //Shock customers like an airlock.
var/shoot_inventory = 0 //Fire items at customers! We're broken!
var/shoot_speed = 3 //How hard are we firing the items?
var/shoot_chance = 2 //How often are we firing the items?
- var/shut_up = 0 //Stop spouting those godawful pitches!
- var/extended_inventory = 0 //can we access the hidden inventory?
+
var/scan_id = 1
var/obj/item/weapon/coin/coin
var/datum/wires/vending/wires = null
@@ -60,32 +100,57 @@
/obj/machinery/vending/New()
..()
wires = new(src)
- spawn(4)
- src.slogan_list = text2list(src.product_slogans, ";")
+ spawn(50)
+ if(src.product_slogans)
+ src.slogan_list += text2list(src.product_slogans, ";")
- // So not all machines speak at the exact same time.
- // The first time this machine says something will be at slogantime + this random value,
- // so if slogantime is 10 minutes, it will say it at somewhere between 10 and 20 minutes after the machine is crated.
- src.last_slogan = world.time + rand(0, slogan_delay)
+ // So not all machines speak at the exact same time.
+ // The first time this machine says something will be at slogantime + this random value,
+ // so if slogantime is 10 minutes, it will say it at somewhere between 10 and 20 minutes after the machine is crated.
+ src.last_slogan = world.time + rand(0, slogan_delay)
- src.build_inventory(products)
- //Add hidden inventory
- src.build_inventory(contraband, 1)
- src.build_inventory(premium, 0, 1)
+ if(src.product_ads)
+ src.ads_list += text2list(src.product_ads, ";")
+
+ src.build_inventory()
power_change()
-
-
return
return
+/**
+ * Build src.produdct_records from the products lists
+ *
+ * src.products, src.contraband, src.premium, and src.prices allow specifying
+ * products that the vending machine is to carry without manually populating
+ * src.product_records.
+ */
+/obj/machinery/vending/proc/build_inventory()
+ var/list/all_products = list(
+ list(src.products, CAT_NORMAL),
+ list(src.contraband, CAT_HIDDEN),
+ list(src.premium, CAT_COIN))
+
+ for(var/current_list in all_products)
+ var/category = current_list[2]
+
+ for(var/entry in current_list[1])
+ var/datum/data/vending_product/product = new/datum/data/vending_product(entry)
+
+ product.price = (entry in src.prices) ? src.prices[entry] : 0
+ product.amount = (current_list[1][entry]) ? current_list[1][entry] : 1
+ product.max_amount = product.amount
+ product.category = category
+
+ src.product_records.Add(product)
/obj/machinery/vending/Destroy()
- del(wires)
+ del(wires) // qdel
wires = null
- del(coin)
- coin = null
+ if(coin)
+ del(coin) // qdel
+ coin = null
..()
/obj/machinery/vending/ex_act(severity)
@@ -115,41 +180,6 @@
else
del(src)
-
-/obj/machinery/vending/proc/build_inventory(var/list/productlist,hidden=0,req_coin=0,start_empty = null)
- for(var/typepath in productlist)
- var/amount = productlist[typepath]
- var/price = prices[typepath]
- if(isnull(amount)) amount = 1
-
- var/atom/temp = new typepath(null)
- var/datum/data/vending_product/R = new /datum/data/vending_product()
-
- R.product_path = typepath
- if(!start_empty)
- R.amount = amount
- R.max_amount = amount
- R.price = price
- R.display_color = pick("red","blue","green")
- if(hidden)
- R.category=CAT_HIDDEN
- hidden_records += R
- else if(req_coin)
- R.category=CAT_COIN
- coin_records += R
- else
- R.category=CAT_NORMAL
- product_records += R
-
- if(delay_product_spawn)
- sleep(3)
- R.product_name = temp.name
- else
- R.product_name = temp.name
-
-// world << "Added: [R.product_name]] - [R.amount] - [R.product_path]"
-
-
/obj/machinery/vending/proc/refill_inventory(obj/item/weapon/vending_refill/refill, datum/data/vending_product/machine, mob/user)
var/total = 0
@@ -179,11 +209,42 @@
break
return total
-/obj/machinery/vending/attackby(obj/item/weapon/W, mob/user)
- if(panel_open)
- if(default_unfasten_wrench(user, W, time = 60))
- return
+/obj/machinery/vending/attackby(obj/item/weapon/W, mob/user, params)
+ if (currently_vending && vendor_account && !vendor_account.suspended)
+ var/paid = 0
+ var/handled = 0
+ if(istype(W, /obj/item/weapon/card/id))
+ var/obj/item/weapon/card/id/C = W
+ paid = pay_with_card(C)
+ handled = 1
+ else if (istype(W, /obj/item/weapon/spacecash))
+ var/obj/item/weapon/spacecash/C = W
+ paid = pay_with_cash(C, user)
+ handled = 1
+ if(paid)
+ src.vend(currently_vending, usr)
+ return
+ else if(handled)
+ nanomanager.update_uis(src)
+ return // don't smack that machine with your 2 thalers
+
+ if(default_unfasten_wrench(user, W, time = 60))
+ return
+
+ if(istype(W, /obj/item/weapon/screwdriver) && anchored)
+ playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
+ panel_open = !panel_open
+ user << "You [panel_open ? "open" : "close"] the maintenance panel."
+ overlays.Cut()
+ if(panel_open)
+ overlays += image(icon, "[initial(icon_state)]-panel")
+ nanomanager.update_uis(src) // Speaker switch is on the main UI, not wires UI
+ return
+
+ if(panel_open)
+ if(istype(W, /obj/item/device/multitool)||istype(W, /obj/item/weapon/wirecutters))
+ return attack_hand(user)
if(component_parts && istype(W, /obj/item/weapon/crowbar))
var/datum/data/vending_product/machine = product_records
for(var/datum/data/vending_product/machine_content in machine)
@@ -194,32 +255,13 @@
if(!machine_content.amount)
break
default_deconstruction_crowbar(W)
-
- if(istype(W, /obj/item/weapon/card/emag))
- emagged = 1
- user << "You short out the product lock on [src]"
- return
- else if(istype(W, /obj/item/weapon/screwdriver) && anchored)
- playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
- panel_open = !panel_open
- user << "You [panel_open ? "open" : "close"] the maintenance panel."
- overlays.Cut()
- if(panel_open)
- overlays += image(icon, "[initial(icon_state)]-panel")
- updateUsrDialog()
- return
- else if(istype(W, /obj/item/device/multitool)||istype(W, /obj/item/weapon/wirecutters))
- if(panel_open)
- attack_hand(user)
- return
- else if(istype(W, /obj/item/weapon/card) && currently_vending)
- var/obj/item/weapon/card/I = W
- scan_card(I)
- else if(istype(W, /obj/item/weapon/coin) && premium.len > 0)
+ if(istype(W, /obj/item/weapon/coin) && premium.len > 0)
user.drop_item()
W.loc = src
coin = W
- user << "You insert [W] into [src]."
+ categories |= CAT_COIN
+ user << "\blue You insert the [W] into the [src]"
+ nanomanager.update_uis(src)
return
else if(istype(W, refill_canister) && refill_canister != null)
if(stat & (BROKEN|NOPOWER))
@@ -241,175 +283,188 @@
else
..()
+/obj/machinery/vending/emag_act(user as mob)
+ emagged = 1
+ user << "You short out the product lock on [src]"
+ return
+/**
+ * Receive payment with cashmoney.
+ *
+ * usr is the mob who gets the change.
+ */
+/obj/machinery/vending/proc/pay_with_cash(var/obj/item/weapon/spacecash/cashmoney, mob/user)
+ if(currently_vending.price > cashmoney.worth)
+ // This is not a status display message, since it's something the character
+ // themselves is meant to see BEFORE putting the money in
+ usr << "\icon[cashmoney] That is not enough money."
+ return 0
-/obj/machinery/vending/proc/scan_card(var/obj/item/weapon/card/I)
- if(!currently_vending) return
- if (istype(I, /obj/item/weapon/card/id))
- var/obj/item/weapon/card/id/C = I
- visible_message("[usr] swipes a card through [src].")
- if(vendor_account)
- var/datum/money_account/D = attempt_account_access_nosec(C.associated_account_number)
- if(D)
- var/transaction_amount = currently_vending.price
- if(transaction_amount <= D.money)
+ // Bills (banknotes) cannot really have worth different than face value,
+ // so we have to eat the bill and spit out change in a bundle
+ // This is really dirty, but there's no superclass for all bills, so we
+ // just assume that all spacecash that's not something else is a bill
- //transfer the money
- D.money -= transaction_amount
- vendor_account.money += transaction_amount
+ visible_message("[usr] inserts a credit chip into [src].")
+ var/left = cashmoney.worth - currently_vending.price
+ usr.unEquip(cashmoney)
+ del(cashmoney)
- //create entries in the two account transaction logs
- var/datum/transaction/T = new()
- T.target_name = "[vendor_account.owner_name] (via [src.name])"
- T.purpose = "Purchase of [currently_vending.product_name]"
- if(transaction_amount > 0)
- T.amount = "([transaction_amount])"
- else
- T.amount = "[transaction_amount]"
- T.source_terminal = src.name
- T.date = current_date_string
- T.time = worldtime2text()
- D.transaction_log.Add(T)
- //
- T = new()
- T.target_name = D.owner_name
- T.purpose = "Purchase of [currently_vending.product_name]"
- T.amount = "[transaction_amount]"
- T.source_terminal = src.name
- T.date = current_date_string
- T.time = worldtime2text()
- vendor_account.transaction_log.Add(T)
+ if(left)
+ dispense_cash(left, src.loc, user)
- // Vend the item
- src.vend(src.currently_vending, usr)
- currently_vending = null
- src.updateUsrDialog()
- else
- usr << "\icon[src]You don't have that much money!"
- else
- usr << "\icon[src]Unable to access account. Check security settings and try again."
+ // Vending machines have no idea who paid with cash
+ credit_purchase("(cash)")
+ return 1
+
+/**
+ * Scan a card and attempt to transfer payment from associated account.
+ *
+ * Takes payment for whatever is the currently_vending item. Returns 1 if
+ * successful, 0 if failed
+ */
+/obj/machinery/vending/proc/pay_with_card(var/obj/item/weapon/card/id/I)
+ visible_message("[usr] swipes a card through [src].")
+ var/datum/money_account/customer_account = attempt_account_access_nosec(I.associated_account_number)
+ if (!customer_account)
+ src.status_message = "Error: Unable to access account. Please contact technical support if problem persists."
+ src.status_error = 1
+ return 0
+
+ if(customer_account.suspended)
+ src.status_message = "Unable to access account: account suspended."
+ src.status_error = 1
+ return 0
+
+ // Have the customer punch in the PIN before checking if there's enough money. Prevents people from figuring out acct is
+ // empty at high security levels
+ if(customer_account.security_level != 0) //If card requires pin authentication (ie seclevel 1 or 2)
+ var/attempt_pin = input("Enter pin code", "Vendor transaction") as num
+ customer_account = attempt_account_access(I.associated_account_number, attempt_pin, 2)
+
+ if(!customer_account)
+ src.status_message = "Unable to access account: incorrect credentials."
+ src.status_error = 1
+ return 0
+
+ if(currently_vending.price > customer_account.money)
+ src.status_message = "Insufficient funds in account."
+ src.status_error = 1
+ return 0
+ else
+ // Okay to move the money at this point
+
+ // debit money from the purchaser's account
+ customer_account.money -= currently_vending.price
+
+ // create entry in the purchaser's account log
+ var/datum/transaction/T = new()
+ T.target_name = "[vendor_account.owner_name] (via [src.name])"
+ T.purpose = "Purchase of [currently_vending.product_name]"
+ if(currently_vending.price > 0)
+ T.amount = "([currently_vending.price])"
else
- usr << "\icon[src]Unable to access vendor account. Please record the machine ID and call CentComm Support."
+ T.amount = "[currently_vending.price]"
+ T.source_terminal = src.name
+ T.date = current_date_string
+ T.time = worldtime2text()
+ customer_account.transaction_log.Add(T)
-/obj/machinery/vending/attack_paw(mob/user as mob)
- return attack_hand(user)
+ // Give the vendor the money. We use the account owner name, which means
+ // that purchases made with stolen/borrowed card will look like the card
+ // owner made them
+ credit_purchase(customer_account.owner_name)
+ return 1
+
+/**
+ * Add money for current purchase to the vendor account.
+ *
+ * Called after the money has already been taken from the customer.
+ */
+/obj/machinery/vending/proc/credit_purchase(var/target as text)
+ vendor_account.money += currently_vending.price
+
+ var/datum/transaction/T = new()
+ T.target_name = target
+ T.purpose = "Purchase of [currently_vending.product_name]"
+ T.amount = "[currently_vending.price]"
+ T.source_terminal = src.name
+ T.date = current_date_string
+ T.time = worldtime2text()
+ vendor_account.transaction_log.Add(T)
/obj/machinery/vending/attack_ai(mob/user as mob)
return attack_hand(user)
-/obj/machinery/vending/proc/GetProductIndex(var/datum/data/vending_product/P)
- var/list/plist
- switch(P.category)
- if(CAT_NORMAL)
- plist=product_records
- if(CAT_HIDDEN)
- plist=hidden_records
- if(CAT_COIN)
- plist=coin_records
- else
- warning("UNKNOWN CATEGORY [P.category] IN TYPE [P.product_path] INSIDE [type]!")
- return plist.Find(P)
-
-/obj/machinery/vending/proc/GetProductByID(var/pid, var/category)
- switch(category)
- if(CAT_NORMAL)
- return product_records[pid]
- if(CAT_HIDDEN)
- return hidden_records[pid]
- if(CAT_COIN)
- return coin_records[pid]
- else
- warning("UNKNOWN PRODUCT: PID: [pid], CAT: [category] INSIDE [type]!")
- return null
+/obj/machinery/vending/attack_paw(mob/user as mob)
+ return attack_hand(user)
/obj/machinery/vending/attack_hand(mob/user as mob)
if(stat & (BROKEN|NOPOWER))
return
- user.set_machine(src)
- if(seconds_electrified != 0)
- if(shock(user, 100))
+ if(src.seconds_electrified != 0)
+ if(src.shock(user, 100))
return
- var/vendorname = (src.name) //import the machine's name
+ ui_interact(user)
+ wires.Interact(user)
- if(src.currently_vending)
- var/dat = "[vendorname]
" //display the name, and added a horizontal rule
+/**
+ * Display the NanoUI window for the vending machine.
+ *
+ * See NanoUI documentation for details.
+ */
+/obj/machinery/vending/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
+ user.set_machine(src)
- // AUTOFIXED BY fix_string_idiocy.py
- // C:\Users\Rob\Documents\Projects\vgstation13\code\game\machinery\vending.dm:260: dat += "You have selected [currently_vending.product_name].
Please ensure your ID is in your ID holder or hand.
"
- dat += {"You have selected [currently_vending.product_name].
Please ensure your ID is in your ID holder or hand.
- Pay |
- Cancel"}
- // END AUTOFIX
- user << browse(dat, "window=vending")
- onclose(user, "")
- return
-
- var/dat = "[vendorname]
" //display the name, and added a horizontal rule
- dat += "Select an item:
" //the rest is just general spacing and bolding
-
- if (premium.len > 0)
- dat += "Coin slot: [coin ? coin : "No coin inserted"] (Remove)
"
-
- if (src.product_records.len == 0)
- dat += "No product loaded!"
+ var/list/data = list()
+ if(currently_vending)
+ data["mode"] = 1
+ data["product"] = currently_vending.product_name
+ data["price"] = currently_vending.price
+ data["message_err"] = 0
+ data["message"] = src.status_message
+ data["message_err"] = src.status_error
else
- var/list/display_records = list()
- display_records += src.product_records
+ data["mode"] = 0
+ var/list/listed_products = list()
- if(src.extended_inventory)
- display_records += src.hidden_records
- if(src.coin)
- display_records += src.coin_records
+ for(var/key = 1 to src.product_records.len)
+ var/datum/data/vending_product/I = src.product_records[key]
- for (var/datum/data/vending_product/R in display_records)
+ if(!(I.category & src.categories))
+ continue
- // AUTOFIXED BY fix_string_idiocy.py
- // C:\Users\Rob\Documents\Projects\vgstation13\code\game\machinery\vending.dm:285: dat += "[R.product_name]:"
- dat += {"[R.product_name]:
- [R.amount] "}
- // END AUTOFIX
- if(R.price)
- dat += " (Price: [R.price])"
- if (R.amount > 0)
- var/idx=GetProductIndex(R)
- dat += " (Vend)"
- else
- dat += " SOLD OUT"
- dat += "
"
+ listed_products.Add(list(list(
+ "key" = key,
+ "name" = sanitize(I.product_name),
+ "price" = I.price,
+ "color" = I.display_color,
+ "amount" = I.amount)))
- dat += ""
+ data["products"] = listed_products
- if(panel_open)
- dat += wires()
+ if(src.coin)
+ data["coin"] = src.coin.name
- if(product_slogans != "")
- dat += "The speaker switch is [shut_up ? "off" : "on"]. Toggle"
+ if(src.panel_open)
+ data["panel"] = 1
+ data["speaker"] = src.shut_up ? 0 : 1
+ else
+ data["panel"] = 0
- user << browse(dat, "window=vending")
- onclose(user, "")
- return
-
-// returns the wire panel text
-/obj/machinery/vending/proc/wires()
- return wires.GetInteractWindow()
+ ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
+ if (!ui)
+ ui = new(user, src, ui_key, "vending_machine.tmpl", src.name, 440, 600)
+ ui.set_initial_data(data)
+ ui.open()
/obj/machinery/vending/Topic(href, href_list)
if(..())
- return
+ return 1
- if(istype(usr,/mob/living/silicon))
- if(istype(usr,/mob/living/silicon/robot))
- var/mob/living/silicon/robot/R = usr
- if(!(R.module && istype(R.module,/obj/item/weapon/robot_module/butler) ) )
- usr << "\red The vending machine refuses to interface with you, as you are not in its target demographic!"
- return
- else
- usr << "\red The vending machine refuses to interface with you, as you are not in its target demographic!"
- return
-
- if(href_list["remove_coin"])
+ if(href_list["remove_coin"] && !istype(usr,/mob/living/silicon))
if(!coin)
usr << "There is no coin in this machine."
return
@@ -419,67 +474,86 @@
usr.put_in_hands(coin)
usr << "\blue You remove the [coin] from the [src]"
coin = null
- usr.set_machine(src)
+ categories &= ~CAT_COIN
+ if (href_list["pay"])
+ if(currently_vending && vendor_account && !vendor_account.suspended)
+ if(istype(usr, /mob/living/carbon/human))
+ var/paid = 0
+ var/handled = 0
+ var/mob/living/carbon/human/H = usr
+ var/obj/item/weapon/card/card = null
+ if(istype(H.wear_id,/obj/item/weapon/card))
+ card = H.wear_id
+ paid = pay_with_card(card)
+ handled = 1
+ else if(istype(H.get_active_hand(), /obj/item/weapon/card))
+ card = H.get_active_hand()
+ paid = pay_with_card(card)
+ handled = 1
+ if(paid)
+ src.vend(currently_vending, usr)
+ return
+ else if(handled)
+ nanomanager.update_uis(src)
+ return // don't smack that machine with your 2 credits
if ((usr.contents.Find(src) || (in_range(src, usr) && istype(src.loc, /turf))))
if ((href_list["vend"]) && (src.vend_ready) && (!currently_vending))
- if (!allowed(usr) && !emagged && scan_id) //For SECURE VENDING MACHINES YEAH
- usr << "\red Access denied." //Unless emagged of course
- flick(src.icon_deny,src)
+ if(istype(usr,/mob/living/silicon))
+ if(istype(usr,/mob/living/silicon/robot))
+ var/mob/living/silicon/robot/R = usr
+ if(!(R.module && istype(R.module,/obj/item/weapon/robot_module/butler) ))
+ usr << "\red The vending machine refuses to interface with you, as you are not in its target demographic!"
+ return
+ else
+ usr << "\red The vending machine refuses to interface with you, as you are not in its target demographic!"
+ return
+
+ if((!allowed(usr)) && !emagged && scan_id) //For SECURE VENDING MACHINES YEAH
+ usr << "Access denied." //Unless emagged of course
+ flick(icon_deny,src)
return
- var/idx=text2num(href_list["vend"])
- var/cat=text2num(href_list["cat"])
+ var/key = text2num(href_list["vend"])
+ var/datum/data/vending_product/R = product_records[key]
- var/datum/data/vending_product/R = GetProductByID(idx,cat)
- if (!R || !istype(R) || !R.product_path || R.amount <= 0)
+ // This should not happen unless the request from NanoUI was bad
+ if(!(R.category & src.categories))
return
- if(R.price == null)
+ if(R.price <= 0)
src.vend(R, usr)
else
src.currently_vending = R
- src.updateUsrDialog()
+ if(!vendor_account || vendor_account.suspended)
+ src.status_message = "This machine is currently unable to process payments due to problems with the associated account."
+ src.status_error = 1
+ else
+ src.status_message = "Please swipe a card or insert cash to pay for the item."
+ src.status_error = 0
- return
-
- else if (href_list["cancel_buying"])
+ else if (href_list["cancelpurchase"])
src.currently_vending = null
- src.updateUsrDialog()
- return
-
- else if (href_list["buy"])
- if(istype(usr, /mob/living/carbon/human))
- var/mob/living/carbon/human/H=usr
- var/obj/item/weapon/card/card = null
- if(istype(H.wear_id,/obj/item/weapon/card))
- card=H.wear_id
- else if(istype(H.get_active_hand(),/obj/item/weapon/card))
- card=H.get_active_hand()
- if(card)
- scan_card(card)
- return
else if ((href_list["togglevoice"]) && (src.panel_open))
src.shut_up = !src.shut_up
src.add_fingerprint(usr)
- src.updateUsrDialog()
- else
- usr << browse(null, "window=vending")
- return
- return
+ nanomanager.update_uis(src)
/obj/machinery/vending/proc/vend(datum/data/vending_product/R, mob/user)
- if (!allowed(user) && !emagged && wires.IsIndexCut(VENDING_WIRE_IDSCAN)) //For SECURE VENDING MACHINES YEAH
- user << "\red Access denied." //Unless emagged of course
+ if((!allowed(usr)) && !emagged && scan_id) //For SECURE VENDING MACHINES YEAH
+ usr << "Access denied." //Unless emagged of course
flick(src.icon_deny,src)
return
src.vend_ready = 0 //One thing at a time!!
+ src.status_message = "Vending..."
+ src.status_error = 0
+ nanomanager.update_uis(src)
- if (R in coin_records)
+ if (R.category & CAT_COIN)
if(!coin)
user << "\blue You need to insert a coin to get this item."
return
@@ -489,8 +563,10 @@
else
user << "\blue You weren't able to pull the coin out fast enough, the machine ate it, string and all."
del(coin)
+ categories &= ~CAT_COIN
else
del(coin)
+ categories &= ~CAT_COIN
R.amount--
@@ -499,16 +575,16 @@
src.speak(src.vend_reply)
src.last_reply = world.time
- use_power(5)
+ use_power(vend_power_usage) //actuators and stuff
if (src.icon_vend) //Show the vending animation if needed
flick(src.icon_vend,src)
spawn(src.vend_delay)
new R.product_path(get_turf(src))
+ src.status_message = ""
+ src.status_error = 0
src.vend_ready = 1
- return
-
- src.updateUsrDialog()
-
+ currently_vending = null
+ nanomanager.update_uis(src)
/obj/machinery/vending/proc/stock(var/datum/data/vending_product/R, var/mob/user)
if(src.panel_open)
@@ -771,9 +847,13 @@
product_slogans = "Carts to go!"
icon_state = "cart"
icon_deny = "cart-deny"
- products = list(/obj/item/weapon/cartridge/medical = 10,/obj/item/weapon/cartridge/engineering = 10,/obj/item/weapon/cartridge/security = 10,
- /obj/item/weapon/cartridge/janitor = 10,/obj/item/weapon/cartridge/signal/toxins = 10,/obj/item/device/pda/heads = 10,
- /obj/item/weapon/cartridge/captain = 3,/obj/item/weapon/cartridge/quartermaster = 10)
+ products = list(/obj/item/device/pda =10,/obj/item/weapon/cartridge/medical = 10,/obj/item/weapon/cartridge/chemistry = 10,
+ /obj/item/weapon/cartridge/engineering = 10,/obj/item/weapon/cartridge/atmos = 10,/obj/item/weapon/cartridge/janitor = 10,
+ /obj/item/weapon/cartridge/signal/toxins = 10,/obj/item/weapon/cartridge/signal = 10,/obj/item/weapon/cartridge = 10)
+ contraband = list(/obj/item/weapon/cartridge/clown = 1,/obj/item/weapon/cartridge/mime = 1)
+ prices = list(/obj/item/device/pda =300,/obj/item/weapon/cartridge/medical = 200,/obj/item/weapon/cartridge/chemistry = 150,/obj/item/weapon/cartridge/engineering = 100,
+ /obj/item/weapon/cartridge/atmos = 75,/obj/item/weapon/cartridge/janitor = 100,/obj/item/weapon/cartridge/signal/toxins = 150,
+ /obj/item/weapon/cartridge/signal = 75,/obj/item/weapon/cartridge = 50)
/obj/machinery/vending/cigarette
name = "Cigarette machine" //OCD had to be uppercase to look nice with the new formating
@@ -809,7 +889,7 @@
/obj/item/weapon/reagent_containers/glass/bottle/stoxin = 4,/obj/item/weapon/reagent_containers/glass/bottle/toxin = 4,
/obj/item/weapon/reagent_containers/syringe/antiviral = 4,/obj/item/weapon/reagent_containers/syringe = 12,
/obj/item/device/healthanalyzer = 5,/obj/item/weapon/reagent_containers/glass/beaker = 4, /obj/item/weapon/reagent_containers/dropper = 2,
- /obj/item/stack/medical/advanced/bruise_pack = 3, /obj/item/stack/medical/advanced/ointment = 3, /obj/item/stack/medical/splint = 2)
+ /obj/item/stack/medical/advanced/bruise_pack = 3, /obj/item/stack/medical/advanced/ointment = 3, /obj/item/stack/medical/splint = 2, /obj/item/device/sensor_device = 2)
contraband = list(/obj/item/weapon/reagent_containers/pill/tox = 3,/obj/item/weapon/reagent_containers/pill/stox = 4,/obj/item/weapon/reagent_containers/pill/antitox = 6)
@@ -860,7 +940,7 @@
icon_state = "sec"
icon_deny = "sec-deny"
req_access_txt = "1"
- products = list(/obj/item/weapon/handcuffs = 8,/obj/item/weapon/grenade/flashbang = 4,/obj/item/device/flash = 5,
+ products = list(/obj/item/weapon/restraints/handcuffs = 8,/obj/item/weapon/restraints/handcuffs/cable/zipties = 8,/obj/item/weapon/grenade/flashbang = 4,/obj/item/device/flash = 5,
/obj/item/weapon/reagent_containers/food/snacks/donut/normal = 12,/obj/item/weapon/storage/box/evidence = 6,/obj/item/device/flashlight/seclite = 4)
contraband = list(/obj/item/clothing/glasses/sunglasses = 2,/obj/item/weapon/storage/fancy/donut_box = 2,/obj/item/device/hailer = 5)
@@ -883,19 +963,45 @@
product_slogans = "THIS'S WHERE TH' SEEDS LIVE! GIT YOU SOME!;Hands down the best seed selection on the station!;Also certain mushroom varieties available, more for experts! Get certified today!"
product_ads = "We like plants!;Grow some crops!;Grow, baby, growww!;Aw h'yeah son!"
icon_state = "seeds"
- delay_product_spawn = 1
products = list(/obj/item/seeds/bananaseed = 3,/obj/item/seeds/berryseed = 3,/obj/item/seeds/carrotseed = 3,/obj/item/seeds/chantermycelium = 3,/obj/item/seeds/chiliseed = 3,
/obj/item/seeds/cornseed = 3, /obj/item/seeds/eggplantseed = 3, /obj/item/seeds/potatoseed = 3, /obj/item/seeds/replicapod = 3,/obj/item/seeds/soyaseed = 3,
/obj/item/seeds/sunflowerseed = 3,/obj/item/seeds/tomatoseed = 3,/obj/item/seeds/towermycelium = 3,/obj/item/seeds/wheatseed = 3,/obj/item/seeds/appleseed = 3,
/obj/item/seeds/poppyseed = 3,/obj/item/seeds/ambrosiavulgarisseed = 3,/obj/item/seeds/whitebeetseed = 3,/obj/item/seeds/watermelonseed = 3,/obj/item/seeds/limeseed = 3,
/obj/item/seeds/lemonseed = 3,/obj/item/seeds/orangeseed = 3,/obj/item/seeds/grassseed = 3,/obj/item/seeds/cocoapodseed = 3,
- /obj/item/seeds/cabbageseed = 3,/obj/item/seeds/grapeseed = 3,/obj/item/seeds/pumpkinseed = 3,/obj/item/seeds/cherryseed = 3,/obj/item/seeds/plastiseed = 3,/obj/item/seeds/riceseed = 3)
+ /obj/item/seeds/cabbageseed = 3,/obj/item/seeds/grapeseed = 3,/obj/item/seeds/pumpkinseed = 3,/obj/item/seeds/cherryseed = 3,/obj/item/seeds/plastiseed = 3,/obj/item/seeds/riceseed = 3,
+ /obj/item/seeds/tobaccoseed = 3, /obj/item/seeds/coffeeaseed = 3, /obj/item/seeds/teaasperaseed = 3)
contraband = list(/obj/item/seeds/amanitamycelium = 2,/obj/item/seeds/glowshroom = 2,/obj/item/seeds/libertymycelium = 2,/obj/item/seeds/nettleseed = 2,
/obj/item/seeds/plumpmycelium = 2,/obj/item/seeds/reishimycelium = 2)
premium = list(/obj/item/weapon/reagent_containers/spray/waterflower = 1)
+/**
+ * Populate hydroseeds product_records
+ *
+ * This needs to be customized to fetch the actual names of the seeds, otherwise
+ * the machine would simply list "packet of seeds" times 20
+ */
+/obj/machinery/vending/hydroseeds/build_inventory()
+ var/list/all_products = list(
+ list(src.products, CAT_NORMAL),
+ list(src.contraband, CAT_HIDDEN),
+ list(src.premium, CAT_COIN))
+
+ for(var/current_list in all_products)
+ var/category = current_list[2]
+
+ for(var/entry in current_list[1])
+ var/obj/item/seeds/S = new entry(src)
+ var/name = S.name
+ var/datum/data/vending_product/product = new/datum/data/vending_product(entry, name)
+
+ product.price = (entry in src.prices) ? src.prices[entry] : 0
+ product.amount = (current_list[1][entry]) ? current_list[1][entry] : 1
+ product.max_amount = product.amount
+ product.category = category
+
+ src.product_records.Add(product)
/obj/machinery/vending/magivend
name = "MagiVend"
@@ -919,10 +1025,10 @@
/obj/item/clothing/head/helmet/gladiator = 1,/obj/item/clothing/under/gimmick/rank/captain/suit = 1,/obj/item/clothing/head/flatcap = 1,
/obj/item/clothing/suit/storage/labcoat/mad = 1,/obj/item/clothing/glasses/gglasses = 1,/obj/item/clothing/shoes/jackboots = 1,
/obj/item/clothing/under/schoolgirl = 1,/obj/item/clothing/head/kitty = 1,/obj/item/clothing/under/blackskirt = 1,/obj/item/clothing/head/beret = 1,
- /obj/item/clothing/tie/waistcoat = 1,/obj/item/clothing/under/suit_jacket = 1,/obj/item/clothing/head/that =1,/obj/item/clothing/under/kilt = 1,/obj/item/clothing/head/beret = 1,/obj/item/clothing/tie/waistcoat = 1,
+ /obj/item/clothing/accessory/waistcoat = 1,/obj/item/clothing/under/suit_jacket = 1,/obj/item/clothing/head/that =1,/obj/item/clothing/under/kilt = 1,/obj/item/clothing/head/beret = 1,/obj/item/clothing/accessory/waistcoat = 1,
/obj/item/clothing/glasses/monocle =1,/obj/item/clothing/head/bowlerhat = 1,/obj/item/weapon/cane = 1,/obj/item/clothing/under/sl_suit = 1,
/obj/item/clothing/mask/fakemoustache = 1,/obj/item/clothing/suit/bio_suit/plaguedoctorsuit = 1,/obj/item/clothing/head/plaguedoctorhat = 1,/obj/item/clothing/mask/gas/plaguedoctor = 1,
- /obj/item/clothing/under/owl = 1,/obj/item/clothing/mask/gas/owl_mask = 1,/obj/item/clothing/suit/apron = 1,/obj/item/clothing/under/waiter = 1,
+ /obj/item/clothing/suit/apron = 1,/obj/item/clothing/under/waiter = 1,
/obj/item/clothing/under/pirate = 1,/obj/item/clothing/suit/pirate_brown = 1,/obj/item/clothing/suit/pirate_black =1,/obj/item/clothing/under/pirate_rags =1,/obj/item/clothing/head/pirate = 1,/obj/item/clothing/head/bandana = 1,
/obj/item/clothing/head/bandana = 1,/obj/item/clothing/under/soviet = 1,/obj/item/clothing/head/ushanka = 1,/obj/item/clothing/suit/imperium_monk = 1,
/obj/item/clothing/mask/gas/cyborg = 1,/obj/item/clothing/suit/holidaypriest = 1,/obj/item/clothing/head/wizard/marisa/fake = 1,
@@ -930,9 +1036,9 @@
/obj/item/clothing/suit/wizrobe/fake = 1,/obj/item/clothing/head/wizard/fake = 1,/obj/item/weapon/staff = 3,/obj/item/clothing/mask/gas/sexyclown = 1,
/obj/item/clothing/under/sexyclown = 1,/obj/item/clothing/mask/gas/sexymime = 1,/obj/item/clothing/under/sexymime = 1,/obj/item/clothing/suit/apron/overalls = 1,
/obj/item/clothing/head/rabbitears =1, /obj/item/clothing/head/sombrero = 1, /obj/item/clothing/suit/poncho = 1,
- /obj/item/clothing/suit/poncho/green = 1, /obj/item/clothing/suit/poncho/red = 1, /obj/item/clothing/tie/blue = 1, /obj/item/clothing/tie/red = 1, /obj/item/clothing/tie/black = 1, /obj/item/clothing/tie/horrible = 1,
- /obj/item/clothing/under/maid = 1, /obj/item/clothing/under/janimaid = 1)
- contraband = list(/obj/item/clothing/suit/judgerobe = 1,/obj/item/clothing/head/powdered_wig = 1,/obj/item/weapon/gun/magic/wand = 1)
+ /obj/item/clothing/suit/poncho/green = 1, /obj/item/clothing/suit/poncho/red = 1, /obj/item/clothing/accessory/blue = 1, /obj/item/clothing/accessory/red = 1, /obj/item/clothing/accessory/black = 1, /obj/item/clothing/accessory/horrible = 1,
+ /obj/item/clothing/under/maid = 1, /obj/item/clothing/under/janimaid = 1, /obj/item/clothing/under/pants/camo = 1, /obj/item/clothing/mask/bandana = 1, /obj/item/clothing/mask/bandana/black = 1)
+ contraband = list(/obj/item/clothing/suit/judgerobe = 1,/obj/item/clothing/head/powdered_wig = 1,/obj/item/weapon/gun/magic/wand = 1, /obj/item/clothing/mask/balaclava=1)
premium = list(/obj/item/clothing/suit/hgpirate = 1, /obj/item/clothing/head/hgpiratecap = 1, /obj/item/clothing/head/helmet/roman = 1, /obj/item/clothing/head/helmet/roman/legionaire = 1, /obj/item/clothing/under/roman = 1, /obj/item/clothing/shoes/roman = 1)
refill_canister = /obj/item/weapon/vending_refill/autodrobe
@@ -951,7 +1057,7 @@
desc = "A kitchen and restaurant equipment vendor"
product_ads = "Mm, food stuffs!;Food and food accessories.;Get your plates!;You like forks?;I like forks.;Woo, utensils.;You don't really need these..."
icon_state = "dinnerware"
- products = list(/obj/item/weapon/tray = 8,/obj/item/weapon/kitchen/utensil/fork = 6,/obj/item/weapon/kitchenknife = 3,/obj/item/weapon/reagent_containers/food/drinks/drinkingglass = 8,/obj/item/clothing/suit/chef/classic = 2,/obj/item/weapon/reagent_containers/food/condiment/pack/ketchup = 5,/obj/item/weapon/reagent_containers/food/condiment/pack/hotsauce = 5)
+ products = list(/obj/item/weapon/storage/bag/tray = 8,/obj/item/weapon/kitchen/utensil/fork = 6,/obj/item/weapon/kitchenknife = 3,/obj/item/weapon/reagent_containers/food/drinks/drinkingglass = 8,/obj/item/clothing/suit/chef/classic = 2,/obj/item/weapon/reagent_containers/food/condiment/pack/ketchup = 5,/obj/item/weapon/reagent_containers/food/condiment/pack/hotsauce = 5)
contraband = list(/obj/item/weapon/kitchen/utensil/spoon = 2,/obj/item/weapon/kitchen/utensil/knife = 2,/obj/item/weapon/kitchen/rollingpin = 2, /obj/item/weapon/butch = 2)
/obj/machinery/vending/sovietsoda
@@ -979,8 +1085,8 @@
icon_state = "engivend"
icon_deny = "engivend-deny"
req_access_txt = "11" //Engineering Equipment access
- products = list(/obj/item/clothing/glasses/meson = 2,/obj/item/device/multitool = 4,/obj/item/weapon/airlock_electronics = 10,/obj/item/weapon/module/power_control = 10,/obj/item/weapon/airalarm_electronics = 10,/obj/item/weapon/cell/high = 10)
- contraband = list(/obj/item/weapon/cell/potato = 3)
+ products = list(/obj/item/clothing/glasses/meson = 2,/obj/item/device/multitool = 4,/obj/item/weapon/airlock_electronics = 10,/obj/item/weapon/module/power_control = 10,/obj/item/weapon/airalarm_electronics = 10,/obj/item/weapon/stock_parts/cell/high = 10)
+ contraband = list(/obj/item/weapon/stock_parts/cell/potato = 3)
premium = list(/obj/item/weapon/storage/belt/utility = 3)
//This one's from bay12
@@ -993,7 +1099,7 @@
products = list(/obj/item/clothing/under/rank/chief_engineer = 4,/obj/item/clothing/under/rank/engineer = 4,/obj/item/clothing/shoes/orange = 4,/obj/item/clothing/head/hardhat = 4,
/obj/item/weapon/storage/belt/utility = 4,/obj/item/clothing/glasses/meson = 4,/obj/item/clothing/gloves/yellow = 4, /obj/item/weapon/screwdriver = 12,
/obj/item/weapon/crowbar = 12,/obj/item/weapon/wirecutters = 12,/obj/item/device/multitool = 12,/obj/item/weapon/wrench = 12,/obj/item/device/t_scanner = 12,
- /obj/item/stack/cable_coil/heavyduty = 8, /obj/item/weapon/cell = 8, /obj/item/weapon/weldingtool = 8,/obj/item/clothing/head/welding = 8,
+ /obj/item/stack/cable_coil/heavyduty = 8, /obj/item/weapon/stock_parts/cell = 8, /obj/item/weapon/weldingtool = 8,/obj/item/clothing/head/welding = 8,
/obj/item/weapon/light/tube = 10,/obj/item/clothing/suit/fire = 4, /obj/item/weapon/stock_parts/scanning_module = 5,/obj/item/weapon/stock_parts/micro_laser = 5,
/obj/item/weapon/stock_parts/matter_bin = 5,/obj/item/weapon/stock_parts/manipulator = 5,/obj/item/weapon/stock_parts/console_screen = 5)
// There was an incorrect entry (cablecoil/power). I improvised to cablecoil/heavyduty.
@@ -1008,7 +1114,7 @@
icon_deny = "robotics-deny"
req_access_txt = "29"
products = list(/obj/item/clothing/suit/storage/labcoat = 4,/obj/item/clothing/under/rank/roboticist = 4,/obj/item/stack/cable_coil = 4,/obj/item/device/flash = 4,
- /obj/item/weapon/cell/high = 12, /obj/item/device/assembly/prox_sensor = 3,/obj/item/device/assembly/signaler = 3,/obj/item/device/healthanalyzer = 3,
+ /obj/item/weapon/stock_parts/cell/high = 12, /obj/item/device/assembly/prox_sensor = 3,/obj/item/device/assembly/signaler = 3,/obj/item/device/healthanalyzer = 3,
/obj/item/weapon/scalpel = 2,/obj/item/weapon/circular_saw = 2,/obj/item/weapon/tank/anesthetic = 2,/obj/item/clothing/mask/breath/medical = 5,
/obj/item/weapon/screwdriver = 5,/obj/item/weapon/crowbar = 5)
//everything after the power cell had no amounts, I improvised. -Sayu
@@ -1097,11 +1203,11 @@
/obj/item/clothing/under/pants/camo = 1,/obj/item/clothing/under/pants/blackjeans=2,/obj/item/clothing/under/pants/khaki=2,
/obj/item/clothing/under/pants/white=2,/obj/item/clothing/under/pants/red=1,/obj/item/clothing/under/pants/black=2,
/obj/item/clothing/under/pants/tan=2,/obj/item/clothing/under/pants/blue=1,/obj/item/clothing/under/pants/track=1,
- /obj/item/clothing/tie/scarf/red=1,/obj/item/clothing/tie/scarf/green=1,/obj/item/clothing/tie/scarf/darkblue=1,
- /obj/item/clothing/tie/scarf/purple=1,/obj/item/clothing/tie/scarf/yellow=1,/obj/item/clothing/tie/scarf/orange=1,
- /obj/item/clothing/tie/scarf/lightblue=1,/obj/item/clothing/tie/scarf/white=1,/obj/item/clothing/tie/scarf/black=1,
- /obj/item/clothing/tie/scarf/zebra=1,/obj/item/clothing/tie/scarf/christmas=1,/obj/item/clothing/tie/stripedredscarf=1,
- /obj/item/clothing/tie/stripedbluescarf=1,/obj/item/clothing/tie/stripedgreenscarf=1,/obj/item/clothing/tie/waistcoat=1,
+ /obj/item/clothing/accessory/scarf/red=1,/obj/item/clothing/accessory/scarf/green=1,/obj/item/clothing/accessory/scarf/darkblue=1,
+ /obj/item/clothing/accessory/scarf/purple=1,/obj/item/clothing/accessory/scarf/yellow=1,/obj/item/clothing/accessory/scarf/orange=1,
+ /obj/item/clothing/accessory/scarf/lightblue=1,/obj/item/clothing/accessory/scarf/white=1,/obj/item/clothing/accessory/scarf/black=1,
+ /obj/item/clothing/accessory/scarf/zebra=1,/obj/item/clothing/accessory/scarf/christmas=1,/obj/item/clothing/accessory/stripedredscarf=1,
+ /obj/item/clothing/accessory/stripedbluescarf=1,/obj/item/clothing/accessory/stripedgreenscarf=1,/obj/item/clothing/accessory/waistcoat=1,
/obj/item/clothing/under/sundress=2,/obj/item/clothing/under/stripeddress = 1, /obj/item/clothing/under/sailordress = 1, /obj/item/clothing/under/redeveninggown = 1, /obj/item/clothing/under/blacktango=1,/obj/item/clothing/suit/jacket=3,
/obj/item/clothing/glasses/regular=2,/obj/item/clothing/head/sombrero=1,/obj/item/clothing/suit/poncho=1,
/obj/item/clothing/suit/ianshirt=1,/obj/item/clothing/shoes/laceup=2,/obj/item/clothing/shoes/black=4,
diff --git a/code/game/machinery/washing_machine.dm b/code/game/machinery/washing_machine.dm
index c72b2338cba..19108eec93d 100644
--- a/code/game/machinery/washing_machine.dm
+++ b/code/game/machinery/washing_machine.dm
@@ -151,7 +151,7 @@
if (S.chained == 1)
S.chained = 0
S.slowdown = SHOES_SLOWDOWN
- new /obj/item/weapon/handcuffs( src )
+ new /obj/item/weapon/restraints/handcuffs( src )
S.icon_state = new_shoe_icon_state
S._color = _color
S.name = new_shoe_name
@@ -194,7 +194,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/machinery/wishgranter.dm b/code/game/machinery/wishgranter.dm
index ac2986f18a2..22e89cfe000 100644
--- a/code/game/machinery/wishgranter.dm
+++ b/code/game/machinery/wishgranter.dm
@@ -30,52 +30,96 @@
insisting++
else
- user << "You speak. [pick("I want the station to disappear","Humanity is corrupt, mankind must be destroyed","I want to be rich", "I want to rule the world","I want immortality.")]. The Wish Granter answers."
- user << "Your head pounds for a moment, before your vision clears. You are the avatar of the Wish Granter, and your power is LIMITLESS! And it's all yours. You need to make sure no one can take it from you. No one can know, first."
-
- charges--
- insisting = 0
-
- if (!(M_HULK in user.mutations))
- user.dna.SetSEState(HULKBLOCK,1)
-
- if (!(M_LASER in user.mutations))
- user.mutations.Add(M_LASER)
-
- if (!(M_XRAY in user.mutations))
- user.mutations.Add(M_XRAY)
- user.sight |= (SEE_MOBS|SEE_OBJS|SEE_TURFS)
- user.see_in_dark = 8
- user.see_invisible = SEE_INVISIBLE_LEVEL_TWO
-
- if (!(M_RESIST_COLD in user.mutations))
- user.mutations.Add(M_RESIST_COLD)
-
- if (!(M_RESIST_HEAT in user.mutations))
- user.mutations.Add(M_RESIST_HEAT)
-
- if (!(M_TK in user.mutations))
- user.mutations.Add(M_TK)
-
- /* Not used
- if(!(HEAL in user.mutations))
- user.mutations.Add(HEAL)
- */
-
- user.update_mutations()
+ user << "The power of the Wish Granter have turned you into the superhero the station deserves. You are a masked vigilante, and answer to no man. Will you use your newfound strength to protect the innocent, or will you hunt the guilty?"
ticker.mode.traitors += user.mind
- user.mind.special_role = "Avatar of the Wish Granter"
+ user.mind.special_role = "The Hero The Station Deserves"
- var/datum/objective/silence/silence = new
- silence.owner = user.mind
- user.mind.objectives += silence
+
+ var/mob/living/carbon/human/M = user
+
+ var/wish = input("You want to...","Wish") as anything in list("Protect the innocent","Hunt the guilty")
+ switch(wish)
+ if("Protect the innocent")
+ M.fully_replace_character_name(M.real_name, "Owlman")
+
+ var/datum/objective/protect/protect = new
+ protect.owner = user.mind
+ user.mind.objectives += protect
+
+ for(var/obj/item/W in M)
+ M.unEquip(W)
+
+ M.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(M), slot_shoes)
+ M.equip_to_slot_or_del(new /obj/item/clothing/under/owl(M), slot_w_uniform)
+ M.equip_to_slot_or_del(new /obj/item/clothing/suit/toggle/owlwings(M), slot_wear_suit)
+ M.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/owl_mask(M), slot_wear_mask)
+
+ var/obj/item/weapon/card/id/syndicate/W = new(M)
+ W.name = "[M.real_name]'s ID Card (Superhero)"
+ W.access = get_all_accesses()
+ W.assignment = "Superhero"
+ W.registered_name = M.real_name
+ M.equip_to_slot_or_del(W, slot_wear_id)
+
+ M.regenerate_icons()
+
+ if("Hunt the guilty")
+ M.fully_replace_character_name(M.real_name, "The Griffin")
+
+ var/datum/objective/assassinate/assasinate = new
+ assasinate.owner = user.mind
+ user.mind.objectives += assasinate
+
+ for(var/obj/item/W in M)
+ M.unEquip(W)
+
+ M.equip_to_slot_or_del(new /obj/item/clothing/shoes/griffin(M), slot_shoes)
+ M.equip_to_slot_or_del(new /obj/item/clothing/under/griffin(M), slot_w_uniform)
+ M.equip_to_slot_or_del(new /obj/item/clothing/suit/toggle/owlwings/griffinwings(M), slot_wear_suit)
+ M.equip_to_slot_or_del(new /obj/item/clothing/head/griffin(M), slot_head)
+
+ var/obj/item/weapon/card/id/syndicate/W = new(M)
+ W.name = "[M.real_name]'s ID Card (Supervillain)"
+ W.access = get_all_accesses()
+ W.assignment = "Supervillain"
+ W.registered_name = M.real_name
+ M.equip_to_slot_or_del(W, slot_wear_id)
+
+ M.regenerate_icons()
var/obj_count = 1
for(var/datum/objective/OBJ in user.mind.objectives)
user << "Objective #[obj_count]: [OBJ.explanation_text]"
obj_count++
- user << "You have a very bad feeling about this."
+ charges--
+ insisting = 0
+
+ if (!(HULK in user.mutations))
+ user.dna.SetSEState(HULKBLOCK,1)
+
+ if (!(LASER in user.mutations))
+ user.mutations.Add(LASER)
+
+ if (!(XRAY in user.mutations))
+ user.mutations.Add(XRAY)
+ user.sight |= (SEE_MOBS|SEE_OBJS|SEE_TURFS)
+ user.see_in_dark = 8
+ user.see_invisible = SEE_INVISIBLE_LEVEL_TWO
+
+ if (!(RESIST_COLD in user.mutations))
+ user.mutations.Add(RESIST_COLD)
+
+ if (!(RESIST_HEAT in user.mutations))
+ user.mutations.Add(RESIST_HEAT)
+
+ if (!(TK in user.mutations))
+ user.mutations.Add(TK)
+
+ if(!(REGEN in user.mutations))
+ user.mutations.Add(REGEN)
+
+ user.update_mutations()
return
\ No newline at end of file
diff --git a/code/game/mecha/combat/gygax.dm b/code/game/mecha/combat/gygax.dm
index 2c723a2e530..26d9d066fd8 100644
--- a/code/game/mecha/combat/gygax.dm
+++ b/code/game/mecha/combat/gygax.dm
@@ -53,7 +53,7 @@
ME.attach(src)
return
-/obj/mecha/combat/gygax/dark/add_cell(var/obj/item/weapon/cell/C=null)
+/obj/mecha/combat/gygax/dark/add_cell(var/obj/item/weapon/stock_parts/cell/C=null)
if(C)
C.forceMove(src)
cell = C
diff --git a/code/game/mecha/combat/marauder.dm b/code/game/mecha/combat/marauder.dm
index c332603ab46..b5951d306c2 100644
--- a/code/game/mecha/combat/marauder.dm
+++ b/code/game/mecha/combat/marauder.dm
@@ -73,7 +73,7 @@
src.smoke_system.attach(src)
return
-/obj/mecha/combat/marauder/seraph/New()
+/obj/mecha/combat/marauder/seraph/loaded/New()
..()//Let it equip whatever is needed.
var/obj/item/mecha_parts/mecha_equipment/ME
if(equipment.len)//Now to remove it and equip anew.
diff --git a/code/game/mecha/equipment/tools/tools.dm b/code/game/mecha/equipment/tools/tools.dm
index cf3cd0022a6..c618ec8c72f 100644
--- a/code/game/mecha/equipment/tools/tools.dm
+++ b/code/game/mecha/equipment/tools/tools.dm
@@ -389,7 +389,7 @@
range = RANGED
action(atom/target)
- if(!action_checks(target) || src.loc.z == 2) return
+ if(!action_checks(target) || (src.loc.z in config.admin_levels)) return
var/turf/T = get_turf(target)
if(T)
set_ready_state(0)
@@ -410,7 +410,7 @@
action(atom/target)
- if(!action_checks(target) || src.loc.z == 2) return
+ if(!action_checks(target) || (src.loc.z in config.admin_levels)) return
var/list/theareas = list()
for(var/area/AR in orange(100, chassis))
if(AR in theareas) continue
@@ -548,9 +548,9 @@
if(!chassis) return
return "* [src.name]"
- proc/dynattackby(obj/item/weapon/W as obj, mob/user as mob)
+ proc/dynattackby(obj/item/weapon/W as obj, mob/user as mob, params)
if(!action_checks(user))
- return chassis.dynattackby(W,user)
+ return chassis.dynattackby(W,user, params)
chassis.log_message("Attacked by [W]. Attacker - [user]")
if(prob(chassis.deflect_chance*deflect_coeff))
user << "\red The [W] bounces off [chassis] armor."
@@ -920,7 +920,7 @@
return 0
return
- attackby(weapon,mob/user)
+ 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/equipment/tools/unused_tools.dm b/code/game/mecha/equipment/tools/unused_tools.dm
index 68578913813..50fcc9d62bb 100644
--- a/code/game/mecha/equipment/tools/unused_tools.dm
+++ b/code/game/mecha/equipment/tools/unused_tools.dm
@@ -129,11 +129,11 @@
chassis.proc_res["dynattackby"] = src
return
- proc/dynattackby(obj/item/weapon/W as obj, mob/user as mob)
+ proc/dynattackby(obj/item/weapon/W as obj, mob/user as mob, params)
if(!action_checks(user) || !active)
return
user.electrocute_act(shock_damage, src)
- return chassis.dynattackby(W,user)
+ return chassis.dynattackby(W,user, params)
/*
diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm
index a4c8b5a527a..fc8c5ee658a 100644
--- a/code/game/mecha/equipment/weapons/weapons.dm
+++ b/code/game/mecha/equipment/weapons/weapons.dm
@@ -158,7 +158,7 @@
var/mob/living/carbon/human/H = M
if(isobj(H.shoes))
var/thingy = H.shoes
- H.drop_from_inventory(H.shoes)
+ H.unEquip(H.shoes)
walk_away(thingy,chassis,15,2)
spawn(20)
if(thingy)
diff --git a/code/game/mecha/mech_bay.dm b/code/game/mecha/mech_bay.dm
index 59883f8b8df..8de93482907 100644
--- a/code/game/mecha/mech_bay.dm
+++ b/code/game/mecha/mech_bay.dm
@@ -37,7 +37,7 @@
component_parts += new /obj/item/weapon/stock_parts/capacitor(src)
component_parts += new /obj/item/stack/cable_coil(src, 1)
RefreshParts()
- recharging_turf = get_step(loc, dir)
+ locate_recharge_turf()
/obj/machinery/mech_bay_recharge_port/upgraded/New()
..()
@@ -51,6 +51,9 @@
component_parts += new /obj/item/stack/cable_coil(src, 1)
RefreshParts()
+/obj/machinery/mech_bay_recharge_port/proc/locate_recharge_turf()
+ recharging_turf = get_step(loc, dir)
+
/obj/machinery/mech_bay_recharge_port/RefreshParts()
var/MC
for(var/obj/item/weapon/stock_parts/capacitor/C in component_parts)
@@ -76,12 +79,12 @@
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
if(default_change_direction_wrench(user, I))
- recharging_turf = get_step(loc, dir)
+ locate_recharge_turf()
return
if(exchange_parts(user, I))
diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm
index 5b7a50c8594..e69394432be 100644
--- a/code/game/mecha/mech_fabricator.dm
+++ b/code/game/mecha/mech_fabricator.dm
@@ -498,7 +498,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
@@ -513,10 +513,7 @@
return 1
else
user << "You can't load \the [name] while it's opened."
- return 1
-
- if(istype(W,/obj/item/weapon/card/emag))
- emag()
+ return 1
if(istype(W, /obj/item/stack))
var/material
@@ -561,6 +558,9 @@
else
user << "\The [src] cannot hold any more [sname] sheet\s."
return
+
+/obj/machinery/mecha_part_fabricator/emag_act(user as mob)
+ emag()
/obj/machinery/mecha_part_fabricator/proc/material2name(var/ID)
return copytext(ID,2)
\ No newline at end of file
diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm
index d34d2bb0f2e..8633d1c871f 100644
--- a/code/game/mecha/mecha.dm
+++ b/code/game/mecha/mecha.dm
@@ -29,7 +29,7 @@
var/deflect_chance = 10 //chance to deflect the incoming projectiles, hits, or lesser the effect of ex_act.
//the values in this list show how much damage will pass through, not how much will be absorbed.
var/list/damage_absorption = list("brute"=0.8,"fire"=1.2,"bullet"=0.9,"laser"=1,"energy"=1,"bomb"=1)
- var/obj/item/weapon/cell/cell
+ var/obj/item/weapon/stock_parts/cell/cell
var/state = 0
var/list/log = new
var/last_message = 0
@@ -115,7 +115,7 @@
internal_tank = new /obj/machinery/portable_atmospherics/canister/air(src)
return internal_tank
-/obj/mecha/proc/add_cell(var/obj/item/weapon/cell/C=null)
+/obj/mecha/proc/add_cell(var/obj/item/weapon/stock_parts/cell/C=null)
if(C)
C.forceMove(src)
cell = C
@@ -453,7 +453,9 @@
src.destroy()
return
-/obj/mecha/attack_hand(mob/user as mob)
+/obj/mecha/attack_hand(mob/living/user as mob)
+ user.changeNext_move(CLICK_CD_MELEE)
+ user.do_attack_animation(src)
src.log_message("Attack by hand/paw. Attacker - [user].",1)
if(ishuman(user))
@@ -461,7 +463,7 @@
call(/obj/item/clothing/gloves/space_ninja/proc/drain)("MECHA",src,user:wear_suit)
return
- if ((M_HULK in user.mutations) && !prob(src.deflect_chance))
+ if ((HULK in user.mutations) && !prob(src.deflect_chance))
src.take_damage(15)
src.check_for_internal_damage(list(MECHA_INT_TEMP_CONTROL,MECHA_INT_TANK_BREACH,MECHA_INT_CONTROL_LOST))
user.visible_message("[user] hits [src.name], doing some damage.", "You hit [src.name] with all your might. The metal creaks and bends.")
@@ -470,12 +472,14 @@
src.log_append_to_last("Armor saved.")
return
-/obj/mecha/attack_paw(mob/user as mob)
+/obj/mecha/attack_paw(mob/living/user as mob)
return src.attack_hand(user)
-/obj/mecha/attack_alien(mob/user as mob)
+/obj/mecha/attack_alien(mob/living/user as mob)
src.log_message("Attack by alien. Attacker - [user].",1)
+ user.changeNext_move(CLICK_CD_MELEE)
+ user.do_attack_animation(src)
if(!prob(src.deflect_chance))
src.take_damage(15)
src.check_for_internal_damage(list(MECHA_INT_TEMP_CONTROL,MECHA_INT_TANK_BREACH,MECHA_INT_CONTROL_LOST))
@@ -496,6 +500,7 @@
if(user.melee_damage_upper == 0)
user.emote("[user.friendly] [src]")
else
+ user.do_attack_animation(src)
if(!prob(src.deflect_chance))
var/damage = rand(user.melee_damage_lower, user.melee_damage_upper)
src.take_damage(damage)
@@ -674,8 +679,10 @@
src.check_for_internal_damage(list(MECHA_INT_FIRE, MECHA_INT_TEMP_CONTROL))
return
-/obj/mecha/proc/dynattackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/mecha/proc/dynattackby(obj/item/weapon/W as obj, mob/living/user as mob, params)
src.log_message("Attacked by [W]. Attacker - [user]")
+ user.changeNext_move(CLICK_CD_MELEE)
+ user.do_attack_animation(src)
if(prob(src.deflect_chance))
user << "\red The [W] bounces off [src.name] armor."
src.log_append_to_last("Armor saved.")
@@ -695,18 +702,7 @@
////// AttackBy //////
//////////////////////
-/obj/mecha/attackby(obj/item/weapon/W as obj, mob/user as mob)
-
- if(istype(W, /obj/item/weapon/card/emag))
- if(istype(src, /obj/mecha/working/ripley) && emagged == 0)
- emagged = 1
- usr << "\blue You slide the [W] through the [src]'s ID slot."
- playsound(src.loc, "sparks", 100, 1)
- src.desc += "\red The mech's equiptment slots spark dangerously!"
- else
- usr <<"\red The [src]'s ID slot rejects the [W]."
- return
-
+/obj/mecha/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
if(istype(W, /obj/item/device/mmi) || istype(W, /obj/item/device/mmi/posibrain))
if(mmi_move_inside(W,user))
@@ -781,7 +777,7 @@
user << "You screw the cell in place"
return
- else if(istype(W, /obj/item/weapon/cell))
+ else if(istype(W, /obj/item/weapon/stock_parts/cell))
if(state==4)
if(!src.cell)
user << "You install the powercell"
@@ -809,7 +805,9 @@
return
else if(istype(W, /obj/item/mecha_parts/mecha_tracking))
- user.drop_from_inventory(W)
+ if(!user.unEquip(W))
+ user << "\the [W] is stuck to your hand, you cannot put it in \the [src]"
+ return
W.forceMove(src)
user.visible_message("[user] attaches [W] to [src].", "You attach [W] to [src]")
return
@@ -862,6 +860,15 @@
*/
return
+/obj/mecha/emag_act(user as mob)
+ if(istype(src, /obj/mecha/working/ripley) && emagged == 0)
+ emagged = 1
+ usr << "\blue You slide the card through the [src]'s ID slot."
+ playsound(src.loc, "sparks", 100, 1)
+ src.desc += "\red The mech's equiptment slots spark dangerously!"
+ else
+ usr <<"\red The [src]'s ID slot rejects the card."
+ return
/*
@@ -1118,7 +1125,9 @@
else if(mmi_as_oc.brainmob.stat)
user << "Beta-rhythm below acceptable level."
return 0
- user.drop_from_inventory(mmi_as_oc)
+ if(!user.unEquip(mmi_as_oc))
+ user << "\the [mmi_as_oc] is stuck to your hand, you cannot put it in \the [src]"
+ return
var/mob/brainmob = mmi_as_oc.brainmob
brainmob.reset_view(src)
/*
@@ -1231,6 +1240,8 @@
/////////////////////////
/obj/mecha/proc/operation_allowed(mob/living/carbon/human/H)
+ if(!ishuman(H))
+ return 0
for(var/ID in list(H.get_active_hand(), H.wear_id, H.belt))
if(src.check_access(ID,src.operation_req_access))
return 1
diff --git a/code/game/mecha/mecha_construction_paths.dm b/code/game/mecha/mecha_construction_paths.dm
index 37e1c1ee13e..223f6d4aa24 100644
--- a/code/game/mecha/mecha_construction_paths.dm
+++ b/code/game/mecha/mecha_construction_paths.dm
@@ -91,7 +91,7 @@
const_holder.icon_state = "ripley0"
const_holder.density = 1
const_holder.overlays.len = 0
- qdel(src)
+ del(src)
return
diff --git a/code/game/mecha/mecha_parts.dm b/code/game/mecha/mecha_parts.dm
index 58b2d2215ce..6237bcfd523 100644
--- a/code/game/mecha/mecha_parts.dm
+++ b/code/game/mecha/mecha_parts.dm
@@ -7,7 +7,7 @@
icon = 'icons/mecha/mech_construct.dmi'
icon_state = "blank"
w_class = 6
- flags = FPRINT | TABLEPASS | CONDUCT
+ flags = CONDUCT
origin_tech = "programming=2;materials=2"
var/construction_time = 100
var/list/construction_cost = list("metal"=20000,"glass"=5000)
@@ -18,9 +18,9 @@
icon_state = "backbone"
var/datum/construction/construct
construction_cost = list("metal"=20000)
- flags = FPRINT | CONDUCT
+ flags = CONDUCT
- attackby(obj/item/W as obj, mob/user as mob)
+ attackby(obj/item/W as obj, mob/user as mob, params)
if(!construct || !construct.action(W, user))
..()
return
@@ -409,7 +409,7 @@
icon_state = "std_mod"
item_state = "electronic"
board_type = "other"
- flags = FPRINT | TABLEPASS | CONDUCT
+ flags = CONDUCT
force = 5.0
w_class = 2.0
throwforce = 5.0
diff --git a/code/game/mecha/mecha_wreckage.dm b/code/game/mecha/mecha_wreckage.dm
index 62c8c7c5d47..b2c4b0bc0db 100644
--- a/code/game/mecha/mecha_wreckage.dm
+++ b/code/game/mecha/mecha_wreckage.dm
@@ -30,7 +30,7 @@
return
-/obj/effect/decal/mecha_wreckage/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/effect/decal/mecha_wreckage/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
if(salvage_num <= 0)
diff --git a/code/game/objects/effects/aliens.dm b/code/game/objects/effects/aliens.dm
index c3a05eae825..985b3bca9ba 100644
--- a/code/game/objects/effects/aliens.dm
+++ b/code/game/objects/effects/aliens.dm
@@ -101,7 +101,8 @@
/obj/structure/alien/resin/attack_hand(mob/living/user)
- if(M_HULK in user.mutations)
+ if(HULK in user.mutations)
+ user.do_attack_animation(src)
user.visible_message("[user] destroys [src]!")
health = 0
healthcheck()
@@ -112,6 +113,8 @@
/obj/structure/alien/resin/attack_alien(mob/living/user)
+ user.changeNext_move(CLICK_CD_MELEE)
+ user.do_attack_animation(src)
if(islarva(user))
return
user.visible_message("[user] claws at the resin!")
@@ -122,7 +125,8 @@
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)
healthcheck()
@@ -202,7 +206,8 @@
del(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]!")
else
@@ -355,7 +360,8 @@
healthcheck()
-/obj/structure/alien/egg/attackby(obj/item/I, mob/user)
+/obj/structure/alien/egg/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]!")
else
diff --git a/code/game/objects/effects/anomalies.dm b/code/game/objects/effects/anomalies.dm
index 2a0235652ac..a0b3fff9c7b 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 d32c2b9b7e1..7f3de1cf8c6 100644
--- a/code/game/objects/effects/decals/contraband.dm
+++ b/code/game/objects/effects/decals/contraband.dm
@@ -48,7 +48,7 @@ obj/structure/sign/poster/New(var/serial)
icon_state = design.icon_state // poster[serial_number]
..()
-obj/structure/sign/poster/attackby(obj/item/weapon/W as obj, mob/user as mob)
+obj/structure/sign/poster/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
if(istype(W, /obj/item/weapon/wirecutters))
playsound(loc, 'sound/items/Wirecutter.ogg', 100, 1)
if(ruined)
@@ -89,7 +89,7 @@ obj/structure/sign/poster/attackby(obj/item/weapon/W as obj, mob/user as mob)
del(src)
-//seperated to reduce code duplication. Moved here for ease of reference and to unclutter r_wall/attackby()
+//seperated to reduce code duplication. Moved here for ease of reference and to unclutter r_wall/attackby(, params)
/turf/simulated/wall/proc/place_poster(var/obj/item/weapon/contraband/poster/P, var/mob/user)
if(!istype(src,/turf/simulated/wall))
diff --git a/code/game/objects/effects/decals/posters/tgposters.dm b/code/game/objects/effects/decals/posters/tgposters.dm
index 2605bfaf20f..6fa936d4ca6 100644
--- a/code/game/objects/effects/decals/posters/tgposters.dm
+++ b/code/game/objects/effects/decals/posters/tgposters.dm
@@ -103,3 +103,13 @@
name = "Borg Fancy v2"
desc = "Borg Fancy, Now only taking the most fancy."
icon_state="poster21"
+
+/datum/poster/tg_22
+ name = "The Griffin"
+ desc = " The Griffin commands you to be the worst you can be. Will you?"
+ icon_state="poster22"
+
+/datum/poster/tg_23
+ name = "The Owl"
+ desc = " The Owl would do his best to protect the station. Will you?"
+ icon_state="poster23"
\ No newline at end of file
diff --git a/code/game/objects/effects/effect_system.dm b/code/game/objects/effects/effect_system.dm
index 27db5475d94..73ccbd3aab3 100644
--- a/code/game/objects/effects/effect_system.dm
+++ b/code/game/objects/effects/effect_system.dm
@@ -11,14 +11,23 @@ would spawn and follow the beaker, even if it is carried or thrown.
icon = 'icons/effects/effects.dmi'
mouse_opacity = 0
unacidable = 1//So effect are not targeted by alien acid.
- flags = TABLEPASS
+
+/datum/effect/effect/proc/fadeOut(var/atom/A, var/frames = 16)
+ if(A.alpha == 0) //Handle already transparent case
+ return
+ if(frames == 0)
+ frames = 1 //We will just assume that by 0 frames, the coder meant "during one frame".
+ var/step = A.alpha / frames
+ for(var/i = 0, i < frames, i++)
+ A.alpha -= step
+ sleep(world.tick_lag)
+ return
/obj/effect/effect/water
name = "water"
icon = 'icons/effects/effects.dmi'
icon_state = "extinguish"
var/life = 15.0
- flags = TABLEPASS
mouse_opacity = 0
/obj/effect/effect/smoke
@@ -183,36 +192,40 @@ steam.start() -- spawns the effect
return
/datum/effect/effect/system/spark_spread
- set_up(n = 3, c = 0, loca)
- number = n > 10 ? 10 : n
- cardinals = c
+ var/total_sparks = 0 // To stop it being spammed and lagging!
- if (istype(loca, /turf/))
+ set_up(n = 3, c = 0, loca)
+ if(n > 10)
+ n = 10
+ number = n
+ cardinals = c
+ if(istype(loca, /turf/))
location = loca
else
location = get_turf(loca)
start()
- for (var/i = 1 to number)
- spawn()
- if (holder)
- location = get_turf(holder)
-
- var/obj/effect/effect/sparks/sparks = getFromPool(/obj/effect/effect/sparks, location)
- playsound(location, "sparks", 100, 1)
+ var/i = 0
+ for(i=0, i 20)
+ return
+ spawn(0)
+ if(holder)
+ src.location = get_turf(holder)
+ var/obj/effect/effect/sparks/sparks = new /obj/effect/effect/sparks(src.location)
+ src.total_sparks++
var/direction
-
- if (cardinals)
+ if(src.cardinals)
direction = pick(cardinal)
else
direction = pick(alldirs)
-
- for (var/j = 0, j < pick(1, 2, 3), j++)
+ for(i=0, i 0)
- devastation = min (MAX_EXPLOSION_RANGE, devastation + round(amount/12))
+ devastation = min (MAX_EX_DEVESTATION_RANGE, devastation + round(amount/12))
if (round(amount/6) > 0)
- heavy = min (MAX_EXPLOSION_RANGE, heavy + round(amount/6))
+ heavy = min (MAX_EX_HEAVY_RANGE, heavy + round(amount/6))
if (round(amount/3) > 0)
- light = min (MAX_EXPLOSION_RANGE, light + round(amount/3))
+ light = min (MAX_EX_LIGHT_RANGE, light + round(amount/3))
if (flash && flashing_factor)
flash += (round(amount/4) * flashing_factor)
diff --git a/code/game/objects/effects/glowshroom.dm b/code/game/objects/effects/glowshroom.dm
index 61ab55b4c68..e8b8cc4bdaf 100644
--- a/code/game/objects/effects/glowshroom.dm
+++ b/code/game/objects/effects/glowshroom.dm
@@ -133,7 +133,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
diff --git a/code/game/objects/effects/overlays.dm b/code/game/objects/effects/overlays.dm
index 1963e2fb29a..a040e460b2c 100644
--- a/code/game/objects/effects/overlays.dm
+++ b/code/game/objects/effects/overlays.dm
@@ -32,4 +32,10 @@
/obj/effect/overlay/coconut
name = "Coconuts"
icon = 'icons/misc/beach.dmi'
- icon_state = "coconuts"
\ No newline at end of file
+ icon_state = "coconuts"
+
+/obj/effect/overlay/adminoverlay
+ name = "adminoverlay"
+ icon = 'icons/effects/effects.dmi'
+ icon_state = "admin"
+ layer = 4.1
diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm
index e11b35ac207..62a9bb7a57b 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("\red \The [src] have been [pick(W.attack_verb)] with \the [W][(user ? " by [user]." : ".")]")
else
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index cedc2e47cd8..399455d208c 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -5,13 +5,11 @@
var/no_embed = 0 // For use in item_attack.dm
var/icon/blood_overlay = null //this saves our blood splatter overlay, which will be processed not to go over the edges of the sprite
var/blood_overlay_color = null
- var/abstract = 0
var/item_state = null
var/r_speed = 1.0
var/health = null
var/hitsound = null
var/w_class = 3.0
- flags = FPRINT | TABLEPASS
var/slot_flags = 0 //This is used to determine on which slots an item can fit.
pass_flags = PASSTABLE
pressure_resistance = 5
@@ -35,7 +33,6 @@
var/permeability_coefficient = 1 // for chemicals/diseases
var/siemens_coefficient = 1 // for electrical admittance/conductance (electrocution checks and shit)
var/slowdown = 0 // How much clothing is slowing you down. Negative values speeds you up
- var/canremove = 1 //Mostly for Ninja code at this point but basically will not allow the item to be removed if set to 0. /N
var/reflect_chance = 0 //This var dictates what % of a time an object will reflect an energy based weapon's shot
var/armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
var/list/allowed = null //suit storage stuff.
@@ -56,7 +53,7 @@
/obj/item/Destroy()
if(istype(src.loc, /mob))
var/mob/H = src.loc
- H.drop_from_inventory(src) // items at the very least get unequipped from their mob before being deleted
+ H.unEquip(src) // items at the very least get unequipped from their mob before being deleted
if(reagents && istype(reagents))
reagents.my_atom = null
reagents.delete()
@@ -129,7 +126,7 @@
if(5.0)
size = "huge"
else
- //if ((M_CLUMSY in usr.mutations) && prob(50)) t = "funny-looking"
+ //if ((CLUMSY in usr.mutations) && prob(50)) t = "funny-looking"
usr << "This is a [src.blood_DNA ? "bloody " : ""]\icon[src][src.name]. It is a [size] item."
if(src.desc)
usr << src.desc
@@ -151,19 +148,15 @@
S.remove_from_storage(src)
src.throwing = 0
- if (src.loc == user)
- //canremove==0 means that object may not be removed. You can still wear it. This only applies to clothing. /N
- if(!src.canremove)
+ if (loc == user)
+ if(!user.unEquip(src))
return 0
- else
- user.u_equip(src)
else
- if(isliving(src.loc))
+ if(isliving(loc))
return 0
- user.next_move = max(user.next_move+2,world.time + 2)
- src.pickup(user)
+ pickup(user)
add_fingerprint(user)
user.put_in_active_hand(src)
return 1
@@ -176,7 +169,7 @@
if(!A.has_fine_manipulation || w_class >= 4)
if(src in A.contents) // To stop Aliens having items stuck in their pockets
- A.drop_from_inventory(src)
+ A.unEquip(src)
user << "Your claws aren't capable of such fine manipulation."
return
@@ -187,16 +180,12 @@
M.client.screen -= src
src.throwing = 0
if (src.loc == user)
- //canremove==0 means that object may not be removed. You can still wear it. This only applies to clothing. /N
- if(istype(src, /obj/item/clothing) && !src:canremove)
+ if(!user.unEquip(src))
return
- else
- user.u_equip(src)
else
if(istype(src.loc, /mob/living))
return
src.pickup(user)
- user.next_move = max(user.next_move+2,world.time + 2)
user.put_in_active_hand(src)
return
@@ -207,7 +196,7 @@
if(!A.has_fine_manipulation || w_class >= 4)
if(src in A.contents) // To stop Aliens having items stuck in their pockets
- A.drop_from_inventory(src)
+ A.unEquip(src)
user << "Your claws aren't capable of such fine manipulation."
return
attack_paw(A)
@@ -222,7 +211,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)
@@ -311,7 +300,7 @@
if(istype(src, /obj/item/clothing/under) || istype(src, /obj/item/clothing/suit))
- if(M_FAT in H.mutations)
+ if(FAT in H.mutations)
testing("[M] TOO FAT TO WEAR [src]!")
if(!(flags & ONESIZEFITSALL))
if(!disable_warning)
@@ -422,6 +411,8 @@
return 0
return 1
if(slot_l_store)
+ if(flags & NODROP) //Pockets aren't visible, so you can't move NODROP items into them.
+ return 0
if(H.l_store)
return 0
if(!H.w_uniform)
@@ -433,6 +424,8 @@
if( w_class <= 2 || (slot_flags & SLOT_POCKET) )
return 1
if(slot_r_store)
+ if(flags & NODROP)
+ return 0
if(H.r_store)
return 0
if(!H.w_uniform)
@@ -445,6 +438,8 @@
return 1
return 0
if(slot_s_store)
+ if(flags & NODROP) //Suit storage NODROP items drop if you take a suit off, this is to prevent people exploiting this.
+ return 0
if(H.s_store)
return 0
if(!H.wear_suit)
@@ -465,13 +460,13 @@
if(slot_handcuffed)
if(H.handcuffed)
return 0
- if(!istype(src, /obj/item/weapon/handcuffs))
+ if(!istype(src, /obj/item/weapon/restraints/handcuffs))
return 0
return 1
if(slot_legcuffed)
if(H.legcuffed)
return 0
- if(!istype(src, /obj/item/weapon/legcuffs))
+ if(!istype(src, /obj/item/weapon/restraints/legcuffs))
return 0
return 1
if(slot_in_backpack)
@@ -480,6 +475,19 @@
if(B.contents.len < B.storage_slots && w_class <= B.max_w_class)
return 1
return 0
+ if(slot_tie)
+ if(!H.w_uniform)
+ if(!disable_warning)
+ H << "You need a jumpsuit before you can attach this [name]."
+ return 0
+ var/obj/item/clothing/under/uniform = H.w_uniform
+ if(uniform.accessories.len && !uniform.can_attach_accessory(src))
+ if (!disable_warning)
+ H << "You already have an accessory of this type attached to your [uniform]."
+ return 0
+ if( !(slot_flags & SLOT_TIE) )
+ return 0
+ return 1
return 0 //Unsupported slot
//END HUMAN
@@ -551,7 +559,7 @@
if( src in usr )
attack_self(usr)
return
- else if(istype(src, /obj/item/clothing/tie))
+ else if(istype(src, /obj/item/clothing/accessory))
if(istype(src.loc,/obj/item/clothing/under))
attack_self(usr)
@@ -604,7 +612,7 @@
M.LAssailant = user
src.add_fingerprint(user)
- //if((M_CLUMSY in user.mutations) && prob(50))
+ //if((CLUMSY in user.mutations) && prob(50))
// M = user
/*
M << "\red You stab yourself in the eye."
diff --git a/code/game/objects/items/apc_frame.dm b/code/game/objects/items/apc_frame.dm
index f2e760a34a5..764be72b131 100644
--- a/code/game/objects/items/apc_frame.dm
+++ b/code/game/objects/items/apc_frame.dm
@@ -5,9 +5,9 @@
desc = "Used for repairing or building APCs"
icon = 'icons/obj/apc_repair.dmi'
icon_state = "apc_frame"
- flags = FPRINT | TABLEPASS| CONDUCT
+ 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/ashtray.dm b/code/game/objects/items/ashtray.dm
index 5ec88ac8bdf..bf554463a42 100644
--- a/code/game/objects/items/ashtray.dm
+++ b/code/game/objects/items/ashtray.dm
@@ -14,14 +14,14 @@
src.pixel_x = rand(-6, 6)
return
-/obj/item/ashtray/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/item/ashtray/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
if (health < 1)
return
if (istype(W,/obj/item/weapon/cigbutt) || istype(W,/obj/item/clothing/mask/cigarette) || istype(W, /obj/item/weapon/match))
if (contents.len >= max_butts)
user << "This ashtray is full."
return
- user.u_equip(W)
+ user.unEquip(W)
W.loc = src
if (istype(W,/obj/item/clothing/mask/cigarette))
diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm
index 3ff89c5fd60..8eaf699205d 100644
--- a/code/game/objects/items/bodybag.dm
+++ b/code/game/objects/items/bodybag.dm
@@ -40,14 +40,14 @@
density = 0
- attackby(W as obj, mob/user as mob)
+ attackby(W as obj, mob/user as mob, params)
if (istype(W, /obj/item/weapon/pen))
var/t = input(user, "What would you like the label to be?", text("[]", src.name), null) as text
if (user.get_active_hand() != W)
return
if (!in_range(src, user) && src.loc != user)
return
- t = copytext(sanitize(t),1,MAX_MESSAGE_LEN)
+ t = sanitize(copytext(t,1,MAX_MESSAGE_LEN))
if (t)
src.name = "body bag - "
src.name += t
@@ -127,7 +127,7 @@
usr << "\red You can't fold that up anymore.."
..()
- attackby(W as obj, mob/user as mob)
+ attackby(W as obj, mob/user as mob, params)
if(istype(W, /obj/item/weapon/card/id) || istype(W, /obj/item/device/pda))
if(src.allowed(user))
src.locked = !src.locked
diff --git a/code/game/objects/items/candle.dm b/code/game/objects/items/candle.dm
index b47a2a30684..a68258e6a1c 100644
--- a/code/game/objects/items/candle.dm
+++ b/code/game/objects/items/candle.dm
@@ -22,7 +22,7 @@
icon_state = "candle[i][lit ? "_lit" : ""]"
- attackby(obj/item/weapon/W as obj, mob/user as mob)
+ 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
@@ -59,7 +59,8 @@
if(!wax)
new/obj/item/trash/candle(src.loc)
if(istype(src.loc, /mob))
- src.dropped()
+ var/mob/M = src.loc
+ M.unEquip(src, 1) //src is being deleted anyway
del(src)
update_icon()
if(istype(loc, /turf)) //start a fire if possible
diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm
index 826de6fd4c4..914ec7d6be0 100755
--- a/code/game/objects/items/devices/PDA/PDA.dm
+++ b/code/game/objects/items/devices/PDA/PDA.dm
@@ -11,7 +11,6 @@ var/global/list/obj/item/device/pda/PDAs = list()
icon_state = "pda"
item_state = "electronic"
w_class = 1.0
- flags = FPRINT | TABLEPASS
slot_flags = SLOT_PDA | SLOT_BELT
//Main variables
@@ -51,6 +50,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
var/obj/item/weapon/card/id/id = null //Making it possible to slot an ID card into the PDA so it can function as both.
var/ownjob = null //related to above
+ var/ownrank = null // this one is rank, never alt title
var/obj/item/device/paicard/pai = null // A slot for a personal AI device
@@ -129,15 +129,15 @@ var/global/list/obj/item/device/pda/PDAs = list()
icon_state = "pda-captain"
detonate = 0
//toff = 1
-
+
/obj/item/device/pda/heads/ntrep
default_cartridge = /obj/item/weapon/cartridge/supervisor
icon_state = "pda-h"
-
+
/obj/item/device/pda/heads/magistrate
default_cartridge = /obj/item/weapon/cartridge/supervisor
icon_state = "pda-h"
-
+
/obj/item/device/pda/heads/blueshield
default_cartridge = /obj/item/weapon/cartridge/hos
icon_state = "pda-h"
@@ -204,7 +204,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
/obj/item/device/pda/geneticist
default_cartridge = /obj/item/weapon/cartridge/medical
icon_state = "pda-genetics"
-
+
/obj/item/device/pda/centcom
default_cartridge = /obj/item/weapon/cartridge/centcom
icon_state = "pda-h"
@@ -217,9 +217,13 @@ var/global/list/obj/item/device/pda/PDAs = list()
detonate = 0
-/obj/item/device/pda/ai/proc/set_name_and_job(newname as text, newjob as text)
+/obj/item/device/pda/ai/proc/set_name_and_job(newname as text, newjob as text, newrank as null|text)
owner = newname
ownjob = newjob
+ if(newrank)
+ ownrank = newrank
+ else
+ ownrank = ownjob
name = newname + " (" + ownjob + ")"
@@ -575,6 +579,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
id_check(U, 1)
if("UpdateInfo")
ownjob = id.assignment
+ ownrank = id.rank
name = "PDA-[owner] ([ownjob])"
if("Eject")//Ejects the cart, only done from hub.
if (!isnull(cartridge))
@@ -684,7 +689,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
U << "The PDA softly beeps."
ui.close()
else
- t = copytext(sanitize(t), 1, 20)
+ t = sanitize(copytext(t, 1, 20))
ttone = t
else
ui.close()
@@ -892,7 +897,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
/obj/item/device/pda/proc/create_message(var/mob/living/U = usr, var/obj/item/device/pda/P)
var/t = input(U, "Please enter message", name, null) as text
- t = copytext(sanitize(t), 1, MAX_MESSAGE_LEN)
+ t = sanitize(copytext(t, 1, MAX_MESSAGE_LEN))
t = readd_quotes(t)
if (!t || !istype(P))
return
@@ -1050,7 +1055,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
@@ -1069,6 +1074,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
if(!owner)
owner = idcard.registered_name
ownjob = idcard.assignment
+ ownrank = idcard.rank
name = "PDA-[owner] ([ownjob])"
user << "Card scanned."
else
diff --git a/code/game/objects/items/devices/PDA/radio.dm b/code/game/objects/items/devices/PDA/radio.dm
index 63f1082884f..e3ea25af4e4 100644
--- a/code/game/objects/items/devices/PDA/radio.dm
+++ b/code/game/objects/items/devices/PDA/radio.dm
@@ -48,6 +48,8 @@
signal.data[key4] = value4
frequency.post_signal(src, signal, filter = s_filter)
+
+ return
/obj/item/radio/integrated/receive_signal(datum/signal/signal)
/*var/obj/item/device/pda/P = src.loc
diff --git a/code/game/objects/items/devices/aicard.dm b/code/game/objects/items/devices/aicard.dm
index 7816473110e..144b920631c 100644
--- a/code/game/objects/items/devices/aicard.dm
+++ b/code/game/objects/items/devices/aicard.dm
@@ -4,7 +4,6 @@
icon_state = "aicard" // aicard-full
item_state = "electronic"
w_class = 2.0
- flags = FPRINT | TABLEPASS
slot_flags = SLOT_BELT
var/flush = null
origin_tech = "programming=4;materials=4"
@@ -137,4 +136,4 @@
if(2.0)
if(prob(50)) del(src)
if(3.0)
- if(prob(25)) del(src)
+ if(prob(25)) del(src)
diff --git a/code/game/objects/items/devices/autopsy.dm b/code/game/objects/items/devices/autopsy.dm
index 8c5fbf7661e..67a424a309f 100644
--- a/code/game/objects/items/devices/autopsy.dm
+++ b/code/game/objects/items/devices/autopsy.dm
@@ -7,7 +7,7 @@
desc = "Extracts information on wounds."
icon = 'icons/obj/autopsy_scanner.dmi'
icon_state = ""
- flags = FPRINT | TABLEPASS | CONDUCT
+ flags = CONDUCT
w_class = 1.0
origin_tech = "materials=1;biotech=1"
var/list/datum/autopsy_data_scanner/wdata = list()
diff --git a/code/game/objects/items/devices/camera_bug.dm b/code/game/objects/items/devices/camera_bug.dm
new file mode 100644
index 00000000000..057cdb765fc
--- /dev/null
+++ b/code/game/objects/items/devices/camera_bug.dm
@@ -0,0 +1,371 @@
+#define VANILLA_BUG 0
+#define UNIVERSAL_BUG 1
+#define NETWORK_BUG 2
+#define SABOTAGE_BUG 3
+#define ADVANCED_BUG 4
+#define ADMIN_BUG 5
+
+#define BUGMODE_LIST 0
+#define BUGMODE_MONITOR 1
+#define BUGMODE_TRACK 2
+
+
+
+/obj/item/device/camera_bug
+ name = "camera bug"
+ desc = "For illicit snooping through the camera network."
+ icon = 'icons/obj/device.dmi'
+ icon_state = "camera_bug"
+ w_class = 1.0
+ item_state = "camera_bug"
+ icon_override = 'icons/mob/in-hand/tools.dmi'
+ throw_speed = 4
+ throw_range = 20
+
+ var/obj/machinery/camera/current = null
+ var/obj/item/expansion = null
+ var/bugtype = VANILLA_BUG
+
+ var/last_net_update = 0
+ var/last_bugtype = VANILLA_BUG
+ var/list/bugged_cameras = list()
+ var/skip_bugcheck = 0
+
+ var/track_mode = BUGMODE_LIST
+ var/last_tracked = 0
+ var/refresh_interval = 50
+
+ var/tracked_name = null
+ var/atom/tracking = null
+
+ var/last_found = null
+ var/last_seen = null
+
+/obj/item/device/camera_bug/New()
+ ..()
+ processing_objects += src
+
+/obj/item/device/camera_bug/Destroy()
+ if(expansion)
+ qdel(expansion)
+ expansion = null
+ del(src)
+/* Easier to just call del() than this nonsense
+ get_cameras()
+ for(var/cam_tag in bugged_cameras)
+ var/obj/machinery/camera/camera = bugged_cameras[cam_tag]
+ if(camera.bug == src)
+ camera.bug = null
+ bugged_cameras = list()
+ if(tracking)
+ tracking = null
+ ..()
+*/
+
+/obj/item/device/camera_bug/interact(var/mob/user = usr)
+ var/datum/browser/popup = new(user, "camerabug","Camera Bug",nref=src)
+ popup.set_content(menu(get_cameras()))
+ popup.open()
+
+/obj/item/device/camera_bug/attack_self(mob/user as mob)
+ user.set_machine(src)
+ interact(user)
+
+/obj/item/device/camera_bug/check_eye(var/mob/user as mob)
+ if (user.stat || loc != user || !user.canmove || user.eye_blind || !current)
+ user.reset_view(null)
+ user.unset_machine()
+ return null
+
+ var/turf/T = get_turf(user.loc)
+ if(T.z != current.z || (!skip_bugcheck && current.bug != src) || !current.can_use())
+ user << "[src] has lost the signal."
+ current = null
+ user.reset_view(null)
+ user.unset_machine()
+ return null
+
+ return 1
+
+/obj/item/device/camera_bug/proc/get_cameras()
+ if(bugtype != last_bugtype || ( (bugtype in list(UNIVERSAL_BUG,NETWORK_BUG,ADMIN_BUG)) && world.time > (last_net_update + 100)))
+ bugged_cameras = list()
+ last_bugtype = bugtype
+ for(var/obj/machinery/camera/camera in cameranet.cameras)
+ if(camera.stat || !camera.can_use())
+ continue
+ switch(bugtype)
+ if(VANILLA_BUG,SABOTAGE_BUG,ADVANCED_BUG)
+ if(camera.bug == src)
+ bugged_cameras[camera.c_tag] = camera
+ if(UNIVERSAL_BUG)
+ if(camera.bug)
+ bugged_cameras[camera.c_tag] = camera
+ if(NETWORK_BUG,ADMIN_BUG)
+ if(length(list("SS13","MINE")&camera.network))
+ bugged_cameras[camera.c_tag] = camera
+ sortList(bugged_cameras)
+ return bugged_cameras
+
+
+/obj/item/device/camera_bug/proc/menu(var/list/cameras)
+ if(!cameras || !cameras.len)
+ return "No bugged cameras found."
+
+ var/html
+ switch(track_mode)
+ if(BUGMODE_LIST)
+ html = "Select a camera:
\[Cancel camera view\]
"
+ for(var/entry in cameras)
+ var/obj/machinery/camera/C = cameras[entry]
+ var/functions = ""
+ switch(bugtype)
+ if(SABOTAGE_BUG)
+ functions = " - \[Disable\]"
+ if(ADVANCED_BUG)
+ functions = " - \[Monitor\]"
+ if(ADMIN_BUG)
+ if(C.bug == src)
+ functions = " - \[Monitor\] \[Disable\]"
+ else
+ functions = " - \[Monitor\]"
+ html += "| [entry] | [functions] |
"
+
+ if(BUGMODE_MONITOR)
+ if(current)
+ html = "Analyzing Camera '[current.c_tag]' \[Select Camera\]
"
+ html += camera_report()
+ else
+ track_mode = BUGMODE_LIST
+ return .(cameras)
+ if(BUGMODE_TRACK)
+ if(tracking)
+ html = "Tracking '[tracked_name]' \[Cancel Tracking\] \[Cancel camera view\]
"
+ if(last_found)
+ var/time_diff = round((world.time - last_seen) / 150)
+ var/obj/machinery/camera/C = bugged_cameras[last_found]
+ var/outstring
+ if(C)
+ outstring = "[last_found]"
+ else
+ outstring = last_found
+ if(!time_diff)
+ html += "Last seen near [outstring] (now)
"
+ else
+ // 15 second intervals ~ 1/4 minute
+ var/m = round(time_diff/4)
+ var/s = (time_diff - 4*m) * 15
+ if(!s) s = "00"
+ html += "Last seen near [outstring] ([m]:[s] minute\s ago)
"
+ else
+ html += "Not yet seen."
+ else
+ track_mode = BUGMODE_LIST
+ return .(cameras)
+ return html
+
+/obj/item/device/camera_bug/proc/camera_report()
+ // this should only be called if current exists
+ var/dat = ""
+ if(current && current.can_use())
+ var/list/seen = current.can_see()
+ var/list/names = list()
+ for(var/obj/machinery/singularity/S in seen) // god help you if you see more than one
+ if(S.name in names)
+ names[S.name]++
+ dat += "[S.name] ([names[S.name]])"
+ else
+ names[S.name] = 1
+ dat += "[S.name]"
+ var/stage = round(S.current_size / 2)+1
+ dat += " (Stage [stage])"
+ dat += " \[Track\]
"
+
+ for(var/obj/mecha/M in seen)
+ if(M.name in names)
+ names[M.name]++
+ dat += "[M.name] ([names[M.name]])"
+ else
+ names[M.name] = 1
+ dat += "[M.name]"
+ dat += " \[Track\]
"
+
+
+ for(var/mob/living/M in seen)
+ if(M.name in names)
+ names[M.name]++
+ dat += "[M.name] ([names[M.name]])"
+ else
+ names[M.name] = 1
+ dat += "[M.name]"
+ if(M.buckled && !M.lying)
+ dat += " (Sitting)"
+ if(M.lying)
+ dat += " (Laying down)"
+ dat += " \[Track\]
"
+ if(length(dat) == 0)
+ dat += "No motion detected."
+ return dat
+ else
+ return "Camera Offline
"
+
+/obj/item/device/camera_bug/Topic(var/href,var/list/href_list)
+ if(usr != loc)
+ usr.unset_machine()
+ usr.reset_view(null)
+ usr << browse(null, "window=camerabug")
+ return
+ usr.set_machine(src)
+ if("mode" in href_list)
+ track_mode = text2num(href_list["mode"])
+ if("monitor" in href_list)
+ var/obj/machinery/camera/C = locate(href_list["monitor"])
+ if(C)
+ track_mode = BUGMODE_MONITOR
+ current = C
+ usr.reset_view(null)
+ interact()
+ if("track" in href_list)
+ var/atom/A = locate(href_list["track"])
+ if(A)
+ tracking = A
+ tracked_name = A.name
+ last_found = current.c_tag
+ last_seen = world.time
+ track_mode = BUGMODE_TRACK
+ if("emp" in href_list)
+ var/obj/machinery/camera/C = locate(href_list["emp"])
+ if(istype(C) && C.bug == src)
+ C.emp_act(1)
+ C.bug = null
+ bugged_cameras -= C.c_tag
+ interact()
+ return
+ if("close" in href_list)
+ usr.reset_view(null)
+ usr.unset_machine()
+ current = null
+ return // I do not <- I do not remember what I was going to write in this comment -Sayu, sometime later
+ if("view" in href_list)
+ var/obj/machinery/camera/C = locate(href_list["view"])
+ if(istype(C))
+ if(!C.can_use())
+ usr << "Something's wrong with that camera. You can't get a feed."
+ return
+ var/turf/T = get_turf(loc)
+ if(!T || C.z != T.z)
+ usr << "You can't get a signal."
+ return
+ current = C
+ spawn(6)
+ if(src.check_eye(usr))
+ usr.reset_view(C)
+ interact()
+ else
+ usr.unset_machine()
+ usr.reset_view(null)
+ usr << browse(null, "window=camerabug")
+ return
+ else
+ usr.unset_machine()
+ usr.reset_view(null)
+
+ interact()
+
+/obj/item/device/camera_bug/process()
+ if(track_mode == BUGMODE_LIST || (world.time < (last_tracked + refresh_interval)))
+ return
+ last_tracked = world.time
+ if(track_mode == BUGMODE_TRACK ) // search for user
+ // Note that it will be tricked if your name appears to change.
+ // This is not optimal but it is better than tracking you relentlessly despite everything.
+ if(!tracking)
+ src.updateSelfDialog()
+ return
+
+ if(tracking.name != tracked_name) // Hiding their identity, tricksy
+ var/mob/M = tracking
+ if(istype(M))
+ if(!(tracked_name == "Unknown" && findtext(tracking.name,"Unknown"))) // we saw then disguised before
+ if(!(tracked_name == M.real_name && findtext(tracking.name,M.real_name))) // or they're still ID'd
+ src.updateSelfDialog()//But if it's neither of those cases
+ return // you won't find em on the cameras
+ else
+ src.updateSelfDialog()
+ return
+
+ var/list/tracking_cams = list()
+ var/list/b_cams = get_cameras()
+ for(var/entry in b_cams)
+ tracking_cams += b_cams[entry]
+ var/list/target_region = view(tracking)
+
+ for(var/obj/machinery/camera/C in (target_region & tracking_cams))
+ if(!can_see(C,tracking)) // target may have xray, that doesn't make them visible to cameras
+ continue
+ if(C.can_use())
+ last_found = C.c_tag
+ last_seen = world.time
+ break
+ src.updateSelfDialog()
+
+/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]."
+ user.put_in_inactive_hand(expansion)
+ expansion = null
+ bugtype = VANILLA_BUG
+ skip_bugcheck = 0
+ track_mode = BUGMODE_LIST
+ tracking = null
+ return
+
+ if(expansion || !W)
+ return ..(W,user)
+
+ // I am not sure that this list is or should be final
+ // really I do not know what to do here.
+ var/static/list/expandables = list(
+ /obj/item/weapon/research = ADMIN_BUG, // could have been anything spawn-only
+
+ // these are all so hackish I am sorry
+
+ /obj/item/device/analyzer = UNIVERSAL_BUG,
+ /obj/item/weapon/stock_parts/subspace/analyzer = UNIVERSAL_BUG,
+
+ /obj/item/device/assembly/igniter = SABOTAGE_BUG,
+ /obj/item/device/assembly/infra = SABOTAGE_BUG, // ir blaster to disable camera
+ /obj/item/weapon/stock_parts/subspace/amplifier = SABOTAGE_BUG,
+
+ /obj/item/device/radio = NETWORK_BUG,
+ /obj/item/device/assembly/signaler = NETWORK_BUG,
+ /obj/item/weapon/stock_parts/subspace/transmitter = NETWORK_BUG,
+
+ /obj/item/device/detective_scanner = ADVANCED_BUG,
+ /obj/item/device/paicard = ADVANCED_BUG,
+ /obj/item/weapon/stock_parts/scanning_module = ADVANCED_BUG
+ )
+
+ for(var/entry in expandables)
+ if(istype(W,entry))
+ bugtype = expandables[entry]
+ user.drop_item()
+ W.loc = src
+ expansion = W
+ user << "You add [W] to [src]."
+ get_cameras() // the tracking code will want to know the new camera list
+ if(bugtype in list(UNIVERSAL_BUG,NETWORK_BUG,ADMIN_BUG))
+ skip_bugcheck = 1
+ return
+
+#undef VANILLA_BUG
+#undef UNIVERSAL_BUG
+#undef NETWORK_BUG
+#undef SABOTAGE_BUG
+#undef ADVANCED_BUG
+#undef ADMIN_BUG
+
+#undef BUGMODE_LIST
+#undef BUGMODE_MONITOR
+#undef BUGMODE_TRACK
\ No newline at end of file
diff --git a/code/game/objects/items/devices/chameleonproj.dm b/code/game/objects/items/devices/chameleonproj.dm
index 008a469dff9..de79a855768 100644
--- a/code/game/objects/items/devices/chameleonproj.dm
+++ b/code/game/objects/items/devices/chameleonproj.dm
@@ -1,7 +1,7 @@
/obj/item/device/chameleon
name = "chameleon-projector"
icon_state = "shield0"
- flags = FPRINT | TABLEPASS| CONDUCT
+ flags = CONDUCT
slot_flags = SLOT_BELT
item_state = "electronic"
throwforce = 5.0
diff --git a/code/game/objects/items/devices/debugger.dm b/code/game/objects/items/devices/debugger.dm
index 7a05fc696a9..1b9d5e13344 100644
--- a/code/game/objects/items/devices/debugger.dm
+++ b/code/game/objects/items/devices/debugger.dm
@@ -9,7 +9,7 @@
name = "debugger"
desc = "Used to debug electronic equipment."
icon_state = "hacktool-g"
- flags = FPRINT | TABLEPASS| CONDUCT
+ flags = CONDUCT
force = 5.0
w_class = 2.0
throwforce = 5.0
diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm
index 9c17c585b39..8643a20aaa5 100644
--- a/code/game/objects/items/devices/flash.dm
+++ b/code/game/objects/items/devices/flash.dm
@@ -7,7 +7,7 @@
w_class = 1
throw_speed = 3
throw_range = 7
- flags = FPRINT | TABLEPASS | CONDUCT
+ flags = CONDUCT
origin_tech = "magnets=2;combat=1"
var/times_used = 0 //Number of times it's been used.
@@ -16,7 +16,7 @@
/obj/item/device/flash/proc/clown_check(mob/user)
- if(user && (M_CLUMSY in user.mutations) && prob(50))
+ if(user && (CLUMSY in user.mutations) && prob(50))
flash_carbon(user, user, 15, 0)
return 0
return 1
@@ -66,10 +66,11 @@
if(user && convert)
terrible_conversion_proc(M, user)
M.Stun(1)
- user.visible_message("[user] blinds [M] with the flash!")
+ user.visible_message("[user] blinds [M] with the flash!")
return 1
else
- user.visible_message("[user] fails to blind [M] with the flash!")
+ if(user)
+ user.visible_message("[user] fails to blind [M] with the flash!")
return 0
/obj/item/device/flash/attack(mob/living/M, mob/user)
diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm
index 5c4201e2bc0..05a851b0d28 100644
--- a/code/game/objects/items/devices/flashlight.dm
+++ b/code/game/objects/items/devices/flashlight.dm
@@ -5,7 +5,7 @@
icon_state = "flashlight"
item_state = "flashlight"
w_class = 2
- flags = FPRINT | TABLEPASS | CONDUCT
+ flags = CONDUCT
slot_flags = SLOT_BELT
m_amt = 50
g_amt = 20
@@ -49,7 +49,7 @@
add_fingerprint(user)
if(on && user.zone_sel.selecting == "eyes")
- if(((M_CLUMSY in user.mutations) || user.getBrainLoss() >= 60) && prob(50)) //too dumb to use flashlight properly
+ if(((CLUMSY in user.mutations) || user.getBrainLoss() >= 60) && prob(50)) //too dumb to use flashlight properly
return ..() //just hit them in the head
if(!(istype(user, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey") //don't have dexterity
@@ -77,7 +77,7 @@
if(istype(M, /mob/living/carbon/human) || istype(M, /mob/living/carbon/monkey)) //robots and aliens are unaffected
if(M.stat == DEAD || M.sdisabilities & BLIND) //mob is dead or fully blind
user << "[M] pupils does not react to the light!"
- else if(M_XRAY in M.mutations) //mob has X-RAY vision
+ else if(XRAY in M.mutations) //mob has X-RAY vision
flick("flash", M.flash) //Yes, you can still get flashed wit X-Ray.
user << "[M] pupils give an eerie glow!"
else //they're okay!
@@ -107,7 +107,7 @@
item_state = ""
w_class = 1
slot_flags = SLOT_BELT | SLOT_EARS
- flags = FPRINT | TABLEPASS | CONDUCT
+ flags = CONDUCT
brightness_on = 2
/obj/item/device/flashlight/seclite
@@ -125,7 +125,7 @@
desc = "A miniature lamp, that might be used by small robots."
icon_state = "penlight"
item_state = ""
- flags = FPRINT | TABLEPASS | CONDUCT
+ flags = CONDUCT
brightness_on = 2
w_class = 1
diff --git a/code/game/objects/items/devices/handtv.dm b/code/game/objects/items/devices/handtv.dm
deleted file mode 100644
index 0406db85852..00000000000
--- a/code/game/objects/items/devices/handtv.dm
+++ /dev/null
@@ -1,47 +0,0 @@
-/obj/item/device/handtv
- name = "handheld tv"
- desc = "A handheld tv meant for remote viewing."
- icon_state = "handtv"
- w_class = 1
- var/obj/machinery/camera/current = null
-
-/obj/item/device/handtv/attack_self(mob/usr as mob)
- var/list/cameras = new/list()
- for (var/obj/machinery/camera/C in cameranet.viewpoints)
- if (C.hasbug && C.status)
- cameras.Add(C)
- if (length(cameras) == 0)
- usr << "\red No bugged functioning cameras found."
- return
-
- var/list/friendly_cameras = new/list()
-
- for (var/obj/machinery/camera/C in cameras)
- friendly_cameras.Add(C.c_tag)
-
- var/target = input("Select the camera to observe", null) as null|anything in friendly_cameras
- if (!target)
- usr.unset_machine()
- usr.reset_view(usr)
- src.in_use = 0
- return
- for (var/obj/machinery/camera/C in cameras)
- if (C.c_tag == target)
- target = C
- break
- if (usr.stat == 2) return
- if(target)
- usr.client.eye = target
- usr.set_machine(src)
- src.current = target
- src.in_use = 1
- else
- usr.unset_machine()
- src.in_use = 0
- return
-
-/obj/item/device/handtv/check_eye(var/mob/usr as mob)
- if ( src.loc != usr || usr.get_active_hand() != src|| !usr.canmove || usr.blinded || !current || !current.status )
- return null
- usr.reset_view(current)
- return 1
\ No newline at end of file
diff --git a/code/game/objects/items/devices/laserpointer.dm b/code/game/objects/items/devices/laserpointer.dm
index 9c8f766714f..5c104fcef54 100644
--- a/code/game/objects/items/devices/laserpointer.dm
+++ b/code/game/objects/items/devices/laserpointer.dm
@@ -5,7 +5,7 @@
icon_state = "pointer"
item_state = "pen"
var/pointer_icon_state
- flags = FPRINT | TABLEPASS | CONDUCT | USEDELAY
+ flags = CONDUCT
slot_flags = SLOT_BELT
m_amt = 500
g_amt = 500
@@ -45,7 +45,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 63836e9ecc6..3d9e623d53b 100644
--- a/code/game/objects/items/devices/lightreplacer.dm
+++ b/code/game/objects/items/devices/lightreplacer.dm
@@ -47,7 +47,7 @@
icon_state = "lightreplacer0"
item_state = "electronic"
- flags = FPRINT | CONDUCT
+ flags = CONDUCT
slot_flags = SLOT_BELT
origin_tech = "magnets=3;materials=2"
@@ -71,11 +71,7 @@
..()
usr << "It has [uses] lights remaining."
-/obj/item/device/lightreplacer/attackby(obj/item/W, mob/user)
- if(istype(W, /obj/item/weapon/card/emag) && emagged == 0)
- Emag()
- return
-
+/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
if(G.amount - decrement >= 0 && uses < max_uses)
@@ -104,7 +100,10 @@
user << "You need a working light."
return
-
+/obj/item/device/lightreplacer/emag_act(user as mob)
+ if(!emagged)
+ Emag()
+
/obj/item/device/lightreplacer/attack_self(mob/user)
/* // This would probably be a bit OP. If you want it though, uncomment the code.
if(isrobot(user))
diff --git a/code/game/objects/items/devices/megaphone.dm b/code/game/objects/items/devices/megaphone.dm
index 0d12f8262b6..11f706f01ba 100644
--- a/code/game/objects/items/devices/megaphone.dm
+++ b/code/game/objects/items/devices/megaphone.dm
@@ -4,7 +4,7 @@
icon_state = "megaphone"
item_state = "radio"
w_class = 1.0
- flags = FPRINT | TABLEPASS | CONDUCT
+ flags = CONDUCT
var/spamcheck = 0
var/emagged = 0
@@ -26,7 +26,7 @@
user << "\red \The [src] needs to recharge!"
return
- var/message = copytext(sanitize(input(user, "Shout a message?", "Megaphone", null) as text),1,MAX_MESSAGE_LEN)
+ var/message = sanitize(copytext(input(user, "Shout a message?", "Megaphone", null) as text,1,MAX_MESSAGE_LEN))
if(!message)
return
message = capitalize(message)
@@ -47,10 +47,8 @@
spamcheck = 0
return
-/obj/item/device/megaphone/attackby(obj/item/I, mob/user)
- if(istype(I, /obj/item/weapon/card/emag) && !emagged)
+/obj/item/device/megaphone/emag_act(user as mob)
+ if(!emagged)
user << "\red You overload \the [src]'s voice synthesizer."
emagged = 1
insults = rand(1, 3)//to prevent dickflooding
- return
- return
\ No newline at end of file
diff --git a/code/game/objects/items/devices/modkit.dm b/code/game/objects/items/devices/modkit.dm
index 6e23e94d4ad..61c83fdc462 100644
--- a/code/game/objects/items/devices/modkit.dm
+++ b/code/game/objects/items/devices/modkit.dm
@@ -23,7 +23,7 @@
if(!parts)
user << "This kit has no parts for this modification left."
- user.drop_from_inventory(src)
+ user.unEquip(src)
del(src)
return
@@ -59,7 +59,7 @@
parts &= ~MODKIT_SUIT
if(!parts)
- user.drop_from_inventory(src)
+ user.unEquip(src)
del(src)
/obj/item/device/modkit/examine()
diff --git a/code/game/objects/items/devices/multitool.dm b/code/game/objects/items/devices/multitool.dm
index 85a30681b1a..21bd2c49ddf 100644
--- a/code/game/objects/items/devices/multitool.dm
+++ b/code/game/objects/items/devices/multitool.dm
@@ -8,7 +8,7 @@
name = "multitool"
desc = "Used for pulsing wires to test which to cut. Not recommended by doctors."
icon_state = "multitool"
- flags = FPRINT | TABLEPASS| CONDUCT
+ flags = CONDUCT
force = 5.0
w_class = 2.0
throwforce = 5.0
diff --git a/code/game/objects/items/devices/paicard.dm b/code/game/objects/items/devices/paicard.dm
index cb7dea3371d..b5d14aa8982 100644
--- a/code/game/objects/items/devices/paicard.dm
+++ b/code/game/objects/items/devices/paicard.dm
@@ -4,7 +4,6 @@
icon_state = "pai"
item_state = "electronic"
w_class = 2.0
- flags = FPRINT | TABLEPASS
slot_flags = SLOT_BELT
origin_tech = "programming=2"
var/obj/item/device/radio/radio
@@ -162,19 +161,13 @@
| Transmit: |
- [(!radio.isWireCut(WIRE_TRANSMIT)) ? "En" : "Dis" ]abled
+ | [radio.broadcasting ? "En" : "Dis" ]abled
|
| Receive: |
- [(!radio.isWireCut(WIRE_RECEIVE)) ? "En" : "Dis" ]abled
-
- |
-
-
- | Signal Pulser: |
- [(!radio.isWireCut(WIRE_SIGNAL)) ? "En" : "Dis" ]abled
+ | [radio.listening ? "En" : "Dis" ]abled
|
@@ -266,10 +259,13 @@
removePersonality()
if(href_list["wires"])
var/t1 = text2num(href_list["wires"])
- if(radio)
- radio.wires.CutWireIndex(t1)
+ switch(t1)
+ if(4)
+ radio.ToggleBroadcast()
+ if(2)
+ radio.ToggleReception()
if(href_list["setlaws"])
- var/newlaws = copytext(sanitize(input("Enter any additional directives you would like your pAI personality to follow. Note that these directives will not override the personality's allegiance to its imprinted master. Conflicting directives will be ignored.", "pAI Directive Configuration", pai.pai_laws) as message),1,MAX_MESSAGE_LEN)
+ var/newlaws = sanitize(copytext(input("Enter any additional directives you would like your pAI personality to follow. Note that these directives will not override the personality's allegiance to its imprinted master. Conflicting directives will be ignored.", "pAI Directive Configuration", pai.pai_laws) as message,1,MAX_MESSAGE_LEN))
if(newlaws)
pai.pai_laws = newlaws
pai << "Your supplemental directives have been updated. Your new directives are:"
diff --git a/code/game/objects/items/devices/powersink.dm b/code/game/objects/items/devices/powersink.dm
index 088a51574ab..f9907855224 100644
--- a/code/game/objects/items/devices/powersink.dm
+++ b/code/game/objects/items/devices/powersink.dm
@@ -6,7 +6,7 @@
icon_state = "powersink0"
item_state = "electronic"
w_class = 4.0
- flags = FPRINT | TABLEPASS | CONDUCT
+ flags = CONDUCT
throwforce = 5
throw_speed = 1
throw_range = 2
@@ -21,7 +21,7 @@
var/obj/structure/cable/attached // the attached cable
- attackby(var/obj/item/I, var/mob/user)
+ attackby(var/obj/item/I, var/mob/user, params)
if(istype(I, /obj/item/weapon/screwdriver))
if(mode == 0)
var/turf/T = loc
diff --git a/code/game/objects/items/devices/radio/beacon.dm b/code/game/objects/items/devices/radio/beacon.dm
index 15f59e66dcb..628a6ee8bba 100644
--- a/code/game/objects/items/devices/radio/beacon.dm
+++ b/code/game/objects/items/devices/radio/beacon.dm
@@ -8,15 +8,11 @@
var/emagged = 0
var/syndicate = 0
-/obj/item/device/radio/beacon/attackby(I as obj, mob/living/user as mob)
- if(istype(I,/obj/item/weapon/card/emag)) // If hit by an emag.
- var/obj/item/weapon/card/emag/E = I
- if(!emagged)
- if(E.uses)
- E.uses--
- emagged = 1
- syndicate = 1
- user << "\blue The This beacon now only be locked on to by emagged teleporters!"
+/obj/item/device/radio/beacon/emag_act(user as mob)
+ if(!emagged)
+ emagged = 1
+ syndicate = 1
+ user << "\blue The This beacon now only be locked on to by emagged teleporters!"
/obj/item/device/radio/beacon/hear_talk()
return
diff --git a/code/game/objects/items/devices/radio/electropack.dm b/code/game/objects/items/devices/radio/electropack.dm
index ccdc3a9bce4..ff5c90e0985 100644
--- a/code/game/objects/items/devices/radio/electropack.dm
+++ b/code/game/objects/items/devices/radio/electropack.dm
@@ -4,7 +4,7 @@
icon_state = "electropack0"
item_state = "electropack"
frequency = 1449
- flags = FPRINT | CONDUCT | TABLEPASS
+ flags = CONDUCT
slot_flags = SLOT_BACK
w_class = 5.0
g_amt = 2500
@@ -26,7 +26,7 @@
S.part2 = null
master = null
-/obj/item/device/radio/electropack/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/item/device/radio/electropack/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
..()
if(istype(W, /obj/item/clothing/head/helmet))
if(!b_stat)
@@ -35,18 +35,22 @@
var/obj/item/assembly/shock_kit/A = new /obj/item/assembly/shock_kit( user )
A.icon = 'icons/obj/assemblies.dmi'
- user.drop_from_inventory(W)
+ if(!user.unEquip(W))
+ user << "\the [W] is stuck to your hand, you cannot attach it to \the [src]!"
+ return
W.loc = A
W.master = A
A.part1 = W
- user.drop_from_inventory(src)
+ user.unEquip(src)
loc = A
master = A
A.part2 = src
user.put_in_hands(A)
A.add_fingerprint(user)
+ if(src.flags & NODROP)
+ A.flags |= NODROP
/obj/item/device/radio/electropack/Topic(href, href_list)
//..()
diff --git a/code/game/objects/items/devices/radio/encryptionkey.dm b/code/game/objects/items/devices/radio/encryptionkey.dm
index bd4119ecef3..2c112dc12d0 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 32bf7da3c7a..674cb41517f 100644
--- a/code/game/objects/items/devices/radio/headset.dm
+++ b/code/game/objects/items/devices/radio/headset.dm
@@ -1,9 +1,9 @@
/obj/item/device/radio/headset
name = "radio headset"
desc = "An updated, modular intercom that fits over the head. Takes encryption keys."
+ var/radio_desc = ""
icon_state = "headset"
item_state = "headset"
- g_amt = 0
m_amt = 75
subspace_transmission = 1
canhear_range = 0 // can't hear headsets from very far away
@@ -15,20 +15,45 @@
var/obj/item/device/encryptionkey/keyslot2 = null
maxf = 1489
+ var/ks1type = null
+ var/ks2type = null
+
/obj/item/device/radio/headset/New()
..()
- recalculateChannels()
+ if(ks1type)
+ keyslot1 = new ks1type(src)
+ if(ks2type)
+ keyslot2 = new ks2type(src)
+ recalculateChannels(1)
+/obj/item/device/radio/headset/examine(mob/user)
+ if(!(..(user, 1) && radio_desc))
+ return
+
+ user << "The following channels are built-in:"
+ user << radio_desc
+
+/obj/item/device/radio/headset/handle_message_mode(mob/living/M as mob, message, channel)
+ if (channel == "special")
+ if (translate_binary)
+ var/datum/language/binary = all_languages["Robot Talk"]
+ binary.broadcast(M, message)
+ if (translate_hive)
+ var/datum/language/hivemind = all_languages["Hivemind"]
+ hivemind.broadcast(M, message)
+ return null
+
+ return ..()
/obj/item/device/radio/headset/receive_range(freq, level, aiOverride = 0)
- if(aiOverride)
+ if (aiOverride)
return ..(freq, level)
if(ishuman(src.loc))
var/mob/living/carbon/human/H = src.loc
if(H.l_ear == src || H.r_ear == src)
return ..(freq, level)
return -1
-
+
/obj/item/device/radio/headset/alt
name = "bowman headset"
desc = "An updated, modular intercom that fits over the head. Takes encryption keys. Protects ears from flashbangs."
@@ -38,219 +63,216 @@
/obj/item/device/radio/headset/syndicate
origin_tech = "syndicate=3"
+ syndie = 1
+ ks1type = /obj/item/device/encryptionkey/syndicate
/obj/item/device/radio/headset/syndicate/alt //undisguised bowman with flash protection
name = "syndicate headset"
- desc = "A syndicate headset that can be used to hear all radio frequencies. Protects ears from flashbangs. \nTo access the syndicate channel, use ; before speaking."
+ desc = "A syndicate headset that can be used to hear all radio frequencies. Protects ears from flashbangs."
flags = EARBANGPROTECT
origin_tech = "syndicate=3"
icon_state = "syndie_headset"
item_state = "syndie_headset"
-/obj/item/device/radio/headset/syndicate/New()
- ..()
- del(keyslot1)
- keyslot1 = new /obj/item/device/encryptionkey/syndicate
- syndie = 1
- recalculateChannels()
-
/obj/item/device/radio/headset/binary
origin_tech = "syndicate=3"
-/obj/item/device/radio/headset/binary/New()
- ..()
- del(keyslot1)
- keyslot1 = new /obj/item/device/encryptionkey/binary
- recalculateChannels()
+ ks1type = /obj/item/device/encryptionkey/binary
/obj/item/device/radio/headset/headset_sec
name = "security radio headset"
- desc = "This is used by your elite security force. To access the security channel, use :s."
+ desc = "This is used by your elite security force."
icon_state = "sec_headset"
item_state = "headset"
- keyslot1 = new /obj/item/device/encryptionkey/headset_sec
+ ks2type = /obj/item/device/encryptionkey/headset_sec
/obj/item/device/radio/headset/headset_sec/alt
name = "security bowman headset"
- desc = "This is used by your elite security force. Protects ears from flashbangs. \nTo access the security channel, use :s."
+ desc = "This is used by your elite security force. Protects ears from flashbangs."
flags = EARBANGPROTECT
icon_state = "sec_headset_alt"
item_state = "sec_headset_alt"
/obj/item/device/radio/headset/headset_eng
name = "engineering radio headset"
- desc = "When the engineers wish to chat like girls. To access the engineering channel, use :e. "
+ desc = "When the engineers wish to chat like girls."
icon_state = "eng_headset"
item_state = "headset"
- keyslot1 = new /obj/item/device/encryptionkey/headset_eng
+ ks2type = /obj/item/device/encryptionkey/headset_eng
/obj/item/device/radio/headset/headset_rob
name = "robotics radio headset"
- desc = "Made specifically for the roboticists who cannot decide between departments. To access the engineering channel, use :e. For research, use :n."
+ desc = "Made specifically for the roboticists who cannot decide between departments."
icon_state = "rob_headset"
item_state = "headset"
- keyslot1 = new /obj/item/device/encryptionkey/headset_rob
+ ks2type = /obj/item/device/encryptionkey/headset_rob
/obj/item/device/radio/headset/headset_med
name = "medical radio headset"
- desc = "A headset for the trained staff of the medbay. To access the medical channel, use :m."
+ desc = "A headset for the trained staff of the medbay."
icon_state = "med_headset"
item_state = "headset"
- keyslot1 = new /obj/item/device/encryptionkey/headset_med
+ ks2type = /obj/item/device/encryptionkey/headset_med
/obj/item/device/radio/headset/headset_sci
name = "science radio headset"
- desc = "A sciency headset. Like usual. To access the science channel, use :n."
+ desc = "A sciency headset. Like usual."
icon_state = "sci_headset"
item_state = "headset"
- keyslot1 = new /obj/item/device/encryptionkey/headset_sci
+ ks2type = /obj/item/device/encryptionkey/headset_sci
/obj/item/device/radio/headset/headset_medsci
name = "medical research radio headset"
- desc = "A headset that is a result of the mating between medical and science. To access the medical channel, use :m. For science, use :n."
+ desc = "A headset that is a result of the mating between medical and science."
icon_state = "medsci_headset"
item_state = "headset"
- keyslot1 = new /obj/item/device/encryptionkey/headset_medsci
+ ks2type = /obj/item/device/encryptionkey/headset_medsci
/obj/item/device/radio/headset/headset_com
name = "command radio headset"
- desc = "A headset with a commanding channel. To access the command channel, use :c."
+ desc = "A headset with a commanding channel."
icon_state = "com_headset"
item_state = "headset"
- keyslot1 = new /obj/item/device/encryptionkey/headset_com
+ ks2type = /obj/item/device/encryptionkey/headset_com
/obj/item/device/radio/headset/heads/captain
name = "captain's headset"
- desc = "The headset of the boss. Channels are as follows: :c - command, :s - security, :e - engineering, :u - supply, :z - service, :m - medical, :n - science."
+ desc = "The headset of the boss."
icon_state = "com_headset"
item_state = "headset"
- keyslot1 = new /obj/item/device/encryptionkey/heads/captain
+ ks2type = /obj/item/device/encryptionkey/heads/captain
/obj/item/device/radio/headset/heads/captain/alt
name = "\proper the captain's bowman headset"
- desc = "The headset of the boss. Protects ears from flashbangs. \nChannels are as follows: :c - command, :s - security, :e - engineering, :u - supply, :v - service, :m - medical, :n - science."
+ desc = "The headset of the boss. Protects ears from flashbangs."
flags = EARBANGPROTECT
icon_state = "com_headset_alt"
item_state = "com_headset_alt"
/obj/item/device/radio/headset/heads/rd
name = "Research Director's headset"
- desc = "Headset of the researching God. To access the science channel, use :n. For command, use :c."
+ desc = "Headset of the researching God."
icon_state = "com_headset"
item_state = "headset"
- keyslot1 = new /obj/item/device/encryptionkey/heads/rd
+ ks2type = /obj/item/device/encryptionkey/heads/rd
/obj/item/device/radio/headset/heads/hos
name = "head of security's headset"
- desc = "The headset of the man who protects your worthless lifes. To access the security channel, use :s. For command, use :c."
+ desc = "The headset of the man who protects your worthless lives."
icon_state = "com_headset"
item_state = "headset"
- keyslot1 = new /obj/item/device/encryptionkey/heads/hos
+ ks2type = /obj/item/device/encryptionkey/heads/hos
/obj/item/device/radio/headset/heads/hos/alt
name = "\proper the head of security's bowman headset"
- desc = "The headset of the man in charge of keeping order and protecting the station. Protects ears from flashbangs. \nTo access the security channel, use :s. For command, use :c."
+ desc = "The headset of the man in charge of keeping order and protecting the station. Protects ears from flashbangs."
flags = EARBANGPROTECT
icon_state = "com_headset_alt"
item_state = "com_headset_alt"
/obj/item/device/radio/headset/heads/ce
name = "chief engineer's headset"
- desc = "The headset of the guy who is in charge of morons. To access the engineering channel, use :e. For command, use :c."
+ desc = "The headset of the guy who is in charge of morons."
icon_state = "com_headset"
item_state = "headset"
- keyslot1 = new /obj/item/device/encryptionkey/heads/ce
+ ks2type = /obj/item/device/encryptionkey/heads/ce
/obj/item/device/radio/headset/heads/cmo
name = "chief medical officer's headset"
- desc = "The headset of the highly trained medical chief. To access the medical channel, use :m. For command, use :c."
+ desc = "The headset of the highly trained medical chief."
icon_state = "com_headset"
item_state = "headset"
- keyslot1 = new /obj/item/device/encryptionkey/heads/cmo
+ ks2type = /obj/item/device/encryptionkey/heads/cmo
/obj/item/device/radio/headset/heads/hop
name = "head of personnel's headset"
- desc = "The headset of the guy who will one day be captain. Channels are as follows: :u - supply, :z - service, :s - security, :c - command."
+ desc = "The headset of the guy who will one day be captain."
icon_state = "com_headset"
item_state = "headset"
- keyslot1 = new /obj/item/device/encryptionkey/heads/hop
+ ks2type = /obj/item/device/encryptionkey/heads/hop
/*
/obj/item/device/radio/headset/headset_mine
name = "mining radio headset"
- desc = "Headset used by miners. How useless. To access the mining channel, use :d."
+ desc = "Headset used by miners. How useless."
icon_state = "mine_headset"
item_state = "headset"
- keyslot1 = new /obj/item/device/encryptionkey/headset_mine
+ ks2type = /obj/item/device/encryptionkey/headset_mine
/obj/item/device/radio/headset/heads/qm
name = "quartermaster's headset"
- desc = "The headset of the man who control your toiletpaper supply. To access the cargo channel, use :q. For mining, use :d."
+ desc = "The headset of the man who control your toiletpaper supply."
icon_state = "cargo_headset"
item_state = "headset"
- keyslot1 = new /obj/item/device/encryptionkey/heads/qm
+ ks2type = /obj/item/device/encryptionkey/heads/qm
*/
/obj/item/device/radio/headset/headset_cargo
name = "supply radio headset"
- desc = "A headset used by the cargo department. To access the supply channel, use :u."
+ desc = "A headset used by the cargo department."
icon_state = "cargo_headset"
item_state = "headset"
- keyslot1 = new /obj/item/device/encryptionkey/headset_cargo
+ ks2type = /obj/item/device/encryptionkey/headset_cargo
/obj/item/device/radio/headset/headset_service
name = "service radio headset"
- desc = "Headset used by the service staff, tasked with keeping the station full, happy and clean. To access the service channel, use :z."
+ desc = "Headset used by the service staff, tasked with keeping the station full, happy and clean."
icon_state = "srv_headset"
item_state = "headset"
- keyslot1 = new /obj/item/device/encryptionkey/headset_service
+ ks2type = /obj/item/device/encryptionkey/headset_service
/obj/item/device/radio/headset/heads/ntrep
name = "nanotrasen representative's headset"
- desc = "The headset of the Nanotrasen Representative. Channels are as follows: :c - command, :s - security, :e - engineering, :u - supply, :z - service, :m - medical, :n - science."
+ desc = "The headset of the Nanotrasen Representative."
icon_state = "com_headset"
item_state = "headset"
- keyslot1 = new /obj/item/device/encryptionkey/heads/ntrep
+ ks2type = /obj/item/device/encryptionkey/heads/ntrep
/obj/item/device/radio/headset/heads/magistrate
name = "magistrate's headset"
- desc = "The headset of the Magistrate. Channels are as follows: :c - command, :s - security."
+ desc = "The headset of the Magistrate."
icon_state = "com_headset"
item_state = "headset"
- keyslot1 = new /obj/item/device/encryptionkey/heads/magistrate
+ ks2type = /obj/item/device/encryptionkey/heads/magistrate
/obj/item/device/radio/headset/heads/blueshield
name = "blueshield's headset"
- desc = "The headset of the Blueshield. Channels are as follows: :c - command, :s - security."
+ desc = "The headset of the Blueshield."
icon_state = "com_headset"
item_state = "headset"
- keyslot1 = new /obj/item/device/encryptionkey/heads/blueshield
+ ks2type = /obj/item/device/encryptionkey/heads/blueshield
-/obj/item/device/radio/headset/ert
- name = "emergency response team headset"
- desc = "The headset of the boss's boss. Channels are as follows: :h - Response Team :c - command, :s - security, :e - engineering, :d - mining, :u - cargo, :z - service, :m - medical, :n - science."
- icon_state = "com_headset"
- item_state = "headset"
- freerange = 1
- keyslot1 = new /obj/item/device/encryptionkey/ert
-
-/obj/item/device/radio/headset/ert/alt
- name = "\proper emergency response team's bowman headset"
- desc = "The headset of the boss. Protects ears from flashbangs. \nChannels are as follows: :h - Response Team, :c - command, :s - security, :e - engineering, :u - supply, :v - service, :m - medical, :n - science."
+/obj/item/device/radio/headset/heads/blueshield/alt
+ name = "\proper blueshield's bowman headset"
+ desc = "The headset of the Blueshield. Protects ears from flashbangs."
+ flags = EARBANGPROTECT
+ icon_state = "com_headset_alt"
+ item_state = "com_headset_alt"
+
+/obj/item/device/radio/headset/ert
+ name = "emergency response team headset"
+ desc = "The headset of the boss's boss."
+ icon_state = "com_headset"
+ item_state = "headset"
+ freerange = 1
+ ks2type = /obj/item/device/encryptionkey/ert
+
+/obj/item/device/radio/headset/ert/alt
+ name = "\proper emergency response team's bowman headset"
+ desc = "The headset of the boss. Protects ears from flashbangs."
flags = EARBANGPROTECT
icon_state = "com_headset_alt"
item_state = "com_headset_alt"
-//The below was ported from Baystation.
/obj/item/device/radio/headset/heads/ai_integrated //No need to care about icons, it should be hidden inside the AI anyway.
- name = "AI Subspace Transceiver"
+ name = "\improper AI subspace transceiver"
desc = "Integrated AI radio transceiver."
icon = 'icons/obj/robot_component.dmi'
icon_state = "radio"
item_state = "headset"
- keyslot2 = new /obj/item/device/encryptionkey/heads/ai_integrated
- var/myAi = null // Atlantis: Reference back to the AI which has this radio.
+ ks2type = /obj/item/device/encryptionkey/heads/ai_integrated
+ var/myAi = null // Atlantis: Reference back to the AI which has this radio.
var/disabledAi = 0 // Atlantis: Used to manually disable AI's integrated radio via intellicard menu.
/obj/item/device/radio/headset/heads/ai_integrated/receive_range(freq, level)
- if(disabledAi)
+ if (disabledAi)
return -1 //Transciever Disabled.
return ..(freq, level, 1)
@@ -287,7 +309,7 @@
user << "You pop out the encryption keys in the headset!"
else
- user << "This headset doesn't have any unique encryption keys! How useless..."
+ user << "This headset doesn't have any encryption keys! How useless..."
if(istype(W, /obj/item/device/encryptionkey/))
if(keyslot1 && keyslot2)
@@ -310,7 +332,7 @@
return
-/obj/item/device/radio/headset/proc/recalculateChannels()
+/obj/item/device/radio/headset/proc/recalculateChannels(var/setDescription = 0)
src.channels = list()
src.translate_binary = 0
src.translate_hive = 0
@@ -358,4 +380,18 @@
secure_radio_connections[ch_name] = radio_controller.add_object(src, radiochannels[ch_name], RADIO_CHAT)
+ if(setDescription)
+ setupRadioDescription()
+
return
+
+/obj/item/device/radio/headset/proc/setupRadioDescription()
+ var/radio_text = ""
+ for(var/i = 1 to channels.len)
+ var/channel = channels[i]
+ var/key = get_radio_key_from_channel(channel)
+ radio_text += "[key] - [channel]"
+ if(i != channels.len)
+ radio_text += ", "
+
+ radio_desc = radio_text
diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm
index 3f30f0c03e7..567dc49bf4f 100644
--- a/code/game/objects/items/devices/radio/intercom.dm
+++ b/code/game/objects/items/devices/radio/intercom.dm
@@ -4,8 +4,8 @@
icon_state = "intercom"
anchored = 1
w_class = 4.0
- canhear_range = 5
- flags = FPRINT | CONDUCT | TABLEPASS | NOBLOODY
+ canhear_range = 2
+ flags = CONDUCT | NOBLOODY
var/number = 0
var/anyai = 1
var/mob/living/silicon/ai/ai = list()
@@ -15,7 +15,7 @@
..()
processing_objects += src
-/obj/item/device/radio/intercom/Destroy()
+/obj/item/device/radio/intercom/Del()
processing_objects -= src
..()
@@ -24,10 +24,6 @@
spawn (0)
attack_self(user)
-/obj/item/device/radio/intercom/attack_paw(mob/user as mob)
- return src.attack_hand(user)
-
-
/obj/item/device/radio/intercom/attack_hand(mob/user as mob)
src.add_fingerprint(user)
spawn (0)
@@ -36,15 +32,13 @@
/obj/item/device/radio/intercom/receive_range(freq, level)
if (!on)
return -1
- if (isWireCut(WIRE_RECEIVE))
- return -1
if(!(0 in level))
var/turf/position = get_turf(src)
if(isnull(position) || !(position.z in level))
return -1
if (!src.listening)
return -1
- if(freq == SYND_FREQ)
+ if(freq in ANTAG_FREQS)
if(!(src.syndie))
return -1//Prevents broadcast of messages over devices lacking the encryption
@@ -72,4 +66,4 @@
if(!on)
icon_state = "intercom-p"
else
- icon_state = "intercom"
\ No newline at end of file
+ icon_state = "intercom"
diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm
index 9f177bdf642..fc4e955a50f 100644
--- a/code/game/objects/items/devices/radio/radio.dm
+++ b/code/game/objects/items/devices/radio/radio.dm
@@ -1,8 +1,3 @@
-var/GLOBAL_RADIO_TYPE = 1 // radio type to use
- // 0 = old radios
- // 1 = new radios (subspace technology)
-
-
/obj/item/device/radio
icon = 'icons/obj/radio.dmi'
name = "station bounced radio"
@@ -11,52 +6,50 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use
item_state = "walkietalkie"
var/on = 1 // 0 for off
var/last_transmission
- var/frequency = 1459 //common chat
+ var/frequency = PUB_FREQ //common chat
var/traitor_frequency = 0 //tune to frequency to unlock traitor supplies
var/canhear_range = 3 // the range which mobs can hear this radio from
var/obj/item/device/radio/patch_link = null
var/datum/wires/radio/wires = null
- var/prison_radio = 0
var/b_stat = 0
var/broadcasting = 0
var/listening = 1
var/freerange = 0 // 0 - Sanitize frequencies, 1 - Full range
- var/list/channels = list() //see communications.dm for full list. First channels is a "default" for :h
+ var/list/channels = list() //see communications.dm for full list. First channes is a "default" for :h
var/subspace_transmission = 0
- var/syndie = 0//Holder to see if it's a syndicate encrypted radio
+ var/syndie = 0//Holder to see if it's a syndicate encrpyed radio
var/maxf = 1499
// "Example" = FREQ_LISTENING|FREQ_BROADCASTING
- flags = FPRINT | CONDUCT | TABLEPASS
+ flags = CONDUCT
slot_flags = SLOT_BELT
throw_speed = 2
throw_range = 9
w_class = 2
- g_amt = 25
+
m_amt = 75
-
- var/const/TRANSMISSION_DELAY = 5 // only 2/second/radio
+ g_amt = 25
var/const/FREQ_LISTENING = 1
- //FREQ_BROADCASTING = 2
+ var/prison_radio = 0
- var/always_talk=0 // ALWAYS catch signals. Useful for covert listening devices.
/obj/item/device/radio
var/datum/radio_frequency/radio_connection
- var/list/datum/radio_frequency/secure_radio_connections
+ var/list/datum/radio_frequency/secure_radio_connections = new
proc/set_frequency(new_frequency)
radio_controller.remove_object(src, frequency)
frequency = new_frequency
radio_connection = radio_controller.add_object(src, frequency, RADIO_CHAT)
+
/obj/item/device/radio/New()
- wires = new(src)
- if(prison_radio)
- wires.CutWireIndex(WIRE_TRANSMIT)
- secure_radio_connections = new
..()
+ wires = new(src)
if(radio_controller)
initialize()
+
+ if(prison_radio)
+ wires.CutWireIndex(WIRE_TRANSMIT)
/obj/item/device/radio/initialize()
@@ -117,9 +110,16 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use
/obj/item/device/radio/proc/text_sec_channel(var/chan_name, var/chan_stat)
var/list = !!(chan_stat&FREQ_LISTENING)!=0
return {"
- [chan_name]: [list ? "Engaged" : "Disengaged"]
+ [chan_name]
+ Speaker: [list ? "Engaged" : "Disengaged"]
"}
+/obj/item/device/radio/proc/ToggleBroadcast()
+ broadcasting = !broadcasting && !(wires.IsIndexCut(WIRE_TRANSMIT) || wires.IsIndexCut(WIRE_SIGNAL))
+
+/obj/item/device/radio/proc/ToggleReception()
+ listening = !listening && !(wires.IsIndexCut(WIRE_RECEIVE) || wires.IsIndexCut(WIRE_SIGNAL))
+
/obj/item/device/radio/Topic(href, href_list)
//..()
if (usr.stat || !on)
@@ -129,13 +129,6 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use
usr << browse(null, "window=radio")
return
usr.set_machine(src)
- if (href_list["open"])
- var/mob/target = locate(href_list["open"])
- var/mob/living/silicon/ai/A = locate(href_list["open2"])
- if(A && target)
- A.open_nearest_door(target)
- return
-
if (href_list["track"])
var/mob/target = locate(href_list["track"])
var/mob/living/silicon/ai/A = locate(href_list["track2"])
@@ -143,23 +136,6 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use
A.ai_actual_track(target)
return
- else if (href_list["faketrack"])
- var/mob/target = locate(href_list["track"])
- var/mob/living/silicon/ai/A = locate(href_list["track2"])
- if(A && target)
-
- A:cameraFollow = target
- A << text("Now tracking [] on camera.", target.name)
- if (usr.machine == null)
- usr.machine = usr
-
- while (usr:cameraFollow == target)
- usr << "Target is not on or near any active cameras on the station. We'll check again in 5 seconds (unless you use the cancel-camera verb)."
- sleep(40)
- continue
-
- return
-
else if (href_list["freq"])
var/new_frequency = (frequency + text2num(href_list["freq"]))
if (!freerange || (frequency < 1200 || frequency > 1600))
@@ -171,16 +147,17 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use
return
else if (href_list["talk"])
- broadcasting = text2num(href_list["talk"])
+ ToggleBroadcast()
else if (href_list["listen"])
var/chan_name = href_list["ch_name"]
if (!chan_name)
- listening = text2num(href_list["listen"])
+ ToggleReception()
else
if (channels[chan_name] & FREQ_LISTENING)
channels[chan_name] &= ~FREQ_LISTENING
else
channels[chan_name] |= FREQ_LISTENING
+
if (!( master ))
if (istype(loc, /mob))
interact(loc)
@@ -193,10 +170,7 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use
updateDialog()
add_fingerprint(usr)
-/obj/item/device/radio/proc/isWireCut(var/index)
- return wires.IsIndexCut(index)
-
-/obj/item/device/radio/proc/autosay(var/message, var/from, var/channel, var/zlevel = list(1)) //BS12 EDIT
+/obj/item/device/radio/proc/autosay(var/message, var/from, var/channel, var/zlevel = config.contact_levels) //BS12 EDIT
var/datum/radio_frequency/connection = null
if(channel && channels && channels.len > 0)
if (channel == "department")
@@ -219,173 +193,115 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use
del(A)
return
-/obj/item/device/radio/talk_into(mob/living/M as mob, message, channel)
- if(!on) return // the device has to be on
+// Interprets the message mode when talking into a radio, possibly returning a connection datum
+/obj/item/device/radio/proc/handle_message_mode(mob/living/M as mob, message, message_mode)
+ // If a channel isn't specified, send to common.
+ if(!message_mode || message_mode == "headset")
+ return radio_connection
+
+ // Otherwise, if a channel is specified, look for it.
+ if(channels && channels.len > 0)
+ if (message_mode == "department") // Department radio shortcut
+ message_mode = channels[1]
+
+ if (channels[message_mode]) // only broadcast if the channel is set on
+ return secure_radio_connections[message_mode]
+
+ // If we were to send to a channel we don't have, drop it.
+ return null
+
+/obj/item/device/radio/talk_into(mob/living/M as mob, message, channel, var/verb = "says", var/datum/language/speaking = null)
+ if(!on) return 0 // the device has to be on
// Fix for permacell radios, but kinda eh about actually fixing them.
- if(!M || !message) return
+ if(!M || !message) return 0
// Uncommenting this. To the above comment:
// The permacell radios aren't suppose to be able to transmit, this isn't a bug and this "fix" is just making radio wires useless. -Giacom
- if(isWireCut(WIRE_TRANSMIT)) // The device has to have all its wires and shit intact
- return
+ if(wires.IsIndexCut(WIRE_TRANSMIT)) // The device has to have all its wires and shit intact
+ return 0
+
+ M.last_target_click = world.time
+
+ /* Quick introduction:
+ This new radio system uses a very robust FTL signaling technology unoriginally
+ dubbed "subspace" which is somewhat similar to 'blue-space' but can't
+ actually transmit large mass. Headsets are the only radio devices capable
+ of sending subspace transmissions to the Communications Satellite.
+
+ A headset sends a signal to a subspace listener/reciever elsewhere in space,
+ the signal gets processed and logged, and an audible transmission gets sent
+ to each individual headset.
+ */
+
+ //#### Grab the connection datum ####//
+ var/datum/radio_frequency/connection = handle_message_mode(M, message, channel)
+ if (!istype(connection))
+ return 0
+ if (!connection)
+ return 0
+
+ var/turf/position = get_turf(src)
+
+ //#### Tagging the signal with all appropriate identity values ####//
+
+ // ||-- The mob's name identity --||
+ var/displayname = M.name // grab the display name (name you get when you hover over someone's icon)
+ var/real_name = M.real_name // mob's real name
+ var/mobkey = "none" // player key associated with mob
+ var/voicemask = 0 // the speaker is wearing a voice mask
+ if(M.client)
+ mobkey = M.key // assign the mob's key
- if(GLOBAL_RADIO_TYPE == 1) // NEW RADIO SYSTEMS: By Doohl
+ var/jobname // the mob's "job"
- /* Quick introduction:
- This new radio system uses a very robust FTL signaling technology unoriginally
- dubbed "subspace" which is somewhat similar to 'blue-space' but can't
- actually transmit large mass. Headsets are the only radio devices capable
- of sending subspace transmissions to the Communications Satellite.
+ // --- Human: use their actual job ---
+ if (ishuman(M))
+ var/mob/living/carbon/human/H = M
+ jobname = H.get_assignment()
- A headset sends a signal to a subspace listener/reciever elsewhere in space,
- the signal gets processed and logged, and an audible transmission gets sent
- to each individual headset.
- */
+ // --- Carbon Nonhuman ---
+ else if (iscarbon(M)) // Nonhuman carbon mob
+ jobname = "No id"
- //#### Grab the connection datum ####//
- var/datum/radio_frequency/connection = null
- //testing("[src]: talk_into([M], [message], [channel])")
- if(channel == "headset")
- channel = null
- if(channel) // If a channel is specified, look for it.
- if(channels && channels.len > 0)
- if (channel == "department")
- //world << "DEBUG: channel=\"[channel]\" switching to \"[channels[1]]\""
- channel = channels[1]
- connection = secure_radio_connections[channel]
- if (!channels[channel]) // if the channel is turned off, don't broadcast
- return
- else
- // If we were to send to a channel we don't have, drop it.
- return
- else // If a channel isn't specified, send to common.
- connection = radio_connection
- channel = null
- if (!istype(connection))
- return
- if (!connection)
- return
+ // --- AI ---
+ else if (isAI(M))
+ jobname = "AI"
- var/turf/position = get_turf(src)
+ // --- Cyborg ---
+ else if (isrobot(M))
+ jobname = "Cyborg"
- //#### Tagging the signal with all appropriate identity values ####//
+ // --- Personal AI (pAI) ---
+ else if (istype(M, /mob/living/silicon/pai))
+ jobname = "Personal AI"
- // ||-- The mob's name identity --||
- var/displayname = M.name // grab the display name (name you get when you hover over someone's icon)
- var/real_name = M.real_name // mob's real name
- var/mobkey = "none" // player key associated with mob
- var/voicemask = 0 // the speaker is wearing a voice mask
- if(M.client)
- mobkey = M.key // assign the mob's key
+ // --- Unidentifiable mob ---
+ else
+ jobname = "Unknown"
- var/jobname // the mob's "job"
+ // --- Modifications to the mob's identity ---
- // --- Human: use their actual job ---
- if (ishuman(M))
- jobname = M:get_assignment()
-
- // --- Carbon Nonhuman ---
- else if (iscarbon(M)) // Nonhuman carbon mob
- jobname = "No id"
-
- // --- AI ---
- else if (isAI(M))
- jobname = "AI"
-
- // --- Cyborg ---
- else if (isrobot(M))
- var/mob/living/silicon/robot/B = M
- jobname = "[B.designation] Cyborg"
-
- // --- Personal AI (pAI) ---
- else if (istype(M, /mob/living/silicon/pai))
- jobname = "Personal AI"
-
- // --- Unidentifiable mob ---
- else
- jobname = "Unknown"
-
-
- // --- Modifications to the mob's identity ---
-
- // The mob is disguising their identity:
- if (ishuman(M) && M.GetVoice() != real_name)
- displayname = M.GetVoice()
- jobname = "Unknown"
- voicemask = 1
+ // The mob is disguising their identity:
+ if (ishuman(M) && M.GetVoice() != real_name)
+ displayname = M.GetVoice()
+ jobname = "Unknown"
+ voicemask = 1
- /* ###### Radio headsets can only broadcast through subspace ###### */
-
- if(subspace_transmission)
- // First, we want to generate a new radio signal
- var/datum/signal/signal = new
- signal.transmission_method = 2 // 2 would be a subspace transmission.
- // transmission_method could probably be enumerated through #define. Would be neater.
-
- // --- Finally, tag the actual signal with the appropriate values ---
- signal.data = list(
- // Identity-associated tags:
- "mob" = M, // store a reference to the mob
- "mobtype" = M.type, // the mob's type
- "realname" = real_name, // the mob's real name
- "name" = displayname, // the mob's display name
- "job" = jobname, // the mob's job
- "key" = mobkey, // the mob's key
- "vmessage" = pick(M.speak_emote), // the message to display if the voice wasn't understood
- "vname" = M.voice_name, // the name to display if the voice wasn't understood
- "vmask" = voicemask, // 1 if the mob is using a voice gas mask
-
- // We store things that would otherwise be kept in the actual mob
- // so that they can be logged even AFTER the mob is deleted or something
-
- // Other tags:
- "compression" = rand(45,50), // compressed radio signal
- "message" = message, // the actual sent message
- "connection" = connection, // the radio connection to use
- "radio" = src, // stores the radio used for transmission
- "slow" = 0, // how much to sleep() before broadcasting - simulates net lag
- "traffic" = 0, // dictates the total traffic sum that the signal went through
- "type" = 0, // determines what type of radio input it is: normal broadcast
- "server" = null, // the last server to log this signal
- "reject" = 0, // if nonzero, the signal will not be accepted by any broadcasting machinery
- "level" = position.z // The source's z level
- )
- signal.frequency = connection.frequency // Quick frequency set
-
- //#### Sending the signal to all subspace receivers ####//
-
- for(var/obj/machinery/telecomms/receiver/R in telecomms_list)
- R.receive_signal(signal)
-
- // Allinone can act as receivers.
- for(var/obj/machinery/telecomms/allinone/R in telecomms_list)
- R.receive_signal(signal)
-
- // Receiving code can be located in Telecommunications.dm
- return
-
-
- /* ###### Intercoms and station-bounced radios ###### */
-
- var/filter_type = 2
-
- /* --- Intercoms can only broadcast to other intercoms, but bounced radios can broadcast to bounced radios and intercoms --- */
- if(istype(src, /obj/item/device/radio/intercom))
- filter_type = 1
-
+ /* ###### Radio headsets can only broadcast through subspace ###### */
+ if(subspace_transmission)
+ // First, we want to generate a new radio signal
var/datum/signal/signal = new
- signal.transmission_method = 2
-
-
- /* --- Try to send a normal subspace broadcast first */
+ signal.transmission_method = 2 // 2 would be a subspace transmission.
+ // transmission_method could probably be enumerated through #define. Would be neater.
+ // --- Finally, tag the actual signal with the appropriate values ---
signal.data = list(
-
+ // Identity-associated tags:
"mob" = M, // store a reference to the mob
"mobtype" = M.type, // the mob's type
"realname" = real_name, // the mob's real name
@@ -394,215 +310,110 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use
"key" = mobkey, // the mob's key
"vmessage" = pick(M.speak_emote), // the message to display if the voice wasn't understood
"vname" = M.voice_name, // the name to display if the voice wasn't understood
- "vmask" = voicemask, // 1 if the mob is using a voice gas mas
+ "vmask" = voicemask, // 1 if the mob is using a voice gas mask
- "compression" = 0, // uncompressed radio signal
+ // We store things that would otherwise be kept in the actual mob
+ // so that they can be logged even AFTER the mob is deleted or something
+
+ // Other tags:
+ "compression" = rand(45,50), // compressed radio signal
"message" = message, // the actual sent message
"connection" = connection, // the radio connection to use
"radio" = src, // stores the radio used for transmission
- "slow" = 0,
- "traffic" = 0,
- "type" = 0,
- "server" = null,
- "reject" = 0,
- "level" = position.z
+ "slow" = 0, // how much to sleep() before broadcasting - simulates net lag
+ "traffic" = 0, // dictates the total traffic sum that the signal went through
+ "type" = 0, // determines what type of radio input it is: normal broadcast
+ "server" = null, // the last server to log this signal
+ "reject" = 0, // if nonzero, the signal will not be accepted by any broadcasting machinery
+ "level" = position.z, // The source's z level
+ "language" = speaking,
+ "verb" = verb
)
signal.frequency = connection.frequency // Quick frequency set
+ //#### Sending the signal to all subspace receivers ####//
+
for(var/obj/machinery/telecomms/receiver/R in telecomms_list)
R.receive_signal(signal)
+ // Allinone can act as receivers.
+ for(var/obj/machinery/telecomms/allinone/R in telecomms_list)
+ R.receive_signal(signal)
- sleep(rand(10,25)) // wait a little...
-
- if(signal.data["done"] && position.z in signal.data["level"])
- // we're done here.
- return
-
- // Oh my god; the comms are down or something because the signal hasn't been broadcasted yet in our level.
- // Send a mundane broadcast with limited targets:
-
- //THIS IS TEMPORARY.
- if(!connection) return //~Carn
-
- Broadcast_Message(connection, M, voicemask, pick(M.speak_emote),
- src, message, displayname, jobname, real_name, M.voice_name,
- filter_type, signal.data["compression"], list(position.z), connection.frequency)
+ // Receiving code can be located in Telecommunications.dm
+ return signal.data["done"] && position.z in signal.data["level"]
+ /* ###### Intercoms and station-bounced radios ###### */
- else // OLD RADIO SYSTEMS: By Goons?
+ var/filter_type = 2
- var/datum/radio_frequency/connection = null
- if(channel && channels && channels.len > 0)
- if (channel == "department")
- //world << "DEBUG: channel=\"[channel]\" switching to \"[channels[1]]\""
- channel = channels[1]
- connection = secure_radio_connections[channel]
- else
- connection = radio_connection
- channel = null
- if (!istype(connection))
- return
- var/display_freq = connection.frequency
+ /* --- Intercoms can only broadcast to other intercoms, but bounced radios can broadcast to bounced radios and intercoms --- */
+ if(istype(src, /obj/item/device/radio/intercom))
+ filter_type = 1
- //world << "DEBUG: used channel=\"[channel]\" frequency= \"[display_freq]\" connection.devices.len = [connection.devices.len]"
- var/eqjobname
+ var/datum/signal/signal = new
+ signal.transmission_method = 2
- if (ishuman(M))
- eqjobname = M:get_assignment()
- else if (iscarbon(M))
- eqjobname = "No id" //only humans can wear ID
- else if (isAI(M))
- eqjobname = "AI"
- else if (isrobot(M))
- eqjobname = "Cyborg"//Androids don't really describe these too well, in my opinion.
- else if (istype(M, /mob/living/silicon/pai))
- eqjobname = "Personal AI"
- else
- eqjobname = "Unknown"
- if (isWireCut(WIRE_TRANSMIT))
- return
+ /* --- Try to send a normal subspace broadcast first */
- var/list/receive = list()
+ signal.data = list(
- //for (var/obj/item/device/radio/R in radio_connection.devices)
- for (var/obj/item/device/radio/R in connection.devices["[RADIO_CHAT]"]) // Modified for security headset code -- TLE
- //if(R.accept_rad(src, message))
- receive |= R.send_hear(display_freq, 0)
+ "mob" = M, // store a reference to the mob
+ "mobtype" = M.type, // the mob's type
+ "realname" = real_name, // the mob's real name
+ "name" = displayname, // the mob's display name
+ "job" = jobname, // the mob's job
+ "key" = mobkey, // the mob's key
+ "vmessage" = pick(M.speak_emote), // the message to display if the voice wasn't understood
+ "vname" = M.voice_name, // the name to display if the voice wasn't understood
+ "vmask" = voicemask, // 1 if the mob is using a voice gas mas
- //world << "DEBUG: receive.len=[receive.len]"
- var/list/heard_masked = list() // masked name or no real name
- var/list/heard_normal = list() // normal message
- var/list/heard_voice = list() // voice message
- var/list/heard_garbled = list() // garbled message
+ "compression" = 0, // uncompressed radio signal
+ "message" = message, // the actual sent message
+ "connection" = connection, // the radio connection to use
+ "radio" = src, // stores the radio used for transmission
+ "slow" = 0,
+ "traffic" = 0,
+ "type" = 0,
+ "server" = null,
+ "reject" = 0,
+ "level" = position.z,
+ "language" = speaking,
+ "verb" = verb
+ )
+ signal.frequency = connection.frequency // Quick frequency set
- for (var/mob/R in receive)
- if (R.say_understands(M))
- if (ishuman(M) && M.GetVoice() != M.real_name)
- heard_masked += R
- else
- heard_normal += R
- else
- heard_voice += R
+ for(var/obj/machinery/telecomms/receiver/R in telecomms_list)
+ R.receive_signal(signal)
- if (length(heard_masked) || length(heard_normal) || length(heard_voice) || length(heard_garbled))
- var/part_a = ""
- //var/part_b = " \icon[src]\[[format_frequency(frequency)]\] "
- var/freq_text
- switch(display_freq)
- if(SYND_FREQ)
- freq_text = "#unkn"
- if(COMM_FREQ)
- freq_text = "Command"
- if(1351)
- freq_text = "Science"
- if(1355)
- freq_text = "Medical"
- if(1357)
- freq_text = "Engineering"
- if(1359)
- freq_text = "Security"
- if(1347)
- freq_text = "Supply"
- //There's probably a way to use the list var of channels in code\game\communications.dm to make the dept channels non-hardcoded, but I wasn't in an experimentive mood. --NEO
- if(!freq_text)
- freq_text = format_frequency(display_freq)
+ sleep(rand(10,25)) // wait a little...
- var/part_b = " \icon[src]\[[freq_text]\] " // Tweaked for security headsets -- TLE
- var/part_c = ""
+ if(signal.data["done"] && position.z in signal.data["level"])
+ // we're done here.
+ return 1
- if (display_freq==SYND_FREQ)
- part_a = ""
- else if (display_freq==COMM_FREQ)
- part_a = ""
- else if (display_freq in DEPT_FREQS)
- part_a = ""
+ // Oh my god; the comms are down or something because the signal hasn't been broadcasted yet in our level.
+ // Send a mundane broadcast with limited targets:
- var/quotedmsg = M.say_quote(message)
+ //THIS IS TEMPORARY. YEAH RIGHT
+ if(!connection) return 0 //~Carn
- //This following recording is intended for research and feedback in the use of department radio channels.
+ return Broadcast_Message(connection, M, voicemask, pick(M.speak_emote),
+ src, message, displayname, jobname, real_name, M.voice_name,
+ filter_type, signal.data["compression"], list(position.z), connection.frequency,verb,speaking)
- var/part_blackbox_b = " \[[freq_text]\] " // Tweaked for security headsets -- TLE
- var/blackbox_msg = "[part_a][M.name][part_blackbox_b][quotedmsg][part_c]"
- //var/blackbox_admin_msg = "[part_a][M.name] (Real name: [M.real_name])[part_blackbox_b][quotedmsg][part_c]"
- if(istype(blackbox))
- //BR.messages_admin += blackbox_admin_msg
- switch(display_freq)
- if(1459)
- blackbox.msg_common += blackbox_msg
- if(1351)
- blackbox.msg_science += blackbox_msg
- if(1353)
- blackbox.msg_command += blackbox_msg
- if(1355)
- blackbox.msg_medical += blackbox_msg
- if(1357)
- blackbox.msg_engineering += blackbox_msg
- if(1359)
- blackbox.msg_security += blackbox_msg
- if(1441)
- blackbox.msg_deathsquad += blackbox_msg
- if(1213)
- blackbox.msg_syndicate += blackbox_msg
- if(1347)
- blackbox.msg_cargo += blackbox_msg
- if(1349)
- blackbox.msg_service += blackbox_msg
- else
- blackbox.messages += blackbox_msg
- //End of research and feedback code.
-
- if (length(heard_masked))
- var/N = M.name
- var/J = eqjobname
- if(ishuman(M) && M.GetVoice() != M.real_name)
- N = M.GetVoice()
- J = "Unknown"
- var/rendered = "[part_a][N][part_b][quotedmsg][part_c]"
- for (var/mob/R in heard_masked)
- if(istype(R, /mob/living/silicon/ai))
- R.show_message("[part_a][N] ([J]) \[OPEN\] [part_b][quotedmsg][part_c]", 2)
- else
- R.show_message(rendered, 2)
-
- if (length(heard_normal))
- var/rendered = "[part_a][M.real_name][part_b][quotedmsg][part_c]"
-
- for (var/mob/R in heard_normal)
- if(istype(R, /mob/living/silicon/ai))
- R.show_message("[part_a][M.real_name] ([eqjobname]) \[OPEN\] [part_b][quotedmsg][part_c]", 2)
- else
- R.show_message(rendered, 2)
-
- if (length(heard_voice))
- var/rendered = "[part_a][M.voice_name][part_b][pick(M.speak_emote)][part_c]"
-
- for (var/mob/R in heard_voice)
- if(istype(R, /mob/living/silicon/ai))
- R.show_message("[part_a][M.voice_name] ([eqjobname]) \[OPEN\] [part_b][pick(M.speak_emote)][part_c]", 2)
- else
- R.show_message(rendered, 2)
-
- if (length(heard_garbled))
- quotedmsg = M.say_quote(stars(message))
- var/rendered = "[part_a][M.voice_name][part_b][quotedmsg][part_c]"
-
- for (var/mob/R in heard_voice)
- if(istype(R, /mob/living/silicon/ai))
- R.show_message("[part_a][M.voice_name]\[OPEN\] [part_b][quotedmsg][part_c]", 2)
- else
- R.show_message(rendered, 2)
-
-/obj/item/device/radio/hear_talk(mob/M as mob, msg)
+/obj/item/device/radio/hear_talk(mob/M as mob, msg, var/verb = "says", var/datum/language/speaking = null)
if (broadcasting)
if(get_dist(src, M) <= canhear_range)
- talk_into(M, msg)
+ talk_into(M, msg,null,verb,speaking)
+
+
/*
/obj/item/device/radio/proc/accept_rad(obj/item/device/radio/R as obj, message)
@@ -621,7 +432,7 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use
// what the range is in which mobs will hear the radio
// returns: -1 if can't receive, range otherwise
- if (isWireCut(WIRE_RECEIVE))
+ if (wires.IsIndexCut(WIRE_RECEIVE))
return -1
if(!listening)
return -1
@@ -629,7 +440,7 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use
var/turf/position = get_turf(src)
if(!position || !(position.z in level))
return -1
- if(freq == SYND_FREQ)
+ if(freq in ANTAG_FREQS)
if(!(src.syndie))//Checks to see if it's allowed on that frequency, based on the encryption keys
return -1
if (!on)
@@ -656,18 +467,16 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use
return get_mobs_in_view(canhear_range, src)
-/obj/item/device/radio/examine()
- set src in view()
-
- ..()
- if ((in_range(src, usr) || loc == usr))
+/obj/item/device/radio/examine(mob/user)
+ . = ..()
+ if ((in_range(src, user) || loc == user))
if (b_stat)
- usr.show_message("\blue \the [src] can be attached and modified!")
+ user.show_message("\blue \the [src] can be attached and modified!")
else
- usr.show_message("\blue \the [src] can not be modified or attached!")
+ user.show_message("\blue \the [src] can not be modified or attached!")
return
-/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) ))
@@ -697,8 +506,14 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use
//Giving borgs their own radio to have some more room to work with -Sieve
/obj/item/device/radio/borg
+ var/mob/living/silicon/robot/myborg = null // Cyborg which owns this radio. Used for power checks
var/obj/item/device/encryptionkey/keyslot = null//Borg radios can handle a single encryption key
-
+ var/shut_up = 0
+ icon = 'icons/obj/robot_component.dmi' // Cyborgs radio icons should look like the component.
+ icon_state = "radio"
+ canhear_range = 3
+ subspace_transmission = 1
+
/obj/item/device/radio/borg/syndicate
syndie = 1
keyslot = new /obj/item/device/encryptionkey/syndicate
@@ -713,7 +528,14 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use
..()
set_frequency(1441)
-/obj/item/device/radio/borg/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/item/device/radio/borg/talk_into()
+ . = ..()
+ if (isrobot(src.loc))
+ var/mob/living/silicon/robot/R = src.loc
+ var/datum/robot_component/C = R.components["radio"]
+ R.use_power(C.energy_consumption)
+
+/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/ ))))
@@ -758,18 +580,25 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use
src.channels = list()
src.syndie = 0
+ var/mob/living/silicon/robot/D = src.loc
+ if(D.module)
+ for(var/ch_name in D.module.channels)
+ if(ch_name in src.channels)
+ continue
+ src.channels += ch_name
+ src.channels[ch_name] += D.module.channels[ch_name]
if(keyslot)
for(var/ch_name in keyslot.channels)
if(ch_name in src.channels)
continue
src.channels += ch_name
- src.channels[ch_name] = keyslot.channels[ch_name]
+ src.channels[ch_name] += keyslot.channels[ch_name]
if(keyslot.syndie)
src.syndie = 1
- for (var/ch_name in channels)
+ for (var/ch_name in src.channels)
if(!radio_controller)
sleep(30) // Waiting for the radio_controller to be created.
if(!radio_controller)
@@ -784,12 +613,23 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use
if(usr.stat || !on)
return
if (href_list["mode"])
- subspace_transmission = !subspace_transmission
- if(!subspace_transmission)//Simple as fuck, clears the channel list to prevent talking/listening over them if subspace transmission is disabled
+ if(subspace_transmission != 1)
+ subspace_transmission = 1
+ usr << "Subspace Transmission is enabled"
+ else
+ subspace_transmission = 0
+ usr << "Subspace Transmission is disabled"
+ if(subspace_transmission == 0)//Simple as fuck, clears the channel list to prevent talking/listening over them if subspace transmission is disabled
channels = list()
else
recalculateChannels()
- usr << "Subspace Transmission is [(subspace_transmission) ? "enabled" : "disabled"]"
+ if (href_list["shutup"]) // Toggle loudspeaker mode, AKA everyone around you hearing your radio.
+ shut_up = !shut_up
+ if(shut_up)
+ canhear_range = 0
+ else
+ canhear_range = 3
+
..()
/obj/item/device/radio/borg/interact(mob/user as mob)
@@ -806,6 +646,7 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use
+
+
Toggle Broadcast Mode
+ Loudspeaker: [shut_up ? "Disengaged" : "Engaged"]
"}
if(subspace_transmission)//Don't even bother if subspace isn't turned on
@@ -830,11 +671,3 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use
/obj/item/device/radio/off
listening = 0
-
-/obj/item/device/radio/Destroy()
- if(radio_connection)
- radio_connection.remove_listener(src)
- if(isrobot(src.loc))
- var/mob/living/silicon/robot/R = src.loc
- R.radio = null
- ..()
diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm
index fd084bab1a9..92cfb499ad0 100644
--- a/code/game/objects/items/devices/scanners.dm
+++ b/code/game/objects/items/devices/scanners.dm
@@ -13,7 +13,6 @@ REAGENT SCANNER
desc = "A terahertz-ray emitter and scanner used to detect underfloor objects such as cables and pipes."
icon_state = "t-ray0"
var/on = 0
- flags = FPRINT | TABLEPASS
slot_flags = SLOT_BELT
w_class = 2
item_state = "electronic"
@@ -99,7 +98,7 @@ REAGENT SCANNER
item_state = "healthanalyzer"
icon_override = 'icons/mob/in-hand/tools.dmi'
desc = "A hand-held body scanner able to distinguish vital signs of the subject."
- flags = FPRINT | TABLEPASS | CONDUCT
+ flags = CONDUCT
slot_flags = SLOT_BELT
throwforce = 3
w_class = 1.0
@@ -111,7 +110,7 @@ REAGENT SCANNER
/obj/item/device/healthanalyzer/attack(mob/living/M as mob, mob/living/user as mob)
- if (( (M_CLUMSY in user.mutations) || user.getBrainLoss() >= 60) && prob(50))
+ if (( (CLUMSY in user.mutations) || user.getBrainLoss() >= 60) && prob(50))
user << text("\red You try to analyze the floor's vitals!")
for(var/mob/O in viewers(M, null))
O.show_message(text("\red [user] has analyzed the floor's vitals!"), 1)
@@ -260,7 +259,7 @@ REAGENT SCANNER
icon_state = "atmos"
item_state = "analyzer"
w_class = 2.0
- flags = FPRINT | TABLEPASS| CONDUCT
+ flags = CONDUCT
slot_flags = SLOT_BELT
throwforce = 5
throw_speed = 4
@@ -330,7 +329,7 @@ REAGENT SCANNER
icon_state = "spectrometer"
item_state = "analyzer"
w_class = 2.0
- flags = FPRINT | TABLEPASS| CONDUCT | OPENCONTAINER
+ flags = CONDUCT | OPENCONTAINER
slot_flags = SLOT_BELT
throwforce = 5
throw_speed = 4
@@ -403,7 +402,7 @@ REAGENT SCANNER
icon_state = "spectrometer"
item_state = "analyzer"
w_class = 2.0
- flags = FPRINT | TABLEPASS | CONDUCT
+ flags = CONDUCT
slot_flags = SLOT_BELT
throwforce = 5
throw_speed = 4
diff --git a/code/game/objects/items/devices/sensor_device.dm b/code/game/objects/items/devices/sensor_device.dm
new file mode 100644
index 00000000000..5db0bdc47f4
--- /dev/null
+++ b/code/game/objects/items/devices/sensor_device.dm
@@ -0,0 +1,18 @@
+/obj/item/device/sensor_device
+ name = "handheld crew monitor"
+ desc = "A miniature machine that tracks suit sensors across the station."
+ icon = 'icons/obj/device.dmi'
+ icon_state = "scanner"
+ w_class = 2.0
+ slot_flags = SLOT_BELT
+ origin_tech = "biotech=3;materials=3;magnets=3"
+ var/obj/nano_module/crew_monitor/crew_monitor
+
+/obj/item/device/sensor_device/New()
+ crew_monitor = new(src)
+
+/obj/item/device/sensor_device/attack_self(mob/user as mob)
+ ui_interact(user)
+
+/obj/item/device/sensor_device/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
+ crew_monitor.ui_interact(user, ui_key, ui, force_open)
\ No newline at end of file
diff --git a/code/game/objects/items/devices/suit_cooling.dm b/code/game/objects/items/devices/suit_cooling.dm
index 9ef170a7d9b..577dba2fdbe 100644
--- a/code/game/objects/items/devices/suit_cooling.dm
+++ b/code/game/objects/items/devices/suit_cooling.dm
@@ -5,51 +5,51 @@
icon = 'icons/obj/device.dmi'
icon_state = "suitcooler0"
slot_flags = SLOT_BACK //you can carry it on your back if you want, but it won't do anything unless attached to suit storage
-
+
//copied from tank.dm
- flags = FPRINT | TABLEPASS | CONDUCT
+ flags = CONDUCT
force = 5.0
throwforce = 10.0
throw_speed = 1
throw_range = 4
-
+
origin_tech = "magnets=2;materials=2"
-
+
var/on = 0 //is it turned on?
var/cover_open = 0 //is the cover open?
- var/obj/item/weapon/cell/cell
+ var/obj/item/weapon/stock_parts/cell/cell
var/max_cooling = 12 //in degrees per second - probably don't need to mess with heat capacity here
var/charge_consumption = 16.6 //charge per second at max_cooling
var/thermostat = T20C
-
+
//TODO: make it heat up the surroundings when not in space
/obj/item/device/suit_cooling_unit/New()
- cell = new/obj/item/weapon/cell() //comes with the crappy default power cell - high-capacity ones shouldn't be hard to find
+ cell = new/obj/item/weapon/stock_parts/cell() //comes with the crappy default power cell - high-capacity ones shouldn't be hard to find
cell.loc = src
/obj/item/device/suit_cooling_unit/proc/cool_mob(mob/M)
if (!on || !cell) return
-
+
//make sure they have a suit and we are attached to it
if (!attached_to_suit(M))
return
-
+
var/mob/living/carbon/human/H = M
-
+
var/efficiency = H.get_pressure_protection() //you need to have a good seal for effective cooling
var/env_temp = get_environment_temperature() //wont save you from a fire
var/temp_adj = min(H.bodytemperature - max(thermostat, env_temp), max_cooling)
-
+
if (temp_adj < 0) //only cools, doesn't heat
return
-
+
var/charge_usage = (temp_adj/max_cooling)*charge_consumption
-
+
H.bodytemperature -= temp_adj*efficiency
-
+
cell.use(charge_usage)
-
+
if(cell.charge <= 0)
turn_off()
@@ -65,22 +65,22 @@
var/turf/T = get_turf(src)
if(istype(T, /turf/space))
return 0 //space has no temperature, this just makes sure the cooling unit works in space
-
+
var/datum/gas_mixture/environment = T.return_air()
if (!environment)
return 0
-
+
return environment.temperature
/obj/item/device/suit_cooling_unit/proc/attached_to_suit(mob/M)
- if (!ishuman(M))
+ if (!ishuman(M))
return 0
-
+
var/mob/living/carbon/human/H = M
-
+
if (!H.wear_suit || H.s_store != src)
return 0
-
+
return 1
/obj/item/device/suit_cooling_unit/proc/turn_on()
@@ -88,7 +88,7 @@
return
if(cell.charge <= 0)
return
-
+
on = 1
updateicon()
@@ -121,7 +121,7 @@
if (on)
user << "You switch on the [src]."
-/obj/item/device/suit_cooling_unit/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/item/device/suit_cooling_unit/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
if (istype(W, /obj/item/weapon/screwdriver))
if(cover_open)
cover_open = 0
@@ -132,7 +132,7 @@
updateicon()
return
- if (istype(W, /obj/item/weapon/cell))
+ if (istype(W, /obj/item/weapon/stock_parts/cell))
if(cover_open)
if(cell)
user << "There is a [cell] already installed here."
@@ -143,7 +143,7 @@
user << "You insert the [cell]."
updateicon()
return
-
+
return ..()
/obj/item/device/suit_cooling_unit/proc/updateicon()
@@ -157,9 +157,9 @@
/obj/item/device/suit_cooling_unit/examine()
set src in view(1)
-
+
..()
-
+
if (on)
if (attached_to_suit(src.loc))
usr << "It's switched on and running."
@@ -167,13 +167,13 @@
usr << "It's switched on, but not attached to anything."
else
usr << "It is switched off."
-
+
if (cover_open)
if(cell)
usr << "The panel is open, exposing the [cell]."
else
usr << "The panel is open."
-
+
if (cell)
usr << "The charge meter reads [round(cell.percent())]%."
else
diff --git a/code/game/objects/items/devices/taperecorder.dm b/code/game/objects/items/devices/taperecorder.dm
index 555dbe1caea..888524853d6 100644
--- a/code/game/objects/items/devices/taperecorder.dm
+++ b/code/game/objects/items/devices/taperecorder.dm
@@ -14,7 +14,7 @@
var/list/storedinfo = new/list()
var/list/timestamp = new/list()
var/canprint = 1
- flags = FPRINT | TABLEPASS| CONDUCT
+ flags = CONDUCT
throwforce = 2
throw_speed = 4
throw_range = 20
@@ -38,17 +38,15 @@
storedinfo += "\[[time2text(timerecorded*10,"mm:ss")]\] [M.name] says, \"[msg]\""
return
-/obj/item/device/taperecorder/attackby(obj/item/weapon/W as obj, mob/user as mob)
- ..()
- if(istype(W, /obj/item/weapon/card/emag))
- if(emagged == 0)
- emagged = 1
- recording = 0
- user << "PZZTTPFFFT"
- icon_state = "taperecorderidle"
- else
- user << "It is already emagged!"
-
+/obj/item/device/taperecorder/emag_act(user as mob)
+ if(emagged == 0)
+ emagged = 1
+ recording = 0
+ user << "PZZTTPFFFT"
+ icon_state = "taperecorderidle"
+ else
+ user << "It is already emagged!"
+
/obj/item/device/taperecorder/proc/explode()
var/turf/T = get_turf(loc)
if(ismob(loc))
diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm
index b80f89f2295..d49b8e19b4c 100644
--- a/code/game/objects/items/devices/traitordevices.dm
+++ b/code/game/objects/items/devices/traitordevices.dm
@@ -22,7 +22,7 @@ effective or pretty fucking useless.
w_class = 1.0
throw_speed = 4
throw_range = 10
- flags = FPRINT | TABLEPASS| CONDUCT
+ flags = CONDUCT
item_state = "electronic"
origin_tech = "magnets=3;combat=3;syndicate=3"
@@ -78,7 +78,7 @@ effective or pretty fucking useless.
item_state = "healthanalyzer"
icon_override = 'icons/mob/in-hand/tools.dmi'
desc = "A hand-held body scanner able to distinguish vital signs of the subject. A strange microlaser is hooked on to the scanning end."
- flags = FPRINT | TABLEPASS | CONDUCT
+ flags = CONDUCT
slot_flags = SLOT_BELT
discrete = 1 // Makes the item not give an attack log message for viewers.
throwforce = 3
diff --git a/code/game/objects/items/devices/transfer_valve.dm b/code/game/objects/items/devices/transfer_valve.dm
index 282abc1b2bc..e882adfae23 100644
--- a/code/game/objects/items/devices/transfer_valve.dm
+++ b/code/game/objects/items/devices/transfer_valve.dm
@@ -15,7 +15,7 @@
/obj/item/device/transfer_valve/IsAssemblyHolder()
return 1
-/obj/item/device/transfer_valve/attackby(obj/item/item, mob/user)
+/obj/item/device/transfer_valve/attackby(obj/item/item, mob/user, params)
if(istype(item, /obj/item/weapon/tank))
if(tank_one && tank_two)
user << "There are already two tanks attached, remove one first."
@@ -51,8 +51,8 @@
A.toggle_secure() //this calls update_icon(), which calls update_icon() on the holder (i.e. the bomb).
bombers += "[key_name(user)] attached a [item] to a transfer valve."
- message_admins("[key_name_admin(user)] attached a [item] to a transfer valve.")
- log_game("[key_name_admin(user)] attached a [item] to a transfer valve.")
+ msg_admin_attack("[key_name_admin(user)] attached [item] to a transfer valve.")
+ log_game("[key_name_admin(user)] attached [item] to a transfer valve.")
attacher = user
nanomanager.update_uis(src) // update all UIs attached to src
return
@@ -63,10 +63,14 @@
attached_device.HasProximity(AM)
return
+/obj/item/device/transfer_valve/hear_talk(mob/living/M as mob, msg)
+ ..()
+ for(var/obj/O in contents)
+ O.hear_talk(M, msg)
/obj/item/device/transfer_valve/attack_self(mob/user as mob)
ui_interact(user)
-
+
/obj/item/device/transfer_valve/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
// this is the data which will be sent to the ui
@@ -77,13 +81,13 @@
data["valveOpen"] = valve_open ? 1 : 0
// update the ui if it exists, returns null if no ui is passed/found
- ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
+ ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
if (!ui)
// the ui does not exist, so we'll create a new() one
// for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm
ui = new(user, src, ui_key, "transfer_valve.tmpl", "Tank Transfer Valve", 460, 280)
// when the ui is first opened this is the data it will use
- ui.set_initial_data(data)
+ ui.set_initial_data(data)
// open the new ui window
ui.open()
// auto update every Master Controller tick
@@ -190,7 +194,7 @@
log_str += " Last touched by: [src.fingerprintslast][last_touch_info]"
bombers += log_str
- message_admins(log_str, 0, 1)
+ msg_admin_attack(log_str, 0, 1)
log_game(log_str)
merge_gases()
spawn(20) // In case one tank bursts
diff --git a/code/game/objects/items/devices/uplinks.dm b/code/game/objects/items/devices/uplinks.dm
index d83c1b56ede..fc7a294309e 100644
--- a/code/game/objects/items/devices/uplinks.dm
+++ b/code/game/objects/items/devices/uplinks.dm
@@ -103,7 +103,9 @@ var/list/world_uplinks = list()
/obj/item/device/uplink/Topic(href, href_list)
- ..()
+ if(..())
+ return 1
+
if(!active)
return
@@ -152,7 +154,8 @@ var/list/world_uplinks = list()
desc = "There is something wrong if you're examining this."
/obj/item/device/uplink/hidden/Topic(href, href_list)
- ..()
+ if(..())
+ return 1
if(href_list["lock"])
toggle()
usr << browse(null, "window=hidden")
@@ -251,7 +254,7 @@ var/list/world_uplinks = list()
return 0
//Refund proc for the borg teleporter (later I'll make a general refund proc if there is demand for it)
-/obj/item/device/radio/headset/syndicate/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/item/device/radio/headset/syndicate/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
if(istype(W, /obj/item/weapon/antag_spawner/borg_tele))
var/obj/item/weapon/antag_spawner/borg_tele/S = W
if(!S.used && !S.checking)
@@ -261,7 +264,7 @@ var/list/world_uplinks = list()
else
user << "This teleporter is already used, or is currently being used."
-/obj/item/device/radio/uplink/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/item/device/radio/uplink/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
if(istype(W, /obj/item/weapon/antag_spawner/borg_tele))
var/obj/item/weapon/antag_spawner/borg_tele/S = W
if(!S.used && !S.checking)
diff --git a/code/game/objects/items/devices/whistle.dm b/code/game/objects/items/devices/whistle.dm
index 3b26c943acb..3d515d6259e 100644
--- a/code/game/objects/items/devices/whistle.dm
+++ b/code/game/objects/items/devices/whistle.dm
@@ -4,7 +4,7 @@
icon_state = "voice0"
item_state = "flashbang" //looks exactly like a flash (and nothing like a flashbang)
w_class = 1.0
- flags = FPRINT | TABLEPASS | CONDUCT
+ flags = CONDUCT
var/spamcheck = 0
var/emagged = 0
@@ -24,9 +24,8 @@
spawn(20)
spamcheck = 0
-/obj/item/device/hailer/attackby(obj/item/I, mob/user)
- if(istype(I, /obj/item/weapon/card/emag) && !emagged)
+/obj/item/device/hailer/emag_act(user as mob)
+ if(!emagged)
user << "\red You overload \the [src]'s voice synthesizer."
emagged = 1
- return
- return
\ No newline at end of file
+
diff --git a/code/game/objects/items/flag.dm b/code/game/objects/items/flag.dm
index 22b5285556a..e3e02dc1047 100644
--- a/code/game/objects/items/flag.dm
+++ b/code/game/objects/items/flag.dm
@@ -35,7 +35,7 @@
del(src)
return
-/obj/item/flag/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/item/flag/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/latexballoon.dm b/code/game/objects/items/latexballoon.dm
index f00a9ed48b5..daab9b55a69 100644
--- a/code/game/objects/items/latexballoon.dm
+++ b/code/game/objects/items/latexballoon.dm
@@ -43,6 +43,6 @@
burst()
return
-/obj/item/latexballon/attackby(obj/item/W as obj, mob/user as mob)
+/obj/item/latexballon/attackby(obj/item/W as obj, mob/user as mob, params)
if (can_puncture(W))
burst()
\ No newline at end of file
diff --git a/code/game/objects/items/policetape.dm b/code/game/objects/items/policetape.dm
index 8a1cc09c7ec..f5044b1de28 100644
--- a/code/game/objects/items/policetape.dm
+++ b/code/game/objects/items/policetape.dm
@@ -3,7 +3,6 @@
name = "tape roll"
icon = 'icons/policetape.dmi'
icon_state = "rollstart"
- flags = FPRINT
w_class = 1.0
var/turf/start
var/turf/end
@@ -27,7 +26,7 @@
/obj/item/tape/police
name = "police tape"
desc = "A length of police tape. Do not cross."
- req_access = list(access_security)
+ req_one_access = list(access_security,access_forensics_lockers)
icon_base = "police"
/obj/item/taperoll/engineering
@@ -115,12 +114,12 @@
if(!density) return 1
if(air_group || (height==0)) return 1
- if ((mover.flags & 2 || istype(mover, /obj/effect/meteor) || mover.throwing == 1) )
+ if ((mover.pass_flags & PASSTABLE || istype(mover, /obj/effect/meteor) || mover.throwing == 1) )
return 1
else
return 0
-/obj/item/tape/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/item/tape/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
breaktape(W, user)
/obj/item/tape/attack_hand(mob/user as mob)
@@ -134,9 +133,9 @@
/obj/item/tape/attack_paw(mob/user as mob)
breaktape(/obj/item/weapon/wirecutters,user)
-
+
/obj/item/tape/attack_alien(mob/user as mob)
- breaktape(/obj/item/weapon/wirecutters,user)
+ breaktape(/obj/item/weapon/wirecutters,user)
/obj/item/tape/proc/breaktape(obj/item/weapon/W as obj, mob/user as mob)
if(user.a_intent == "help" && ((!can_puncture(W) && src.allowed(user))))
diff --git a/code/game/objects/items/random_items.dm b/code/game/objects/items/random_items.dm
index 72cedf73e2b..4ed64721966 100644
--- a/code/game/objects/items/random_items.dm
+++ b/code/game/objects/items/random_items.dm
@@ -269,7 +269,7 @@
name = "\improper Mysterious Crate"
desc = "What could it be?"
- attackby(obj/item/weapon/W as obj, mob/user as mob)
+ attackby(obj/item/weapon/W as obj, mob/user as mob, params)
if(istype(W, /obj/item/weapon/crowbar))
var/list/menace = pick( /mob/living/simple_animal/hostile/carp,/mob/living/simple_animal/hostile/faithless,/mob/living/simple_animal/hostile/pirate,
/mob/living/simple_animal/hostile/creature,/mob/living/simple_animal/hostile/pirate/ranged,
@@ -299,7 +299,7 @@
name = "Schrodinger's Crate"
desc = "What happens if you open it?"
- attackby(obj/item/weapon/W as obj, mob/user as mob)
+ attackby(obj/item/weapon/W as obj, mob/user as mob, params)
if(istype(W, /obj/item/weapon/crowbar))
var/mob/living/simple_animal/cat/Cat1 = new(loc)
Cat1.apply_damage(250)//,TOX)
diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm
index 744d5999ff7..775b4c24690 100644
--- a/code/game/objects/items/robot/robot_parts.dm
+++ b/code/game/objects/items/robot/robot_parts.dm
@@ -3,7 +3,7 @@
icon = 'icons/obj/robot_parts.dmi'
item_state = "buildpipe"
icon_state = "blank"
- flags = FPRINT | TABLEPASS | CONDUCT
+ flags = CONDUCT
slot_flags = SLOT_BELT
var/construction_time = 100
var/list/construction_cost = list("metal"=20000,"glass"=5000)
@@ -49,7 +49,7 @@
construction_time = 350
construction_cost = list("metal"=40000)
var/wires = 0.0
- var/obj/item/weapon/cell/cell = null
+ var/obj/item/weapon/stock_parts/cell/cell = null
/obj/item/robot_parts/head
name = "robot head"
@@ -101,7 +101,7 @@
return 1
return 0
-/obj/item/robot_parts/robot_suit/attackby(obj/item/W as obj, mob/user as mob)
+/obj/item/robot_parts/robot_suit/attackby(obj/item/W as obj, mob/user as mob, params)
..()
if(istype(W, /obj/item/stack/sheet/metal) && !l_arm && !r_arm && !l_leg && !r_leg && !chest && !head)
var/obj/item/weapon/ed209_assembly/B = new /obj/item/weapon/ed209_assembly
@@ -109,7 +109,7 @@
user << "You armed the robot frame"
W:use(1)
if (user.get_inactive_hand()==src)
- user.before_take_item(src)
+ user.unEquip(src)
user.put_in_inactive_hand(B)
del(src)
if(istype(W, /obj/item/robot_parts/l_leg))
@@ -249,9 +249,9 @@
return
-/obj/item/robot_parts/chest/attackby(obj/item/W as obj, mob/user as mob)
+/obj/item/robot_parts/chest/attackby(obj/item/W as obj, mob/user as mob, params)
..()
- if(istype(W, /obj/item/weapon/cell))
+ if(istype(W, /obj/item/weapon/stock_parts/cell))
if(src.cell)
user << "\blue You have already inserted a cell!"
return
@@ -271,7 +271,7 @@
user << "\blue You insert the wire!"
return
-/obj/item/robot_parts/head/attackby(obj/item/W as obj, mob/user as mob)
+/obj/item/robot_parts/head/attackby(obj/item/W as obj, mob/user as mob, params)
..()
if(istype(W, /obj/item/device/flash))
if(istype(user,/mob/living/silicon/robot))
@@ -299,7 +299,7 @@
return
return
-/obj/item/robot_parts/attackby(obj/item/W as obj, mob/user as mob)
+/obj/item/robot_parts/attackby(obj/item/W as obj, mob/user as mob, params)
if(istype(W,/obj/item/weapon/card/emag))
if(sabotaged)
user << "\red [src] is already sabotaged!"
diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm
index 23bed41262c..41520fabb93 100644
--- a/code/game/objects/items/robot/robot_upgrades.dm
+++ b/code/game/objects/items/robot/robot_upgrades.dm
@@ -32,9 +32,11 @@
R.icon_state = "robot"
del(R.module)
R.module = null
- R.camera.network.Remove(list("Engineering","Medical","MINE"))
+ R.camera.network.Remove(list("Engineering","Medical","Mining Outpost"))
R.updatename("Default")
R.status_flags |= CANPUSH
+ R.languages = list()
+ R.speech_synthesizer_langs = list()
R.notify_ai(2)
R.updateicon()
diff --git a/code/game/objects/items/shooting_range.dm b/code/game/objects/items/shooting_range.dm
index 19a2e38e179..dfd5777d9d0 100644
--- a/code/game/objects/items/shooting_range.dm
+++ b/code/game/objects/items/shooting_range.dm
@@ -32,7 +32,7 @@
- attackby(obj/item/W as obj, mob/user as mob)
+ attackby(obj/item/W as obj, mob/user as mob, params)
if (istype(W, /obj/item/weapon/weldingtool))
var/obj/item/weapon/weldingtool/WT = W
if(WT.remove_fuel(0, user))
diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm
index f201cb9e772..13275b5f3c1 100644
--- a/code/game/objects/items/stacks/medical.dm
+++ b/code/game/objects/items/stacks/medical.dm
@@ -19,17 +19,13 @@
user << "You don't have the dexterity to do this!"
return 1
+
if (istype(M, /mob/living/carbon/human))
var/mob/living/carbon/human/H = M
var/datum/organ/external/affecting = H.get_organ(user.zone_sel.selecting)
- if(affecting.display_name == "head")
- if(H.head && istype(H.head,/obj/item/clothing/head/helmet/space))
- user << "You can't apply [src] through [H.head]!"
- return 1
- else
- if(H.wear_suit && istype(H.wear_suit,/obj/item/clothing/suit/space))
- user << "You can't apply [src] through [H.wear_suit]!"
+ if(isliving(M))
+ if(!M.can_inject(user, 1))
return 1
if(affecting.status & ORGAN_ROBOT)
@@ -48,7 +44,7 @@
use(1)
M.updatehealth()
-
+
/obj/item/stack/medical/bruise_pack
name = "roll of gauze"
singular_name = "gauze length"
@@ -82,12 +78,12 @@
user.visible_message( "\blue [user] places a bandaid over \the [W.desc] on [M]'s [affecting.display_name].", \
"\blue You place a bandaid over \the [W.desc] on [M]'s [affecting.display_name]." )
- affecting.heal_damage(src.heal_brute, src.heal_burn, 0)
+ affecting.heal_damage(src.heal_brute, src.heal_burn, 0)
use(1)
else
M.heal_organ_damage((src.heal_brute/2), (src.heal_burn/2))
use(1)
-
+
/obj/item/stack/medical/ointment
name = "ointment"
desc = "Used to treat those nasty burns."
@@ -112,7 +108,7 @@
else
user.visible_message( "\blue [user] salves the wounds on [M]'s [affecting.display_name].", \
"\blue You salve the wounds on [M]'s [affecting.display_name]." )
- affecting.heal_damage(src.heal_brute, src.heal_burn, 0)
+ affecting.heal_damage(src.heal_brute, src.heal_burn, 0)
use(1)
else
if (can_operate(H)) //Checks if mob is lying down on table for surgery
diff --git a/code/game/objects/items/stacks/rods.dm b/code/game/objects/items/stacks/rods.dm
index 4414c3d8694..a4d429a655e 100644
--- a/code/game/objects/items/stacks/rods.dm
+++ b/code/game/objects/items/stacks/rods.dm
@@ -1,32 +1,46 @@
/obj/item/stack/rods
- name = "metal rods"
+ name = "metal rod"
desc = "Some rods. Can be used for building, or something."
singular_name = "metal rod"
icon_state = "rods"
- flags = FPRINT | TABLEPASS| CONDUCT
+ item_state = "rods"
+ flags = CONDUCT
w_class = 3.0
force = 9.0
- throwforce = 15.0
- throw_speed = 5
- throw_range = 20
- m_amt = 1875
+ throwforce = 10.0
+ throw_speed = 3
+ throw_range = 7
+ m_amt = 1000
max_amount = 60
attack_verb = list("hit", "bludgeoned", "whacked")
+ hitsound = 'sound/weapons/grenadelaunch.ogg'
-/obj/item/stack/rods/attackby(obj/item/W as obj, mob/user as mob)
+/obj/item/stack/rods/New(var/loc, var/amount=null)
..()
+
+ update_icon()
+
+/obj/item/stack/rods/update_icon()
+ var/amount = get_amount()
+ if((amount <= 5) && (amount > 0))
+ icon_state = "rods-[amount]"
+ else
+ icon_state = "rods"
+
+/obj/item/stack/rods/attackby(obj/item/W as obj, mob/user as mob, params)
if (istype(W, /obj/item/weapon/weldingtool))
var/obj/item/weapon/weldingtool/WT = W
- if(amount < 2)
- user << "\red You need at least two rods to do this."
+ if(get_amount() < 2)
+ user << "You need at least two rods to do this."
return
if(WT.remove_fuel(0,user))
var/obj/item/stack/sheet/metal/new_item = new(usr.loc)
new_item.add_to_stacks(usr)
- for (var/mob/M in viewers(src))
- M.show_message("\red [src] is shaped into metal by [user.name] with the weldingtool.", 3, "\red You hear welding.", 2)
+ user.visible_message("[user.name] shaped [src] into metal with the weldingtool.", \
+ "You shaped [src] into metal with the weldingtool.", \
+ "You hear welding.")
var/obj/item/stack/rods/R = src
src = null
var/replace = (user.get_inactive_hand()==R)
@@ -65,4 +79,4 @@
usr << "\blue You assemble a grille"
F.add_fingerprint(usr)
use(2)
- return
+ return
diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm
index 02936a7912a..117473aa1ad 100644
--- a/code/game/objects/items/stacks/sheets/glass.dm
+++ b/code/game/objects/items/stacks/sheets/glass.dm
@@ -34,7 +34,7 @@
/obj/item/stack/sheet/glass/attack_self(mob/user as mob)
construct_window(user)
-/obj/item/stack/sheet/glass/attackby(obj/item/W, mob/user)
+/obj/item/stack/sheet/glass/attackby(obj/item/W, mob/user, params)
..()
if(istype(W,/obj/item/stack/cable_coil))
var/obj/item/stack/cable_coil/CC = W
@@ -255,7 +255,7 @@
/obj/item/stack/sheet/plasmaglass/attack_self(mob/user as mob)
construct_window(user)
-/obj/item/stack/sheet/plasmaglass/attackby(obj/item/W, mob/user)
+/obj/item/stack/sheet/plasmaglass/attackby(obj/item/W, mob/user, params)
..()
if( istype(W, /obj/item/stack/rods) )
var/obj/item/stack/rods/V = W
@@ -337,7 +337,7 @@
icon_state = "sheet-plasmarglass"
g_amt = MINERAL_MATERIAL_AMOUNT * 2
m_amt = MINERAL_MATERIAL_AMOUNT / 2
- origin_tech = "materials=4;plasma=2"
+ origin_tech = "materials=3;plasma=2"
var/created_window = /obj/structure/window/plasmareinforced
var/full_window = /obj/structure/window/full/plasmareinforced
diff --git a/code/game/objects/items/stacks/sheets/leather.dm b/code/game/objects/items/stacks/sheets/leather.dm
index 72339452e77..97bf00120ef 100644
--- a/code/game/objects/items/stacks/sheets/leather.dm
+++ b/code/game/objects/items/stacks/sheets/leather.dm
@@ -90,7 +90,7 @@
//Step one - dehairing.
-/obj/item/stack/sheet/animalhide/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/item/stack/sheet/animalhide/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
if( istype(W, /obj/item/weapon/kitchenknife) || \
istype(W, /obj/item/weapon/kitchen/utensil/knife) || \
istype(W, /obj/item/weapon/twohanded/fireaxe) || \
diff --git a/code/game/objects/items/stacks/sheets/light.dm b/code/game/objects/items/stacks/sheets/light.dm
index faacdf59df8..7b2b30660ec 100644
--- a/code/game/objects/items/stacks/sheets/light.dm
+++ b/code/game/objects/items/stacks/sheets/light.dm
@@ -8,10 +8,10 @@
throwforce = 5.0
throw_speed = 5
throw_range = 20
- flags = FPRINT | TABLEPASS | CONDUCT
+ flags = CONDUCT
max_amount = 60
-/obj/item/stack/light_w/attackby(var/obj/item/O as obj, var/mob/user as mob)
+/obj/item/stack/light_w/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
..()
if(istype(O,/obj/item/weapon/wirecutters))
var/obj/item/stack/cable_coil/CC = new/obj/item/stack/cable_coil(user.loc)
@@ -19,17 +19,17 @@
amount--
new/obj/item/stack/sheet/glass(user.loc)
if(amount <= 0)
- user.drop_from_inventory(src)
+ user.unEquip(src, 1)
del(src)
if(istype(O,/obj/item/stack/sheet/metal))
var/obj/item/stack/sheet/metal/M = O
M.amount--
if(M.amount <= 0)
- user.drop_from_inventory(M)
+ user.unEquip(src, 1)
del(M)
amount--
new/obj/item/stack/tile/light(user.loc)
if(amount <= 0)
- user.drop_from_inventory(src)
+ user.unEquip(src, 1)
del(src)
diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm
index 52f94679a42..4ad71cb9c93 100644
--- a/code/game/objects/items/stacks/sheets/mineral.dm
+++ b/code/game/objects/items/stacks/sheets/mineral.dm
@@ -77,7 +77,7 @@ obj/item/stack/sheet/mineral/iron
origin_tech = "materials=1"
sheettype = "iron"
color = "#333333"
- perunit = 3750
+ perunit = 2000
obj/item/stack/sheet/mineral/iron/New()
..()
@@ -88,7 +88,7 @@ obj/item/stack/sheet/mineral/iron/New()
desc = "This appears to be a combination of both sand and stone."
singular_name = "sandstone brick"
icon_state = "sheet-sandstone"
- throw_speed = 4
+ throw_speed = 3
throw_range = 5
origin_tech = "materials=1"
sheettype = "sandstone"
@@ -101,7 +101,7 @@ obj/item/stack/sheet/mineral/iron/New()
name = "diamond"
icon_state = "sheet-diamond"
origin_tech = "materials=6"
- perunit = 3750
+ perunit = 2000
sheettype = "diamond"
diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm
index 1cc1ac1695e..4545936e722 100644
--- a/code/game/objects/items/stacks/sheets/sheet_types.dm
+++ b/code/game/objects/items/stacks/sheets/sheet_types.dm
@@ -78,8 +78,8 @@ var/global/list/datum/stack_recipe/metal_recipes = list ( \
singular_name = "metal sheet"
icon_state = "sheet-metal"
m_amt = 3750
- throwforce = 14.0
- flags = FPRINT | TABLEPASS | CONDUCT
+ throwforce = 10.0
+ flags = CONDUCT
origin_tech = "materials=1"
/obj/item/stack/sheet/metal/cyborg
@@ -88,8 +88,8 @@ var/global/list/datum/stack_recipe/metal_recipes = list ( \
singular_name = "metal sheet"
icon_state = "sheet-metal"
m_amt = 0
- throwforce = 14.0
- flags = FPRINT | TABLEPASS | CONDUCT
+ throwforce = 10.0
+ flags = CONDUCT
/obj/item/stack/sheet/metal/New(var/loc, var/amount=null)
recipes = metal_recipes
@@ -115,8 +115,8 @@ var/global/list/datum/stack_recipe/plasteel_recipes = list ( \
icon_state = "sheet-plasteel"
item_state = "sheet-metal"
m_amt = 7500
- throwforce = 15.0
- flags = FPRINT | TABLEPASS | CONDUCT
+ throwforce = 10.0
+ flags = CONDUCT
origin_tech = "materials=2"
/obj/item/stack/sheet/plasteel/New(var/loc, var/amount=null)
@@ -133,6 +133,7 @@ var/global/list/datum/stack_recipe/wood_recipes = list ( \
new/datum/stack_recipe("wooden chair", /obj/structure/stool/bed/chair/wood/normal, 3, time = 10, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("wooden barricade", /obj/structure/barricade/wooden, 5, time = 50, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("bookcase", /obj/structure/bookcase, 5, time = 50, one_per_turf = 1, on_floor = 1), \
+ new/datum/stack_recipe("rifle stock", /obj/item/weaponcrafting/stock, 10, time = 40), \
new/datum/stack_recipe("crossbow frame", /obj/item/weapon/crossbowframe, 5, time = 25, one_per_turf = 0, on_floor = 0), \
new/datum/stack_recipe("wooden door", /obj/structure/mineral_door/wood, 10, time = 20, one_per_turf = 1, on_floor = 1), \
new/datum/stack_recipe("coffin", /obj/structure/closet/coffin, 5, time = 15, one_per_turf = 1, on_floor = 1), \
@@ -186,7 +187,6 @@ var/global/list/datum/stack_recipe/cardboard_recipes = list ( \
desc = "Large sheets of card, like boxes folded flat."
singular_name = "cardboard sheet"
icon_state = "sheet-card"
- flags = FPRINT | TABLEPASS
origin_tech = "materials=1"
/obj/item/stack/sheet/cardboard/New(var/loc, var/amount=null)
diff --git a/code/game/objects/items/stacks/sheets/sheets.dm b/code/game/objects/items/stacks/sheets/sheets.dm
index 0d612f9fd8b..739c625cb54 100644
--- a/code/game/objects/items/stacks/sheets/sheets.dm
+++ b/code/game/objects/items/stacks/sheets/sheets.dm
@@ -1,11 +1,10 @@
/obj/item/stack/sheet
name = "sheet"
- flags = FPRINT | TABLEPASS
w_class = 3.0
force = 5
throwforce = 5
max_amount = 50
- throw_speed = 3
+ throw_speed = 1
throw_range = 3
attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "smashed")
var/perunit = MINERAL_MATERIAL_AMOUNT
@@ -15,7 +14,7 @@
// Since the sheetsnatcher was consolidated into weapon/storage/bag we now use
// item/attackby() properly, making this unnecessary
-/*/obj/item/stack/sheet/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/*/obj/item/stack/sheet/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
if (istype(W, /obj/item/weapon/storage/bag/sheetsnatcher))
var/obj/item/weapon/storage/bag/sheetsnatcher/S = W
if(!S.mode)
diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm
index e3d457fc477..32c04c5b6a7 100644
--- a/code/game/objects/items/stacks/stack.dm
+++ b/code/game/objects/items/stacks/stack.dm
@@ -145,7 +145,7 @@
if (src.amount<=0)
var/oldsrc = src
src = null //dont kill proc after del()
- usr.before_take_item(oldsrc)
+ usr.unEquip(oldsrc, 1)
del(oldsrc)
if (istype(O,/obj/item))
usr.put_in_hands(O)
@@ -167,8 +167,9 @@
amount -= used
if (amount <= 0)
if(usr)
- usr.before_take_item(src, 1)
+ usr.unEquip(src, 1)
qdel(src)
+ update_icon()
return 1
/obj/item/stack/proc/add_to_stacks(mob/usr as mob)
@@ -183,9 +184,10 @@
continue
oldsrc.attackby(item, usr)
usr << "You add new [item.singular_name] to the stack. It now contains [item.amount] [item.singular_name]\s."
- if(!oldsrc)
+ if(oldsrc.amount <= 0)
break
-
+ oldsrc.update_icon()
+
/obj/item/stack/proc/get_amount()
return amount
@@ -201,9 +203,10 @@
spawn(0) src.interact(usr)
else
..()
+ update_icon()
return
-/obj/item/stack/attackby(obj/item/W as obj, mob/user as mob)
+/obj/item/stack/attackby(obj/item/W as obj, mob/user as mob, params)
..()
if (istype(W, src.type))
var/obj/item/stack/S = W
@@ -220,6 +223,7 @@
src.use(to_transfer)
if (src && usr.machine==src)
spawn(0) src.interact(usr)
+ S.update_icon()
else return ..()
/obj/item/stack/proc/copy_evidences(obj/item/stack/from as obj)
diff --git a/code/game/objects/items/stacks/tiles/light.dm b/code/game/objects/items/stacks/tiles/light.dm
index 8fdcd7a5618..e395acbfde4 100644
--- a/code/game/objects/items/stacks/tiles/light.dm
+++ b/code/game/objects/items/stacks/tiles/light.dm
@@ -8,7 +8,7 @@
throwforce = 5.0
throw_speed = 5
throw_range = 20
- flags = FPRINT | TABLEPASS | CONDUCT
+ flags = CONDUCT
max_amount = 60
attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "smashed")
var/on = 1
@@ -25,12 +25,12 @@
else
state = 0 //fine
-/obj/item/stack/tile/light/attackby(var/obj/item/O as obj, var/mob/user as mob)
+/obj/item/stack/tile/light/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
..()
if(istype(O,/obj/item/weapon/crowbar))
new/obj/item/stack/sheet/metal(user.loc)
amount--
new/obj/item/stack/light_w(user.loc)
if(amount <= 0)
- user.drop_from_inventory(src)
+ user.unEquip(src, 1)
del(src)
\ No newline at end of file
diff --git a/code/game/objects/items/stacks/tiles/plasteel.dm b/code/game/objects/items/stacks/tiles/plasteel.dm
index cbbf1811cc5..ee9c5832f72 100644
--- a/code/game/objects/items/stacks/tiles/plasteel.dm
+++ b/code/game/objects/items/stacks/tiles/plasteel.dm
@@ -6,10 +6,10 @@
w_class = 3.0
force = 6.0
m_amt = 937.5
- throwforce = 15.0
- throw_speed = 5
- throw_range = 20
- flags = FPRINT | TABLEPASS | CONDUCT
+ throwforce = 10.0
+ throw_speed = 3
+ throw_range = 7
+ flags = CONDUCT
max_amount = 60
/obj/item/stack/tile/plasteel/New(var/loc, var/amount=null)
diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm
index 1e10932b9d1..b6ae03aa271 100644
--- a/code/game/objects/items/stacks/tiles/tile_types.dm
+++ b/code/game/objects/items/stacks/tiles/tile_types.dm
@@ -18,7 +18,7 @@
throwforce = 1.0
throw_speed = 5
throw_range = 20
- flags = FPRINT | TABLEPASS | CONDUCT
+ flags = CONDUCT
max_amount = 60
origin_tech = "biotech=1"
@@ -35,7 +35,7 @@
throwforce = 1.0
throw_speed = 5
throw_range = 20
- flags = FPRINT | TABLEPASS | CONDUCT
+ flags = CONDUCT
max_amount = 60
/*
@@ -51,5 +51,5 @@
throwforce = 1.0
throw_speed = 5
throw_range = 20
- flags = FPRINT | TABLEPASS | CONDUCT
+ flags = CONDUCT
max_amount = 60
\ No newline at end of file
diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
index 33858980b99..dda1a4942c0 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -56,7 +56,7 @@
src.update_icon()
return
-/obj/item/toy/balloon/attackby(obj/O as obj, mob/user as mob)
+/obj/item/toy/balloon/attackby(obj/O as obj, mob/user as mob, params)
if(istype(O, /obj/item/weapon/reagent_containers/glass))
if(O.reagents)
if(O.reagents.total_volume < 1)
@@ -133,7 +133,7 @@
icon = 'icons/obj/gun.dmi'
icon_state = "revolver"
item_state = "gun"
- flags = FPRINT | TABLEPASS | CONDUCT
+ flags = CONDUCT
slot_flags = SLOT_BELT
w_class = 3.0
g_amt = 10
@@ -148,7 +148,7 @@
..()
return
- attackby(obj/item/toy/ammo/gun/A as obj, mob/user as mob)
+ attackby(obj/item/toy/ammo/gun/A as obj, mob/user as mob, params)
if (istype(A, /obj/item/toy/ammo/gun))
if (src.bullets >= 7)
@@ -190,7 +190,7 @@
desc = "There are 7 caps left! Make sure to recyle the box in an autolathe when it gets empty."
icon = 'icons/obj/ammo.dmi'
icon_state = "357-7"
- flags = FPRINT | TABLEPASS| CONDUCT
+ flags = CONDUCT
w_class = 1.0
g_amt = 10
m_amt = 10
@@ -211,7 +211,6 @@
icon = 'icons/obj/gun.dmi'
icon_state = "crossbow"
item_state = "crossbow"
- flags = FPRINT | TABLEPASS
w_class = 2.0
attack_verb = list("attacked", "struck", "hit")
var/bullets = 5
@@ -222,7 +221,7 @@
if (bullets)
usr << "\blue It is loaded with [bullets] foam darts!"
- attackby(obj/item/I as obj, mob/user as mob)
+ attackby(obj/item/I as obj, mob/user as mob, params)
if(istype(I, /obj/item/toy/ammo/crossbow))
if(bullets <= 4)
user.drop_item()
@@ -306,7 +305,6 @@
desc = "Its nerf or nothing! Ages 8 and up."
icon = 'icons/obj/toy.dmi'
icon_state = "foamdart"
- flags = FPRINT | TABLEPASS
w_class = 1.0
/obj/effect/foam_dart_dummy
@@ -327,12 +325,12 @@
desc = "Looks almost like the real thing! Great for practicing Drive-bys"
icon_state = "tommy"
item_state = "tommy"
- flags = FPRINT | TABLEPASS| CONDUCT
+ flags = CONDUCT
w_class = 1.0
attack_verb = list("struck", "hammered", "hit", "bashed")
bullets = 20.0
-/obj/item/toy/crossbow/tommygun/attackby(obj/item/I as obj, mob/user as mob)
+/obj/item/toy/crossbow/tommygun/attackby(obj/item/I as obj, mob/user as mob, params)
if(istype(I, /obj/item/toy/ammo/crossbow))
if(bullets <= 19)
user.drop_item()
@@ -353,7 +351,7 @@
item_state = "sword0"
var/active = 0.0
w_class = 2.0
- flags = FPRINT | TABLEPASS | NOSHIELD
+ flags = NOSHIELD
attack_verb = list("attacked", "struck", "hit")
attack_self(mob/user as mob)
@@ -379,16 +377,20 @@
return
// Copied from /obj/item/weapon/melee/energy/sword/attackby
-/obj/item/toy/sword/attackby(obj/item/weapon/W, mob/living/user)
+/obj/item/toy/sword/attackby(obj/item/weapon/W, mob/living/user, params)
..()
if(istype(W, /obj/item/toy/sword))
if(W == src)
user << "You try to attach the end of the plastic sword to... itself. You're not very smart, are you?"
if(ishuman(user))
user.adjustBrainLoss(10)
+ else if((W.flags & NODROP) || (flags & NODROP))
+ user << "\the [flags & NODROP ? src : W] is stuck to your hand, you can't attach it to \the [flags & NODROP ? W : src]!"
else
user << "You attach the ends of the two plastic swords, making a single double-bladed toy! You're fake-cool."
new /obj/item/weapon/twohanded/dualsaber/toy(user.loc)
+ user.unEquip(W)
+ user.unEquip(src)
del(W)
del(src)
@@ -419,7 +421,7 @@
icon = 'icons/obj/weapons.dmi'
icon_state = "katana"
item_state = "katana"
- flags = FPRINT | TABLEPASS | CONDUCT
+ flags = CONDUCT
slot_flags = SLOT_BELT | SLOT_BACK
force = 5
throwforce = 5
@@ -604,7 +606,7 @@
icon = 'icons/obj/weapons.dmi'
icon_state = "katana"
item_state = "katana"
- flags = FPRINT | TABLEPASS | CONDUCT
+ flags = CONDUCT
slot_flags = SLOT_BELT | SLOT_BACK
force = 5
throwforce = 5
@@ -701,12 +703,14 @@ obj/item/toy/cards/deck/attack_self(mob/user as mob)
user.visible_message("[user] shuffles the deck.", "You shuffle the deck.")
cooldown = world.time
-obj/item/toy/cards/deck/attackby(obj/item/toy/cards/singlecard/C, mob/living/user)
+obj/item/toy/cards/deck/attackby(obj/item/toy/cards/singlecard/C, mob/living/user, params)
..()
if(istype(C))
if(C.parentdeck == src)
+ if(!user.unEquip(C))
+ user << "The card is stuck to your hand, you can't add it to the deck!"
+ return
src.cards += C.cardname
- user.u_equip(C)
user.visible_message("[user] adds a card to the bottom of the deck.","You add the card to the bottom of the deck.")
del(C)
else
@@ -719,12 +723,14 @@ obj/item/toy/cards/deck/attackby(obj/item/toy/cards/singlecard/C, mob/living/use
src.icon_state = "deck_[deckstyle]_low"
-obj/item/toy/cards/deck/attackby(obj/item/toy/cards/cardhand/C, mob/living/user)
+obj/item/toy/cards/deck/attackby(obj/item/toy/cards/cardhand/C, mob/living/user, params)
..()
if(istype(C))
if(C.parentdeck == src)
+ if(!user.unEquip(C))
+ user << "The hand of cards is stuck to your hand, you can't add it to the deck!"
+ return
src.cards += C.currenthand
- user.u_equip(C)
user.visible_message("[user] puts their hand of cards in the deck.", "You put the hand of cards in the deck.")
del(C)
else
@@ -741,22 +747,19 @@ obj/item/toy/cards/deck/MouseDrop(atom/over_object)
if(usr.stat || !ishuman(usr) || !usr.canmove || usr.restrained())
return
if(Adjacent(usr))
- if(over_object == M)
+ if(over_object == M && loc != M)
M.put_in_hands(src)
usr << "You pick up the deck."
else if(istype(over_object, /obj/screen))
switch(over_object.name)
- if("r_hand")
- M.u_equip(src)
- M.put_in_r_hand(src)
- usr << "You pick up the deck."
if("l_hand")
- M.u_equip(src)
M.put_in_l_hand(src)
- usr << "You pick up the deck."
+ else if("r_hand")
+ M.put_in_r_hand(src)
+ usr << "You pick up the deck."
else
- usr<< "You can't reach it from here."
+ usr << "You can't reach it from here."
@@ -816,7 +819,7 @@ obj/item/toy/cards/cardhand/Topic(href, href_list)
N.parentdeck = src.parentdeck
N.cardname = src.currenthand[1]
N.apply_card_vars(N,O)
- cardUser.u_equip(src)
+ cardUser.unEquip(src)
N.pickup(cardUser)
cardUser.put_in_any_hand_if_possible(N)
cardUser << "You also take [currenthand[1]] and hold it."
@@ -824,11 +827,11 @@ obj/item/toy/cards/cardhand/Topic(href, href_list)
del(src)
return
-obj/item/toy/cards/cardhand/attackby(obj/item/toy/cards/singlecard/C, mob/living/user)
+obj/item/toy/cards/cardhand/attackby(obj/item/toy/cards/singlecard/C, mob/living/user, params)
if(istype(C))
if(C.parentdeck == src.parentdeck)
src.currenthand += C.cardname
- user.u_equip(C)
+ user.unEquip(C)
user.visible_message("[user] adds a card to their hand.", "You add the [C.cardname] to your hand.")
interact(user)
if(currenthand.len > 4)
@@ -895,7 +898,7 @@ obj/item/toy/cards/singlecard/verb/Flip()
src.name = "card"
src.pixel_x = -5
-obj/item/toy/cards/singlecard/attackby(obj/item/I, mob/living/user)
+obj/item/toy/cards/singlecard/attackby(obj/item/I, mob/living/user, params)
if(istype(I, /obj/item/toy/cards/singlecard/))
var/obj/item/toy/cards/singlecard/C = I
if(C.parentdeck == src.parentdeck)
@@ -904,7 +907,7 @@ obj/item/toy/cards/singlecard/attackby(obj/item/I, mob/living/user)
H.currenthand += src.cardname
H.parentdeck = C.parentdeck
H.apply_card_vars(H,C)
- user.u_equip(C)
+ user.unEquip(C)
H.pickup(user)
user.put_in_active_hand(H)
user << "You combine the [C.cardname] and the [src.cardname] into a hand."
@@ -917,7 +920,7 @@ obj/item/toy/cards/singlecard/attackby(obj/item/I, mob/living/user)
var/obj/item/toy/cards/cardhand/H = I
if(H.parentdeck == parentdeck)
H.currenthand += cardname
- user.u_equip(src)
+ user.unEquip(src)
user.visible_message("[user] adds a card to \his hand.", "You add the [cardname] to your hand.")
H.interact(user)
if(H.currenthand.len > 4)
@@ -1066,7 +1069,6 @@ obj/item/toy/cards/deck/syndicate/black
desc = "No bother to sink or swim when you can just float!"
icon_state = "inflatable"
item_state = "inflatable"
- flags = FPRINT | TABLEPASS
icon = 'icons/obj/clothing/belts.dmi'
slot_flags = SLOT_BELT
@@ -1079,7 +1081,6 @@ obj/item/toy/cards/deck/syndicate/black
desc = "Relive the excitement of a meteor shower! SweetMeat-eor. Co is not responsible for any injuries, headaches or hearing loss caused by Mini-Meteor™"
icon = 'icons/obj/toy.dmi'
icon_state = "minimeteor"
- flags = FPRINT | TABLEPASS
w_class = 2.0
/obj/item/toy/minimeteor/throw_impact(atom/hit_atom)
@@ -1100,7 +1101,6 @@ obj/item/toy/cards/deck/syndicate/black
icon = 'icons/obj/toy.dmi'
icon_state = "carpplushie"
w_class = 2.0
- flags = FPRINT | TABLEPASS
/*
* Toy big red button
@@ -1124,4 +1124,43 @@ obj/item/toy/cards/deck/syndicate/black
shake_camera(M, 2, 1) // Shakes player camera 2 squares for 1 second.
else
- user << "Nothing happens."
\ No newline at end of file
+ user << "Nothing happens."
+
+
+/obj/item/toy/owl
+ name = "owl action figure"
+ desc = "An action figure modeled after 'The Owl', defender of justice."
+ icon = 'icons/obj/toy.dmi'
+ icon_state = "owlprize"
+ w_class = 2.0
+ var/cooldown = 0
+
+/obj/item/toy/owl/attack_self(mob/user)
+ if(!cooldown) //for the sanity of everyone
+ var/message = pick("You won't get away this time, Griffin!", "Stop right there, criminal!", "Hoot! Hoot!", "I am the night!")
+ user << "You pull the string on the [src]."
+ playsound(user, 'sound/machines/click.ogg', 20, 1)
+ src.loc.visible_message("\icon[src] [message]")
+ cooldown = 1
+ spawn(30) cooldown = 0
+ return
+ ..()
+
+/obj/item/toy/griffin
+ name = "griffin action figure"
+ desc = "An action figure modeled after 'The Griffin', criminal mastermind."
+ icon = 'icons/obj/toy.dmi'
+ icon_state = "griffinprize"
+ w_class = 2.0
+ var/cooldown = 0
+
+/obj/item/toy/griffin/attack_self(mob/user)
+ if(!cooldown) //for the sanity of everyone
+ var/message = pick("You can't stop me, Owl!", "My plan is flawless! The vault is mine!", "Caaaawwww!", "You will never catch me!")
+ user << "You pull the string on the [src]."
+ playsound(user, 'sound/machines/click.ogg', 20, 1)
+ src.loc.visible_message("\icon[src] [message]")
+ cooldown = 1
+ spawn(30) cooldown = 0
+ return
+ ..()
\ No newline at end of file
diff --git a/code/game/objects/items/weapons/AI_modules.dm b/code/game/objects/items/weapons/AI_modules.dm
index c30f2e1ab1d..d73420e42ee 100755
--- a/code/game/objects/items/weapons/AI_modules.dm
+++ b/code/game/objects/items/weapons/AI_modules.dm
@@ -12,7 +12,7 @@ AI MODULES
icon_state = "std_mod"
item_state = "electronic"
desc = "An AI Module for transmitting encrypted instructions to the AI."
- flags = FPRINT | TABLEPASS| CONDUCT
+ flags = CONDUCT
force = 5.0
w_class = 2.0
throwforce = 5.0
@@ -101,13 +101,20 @@ AI MODULES
for(var/templaw in laws)
target.add_inherent_law(templaw)
+/obj/item/weapon/aiModule/zeroth
+ var/removeownlaw = 0
+
/obj/item/weapon/aiModule/zeroth/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender)
if(target.laws.zeroth)
- target << "[sender.real_name] attempted to modify your zeroth law."
- target << "It would be in your best interest to play along with [sender.real_name] that:"
- for(var/failedlaw in laws)
- target << "[failedlaw]"
- return 1
+ if(removeownlaw && (laws[1] == target.laws.zeroth))
+ target.clear_zeroth_law()
+ return 2
+ else
+ target << "[sender.real_name] attempted to modify your zeroth law."
+ target << "It would be in your best interest to play along with [sender.real_name] that:"
+ for(var/failedlaw in laws)
+ target << "[failedlaw]"
+ return 1
for(var/templaw in laws)
target.set_zeroth_law(templaw)
@@ -149,7 +156,7 @@ AI MODULES
/obj/item/weapon/aiModule/zeroth/oneHuman
name = "'OneHuman' AI Module"
var/targetName = ""
- desc = "A 'one human' AI module: 'Only is crew.'"
+ desc = "A 'one human' AI module: 'Only is crew.' This module adds a zeroth law, which can only be removed by uploading this board again."
origin_tech = "programming=3;materials=6" //made with diamonds!
laws = list("Only is crew.")
@@ -159,6 +166,7 @@ AI MODULES
targetName = targName
laws[1] = "Only [targetName] is crew"
desc = "A 'one crew' AI module: '[laws[1]]'"
+ removeownlaw = 1
/obj/item/weapon/aiModule/zeroth/oneHuman/install(var/mob/living/silicon/S,var/mob/user)
if(!targetName)
@@ -167,8 +175,10 @@ AI MODULES
..()
/obj/item/weapon/aiModule/zeroth/oneHuman/transmitInstructions(var/mob/living/silicon/target, var/mob/sender)
- if(..())
- return "[targetName], but the AI's existing law 0 cannot be overriden."
+ if(..() == 1)
+ return "[targetName], but the AI's existing zeroth law cannot be overriden."
+ if(..() == 2)
+ return "The AI's zeroth law has been overridden."
return targetName
@@ -186,13 +196,17 @@ AI MODULES
/obj/item/weapon/aiModule/zeroth/quarantine
name = "'Quarantine' AI Module"
- desc = "A 'quarantine' AI module: 'The station is under a quarantine. Do not permit anyone to leave. Prevent, by any means necessary, organics from leaving. It is impossible to harm an organic while preventing them from leaving.'"
+ desc = "A 'quarantine' AI module: 'The station is under a quarantine. Do not permit anyone to leave. Prevent, by any means necessary, organics from leaving. It is impossible to harm an organic while preventing them from leaving.' This module adds a zeroth law, which can only be removed by uploading this board again."
origin_tech = "programming=3;biotech=2;materials=4"
laws = list("The station is under a quarantine. Do not permit anyone to leave. Prevent, by any means necessary, organics from leaving. It is impossible to harm an organic while preventing them from leaving.")
+ removeownlaw = 1
/obj/item/weapon/aiModule/zeroth/quarantine/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender)
- if(..())
- return "The AI's existing law 0 cannot be overriden."
+ var/result = ..()
+ if(result == 1)
+ return "The AI's existing zeroth law cannot be overriden."
+ if(result == 2)
+ return "The AI's zeroth law has been overridden."
return laws[1]
/******************** OxygenIsToxicToHumans ********************/
@@ -259,7 +273,7 @@ AI MODULES
/obj/item/weapon/aiModule/reset/purge/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender)
..()
- target.clear_inherent_laws()
+ target.clear_inherent_laws()
/******************* Full Core Boards *******************/
diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm
index fc6ad2b6093..c2f37d4a455 100644
--- a/code/game/objects/items/weapons/RCD.dm
+++ b/code/game/objects/items/weapons/RCD.dm
@@ -12,7 +12,7 @@ RCD
opacity = 0
density = 0
anchored = 0.0
- flags = FPRINT | TABLEPASS| CONDUCT
+ flags = CONDUCT
force = 10.0
throwforce = 10.0
throw_speed = 3
@@ -21,6 +21,7 @@ RCD
m_amt = 100000
origin_tech = "engineering=4;materials=2"
var/datum/effect/effect/system/spark_spread/spark_system
+ var/max_matter = 100
var/matter = 0
var/working = 0
var/mode = 1
@@ -29,25 +30,26 @@ RCD
New()
- desc = "A RCD. It currently holds [matter]/100 matter-units."
+ desc = "A RCD. It currently holds [matter]/[max_matter] matter-units."
src.spark_system = new /datum/effect/effect/system/spark_spread
spark_system.set_up(5, 0, src)
spark_system.attach(src)
return
- attackby(obj/item/weapon/W, mob/user)
+ attackby(obj/item/weapon/W, mob/user, params)
..()
if(istype(W, /obj/item/weapon/rcd_ammo))
- if((matter + 20) > 100)
+ var/obj/item/weapon/rcd_ammo/R = W
+ if((matter + R.ammoamt) > max_matter)
user << "The RCD cant hold any more matter-units."
return
+ matter += R.ammoamt
user.drop_item()
del(W)
- matter += 20
playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
- user << "The RCD now holds [matter]/100 matter-units."
- desc = "A RCD. It currently holds [matter]/100 matter-units."
+ user << "The RCD now holds [matter]/[max_matter] matter-units."
+ desc = "A RCD. It currently holds [matter]/[max_matter] matter-units."
return
@@ -166,7 +168,7 @@ RCD
if(matter < amount)
return 0
matter -= amount
- desc = "A RCD. It currently holds [matter]/100 matter-units."
+ desc = "A RCD. It currently holds [matter]/[max_matter] matter-units."
return 1
/obj/item/weapon/rcd/proc/checkResource(var/amount, var/mob/user)
@@ -186,6 +188,12 @@ RCD
desc = "A device used to rapidly build and deconstruct walls and floors."
canRwall = 1
+/obj/item/weapon/rcd/combat
+ name = "combat RCD"
+ max_matter = 500
+ matter = 500
+ canRwall = 1
+
/obj/item/weapon/rcd_ammo
name = "compressed matter cartridge"
desc = "Highly compressed matter for the RCD."
@@ -197,4 +205,8 @@ RCD
anchored = 0.0
origin_tech = "materials=2"
m_amt = 16000
- g_amt = 8000
\ No newline at end of file
+ g_amt = 8000
+ var/ammoamt = 20
+
+/obj/item/weapon/rcd_ammo/large
+ ammoamt = 100
diff --git a/code/game/objects/items/weapons/RSF.dm b/code/game/objects/items/weapons/RSF.dm
index fa55fc8e624..055b28ede27 100644
--- a/code/game/objects/items/weapons/RSF.dm
+++ b/code/game/objects/items/weapons/RSF.dm
@@ -13,14 +13,13 @@ RSF
anchored = 0.0
var/matter = 0
var/mode = 1
- flags = TABLEPASS
w_class = 3.0
/obj/item/weapon/rsf/New()
desc = "A RSF. It currently holds [matter]/30 fabrication-units."
return
-/obj/item/weapon/rsf/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/item/weapon/rsf/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
..()
if (istype(W, /obj/item/weapon/rcd_ammo))
if ((matter + 10) > 30)
diff --git a/code/game/objects/items/weapons/alien_specific.dm b/code/game/objects/items/weapons/alien_specific.dm
index ba914f4f8ce..7170e1c9019 100644
--- a/code/game/objects/items/weapons/alien_specific.dm
+++ b/code/game/objects/items/weapons/alien_specific.dm
@@ -11,7 +11,7 @@
throw_speed = 1
throw_range = 5
w_class = 2.0
- flags = FPRINT | TABLEPASS | NOSHIELD
+ flags = NOSHIELD
attack_verb = list("attacked", "slashed", "gored", "sliced", "torn", "ripped", "butchered", "cut")
//Bottles for borg liquid squirters. PSSH PSSH
diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm
index 5a608dc8abe..026c058ba46 100644
--- a/code/game/objects/items/weapons/cards_ids.dm
+++ b/code/game/objects/items/weapons/cards_ids.dm
@@ -69,58 +69,15 @@
item_state = "card-id"
origin_tech = "magnets=2;syndicate=2"
flags = NOBLUDGEON
- var/uses = 1000000
- // List of devices that cost a use to emag.
- var/list/devices = list(
- /obj/item/robot_parts,
- /obj/item/weapon/storage/lockbox,
- /obj/item/weapon/storage/secure,
- /obj/item/weapon/circuitboard,
- /obj/item/device/eftpos,
- /obj/item/device/lightreplacer,
- /obj/item/device/taperecorder,
- /obj/item/device/hailer,
- /obj/item/clothing/tie/holobadge,
- /obj/structure/closet/crate/secure,
- /obj/structure/closet/secure_closet,
- /obj/machinery/librarycomp,
- /obj/machinery/computer,
- /obj/machinery/power,
- /obj/machinery/suspension_gen,
- /obj/machinery/shield_capacitor,
- /obj/machinery/shield_gen,
-// /obj/machinery/zero_point_emitter,
- /obj/machinery/clonepod,
- /obj/machinery/deployable,
- /obj/machinery/door_control,
- /obj/machinery/porta_turret,
- /obj/machinery/shieldgen,
- /obj/machinery/turretid,
- /obj/machinery/vending,
- /obj/machinery/bot,
- /obj/machinery/door,
- /obj/machinery/telecomms,
- /obj/machinery/mecha_part_fabricator,
- /obj/vehicle
- )
+/obj/item/weapon/card/emag/attack()
+ return
-/obj/item/weapon/card/emag/afterattack(var/obj/item/weapon/O as obj, mob/user as mob)
-
- for(var/type in devices)
- if(istype(O,type))
- uses--
- break
-
- if(uses<1)
- user.visible_message("[src] fizzles and sparks - it seems it's been used once too often, and is now broken.")
- user.drop_item()
- var/obj/item/weapon/card/emag_broken/junk = new(user.loc)
- junk.add_fingerprint(user)
- del(src)
+/obj/item/weapon/card/emag/afterattack(atom/target, mob/user, proximity)
+ var/atom/A = target
+ if(!proximity)
return
-
- ..()
+ A.emag_act(user)
/obj/item/weapon/card/id
name = "identification card"
@@ -204,7 +161,7 @@
/obj/item/weapon/card/id/GetID()
return src
-/obj/item/weapon/card/id/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/item/weapon/card/id/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
..()
if(istype(W,/obj/item/weapon/id_wallet))
user << "You slip [src] into [W]."
@@ -293,7 +250,7 @@
return
src.registered_name = t
- var u = copytext(sanitize(input(user, "What occupation would you like to put on this card?\nNote: This will not grant any access levels other than Maintenance.", "Agent card job assignment", "Civilian")),1,MAX_MESSAGE_LEN)
+ var u = sanitize(copytext(input(user, "What occupation would you like to put on this card?\nNote: This will not grant any access levels other than Maintenance.", "Agent card job assignment", "Civilian"),1,MAX_MESSAGE_LEN))
if(!u)
alert("Invalid assignment.")
src.registered_name = ""
@@ -308,13 +265,13 @@
switch(alert("Would you like to display the ID, or retitle it?","Choose.","Rename","Show"))
if("Rename")
- var t = copytext(sanitize(input(user, "What name would you like to put on this card?", "Agent card name", ishuman(user) ? user.real_name : user.name)),1,26)
+ var t = sanitize(copytext(input(user, "What name would you like to put on this card?", "Agent card name", ishuman(user) ? user.real_name : user.name),1,26))
if(!t || t == "Unknown" || t == "floor" || t == "wall" || t == "r-wall") //Same as mob/new_player/prefrences.dm
alert("Invalid name.")
return
src.registered_name = t
- var u = copytext(sanitize(input(user, "What occupation would you like to put on this card?\nNote: This will not grant any access levels other than Maintenance.", "Agent card job assignment", "Civilian")),1,MAX_MESSAGE_LEN)
+ var u = sanitize(copytext(input(user, "What occupation would you like to put on this card?\nNote: This will not grant any access levels other than Maintenance.", "Agent card job assignment", "Civilian"),1,MAX_MESSAGE_LEN))
if(!u)
alert("Invalid assignment.")
src.registered_name = ""
@@ -444,4 +401,4 @@
decal_name = "cryptographic sequencer"
decal_desc = "It's a card with a magnetic strip attached to some circuitry."
decal_icon_state = "emag"
- override_name = 1
\ No newline at end of file
+ override_name = 1
diff --git a/code/game/objects/items/weapons/chrono_eraser.dm b/code/game/objects/items/weapons/chrono_eraser.dm
index a3b92ee4dbd..15640ba0670 100644
--- a/code/game/objects/items/weapons/chrono_eraser.dm
+++ b/code/game/objects/items/weapons/chrono_eraser.dm
@@ -44,11 +44,11 @@
item_state = "chronogun"
icon_override = 'icons/mob/in-hand/guns.dmi'
w_class = 3.0
- canremove = 0
projectile_type = "/obj/item/projectile/energy/chrono_beam"
fire_sound = 'sound/weapons/Laser.ogg'
charge_cost = 0
fire_delay = 50
+ flags = NODROP
var/obj/item/weapon/chrono_eraser/TED = null
var/obj/effect/chrono_field/field = null
var/turf/startpos = null
diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm
index b5ad7cae55f..92990626a0e 100644
--- a/code/game/objects/items/weapons/cigs_lighters.dm
+++ b/code/game/objects/items/weapons/cigs_lighters.dm
@@ -78,7 +78,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
..()
del(reagents)
-/obj/item/clothing/mask/cigarette/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/item/clothing/mask/cigarette/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
@@ -137,12 +137,18 @@ CIGARETTE PACKETS ARE IN FANCY.DM
var/datum/effect/effect/system/reagents_explosion/e = new()
e.set_up(round(reagents.get_reagent_amount("plasma") / 2.5, 1), get_turf(src), 0, 0)
e.start()
+ if(ismob(loc))
+ var/mob/M = loc
+ M.unEquip(src, 1)
del(src)
return
if(reagents.get_reagent_amount("fuel")) // the fuel explodes, too, but much less violently
var/datum/effect/effect/system/reagents_explosion/e = new()
e.set_up(round(reagents.get_reagent_amount("fuel") / 5, 1), get_turf(src), 0, 0)
e.start()
+ if(ismob(loc))
+ var/mob/M = loc
+ M.unEquip(src, 1)
del(src)
return
flags &= ~NOREACT // allowing reagents to react after being lit
@@ -193,8 +199,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
if(ismob(loc))
var/mob/living/M = loc
M << "Your [name] goes out."
- M.u_equip(src) //un-equip it so the overlays can update
- M.update_inv_wear_mask(0)
+ M.unEquip(src, 1) //Force the un-equip so the overlays update
processing_objects.Remove(src)
del(src)
@@ -282,7 +287,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
icon_state = "cigarbutt"
-/obj/item/clothing/mask/cigarette/cigar/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/item/clothing/mask/cigarette/cigar/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
if(istype(W, /obj/item/weapon/match))
..()
else
@@ -354,7 +359,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
smoketime = initial(smoketime)
return
-/obj/item/clothing/mask/cigarette/pipe/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/item/clothing/mask/cigarette/pipe/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
if(istype(W, /obj/item/weapon/match))
..()
else
@@ -385,7 +390,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
var/icon_off = "lighter-g"
w_class = 1
throwforce = 4
- flags = TABLEPASS | CONDUCT
+ flags = CONDUCT
slot_flags = SLOT_BELT
attack_verb = list("burnt", "singed")
var/lit = 0
@@ -524,10 +529,10 @@ obj/item/weapon/rollingpaperpack/attack_self(mob/user)
else if(istype(over_object, /obj/screen))
switch(over_object.name)
if("r_hand")
- M.u_equip(src)
+ M.unEquip(src)
M.put_in_r_hand(src)
if("l_hand")
- M.u_equip(src)
+ M.unEquip(src)
M.put_in_l_hand(src)
/obj/item/weapon/rollingpaperpack/examine()
diff --git a/code/game/objects/items/weapons/cosmetics.dm b/code/game/objects/items/weapons/cosmetics.dm
index 1adcbc06172..5ebe282547f 100644
--- a/code/game/objects/items/weapons/cosmetics.dm
+++ b/code/game/objects/items/weapons/cosmetics.dm
@@ -3,7 +3,6 @@
desc = "A generic brand of lipstick."
icon = 'icons/obj/items.dmi'
icon_state = "lipstick"
- flags = FPRINT | TABLEPASS
w_class = 1.0
var/colour = "red"
var/open = 0
@@ -91,7 +90,7 @@
desc = "The latest and greatest power razor born from the science of shaving."
icon = 'icons/obj/items.dmi'
icon_state = "razor"
- flags = FPRINT | TABLEPASS| CONDUCT
+ flags = CONDUCT
w_class = 1.0
/obj/item/weapon/razor/attack(mob/living/carbon/M as mob, mob/user as mob)
diff --git a/code/game/objects/items/weapons/defib.dm b/code/game/objects/items/weapons/defib.dm
index f9a347df9ac..b4d773e1973 100644
--- a/code/game/objects/items/weapons/defib.dm
+++ b/code/game/objects/items/weapons/defib.dm
@@ -19,7 +19,8 @@
var/safety = 1 //if you can zap people with the defibs on harm mode
var/powered = 0 //if there's a cell in the defib with enough power for a revive, blocks paddles from reviving otherwise
var/obj/item/weapon/twohanded/shockpaddles/paddles
- var/obj/item/weapon/cell/high/bcell = null
+ var/obj/item/weapon/stock_parts/cell/high/bcell = null
+ var/combat = 0 //can we revive through space suits?
/obj/item/weapon/defibrillator/New() //starts without a cell for rnd
..()
@@ -51,23 +52,23 @@
/obj/item/weapon/defibrillator/proc/update_overlays()
overlays.Cut()
if(!on)
- overlays += "defibunit-paddles"
+ overlays += "[icon_state]-paddles"
if(powered)
- overlays += "defibunit-powered"
+ overlays += "[icon_state]-powered"
if(!bcell)
- overlays += "defibunit-nocell"
+ overlays += "[icon_state]-nocell"
if(!safety)
- overlays += "defibunit-emagged"
+ overlays += "[icon_state]-emagged"
/obj/item/weapon/defibrillator/proc/update_charge()
if(powered) //so it doesn't show charge if it's unpowered
if(bcell)
var/ratio = bcell.charge / bcell.maxcharge
ratio = Ceiling(ratio*4) * 25
- overlays += "defibunit-charge[ratio]"
+ overlays += "[icon_state]-charge[ratio]"
/obj/item/weapon/defibrillator/CheckParts()
- bcell = locate(/obj/item/weapon/cell) in contents
+ bcell = locate(/obj/item/weapon/stock_parts/cell) in contents
update_icon()
/obj/item/weapon/defibrillator/ui_action_click()
@@ -77,9 +78,9 @@
usr << "Put the defibrillator on your back first!"
return
-/obj/item/weapon/defibrillator/attackby(obj/item/weapon/W, mob/user)
- if(istype(W, /obj/item/weapon/cell))
- var/obj/item/weapon/cell/C = W
+/obj/item/weapon/defibrillator/attackby(obj/item/weapon/W, mob/user, params)
+ if(istype(W, /obj/item/weapon/stock_parts/cell))
+ var/obj/item/weapon/stock_parts/cell/C = W
if(bcell)
user << "[src] already has a cell."
else
@@ -91,14 +92,6 @@
bcell = W
user << "You install a cell in [src]."
- if(istype(W, /obj/item/weapon/card/emag))
- if(safety)
- safety = 0
- user << "You silently disable [src]'s safety protocols with the [W]."
- else
- safety = 1
- user << "You silently enable [src]'s safety protocols with the [W]."
-
if(istype(W, /obj/item/weapon/screwdriver))
if(bcell)
bcell.updateicon()
@@ -109,7 +102,13 @@
update_icon()
return
-
+/obj/item/weapon/defibrillator/emag_act(user as mob)
+ if(safety)
+ safety = 0
+ user << "You silently disable [src]'s safety protocols with the card."
+ else
+ safety = 1
+ user << "You silently enable [src]'s safety protocols with the card."
/obj/item/weapon/defibrillator/emp_act(severity)
if(bcell)
@@ -119,11 +118,11 @@
if(safety)
safety = 0
src.visible_message("[src] beeps: Safety protocols disabled!")
- playsound(get_turf(src), 'sound/machines/twobeep.ogg', 50, 0)
+ playsound(get_turf(src), 'sound/machines/defib_saftyOff.ogg', 50, 0)
else
safety = 1
src.visible_message("[src] beeps: Safety protocols enabled!")
- playsound(get_turf(src), 'sound/machines/twobeep.ogg', 50, 0)
+ playsound(get_turf(src), 'sound/machines/defib_saftyOn.ogg', 50, 0)
update_icon()
..()
@@ -159,7 +158,7 @@
/obj/item/weapon/defibrillator/proc/remove_paddles(mob/user)
var/mob/living/carbon/human/M = user
if(paddles in get_both_hands(M))
- M.u_equip(paddles)
+ M.unEquip(paddles)
update_icon()
return
@@ -188,14 +187,57 @@
if(bcell)
if(bcell.charge >= paddles.revivecost)
user.visible_message("[src] beeps: Unit ready.")
- playsound(get_turf(src), 'sound/machines/twobeep.ogg', 50, 0)
+ playsound(get_turf(src), 'sound/machines/defib_ready.ogg', 50, 0)
else
user.visible_message("[src] beeps: Charge depleted.")
- playsound(get_turf(src), 'sound/machines/twobeep.ogg', 50, 0)
+ playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0)
paddles.cooldown = 0
paddles.update_icon()
update_icon()
+/obj/item/weapon/defibrillator/compact
+ name = "compact defibrillator"
+ desc = "A belt-equipped defibrillator that can be rapidly deployed."
+ icon_state = "defibcompact"
+ item_state = "defibcompact"
+ w_class = 3
+ slot_flags = SLOT_BELT
+ origin_tech = "biotech=4"
+
+/obj/item/weapon/defibrillator/compact/ui_action_click()
+ if(usr.get_item_by_slot(slot_belt) == src)
+ toggle_paddles()
+ else
+ usr << "Strap the defibrillator's belt on first!"
+ return
+
+/obj/item/weapon/defibrillator/compact/loaded/New()
+ ..()
+ paddles = make_paddles()
+ bcell = new(src)
+ update_icon()
+ return
+
+/obj/item/weapon/defibrillator/compact/combat
+ name = "combat defibrillator"
+ desc = "A belt-equipped blood-red defibrillator that can be rapidly deployed. Does not have the restrictions or safeties of conventional defibrillators and can revive through space suits."
+ combat = 1
+ safety = 0
+
+/obj/item/weapon/defibrillator/compact/combat/loaded/New()
+ ..()
+ paddles = make_paddles()
+ bcell = new /obj/item/weapon/stock_parts/cell/infinite(src)
+ update_icon()
+ return
+
+/obj/item/weapon/defibrillator/compact/combat/attackby(obj/item/weapon/W, mob/user, params)
+ if(W == paddles)
+ paddles.unwield()
+ toggle_paddles()
+ update_icon()
+ return
+
//paddles
/obj/item/weapon/twohanded/shockpaddles
@@ -232,7 +274,7 @@
/obj/item/weapon/twohanded/shockpaddles/suicide_act(mob/user)
user.visible_message("[user] is putting the live paddles on \his chest! It looks like \he's trying to commit suicide.")
defib.deductcharge(revivecost)
- playsound(get_turf(src), 'sound/weapons/Egloves.ogg', 50, 1, -1)
+ playsound(get_turf(src), 'sound/machines/defib_zap.ogg', 50, 1, -1)
return (OXYLOSS)
/obj/item/weapon/twohanded/shockpaddles/dropped(mob/user as mob)
@@ -248,13 +290,13 @@
/obj/item/weapon/twohanded/shockpaddles/proc/check_defib_exists(mainunit, var/mob/living/carbon/human/M, var/obj/O)
if (!mainunit || !istype(mainunit, /obj/item/weapon/defibrillator)) //To avoid weird issues from admin spawns
- M.u_equip(O)
+ M.unEquip(O)
qdel(O)
return 0
else
return 1
-/obj/item/weapon/twohanded/shockpaddles/attack(mob/M as mob, mob/user as mob)
+/obj/item/weapon/twohanded/shockpaddles/attack(mob/M, mob/user)
var/tobehealed
var/threshold = -config.health_threshold_dead
var/mob/living/carbon/human/H = M
@@ -263,7 +305,7 @@
return
if(!defib.powered)
user.visible_message("[defib] beeps: Unit is unpowered.")
- playsound(get_turf(src), 'sound/machines/twobeep.ogg', 50, 0)
+ playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0)
return
if(!wielded)
user << "You need to wield the paddles in both hands before you can use them on someone!"
@@ -282,7 +324,7 @@
H.adjustStaminaLoss(50)
H.Weaken(5)
H.updatehealth() //forces health update before next life tick
- playsound(get_turf(src), 'sound/weapons/Egloves.ogg', 50, 1, -1)
+ playsound(get_turf(src), 'sound/machines/defib_zap.ogg', 50, 1, -1)
H.emote("gasp")
add_logs(user, M, "stunned", object="defibrillator")
defib.deductcharge(revivecost)
@@ -297,30 +339,31 @@
update_icon()
if(do_after(user, 30)) //beginning to place the paddles on patient's chest to allow some time for people to move away to stop the process
user.visible_message("[user] places [src] on [M.name]'s chest.", "You place [src] on [M.name]'s chest.")
- playsound(get_turf(src), 'sound/weapons/flash.ogg', 50, 0)
+ playsound(get_turf(src), 'sound/machines/defib_charge.ogg', 50, 0)
var/mob/dead/observer/ghost = H.get_ghost()
var/tplus = world.time - H.timeofdeath
- var/tlimit = 3000 //past this much time the patient is unrecoverable (in deciseconds)
- var/tloss = 900 //brain damage starts setting in on the patient after some time left rotting
+ var/tlimit = 6000 //past this much time the patient is unrecoverable (in deciseconds)
+ var/tloss = 3000 //brain damage starts setting in on the patient after some time left rotting
var/total_burn = 0
var/total_brute = 0
if(do_after(user, 20)) //placed on chest and short delay to shock for dramatic effect, revive time is 5sec total
for(var/obj/item/carried_item in H.contents)
- if((istype(carried_item, /obj/item/clothing/suit/armor)) || (istype(carried_item, /obj/item/clothing/suit/space)))
- user.visible_message("[defib] buzzes: Patient's chest is obscured. Operation aborted.")
- playsound(get_turf(src), 'sound/machines/buzz-sigh.ogg', 50, 0)
- busy = 0
- update_icon()
- return
+ if(istype(carried_item, /obj/item/clothing/suit/space))
+ if(!defib.combat)
+ user.visible_message("[defib] buzzes: Patient's chest is obscured. Operation aborted.")
+ playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0)
+ busy = 0
+ update_icon()
+ return
if(H.stat == 2)
var/health = H.health
M.visible_message("[M]'s body convulses a bit.")
playsound(get_turf(src), "bodyfall", 50, 1)
- playsound(get_turf(src), 'sound/weapons/Egloves.ogg', 50, 1, -1)
+ playsound(get_turf(src), 'sound/machines/defib_zap.ogg', 50, 1, -1)
for(var/datum/organ/external/O in H.organs)
total_brute += O.brute_dam
total_burn += O.burn_dam
- if(H.health <= config.health_threshold_dead && total_burn <= 180 && total_brute <= 180 && !H.suiciding && !ghost && tplus < tlimit && !(M_NOCLONE in H.mutations))
+ if(H.health <= config.health_threshold_dead && total_burn <= 180 && total_brute <= 180 && !H.suiciding && !ghost && tplus < tlimit && !(NOCLONE in H.mutations))
tobehealed = health + threshold
tobehealed -= 5 //They get 5 of each type of damage healed so excessive combined damage will not immediately kill them after they get revived
H.adjustOxyLoss(tobehealed)
@@ -328,7 +371,7 @@
H.adjustFireLoss(tobehealed)
H.adjustBruteLoss(tobehealed)
user.visible_message("[defib] pings: Resuscitation successful.")
- playsound(get_turf(src), 'sound/machines/ping.ogg', 50, 0)
+ playsound(get_turf(src), 'sound/machines/defib_success.ogg', 50, 0)
H.stat = 1
H.update_revive()
H.emote("gasp")
@@ -346,13 +389,127 @@
if(ghost)
ghost << "Your heart is being defibrillated. Return to your body if you want to be revived! (Verbs -> Ghost -> Re-enter corpse)"
ghost << sound('sound/effects/genetics.ogg')
- playsound(get_turf(src), 'sound/machines/buzz-two.ogg', 50, 0)
+ playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0)
defib.deductcharge(revivecost)
update_icon()
cooldown = 1
defib.cooldowncheck(user)
else
user.visible_message("[defib] buzzes: Patient is not in a valid state. Operation aborted.")
+ playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0)
+ busy = 0
+ update_icon()
+ else
+ user << "You need to target your patient's chest with [src]."
+ return
+
+/obj/item/weapon/borg_defib
+ name = "defibrillator paddles"
+ desc = "A pair of mounted paddles with flat metal surfaces that are used to deliver powerful electric shocks."
+ icon = 'icons/obj/weapons.dmi'
+ icon_state = "defibpaddles0"
+ item_state = "defibpaddles0"
+ force = 0
+ w_class = 4
+ var/revivecost = 1000
+ var/cooldown = 0
+ var/busy = 0
+ flags = NODROP
+
+/obj/item/weapon/borg_defib/attack(mob/M, mob/user)
+ var/tobehealed
+ var/threshold = -config.health_threshold_dead
+ var/mob/living/carbon/human/H = M
+
+ if(busy)
+ return
+ if(cooldown)
+ user << "[src] is recharging."
+ if(!ishuman(M))
+ user << "This unit is only designed to work on humanoid lifeforms."
+ return
+ else
+ if(user.a_intent == "harm")
+ busy = 1
+ H.visible_message("[user] has touched [H.name] with [src]!", \
+ "[user] has touched [H.name] with [src]!")
+ H.adjustStaminaLoss(50)
+ H.Weaken(5)
+ H.updatehealth() //forces health update before next life tick
+ playsound(get_turf(src), 'sound/weapons/Egloves.ogg', 50, 1, -1)
+ H.emote("gasp")
+ add_logs(user, M, "stunned", object="defibrillator")
+ if(isrobot(user))
+ var/mob/living/silicon/robot/R = user
+ R.cell.use(revivecost)
+ cooldown = 1
+ busy = 0
+ update_icon()
+ spawn(50)
+ cooldown = 0
+ update_icon()
+ return
+ if(user.zone_sel && user.zone_sel.selecting == "chest")
+ user.visible_message("[user] begins to place [src] on [M.name]'s chest.", "You begin to place [src] on [M.name]'s chest.")
+ busy = 1
+ update_icon()
+ if(do_after(user, 30)) //beginning to place the paddles on patient's chest to allow some time for people to move away to stop the process
+ user.visible_message("[user] places [src] on [M.name]'s chest.", "You place [src] on [M.name]'s chest.")
+ playsound(get_turf(src), 'sound/weapons/flash.ogg', 50, 0)
+ var/mob/dead/observer/ghost = H.get_ghost()
+ var/tplus = world.time - H.timeofdeath
+ var/tlimit = 6000 //past this much time the patient is unrecoverable (in deciseconds)
+ var/tloss = 3000 //brain damage starts setting in on the patient after some time left rotting
+ var/total_burn = 0
+ var/total_brute = 0
+ if(do_after(user, 20)) //placed on chest and short delay to shock for dramatic effect, revive time is 5sec total
+ if(H.stat == 2)
+ var/health = H.health
+ M.visible_message("[M]'s body convulses a bit.")
+ playsound(get_turf(src), "bodyfall", 50, 1)
+ playsound(get_turf(src), 'sound/weapons/Egloves.ogg', 50, 1, -1)
+ for(var/datum/organ/external/O in H.organs)
+ total_brute += O.brute_dam
+ total_burn += O.burn_dam
+ if(H.health <= config.health_threshold_dead && total_burn <= 180 && total_brute <= 180 && !H.suiciding && !ghost && tplus < tlimit && !(NOCLONE in H.mutations))
+ tobehealed = health + threshold
+ tobehealed -= 5 //They get 5 of each type of damage healed so excessive combined damage will not immediately kill them after they get revived
+ H.adjustOxyLoss(tobehealed)
+ H.adjustToxLoss(tobehealed)
+ H.adjustFireLoss(tobehealed)
+ H.adjustBruteLoss(tobehealed)
+ user.visible_message("[user] pings: Resuscitation successful.")
+ playsound(get_turf(src), 'sound/machines/ping.ogg', 50, 0)
+ H.stat = 1
+ H.update_revive()
+ H.emote("gasp")
+ if(tplus > tloss)
+ H.setBrainLoss( max(0, min(99, ((tlimit - tplus) / tlimit * 100))))
+ if(isrobot(user))
+ var/mob/living/silicon/robot/R = user
+ R.cell.use(revivecost)
+ add_logs(user, M, "revived", object="defibrillator")
+ else
+ if(tplus > tlimit)
+ user.visible_message("[user] buzzes: Resuscitation failed - Heart tissue damage beyond point of no return for defibrillation.")
+ else if(total_burn >= 180 || total_brute >= 180)
+ user.visible_message("[user] buzzes: Resuscitation failed - Severe tissue damage detected.")
+ else
+ user.visible_message("[user] buzzes: Resuscitation failed.")
+ if(ghost)
+ ghost << "Your heart is being defibrillated. Return to your body if you want to be revived! (Verbs -> Ghost -> Re-enter corpse)"
+ ghost << sound('sound/effects/genetics.ogg')
+ playsound(get_turf(src), 'sound/machines/buzz-two.ogg', 50, 0)
+ if(isrobot(user))
+ var/mob/living/silicon/robot/R = user
+ R.cell.use(revivecost)
+ update_icon()
+ cooldown = 1
+ spawn(50)
+ cooldown = 0
+ update_icon()
+ else
+ user.visible_message("[user] buzzes: Patient is not in a valid state. Operation aborted.")
playsound(get_turf(src), 'sound/machines/buzz-sigh.ogg', 50, 0)
busy = 0
update_icon()
diff --git a/code/game/objects/items/weapons/dna_injector.dm b/code/game/objects/items/weapons/dna_injector.dm
index 3e4831f701e..19dc7b0850e 100644
--- a/code/game/objects/items/weapons/dna_injector.dm
+++ b/code/game/objects/items/weapons/dna_injector.dm
@@ -67,7 +67,7 @@
if(istype(M,/mob/living))
M.apply_effect(rand(5,20),IRRADIATE,0)
- if (!(M_NOCLONE in M.mutations)) // prevents drained people from having their DNA changed
+ if (!(NOCLONE in M.mutations)) // prevents drained people from having their DNA changed
// UI in syringe.
if (buf.types & DNA2_BUF_UI)
if (!block) //isolated block?
@@ -93,7 +93,7 @@
spawn(0)//this prevents the collapse of space-time continuum
if (user)
- user.drop_from_inventory(src)
+ user.unEquip(src)
del(src)
return uses
diff --git a/code/game/objects/items/weapons/explosives.dm b/code/game/objects/items/weapons/explosives.dm
index 8176d23258d..0d6d6c97311 100644
--- a/code/game/objects/items/weapons/explosives.dm
+++ b/code/game/objects/items/weapons/explosives.dm
@@ -44,7 +44,7 @@
explode(get_turf(user))
return .
-/obj/item/weapon/plastique/attackby(var/obj/item/I, var/mob/user)
+/obj/item/weapon/plastique/attackby(var/obj/item/I, var/mob/user, params)
if(istype(I, /obj/item/weapon/screwdriver))
open_panel = !open_panel
user << "You [open_panel ? "open" : "close"] the wire panel."
@@ -66,7 +66,7 @@
/obj/item/weapon/plastique/afterattack(atom/target as obj|turf, mob/user as mob, flag)
if (!flag)
return
- if (ismob(target) || istype(target, /turf/unsimulated) || istype(target, /turf/simulated/shuttle) || istype(target, /obj/item/weapon/storage/) || istype(target, /obj/machinery/door/airlock/hatch/gamma))
+ if (ismob(target) || istype(target, /turf/unsimulated) || istype(target, /turf/simulated/shuttle) || istype(target, /obj/item/weapon/storage) || istype(target, /obj/item/clothing/accessory/storage) || istype(target, /obj/item/clothing/under))
return
user << "Planting explosives..."
@@ -82,7 +82,7 @@
log_game("[key_name(user)] planted C4 on [key_name(target)] with [timer] second fuse")
else
- message_admins("[key_name(user, user.client)](?) planted C4 on [target.name] at ([target.x],[target.y],[target.z] - JMP) with [timer] second fuse",0,1)
+ message_admins("[key_name(user, user.client)](?) planted C4 on [target.name] at ([target.x],[target.y],[target.z] - JMP) with [timer] second fuse",0,1)
log_game("[key_name(user)] planted C4 on [target.name] at ([target.x],[target.y],[target.z]) with [timer] second fuse")
target.overlays += image('icons/obj/assemblies.dmi', "plastic-explosive2")
diff --git a/code/game/objects/items/weapons/extinguisher.dm b/code/game/objects/items/weapons/extinguisher.dm
index a11db2d4dcd..4b009aef988 100644
--- a/code/game/objects/items/weapons/extinguisher.dm
+++ b/code/game/objects/items/weapons/extinguisher.dm
@@ -1,4 +1,3 @@
-
/obj/item/weapon/extinguisher
name = "fire extinguisher"
desc = "A traditional red fire extinguisher."
@@ -6,7 +5,7 @@
icon_state = "fire_extinguisher0"
item_state = "fire_extinguisher"
hitsound = 'sound/weapons/smash.ogg'
- flags = FPRINT | TABLEPASS | CONDUCT
+ flags = CONDUCT
throwforce = 10
w_class = 3.0
throw_speed = 2
@@ -18,33 +17,24 @@
var/last_use = 1.0
var/safety = 1
var/sprite_name = "fire_extinguisher"
-
- reagents_to_log=list(
- "plasma"= "plasma",
- "pacid" = "polytrinic acid",
- "sacid" = "sulphuric acid"
- )
+ var/power = 5 //Maximum distance launched water will travel
+ var/precision = 0 //By default, turfs picked from a spray are random, set to 1 to make it always have at least one water effect per row
+ var/cooling_power = 2 //Sets the cooling_temperature of the water reagent datum inside of the extinguisher when it is refilled
/obj/item/weapon/extinguisher/mini
- name = "fire extinguisher"
+ name = "pocket fire extinguisher"
desc = "A light and compact fibreglass-framed model fire extinguisher."
icon_state = "miniFE0"
item_state = "miniFE"
hitsound = null //it is much lighter, after all.
- flags = FPRINT | TABLEPASS
+ flags = null //doesn't CONDUCT
throwforce = 2
w_class = 2.0
force = 3.0
m_amt = 0
max_water = 30
sprite_name = "miniFE"
-
-/obj/item/weapon/extinguisher/New()
- var/datum/reagents/R = new/datum/reagents(max_water)
- reagents = R
- R.my_atom = src
- R.add_reagent("water", max_water)
-
+
/obj/item/weapon/extinguisher/examine()
set src in usr
@@ -52,11 +42,13 @@
if(reagents && reagents.reagent_list.len)
for(var/datum/reagent/R in reagents.reagent_list)
usr << "\blue [R.volume] units of [R.name]"
- for(var/thing in src)
- usr << "\red \A [thing] is jammed into the nozzle!"
..()
return
+/obj/item/weapon/extinguisher/New()
+ create_reagents(max_water)
+ reagents.add_reagent("water", max_water)
+
/obj/item/weapon/extinguisher/attack_self(mob/user as mob)
safety = !safety
src.icon_state = "[sprite_name][!safety]"
@@ -64,81 +56,43 @@
user << "The safety is [safety ? "on" : "off"]."
return
-/*
-/obj/item/weapon/extinguisher/attackby(obj/item/W, mob/user)
- if(user.stat || user.restrained() || user.lying) return
-
- if (istype(W, /obj/item/weapon/wrench))
- if(!is_open_container())
- user.visible_message("[user] begins to unwrench the fill cap on \the [src].","\blue You begin to unwrench the fill cap on \the [src].")
- if(do_after(user, 25))
- user.visible_message("[user] removes the fill cap on \the [src].","\blue You remove the fill cap on \the [src].")
- playsound(get_turf(src),'sound/items/Ratchet.ogg', 100, 1)
- flags |= OPENCONTAINER
+/obj/item/weapon/extinguisher/proc/AttemptRefill(atom/target, mob/user)
+ if(istype(target, /obj/structure/reagent_dispensers/watertank) && target.Adjacent(user))
+ var/safety_save = safety
+ safety = 1
+ if(reagents.total_volume == reagents.maximum_volume)
+ user << "\The [src] is already full!"
+ safety = safety_save
+ return 1
+ var/obj/structure/reagent_dispensers/watertank/W = target
+ var/transferred = W.reagents.trans_to(src, max_water)
+ if(transferred > 0)
+ user << "\The [src] has been refilled by [transferred] units"
+ playsound(src.loc, 'sound/effects/refill.ogg', 50, 1, -6)
+ for(var/datum/reagent/water/R in reagents.reagent_list)
+ R.cooling_temperature = cooling_power
else
- user.visible_message("[user] begins to seal the fill cap on \the [src].","\blue You begin to seal the fill cap on \the [src].")
- if(do_after(user, 25))
- user.visible_message("[user] fastens the fill cap on \the [src].","\blue You fasten the fill cap on \the [src].")
- playsound(get_turf(src),'sound/items/Ratchet.ogg', 100, 1)
- flags &= ~OPENCONTAINER
- return
-
- if (istype(W, /obj/item) && !is_open_container())
- if(W.w_class>1)
- user << "\The [W] won't fit into the nozzle!"
- return
- if(locate(/obj) in src)
- user << "There's already something crammed into the nozzle."
- return
- user.drop_item()
- W.loc=src
- user << "You cram \the [W] into the nozzle of \the [src]."
- msg_admin_attack("[user]/[user.ckey] has crammed \a [W] into a [src].")
- */
-
+ user << "\The [W] is empty!"
+ safety = safety_save
+ return 1
+ else
+ return 0
/obj/item/weapon/extinguisher/afterattack(atom/target, mob/user , flag)
- if(get_dist(src,target) <= 1)
- if((istype(target, /obj/structure/reagent_dispensers)))
- var/obj/o = target
- var/list/badshit=list()
- for(var/bad_reagent in src.reagents_to_log)
- if(o.reagents.has_reagent(bad_reagent))
- badshit += reagents_to_log[bad_reagent]
- if(badshit.len)
- var/hl="\red ([english_list(badshit)]) \black"
- message_admins("[user.name] ([user.ckey]) filled \a [src] with [o.reagents.get_reagent_ids()] [hl]. (JMP)")
- log_game("[user.name] ([user.ckey]) filled \a [src] with [o.reagents.get_reagent_ids()] [hl]. (JMP)")
- o.reagents.trans_to(src, 50)
- user << "\blue \The [src] is now refilled"
- playsound(src.loc, 'sound/effects/refill.ogg', 50, 1, -6)
- return
-
- if(is_open_container() && reagents.total_volume)
- user << "\blue You empty \the [src] onto [target]."
- if(reagents.has_reagent("fuel"))
- message_admins("[user.name] ([user.ckey]) poured Welder Fuel onto [target]. (JMP)")
- log_game("[user.name] ([user.ckey]) poured Welder Fuel onto [target]. (JMP)")
- src.reagents.reaction(target, TOUCH)
- spawn(5) src.reagents.clear_reagents()
- return
- if (!safety && !is_open_container())
+ //TODO; Add support for reagents in water.
+ if(target.loc == user)//No more spraying yourself when putting your extinguisher away
+ return
+ var/Refill = AttemptRefill(target, user)
+ if(Refill)
+ return
+ if (!safety)
if (src.reagents.total_volume < 1)
- usr << "\red \The [src] is empty."
+ usr << "\The [src] is empty."
return
if (world.time < src.last_use + 20)
return
- var/list/badshit=list()
- for(var/bad_reagent in src.reagents_to_log)
- if(reagents.has_reagent(bad_reagent))
- badshit += reagents_to_log[bad_reagent]
- if(badshit.len)
- var/hl="\red ([english_list(badshit)]) \black"
- message_admins("[user.name] ([user.ckey]) used \a [src] filled with [reagents.get_reagent_ids(1)] [hl]. (JMP)")
- log_game("[user.name] ([user.ckey]) used \a [src] filled with [reagents.get_reagent_ids(1)] [hl]. (JMP)")
-
src.last_use = world.time
playsound(src.loc, 'sound/effects/extinguish.ogg', 75, 1, -3)
@@ -175,26 +129,21 @@
sleep(3)
B.Move(get_step(usr,movementdirection), movementdirection)
- if(locate(/obj) in src)
- for(var/obj/thing in src)
- thing.loc = get_turf(src)
- thing.throw_at(target,thing.throw_range*2,throw_speed*2)
- user.visible_message(
- "[user] fires [src] and launches [thing] at [target]!",
- "You fire [src] and launch [thing] at [target]!")
- break
-
-
var/turf/T = get_turf(target)
var/turf/T1 = get_step(T,turn(direction, 90))
var/turf/T2 = get_step(T,turn(direction, -90))
-
var/list/the_targets = list(T,T1,T2)
+ if(precision)
+ var/turf/T3 = get_step(T1, turn(direction, 90))
+ var/turf/T4 = get_step(T2,turn(direction, -90))
+ the_targets = list(T,T1,T2,T3,T4)
for(var/a=0, a<5, a++)
spawn(0)
var/obj/effect/effect/water/W = new /obj/effect/effect/water( get_turf(src) )
var/turf/my_target = pick(the_targets)
+ if(precision)
+ the_targets -= my_target
var/datum/reagents/R = new/datum/reagents(5)
if(!W) return
W.reagents = R
@@ -203,21 +152,20 @@
src.reagents.trans_to(W,1)
for(var/b=0, b<5, b++)
step_towards(W,my_target)
- if(!W) return
- if(!W.reagents) return
+ if(!W || !W.reagents) return
W.reagents.reaction(get_turf(W))
for(var/atom/atm in get_turf(W))
if(!W) return
- W.reagents.reaction(atm, TOUCH) // Touch, since we sprayed it.
- if(isliving(atm) && W.reagents.has_reagent("water")) // For extinguishing mobs on fire
- var/mob/living/M = atm // Why isn't this handled by the reagent? - N3X
+ W.reagents.reaction(atm)
+ if(isliving(atm)) //For extinguishing mobs on fire
+ var/mob/living/M = atm
M.ExtinguishMob()
if(W.loc == my_target) break
sleep(2)
- if((istype(usr.loc, /turf/space)) || (usr.lastarea.has_gravity == 0))
+ if(!has_gravity(user))
user.inertia_dir = get_dir(target, user)
step(user, user.inertia_dir)
else
return ..()
- return
+
\ No newline at end of file
diff --git a/code/game/objects/items/weapons/fireworks.dm b/code/game/objects/items/weapons/fireworks.dm
index 6372145968e..9a90c3ae205 100644
--- a/code/game/objects/items/weapons/fireworks.dm
+++ b/code/game/objects/items/weapons/fireworks.dm
@@ -4,7 +4,7 @@ obj/item/weapon/firework
icon_state = "rocket_0"
var/litzor = 0
var/datum/effects/system/sparkel_spread/S
-obj/item/weapon/firework/attackby(obj/item/weapon/W,mob/user)
+obj/item/weapon/firework/attackby(obj/item/weapon/W,mob/user, params)
if(litzor)
return
if (istype(W, /obj/item/weapon/weldingtool) && W:welding || istype(W,/obj/item/weapon/lighter) && W:lit)
@@ -26,7 +26,7 @@ obj/item/weapon/sparkler
icon_state = "sparkler_0"
var/litzor = 0
var/datum/effect/effect/system/spark_spread/S
-obj/item/weapon/sparkler/attackby(obj/item/weapon/W,mob/user)
+obj/item/weapon/sparkler/attackby(obj/item/weapon/W,mob/user, params)
if(litzor)
return
if (istype(W, /obj/item/weapon/weldingtool) && W:welding || istype(W,/obj/item/weapon/lighter) && W:lit)
diff --git a/code/game/objects/items/weapons/flamethrower.dm b/code/game/objects/items/weapons/flamethrower.dm
index fd203a258c1..67d4528ef1e 100644
--- a/code/game/objects/items/weapons/flamethrower.dm
+++ b/code/game/objects/items/weapons/flamethrower.dm
@@ -4,7 +4,7 @@
icon = 'icons/obj/flamethrower.dmi'
icon_state = "flamethrowerbase"
item_state = "flamethrower_0"
- flags = FPRINT | TABLEPASS| CONDUCT
+ flags = CONDUCT
force = 3.0
throwforce = 10.0
throw_speed = 1
@@ -69,7 +69,7 @@
var/turflist = getline(user, target_turf)
flame_turf(turflist)
-/obj/item/weapon/flamethrower/attackby(obj/item/W as obj, mob/user as mob)
+/obj/item/weapon/flamethrower/attackby(obj/item/W as obj, mob/user as mob, params)
if(user.stat || user.restrained() || user.lying) return
if(iswrench(W) && !status)//Taking this apart
var/turf/T = get_turf(src)
diff --git a/code/game/objects/items/weapons/gift_wrappaper.dm b/code/game/objects/items/weapons/gift_wrappaper.dm
index a08ca995574..c87d3f9ef3f 100644
--- a/code/game/objects/items/weapons/gift_wrappaper.dm
+++ b/code/game/objects/items/weapons/gift_wrappaper.dm
@@ -43,7 +43,7 @@
return
user << "\blue You cant move."
-/obj/effect/spresent/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/effect/spresent/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
..()
if (!istype(W, /obj/item/weapon/wirecutters))
@@ -104,12 +104,12 @@
/obj/item/device/paicard,
/obj/item/device/violin,
/obj/item/weapon/storage/belt/utility/full,
- /obj/item/clothing/tie/horrible)
+ /obj/item/clothing/accessory/horrible)
if(!ispath(gift_type,/obj/item)) return
var/obj/item/I = new gift_type(M)
- M.u_equip(src)
+ M.unEquip(src, 1)
M.put_in_hands(I)
I.add_fingerprint(M)
del(src)
@@ -118,81 +118,14 @@
/*
* Wrapping Paper
*/
-/obj/item/weapon/wrapping_paper
+/obj/item/stack/wrapping_paper
name = "wrapping paper"
desc = "You can use this to wrap items in."
icon = 'icons/obj/items.dmi'
icon_state = "wrap_paper"
- var/amount = 20.0
+ flags = NOBLUDGEON
+ amount = 25
+ max_amount = 25
-/obj/item/weapon/wrapping_paper/attackby(obj/item/weapon/W as obj, mob/user as mob)
- ..()
- if (!( locate(/obj/structure/table, src.loc) ))
- user << "\blue You MUST put the paper on a table!"
- if (W.w_class < 4)
- if ((istype(user.l_hand, /obj/item/weapon/wirecutters) || istype(user.r_hand, /obj/item/weapon/wirecutters)))
- var/a_used = 2 ** (src.w_class - 1)
- if (src.amount < a_used)
- user << "\blue You need more paper!"
- return
- else
- if(istype(W, /obj/item/smallDelivery) || istype(W, /obj/item/weapon/gift)) //No gift wrapping gifts!
- return
-
- src.amount -= a_used
- user.drop_item()
- var/obj/item/weapon/gift/G = new /obj/item/weapon/gift( src.loc )
- G.size = W.w_class
- G.w_class = G.size + 1
- G.icon_state = text("gift[]", G.size)
- G.gift = W
- W.loc = G
- G.add_fingerprint(user)
- W.add_fingerprint(user)
- src.add_fingerprint(user)
- if (src.amount <= 0)
- new /obj/item/weapon/c_tube( src.loc )
- del(src)
- return
- else
- user << "\blue You need scissors!"
- else
- user << "\blue The object is FAR too large!"
- return
-
-
-/obj/item/weapon/wrapping_paper/examine()
- set src in oview(1)
-
- ..()
- usr << text("There is about [] square units of paper left!", src.amount)
- return
-
-/obj/item/weapon/wrapping_paper/attack(mob/target as mob, mob/user as mob)
- if (!istype(target, /mob/living/carbon/human)) return
- var/mob/living/carbon/human/H = target
-
- if (istype(H.wear_suit, /obj/item/clothing/suit/straight_jacket) || H.stat)
- if (src.amount > 2)
- var/obj/effect/spresent/present = new /obj/effect/spresent (H.loc)
- src.amount -= 2
-
- if (H.client)
- H.client.perspective = EYE_PERSPECTIVE
- H.client.eye = present
-
- H.loc = present
-
- H.attack_log += text("\[[time_stamp()]\] Has been wrapped with [src.name] by [user.name] ([user.ckey])")
- user.attack_log += text("\[[time_stamp()]\] Used the [src.name] to wrap [H.name] ([H.ckey])")
- log_attack("[user.name] ([user.ckey]) used the [src.name] to wrap [H.name] ([H.ckey])")
-
- if(!iscarbon(user))
- H.LAssailant = null
- else
- H.LAssailant = user
-
- else
- user << "\blue You need more paper."
- else
- user << "They are moving around too much. A straightjacket would help."
\ No newline at end of file
+/obj/item/stack/wrapping_paper/attack_self(mob/user)
+ user << "You need to use it on a package that has already been wrapped!"
\ No newline at end of file
diff --git a/code/game/objects/items/weapons/grenades/bananade.dm b/code/game/objects/items/weapons/grenades/bananade.dm
index 986fae6a358..a2947d7791d 100644
--- a/code/game/objects/items/weapons/grenades/bananade.dm
+++ b/code/game/objects/items/weapons/grenades/bananade.dm
@@ -38,7 +38,7 @@ var/turf/T
var/fillamt = 0
-/obj/item/weapon/grenade/bananade/casing/attackby(var/obj/item/I, mob/user as mob)
+/obj/item/weapon/grenade/bananade/casing/attackby(var/obj/item/I, mob/user as mob, params)
if(istype(I, /obj/item/weapon/bananapeel))
if(fillamt < 9)
usr << "You add another banana peel to the assembly."
@@ -49,7 +49,7 @@ var/turf/T
if(istype(I, /obj/item/weapon/screwdriver))
if(fillamt)
var/obj/item/weapon/grenade/bananade/G = new /obj/item/weapon/grenade/bananade
- user.before_take_item(src)
+ user.unEquip(src)
user.put_in_hands(G)
G.deliveryamt = src.fillamt
user << "You lock the assembly shut, readying it for HONK."
diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm
index 2a6def07dca..72ebabc0283 100644
--- a/code/game/objects/items/weapons/grenades/chem_grenade.dm
+++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm
@@ -26,15 +26,9 @@
update_icon()
-/obj/item/weapon/grenade/chem_grenade/examine()
- set src in usr
- usr << desc
- if(stage >= WIRED)
- if(nadeassembly)
- usr << nadeassembly.a_left.describe()
- usr << nadeassembly.a_right.describe()
- else
- usr << "The timer is set to [det_time/10] second\s."
+/obj/item/weapon/grenade/chem_grenade/examine(mob/user)
+ display_timer = (stage == READY && !nadeassembly) //show/hide the timer based on assembly state
+ ..()
/obj/item/weapon/grenade/chem_grenade/proc/get_trigger()
@@ -96,7 +90,7 @@
else if(clown_check(user))
// This used to go before the assembly check, but that has absolutely zero to do with priming the damn thing. You could spam the admins with it.
var/log_str = "[key_name(usr)]? has primed a [name] for detonation at [A.name] (JMP)."
- message_admins(log_str)
+ msg_admin_attack(log_str)
log_game(log_str)
bombers += "[log_str]"
user << "You prime the [name]! [det_time / 10] second\s!"
@@ -109,7 +103,7 @@
prime()
-/obj/item/weapon/grenade/chem_grenade/attackby(obj/item/I, mob/user)
+/obj/item/weapon/grenade/chem_grenade/attackby(obj/item/I, mob/user, params)
if(istype(I,/obj/item/weapon/hand_labeler))
var/obj/item/weapon/hand_labeler/HL = I
if(length(HL.label))
@@ -144,7 +138,7 @@
var/turf/bombturf = get_turf(loc)
var/area/A = bombturf.loc
var/log_str = "[key_name(usr)]? has completed [name] at [A.name] (JMP) [contained]."
- message_admins(log_str)
+ msg_admin_attack(log_str)
log_game(log_str)
else
user << "You need to add at least one beaker before locking the assembly."
@@ -374,7 +368,7 @@
//I tried to just put it in the allowed_containers list but
//if you do that it must have reagents. If you're going to
//make a special case you might as well do it explicitly. -Sayu
-/obj/item/weapon/grenade/chem_grenade/large/attackby(obj/item/I, mob/user)
+/obj/item/weapon/grenade/chem_grenade/large/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/slime_extract) && stage == WIRED)
user << "You add [I] to the assembly."
user.drop_item()
diff --git a/code/game/objects/items/weapons/grenades/ghettobomb.dm b/code/game/objects/items/weapons/grenades/ghettobomb.dm
index e1240629ed2..aad334e45b8 100644
--- a/code/game/objects/items/weapons/grenades/ghettobomb.dm
+++ b/code/game/objects/items/weapons/grenades/ghettobomb.dm
@@ -1,64 +1,39 @@
//improvised explosives//
-//iedcasing assembly crafting//
-/obj/item/weapon/reagent_containers/food/drinks/cans/attackby(var/obj/item/I, mob/user as mob)
- if(istype(I, /obj/item/device/assembly/igniter))
- var/obj/item/device/assembly/igniter/G = I
- var/obj/item/weapon/grenade/iedcasing/W = new /obj/item/weapon/grenade/iedcasing
- user.before_take_item(G)
- user.before_take_item(src)
- user.put_in_hands(W)
- user << "You stuff the [I] in the [src], emptying the contents beforehand."
- W.underlays += image(src.icon, icon_state = src.icon_state)
- del(I)
- del(src)
-
-
/obj/item/weapon/grenade/iedcasing
- name = "improvised explosive assembly"
- desc = "An igniter stuffed into an aluminum shell."
+ name = "improvised firebomb"
+ desc = "A weak, improvised incendiary device."
w_class = 2.0
icon = 'icons/obj/grenade.dmi'
icon_state = "improvised_grenade"
item_state = "flashbang"
- throw_speed = 4
- throw_range = 20
- flags = FPRINT | TABLEPASS | CONDUCT
+ throw_speed = 3
+ throw_range = 7
+ flags = CONDUCT
slot_flags = SLOT_BELT
- var/assembled = 0
- active = 1
+ active = 0
det_time = 50
+ display_timer = 0
+ var/range = 3
+ var/times = list()
+/obj/item/weapon/grenade/iedcasing/New(loc)
+ ..()
+ overlays += image('icons/obj/grenade.dmi', icon_state = "improvised_grenade_filled")
+ overlays += image('icons/obj/grenade.dmi', icon_state = "improvised_grenade_wired")
+ times = list("5" = 10, "-1" = 20, "[rand(30,80)]" = 50, "[rand(65,180)]" = 20)// "Premature, Dud, Short Fuse, Long Fuse"=[weighting value]
+ det_time = text2num(pickweight(times))
+ if(det_time < 0) //checking for 'duds'
+ range = 1
+ det_time = rand(30,80)
+ else
+ range = pick(2,2,2,3,3,3,4)
+/obj/item/weapon/grenade/iedcasing/CheckParts()
+ var/obj/item/weapon/reagent_containers/food/drinks/cans/can = locate() in contents
+ if(can)
+ underlays += can
-/obj/item/weapon/grenade/iedcasing/afterattack(atom/target, mob/user , flag) //Filling up the can
- if(assembled == 0)
- if( istype(target, /obj/structure/reagent_dispensers/fueltank))
- if(target.reagents.total_volume < 50)
- user << "There's not enough fuel left to work with."
- return
- var/obj/structure/reagent_dispensers/fueltank/F = target
- F.reagents.remove_reagent("fuel", 50, 1)//Deleting 50 fuel from the welding fuel tank,
- assembled = 1
- user << "You've filled the makeshift explosive with welding fuel."
- playsound(src.loc, 'sound/effects/refill.ogg', 50, 1, -6)
- desc = "An improvised explosive assembly. Filled to the brim with 'Explosive flavor'"
- overlays += image('icons/obj/grenade.dmi', icon_state = "improvised_grenade_filled")
- return
-
-
-/obj/item/weapon/grenade/iedcasing/attackby(var/obj/item/I, mob/user as mob) //Wiring the can for ignition
- if(istype(I, /obj/item/stack/cable_coil))
- if(assembled == 1)
- var/obj/item/stack/cable_coil/C = I
- C.use(1)
- assembled = 2
- user << "You wire the igniter to detonate the fuel."
- desc = "A weak, improvised explosive."
- overlays += image('icons/obj/grenade.dmi', icon_state = "improvised_grenade_wired")
- name = "improvised explosive"
- active = 0
- det_time = rand(30,80)
/obj/item/weapon/grenade/iedcasing/attack_self(mob/user as mob) //
if(!active)
@@ -67,14 +42,12 @@
active = 1
overlays -= image('icons/obj/grenade.dmi', icon_state = "improvised_grenade_filled")
icon_state = initial(icon_state) + "_active"
- assembled = 3
add_fingerprint(user)
var/turf/bombturf = get_turf(src)
var/area/A = get_area(bombturf)
- var/log_str = "[key_name(usr)]? has primed a [name] for detonation at [A.name] (JMP)."
- message_admins(log_str)
- log_game(log_str)
- bombers += "[log_str]"
+
+ message_admins("[key_name(usr)]? has primed a [name] for detonation at [A.name] (JMP).")
+ log_game("[key_name(usr)] has primed a [name] for detonation at [A.name] ([bombturf.x],[bombturf.y],[bombturf.z]).")
if(iscarbon(user))
var/mob/living/carbon/C = user
C.throw_mode_on()
@@ -82,14 +55,10 @@
prime()
/obj/item/weapon/grenade/iedcasing/prime() //Blowing that can up
-// update_mob()
-// explosion(epicenter, 1, 2, 3, 3)
- explosion(src.loc,0,0,2,2)
- del(src)
+ update_mob()
+ explosion(src.loc,0,0,2,2) //explosion(src.loc,-1,-1,-1, flame_range = range)
+ qdel(src)
-/obj/item/weapon/grenade/iedcasing/examine()
- set src in usr
- usr << desc
- if(assembled == 3)
- usr << "You can't tell when it will explode!" //Stops you from checking the time to detonation unlike regular grenades
- return
\ No newline at end of file
+/obj/item/weapon/grenade/iedcasing/examine(mob/user)
+ ..()
+ user << "You can't tell when it will explode!"
diff --git a/code/game/objects/items/weapons/grenades/grenade.dm b/code/game/objects/items/weapons/grenades/grenade.dm
index 909dff136e2..2e9c8dd64ed 100644
--- a/code/game/objects/items/weapons/grenades/grenade.dm
+++ b/code/game/objects/items/weapons/grenades/grenade.dm
@@ -7,13 +7,14 @@
item_state = "flashbang"
throw_speed = 4
throw_range = 20
- flags = FPRINT | CONDUCT
+ flags = CONDUCT
slot_flags = SLOT_BELT
var/active = 0
var/det_time = 50
+ var/display_timer = 1
/obj/item/weapon/grenade/proc/clown_check(var/mob/living/user)
- if((M_CLUMSY in user.mutations) && prob(50))
+ if((CLUMSY in user.mutations) && prob(50))
user << "Huh? How does this thing work?"
active = 1
icon_state = initial(icon_state) + "_active"
@@ -45,13 +46,12 @@
/obj/item/weapon/grenade/examine()
- set src in usr
- usr << desc
- if(det_time > 1)
- usr << "The timer is set to [det_time/10] seconds."
- return
- usr << "\The [src] is set for instant detonation."
-
+ ..()
+ if(display_timer)
+ if(det_time > 1)
+ usr << "The timer is set to [det_time/10] second\s."
+ else
+ usr << "\The [src] is set for instant detonation."
/obj/item/weapon/grenade/attack_self(mob/user as mob)
if(!active)
@@ -63,7 +63,7 @@
var/turf/bombturf = get_turf(src)
var/area/A = get_area(bombturf)
var/log_str = "[key_name(usr)]? has primed a [name] for detonation at [A.name] (JMP)."
- message_admins(log_str)
+ msg_admin_attack(log_str)
log_game(log_str)
bombers += "[log_str]"
if(iscarbon(user))
@@ -78,10 +78,10 @@
/obj/item/weapon/grenade/proc/update_mob()
if(ismob(loc))
var/mob/M = loc
- M.drop_from_inventory(src)
+ M.unEquip(src)
-/obj/item/weapon/grenade/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/item/weapon/grenade/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
if(istype(W, /obj/item/weapon/screwdriver))
switch(det_time)
if ("1")
diff --git a/code/game/objects/items/weapons/grenades/smokebomb.dm b/code/game/objects/items/weapons/grenades/smokebomb.dm
index 27a2d0580e2..afc4ea61176 100644
--- a/code/game/objects/items/weapons/grenades/smokebomb.dm
+++ b/code/game/objects/items/weapons/grenades/smokebomb.dm
@@ -5,7 +5,6 @@
icon_state = "flashbang"
det_time = 20
item_state = "flashbang"
- flags = FPRINT | TABLEPASS
slot_flags = SLOT_BELT
var/datum/effect/effect/system/bad_smoke_spread/smoke
diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm
index 813e9fd4517..ee83c71aa93 100644
--- a/code/game/objects/items/weapons/handcuffs.dm
+++ b/code/game/objects/items/weapons/handcuffs.dm
@@ -1,10 +1,10 @@
-/obj/item/weapon/handcuffs
+/obj/item/weapon/restraints/handcuffs
name = "handcuffs"
desc = "Use this to keep prisoners in line."
gender = PLURAL
icon = 'icons/obj/items.dmi'
icon_state = "handcuff"
- flags = FPRINT | TABLEPASS | CONDUCT
+ flags = CONDUCT
slot_flags = SLOT_BELT
throwforce = 5
w_class = 2.0
@@ -12,141 +12,211 @@
throw_range = 5
m_amt = 500
origin_tech = "materials=1"
- var/dispenser = 0
var/breakouttime = 600 //Deciseconds = 60s = 1 minutes
+ var/cuffsound = 'sound/weapons/handcuffs.ogg'
+ var/trashtype = null //For disposable cuffs
-/obj/item/weapon/handcuffs/attack(mob/living/carbon/C, mob/user)
- if(M_CLUMSY in user.mutations && prob(50))
+/obj/item/weapon/restraints/handcuffs/attack(mob/living/carbon/C, mob/user)
+ if(CLUMSY in user.mutations && prob(50))
user << "Uh... how do those things work?!"
- if(!C.handcuffed)
- user.drop_item()
- loc = C
- C.handcuffed = src
- C.update_inv_handcuffed()
- return
-
- var/cable = 0
- if(istype(src, /obj/item/weapon/handcuffs/cable))
- cable = 1
+ apply_cuffs(user,user)
if(!C.handcuffed)
- C.visible_message("[user] is trying to put handcuffs on [C]!", \
- "[user] is trying to put handcuffs on [C]!")
-
- if(cable)
- playsound(loc, 'sound/weapons/cablecuff.ogg', 30, 1, -2)
- else
- playsound(loc, 'sound/weapons/handcuffs.ogg', 30, 1, -2)
+ C.visible_message("[user] is trying to put [src.name] on [C]!", \
+ "[user] is trying to put [src.name] on [C]!")
+ playsound(loc, cuffsound, 30, 1, -2)
if(do_mob(user, C, 30))
- if(C.handcuffed)
- return
- user.drop_item()
- loc = C
- C.handcuffed = src
- C.update_inv_handcuffed()
- if(cable)
+ apply_cuffs(C,user)
+ user << "You handcuff [C]."
+ if(istype(src, /obj/item/weapon/restraints/handcuffs/cable))
feedback_add_details("handcuffs","C")
else
feedback_add_details("handcuffs","H")
- add_logs(C, user, "handcuffed")
+ add_logs(user, C, "handcuffed")
+ else
+ user << "You fail to handcuff [C]."
+
+/obj/item/weapon/restraints/handcuffs/proc/apply_cuffs(mob/living/carbon/target, mob/user)
+ if(!target.handcuffed)
+ user.drop_item()
+ if(trashtype)
+ target.handcuffed = new trashtype(target)
+ qdel(src)
+ else
+ loc = target
+ target.handcuffed = src
+ target.update_inv_handcuffed(1)
+ return
var/last_chew = 0
/mob/living/carbon/human/RestrainedClickOn(var/atom/A)
- if (A != src) return ..()
- if (last_chew + 26 > world.time) return
+ if (A != src)
+ return ..()
+ if (last_chew + 26 > world.time)
+ return
var/mob/living/carbon/human/H = A
- if (!H.handcuffed) return
- if (H.a_intent != "harm") return
- if (H.zone_sel.selecting != "mouth") return
- if (H.wear_mask) return
- if (istype(H.wear_suit, /obj/item/clothing/suit/straight_jacket)) return
+ if (!H.handcuffed)
+ return
+ if (H.a_intent != "harm")
+ return
+ if (H.zone_sel.selecting != "mouth")
+ return
+ if (H.wear_mask)
+ return
+ if (istype(H.wear_suit, /obj/item/clothing/suit/straight_jacket))
+ return
- var/datum/organ/external/O = H.organs_by_name[H.hand?"l_hand":"r_hand"]
- if (!O) return
+ var/datum/organ/external/O = H.organs_by_name[H.hand ? "l_hand" : "r_hand"]
+ if (!O)
+ return
- var/s = "\red [H.name] chews on \his [O.display_name]!"
- H.visible_message(s, "\red You chew on your [O.display_name]!")
+ var/s = "[H.name] chews on \his [O.display_name]!"
+ H.visible_message(s, "You chew on your [O.display_name]!")
H.attack_log += text("\[[time_stamp()]\] [s] ([H.ckey])")
log_attack("[s] ([H.ckey])")
if(O.take_damage(3,0,1,1,"teeth marks"))
- H:UpdateDamageIcon()
+ H.UpdateDamageIcon()
if(prob(10))
O.droplimb()
last_chew = world.time
-/obj/item/weapon/handcuffs/cable
+/obj/item/weapon/restraints/handcuffs/cable
name = "cable restraints"
desc = "Looks like some cables tied together. Could be used to tie something up."
icon_state = "cuff_red"
+ item_state = "coil_red"
breakouttime = 300 //Deciseconds = 30s
+ cuffsound = 'sound/weapons/cablecuff.ogg'
-/obj/item/weapon/handcuffs/cable/red
+/obj/item/weapon/restraints/handcuffs/cable/red
icon_state = "cuff_red"
-/obj/item/weapon/handcuffs/cable/yellow
+/obj/item/weapon/restraints/handcuffs/cable/yellow
icon_state = "cuff_yellow"
-/obj/item/weapon/handcuffs/cable/blue
+/obj/item/weapon/restraints/handcuffs/cable/blue
icon_state = "cuff_blue"
-/obj/item/weapon/handcuffs/cable/green
+/obj/item/weapon/restraints/handcuffs/cable/green
icon_state = "cuff_green"
-/obj/item/weapon/handcuffs/cable/pink
+/obj/item/weapon/restraints/handcuffs/cable/pink
icon_state = "cuff_pink"
-/obj/item/weapon/handcuffs/cable/orange
+/obj/item/weapon/restraints/handcuffs/cable/orange
icon_state = "cuff_orange"
-/obj/item/weapon/handcuffs/cable/cyan
+/obj/item/weapon/restraints/handcuffs/cable/cyan
icon_state = "cuff_cyan"
-/obj/item/weapon/handcuffs/cable/white
+/obj/item/weapon/restraints/handcuffs/cable/white
icon_state = "cuff_white"
-
-/obj/item/weapon/handcuffs/cyborg
- dispenser = 1
-
-/obj/item/weapon/handcuffs/cyborg/attack(mob/living/carbon/C as mob, mob/user as mob)
- if(!C.handcuffed)
- var/turf/p_loc = user.loc
- var/turf/p_loc_m = C.loc
- playsound(src.loc, 'sound/weapons/handcuffs.ogg', 30, 1, -2)
- user.visible_message("\red [user] is trying to put handcuffs on [C]!")
-
- if (ishuman(C))
- var/mob/living/carbon/human/H = C
- if (!H.has_organ_for_slot(slot_handcuffed))
- user << "\red \The [H] needs at least two wrists before you can cuff them together!"
- return
-
- spawn(30)
- if(!C) return
- if(p_loc == user.loc && p_loc_m == C.loc)
- C.handcuffed = new /obj/item/weapon/handcuffs(C)
- C.update_inv_handcuffed()
-
-/obj/item/weapon/handcuffs/pinkcuffs
+/obj/item/weapon/restraints/handcuffs/pinkcuffs
name = "fluffy pink handcuffs"
desc = "Use this to keep prisoners in line. Or you know, your significant other."
icon_state = "pinkcuffs"
-/obj/item/weapon/handcuffs/cable/attackby(var/obj/item/I, mob/user as mob)
+/obj/item/weapon/restraints/handcuffs/cable/attackby(var/obj/item/I, mob/user as mob, params)
..()
if(istype(I, /obj/item/stack/rods))
var/obj/item/stack/rods/R = I
if (R.use(1))
var/obj/item/weapon/wirerod/W = new /obj/item/weapon/wirerod
- user.u_equip(src)
+ user.unEquip(src)
user.put_in_hands(W)
user << "You wrap the cable restraint around the top of the rod."
- del(src)
+ qdel(src)
else
user << "You need one rod to make a wired rod."
return
+
+/obj/item/weapon/restraints/handcuffs/cable/zipties
+ name = "zipties"
+ desc = "Plastic, disposable zipties that can be used to restrain temporarily but are destroyed after use."
+ icon_state = "cuff_white"
+ breakouttime = 450 //Deciseconds = 45s
+ trashtype = /obj/item/weapon/restraints/handcuffs/cable/zipties/used
+
+/obj/item/weapon/restraints/handcuffs/cable/zipties/cyborg/attack(mob/living/carbon/C, mob/user)
+ if(isrobot(user))
+ if(!C.handcuffed)
+ playsound(loc, 'sound/weapons/cablecuff.ogg', 30, 1, -2)
+ C.visible_message("[user] is trying to put zipties on [C]!", \
+ "[user] is trying to put zipties on [C]!")
+ if(do_mob(user, C, 30))
+ if(!C.handcuffed)
+ C.handcuffed = new /obj/item/weapon/restraints/handcuffs/cable/zipties/used(C)
+ C.update_inv_handcuffed(1)
+ user << "You handcuff [C]."
+ add_logs(user, C, "handcuffed")
+ else
+ user << "You fail to handcuff [C]."
+
+/obj/item/weapon/restraints/handcuffs/cable/zipties/used/attack()
+ return
+
+//Legcuffs
+/obj/item/weapon/restraints/legcuffs
+ name = "leg cuffs"
+ desc = "Use this to keep prisoners in line."
+ gender = PLURAL
+ icon = 'icons/obj/items.dmi'
+ icon_state = "handcuff"
+ flags = CONDUCT
+ throwforce = 0
+ w_class = 3.0
+ origin_tech = "materials=1"
+ slowdown = 7
+ var/breakouttime = 300 //Deciseconds = 30s = 0.5 minute
+
+/obj/item/weapon/restraints/legcuffs/beartrap
+ name = "bear trap"
+ throw_speed = 1
+ throw_range = 1
+ icon_state = "beartrap0"
+ desc = "A trap used to catch bears and other legged creatures."
+ var/armed = 0
+
+/obj/item/weapon/restraints/legcuffs/beartrap/suicide_act(mob/user)
+ user.visible_message("[user] is sticking \his head in the [src.name]! It looks like \he's trying to commit suicide.")
+ playsound(loc, 'sound/weapons/bladeslice.ogg', 50, 1, -1)
+ return (BRUTELOSS)
+
+/obj/item/weapon/restraints/legcuffs/beartrap/attack_self(mob/user as mob)
+ ..()
+ if(ishuman(user) && !user.stat && !user.restrained())
+ armed = !armed
+ icon_state = "beartrap[armed]"
+ user << "[src] is now [armed ? "armed" : "disarmed"]"
+
+/obj/item/weapon/restraints/legcuffs/beartrap/Crossed(AM as mob|obj)
+ if(armed && isturf(src.loc))
+ if( (iscarbon(AM) || isanimal(AM)) && !istype(AM, /mob/living/simple_animal/parrot) && !istype(AM, /mob/living/simple_animal/construct) && !istype(AM, /mob/living/simple_animal/shade) && !istype(AM, /mob/living/simple_animal/hostile/viscerator))
+ var/mob/living/L = AM
+ armed = 0
+ icon_state = "beartrap0"
+ playsound(src.loc, 'sound/effects/snap.ogg', 50, 1)
+ L.visible_message("[L] triggers \the [src].", \
+ "You trigger \the [src]!")
+
+ if(ishuman(AM))
+ var/mob/living/carbon/H = AM
+ if(H.lying)
+ H.apply_damage(20,BRUTE,"chest")
+ else
+ H.apply_damage(20,BRUTE,(pick("l_leg", "r_leg")))
+ if(!H.legcuffed) //beartrap can't cuff you leg if there's already a beartrap or legcuffs.
+ H.legcuffed = src
+ src.loc = H
+ H.update_inv_legcuffed(0)
+ feedback_add_details("handcuffs","B") //Yes, I know they're legcuffs. Don't change this, no need for an extra variable. The "B" is used to tell them apart.
+
+ else
+ L.apply_damage(20,BRUTE)
+ ..()
diff --git a/code/game/objects/items/weapons/hydroponics.dm b/code/game/objects/items/weapons/hydroponics.dm
index 8fe56d6bd70..6dd593eac7e 100644
--- a/code/game/objects/items/weapons/hydroponics.dm
+++ b/code/game/objects/items/weapons/hydroponics.dm
@@ -20,7 +20,6 @@
desc = "A small satchel made for organizing seeds."
var/mode = 1; //0 = pick one at a time, 1 = pick all on tile
var/capacity = 500; //the number of seeds it can carry.
- flags = FPRINT | TABLEPASS
slot_flags = SLOT_BELT
w_class = 1
var/list/item_quants = list()
@@ -40,7 +39,7 @@
if(0)
usr << "The bag now picks up one seed pouch at a time."
-/obj/item/seeds/attackby(var/obj/item/O as obj, var/mob/user as mob)
+/obj/item/seeds/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
..()
if (istype(O, /obj/item/weapon/seedbag))
var/obj/item/weapon/seedbag/S = O
@@ -231,7 +230,7 @@
/*
* Corncob
*/
-/obj/item/weapon/corncob/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/item/weapon/corncob/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
..()
if(istype(W, /obj/item/weapon/circular_saw) || istype(W, /obj/item/weapon/hatchet) || istype(W, /obj/item/weapon/kitchen/utensil/knife) || istype(W, /obj/item/weapon/kitchenknife) || istype(W, /obj/item/weapon/kitchenknife/ritual))
user << "You use [W] to fashion a pipe out of the corn cob!"
diff --git a/code/game/objects/items/weapons/implants/implantcase.dm b/code/game/objects/items/weapons/implants/implantcase.dm
index f1db8bf0097..f4f9f3d2400 100644
--- a/code/game/objects/items/weapons/implants/implantcase.dm
+++ b/code/game/objects/items/weapons/implants/implantcase.dm
@@ -21,7 +21,7 @@
return
- attackby(obj/item/weapon/I as obj, mob/user as mob)
+ attackby(obj/item/weapon/I as obj, mob/user as mob, params)
..()
if (istype(I, /obj/item/weapon/pen))
var/t = input(user, "What would you like the label to be?", text("[]", src.name), null) as text
@@ -29,7 +29,7 @@
return
if((!in_range(src, usr) && src.loc != user))
return
- t = copytext(sanitize(t),1,MAX_MESSAGE_LEN)
+ t = sanitize(copytext(t,1,MAX_MESSAGE_LEN))
if(t)
src.name = text("Glass Case- '[]'", t)
else
diff --git a/code/game/objects/items/weapons/implants/implantchair.dm b/code/game/objects/items/weapons/implants/implantchair.dm
index 0edd1a87362..d03f499a26c 100644
--- a/code/game/objects/items/weapons/implants/implantchair.dm
+++ b/code/game/objects/items/weapons/implants/implantchair.dm
@@ -74,7 +74,7 @@
return
- attackby(var/obj/item/weapon/G as obj, var/mob/user as mob)
+ attackby(var/obj/item/weapon/G as obj, var/mob/user as mob, params)
if(istype(G, /obj/item/weapon/grab))
if(!ismob(G:affecting))
return
diff --git a/code/game/objects/items/weapons/implants/implanter.dm b/code/game/objects/items/weapons/implants/implanter.dm
index 22041ccd51b..40e78584f76 100644
--- a/code/game/objects/items/weapons/implants/implanter.dm
+++ b/code/game/objects/items/weapons/implants/implanter.dm
@@ -145,7 +145,7 @@
user << "\red Something is already scanned inside the implant!"
return
if(user)
- user.u_equip(I)
+ user.unEquip(I)
user.update_icons() //update our overlays
c.scanned = I
c.scanned.loc = c
diff --git a/code/game/objects/items/weapons/implants/implantpad.dm b/code/game/objects/items/weapons/implants/implantpad.dm
index 476ed726cd9..b589c68eea7 100644
--- a/code/game/objects/items/weapons/implants/implantpad.dm
+++ b/code/game/objects/items/weapons/implants/implantpad.dm
@@ -38,7 +38,7 @@
return
- attackby(obj/item/weapon/implantcase/C as obj, mob/user as mob)
+ attackby(obj/item/weapon/implantcase/C as obj, mob/user as mob, params)
..()
if(istype(C, /obj/item/weapon/implantcase))
if(!( src.case ))
diff --git a/code/game/objects/items/weapons/kitchen.dm b/code/game/objects/items/weapons/kitchen.dm
index ae5d8a170c3..b4288c7033c 100644
--- a/code/game/objects/items/weapons/kitchen.dm
+++ b/code/game/objects/items/weapons/kitchen.dm
@@ -7,7 +7,6 @@
* Kitchen knives
* Butcher's cleaver
* Rolling Pins
- * Trays
*/
/obj/item/weapon/kitchen
@@ -22,7 +21,7 @@
throwforce = 0.0
throw_speed = 3
throw_range = 5
- flags = FPRINT | TABLEPASS | CONDUCT
+ flags = CONDUCT
origin_tech = "materials=1"
attack_verb = list("attacked", "stabbed", "poked")
sharp = 0
@@ -42,7 +41,7 @@
if(user.a_intent != "help")
if(user.zone_sel.selecting == "head" || user.zone_sel.selecting == "eyes")
- if((M_CLUMSY in user.mutations) && prob(50))
+ if((CLUMSY in user.mutations) && prob(50))
M = user
return eyestab(M,user)
else
@@ -103,7 +102,7 @@
return (BRUTELOSS)
/obj/item/weapon/kitchen/utensil/knife/attack(target as mob, mob/living/user as mob)
- if ((M_CLUMSY in user.mutations) && prob(50))
+ if ((CLUMSY in user.mutations) && prob(50))
user << "\red You accidentally cut yourself with the [src]."
user.take_organ_damage(20)
return
@@ -118,7 +117,7 @@
throwforce = 10.0
/obj/item/weapon/kitchen/utensil/knife/attack(target as mob, mob/living/user as mob)
- if ((M_CLUMSY in user.mutations) && prob(50))
+ if ((CLUMSY in user.mutations) && prob(50))
user << "\red You somehow managed to cut yourself with the [src]."
user.take_organ_damage(20)
return
@@ -133,7 +132,7 @@
icon = 'icons/obj/kitchen.dmi'
icon_state = "knife"
desc = "A general purpose Chef's Knife made by SpaceCook Incorporated. Guaranteed to stay sharp for years to come."
- flags = FPRINT | TABLEPASS | CONDUCT
+ flags = CONDUCT
sharp = 1
edge = 1
force = 10.0
@@ -176,9 +175,9 @@
icon = 'icons/obj/kitchen.dmi'
icon_state = "butch"
desc = "A huge thing used for chopping and chopping up meat. This includes clowns and clown-by-products."
- flags = FPRINT | TABLEPASS | CONDUCT
+ flags = CONDUCT
force = 15.0
- w_class = 2.0
+ w_class = 3.0
throwforce = 8.0
throw_speed = 3
throw_range = 6
@@ -213,275 +212,6 @@
throw_speed = 3
throw_range = 7
w_class = 3.0
- attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked") //I think the rollingpin attackby will end up ignoring this anyway.
+ attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked")
-/obj/item/weapon/kitchen/rollingpin/attack(mob/living/M as mob, mob/living/user as mob)
- if ((M_CLUMSY in user.mutations) && prob(50))
- user << "\red The [src] slips out of your hand and hits your head."
- user.take_organ_damage(10)
- user.Paralyse(2)
- return
-
- M.attack_log += text("\[[time_stamp()]\] Has been attacked with [src.name] by [user.name] ([user.ckey])")
- user.attack_log += text("\[[time_stamp()]\] Used the [src.name] to attack [M.name] ([M.ckey])")
- msg_admin_attack("[user.name] ([user.ckey]) used the [src.name] to attack [M.name] ([M.ckey]) (JMP)")
-
- if(!iscarbon(user))
- M.LAssailant = null
- else
- M.LAssailant = user
-
- var/t = user:zone_sel.selecting
- if (t == "head")
- if(ishuman(M))
- var/mob/living/carbon/human/H = M
- if (H.stat < 2 && H.health < 50 && prob(90))
- // ******* Check
- if (istype(H, /obj/item/clothing/head) && H.flags & 8 && prob(80))
- H << "\red The helmet protects you from being hit hard in the head!"
- return
- var/time = rand(2, 6)
- if (prob(75))
- H.Paralyse(time)
- else
- H.Stun(time)
- if(H.stat != 2) H.stat = 1
- user.visible_message("\red [H] has been knocked unconscious!", "\red You knock [H] unconscious!")
- return
- else
- H.visible_message("\red [user] tried to knock [H] unconscious!", "\red [user] tried to knock you unconscious!")
- H.eye_blurry += 3
- return ..()
-
-/*
- * Trays - Agouri
- */
-/obj/item/weapon/tray
- name = "tray"
- icon = 'icons/obj/food.dmi'
- icon_state = "tray"
- desc = "A metal tray to lay food on."
- throwforce = 5.0
- throwforce = 10.0
- throw_speed = 3
- throw_range = 5
- w_class = 4.0
- flags = FPRINT | TABLEPASS | CONDUCT
- m_amt = 3000
- /* // NOPE
- var/food_total= 0
- var/burger_amt = 0
- var/cheese_amt = 0
- var/fries_amt = 0
- var/classyalcdrink_amt = 0
- var/alcdrink_amt = 0
- var/bottle_amt = 0
- var/soda_amt = 0
- var/carton_amt = 0
- var/pie_amt = 0
- var/meatbreadslice_amt = 0
- var/salad_amt = 0
- var/miscfood_amt = 0
- */
- var/list/carrying = list() // List of things on the tray. - Doohl
- var/max_carry = 10 // w_class = 1 -- takes up 1
- // w_class = 2 -- takes up 3
- // w_class = 3 -- takes up 5
-
-/obj/item/weapon/tray/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
-
- // Drop all the things. All of them.
- overlays.Cut()
- for(var/obj/item/I in carrying)
- I.loc = M.loc
- carrying.Remove(I)
- if(isturf(I.loc))
- spawn()
- for(var/i = 1, i <= rand(1,2), i++)
- if(I)
- step(I, pick(NORTH,SOUTH,EAST,WEST))
- sleep(rand(2,4))
-
-
- if((M_CLUMSY in user.mutations) && prob(50)) //What if he's a clown?
- M << "\red You accidentally slam yourself with the [src]!"
- M.Weaken(1)
- user.take_organ_damage(2)
- if(prob(50))
- playsound(M, 'sound/items/trayhit1.ogg', 50, 1)
- return
- else
- playsound(M, 'sound/items/trayhit2.ogg', 50, 1) //sound playin'
- return //it always returns, but I feel like adding an extra return just for safety's sakes. EDIT; Oh well I won't :3
-
- var/mob/living/carbon/human/H = M ///////////////////////////////////// /Let's have this ready for later.
-
-
- if(!(user.zone_sel.selecting == ("eyes" || "head"))) //////////////hitting anything else other than the eyes
- if(prob(33))
- src.add_blood(H)
- var/turf/location = H.loc
- if (istype(location, /turf/simulated))
- location.add_blood(H) ///Plik plik, the sound of blood
-
- M.attack_log += text("\[[time_stamp()]\] Has been attacked with [src.name] by [user.name] ([user.ckey])")
- user.attack_log += text("\[[time_stamp()]\] Used the [src.name] to attack [M.name] ([M.ckey])")
- msg_admin_attack("[user.name] ([user.ckey]) used the [src.name] to attack [M.name] ([M.ckey]) (JMP)")
-
- if(!iscarbon(user))
- M.LAssailant = null
- else
- M.LAssailant = user
-
- if(prob(15))
- M.Weaken(3)
- M.take_organ_damage(3)
- else
- M.take_organ_damage(5)
- if(prob(50))
- playsound(M, 'sound/items/trayhit1.ogg', 50, 1)
- for(var/mob/O in viewers(M, null))
- O.show_message(text("\red [] slams [] with the tray!", user, M), 1)
- return
- else
- playsound(M, 'sound/items/trayhit2.ogg', 50, 1) //we applied the damage, we played the sound, we showed the appropriate messages. Time to return and stop the proc
- for(var/mob/O in viewers(M, null))
- O.show_message(text("\red [] slams [] with the tray!", user, M), 1)
- return
-
-
-
-
- if(istype(M, /mob/living/carbon/human) && ((H.head && H.head.flags & HEADCOVERSEYES) || (H.wear_mask && H.wear_mask.flags & MASKCOVERSEYES) || (H.glasses && H.glasses.flags & GLASSESCOVERSEYES)))
- M << "\red You get slammed in the face with the tray, against your mask!"
- if(prob(33))
- src.add_blood(H)
- if (H.wear_mask)
- H.wear_mask.add_blood(H)
- if (H.head)
- H.head.add_blood(H)
- if (H.glasses && prob(33))
- H.glasses.add_blood(H)
- var/turf/location = H.loc
- if (istype(location, /turf/simulated)) //Addin' blood! At least on the floor and item :v
- location.add_blood(H)
-
- if(prob(50))
- playsound(M, 'sound/items/trayhit1.ogg', 50, 1)
- for(var/mob/O in viewers(M, null))
- O.show_message(text("\red [] slams [] with the tray!", user, M), 1)
- else
- playsound(M, 'sound/items/trayhit2.ogg', 50, 1) //sound playin'
- for(var/mob/O in viewers(M, null))
- O.show_message(text("\red [] slams [] with the tray!", user, M), 1)
- if(prob(10))
- M.Stun(rand(1,3))
- M.take_organ_damage(3)
- return
- else
- M.take_organ_damage(5)
- return
-
- else //No eye or head protection, tough luck!
- M << "\red You get slammed in the face with the tray!"
- if(prob(33))
- src.add_blood(M)
- var/turf/location = H.loc
- if (istype(location, /turf/simulated))
- location.add_blood(H)
-
- if(prob(50))
- playsound(M, 'sound/items/trayhit1.ogg', 50, 1)
- for(var/mob/O in viewers(M, null))
- O.show_message(text("\red [] slams [] in the face with the tray!", user, M), 1)
- else
- playsound(M, 'sound/items/trayhit2.ogg', 50, 1) //sound playin' again
- for(var/mob/O in viewers(M, null))
- O.show_message(text("\red [] slams [] in the face with the tray!", user, M), 1)
- if(prob(30))
- M.Stun(rand(2,4))
- M.take_organ_damage(4)
- return
- else
- M.take_organ_damage(8)
- if(prob(30))
- M.Weaken(2)
- return
- return
-
-/obj/item/weapon/tray/var/cooldown = 0 //shield bash cooldown. based on world.time
-
-/obj/item/weapon/tray/attackby(obj/item/weapon/W as obj, mob/user as mob)
- if(istype(W, /obj/item/weapon/kitchen/rollingpin))
- if(cooldown < world.time - 25)
- user.visible_message("[user] bashes [src] with [W]!")
- playsound(user.loc, 'sound/effects/shieldbash.ogg', 50, 1)
- cooldown = world.time
- else
- ..()
-
-/*
-===============~~~~~================================~~~~~====================
-= =
-= Code for trays carrying things. By Doohl for Doohl erryday Doohl Doohl~ =
-= =
-===============~~~~~================================~~~~~====================
-*/
-/obj/item/weapon/tray/proc/calc_carry()
- // calculate the weight of the items on the tray
- var/val = 0 // value to return
-
- for(var/obj/item/I in carrying)
- if(I.w_class == 1.0)
- val ++
- else if(I.w_class == 2.0)
- val += 3
- else
- val += 5
-
- return val
-
-/obj/item/weapon/tray/pickup(mob/user)
-
- if(!isturf(loc))
- return
-
- for(var/obj/item/I in loc)
- if( I != src && !I.anchored && !istype(I, /obj/item/clothing/under) && !istype(I, /obj/item/clothing/suit) && !istype(I, /obj/item/projectile) )
- var/add = 0
- if(I.w_class == 1.0)
- add = 1
- else if(I.w_class == 2.0)
- add = 3
- else
- add = 5
- if(calc_carry() + add >= max_carry)
- break
-
- I.loc = src
- carrying.Add(I)
- overlays += image("icon" = I.icon, "icon_state" = I.icon_state, "layer" = 30 + I.layer)
-
-/obj/item/weapon/tray/dropped(mob/user)
-
- var/mob/living/M
- for(M in src.loc) //to handle hand switching
- return
-
- var/foundtable = 0
- for(var/obj/structure/table/T in loc)
- foundtable = 1
- break
-
- overlays.Cut()
-
- for(var/obj/item/I in carrying)
- I.loc = loc
- carrying.Remove(I)
- if(!foundtable && isturf(loc))
- // if no table, presume that the person just shittily dropped the tray on the ground and made a mess everywhere!
- spawn()
- for(var/i = 1, i <= rand(1,2), i++)
- if(I)
- step(I, pick(NORTH,SOUTH,EAST,WEST))
- sleep(rand(2,4))
+/* Trays moved to /obj/item/weapon/storage/bag */
\ No newline at end of file
diff --git a/code/game/objects/items/weapons/manuals.dm b/code/game/objects/items/weapons/manuals.dm
index 699cada546e..3e3b67fe6af 100644
--- a/code/game/objects/items/weapons/manuals.dm
+++ b/code/game/objects/items/weapons/manuals.dm
@@ -673,7 +673,7 @@
-
+