From 1caba774316571d4ffae48ccfbd90267fe464836 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Tue, 29 Aug 2017 17:16:17 -0500 Subject: [PATCH 001/163] Server tools versioning and fix to displayed testmerges --- code/__DEFINES/server_tools.dm | 4 +++- code/datums/helper_datums/getrev.dm | 10 ++++++++-- code/modules/server_tools/server_tools.dm | 4 ++++ 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/code/__DEFINES/server_tools.dm b/code/__DEFINES/server_tools.dm index a4afa58a87..d2be3e578e 100644 --- a/code/__DEFINES/server_tools.dm +++ b/code/__DEFINES/server_tools.dm @@ -9,7 +9,9 @@ //keep these in sync with TGS3 #define SERVICE_WORLD_PARAM "server_service" -#define SERVICE_PR_TEST_JSON "..\\..\\prtestjob.json" +#define SERVICE_VERSION_PARAM "server_service_version" +#define SERVICE_PR_TEST_JSON "prtestjob.json" +#define SERVICE_PR_TEST_JSON_OLD "..\\..\\[SERVICE_PR_TEST_JSON]" #define SERVICE_CMD_HARD_REBOOT "hard_reboot" #define SERVICE_CMD_GRACEFUL_SHUTDOWN "graceful_shutdown" diff --git a/code/datums/helper_datums/getrev.dm b/code/datums/helper_datums/getrev.dm index 806f48a24f..c6958fa997 100644 --- a/code/datums/helper_datums/getrev.dm +++ b/code/datums/helper_datums/getrev.dm @@ -6,8 +6,14 @@ var/date /datum/getrev/New() - if(world.RunningService() && fexists(SERVICE_PR_TEST_JSON)) - testmerge = json_decode(file2text(SERVICE_PR_TEST_JSON)) + if(world.RunningService()) + var/file_name + if(ServiceVersion()) //will return null for versions < 3.0.91.0 + file_name = SERVICE_PR_TEST_JSON_OLD + else + file_name = SERVICE_PR_TEST_JSON + if(fexists(file_name)) + testmerge = json_decode(file2text(file_name)) #ifdef SERVERTOOLS else if(!world.RunningService() && fexists("../prtestjob.lk")) //tgs2 support var/list/tmp = world.file2list("..\\prtestjob.lk") diff --git a/code/modules/server_tools/server_tools.dm b/code/modules/server_tools/server_tools.dm index be8c80ac24..f16a56b2f9 100644 --- a/code/modules/server_tools/server_tools.dm +++ b/code/modules/server_tools/server_tools.dm @@ -4,6 +4,10 @@ GLOBAL_PROTECT(reboot_mode) /world/proc/RunningService() return params[SERVICE_WORLD_PARAM] +/proc/ServiceVersion() + if(world.RunningService()) + return world.params[SERVICE_VERSION_PARAM] + /world/proc/ExportService(command) return RunningService() && shell("python code/modules/server_tools/nudge.py \"[command]\"") == 0 From acd129ac37292a70ac03b43a1f91a90f7160e129 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Wed, 30 Aug 2017 08:01:27 -0500 Subject: [PATCH 002/163] Adds db connectivity check to jobban cache building --- code/modules/admin/banjob.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/admin/banjob.dm b/code/modules/admin/banjob.dm index 0128b719d7..a260746e66 100644 --- a/code/modules/admin/banjob.dm +++ b/code/modules/admin/banjob.dm @@ -22,6 +22,8 @@ return 0 /proc/jobban_buildcache(client/C) + if(!SSdbcore.Connect()) + return if(C && istype(C)) C.jobbancache = list() var/datum/DBQuery/query_jobban_build_cache = SSdbcore.NewQuery("SELECT job, reason FROM [format_table_name("ban")] WHERE ckey = '[sanitizeSQL(C.ckey)]' AND (bantype = 'JOB_PERMABAN' OR (bantype = 'JOB_TEMPBAN' AND expiration_time > Now())) AND isnull(unbanned)") From 50b88388da6413d1764dd4958b4aa6c757b69c22 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Wed, 30 Aug 2017 17:03:20 -0500 Subject: [PATCH 003/163] Crew monitoring rework part 1: crew pinpointers --- _maps/map_files/BoxStation/BoxStation.dmm | 2 +- .../map_files/Deltastation/DeltaStation2.dmm | 2 +- _maps/map_files/MetaStation/MetaStation.dmm | 2 +- _maps/map_files/OmegaStation/OmegaStation.dmm | 2 +- _maps/map_files/PubbyStation/PubbyStation.dmm | 2 +- code/__DEFINES/pinpointers.dm | 3 - .../gamemodes/malfunction/Malf_Modules.dm.rej | 11 ++ code/game/gamemodes/nuclear/nuclear.dm.rej | 10 ++ .../game/gamemodes/nuclear/nuclearbomb.dm.rej | 33 ++++ code/game/gamemodes/nuclear/pinpointer.dm | 6 - code/game/gamemodes/nuclear/pinpointer.dm.rej | 21 +++ code/game/gamemodes/objective_items.dm.rej | 10 ++ code/game/machinery/vending.dm | 2 +- code/game/objects/items/devices/pinpointer.dm | 152 ++++++++++++++++++ code/game/objects/items/pinpointer.dm | 150 +++++++++++++++++ .../crates_lockers/closets/secure/security.dm | 4 +- code/modules/admin/verbs/onlyone.dm | 4 +- code/modules/jobs/job_types/medical.dm | 1 + .../mob/living/silicon/ai/death.dm.rej | 13 ++ .../living/silicon/robot/robot_modules.dm.rej | 19 +++ code/modules/power/apc.dm.rej | 13 ++ icons/obj/device.dmi | Bin 38526 -> 37754 bytes tgstation.dme | 1 + tgstation.dme.rej | 20 +-- 24 files changed, 453 insertions(+), 30 deletions(-) create mode 100644 code/game/gamemodes/malfunction/Malf_Modules.dm.rej create mode 100644 code/game/gamemodes/nuclear/nuclear.dm.rej create mode 100644 code/game/gamemodes/nuclear/nuclearbomb.dm.rej create mode 100644 code/game/gamemodes/nuclear/pinpointer.dm.rej create mode 100644 code/game/gamemodes/objective_items.dm.rej create mode 100644 code/game/objects/items/devices/pinpointer.dm create mode 100644 code/game/objects/items/pinpointer.dm create mode 100644 code/modules/mob/living/silicon/ai/death.dm.rej create mode 100644 code/modules/mob/living/silicon/robot/robot_modules.dm.rej create mode 100644 code/modules/power/apc.dm.rej diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 95f1cb283c..27f366f7f8 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -24458,7 +24458,7 @@ /area/crew_quarters/heads/captain) "bfE" = ( /obj/structure/table/wood, -/obj/item/pinpointer, +/obj/item/pinpointer/nuke, /obj/item/disk/nuclear, /obj/item/storage/secure/safe{ pixel_x = 35; diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 5e0ded4416..0484d95b79 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -53210,7 +53210,7 @@ /area/tcommsat/server) "bYo" = ( /obj/structure/table/wood, -/obj/item/pinpointer, +/obj/item/pinpointer/nuke, /obj/item/disk/nuclear, /obj/item/device/radio/intercom{ name = "Station Intercom"; diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index ec76a564d5..a60e43dd83 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -29108,7 +29108,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/table/wood, -/obj/item/pinpointer, +/obj/item/pinpointer/nuke, /obj/item/disk/nuclear, /turf/open/floor/carpet, /area/crew_quarters/heads/captain/private) diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm index 9a3b2b9454..6b4f65c67e 100644 --- a/_maps/map_files/OmegaStation/OmegaStation.dmm +++ b/_maps/map_files/OmegaStation/OmegaStation.dmm @@ -1187,7 +1187,7 @@ pixel_x = 32; pixel_y = 24 }, -/obj/item/pinpointer, +/obj/item/pinpointer/nuke, /obj/item/disk/nuclear, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 10 diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index 7f55c286c7..497bf0a4ce 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -13937,7 +13937,7 @@ /area/storage/primary) "aEx" = ( /obj/structure/table/wood, -/obj/item/pinpointer, +/obj/item/pinpointer/nuke, /obj/item/disk/nuclear, /obj/machinery/light{ dir = 8 diff --git a/code/__DEFINES/pinpointers.dm b/code/__DEFINES/pinpointers.dm index 80403e54de..75f0452ea9 100644 --- a/code/__DEFINES/pinpointers.dm +++ b/code/__DEFINES/pinpointers.dm @@ -2,6 +2,3 @@ #define TRACK_NUKE_DISK 1 //We track the nuclear authentication disk, either to protect it or steal it #define TRACK_MALF_AI 2 //We track the malfunctioning AI, so we can prevent it from blowing us all up #define TRACK_INFILTRATOR 3 //We track the Syndicate infiltrator, so we can get back to ship when the nuke's armed -#define TRACK_OPERATIVES 4 //We track the closest operative, so we can regroup when we need to -#define TRACK_ATOM 5 //We track a specified atom, so admins can make us function for events -#define TRACK_COORDINATES 6 //We point towards the specified coordinates on our z-level, so we can navigate diff --git a/code/game/gamemodes/malfunction/Malf_Modules.dm.rej b/code/game/gamemodes/malfunction/Malf_Modules.dm.rej new file mode 100644 index 0000000000..97dbe2bbdb --- /dev/null +++ b/code/game/gamemodes/malfunction/Malf_Modules.dm.rej @@ -0,0 +1,11 @@ +diff a/code/game/gamemodes/malfunction/Malf_Modules.dm b/code/game/gamemodes/malfunction/Malf_Modules.dm (rejected hunks) +@@ -309,8 +309,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( + owner_AI.nuking = TRUE + owner_AI.doomsday_device = DOOM + owner_AI.doomsday_device.start() +- for(var/pinpointer in GLOB.pinpointer_list) +- var/obj/item/weapon/pinpointer/P = pinpointer ++ for(var/obj/item/weapon/pinpointer/nuke/P in GLOB.pinpointer_list) + P.switch_mode_to(TRACK_MALF_AI) //Pinpointers start tracking the AI wherever it goes + qdel(src) + diff --git a/code/game/gamemodes/nuclear/nuclear.dm.rej b/code/game/gamemodes/nuclear/nuclear.dm.rej new file mode 100644 index 0000000000..19648547c7 --- /dev/null +++ b/code/game/gamemodes/nuclear/nuclear.dm.rej @@ -0,0 +1,10 @@ +diff a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm (rejected hunks) +@@ -325,7 +325,7 @@ + gloves = /obj/item/clothing/gloves/combat + back = /obj/item/weapon/storage/backpack + ears = /obj/item/device/radio/headset/syndicate/alt +- l_pocket = /obj/item/weapon/pinpointer/syndicate ++ l_pocket = /obj/item/weapon/pinpointer/nuke/syndicate + id = /obj/item/weapon/card/id/syndicate + belt = /obj/item/weapon/gun/ballistic/automatic/pistol + backpack_contents = list(/obj/item/weapon/storage/box/syndie=1) diff --git a/code/game/gamemodes/nuclear/nuclearbomb.dm.rej b/code/game/gamemodes/nuclear/nuclearbomb.dm.rej new file mode 100644 index 0000000000..6a35e91cde --- /dev/null +++ b/code/game/gamemodes/nuclear/nuclearbomb.dm.rej @@ -0,0 +1,33 @@ +diff a/code/game/gamemodes/nuclear/nuclearbomb.dm b/code/game/gamemodes/nuclear/nuclearbomb.dm (rejected hunks) +@@ -362,9 +362,9 @@ + if(safety) + if(timing) + set_security_level(previous_level) +- for(var/obj/item/weapon/pinpointer/syndicate/S in GLOB.pinpointer_list) ++ for(var/obj/item/weapon/pinpointer/nuke/syndicate/S in GLOB.pinpointer_list) + S.switch_mode_to(initial(S.mode)) +- S.nuke_warning = FALSE ++ S.alert = FALSE + timing = FALSE + bomb_set = TRUE + detonation_timer = null +@@ -381,16 +381,16 @@ + bomb_set = TRUE + set_security_level("delta") + detonation_timer = world.time + (timer_set * 10) +- for(var/obj/item/weapon/pinpointer/syndicate/S in GLOB.pinpointer_list) ++ for(var/obj/item/weapon/pinpointer/nuke/syndicate/S in GLOB.pinpointer_list) + S.switch_mode_to(TRACK_INFILTRATOR) + countdown.start() + else + bomb_set = FALSE + detonation_timer = null + set_security_level(previous_level) +- for(var/obj/item/weapon/pinpointer/syndicate/S in GLOB.pinpointer_list) ++ for(var/obj/item/weapon/pinpointer/nuke/syndicate/S in GLOB.pinpointer_list) + S.switch_mode_to(initial(S.mode)) +- S.nuke_warning = FALSE ++ S.alert = FALSE + countdown.stop() + update_icon() + diff --git a/code/game/gamemodes/nuclear/pinpointer.dm b/code/game/gamemodes/nuclear/pinpointer.dm index 9f63309643..342bcac090 100644 --- a/code/game/gamemodes/nuclear/pinpointer.dm +++ b/code/game/gamemodes/nuclear/pinpointer.dm @@ -60,12 +60,6 @@ msg += "\"01000001 01001001\"." if(TRACK_INFILTRATOR) msg += "\"vasvygengbefuvc\"." - if(TRACK_OPERATIVES) - msg += "\"[target ? "Operative [target]" : "friends"]\"." - if(TRACK_ATOM) - msg += "\"[initial(constant_target.name)]\"." - if(TRACK_COORDINATES) - msg += "\"([target_x], [target_y])\"." else msg = "Its tracking indicator is blank." to_chat(user, msg) diff --git a/code/game/gamemodes/nuclear/pinpointer.dm.rej b/code/game/gamemodes/nuclear/pinpointer.dm.rej new file mode 100644 index 0000000000..79d652af9b --- /dev/null +++ b/code/game/gamemodes/nuclear/pinpointer.dm.rej @@ -0,0 +1,21 @@ +diff a/code/game/gamemodes/nuclear/pinpointer.dm b/code/game/gamemodes/nuclear/pinpointer.dm (rejected hunks) +@@ -30,7 +30,6 @@ + var/mob/living/L = loc + to_chat(L, "Your [name] vibrates and lets out a tinny alarm. Uh oh.") + +- + /obj/item/pinpointer/nuke/scan_for_target() + target = null + switch(mode) +@@ -58,10 +57,10 @@ + mode = new_mode + scan_for_target() + +- + /obj/item/pinpointer/nuke/syndicate // Syndicate pinpointers automatically point towards the infiltrator once the nuke is active. + name = "syndicate pinpointer" + desc = "A handheld tracking device that locks onto certain signals. It's configured to switch tracking modes once it detects the activation signal of a nuclear device." ++ icon_state = "pinpointer_syndicate" + + /obj/item/pinpointer/syndicate_cyborg // Cyborg pinpointers just look for a random operative. + name = "cyborg syndicate pinpointer" diff --git a/code/game/gamemodes/objective_items.dm.rej b/code/game/gamemodes/objective_items.dm.rej new file mode 100644 index 0000000000..3770d7eea9 --- /dev/null +++ b/code/game/gamemodes/objective_items.dm.rej @@ -0,0 +1,10 @@ +diff a/code/game/gamemodes/objective_items.dm b/code/game/gamemodes/objective_items.dm (rejected hunks) +@@ -158,7 +158,7 @@ + difficulty = 10 + + //Old ninja objectives. +-/datum/objective_item/special/pinpointer ++/datum/objective_item/special/pinpointer/nuke + name = "the captain's pinpointer." + targetitem = /obj/item/pinpointer + difficulty = 10 diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 427bc95253..bf879f84da 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -869,7 +869,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C products = list(/obj/item/reagent_containers/syringe = 12, /obj/item/reagent_containers/dropper = 3, /obj/item/stack/medical/gauze = 8, /obj/item/reagent_containers/pill/patch/styptic = 5, /obj/item/reagent_containers/pill/insulin = 10, /obj/item/reagent_containers/pill/patch/silver_sulf = 5, /obj/item/reagent_containers/glass/bottle/charcoal = 4, /obj/item/reagent_containers/spray/medical/sterilizer = 1, /obj/item/reagent_containers/glass/bottle/epinephrine = 4, /obj/item/reagent_containers/glass/bottle/morphine = 4, /obj/item/reagent_containers/glass/bottle/salglu_solution = 3, - /obj/item/reagent_containers/glass/bottle/toxin = 3, /obj/item/reagent_containers/syringe/antiviral = 6, /obj/item/reagent_containers/pill/salbutamol = 2, /obj/item/device/healthanalyzer = 4, /obj/item/device/sensor_device = 2) + /obj/item/reagent_containers/glass/bottle/toxin = 3, /obj/item/reagent_containers/syringe/antiviral = 6, /obj/item/reagent_containers/pill/salbutamol = 2, /obj/item/device/healthanalyzer = 4, /obj/item/device/sensor_device = 2, /obj/item/pinpointer/crew = 2) contraband = list(/obj/item/reagent_containers/pill/tox = 3, /obj/item/reagent_containers/pill/morphine = 4, /obj/item/reagent_containers/pill/charcoal = 6) premium = list(/obj/item/storage/box/hug/medical = 1, /obj/item/reagent_containers/hypospray/medipen = 3, /obj/item/storage/belt/medical = 3, /obj/item/wrench/medical = 1) armor = list(melee = 100, bullet = 100, laser = 100, energy = 100, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 50) diff --git a/code/game/objects/items/devices/pinpointer.dm b/code/game/objects/items/devices/pinpointer.dm new file mode 100644 index 0000000000..1d11f312a4 --- /dev/null +++ b/code/game/objects/items/devices/pinpointer.dm @@ -0,0 +1,152 @@ +//Pinpointers are used to track atoms from a distance as long as they're on the same z-level. The captain and nuke ops have ones that track the nuclear authentication disk. +/obj/item/weapon/pinpointer + name = "pinpointer" + desc = "A handheld tracking device that locks onto certain signals." + icon = 'icons/obj/device.dmi' + icon_state = "pinpointer" + flags = CONDUCT + slot_flags = SLOT_BELT + w_class = WEIGHT_CLASS_SMALL + item_state = "electronic" + lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' + righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' + throw_speed = 3 + throw_range = 7 + materials = list(MAT_METAL = 500, MAT_GLASS = 250) + resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF + var/active = FALSE + var/atom/movable/target = null //The thing we're searching for + var/minimum_range = 0 //at what range the pinpointer declares you to be at your destination + var/alert = FALSE // TRUE to display things more seriously + +/obj/item/weapon/pinpointer/New() + ..() + GLOB.pinpointer_list += src + +/obj/item/weapon/pinpointer/Destroy() + STOP_PROCESSING(SSfastprocess, src) + GLOB.pinpointer_list -= src + return ..() + +/obj/item/weapon/pinpointer/attack_self(mob/living/user) + active = !active + user.visible_message("[user] [active ? "" : "de"]activates their pinpointer.", "You [active ? "" : "de"]activate your pinpointer.") + playsound(user, 'sound/items/screwdriver2.ogg', 50, 1) + if(active) + START_PROCESSING(SSfastprocess, src) + else + target = null + STOP_PROCESSING(SSfastprocess, src) + update_pointer_overlay() + +/obj/item/weapon/pinpointer/process() + if(!active) + STOP_PROCESSING(SSfastprocess, src) + return + scan_for_target() + update_pointer_overlay() + +/obj/item/weapon/pinpointer/proc/scan_for_target() + return + +/obj/item/weapon/pinpointer/proc/update_pointer_overlay() + cut_overlays() + if(!active) + return + if(!target) + add_overlay("pinon[alert ? "alert" : ""]null") + var/turf/here = get_turf(src) + var/turf/there = get_turf(target) + if(here.z != there.z) + add_overlay("pinon[alert ? "alert" : ""]null") + return + if(get_dist_euclidian(here,there) <= minimum_range) + add_overlay("pinon[alert ? "alert" : ""]direct") + else + setDir(get_dir(here, there)) + switch(get_dist(here, there)) + if(1 to 8) + add_overlay("pinon[alert ? "alert" : "close"]") + if(9 to 16) + add_overlay("pinon[alert ? "alert" : "medium"]") + if(16 to INFINITY) + add_overlay("pinon[alert ? "alert" : "far"]") + +/obj/item/weapon/pinpointer/crew // A replacement for the old crew monitoring consoles + name = "crew pinpointer" + desc = "A handheld tracking device that points to crew suit sensors." + icon_state = "pinpointer_crew" + +/obj/item/weapon/pinpointer/crew/proc/trackable(mob/living/carbon/human/H) + var/turf/here = get_turf(src) + if((H.z == 0 || H.z == here.z) && istype(H.w_uniform, /obj/item/clothing/under)) + var/obj/item/clothing/under/U = H.w_uniform + + // Suit sensors must be on maximum. + if(!U.has_sensor || U.sensor_mode < SENSOR_COORDS) + return FALSE + + var/turf/there = get_turf(H) + return (H.z != 0 || (there && there.z == H.z)) + + return FALSE + +/obj/item/weapon/pinpointer/crew/attack_self(mob/living/user) + if(active) + active = FALSE + user.visible_message("[user] deactivates their pinpointer.", "You deactivate your pinpointer.") + playsound(user, 'sound/items/screwdriver2.ogg', 50, 1) + target = null //Restarting the pinpointer forces a target reset + STOP_PROCESSING(SSfastprocess, src) + update_pointer_overlay() + return + + var/list/name_counts = list() + var/list/names = list() + + for(var/mob/living/carbon/human/H in GLOB.mob_list) + if(!trackable(H)) + continue + + var/name = "Unknown" + if(H.wear_id) + var/obj/item/weapon/card/id/I = H.wear_id.GetID() + name = I.registered_name + + while(name in name_counts) + name_counts[name]++ + name = text("[] ([])", name, name_counts[name]) + names[name] = H + name_counts[name] = 1 + + if(!names.len) + user.visible_message("[user]'s pinpointer fails to detect a signal.", "Your pinpointer fails to detect a signal.") + return + + var/A = input(user, "Person to track", "Pinpoint") in names + if(!src || QDELETED(src) || !user || !user.is_holding(src) || user.incapacitated() || !A) + return + + target = names[A] + active = TRUE + user.visible_message("[user] activates their pinpointer.", "You activate your pinpointer.") + playsound(user, 'sound/items/screwdriver2.ogg', 50, 1) + START_PROCESSING(SSfastprocess, src) + update_pointer_overlay() + +/obj/item/weapon/pinpointer/crew/scan_for_target() + if(target) + if(ishuman(target)) + var/mob/living/carbon/human/H = target + if(!trackable(H)) + target = null + if(!target) + active = FALSE + +/obj/item/weapon/pinpointer/process() + if(!active) + STOP_PROCESSING(SSfastprocess, src) + return + scan_for_target() + update_pointer_overlay() + diff --git a/code/game/objects/items/pinpointer.dm b/code/game/objects/items/pinpointer.dm new file mode 100644 index 0000000000..28488a231f --- /dev/null +++ b/code/game/objects/items/pinpointer.dm @@ -0,0 +1,150 @@ +//Pinpointers are used to track atoms from a distance as long as they're on the same z-level. The captain and nuke ops have ones that track the nuclear authentication disk. +/obj/item/pinpointer + name = "pinpointer" + desc = "A handheld tracking device that locks onto certain signals." + icon = 'icons/obj/device.dmi' + icon_state = "pinpointer" + flags_1 = CONDUCT_1 + slot_flags = SLOT_BELT + w_class = WEIGHT_CLASS_SMALL + item_state = "electronic" + lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' + righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' + throw_speed = 3 + throw_range = 7 + materials = list(MAT_METAL = 500, MAT_GLASS = 250) + resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF + var/active = FALSE + var/atom/movable/target //The thing we're searching for + var/minimum_range = 0 //at what range the pinpointer declares you to be at your destination + var/alert = FALSE // TRUE to display things more seriously + +/obj/item/pinpointer/Initialize() + . = ..() + GLOB.pinpointer_list += src + +/obj/item/pinpointer/Destroy() + STOP_PROCESSING(SSfastprocess, src) + GLOB.pinpointer_list -= src + return ..() + +/obj/item/pinpointer/attack_self(mob/living/user) + active = !active + user.visible_message("[user] [active ? "" : "de"]activates their pinpointer.", "You [active ? "" : "de"]activate your pinpointer.") + playsound(src, 'sound/items/screwdriver2.ogg', 50, 1) + if(active) + START_PROCESSING(SSfastprocess, src) + else + target = null + STOP_PROCESSING(SSfastprocess, src) + update_icon() + +/obj/item/pinpointer/process() + if(!active) + return PROCESS_KILL + scan_for_target() + update_icon() + +/obj/item/pinpointer/proc/scan_for_target() + return + +/obj/item/pinpointer/update_icon() + cut_overlays() + if(!active) + return + if(!target) + add_overlay("pinon[alert ? "alert" : ""]null") + var/turf/here = get_turf(src) + var/turf/there = get_turf(target) + if(here.z != there.z) + add_overlay("pinon[alert ? "alert" : ""]null") + return + if(get_dist_euclidian(here,there) <= minimum_range) + add_overlay("pinon[alert ? "alert" : ""]direct") + else + setDir(get_dir(here, there)) + switch(get_dist(here, there)) + if(1 to 8) + add_overlay("pinon[alert ? "alert" : "close"]") + if(9 to 16) + add_overlay("pinon[alert ? "alert" : "medium"]") + if(16 to INFINITY) + add_overlay("pinon[alert ? "alert" : "far"]") + +/obj/item/pinpointer/crew // A replacement for the old crew monitoring consoles + name = "crew pinpointer" + desc = "A handheld tracking device that points to crew suit sensors." + icon_state = "pinpointer_crew" + +/obj/item/pinpointer/crew/proc/trackable(mob/living/carbon/human/H) + var/turf/here = get_turf(src) + if((H.z == 0 || H.z == here.z) && istype(H.w_uniform, /obj/item/clothing/under)) + var/obj/item/clothing/under/U = H.w_uniform + + // Suit sensors must be on maximum. + if(!U.has_sensor || U.sensor_mode < SENSOR_COORDS) + return FALSE + + var/turf/there = get_turf(H) + return (H.z != 0 || (there && there.z == H.z)) + + return FALSE + +/obj/item/pinpointer/crew/attack_self(mob/living/user) + if(active) + active = FALSE + user.visible_message("[user] deactivates their pinpointer.", "You deactivate your pinpointer.") + playsound(src, 'sound/items/screwdriver2.ogg', 50, 1) + target = null //Restarting the pinpointer forces a target reset + STOP_PROCESSING(SSfastprocess, src) + update_icon() + return + + var/list/name_counts = list() + var/list/names = list() + + for(var/mob/living/carbon/human/H in GLOB.mob_list) + if(!trackable(H)) + continue + + var/crewmember_name = "Unknown" + if(H.wear_id) + var/obj/item/card/id/I = H.wear_id.GetID() + crewmember_name = I.registered_name + + while(crewmember_name in name_counts) + name_counts[crewmember_name]++ + crewmember_name = text("[] ([])", crewmember_name, name_counts[crewmember_name]) + names[crewmember_name] = H + name_counts[crewmember_name] = 1 + + if(!names.len) + user.visible_message("[user]'s pinpointer fails to detect a signal.", "Your pinpointer fails to detect a signal.") + return + + var/A = input(user, "Person to track", "Pinpoint") in names + if(!A || QDELETED(src) || !user || !user.is_holding(src) || user.incapacitated()) + return + + target = names[A] + active = TRUE + user.visible_message("[user] activates their pinpointer.", "You activate your pinpointer.") + playsound(src, 'sound/items/screwdriver2.ogg', 50, 1) + START_PROCESSING(SSfastprocess, src) + update_icon() + +/obj/item/pinpointer/crew/scan_for_target() + if(target) + if(ishuman(target)) + var/mob/living/carbon/human/H = target + if(!trackable(H)) + target = null + if(!target) //target can be set to null from above code, or elsewhere + active = FALSE + +/obj/item/pinpointer/process() + if(!active) + return PROCESS_KILL + scan_for_target() + update_icon() + diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 6327d2d3ff..f13eaf73c4 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -83,7 +83,7 @@ new /obj/item/storage/belt/security/full(src) new /obj/item/gun/energy/e_gun/hos(src) new /obj/item/device/flashlight/seclite(src) - new /obj/item/pinpointer(src) + new /obj/item/pinpointer/nuke(src) /obj/structure/closet/secure_closet/warden name = "\proper warden's locker" @@ -108,6 +108,7 @@ new /obj/item/clothing/gloves/krav_maga/sec(src) new /obj/item/door_remote/head_of_security(src) new /obj/item/gun/ballistic/shotgun/automatic/combat/compact(src) + new /obj/item/pinpointer/crew(src) /obj/structure/closet/secure_closet/security name = "security officer's locker" @@ -183,6 +184,7 @@ new /obj/item/reagent_containers/spray/pepper(src) new /obj/item/clothing/suit/armor/vest/det_suit(src) new /obj/item/storage/belt/holster/full(src) + new /obj/item/pinpointer/crew(src) /obj/structure/closet/secure_closet/injection name = "lethal injections" diff --git a/code/modules/admin/verbs/onlyone.dm b/code/modules/admin/verbs/onlyone.dm index 7301724eb6..abb87a4235 100644 --- a/code/modules/admin/verbs/onlyone.dm +++ b/code/modules/admin/verbs/onlyone.dm @@ -50,8 +50,8 @@ GLOBAL_VAR_INIT(highlander, FALSE) equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/captain(src), slot_ears) equip_to_slot_or_del(new /obj/item/clothing/head/beret/highlander(src), slot_head) equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(src), slot_shoes) - equip_to_slot_or_del(new /obj/item/pinpointer(src), slot_l_store) - for(var/obj/item/pinpointer/P in src) + equip_to_slot_or_del(new /obj/item/pinpointer/nuke(src), slot_l_store) + for(var/obj/item/pinpointer/nuke/P in src) P.attack_self(src) var/obj/item/card/id/W = new(src) W.icon_state = "centcom" diff --git a/code/modules/jobs/job_types/medical.dm b/code/modules/jobs/job_types/medical.dm index 5f22e1886a..3d9f857dbf 100644 --- a/code/modules/jobs/job_types/medical.dm +++ b/code/modules/jobs/job_types/medical.dm @@ -30,6 +30,7 @@ Chief Medical Officer id = /obj/item/card/id/silver belt = /obj/item/device/pda/heads/cmo + l_pocket = /obj/item/pinpointer/crew ears = /obj/item/device/radio/headset/heads/cmo uniform = /obj/item/clothing/under/rank/chief_medical_officer shoes = /obj/item/clothing/shoes/sneakers/brown diff --git a/code/modules/mob/living/silicon/ai/death.dm.rej b/code/modules/mob/living/silicon/ai/death.dm.rej new file mode 100644 index 0000000000..40b5625e8c --- /dev/null +++ b/code/modules/mob/living/silicon/ai/death.dm.rej @@ -0,0 +1,13 @@ +diff a/code/modules/mob/living/silicon/ai/death.dm b/code/modules/mob/living/silicon/ai/death.dm (rejected hunks) +@@ -35,9 +35,9 @@ + if(nuking) + set_security_level("red") + nuking = FALSE +- for(var/obj/item/weapon/pinpointer/P in GLOB.pinpointer_list) ++ for(var/obj/item/weapon/pinpointer/nuke/P in GLOB.pinpointer_list) + P.switch_mode_to(TRACK_NUKE_DISK) //Party's over, back to work, everyone +- P.nuke_warning = FALSE ++ P.alert = FALSE + + if(doomsday_device) + doomsday_device.timing = FALSE diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm.rej b/code/modules/mob/living/silicon/robot/robot_modules.dm.rej new file mode 100644 index 0000000000..b0f0812dc4 --- /dev/null +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm.rej @@ -0,0 +1,19 @@ +diff a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm (rejected hunks) +@@ -519,7 +519,7 @@ + /obj/item/weapon/gun/ballistic/revolver/grenadelauncher/cyborg, + /obj/item/weapon/card/emag, + /obj/item/weapon/crowbar/cyborg, +- /obj/item/weapon/pinpointer/syndicate/cyborg) ++ /obj/item/weapon/pinpointer/syndicate_cyborg) + + ratvar_modules = list( + /obj/item/clockwork/slab/cyborg/security, +@@ -545,7 +545,7 @@ + /obj/item/roller/robo, + /obj/item/weapon/card/emag, + /obj/item/weapon/crowbar/cyborg, +- /obj/item/weapon/pinpointer/syndicate/cyborg, ++ /obj/item/weapon/pinpointer/syndicate_cyborg, + /obj/item/stack/medical/gauze/cyborg, + /obj/item/weapon/gun/medbeam) + ratvar_modules = list( diff --git a/code/modules/power/apc.dm.rej b/code/modules/power/apc.dm.rej new file mode 100644 index 0000000000..9e432f503c --- /dev/null +++ b/code/modules/power/apc.dm.rej @@ -0,0 +1,13 @@ +diff a/code/modules/power/apc.dm b/code/modules/power/apc.dm (rejected hunks) +@@ -867,9 +867,9 @@ + occupier.loc = src.loc + occupier.death() + occupier.gib() +- for(var/obj/item/weapon/pinpointer/P in GLOB.pinpointer_list) ++ for(var/obj/item/weapon/pinpointer/nuke/P in GLOB.pinpointer_list) + P.switch_mode_to(TRACK_NUKE_DISK) //Pinpointers go back to tracking the nuke disk +- P.nuke_warning = FALSE ++ P.alert = FALSE + + /obj/machinery/power/apc/transfer_ai(interaction, mob/user, mob/living/silicon/ai/AI, obj/item/device/aicard/card) + if(card.AI) diff --git a/icons/obj/device.dmi b/icons/obj/device.dmi index 808de6944665734cb96d96dbd42c08aeefa1452e..79f0a207d41d802e2e87d718157c7a5ca1983ffd 100644 GIT binary patch literal 37754 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 aH-6%}!&bucoQ)y~JeO=8ZK`qJNq+-{0&jQ# literal 38526 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 diff --git a/tgstation.dme b/tgstation.dme index 1e1c153493..4c2da1f48b 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -793,6 +793,7 @@ #include "code\game\objects\items\mop.dm" #include "code\game\objects\items\paint.dm" #include "code\game\objects\items\paiwire.dm" +#include "code\game\objects\items\pinpointer.dm" #include "code\game\objects\items\pneumaticCannon.dm" #include "code\game\objects\items\powerfist.dm" #include "code\game\objects\items\RCD.dm" diff --git a/tgstation.dme.rej b/tgstation.dme.rej index a5ff4dc3cb..82c613607a 100644 --- a/tgstation.dme.rej +++ b/tgstation.dme.rej @@ -1,13 +1,9 @@ diff a/tgstation.dme b/tgstation.dme (rejected hunks) -@@ -1746,6 +1745,11 @@ - #include "code\modules\mob\living\simple_animal\hostile\gorilla\emotes.dm" - #include "code\modules\mob\living\simple_animal\hostile\gorilla\gorilla.dm" - #include "code\modules\mob\living\simple_animal\hostile\gorilla\visuals_icons.dm" -+#include "code\modules\mob\living\simple_animal\hostile\jungle\_jungle_mobs.dm" -+#include "code\modules\mob\living\simple_animal\hostile\jungle\leaper.dm" -+#include "code\modules\mob\living\simple_animal\hostile\jungle\mega_arachnid.dm" -+#include "code\modules\mob\living\simple_animal\hostile\jungle\mook.dm" -+#include "code\modules\mob\living\simple_animal\hostile\jungle\seedling.dm" - #include "code\modules\mob\living\simple_animal\hostile\megafauna\blood_drunk_miner.dm" - #include "code\modules\mob\living\simple_animal\hostile\megafauna\bubblegum.dm" - #include "code\modules\mob\living\simple_animal\hostile\megafauna\colossus.dm" +@@ -793,7 +794,6 @@ + #include "code\game\objects\items\devices\megaphone.dm" + #include "code\game\objects\items\devices\multitool.dm" + #include "code\game\objects\items\devices\paicard.dm" +-#include "code\game\objects\items\devices\pinpointer.dm" + #include "code\game\objects\items\devices\pipe_painter.dm" + #include "code\game\objects\items\devices\powersink.dm" + #include "code\game\objects\items\devices\pressureplates.dm" From 64b94e93934f2a972dc331b58c4c911f54fa678a Mon Sep 17 00:00:00 2001 From: LetterJay Date: Mon, 4 Sep 2017 11:07:47 -0500 Subject: [PATCH 004/163] disables the lisp that lizard tongues have --- code/modules/surgery/organs/tongue.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/surgery/organs/tongue.dm b/code/modules/surgery/organs/tongue.dm index b69c1f4c5c..0113166d86 100644 --- a/code/modules/surgery/organs/tongue.dm +++ b/code/modules/surgery/organs/tongue.dm @@ -47,6 +47,7 @@ say_mod = "hisses" taste_sensitivity = 10 // combined nose + tongue, extra sensitive +/* /obj/item/organ/tongue/lizard/TongueSpeech(var/message) var/regex/lizard_hiss = new("s+", "g") var/regex/lizard_hiSS = new("S+", "g") @@ -54,6 +55,7 @@ message = lizard_hiss.Replace(message, "sss") message = lizard_hiSS.Replace(message, "SSS") return message + */ /obj/item/organ/tongue/fly name = "proboscis" From d73b82cf1140157d5280108c542b2a13fdfb7b83 Mon Sep 17 00:00:00 2001 From: tortellinitony <22010639+tortellinitony@users.noreply.github.com> Date: Thu, 7 Sep 2017 00:38:24 -0400 Subject: [PATCH 005/163] Gets rid of manual overlay manipulation --- .../clock_structures/prolonging_prism.dm | 2 +- code/game/objects/items/devices/flashlight.dm | 2 +- .../objects/items/devices/pressureplates.dm | 2 +- code/game/objects/items/tools.dm | 793 ++++++++++++++++++ code/game/turfs/turf.dm | 4 +- code/modules/hydroponics/hydroponics.dm | 2 +- 6 files changed, 799 insertions(+), 6 deletions(-) diff --git a/code/game/gamemodes/clock_cult/clock_structures/prolonging_prism.dm b/code/game/gamemodes/clock_cult/clock_structures/prolonging_prism.dm index cf730189e3..a6bc9a7f38 100644 --- a/code/game/gamemodes/clock_cult/clock_structures/prolonging_prism.dm +++ b/code/game/gamemodes/clock_cult/clock_structures/prolonging_prism.dm @@ -126,7 +126,7 @@ if(!hex_combo) hex_combo = mutable_appearance('icons/effects/64x64.dmi', n, RIPPLE_LAYER) else - hex_combo.overlays += mutable_appearance('icons/effects/64x64.dmi', n, RIPPLE_LAYER) + hex_combo.add_overlay(mutable_appearance('icons/effects/64x64.dmi', n, RIPPLE_LAYER)) if(hex_combo) //YOU BUILT A HEXAGON hex_combo.pixel_x = -16 hex_combo.pixel_y = -16 diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index b41438451c..9c19f37f3f 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -428,7 +428,7 @@ /obj/item/device/flashlight/glowstick/update_icon() item_state = "glowstick" - overlays.Cut() + cut_overlays() if(!fuel) icon_state = "glowstick-empty" cut_overlays() diff --git a/code/game/objects/items/devices/pressureplates.dm b/code/game/objects/items/devices/pressureplates.dm index bab40edb29..b8b4884db7 100644 --- a/code/game/objects/items/devices/pressureplates.dm +++ b/code/game/objects/items/devices/pressureplates.dm @@ -86,7 +86,7 @@ icon_state = null active = TRUE if(tile_overlay) - loc.overlays += tile_overlay + loc.add_overlay(tile_overlay) else if(crossed) trigger() //no cheesing. diff --git a/code/game/objects/items/tools.dm b/code/game/objects/items/tools.dm index 23f68ca93c..0e557497c0 100644 --- a/code/game/objects/items/tools.dm +++ b/code/game/objects/items/tools.dm @@ -1,3 +1,4 @@ +<<<<<<< HEAD #define WELDER_FUEL_BURN_INTERVAL 13 /* Tools! @@ -788,3 +789,795 @@ user.put_in_active_hand(cutjaws) #undef WELDER_FUEL_BURN_INTERVAL +======= +#define WELDER_FUEL_BURN_INTERVAL 13 + +/* Tools! + * Note: Multitools are /obj/item/device + * + * Contains: + * Wrench + * Screwdriver + * Wirecutters + * Welding Tool + * Crowbar + */ + +/* + * Wrench + */ +/obj/item/wrench + name = "wrench" + desc = "A wrench with common uses. Can be found in your hand." + icon = 'icons/obj/tools.dmi' + icon_state = "wrench" + lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' + flags_1 = CONDUCT_1 + slot_flags = SLOT_BELT + force = 5 + throwforce = 7 + w_class = WEIGHT_CLASS_SMALL + usesound = 'sound/items/ratchet.ogg' + materials = list(MAT_METAL=150) + origin_tech = "materials=1;engineering=1" + attack_verb = list("bashed", "battered", "bludgeoned", "whacked") + toolspeed = 1 + armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 30) + +/obj/item/wrench/suicide_act(mob/user) + user.visible_message("[user] is beating [user.p_them()]self to death with [src]! It looks like [user.p_theyre()] trying to commit suicide!") + playsound(loc, 'sound/weapons/genhit.ogg', 50, 1, -1) + return (BRUTELOSS) + +/obj/item/wrench/cyborg + name = "automatic wrench" + desc = "An advanced robotic wrench. Can be found in construction cyborgs." + toolspeed = 0.5 + +/obj/item/wrench/brass + name = "brass wrench" + desc = "A brass wrench. It's faintly warm to the touch." + resistance_flags = FIRE_PROOF | ACID_PROOF + icon_state = "wrench_brass" + toolspeed = 0.5 + +/obj/item/wrench/abductor + name = "alien wrench" + desc = "A polarized wrench. It causes anything placed between the jaws to turn." + icon = 'icons/obj/abductor.dmi' + icon_state = "wrench" + usesound = 'sound/effects/empulse.ogg' + toolspeed = 0.1 + origin_tech = "materials=5;engineering=5;abductor=3" + +/obj/item/wrench/power + name = "hand drill" + desc = "A simple powered hand drill. It's fitted with a bolt bit." + icon_state = "drill_bolt" + item_state = "drill" + lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' + usesound = 'sound/items/drill_use.ogg' + materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_TITANIUM=25) + origin_tech = "materials=2;engineering=2" //done for balance reasons, making them high value for research, but harder to get + force = 8 //might or might not be too high, subject to change + w_class = WEIGHT_CLASS_SMALL + throwforce = 8 + attack_verb = list("drilled", "screwed", "jabbed") + toolspeed = 0.25 + +/obj/item/wrench/power/attack_self(mob/user) + playsound(get_turf(user),'sound/items/change_drill.ogg',50,1) + var/obj/item/wirecutters/power/s_drill = new /obj/item/screwdriver/power + to_chat(user, "You attach the screw driver bit to [src].") + qdel(src) + user.put_in_active_hand(s_drill) + +/obj/item/wrench/power/suicide_act(mob/user) + user.visible_message("[user] is pressing [src] against [user.p_their()] head! It looks like [user.p_theyre()] trying to commit suicide!") + return (BRUTELOSS) + +/obj/item/wrench/medical + name = "medical wrench" + desc = "A medical wrench with common(medical?) uses. Can be found in your hand." + icon_state = "wrench_medical" + force = 2 //MEDICAL + throwforce = 4 + origin_tech = "materials=1;engineering=1;biotech=3" + attack_verb = list("wrenched", "medicaled", "tapped", "jabbed", "whacked") + +/obj/item/wrench/medical/suicide_act(mob/living/user) + user.visible_message("[user] is praying to the medical wrench to take [user.p_their()] soul. It looks like [user.p_theyre()] trying to commit suicide!") + // TODO Make them glow with the power of the M E D I C A L W R E N C H + // during their ascension + + // Stun stops them from wandering off + user.Stun(100, ignore_canstun = TRUE) + playsound(loc, 'sound/effects/pray.ogg', 50, 1, -1) + + // Let the sound effect finish playing + sleep(20) + + if(!user) + return + + for(var/obj/item/W in user) + user.dropItemToGround(W) + + var/obj/item/wrench/medical/W = new /obj/item/wrench/medical(loc) + W.add_fingerprint(user) + W.desc += " For some reason, it reminds you of [user.name]." + + if(!user) + return + + user.dust() + + return OXYLOSS + +/* + * Screwdriver + */ +/obj/item/screwdriver + name = "screwdriver" + desc = "You can be totally screwy with this." + icon = 'icons/obj/tools.dmi' + icon_state = "screwdriver" + item_state = "screwdriver" + lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' + flags_1 = CONDUCT_1 + slot_flags = SLOT_BELT + force = 5 + w_class = WEIGHT_CLASS_TINY + throwforce = 5 + throw_speed = 3 + throw_range = 5 + materials = list(MAT_METAL=75) + attack_verb = list("stabbed") + hitsound = 'sound/weapons/bladeslice.ogg' + usesound = 'sound/items/screwdriver.ogg' + toolspeed = 1 + armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 30) + var/random_color = TRUE //if the screwdriver uses random coloring + var/static/list/screwdriver_colors = list(\ + "blue" = rgb(24, 97, 213), \ + "red" = rgb(149, 23, 16), \ + "pink" = rgb(213, 24, 141), \ + "brown" = rgb(160, 82, 18), \ + "green" = rgb(14, 127, 27), \ + "cyan" = rgb(24, 162, 213), \ + "yellow" = rgb(213, 140, 24), \ + ) + +/obj/item/screwdriver/suicide_act(mob/user) + user.visible_message("[user] is stabbing [src] into [user.p_their()] [pick("temple", "heart")]! It looks like [user.p_theyre()] trying to commit suicide!") + return(BRUTELOSS) + +/obj/item/screwdriver/Initialize() + . = ..() + if(random_color) //random colors! + var/our_color = pick(screwdriver_colors) + add_atom_colour(screwdriver_colors[our_color], FIXED_COLOUR_PRIORITY) + update_icon() + if(prob(75)) + pixel_y = rand(0, 16) + +/obj/item/screwdriver/update_icon() + if(!random_color) //icon override + return + cut_overlays() + var/mutable_appearance/base_overlay = mutable_appearance(icon, "screwdriver_screwybits") + base_overlay.appearance_flags = RESET_COLOR + add_overlay(base_overlay) + +/obj/item/screwdriver/worn_overlays(isinhands = FALSE, icon_file) + . = list() + if(isinhands && random_color) + var/mutable_appearance/M = mutable_appearance(icon_file, "screwdriver_head") + M.appearance_flags = RESET_COLOR + . += M + +/obj/item/screwdriver/get_belt_overlay() + if(random_color) + var/mutable_appearance/body = mutable_appearance('icons/obj/clothing/belt_overlays.dmi', "screwdriver") + var/mutable_appearance/head = mutable_appearance('icons/obj/clothing/belt_overlays.dmi', "screwdriver_head") + body.color = color + head.add_overlay(body) + return head + else + return mutable_appearance('icons/obj/clothing/belt_overlays.dmi', icon_state) + +/obj/item/screwdriver/attack(mob/living/carbon/M, mob/living/carbon/user) + if(!istype(M)) + return ..() + if(user.zone_selected != "eyes" && user.zone_selected != "head") + return ..() + if(user.disabilities & CLUMSY && prob(50)) + M = user + return eyestab(M,user) + +/obj/item/screwdriver/brass + name = "brass screwdriver" + desc = "A screwdriver made of brass. The handle feels freezing cold." + resistance_flags = FIRE_PROOF | ACID_PROOF + icon_state = "screwdriver_brass" + item_state = "screwdriver_brass" + toolspeed = 0.5 + random_color = FALSE + +/obj/item/screwdriver/abductor + name = "alien screwdriver" + desc = "An ultrasonic screwdriver." + icon = 'icons/obj/abductor.dmi' + icon_state = "screwdriver_a" + item_state = "screwdriver_nuke" + usesound = 'sound/items/pshoom.ogg' + toolspeed = 0.1 + random_color = FALSE + +/obj/item/screwdriver/power + name = "hand drill" + desc = "A simple powered hand drill. It's fitted with a screw bit." + icon_state = "drill_screw" + item_state = "drill" + lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' + materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_TITANIUM=25) + origin_tech = "materials=2;engineering=2" //done for balance reasons, making them high value for research, but harder to get + force = 8 //might or might not be too high, subject to change + w_class = WEIGHT_CLASS_SMALL + throwforce = 8 + throw_speed = 2 + throw_range = 3//it's heavier than a screw driver/wrench, so it does more damage, but can't be thrown as far + attack_verb = list("drilled", "screwed", "jabbed","whacked") + hitsound = 'sound/items/drill_hit.ogg' + usesound = 'sound/items/drill_use.ogg' + toolspeed = 0.25 + random_color = FALSE + +/obj/item/screwdriver/power/suicide_act(mob/user) + user.visible_message("[user] is putting [src] to [user.p_their()] temple. It looks like [user.p_theyre()] trying to commit suicide!") + return(BRUTELOSS) + +/obj/item/screwdriver/power/attack_self(mob/user) + playsound(get_turf(user),'sound/items/change_drill.ogg',50,1) + var/obj/item/wrench/power/b_drill = new /obj/item/wrench/power + to_chat(user, "You attach the bolt driver bit to [src].") + qdel(src) + user.put_in_active_hand(b_drill) + +/obj/item/screwdriver/cyborg + name = "powered screwdriver" + desc = "An electrical screwdriver, designed to be both precise and quick." + usesound = 'sound/items/drill_use.ogg' + toolspeed = 0.5 + +/* + * Wirecutters + */ +/obj/item/wirecutters + name = "wirecutters" + desc = "This cuts wires." + icon = 'icons/obj/tools.dmi' + icon_state = null + lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' + flags_1 = CONDUCT_1 + slot_flags = SLOT_BELT + force = 6 + throw_speed = 3 + throw_range = 7 + w_class = WEIGHT_CLASS_SMALL + materials = list(MAT_METAL=80) + attack_verb = list("pinched", "nipped") + hitsound = 'sound/items/wirecutter.ogg' + usesound = 'sound/items/wirecutter.ogg' + origin_tech = "materials=1;engineering=1" + toolspeed = 1 + armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 30) + + +/obj/item/wirecutters/New(loc, var/param_color = null) + ..() + if(!icon_state) + if(!param_color) + param_color = pick("yellow","red") + icon_state = "cutters_[param_color]" + +/obj/item/wirecutters/attack(mob/living/carbon/C, mob/user) + if(istype(C) && C.handcuffed && istype(C.handcuffed, /obj/item/restraints/handcuffs/cable)) + user.visible_message("[user] cuts [C]'s restraints with [src]!") + qdel(C.handcuffed) + C.handcuffed = null + if(C.buckled && C.buckled.buckle_requires_restraints) + C.buckled.unbuckle_mob(C) + C.update_handcuffed() + return + else + ..() + +/obj/item/wirecutters/suicide_act(mob/user) + user.visible_message("[user] is cutting at [user.p_their()] arteries with [src]! It looks like [user.p_theyre()] trying to commit suicide!") + playsound(loc, usesound, 50, 1, -1) + return (BRUTELOSS) + +/obj/item/wirecutters/brass + name = "brass wirecutters" + desc = "A pair of wirecutters made of brass. The handle feels freezing cold to the touch." + resistance_flags = FIRE_PROOF | ACID_PROOF + icon_state = "cutters_brass" + toolspeed = 0.5 + +/obj/item/wirecutters/abductor + name = "alien wirecutters" + desc = "Extremely sharp wirecutters, made out of a silvery-green metal." + icon = 'icons/obj/abductor.dmi' + icon_state = "cutters" + toolspeed = 0.1 + origin_tech = "materials=5;engineering=4;abductor=3" + +/obj/item/wirecutters/cyborg + name = "wirecutters" + desc = "This cuts wires." + toolspeed = 0.5 + +/obj/item/wirecutters/power + name = "jaws of life" + desc = "A set of jaws of life, compressed through the magic of science. It's fitted with a cutting head." + icon_state = "jaws_cutter" + item_state = "jawsoflife" + origin_tech = "materials=2;engineering=2" + materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_TITANIUM=25) + usesound = 'sound/items/jaws_cut.ogg' + toolspeed = 0.25 + +/obj/item/wirecutters/power/suicide_act(mob/user) + user.visible_message("[user] is wrapping \the [src] around [user.p_their()] neck. It looks like [user.p_theyre()] trying to rip [user.p_their()] head off!") + playsound(loc, 'sound/items/jaws_cut.ogg', 50, 1, -1) + if(iscarbon(user)) + var/mob/living/carbon/C = user + var/obj/item/bodypart/BP = C.get_bodypart("head") + if(BP) + BP.drop_limb() + playsound(loc,pick('sound/misc/desceration-01.ogg','sound/misc/desceration-02.ogg','sound/misc/desceration-01.ogg') ,50, 1, -1) + return (BRUTELOSS) + +/obj/item/wirecutters/power/attack_self(mob/user) + playsound(get_turf(user), 'sound/items/change_jaws.ogg', 50, 1) + var/obj/item/crowbar/power/pryjaws = new /obj/item/crowbar/power + to_chat(user, "You attach the pry jaws to [src].") + qdel(src) + user.put_in_active_hand(pryjaws) +/* + * Welding Tool + */ +/obj/item/weldingtool + name = "welding tool" + desc = "A standard edition welder provided by Nanotrasen." + icon = 'icons/obj/tools.dmi' + icon_state = "welder" + item_state = "welder" + lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' + flags_1 = CONDUCT_1 + slot_flags = SLOT_BELT + force = 3 + throwforce = 5 + hitsound = "swing_hit" + usesound = 'sound/items/welder.ogg' + var/acti_sound = 'sound/items/welderactivate.ogg' + var/deac_sound = 'sound/items/welderdeactivate.ogg' + throw_speed = 3 + throw_range = 5 + w_class = WEIGHT_CLASS_SMALL + armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 30) + resistance_flags = FIRE_PROOF + + materials = list(MAT_METAL=70, MAT_GLASS=30) + origin_tech = "engineering=1;plasmatech=1" + var/welding = 0 //Whether or not the welding tool is off(0), on(1) or currently welding(2) + var/status = TRUE //Whether the welder is secured or unsecured (able to attach rods to it to make a flamethrower) + var/max_fuel = 20 //The max amount of fuel the welder can hold + var/change_icons = 1 + var/can_off_process = 0 + var/light_intensity = 2 //how powerful the emitted light is when used. + var/burned_fuel_for = 0 //when fuel was last removed + heat = 3800 + toolspeed = 1 + +/obj/item/weldingtool/Initialize() + . = ..() + create_reagents(max_fuel) + reagents.add_reagent("welding_fuel", max_fuel) + update_icon() + + +/obj/item/weldingtool/proc/update_torch() + if(welding) + add_overlay("[initial(icon_state)]-on") + item_state = "[initial(item_state)]1" + else + item_state = "[initial(item_state)]" + + +/obj/item/weldingtool/update_icon() + cut_overlays() + if(change_icons) + var/ratio = get_fuel() / max_fuel + ratio = Ceiling(ratio*4) * 25 + add_overlay("[initial(icon_state)][ratio]") + update_torch() + return + + +/obj/item/weldingtool/process() + switch(welding) + if(0) + force = 3 + damtype = "brute" + update_icon() + if(!can_off_process) + STOP_PROCESSING(SSobj, src) + return + //Welders left on now use up fuel, but lets not have them run out quite that fast + if(1) + force = 15 + damtype = "fire" + ++burned_fuel_for + if(burned_fuel_for >= WELDER_FUEL_BURN_INTERVAL) + remove_fuel(1) + update_icon() + + //This is to start fires. process() is only called if the welder is on. + open_flame() + + +/obj/item/weldingtool/suicide_act(mob/user) + user.visible_message("[user] welds [user.p_their()] every orifice closed! It looks like [user.p_theyre()] trying to commit suicide!") + return (FIRELOSS) + + +/obj/item/weldingtool/attackby(obj/item/I, mob/user, params) + if(istype(I, /obj/item/screwdriver)) + flamethrower_screwdriver(I, user) + else if(istype(I, /obj/item/stack/rods)) + flamethrower_rods(I, user) + else + return ..() + + +/obj/item/weldingtool/attack(mob/living/carbon/human/H, mob/user) + if(!istype(H)) + return ..() + + var/obj/item/bodypart/affecting = H.get_bodypart(check_zone(user.zone_selected)) + + if(affecting && affecting.status == BODYPART_ROBOTIC && user.a_intent != INTENT_HARM) + if(src.remove_fuel(1)) + playsound(loc, usesound, 50, 1) + if(user == H) + user.visible_message("[user] starts to fix some of the dents on [H]'s [affecting.name].", "You start fixing some of the dents on [H]'s [affecting.name].") + if(!do_mob(user, H, 50)) + return + item_heal_robotic(H, user, 15, 0) + else + return ..() + + +/obj/item/weldingtool/afterattack(atom/O, mob/user, proximity) + if(!proximity) return + + if(welding) + remove_fuel(1) + var/turf/location = get_turf(user) + location.hotspot_expose(700, 50, 1) + if(get_fuel() <= 0) + set_light(0) + + if(isliving(O)) + var/mob/living/L = O + if(L.IgniteMob()) + message_admins("[key_name_admin(user)] set [key_name_admin(L)] on fire") + log_game("[key_name(user)] set [key_name(L)] on fire") + + +/obj/item/weldingtool/attack_self(mob/user) + switched_on(user) + if(welding) + set_light(light_intensity) + + update_icon() + + +//Returns the amount of fuel in the welder +/obj/item/weldingtool/proc/get_fuel() + return reagents.get_reagent_amount("welding_fuel") + + +//Removes fuel from the welding tool. If a mob is passed, it will try to flash the mob's eyes. This should probably be renamed to use() +/obj/item/weldingtool/proc/remove_fuel(amount = 1, mob/living/M = null) + if(!welding || !check_fuel()) + return 0 + if(amount) + burned_fuel_for = 0 + if(get_fuel() >= amount) + reagents.remove_reagent("welding_fuel", amount) + check_fuel() + if(M) + M.flash_act(light_intensity) + return TRUE + else + if(M) + to_chat(M, "You need more welding fuel to complete this task!") + return FALSE + + +//Turns off the welder if there is no more fuel (does this really need to be its own proc?) +/obj/item/weldingtool/proc/check_fuel(mob/user) + if(get_fuel() <= 0 && welding) + switched_on(user) + update_icon() + //mob icon update + if(ismob(loc)) + var/mob/M = loc + M.update_inv_hands(0) + + return 0 + return 1 + +//Switches the welder on +/obj/item/weldingtool/proc/switched_on(mob/user) + if(!status) + to_chat(user, "[src] can't be turned on while unsecured!") + return + welding = !welding + if(welding) + if(get_fuel() >= 1) + to_chat(user, "You switch [src] on.") + playsound(loc, acti_sound, 50, 1) + force = 15 + damtype = "fire" + hitsound = 'sound/items/welder.ogg' + update_icon() + START_PROCESSING(SSobj, src) + else + to_chat(user, "You need more fuel!") + switched_off(user) + else + to_chat(user, "You switch [src] off.") + playsound(loc, deac_sound, 50, 1) + switched_off(user) + +//Switches the welder off +/obj/item/weldingtool/proc/switched_off(mob/user) + welding = 0 + set_light(0) + + force = 3 + damtype = "brute" + hitsound = "swing_hit" + update_icon() + + +/obj/item/weldingtool/examine(mob/user) + ..() + to_chat(user, "It contains [get_fuel()] unit\s of fuel out of [max_fuel].") + +/obj/item/weldingtool/is_hot() + return welding * heat + +//Returns whether or not the welding tool is currently on. +/obj/item/weldingtool/proc/isOn() + return welding + + +/obj/item/weldingtool/proc/flamethrower_screwdriver(obj/item/I, mob/user) + if(welding) + to_chat(user, "Turn it off first!") + return + status = !status + if(status) + to_chat(user, "You resecure [src].") + else + to_chat(user, "[src] can now be attached and modified.") + add_fingerprint(user) + +/obj/item/weldingtool/proc/flamethrower_rods(obj/item/I, mob/user) + if(!status) + var/obj/item/stack/rods/R = I + if (R.use(1)) + var/obj/item/flamethrower/F = new /obj/item/flamethrower(user.loc) + if(!remove_item_from_storage(F)) + user.transferItemToLoc(src, F, TRUE) + F.weldtool = src + add_fingerprint(user) + to_chat(user, "You add a rod to a welder, starting to build a flamethrower.") + user.put_in_hands(F) + else + to_chat(user, "You need one rod to start building a flamethrower!") + +/obj/item/weldingtool/ignition_effect(atom/A, mob/user) + if(welding && remove_fuel(1, user)) + . = "[user] casually lights [A] with [src], what a badass." + else + . = "" + +/obj/item/weldingtool/largetank + name = "industrial welding tool" + desc = "A slightly larger welder with a larger tank." + icon_state = "indwelder" + max_fuel = 40 + materials = list(MAT_GLASS=60) + origin_tech = "engineering=2;plasmatech=2" + +/obj/item/weldingtool/largetank/cyborg + name = "integrated welding tool" + desc = "An advanced welder designed to be used in robotic systems." + toolspeed = 0.5 + +/obj/item/weldingtool/largetank/flamethrower_screwdriver() + return + + +/obj/item/weldingtool/mini + name = "emergency welding tool" + desc = "A miniature welder used during emergencies." + icon_state = "miniwelder" + max_fuel = 10 + w_class = WEIGHT_CLASS_TINY + materials = list(MAT_METAL=30, MAT_GLASS=10) + change_icons = 0 + +/obj/item/weldingtool/mini/flamethrower_screwdriver() + return + +/obj/item/weldingtool/abductor + name = "alien welding tool" + desc = "An alien welding tool. Whatever fuel it uses, it never runs out." + icon = 'icons/obj/abductor.dmi' + icon_state = "welder" + toolspeed = 0.1 + light_intensity = 0 + change_icons = 0 + origin_tech = "plasmatech=5;engineering=5;abductor=3" + +/obj/item/weldingtool/abductor/process() + if(get_fuel() <= max_fuel) + reagents.add_reagent("welding_fuel", 1) + ..() + +/obj/item/weldingtool/hugetank + name = "upgraded industrial welding tool" + desc = "An upgraded welder based of the industrial welder." + icon_state = "upindwelder" + item_state = "upindwelder" + max_fuel = 80 + materials = list(MAT_METAL=70, MAT_GLASS=120) + origin_tech = "engineering=3;plasmatech=2" + +/obj/item/weldingtool/experimental + name = "experimental welding tool" + desc = "An experimental welder capable of self-fuel generation and less harmful to the eyes." + icon_state = "exwelder" + item_state = "exwelder" + max_fuel = 40 + materials = list(MAT_METAL=70, MAT_GLASS=120) + origin_tech = "materials=4;engineering=4;bluespace=3;plasmatech=4" + var/last_gen = 0 + change_icons = 0 + can_off_process = 1 + light_intensity = 1 + toolspeed = 0.5 + var/nextrefueltick = 0 + +/obj/item/weldingtool/experimental/brass + name = "brass welding tool" + desc = "A brass welder that seems to constantly refuel itself. It is faintly warm to the touch." + resistance_flags = FIRE_PROOF | ACID_PROOF + icon_state = "brasswelder" + item_state = "brasswelder" + + +/obj/item/weldingtool/experimental/process() + ..() + if(get_fuel() < max_fuel && nextrefueltick < world.time) + nextrefueltick = world.time + 10 + reagents.add_reagent("welding_fuel", 1) + + +/* + * Crowbar + */ + +/obj/item/crowbar + name = "pocket crowbar" + desc = "A small crowbar. This handy tool is useful for lots of things, such as prying floor tiles or opening unpowered doors." + icon = 'icons/obj/tools.dmi' + icon_state = "crowbar" + lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' + usesound = 'sound/items/crowbar.ogg' + flags_1 = CONDUCT_1 + slot_flags = SLOT_BELT + force = 5 + throwforce = 7 + w_class = WEIGHT_CLASS_SMALL + materials = list(MAT_METAL=50) + origin_tech = "engineering=1;combat=1" + attack_verb = list("attacked", "bashed", "battered", "bludgeoned", "whacked") + toolspeed = 1 + armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 30) + +/obj/item/crowbar/suicide_act(mob/user) + user.visible_message("[user] is beating [user.p_them()]self to death with [src]! It looks like [user.p_theyre()] trying to commit suicide!") + playsound(loc, 'sound/weapons/genhit.ogg', 50, 1, -1) + return (BRUTELOSS) + +/obj/item/crowbar/red + icon_state = "crowbar_red" + force = 8 + +/obj/item/crowbar/brass + name = "brass crowbar" + desc = "A brass crowbar. It feels faintly warm to the touch." + resistance_flags = FIRE_PROOF | ACID_PROOF + icon_state = "crowbar_brass" + toolspeed = 0.5 + +/obj/item/crowbar/abductor + name = "alien crowbar" + desc = "A hard-light crowbar. It appears to pry by itself, without any effort required." + icon = 'icons/obj/abductor.dmi' + usesound = 'sound/weapons/sonic_jackhammer.ogg' + icon_state = "crowbar" + toolspeed = 0.1 + origin_tech = "combat=4;engineering=4;abductor=3" + +/obj/item/crowbar/large + name = "crowbar" + desc = "It's a big crowbar. It doesn't fit in your pockets, because it's big." + force = 12 + w_class = WEIGHT_CLASS_NORMAL + throw_speed = 3 + throw_range = 3 + materials = list(MAT_METAL=70) + icon_state = "crowbar_large" + item_state = "crowbar" + toolspeed = 0.5 + +/obj/item/crowbar/cyborg + name = "hydraulic crowbar" + desc = "A hydraulic prying tool, compact but powerful. Designed to replace crowbar in construction cyborgs." + usesound = 'sound/items/jaws_pry.ogg' + force = 10 + toolspeed = 0.5 + +/obj/item/crowbar/power + name = "jaws of life" + desc = "A set of jaws of life, compressed through the magic of science. It's fitted with a prying head." + icon_state = "jaws_pry" + item_state = "jawsoflife" + lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' + materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_TITANIUM=25) + origin_tech = "materials=2;engineering=2" + usesound = 'sound/items/jaws_pry.ogg' + force = 15 + toolspeed = 0.25 + +/obj/item/crowbar/power/suicide_act(mob/user) + user.visible_message("[user] is putting [user.p_their()] head in [src], it looks like [user.p_theyre()] trying to commit suicide!") + playsound(loc, 'sound/items/jaws_pry.ogg', 50, 1, -1) + return (BRUTELOSS) + +/obj/item/crowbar/power/attack_self(mob/user) + playsound(get_turf(user), 'sound/items/change_jaws.ogg', 50, 1) + var/obj/item/wirecutters/power/cutjaws = new /obj/item/wirecutters/power + to_chat(user, "You attach the cutting jaws to [src].") + qdel(src) + user.put_in_active_hand(cutjaws) + +#undef WELDER_FUEL_BURN_INTERVAL +>>>>>>> 2240756... Gets rid of manual overlay manipulation (#30454) diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index e6314861b6..c8be2aa28a 100755 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -524,12 +524,12 @@ /turf/proc/photograph(limit=20) var/image/I = new() - I.overlays += src + I.add_overlay(src) for(var/V in contents) var/atom/A = V if(A.invisibility) continue - I.overlays += A + I.add_overlay(A) if(limit) limit-- else diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm index 66a15ac705..52f5e4e138 100644 --- a/code/modules/hydroponics/hydroponics.dm +++ b/code/modules/hydroponics/hydroponics.dm @@ -248,7 +248,7 @@ if(istype(src, /obj/machinery/hydroponics/soil)) add_atom_colour(rgb(255, 175, 0), FIXED_COLOUR_PRIORITY) else - overlays += mutable_appearance('icons/obj/hydroponics/equipment.dmi', "gaia_blessing") + add_overlay(mutable_appearance('icons/obj/hydroponics/equipment.dmi', "gaia_blessing")) set_light(3) update_icon_hoses() From d8a3b87719be4d429bccd12d6f13a4d531318d76 Mon Sep 17 00:00:00 2001 From: ShizCalev Date: Thu, 7 Sep 2017 06:14:17 -0400 Subject: [PATCH 006/163] Fixes brains counting towards highlander killstreaks --- code/game/objects/items/weaponry.dm | 569 ++++++++++++++++++++++++++++ 1 file changed, 569 insertions(+) diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm index 13acf7e990..fe9c9485cd 100644 --- a/code/game/objects/items/weaponry.dm +++ b/code/game/objects/items/weaponry.dm @@ -23,6 +23,7 @@ else M.visible_message("[M] has been banned FOR NO REISIN by [user]", "You have been banned FOR NO REISIN by [user]", "you hear a banhammer banning someone") +<<<<<<< HEAD playsound(loc, 'sound/effects/adminhelp.ogg', 15) //keep it at 15% volume so people don't jump out of their skin too much /obj/item/sord @@ -589,4 +590,572 @@ /obj/item/proc/can_trigger_gun(mob/living/user) if(!user.can_use_guns(src)) return FALSE +======= + playsound(loc, 'sound/effects/adminhelp.ogg', 15) //keep it at 15% volume so people don't jump out of their skin too much + +/obj/item/sord + name = "\improper SORD" + desc = "This thing is so unspeakably shitty you are having a hard time even holding it." + icon_state = "sord" + item_state = "sord" + lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi' + righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi' + slot_flags = SLOT_BELT + force = 2 + throwforce = 1 + w_class = WEIGHT_CLASS_NORMAL + hitsound = 'sound/weapons/bladeslice.ogg' + attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") + +/obj/item/sord/suicide_act(mob/user) + user.visible_message("[user] is trying to impale [user.p_them()]self with [src]! It might be a suicide attempt if it weren't so shitty.", \ + "You try to impale yourself with [src], but it's USELESS...") + return SHAME + +/obj/item/claymore + name = "claymore" + desc = "What are you standing around staring at this for? Get to killing!" + icon_state = "claymore" + item_state = "claymore" + lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi' + righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi' + hitsound = 'sound/weapons/bladeslice.ogg' + flags_1 = CONDUCT_1 + slot_flags = SLOT_BELT | SLOT_BACK + force = 40 + throwforce = 10 + w_class = WEIGHT_CLASS_NORMAL + attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") + block_chance = 50 + sharpness = IS_SHARP + max_integrity = 200 + armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 50) + resistance_flags = FIRE_PROOF + +/obj/item/claymore/suicide_act(mob/user) + user.visible_message("[user] is falling on [src]! It looks like [user.p_theyre()] trying to commit suicide!") + return(BRUTELOSS) + +/obj/item/claymore/highlander //ALL COMMENTS MADE REGARDING THIS SWORD MUST BE MADE IN ALL CAPS + desc = "THERE CAN BE ONLY ONE, AND IT WILL BE YOU!!!\nActivate it in your hand to point to the nearest victim." + flags_1 = CONDUCT_1 | NODROP_1 | DROPDEL_1 + slot_flags = null + block_chance = 0 //RNG WON'T HELP YOU NOW, PANSY + luminosity = 3 + attack_verb = list("brutalized", "eviscerated", "disemboweled", "hacked", "carved", "cleaved") //ONLY THE MOST VISCERAL ATTACK VERBS + var/notches = 0 //HOW MANY PEOPLE HAVE BEEN SLAIN WITH THIS BLADE + var/obj/item/disk/nuclear/nuke_disk //OUR STORED NUKE DISK + +/obj/item/claymore/highlander/Initialize() + . = ..() + START_PROCESSING(SSobj, src) + +/obj/item/claymore/highlander/Destroy() + if(nuke_disk) + nuke_disk.forceMove(get_turf(src)) + nuke_disk.visible_message("The nuke disk is vulnerable!") + nuke_disk = null + STOP_PROCESSING(SSobj, src) + return ..() + +/obj/item/claymore/highlander/process() + if(ishuman(loc)) + var/mob/living/carbon/human/H = loc + loc.layer = LARGE_MOB_LAYER //NO HIDING BEHIND PLANTS FOR YOU, DICKWEED (HA GET IT, BECAUSE WEEDS ARE PLANTS) + H.bleedsuppress = TRUE //AND WE WON'T BLEED OUT LIKE COWARDS + else + if(!admin_spawned) + qdel(src) + + +/obj/item/claymore/highlander/pickup(mob/living/user) + to_chat(user, "The power of Scotland protects you! You are shielded from all stuns and knockdowns.") + user.add_stun_absorption("highlander", INFINITY, 1, " is protected by the power of Scotland!", "The power of Scotland absorbs the stun!", " is protected by the power of Scotland!") + user.status_flags += IGNORESLOWDOWN + +/obj/item/claymore/highlander/dropped(mob/living/user) + user.status_flags -= IGNORESLOWDOWN + qdel(src) //If this ever happens, it's because you lost an arm + +/obj/item/claymore/highlander/examine(mob/user) + ..() + to_chat(user, "It has [!notches ? "nothing" : "[notches] notches"] scratched into the blade.") + if(nuke_disk) + to_chat(user, "It's holding the nuke disk!") + +/obj/item/claymore/highlander/attack(mob/living/target, mob/living/user) + . = ..() + if(!QDELETED(target) && iscarbon(target) && target.stat == DEAD && target.mind && target.mind.special_role == "highlander") + user.fully_heal() //STEAL THE LIFE OF OUR FALLEN FOES + add_notch(user) + target.visible_message("[target] crumbles to dust beneath [user]'s blows!", "As you fall, your body crumbles to dust!") + target.dust() + +/obj/item/claymore/highlander/attack_self(mob/living/user) + var/closest_victim + var/closest_distance = 255 + for(var/mob/living/carbon/human/H in GLOB.player_list - user) + if(H.client && H.mind.special_role == "highlander" && (!closest_victim || get_dist(user, closest_victim) < closest_distance)) + closest_victim = H + if(!closest_victim) + to_chat(user, "[src] thrums for a moment and falls dark. Perhaps there's nobody nearby.") + return + to_chat(user, "[src] thrums and points to the [dir2text(get_dir(user, closest_victim))].") + +/obj/item/claymore/highlander/IsReflect() + return 1 //YOU THINK YOUR PUNY LASERS CAN STOP ME? + +/obj/item/claymore/highlander/proc/add_notch(mob/living/user) //DYNAMIC CLAYMORE PROGRESSION SYSTEM - THIS IS THE FUTURE + notches++ + force++ + var/new_name = name + switch(notches) + if(1) + to_chat(user, "Your first kill - hopefully one of many. You scratch a notch into [src]'s blade.") + to_chat(user, "You feel your fallen foe's soul entering your blade, restoring your wounds!") + new_name = "notched claymore" + if(2) + to_chat(user, "Another falls before you. Another soul fuses with your own. Another notch in the blade.") + new_name = "double-notched claymore" + add_atom_colour(rgb(255, 235, 235), ADMIN_COLOUR_PRIORITY) + if(3) + to_chat(user, "You're beginning to relish the thrill of battle.") + new_name = "triple-notched claymore" + add_atom_colour(rgb(255, 215, 215), ADMIN_COLOUR_PRIORITY) + if(4) + to_chat(user, "You've lost count of how many you've killed.") + new_name = "many-notched claymore" + add_atom_colour(rgb(255, 195, 195), ADMIN_COLOUR_PRIORITY) + if(5) + to_chat(user, "Five voices now echo in your mind, cheering the slaughter.") + new_name = "battle-tested claymore" + add_atom_colour(rgb(255, 175, 175), ADMIN_COLOUR_PRIORITY) + if(6) + to_chat(user, "Is this what the vikings felt like? Visions of glory fill your head as you slay your sixth foe.") + new_name = "battle-scarred claymore" + add_atom_colour(rgb(255, 155, 155), ADMIN_COLOUR_PRIORITY) + if(7) + to_chat(user, "Kill. Butcher. Conquer.") + new_name = "vicious claymore" + add_atom_colour(rgb(255, 135, 135), ADMIN_COLOUR_PRIORITY) + if(8) + to_chat(user, "IT NEVER GETS OLD. THE SCREAMING. THE BLOOD AS IT SPRAYS ACROSS YOUR FACE.") + new_name = "bloodthirsty claymore" + add_atom_colour(rgb(255, 115, 115), ADMIN_COLOUR_PRIORITY) + if(9) + to_chat(user, "ANOTHER ONE FALLS TO YOUR BLOWS. ANOTHER WEAKLING UNFIT TO LIVE.") + new_name = "gore-stained claymore" + add_atom_colour(rgb(255, 95, 95), ADMIN_COLOUR_PRIORITY) + if(10) + user.visible_message("[user]'s eyes light up with a vengeful fire!", \ + "YOU FEEL THE POWER OF VALHALLA FLOWING THROUGH YOU! THERE CAN BE ONLY ONE!!!") + user.update_icons() + new_name = "GORE-DRENCHED CLAYMORE OF [pick("THE WHIMSICAL SLAUGHTER", "A THOUSAND SLAUGHTERED CATTLE", "GLORY AND VALHALLA", "ANNIHILATION", "OBLITERATION")]" + icon_state = "claymore_valhalla" + item_state = "cultblade" + remove_atom_colour(ADMIN_COLOUR_PRIORITY) + + name = new_name + playsound(user, 'sound/items/screwdriver2.ogg', 50, 1) + +/obj/item/katana + name = "katana" + desc = "Woefully underpowered in D20" + icon_state = "katana" + item_state = "katana" + lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi' + righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi' + flags_1 = CONDUCT_1 + slot_flags = SLOT_BELT | SLOT_BACK + force = 40 + throwforce = 10 + w_class = WEIGHT_CLASS_NORMAL + hitsound = 'sound/weapons/bladeslice.ogg' + attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") + block_chance = 50 + sharpness = IS_SHARP + max_integrity = 200 + armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 50) + resistance_flags = FIRE_PROOF + +/obj/item/katana/cursed + slot_flags = null + +/obj/item/katana/suicide_act(mob/user) + user.visible_message("[user] is slitting [user.p_their()] stomach open with [src]! It looks like [user.p_theyre()] trying to commit seppuku!") + return(BRUTELOSS) + +/obj/item/wirerod + name = "wired rod" + desc = "A rod with some wire wrapped around the top. It'd be easy to attach something to the top bit." + icon_state = "wiredrod" + item_state = "rods" + flags_1 = CONDUCT_1 + force = 9 + throwforce = 10 + w_class = WEIGHT_CLASS_NORMAL + materials = list(MAT_METAL=1150, MAT_GLASS=75) + attack_verb = list("hit", "bludgeoned", "whacked", "bonked") + +/obj/item/wirerod/attackby(obj/item/I, mob/user, params) + if(istype(I, /obj/item/shard)) + var/obj/item/twohanded/spear/S = new /obj/item/twohanded/spear + + remove_item_from_storage(user) + qdel(I) + qdel(src) + + user.put_in_hands(S) + to_chat(user, "You fasten the glass shard to the top of the rod with the cable.") + + else if(istype(I, /obj/item/device/assembly/igniter) && !(I.flags_1 & NODROP_1)) + var/obj/item/melee/baton/cattleprod/P = new /obj/item/melee/baton/cattleprod + + remove_item_from_storage(user) + + to_chat(user, "You fasten [I] to the top of the rod with the cable.") + + qdel(I) + qdel(src) + + user.put_in_hands(P) + else + return ..() + + +/obj/item/throwing_star + name = "throwing star" + desc = "An ancient weapon still used to this day due to it's ease of lodging itself into victim's body parts" + icon_state = "throwingstar" + item_state = "eshield0" + lefthand_file = 'icons/mob/inhands/equipment/shields_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/shields_righthand.dmi' + force = 2 + throwforce = 20 //This is never used on mobs since this has a 100% embed chance. + throw_speed = 4 + embedded_pain_multiplier = 4 + w_class = WEIGHT_CLASS_SMALL + embed_chance = 100 + embedded_fall_chance = 0 //Hahaha! + sharpness = IS_SHARP + materials = list(MAT_METAL=500, MAT_GLASS=500) + resistance_flags = FIRE_PROOF + + +/obj/item/switchblade + name = "switchblade" + icon_state = "switchblade" + lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi' + righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi' + desc = "A sharp, concealable, spring-loaded knife." + flags_1 = CONDUCT_1 + force = 3 + w_class = WEIGHT_CLASS_SMALL + throwforce = 5 + throw_speed = 3 + throw_range = 6 + materials = list(MAT_METAL=12000) + origin_tech = "engineering=3;combat=2" + hitsound = 'sound/weapons/genhit.ogg' + attack_verb = list("stubbed", "poked") + resistance_flags = FIRE_PROOF + var/extended = 0 + +/obj/item/switchblade/attack_self(mob/user) + extended = !extended + playsound(src.loc, 'sound/weapons/batonextend.ogg', 50, 1) + if(extended) + force = 20 + w_class = WEIGHT_CLASS_NORMAL + throwforce = 23 + icon_state = "switchblade_ext" + attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") + hitsound = 'sound/weapons/bladeslice.ogg' + sharpness = IS_SHARP + else + force = 3 + w_class = WEIGHT_CLASS_SMALL + throwforce = 5 + icon_state = "switchblade" + attack_verb = list("stubbed", "poked") + hitsound = 'sound/weapons/genhit.ogg' + sharpness = IS_BLUNT + +/obj/item/switchblade/suicide_act(mob/user) + user.visible_message("[user] is slitting [user.p_their()] own throat with [src]! It looks like [user.p_theyre()] trying to commit suicide!") + return (BRUTELOSS) + +/obj/item/phone + name = "red phone" + desc = "Should anything ever go wrong..." + icon = 'icons/obj/items_and_weapons.dmi' + icon_state = "red_phone" + force = 3 + throwforce = 2 + throw_speed = 3 + throw_range = 4 + w_class = WEIGHT_CLASS_SMALL + attack_verb = list("called", "rang") + hitsound = 'sound/weapons/ring.ogg' + +/obj/item/phone/suicide_act(mob/user) + if(locate(/obj/structure/chair/stool) in user.loc) + user.visible_message("[user] begins to tie a noose with [src]'s cord! It looks like [user.p_theyre()] trying to commit suicide!") + else + user.visible_message("[user] is strangling [user.p_them()]self with [src]'s cord! It looks like [user.p_theyre()] trying to commit suicide!") + return(OXYLOSS) + +/obj/item/cane + name = "cane" + desc = "A cane used by a true gentleman. Or a clown." + icon = 'icons/obj/items_and_weapons.dmi' + icon_state = "cane" + item_state = "stick" + lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi' + righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi' + force = 5 + throwforce = 5 + w_class = WEIGHT_CLASS_SMALL + materials = list(MAT_METAL=50) + attack_verb = list("bludgeoned", "whacked", "disciplined", "thrashed") + +/obj/item/staff + name = "wizard staff" + desc = "Apparently a staff used by the wizard." + icon = 'icons/obj/wizard.dmi' + icon_state = "staff" + lefthand_file = 'icons/mob/inhands/weapons/staves_lefthand.dmi' + righthand_file = 'icons/mob/inhands/weapons/staves_righthand.dmi' + force = 3 + throwforce = 5 + throw_speed = 2 + throw_range = 5 + w_class = WEIGHT_CLASS_SMALL + armour_penetration = 100 + attack_verb = list("bludgeoned", "whacked", "disciplined") + resistance_flags = FLAMMABLE + +/obj/item/staff/broom + name = "broom" + desc = "Used for sweeping, and flying into the night while cackling. Black cat not included." + icon = 'icons/obj/wizard.dmi' + icon_state = "broom" + resistance_flags = FLAMMABLE + +/obj/item/staff/stick + name = "stick" + desc = "A great tool to drag someone else's drinks across the bar." + icon = 'icons/obj/items_and_weapons.dmi' + icon_state = "stick" + item_state = "stick" + lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi' + righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi' + force = 3 + throwforce = 5 + throw_speed = 2 + throw_range = 5 + w_class = WEIGHT_CLASS_SMALL + +/obj/item/ectoplasm + name = "ectoplasm" + desc = "spooky" + gender = PLURAL + icon = 'icons/obj/wizard.dmi' + icon_state = "ectoplasm" + +/obj/item/ectoplasm/suicide_act(mob/user) + user.visible_message("[user] is inhaling [src]! It looks like [user.p_theyre()] trying to visit the astral plane.") + return (OXYLOSS) + +/obj/item/mounted_chainsaw + name = "mounted chainsaw" + desc = "A chainsaw that has replaced your arm." + icon_state = "chainsaw_on" + item_state = "mounted_chainsaw" + lefthand_file = 'icons/mob/inhands/weapons/chainsaw_lefthand.dmi' + righthand_file = 'icons/mob/inhands/weapons/chainsaw_righthand.dmi' + flags_1 = NODROP_1 | ABSTRACT_1 | DROPDEL_1 + w_class = WEIGHT_CLASS_HUGE + force = 21 + throwforce = 0 + throw_range = 0 + throw_speed = 0 + sharpness = IS_SHARP + attack_verb = list("sawed", "torn", "cut", "chopped", "diced") + hitsound = 'sound/weapons/chainsawhit.ogg' + +/obj/item/mounted_chainsaw/Destroy() + var/obj/item/bodypart/part + new /obj/item/twohanded/required/chainsaw(get_turf(src)) + if(iscarbon(loc)) + var/mob/living/carbon/holder = loc + var/index = holder.get_held_index_of_item(src) + if(index) + part = holder.hand_bodyparts[index] + . = ..() + if(part) + part.drop_limb() + +/obj/item/statuebust + name = "bust" + desc = "A priceless ancient marble bust, the kind that belongs in a museum." //or you can hit people with it + icon = 'icons/obj/statue.dmi' + icon_state = "bust" + force = 15 + throwforce = 10 + throw_speed = 5 + throw_range = 2 + attack_verb = list("busted") + +/obj/item/tailclub + name = "tail club" + desc = "For the beating to death of lizards with their own tails." + icon_state = "tailclub" + force = 14 + throwforce = 1 // why are you throwing a club do you even weapon + throw_speed = 1 + throw_range = 1 + attack_verb = list("clubbed", "bludgeoned") + +/obj/item/melee/chainofcommand/tailwhip + name = "liz o' nine tails" + desc = "A whip fashioned from the severed tails of lizards." + icon_state = "tailwhip" + origin_tech = "engineering=3;combat=3;biotech=3" + needs_permit = 0 + +/obj/item/melee/chainofcommand/tailwhip/kitty + name = "cat o' nine tails" + desc = "A whip fashioned from the severed tails of cats." + icon_state = "catwhip" + +/obj/item/melee/skateboard + name = "skateboard" + desc = "A skateboard. It can be placed on its wheels and ridden, or used as a strong weapon." + icon_state = "skateboard" + item_state = "skateboard" + force = 12 + throwforce = 4 + w_class = WEIGHT_CLASS_HUGE + attack_verb = list("smacked", "whacked", "slammed", "smashed") + +/obj/item/melee/skateboard/attack_self(mob/user) + new /obj/vehicle/scooter/skateboard(get_turf(user)) + qdel(src) + +/obj/item/melee/baseball_bat + name = "baseball bat" + desc = "There ain't a skull in the league that can withstand a swatter." + icon = 'icons/obj/items_and_weapons.dmi' + icon_state = "baseball_bat" + item_state = "baseball_bat" + lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi' + righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi' + force = 10 + throwforce = 12 + attack_verb = list("beat", "smacked") + w_class = WEIGHT_CLASS_HUGE + var/homerun_ready = 0 + var/homerun_able = 0 + +/obj/item/melee/baseball_bat/homerun + name = "home run bat" + desc = "This thing looks dangerous... Dangerously good at baseball, that is." + homerun_able = 1 + +/obj/item/melee/baseball_bat/attack_self(mob/user) + if(!homerun_able) + ..() + return + if(homerun_ready) + to_chat(user, "You're already ready to do a home run!") + ..() + return + to_chat(user, "You begin gathering strength...") + playsound(get_turf(src), 'sound/magic/lightning_chargeup.ogg', 65, 1) + if(do_after(user, 90, target = src)) + to_chat(user, "You gather power! Time for a home run!") + homerun_ready = 1 + ..() + +/obj/item/melee/baseball_bat/attack(mob/living/target, mob/living/user) + . = ..() + var/atom/throw_target = get_edge_target_turf(target, user.dir) + if(homerun_ready) + user.visible_message("It's a home run!") + target.throw_at(throw_target, rand(8,10), 14, user) + target.ex_act(EXPLODE_HEAVY) + playsound(get_turf(src), 'sound/weapons/homerun.ogg', 100, 1) + homerun_ready = 0 + return + else if(!target.anchored) + target.throw_at(throw_target, rand(1,2), 7, user) + +/obj/item/melee/baseball_bat/ablative + name = "metal baseball bat" + desc = "This bat is made of highly reflective, highly armored material." + icon_state = "baseball_bat_metal" + item_state = "baseball_bat_metal" + force = 12 + throwforce = 15 + +/obj/item/melee/baseball_bat/ablative/IsReflect()//some day this will reflect thrown items instead of lasers + var/picksound = rand(1,2) + var/turf = get_turf(src) + if(picksound == 1) + playsound(turf, 'sound/weapons/effects/batreflect1.ogg', 50, 1) + if(picksound == 2) + playsound(turf, 'sound/weapons/effects/batreflect2.ogg', 50, 1) + return 1 + +/obj/item/melee/flyswatter + name = "flyswatter" + desc = "Useful for killing insects of all sizes." + icon = 'icons/obj/items_and_weapons.dmi' + icon_state = "flyswatter" + item_state = "flyswatter" + lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi' + righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi' + force = 1 + throwforce = 1 + attack_verb = list("swatted", "smacked") + hitsound = 'sound/effects/snap.ogg' + w_class = WEIGHT_CLASS_SMALL + //Things in this list will be instantly splatted. Flyman weakness is handled in the flyman species weakness proc. + var/list/strong_against + +/obj/item/melee/flyswatter/Initialize() + . = ..() + strong_against = typecacheof(list( + /mob/living/simple_animal/hostile/poison/bees/, + /mob/living/simple_animal/butterfly, + /mob/living/simple_animal/cockroach, + /obj/item/queen_bee + )) + + +/obj/item/melee/flyswatter/afterattack(atom/target, mob/user, proximity_flag) + if(proximity_flag) + if(is_type_in_typecache(target, strong_against)) + new /obj/effect/decal/cleanable/deadcockroach(get_turf(target)) + to_chat(user, "You easily splat the [target].") + if(istype(target, /mob/living/)) + var/mob/living/bug = target + bug.death(1) + else + qdel(target) + +/obj/item/circlegame + name = "circled hand" + desc = "If somebody looks at this while it's below your waist, you get to bop them." + icon_state = "madeyoulook" + force = 0 + throwforce = 0 + flags_1 = DROPDEL_1 | ABSTRACT_1 + attack_verb = list("bopped") + +/obj/item/proc/can_trigger_gun(mob/living/user) + if(!user.can_use_guns(src)) + return FALSE +>>>>>>> 129a7b9... Fixes brains counting towards highlander killstreaks (#30396) return TRUE From 3f025582f285a0e5a39c48d9a0c8762aa3ecaa0b Mon Sep 17 00:00:00 2001 From: Kyle Spier-Swenson Date: Thu, 7 Sep 2017 08:01:26 -0700 Subject: [PATCH 007/163] Gives admins the ability to show a read only vv window to a player --- code/datums/datumvars.dm | 506 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 506 insertions(+) diff --git a/code/datums/datumvars.dm b/code/datums/datumvars.dm index 87c6ad7334..cb9be25f05 100644 --- a/code/datums/datumvars.dm +++ b/code/datums/datumvars.dm @@ -22,6 +22,7 @@ //please call . = ..() first and append to the result, that way parent items are always at the top and child items are further down //add separaters by doing . += "---" +<<<<<<< HEAD /datum/proc/vv_get_dropdown() . = list() . += "---" @@ -485,6 +486,472 @@ if(!check_rights(0)) return +======= +/datum/proc/vv_get_dropdown() + . = list() + . += "---" + .["Call Proc"] = "?_src_=vars;proc_call=\ref[src]" + .["Mark Object"] = "?_src_=vars;mark_object=\ref[src]" + .["Delete"] = "?_src_=vars;delete=\ref[src]" + .["Show VV To Player"] = "?_src_=vars;expose=\ref[src]" + + +/datum/proc/on_reagent_change() + return + + +/client/proc/debug_variables(datum/D in world) + set category = "Debug" + set name = "View Variables" + //set src in world + var/static/cookieoffset = rand(1, 9999) //to force cookies to reset after the round. + + if(!usr.client || !usr.client.holder) //The usr vs src abuse in this proc is intentional and must not be changed + to_chat(usr, "You need to be an administrator to access this.") + return + + if(!D) + return + + var/islist = islist(D) + if (!islist && !istype(D)) + return + + var/title = "" + var/refid = "\ref[D]" + var/icon/sprite + var/hash + + var/type = /list + if (!islist) + type = D.type + + + + if(istype(D, /atom)) + var/atom/AT = D + if(AT.icon && AT.icon_state) + sprite = new /icon(AT.icon, AT.icon_state) + hash = md5(AT.icon) + hash = md5(hash + AT.icon_state) + src << browse_rsc(sprite, "vv[hash].png") + + title = "[D] (\ref[D]) = [type]" + + var/sprite_text + if(sprite) + sprite_text = "" + var/list/atomsnowflake = list() + + if(istype(D, /atom)) + var/atom/A = D + if(isliving(A)) + atomsnowflake += "[D]" + if(A.dir) + atomsnowflake += "
<< [dir2text(A.dir)] >>" + var/mob/living/M = A + atomsnowflake += {" +
[M.ckey ? M.ckey : "No ckey"] / [M.real_name ? M.real_name : "No real name"] +
+ BRUTE:[M.getBruteLoss()] + FIRE:[M.getFireLoss()] + TOXIN:[M.getToxLoss()] + OXY:[M.getOxyLoss()] + CLONE:[M.getCloneLoss()] + BRAIN:[M.getBrainLoss()] + STAMINA:[M.getStaminaLoss()] + + "} + else + atomsnowflake += "[D]" + if(A.dir) + atomsnowflake += "
<< [dir2text(A.dir)] >>" + else + atomsnowflake += "[D]" + + var/formatted_type = "[type]" + if(length(formatted_type) > 25) + var/middle_point = length(formatted_type) / 2 + var/splitpoint = findtext(formatted_type,"/",middle_point) + if(splitpoint) + formatted_type = "[copytext(formatted_type,1,splitpoint)]
[copytext(formatted_type,splitpoint)]" + else + formatted_type = "Type too long" //No suitable splitpoint (/) found. + + var/marked + if(holder && holder.marked_datum && holder.marked_datum == D) + marked = "
Marked Object" + var/varedited_line = "" + if(!islist && D.var_edited) + varedited_line = "
Var Edited" + + var/list/dropdownoptions = list() + if (islist) + dropdownoptions = list( + "---", + "Add Item" = "?_src_=vars;listadd=[refid]", + "Remove Nulls" = "?_src_=vars;listnulls=[refid]", + "Remove Dupes" = "?_src_=vars;listdupes=[refid]", + "Set len" = "?_src_=vars;listlen=[refid]", + "Shuffle" = "?_src_=vars;listshuffle=[refid]", + "Show VV To Player" = "?_src_=vars;expose=[refid]" + ) + else + dropdownoptions = D.vv_get_dropdown() + var/list/dropdownoptions_html = list() + + for (var/name in dropdownoptions) + var/link = dropdownoptions[name] + if (link) + dropdownoptions_html += "" + else + dropdownoptions_html += "" + + var/list/names = list() + if (!islist) + for (var/V in D.vars) + names += V + sleep(1)//For some reason, without this sleep, VVing will cause client to disconnect on certain objects. + + var/list/variable_html = list() + if (islist) + var/list/L = D + for (var/i in 1 to L.len) + var/key = L[i] + var/value + if (IS_NORMAL_LIST(L) && !isnum(key)) + value = L[key] + variable_html += debug_variable(i, value, 0, D) + else + + names = sortList(names) + for (var/V in names) + if(D.can_vv_get(V)) + variable_html += D.vv_get_var(V) + + var/html = {" + + + [title] + + + + +
+ + + + + +
+ + + + +
+ [sprite_text] +
+ [atomsnowflake.Join()] +
+
+
+ [formatted_type] + [marked] + [varedited_line] +
+
+
+ Refresh +
+ +
+
+
+
+
+ + E - Edit, tries to determine the variable type by itself.
+ C - Change, asks you for the var type first.
+ M - Mass modify: changes this variable for all objects of this type.
+
+
+ + + + + +
+
+ Search: +
+
+ +
+
+
    + [variable_html.Join()] +
+ + + +"} + src << browse(html, "window=variables[refid];size=475x650") + + +#define VV_HTML_ENCODE(thing) ( sanitize ? html_encode(thing) : thing ) +/proc/debug_variable(name, value, level, datum/DA = null, sanitize = TRUE) + var/header + if(DA) + if (islist(DA)) + var/index = name + if (value) + name = DA[name] //name is really the index until this line + else + value = DA[name] + header = "
  • (E) (C) (-) " + else + header = "
  • (E) (C) (M) " + else + header = "
  • " + + var/item + if (isnull(value)) + item = "[VV_HTML_ENCODE(name)] = null" + + else if (istext(value)) + item = "[VV_HTML_ENCODE(name)] = \"[VV_HTML_ENCODE(value)]\"" + + else if (isicon(value)) + #ifdef VARSICON + var/icon/I = new/icon(value) + var/rnd = rand(1,10000) + var/rname = "tmp\ref[I][rnd].png" + usr << browse_rsc(I, rname) + item = "[VV_HTML_ENCODE(name)] = ([value]) " + #else + item = "[VV_HTML_ENCODE(name)] = /icon ([value])" + #endif + +/* else if (istype(value, /image)) + #ifdef VARSICON + var/rnd = rand(1, 10000) + var/image/I = value + + src << browse_rsc(I.icon, "tmp\ref[value][rnd].png") + html += "[name] = " + #else + html += "[name] = /image ([value])" + #endif +*/ + else if (isfile(value)) + item = "[VV_HTML_ENCODE(name)] = '[value]'" + + //else if (istype(value, /client)) + // var/client/C = value + // item = "[VV_HTML_ENCODE(name)] \ref[value] = [C] [C.type]" + + else if (istype(value, /datum)) + var/datum/D = value + if ("[D]" != "[D.type]") //if the thing as a name var, lets use it. + item = "[VV_HTML_ENCODE(name)] \ref[value] = [D] [D.type]" + else + item = "[VV_HTML_ENCODE(name)] \ref[value] = [D.type]" + + else if (islist(value)) + var/list/L = value + var/list/items = list() + + if (L.len > 0 && !(name == "underlays" || name == "overlays" || L.len > (IS_NORMAL_LIST(L) ? 50 : 150))) + for (var/i in 1 to L.len) + var/key = L[i] + var/val + if (IS_NORMAL_LIST(L) && !isnum(key)) + val = L[key] + if (!val) + val = key + key = i + + items += debug_variable(key, val, level + 1, sanitize = sanitize) + + item = "[VV_HTML_ENCODE(name)] = /list ([L.len])
      [items.Join()]
    " + else + item = "[VV_HTML_ENCODE(name)] = /list ([L.len])" + + else + item = "[VV_HTML_ENCODE(name)] = [VV_HTML_ENCODE(value)]" + + return "[header][item]
  • " + +#undef VV_HTML_ENCODE + +/client/proc/view_var_Topic(href, href_list, hsrc) + if( (usr.client != src) || !src.holder ) + return + if(href_list["Vars"]) + debug_variables(locate(href_list["Vars"])) + + else if(href_list["datumrefresh"]) + var/datum/DAT = locate(href_list["datumrefresh"]) + if(!DAT) //can't be an istype() because /client etc aren't datums + return + src.debug_variables(DAT) + + else if(href_list["mob_player_panel"]) + if(!check_rights(0)) + return + +>>>>>>> 6656ce6... Gives admins the ability to show a read only vv window to a player (#30463) var/mob/M = locate(href_list["mob_player_panel"]) in GLOB.mob_list if(!istype(M)) to_chat(usr, "This can only be used on instances of type /mob") @@ -541,6 +1008,7 @@ return var/mob/M = locate(href_list["regenerateicons"]) in GLOB.mob_list +<<<<<<< HEAD if(!ismob(M)) to_chat(usr, "This can only be done to instances of type /mob") return @@ -557,6 +1025,44 @@ if(!check_rights(0)) return +======= + if(!ismob(M)) + to_chat(usr, "This can only be done to instances of type /mob") + return + M.regenerate_icons() + else if(href_list["expose"]) + if(!check_rights(R_ADMIN, FALSE)) + return + var/thing = locate(href_list["expose"]) + if (!thing) + return + var/value = vv_get_value(VV_CLIENT) + if (value["class"] != VV_CLIENT) + return + var/client/C = value["value"] + if (!C) + return + var/prompt = alert("Do you want to grant [C] access to view this VV window? (they will not be able to edit or change anything nor open nested vv windows unless they themselves are an admin)", "Confirm", "Yes", "No") + if (prompt != "Yes" || !usr.client) + return + message_admins("[key_name_admin(usr)] Showed [key_name_admin(C)] a VV window") + log_admin("Admin [key_name(usr)] Showed [key_name(C)] a VV window of a [thing]") + to_chat(C, "[usr.client.holder.fakekey ? "an Administrator" : "[usr.client.key]"] has granted you access to view a View Variables window") + C.debug_variables(thing) + + +//Needs +VAREDIT past this point + + else if(check_rights(R_VAREDIT)) + + + //~CARN: for renaming mobs (updates their name, real_name, mind.name, their ID/PDA and datacore records). + + if(href_list["rename"]) + if(!check_rights(0)) + return + +>>>>>>> 6656ce6... Gives admins the ability to show a read only vv window to a player (#30463) var/mob/M = locate(href_list["rename"]) in GLOB.mob_list if(!istype(M)) to_chat(usr, "This can only be used on instances of type /mob") From c2c69d359f1255e1869d9a9b69bc8633cee9dd38 Mon Sep 17 00:00:00 2001 From: AnturK Date: Wed, 6 Sep 2017 10:44:38 +0200 Subject: [PATCH 008/163] Fixes shuttle name on ramming. --- code/modules/shuttle/on_move.dm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/code/modules/shuttle/on_move.dm b/code/modules/shuttle/on_move.dm index 59a0a46ae8..e80b690737 100644 --- a/code/modules/shuttle/on_move.dm +++ b/code/modules/shuttle/on_move.dm @@ -14,7 +14,12 @@ All ShuttleMove procs go here // Called from the new turf before anything has been moved // Only gets called if fromShuttleMove returns true first // returns the new move_mode (based on the old) +<<<<<<< HEAD /turf/proc/toShuttleMove(turf/oldT, shuttle_dir, move_mode) +======= +/turf/proc/toShuttleMove(turf/oldT, move_mode, obj/docking_port/mobile/shuttle) + var/shuttle_dir = shuttle.dir +>>>>>>> 9ac60a8... Typo for(var/i in contents) var/atom/movable/thing = i if(ismob(thing)) From cf07ead653fbc0cfd3b3195e69b133e0c17185b6 Mon Sep 17 00:00:00 2001 From: kingofkosmos Date: Fri, 8 Sep 2017 17:57:51 +0300 Subject: [PATCH 010/163] Regularizes resisting out of containers --- .../abduction/machinery/experiment.dm | 22 +- code/game/machinery/cloning.dm | 3 + code/game/machinery/dna_scanner.dm | 24 +- code/game/machinery/gulag_teleporter.dm | 23 +- code/game/machinery/suit_storage_unit.dm | 278 ++++++++++++++++++ .../objects/items/implants/implantchair.dm | 191 ++++++++++++ .../structures/crates_lockers/closets.dm | 25 +- code/game/objects/structures/morgue.dm | 26 +- .../transit_tubes/transit_tube_pod.dm | 3 + code/modules/VR/vr_sleeper.dm | 4 + .../components/unary_devices/cryo.dm | 27 +- .../kitchen_machinery/gibber.dm | 5 +- 12 files changed, 567 insertions(+), 64 deletions(-) diff --git a/code/game/gamemodes/miniantags/abduction/machinery/experiment.dm b/code/game/gamemodes/miniantags/abduction/machinery/experiment.dm index 58ca8bbea9..182b7e2756 100644 --- a/code/game/gamemodes/miniantags/abduction/machinery/experiment.dm +++ b/code/game/gamemodes/miniantags/abduction/machinery/experiment.dm @@ -12,6 +12,8 @@ var/list/abductee_minds var/flash = " - || - " var/obj/machinery/abductor/console/console + var/message_cooldown = 0 + var/breakout_time = 0.75 /obj/machinery/abductor/experiment/MouseDrop_T(mob/target, mob/user) if(user.stat || user.lying || !Adjacent(user) || !target.Adjacent(user) || !ishuman(target)) @@ -40,25 +42,23 @@ /obj/machinery/abductor/experiment/relaymove(mob/user) if(user.stat != CONSCIOUS) return - container_resist(user) + if(message_cooldown <= world.time) + message_cooldown = world.time + 50 + to_chat(user, "[src]'s door won't budge!") /obj/machinery/abductor/experiment/container_resist(mob/living/user) - var/breakout_time = 600 user.changeNext_move(CLICK_CD_BREAKOUT) user.last_special = world.time + CLICK_CD_BREAKOUT - to_chat(user, "You lean on the back of [src] and start pushing the door open... (this will take about a minute.)") - user.visible_message("You hear a metallic creaking from [src]!") - - if(do_after(user,(breakout_time), target = src)) + user.visible_message("You see [user] kicking against the door of [src]!", \ + "You lean on the back of [src] and start pushing the door open... (this will take about [(breakout_time<1) ? "[breakout_time*60] seconds" : "[breakout_time] minute\s"].)", \ + "You hear a metallic creaking from [src].") + if(do_after(user,(breakout_time*60*10), target = src)) //minutes * 60seconds * 10deciseconds if(!user || user.stat != CONSCIOUS || user.loc != src || state_open) return - - visible_message("[user] successfully broke out of [src]!") - to_chat(user, "You successfully break out of [src]!") - + user.visible_message("[user] successfully broke out of [src]!", \ + "You successfully break out of [src]!") open_machine() - /obj/machinery/abductor/experiment/proc/dissection_icon(mob/living/carbon/human/H) var/icon/photo = null var/g = (H.gender == FEMALE) ? "f" : "m" diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index 7ea954a671..2276b5154b 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -392,6 +392,9 @@ QDEL_IN(mob_occupant, 40) /obj/machinery/clonepod/relaymove(mob/user) + container_resist() + +/obj/machinery/clonepod/container_resist(mob/living/user) if(user.stat == CONSCIOUS) go_out() diff --git a/code/game/machinery/dna_scanner.dm b/code/game/machinery/dna_scanner.dm index 65a6088721..4085b4edb4 100644 --- a/code/game/machinery/dna_scanner.dm +++ b/code/game/machinery/dna_scanner.dm @@ -14,6 +14,8 @@ var/damage_coeff var/scan_level var/precision_coeff + var/message_cooldown + var/breakout_time = 2 /obj/machinery/dna_scannernew/RefreshParts() scan_level = 0 @@ -65,23 +67,20 @@ open_machine() /obj/machinery/dna_scannernew/container_resist(mob/living/user) - var/breakout_time = 2 - if(state_open || !locked) //Open and unlocked, no need to escape - state_open = TRUE + if(!locked) + open_machine() return user.changeNext_move(CLICK_CD_BREAKOUT) user.last_special = world.time + CLICK_CD_BREAKOUT - to_chat(user, "You lean on the back of [src] and start pushing the door open... (this will take about [breakout_time] minutes.)") - user.visible_message("You hear a metallic creaking from [src]!") - + user.visible_message("You see [user] kicking against the door of [src]!", \ + "You lean on the back of [src] and start pushing the door open... (this will take about [(breakout_time<1) ? "[breakout_time*60] seconds" : "[breakout_time] minute\s"].)", \ + "You hear a metallic creaking from [src].") if(do_after(user,(breakout_time*60*10), target = src)) //minutes * 60seconds * 10deciseconds if(!user || user.stat != CONSCIOUS || user.loc != src || state_open || !locked) return - locked = FALSE - visible_message("[user] successfully broke out of [src]!") - to_chat(user, "You successfully break out of [src]!") - + user.visible_message("[user] successfully broke out of [src]!", \ + "You successfully break out of [src]!") open_machine() /obj/machinery/dna_scannernew/proc/locate_computer(type_) @@ -122,10 +121,11 @@ /obj/machinery/dna_scannernew/relaymove(mob/user as mob) if(user.stat || locked) + if(message_cooldown <= world.time) + message_cooldown = world.time + 50 + to_chat(user, "[src]'s door won't budge!") return - open_machine() - return /obj/machinery/dna_scannernew/attackby(obj/item/I, mob/user, params) diff --git a/code/game/machinery/gulag_teleporter.dm b/code/game/machinery/gulag_teleporter.dm index b37c5a10a7..d77e91af90 100644 --- a/code/game/machinery/gulag_teleporter.dm +++ b/code/game/machinery/gulag_teleporter.dm @@ -19,6 +19,8 @@ The console is located at computer/gulag_teleporter.dm active_power_usage = 5000 circuit = /obj/item/circuitboard/machine/gulag_teleporter var/locked = FALSE + var/message_cooldown + var/breakout_time = 1 var/jumpsuit_type = /obj/item/clothing/under/rank/prisoner var/shoes_type = /obj/item/clothing/shoes/sneakers/orange var/obj/machinery/gulag_item_reclaimer/linked_reclaimer @@ -46,7 +48,7 @@ The console is located at computer/gulag_teleporter.dm /obj/machinery/gulag_teleporter/interact(mob/user) if(locked) - to_chat(user, "[src] is locked.") + to_chat(user, "[src] is locked!") return toggle_open() @@ -89,28 +91,27 @@ The console is located at computer/gulag_teleporter.dm if(user.stat != CONSCIOUS) return if(locked) - to_chat(user, "[src] is locked!") + if(message_cooldown <= world.time) + message_cooldown = world.time + 50 + to_chat(user, "[src]'s door won't budge!") return open_machine() /obj/machinery/gulag_teleporter/container_resist(mob/living/user) - var/breakout_time = 600 if(!locked) open_machine() return user.changeNext_move(CLICK_CD_BREAKOUT) user.last_special = world.time + CLICK_CD_BREAKOUT - to_chat(user, "You lean on the back of [src] and start pushing the door open... (this will take about a minute.)") - user.visible_message("You hear a metallic creaking from [src]!") - - if(do_after(user,(breakout_time), target = src)) + user.visible_message("You see [user] kicking against the door of [src]!", \ + "You lean on the back of [src] and start pushing the door open... (this will take about [(breakout_time<1) ? "[breakout_time*60] seconds" : "[breakout_time] minute\s"].)", \ + "You hear a metallic creaking from [src].") + if(do_after(user,(breakout_time*60*10), target = src)) //minutes * 60seconds * 10deciseconds if(!user || user.stat != CONSCIOUS || user.loc != src || state_open || !locked) return - locked = FALSE - visible_message("[user] successfully broke out of [src]!") - to_chat(user, "You successfully break out of [src]!") - + user.visible_message("[user] successfully broke out of [src]!", \ + "You successfully break out of [src]!") open_machine() /obj/machinery/gulag_teleporter/proc/locate_reclaimer() diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index cd2a5bd3b5..6ab0cbf17b 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -6,6 +6,7 @@ icon_state = "close" anchored = TRUE density = TRUE +<<<<<<< HEAD max_integrity = 250 var/obj/item/clothing/suit/space/suit = null @@ -101,6 +102,105 @@ mask_type = /obj/item/clothing/mask/breath storage_type = /obj/item/tank/internals/emergency_oxygen/double +======= + max_integrity = 250 + + var/obj/item/clothing/suit/space/suit = null + var/obj/item/clothing/head/helmet/space/helmet = null + var/obj/item/clothing/mask/mask = null + var/obj/item/storage = null + + var/suit_type = null + var/helmet_type = null + var/mask_type = null + var/storage_type = null + + state_open = FALSE + var/locked = FALSE + panel_open = FALSE + var/safeties = TRUE + + var/uv = FALSE + var/uv_super = FALSE + var/uv_cycles = 6 + var/message_cooldown + var/breakout_time = 0.5 + +/obj/machinery/suit_storage_unit/standard_unit + suit_type = /obj/item/clothing/suit/space/eva + helmet_type = /obj/item/clothing/head/helmet/space/eva + mask_type = /obj/item/clothing/mask/breath + +/obj/machinery/suit_storage_unit/captain + suit_type = /obj/item/clothing/suit/space/hardsuit/captain + mask_type = /obj/item/clothing/mask/gas/sechailer + storage_type = /obj/item/tank/jetpack/oxygen/captain + +/obj/machinery/suit_storage_unit/engine + suit_type = /obj/item/clothing/suit/space/hardsuit/engine + mask_type = /obj/item/clothing/mask/breath + +/obj/machinery/suit_storage_unit/ce + suit_type = /obj/item/clothing/suit/space/hardsuit/engine/elite + mask_type = /obj/item/clothing/mask/breath + storage_type= /obj/item/clothing/shoes/magboots/advance + +/obj/machinery/suit_storage_unit/security + suit_type = /obj/item/clothing/suit/space/hardsuit/security + mask_type = /obj/item/clothing/mask/gas/sechailer + +/obj/machinery/suit_storage_unit/hos + suit_type = /obj/item/clothing/suit/space/hardsuit/security/hos + mask_type = /obj/item/clothing/mask/gas/sechailer + storage_type = /obj/item/tank/internals/oxygen + +/obj/machinery/suit_storage_unit/atmos + suit_type = /obj/item/clothing/suit/space/hardsuit/engine/atmos + mask_type = /obj/item/clothing/mask/gas + storage_type = /obj/item/watertank/atmos + +/obj/machinery/suit_storage_unit/mining + suit_type = /obj/item/clothing/suit/hooded/explorer + mask_type = /obj/item/clothing/mask/gas/explorer + +/obj/machinery/suit_storage_unit/mining/eva + suit_type = /obj/item/clothing/suit/space/hardsuit/mining + mask_type = /obj/item/clothing/mask/breath + +/obj/machinery/suit_storage_unit/cmo + suit_type = /obj/item/clothing/suit/space/hardsuit/medical + mask_type = /obj/item/clothing/mask/breath + +/obj/machinery/suit_storage_unit/rd + suit_type = /obj/item/clothing/suit/space/hardsuit/rd + mask_type = /obj/item/clothing/mask/breath + +/obj/machinery/suit_storage_unit/syndicate + suit_type = /obj/item/clothing/suit/space/hardsuit/syndi + mask_type = /obj/item/clothing/mask/gas/syndicate + storage_type = /obj/item/tank/jetpack/oxygen/harness + +/obj/machinery/suit_storage_unit/ert/command + suit_type = /obj/item/clothing/suit/space/hardsuit/ert + mask_type = /obj/item/clothing/mask/breath + storage_type = /obj/item/tank/internals/emergency_oxygen/double + +/obj/machinery/suit_storage_unit/ert/security + suit_type = /obj/item/clothing/suit/space/hardsuit/ert/sec + mask_type = /obj/item/clothing/mask/breath + storage_type = /obj/item/tank/internals/emergency_oxygen/double + +/obj/machinery/suit_storage_unit/ert/engineer + suit_type = /obj/item/clothing/suit/space/hardsuit/ert/engi + mask_type = /obj/item/clothing/mask/breath + storage_type = /obj/item/tank/internals/emergency_oxygen/double + +/obj/machinery/suit_storage_unit/ert/medical + suit_type = /obj/item/clothing/suit/space/hardsuit/ert/med + mask_type = /obj/item/clothing/mask/breath + storage_type = /obj/item/tank/internals/emergency_oxygen/double + +>>>>>>> d4d898f... Regularizes resisting out of containers (#30412) /obj/machinery/suit_storage_unit/Initialize() . = ..() wires = new /datum/wires/suit_storage_unit(src) @@ -162,6 +262,7 @@ /obj/machinery/suit_storage_unit/deconstruct(disassembled = TRUE) if(!(flags_1 & NODECONSTRUCT_1)) +<<<<<<< HEAD open_machine() dump_contents() new /obj/item/stack/sheet/metal (loc, 2) @@ -312,6 +413,183 @@ return ..() +======= + open_machine() + dump_contents() + new /obj/item/stack/sheet/metal (loc, 2) + qdel(src) + +/obj/machinery/suit_storage_unit/MouseDrop_T(atom/A, mob/user) + if(user.stat || user.lying || !Adjacent(user) || !Adjacent(A) || !isliving(A)) + return + var/mob/living/target = A + if(!state_open) + to_chat(user, "The unit's doors are shut!") + return + if(!is_operational()) + to_chat(user, "The unit is not operational!") + return + if(occupant || helmet || suit || storage) + to_chat(user, "It's too cluttered inside to fit in!") + return + + if(target == user) + user.visible_message("[user] starts squeezing into [src]!", "You start working your way into [src]...") + else + target.visible_message("[user] starts shoving [target] into [src]!", "[user] starts shoving you into [src]!") + + if(do_mob(user, target, 30)) + if(occupant || helmet || suit || storage) + return + if(target == user) + user.visible_message("[user] slips into [src] and closes the door behind them!", "You slip into [src]'s cramped space and shut its door.") + else + target.visible_message("[user] pushes [target] into [src] and shuts its door!", "[user] shoves you into [src] and shuts the door!") + close_machine(target) + add_fingerprint(user) + +/obj/machinery/suit_storage_unit/proc/cook() + if(uv_cycles) + uv_cycles-- + uv = TRUE + locked = TRUE + update_icon() + if(occupant) + var/mob/living/mob_occupant = occupant + if(uv_super) + mob_occupant.adjustFireLoss(rand(20, 36)) + else + mob_occupant.adjustFireLoss(rand(10, 16)) + mob_occupant.emote("scream") + addtimer(CALLBACK(src, .proc/cook), 50) + else + uv_cycles = initial(uv_cycles) + uv = FALSE + locked = FALSE + if(uv_super) + visible_message("[src]'s door creaks open with a loud whining noise. A cloud of foul black smoke escapes from its chamber.") + playsound(src, 'sound/machines/airlock_alien_prying.ogg', 50, 1) + helmet = null + qdel(helmet) + suit = null + qdel(suit) // Delete everything but the occupant. + mask = null + qdel(mask) + storage = null + qdel(storage) + // The wires get damaged too. + wires.cut_all() + else + if(!occupant) + visible_message("[src]'s door slides open. The glowing yellow lights dim to a gentle green.") + else + visible_message("[src]'s door slides open, barraging you with the nauseating smell of charred flesh.") + playsound(src, 'sound/machines/airlockclose.ogg', 25, 1) + for(var/obj/item/I in src) //Scorches away blood and forensic evidence, although the SSU itself is unaffected + I.clean_blood() + I.fingerprints = list() + open_machine(FALSE) + if(occupant) + dump_contents() + +/obj/machinery/suit_storage_unit/proc/shock(mob/user, prb) + if(!prob(prb)) + var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread + s.set_up(5, 1, src) + s.start() + if(electrocute_mob(user, src, src, 1, TRUE)) + return 1 + +/obj/machinery/suit_storage_unit/relaymove(mob/user) + if(locked) + if(message_cooldown <= world.time) + message_cooldown = world.time + 50 + to_chat(user, "[src]'s door won't budge!") + return + open_machine() + dump_contents() + +/obj/machinery/suit_storage_unit/container_resist(mob/living/user) + if(!locked) + open_machine() + dump_contents() + return + user.changeNext_move(CLICK_CD_BREAKOUT) + user.last_special = world.time + CLICK_CD_BREAKOUT + user.visible_message("You see [user] kicking against the doors of [src]!", \ + "You start kicking against the doors... (this will take about [(breakout_time<1) ? "[breakout_time*60] seconds" : "[breakout_time] minute\s"].)", \ + "You hear a thump from [src].") + if(do_after(user,(breakout_time*60*10), target = src)) //minutes * 60seconds * 10deciseconds + if(!user || user.stat != CONSCIOUS || user.loc != src ) + return + user.visible_message("[user] successfully broke out of [src]!", \ + "You successfully break out of [src]!") + open_machine() + dump_contents() + + add_fingerprint(user) + if(locked) + visible_message("You see [user] kicking against the doors of [src]!", \ + "You start kicking against the doors...") + addtimer(CALLBACK(src, .proc/resist_open, user), 300) + else + open_machine() + dump_contents() + +/obj/machinery/suit_storage_unit/proc/resist_open(mob/user) + if(!state_open && occupant && (user in src) && user.stat == 0) // Check they're still here. + visible_message("You see [user] bursts out of [src]!", \ + "You escape the cramped confines of [src]!") + open_machine() + +/obj/machinery/suit_storage_unit/attackby(obj/item/I, mob/user, params) + if(state_open && is_operational()) + if(istype(I, /obj/item/clothing/suit/space)) + if(suit) + to_chat(user, "The unit already contains a suit!.") + return + if(!user.drop_item()) + return + suit = I + else if(istype(I, /obj/item/clothing/head/helmet)) + if(helmet) + to_chat(user, "The unit already contains a helmet!") + return + if(!user.drop_item()) + return + helmet = I + else if(istype(I, /obj/item/clothing/mask)) + if(mask) + to_chat(user, "The unit already contains a mask!") + return + if(!user.drop_item()) + return + mask = I + else + if(storage) + to_chat(user, "The auxiliary storage compartment is full!") + return + if(!user.drop_item()) + return + storage = I + + I.loc = src + visible_message("[user] inserts [I] into [src]", "You load [I] into [src].") + update_icon() + return + + if(panel_open && is_wire_tool(I)) + wires.interact(user) + if(!state_open) + if(default_deconstruction_screwdriver(user, "panel", "close", I)) + return + if(default_pry_open(I)) + dump_contents() + return + + return ..() + +>>>>>>> d4d898f... Regularizes resisting out of containers (#30412) /obj/machinery/suit_storage_unit/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \ datum/tgui/master_ui = null, datum/ui_state/state = GLOB.notcontained_state) ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open) diff --git a/code/game/objects/items/implants/implantchair.dm b/code/game/objects/items/implants/implantchair.dm index 55a35960cf..c7035f748e 100644 --- a/code/game/objects/items/implants/implantchair.dm +++ b/code/game/objects/items/implants/implantchair.dm @@ -1,3 +1,4 @@ +<<<<<<< HEAD /obj/machinery/implantchair name = "mindshield implanter" desc = "Used to implant occupants with mindshield implants." @@ -185,3 +186,193 @@ log_game("[key_name_admin(user)] brainwashed [key_name_admin(C)] with objective '[objective]'.") return 1 +======= +/obj/machinery/implantchair + name = "mindshield implanter" + desc = "Used to implant occupants with mindshield implants." + icon = 'icons/obj/machines/implantchair.dmi' + icon_state = "implantchair" + density = TRUE + opacity = 0 + anchored = TRUE + + var/ready = TRUE + var/replenishing = FALSE + + var/ready_implants = 5 + var/max_implants = 5 + var/injection_cooldown = 600 + var/replenish_cooldown = 6000 + var/implant_type = /obj/item/implant/mindshield + var/auto_inject = FALSE + var/auto_replenish = TRUE + var/special = FALSE + var/special_name = "special function" + var/message_cooldown + var/breakout_time = 1 + +/obj/machinery/implantchair/Initialize() + . = ..() + open_machine() + update_icon() + + +/obj/machinery/implantchair/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.notcontained_state) + ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open) + if(!ui) + ui = new(user, src, ui_key, "implantchair", name, 375, 280, master_ui, state) + ui.open() + + +/obj/machinery/implantchair/ui_data() + var/list/data = list() + data["occupied"] = occupant ? 1 : 0 + data["open"] = state_open + + data["occupant"] = list() + if(occupant) + var/mob/living/mob_occupant = occupant + data["occupant"]["name"] = mob_occupant.name + data["occupant"]["stat"] = mob_occupant.stat + + data["special_name"] = special ? special_name : null + data["ready_implants"] = ready_implants + data["ready"] = ready + data["replenishing"] = replenishing + + return data + +/obj/machinery/implantchair/ui_act(action, params) + if(..()) + return + switch(action) + if("door") + if(state_open) + close_machine() + else + open_machine() + . = TRUE + if("implant") + implant(occupant,usr) + . = TRUE + +/obj/machinery/implantchair/proc/implant(mob/living/M,mob/user) + if (!istype(M)) + return + if(!ready_implants || !ready) + return + if(implant_action(M,user)) + ready_implants-- + if(!replenishing && auto_replenish) + replenishing = TRUE + addtimer(CALLBACK(src,"replenish"),replenish_cooldown) + if(injection_cooldown > 0) + ready = FALSE + addtimer(CALLBACK(src,"set_ready"),injection_cooldown) + else + playsound(get_turf(src), 'sound/machines/buzz-sigh.ogg', 25, 1) + update_icon() + +/obj/machinery/implantchair/proc/implant_action(mob/living/M) + var/obj/item/implant/I = new implant_type + if(I.implant(M)) + visible_message("[M] has been implanted by the [name].") + return 1 + +/obj/machinery/implantchair/update_icon() + icon_state = initial(icon_state) + if(state_open) + icon_state += "_open" + if(occupant) + icon_state += "_occupied" + if(ready) + add_overlay("ready") + else + cut_overlays() + +/obj/machinery/implantchair/proc/replenish() + if(ready_implants < max_implants) + ready_implants++ + if(ready_implants < max_implants) + addtimer(CALLBACK(src,"replenish"),replenish_cooldown) + else + replenishing = FALSE + +/obj/machinery/implantchair/proc/set_ready() + ready = TRUE + update_icon() + +/obj/machinery/implantchair/container_resist(mob/living/user) + user.changeNext_move(CLICK_CD_BREAKOUT) + user.last_special = world.time + CLICK_CD_BREAKOUT + user.visible_message("You see [user] kicking against the door of [src]!", \ + "You lean on the back of [src] and start pushing the door open... (this will take about [(breakout_time<1) ? "[breakout_time*60] seconds" : "[breakout_time] minute\s"].)", \ + "You hear a metallic creaking from [src].") + if(do_after(user,(breakout_time*60*10), target = src)) //minutes * 60seconds * 10deciseconds + if(!user || user.stat != CONSCIOUS || user.loc != src || state_open) + return + user.visible_message("[user] successfully broke out of [src]!", \ + "You successfully break out of [src]!") + open_machine() + +/obj/machinery/implantchair/relaymove(mob/user) + if(message_cooldown <= world.time) + message_cooldown = world.time + 50 + to_chat(user, "[src]'s door won't budge!") + +/obj/machinery/implantchair/MouseDrop_T(mob/target, mob/user) + if(user.stat || user.lying || !Adjacent(user) || !user.Adjacent(target) || !isliving(target) || !user.IsAdvancedToolUser()) + return + close_machine(target) + +/obj/machinery/implantchair/close_machine(mob/living/user) + if((isnull(user) || istype(user)) && state_open) + ..(user) + if(auto_inject && ready && ready_implants > 0) + implant(user,null) + +/obj/machinery/implantchair/genepurge + name = "Genetic purifier" + desc = "Used to purge human genome of foreign influences" + special = TRUE + special_name = "Purge genome" + injection_cooldown = 0 + replenish_cooldown = 300 + +/obj/machinery/implantchair/genepurge/implant_action(mob/living/carbon/human/H,mob/user) + if(!istype(H)) + return 0 + H.set_species(/datum/species/human, 1)//lizards go home + purrbation_remove(H)//remove cats + H.dna.remove_all_mutations()//hulks out + return 1 + + +/obj/machinery/implantchair/brainwash + name = "Neural Imprinter" + desc = "Used to indoctrinate rehabilitate hardened recidivists." + special_name = "Imprint" + injection_cooldown = 3000 + auto_inject = FALSE + auto_replenish = FALSE + special = TRUE + var/objective = "Obey the law. Praise Nanotrasen." + var/custom = FALSE + +/obj/machinery/implantchair/brainwash/implant_action(mob/living/C,mob/user) + if(!istype(C) || !C.mind) // I don't know how this makes any sense for silicons but laws trump objectives anyway. + return 0 + if(custom) + if(!user || !user.Adjacent(src)) + return 0 + objective = stripped_input(usr,"What order do you want to imprint on [C]?","Enter the order","",120) + message_admins("[key_name_admin(user)] set brainwash machine objective to '[objective]'.") + log_game("[key_name_admin(user)] set brainwash machine objective to '[objective]'.") + var/datum/objective/custom_objective = new/datum/objective(objective) + custom_objective.owner = C.mind + C.mind.objectives += custom_objective + C.mind.announce_objectives() + message_admins("[key_name_admin(user)] brainwashed [key_name_admin(C)] with objective '[objective]'.") + log_game("[key_name_admin(user)] brainwashed [key_name_admin(C)] with objective '[objective]'.") + return 1 +>>>>>>> d4d898f... Regularizes resisting out of containers (#30412) diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index 78e672e49d..4f8705aa71 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -16,7 +16,7 @@ integrity_failure = 50 armor = list(melee = 20, bullet = 10, laser = 10, energy = 0, bomb = 10, bio = 0, rad = 0, fire = 70, acid = 60) var/breakout_time = 2 - var/lastbang + var/message_cooldown var/can_weld_shut = TRUE var/horizontal = FALSE var/allow_objects = FALSE @@ -300,14 +300,12 @@ /obj/structure/closet/relaymove(mob/user) if(user.stat || !isturf(loc) || !isliving(user)) return - var/mob/living/L = user - if(!open()) - if(L.last_special <= world.time) - container_resist(L) - if(world.time > lastbang+5) - lastbang = world.time - for(var/mob/M in get_hearers_in_view(src, null)) - M.show_message("BANG, bang!", 2) + if(locked) + if(message_cooldown <= world.time) + message_cooldown = world.time + 50 + to_chat(user, "[src]'s door won't budge!") + return + container_resist() /obj/structure/closet/attack_hand(mob/user) ..() @@ -367,9 +365,10 @@ //okay, so the closet is either welded or locked... resist!!! user.changeNext_move(CLICK_CD_BREAKOUT) user.last_special = world.time + CLICK_CD_BREAKOUT - to_chat(user, "You lean on the back of [src] and start pushing the door open.") - visible_message("[src] begins to shake violently!") - if(do_after(user,(breakout_time * 60 * 10), target = src)) //minutes * 60seconds * 10deciseconds + user.visible_message("[src] begins to shake violently!", \ + "You lean on the back of [src] and start pushing the door open... (this will take about [(breakout_time<1) ? "[breakout_time*60] seconds" : "[breakout_time] minute\s"].)", \ + "You hear banging from [src].") + if(do_after(user,(breakout_time*60*10), target = src)) //minutes * 60seconds * 10deciseconds if(!user || user.stat != CONSCIOUS || user.loc != src || opened || (!locked && !welded) ) return //we check after a while whether there is a point of resisting anymore and whether the user is capable of resisting @@ -388,7 +387,7 @@ /obj/structure/closet/AltClick(mob/user) ..() - if(!user.canUseTopic(src, be_close=TRUE)) + if(!user.canUseTopic(src, be_close=TRUE) || isturf(loc)) to_chat(user, "You can't do that right now!") return if(opened || !secure) diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm index 600e15201d..f4a98811c0 100644 --- a/code/game/objects/structures/morgue.dm +++ b/code/game/objects/structures/morgue.dm @@ -23,6 +23,8 @@ var/obj/structure/tray/connected = null var/locked = FALSE var/opendir = SOUTH + var/message_cooldown + var/breakout_time = 1 /obj/structure/bodycontainer/Destroy() open() @@ -41,6 +43,11 @@ /obj/structure/bodycontainer/relaymove(mob/user) if(user.stat || !isturf(loc)) return + if(locked) + if(message_cooldown <= world.time) + message_cooldown = world.time + 50 + to_chat(user, "[src]'s door won't budge!") + return open() /obj/structure/bodycontainer/attack_paw(mob/user) @@ -84,11 +91,20 @@ qdel(src) /obj/structure/bodycontainer/container_resist(mob/living/user) - open() - -/obj/structure/bodycontainer/relay_container_resist(mob/living/user, obj/O) - to_chat(user, "You slam yourself into the side of [O].") - container_resist(user) + if(!locked) + open() + return + user.changeNext_move(CLICK_CD_BREAKOUT) + user.last_special = world.time + CLICK_CD_BREAKOUT + user.visible_message(null, \ + "You lean on the back of [src] and start pushing the tray open... (this will take about [(breakout_time<1) ? "[breakout_time*60] seconds" : "[breakout_time] minute\s"].)", \ + "You hear a metallic creaking from [src].") + if(do_after(user,(breakout_time*60*10), target = src)) //minutes * 60seconds * 10deciseconds + if(!user || user.stat != CONSCIOUS || user.loc != src ) + return + user.visible_message("[user] successfully broke out of [src]!", \ + "You successfully break out of [src]!") + open() /obj/structure/bodycontainer/proc/open() playsound(src.loc, 'sound/items/deconstruct.ogg', 50, 1) diff --git a/code/game/objects/structures/transit_tubes/transit_tube_pod.dm b/code/game/objects/structures/transit_tubes/transit_tube_pod.dm index 89f02b13af..fcd9ead2a7 100644 --- a/code/game/objects/structures/transit_tubes/transit_tube_pod.dm +++ b/code/game/objects/structures/transit_tubes/transit_tube_pod.dm @@ -66,6 +66,9 @@ deconstruct(FALSE) /obj/structure/transit_tube_pod/container_resist(mob/living/user) + if(!user.incapacitated()) + empty_pod() + return if(!moving) user.changeNext_move(CLICK_CD_BREAKOUT) user.last_special = world.time + CLICK_CD_BREAKOUT diff --git a/code/modules/VR/vr_sleeper.dm b/code/modules/VR/vr_sleeper.dm index a83ced850e..f447b2f3e9 100644 --- a/code/modules/VR/vr_sleeper.dm +++ b/code/modules/VR/vr_sleeper.dm @@ -49,6 +49,10 @@ open_machine() +/obj/machinery/vr_sleeper/container_resist(mob/living/user) + open_machine() + + /obj/machinery/vr_sleeper/Destroy() open_machine() cleanup_vr_human() diff --git a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm index f0f41e375a..89e6538b07 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm @@ -32,6 +32,8 @@ var/running_bob_anim = FALSE var/escape_in_progress = FALSE + var/message_cooldown + var/breakout_time = 0.5 /obj/machinery/atmospherics/components/unary/cryo_cell/Initialize() . = ..() @@ -219,7 +221,9 @@ update_icon() /obj/machinery/atmospherics/components/unary/cryo_cell/relaymove(mob/user) - container_resist(user) + if(message_cooldown <= world.time) + message_cooldown = world.time + 50 + to_chat(user, "[src]'s door won't budge!") /obj/machinery/atmospherics/components/unary/cryo_cell/open_machine(drop = 0) if(!state_open && !panel_open) @@ -239,16 +243,17 @@ return occupant /obj/machinery/atmospherics/components/unary/cryo_cell/container_resist(mob/living/user) - if(escape_in_progress) - to_chat(user, "You are already trying to exit (This will take around 30 seconds)") - return - escape_in_progress = TRUE - to_chat(user, "You struggle inside the cryotube, kicking the release with your foot... (This will take around 30 seconds.)") - audible_message("You hear a thump from [src].") - if(do_after(user, 300)) - if(occupant == user) // Check they're still here. - open_machine() - escape_in_progress = FALSE + user.changeNext_move(CLICK_CD_BREAKOUT) + user.last_special = world.time + CLICK_CD_BREAKOUT + user.visible_message("You see [user] kicking against the glass of [src]!", \ + "You struggle inside [src], kicking the release with your foot... (this will take about [(breakout_time<1) ? "[breakout_time*60] seconds" : "[breakout_time] minute\s"].)", \ + "You hear a thump from [src].") + if(do_after(user,(breakout_time*60*10), target = src)) //minutes * 60seconds * 10deciseconds + if(!user || user.stat != CONSCIOUS || user.loc != src ) + return + user.visible_message("[user] successfully broke out of [src]!", \ + "You successfully break out of [src]!") + open_machine() /obj/machinery/atmospherics/components/unary/cryo_cell/examine(mob/user) ..() diff --git a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm index d9f70160a4..978e8af62d 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm @@ -51,6 +51,9 @@ /obj/machinery/gibber/container_resist(mob/living/user) go_out() +/obj/machinery/gibber/relaymove(mob/living/user) + go_out() + /obj/machinery/gibber/attack_hand(mob/user) if(stat & (NOPOWER|BROKEN)) return @@ -225,4 +228,4 @@ if(M.loc == input_plate) M.forceMove(src) - M.gib() \ No newline at end of file + M.gib() From 0dfe72d77ed5a9a5d37c23736c88ab3d255753f0 Mon Sep 17 00:00:00 2001 From: Armhulen Date: Fri, 8 Sep 2017 08:00:34 -0700 Subject: [PATCH 011/163] chainsaws rebalance, but working this time :) --- code/game/objects/items/twohanded.dm | 2 +- code/game/objects/items/weaponry.dm | 569 +++++++++++++++++++++++++++ code/modules/crafting/recipes.dm | 4 +- 3 files changed, 572 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/twohanded.dm b/code/game/objects/items/twohanded.dm index 323527fc88..6c19b49073 100644 --- a/code/game/objects/items/twohanded.dm +++ b/code/game/objects/items/twohanded.dm @@ -487,7 +487,7 @@ righthand_file = 'icons/mob/inhands/weapons/chainsaw_righthand.dmi' flags_1 = CONDUCT_1 force = 13 - var/force_on = 21 + var/force_on = 24 w_class = WEIGHT_CLASS_HUGE throwforce = 13 throw_speed = 2 diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm index 13acf7e990..1c5a409dd3 100644 --- a/code/game/objects/items/weaponry.dm +++ b/code/game/objects/items/weaponry.dm @@ -23,6 +23,7 @@ else M.visible_message("[M] has been banned FOR NO REISIN by [user]", "You have been banned FOR NO REISIN by [user]", "you hear a banhammer banning someone") +<<<<<<< HEAD playsound(loc, 'sound/effects/adminhelp.ogg', 15) //keep it at 15% volume so people don't jump out of their skin too much /obj/item/sord @@ -589,4 +590,572 @@ /obj/item/proc/can_trigger_gun(mob/living/user) if(!user.can_use_guns(src)) return FALSE +======= + playsound(loc, 'sound/effects/adminhelp.ogg', 15) //keep it at 15% volume so people don't jump out of their skin too much + +/obj/item/sord + name = "\improper SORD" + desc = "This thing is so unspeakably shitty you are having a hard time even holding it." + icon_state = "sord" + item_state = "sord" + lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi' + righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi' + slot_flags = SLOT_BELT + force = 2 + throwforce = 1 + w_class = WEIGHT_CLASS_NORMAL + hitsound = 'sound/weapons/bladeslice.ogg' + attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") + +/obj/item/sord/suicide_act(mob/user) + user.visible_message("[user] is trying to impale [user.p_them()]self with [src]! It might be a suicide attempt if it weren't so shitty.", \ + "You try to impale yourself with [src], but it's USELESS...") + return SHAME + +/obj/item/claymore + name = "claymore" + desc = "What are you standing around staring at this for? Get to killing!" + icon_state = "claymore" + item_state = "claymore" + lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi' + righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi' + hitsound = 'sound/weapons/bladeslice.ogg' + flags_1 = CONDUCT_1 + slot_flags = SLOT_BELT | SLOT_BACK + force = 40 + throwforce = 10 + w_class = WEIGHT_CLASS_NORMAL + attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") + block_chance = 50 + sharpness = IS_SHARP + max_integrity = 200 + armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 50) + resistance_flags = FIRE_PROOF + +/obj/item/claymore/suicide_act(mob/user) + user.visible_message("[user] is falling on [src]! It looks like [user.p_theyre()] trying to commit suicide!") + return(BRUTELOSS) + +/obj/item/claymore/highlander //ALL COMMENTS MADE REGARDING THIS SWORD MUST BE MADE IN ALL CAPS + desc = "THERE CAN BE ONLY ONE, AND IT WILL BE YOU!!!\nActivate it in your hand to point to the nearest victim." + flags_1 = CONDUCT_1 | NODROP_1 | DROPDEL_1 + slot_flags = null + block_chance = 0 //RNG WON'T HELP YOU NOW, PANSY + luminosity = 3 + attack_verb = list("brutalized", "eviscerated", "disemboweled", "hacked", "carved", "cleaved") //ONLY THE MOST VISCERAL ATTACK VERBS + var/notches = 0 //HOW MANY PEOPLE HAVE BEEN SLAIN WITH THIS BLADE + var/obj/item/disk/nuclear/nuke_disk //OUR STORED NUKE DISK + +/obj/item/claymore/highlander/Initialize() + . = ..() + START_PROCESSING(SSobj, src) + +/obj/item/claymore/highlander/Destroy() + if(nuke_disk) + nuke_disk.forceMove(get_turf(src)) + nuke_disk.visible_message("The nuke disk is vulnerable!") + nuke_disk = null + STOP_PROCESSING(SSobj, src) + return ..() + +/obj/item/claymore/highlander/process() + if(ishuman(loc)) + var/mob/living/carbon/human/H = loc + loc.layer = LARGE_MOB_LAYER //NO HIDING BEHIND PLANTS FOR YOU, DICKWEED (HA GET IT, BECAUSE WEEDS ARE PLANTS) + H.bleedsuppress = TRUE //AND WE WON'T BLEED OUT LIKE COWARDS + else + if(!admin_spawned) + qdel(src) + + +/obj/item/claymore/highlander/pickup(mob/living/user) + to_chat(user, "The power of Scotland protects you! You are shielded from all stuns and knockdowns.") + user.add_stun_absorption("highlander", INFINITY, 1, " is protected by the power of Scotland!", "The power of Scotland absorbs the stun!", " is protected by the power of Scotland!") + user.status_flags += IGNORESLOWDOWN + +/obj/item/claymore/highlander/dropped(mob/living/user) + user.status_flags -= IGNORESLOWDOWN + qdel(src) //If this ever happens, it's because you lost an arm + +/obj/item/claymore/highlander/examine(mob/user) + ..() + to_chat(user, "It has [!notches ? "nothing" : "[notches] notches"] scratched into the blade.") + if(nuke_disk) + to_chat(user, "It's holding the nuke disk!") + +/obj/item/claymore/highlander/attack(mob/living/target, mob/living/user) + . = ..() + if(!QDELETED(target) && iscarbon(target) && target.stat == DEAD && target.mind && target.mind.special_role == "highlander") + user.fully_heal() //STEAL THE LIFE OF OUR FALLEN FOES + add_notch(user) + target.visible_message("[target] crumbles to dust beneath [user]'s blows!", "As you fall, your body crumbles to dust!") + target.dust() + +/obj/item/claymore/highlander/attack_self(mob/living/user) + var/closest_victim + var/closest_distance = 255 + for(var/mob/living/carbon/human/H in GLOB.player_list - user) + if(H.client && H.mind.special_role == "highlander" && (!closest_victim || get_dist(user, closest_victim) < closest_distance)) + closest_victim = H + if(!closest_victim) + to_chat(user, "[src] thrums for a moment and falls dark. Perhaps there's nobody nearby.") + return + to_chat(user, "[src] thrums and points to the [dir2text(get_dir(user, closest_victim))].") + +/obj/item/claymore/highlander/IsReflect() + return 1 //YOU THINK YOUR PUNY LASERS CAN STOP ME? + +/obj/item/claymore/highlander/proc/add_notch(mob/living/user) //DYNAMIC CLAYMORE PROGRESSION SYSTEM - THIS IS THE FUTURE + notches++ + force++ + var/new_name = name + switch(notches) + if(1) + to_chat(user, "Your first kill - hopefully one of many. You scratch a notch into [src]'s blade.") + to_chat(user, "You feel your fallen foe's soul entering your blade, restoring your wounds!") + new_name = "notched claymore" + if(2) + to_chat(user, "Another falls before you. Another soul fuses with your own. Another notch in the blade.") + new_name = "double-notched claymore" + add_atom_colour(rgb(255, 235, 235), ADMIN_COLOUR_PRIORITY) + if(3) + to_chat(user, "You're beginning to relish the thrill of battle.") + new_name = "triple-notched claymore" + add_atom_colour(rgb(255, 215, 215), ADMIN_COLOUR_PRIORITY) + if(4) + to_chat(user, "You've lost count of how many you've killed.") + new_name = "many-notched claymore" + add_atom_colour(rgb(255, 195, 195), ADMIN_COLOUR_PRIORITY) + if(5) + to_chat(user, "Five voices now echo in your mind, cheering the slaughter.") + new_name = "battle-tested claymore" + add_atom_colour(rgb(255, 175, 175), ADMIN_COLOUR_PRIORITY) + if(6) + to_chat(user, "Is this what the vikings felt like? Visions of glory fill your head as you slay your sixth foe.") + new_name = "battle-scarred claymore" + add_atom_colour(rgb(255, 155, 155), ADMIN_COLOUR_PRIORITY) + if(7) + to_chat(user, "Kill. Butcher. Conquer.") + new_name = "vicious claymore" + add_atom_colour(rgb(255, 135, 135), ADMIN_COLOUR_PRIORITY) + if(8) + to_chat(user, "IT NEVER GETS OLD. THE SCREAMING. THE BLOOD AS IT SPRAYS ACROSS YOUR FACE.") + new_name = "bloodthirsty claymore" + add_atom_colour(rgb(255, 115, 115), ADMIN_COLOUR_PRIORITY) + if(9) + to_chat(user, "ANOTHER ONE FALLS TO YOUR BLOWS. ANOTHER WEAKLING UNFIT TO LIVE.") + new_name = "gore-stained claymore" + add_atom_colour(rgb(255, 95, 95), ADMIN_COLOUR_PRIORITY) + if(10) + user.visible_message("[user]'s eyes light up with a vengeful fire!", \ + "YOU FEEL THE POWER OF VALHALLA FLOWING THROUGH YOU! THERE CAN BE ONLY ONE!!!") + user.update_icons() + new_name = "GORE-DRENCHED CLAYMORE OF [pick("THE WHIMSICAL SLAUGHTER", "A THOUSAND SLAUGHTERED CATTLE", "GLORY AND VALHALLA", "ANNIHILATION", "OBLITERATION")]" + icon_state = "claymore_valhalla" + item_state = "cultblade" + remove_atom_colour(ADMIN_COLOUR_PRIORITY) + + name = new_name + playsound(user, 'sound/items/screwdriver2.ogg', 50, 1) + +/obj/item/katana + name = "katana" + desc = "Woefully underpowered in D20" + icon_state = "katana" + item_state = "katana" + lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi' + righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi' + flags_1 = CONDUCT_1 + slot_flags = SLOT_BELT | SLOT_BACK + force = 40 + throwforce = 10 + w_class = WEIGHT_CLASS_NORMAL + hitsound = 'sound/weapons/bladeslice.ogg' + attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") + block_chance = 50 + sharpness = IS_SHARP + max_integrity = 200 + armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 50) + resistance_flags = FIRE_PROOF + +/obj/item/katana/cursed + slot_flags = null + +/obj/item/katana/suicide_act(mob/user) + user.visible_message("[user] is slitting [user.p_their()] stomach open with [src]! It looks like [user.p_theyre()] trying to commit seppuku!") + return(BRUTELOSS) + +/obj/item/wirerod + name = "wired rod" + desc = "A rod with some wire wrapped around the top. It'd be easy to attach something to the top bit." + icon_state = "wiredrod" + item_state = "rods" + flags_1 = CONDUCT_1 + force = 9 + throwforce = 10 + w_class = WEIGHT_CLASS_NORMAL + materials = list(MAT_METAL=1150, MAT_GLASS=75) + attack_verb = list("hit", "bludgeoned", "whacked", "bonked") + +/obj/item/wirerod/attackby(obj/item/I, mob/user, params) + if(istype(I, /obj/item/shard)) + var/obj/item/twohanded/spear/S = new /obj/item/twohanded/spear + + remove_item_from_storage(user) + qdel(I) + qdel(src) + + user.put_in_hands(S) + to_chat(user, "You fasten the glass shard to the top of the rod with the cable.") + + else if(istype(I, /obj/item/device/assembly/igniter) && !(I.flags_1 & NODROP_1)) + var/obj/item/melee/baton/cattleprod/P = new /obj/item/melee/baton/cattleprod + + remove_item_from_storage(user) + + to_chat(user, "You fasten [I] to the top of the rod with the cable.") + + qdel(I) + qdel(src) + + user.put_in_hands(P) + else + return ..() + + +/obj/item/throwing_star + name = "throwing star" + desc = "An ancient weapon still used to this day due to it's ease of lodging itself into victim's body parts" + icon_state = "throwingstar" + item_state = "eshield0" + lefthand_file = 'icons/mob/inhands/equipment/shields_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/shields_righthand.dmi' + force = 2 + throwforce = 20 //This is never used on mobs since this has a 100% embed chance. + throw_speed = 4 + embedded_pain_multiplier = 4 + w_class = WEIGHT_CLASS_SMALL + embed_chance = 100 + embedded_fall_chance = 0 //Hahaha! + sharpness = IS_SHARP + materials = list(MAT_METAL=500, MAT_GLASS=500) + resistance_flags = FIRE_PROOF + + +/obj/item/switchblade + name = "switchblade" + icon_state = "switchblade" + lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi' + righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi' + desc = "A sharp, concealable, spring-loaded knife." + flags_1 = CONDUCT_1 + force = 3 + w_class = WEIGHT_CLASS_SMALL + throwforce = 5 + throw_speed = 3 + throw_range = 6 + materials = list(MAT_METAL=12000) + origin_tech = "engineering=3;combat=2" + hitsound = 'sound/weapons/genhit.ogg' + attack_verb = list("stubbed", "poked") + resistance_flags = FIRE_PROOF + var/extended = 0 + +/obj/item/switchblade/attack_self(mob/user) + extended = !extended + playsound(src.loc, 'sound/weapons/batonextend.ogg', 50, 1) + if(extended) + force = 20 + w_class = WEIGHT_CLASS_NORMAL + throwforce = 23 + icon_state = "switchblade_ext" + attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") + hitsound = 'sound/weapons/bladeslice.ogg' + sharpness = IS_SHARP + else + force = 3 + w_class = WEIGHT_CLASS_SMALL + throwforce = 5 + icon_state = "switchblade" + attack_verb = list("stubbed", "poked") + hitsound = 'sound/weapons/genhit.ogg' + sharpness = IS_BLUNT + +/obj/item/switchblade/suicide_act(mob/user) + user.visible_message("[user] is slitting [user.p_their()] own throat with [src]! It looks like [user.p_theyre()] trying to commit suicide!") + return (BRUTELOSS) + +/obj/item/phone + name = "red phone" + desc = "Should anything ever go wrong..." + icon = 'icons/obj/items_and_weapons.dmi' + icon_state = "red_phone" + force = 3 + throwforce = 2 + throw_speed = 3 + throw_range = 4 + w_class = WEIGHT_CLASS_SMALL + attack_verb = list("called", "rang") + hitsound = 'sound/weapons/ring.ogg' + +/obj/item/phone/suicide_act(mob/user) + if(locate(/obj/structure/chair/stool) in user.loc) + user.visible_message("[user] begins to tie a noose with [src]'s cord! It looks like [user.p_theyre()] trying to commit suicide!") + else + user.visible_message("[user] is strangling [user.p_them()]self with [src]'s cord! It looks like [user.p_theyre()] trying to commit suicide!") + return(OXYLOSS) + +/obj/item/cane + name = "cane" + desc = "A cane used by a true gentleman. Or a clown." + icon = 'icons/obj/items_and_weapons.dmi' + icon_state = "cane" + item_state = "stick" + lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi' + righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi' + force = 5 + throwforce = 5 + w_class = WEIGHT_CLASS_SMALL + materials = list(MAT_METAL=50) + attack_verb = list("bludgeoned", "whacked", "disciplined", "thrashed") + +/obj/item/staff + name = "wizard staff" + desc = "Apparently a staff used by the wizard." + icon = 'icons/obj/wizard.dmi' + icon_state = "staff" + lefthand_file = 'icons/mob/inhands/weapons/staves_lefthand.dmi' + righthand_file = 'icons/mob/inhands/weapons/staves_righthand.dmi' + force = 3 + throwforce = 5 + throw_speed = 2 + throw_range = 5 + w_class = WEIGHT_CLASS_SMALL + armour_penetration = 100 + attack_verb = list("bludgeoned", "whacked", "disciplined") + resistance_flags = FLAMMABLE + +/obj/item/staff/broom + name = "broom" + desc = "Used for sweeping, and flying into the night while cackling. Black cat not included." + icon = 'icons/obj/wizard.dmi' + icon_state = "broom" + resistance_flags = FLAMMABLE + +/obj/item/staff/stick + name = "stick" + desc = "A great tool to drag someone else's drinks across the bar." + icon = 'icons/obj/items_and_weapons.dmi' + icon_state = "stick" + item_state = "stick" + lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi' + righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi' + force = 3 + throwforce = 5 + throw_speed = 2 + throw_range = 5 + w_class = WEIGHT_CLASS_SMALL + +/obj/item/ectoplasm + name = "ectoplasm" + desc = "spooky" + gender = PLURAL + icon = 'icons/obj/wizard.dmi' + icon_state = "ectoplasm" + +/obj/item/ectoplasm/suicide_act(mob/user) + user.visible_message("[user] is inhaling [src]! It looks like [user.p_theyre()] trying to visit the astral plane.") + return (OXYLOSS) + +/obj/item/mounted_chainsaw + name = "mounted chainsaw" + desc = "A chainsaw that has replaced your arm." + icon_state = "chainsaw_on" + item_state = "mounted_chainsaw" + lefthand_file = 'icons/mob/inhands/weapons/chainsaw_lefthand.dmi' + righthand_file = 'icons/mob/inhands/weapons/chainsaw_righthand.dmi' + flags_1 = NODROP_1 | ABSTRACT_1 | DROPDEL_1 + w_class = WEIGHT_CLASS_HUGE + force = 24 + throwforce = 0 + throw_range = 0 + throw_speed = 0 + sharpness = IS_SHARP + attack_verb = list("sawed", "torn", "cut", "chopped", "diced") + hitsound = 'sound/weapons/chainsawhit.ogg' + +/obj/item/mounted_chainsaw/Destroy() + var/obj/item/bodypart/part + new /obj/item/twohanded/required/chainsaw(get_turf(src)) + if(iscarbon(loc)) + var/mob/living/carbon/holder = loc + var/index = holder.get_held_index_of_item(src) + if(index) + part = holder.hand_bodyparts[index] + . = ..() + if(part) + part.drop_limb() + +/obj/item/statuebust + name = "bust" + desc = "A priceless ancient marble bust, the kind that belongs in a museum." //or you can hit people with it + icon = 'icons/obj/statue.dmi' + icon_state = "bust" + force = 15 + throwforce = 10 + throw_speed = 5 + throw_range = 2 + attack_verb = list("busted") + +/obj/item/tailclub + name = "tail club" + desc = "For the beating to death of lizards with their own tails." + icon_state = "tailclub" + force = 14 + throwforce = 1 // why are you throwing a club do you even weapon + throw_speed = 1 + throw_range = 1 + attack_verb = list("clubbed", "bludgeoned") + +/obj/item/melee/chainofcommand/tailwhip + name = "liz o' nine tails" + desc = "A whip fashioned from the severed tails of lizards." + icon_state = "tailwhip" + origin_tech = "engineering=3;combat=3;biotech=3" + needs_permit = 0 + +/obj/item/melee/chainofcommand/tailwhip/kitty + name = "cat o' nine tails" + desc = "A whip fashioned from the severed tails of cats." + icon_state = "catwhip" + +/obj/item/melee/skateboard + name = "skateboard" + desc = "A skateboard. It can be placed on its wheels and ridden, or used as a strong weapon." + icon_state = "skateboard" + item_state = "skateboard" + force = 12 + throwforce = 4 + w_class = WEIGHT_CLASS_HUGE + attack_verb = list("smacked", "whacked", "slammed", "smashed") + +/obj/item/melee/skateboard/attack_self(mob/user) + new /obj/vehicle/scooter/skateboard(get_turf(user)) + qdel(src) + +/obj/item/melee/baseball_bat + name = "baseball bat" + desc = "There ain't a skull in the league that can withstand a swatter." + icon = 'icons/obj/items_and_weapons.dmi' + icon_state = "baseball_bat" + item_state = "baseball_bat" + lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi' + righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi' + force = 10 + throwforce = 12 + attack_verb = list("beat", "smacked") + w_class = WEIGHT_CLASS_HUGE + var/homerun_ready = 0 + var/homerun_able = 0 + +/obj/item/melee/baseball_bat/homerun + name = "home run bat" + desc = "This thing looks dangerous... Dangerously good at baseball, that is." + homerun_able = 1 + +/obj/item/melee/baseball_bat/attack_self(mob/user) + if(!homerun_able) + ..() + return + if(homerun_ready) + to_chat(user, "You're already ready to do a home run!") + ..() + return + to_chat(user, "You begin gathering strength...") + playsound(get_turf(src), 'sound/magic/lightning_chargeup.ogg', 65, 1) + if(do_after(user, 90, target = src)) + to_chat(user, "You gather power! Time for a home run!") + homerun_ready = 1 + ..() + +/obj/item/melee/baseball_bat/attack(mob/living/target, mob/living/user) + . = ..() + var/atom/throw_target = get_edge_target_turf(target, user.dir) + if(homerun_ready) + user.visible_message("It's a home run!") + target.throw_at(throw_target, rand(8,10), 14, user) + target.ex_act(EXPLODE_HEAVY) + playsound(get_turf(src), 'sound/weapons/homerun.ogg', 100, 1) + homerun_ready = 0 + return + else if(!target.anchored) + target.throw_at(throw_target, rand(1,2), 7, user) + +/obj/item/melee/baseball_bat/ablative + name = "metal baseball bat" + desc = "This bat is made of highly reflective, highly armored material." + icon_state = "baseball_bat_metal" + item_state = "baseball_bat_metal" + force = 12 + throwforce = 15 + +/obj/item/melee/baseball_bat/ablative/IsReflect()//some day this will reflect thrown items instead of lasers + var/picksound = rand(1,2) + var/turf = get_turf(src) + if(picksound == 1) + playsound(turf, 'sound/weapons/effects/batreflect1.ogg', 50, 1) + if(picksound == 2) + playsound(turf, 'sound/weapons/effects/batreflect2.ogg', 50, 1) + return 1 + +/obj/item/melee/flyswatter + name = "flyswatter" + desc = "Useful for killing insects of all sizes." + icon = 'icons/obj/items_and_weapons.dmi' + icon_state = "flyswatter" + item_state = "flyswatter" + lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi' + righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi' + force = 1 + throwforce = 1 + attack_verb = list("swatted", "smacked") + hitsound = 'sound/effects/snap.ogg' + w_class = WEIGHT_CLASS_SMALL + //Things in this list will be instantly splatted. Flyman weakness is handled in the flyman species weakness proc. + var/list/strong_against + +/obj/item/melee/flyswatter/Initialize() + . = ..() + strong_against = typecacheof(list( + /mob/living/simple_animal/hostile/poison/bees/, + /mob/living/simple_animal/butterfly, + /mob/living/simple_animal/cockroach, + /obj/item/queen_bee + )) + + +/obj/item/melee/flyswatter/afterattack(atom/target, mob/user, proximity_flag) + if(proximity_flag) + if(is_type_in_typecache(target, strong_against)) + new /obj/effect/decal/cleanable/deadcockroach(get_turf(target)) + to_chat(user, "You easily splat the [target].") + if(istype(target, /mob/living/)) + var/mob/living/bug = target + bug.death(1) + else + qdel(target) + +/obj/item/circlegame + name = "circled hand" + desc = "If somebody looks at this while it's below your waist, you get to bop them." + icon_state = "madeyoulook" + force = 0 + throwforce = 0 + flags_1 = DROPDEL_1 | ABSTRACT_1 + attack_verb = list("bopped") + +/obj/item/proc/can_trigger_gun(mob/living/user) + if(!user.can_use_guns(src)) + return FALSE +>>>>>>> bcbc166... chainsaws rebalance, but working this time :) (#30399) return TRUE diff --git a/code/modules/crafting/recipes.dm b/code/modules/crafting/recipes.dm index 1f12e671ec..d3b53d3a41 100644 --- a/code/modules/crafting/recipes.dm +++ b/code/modules/crafting/recipes.dm @@ -308,8 +308,8 @@ name = "Chainsaw" result = /obj/item/twohanded/required/chainsaw reqs = list(/obj/item/circular_saw = 1, - /obj/item/stack/cable_coil = 1, - /obj/item/stack/sheet/plasteel = 1) + /obj/item/stack/cable_coil = 3, + /obj/item/stack/sheet/plasteel = 5) tools = list(/obj/item/weldingtool) time = 50 category = CAT_WEAPONRY From 33f36fd0de5d8dfa880ca0380f3f329ed5da6c9a Mon Sep 17 00:00:00 2001 From: ExcessiveUseOfCobblestone <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com> Date: Fri, 8 Sep 2017 11:01:30 -0400 Subject: [PATCH 012/163] Adds Archaeology Component --- code/__DEFINES/components.dm | 11 ++- code/__DEFINES/is_helpers.dm | 2 + code/datums/components/archaeology.dm | 92 +++++++++++++++++++ code/game/atoms.dm | 5 +- .../mecha/equipment/tools/mining_tools.dm | 4 +- code/game/objects/items.dm | 3 +- code/game/objects/objs.dm | 1 + code/game/objects/structures/lattice.dm | 1 + .../structures/transit_tubes/transit_tube.dm | 1 + .../transit_tubes/transit_tube_pod.dm | 1 + code/game/objects/structures/window.dm | 1 + code/game/turfs/open.dm | 3 + code/game/turfs/simulated/floor.dm | 1 + code/game/turfs/simulated/floor/misc_floor.dm | 1 + .../turfs/simulated/floor/plating/asteroid.dm | 83 +++-------------- .../game/turfs/simulated/floor/reinf_floor.dm | 1 + code/game/turfs/simulated/wall/reinf_walls.dm | 1 + code/game/turfs/simulated/walls.dm | 1 + .../atmospherics/machinery/atmosmachinery.dm | 1 + .../atmospherics/machinery/other/meter.dm | 1 + code/modules/mob/living/carbon/human/human.dm | 2 +- code/modules/mob/living/living.dm | 1 + code/modules/power/cable.dm | 1 + code/modules/recycling/disposal-structures.dm | 1 + code/modules/recycling/disposal-unit.dm | 1 + tgstation.dme | 1 + 26 files changed, 146 insertions(+), 76 deletions(-) create mode 100644 code/datums/components/archaeology.dm diff --git a/code/__DEFINES/components.dm b/code/__DEFINES/components.dm index 0225dad669..37af346a88 100644 --- a/code/__DEFINES/components.dm +++ b/code/__DEFINES/components.dm @@ -5,7 +5,7 @@ // How multiple components of the exact same type are handled in the same datum #define COMPONENT_DUPE_HIGHLANDER 0 //old component is deleted (default) -#define COMPONENT_DUPE_ALLOWED 1 //duplicates allowed +#define COMPONENT_DUPE_ALLOWED 1 //duplicates allowed #define COMPONENT_DUPE_UNIQUE 2 //new component is deleted // All signals. Format: @@ -14,5 +14,14 @@ #define COMSIG_COMPONENT_ADDED "component_added" //when a component is added to a datum: (datum/component) #define COMSIG_COMPONENT_REMOVING "component_removing" //before a component is removed from a datum because of RemoveComponent: (datum/component) #define COMSIG_PARENT_QDELETED "parent_qdeleted" //before a datum's Destroy() is called: () +<<<<<<< HEAD #define COMSIG_ATOM_ENTERED "atom_entered" //from base of atom/Entered(): (atom/movable, atom) #define COMSIG_MOVABLE_CROSSED "movable_crossed" //from base of atom/movable/Crossed(): (atom/movable) +======= +#define COMSIG_PARENT_ATTACKBY "atom_attackby" //from the base of atom/attackby: (obj/item, mob/living, params) +#define COMSIG_PARENT_EXAMINE "atom_examine" //from the base of atom/examine: (mob) +#define COMSIG_ATOM_ENTERED "atom_entered" //from base of atom/Entered(): (atom/movable, atom) +#define COMSIG_ATOM_EX_ACT "atom_ex_act" //from base of atom/ex_act(): (severity, target) +#define COMSIG_ATOM_SING_PULL "atom_sing_pull" //from base of atom/singularity_pull(): (S, current_size) +#define COMSIG_MOVABLE_CROSSED "movable_crossed" //from base of atom/movable/Crossed(): (atom/movable) +>>>>>>> 1e17bb7... Adds Archaeology Component (#30220) diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm index 16b2a8f4fb..2c18e51f01 100644 --- a/code/__DEFINES/is_helpers.dm +++ b/code/__DEFINES/is_helpers.dm @@ -25,6 +25,8 @@ #define islava(A) (istype(A, /turf/open/lava)) +#define isplatingturf(A) (istype(A, /turf/open/floor/plating)) + //Mobs #define isliving(A) (istype(A, /mob/living)) diff --git a/code/datums/components/archaeology.dm b/code/datums/components/archaeology.dm new file mode 100644 index 0000000000..22a6b24bc4 --- /dev/null +++ b/code/datums/components/archaeology.dm @@ -0,0 +1,92 @@ +/datum/component/archaeology + dupe_type = COMPONENT_DUPE_UNIQUE + var/list/archdrops + var/prob2drop + var/dug + +/datum/component/archaeology/Initialize(_prob2drop, list/_archdrops = list()) + prob2drop = Clamp(_prob2drop, 0, 100) + archdrops = _archdrops + RegisterSignal(COMSIG_PARENT_ATTACKBY,.proc/Dig) + RegisterSignal(COMSIG_ATOM_EX_ACT, .proc/BombDig) + RegisterSignal(COMSIG_ATOM_SING_PULL, .proc/SingDig) + +/datum/component/archaeology/InheritComponent(datum/component/archaeology/A, i_am_original) + var/list/other_archdrops = A.archdrops + var/list/_archdrops = archdrops + for(var/I in other_archdrops) + _archdrops[I] += other_archdrops[I] + +/datum/component/archaeology/proc/Dig(mob/user, obj/item/W) + if(dug) + to_chat(user, "Looks like someone has dug here already.") + return FALSE + else + var/digging_speed + if (istype(W, /obj/item/shovel)) + var/obj/item/shovel/S = W + digging_speed = S.digspeed + else if (istype(W, /obj/item/pickaxe)) + var/obj/item/pickaxe/P = W + digging_speed = P.digspeed + + if (digging_speed && isturf(user.loc)) + to_chat(user, "You start digging...") + playsound(parent, 'sound/effects/shovel_dig.ogg', 50, 1) + + if(do_after(user, digging_speed, target = parent)) + to_chat(user, "You dig a hole.") + gets_dug() + dug = TRUE + SSblackbox.add_details("pick_used_mining",W.type) + return TRUE + return FALSE + +/datum/component/archaeology/proc/gets_dug() + if(dug) + return + else + var/turf/open/OT = get_turf(parent) + for(var/thing in archdrops) + var/maxtodrop = archdrops[thing] + for(var/i in 1 to maxtodrop) + if(prob(prob2drop)) // can't win them all! + new thing(OT) + + if(isopenturf(OT)) + if(OT.postdig_icon_change) + if(istype(OT, /turf/open/floor/plating/asteroid/) && !OT.postdig_icon) + var/turf/open/floor/plating/asteroid/AOT = parent + AOT.icon_plating = "[AOT.environment_type]_dug" + AOT.icon_state = "[AOT.environment_type]_dug" + else + if(isplatingturf(OT)) + var/turf/open/floor/plating/POT = parent + POT.icon_plating = "[POT.postdig_icon]" + OT.icon_state = "[OT.postdig_icon]" + + if(OT.slowdown) //Things like snow slow you down until you dig them. + OT.slowdown = 0 + dug = TRUE + +/datum/component/archaeology/proc/SingDig(S, current_size) + switch(current_size) + if(STAGE_THREE) + if(prob(30)) + gets_dug() + if(STAGE_FOUR) + if(prob(50)) + gets_dug() + else + if(current_size >= STAGE_FIVE && prob(70)) + gets_dug() + +/datum/component/archaeology/proc/BombDig(severity, target) + switch(severity) + if(3) + return + if(2) + if(prob(20)) + gets_dug() + if(1) + gets_dug() diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 77bcefeddf..1e8ef4c5e2 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -304,6 +304,7 @@ /atom/proc/ex_act(severity, target) set waitfor = FALSE contents_explosion(severity, target) + SendSignal(COMSIG_ATOM_EX_ACT, severity, target) /atom/proc/blob_act(obj/structure/blob/B) return @@ -468,8 +469,8 @@ GLOBAL_LIST_EMPTY(blood_splatter_icons) /atom/proc/singularity_act() return -/atom/proc/singularity_pull() - return +/atom/proc/singularity_pull(obj/singularity/S, current_size) + SendSignal(COMSIG_ATOM_SING_PULL, S, current_size) /atom/proc/acid_act(acidpwr, acid_volume) return diff --git a/code/game/mecha/equipment/tools/mining_tools.dm b/code/game/mecha/equipment/tools/mining_tools.dm index 6d15716941..d0a1310e8e 100644 --- a/code/game/mecha/equipment/tools/mining_tools.dm +++ b/code/game/mecha/equipment/tools/mining_tools.dm @@ -58,7 +58,9 @@ /turf/open/floor/plating/asteroid/drill_act(obj/item/mecha_parts/mecha_equipment/drill/drill) for(var/turf/open/floor/plating/asteroid/M in range(1, drill.chassis)) if(get_dir(drill.chassis,M)&drill.chassis.dir) - M.gets_dug() + for(var/I in GetComponents(/datum/component/archaeology)) + var/datum/component/archaeology/archy = I + archy.gets_dug() drill.log_message("Drilled through [src]") drill.move_ores() diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 96dcba36cf..f640e0f90b 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -549,9 +549,10 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE) transfer_blood = 0 /obj/item/singularity_pull(S, current_size) + ..() if(current_size >= STAGE_FOUR) throw_at(S,14,3, spin=0) - else ..() + else return /obj/item/throw_impact(atom/A) if(A && !QDELETED(A)) diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index 1f3668f283..c8f105dfbe 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -169,6 +169,7 @@ return /obj/singularity_pull(S, current_size) + ..() if(!anchored || current_size >= STAGE_FIVE) step_towards(src,S) diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm index 8a24b0271f..081cf186a3 100644 --- a/code/game/objects/structures/lattice.dm +++ b/code/game/objects/structures/lattice.dm @@ -45,6 +45,7 @@ qdel(src) /obj/structure/lattice/singularity_pull(S, current_size) + ..() if(current_size >= STAGE_FOUR) deconstruct() diff --git a/code/game/objects/structures/transit_tubes/transit_tube.dm b/code/game/objects/structures/transit_tubes/transit_tube.dm index 7b86cdffcc..10d883d392 100644 --- a/code/game/objects/structures/transit_tubes/transit_tube.dm +++ b/code/game/objects/structures/transit_tubes/transit_tube.dm @@ -30,6 +30,7 @@ return ..() /obj/structure/transit_tube/singularity_pull(S, current_size) + ..() if(current_size >= STAGE_FIVE) deconstruct(FALSE) diff --git a/code/game/objects/structures/transit_tubes/transit_tube_pod.dm b/code/game/objects/structures/transit_tubes/transit_tube_pod.dm index 89f02b13af..b885f980a2 100644 --- a/code/game/objects/structures/transit_tubes/transit_tube_pod.dm +++ b/code/game/objects/structures/transit_tubes/transit_tube_pod.dm @@ -62,6 +62,7 @@ AM.ex_act(severity, target) /obj/structure/transit_tube_pod/singularity_pull(S, current_size) + ..() if(current_size >= STAGE_FIVE) deconstruct(FALSE) diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index e70d5d3ddb..170a651315 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -105,6 +105,7 @@ qdel(src) /obj/structure/window/singularity_pull(S, current_size) + ..() if(current_size >= STAGE_FIVE) deconstruct(FALSE) diff --git a/code/game/turfs/open.dm b/code/game/turfs/open.dm index 2622a4e74c..f97f79068d 100644 --- a/code/game/turfs/open.dm +++ b/code/game/turfs/open.dm @@ -4,6 +4,9 @@ var/wet = 0 var/wet_time = 0 // Time in seconds that this floor will be wet for. var/mutable_appearance/wet_overlay + var/postdig_icon_change = FALSE + var/postdig_icon + var/list/archdrops /turf/open/indestructible name = "floor" diff --git a/code/game/turfs/simulated/floor.dm b/code/game/turfs/simulated/floor.dm index cfc834037d..df3d2aba86 100644 --- a/code/game/turfs/simulated/floor.dm +++ b/code/game/turfs/simulated/floor.dm @@ -170,6 +170,7 @@ return make_plating() /turf/open/floor/singularity_pull(S, current_size) + ..() if(current_size == STAGE_THREE) if(prob(30)) if(floor_tile) diff --git a/code/game/turfs/simulated/floor/misc_floor.dm b/code/game/turfs/simulated/floor/misc_floor.dm index f8d6c1da71..f2475cf997 100644 --- a/code/game/turfs/simulated/floor/misc_floor.dm +++ b/code/game/turfs/simulated/floor/misc_floor.dm @@ -269,6 +269,7 @@ narsie_act(force, ignore_mobs, probability) /turf/open/floor/vines/singularity_pull(S, current_size) + ..() if(current_size >= STAGE_FIVE) if(prob(50)) ChangeTurf(src.baseturf) diff --git a/code/game/turfs/simulated/floor/plating/asteroid.dm b/code/game/turfs/simulated/floor/plating/asteroid.dm index b24b758d73..c6dd8cb2eb 100644 --- a/code/game/turfs/simulated/floor/plating/asteroid.dm +++ b/code/game/turfs/simulated/floor/plating/asteroid.dm @@ -9,11 +9,11 @@ icon = 'icons/turf/floors.dmi' icon_state = "asteroid" icon_plating = "asteroid" + postdig_icon_change = TRUE var/environment_type = "asteroid" var/turf_type = /turf/open/floor/plating/asteroid //Because caves do whacky shit to revert to normal - var/dug = 0 //0 = has not yet been dug, 1 = has already been dug - var/sand_type = /obj/item/ore/glass var/floor_variance = 20 //probability floor has a different icon state + archdrops = list(/obj/item/ore/glass = 5) /turf/open/floor/plating/asteroid/Initialize() var/proper_name = name @@ -22,6 +22,9 @@ if(prob(floor_variance)) icon_state = "[environment_type][rand(0,12)]" + if(LAZYLEN(archdrops)) + AddComponent(/datum/component/archaeology, 100, archdrops) + /turf/open/floor/plating/asteroid/burn_tile() return @@ -31,46 +34,7 @@ /turf/open/floor/plating/asteroid/MakeDry(wet_setting = TURF_WET_WATER) return -/turf/open/floor/plating/asteroid/ex_act(severity, target) - contents_explosion(severity, target) - switch(severity) - if(3) - return - if(2) - if(prob(20)) - src.gets_dug() - if(1) - src.gets_dug() - /turf/open/floor/plating/asteroid/attackby(obj/item/W, mob/user, params) - //note that this proc does not call ..() - if(!W || !user) - return 0 - var/digging_speed = 0 - if (istype(W, /obj/item/shovel)) - var/obj/item/shovel/S = W - digging_speed = S.digspeed - else if (istype(W, /obj/item/pickaxe)) - var/obj/item/pickaxe/P = W - digging_speed = P.digspeed - if (digging_speed) - var/turf/T = user.loc - if(!isturf(T)) - return - - if (dug) - to_chat(user, "This area has already been dug!") - return - - to_chat(user, "You start digging...") - playsound(src, 'sound/effects/shovel_dig.ogg', 50, 1) - - if(do_after(user, digging_speed, target = src)) - if(istype(src, /turf/open/floor/plating/asteroid)) - to_chat(user, "You dig a hole.") - gets_dug() - SSblackbox.add_details("pick_used_mining","[W.type]") - if(istype(W, /obj/item/storage/bag/ore)) var/obj/item/storage/bag/ore/S = W if(S.collection_mode == 1) @@ -88,37 +52,16 @@ var/turf/open/floor/light/F = T F.state = L.state playsound(src, 'sound/weapons/genhit.ogg', 50, 1) - -/turf/open/floor/plating/asteroid/proc/gets_dug() - if(dug) return - for(var/i in 1 to 5) - new sand_type(src) - dug = 1 - icon_plating = "[environment_type]_dug" - icon_state = "[environment_type]_dug" - slowdown = 0 - return + + return ..() + /turf/open/floor/plating/asteroid/singularity_act() if(turf_z_is_planet(src)) return ..() ChangeTurf(/turf/open/space) -/turf/open/floor/plating/asteroid/singularity_pull(S, current_size) - if(dug) - return - switch(current_size) - if(STAGE_THREE) - if(!prob(30)) - gets_dug() - if(STAGE_FOUR) - if(prob(50)) - gets_dug() - else - if(current_size >= STAGE_FIVE && prob(70)) - gets_dug() - /turf/open/floor/plating/asteroid/basalt name = "volcanic floor" @@ -127,7 +70,7 @@ icon_state = "basalt" icon_plating = "basalt" environment_type = "basalt" - sand_type = /obj/item/ore/glass/basalt + archdrops = list(/obj/item/ore/glass/basalt = 5) floor_variance = 15 /turf/open/floor/plating/asteroid/basalt/lava //lava underneath @@ -147,10 +90,10 @@ if("basalt5", "basalt9") B.set_light(1.4, 0.6, LIGHT_COLOR_LAVA) //barely anything! -/turf/open/floor/plating/asteroid/basalt/gets_dug() - if(!dug) - set_light(0) +/turf/open/floor/plating/asteroid/basalt/ComponentActivated(datum/component/C) ..() + if(istype(C, /datum/component/archaeology)) + set_light(0) ///////Surface. The surface is warm, but survivable without a suit. Internals are required. The floors break to chasms, which drop you into the underground. @@ -340,8 +283,8 @@ initial_gas_mix = "TEMP=180" slowdown = 2 environment_type = "snow" - sand_type = /obj/item/stack/sheet/mineral/snow flags_1 = NONE + archdrops = list(/obj/item/stack/sheet/mineral/snow = 5) /turf/open/floor/plating/asteroid/snow/airless initial_gas_mix = "TEMP=2.7" diff --git a/code/game/turfs/simulated/floor/reinf_floor.dm b/code/game/turfs/simulated/floor/reinf_floor.dm index df353653d7..eaf0e512f7 100644 --- a/code/game/turfs/simulated/floor/reinf_floor.dm +++ b/code/game/turfs/simulated/floor/reinf_floor.dm @@ -58,6 +58,7 @@ make_plating(1) /turf/open/floor/engine/singularity_pull(S, current_size) + ..() if(current_size >= STAGE_FIVE) if(floor_tile) if(prob(30)) diff --git a/code/game/turfs/simulated/wall/reinf_walls.dm b/code/game/turfs/simulated/wall/reinf_walls.dm index 261e856629..5ebe1d632a 100644 --- a/code/game/turfs/simulated/wall/reinf_walls.dm +++ b/code/game/turfs/simulated/wall/reinf_walls.dm @@ -247,6 +247,7 @@ icon_state = "r_wall" /turf/closed/wall/r_wall/singularity_pull(S, current_size) + ..() if(current_size >= STAGE_FIVE) if(prob(30)) dismantle_wall() diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm index 57774a5754..9171c7f54c 100644 --- a/code/game/turfs/simulated/walls.dm +++ b/code/game/turfs/simulated/walls.dm @@ -245,6 +245,7 @@ QDEL_IN(O, 50) /turf/closed/wall/singularity_pull(S, current_size) + ..() if(current_size >= STAGE_FIVE) if(prob(50)) dismantle_wall() diff --git a/code/modules/atmospherics/machinery/atmosmachinery.dm b/code/modules/atmospherics/machinery/atmosmachinery.dm index e22da2f1b1..977d48fbd7 100644 --- a/code/modules/atmospherics/machinery/atmosmachinery.dm +++ b/code/modules/atmospherics/machinery/atmosmachinery.dm @@ -222,6 +222,7 @@ Pipelines + Other Objects -> Pipe network build_network() /obj/machinery/atmospherics/singularity_pull(S, current_size) + ..() if(current_size >= STAGE_FIVE) deconstruct(FALSE) diff --git a/code/modules/atmospherics/machinery/other/meter.dm b/code/modules/atmospherics/machinery/other/meter.dm index 89f8b8d2cb..b73fd986f8 100644 --- a/code/modules/atmospherics/machinery/other/meter.dm +++ b/code/modules/atmospherics/machinery/other/meter.dm @@ -120,6 +120,7 @@ return 1 /obj/machinery/meter/singularity_pull(S, current_size) + ..() if(current_size >= STAGE_FIVE) new /obj/item/pipe_meter(loc) qdel(src) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 304a745220..f93b1cc2f1 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -643,6 +643,7 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy) update_hair() /mob/living/carbon/human/singularity_pull(S, current_size) + ..() if(current_size >= STAGE_THREE) for(var/obj/item/hand in held_items) if(prob(current_size * 5) && hand.w_class >= ((11-current_size)/2) && dropItemToGround(hand)) @@ -651,7 +652,6 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy) rad_act(current_size * 3) if(mob_negates_gravity()) return - ..() /mob/living/carbon/human/proc/do_cpr(mob/living/carbon/C) CHECK_DNA_AND_SPECIES(C) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 70a8474165..522bf5cf57 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -690,6 +690,7 @@ who.equip_to_slot(what, where, TRUE) /mob/living/singularity_pull(S, current_size) + ..() if(current_size >= STAGE_SIX) throw_at(S,14,3, spin=1) else diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index ebe478a7bf..a24c0d7c57 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -170,6 +170,7 @@ By design, d1 is the smallest direction and d2 is the highest return 0 /obj/structure/cable/singularity_pull(S, current_size) + ..() if(current_size >= STAGE_FIVE) deconstruct() diff --git a/code/modules/recycling/disposal-structures.dm b/code/modules/recycling/disposal-structures.dm index efe730d1c2..9015320c56 100644 --- a/code/modules/recycling/disposal-structures.dm +++ b/code/modules/recycling/disposal-structures.dm @@ -335,6 +335,7 @@ /obj/structure/disposalpipe/singularity_pull(S, current_size) + ..() if(current_size >= STAGE_FIVE) deconstruct() diff --git a/code/modules/recycling/disposal-unit.dm b/code/modules/recycling/disposal-unit.dm index 14ebec8128..4c82605673 100644 --- a/code/modules/recycling/disposal-unit.dm +++ b/code/modules/recycling/disposal-unit.dm @@ -58,6 +58,7 @@ return ..() /obj/machinery/disposal/singularity_pull(S, current_size) + ..() if(current_size >= STAGE_FIVE) deconstruct() diff --git a/tgstation.dme b/tgstation.dme index df879e0b4d..4ecd700891 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -281,6 +281,7 @@ #include "code\datums\antagonists\datum_traitor.dm" #include "code\datums\antagonists\devil.dm" #include "code\datums\antagonists\ninja.dm" +#include "code\datums\components\archaeology.dm" #include "code\datums\components\component.dm" #include "code\datums\components\slippery.dm" #include "code\datums\diseases\_disease.dm" From 71e87d851c9a943a4d864a219a0d0c715c84ae05 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Fri, 8 Sep 2017 11:27:53 -0400 Subject: [PATCH 013/163] Adds Features per Fix tracking --- tools/github_webhook_processor.php | 128 ++++++++++++++++++++++++++++- 1 file changed, 127 insertions(+), 1 deletion(-) diff --git a/tools/github_webhook_processor.php b/tools/github_webhook_processor.php index 6113714566..75cb3562b6 100644 --- a/tools/github_webhook_processor.php +++ b/tools/github_webhook_processor.php @@ -23,6 +23,12 @@ //This is required as otherwise somebody could trick the script into leaking the api key. $hookSecret = '08ajh0qj93209qj90jfq932j32r'; +$trackPRBalance = true; //set this to false to disable PR balance tracking +$prBalanceJson = ''; //Set this to the path you'd like the writable pr balance file to be stored, not setting it writes it to the working directory +$startingPRBalance = 3; //Starting balance for never before seen users +//team 133041: tgstation/commit-access +$maintainer_team_id = 133041; //org team id that is exempt from PR balance system, setting this to null will use anyone with write access to the repo. Get from https://api.github.com/orgs/:org/teams + //Api key for pushing changelogs. $apiKey = '209ab8d879c0f987d06a09b9d879c0f987d06a09b9d8787d0a089c'; @@ -168,7 +174,7 @@ function tag_pr($payload, $opened) { if(strpos($lowertitle, '[wip]') !== FALSE) $tags[] = 'Work In Progress'; - $url = $payload['pull_request']['base']['repo']['url'] . '/issues/' . $payload['pull_request']['number'] . '/labels'; + $url = $payload['pull_request']['issue_url'] . '/labels'; $existing_labels = file_get_contents($url, false, stream_context_create($scontext)); $existing_labels = json_decode($existing_labels, true); @@ -195,6 +201,12 @@ function handle_pr($payload) { switch ($payload["action"]) { case 'opened': tag_pr($payload, true); + if(get_pr_code_friendliness($payload) < 0){ + $balances = pr_balances(); + $author = $payload['pull_request']['user']['login']; + if(isset($balances[$author]) && $balances[$author] < 0) + create_comment($payload, 'You currently have a negative Fix/Feature pull request delta of ' . $balances[$author] . '. Maintainers may close this PR at will. Fixing issues or improving the codebase will improve this score.'); + } break; case 'edited': case 'synchronize': @@ -210,6 +222,11 @@ function handle_pr($payload) { else { $action = 'merged'; checkchangelog($payload, true, true); +<<<<<<< HEAD +======= + update_pr_balance($payload); + $validated = TRUE; //pr merged events always get announced. +>>>>>>> af44a7a... Adds Features per Fix tracking (#29897) } break; default: @@ -223,7 +240,116 @@ function handle_pr($payload) { $msg = '['.$payload['pull_request']['base']['repo']['full_name'].'] Pull Request '.$action.' by '.htmlSpecialChars($payload['sender']['login']).': '.htmlSpecialChars('#'.$payload['pull_request']['number'].' '.$payload['pull_request']['user']['login'].' - '.$payload['pull_request']['title']).''; sendtoallservers('?announce='.urlencode($msg), $payload); +} +//creates a comment on the payload issue +function create_comment($payload, $comment){ + apisend($payload['pull_request']['comments_url'], 'POST', json_encode(array('body' => $comment))); +} + +//returns the payload issue's labels as a flat array +function get_pr_labels_array($payload){ + $url = $payload['pull_request']['issue_url'] . '/labels'; + $issue = json_decode(apisend($url), true); + $result = array(); + foreach($issue as $l) + $result[] = $l['name']; + return $result; +} + +//helper for getting the path the the balance json file +function pr_balance_json_path(){ + global $prBalanceJson; + return $prBalanceJson != '' ? $prBalanceJson : 'pr_balances.json'; +} + +//return the assoc array of login -> balance for prs +function pr_balances(){ + $path = pr_balance_json_path(); + if(file_exists($path)) + return json_decode(file_get_contents($path), true); + else + return array(); +} + +//returns the difference in PR balance a pull request would cause +function get_pr_code_friendliness($payload, $oldbalance = null){ + global $startingPRBalance; + if($oldbalance == null) + $oldbalance = $startingPRBalance; + $labels = get_pr_labels_array($payload); + //anything not in this list defaults to 0 + $label_values = array( + 'Fix' => 2, + 'Refactor' => 2, + 'Code Improvement' => 1, + 'Priority: High' => 4, + 'Priority: CRITICAL' => 5, + 'Atmospherics' => 4, + 'Logging' => 1, + 'Feedback' => 1, + 'Performance' => 3, + 'Feature' => -1, + 'Balance/Rebalance' => -1, + 'Tweak' => -1, + 'PRB: Reset' => $startingPRBalance - $oldbalance, + ); + + $affecting = 0; + $is_neutral = FALSE; + $found_something_positive = false; + foreach($labels as $l){ + if($l == 'PRB: No Update') { //no effect on balance + $affecting = 0; + break; + } + else if(isset($label_values[$l])) { + $friendliness = $label_values[$l]; + if($friendliness > 0) + $found_something_positive = true; + $affecting = $found_something_positive ? max($affecting, $friendliness) : $friendliness; + } + } + return $affecting; +} + +function is_maintainer($payload, $author){ + global $maintainer_team_id; + $repo_is_org = $payload['pull_request']['base']['repo']['owner']['type'] == 'Organization'; + if($maintainer_team_id == null || !$repo_is_org) { + $collaburl = $payload['pull_request']['base']['repo']['collaborators_url'] . '/' . $author . '/permissions'; + $perms = json_decode(apisend($collaburl), true); + $permlevel = $perms['permission']; + return $permlevel == 'admin' || $permlevel == 'write'; + } + else { + $check_url = 'https://api.github.com/teams/' . $maintainer_team_id . '/memberships/' . $author; + $result = json_decode(apisend($check_url), true); + return isset($result['state']); //this field won't be here if they aren't a member + } +} + +//payload is a merged pull request, updates the pr balances file with the correct positive or negative balance based on comments +function update_pr_balance($payload) { + global $startingPRBalance; + global $trackPRBalance; + if(!$trackPRBalance) + return; + $author = $payload['pull_request']['user']['login']; + if(is_maintainer($payload, $author)) //immune + return; + $balances = pr_balances(); + if(!isset($balances[$author])) + $balances[$author] = $startingPRBalance; + $friendliness = get_pr_code_friendliness($payload, $balances[$author]); + $balances[$author] += $friendliness; + if($balances[$author] < 0 && $friendliness < 0) + create_comment($payload, 'Your Fix/Feature pull request delta is currently below zero (' . $balances[$author] . '). Maintainers may close future Feature/Tweak/Balance PRs. Fixing issues or helping to improve the codebase will raise this score.'); + else if($balances[$author] >= 0 && ($balances[$author] - $friendliness) < 0) + create_comment($payload, 'Your Fix/Feature pull request delta is now above zero (' . $balances[$author] . '). Feel free to make Feature/Tweak/Balance PRs.'); + $balances_file = fopen(pr_balance_json_path(), 'w'); + fwrite($balances_file, json_encode($balances)); + fclose($balances_file); } function has_tree_been_edited($payload, $tree){ From 770c6a8e5449b9bc5bf8e6716de32b10efcb43f5 Mon Sep 17 00:00:00 2001 From: Lexorion Date: Sat, 9 Sep 2017 03:52:35 +0200 Subject: [PATCH 014/163] New blackbox sprites (#30242) * New blackbox sprites * Changes the blackbox sprite again --- icons/obj/stationobjs.dmi | Bin 56174 -> 58072 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/obj/stationobjs.dmi b/icons/obj/stationobjs.dmi index 28dd158ff78d6a0992bce25ffdb91cf9c604d449..0f4cda5d8bf11c5a952d56492728c4c463c82224 100644 GIT binary patch delta 15857 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 Date: Fri, 8 Sep 2017 22:15:53 -0400 Subject: [PATCH 016/163] [s] Adds a security token to all admin hrefs --- code/__DEFINES/admin.dm | 77 +++ code/controllers/configuration.dm | 4 + code/controllers/subsystem/events.dm | 4 +- code/datums/datumvars.dm | 493 ++++++++++++++++++ code/game/atoms.dm | 8 +- code/game/atoms_movable.dm | 2 +- code/game/objects/objs.dm | 2 +- code/modules/admin/DB_ban/functions.dm | 12 +- code/modules/admin/admin.dm | 258 +++++---- code/modules/admin/create_mob.dm | 28 + code/modules/admin/create_object.dm | 31 +- code/modules/admin/create_turf.dm | 12 + code/modules/admin/holder2.dm | 128 +++++ .../admin/permissionverbs/permissionedit.dm | 10 +- code/modules/admin/player_panel.dm | 144 ++--- code/modules/admin/secrets.dm | 80 ++- code/modules/admin/sql_message_system.dm | 49 +- code/modules/admin/stickyban.dm | 10 +- code/modules/admin/topic.dm | 17 + code/modules/admin/verbs/SDQL2/SDQL_2.dm | 2 +- code/modules/admin/verbs/adminhelp.dm | 18 +- code/modules/admin/verbs/adminsay.dm | 2 +- .../modules/admin/verbs/individual_logging.dm | 12 +- code/modules/admin/verbs/one_click_antag.dm | 14 + code/modules/admin/verbs/randomverbs.dm | 8 +- code/modules/error_handler/error_viewer.dm | 12 +- code/modules/events/spacevine.dm | 4 +- code/modules/mob/living/carbon/carbon.dm | 8 +- code/modules/mob/living/carbon/human/human.dm | 12 +- code/modules/mob/mob.dm | 24 +- code/modules/station_goals/station_goal.dm | 2 +- config/config.txt | 6 + 32 files changed, 1166 insertions(+), 327 deletions(-) diff --git a/code/__DEFINES/admin.dm b/code/__DEFINES/admin.dm index 26a1535e33..00d81fe7c7 100644 --- a/code/__DEFINES/admin.dm +++ b/code/__DEFINES/admin.dm @@ -1,3 +1,4 @@ +<<<<<<< HEAD //A set of constants used to determine which type of mute an admin wishes to apply: //Please read and understand the muting/automuting stuff before changing these. MUTE_IC_AUTO etc = (MUTE_IC << 1) //Therefore there needs to be a gap between the flags_1 for the automute flags_1 @@ -72,3 +73,79 @@ #define AHELP_ACTIVE 1 #define AHELP_CLOSED 2 #define AHELP_RESOLVED 3 +======= +//A set of constants used to determine which type of mute an admin wishes to apply: +//Please read and understand the muting/automuting stuff before changing these. MUTE_IC_AUTO etc = (MUTE_IC << 1) +//Therefore there needs to be a gap between the flags for the automute flags +#define MUTE_IC 1 +#define MUTE_OOC 2 +#define MUTE_PRAY 4 +#define MUTE_ADMINHELP 8 +#define MUTE_DEADCHAT 16 +#define MUTE_ALL 31 + +//Some constants for DB_Ban +#define BANTYPE_PERMA 1 +#define BANTYPE_TEMP 2 +#define BANTYPE_JOB_PERMA 3 +#define BANTYPE_JOB_TEMP 4 +#define BANTYPE_ANY_FULLBAN 5 //used to locate stuff to unban. + +#define BANTYPE_ADMIN_PERMA 7 +#define BANTYPE_ADMIN_TEMP 8 +#define BANTYPE_ANY_JOB 9 //used to remove jobbans + +//Please don't edit these values without speaking to Errorage first ~Carn +//Admin Permissions +#define R_BUILDMODE 1 +#define R_ADMIN 2 +#define R_BAN 4 +#define R_FUN 8 +#define R_SERVER 16 +#define R_DEBUG 32 +#define R_POSSESS 64 +#define R_PERMISSIONS 128 +#define R_STEALTH 256 +#define R_POLL 512 +#define R_VAREDIT 1024 +#define R_SOUNDS 2048 +#define R_SPAWN 4096 + +#if DM_VERSION > 512 +#error Remove the flag below , its been long enough +#endif +//legacy , remove post 512, it was replaced by R_POLL +#define R_REJUVINATE 2 + +#define R_MAXPERMISSION 4096 //This holds the maximum value for a permission. It is used in iteration, so keep it updated. + +#define ADMIN_QUE(user) "(?)" +#define ADMIN_FLW(user) "(FLW)" +#define ADMIN_PP(user) "(PP)" +#define ADMIN_VV(atom) "(VV)" +#define ADMIN_SM(user) "(SM)" +#define ADMIN_TP(user) "(TP)" +#define ADMIN_KICK(user) "(KICK)" +#define ADMIN_CENTCOM_REPLY(user) "(RPLY)" +#define ADMIN_SYNDICATE_REPLY(user) "(RPLY)" +#define ADMIN_SC(user) "(SC)" +#define ADMIN_SMITE(user) "(SMITE)" +#define ADMIN_LOOKUP(user) "[key_name_admin(user)][ADMIN_QUE(user)]" +#define ADMIN_LOOKUPFLW(user) "[key_name_admin(user)][ADMIN_QUE(user)] [ADMIN_FLW(user)]" +#define ADMIN_SET_SD_CODE "(SETCODE)" +#define ADMIN_FULLMONTY_NONAME(user) "[ADMIN_QUE(user)] [ADMIN_PP(user)] [ADMIN_VV(user)] [ADMIN_SM(user)] [ADMIN_FLW(user)] [ADMIN_TP(user)] [ADMIN_INDIVIDUALLOG(user)] [ADMIN_SMITE(user)]" +#define ADMIN_FULLMONTY(user) "[key_name_admin(user)] [ADMIN_FULLMONTY_NONAME(user)]" +#define ADMIN_JMP(src) "(JMP)" +#define COORD(src) "[src ? "([src.x],[src.y],[src.z])" : "nonexistent location"]" +#define ADMIN_COORDJMP(src) "[src ? "[COORD(src)] [ADMIN_JMP(src)]" : "nonexistent location"]" +#define ADMIN_INDIVIDUALLOG(user) "(LOGS)" + +#define ADMIN_PUNISHMENT_LIGHTNING "Lightning bolt" +#define ADMIN_PUNISHMENT_BRAINDAMAGE "Brain damage" +#define ADMIN_PUNISHMENT_GIB "Gib" +#define ADMIN_PUNISHMENT_BSA "Bluespace Artillery Device" + +#define AHELP_ACTIVE 1 +#define AHELP_CLOSED 2 +#define AHELP_RESOLVED 3 +>>>>>>> 84b1e3d... [s] Adds a security token to all admin hrefs (#29839) diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm index 1d853c332b..e430ecb337 100644 --- a/code/controllers/configuration.dm +++ b/code/controllers/configuration.dm @@ -278,6 +278,8 @@ GLOBAL_PROTECT(config_dir) var/list/policies = list() + var/debug_admin_hrefs = FALSE //turns off admin href token protection for debugging purposes + /datum/configuration/New() gamemode_cache = typecacheof(/datum/game_mode,TRUE) for(var/T in gamemode_cache) @@ -559,6 +561,8 @@ GLOBAL_PROTECT(config_dir) error_msg_delay = text2num(value) if("irc_announce_new_game") irc_announce_new_game = TRUE + if("debug_admin_hrefs") + debug_admin_hrefs = TRUE else #if DM_VERSION > 511 #error Replace the line below with WRITE_FILE(GLOB.config_error_log, "Unknown setting in configuration: '[name]'") diff --git a/code/controllers/subsystem/events.dm b/code/controllers/subsystem/events.dm index c41f422575..7816a6bdf8 100644 --- a/code/controllers/subsystem/events.dm +++ b/code/controllers/subsystem/events.dm @@ -116,6 +116,8 @@ SUBSYSTEM_DEF(events) //allows a client to trigger an event //aka Badmin Central +// > Not in modules/admin +// REEEEEEEEE /client/proc/forceEvent() set name = "Trigger Event" set category = "Fun" @@ -131,7 +133,7 @@ SUBSYSTEM_DEF(events) var/magic = "" var/holiday = "" for(var/datum/round_event_control/E in SSevents.control) - dat = "
    [E]" + dat = "
    [E]" if(E.holidayID) holiday += dat else if(E.wizardevent) diff --git a/code/datums/datumvars.dm b/code/datums/datumvars.dm index 87c6ad7334..44661316ab 100644 --- a/code/datums/datumvars.dm +++ b/code/datums/datumvars.dm @@ -22,6 +22,7 @@ //please call . = ..() first and append to the result, that way parent items are always at the top and child items are further down //add separaters by doing . += "---" +<<<<<<< HEAD /datum/proc/vv_get_dropdown() . = list() . += "---" @@ -62,6 +63,49 @@ +======= +/datum/proc/vv_get_dropdown() + . = list() + . += "---" + .["Call Proc"] = "?_src_=vars;[HrefToken()];proc_call=\ref[src]" + .["Mark Object"] = "?_src_=vars;[HrefToken()];mark_object=\ref[src]" + .["Delete"] = "?_src_=vars;[HrefToken()];delete=\ref[src]" + .["Show VV To Player"] = "?_src_=vars;[HrefToken(TRUE)];expose=\ref[src]" + + +/datum/proc/on_reagent_change() + return + + +/client/proc/debug_variables(datum/D in world) + set category = "Debug" + set name = "View Variables" + //set src in world + var/static/cookieoffset = rand(1, 9999) //to force cookies to reset after the round. + + if(!usr.client || !usr.client.holder) //The usr vs src abuse in this proc is intentional and must not be changed + to_chat(usr, "You need to be an administrator to access this.") + return + + if(!D) + return + + var/islist = islist(D) + if (!islist && !istype(D)) + return + + var/title = "" + var/refid = "\ref[D]" + var/icon/sprite + var/hash + + var/type = /list + if (!islist) + type = D.type + + + +>>>>>>> 84b1e3d... [s] Adds a security token to all admin hrefs (#29839) if(istype(D, /atom)) var/atom/AT = D if(AT.icon && AT.icon_state) @@ -78,6 +122,7 @@ var/list/atomsnowflake = list() if(istype(D, /atom)) +<<<<<<< HEAD var/atom/A = D if(isliving(A)) atomsnowflake += "[D]" @@ -485,6 +530,415 @@ if(!check_rights(0)) return +======= + var/atom/A = D + if(isliving(A)) + atomsnowflake += "[D]" + if(A.dir) + atomsnowflake += "
    << [dir2text(A.dir)] >>" + var/mob/living/M = A + atomsnowflake += {" +
    [M.ckey ? M.ckey : "No ckey"] / [M.real_name ? M.real_name : "No real name"] +
    + BRUTE:[M.getBruteLoss()] + FIRE:[M.getFireLoss()] + TOXIN:[M.getToxLoss()] + OXY:[M.getOxyLoss()] + CLONE:[M.getCloneLoss()] + BRAIN:[M.getBrainLoss()] + STAMINA:[M.getStaminaLoss()] + + "} + else + atomsnowflake += "[D]" + if(A.dir) + atomsnowflake += "
    << [dir2text(A.dir)] >>" + else + atomsnowflake += "[D]" + + var/formatted_type = "[type]" + if(length(formatted_type) > 25) + var/middle_point = length(formatted_type) / 2 + var/splitpoint = findtext(formatted_type,"/",middle_point) + if(splitpoint) + formatted_type = "[copytext(formatted_type,1,splitpoint)]
    [copytext(formatted_type,splitpoint)]" + else + formatted_type = "Type too long" //No suitable splitpoint (/) found. + + var/marked + if(holder && holder.marked_datum && holder.marked_datum == D) + marked = "
    Marked Object" + var/varedited_line = "" + if(!islist && D.var_edited) + varedited_line = "
    Var Edited" + + var/list/dropdownoptions = list() + if (islist) + dropdownoptions = list( + "---", + "Add Item" = "?_src_=vars;[HrefToken()];listadd=[refid]", + "Remove Nulls" = "?_src_=vars;[HrefToken()];listnulls=[refid]", + "Remove Dupes" = "?_src_=vars;[HrefToken()];listdupes=[refid]", + "Set len" = "?_src_=vars;[HrefToken()];listlen=[refid]", + "Shuffle" = "?_src_=vars;[HrefToken()];listshuffle=[refid]", + "Show VV To Player" = "?_src_=vars;[HrefToken()];expose=[refid]" + ) + else + dropdownoptions = D.vv_get_dropdown() + var/list/dropdownoptions_html = list() + + for (var/name in dropdownoptions) + var/link = dropdownoptions[name] + if (link) + dropdownoptions_html += "" + else + dropdownoptions_html += "" + + var/list/names = list() + if (!islist) + for (var/V in D.vars) + names += V + sleep(1)//For some reason, without this sleep, VVing will cause client to disconnect on certain objects. + + var/list/variable_html = list() + if (islist) + var/list/L = D + for (var/i in 1 to L.len) + var/key = L[i] + var/value + if (IS_NORMAL_LIST(L) && !isnum(key)) + value = L[key] + variable_html += debug_variable(i, value, 0, D) + else + + names = sortList(names) + for (var/V in names) + if(D.can_vv_get(V)) + variable_html += D.vv_get_var(V) + + var/html = {" + + + [title] + + + + +
    + + + + + +
    + + + + +
    + [sprite_text] +
    + [atomsnowflake.Join()] +
    +
    +
    + [formatted_type] + [marked] + [varedited_line] +
    +
    +
    + Refresh +
    + +
    +
    +
    +
    +
    + + E - Edit, tries to determine the variable type by itself.
    + C - Change, asks you for the var type first.
    + M - Mass modify: changes this variable for all objects of this type.
    +
    +
    + + + + + +
    +
    + Search: +
    +
    + +
    +
    +
      + [variable_html.Join()] +
    + + + +"} + src << browse(html, "window=variables[refid];size=475x650") + + +#define VV_HTML_ENCODE(thing) ( sanitize ? html_encode(thing) : thing ) +/proc/debug_variable(name, value, level, datum/DA = null, sanitize = TRUE) + var/header + if(DA) + if (islist(DA)) + var/index = name + if (value) + name = DA[name] //name is really the index until this line + else + value = DA[name] + header = "
  • (E) (C) (-) " + else + header = "
  • (E) (C) (M) " + else + header = "
  • " + + var/item + if (isnull(value)) + item = "[VV_HTML_ENCODE(name)] = null" + + else if (istext(value)) + item = "[VV_HTML_ENCODE(name)] = \"[VV_HTML_ENCODE(value)]\"" + + else if (isicon(value)) + #ifdef VARSICON + var/icon/I = new/icon(value) + var/rnd = rand(1,10000) + var/rname = "tmp\ref[I][rnd].png" + usr << browse_rsc(I, rname) + item = "[VV_HTML_ENCODE(name)] = ([value]) " + #else + item = "[VV_HTML_ENCODE(name)] = /icon ([value])" + #endif + +/* else if (istype(value, /image)) + #ifdef VARSICON + var/rnd = rand(1, 10000) + var/image/I = value + + src << browse_rsc(I.icon, "tmp\ref[value][rnd].png") + html += "[name] = " + #else + html += "[name] = /image ([value])" + #endif +*/ + else if (isfile(value)) + item = "[VV_HTML_ENCODE(name)] = '[value]'" + + //else if (istype(value, /client)) + // var/client/C = value + // item = "[VV_HTML_ENCODE(name)] \ref[value] = [C] [C.type]" + + else if (istype(value, /datum)) + var/datum/D = value + if ("[D]" != "[D.type]") //if the thing as a name var, lets use it. + item = "[VV_HTML_ENCODE(name)] \ref[value] = [D] [D.type]" + else + item = "[VV_HTML_ENCODE(name)] \ref[value] = [D.type]" + + else if (islist(value)) + var/list/L = value + var/list/items = list() + + if (L.len > 0 && !(name == "underlays" || name == "overlays" || L.len > (IS_NORMAL_LIST(L) ? 50 : 150))) + for (var/i in 1 to L.len) + var/key = L[i] + var/val + if (IS_NORMAL_LIST(L) && !isnum(key)) + val = L[key] + if (!val) + val = key + key = i + + items += debug_variable(key, val, level + 1, sanitize = sanitize) + + item = "[VV_HTML_ENCODE(name)] = /list ([L.len])
      [items.Join()]
    " + else + item = "[VV_HTML_ENCODE(name)] = /list ([L.len])" + + else + item = "[VV_HTML_ENCODE(name)] = [VV_HTML_ENCODE(value)]" + + return "[header][item]
  • " + +#undef VV_HTML_ENCODE + +/client/proc/view_var_Topic(href, href_list, hsrc) + if( (usr.client != src) || !src.holder || !holder.CheckAdminHref(href, href_list)) + return + if(href_list["Vars"]) + debug_variables(locate(href_list["Vars"])) + + else if(href_list["datumrefresh"]) + var/datum/DAT = locate(href_list["datumrefresh"]) + if(!DAT) //can't be an istype() because /client etc aren't datums + return + src.debug_variables(DAT) + + else if(href_list["mob_player_panel"]) + if(!check_rights(0)) + return + +>>>>>>> 84b1e3d... [s] Adds a security token to all admin hrefs (#29839) var/mob/M = locate(href_list["mob_player_panel"]) in GLOB.mob_list if(!istype(M)) to_chat(usr, "This can only be used on instances of type /mob") @@ -541,6 +995,7 @@ return var/mob/M = locate(href_list["regenerateicons"]) in GLOB.mob_list +<<<<<<< HEAD if(!ismob(M)) to_chat(usr, "This can only be done to instances of type /mob") return @@ -557,6 +1012,44 @@ if(!check_rights(0)) return +======= + if(!ismob(M)) + to_chat(usr, "This can only be done to instances of type /mob") + return + M.regenerate_icons() + else if(href_list["expose"]) + if(!check_rights(R_ADMIN, FALSE)) + return + var/thing = locate(href_list["expose"]) + if (!thing) + return + var/value = vv_get_value(VV_CLIENT) + if (value["class"] != VV_CLIENT) + return + var/client/C = value["value"] + if (!C) + return + var/prompt = alert("Do you want to grant [C] access to view this VV window? (they will not be able to edit or change anything nor open nested vv windows unless they themselves are an admin)", "Confirm", "Yes", "No") + if (prompt != "Yes" || !usr.client) + return + message_admins("[key_name_admin(usr)] Showed [key_name_admin(C)] a VV window") + log_admin("Admin [key_name(usr)] Showed [key_name(C)] a VV window of a [thing]") + to_chat(C, "[usr.client.holder.fakekey ? "an Administrator" : "[usr.client.key]"] has granted you access to view a View Variables window") + C.debug_variables(thing) + + +//Needs +VAREDIT past this point + + else if(check_rights(R_VAREDIT)) + + + //~CARN: for renaming mobs (updates their name, real_name, mind.name, their ID/PDA and datacore records). + + if(href_list["rename"]) + if(!check_rights(0)) + return + +>>>>>>> 84b1e3d... [s] Adds a security token to all admin hrefs (#29839) var/mob/M = locate(href_list["rename"]) in GLOB.mob_list if(!istype(M)) to_chat(usr, "This can only be used on instances of type /mob") diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 77bcefeddf..049d9bf838 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -613,10 +613,10 @@ GLOBAL_LIST_EMPTY(blood_splatter_icons) . += "---" var/turf/curturf = get_turf(src) if (curturf) - .["Jump to"] = "?_src_=holder;adminplayerobservecoodjump=1;X=[curturf.x];Y=[curturf.y];Z=[curturf.z]" - .["Add reagent"] = "?_src_=vars;addreagent=\ref[src]" - .["Trigger EM pulse"] = "?_src_=vars;emp=\ref[src]" - .["Trigger explosion"] = "?_src_=vars;explode=\ref[src]" + .["Jump to"] = "?_src_=holder;[HrefToken()];adminplayerobservecoodjump=1;X=[curturf.x];Y=[curturf.y];Z=[curturf.z]" + .["Add reagent"] = "?_src_=vars;[HrefToken()];addreagent=\ref[src]" + .["Trigger EM pulse"] = "?_src_=vars;[HrefToken()];emp=\ref[src]" + .["Trigger explosion"] = "?_src_=vars;[HrefToken()];explode=\ref[src]" /atom/proc/drop_location() var/atom/L = loc diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index f4cbcda098..e8c30f1fcc 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -497,7 +497,7 @@ /atom/movable/vv_get_dropdown() . = ..() . -= "Jump to" - .["Follow"] = "?_src_=holder;adminplayerobservefollow=\ref[src]" + .["Follow"] = "?_src_=holder;[HrefToken()];adminplayerobservefollow=\ref[src]" /atom/movable/proc/ex_check(ex_id) if(!ex_id) diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index 1f3668f283..568921cfbf 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -198,7 +198,7 @@ /obj/vv_get_dropdown() . = ..() - .["Delete all of type"] = "?_src_=vars;delall=\ref[src]" + .["Delete all of type"] = "?_src_=vars;[HrefToken()];delall=\ref[src]" /obj/examine(mob/user) ..() diff --git a/code/modules/admin/DB_ban/functions.dm b/code/modules/admin/DB_ban/functions.dm index e580b306b3..c6f44fd1da 100644 --- a/code/modules/admin/DB_ban/functions.dm +++ b/code/modules/admin/DB_ban/functions.dm @@ -414,7 +414,7 @@ if(bancount > bansperpage) output += "
    Page: " while(bancount > 0) - output+= "|[pagecount == page ? "\[[pagecount]\]" : "\[[pagecount]\]"]" + output+= "|[pagecount == page ? "\[[pagecount]\]" : "\[[pagecount]\]"]" bancount -= bansperpage pagecount++ output += "|" @@ -462,25 +462,25 @@ if("PERMABAN") typedesc = "PERMABAN" if("TEMPBAN") - typedesc = "TEMPBAN
    ([duration] minutes [(unbanned) ? "" : "(Edit))"]
    Expires [expiration]
    " + typedesc = "TEMPBAN
    ([duration] minutes [(unbanned) ? "" : "(Edit))"]
    Expires [expiration]
    " if("JOB_PERMABAN") typedesc = "JOBBAN
    ([job])" if("JOB_TEMPBAN") - typedesc = "TEMP JOBBAN
    ([job])
    ([duration] minutes [(unbanned) ? "" : "(Edit))"]
    Expires [expiration]" + typedesc = "TEMP JOBBAN
    ([job])
    ([duration] minutes [(unbanned) ? "" : "(Edit))"]
    Expires [expiration]" if("ADMIN_PERMABAN") typedesc = "ADMIN PERMABAN" if("ADMIN_TEMPBAN") - typedesc = "ADMIN TEMPBAN
    ([duration] minutes [(unbanned) ? "" : "(Edit))"]
    Expires [expiration]
    " + typedesc = "ADMIN TEMPBAN
    ([duration] minutes [(unbanned) ? "" : "(Edit))"]
    Expires [expiration]
    " output += "" output += "[typedesc]" output += "[ckey]" output += "[bantime]" output += "[ackey]" - output += "[(unbanned) ? "" : "Unban"]" + output += "[(unbanned) ? "" : "Unban"]" output += "" output += "" - output += "Reason: [(unbanned) ? "" : "(Edit)"] \"[reason]\"" + output += "Reason: [(unbanned) ? "" : "(Edit)"] \"[reason]\"" output += "" if(edits) output += "" diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index b88451b724..392d361773 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -30,68 +30,68 @@ body += "Options panel for [M]" if(M.client) body += " played by [M.client] " - body += "\[[M.client.holder ? M.client.holder.rank : "Player"]\]" + body += "\[[M.client.holder ? M.client.holder.rank : "Player"]\]" if(config.use_exp_tracking) - body += "\[" + M.client.get_exp_living() + "\]" + body += "\[" + M.client.get_exp_living() + "\]" if(isnewplayer(M)) body += " Hasn't Entered Game " else - body += " \[Heal\] " + body += " \[Heal\] " if(M.client) body += "
    \[First Seen: [M.client.player_join_date]\]\[Byond account registered on: [M.client.account_join_date]\]" body += "

    Show related accounts by: " - body += "\[ CID | " - body += "IP \]" + body += "\[ CID | " + body += "IP \]" body += "

    \[ " - body += "VV - " - body += "TP - " + body += "VV - " + body += "TP - " body += "PM - " - body += "SM - " - body += "FLW - " - body += "LOGS\]
    " + body += "SM - " + body += "FLW - " + body += "LOGS\]
    " body += "Mob type = [M.type]

    " - body += "Kick | " - body += "Ban | " - body += "Jobban | " - body += "Identity Ban | " + body += "Kick | " + body += "Ban | " + body += "Jobban | " + body += "Identity Ban | " if(jobban_isbanned(M, "OOC")) - body+= "OOCBan | " + body+= "OOCBan | " else - body+= "OOCBan | " + body+= "OOCBan | " if(jobban_isbanned(M, "emote")) - body+= "EmoteBan | " + body+= "EmoteBan | " else - body+= "Emoteban | " + body+= "Emoteban | " - body += "Notes | Messages | Watchlist | " + body += "Notes | Messages | Watchlist | " if(M.client) - body += "| Prison | " - body += "\ Send back to Lobby | " + body += "| Prison | " + body += "\ Send back to Lobby | " var/muted = M.client.prefs.muted body += "
    Mute: " - body += "\[IC | " - body += "OOC | " - body += "PRAY | " - body += "ADMINHELP | " - body += "DEADCHAT\]" - body += "(toggle all)" + body += "\[IC | " + body += "OOC | " + body += "PRAY | " + body += "ADMINHELP | " + body += "DEADCHAT\]" + body += "(toggle all)" body += "

    " - body += "Jump to | " - body += "Get | " - body += "Send To" + body += "Jump to | " + body += "Get | " + body += "Send To" body += "

    " - body += "Traitor panel | " - body += "Narrate to | " - body += "Subtle message | " - body += "Language Menu" + body += "Traitor panel | " + body += "Narrate to | " + body += "Subtle message | " + body += "Language Menu" if (M.client) if(!isnewplayer(M)) @@ -103,73 +103,71 @@ if(ishuman(M)) body += "Human | " else - body += "Humanize | " + body += "Humanize | " //Monkey if(ismonkey(M)) body += "Monkeyized | " else - body += "Monkeyize | " + body += "Monkeyize | " //Corgi if(iscorgi(M)) body += "Corgized | " else - body += "Corgize | " + body += "Corgize | " //AI / Cyborg if(isAI(M)) body += "Is an AI " else if(ishuman(M)) - body += "Make AI | " - body += "Make Robot | " - body += "Make Alien | " - body += "Make Slime | " - body += "Make Blob | " + body += "Make AI | " + body += "Make Robot | " + body += "Make Alien | " + body += "Make Slime | " + body += "Make Blob | " //Simple Animals if(isanimal(M)) - body += "Re-Animalize | " + body += "Re-Animalize | " else - body += "Animalize | " + body += "Animalize | " body += "

    " body += "Rudimentary transformation:
    These transformations only create a new mob type and copy stuff over. They do not take into account MMIs and similar mob-specific things. The buttons in 'Transformations' are preferred, when possible.

    " - body += "Observer | " - body += "\[ Alien: Drone, " - body += "Hunter, " - body += "Sentinel, " - body += "Praetorian, " - body += "Queen, " - body += "Larva \] " - body += "Human " - body += "\[ slime: Baby, " - body += "Adult \] " - body += "Monkey | " - body += "Cyborg | " - body += "Cat | " - body += "Runtime | " - body += "Corgi | " - body += "Ian | " - body += "Crab | " - body += "Coffee | " - //body += "Parrot | " - //body += "Poly | " - body += "\[ Construct: Juggernaut , " - body += "Artificer , " - body += "Wraith \] " - body += "Shade" + body += "Observer | " + body += "\[ Alien: Drone, " + body += "Hunter, " + body += "Sentinel, " + body += "Praetorian, " + body += "Queen, " + body += "Larva \] " + body += "Human " + body += "\[ slime: Baby, " + body += "Adult \] " + body += "Monkey | " + body += "Cyborg | " + body += "Cat | " + body += "Runtime | " + body += "Corgi | " + body += "Ian | " + body += "Crab | " + body += "Coffee | " + body += "\[ Construct: Juggernaut , " + body += "Artificer , " + body += "Wraith \] " + body += "Shade" body += "
    " if (M.client) body += "

    " body += "Other actions:" body += "
    " - body += "Forcesay | " - body += "Thunderdome 1 | " - body += "Thunderdome 2 | " - body += "Thunderdome Admin | " - body += "Thunderdome Observer | " + body += "Forcesay | " + body += "Thunderdome 1 | " + body += "Thunderdome 2 | " + body += "Thunderdome Admin | " + body += "Thunderdome Observer | " body += "
    " body += "" @@ -197,19 +195,19 @@ dat += "
    Feed channels and stories entered through here will be uneditable and handled as official news by the rest of the units." dat += "
    Note that this panel allows full freedom over the news network, there are no constrictions except the few basic ones. Don't break things!
    " if(GLOB.news_network.wanted_issue.active) - dat+= "
    Read Wanted Issue" - dat+= "

    Create Feed Channel" - dat+= "
    View Feed Channels" - dat+= "
    Submit new Feed story" - dat+= "

    Exit" + dat+= "
    Read Wanted Issue" + dat+= "

    Create Feed Channel" + dat+= "
    View Feed Channels" + dat+= "
    Submit new Feed story" + dat+= "

    Exit" var/wanted_already = 0 if(GLOB.news_network.wanted_issue.active) wanted_already = 1 dat+="
    Feed Security functions:
    " - dat+="
    [(wanted_already) ? ("Manage") : ("Publish")] \"Wanted\" Issue" - dat+="
    Censor Feed Stories" - dat+="
    Mark Feed Channel with Nanotrasen D-Notice (disables and locks the channel)." - dat+="

    The newscaster recognises you as:
    [src.admin_signature]
    " + dat+="
    [(wanted_already) ? ("Manage") : ("Publish")] \"Wanted\" Issue" + dat+="
    Censor Feed Stories" + dat+="
    Mark Feed Channel with Nanotrasen D-Notice (disables and locks the channel)." + dat+="

    The newscaster recognises you as:
    [src.admin_signature]
    " if(1) dat+= "Station Feed Channels
    " if( isemptylist(GLOB.news_network.network_channels) ) @@ -219,34 +217,34 @@ if(CHANNEL.is_admin_channel) dat+="[CHANNEL.channel_name]
    " else - dat+="[CHANNEL.channel_name] [(CHANNEL.censored) ? ("***") : ()]
    " - dat+="

    Refresh" - dat+="
    Back" + dat+="[CHANNEL.channel_name] [(CHANNEL.censored) ? ("***") : ()]
    " + dat+="

    Refresh" + dat+="
    Back" if(2) dat+="Creating new Feed Channel..." - dat+="
    Channel Name: [src.admincaster_feed_channel.channel_name]
    " - dat+="Channel Author: [src.admin_signature]
    " - dat+="Will Accept Public Feeds: [(src.admincaster_feed_channel.locked) ? ("NO") : ("YES")]

    " - dat+="
    Submit

    Cancel
    " + dat+="
    Channel Name: [src.admincaster_feed_channel.channel_name]
    " + dat+="Channel Author: [src.admin_signature]
    " + dat+="Will Accept Public Feeds: [(src.admincaster_feed_channel.locked) ? ("NO") : ("YES")]

    " + dat+="
    Submit

    Cancel
    " if(3) dat+="Creating new Feed Message..." - dat+="
    Receiving Channel: [src.admincaster_feed_channel.channel_name]
    " //MARK + dat+="
    Receiving Channel: [src.admincaster_feed_channel.channel_name]
    " //MARK dat+="Message Author: [src.admin_signature]
    " - dat+="Message Body: [src.admincaster_feed_message.returnBody(-1)]
    " - dat+="
    Submit

    Cancel
    " + dat+="Message Body: [src.admincaster_feed_message.returnBody(-1)]
    " + dat+="
    Submit

    Cancel
    " if(4) dat+="Feed story successfully submitted to [src.admincaster_feed_channel.channel_name].

    " - dat+="
    Return
    " + dat+="
    Return
    " if(5) dat+="Feed Channel [src.admincaster_feed_channel.channel_name] created successfully.

    " - dat+="
    Return
    " + dat+="
    Return
    " if(6) dat+="ERROR: Could not submit Feed story to Network.

    " if(src.admincaster_feed_channel.channel_name=="") dat+="•Invalid receiving channel name.
    " if(src.admincaster_feed_message.returnBody(-1) == "" || src.admincaster_feed_message.returnBody(-1) == "\[REDACTED\]") dat+="•Invalid message body.
    " - dat+="
    Return
    " + dat+="
    Return
    " if(7) dat+="ERROR: Could not submit Feed Channel to Network.

    " if(src.admincaster_feed_channel.channel_name =="" || src.admincaster_feed_channel.channel_name == "\[REDACTED\]") @@ -258,7 +256,7 @@ break if(check) dat+="•Channel name already in use.
    " - dat+="
    Return
    " + dat+="
    Return
    " if(9) dat+="[admincaster_feed_channel.channel_name]: \[created by: [admincaster_feed_channel.returnAuthor(-1)]\]
    " if(src.admincaster_feed_channel.censored) @@ -280,8 +278,8 @@ for(var/datum/newscaster/feed_comment/comment in MESSAGE.comments) dat+="[comment.body]
    [comment.author] [comment.time_stamp]
    " dat+="
    " - dat+="

    Refresh" - dat+="
    Back" + dat+="

    Refresh" + dat+="
    Back" if(10) dat+="Nanotrasen Feed Censorship Tool
    " dat+="NOTE: Due to the nature of news Feeds, total deletion of a Feed Story is not possible.
    " @@ -291,8 +289,8 @@ dat+="No feed channels found active...
    " else for(var/datum/newscaster/feed_channel/CHANNEL in GLOB.news_network.network_channels) - dat+="[CHANNEL.channel_name] [(CHANNEL.censored) ? ("***") : ()]
    " - dat+="
    Cancel" + dat+="[CHANNEL.channel_name] [(CHANNEL.censored) ? ("***") : ()]
    " + dat+="
    Cancel" if(11) dat+="Nanotrasen D-Notice Handler
    " dat+="A D-Notice is to be bestowed upon the channel if the handling Authority deems it as harmful for the station's" @@ -302,26 +300,26 @@ dat+="No feed channels found active...
    " else for(var/datum/newscaster/feed_channel/CHANNEL in GLOB.news_network.network_channels) - dat+="[CHANNEL.channel_name] [(CHANNEL.censored) ? ("***") : ()]
    " + dat+="[CHANNEL.channel_name] [(CHANNEL.censored) ? ("***") : ()]
    " - dat+="
    Back" + dat+="
    Back" if(12) dat+="[src.admincaster_feed_channel.channel_name]: \[ created by: [src.admincaster_feed_channel.returnAuthor(-1)] \]
    " - dat+="[(src.admincaster_feed_channel.authorCensor) ? ("Undo Author censorship") : ("Censor channel Author")]
    " + dat+="[(src.admincaster_feed_channel.authorCensor) ? ("Undo Author censorship") : ("Censor channel Author")]
    " if( isemptylist(src.admincaster_feed_channel.messages) ) dat+="No feed messages found in channel...
    " else for(var/datum/newscaster/feed_message/MESSAGE in src.admincaster_feed_channel.messages) dat+="-[MESSAGE.returnBody(-1)]
    \[Story by [MESSAGE.returnAuthor(-1)]\]
    " - dat+="[(MESSAGE.bodyCensor) ? ("Undo story censorship") : ("Censor story")] - [(MESSAGE.authorCensor) ? ("Undo Author Censorship") : ("Censor message Author")]
    " - dat+="[MESSAGE.comments.len] comment[MESSAGE.comments.len > 1 ? "s" : ""]: [MESSAGE.locked ? "Unlock" : "Lock"]
    " + dat+="[(MESSAGE.bodyCensor) ? ("Undo story censorship") : ("Censor story")] - [(MESSAGE.authorCensor) ? ("Undo Author Censorship") : ("Censor message Author")]
    " + dat+="[MESSAGE.comments.len] comment[MESSAGE.comments.len > 1 ? "s" : ""]: [MESSAGE.locked ? "Unlock" : "Lock"]
    " for(var/datum/newscaster/feed_comment/comment in MESSAGE.comments) - dat+="[comment.body] X
    [comment.author] [comment.time_stamp]
    " - dat+="
    Back" + dat+="[comment.body] X
    [comment.author] [comment.time_stamp]
    " + dat+="
    Back" if(13) dat+="[src.admincaster_feed_channel.channel_name]: \[ created by: [src.admincaster_feed_channel.returnAuthor(-1)] \]
    " - dat+="Channel messages listed below. If you deem them dangerous to the station, you can Bestow a D-Notice upon the channel.
    " + dat+="Channel messages listed below. If you deem them dangerous to the station, you can Bestow a D-Notice upon the channel.
    " if(src.admincaster_feed_channel.censored) dat+="ATTENTION: This channel has been deemed as threatening to the welfare of the station, and marked with a Nanotrasen D-Notice.
    " dat+="No further feed story additions are allowed while the D-Notice is in effect.


    " @@ -331,7 +329,7 @@ else for(var/datum/newscaster/feed_message/MESSAGE in src.admincaster_feed_channel.messages) dat+="-[MESSAGE.returnBody(-1)]
    \[Story by [MESSAGE.returnAuthor(-1)]\]
    " - dat+="
    Back" + dat+="
    Back" if(14) dat+="Wanted Issue Handler:" var/wanted_already = 0 @@ -342,29 +340,29 @@ if(wanted_already) dat+="
    A wanted issue is already in Feed Circulation. You can edit or cancel it below.
    " dat+="
    " - dat+="Criminal Name: [src.admincaster_wanted_message.criminal]
    " - dat+="Description: [src.admincaster_wanted_message.body]
    " + dat+="Criminal Name: [src.admincaster_wanted_message.criminal]
    " + dat+="Description: [src.admincaster_wanted_message.body]
    " if(wanted_already) dat+="Wanted Issue created by:[GLOB.news_network.wanted_issue.scannedUser]
    " else dat+="Wanted Issue will be created under prosecutor:[src.admin_signature]
    " - dat+="
    [(wanted_already) ? ("Edit Issue") : ("Submit")]" + dat+="
    [(wanted_already) ? ("Edit Issue") : ("Submit")]" if(wanted_already) - dat+="
    Take down Issue" - dat+="
    Cancel" + dat+="
    Take down Issue" + dat+="
    Cancel" if(15) dat+="Wanted issue for [src.admincaster_wanted_message.criminal] is now in Network Circulation.

    " - dat+="
    Return
    " + dat+="
    Return
    " if(16) dat+="ERROR: Wanted Issue rejected by Network.

    " if(src.admincaster_wanted_message.criminal =="" || src.admincaster_wanted_message.criminal == "\[REDACTED\]") dat+="•Invalid name for person wanted.
    " if(src.admincaster_wanted_message.body == "" || src.admincaster_wanted_message.body == "\[REDACTED\]") dat+="•Invalid description.
    " - dat+="
    Return
    " + dat+="
    Return
    " if(17) dat+="Wanted Issue successfully deleted from Circulation
    " - dat+="
    Return
    " + dat+="
    Return
    " if(18) dat+="-- STATIONWIDE WANTED ISSUE --
    \[Submitted by: [GLOB.news_network.wanted_issue.scannedUser]\]
    " dat+="Criminal: [GLOB.news_network.wanted_issue.criminal]
    " @@ -375,10 +373,10 @@ dat+="
    " else dat+="None" - dat+="
    Back
    " + dat+="
    Back
    " if(19) dat+="Wanted issue for [src.admincaster_wanted_message.criminal] successfully edited.

    " - dat+="
    Return
    " + dat+="
    Return
    " else dat+="I'm sorry to break your immersion. This shit's bugged. Report this bug to Agouri, polyxenitopalidou@gmail.com" @@ -394,21 +392,21 @@ var/dat = {"
    Game Panel

    \n - Change Game Mode
    + Change Game Mode
    "} if(GLOB.master_mode == "secret") - dat += "(Force Secret Mode)
    " + dat += "(Force Secret Mode)
    " dat += {"
    - Create Object
    - Quick Create Object
    - Create Turf
    - Create Mob
    + Create Object
    + Quick Create Object
    + Create Turf
    + Create Mob
    "} if(marked_datum && istype(marked_datum, /atom)) - dat += "Duplicate Marked Datum
    " + dat += "Duplicate Marked Datum
    " usr << browse(dat, "window=admin2;size=210x200") return @@ -755,14 +753,14 @@ dat += " (Cannot Late Join)
    " continue if(job.total_positions >= 0) - dat += " Add | " + dat += " Add | " if(job.total_positions > job.current_positions) - dat += "Remove | " + dat += "Remove | " else dat += "Remove | " - dat += "Unlimit" + dat += "Unlimit" else - dat += " Limit" + dat += " Limit" dat += "
    " dat += "" diff --git a/code/modules/admin/create_mob.dm b/code/modules/admin/create_mob.dm index cf0d4be37f..7bfd7ec80a 100644 --- a/code/modules/admin/create_mob.dm +++ b/code/modules/admin/create_mob.dm @@ -1,3 +1,4 @@ +<<<<<<< HEAD /datum/admins/proc/create_mob(mob/user) var/static/create_mob_html @@ -23,4 +24,31 @@ H.dna.blood_type = random_blood_type() H.update_body() H.update_hair() +======= + +/datum/admins/proc/create_mob(mob/user) + var/static/create_mob_html + if (!create_mob_html) + var/mobjs = null + mobjs = jointext(typesof(/mob), ";") + create_mob_html = file2text('html/create_object.html') + create_mob_html = replacetext(create_mob_html, "null /* object types */", "\"[mobjs]\"") + + user << browse(replacetext(create_mob_html, "/* ref src */", "\ref[src];[HrefToken()]"), "window=create_mob;size=425x475") + +/proc/randomize_human(mob/living/carbon/human/H) + H.gender = pick(MALE, FEMALE) + H.real_name = random_unique_name(H.gender) + H.name = H.real_name + H.underwear = random_underwear(H.gender) + H.skin_tone = random_skin_tone() + H.hair_style = random_hair_style(H.gender) + H.facial_hair_style = random_facial_hair_style(H.gender) + H.hair_color = random_short_color() + H.facial_hair_color = H.hair_color + H.eye_color = random_eye_color() + H.dna.blood_type = random_blood_type() + H.update_body() + H.update_hair() +>>>>>>> 84b1e3d... [s] Adds a security token to all admin hrefs (#29839) H.update_body_parts() \ No newline at end of file diff --git a/code/modules/admin/create_object.dm b/code/modules/admin/create_object.dm index 32801149f9..cddadb4082 100644 --- a/code/modules/admin/create_object.dm +++ b/code/modules/admin/create_object.dm @@ -1,3 +1,4 @@ +<<<<<<< HEAD /datum/admins/proc/create_object(mob/user) var/static/create_object_html = null if (!create_object_html) @@ -23,4 +24,32 @@ html_form = replacetext(html_form, "null /* object types */", "\"[objectjs]\"") create_object_forms[path] = html_form - user << browse(replacetext(html_form, "/* ref src */", "\ref[src]"), "window=qco[path];size=425x475") \ No newline at end of file + user << browse(replacetext(html_form, "/* ref src */", "\ref[src]"), "window=qco[path];size=425x475") +======= +/datum/admins/proc/create_object(mob/user) + var/static/create_object_html = null + if (!create_object_html) + var/objectjs = null + objectjs = jointext(typesof(/obj), ";") + create_object_html = file2text('html/create_object.html') + create_object_html = replacetext(create_object_html, "null /* object types */", "\"[objectjs]\"") + + user << browse(replacetext(create_object_html, "/* ref src */", "\ref[src];[HrefToken()]"), "window=create_object;size=425x475") + +/datum/admins/proc/quick_create_object(mob/user) + var/static/list/create_object_forms = list( + /obj, /obj/structure, /obj/machinery, /obj/effect, + /obj/item, /obj/item/clothing, /obj/item/stack, /obj/item/device, + /obj/item/reagent_containers, /obj/item/gun) + + var/path = input("Select the path of the object you wish to create.", "Path", /obj) in create_object_forms + var/html_form = create_object_forms[path] + + if (!html_form) + var/objectjs = jointext(typesof(path), ";") + html_form = file2text('html/create_object.html') + html_form = replacetext(html_form, "null /* object types */", "\"[objectjs]\"") + create_object_forms[path] = html_form + + user << browse(replacetext(html_form, "/* ref src */", "\ref[src];[HrefToken()]"), "window=qco[path];size=425x475") +>>>>>>> 84b1e3d... [s] Adds a security token to all admin hrefs (#29839) diff --git a/code/modules/admin/create_turf.dm b/code/modules/admin/create_turf.dm index 63e3b8cf69..62e26d89d5 100644 --- a/code/modules/admin/create_turf.dm +++ b/code/modules/admin/create_turf.dm @@ -1,3 +1,4 @@ +<<<<<<< HEAD /datum/admins/proc/create_turf(mob/user) var/static/create_turf_html if (!create_turf_html) @@ -7,3 +8,14 @@ create_turf_html = replacetext(create_turf_html, "null /* object types */", "\"[turfjs]\"") user << browse(replacetext(create_turf_html, "/* ref src */", "\ref[src]"), "window=create_turf;size=425x475") +======= +/datum/admins/proc/create_turf(mob/user) + var/static/create_turf_html + if (!create_turf_html) + var/turfjs = null + turfjs = jointext(typesof(/turf), ";") + create_turf_html = file2text('html/create_object.html') + create_turf_html = replacetext(create_turf_html, "null /* object types */", "\"[turfjs]\"") + + user << browse(replacetext(create_turf_html, "/* ref src */", "\ref[src];[HrefToken()]"), "window=create_turf;size=425x475") +>>>>>>> 84b1e3d... [s] Adds a security token to all admin hrefs (#29839) diff --git a/code/modules/admin/holder2.dm b/code/modules/admin/holder2.dm index bdd799badf..d9c5b88364 100644 --- a/code/modules/admin/holder2.dm +++ b/code/modules/admin/holder2.dm @@ -1,3 +1,4 @@ +<<<<<<< HEAD GLOBAL_LIST_EMPTY(admin_datums) GLOBAL_PROTECT(admin_datums) @@ -102,4 +103,131 @@ you will have to do something like if(client.rights & R_ADMIN) yourself. if(rights_required && !(rights_required & subject.holder.rank.rights)) return 0 return 1 +======= +GLOBAL_LIST_EMPTY(admin_datums) +GLOBAL_PROTECT(admin_datums) + +GLOBAL_VAR_INIT(href_token, GenerateToken()) +GLOBAL_PROTECT(href_token) + +/datum/admins + var/datum/admin_rank/rank + + var/client/owner = null + var/fakekey = null + + var/datum/marked_datum + + var/spamcooldown = 0 + + var/admincaster_screen = 0 //TODO: remove all these 5 variables, they are completly unacceptable + var/datum/newscaster/feed_message/admincaster_feed_message = new /datum/newscaster/feed_message + var/datum/newscaster/wanted_message/admincaster_wanted_message = new /datum/newscaster/wanted_message + var/datum/newscaster/feed_channel/admincaster_feed_channel = new /datum/newscaster/feed_channel + var/admin_signature + var/href_token + +/datum/admins/New(datum/admin_rank/R, ckey) + if(!ckey) + QDEL_IN(src, 0) + throw EXCEPTION("Admin datum created without a ckey") + return + if(!istype(R)) + QDEL_IN(src, 0) + throw EXCEPTION("Admin datum created without a rank") + return + rank = R + admin_signature = "Nanotrasen Officer #[rand(0,9)][rand(0,9)][rand(0,9)]" + href_token = GenerateToken() + GLOB.admin_datums[ckey] = src + +/proc/GenerateToken() + . = "" + for(var/I in 1 to 32) + . += "[rand(10)]" + +/proc/HrefToken(forceGlobal = FALSE) + var/tok = GLOB.href_token + if(!forceGlobal && usr) + var/client/C = usr.client + if(!C) + CRASH("No client for HrefToken()!") + var/datum/admins/holder = C.holder + if(holder) + tok = holder.href_token + return "admin_token=[tok]" + +/datum/admins/proc/associate(client/C) + if(IsAdminAdvancedProcCall()) + var/msg = " has tried to elevate permissions!" + message_admins("[key_name_admin(usr)][msg]") + log_admin_private("[key_name(usr)][msg]") + return + if(istype(C)) + owner = C + owner.holder = src + owner.add_admin_verbs() //TODO + owner.verbs -= /client/proc/readmin + GLOB.admins |= C + +/datum/admins/proc/disassociate() + if(owner) + GLOB.admins -= owner + owner.remove_admin_verbs() + owner.holder = null + owner = null + +/datum/admins/proc/check_if_greater_rights_than_holder(datum/admins/other) + if(!other) + return 1 //they have no rights + if(rank.rights == 65535) + return 1 //we have all the rights + if(src == other) + return 1 //you always have more rights than yourself + if(rank.rights != other.rank.rights) + if( (rank.rights & other.rank.rights) == other.rank.rights ) + return 1 //we have all the rights they have and more + return 0 + +/datum/admins/vv_edit_var(var_name, var_value) + return FALSE //nice try trialmin + +/* +checks if usr is an admin with at least ONE of the flags in rights_required. (Note, they don't need all the flags) +if rights_required == 0, then it simply checks if they are an admin. +if it doesn't return 1 and show_msg=1 it will prints a message explaining why the check has failed +generally it would be used like so: + +/proc/admin_proc() + if(!check_rights(R_ADMIN)) return + to_chat(world, "you have enough rights!") + +NOTE: it checks usr! not src! So if you're checking somebody's rank in a proc which they did not call +you will have to do something like if(client.rights & R_ADMIN) yourself. +*/ +/proc/check_rights(rights_required, show_msg=1) + if(usr && usr.client) + if (check_rights_for(usr.client, rights_required)) + return 1 + else + if(show_msg) + to_chat(usr, "Error: You do not have sufficient rights to do that. You require one of the following flags:[rights2text(rights_required," ")].") + return 0 + +//probably a bit iffy - will hopefully figure out a better solution +/proc/check_if_greater_rights_than(client/other) + if(usr && usr.client) + if(usr.client.holder) + if(!other || !other.holder) + return 1 + return usr.client.holder.check_if_greater_rights_than_holder(other.holder) + return 0 + +//This proc checks whether subject has at least ONE of the rights specified in rights_required. +/proc/check_rights_for(client/subject, rights_required) + if(subject && subject.holder && subject.holder.rank) + if(rights_required && !(rights_required & subject.holder.rank.rights)) + return 0 + return 1 +>>>>>>> 84b1e3d... [s] Adds a security token to all admin hrefs (#29839) return 0 \ No newline at end of file diff --git a/code/modules/admin/permissionverbs/permissionedit.dm b/code/modules/admin/permissionverbs/permissionedit.dm index aafe3b393e..552757b750 100644 --- a/code/modules/admin/permissionverbs/permissionedit.dm +++ b/code/modules/admin/permissionverbs/permissionedit.dm @@ -20,7 +20,7 @@
    - + @@ -36,10 +36,10 @@ if(!rights) rights = "*none*" output += "" - output += "" - output += "" - output += "" - output += "" + output += "" + output += "" + output += "" + output += "" output += "" output += {" diff --git a/code/modules/admin/player_panel.dm b/code/modules/admin/player_panel.dm index 9237d1f1e2..0a3520285c 100644 --- a/code/modules/admin/player_panel.dm +++ b/code/modules/admin/player_panel.dm @@ -75,16 +75,16 @@ body += "
    CKEY \[+\]CKEY \[+\] RANK PERMISSIONS VERB-OVERRIDES
    [adm_ckey] \[-\][D.rank.name][rights][rights2text(0," ",D.rank.adds,D.rank.subs)][adm_ckey] \[-\][D.rank.name][rights][rights2text(0," ",D.rank.adds,D.rank.subs)]
    "; - body += "PP - " - body += "N - " + body += "PP - " + body += "N - " body += "VV - " - body += "TP - " + body += "TP - " body += "PM - " - body += "SM - " - body += "FLW - " - body += "LOGS
    " + body += "SM - " + body += "FLW - " + body += "LOGS
    " if(antagonist > 0) - body += "Antagonist"; + body += "Antagonist"; body += "
    "; @@ -195,7 +195,7 @@ Player panel
    - Hover over a line to see more information - Check antagonists - Kick everyone/AFKers in lobby + Hover over a line to see more information - Check antagonists - Kick everyone/AFKers in lobby

    @@ -320,26 +320,26 @@ dat += "Round Duration: [round(world.time / 36000)]:[add_zero("[world.time / 600 % 60]", 2)]:[world.time / 100 % 6][world.time / 100 % 10]
    " dat += "Emergency shuttle
    " if(EMERGENCY_IDLE_OR_RECALLED) - dat += "Call Shuttle
    " + dat += "Call Shuttle
    " else var/timeleft = SSshuttle.emergency.timeLeft() if(SSshuttle.emergency.mode == SHUTTLE_CALL) - dat += "ETA: [(timeleft / 60) % 60]:[add_zero(num2text(timeleft % 60), 2)]
    " - dat += "Send Back
    " + dat += "ETA: [(timeleft / 60) % 60]:[add_zero(num2text(timeleft % 60), 2)]
    " + dat += "Send Back
    " else - dat += "ETA: [(timeleft / 60) % 60]:[add_zero(num2text(timeleft % 60), 2)]
    " + dat += "ETA: [(timeleft / 60) % 60]:[add_zero(num2text(timeleft % 60), 2)]
    " dat += "Continuous Round Status
    " - dat += "[config.continuous[SSticker.mode.config_tag] ? "Continue if antagonists die" : "End on antagonist death"]" + dat += "[config.continuous[SSticker.mode.config_tag] ? "Continue if antagonists die" : "End on antagonist death"]" if(config.continuous[SSticker.mode.config_tag]) - dat += ", [config.midround_antag[SSticker.mode.config_tag] ? "creating replacement antagonists" : "not creating new antagonists"]
    " + dat += ", [config.midround_antag[SSticker.mode.config_tag] ? "creating replacement antagonists" : "not creating new antagonists"]
    " else dat += "
    " if(config.midround_antag[SSticker.mode.config_tag]) - dat += "Time limit: [config.midround_antag_time_check] minutes into round
    " - dat += "Living crew limit: [config.midround_antag_life_check * 100]% of crew alive
    " - dat += "If limits past: [SSticker.mode.round_ends_with_antag_death ? "End The Round" : "Continue As Extended"]
    " - dat += "End Round Now
    " - dat += "[SSticker.delay_end ? "End Round Normally" : "Delay Round End"]" + dat += "Time limit: [config.midround_antag_time_check] minutes into round
    " + dat += "Living crew limit: [config.midround_antag_life_check * 100]% of crew alive
    " + dat += "If limits past: [SSticker.mode.round_ends_with_antag_death ? "End The Round" : "Continue As Extended"]
    " + dat += "End Round Now
    " + dat += "[SSticker.delay_end ? "End Round Normally" : "Delay Round End"]" var/connected_players = GLOB.clients.len var/lobby_players = 0 var/observers = 0 @@ -389,11 +389,11 @@ for(var/datum/mind/N in SSticker.mode.syndicates) var/mob/M = N.current if(M) - dat += "[M.real_name][M.client ? "" : " (No Client)"][M.stat == DEAD ? " (DEAD)" : ""]" + dat += "[M.real_name][M.client ? "" : " (No Client)"][M.stat == DEAD ? " (DEAD)" : ""]" dat += "PM" - dat += "FLW" + dat += "FLW" else - dat += "[N.name]([N.key]) Nuclear Operative Body destroyed!" + dat += "[N.name]([N.key]) Nuclear Operative Body destroyed!" dat += "PM" dat += "
    " for(var/obj/item/disk/nuclear/N in GLOB.poi_list) @@ -402,7 +402,7 @@ while(!isturf(disk_loc)) if(ismob(disk_loc)) var/mob/M = disk_loc - dat += "carried by [M.real_name] " + dat += "carried by [M.real_name] " if(isobj(disk_loc)) var/obj/O = disk_loc dat += "in \a [O.name] " @@ -415,29 +415,29 @@ for(var/datum/mind/N in SSticker.mode.head_revolutionaries) var/mob/M = N.current if(!M) - dat += "" + dat += "" dat += "" else - dat += "" + dat += "" dat += "" - dat += "" + dat += "" for(var/datum/mind/N in SSticker.mode.revolutionaries) var/mob/M = N.current if(M) - dat += "" + dat += "" dat += "" - dat += "" + dat += "" dat += "
    Nuclear Disk(s)
    [N.name]([N.key])Head Revolutionary body destroyed!
    [N.name]([N.key])Head Revolutionary body destroyed!PM
    [M.real_name] (Leader)[M.client ? "" : " (No Client)"][M.stat == DEAD ? " (DEAD)" : ""]
    [M.real_name] (Leader)[M.client ? "" : " (No Client)"][M.stat == DEAD ? " (DEAD)" : ""]PMFLW
    FLW
    [M.real_name][M.client ? "" : " (No Client)"][M.stat == DEAD ? " (DEAD)" : ""]
    [M.real_name][M.client ? "" : " (No Client)"][M.stat == DEAD ? " (DEAD)" : ""]PMFLW
    FLW
    " for(var/datum/mind/N in SSticker.mode.get_living_heads()) var/mob/M = N.current if(M) - dat += "" + dat += "" dat += "" - dat += "" + dat += "" var/turf/mob_loc = get_turf(M) dat += "" else - dat += "" + dat += "" dat += "" dat += "
    Target(s)Location
    [M.real_name][M.client ? "" : " (No Client)"][M.stat == DEAD ? " (DEAD)" : ""]
    [M.real_name][M.client ? "" : " (No Client)"][M.stat == DEAD ? " (DEAD)" : ""]PMFLWFLW[mob_loc.loc]
    [N.name]([N.key])Head body destroyed!
    [N.name]([N.key])Head body destroyed!PM
    " @@ -464,12 +464,12 @@ for(var/datum/mind/changeling in SSticker.mode.changelings) var/mob/M = changeling.current if(M) - dat += "[M.mind.changeling.changelingID] as [M.real_name][M.client ? "" : " (No Client)"][M.stat == DEAD ? " (DEAD)" : ""]" + dat += "[M.mind.changeling.changelingID] as [M.real_name][M.client ? "" : " (No Client)"][M.stat == DEAD ? " (DEAD)" : ""]" dat += "PM" - dat += "FLW" - dat += "Show Objective" + dat += "FLW" + dat += "Show Objective" else - dat += "[changeling.name]([changeling.key])Changeling body destroyed!" + dat += "[changeling.name]([changeling.key])Changeling body destroyed!" dat += "PM" dat += "" @@ -478,12 +478,12 @@ for(var/datum/mind/wizard in SSticker.mode.wizards) var/mob/M = wizard.current if(M) - dat += "[M.real_name][M.client ? "" : " (No Client)"][M.stat == DEAD ? " (DEAD)" : ""]" + dat += "[M.real_name][M.client ? "" : " (No Client)"][M.stat == DEAD ? " (DEAD)" : ""]" dat += "PM" - dat += "FLW" - dat += "Show Objective" + dat += "FLW" + dat += "Show Objective" else - dat += "[wizard.name]([wizard.key])Wizard body destroyed!" + dat += "[wizard.name]([wizard.key])Wizard body destroyed!" dat += "PM" dat += "" @@ -492,12 +492,12 @@ for(var/datum/mind/apprentice in SSticker.mode.apprentices) var/mob/M = apprentice.current if(M) - dat += "[M.real_name][M.client ? "" : " (No Client)"][M.stat == DEAD ? " (DEAD)" : ""]" + dat += "[M.real_name][M.client ? "" : " (No Client)"][M.stat == DEAD ? " (DEAD)" : ""]" dat += "PM" - dat += "FLW" - dat += "Show Objective" + dat += "FLW" + dat += "Show Objective" else - dat += "[apprentice.name]([apprentice.key])Apprentice body destroyed!!" + dat += "[apprentice.name]([apprentice.key])Apprentice body destroyed!!" dat += "PM" dat += "" @@ -506,9 +506,9 @@ for(var/datum/mind/N in SSticker.mode.cult) var/mob/M = N.current if(M) - dat += "[M.real_name][N.has_antag_datum(ANTAG_DATUM_CULT_MASTER) ? " \[Master\]" : ""][M.client ? "" : " (No Client)"][M.stat == DEAD ? " (DEAD)" : ""]" + dat += "[M.real_name][N.has_antag_datum(ANTAG_DATUM_CULT_MASTER) ? " \[Master\]" : ""][M.client ? "" : " (No Client)"][M.stat == DEAD ? " (DEAD)" : ""]" dat += "PM" - dat += "FLW" + dat += "FLW" dat += "" if(SSticker.mode.servants_of_ratvar.len) @@ -516,9 +516,9 @@ for(var/datum/mind/N in SSticker.mode.servants_of_ratvar) var/mob/M = N.current if(M) - dat += "[M.real_name][M.client ? "" : " (ghost)"][M.stat == DEAD ? " (DEAD)" : ""]" + dat += "[M.real_name][M.client ? "" : " (ghost)"][M.stat == DEAD ? " (DEAD)" : ""]" dat += "PM" - dat += "FLW" + dat += "FLW" dat += "" if(SSticker.mode.traitors.len > 0) @@ -526,12 +526,12 @@ for(var/datum/mind/traitor in SSticker.mode.traitors) var/mob/M = traitor.current if(M) - dat += "[M.real_name][M.client ? "" : " (No Client)"][M.stat == DEAD ? " (DEAD)" : ""]" + dat += "[M.real_name][M.client ? "" : " (No Client)"][M.stat == DEAD ? " (DEAD)" : ""]" dat += "PM" - dat += "FLW" - dat += "Show Objective" + dat += "FLW" + dat += "Show Objective" else - dat += "[traitor.name]([traitor.key])Traitor body destroyed!" + dat += "[traitor.name]([traitor.key])Traitor body destroyed!" dat += "PM" dat += "" @@ -540,12 +540,12 @@ for(var/datum/mind/abductor in SSticker.mode.abductors) var/mob/M = abductor.current if(M) - dat += "[M.real_name][M.client ? "" : " (No Client)"][M.stat == DEAD ? " (DEAD)" : ""]" + dat += "[M.real_name][M.client ? "" : " (No Client)"][M.stat == DEAD ? " (DEAD)" : ""]" dat += "PM" - dat += "FLW" - dat += "Show Objective" + dat += "FLW" + dat += "Show Objective" else - dat += "[abductor.name]([abductor.key])Abductor body destroyed!" + dat += "[abductor.name]([abductor.key])Abductor body destroyed!" dat += "PM" dat += "" dat += "
    " @@ -553,12 +553,12 @@ for(var/datum/mind/abductee in E.abductee_minds) var/mob/M = abductee.current if(M) - dat += "" + dat += "" dat += "" - dat += "" - dat += "" + dat += "" + dat += "" else - dat += "" + dat += "" dat += "" dat += "
    Abductees
    [M.real_name][M.client ? "" : " (No Client)"][M.stat == DEAD ? " (DEAD)" : ""]
    [M.real_name][M.client ? "" : " (No Client)"][M.stat == DEAD ? " (DEAD)" : ""]PMFLWShow Objective
    FLWShow Objective
    [abductee.name]([abductee.key])Abductee body destroyed!
    [abductee.name]([abductee.key])Abductee body destroyed!PM
    " @@ -569,12 +569,12 @@ var/mob/M = devil.current var/datum/antagonist/devil/devilinfo = devil.has_antag_datum(ANTAG_DATUM_DEVIL) if(M) - dat += "[M.real_name] : [devilinfo.truename][M.client ? "" : " (No Client)"][M.stat == DEAD ? " (DEAD)" : ""]" + dat += "[M.real_name] : [devilinfo.truename][M.client ? "" : " (No Client)"][M.stat == DEAD ? " (DEAD)" : ""]" dat += "PM" - dat += "Show Objective" - dat += "Show all devil info" + dat += "Show Objective" + dat += "Show all devil info" else - dat += "[devil.name] : [devilinfo.truename] ([devil.key])devil body destroyed!" + dat += "[devil.name] : [devilinfo.truename] ([devil.key])devil body destroyed!" dat += "PM" dat += "" @@ -584,11 +584,11 @@ var/datum/mind/sintouched = X var/mob/M = sintouched.current if(M) - dat += "[M.real_name][M.client ? "" : " (No Client)"][M.stat == DEAD ? " (DEAD)" : ""]" + dat += "[M.real_name][M.client ? "" : " (No Client)"][M.stat == DEAD ? " (DEAD)" : ""]" dat += "PM" - dat += "Show Objective" + dat += "Show Objective" else - dat += "[sintouched.name]([sintouched.key])sintouched body destroyed!" + dat += "[sintouched.name]([sintouched.key])sintouched body destroyed!" dat += "PM" dat += "" @@ -606,11 +606,11 @@ for(var/datum/mind/blob in blob_minds) var/mob/M = blob.current if(M) - dat += "[M.real_name][M.client ? "" : " (No Client)"][M.stat == DEAD ? " (DEAD)" : ""]" + dat += "[M.real_name][M.client ? "" : " (No Client)"][M.stat == DEAD ? " (DEAD)" : ""]" dat += "PM" - dat += "FLW" + dat += "FLW" else - dat += "[blob.name]([blob.key])Blob not found!" + dat += "[blob.name]([blob.key])Blob not found!" dat += "PM" dat += "" @@ -622,11 +622,11 @@ for(var/datum/mind/eek in mode.ape_infectees) var/mob/M = eek.current if(M) - dat += "[M.real_name][M.client ? "" : " (No Client)"][M.stat == DEAD ? " (DEAD)" : ""]" + dat += "[M.real_name][M.client ? "" : " (No Client)"][M.stat == DEAD ? " (DEAD)" : ""]" dat += "PM" - dat += "FLW" + dat += "FLW" else - dat += "[eek.name]([eek.key])Monkey not found!" + dat += "[eek.name]([eek.key])Monkey not found!" dat += "PM" dat += "" diff --git a/code/modules/admin/secrets.dm b/code/modules/admin/secrets.dm index 70c7346369..899e763c92 100644 --- a/code/modules/admin/secrets.dm +++ b/code/modules/admin/secrets.dm @@ -7,9 +7,9 @@ dat +={" General Secrets

    - Show Job Debug
    - Admin Log
    - Show Admin List
    + Show Job Debug
    + Admin Log
    + Show Admin List

    "} @@ -17,27 +17,27 @@ dat += {" Admin Secrets

    - Cure all diseases currently in existence
    - Bombing List
    - Show current traitors and objectives
    - Show last [length(GLOB.lastsignalers)] signalers
    - Show last [length(GLOB.lawchanges)] law changes
    - Show AI Laws
    - Show Game Mode
    - Show Crew Manifest
    - List DNA (Blood)
    - List Fingerprints
    - Enable/Disable CTF

    - Reset Thunderdome to default state
    - Rename Station Name
    - Reset Station Name
    + Cure all diseases currently in existence
    + Bombing List
    + Show current traitors and objectives
    + Show last [length(GLOB.lastsignalers)] signalers
    + Show last [length(GLOB.lawchanges)] law changes
    + Show AI Laws
    + Show Game Mode
    + Show Crew Manifest
    + List DNA (Blood)
    + List Fingerprints
    + Enable/Disable CTF

    + Reset Thunderdome to default state
    + Rename Station Name
    + Reset Station Name

    Shuttles

    - Move Ferry
    - Toggle Arrivals Ferry
    - Move Mining Shuttle
    - Move Labor Shuttle
    + Move Ferry
    + Toggle Arrivals Ferry
    + Move Mining Shuttle
    + Move Labor Shuttle

    "} @@ -45,6 +45,7 @@ dat += {" Fun Secrets

    +<<<<<<< HEAD Trigger a Virus Outbreak
    Turn all humans into monkeys
    @@ -66,10 +67,35 @@ Break all lights
    Fix all lights
    The floor is lava! (DANGEROUS: extremely lame)
    +======= +<<<<<<< HEAD + +======= +>>>>>>> 6e5ebf9c41fc97d5ee0daf4fd22536844438ace0 + Trigger a Virus Outbreak
    + Turn all humans into monkeys
    + Chinese Cartoons
    + Change the species of all humans
    + Make all areas powered
    + Make all areas unpowered
    + Power all SMES
    + Triple AI mode (needs to be used in the lobby)
    + Everyone is the traitor
    + Summon Guns
    + Summon Magic
    + Summon Events (Toggle)
    + There can only be one!
    + There can only be one! (40-second delay)
    + Make all players retarded
    + Egalitarian Station Mode
    + Break all lights
    + Fix all lights
    + The floor is lava! (DANGEROUS: extremely lame)
    +>>>>>>> 84b1e3d... [s] Adds a security token to all admin hrefs (#29839)
    - Change bomb cap
    - Mass Purrbation
    - Mass Remove Purrbation
    + Change bomb cap
    + Mass Purrbation
    + Mass Remove Purrbation
    "} dat += "
    " @@ -78,9 +104,9 @@ dat += {" Security Level Elevated

    - Change all maintenance doors to engie/brig access only
    - Change all maintenance doors to brig access only
    - Remove cap on security officers
    + Change all maintenance doors to engie/brig access only
    + Change all maintenance doors to brig access only
    + Remove cap on security officers

    "} diff --git a/code/modules/admin/sql_message_system.dm b/code/modules/admin/sql_message_system.dm index b42fe93eef..9eb66986b0 100644 --- a/code/modules/admin/sql_message_system.dm +++ b/code/modules/admin/sql_message_system.dm @@ -147,10 +147,10 @@ return var/output var/ruler = "


    " - var/navbar = "\[All\]|\[#\]" + var/navbar = "\[All\]|\[#\]" for(var/letter in GLOB.alphabet) - navbar += "|\[[letter]\]" - navbar += "|\[Memos\]|\[Watchlist\]" + navbar += "|\[[letter]\]" + navbar += "|\[Memos\]|\[Watchlist\]" navbar += "
    \ \ \ @@ -160,14 +160,14 @@ if(type == "memo" || type == "watchlist entry") if(type == "memo") output += "

    Admin memos

    " - output += "\[Add memo\]" + output += "\[Add memo\]" else if(type == "watchlist entry") output += "

    Watchlist entries

    " - output += "\[Add watchlist entry\]" + output += "\[Add watchlist entry\]" if(filter) - output += "|\[Unfilter clients\]" + output += "|\[Unfilter clients\]" else - output += "|\[Filter offline clients\]" + output += "|\[Filter offline clients\]" output += ruler var/datum/DBQuery/query_get_type_messages = SSdbcore.NewQuery("SELECT id, targetckey, adminckey, text, timestamp, server, lasteditor FROM [format_table_name("messages")] WHERE type = '[type]'") if(!query_get_type_messages.warn_execute()) @@ -186,10 +186,10 @@ if(type == "watchlist entry") output += "[t_ckey] | " output += "[timestamp] | [server] | [admin_ckey]
    " - output += " \[Delete\]" - output += " \[Edit\]" + output += " \[Delete\]" + output += " \[Edit\]" if(editor_ckey) - output += " Last edit by [editor_ckey] (Click here to see edit log)" + output += " Last edit by [editor_ckey] (Click here to see edit log)" output += "
    [text]
    " if(target_ckey) target_ckey = sanitizeSQL(target_ckey) @@ -215,18 +215,23 @@ var/data data += "[timestamp] | [server] | [admin_ckey]" if(!linkless) - data += " \[Delete\]" + data += " \[Delete\]" if(type == "note") - data += " [secret ? "\[Secret\]" : "\[Not secret\]"]" + data += " [secret ? "\[Secret\]" : "\[Not secret\]"]" if(type == "message sent") data += " Message has been sent" if(editor_ckey) data += "|" else - data += " \[Edit\]" + data += " \[Edit\]" if(editor_ckey) +<<<<<<< HEAD data += " Last edit by [editor_ckey] (Click here to see edit log)" data += "
    [text]
    " +======= + data += " Last edit by [editor_ckey] (Click here to see edit log)" + data += "
    [text]


    " +>>>>>>> 84b1e3d... [s] Adds a security token to all admin hrefs (#29839) switch(type) if("message") messagedata += data @@ -238,12 +243,12 @@ notedata += data output += "

    [target_ckey]

    " if(!linkless) - output += "\[Add note\]" - output += " \[Add message\]" - output += " \[Add to watchlist\]" - output += " \[Refresh page\]
    " + output += "\[Add note\]" + output += " \[Add message\]" + output += " \[Add to watchlist\]" + output += " \[Refresh page\]" else - output += " \[Refresh page\]" + output += " \[Refresh page\]" output += ruler if(messagedata) output += "

    Messages

    " @@ -257,7 +262,7 @@ if(index) var/index_ckey var/search - output += "
    \[Add message\]\[Add watchlist entry\]\[Add note\]
    " + output += "
    \[Add message\]\[Add watchlist entry\]\[Add note\]
    " output += ruler if(!isnum(index)) index = sanitizeSQL(index) @@ -273,9 +278,9 @@ return while(query_list_messages.NextRow()) index_ckey = query_list_messages.item[1] - output += "[index_ckey]
    " + output += "[index_ckey]
    " else if(!type && !target_ckey && !index) - output += "
    \[Add message\]\[Add watchlist entry\]\[Add note\]
    " + output += "
    \[Add message\]\[Add watchlist entry\]\[Add note\]
    " output += ruler usr << browse(output, "window=browse_messages;size=900x500") @@ -313,7 +318,7 @@ proc/get_message_output(type, target_ckey) if("memo") output += "Memo by [admin_ckey] on [timestamp]" if(editor_ckey) - output += "
    Last edit by [editor_ckey] (Click here to see edit log)" + output += "
    Last edit by [editor_ckey] (Click here to see edit log)" output += "
    [text]

    " return output diff --git a/code/modules/admin/stickyban.dm b/code/modules/admin/stickyban.dm index 9ac85e49fa..f5d6c72ffb 100644 --- a/code/modules/admin/stickyban.dm +++ b/code/modules/admin/stickyban.dm @@ -152,11 +152,11 @@ /datum/admins/proc/stickyban_gethtml(ckey, ban) . = {" - \[-\] - \[revert\] + \[-\] + \[revert\] [ckey]
    " - [ban["message"]] \[Edit\]
    + [ban["message"]] \[Edit\]
    "} if (ban["admin"]) . += "[ban["admin"]]
    " @@ -166,7 +166,7 @@ for (var/key in ban["keys"]) if (ckey(key) == ckey) continue - . += "
  • \[-\][key]
  • " + . += "
  • \[-\][key]
  • " . += "\n" /datum/admins/proc/stickyban_show() @@ -185,7 +185,7 @@ Sticky Bans -

    All Sticky Bans:

    \[+\]
    +

    All Sticky Bans:

    \[+\]
    [banhtml] "} diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index f7b0f8b6ff..f5f3326001 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -1,3 +1,16 @@ +/datum/admins/proc/CheckAdminHref(href, href_list) + var/auth = href_list["admin_token"] + . = auth && auth != href_token && auth != GLOB.href_token + if(.) + return + var/msg = !auth ? "no" : "a bad" + message_admins("[key_name_admin(usr)] clicked an href with [msg] authorization key!") + if(config.debug_admin_hrefs) + message_admins("Debug mode enabled, call not blocked. Please ask your coders to review this round's logs.") + log_world("UAH: [href]") + return TRUE + log_admin_private("[key_name(usr)] clicked an href with [msg] authorization key! [href]") + /datum/admins/Topic(href, href_list) ..() @@ -5,6 +18,10 @@ message_admins("[usr.key] has attempted to override the admin panel!") log_admin("[key_name(usr)] tried to use the admin panel without authorization.") return + + if(!CheckAdminHref(href, href_list)) + return + if(href_list["ahelp"]) if(!check_rights(R_ADMIN, TRUE)) return diff --git a/code/modules/admin/verbs/SDQL2/SDQL_2.dm b/code/modules/admin/verbs/SDQL2/SDQL_2.dm index 5d4e0dc29a..eaa98934d5 100644 --- a/code/modules/admin/verbs/SDQL2/SDQL_2.dm +++ b/code/modules/admin/verbs/SDQL2/SDQL_2.dm @@ -122,7 +122,7 @@ /proc/SDQL_gen_vv_href(t) var/text = "" - text += "\ref[t]" + text += "\ref[t]" if(istype(t, /atom)) var/atom/a = t var/turf/T = a.loc diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm index d593973188..c1c1894184 100644 --- a/code/modules/admin/verbs/adminhelp.dm +++ b/code/modules/admin/verbs/adminhelp.dm @@ -80,10 +80,10 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) if(!l2b) return var/list/dat = list("[title]") - dat += "Refresh

    " + dat += "Refresh

    " for(var/I in l2b) var/datum/admin_help/AH = I - dat += "Ticket #[AH.id]: [AH.initiator_key_name]: [AH.name]
    " + dat += "Ticket #[AH.id]: [AH.initiator_key_name]: [AH.name]
    " usr << browse(dat.Join(), "window=ahelp_list[state];size=600x480") @@ -228,22 +228,22 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) /datum/admin_help/proc/ClosureLinks(ref_src) if(!ref_src) ref_src = "\ref[src]" - . = " (REJT)" - . += " (IC)" - . += " (CLOSE)" - . += " (RSLVE)" + . = " (REJT)" + . += " (IC)" + . += " (CLOSE)" + . += " (RSLVE)" //private /datum/admin_help/proc/LinkedReplyName(ref_src) if(!ref_src) ref_src = "\ref[src]" - return "[initiator_key_name]" + return "[initiator_key_name]" //private /datum/admin_help/proc/TicketHref(msg, ref_src, action = "ticket") if(!ref_src) ref_src = "\ref[src]" - return "[msg]" + return "[msg]" //message from the initiator without a target, all admins will see this //won't bug irc @@ -675,7 +675,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) if(found.mind && found.mind.special_role) is_antag = 1 founds += "Name: [found.name]([found.real_name]) Ckey: [found.ckey] [is_antag ? "(Antag)" : null] " - msg += "[original_word](?|F) " + msg += "[original_word](?|F) " continue msg += "[original_word] " if(irc) diff --git a/code/modules/admin/verbs/adminsay.dm b/code/modules/admin/verbs/adminsay.dm index 707a76854f..8e543c8a73 100644 --- a/code/modules/admin/verbs/adminsay.dm +++ b/code/modules/admin/verbs/adminsay.dm @@ -12,7 +12,7 @@ log_talk(mob,"[key_name(src)] : [msg]",LOGASAY) msg = keywords_lookup(msg) if(check_rights(R_ADMIN,0)) - msg = "ADMIN: [key_name(usr, 1)] (FLW): [msg]" + msg = "ADMIN: [key_name(usr, 1)] [ADMIN_FLW(mob)]: [msg]" to_chat(GLOB.admins, msg) else msg = "ADMIN: [key_name(usr, 1)]: [msg]" diff --git a/code/modules/admin/verbs/individual_logging.dm b/code/modules/admin/verbs/individual_logging.dm index ca84d5d759..cd3feed5d0 100644 --- a/code/modules/admin/verbs/individual_logging.dm +++ b/code/modules/admin/verbs/individual_logging.dm @@ -1,12 +1,12 @@ /proc/show_individual_logging_panel(mob/M, type = INDIVIDUAL_ATTACK_LOG) if(!M || !ismob(M)) return - var/dat = "
    Attack log | " - dat += "Say log | " - dat += "Emote log | " - dat += "OOC log | " - dat += "Show all | " - dat += "Refresh
    " + var/dat = "
    Attack log | " + dat += "Say log | " + dat += "Emote log | " + dat += "OOC log | " + dat += "Show all | " + dat += "Refresh
    " dat += "
    " diff --git a/code/modules/admin/verbs/one_click_antag.dm b/code/modules/admin/verbs/one_click_antag.dm index c8df7f56f1..398965e74d 100644 --- a/code/modules/admin/verbs/one_click_antag.dm +++ b/code/modules/admin/verbs/one_click_antag.dm @@ -11,6 +11,7 @@ /datum/admins/proc/one_click_antag() var/dat = {" +<<<<<<< HEAD Make Traitors
    Make Changelings
    Make Revs
    @@ -23,6 +24,19 @@ Make CentCom Response Team (Requires Ghosts)
    Make Abductor Team (Requires Ghosts)
    Make Revenant (Requires Ghost)
    +======= + Make Traitors
    + Make Changelings
    + Make Revs
    + Make Cult
    + Make Clockwork Cult
    + Make Blob
    + Make Wizard (Requires Ghosts)
    + Make Nuke Team (Requires Ghosts)
    + Make CentCom Response Team (Requires Ghosts)
    + Make Abductor Team (Requires Ghosts)
    + Make Revenant (Requires Ghost)
    +>>>>>>> 84b1e3d... [s] Adds a security token to all admin hrefs (#29839) "} var/datum/browser/popup = new(usr, "oneclickantag", "Quick-Create Antagonist", 400, 400) diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 62f3cab1d1..cb27d019ce 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -1147,8 +1147,8 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits /datum/admins/proc/modify_goals() var/dat = "" for(var/datum/station_goal/S in SSticker.mode.station_goals) - dat += "[S.name] - Announce | Remove
    " - dat += "
    Add New Goal" + dat += "[S.name] - Announce | Remove
    " + dat += "
    Add New Goal" usr << browse(dat, "window=goals;size=400x400") @@ -1219,7 +1219,7 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits var/list/msg = list() msg += "Playtime ReportPlaytime:
    " src << browse(msg.Join(), "window=Player_playtime_check") @@ -1233,7 +1233,7 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits var/list/body = list() body += "Playtime for [C.key]
    Playtime:" body += C.get_exp_report() - body += "Toggle Exempt status" + body += "Toggle Exempt status" body += "" usr << browse(body.Join(), "window=playerplaytime[C.ckey];size=550x615") diff --git a/code/modules/error_handler/error_viewer.dm b/code/modules/error_handler/error_viewer.dm index eee95fe0af..dddff75bb2 100644 --- a/code/modules/error_handler/error_viewer.dm +++ b/code/modules/error_handler/error_viewer.dm @@ -71,7 +71,7 @@ GLOBAL_DATUM(error_cache, /datum/error_viewer/error_cache) if (linear) back_to_param += ";viewruntime_linear=1" - return "[linktext]" + return "[linktext]" /datum/error_viewer/error_cache var/list/errors = list() @@ -181,12 +181,12 @@ GLOBAL_DATUM(error_cache, /datum/error_viewer/error_cache) var/html = build_header(back_to, linear) html += "[name]
    [desc]
    " if (usr_ref) - html += "
    usr: VV" - html += " PP" - html += " Follow" + html += "
    usr: VV" + html += " PP" + html += " Follow" if (istype(usr_loc)) - html += "
    usr.loc: VV" - html += " JMP" + html += "
    usr.loc: VV" + html += " JMP" browse_to(user, html) diff --git a/code/modules/events/spacevine.dm b/code/modules/events/spacevine.dm index 1feb7aa116..5ea8c20e32 100644 --- a/code/modules/events/spacevine.dm +++ b/code/modules/events/spacevine.dm @@ -390,10 +390,10 @@ /datum/spacevine_controller/vv_get_dropdown() . = ..() . += "---" - .["Delete Vines"] = "?_src_=\ref[src];purge_vines=1" + .["Delete Vines"] = "?_src_=\ref[src];[HrefToken()];purge_vines=1" /datum/spacevine_controller/Topic(href, href_list) - if(..() || !check_rights(R_ADMIN, FALSE)) + if(..() || !check_rights(R_ADMIN, FALSE) || !usr.client.holder.CheckAdminHref(href, href_list)) return if(href_list["purge_vines"]) diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 84ff0c2ef2..717c5478a5 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -860,7 +860,7 @@ /mob/living/carbon/vv_get_dropdown() . = ..() . += "---" - .["Make AI"] = "?_src_=vars;makeai=\ref[src]" - .["Modify bodypart"] = "?_src_=vars;editbodypart=\ref[src]" - .["Modify organs"] = "?_src_=vars;editorgans=\ref[src]" - .["Hallucinate"] = "?_src_=vars;hallucinate=\ref[src]" + .["Make AI"] = "?_src_=vars;[HrefToken()];makeai=\ref[src]" + .["Modify bodypart"] = "?_src_=vars;[HrefToken()];editbodypart=\ref[src]" + .["Modify organs"] = "?_src_=vars;[HrefToken()];editorgans=\ref[src]" + .["Hallucinate"] = "?_src_=vars;[HrefToken()];hallucinate=\ref[src]" diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 304a745220..069dcb8ab5 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -906,12 +906,12 @@ INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy) /mob/living/carbon/human/vv_get_dropdown() . = ..() . += "---" - .["Make monkey"] = "?_src_=vars;makemonkey=\ref[src]" - .["Set Species"] = "?_src_=vars;setspecies=\ref[src]" - .["Make cyborg"] = "?_src_=vars;makerobot=\ref[src]" - .["Make alien"] = "?_src_=vars;makealien=\ref[src]" - .["Make slime"] = "?_src_=vars;makeslime=\ref[src]" - .["Toggle Purrbation"] = "?_src_=vars;purrbation=\ref[src]" + .["Make monkey"] = "?_src_=vars;[HrefToken()];makemonkey=\ref[src]" + .["Set Species"] = "?_src_=vars;[HrefToken()];setspecies=\ref[src]" + .["Make cyborg"] = "?_src_=vars;[HrefToken()];makerobot=\ref[src]" + .["Make alien"] = "?_src_=vars;[HrefToken()];makealien=\ref[src]" + .["Make slime"] = "?_src_=vars;[HrefToken()];makeslime=\ref[src]" + .["Toggle Purrbation"] = "?_src_=vars;[HrefToken()];purrbation=\ref[src]" /mob/living/carbon/human/MouseDrop_T(mob/living/target, mob/living/user) if((target != pulling) || (grab_state < GRAB_AGGRESSIVE) || (user != target) || !isliving(user) || stat || user.stat)//Get consent first :^) diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 76553d17fd..1ef1d9df25 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -950,18 +950,18 @@ /mob/vv_get_dropdown() . = ..() . += "---" - .["Gib"] = "?_src_=vars;gib=\ref[src]" - .["Give Spell"] = "?_src_=vars;give_spell=\ref[src]" - .["Remove Spell"] = "?_src_=vars;remove_spell=\ref[src]" - .["Give Disease"] = "?_src_=vars;give_disease=\ref[src]" - .["Toggle Godmode"] = "?_src_=vars;godmode=\ref[src]" - .["Drop Everything"] = "?_src_=vars;drop_everything=\ref[src]" - .["Regenerate Icons"] = "?_src_=vars;regenerateicons=\ref[src]" - .["Make Space Ninja"] = "?_src_=vars;ninja=\ref[src]" - .["Show player panel"] = "?_src_=vars;mob_player_panel=\ref[src]" - .["Toggle Build Mode"] = "?_src_=vars;build_mode=\ref[src]" - .["Assume Direct Control"] = "?_src_=vars;direct_control=\ref[src]" - .["Offer Control to Ghosts"] = "?_src_=vars;offer_control=\ref[src]" + .["Gib"] = "?_src_=vars;[HrefToken()];gib=\ref[src]" + .["Give Spell"] = "?_src_=vars;[HrefToken()];give_spell=\ref[src]" + .["Remove Spell"] = "?_src_=vars;[HrefToken()];remove_spell=\ref[src]" + .["Give Disease"] = "?_src_=vars;[HrefToken()];give_disease=\ref[src]" + .["Toggle Godmode"] = "?_src_=vars;[HrefToken()];godmode=\ref[src]" + .["Drop Everything"] = "?_src_=vars;[HrefToken()];drop_everything=\ref[src]" + .["Regenerate Icons"] = "?_src_=vars;[HrefToken()];regenerateicons=\ref[src]" + .["Make Space Ninja"] = "?_src_=vars;[HrefToken()];ninja=\ref[src]" + .["Show player panel"] = "?_src_=vars;[HrefToken()];mob_player_panel=\ref[src]" + .["Toggle Build Mode"] = "?_src_=vars;[HrefToken()];build_mode=\ref[src]" + .["Assume Direct Control"] = "?_src_=vars;[HrefToken()];direct_control=\ref[src]" + .["Offer Control to Ghosts"] = "?_src_=vars;[HrefToken()];offer_control=\ref[src]" /mob/vv_get_var(var_name) switch(var_name) diff --git a/code/modules/station_goals/station_goal.dm b/code/modules/station_goals/station_goal.dm index 4a9bc42438..98ec01f641 100644 --- a/code/modules/station_goals/station_goal.dm +++ b/code/modules/station_goals/station_goal.dm @@ -39,7 +39,7 @@ /datum/station_goal/Topic(href, href_list) ..() - if(!check_rights(R_ADMIN)) + if(!check_rights(R_ADMIN) || !usr.client.holder.CheckAdminHref(href, href_list)) return if(href_list["announce"]) diff --git a/config/config.txt b/config/config.txt index ae2cc1e43a..7073d7e33c 100644 --- a/config/config.txt +++ b/config/config.txt @@ -329,3 +329,9 @@ MINUTE_TOPIC_LIMIT 100 ## Send a message to IRC when starting a new game #IRC_ANNOUNCE_NEW_GAME +<<<<<<< HEAD +======= + +## Allow admin hrefs that don't use the new token system, will eventually be removed +DEBUG_ADMIN_HREFS +>>>>>>> 84b1e3d... [s] Adds a security token to all admin hrefs (#29839) From 8e0ef4f38f18879ebd14c0e9853c2a80481444c5 Mon Sep 17 00:00:00 2001 From: Kyle Spier-Swenson Date: Sat, 9 Sep 2017 12:23:54 -0700 Subject: [PATCH 017/163] num2text the Instances number (#30509) --- code/modules/mob/mob.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 76553d17fd..a759bb89ec 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -587,7 +587,7 @@ var/turf/T = get_turf(client.eye) stat("Location:", COORD(T)) stat("CPU:", "[world.cpu]") - stat("Instances:", "[world.contents.len]") + stat("Instances:", "[num2text(world.contents.len, 10)]") GLOB.stat_entry() config.stat_entry() stat(null) From dc2c9fb07defb97d06b26f466af68ef910ab57f8 Mon Sep 17 00:00:00 2001 From: AnturK Date: Sun, 10 Sep 2017 00:12:52 +0200 Subject: [PATCH 019/163] Fixes admin topics --- code/modules/admin/topic.dm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index f7b0f8b6ff..fc52c79de1 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -1,3 +1,19 @@ +<<<<<<< HEAD +======= +/datum/admins/proc/CheckAdminHref(href, href_list) + var/auth = href_list["admin_token"] + . = auth && (auth == href_token || auth == GLOB.href_token) + if(.) + return + var/msg = !auth ? "no" : "a bad" + message_admins("[key_name_admin(usr)] clicked an href with [msg] authorization key!") + if(config.debug_admin_hrefs) + message_admins("Debug mode enabled, call not blocked. Please ask your coders to review this round's logs.") + log_world("UAH: [href]") + return TRUE + log_admin_private("[key_name(usr)] clicked an href with [msg] authorization key! [href]") + +>>>>>>> 1204251... Fixes admin topics (#30554) /datum/admins/Topic(href, href_list) ..() From eaeaae7bef957e594e2727d02a7f3accd4392567 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Sat, 9 Sep 2017 20:39:49 -0400 Subject: [PATCH 020/163] Added warnings for ultrasafe and safe security modes (#30515) --- code/__DEFINES/misc.dm | 5 +++++ code/game/world.dm | 19 +++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm index 209a33e0c5..1c79dde65f 100644 --- a/code/__DEFINES/misc.dm +++ b/code/__DEFINES/misc.dm @@ -458,3 +458,8 @@ GLOBAL_LIST_INIT(ghost_others_options, list(GHOST_OTHERS_SIMPLE, GHOST_OTHERS_DE #define SHELLEO_ERRORLEVEL 1 #define SHELLEO_STDOUT 2 #define SHELLEO_STDERR 3 + +//server security mode +#define SECURITY_SAFE 1 +#define SECURITY_ULTRASAFE 2 +#define SECURITY_TRUSTED 3 diff --git a/code/game/world.dm b/code/game/world.dm index a1fcc364cd..991e6230e6 100644 --- a/code/game/world.dm +++ b/code/game/world.dm @@ -1,3 +1,6 @@ +GLOBAL_VAR(security_mode) +GLOBAL_PROTECT(security_mode) + /world/New() log_world("World loaded at [time_stamp()]") @@ -5,6 +8,8 @@ GLOB.config_error_log = GLOB.sql_error_log = GLOB.world_href_log = GLOB.world_runtime_log = GLOB.world_attack_log = GLOB.world_game_log = file("data/logs/config_error.log") //temporary file used to record errors with loading config, moved to log directory once logging is set bl + CheckSecurityMode() + make_datum_references_lists() //initialises global lists for referencing frequently used datums (so that we only ever do it once) config = new @@ -94,6 +99,20 @@ if(GLOB.round_id) log_game("Round ID: [GLOB.round_id]") +/world/proc/CheckSecurityMode() + //try to write to data + if(!text2file("The world is running at least safe mode", "data/server_security_check.lock")) + GLOB.security_mode = SECURITY_ULTRASAFE + warning("/tg/station 13 is not supported in ultrasafe security mode. Everything will break!") + return + + //try to shell + if(shell("echo \"The world is running in trusted mode\"") != null) + GLOB.security_mode = SECURITY_TRUSTED + else + GLOB.security_mode = SECURITY_SAFE + warning("/tg/station 13 uses many file operations, a few shell()s, and some external call()s. Trusted mode is recommended. You can download our source code for your own browsing and compilation at https://github.com/tgstation/tgstation") + /world/Topic(T, addr, master, key) var/list/input = params2list(T) From 8a297a3a9cc58c056886a889eeffa4554814f861 Mon Sep 17 00:00:00 2001 From: KorPhaeron Date: Sat, 9 Sep 2017 21:07:02 -0500 Subject: [PATCH 022/163] People in soft crit will leave blood trails when dragging themselves/Will take less damage in soft crit --- .../mob/living/carbon/human/human_movement.dm | 56 +++++++++++++++++++ code/modules/mob/living/carbon/life.dm | 10 +++- code/modules/mob/living/living.dm | 28 +++++----- 3 files changed, 78 insertions(+), 16 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm index 52650ec273..d01048c69a 100644 --- a/code/modules/mob/living/carbon/human/human_movement.dm +++ b/code/modules/mob/living/carbon/human/human_movement.dm @@ -12,6 +12,7 @@ /mob/living/carbon/human/experience_pressure_difference() playsound(src, 'sound/effects/space_wind.ogg', 50, 1) if(shoes && shoes.flags_1&NOSLIP_1) +<<<<<<< HEAD return 0 return ..() @@ -65,3 +66,58 @@ if(..()) return 1 return dna.species.space_move(src) +======= + return 0 + return ..() + +/mob/living/carbon/human/mob_has_gravity() + . = ..() + if(!.) + if(mob_negates_gravity()) + . = 1 + +/mob/living/carbon/human/mob_negates_gravity() + return ((shoes && shoes.negates_gravity()) || dna.species.negates_gravity(src)) + +/mob/living/carbon/human/Move(NewLoc, direct) + . = ..() + for(var/datum/mutation/human/HM in dna.mutations) + HM.on_move(src, NewLoc) + + if(shoes) + if(!lying && !buckled) + if(loc == NewLoc) + if(!has_gravity(loc)) + return + var/obj/item/clothing/shoes/S = shoes + + //Bloody footprints + var/turf/T = get_turf(src) + if(S.bloody_shoes && S.bloody_shoes[S.blood_state]) + var/obj/effect/decal/cleanable/blood/footprints/oldFP = locate(/obj/effect/decal/cleanable/blood/footprints) in T + if(oldFP && oldFP.blood_state == S.blood_state) + return + else + //No oldFP or it's a different kind of blood + S.bloody_shoes[S.blood_state] = max(0, S.bloody_shoes[S.blood_state]-BLOOD_LOSS_PER_STEP) + var/obj/effect/decal/cleanable/blood/footprints/FP = new /obj/effect/decal/cleanable/blood/footprints(T) + FP.blood_state = S.blood_state + FP.entered_dirs |= dir + FP.bloodiness = S.bloody_shoes[S.blood_state] + if(S.blood_DNA && S.blood_DNA.len) + FP.transfer_blood_dna(S.blood_DNA) + FP.update_icon() + update_inv_shoes() + //End bloody footprints + + S.step_action() +/mob/living/carbon/human/Moved() + . = ..() + if(buckled_mobs && buckled_mobs.len && riding_datum) + riding_datum.on_vehicle_move() + +/mob/living/carbon/human/Process_Spacemove(movement_dir = 0) //Temporary laziness thing. Will change to handles by species reee. + if(..()) + return 1 + return dna.species.space_move(src) +>>>>>>> 96a55aa... People in soft crit will leave blood trails when dragging themselves/Will take less damage in soft crit (#30482) diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm index d6d6084380..38e13f41d0 100644 --- a/code/modules/mob/living/carbon/life.dm +++ b/code/modules/mob/living/carbon/life.dm @@ -58,12 +58,14 @@ var/datum/gas_mixture/breath - if(health <= HEALTH_THRESHOLD_CRIT || (pulledby && pulledby.grab_state >= GRAB_KILL && !getorganslot("breathing_tube"))) + if(health <= HEALTH_THRESHOLD_FULLCRIT || (pulledby && pulledby.grab_state >= GRAB_KILL && !getorganslot("breathing_tube"))) losebreath++ + else if(health <= HEALTH_THRESHOLD_CRIT) + losebreath += 0.25 + //Suffocate if(losebreath > 0) - losebreath-- if(prob(10)) emote("gasp") if(istype(loc, /obj/)) @@ -113,7 +115,9 @@ if(!breath || (breath.total_moles() == 0) || !lungs) if(reagents.has_reagent("epinephrine") && lungs) return - adjustOxyLoss(1) + var/oxy_loss = min(losebreath, 1) + adjustOxyLoss(oxy_loss) + losebreath -= oxy_loss failed_last_breath = 1 throw_alert("not_enough_oxy", /obj/screen/alert/not_enough_oxy) return 0 diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 70a8474165..b2c771db08 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -429,6 +429,7 @@ else return 0 + var/old_direction = dir var/atom/movable/pullee = pulling if(pullee && get_dist(src, pullee) > 1) stop_pulling() @@ -444,10 +445,6 @@ var/pull_dir = get_dir(src, pulling) if(get_dist(src, pulling) > 1 || ((pull_dir - 1) & pull_dir)) //puller and pullee more than one tile away or in diagonal position - if(isliving(pulling)) - var/mob/living/M = pulling - if(M.lying && !M.buckled && (prob(M.getBruteLoss()*200/M.maxHealth))) - M.makeTrail(T) pulling.Move(T, get_dir(pulling, T)) //the pullee tries to reach our previous position if(pulling && get_dist(src, pulling) > 1) //the pullee couldn't keep up stop_pulling() @@ -458,6 +455,10 @@ if (s_active && !(CanReach(s_active,view_only = TRUE))) s_active.close(src) + if(lying && !buckled && prob(getBruteLoss()*200/maxHealth)) + + makeTrail(newloc, T, old_direction) + /mob/living/movement_delay(ignorewalk = 0) . = ..() if(isopenturf(loc) && !is_flying()) @@ -474,31 +475,32 @@ if(MOVE_INTENT_WALK) . += config.walk_speed -/mob/living/proc/makeTrail(turf/target_turf) +/mob/living/proc/makeTrail(turf/target_turf, turf/start, direction) if(!has_gravity()) return var/blood_exists = FALSE - for(var/obj/effect/decal/cleanable/trail_holder/C in loc) //checks for blood splatter already on the floor + for(var/obj/effect/decal/cleanable/trail_holder/C in start) //checks for blood splatter already on the floor blood_exists = TRUE - if(isturf(loc)) + if(isturf(start)) var/trail_type = getTrail() if(trail_type) var/brute_ratio = round(getBruteLoss() / maxHealth, 0.1) if(blood_volume && blood_volume > max(BLOOD_VOLUME_NORMAL*(1 - brute_ratio * 0.25), 0))//don't leave trail if blood volume below a threshold blood_volume = max(blood_volume - max(1, brute_ratio * 2), 0) //that depends on our brute damage. - var/newdir = get_dir(target_turf, loc) - if(newdir != dir) - newdir = newdir | dir + var/newdir = get_dir(target_turf, start) + if(newdir != direction) + newdir = newdir | direction if(newdir == 3) //N + S newdir = NORTH else if(newdir == 12) //E + W newdir = EAST if((newdir in GLOB.cardinals) && (prob(50))) - newdir = turn(get_dir(target_turf, loc), 180) + newdir = turn(get_dir(target_turf, start), 180) if(!blood_exists) - new /obj/effect/decal/cleanable/trail_holder(loc) - for(var/obj/effect/decal/cleanable/trail_holder/TH in loc) + new /obj/effect/decal/cleanable/trail_holder(start) + + for(var/obj/effect/decal/cleanable/trail_holder/TH in start) if((!(newdir in TH.existing_dirs) || trail_type == "trails_1" || trail_type == "trails_2") && TH.existing_dirs.len <= 16) //maximum amount of overlays is 16 (all light & heavy directions filled) TH.existing_dirs += newdir TH.add_overlay(image('icons/effects/blood.dmi', trail_type, dir = newdir)) From d158ec95285f53e801b72773690b431e0957d56a Mon Sep 17 00:00:00 2001 From: Kerbin-Fiber Date: Sun, 10 Sep 2017 03:42:16 -0500 Subject: [PATCH 023/163] Adds Donksoft Toy Vendor (Machine Board) to the Circuit Imprinter --- code/game/machinery/vending.dm | 61 ++++++++++++ .../circuitboards/machine_circuitboards.dm | 10 +- code/game/objects/items/vending_items.dm | 90 ++++++++++++++++++ code/modules/cargo/packs.dm | 3 +- .../boxes_magazines/external_mag.dm | 11 ++- .../modules/projectiles/guns/ballistic/toy.dm | 14 ++- .../research/designs/machine_designs.dm | 8 ++ icons/obj/vending_restock.dmi | Bin 1343 -> 1454 bytes 8 files changed, 192 insertions(+), 5 deletions(-) diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 427bc95253..e65d71e38f 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -1138,6 +1138,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C /obj/item/clothing/ears/headphones = 10) contraband = list(/obj/item/clothing/under/syndicate/tacticool=1, /obj/item/clothing/mask/balaclava=1, /obj/item/clothing/head/ushanka=1, /obj/item/clothing/under/soviet=1, /obj/item/storage/belt/fannypack/black=2, /obj/item/clothing/suit/jacket/letterman_syndie=1, /obj/item/clothing/under/jabroni=1, /obj/item/clothing/suit/vapeshirt=1, /obj/item/clothing/under/geisha=1) premium = list(/obj/item/clothing/under/suit_jacket/checkered=1, /obj/item/clothing/head/mailman=1, /obj/item/clothing/under/rank/mailman=1, /obj/item/clothing/suit/jacket/leather=1, /obj/item/clothing/suit/jacket/leather/overcoat=1, /obj/item/clothing/under/pants/mustangjeans=1, /obj/item/clothing/neck/necklace/dope=3, /obj/item/clothing/suit/jacket/letterman_nanotrasen=1) +<<<<<<< HEAD refill_canister = /obj/item/vending_refill/clothing /obj/machinery/vending/toyliberationstation @@ -1169,3 +1170,63 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C #undef STANDARD_CHARGE #undef CONTRABAND_CHARGE #undef COIN_CHARGE +======= + refill_canister = /obj/item/vending_refill/clothing + +/obj/machinery/vending/toyliberationstation + name = "\improper Syndicate Donksoft Toy Vendor" + desc = "A ages 8 and up approved vendor that dispenses toys. If you were to find the right wires, you can unlock the adult mode setting!" + icon_state = "syndi" + req_access_txt = "1" + product_slogans = "Get your cool toys today!;Trigger a valid hunter today!;Quality toy weapons for cheap prices!;Give them to HoPs for all access!;Give them to HoS to get perma briged!" + product_ads = "Feel robust with your toys!;Express your inner child today!;Toy weapons don't kill people, but valid hunters do!;Who needs responsibilities when you have toy weapons?;Make your next murder FUN!" + vend_reply = "Come back for more!" + products = list(/obj/item/gun/ballistic/automatic/toy/unrestricted = 10, + /obj/item/gun/ballistic/automatic/toy/pistol/unrestricted = 10, + /obj/item/gun/ballistic/shotgun/toy/unrestricted = 10, + /obj/item/toy/sword = 10, + /obj/item/ammo_box/foambox = 20, + /obj/item/toy/foamblade = 10, + /obj/item/toy/syndicateballoon = 10, + /obj/item/clothing/suit/syndicatefake = 5, + /obj/item/clothing/head/syndicatefake = 5) //OPS IN DORMS oh wait it's just a assistant + contraband = list(/obj/item/gun/ballistic/shotgun/toy/crossbow = 10, //Congrats, you unlocked the +18 setting! + /obj/item/gun/ballistic/automatic/c20r/toy/riot/unrestricted = 10, + /obj/item/gun/ballistic/automatic/l6_saw/toy/riot/unrestricted = 10, + /obj/item/ammo_box/foambox/riot = 20, + /obj/item/toy/katana = 10, + /obj/item/twohanded/dualsaber/toy = 5, + /obj/item/toy/cards/deck/syndicate = 10) //Gambling and it hurts, making it a +18 item + armor = list(melee = 100, bullet = 100, laser = 100, energy = 100, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 50) + resistance_flags = FIRE_PROOF + refill_canister = /obj/item/vending_refill/donksoft + +/obj/machinery/vending/donksofttoyvendor + name = "\improper Donksoft Toy Vendor" + desc = "Ages 8 and up approved vendor that dispenses toys." + icon_state = "syndi" + product_slogans = "Get your cool toys today!;Trigger a valid hunter today!;Quality toy weapons for cheap prices!;Give them to HoPs for all access!;Give them to HoS to get perma briged!" + product_ads = "Feel robust with your toys!;Express your inner child today!;Toy weapons don't kill people, but valid hunters do!;Who needs responsibilities when you have toy weapons?;Make your next murder FUN!" + vend_reply = "Come back for more!" + products = list(/obj/item/gun/ballistic/automatic/toy/unrestricted = 10, + /obj/item/gun/ballistic/automatic/toy/pistol/unrestricted = 10, + /obj/item/gun/ballistic/shotgun/toy/unrestricted = 10, + /obj/item/toy/sword = 10, + /obj/item/ammo_box/foambox = 20, + /obj/item/toy/foamblade = 10, + /obj/item/toy/syndicateballoon = 10, + /obj/item/clothing/suit/syndicatefake = 5, + /obj/item/clothing/head/syndicatefake = 5) + contraband = list(/obj/item/gun/ballistic/shotgun/toy/crossbow = 10, + /obj/item/gun/ballistic/automatic/c20r/toy/unrestricted = 10, + /obj/item/gun/ballistic/automatic/l6_saw/toy/unrestricted = 10, + /obj/item/toy/katana = 10, + /obj/item/twohanded/dualsaber/toy = 5) + armor = list(melee = 100, bullet = 100, laser = 100, energy = 100, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 50) + resistance_flags = FIRE_PROOF + refill_canister = /obj/item/vending_refill/donksoft + +#undef STANDARD_CHARGE +#undef CONTRABAND_CHARGE +#undef COIN_CHARGE +>>>>>>> 91a9164... Adds Donksoft Toy Vendor (Machine Board) to the Circuit Imprinter (#30531) diff --git a/code/game/objects/items/circuitboards/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machine_circuitboards.dm index 645e8c05a3..cbbf1d0cb7 100644 --- a/code/game/objects/items/circuitboards/machine_circuitboards.dm +++ b/code/game/objects/items/circuitboards/machine_circuitboards.dm @@ -720,4 +720,12 @@ /obj/item/stock_parts/matter_bin = 1, /obj/item/stack/cable_coil = 2, /obj/item/stock_parts/console_screen = 1, - /obj/item/stack/sheet/glass = 1) \ No newline at end of file + /obj/item/stack/sheet/glass = 1) + +/obj/item/circuitboard/machine/vending/donksofttoyvendor + name = "Donksoft Toy Vendor (Machine Board)" + build_path = /obj/machinery/vending/donksofttoyvendor + origin_tech = "programming=1;syndicate=2" + req_components = list( + /obj/item/stock_parts/console_screen = 1, + /obj/item/vending_refill/donksoft = 3) diff --git a/code/game/objects/items/vending_items.dm b/code/game/objects/items/vending_items.dm index 3227228127..7837b10939 100644 --- a/code/game/objects/items/vending_items.dm +++ b/code/game/objects/items/vending_items.dm @@ -1,3 +1,4 @@ +<<<<<<< HEAD /obj/item/vending_refill name = "resupply canister" var/machine_name = "Generic" @@ -79,3 +80,92 @@ icon_state = "refill_medical" charges = list(26, 5, 3)// of 76 standard, 13 contraband, 8 premium init_charges = list(26, 5, 3) +======= +/obj/item/vending_refill + name = "resupply canister" + var/machine_name = "Generic" + + icon = 'icons/obj/vending_restock.dmi' + icon_state = "refill_snack" + item_state = "restock_unit" + lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' + righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' + flags_1 = CONDUCT_1 + force = 7 + throwforce = 10 + throw_speed = 1 + throw_range = 7 + w_class = WEIGHT_CLASS_BULKY + armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 70, acid = 30) + var/charges = list(0, 0, 0) //how many restocking "charges" the refill has for standard/contraband/coin products + var/init_charges = list(0, 0, 0) + + +/obj/item/vending_refill/New(amt = -1) + ..() + name = "\improper [machine_name] restocking unit" + if(isnum(amt) && amt > -1) + charges[1] = amt + +/obj/item/vending_refill/examine(mob/user) + ..() + if(charges[1] > 0) + to_chat(user, "It can restock [charges[1]+charges[2]+charges[3]] item(s).") + else + to_chat(user, "It's empty!") + +//NOTE I decided to go for about 1/3 of a machine's capacity + +/obj/item/vending_refill/boozeomat + machine_name = "Booze-O-Mat" + icon_state = "refill_booze" + charges = list(54, 4, 0)//of 159 standard, 12 contraband + init_charges = list(54, 4, 0) + +/obj/item/vending_refill/coffee + machine_name = "Solar's Best Hot Drinks" + icon_state = "refill_joe" + charges = list(25, 4, 0)//of 75 standard, 12 contraband + init_charges = list(25, 4, 0) + +/obj/item/vending_refill/snack + machine_name = "Getmore Chocolate Corp" + charges = list(12, 2, 0)//of 36 standard, 6 contraband + init_charges = list(12, 2, 0) + +/obj/item/vending_refill/cola + machine_name = "Robust Softdrinks" + icon_state = "refill_cola" + charges = list(30, 4, 1)//of 90 standard, 12 contraband, 1 premium + init_charges = list(30, 4, 1) + +/obj/item/vending_refill/cigarette + machine_name = "ShadyCigs Deluxe" + icon_state = "refill_smoke" + charges = list(12, 3, 2)// of 36 standard, 9 contraband, 6 premium + init_charges = list(12, 3, 2) + +/obj/item/vending_refill/autodrobe + machine_name = "AutoDrobe" + icon_state = "refill_costume" + charges = list(32, 2, 3)// of 96 standard, 6 contraband, 9 premium + init_charges = list(32, 2, 3) + +/obj/item/vending_refill/clothing + machine_name = "ClothesMate" + icon_state = "refill_clothes" + charges = list(37, 4, 4)// of 111 standard, 12 contraband, 10 premium(?) + init_charges = list(37, 4, 4) + +/obj/item/vending_refill/medical + machine_name = "NanoMed" + icon_state = "refill_medical" + charges = list(26, 5, 3)// of 76 standard, 13 contraband, 8 premium + init_charges = list(26, 5, 3) + +/obj/item/vending_refill/donksoft + machine_name = "Donksoft Toy Vendor" + icon_state = "refill_donksoft" + charges = list(32,28,0)// of 90 standard, 75 contraband, 0 premium + init_charges = list(32,28,0) +>>>>>>> 91a9164... Adds Donksoft Toy Vendor (Machine Board) to the Circuit Imprinter (#30531) diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index 8bdbc328ad..ba536acdac 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -1648,7 +1648,8 @@ /obj/item/stack/tile/fakespace/loaded, /obj/item/gun/ballistic/shotgun/toy/crossbow, /obj/item/toy/redbutton, - /obj/item/toy/eightball) + /obj/item/toy/eightball, + /obj/item/vending_refill/donksoft) crate_name = "toy crate" /datum/supply_pack/misc/autodrobe diff --git a/code/modules/projectiles/boxes_magazines/external_mag.dm b/code/modules/projectiles/boxes_magazines/external_mag.dm index 3bfb90224d..525466be28 100644 --- a/code/modules/projectiles/boxes_magazines/external_mag.dm +++ b/code/modules/projectiles/boxes_magazines/external_mag.dm @@ -324,6 +324,7 @@ /obj/item/ammo_box/magazine/toy/smg name = "foam force SMG magazine" icon_state = "smg9mm-42" + ammo_type = /obj/item/ammo_casing/caseless/foam_dart max_ammo = 20 /obj/item/ammo_box/magazine/toy/smg/update_icon() @@ -348,23 +349,29 @@ /obj/item/ammo_box/magazine/toy/smgm45 name = "donksoft SMG magazine" caliber = "foam_force" - ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot + ammo_type = /obj/item/ammo_casing/caseless/foam_dart max_ammo = 20 /obj/item/ammo_box/magazine/toy/smgm45/update_icon() ..() icon_state = "c20r45-[round(ammo_count(),2)]" +/obj/item/ammo_box/magazine/toy/smgm45/riot + ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot + /obj/item/ammo_box/magazine/toy/m762 name = "donksoft box magazine" caliber = "foam_force" - ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot + ammo_type = /obj/item/ammo_casing/caseless/foam_dart max_ammo = 50 /obj/item/ammo_box/magazine/toy/m762/update_icon() ..() icon_state = "a762-[round(ammo_count(),10)]" +/obj/item/ammo_box/magazine/toy/m762/riot + ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot + diff --git a/code/modules/projectiles/guns/ballistic/toy.dm b/code/modules/projectiles/guns/ballistic/toy.dm index 135540436a..fc1ad963e4 100644 --- a/code/modules/projectiles/guns/ballistic/toy.dm +++ b/code/modules/projectiles/guns/ballistic/toy.dm @@ -89,6 +89,12 @@ /obj/item/gun/ballistic/automatic/c20r/toy/unrestricted pin = /obj/item/device/firing_pin +/obj/item/gun/ballistic/automatic/smgm45/toy/riot + mag_type = /obj/item/ammo_box/magazine/toy/smgm45/riot + +/obj/item/gun/ballistic/automatic/c20r/toy/riot/unrestricted + pin = /obj/item/device/firing_pin + /obj/item/gun/ballistic/automatic/l6_saw/toy name = "donksoft LMG" desc = "A heavily modified toy light machine gun, designated 'L6 SAW'. Ages 8 and up." @@ -99,4 +105,10 @@ casing_ejector = 0 /obj/item/gun/ballistic/automatic/l6_saw/toy/unrestricted - pin = /obj/item/device/firing_pin \ No newline at end of file + pin = /obj/item/device/firing_pin + +/obj/item/gun/ballistic/automatic/l6_saw/toy/riot + mag_type = /obj/item/ammo_box/magazine/toy/m762/riot + +/obj/item/gun/ballistic/automatic/l6_saw/toy/riot/unrestricted + pin = /obj/item/device/firing_pin diff --git a/code/modules/research/designs/machine_designs.dm b/code/modules/research/designs/machine_designs.dm index cee8167666..bb2887e2a1 100644 --- a/code/modules/research/designs/machine_designs.dm +++ b/code/modules/research/designs/machine_designs.dm @@ -418,3 +418,11 @@ req_tech = list("programming" = 1) build_path = /obj/item/circuitboard/machine/deep_fryer category = list ("Misc. Machinery") + +/datum/design/board/donksofttoyvendor + name = "Machine Design (Donksoft Toy Vendor Board)" + desc = "The circuit board for a Donksoft Toy Vendor." + id = "donksofttoyvendor" + req_tech = list("programming" = 1, "syndicate" = 2) + build_path = /obj/item/circuitboard/machine/vending/donksofttoyvendor + category = list ("Misc. Machinery") diff --git a/icons/obj/vending_restock.dmi b/icons/obj/vending_restock.dmi index eac7b8a266846d2499b22b5b6e97f7af561cf82d..7f8289a0877ff2bd07cb43f6ce9f4a87438919a6 100644 GIT binary patch delta 1220 zcmV;#1Uvh`3a$%~Bmw!6C6`EZb904-g_M+(#Fb#Oi&E@fIA+W<{{R300000pGnoJY z|7QO)0RR7)GiGKp0RJ<{4L8HTui_3W+1c5vtE)afKCKHe|Nk?Q=^hn4(ms^{0004W zQchCy3`3+~O1nNB-q&)eg<)mv8?pj1=T=e>dO&00Xf}L_t(& zf$fzvxj7>vqc@d+a_~a|FS?%bawd!aD=E2MsW^_K<}Q=w`j1re9xAE0Q>oat z?I^ilWpV-kl*wYEfA#a<0C2~#KVuDd7pgv181PkS-cuNG?$}6Sz`45s3~)Iowgs%? z4sx{Icgw(_HvI)^m>v<P-O-( zUiaPfdfJ1MVBpR38T>SG=KvbOf4hhmp!a_zJwm&{06quM zKz>B@`LbVopf#X9fCko-*b(89$e97>jxFQ#8Fo1rdQhq@z3S@{Jp!!fj-2~$%6%Wc zifYSKs$o1MhxOs34zHh?&;GJ6;6_G9Mn?aQW_{&bK*IHJ!O~+2)cHPaps*1FZoTo9 z)wQ*?vZcJff0-xl)q&+hHzyT6s?EujuCkFUTJe zB^ zEtvtW8e|567;d+Bc6PQor#+B_-wrLo`Q{c9(>2Z4e@)Nh3uq6-0=s*Ad;94QP$=?F zrxPS+P{UiOD>XRq4$}ND^ne-cQ>7d{2aI<*nFHnBLz%%r^T5;eV0s5_`3^ei4!Va& zviX1=5zqHx57_5)1L^$GXvyXSX2AL3kv!iwy)@s`9!U7^?rzG%g82c~7xTYY!2fc7 zF!OK`9lD&GImr}YO) zPRMz5@$(Gue7>jkd%FB@Q3ow25y1)rzUsKA&;Nry*79Ew*3Sn$bg9k%13c7nf=R)A zaCxQ8|9IGya6(ANNhFEy`1<$th-c5ss~c_pe;;;-A}6=Ew}f+YD(s+MAIGEXQ9Mo- zT-`{2ADB#116p6;w0^`LYWRX+FXXbM$_&mTVF#A=yd3Yx%g;%^ zQh#`q<$r53N#}#=lfcRA2B^U~>;cR7@TbA^S4l$4ajm0+@qQtVzh|7QQl4L8HTui_3W z+1c5vtE)afKCKHeDJdyhT3TJ1z8pAjy}i9BKaUnHR>na97Z(>WFfighTFU?c00DGT zPE!Ct=GbNc005wqHvuhwW^B@dOjPjn2D=m??%o?d-ezibY`cC?&8e3Uh>SF=gW9jw zQasTnm&3fH`x0M3z(a{@SbcR&ECX2h02bR1!%<-S`50rkx< zP$zVYh>l|$X}KS`Frcv^YEbitjw2}`1-rX~OEZ85@Gj!~JJl*c#T&jWuBS7oNC94r z-=ORR@GcSoj=r@Z?BbjN&f6`lKOcDE zp|<}=IMVVKKGL5LFqnbFyG{N1;pkXd-@{PUZ#V;3@8Jv}KRP~91yI*;6%fkh_Vn!R z?38ml14a4mQwz?IPq5ssX}|7x9{&KHfow21KR>^J5G%lu%=`U*nC?NHoZz7{VC0QN z|CeUK0xqZo2hRcH{r)O}^5LZ_VAL6Tni*`apr>9zU#wtwd8IlZur1>KUY-H_J6(V{ zKQz0l^8pLs{PIfO?>nC8_jCpdJ{SxHj|$EY&|mKVUI8z8elX_)BO@atqrax2eqY23 z{ny2Ray+@dz8+h-d^-C%o6brmK>x|a%Hz{tQ|ezb0Q7t6Ki2hsizbjfuYv&XG8yap z|7=Ri1;Bnk#y8sjKO^&!0kGfS+-mzjnGeeb&`L?}e%~#4_q@5i*Y^MUu=ENVjb*&J zTg1!M;Pzhm|A8bC0o1=-_hAN$IA%Yo!99L`&<4!O;|Bs3G+@C4@WYcFkfcgEc?`-2 zusuq5h#EXRJ!=CVgO{=ami4+HU&Q;bX}^DZR`q`?NyPaecqusp*6)|`+wv`5rv3g| z-T#wB^#8K{yx%XGKG^>Y1Geq|g#o7j8~xAv14w70nwsEWfB*mh07*qoM6N<$f^Xk5 A1ONa4 From adc85f0edca5f9bd267692a0fad2c2488939538f Mon Sep 17 00:00:00 2001 From: oranges Date: Sun, 10 Sep 2017 21:00:32 +1000 Subject: [PATCH 024/163] In which smartfridge ui_data is called only when needed, and a minor display bug involving drying racks is fixed --- .../kitchen_machinery/smartfridge.dm | 55 +++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm index e996429939..491da12a81 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm @@ -150,6 +150,7 @@ if(stat) return FALSE +<<<<<<< HEAD var/dat = "Select an item:
    " if (contents.len == 0) @@ -189,6 +190,39 @@ /obj/machinery/smartfridge/Topic(var/href, var/list/href_list) if(..()) +======= +/obj/machinery/smartfridge/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state) + ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open) + if(!ui) + ui = new(user, src, ui_key, "smartvend", name, 440, 550, master_ui, state) + ui.set_autoupdate(FALSE) + ui.open() + +/obj/machinery/smartfridge/ui_data(mob/user) + . = list() + + var/listofitems = list() + for (var/I in src) + var/atom/movable/O = I + if (!QDELETED(O)) + if (listofitems[O.name]) + listofitems[O.name]["amount"]++ + else + listofitems[O.name] = list("name" = O.name, "type" = O.type, "amount" = 1) + sortList(listofitems) + + .["contents"] = listofitems + .["name"] = name + .["isdryer"] = FALSE + + +/obj/machinery/smartfridge/handle_atom_del(atom/A) // Update the UIs in case something inside gets deleted + SStgui.update_uis(src) + +/obj/machinery/smartfridge/ui_act(action, params) + . = ..() + if(.) +>>>>>>> 5f6b2a9... Merge pull request #30519 from vuonojenmustaturska/smartfridges2electricboogaloo return usr.set_machine(src) @@ -240,6 +274,7 @@ /obj/machinery/smartfridge/drying_rack/default_deconstruction_crowbar(obj/item/crowbar/C, ignore_panel = 1) ..() +<<<<<<< HEAD /obj/machinery/smartfridge/drying_rack/interact(mob/user) var/dat = ..() if(dat) @@ -254,6 +289,25 @@ toggle_drying(FALSE) updateUsrDialog() update_icon() +======= +/obj/machinery/smartfridge/drying_rack/ui_data(mob/user) + . = ..() + .["isdryer"] = TRUE + .["verb"] = "Take" + .["drying"] = drying + + +/obj/machinery/smartfridge/drying_rack/ui_act(action, params) + . = ..() + if(.) + update_icon() // This is to handle a case where the last item is taken out manually instead of through drying pop-out + return + switch(action) + if("Dry") + toggle_drying(FALSE) + return TRUE + return FALSE +>>>>>>> 5f6b2a9... Merge pull request #30519 from vuonojenmustaturska/smartfridges2electricboogaloo /obj/machinery/smartfridge/drying_rack/power_change() if(powered() && anchored) @@ -279,6 +333,7 @@ ..() if(drying) if(rack_dry())//no need to update unless something got dried + SStgui.update_uis(src) update_icon() /obj/machinery/smartfridge/drying_rack/accept_check(obj/item/O) From 0e24ac55a545713f9290e5a2d0c9fb6be3ab41e6 Mon Sep 17 00:00:00 2001 From: Leo Date: Sun, 10 Sep 2017 11:35:13 -0300 Subject: [PATCH 025/163] Merge pull request #30558 from Cyberboss/IFUCKINGHATETHISGODAMNSTUPIDASSFILE Adds href tokens to topic.dm --- code/modules/admin/topic.dm | 116 ++++++++++++++++++------------------ 1 file changed, 58 insertions(+), 58 deletions(-) diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index f7b0f8b6ff..8f29176568 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -604,15 +604,15 @@ //Regular jobs //Command (Blue) dat += "" - dat += "" + dat += "" for(var/jobPos in GLOB.command_positions) if(!jobPos) continue if(jobban_isbanned(M, jobPos)) - dat += "" + dat += "" counter++ else - dat += "" + dat += "" counter++ if(counter >= 6) //So things dont get squiiiiished! @@ -623,15 +623,15 @@ //Security (Red) counter = 0 dat += "
    Command Positions
    Command Positions
    [jobPos][jobPos][jobPos][jobPos]
    " - dat += "" + dat += "" for(var/jobPos in GLOB.security_positions) if(!jobPos) continue if(jobban_isbanned(M, jobPos)) - dat += "" + dat += "" counter++ else - dat += "" + dat += "" counter++ if(counter >= 5) //So things dont get squiiiiished! @@ -642,15 +642,15 @@ //Engineering (Yellow) counter = 0 dat += "
    Security Positions
    Security Positions
    [jobPos][jobPos][jobPos][jobPos]
    " - dat += "" + dat += "" for(var/jobPos in GLOB.engineering_positions) if(!jobPos) continue if(jobban_isbanned(M, jobPos)) - dat += "" + dat += "" counter++ else - dat += "" + dat += "" counter++ if(counter >= 5) //So things dont get squiiiiished! @@ -661,15 +661,15 @@ //Medical (White) counter = 0 dat += "
    Engineering Positions
    Engineering Positions
    [jobPos][jobPos][jobPos][jobPos]
    " - dat += "" + dat += "" for(var/jobPos in GLOB.medical_positions) if(!jobPos) continue if(jobban_isbanned(M, jobPos)) - dat += "" + dat += "" counter++ else - dat += "" + dat += "" counter++ if(counter >= 5) //So things dont get squiiiiished! @@ -680,15 +680,15 @@ //Science (Purple) counter = 0 dat += "
    Medical Positions
    Medical Positions
    [jobPos][jobPos][jobPos][jobPos]
    " - dat += "" + dat += "" for(var/jobPos in GLOB.science_positions) if(!jobPos) continue if(jobban_isbanned(M, jobPos)) - dat += "" + dat += "" counter++ else - dat += "" + dat += "" counter++ if(counter >= 5) //So things dont get squiiiiished! @@ -699,15 +699,15 @@ //Supply (Brown) counter = 0 dat += "
    Science Positions
    Science Positions
    [jobPos][jobPos][jobPos][jobPos]
    " - dat += "" + dat += "" for(var/jobPos in GLOB.supply_positions) if(!jobPos) continue if(jobban_isbanned(M, jobPos)) - dat += "" + dat += "" counter++ else - dat += "" + dat += "" counter++ if(counter >= 5) //So things dont get COPYPASTE! @@ -718,15 +718,15 @@ //Civilian (Grey) counter = 0 dat += "
    Supply Positions
    Supply Positions
    [jobPos][jobPos][jobPos][jobPos]
    " - dat += "" + dat += "" for(var/jobPos in GLOB.civilian_positions) if(!jobPos) continue if(jobban_isbanned(M, jobPos)) - dat += "" + dat += "" counter++ else - dat += "" + dat += "" counter++ if(counter >= 5) //So things dont get squiiiiished! @@ -737,15 +737,15 @@ //Non-Human (Green) counter = 0 dat += "
    Civilian Positions
    Civilian Positions
    [jobPos][jobPos][jobPos][jobPos]
    " - dat += "" + dat += "" for(var/jobPos in GLOB.nonhuman_positions) if(!jobPos) continue if(jobban_isbanned(M, jobPos)) - dat += "" + dat += "" counter++ else - dat += "" + dat += "" counter++ if(counter >= 5) //So things dont get squiiiiished! @@ -756,71 +756,71 @@ //Ghost Roles (light light gray) dat += "
    Non-human Positions
    Non-human Positions
    [jobPos][jobPos][jobPos][jobPos]
    " - dat += "" + dat += "" //pAI if(jobban_isbanned(M, "pAI")) - dat += "" + dat += "" else - dat += "" + dat += "" //Drones if(jobban_isbanned(M, "drone")) - dat += "" + dat += "" else - dat += "" + dat += "" //Positronic Brains if(jobban_isbanned(M, "posibrain")) - dat += "" + dat += "" else - dat += "" + dat += "" //Deathsquad if(jobban_isbanned(M, "deathsquad")) - dat += "" + dat += "" else - dat += "" + dat += "" //Lavaland roles if(jobban_isbanned(M, "lavaland")) - dat += "" + dat += "" else - dat += "" + dat += "" dat += "
    Ghost Roles
    Ghost Roles
    pAIpAIpAIpAIDroneDroneDroneDronePosibrainPosibrainPosibrainPosibrainDeathsquadDeathsquadDeathsquadDeathsquadLavalandLavalandLavalandLavaland
    " //Antagonist (Orange) var/isbanned_dept = jobban_isbanned(M, "Syndicate") dat += "" - dat += "" + dat += "" //Traitor if(jobban_isbanned(M, "traitor") || isbanned_dept) - dat += "" + dat += "" else dat += "" //Changeling if(jobban_isbanned(M, "changeling") || isbanned_dept) - dat += "" + dat += "" else - dat += "" + dat += "" //Nuke Operative if(jobban_isbanned(M, "operative") || isbanned_dept) - dat += "" + dat += "" else - dat += "" + dat += "" //Revolutionary if(jobban_isbanned(M, "revolutionary") || isbanned_dept) - dat += "" + dat += "" else - dat += "" + dat += "" //Gangster if(jobban_isbanned(M, "gangster") || isbanned_dept) @@ -832,27 +832,27 @@ //Cultist if(jobban_isbanned(M, "cultist") || isbanned_dept) - dat += "" + dat += "" else - dat += "" + dat += "" //Servant of Ratvar if(jobban_isbanned(M, "servant of Ratvar") || isbanned_dept) - dat += "" + dat += "" else - dat += "" + dat += "" //Wizard if(jobban_isbanned(M, "wizard") || isbanned_dept) - dat += "" + dat += "" else - dat += "" + dat += "" //Abductor if(jobban_isbanned(M, "abductor") || isbanned_dept) - dat += "" + dat += "" else - dat += "" + dat += "" //Borer if(jobban_isbanned(M, "borer") || isbanned_dept) @@ -862,9 +862,9 @@ //Alien if(jobban_isbanned(M, "alien candidate") || isbanned_dept) - dat += "" + dat += "" else - dat += "" + dat += "" dat += "
    Antagonist Positions
    Antagonist Positions
    TraitorTraitorTraitorChangelingChangelingChangelingChangelingNuke OperativeNuke OperativeNuke OperativeNuke OperativeRevolutionaryRevolutionaryRevolutionaryRevolutionaryCultistCultistCultistCultistServantServantServantServantWizardWizardWizardWizardAbductorAbductorAbductorAbductorAlienAlienAlienAlien
    " usr << browse(dat, "window=jobban2;size=800x450") @@ -1207,9 +1207,9 @@ return alert(usr, "The game has already started.", null, null, null, null) var/dat = {"What mode do you wish to play?
    "} for(var/mode in config.modes) - dat += {"[config.mode_names[mode]]
    "} - dat += {"Secret
    "} - dat += {"Random
    "} + dat += {"[config.mode_names[mode]]
    "} + dat += {"Secret
    "} + dat += {"Random
    "} dat += {"Now: [GLOB.master_mode]"} usr << browse(dat, "window=c_mode") @@ -1223,8 +1223,8 @@ return alert(usr, "The game mode has to be secret!", null, null, null, null) var/dat = {"What game mode do you want to force secret to be? Use this if you want to change the game mode, but want the players to believe it's secret. This will only work if the current game mode is secret.
    "} for(var/mode in config.modes) - dat += {"[config.mode_names[mode]]
    "} - dat += {"Random (default)
    "} + dat += {"[config.mode_names[mode]]
    "} + dat += {"Random (default)
    "} dat += {"Now: [GLOB.secret_force_mode]"} usr << browse(dat, "window=f_secret") From 33f35fe4d2c895ecefa4970c2d25cf303c63951d Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sun, 10 Sep 2017 11:46:34 -0500 Subject: [PATCH 027/163] Update tools.dm --- code/game/objects/items/tools.dm | 1583 +++++++++++++++--------------- 1 file changed, 790 insertions(+), 793 deletions(-) diff --git a/code/game/objects/items/tools.dm b/code/game/objects/items/tools.dm index 0e557497c0..5c901ca4bd 100644 --- a/code/game/objects/items/tools.dm +++ b/code/game/objects/items/tools.dm @@ -1,795 +1,793 @@ -<<<<<<< HEAD -#define WELDER_FUEL_BURN_INTERVAL 13 - -/* Tools! - * Note: Multitools are /obj/item/device - * - * Contains: - * Wrench - * Screwdriver - * Wirecutters - * Welding Tool - * Crowbar - */ - -/* - * Wrench - */ -/obj/item/wrench - name = "wrench" - desc = "A wrench with common uses. Can be found in your hand." - icon = 'icons/obj/tools.dmi' - icon_state = "wrench" - lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' - righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' - flags_1 = CONDUCT_1 - slot_flags = SLOT_BELT - force = 5 - throwforce = 7 - w_class = WEIGHT_CLASS_SMALL - usesound = 'sound/items/ratchet.ogg' - materials = list(MAT_METAL=150) - origin_tech = "materials=1;engineering=1" - attack_verb = list("bashed", "battered", "bludgeoned", "whacked") - toolspeed = 1 - armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 30) - -/obj/item/wrench/suicide_act(mob/user) - user.visible_message("[user] is beating [user.p_them()]self to death with [src]! It looks like [user.p_theyre()] trying to commit suicide!") - playsound(loc, 'sound/weapons/genhit.ogg', 50, 1, -1) - return (BRUTELOSS) - -/obj/item/wrench/cyborg - name = "automatic wrench" - desc = "An advanced robotic wrench. Can be found in construction cyborgs." - toolspeed = 0.5 - -/obj/item/wrench/brass - name = "brass wrench" - desc = "A brass wrench. It's faintly warm to the touch." - resistance_flags = FIRE_PROOF | ACID_PROOF - icon_state = "wrench_brass" - toolspeed = 0.5 - -/obj/item/wrench/abductor - name = "alien wrench" - desc = "A polarized wrench. It causes anything placed between the jaws to turn." - icon = 'icons/obj/abductor.dmi' - icon_state = "wrench" - usesound = 'sound/effects/empulse.ogg' - toolspeed = 0.1 - origin_tech = "materials=5;engineering=5;abductor=3" - -/obj/item/wrench/power - name = "hand drill" - desc = "A simple powered hand drill. It's fitted with a bolt bit." - icon_state = "drill_bolt" - item_state = "drill" - lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' - righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' - usesound = 'sound/items/drill_use.ogg' - materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_TITANIUM=25) - origin_tech = "materials=2;engineering=2" //done for balance reasons, making them high value for research, but harder to get - force = 8 //might or might not be too high, subject to change - w_class = WEIGHT_CLASS_SMALL - throwforce = 8 - attack_verb = list("drilled", "screwed", "jabbed") - toolspeed = 0.25 - -/obj/item/wrench/power/attack_self(mob/user) - playsound(get_turf(user),'sound/items/change_drill.ogg',50,1) - var/obj/item/wirecutters/power/s_drill = new /obj/item/screwdriver/power - to_chat(user, "You attach the screw driver bit to [src].") - qdel(src) - user.put_in_active_hand(s_drill) - -/obj/item/wrench/power/suicide_act(mob/user) - user.visible_message("[user] is pressing [src] against [user.p_their()] head! It looks like [user.p_theyre()] trying to commit suicide!") - return (BRUTELOSS) - -/obj/item/wrench/medical - name = "medical wrench" - desc = "A medical wrench with common(medical?) uses. Can be found in your hand." - icon_state = "wrench_medical" - force = 2 //MEDICAL - throwforce = 4 - origin_tech = "materials=1;engineering=1;biotech=3" - attack_verb = list("wrenched", "medicaled", "tapped", "jabbed", "whacked") - -/obj/item/wrench/medical/suicide_act(mob/living/user) - user.visible_message("[user] is praying to the medical wrench to take [user.p_their()] soul. It looks like [user.p_theyre()] trying to commit suicide!") - // TODO Make them glow with the power of the M E D I C A L W R E N C H - // during their ascension - - // Stun stops them from wandering off - user.Stun(100, ignore_canstun = TRUE) - playsound(loc, 'sound/effects/pray.ogg', 50, 1, -1) - - // Let the sound effect finish playing - sleep(20) - - if(!user) - return - - for(var/obj/item/W in user) - user.dropItemToGround(W) - - var/obj/item/wrench/medical/W = new /obj/item/wrench/medical(loc) - W.add_fingerprint(user) - W.desc += " For some reason, it reminds you of [user.name]." - - if(!user) - return - - user.dust() - - return OXYLOSS - -/* - * Screwdriver - */ -/obj/item/screwdriver - name = "screwdriver" - desc = "You can be totally screwy with this." - icon = 'icons/obj/tools.dmi' - icon_state = "screwdriver" - item_state = "screwdriver" - lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' - righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' - flags_1 = CONDUCT_1 - slot_flags = SLOT_BELT - force = 5 - w_class = WEIGHT_CLASS_TINY - throwforce = 5 - throw_speed = 3 - throw_range = 5 - materials = list(MAT_METAL=75) - attack_verb = list("stabbed") - hitsound = 'sound/weapons/bladeslice.ogg' - usesound = 'sound/items/screwdriver.ogg' - toolspeed = 1 - armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 30) - var/random_color = TRUE //if the screwdriver uses random coloring - var/static/list/screwdriver_colors = list(\ - "blue" = rgb(24, 97, 213), \ - "red" = rgb(149, 23, 16), \ - "pink" = rgb(213, 24, 141), \ - "brown" = rgb(160, 82, 18), \ - "green" = rgb(14, 127, 27), \ - "cyan" = rgb(24, 162, 213), \ - "yellow" = rgb(213, 140, 24), \ - ) - -/obj/item/screwdriver/suicide_act(mob/user) - user.visible_message("[user] is stabbing [src] into [user.p_their()] [pick("temple", "heart")]! It looks like [user.p_theyre()] trying to commit suicide!") - return(BRUTELOSS) - -/obj/item/screwdriver/Initialize() - . = ..() - if(random_color) //random colors! - var/our_color = pick(screwdriver_colors) - add_atom_colour(screwdriver_colors[our_color], FIXED_COLOUR_PRIORITY) - update_icon() - if(prob(75)) - pixel_y = rand(0, 16) - -/obj/item/screwdriver/update_icon() - if(!random_color) //icon override - return - cut_overlays() - var/mutable_appearance/base_overlay = mutable_appearance(icon, "screwdriver_screwybits") - base_overlay.appearance_flags = RESET_COLOR - add_overlay(base_overlay) - -/obj/item/screwdriver/worn_overlays(isinhands = FALSE, icon_file) - . = list() - if(isinhands && random_color) - var/mutable_appearance/M = mutable_appearance(icon_file, "screwdriver_head") - M.appearance_flags = RESET_COLOR - . += M - -/obj/item/screwdriver/get_belt_overlay() - if(random_color) - var/mutable_appearance/body = mutable_appearance('icons/obj/clothing/belt_overlays.dmi', "screwdriver") - var/mutable_appearance/head = mutable_appearance('icons/obj/clothing/belt_overlays.dmi', "screwdriver_head") - body.color = color - head.overlays += body - return head - else - return mutable_appearance('icons/obj/clothing/belt_overlays.dmi', icon_state) - -/obj/item/screwdriver/attack(mob/living/carbon/M, mob/living/carbon/user) - if(!istype(M)) - return ..() - if(user.zone_selected != "eyes" && user.zone_selected != "head") - return ..() - if(user.disabilities & CLUMSY && prob(50)) - M = user - return eyestab(M,user) - -/obj/item/screwdriver/brass - name = "brass screwdriver" - desc = "A screwdriver made of brass. The handle feels freezing cold." - resistance_flags = FIRE_PROOF | ACID_PROOF - icon_state = "screwdriver_brass" - item_state = "screwdriver_brass" - toolspeed = 0.5 - random_color = FALSE - -/obj/item/screwdriver/abductor - name = "alien screwdriver" - desc = "An ultrasonic screwdriver." - icon = 'icons/obj/abductor.dmi' - icon_state = "screwdriver_a" - item_state = "screwdriver_nuke" - usesound = 'sound/items/pshoom.ogg' - toolspeed = 0.1 - random_color = FALSE - -/obj/item/screwdriver/power - name = "hand drill" - desc = "A simple powered hand drill. It's fitted with a screw bit." - icon_state = "drill_screw" - item_state = "drill" - lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' - righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' - materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_TITANIUM=25) - origin_tech = "materials=2;engineering=2" //done for balance reasons, making them high value for research, but harder to get - force = 8 //might or might not be too high, subject to change - w_class = WEIGHT_CLASS_SMALL - throwforce = 8 - throw_speed = 2 - throw_range = 3//it's heavier than a screw driver/wrench, so it does more damage, but can't be thrown as far - attack_verb = list("drilled", "screwed", "jabbed","whacked") - hitsound = 'sound/items/drill_hit.ogg' - usesound = 'sound/items/drill_use.ogg' - toolspeed = 0.25 - random_color = FALSE - -/obj/item/screwdriver/power/suicide_act(mob/user) - user.visible_message("[user] is putting [src] to [user.p_their()] temple. It looks like [user.p_theyre()] trying to commit suicide!") - return(BRUTELOSS) - -/obj/item/screwdriver/power/attack_self(mob/user) - playsound(get_turf(user),'sound/items/change_drill.ogg',50,1) - var/obj/item/wrench/power/b_drill = new /obj/item/wrench/power - to_chat(user, "You attach the bolt driver bit to [src].") - qdel(src) - user.put_in_active_hand(b_drill) - -/obj/item/screwdriver/cyborg - name = "powered screwdriver" - desc = "An electrical screwdriver, designed to be both precise and quick." - usesound = 'sound/items/drill_use.ogg' - toolspeed = 0.5 - -/* - * Wirecutters - */ -/obj/item/wirecutters - name = "wirecutters" - desc = "This cuts wires." - icon = 'icons/obj/tools.dmi' - icon_state = null - lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' - righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' - flags_1 = CONDUCT_1 - slot_flags = SLOT_BELT - force = 6 - throw_speed = 3 - throw_range = 7 - w_class = WEIGHT_CLASS_SMALL - materials = list(MAT_METAL=80) - attack_verb = list("pinched", "nipped") - hitsound = 'sound/items/wirecutter.ogg' - usesound = 'sound/items/wirecutter.ogg' - origin_tech = "materials=1;engineering=1" - toolspeed = 1 - armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 30) - - -/obj/item/wirecutters/New(loc, var/param_color = null) - ..() - if(!icon_state) - if(!param_color) - param_color = pick("yellow","red") - icon_state = "cutters_[param_color]" - -/obj/item/wirecutters/attack(mob/living/carbon/C, mob/user) - if(istype(C) && C.handcuffed && istype(C.handcuffed, /obj/item/restraints/handcuffs/cable)) - user.visible_message("[user] cuts [C]'s restraints with [src]!") - qdel(C.handcuffed) - C.handcuffed = null - if(C.buckled && C.buckled.buckle_requires_restraints) - C.buckled.unbuckle_mob(C) - C.update_handcuffed() - return - else - ..() - -/obj/item/wirecutters/suicide_act(mob/user) - user.visible_message("[user] is cutting at [user.p_their()] arteries with [src]! It looks like [user.p_theyre()] trying to commit suicide!") - playsound(loc, usesound, 50, 1, -1) - return (BRUTELOSS) - -/obj/item/wirecutters/brass - name = "brass wirecutters" - desc = "A pair of wirecutters made of brass. The handle feels freezing cold to the touch." - resistance_flags = FIRE_PROOF | ACID_PROOF - icon_state = "cutters_brass" - toolspeed = 0.5 - -/obj/item/wirecutters/abductor - name = "alien wirecutters" - desc = "Extremely sharp wirecutters, made out of a silvery-green metal." - icon = 'icons/obj/abductor.dmi' - icon_state = "cutters" - toolspeed = 0.1 - origin_tech = "materials=5;engineering=4;abductor=3" - -/obj/item/wirecutters/cyborg - name = "wirecutters" - desc = "This cuts wires." - toolspeed = 0.5 - -/obj/item/wirecutters/power - name = "jaws of life" - desc = "A set of jaws of life, compressed through the magic of science. It's fitted with a cutting head." - icon_state = "jaws_cutter" - item_state = "jawsoflife" - origin_tech = "materials=2;engineering=2" - materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_TITANIUM=25) - usesound = 'sound/items/jaws_cut.ogg' - toolspeed = 0.25 - -/obj/item/wirecutters/power/suicide_act(mob/user) - user.visible_message("[user] is wrapping \the [src] around [user.p_their()] neck. It looks like [user.p_theyre()] trying to rip [user.p_their()] head off!") - playsound(loc, 'sound/items/jaws_cut.ogg', 50, 1, -1) - if(iscarbon(user)) - var/mob/living/carbon/C = user - var/obj/item/bodypart/BP = C.get_bodypart("head") - if(BP) - BP.drop_limb() - playsound(loc,pick('sound/misc/desceration-01.ogg','sound/misc/desceration-02.ogg','sound/misc/desceration-01.ogg') ,50, 1, -1) - return (BRUTELOSS) - -/obj/item/wirecutters/power/attack_self(mob/user) - playsound(get_turf(user), 'sound/items/change_jaws.ogg', 50, 1) - var/obj/item/crowbar/power/pryjaws = new /obj/item/crowbar/power - to_chat(user, "You attach the pry jaws to [src].") - qdel(src) - user.put_in_active_hand(pryjaws) -/* - * Welding Tool - */ -/obj/item/weldingtool - name = "welding tool" - desc = "A standard edition welder provided by NanoTrasen." - icon = 'icons/obj/tools.dmi' - icon_state = "welder" - item_state = "welder" - lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' - righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' - flags_1 = CONDUCT_1 - slot_flags = SLOT_BELT - force = 3 - throwforce = 5 - hitsound = "swing_hit" - usesound = 'sound/items/welder.ogg' - var/acti_sound = 'sound/items/welderactivate.ogg' - var/deac_sound = 'sound/items/welderdeactivate.ogg' - throw_speed = 3 - throw_range = 5 - w_class = WEIGHT_CLASS_SMALL - armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 30) - resistance_flags = FIRE_PROOF - - materials = list(MAT_METAL=70, MAT_GLASS=30) - origin_tech = "engineering=1;plasmatech=1" - var/welding = 0 //Whether or not the welding tool is off(0), on(1) or currently welding(2) - var/status = TRUE //Whether the welder is secured or unsecured (able to attach rods to it to make a flamethrower) - var/max_fuel = 20 //The max amount of fuel the welder can hold - var/change_icons = 1 - var/can_off_process = 0 - var/light_intensity = 2 //how powerful the emitted light is when used. - var/burned_fuel_for = 0 //when fuel was last removed - heat = 3800 - toolspeed = 1 - -/obj/item/weldingtool/Initialize() - . = ..() - create_reagents(max_fuel) - reagents.add_reagent("welding_fuel", max_fuel) - update_icon() - - -/obj/item/weldingtool/proc/update_torch() - if(welding) - add_overlay("[initial(icon_state)]-on") - item_state = "[initial(item_state)]1" - else - item_state = "[initial(item_state)]" - - -/obj/item/weldingtool/update_icon() - cut_overlays() - if(change_icons) - var/ratio = get_fuel() / max_fuel - ratio = Ceiling(ratio*4) * 25 - add_overlay("[initial(icon_state)][ratio]") - update_torch() - return - - -/obj/item/weldingtool/process() - switch(welding) - if(0) - force = 3 - damtype = "brute" - update_icon() - if(!can_off_process) - STOP_PROCESSING(SSobj, src) - return - //Welders left on now use up fuel, but lets not have them run out quite that fast - if(1) - force = 15 - damtype = "fire" - ++burned_fuel_for - if(burned_fuel_for >= WELDER_FUEL_BURN_INTERVAL) - remove_fuel(1) - update_icon() - - //This is to start fires. process() is only called if the welder is on. - open_flame() - - -/obj/item/weldingtool/suicide_act(mob/user) - user.visible_message("[user] welds [user.p_their()] every orifice closed! It looks like [user.p_theyre()] trying to commit suicide!") - return (FIRELOSS) - - -/obj/item/weldingtool/attackby(obj/item/I, mob/user, params) - if(istype(I, /obj/item/screwdriver)) - flamethrower_screwdriver(I, user) - else if(istype(I, /obj/item/stack/rods)) - flamethrower_rods(I, user) - else - return ..() - - -/obj/item/weldingtool/attack(mob/living/carbon/human/H, mob/user) - if(!istype(H)) - return ..() - - var/obj/item/bodypart/affecting = H.get_bodypart(check_zone(user.zone_selected)) - - if(affecting && affecting.status == BODYPART_ROBOTIC && user.a_intent != INTENT_HARM) - if(src.remove_fuel(1)) - playsound(loc, usesound, 50, 1) - if(user == H) - user.visible_message("[user] starts to fix some of the dents on [H]'s [affecting.name].", "You start fixing some of the dents on [H]'s [affecting.name].") - if(!do_mob(user, H, 50)) - return - item_heal_robotic(H, user, 15, 0) - else - return ..() - - -/obj/item/weldingtool/afterattack(atom/O, mob/user, proximity) - if(!proximity) return - - if(welding) - remove_fuel(1) - var/turf/location = get_turf(user) - location.hotspot_expose(700, 50, 1) - if(get_fuel() <= 0) - set_light(0) - - if(isliving(O)) - var/mob/living/L = O - if(L.IgniteMob()) - message_admins("[key_name_admin(user)] set [key_name_admin(L)] on fire") - log_game("[key_name(user)] set [key_name(L)] on fire") - - -/obj/item/weldingtool/attack_self(mob/user) - switched_on(user) - if(welding) - set_light(light_intensity) - - update_icon() - - -//Returns the amount of fuel in the welder -/obj/item/weldingtool/proc/get_fuel() - return reagents.get_reagent_amount("welding_fuel") - - -//Removes fuel from the welding tool. If a mob is passed, it will try to flash the mob's eyes. This should probably be renamed to use() -/obj/item/weldingtool/proc/remove_fuel(amount = 1, mob/living/M = null) - if(!welding || !check_fuel()) - return 0 - if(amount) - burned_fuel_for = 0 - if(get_fuel() >= amount) - reagents.remove_reagent("welding_fuel", amount) - check_fuel() - if(M) - M.flash_act(light_intensity) - return TRUE - else - if(M) - to_chat(M, "You need more welding fuel to complete this task!") - return FALSE - - -//Turns off the welder if there is no more fuel (does this really need to be its own proc?) -/obj/item/weldingtool/proc/check_fuel(mob/user) - if(get_fuel() <= 0 && welding) - switched_on(user) - update_icon() - //mob icon update - if(ismob(loc)) - var/mob/M = loc - M.update_inv_hands(0) - - return 0 - return 1 - -//Switches the welder on -/obj/item/weldingtool/proc/switched_on(mob/user) - if(!status) - to_chat(user, "[src] can't be turned on while unsecured!") - return - welding = !welding - if(welding) - if(get_fuel() >= 1) - to_chat(user, "You switch [src] on.") - playsound(loc, acti_sound, 50, 1) - force = 15 - damtype = "fire" - hitsound = 'sound/items/welder.ogg' - update_icon() - START_PROCESSING(SSobj, src) - else - to_chat(user, "You need more fuel!") - switched_off(user) - else - to_chat(user, "You switch [src] off.") - playsound(loc, deac_sound, 50, 1) - switched_off(user) - -//Switches the welder off -/obj/item/weldingtool/proc/switched_off(mob/user) - welding = 0 - set_light(0) - - force = 3 - damtype = "brute" - hitsound = "swing_hit" - update_icon() - - -/obj/item/weldingtool/examine(mob/user) - ..() - to_chat(user, "It contains [get_fuel()] unit\s of fuel out of [max_fuel].") - -/obj/item/weldingtool/is_hot() - return welding * heat - -//Returns whether or not the welding tool is currently on. -/obj/item/weldingtool/proc/isOn() - return welding - - -/obj/item/weldingtool/proc/flamethrower_screwdriver(obj/item/I, mob/user) - if(welding) - to_chat(user, "Turn it off first!") - return - status = !status - if(status) - to_chat(user, "You resecure [src].") - else - to_chat(user, "[src] can now be attached and modified.") - add_fingerprint(user) - -/obj/item/weldingtool/proc/flamethrower_rods(obj/item/I, mob/user) - if(!status) - var/obj/item/stack/rods/R = I - if (R.use(1)) - var/obj/item/flamethrower/F = new /obj/item/flamethrower(user.loc) - if(!remove_item_from_storage(F)) - user.transferItemToLoc(src, F, TRUE) - F.weldtool = src - add_fingerprint(user) - to_chat(user, "You add a rod to a welder, starting to build a flamethrower.") - user.put_in_hands(F) - else - to_chat(user, "You need one rod to start building a flamethrower!") - -/obj/item/weldingtool/ignition_effect(atom/A, mob/user) - if(welding && remove_fuel(1, user)) - . = "[user] casually lights [A] with [src], what a badass." - else - . = "" - -/obj/item/weldingtool/largetank - name = "industrial welding tool" - desc = "A slightly larger welder with a larger tank." - icon_state = "indwelder" - max_fuel = 40 - materials = list(MAT_GLASS=60) - origin_tech = "engineering=2;plasmatech=2" - -/obj/item/weldingtool/largetank/cyborg - name = "integrated welding tool" - desc = "An advanced welder designed to be used in robotic systems." - toolspeed = 0.5 - -/obj/item/weldingtool/largetank/flamethrower_screwdriver() - return - - -/obj/item/weldingtool/mini - name = "emergency welding tool" - desc = "A miniature welder used during emergencies." - icon_state = "miniwelder" - max_fuel = 10 - w_class = WEIGHT_CLASS_TINY - materials = list(MAT_METAL=30, MAT_GLASS=10) - change_icons = 0 - -/obj/item/weldingtool/mini/flamethrower_screwdriver() - return - -/obj/item/weldingtool/abductor - name = "alien welding tool" - desc = "An alien welding tool. Whatever fuel it uses, it never runs out." - icon = 'icons/obj/abductor.dmi' - icon_state = "welder" - toolspeed = 0.1 - light_intensity = 0 - change_icons = 0 - origin_tech = "plasmatech=5;engineering=5;abductor=3" - -/obj/item/weldingtool/abductor/process() - if(get_fuel() <= max_fuel) - reagents.add_reagent("welding_fuel", 1) - ..() - -/obj/item/weldingtool/hugetank - name = "upgraded industrial welding tool" - desc = "An upgraded welder based of the industrial welder." - icon_state = "upindwelder" - item_state = "upindwelder" - max_fuel = 80 - materials = list(MAT_METAL=70, MAT_GLASS=120) - origin_tech = "engineering=3;plasmatech=2" - -/obj/item/weldingtool/experimental - name = "experimental welding tool" - desc = "An experimental welder capable of self-fuel generation and less harmful to the eyes." - icon_state = "exwelder" - item_state = "exwelder" - max_fuel = 40 - materials = list(MAT_METAL=70, MAT_GLASS=120) - origin_tech = "materials=4;engineering=4;bluespace=3;plasmatech=4" - var/last_gen = 0 - change_icons = 0 - can_off_process = 1 - light_intensity = 1 - toolspeed = 0.5 - var/nextrefueltick = 0 - -/obj/item/weldingtool/experimental/brass - name = "brass welding tool" - desc = "A brass welder that seems to constantly refuel itself. It is faintly warm to the touch." - resistance_flags = FIRE_PROOF | ACID_PROOF - icon_state = "brasswelder" - item_state = "brasswelder" - - -/obj/item/weldingtool/experimental/process() - ..() - if(get_fuel() < max_fuel && nextrefueltick < world.time) - nextrefueltick = world.time + 10 - reagents.add_reagent("welding_fuel", 1) - - -/* - * Crowbar - */ - -/obj/item/crowbar - name = "pocket crowbar" - desc = "A small crowbar. This handy tool is useful for lots of things, such as prying floor tiles or opening unpowered doors." - icon = 'icons/obj/tools.dmi' - icon_state = "crowbar" - lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' - righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' - usesound = 'sound/items/crowbar.ogg' - flags_1 = CONDUCT_1 - slot_flags = SLOT_BELT - force = 5 - throwforce = 7 - w_class = WEIGHT_CLASS_SMALL - materials = list(MAT_METAL=50) - origin_tech = "engineering=1;combat=1" - attack_verb = list("attacked", "bashed", "battered", "bludgeoned", "whacked") - toolspeed = 1 - armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 30) - -/obj/item/crowbar/suicide_act(mob/user) - user.visible_message("[user] is beating [user.p_them()]self to death with [src]! It looks like [user.p_theyre()] trying to commit suicide!") - playsound(loc, 'sound/weapons/genhit.ogg', 50, 1, -1) - return (BRUTELOSS) - -/obj/item/crowbar/red - icon_state = "crowbar_red" - force = 8 - -/obj/item/crowbar/brass - name = "brass crowbar" - desc = "A brass crowbar. It feels faintly warm to the touch." - resistance_flags = FIRE_PROOF | ACID_PROOF - icon_state = "crowbar_brass" - toolspeed = 0.5 - -/obj/item/crowbar/abductor - name = "alien crowbar" - desc = "A hard-light crowbar. It appears to pry by itself, without any effort required." - icon = 'icons/obj/abductor.dmi' - usesound = 'sound/weapons/sonic_jackhammer.ogg' - icon_state = "crowbar" - toolspeed = 0.1 - origin_tech = "combat=4;engineering=4;abductor=3" - -/obj/item/crowbar/large - name = "crowbar" - desc = "It's a big crowbar. It doesn't fit in your pockets, because it's big." - force = 12 - w_class = WEIGHT_CLASS_NORMAL - throw_speed = 3 - throw_range = 3 - materials = list(MAT_METAL=70) - icon_state = "crowbar_large" - item_state = "crowbar" - toolspeed = 0.5 - -/obj/item/crowbar/cyborg - name = "hydraulic crowbar" - desc = "A hydraulic prying tool, compact but powerful. Designed to replace crowbar in construction cyborgs." - usesound = 'sound/items/jaws_pry.ogg' - force = 10 - toolspeed = 0.5 - -/obj/item/crowbar/power - name = "jaws of life" - desc = "A set of jaws of life, compressed through the magic of science. It's fitted with a prying head." - icon_state = "jaws_pry" - item_state = "jawsoflife" - lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' - righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' - materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_TITANIUM=25) - origin_tech = "materials=2;engineering=2" - usesound = 'sound/items/jaws_pry.ogg' - force = 15 - toolspeed = 0.25 - -/obj/item/crowbar/power/suicide_act(mob/user) - user.visible_message("[user] is putting [user.p_their()] head in [src], it looks like [user.p_theyre()] trying to commit suicide!") - playsound(loc, 'sound/items/jaws_pry.ogg', 50, 1, -1) - return (BRUTELOSS) - -/obj/item/crowbar/power/attack_self(mob/user) - playsound(get_turf(user), 'sound/items/change_jaws.ogg', 50, 1) - var/obj/item/wirecutters/power/cutjaws = new /obj/item/wirecutters/power - to_chat(user, "You attach the cutting jaws to [src].") - qdel(src) - user.put_in_active_hand(cutjaws) - -#undef WELDER_FUEL_BURN_INTERVAL -======= +#define WELDER_FUEL_BURN_INTERVAL 13 + +/* Tools! + * Note: Multitools are /obj/item/device + * + * Contains: + * Wrench + * Screwdriver + * Wirecutters + * Welding Tool + * Crowbar + */ + +/* + * Wrench + */ +/obj/item/wrench + name = "wrench" + desc = "A wrench with common uses. Can be found in your hand." + icon = 'icons/obj/tools.dmi' + icon_state = "wrench" + lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' + flags_1 = CONDUCT_1 + slot_flags = SLOT_BELT + force = 5 + throwforce = 7 + w_class = WEIGHT_CLASS_SMALL + usesound = 'sound/items/ratchet.ogg' + materials = list(MAT_METAL=150) + origin_tech = "materials=1;engineering=1" + attack_verb = list("bashed", "battered", "bludgeoned", "whacked") + toolspeed = 1 + armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 30) + +/obj/item/wrench/suicide_act(mob/user) + user.visible_message("[user] is beating [user.p_them()]self to death with [src]! It looks like [user.p_theyre()] trying to commit suicide!") + playsound(loc, 'sound/weapons/genhit.ogg', 50, 1, -1) + return (BRUTELOSS) + +/obj/item/wrench/cyborg + name = "automatic wrench" + desc = "An advanced robotic wrench. Can be found in construction cyborgs." + toolspeed = 0.5 + +/obj/item/wrench/brass + name = "brass wrench" + desc = "A brass wrench. It's faintly warm to the touch." + resistance_flags = FIRE_PROOF | ACID_PROOF + icon_state = "wrench_brass" + toolspeed = 0.5 + +/obj/item/wrench/abductor + name = "alien wrench" + desc = "A polarized wrench. It causes anything placed between the jaws to turn." + icon = 'icons/obj/abductor.dmi' + icon_state = "wrench" + usesound = 'sound/effects/empulse.ogg' + toolspeed = 0.1 + origin_tech = "materials=5;engineering=5;abductor=3" + +/obj/item/wrench/power + name = "hand drill" + desc = "A simple powered hand drill. It's fitted with a bolt bit." + icon_state = "drill_bolt" + item_state = "drill" + lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' + usesound = 'sound/items/drill_use.ogg' + materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_TITANIUM=25) + origin_tech = "materials=2;engineering=2" //done for balance reasons, making them high value for research, but harder to get + force = 8 //might or might not be too high, subject to change + w_class = WEIGHT_CLASS_SMALL + throwforce = 8 + attack_verb = list("drilled", "screwed", "jabbed") + toolspeed = 0.25 + +/obj/item/wrench/power/attack_self(mob/user) + playsound(get_turf(user),'sound/items/change_drill.ogg',50,1) + var/obj/item/wirecutters/power/s_drill = new /obj/item/screwdriver/power + to_chat(user, "You attach the screw driver bit to [src].") + qdel(src) + user.put_in_active_hand(s_drill) + +/obj/item/wrench/power/suicide_act(mob/user) + user.visible_message("[user] is pressing [src] against [user.p_their()] head! It looks like [user.p_theyre()] trying to commit suicide!") + return (BRUTELOSS) + +/obj/item/wrench/medical + name = "medical wrench" + desc = "A medical wrench with common(medical?) uses. Can be found in your hand." + icon_state = "wrench_medical" + force = 2 //MEDICAL + throwforce = 4 + origin_tech = "materials=1;engineering=1;biotech=3" + attack_verb = list("wrenched", "medicaled", "tapped", "jabbed", "whacked") + +/obj/item/wrench/medical/suicide_act(mob/living/user) + user.visible_message("[user] is praying to the medical wrench to take [user.p_their()] soul. It looks like [user.p_theyre()] trying to commit suicide!") + // TODO Make them glow with the power of the M E D I C A L W R E N C H + // during their ascension + + // Stun stops them from wandering off + user.Stun(100, ignore_canstun = TRUE) + playsound(loc, 'sound/effects/pray.ogg', 50, 1, -1) + + // Let the sound effect finish playing + sleep(20) + + if(!user) + return + + for(var/obj/item/W in user) + user.dropItemToGround(W) + + var/obj/item/wrench/medical/W = new /obj/item/wrench/medical(loc) + W.add_fingerprint(user) + W.desc += " For some reason, it reminds you of [user.name]." + + if(!user) + return + + user.dust() + + return OXYLOSS + +/* + * Screwdriver + */ +/obj/item/screwdriver + name = "screwdriver" + desc = "You can be totally screwy with this." + icon = 'icons/obj/tools.dmi' + icon_state = "screwdriver" + item_state = "screwdriver" + lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' + flags_1 = CONDUCT_1 + slot_flags = SLOT_BELT + force = 5 + w_class = WEIGHT_CLASS_TINY + throwforce = 5 + throw_speed = 3 + throw_range = 5 + materials = list(MAT_METAL=75) + attack_verb = list("stabbed") + hitsound = 'sound/weapons/bladeslice.ogg' + usesound = 'sound/items/screwdriver.ogg' + toolspeed = 1 + armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 30) + var/random_color = TRUE //if the screwdriver uses random coloring + var/static/list/screwdriver_colors = list(\ + "blue" = rgb(24, 97, 213), \ + "red" = rgb(149, 23, 16), \ + "pink" = rgb(213, 24, 141), \ + "brown" = rgb(160, 82, 18), \ + "green" = rgb(14, 127, 27), \ + "cyan" = rgb(24, 162, 213), \ + "yellow" = rgb(213, 140, 24), \ + ) + +/obj/item/screwdriver/suicide_act(mob/user) + user.visible_message("[user] is stabbing [src] into [user.p_their()] [pick("temple", "heart")]! It looks like [user.p_theyre()] trying to commit suicide!") + return(BRUTELOSS) + +/obj/item/screwdriver/Initialize() + . = ..() + if(random_color) //random colors! + var/our_color = pick(screwdriver_colors) + add_atom_colour(screwdriver_colors[our_color], FIXED_COLOUR_PRIORITY) + update_icon() + if(prob(75)) + pixel_y = rand(0, 16) + +/obj/item/screwdriver/update_icon() + if(!random_color) //icon override + return + cut_overlays() + var/mutable_appearance/base_overlay = mutable_appearance(icon, "screwdriver_screwybits") + base_overlay.appearance_flags = RESET_COLOR + add_overlay(base_overlay) + +/obj/item/screwdriver/worn_overlays(isinhands = FALSE, icon_file) + . = list() + if(isinhands && random_color) + var/mutable_appearance/M = mutable_appearance(icon_file, "screwdriver_head") + M.appearance_flags = RESET_COLOR + . += M + +/obj/item/screwdriver/get_belt_overlay() + if(random_color) + var/mutable_appearance/body = mutable_appearance('icons/obj/clothing/belt_overlays.dmi', "screwdriver") + var/mutable_appearance/head = mutable_appearance('icons/obj/clothing/belt_overlays.dmi', "screwdriver_head") + body.color = color + head.overlays += body + return head + else + return mutable_appearance('icons/obj/clothing/belt_overlays.dmi', icon_state) + +/obj/item/screwdriver/attack(mob/living/carbon/M, mob/living/carbon/user) + if(!istype(M)) + return ..() + if(user.zone_selected != "eyes" && user.zone_selected != "head") + return ..() + if(user.disabilities & CLUMSY && prob(50)) + M = user + return eyestab(M,user) + +/obj/item/screwdriver/brass + name = "brass screwdriver" + desc = "A screwdriver made of brass. The handle feels freezing cold." + resistance_flags = FIRE_PROOF | ACID_PROOF + icon_state = "screwdriver_brass" + item_state = "screwdriver_brass" + toolspeed = 0.5 + random_color = FALSE + +/obj/item/screwdriver/abductor + name = "alien screwdriver" + desc = "An ultrasonic screwdriver." + icon = 'icons/obj/abductor.dmi' + icon_state = "screwdriver_a" + item_state = "screwdriver_nuke" + usesound = 'sound/items/pshoom.ogg' + toolspeed = 0.1 + random_color = FALSE + +/obj/item/screwdriver/power + name = "hand drill" + desc = "A simple powered hand drill. It's fitted with a screw bit." + icon_state = "drill_screw" + item_state = "drill" + lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' + materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_TITANIUM=25) + origin_tech = "materials=2;engineering=2" //done for balance reasons, making them high value for research, but harder to get + force = 8 //might or might not be too high, subject to change + w_class = WEIGHT_CLASS_SMALL + throwforce = 8 + throw_speed = 2 + throw_range = 3//it's heavier than a screw driver/wrench, so it does more damage, but can't be thrown as far + attack_verb = list("drilled", "screwed", "jabbed","whacked") + hitsound = 'sound/items/drill_hit.ogg' + usesound = 'sound/items/drill_use.ogg' + toolspeed = 0.25 + random_color = FALSE + +/obj/item/screwdriver/power/suicide_act(mob/user) + user.visible_message("[user] is putting [src] to [user.p_their()] temple. It looks like [user.p_theyre()] trying to commit suicide!") + return(BRUTELOSS) + +/obj/item/screwdriver/power/attack_self(mob/user) + playsound(get_turf(user),'sound/items/change_drill.ogg',50,1) + var/obj/item/wrench/power/b_drill = new /obj/item/wrench/power + to_chat(user, "You attach the bolt driver bit to [src].") + qdel(src) + user.put_in_active_hand(b_drill) + +/obj/item/screwdriver/cyborg + name = "powered screwdriver" + desc = "An electrical screwdriver, designed to be both precise and quick." + usesound = 'sound/items/drill_use.ogg' + toolspeed = 0.5 + +/* + * Wirecutters + */ +/obj/item/wirecutters + name = "wirecutters" + desc = "This cuts wires." + icon = 'icons/obj/tools.dmi' + icon_state = null + lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' + flags_1 = CONDUCT_1 + slot_flags = SLOT_BELT + force = 6 + throw_speed = 3 + throw_range = 7 + w_class = WEIGHT_CLASS_SMALL + materials = list(MAT_METAL=80) + attack_verb = list("pinched", "nipped") + hitsound = 'sound/items/wirecutter.ogg' + usesound = 'sound/items/wirecutter.ogg' + origin_tech = "materials=1;engineering=1" + toolspeed = 1 + armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 30) + + +/obj/item/wirecutters/New(loc, var/param_color = null) + ..() + if(!icon_state) + if(!param_color) + param_color = pick("yellow","red") + icon_state = "cutters_[param_color]" + +/obj/item/wirecutters/attack(mob/living/carbon/C, mob/user) + if(istype(C) && C.handcuffed && istype(C.handcuffed, /obj/item/restraints/handcuffs/cable)) + user.visible_message("[user] cuts [C]'s restraints with [src]!") + qdel(C.handcuffed) + C.handcuffed = null + if(C.buckled && C.buckled.buckle_requires_restraints) + C.buckled.unbuckle_mob(C) + C.update_handcuffed() + return + else + ..() + +/obj/item/wirecutters/suicide_act(mob/user) + user.visible_message("[user] is cutting at [user.p_their()] arteries with [src]! It looks like [user.p_theyre()] trying to commit suicide!") + playsound(loc, usesound, 50, 1, -1) + return (BRUTELOSS) + +/obj/item/wirecutters/brass + name = "brass wirecutters" + desc = "A pair of wirecutters made of brass. The handle feels freezing cold to the touch." + resistance_flags = FIRE_PROOF | ACID_PROOF + icon_state = "cutters_brass" + toolspeed = 0.5 + +/obj/item/wirecutters/abductor + name = "alien wirecutters" + desc = "Extremely sharp wirecutters, made out of a silvery-green metal." + icon = 'icons/obj/abductor.dmi' + icon_state = "cutters" + toolspeed = 0.1 + origin_tech = "materials=5;engineering=4;abductor=3" + +/obj/item/wirecutters/cyborg + name = "wirecutters" + desc = "This cuts wires." + toolspeed = 0.5 + +/obj/item/wirecutters/power + name = "jaws of life" + desc = "A set of jaws of life, compressed through the magic of science. It's fitted with a cutting head." + icon_state = "jaws_cutter" + item_state = "jawsoflife" + origin_tech = "materials=2;engineering=2" + materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_TITANIUM=25) + usesound = 'sound/items/jaws_cut.ogg' + toolspeed = 0.25 + +/obj/item/wirecutters/power/suicide_act(mob/user) + user.visible_message("[user] is wrapping \the [src] around [user.p_their()] neck. It looks like [user.p_theyre()] trying to rip [user.p_their()] head off!") + playsound(loc, 'sound/items/jaws_cut.ogg', 50, 1, -1) + if(iscarbon(user)) + var/mob/living/carbon/C = user + var/obj/item/bodypart/BP = C.get_bodypart("head") + if(BP) + BP.drop_limb() + playsound(loc,pick('sound/misc/desceration-01.ogg','sound/misc/desceration-02.ogg','sound/misc/desceration-01.ogg') ,50, 1, -1) + return (BRUTELOSS) + +/obj/item/wirecutters/power/attack_self(mob/user) + playsound(get_turf(user), 'sound/items/change_jaws.ogg', 50, 1) + var/obj/item/crowbar/power/pryjaws = new /obj/item/crowbar/power + to_chat(user, "You attach the pry jaws to [src].") + qdel(src) + user.put_in_active_hand(pryjaws) +/* + * Welding Tool + */ +/obj/item/weldingtool + name = "welding tool" + desc = "A standard edition welder provided by NanoTrasen." + icon = 'icons/obj/tools.dmi' + icon_state = "welder" + item_state = "welder" + lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' + flags_1 = CONDUCT_1 + slot_flags = SLOT_BELT + force = 3 + throwforce = 5 + hitsound = "swing_hit" + usesound = 'sound/items/welder.ogg' + var/acti_sound = 'sound/items/welderactivate.ogg' + var/deac_sound = 'sound/items/welderdeactivate.ogg' + throw_speed = 3 + throw_range = 5 + w_class = WEIGHT_CLASS_SMALL + armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 30) + resistance_flags = FIRE_PROOF + + materials = list(MAT_METAL=70, MAT_GLASS=30) + origin_tech = "engineering=1;plasmatech=1" + var/welding = 0 //Whether or not the welding tool is off(0), on(1) or currently welding(2) + var/status = TRUE //Whether the welder is secured or unsecured (able to attach rods to it to make a flamethrower) + var/max_fuel = 20 //The max amount of fuel the welder can hold + var/change_icons = 1 + var/can_off_process = 0 + var/light_intensity = 2 //how powerful the emitted light is when used. + var/burned_fuel_for = 0 //when fuel was last removed + heat = 3800 + toolspeed = 1 + +/obj/item/weldingtool/Initialize() + . = ..() + create_reagents(max_fuel) + reagents.add_reagent("welding_fuel", max_fuel) + update_icon() + + +/obj/item/weldingtool/proc/update_torch() + if(welding) + add_overlay("[initial(icon_state)]-on") + item_state = "[initial(item_state)]1" + else + item_state = "[initial(item_state)]" + + +/obj/item/weldingtool/update_icon() + cut_overlays() + if(change_icons) + var/ratio = get_fuel() / max_fuel + ratio = Ceiling(ratio*4) * 25 + add_overlay("[initial(icon_state)][ratio]") + update_torch() + return + + +/obj/item/weldingtool/process() + switch(welding) + if(0) + force = 3 + damtype = "brute" + update_icon() + if(!can_off_process) + STOP_PROCESSING(SSobj, src) + return + //Welders left on now use up fuel, but lets not have them run out quite that fast + if(1) + force = 15 + damtype = "fire" + ++burned_fuel_for + if(burned_fuel_for >= WELDER_FUEL_BURN_INTERVAL) + remove_fuel(1) + update_icon() + + //This is to start fires. process() is only called if the welder is on. + open_flame() + + +/obj/item/weldingtool/suicide_act(mob/user) + user.visible_message("[user] welds [user.p_their()] every orifice closed! It looks like [user.p_theyre()] trying to commit suicide!") + return (FIRELOSS) + + +/obj/item/weldingtool/attackby(obj/item/I, mob/user, params) + if(istype(I, /obj/item/screwdriver)) + flamethrower_screwdriver(I, user) + else if(istype(I, /obj/item/stack/rods)) + flamethrower_rods(I, user) + else + return ..() + + +/obj/item/weldingtool/attack(mob/living/carbon/human/H, mob/user) + if(!istype(H)) + return ..() + + var/obj/item/bodypart/affecting = H.get_bodypart(check_zone(user.zone_selected)) + + if(affecting && affecting.status == BODYPART_ROBOTIC && user.a_intent != INTENT_HARM) + if(src.remove_fuel(1)) + playsound(loc, usesound, 50, 1) + if(user == H) + user.visible_message("[user] starts to fix some of the dents on [H]'s [affecting.name].", "You start fixing some of the dents on [H]'s [affecting.name].") + if(!do_mob(user, H, 50)) + return + item_heal_robotic(H, user, 15, 0) + else + return ..() + + +/obj/item/weldingtool/afterattack(atom/O, mob/user, proximity) + if(!proximity) return + + if(welding) + remove_fuel(1) + var/turf/location = get_turf(user) + location.hotspot_expose(700, 50, 1) + if(get_fuel() <= 0) + set_light(0) + + if(isliving(O)) + var/mob/living/L = O + if(L.IgniteMob()) + message_admins("[key_name_admin(user)] set [key_name_admin(L)] on fire") + log_game("[key_name(user)] set [key_name(L)] on fire") + + +/obj/item/weldingtool/attack_self(mob/user) + switched_on(user) + if(welding) + set_light(light_intensity) + + update_icon() + + +//Returns the amount of fuel in the welder +/obj/item/weldingtool/proc/get_fuel() + return reagents.get_reagent_amount("welding_fuel") + + +//Removes fuel from the welding tool. If a mob is passed, it will try to flash the mob's eyes. This should probably be renamed to use() +/obj/item/weldingtool/proc/remove_fuel(amount = 1, mob/living/M = null) + if(!welding || !check_fuel()) + return 0 + if(amount) + burned_fuel_for = 0 + if(get_fuel() >= amount) + reagents.remove_reagent("welding_fuel", amount) + check_fuel() + if(M) + M.flash_act(light_intensity) + return TRUE + else + if(M) + to_chat(M, "You need more welding fuel to complete this task!") + return FALSE + + +//Turns off the welder if there is no more fuel (does this really need to be its own proc?) +/obj/item/weldingtool/proc/check_fuel(mob/user) + if(get_fuel() <= 0 && welding) + switched_on(user) + update_icon() + //mob icon update + if(ismob(loc)) + var/mob/M = loc + M.update_inv_hands(0) + + return 0 + return 1 + +//Switches the welder on +/obj/item/weldingtool/proc/switched_on(mob/user) + if(!status) + to_chat(user, "[src] can't be turned on while unsecured!") + return + welding = !welding + if(welding) + if(get_fuel() >= 1) + to_chat(user, "You switch [src] on.") + playsound(loc, acti_sound, 50, 1) + force = 15 + damtype = "fire" + hitsound = 'sound/items/welder.ogg' + update_icon() + START_PROCESSING(SSobj, src) + else + to_chat(user, "You need more fuel!") + switched_off(user) + else + to_chat(user, "You switch [src] off.") + playsound(loc, deac_sound, 50, 1) + switched_off(user) + +//Switches the welder off +/obj/item/weldingtool/proc/switched_off(mob/user) + welding = 0 + set_light(0) + + force = 3 + damtype = "brute" + hitsound = "swing_hit" + update_icon() + + +/obj/item/weldingtool/examine(mob/user) + ..() + to_chat(user, "It contains [get_fuel()] unit\s of fuel out of [max_fuel].") + +/obj/item/weldingtool/is_hot() + return welding * heat + +//Returns whether or not the welding tool is currently on. +/obj/item/weldingtool/proc/isOn() + return welding + + +/obj/item/weldingtool/proc/flamethrower_screwdriver(obj/item/I, mob/user) + if(welding) + to_chat(user, "Turn it off first!") + return + status = !status + if(status) + to_chat(user, "You resecure [src].") + else + to_chat(user, "[src] can now be attached and modified.") + add_fingerprint(user) + +/obj/item/weldingtool/proc/flamethrower_rods(obj/item/I, mob/user) + if(!status) + var/obj/item/stack/rods/R = I + if (R.use(1)) + var/obj/item/flamethrower/F = new /obj/item/flamethrower(user.loc) + if(!remove_item_from_storage(F)) + user.transferItemToLoc(src, F, TRUE) + F.weldtool = src + add_fingerprint(user) + to_chat(user, "You add a rod to a welder, starting to build a flamethrower.") + user.put_in_hands(F) + else + to_chat(user, "You need one rod to start building a flamethrower!") + +/obj/item/weldingtool/ignition_effect(atom/A, mob/user) + if(welding && remove_fuel(1, user)) + . = "[user] casually lights [A] with [src], what a badass." + else + . = "" + +/obj/item/weldingtool/largetank + name = "industrial welding tool" + desc = "A slightly larger welder with a larger tank." + icon_state = "indwelder" + max_fuel = 40 + materials = list(MAT_GLASS=60) + origin_tech = "engineering=2;plasmatech=2" + +/obj/item/weldingtool/largetank/cyborg + name = "integrated welding tool" + desc = "An advanced welder designed to be used in robotic systems." + toolspeed = 0.5 + +/obj/item/weldingtool/largetank/flamethrower_screwdriver() + return + + +/obj/item/weldingtool/mini + name = "emergency welding tool" + desc = "A miniature welder used during emergencies." + icon_state = "miniwelder" + max_fuel = 10 + w_class = WEIGHT_CLASS_TINY + materials = list(MAT_METAL=30, MAT_GLASS=10) + change_icons = 0 + +/obj/item/weldingtool/mini/flamethrower_screwdriver() + return + +/obj/item/weldingtool/abductor + name = "alien welding tool" + desc = "An alien welding tool. Whatever fuel it uses, it never runs out." + icon = 'icons/obj/abductor.dmi' + icon_state = "welder" + toolspeed = 0.1 + light_intensity = 0 + change_icons = 0 + origin_tech = "plasmatech=5;engineering=5;abductor=3" + +/obj/item/weldingtool/abductor/process() + if(get_fuel() <= max_fuel) + reagents.add_reagent("welding_fuel", 1) + ..() + +/obj/item/weldingtool/hugetank + name = "upgraded industrial welding tool" + desc = "An upgraded welder based of the industrial welder." + icon_state = "upindwelder" + item_state = "upindwelder" + max_fuel = 80 + materials = list(MAT_METAL=70, MAT_GLASS=120) + origin_tech = "engineering=3;plasmatech=2" + +/obj/item/weldingtool/experimental + name = "experimental welding tool" + desc = "An experimental welder capable of self-fuel generation and less harmful to the eyes." + icon_state = "exwelder" + item_state = "exwelder" + max_fuel = 40 + materials = list(MAT_METAL=70, MAT_GLASS=120) + origin_tech = "materials=4;engineering=4;bluespace=3;plasmatech=4" + var/last_gen = 0 + change_icons = 0 + can_off_process = 1 + light_intensity = 1 + toolspeed = 0.5 + var/nextrefueltick = 0 + +/obj/item/weldingtool/experimental/brass + name = "brass welding tool" + desc = "A brass welder that seems to constantly refuel itself. It is faintly warm to the touch." + resistance_flags = FIRE_PROOF | ACID_PROOF + icon_state = "brasswelder" + item_state = "brasswelder" + + +/obj/item/weldingtool/experimental/process() + ..() + if(get_fuel() < max_fuel && nextrefueltick < world.time) + nextrefueltick = world.time + 10 + reagents.add_reagent("welding_fuel", 1) + + +/* + * Crowbar + */ + +/obj/item/crowbar + name = "pocket crowbar" + desc = "A small crowbar. This handy tool is useful for lots of things, such as prying floor tiles or opening unpowered doors." + icon = 'icons/obj/tools.dmi' + icon_state = "crowbar" + lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' + usesound = 'sound/items/crowbar.ogg' + flags_1 = CONDUCT_1 + slot_flags = SLOT_BELT + force = 5 + throwforce = 7 + w_class = WEIGHT_CLASS_SMALL + materials = list(MAT_METAL=50) + origin_tech = "engineering=1;combat=1" + attack_verb = list("attacked", "bashed", "battered", "bludgeoned", "whacked") + toolspeed = 1 + armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 30) + +/obj/item/crowbar/suicide_act(mob/user) + user.visible_message("[user] is beating [user.p_them()]self to death with [src]! It looks like [user.p_theyre()] trying to commit suicide!") + playsound(loc, 'sound/weapons/genhit.ogg', 50, 1, -1) + return (BRUTELOSS) + +/obj/item/crowbar/red + icon_state = "crowbar_red" + force = 8 + +/obj/item/crowbar/brass + name = "brass crowbar" + desc = "A brass crowbar. It feels faintly warm to the touch." + resistance_flags = FIRE_PROOF | ACID_PROOF + icon_state = "crowbar_brass" + toolspeed = 0.5 + +/obj/item/crowbar/abductor + name = "alien crowbar" + desc = "A hard-light crowbar. It appears to pry by itself, without any effort required." + icon = 'icons/obj/abductor.dmi' + usesound = 'sound/weapons/sonic_jackhammer.ogg' + icon_state = "crowbar" + toolspeed = 0.1 + origin_tech = "combat=4;engineering=4;abductor=3" + +/obj/item/crowbar/large + name = "crowbar" + desc = "It's a big crowbar. It doesn't fit in your pockets, because it's big." + force = 12 + w_class = WEIGHT_CLASS_NORMAL + throw_speed = 3 + throw_range = 3 + materials = list(MAT_METAL=70) + icon_state = "crowbar_large" + item_state = "crowbar" + toolspeed = 0.5 + +/obj/item/crowbar/cyborg + name = "hydraulic crowbar" + desc = "A hydraulic prying tool, compact but powerful. Designed to replace crowbar in construction cyborgs." + usesound = 'sound/items/jaws_pry.ogg' + force = 10 + toolspeed = 0.5 + +/obj/item/crowbar/power + name = "jaws of life" + desc = "A set of jaws of life, compressed through the magic of science. It's fitted with a prying head." + icon_state = "jaws_pry" + item_state = "jawsoflife" + lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' + materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_TITANIUM=25) + origin_tech = "materials=2;engineering=2" + usesound = 'sound/items/jaws_pry.ogg' + force = 15 + toolspeed = 0.25 + +/obj/item/crowbar/power/suicide_act(mob/user) + user.visible_message("[user] is putting [user.p_their()] head in [src], it looks like [user.p_theyre()] trying to commit suicide!") + playsound(loc, 'sound/items/jaws_pry.ogg', 50, 1, -1) + return (BRUTELOSS) + +/obj/item/crowbar/power/attack_self(mob/user) + playsound(get_turf(user), 'sound/items/change_jaws.ogg', 50, 1) + var/obj/item/wirecutters/power/cutjaws = new /obj/item/wirecutters/power + to_chat(user, "You attach the cutting jaws to [src].") + qdel(src) + user.put_in_active_hand(cutjaws) + +#undef WELDER_FUEL_BURN_INTERVAL #define WELDER_FUEL_BURN_INTERVAL 13 /* Tools! @@ -1580,4 +1578,3 @@ user.put_in_active_hand(cutjaws) #undef WELDER_FUEL_BURN_INTERVAL ->>>>>>> 2240756... Gets rid of manual overlay manipulation (#30454) From 3dbfac920ae6b0360a49d93e7ecc180c8faa277a Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sun, 10 Sep 2017 11:48:28 -0500 Subject: [PATCH 028/163] Update weaponry.dm --- code/game/objects/items/weaponry.dm | 1175 +++++++++++++-------------- 1 file changed, 586 insertions(+), 589 deletions(-) diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm index fe9c9485cd..443518ec0a 100644 --- a/code/game/objects/items/weaponry.dm +++ b/code/game/objects/items/weaponry.dm @@ -1,596 +1,594 @@ -/obj/item/banhammer - desc = "A banhammer" - name = "banhammer" - icon = 'icons/obj/items_and_weapons.dmi' - icon_state = "toyhammer" - slot_flags = SLOT_BELT - throwforce = 0 - w_class = WEIGHT_CLASS_TINY - throw_speed = 3 - throw_range = 7 - attack_verb = list("banned") - max_integrity = 200 - armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 70) - resistance_flags = FIRE_PROOF - -/obj/item/banhammer/suicide_act(mob/user) - user.visible_message("[user] is hitting [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to ban [user.p_them()]self from life.") - return (BRUTELOSS|FIRELOSS|TOXLOSS|OXYLOSS) - -/obj/item/banhammer/attack(mob/M, mob/user) +/obj/item/banhammer + desc = "A banhammer" + name = "banhammer" + icon = 'icons/obj/items_and_weapons.dmi' + icon_state = "toyhammer" + slot_flags = SLOT_BELT + throwforce = 0 + w_class = WEIGHT_CLASS_TINY + throw_speed = 3 + throw_range = 7 + attack_verb = list("banned") + max_integrity = 200 + armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 70) + resistance_flags = FIRE_PROOF + +/obj/item/banhammer/suicide_act(mob/user) + user.visible_message("[user] is hitting [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to ban [user.p_them()]self from life.") + return (BRUTELOSS|FIRELOSS|TOXLOSS|OXYLOSS) + +/obj/item/banhammer/attack(mob/M, mob/user) if(user.zone_selected == "head") M.visible_message("[user] are stroking the head of [M] with a bangammer", "[user] are stroking the head with a bangammer", "you hear a bangammer stroking a head"); else M.visible_message("[M] has been banned FOR NO REISIN by [user]", "You have been banned FOR NO REISIN by [user]", "you hear a banhammer banning someone") -<<<<<<< HEAD - playsound(loc, 'sound/effects/adminhelp.ogg', 15) //keep it at 15% volume so people don't jump out of their skin too much - -/obj/item/sord - name = "\improper SORD" - desc = "This thing is so unspeakably shitty you are having a hard time even holding it." - icon_state = "sord" - item_state = "sord" - lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi' - righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi' - slot_flags = SLOT_BELT - force = 2 - throwforce = 1 - w_class = WEIGHT_CLASS_NORMAL - hitsound = 'sound/weapons/bladeslice.ogg' - attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") - -/obj/item/sord/suicide_act(mob/user) - user.visible_message("[user] is trying to impale [user.p_them()]self with [src]! It might be a suicide attempt if it weren't so shitty.", \ - "You try to impale yourself with [src], but it's USELESS...") - return SHAME - -/obj/item/claymore - name = "claymore" - desc = "What are you standing around staring at this for? Get to killing!" - icon_state = "claymore" - item_state = "claymore" - lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi' - righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi' - hitsound = 'sound/weapons/bladeslice.ogg' - flags_1 = CONDUCT_1 - slot_flags = SLOT_BELT | SLOT_BACK - force = 40 - throwforce = 10 - w_class = WEIGHT_CLASS_NORMAL - attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") - block_chance = 50 - sharpness = IS_SHARP - max_integrity = 200 - armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 50) - resistance_flags = FIRE_PROOF - -/obj/item/claymore/suicide_act(mob/user) - user.visible_message("[user] is falling on [src]! It looks like [user.p_theyre()] trying to commit suicide!") - return(BRUTELOSS) - -/obj/item/claymore/highlander //ALL COMMENTS MADE REGARDING THIS SWORD MUST BE MADE IN ALL CAPS - desc = "THERE CAN BE ONLY ONE, AND IT WILL BE YOU!!!\nActivate it in your hand to point to the nearest victim." - flags_1 = CONDUCT_1 | NODROP_1 | DROPDEL_1 - slot_flags = null - block_chance = 0 //RNG WON'T HELP YOU NOW, PANSY - luminosity = 3 - attack_verb = list("brutalized", "eviscerated", "disemboweled", "hacked", "carved", "cleaved") //ONLY THE MOST VISCERAL ATTACK VERBS - var/notches = 0 //HOW MANY PEOPLE HAVE BEEN SLAIN WITH THIS BLADE - var/obj/item/disk/nuclear/nuke_disk //OUR STORED NUKE DISK - -/obj/item/claymore/highlander/Initialize() - . = ..() - START_PROCESSING(SSobj, src) - -/obj/item/claymore/highlander/Destroy() - if(nuke_disk) - nuke_disk.forceMove(get_turf(src)) - nuke_disk.visible_message("The nuke disk is vulnerable!") - nuke_disk = null - STOP_PROCESSING(SSobj, src) - return ..() - -/obj/item/claymore/highlander/process() - if(ishuman(loc)) - var/mob/living/carbon/human/H = loc - loc.layer = LARGE_MOB_LAYER //NO HIDING BEHIND PLANTS FOR YOU, DICKWEED (HA GET IT, BECAUSE WEEDS ARE PLANTS) - H.bleedsuppress = TRUE //AND WE WON'T BLEED OUT LIKE COWARDS - else - if(!admin_spawned) - qdel(src) - - -/obj/item/claymore/highlander/pickup(mob/living/user) - to_chat(user, "The power of Scotland protects you! You are shielded from all stuns and knockdowns.") - user.add_stun_absorption("highlander", INFINITY, 1, " is protected by the power of Scotland!", "The power of Scotland absorbs the stun!", " is protected by the power of Scotland!") - user.status_flags += IGNORESLOWDOWN - -/obj/item/claymore/highlander/dropped(mob/living/user) - user.status_flags -= IGNORESLOWDOWN - qdel(src) //If this ever happens, it's because you lost an arm - -/obj/item/claymore/highlander/examine(mob/user) - ..() - to_chat(user, "It has [!notches ? "nothing" : "[notches] notches"] scratched into the blade.") - if(nuke_disk) - to_chat(user, "It's holding the nuke disk!") - -/obj/item/claymore/highlander/attack(mob/living/target, mob/living/user) - . = ..() - if(target && target.stat == DEAD && target.mind && target.mind.special_role == "highlander") - user.fully_heal() //STEAL THE LIFE OF OUR FALLEN FOES - add_notch(user) - target.visible_message("[target] crumbles to dust beneath [user]'s blows!", "As you fall, your body crumbles to dust!") - target.dust() - -/obj/item/claymore/highlander/attack_self(mob/living/user) - var/closest_victim - var/closest_distance = 255 - for(var/mob/living/carbon/human/H in GLOB.player_list - user) - if(H.client && H.mind.special_role == "highlander" && (!closest_victim || get_dist(user, closest_victim) < closest_distance)) - closest_victim = H - if(!closest_victim) - to_chat(user, "[src] thrums for a moment and falls dark. Perhaps there's nobody nearby.") - return - to_chat(user, "[src] thrums and points to the [dir2text(get_dir(user, closest_victim))].") - -/obj/item/claymore/highlander/IsReflect() - return 1 //YOU THINK YOUR PUNY LASERS CAN STOP ME? - -/obj/item/claymore/highlander/proc/add_notch(mob/living/user) //DYNAMIC CLAYMORE PROGRESSION SYSTEM - THIS IS THE FUTURE - notches++ - force++ - var/new_name = name - switch(notches) - if(1) - to_chat(user, "Your first kill - hopefully one of many. You scratch a notch into [src]'s blade.") - to_chat(user, "You feel your fallen foe's soul entering your blade, restoring your wounds!") - new_name = "notched claymore" - if(2) - to_chat(user, "Another falls before you. Another soul fuses with your own. Another notch in the blade.") - new_name = "double-notched claymore" - add_atom_colour(rgb(255, 235, 235), ADMIN_COLOUR_PRIORITY) - if(3) - to_chat(user, "You're beginning to relish the thrill of battle.") - new_name = "triple-notched claymore" - add_atom_colour(rgb(255, 215, 215), ADMIN_COLOUR_PRIORITY) - if(4) - to_chat(user, "You've lost count of how many you've killed.") - new_name = "many-notched claymore" - add_atom_colour(rgb(255, 195, 195), ADMIN_COLOUR_PRIORITY) - if(5) - to_chat(user, "Five voices now echo in your mind, cheering the slaughter.") - new_name = "battle-tested claymore" - add_atom_colour(rgb(255, 175, 175), ADMIN_COLOUR_PRIORITY) - if(6) - to_chat(user, "Is this what the vikings felt like? Visions of glory fill your head as you slay your sixth foe.") - new_name = "battle-scarred claymore" - add_atom_colour(rgb(255, 155, 155), ADMIN_COLOUR_PRIORITY) - if(7) - to_chat(user, "Kill. Butcher. Conquer.") - new_name = "vicious claymore" - add_atom_colour(rgb(255, 135, 135), ADMIN_COLOUR_PRIORITY) - if(8) - to_chat(user, "IT NEVER GETS OLD. THE SCREAMING. THE BLOOD AS IT SPRAYS ACROSS YOUR FACE.") - new_name = "bloodthirsty claymore" - add_atom_colour(rgb(255, 115, 115), ADMIN_COLOUR_PRIORITY) - if(9) - to_chat(user, "ANOTHER ONE FALLS TO YOUR BLOWS. ANOTHER WEAKLING UNFIT TO LIVE.") - new_name = "gore-stained claymore" - add_atom_colour(rgb(255, 95, 95), ADMIN_COLOUR_PRIORITY) - if(10) - user.visible_message("[user]'s eyes light up with a vengeful fire!", \ - "YOU FEEL THE POWER OF VALHALLA FLOWING THROUGH YOU! THERE CAN BE ONLY ONE!!!") - user.update_icons() - new_name = "GORE-DRENCHED CLAYMORE OF [pick("THE WHIMSICAL SLAUGHTER", "A THOUSAND SLAUGHTERED CATTLE", "GLORY AND VALHALLA", "ANNIHILATION", "OBLITERATION")]" - icon_state = "claymore_valhalla" - item_state = "cultblade" - remove_atom_colour(ADMIN_COLOUR_PRIORITY) - - name = new_name - playsound(user, 'sound/items/screwdriver2.ogg', 50, 1) - -/obj/item/katana - name = "katana" - desc = "Woefully underpowered in D20" - icon_state = "katana" - item_state = "katana" - lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi' - righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi' - flags_1 = CONDUCT_1 - slot_flags = SLOT_BELT | SLOT_BACK - force = 40 - throwforce = 10 - w_class = WEIGHT_CLASS_NORMAL - hitsound = 'sound/weapons/bladeslice.ogg' - attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") - block_chance = 50 - sharpness = IS_SHARP - max_integrity = 200 - armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 50) - resistance_flags = FIRE_PROOF - -/obj/item/katana/cursed - slot_flags = null - -/obj/item/katana/suicide_act(mob/user) - user.visible_message("[user] is slitting [user.p_their()] stomach open with [src]! It looks like [user.p_theyre()] trying to commit seppuku!") - return(BRUTELOSS) - -/obj/item/wirerod - name = "wired rod" - desc = "A rod with some wire wrapped around the top. It'd be easy to attach something to the top bit." - icon_state = "wiredrod" - item_state = "rods" - flags_1 = CONDUCT_1 - force = 9 - throwforce = 10 - w_class = WEIGHT_CLASS_NORMAL - materials = list(MAT_METAL=1150, MAT_GLASS=75) - attack_verb = list("hit", "bludgeoned", "whacked", "bonked") - -/obj/item/wirerod/attackby(obj/item/I, mob/user, params) - if(istype(I, /obj/item/shard)) - var/obj/item/twohanded/spear/S = new /obj/item/twohanded/spear - - remove_item_from_storage(user) - qdel(I) - qdel(src) - - user.put_in_hands(S) - to_chat(user, "You fasten the glass shard to the top of the rod with the cable.") - - else if(istype(I, /obj/item/device/assembly/igniter) && !(I.flags_1 & NODROP_1)) - var/obj/item/melee/baton/cattleprod/P = new /obj/item/melee/baton/cattleprod - - remove_item_from_storage(user) - - to_chat(user, "You fasten [I] to the top of the rod with the cable.") - - qdel(I) - qdel(src) - - user.put_in_hands(P) - else - return ..() - - -/obj/item/throwing_star - name = "throwing star" - desc = "An ancient weapon still used to this day due to it's ease of lodging itself into victim's body parts" - icon_state = "throwingstar" - item_state = "eshield0" - lefthand_file = 'icons/mob/inhands/equipment/shields_lefthand.dmi' - righthand_file = 'icons/mob/inhands/equipment/shields_righthand.dmi' - force = 2 - throwforce = 20 //This is never used on mobs since this has a 100% embed chance. - throw_speed = 4 - embedded_pain_multiplier = 4 - w_class = WEIGHT_CLASS_SMALL - embed_chance = 100 - embedded_fall_chance = 0 //Hahaha! - sharpness = IS_SHARP - materials = list(MAT_METAL=500, MAT_GLASS=500) - resistance_flags = FIRE_PROOF - - -/obj/item/switchblade - name = "switchblade" - icon_state = "switchblade" - lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi' - righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi' - desc = "A sharp, concealable, spring-loaded knife." - flags_1 = CONDUCT_1 - force = 3 - w_class = WEIGHT_CLASS_SMALL - throwforce = 5 - throw_speed = 3 - throw_range = 6 - materials = list(MAT_METAL=12000) - origin_tech = "engineering=3;combat=2" - hitsound = 'sound/weapons/genhit.ogg' - attack_verb = list("stubbed", "poked") - resistance_flags = FIRE_PROOF - var/extended = 0 - -/obj/item/switchblade/attack_self(mob/user) - extended = !extended - playsound(src.loc, 'sound/weapons/batonextend.ogg', 50, 1) - if(extended) - force = 20 - w_class = WEIGHT_CLASS_NORMAL - throwforce = 23 - icon_state = "switchblade_ext" - attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") - hitsound = 'sound/weapons/bladeslice.ogg' - sharpness = IS_SHARP - else - force = 3 - w_class = WEIGHT_CLASS_SMALL - throwforce = 5 - icon_state = "switchblade" - attack_verb = list("stubbed", "poked") - hitsound = 'sound/weapons/genhit.ogg' - sharpness = IS_BLUNT - -/obj/item/switchblade/suicide_act(mob/user) - user.visible_message("[user] is slitting [user.p_their()] own throat with [src]! It looks like [user.p_theyre()] trying to commit suicide!") - return (BRUTELOSS) - -/obj/item/phone - name = "red phone" - desc = "Should anything ever go wrong..." - icon = 'icons/obj/items_and_weapons.dmi' - icon_state = "red_phone" - force = 3 - throwforce = 2 - throw_speed = 3 - throw_range = 4 - w_class = WEIGHT_CLASS_SMALL - attack_verb = list("called", "rang") - hitsound = 'sound/weapons/ring.ogg' - -/obj/item/phone/suicide_act(mob/user) - if(locate(/obj/structure/chair/stool) in user.loc) - user.visible_message("[user] begins to tie a noose with [src]'s cord! It looks like [user.p_theyre()] trying to commit suicide!") - else - user.visible_message("[user] is strangling [user.p_them()]self with [src]'s cord! It looks like [user.p_theyre()] trying to commit suicide!") - return(OXYLOSS) - -/obj/item/cane - name = "cane" - desc = "A cane used by a true gentleman. Or a clown." - icon = 'icons/obj/items_and_weapons.dmi' - icon_state = "cane" - item_state = "stick" - lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi' - righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi' - force = 5 - throwforce = 5 - w_class = WEIGHT_CLASS_SMALL - materials = list(MAT_METAL=50) - attack_verb = list("bludgeoned", "whacked", "disciplined", "thrashed") - -/obj/item/staff - name = "wizard staff" - desc = "Apparently a staff used by the wizard." - icon = 'icons/obj/wizard.dmi' - icon_state = "staff" - lefthand_file = 'icons/mob/inhands/weapons/staves_lefthand.dmi' - righthand_file = 'icons/mob/inhands/weapons/staves_righthand.dmi' - force = 3 - throwforce = 5 - throw_speed = 2 - throw_range = 5 - w_class = WEIGHT_CLASS_SMALL - armour_penetration = 100 - attack_verb = list("bludgeoned", "whacked", "disciplined") - resistance_flags = FLAMMABLE - -/obj/item/staff/broom - name = "broom" - desc = "Used for sweeping, and flying into the night while cackling. Black cat not included." - icon = 'icons/obj/wizard.dmi' - icon_state = "broom" - resistance_flags = FLAMMABLE - -/obj/item/staff/stick - name = "stick" - desc = "A great tool to drag someone else's drinks across the bar." - icon = 'icons/obj/items_and_weapons.dmi' - icon_state = "stick" - item_state = "stick" - lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi' - righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi' - force = 3 - throwforce = 5 - throw_speed = 2 - throw_range = 5 - w_class = WEIGHT_CLASS_SMALL - -/obj/item/ectoplasm - name = "ectoplasm" - desc = "spooky" - gender = PLURAL - icon = 'icons/obj/wizard.dmi' - icon_state = "ectoplasm" - -/obj/item/ectoplasm/suicide_act(mob/user) - user.visible_message("[user] is inhaling [src]! It looks like [user.p_theyre()] trying to visit the astral plane.") - return (OXYLOSS) - -/obj/item/mounted_chainsaw - name = "mounted chainsaw" - desc = "A chainsaw that has replaced your arm." - icon_state = "chainsaw_on" - item_state = "mounted_chainsaw" - lefthand_file = 'icons/mob/inhands/weapons/chainsaw_lefthand.dmi' - righthand_file = 'icons/mob/inhands/weapons/chainsaw_righthand.dmi' - flags_1 = NODROP_1 | ABSTRACT_1 | DROPDEL_1 - w_class = WEIGHT_CLASS_HUGE - force = 21 - throwforce = 0 - throw_range = 0 - throw_speed = 0 - sharpness = IS_SHARP - attack_verb = list("sawed", "torn", "cut", "chopped", "diced") - hitsound = 'sound/weapons/chainsawhit.ogg' - -/obj/item/mounted_chainsaw/Destroy() - var/obj/item/bodypart/part - new /obj/item/twohanded/required/chainsaw(get_turf(src)) - if(iscarbon(loc)) - var/mob/living/carbon/holder = loc - var/index = holder.get_held_index_of_item(src) - if(index) - part = holder.hand_bodyparts[index] - . = ..() - if(part) - part.drop_limb() - -/obj/item/statuebust - name = "bust" - desc = "A priceless ancient marble bust, the kind that belongs in a museum." //or you can hit people with it - icon = 'icons/obj/statue.dmi' - icon_state = "bust" - force = 15 - throwforce = 10 - throw_speed = 5 - throw_range = 2 - attack_verb = list("busted") - -/obj/item/tailclub - name = "tail club" - desc = "For the beating to death of lizards with their own tails." - icon_state = "tailclub" - force = 14 - throwforce = 1 // why are you throwing a club do you even weapon - throw_speed = 1 - throw_range = 1 - attack_verb = list("clubbed", "bludgeoned") - -/obj/item/melee/chainofcommand/tailwhip - name = "liz o' nine tails" - desc = "A whip fashioned from the severed tails of lizards." - icon_state = "tailwhip" - origin_tech = "engineering=3;combat=3;biotech=3" - needs_permit = 0 - -/obj/item/melee/chainofcommand/tailwhip/kitty - name = "cat o' nine tails" - desc = "A whip fashioned from the severed tails of cats." - icon_state = "catwhip" - -/obj/item/melee/skateboard - name = "skateboard" - desc = "A skateboard. It can be placed on its wheels and ridden, or used as a strong weapon." - icon_state = "skateboard" - item_state = "skateboard" - force = 12 - throwforce = 4 - w_class = WEIGHT_CLASS_HUGE - attack_verb = list("smacked", "whacked", "slammed", "smashed") - -/obj/item/melee/skateboard/attack_self(mob/user) - new /obj/vehicle/scooter/skateboard(get_turf(user)) - qdel(src) - -/obj/item/melee/baseball_bat - name = "baseball bat" - desc = "There ain't a skull in the league that can withstand a swatter." - icon = 'icons/obj/items_and_weapons.dmi' - icon_state = "baseball_bat" - item_state = "baseball_bat" - lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi' - righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi' - force = 10 - throwforce = 12 - attack_verb = list("beat", "smacked") - w_class = WEIGHT_CLASS_HUGE - var/homerun_ready = 0 - var/homerun_able = 0 - -/obj/item/melee/baseball_bat/homerun - name = "home run bat" - desc = "This thing looks dangerous... Dangerously good at baseball, that is." - homerun_able = 1 - -/obj/item/melee/baseball_bat/attack_self(mob/user) - if(!homerun_able) - ..() - return - if(homerun_ready) - to_chat(user, "You're already ready to do a home run!") - ..() - return - to_chat(user, "You begin gathering strength...") - playsound(get_turf(src), 'sound/magic/lightning_chargeup.ogg', 65, 1) - if(do_after(user, 90, target = src)) - to_chat(user, "You gather power! Time for a home run!") - homerun_ready = 1 - ..() - -/obj/item/melee/baseball_bat/attack(mob/living/target, mob/living/user) - . = ..() - var/atom/throw_target = get_edge_target_turf(target, user.dir) - if(homerun_ready) - user.visible_message("It's a home run!") - target.throw_at(throw_target, rand(8,10), 14, user) - target.ex_act(EXPLODE_HEAVY) - playsound(get_turf(src), 'sound/weapons/homerun.ogg', 100, 1) - homerun_ready = 0 - return - else if(!target.anchored) - target.throw_at(throw_target, rand(1,2), 7, user) - -/obj/item/melee/baseball_bat/ablative - name = "metal baseball bat" - desc = "This bat is made of highly reflective, highly armored material." - icon_state = "baseball_bat_metal" - item_state = "baseball_bat_metal" - force = 12 - throwforce = 15 - -/obj/item/melee/baseball_bat/ablative/IsReflect()//some day this will reflect thrown items instead of lasers - var/picksound = rand(1,2) - var/turf = get_turf(src) - if(picksound == 1) - playsound(turf, 'sound/weapons/effects/batreflect1.ogg', 50, 1) - if(picksound == 2) - playsound(turf, 'sound/weapons/effects/batreflect2.ogg', 50, 1) - return 1 - -/obj/item/melee/flyswatter - name = "flyswatter" - desc = "Useful for killing insects of all sizes." - icon = 'icons/obj/items_and_weapons.dmi' - icon_state = "flyswatter" - item_state = "flyswatter" - lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi' - righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi' - force = 1 - throwforce = 1 - attack_verb = list("swatted", "smacked") - hitsound = 'sound/effects/snap.ogg' - w_class = WEIGHT_CLASS_SMALL - //Things in this list will be instantly splatted. Flyman weakness is handled in the flyman species weakness proc. - var/list/strong_against - -/obj/item/melee/flyswatter/Initialize() - . = ..() - strong_against = typecacheof(list( - /mob/living/simple_animal/hostile/poison/bees/, - /mob/living/simple_animal/butterfly, - /mob/living/simple_animal/cockroach, - /obj/item/queen_bee - )) - - -/obj/item/melee/flyswatter/afterattack(atom/target, mob/user, proximity_flag) - if(proximity_flag) - if(is_type_in_typecache(target, strong_against)) - new /obj/effect/decal/cleanable/deadcockroach(get_turf(target)) - to_chat(user, "You easily splat the [target].") - if(istype(target, /mob/living/)) - var/mob/living/bug = target - bug.death(1) - else - qdel(target) - -/obj/item/circlegame - name = "circled hand" - desc = "If somebody looks at this while it's below your waist, you get to bop them." - icon_state = "madeyoulook" - force = 0 - throwforce = 0 - flags_1 = DROPDEL_1 | ABSTRACT_1 - attack_verb = list("bopped") - -/obj/item/proc/can_trigger_gun(mob/living/user) - if(!user.can_use_guns(src)) - return FALSE -======= + playsound(loc, 'sound/effects/adminhelp.ogg', 15) //keep it at 15% volume so people don't jump out of their skin too much + +/obj/item/sord + name = "\improper SORD" + desc = "This thing is so unspeakably shitty you are having a hard time even holding it." + icon_state = "sord" + item_state = "sord" + lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi' + righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi' + slot_flags = SLOT_BELT + force = 2 + throwforce = 1 + w_class = WEIGHT_CLASS_NORMAL + hitsound = 'sound/weapons/bladeslice.ogg' + attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") + +/obj/item/sord/suicide_act(mob/user) + user.visible_message("[user] is trying to impale [user.p_them()]self with [src]! It might be a suicide attempt if it weren't so shitty.", \ + "You try to impale yourself with [src], but it's USELESS...") + return SHAME + +/obj/item/claymore + name = "claymore" + desc = "What are you standing around staring at this for? Get to killing!" + icon_state = "claymore" + item_state = "claymore" + lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi' + righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi' + hitsound = 'sound/weapons/bladeslice.ogg' + flags_1 = CONDUCT_1 + slot_flags = SLOT_BELT | SLOT_BACK + force = 40 + throwforce = 10 + w_class = WEIGHT_CLASS_NORMAL + attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") + block_chance = 50 + sharpness = IS_SHARP + max_integrity = 200 + armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 50) + resistance_flags = FIRE_PROOF + +/obj/item/claymore/suicide_act(mob/user) + user.visible_message("[user] is falling on [src]! It looks like [user.p_theyre()] trying to commit suicide!") + return(BRUTELOSS) + +/obj/item/claymore/highlander //ALL COMMENTS MADE REGARDING THIS SWORD MUST BE MADE IN ALL CAPS + desc = "THERE CAN BE ONLY ONE, AND IT WILL BE YOU!!!\nActivate it in your hand to point to the nearest victim." + flags_1 = CONDUCT_1 | NODROP_1 | DROPDEL_1 + slot_flags = null + block_chance = 0 //RNG WON'T HELP YOU NOW, PANSY + luminosity = 3 + attack_verb = list("brutalized", "eviscerated", "disemboweled", "hacked", "carved", "cleaved") //ONLY THE MOST VISCERAL ATTACK VERBS + var/notches = 0 //HOW MANY PEOPLE HAVE BEEN SLAIN WITH THIS BLADE + var/obj/item/disk/nuclear/nuke_disk //OUR STORED NUKE DISK + +/obj/item/claymore/highlander/Initialize() + . = ..() + START_PROCESSING(SSobj, src) + +/obj/item/claymore/highlander/Destroy() + if(nuke_disk) + nuke_disk.forceMove(get_turf(src)) + nuke_disk.visible_message("The nuke disk is vulnerable!") + nuke_disk = null + STOP_PROCESSING(SSobj, src) + return ..() + +/obj/item/claymore/highlander/process() + if(ishuman(loc)) + var/mob/living/carbon/human/H = loc + loc.layer = LARGE_MOB_LAYER //NO HIDING BEHIND PLANTS FOR YOU, DICKWEED (HA GET IT, BECAUSE WEEDS ARE PLANTS) + H.bleedsuppress = TRUE //AND WE WON'T BLEED OUT LIKE COWARDS + else + if(!admin_spawned) + qdel(src) + + +/obj/item/claymore/highlander/pickup(mob/living/user) + to_chat(user, "The power of Scotland protects you! You are shielded from all stuns and knockdowns.") + user.add_stun_absorption("highlander", INFINITY, 1, " is protected by the power of Scotland!", "The power of Scotland absorbs the stun!", " is protected by the power of Scotland!") + user.status_flags += IGNORESLOWDOWN + +/obj/item/claymore/highlander/dropped(mob/living/user) + user.status_flags -= IGNORESLOWDOWN + qdel(src) //If this ever happens, it's because you lost an arm + +/obj/item/claymore/highlander/examine(mob/user) + ..() + to_chat(user, "It has [!notches ? "nothing" : "[notches] notches"] scratched into the blade.") + if(nuke_disk) + to_chat(user, "It's holding the nuke disk!") + +/obj/item/claymore/highlander/attack(mob/living/target, mob/living/user) + . = ..() + if(target && target.stat == DEAD && target.mind && target.mind.special_role == "highlander") + user.fully_heal() //STEAL THE LIFE OF OUR FALLEN FOES + add_notch(user) + target.visible_message("[target] crumbles to dust beneath [user]'s blows!", "As you fall, your body crumbles to dust!") + target.dust() + +/obj/item/claymore/highlander/attack_self(mob/living/user) + var/closest_victim + var/closest_distance = 255 + for(var/mob/living/carbon/human/H in GLOB.player_list - user) + if(H.client && H.mind.special_role == "highlander" && (!closest_victim || get_dist(user, closest_victim) < closest_distance)) + closest_victim = H + if(!closest_victim) + to_chat(user, "[src] thrums for a moment and falls dark. Perhaps there's nobody nearby.") + return + to_chat(user, "[src] thrums and points to the [dir2text(get_dir(user, closest_victim))].") + +/obj/item/claymore/highlander/IsReflect() + return 1 //YOU THINK YOUR PUNY LASERS CAN STOP ME? + +/obj/item/claymore/highlander/proc/add_notch(mob/living/user) //DYNAMIC CLAYMORE PROGRESSION SYSTEM - THIS IS THE FUTURE + notches++ + force++ + var/new_name = name + switch(notches) + if(1) + to_chat(user, "Your first kill - hopefully one of many. You scratch a notch into [src]'s blade.") + to_chat(user, "You feel your fallen foe's soul entering your blade, restoring your wounds!") + new_name = "notched claymore" + if(2) + to_chat(user, "Another falls before you. Another soul fuses with your own. Another notch in the blade.") + new_name = "double-notched claymore" + add_atom_colour(rgb(255, 235, 235), ADMIN_COLOUR_PRIORITY) + if(3) + to_chat(user, "You're beginning to relish the thrill of battle.") + new_name = "triple-notched claymore" + add_atom_colour(rgb(255, 215, 215), ADMIN_COLOUR_PRIORITY) + if(4) + to_chat(user, "You've lost count of how many you've killed.") + new_name = "many-notched claymore" + add_atom_colour(rgb(255, 195, 195), ADMIN_COLOUR_PRIORITY) + if(5) + to_chat(user, "Five voices now echo in your mind, cheering the slaughter.") + new_name = "battle-tested claymore" + add_atom_colour(rgb(255, 175, 175), ADMIN_COLOUR_PRIORITY) + if(6) + to_chat(user, "Is this what the vikings felt like? Visions of glory fill your head as you slay your sixth foe.") + new_name = "battle-scarred claymore" + add_atom_colour(rgb(255, 155, 155), ADMIN_COLOUR_PRIORITY) + if(7) + to_chat(user, "Kill. Butcher. Conquer.") + new_name = "vicious claymore" + add_atom_colour(rgb(255, 135, 135), ADMIN_COLOUR_PRIORITY) + if(8) + to_chat(user, "IT NEVER GETS OLD. THE SCREAMING. THE BLOOD AS IT SPRAYS ACROSS YOUR FACE.") + new_name = "bloodthirsty claymore" + add_atom_colour(rgb(255, 115, 115), ADMIN_COLOUR_PRIORITY) + if(9) + to_chat(user, "ANOTHER ONE FALLS TO YOUR BLOWS. ANOTHER WEAKLING UNFIT TO LIVE.") + new_name = "gore-stained claymore" + add_atom_colour(rgb(255, 95, 95), ADMIN_COLOUR_PRIORITY) + if(10) + user.visible_message("[user]'s eyes light up with a vengeful fire!", \ + "YOU FEEL THE POWER OF VALHALLA FLOWING THROUGH YOU! THERE CAN BE ONLY ONE!!!") + user.update_icons() + new_name = "GORE-DRENCHED CLAYMORE OF [pick("THE WHIMSICAL SLAUGHTER", "A THOUSAND SLAUGHTERED CATTLE", "GLORY AND VALHALLA", "ANNIHILATION", "OBLITERATION")]" + icon_state = "claymore_valhalla" + item_state = "cultblade" + remove_atom_colour(ADMIN_COLOUR_PRIORITY) + + name = new_name + playsound(user, 'sound/items/screwdriver2.ogg', 50, 1) + +/obj/item/katana + name = "katana" + desc = "Woefully underpowered in D20" + icon_state = "katana" + item_state = "katana" + lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi' + righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi' + flags_1 = CONDUCT_1 + slot_flags = SLOT_BELT | SLOT_BACK + force = 40 + throwforce = 10 + w_class = WEIGHT_CLASS_NORMAL + hitsound = 'sound/weapons/bladeslice.ogg' + attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") + block_chance = 50 + sharpness = IS_SHARP + max_integrity = 200 + armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 50) + resistance_flags = FIRE_PROOF + +/obj/item/katana/cursed + slot_flags = null + +/obj/item/katana/suicide_act(mob/user) + user.visible_message("[user] is slitting [user.p_their()] stomach open with [src]! It looks like [user.p_theyre()] trying to commit seppuku!") + return(BRUTELOSS) + +/obj/item/wirerod + name = "wired rod" + desc = "A rod with some wire wrapped around the top. It'd be easy to attach something to the top bit." + icon_state = "wiredrod" + item_state = "rods" + flags_1 = CONDUCT_1 + force = 9 + throwforce = 10 + w_class = WEIGHT_CLASS_NORMAL + materials = list(MAT_METAL=1150, MAT_GLASS=75) + attack_verb = list("hit", "bludgeoned", "whacked", "bonked") + +/obj/item/wirerod/attackby(obj/item/I, mob/user, params) + if(istype(I, /obj/item/shard)) + var/obj/item/twohanded/spear/S = new /obj/item/twohanded/spear + + remove_item_from_storage(user) + qdel(I) + qdel(src) + + user.put_in_hands(S) + to_chat(user, "You fasten the glass shard to the top of the rod with the cable.") + + else if(istype(I, /obj/item/device/assembly/igniter) && !(I.flags_1 & NODROP_1)) + var/obj/item/melee/baton/cattleprod/P = new /obj/item/melee/baton/cattleprod + + remove_item_from_storage(user) + + to_chat(user, "You fasten [I] to the top of the rod with the cable.") + + qdel(I) + qdel(src) + + user.put_in_hands(P) + else + return ..() + + +/obj/item/throwing_star + name = "throwing star" + desc = "An ancient weapon still used to this day due to it's ease of lodging itself into victim's body parts" + icon_state = "throwingstar" + item_state = "eshield0" + lefthand_file = 'icons/mob/inhands/equipment/shields_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/shields_righthand.dmi' + force = 2 + throwforce = 20 //This is never used on mobs since this has a 100% embed chance. + throw_speed = 4 + embedded_pain_multiplier = 4 + w_class = WEIGHT_CLASS_SMALL + embed_chance = 100 + embedded_fall_chance = 0 //Hahaha! + sharpness = IS_SHARP + materials = list(MAT_METAL=500, MAT_GLASS=500) + resistance_flags = FIRE_PROOF + + +/obj/item/switchblade + name = "switchblade" + icon_state = "switchblade" + lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi' + righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi' + desc = "A sharp, concealable, spring-loaded knife." + flags_1 = CONDUCT_1 + force = 3 + w_class = WEIGHT_CLASS_SMALL + throwforce = 5 + throw_speed = 3 + throw_range = 6 + materials = list(MAT_METAL=12000) + origin_tech = "engineering=3;combat=2" + hitsound = 'sound/weapons/genhit.ogg' + attack_verb = list("stubbed", "poked") + resistance_flags = FIRE_PROOF + var/extended = 0 + +/obj/item/switchblade/attack_self(mob/user) + extended = !extended + playsound(src.loc, 'sound/weapons/batonextend.ogg', 50, 1) + if(extended) + force = 20 + w_class = WEIGHT_CLASS_NORMAL + throwforce = 23 + icon_state = "switchblade_ext" + attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") + hitsound = 'sound/weapons/bladeslice.ogg' + sharpness = IS_SHARP + else + force = 3 + w_class = WEIGHT_CLASS_SMALL + throwforce = 5 + icon_state = "switchblade" + attack_verb = list("stubbed", "poked") + hitsound = 'sound/weapons/genhit.ogg' + sharpness = IS_BLUNT + +/obj/item/switchblade/suicide_act(mob/user) + user.visible_message("[user] is slitting [user.p_their()] own throat with [src]! It looks like [user.p_theyre()] trying to commit suicide!") + return (BRUTELOSS) + +/obj/item/phone + name = "red phone" + desc = "Should anything ever go wrong..." + icon = 'icons/obj/items_and_weapons.dmi' + icon_state = "red_phone" + force = 3 + throwforce = 2 + throw_speed = 3 + throw_range = 4 + w_class = WEIGHT_CLASS_SMALL + attack_verb = list("called", "rang") + hitsound = 'sound/weapons/ring.ogg' + +/obj/item/phone/suicide_act(mob/user) + if(locate(/obj/structure/chair/stool) in user.loc) + user.visible_message("[user] begins to tie a noose with [src]'s cord! It looks like [user.p_theyre()] trying to commit suicide!") + else + user.visible_message("[user] is strangling [user.p_them()]self with [src]'s cord! It looks like [user.p_theyre()] trying to commit suicide!") + return(OXYLOSS) + +/obj/item/cane + name = "cane" + desc = "A cane used by a true gentleman. Or a clown." + icon = 'icons/obj/items_and_weapons.dmi' + icon_state = "cane" + item_state = "stick" + lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi' + righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi' + force = 5 + throwforce = 5 + w_class = WEIGHT_CLASS_SMALL + materials = list(MAT_METAL=50) + attack_verb = list("bludgeoned", "whacked", "disciplined", "thrashed") + +/obj/item/staff + name = "wizard staff" + desc = "Apparently a staff used by the wizard." + icon = 'icons/obj/wizard.dmi' + icon_state = "staff" + lefthand_file = 'icons/mob/inhands/weapons/staves_lefthand.dmi' + righthand_file = 'icons/mob/inhands/weapons/staves_righthand.dmi' + force = 3 + throwforce = 5 + throw_speed = 2 + throw_range = 5 + w_class = WEIGHT_CLASS_SMALL + armour_penetration = 100 + attack_verb = list("bludgeoned", "whacked", "disciplined") + resistance_flags = FLAMMABLE + +/obj/item/staff/broom + name = "broom" + desc = "Used for sweeping, and flying into the night while cackling. Black cat not included." + icon = 'icons/obj/wizard.dmi' + icon_state = "broom" + resistance_flags = FLAMMABLE + +/obj/item/staff/stick + name = "stick" + desc = "A great tool to drag someone else's drinks across the bar." + icon = 'icons/obj/items_and_weapons.dmi' + icon_state = "stick" + item_state = "stick" + lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi' + righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi' + force = 3 + throwforce = 5 + throw_speed = 2 + throw_range = 5 + w_class = WEIGHT_CLASS_SMALL + +/obj/item/ectoplasm + name = "ectoplasm" + desc = "spooky" + gender = PLURAL + icon = 'icons/obj/wizard.dmi' + icon_state = "ectoplasm" + +/obj/item/ectoplasm/suicide_act(mob/user) + user.visible_message("[user] is inhaling [src]! It looks like [user.p_theyre()] trying to visit the astral plane.") + return (OXYLOSS) + +/obj/item/mounted_chainsaw + name = "mounted chainsaw" + desc = "A chainsaw that has replaced your arm." + icon_state = "chainsaw_on" + item_state = "mounted_chainsaw" + lefthand_file = 'icons/mob/inhands/weapons/chainsaw_lefthand.dmi' + righthand_file = 'icons/mob/inhands/weapons/chainsaw_righthand.dmi' + flags_1 = NODROP_1 | ABSTRACT_1 | DROPDEL_1 + w_class = WEIGHT_CLASS_HUGE + force = 21 + throwforce = 0 + throw_range = 0 + throw_speed = 0 + sharpness = IS_SHARP + attack_verb = list("sawed", "torn", "cut", "chopped", "diced") + hitsound = 'sound/weapons/chainsawhit.ogg' + +/obj/item/mounted_chainsaw/Destroy() + var/obj/item/bodypart/part + new /obj/item/twohanded/required/chainsaw(get_turf(src)) + if(iscarbon(loc)) + var/mob/living/carbon/holder = loc + var/index = holder.get_held_index_of_item(src) + if(index) + part = holder.hand_bodyparts[index] + . = ..() + if(part) + part.drop_limb() + +/obj/item/statuebust + name = "bust" + desc = "A priceless ancient marble bust, the kind that belongs in a museum." //or you can hit people with it + icon = 'icons/obj/statue.dmi' + icon_state = "bust" + force = 15 + throwforce = 10 + throw_speed = 5 + throw_range = 2 + attack_verb = list("busted") + +/obj/item/tailclub + name = "tail club" + desc = "For the beating to death of lizards with their own tails." + icon_state = "tailclub" + force = 14 + throwforce = 1 // why are you throwing a club do you even weapon + throw_speed = 1 + throw_range = 1 + attack_verb = list("clubbed", "bludgeoned") + +/obj/item/melee/chainofcommand/tailwhip + name = "liz o' nine tails" + desc = "A whip fashioned from the severed tails of lizards." + icon_state = "tailwhip" + origin_tech = "engineering=3;combat=3;biotech=3" + needs_permit = 0 + +/obj/item/melee/chainofcommand/tailwhip/kitty + name = "cat o' nine tails" + desc = "A whip fashioned from the severed tails of cats." + icon_state = "catwhip" + +/obj/item/melee/skateboard + name = "skateboard" + desc = "A skateboard. It can be placed on its wheels and ridden, or used as a strong weapon." + icon_state = "skateboard" + item_state = "skateboard" + force = 12 + throwforce = 4 + w_class = WEIGHT_CLASS_HUGE + attack_verb = list("smacked", "whacked", "slammed", "smashed") + +/obj/item/melee/skateboard/attack_self(mob/user) + new /obj/vehicle/scooter/skateboard(get_turf(user)) + qdel(src) + +/obj/item/melee/baseball_bat + name = "baseball bat" + desc = "There ain't a skull in the league that can withstand a swatter." + icon = 'icons/obj/items_and_weapons.dmi' + icon_state = "baseball_bat" + item_state = "baseball_bat" + lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi' + righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi' + force = 10 + throwforce = 12 + attack_verb = list("beat", "smacked") + w_class = WEIGHT_CLASS_HUGE + var/homerun_ready = 0 + var/homerun_able = 0 + +/obj/item/melee/baseball_bat/homerun + name = "home run bat" + desc = "This thing looks dangerous... Dangerously good at baseball, that is." + homerun_able = 1 + +/obj/item/melee/baseball_bat/attack_self(mob/user) + if(!homerun_able) + ..() + return + if(homerun_ready) + to_chat(user, "You're already ready to do a home run!") + ..() + return + to_chat(user, "You begin gathering strength...") + playsound(get_turf(src), 'sound/magic/lightning_chargeup.ogg', 65, 1) + if(do_after(user, 90, target = src)) + to_chat(user, "You gather power! Time for a home run!") + homerun_ready = 1 + ..() + +/obj/item/melee/baseball_bat/attack(mob/living/target, mob/living/user) + . = ..() + var/atom/throw_target = get_edge_target_turf(target, user.dir) + if(homerun_ready) + user.visible_message("It's a home run!") + target.throw_at(throw_target, rand(8,10), 14, user) + target.ex_act(EXPLODE_HEAVY) + playsound(get_turf(src), 'sound/weapons/homerun.ogg', 100, 1) + homerun_ready = 0 + return + else if(!target.anchored) + target.throw_at(throw_target, rand(1,2), 7, user) + +/obj/item/melee/baseball_bat/ablative + name = "metal baseball bat" + desc = "This bat is made of highly reflective, highly armored material." + icon_state = "baseball_bat_metal" + item_state = "baseball_bat_metal" + force = 12 + throwforce = 15 + +/obj/item/melee/baseball_bat/ablative/IsReflect()//some day this will reflect thrown items instead of lasers + var/picksound = rand(1,2) + var/turf = get_turf(src) + if(picksound == 1) + playsound(turf, 'sound/weapons/effects/batreflect1.ogg', 50, 1) + if(picksound == 2) + playsound(turf, 'sound/weapons/effects/batreflect2.ogg', 50, 1) + return 1 + +/obj/item/melee/flyswatter + name = "flyswatter" + desc = "Useful for killing insects of all sizes." + icon = 'icons/obj/items_and_weapons.dmi' + icon_state = "flyswatter" + item_state = "flyswatter" + lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi' + righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi' + force = 1 + throwforce = 1 + attack_verb = list("swatted", "smacked") + hitsound = 'sound/effects/snap.ogg' + w_class = WEIGHT_CLASS_SMALL + //Things in this list will be instantly splatted. Flyman weakness is handled in the flyman species weakness proc. + var/list/strong_against + +/obj/item/melee/flyswatter/Initialize() + . = ..() + strong_against = typecacheof(list( + /mob/living/simple_animal/hostile/poison/bees/, + /mob/living/simple_animal/butterfly, + /mob/living/simple_animal/cockroach, + /obj/item/queen_bee + )) + + +/obj/item/melee/flyswatter/afterattack(atom/target, mob/user, proximity_flag) + if(proximity_flag) + if(is_type_in_typecache(target, strong_against)) + new /obj/effect/decal/cleanable/deadcockroach(get_turf(target)) + to_chat(user, "You easily splat the [target].") + if(istype(target, /mob/living/)) + var/mob/living/bug = target + bug.death(1) + else + qdel(target) + +/obj/item/circlegame + name = "circled hand" + desc = "If somebody looks at this while it's below your waist, you get to bop them." + icon_state = "madeyoulook" + force = 0 + throwforce = 0 + flags_1 = DROPDEL_1 | ABSTRACT_1 + attack_verb = list("bopped") + +/obj/item/proc/can_trigger_gun(mob/living/user) + if(!user.can_use_guns(src)) + return FALSE playsound(loc, 'sound/effects/adminhelp.ogg', 15) //keep it at 15% volume so people don't jump out of their skin too much /obj/item/sord @@ -1157,5 +1155,4 @@ /obj/item/proc/can_trigger_gun(mob/living/user) if(!user.can_use_guns(src)) return FALSE ->>>>>>> 129a7b9... Fixes brains counting towards highlander killstreaks (#30396) return TRUE From 134c3f5f39a0a4d1b85d7e6a2d0ce3813981092f Mon Sep 17 00:00:00 2001 From: KorPhaeron Date: Sun, 10 Sep 2017 12:36:42 -0500 Subject: [PATCH 029/163] Losebreath --- code/modules/mob/living/carbon/life.dm | 18 +++++++++++++++++- code/modules/surgery/organs/lungs.dm | 12 ++++++++---- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm index d6d6084380..d0dd1796bf 100644 --- a/code/modules/mob/living/carbon/life.dm +++ b/code/modules/mob/living/carbon/life.dm @@ -58,11 +58,23 @@ var/datum/gas_mixture/breath +<<<<<<< HEAD if(health <= HEALTH_THRESHOLD_CRIT || (pulledby && pulledby.grab_state >= GRAB_KILL && !getorganslot("breathing_tube"))) losebreath++ //Suffocate if(losebreath > 0) +======= + if(!getorganslot("breathing_tube")) + if(health <= HEALTH_THRESHOLD_FULLCRIT || (pulledby && pulledby.grab_state >= GRAB_KILL)) + losebreath++ //You can't breath at all when in critical or when being choked, so you're going to miss a breath + + else if(health <= HEALTH_THRESHOLD_CRIT) + losebreath += 0.25 //You're having trouble breathing in soft crit, so you'll miss a breath one in four times + + //Suffocate + if(losebreath >= 1) //You've missed a breath, take oxy damage +>>>>>>> d4e09c9... Losebreath (#30580) losebreath-- if(prob(10)) emote("gasp") @@ -114,6 +126,10 @@ if(reagents.has_reagent("epinephrine") && lungs) return adjustOxyLoss(1) +<<<<<<< HEAD +======= + +>>>>>>> d4e09c9... Losebreath (#30580) failed_last_breath = 1 throw_alert("not_enough_oxy", /obj/screen/alert/not_enough_oxy) return 0 @@ -150,7 +166,7 @@ else //Enough oxygen failed_last_breath = 0 - if(oxyloss) + if(health >= HEALTH_THRESHOLD_CRIT) adjustOxyLoss(-5) oxygen_used = breath_gases["o2"][MOLES] clear_alert("not_enough_oxy") diff --git a/code/modules/surgery/organs/lungs.dm b/code/modules/surgery/organs/lungs.dm index f95e2cd996..9ff80e760c 100644 --- a/code/modules/surgery/organs/lungs.dm +++ b/code/modules/surgery/organs/lungs.dm @@ -122,7 +122,8 @@ H.throw_alert("not_enough_oxy", /obj/screen/alert/not_enough_oxy) else H.failed_last_breath = FALSE - H.adjustOxyLoss(-5) + if(H.health >= HEALTH_THRESHOLD_CRIT) + H.adjustOxyLoss(-5) gas_breathed = breath_gases["o2"][MOLES] H.clear_alert("not_enough_oxy") @@ -149,7 +150,8 @@ H.throw_alert("nitro", /obj/screen/alert/not_enough_nitro) else H.failed_last_breath = FALSE - H.adjustOxyLoss(-5) + if(H.health >= HEALTH_THRESHOLD_CRIT) + H.adjustOxyLoss(-5) gas_breathed = breath_gases["n2"][MOLES] H.clear_alert("nitro") @@ -185,7 +187,8 @@ H.throw_alert("not_enough_co2", /obj/screen/alert/not_enough_co2) else H.failed_last_breath = FALSE - H.adjustOxyLoss(-5) + if(H.health >= HEALTH_THRESHOLD_CRIT) + H.adjustOxyLoss(-5) gas_breathed = breath_gases["co2"][MOLES] H.clear_alert("not_enough_co2") @@ -214,7 +217,8 @@ H.throw_alert("not_enough_tox", /obj/screen/alert/not_enough_tox) else H.failed_last_breath = FALSE - H.adjustOxyLoss(-5) + if(H.health >= HEALTH_THRESHOLD_CRIT) + H.adjustOxyLoss(-5) gas_breathed = breath_gases["plasma"][MOLES] H.clear_alert("not_enough_tox") From 44e62d80162cd15f04592a6f28a35cc7f86a6235 Mon Sep 17 00:00:00 2001 From: Leo Date: Sun, 10 Sep 2017 16:17:04 -0300 Subject: [PATCH 030/163] Uplink lock codes now pick from the phonetic alphabet global list (#30538) * Uplink lock codes now pick from the phonetic alphabet global list * Update virus_cart.dm --- code/datums/mind.dm | 2 +- code/game/objects/items/devices/PDA/virus_cart.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/datums/mind.dm b/code/datums/mind.dm index 78a402a2dc..7df65438f2 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -311,7 +311,7 @@ traitor_mob.mind.store_memory("Radio Frequency: [format_frequency(R.traitor_frequency)] ([R.name]).") else if(uplink_loc == PDA) - PDA.lock_code = "[rand(100,999)] [pick("Alpha","Bravo","Charlie","Delta","Echo","Foxtrot","Golf","Hotel","India","Juliet","Kilo","Lima","Mike","November","Oscar","Papa","Quebec","Romeo","Sierra","Tango","Uniform","Victor","Whiskey","X-ray","Yankee","Zulu")]" + PDA.lock_code = "[rand(100,999)] [pick(GLOB.phonetic_alphabet)]" if(!silent) to_chat(traitor_mob, "[employer] has cunningly disguised a Syndicate Uplink as your [PDA.name]. Simply enter the code \"[PDA.lock_code]\" into the ringtone select to unlock its hidden features.") traitor_mob.mind.store_memory("Uplink Passcode: [PDA.lock_code] ([PDA.name]).") diff --git a/code/game/objects/items/devices/PDA/virus_cart.dm b/code/game/objects/items/devices/PDA/virus_cart.dm index 2b0a9d3b3c..8c4a42a5aa 100644 --- a/code/game/objects/items/devices/PDA/virus_cart.dm +++ b/code/game/objects/items/devices/PDA/virus_cart.dm @@ -90,7 +90,7 @@ return if(!isnull(target) && !target.toff) charges-- - var/lock_code = "[rand(100,999)] [pick("Alpha","Bravo","Charlie","Delta","Echo","Foxtrot","Golf","Hotel","India","Juliet","Kilo","Lima","Mike","November","Oscar","Papa","Quebec","Romeo","Sierra","Tango","Uniform","Victor","Whiskey","X-ray","Yankee","Zulu")]" + var/lock_code = "[rand(100,999)] [pick(GLOB.phonetic_alphabet)]" to_chat(U, "Virus Sent! The unlock code to the target is: [lock_code]") if(!target.hidden_uplink) var/obj/item/device/uplink/uplink = new(target) From cb734046f728f54b1af4edf0af830bcbe813d3f1 Mon Sep 17 00:00:00 2001 From: Leo Date: Sun, 10 Sep 2017 16:18:12 -0300 Subject: [PATCH 032/163] Changes golem shell attackby istype chain to use an assoc list instead of an istype chain (#30542) * Changes golem shell attackby istype chain to use an assoc list instead * Makes the check use merge_type as opposed of item type --- code/modules/ruins/lavaland_ruin_code.dm | 86 +++++++----------------- 1 file changed, 25 insertions(+), 61 deletions(-) diff --git a/code/modules/ruins/lavaland_ruin_code.dm b/code/modules/ruins/lavaland_ruin_code.dm index e4927349d8..da965aae9d 100644 --- a/code/modules/ruins/lavaland_ruin_code.dm +++ b/code/modules/ruins/lavaland_ruin_code.dm @@ -46,71 +46,35 @@ desc = "The incomplete body of a golem. Add ten sheets of any mineral to finish." var/shell_type = /obj/effect/mob_spawn/human/golem var/has_owner = FALSE //if the resulting golem obeys someone - w_class = WEIGHT_CLASS_BULKY + w_class = WEIGHT_CLASS_BULKY /obj/item/golem_shell/attackby(obj/item/I, mob/user, params) ..() - var/species - if(istype(I, /obj/item/stack/)) + var/static/list/golem_shell_species_types = list( + /obj/item/stack/sheet/metal = /datum/species/golem, + /obj/item/stack/sheet/glass = /datum/species/golem/glass, + /obj/item/stack/sheet/plasteel = /datum/species/golem/plasteel, + /obj/item/stack/sheet/mineral/sandstone = /datum/species/golem/sand, + /obj/item/stack/sheet/mineral/plasma = /datum/species/golem/plasma, + /obj/item/stack/sheet/mineral/diamond = /datum/species/golem/diamond, + /obj/item/stack/sheet/mineral/gold = /datum/species/golem/gold, + /obj/item/stack/sheet/mineral/silver = /datum/species/golem/silver, + /obj/item/stack/sheet/mineral/uranium = /datum/species/golem/uranium, + /obj/item/stack/sheet/mineral/bananium = /datum/species/golem/bananium, + /obj/item/stack/sheet/mineral/titanium = /datum/species/golem/titanium, + /obj/item/stack/sheet/mineral/plastitanium = /datum/species/golem/plastitanium, + /obj/item/stack/sheet/mineral/abductor = /datum/species/golem/alloy, + /obj/item/stack/sheet/mineral/wood = /datum/species/golem/wood, + /obj/item/stack/sheet/bluespace_crystal = /datum/species/golem/bluespace, + /obj/item/stack/sheet/runed_metal = /datum/species/golem/runic, + /obj/item/stack/medical/gauze = /datum/species/golem/cloth, + /obj/item/stack/sheet/cloth = /datum/species/golem/cloth, + /obj/item/stack/sheet/mineral/adamantine = /datum/species/golem/adamantine, + /obj/item/stack/sheet/plastic = /datum/species/golem/plastic) + + if(istype(I, /obj/item/stack)) var/obj/item/stack/O = I - - if(istype(O, /obj/item/stack/sheet/metal)) - species = /datum/species/golem - - if(istype(O, /obj/item/stack/sheet/glass)) - species = /datum/species/golem/glass - - if(istype(O, /obj/item/stack/sheet/plasteel)) - species = /datum/species/golem/plasteel - - if(istype(O, /obj/item/stack/sheet/mineral/sandstone)) - species = /datum/species/golem/sand - - if(istype(O, /obj/item/stack/sheet/mineral/plasma)) - species = /datum/species/golem/plasma - - if(istype(O, /obj/item/stack/sheet/mineral/diamond)) - species = /datum/species/golem/diamond - - if(istype(O, /obj/item/stack/sheet/mineral/gold)) - species = /datum/species/golem/gold - - if(istype(O, /obj/item/stack/sheet/mineral/silver)) - species = /datum/species/golem/silver - - if(istype(O, /obj/item/stack/sheet/mineral/uranium)) - species = /datum/species/golem/uranium - - if(istype(O, /obj/item/stack/sheet/mineral/bananium)) - species = /datum/species/golem/bananium - - if(istype(O, /obj/item/stack/sheet/mineral/titanium)) - species = /datum/species/golem/titanium - - if(istype(O, /obj/item/stack/sheet/mineral/plastitanium)) - species = /datum/species/golem/plastitanium - - if(istype(O, /obj/item/stack/sheet/mineral/abductor)) - species = /datum/species/golem/alloy - - if(istype(O, /obj/item/stack/sheet/mineral/wood)) - species = /datum/species/golem/wood - - if(istype(O, /obj/item/stack/sheet/bluespace_crystal)) - species = /datum/species/golem/bluespace - - if(istype(O, /obj/item/stack/sheet/runed_metal)) - species = /datum/species/golem/runic - - if(istype(O, /obj/item/stack/medical/gauze) || istype(O, /obj/item/stack/sheet/cloth)) - species = /datum/species/golem/cloth - - if(istype(O, /obj/item/stack/sheet/mineral/adamantine)) - species = /datum/species/golem/adamantine - - if(istype(O, /obj/item/stack/sheet/plastic)) - species = /datum/species/golem/plastic - + var/species = golem_shell_species_types[O.merge_type] if(species) if(O.use(10)) to_chat(user, "You finish up the golem shell with ten sheets of [O].") From c3fed32afbcb55111662e13473554c504cf7085f Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sun, 10 Sep 2017 15:17:25 -0500 Subject: [PATCH 034/163] Update prolonging_prism.dm --- .../clock_structures/prolonging_prism.dm | 903 +++++++++++++++--- 1 file changed, 779 insertions(+), 124 deletions(-) diff --git a/code/game/gamemodes/clock_cult/clock_structures/prolonging_prism.dm b/code/game/gamemodes/clock_cult/clock_structures/prolonging_prism.dm index a6bc9a7f38..c6692073b0 100644 --- a/code/game/gamemodes/clock_cult/clock_structures/prolonging_prism.dm +++ b/code/game/gamemodes/clock_cult/clock_structures/prolonging_prism.dm @@ -1,135 +1,790 @@ -//Prolonging Prism: A prism that consumes power to delay the shuttle -/obj/structure/destructible/clockwork/powered/prolonging_prism - name = "prolonging prism" - desc = "A dark onyx prism, held in midair by spiraling tendrils of stone." - clockwork_desc = "A powerful prism that will delay the arrival of an emergency shuttle." - icon_state = "prolonging_prism_inactive" - active_icon = "prolonging_prism" - inactive_icon = "prolonging_prism_inactive" - unanchored_icon = "prolonging_prism_unwrenched" - construction_value = 20 - max_integrity = 125 - break_message = "The prism falls to the ground with a heavy thud!" - debris = list(/obj/item/clockwork/alloy_shards/small = 3, \ - /obj/item/clockwork/alloy_shards/medium = 1, \ - /obj/item/clockwork/alloy_shards/large = 1, \ - /obj/item/clockwork/component/vanguard_cogwheel/onyx_prism = 1) - var/static/list/component_refund = list(VANGUARD_COGWHEEL = 2, GEIS_CAPACITOR = 1, REPLICANT_ALLOY = 1) - var/static/delay_cost = 3000 - var/static/delay_cost_increase = 1250 - var/static/delay_remaining = 0 +#define WELDER_FUEL_BURN_INTERVAL 13 -/obj/structure/destructible/clockwork/powered/prolonging_prism/examine(mob/user) - ..() - if(is_servant_of_ratvar(user) || isobserver(user)) - if(SSshuttle.emergency.mode == SHUTTLE_DOCKED || SSshuttle.emergency.mode == SHUTTLE_IGNITING || SSshuttle.emergency.mode == SHUTTLE_STRANDED || SSshuttle.emergency.mode == SHUTTLE_ESCAPE) - to_chat(user, "An emergency shuttle has arrived and this prism is no longer useful; attempt to activate it to gain a partial refund of components used.") - else - var/efficiency = get_efficiency_mod(TRUE) - to_chat(user, "It requires at least [get_delay_cost()]W of power to attempt to delay the arrival of an emergency shuttle by [2 * efficiency] minutes.") - to_chat(user, "This cost increases by [delay_cost_increase]W for every previous activation.") +/* Tools! + * Note: Multitools are /obj/item/device + * + * Contains: + * Wrench + * Screwdriver + * Wirecutters + * Welding Tool + * Crowbar + */ -/obj/structure/destructible/clockwork/powered/prolonging_prism/forced_disable(bad_effects) - if(active) - if(bad_effects) - try_use_power(MIN_CLOCKCULT_POWER*4) - visible_message("[src] emits an airy chuckling sound and falls dark!") - toggle() - return TRUE +/* + * Wrench + */ +/obj/item/wrench + name = "wrench" + desc = "A wrench with common uses. Can be found in your hand." + icon = 'icons/obj/tools.dmi' + icon_state = "wrench" + lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' + flags_1 = CONDUCT_1 + slot_flags = SLOT_BELT + force = 5 + throwforce = 7 + w_class = WEIGHT_CLASS_SMALL + usesound = 'sound/items/ratchet.ogg' + materials = list(MAT_METAL=150) + origin_tech = "materials=1;engineering=1" + attack_verb = list("bashed", "battered", "bludgeoned", "whacked") + toolspeed = 1 + armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 30) -/obj/structure/destructible/clockwork/powered/prolonging_prism/attack_hand(mob/living/user) - if(user.canUseTopic(src, !issilicon(user), NO_DEXTERY) && is_servant_of_ratvar(user)) - if(SSshuttle.emergency.mode == SHUTTLE_DOCKED || SSshuttle.emergency.mode == SHUTTLE_IGNITING || SSshuttle.emergency.mode == SHUTTLE_STRANDED || SSshuttle.emergency.mode == SHUTTLE_ESCAPE) - to_chat(user, "You break [src] apart, refunding some of the components used.") - for(var/i in component_refund) - generate_cache_component(i, src) - take_damage(max_integrity) - return 0 - if(active) - return 0 - var/turf/T = get_turf(src) - if(!T || T.z != ZLEVEL_STATION) - to_chat(user, "[src] must be on the station to function!") - return 0 - if(SSshuttle.emergency.mode != SHUTTLE_CALL) - to_chat(user, "No emergency shuttles are attempting to arrive at the station!") - return 0 - if(!try_use_power(get_delay_cost())) - to_chat(user, "[src] needs more power to function!") - return 0 - delay_cost += delay_cost_increase - delay_remaining += PRISM_DELAY_DURATION - toggle(0, user) +/obj/item/wrench/suicide_act(mob/user) + user.visible_message("[user] is beating [user.p_them()]self to death with [src]! It looks like [user.p_theyre()] trying to commit suicide!") + playsound(loc, 'sound/weapons/genhit.ogg', 50, 1, -1) + return (BRUTELOSS) -/obj/structure/destructible/clockwork/powered/prolonging_prism/process() - var/turf/own_turf = get_turf(src) - if(SSshuttle.emergency.mode != SHUTTLE_CALL || delay_remaining <= 0 || !own_turf || own_turf.z != ZLEVEL_STATION) - forced_disable(FALSE) +/obj/item/wrench/cyborg + name = "automatic wrench" + desc = "An advanced robotic wrench. Can be found in construction cyborgs." + toolspeed = 0.5 + +/obj/item/wrench/brass + name = "brass wrench" + desc = "A brass wrench. It's faintly warm to the touch." + resistance_flags = FIRE_PROOF | ACID_PROOF + icon_state = "wrench_brass" + toolspeed = 0.5 + +/obj/item/wrench/abductor + name = "alien wrench" + desc = "A polarized wrench. It causes anything placed between the jaws to turn." + icon = 'icons/obj/abductor.dmi' + icon_state = "wrench" + usesound = 'sound/effects/empulse.ogg' + toolspeed = 0.1 + origin_tech = "materials=5;engineering=5;abductor=3" + +/obj/item/wrench/power + name = "hand drill" + desc = "A simple powered hand drill. It's fitted with a bolt bit." + icon_state = "drill_bolt" + item_state = "drill" + lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' + usesound = 'sound/items/drill_use.ogg' + materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_TITANIUM=25) + origin_tech = "materials=2;engineering=2" //done for balance reasons, making them high value for research, but harder to get + force = 8 //might or might not be too high, subject to change + w_class = WEIGHT_CLASS_SMALL + throwforce = 8 + attack_verb = list("drilled", "screwed", "jabbed") + toolspeed = 0.25 + +/obj/item/wrench/power/attack_self(mob/user) + playsound(get_turf(user),'sound/items/change_drill.ogg',50,1) + var/obj/item/wirecutters/power/s_drill = new /obj/item/screwdriver/power + to_chat(user, "You attach the screw driver bit to [src].") + qdel(src) + user.put_in_active_hand(s_drill) + +/obj/item/wrench/power/suicide_act(mob/user) + user.visible_message("[user] is pressing [src] against [user.p_their()] head! It looks like [user.p_theyre()] trying to commit suicide!") + return (BRUTELOSS) + +/obj/item/wrench/medical + name = "medical wrench" + desc = "A medical wrench with common(medical?) uses. Can be found in your hand." + icon_state = "wrench_medical" + force = 2 //MEDICAL + throwforce = 4 + origin_tech = "materials=1;engineering=1;biotech=3" + attack_verb = list("wrenched", "medicaled", "tapped", "jabbed", "whacked") + +/obj/item/wrench/medical/suicide_act(mob/living/user) + user.visible_message("[user] is praying to the medical wrench to take [user.p_their()] soul. It looks like [user.p_theyre()] trying to commit suicide!") + // TODO Make them glow with the power of the M E D I C A L W R E N C H + // during their ascension + + // Stun stops them from wandering off + user.Stun(100, ignore_canstun = TRUE) + playsound(loc, 'sound/effects/pray.ogg', 50, 1, -1) + + // Let the sound effect finish playing + sleep(20) + + if(!user) return + + for(var/obj/item/W in user) + user.dropItemToGround(W) + + var/obj/item/wrench/medical/W = new /obj/item/wrench/medical(loc) + W.add_fingerprint(user) + W.desc += " For some reason, it reminds you of [user.name]." + + if(!user) + return + + user.dust() + + return OXYLOSS + +/* + * Screwdriver + */ +/obj/item/screwdriver + name = "screwdriver" + desc = "You can be totally screwy with this." + icon = 'icons/obj/tools.dmi' + icon_state = "screwdriver" + item_state = "screwdriver" + lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' + flags_1 = CONDUCT_1 + slot_flags = SLOT_BELT + force = 5 + w_class = WEIGHT_CLASS_TINY + throwforce = 5 + throw_speed = 3 + throw_range = 5 + materials = list(MAT_METAL=75) + attack_verb = list("stabbed") + hitsound = 'sound/weapons/bladeslice.ogg' + usesound = 'sound/items/screwdriver.ogg' + toolspeed = 1 + armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 30) + var/random_color = TRUE //if the screwdriver uses random coloring + var/static/list/screwdriver_colors = list(\ + "blue" = rgb(24, 97, 213), \ + "red" = rgb(149, 23, 16), \ + "pink" = rgb(213, 24, 141), \ + "brown" = rgb(160, 82, 18), \ + "green" = rgb(14, 127, 27), \ + "cyan" = rgb(24, 162, 213), \ + "yellow" = rgb(213, 140, 24), \ + ) + +/obj/item/screwdriver/suicide_act(mob/user) + user.visible_message("[user] is stabbing [src] into [user.p_their()] [pick("temple", "heart")]! It looks like [user.p_theyre()] trying to commit suicide!") + return(BRUTELOSS) + +/obj/item/screwdriver/Initialize() . = ..() - var/delay_amount = 40 - delay_remaining -= delay_amount - var/efficiency = get_efficiency_mod() - SSshuttle.emergency.setTimer(SSshuttle.emergency.timeLeft(1) + (delay_amount * efficiency)) - var/highest_y - var/highest_x - var/lowest_y - var/lowest_x - var/list/prism_turfs = list() - for(var/t in SSshuttle.emergency.ripple_area(SSshuttle.getDock("emergency_home"))) - prism_turfs[t] = TRUE - var/turf/T = t - if(!highest_y || T.y > highest_y) - highest_y = T.y - if(!highest_x || T.x > highest_x) - highest_x = T.x - if(!lowest_y || T.y < lowest_y) - lowest_y = T.y - if(!lowest_x || T.x < lowest_x) - lowest_x = T.x - var/mean_y = Lerp(lowest_y, highest_y) - var/mean_x = Lerp(lowest_x, highest_x) - if(prob(50)) - mean_y = Ceiling(mean_y) + if(random_color) //random colors! + var/our_color = pick(screwdriver_colors) + add_atom_colour(screwdriver_colors[our_color], FIXED_COLOUR_PRIORITY) + update_icon() + if(prob(75)) + pixel_y = rand(0, 16) + +/obj/item/screwdriver/update_icon() + if(!random_color) //icon override + return + cut_overlays() + var/mutable_appearance/base_overlay = mutable_appearance(icon, "screwdriver_screwybits") + base_overlay.appearance_flags = RESET_COLOR + add_overlay(base_overlay) + +/obj/item/screwdriver/worn_overlays(isinhands = FALSE, icon_file) + . = list() + if(isinhands && random_color) + var/mutable_appearance/M = mutable_appearance(icon_file, "screwdriver_head") + M.appearance_flags = RESET_COLOR + . += M + +/obj/item/screwdriver/get_belt_overlay() + if(random_color) + var/mutable_appearance/body = mutable_appearance('icons/obj/clothing/belt_overlays.dmi', "screwdriver") + var/mutable_appearance/head = mutable_appearance('icons/obj/clothing/belt_overlays.dmi', "screwdriver_head") + body.color = color + head.add_overlay(body) + return head else - mean_y = Floor(mean_y) - if(prob(50)) - mean_x = Ceiling(mean_x) + return mutable_appearance('icons/obj/clothing/belt_overlays.dmi', icon_state) + +/obj/item/screwdriver/attack(mob/living/carbon/M, mob/living/carbon/user) + if(!istype(M)) + return ..() + if(user.zone_selected != "eyes" && user.zone_selected != "head") + return ..() + if(user.disabilities & CLUMSY && prob(50)) + M = user + return eyestab(M,user) + +/obj/item/screwdriver/brass + name = "brass screwdriver" + desc = "A screwdriver made of brass. The handle feels freezing cold." + resistance_flags = FIRE_PROOF | ACID_PROOF + icon_state = "screwdriver_brass" + item_state = "screwdriver_brass" + toolspeed = 0.5 + random_color = FALSE + +/obj/item/screwdriver/abductor + name = "alien screwdriver" + desc = "An ultrasonic screwdriver." + icon = 'icons/obj/abductor.dmi' + icon_state = "screwdriver_a" + item_state = "screwdriver_nuke" + usesound = 'sound/items/pshoom.ogg' + toolspeed = 0.1 + random_color = FALSE + +/obj/item/screwdriver/power + name = "hand drill" + desc = "A simple powered hand drill. It's fitted with a screw bit." + icon_state = "drill_screw" + item_state = "drill" + lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' + materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_TITANIUM=25) + origin_tech = "materials=2;engineering=2" //done for balance reasons, making them high value for research, but harder to get + force = 8 //might or might not be too high, subject to change + w_class = WEIGHT_CLASS_SMALL + throwforce = 8 + throw_speed = 2 + throw_range = 3//it's heavier than a screw driver/wrench, so it does more damage, but can't be thrown as far + attack_verb = list("drilled", "screwed", "jabbed","whacked") + hitsound = 'sound/items/drill_hit.ogg' + usesound = 'sound/items/drill_use.ogg' + toolspeed = 0.25 + random_color = FALSE + +/obj/item/screwdriver/power/suicide_act(mob/user) + user.visible_message("[user] is putting [src] to [user.p_their()] temple. It looks like [user.p_theyre()] trying to commit suicide!") + return(BRUTELOSS) + +/obj/item/screwdriver/power/attack_self(mob/user) + playsound(get_turf(user),'sound/items/change_drill.ogg',50,1) + var/obj/item/wrench/power/b_drill = new /obj/item/wrench/power + to_chat(user, "You attach the bolt driver bit to [src].") + qdel(src) + user.put_in_active_hand(b_drill) + +/obj/item/screwdriver/cyborg + name = "powered screwdriver" + desc = "An electrical screwdriver, designed to be both precise and quick." + usesound = 'sound/items/drill_use.ogg' + toolspeed = 0.5 + +/* + * Wirecutters + */ +/obj/item/wirecutters + name = "wirecutters" + desc = "This cuts wires." + icon = 'icons/obj/tools.dmi' + icon_state = null + lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' + flags_1 = CONDUCT_1 + slot_flags = SLOT_BELT + force = 6 + throw_speed = 3 + throw_range = 7 + w_class = WEIGHT_CLASS_SMALL + materials = list(MAT_METAL=80) + attack_verb = list("pinched", "nipped") + hitsound = 'sound/items/wirecutter.ogg' + usesound = 'sound/items/wirecutter.ogg' + origin_tech = "materials=1;engineering=1" + toolspeed = 1 + armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 30) + + +/obj/item/wirecutters/New(loc, var/param_color = null) + ..() + if(!icon_state) + if(!param_color) + param_color = pick("yellow","red") + icon_state = "cutters_[param_color]" + +/obj/item/wirecutters/attack(mob/living/carbon/C, mob/user) + if(istype(C) && C.handcuffed && istype(C.handcuffed, /obj/item/restraints/handcuffs/cable)) + user.visible_message("[user] cuts [C]'s restraints with [src]!") + qdel(C.handcuffed) + C.handcuffed = null + if(C.buckled && C.buckled.buckle_requires_restraints) + C.buckled.unbuckle_mob(C) + C.update_handcuffed() + return else - mean_x = Floor(mean_x) - var/turf/semi_random_center_turf = locate(mean_x, mean_y, ZLEVEL_STATION) - for(var/t in getline(src, semi_random_center_turf)) - prism_turfs[t] = TRUE - var/placement_style = prob(50) - for(var/t in prism_turfs) - var/turf/T = t - if(placement_style) - if(IsOdd(T.x + T.y)) - seven_random_hexes(T, efficiency) - else if(prob(50 * efficiency)) - new /obj/effect/temp_visual/ratvar/prolonging_prism(T) + ..() + +/obj/item/wirecutters/suicide_act(mob/user) + user.visible_message("[user] is cutting at [user.p_their()] arteries with [src]! It looks like [user.p_theyre()] trying to commit suicide!") + playsound(loc, usesound, 50, 1, -1) + return (BRUTELOSS) + +/obj/item/wirecutters/brass + name = "brass wirecutters" + desc = "A pair of wirecutters made of brass. The handle feels freezing cold to the touch." + resistance_flags = FIRE_PROOF | ACID_PROOF + icon_state = "cutters_brass" + toolspeed = 0.5 + +/obj/item/wirecutters/abductor + name = "alien wirecutters" + desc = "Extremely sharp wirecutters, made out of a silvery-green metal." + icon = 'icons/obj/abductor.dmi' + icon_state = "cutters" + toolspeed = 0.1 + origin_tech = "materials=5;engineering=4;abductor=3" + +/obj/item/wirecutters/cyborg + name = "wirecutters" + desc = "This cuts wires." + toolspeed = 0.5 + +/obj/item/wirecutters/power + name = "jaws of life" + desc = "A set of jaws of life, compressed through the magic of science. It's fitted with a cutting head." + icon_state = "jaws_cutter" + item_state = "jawsoflife" + origin_tech = "materials=2;engineering=2" + materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_TITANIUM=25) + usesound = 'sound/items/jaws_cut.ogg' + toolspeed = 0.25 + +/obj/item/wirecutters/power/suicide_act(mob/user) + user.visible_message("[user] is wrapping \the [src] around [user.p_their()] neck. It looks like [user.p_theyre()] trying to rip [user.p_their()] head off!") + playsound(loc, 'sound/items/jaws_cut.ogg', 50, 1, -1) + if(iscarbon(user)) + var/mob/living/carbon/C = user + var/obj/item/bodypart/BP = C.get_bodypart("head") + if(BP) + BP.drop_limb() + playsound(loc,pick('sound/misc/desceration-01.ogg','sound/misc/desceration-02.ogg','sound/misc/desceration-01.ogg') ,50, 1, -1) + return (BRUTELOSS) + +/obj/item/wirecutters/power/attack_self(mob/user) + playsound(get_turf(user), 'sound/items/change_jaws.ogg', 50, 1) + var/obj/item/crowbar/power/pryjaws = new /obj/item/crowbar/power + to_chat(user, "You attach the pry jaws to [src].") + qdel(src) + user.put_in_active_hand(pryjaws) +/* + * Welding Tool + */ +/obj/item/weldingtool + name = "welding tool" + desc = "A standard edition welder provided by Nanotrasen." + icon = 'icons/obj/tools.dmi' + icon_state = "welder" + item_state = "welder" + lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' + flags_1 = CONDUCT_1 + slot_flags = SLOT_BELT + force = 3 + throwforce = 5 + hitsound = "swing_hit" + usesound = 'sound/items/welder.ogg' + var/acti_sound = 'sound/items/welderactivate.ogg' + var/deac_sound = 'sound/items/welderdeactivate.ogg' + throw_speed = 3 + throw_range = 5 + w_class = WEIGHT_CLASS_SMALL + armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 30) + resistance_flags = FIRE_PROOF + + materials = list(MAT_METAL=70, MAT_GLASS=30) + origin_tech = "engineering=1;plasmatech=1" + var/welding = 0 //Whether or not the welding tool is off(0), on(1) or currently welding(2) + var/status = TRUE //Whether the welder is secured or unsecured (able to attach rods to it to make a flamethrower) + var/max_fuel = 20 //The max amount of fuel the welder can hold + var/change_icons = 1 + var/can_off_process = 0 + var/light_intensity = 2 //how powerful the emitted light is when used. + var/burned_fuel_for = 0 //when fuel was last removed + heat = 3800 + toolspeed = 1 + +/obj/item/weldingtool/Initialize() + . = ..() + create_reagents(max_fuel) + reagents.add_reagent("welding_fuel", max_fuel) + update_icon() + + +/obj/item/weldingtool/proc/update_torch() + if(welding) + add_overlay("[initial(icon_state)]-on") + item_state = "[initial(item_state)]1" + else + item_state = "[initial(item_state)]" + + +/obj/item/weldingtool/update_icon() + cut_overlays() + if(change_icons) + var/ratio = get_fuel() / max_fuel + ratio = Ceiling(ratio*4) * 25 + add_overlay("[initial(icon_state)][ratio]") + update_torch() + return + + +/obj/item/weldingtool/process() + switch(welding) + if(0) + force = 3 + damtype = "brute" + update_icon() + if(!can_off_process) + STOP_PROCESSING(SSobj, src) + return + //Welders left on now use up fuel, but lets not have them run out quite that fast + if(1) + force = 15 + damtype = "fire" + ++burned_fuel_for + if(burned_fuel_for >= WELDER_FUEL_BURN_INTERVAL) + remove_fuel(1) + update_icon() + + //This is to start fires. process() is only called if the welder is on. + open_flame() + + +/obj/item/weldingtool/suicide_act(mob/user) + user.visible_message("[user] welds [user.p_their()] every orifice closed! It looks like [user.p_theyre()] trying to commit suicide!") + return (FIRELOSS) + + +/obj/item/weldingtool/attackby(obj/item/I, mob/user, params) + if(istype(I, /obj/item/screwdriver)) + flamethrower_screwdriver(I, user) + else if(istype(I, /obj/item/stack/rods)) + flamethrower_rods(I, user) + else + return ..() + + +/obj/item/weldingtool/attack(mob/living/carbon/human/H, mob/user) + if(!istype(H)) + return ..() + + var/obj/item/bodypart/affecting = H.get_bodypart(check_zone(user.zone_selected)) + + if(affecting && affecting.status == BODYPART_ROBOTIC && user.a_intent != INTENT_HARM) + if(src.remove_fuel(1)) + playsound(loc, usesound, 50, 1) + if(user == H) + user.visible_message("[user] starts to fix some of the dents on [H]'s [affecting.name].", "You start fixing some of the dents on [H]'s [affecting.name].") + if(!do_mob(user, H, 50)) + return + item_heal_robotic(H, user, 15, 0) + else + return ..() + + +/obj/item/weldingtool/afterattack(atom/O, mob/user, proximity) + if(!proximity) return + + if(welding) + remove_fuel(1) + var/turf/location = get_turf(user) + location.hotspot_expose(700, 50, 1) + if(get_fuel() <= 0) + set_light(0) + + if(isliving(O)) + var/mob/living/L = O + if(L.IgniteMob()) + message_admins("[key_name_admin(user)] set [key_name_admin(L)] on fire") + log_game("[key_name(user)] set [key_name(L)] on fire") + + +/obj/item/weldingtool/attack_self(mob/user) + switched_on(user) + if(welding) + set_light(light_intensity) + + update_icon() + + +//Returns the amount of fuel in the welder +/obj/item/weldingtool/proc/get_fuel() + return reagents.get_reagent_amount("welding_fuel") + + +//Removes fuel from the welding tool. If a mob is passed, it will try to flash the mob's eyes. This should probably be renamed to use() +/obj/item/weldingtool/proc/remove_fuel(amount = 1, mob/living/M = null) + if(!welding || !check_fuel()) + return 0 + if(amount) + burned_fuel_for = 0 + if(get_fuel() >= amount) + reagents.remove_reagent("welding_fuel", amount) + check_fuel() + if(M) + M.flash_act(light_intensity) + return TRUE + else + if(M) + to_chat(M, "You need more welding fuel to complete this task!") + return FALSE + + +//Turns off the welder if there is no more fuel (does this really need to be its own proc?) +/obj/item/weldingtool/proc/check_fuel(mob/user) + if(get_fuel() <= 0 && welding) + switched_on(user) + update_icon() + //mob icon update + if(ismob(loc)) + var/mob/M = loc + M.update_inv_hands(0) + + return 0 + return 1 + +//Switches the welder on +/obj/item/weldingtool/proc/switched_on(mob/user) + if(!status) + to_chat(user, "[src] can't be turned on while unsecured!") + return + welding = !welding + if(welding) + if(get_fuel() >= 1) + to_chat(user, "You switch [src] on.") + playsound(loc, acti_sound, 50, 1) + force = 15 + damtype = "fire" + hitsound = 'sound/items/welder.ogg' + update_icon() + START_PROCESSING(SSobj, src) else - if(IsEven(T.x + T.y)) - seven_random_hexes(T, efficiency) - else if(prob(50 * efficiency)) - new /obj/effect/temp_visual/ratvar/prolonging_prism(T) - CHECK_TICK //we may be going over a hell of a lot of turfs + to_chat(user, "You need more fuel!") + switched_off(user) + else + to_chat(user, "You switch [src] off.") + playsound(loc, deac_sound, 50, 1) + switched_off(user) -/obj/structure/destructible/clockwork/powered/prolonging_prism/proc/get_delay_cost() - return Floor(delay_cost, MIN_CLOCKCULT_POWER) +//Switches the welder off +/obj/item/weldingtool/proc/switched_off(mob/user) + welding = 0 + set_light(0) -/obj/structure/destructible/clockwork/powered/prolonging_prism/proc/seven_random_hexes(turf/T, efficiency) - var/static/list/hex_states = list("prismhex1", "prismhex2", "prismhex3", "prismhex4", "prismhex5", "prismhex6", "prismhex7") - var/mutable_appearance/hex_combo - for(var/n in hex_states) //BUILD ME A HEXAGON - if(prob(50 * efficiency)) - if(!hex_combo) - hex_combo = mutable_appearance('icons/effects/64x64.dmi', n, RIPPLE_LAYER) - else - hex_combo.add_overlay(mutable_appearance('icons/effects/64x64.dmi', n, RIPPLE_LAYER)) - if(hex_combo) //YOU BUILT A HEXAGON - hex_combo.pixel_x = -16 - hex_combo.pixel_y = -16 - hex_combo.mouse_opacity = MOUSE_OPACITY_TRANSPARENT - hex_combo.plane = GAME_PLANE - new /obj/effect/temp_visual/ratvar/prolonging_prism(T, hex_combo) + force = 3 + damtype = "brute" + hitsound = "swing_hit" + update_icon() + + +/obj/item/weldingtool/examine(mob/user) + ..() + to_chat(user, "It contains [get_fuel()] unit\s of fuel out of [max_fuel].") + +/obj/item/weldingtool/is_hot() + return welding * heat + +//Returns whether or not the welding tool is currently on. +/obj/item/weldingtool/proc/isOn() + return welding + + +/obj/item/weldingtool/proc/flamethrower_screwdriver(obj/item/I, mob/user) + if(welding) + to_chat(user, "Turn it off first!") + return + status = !status + if(status) + to_chat(user, "You resecure [src].") + else + to_chat(user, "[src] can now be attached and modified.") + add_fingerprint(user) + +/obj/item/weldingtool/proc/flamethrower_rods(obj/item/I, mob/user) + if(!status) + var/obj/item/stack/rods/R = I + if (R.use(1)) + var/obj/item/flamethrower/F = new /obj/item/flamethrower(user.loc) + if(!remove_item_from_storage(F)) + user.transferItemToLoc(src, F, TRUE) + F.weldtool = src + add_fingerprint(user) + to_chat(user, "You add a rod to a welder, starting to build a flamethrower.") + user.put_in_hands(F) + else + to_chat(user, "You need one rod to start building a flamethrower!") + +/obj/item/weldingtool/ignition_effect(atom/A, mob/user) + if(welding && remove_fuel(1, user)) + . = "[user] casually lights [A] with [src], what a badass." + else + . = "" + +/obj/item/weldingtool/largetank + name = "industrial welding tool" + desc = "A slightly larger welder with a larger tank." + icon_state = "indwelder" + max_fuel = 40 + materials = list(MAT_GLASS=60) + origin_tech = "engineering=2;plasmatech=2" + +/obj/item/weldingtool/largetank/cyborg + name = "integrated welding tool" + desc = "An advanced welder designed to be used in robotic systems." + toolspeed = 0.5 + +/obj/item/weldingtool/largetank/flamethrower_screwdriver() + return + + +/obj/item/weldingtool/mini + name = "emergency welding tool" + desc = "A miniature welder used during emergencies." + icon_state = "miniwelder" + max_fuel = 10 + w_class = WEIGHT_CLASS_TINY + materials = list(MAT_METAL=30, MAT_GLASS=10) + change_icons = 0 + +/obj/item/weldingtool/mini/flamethrower_screwdriver() + return + +/obj/item/weldingtool/abductor + name = "alien welding tool" + desc = "An alien welding tool. Whatever fuel it uses, it never runs out." + icon = 'icons/obj/abductor.dmi' + icon_state = "welder" + toolspeed = 0.1 + light_intensity = 0 + change_icons = 0 + origin_tech = "plasmatech=5;engineering=5;abductor=3" + +/obj/item/weldingtool/abductor/process() + if(get_fuel() <= max_fuel) + reagents.add_reagent("welding_fuel", 1) + ..() + +/obj/item/weldingtool/hugetank + name = "upgraded industrial welding tool" + desc = "An upgraded welder based of the industrial welder." + icon_state = "upindwelder" + item_state = "upindwelder" + max_fuel = 80 + materials = list(MAT_METAL=70, MAT_GLASS=120) + origin_tech = "engineering=3;plasmatech=2" + +/obj/item/weldingtool/experimental + name = "experimental welding tool" + desc = "An experimental welder capable of self-fuel generation and less harmful to the eyes." + icon_state = "exwelder" + item_state = "exwelder" + max_fuel = 40 + materials = list(MAT_METAL=70, MAT_GLASS=120) + origin_tech = "materials=4;engineering=4;bluespace=3;plasmatech=4" + var/last_gen = 0 + change_icons = 0 + can_off_process = 1 + light_intensity = 1 + toolspeed = 0.5 + var/nextrefueltick = 0 + +/obj/item/weldingtool/experimental/brass + name = "brass welding tool" + desc = "A brass welder that seems to constantly refuel itself. It is faintly warm to the touch." + resistance_flags = FIRE_PROOF | ACID_PROOF + icon_state = "brasswelder" + item_state = "brasswelder" + + +/obj/item/weldingtool/experimental/process() + ..() + if(get_fuel() < max_fuel && nextrefueltick < world.time) + nextrefueltick = world.time + 10 + reagents.add_reagent("welding_fuel", 1) + + +/* + * Crowbar + */ + +/obj/item/crowbar + name = "pocket crowbar" + desc = "A small crowbar. This handy tool is useful for lots of things, such as prying floor tiles or opening unpowered doors." + icon = 'icons/obj/tools.dmi' + icon_state = "crowbar" + lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' + usesound = 'sound/items/crowbar.ogg' + flags_1 = CONDUCT_1 + slot_flags = SLOT_BELT + force = 5 + throwforce = 7 + w_class = WEIGHT_CLASS_SMALL + materials = list(MAT_METAL=50) + origin_tech = "engineering=1;combat=1" + attack_verb = list("attacked", "bashed", "battered", "bludgeoned", "whacked") + toolspeed = 1 + armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 30) + +/obj/item/crowbar/suicide_act(mob/user) + user.visible_message("[user] is beating [user.p_them()]self to death with [src]! It looks like [user.p_theyre()] trying to commit suicide!") + playsound(loc, 'sound/weapons/genhit.ogg', 50, 1, -1) + return (BRUTELOSS) + +/obj/item/crowbar/red + icon_state = "crowbar_red" + force = 8 + +/obj/item/crowbar/brass + name = "brass crowbar" + desc = "A brass crowbar. It feels faintly warm to the touch." + resistance_flags = FIRE_PROOF | ACID_PROOF + icon_state = "crowbar_brass" + toolspeed = 0.5 + +/obj/item/crowbar/abductor + name = "alien crowbar" + desc = "A hard-light crowbar. It appears to pry by itself, without any effort required." + icon = 'icons/obj/abductor.dmi' + usesound = 'sound/weapons/sonic_jackhammer.ogg' + icon_state = "crowbar" + toolspeed = 0.1 + origin_tech = "combat=4;engineering=4;abductor=3" + +/obj/item/crowbar/large + name = "crowbar" + desc = "It's a big crowbar. It doesn't fit in your pockets, because it's big." + force = 12 + w_class = WEIGHT_CLASS_NORMAL + throw_speed = 3 + throw_range = 3 + materials = list(MAT_METAL=70) + icon_state = "crowbar_large" + item_state = "crowbar" + toolspeed = 0.5 + +/obj/item/crowbar/cyborg + name = "hydraulic crowbar" + desc = "A hydraulic prying tool, compact but powerful. Designed to replace crowbar in construction cyborgs." + usesound = 'sound/items/jaws_pry.ogg' + force = 10 + toolspeed = 0.5 + +/obj/item/crowbar/power + name = "jaws of life" + desc = "A set of jaws of life, compressed through the magic of science. It's fitted with a prying head." + icon_state = "jaws_pry" + item_state = "jawsoflife" + lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' + materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_TITANIUM=25) + origin_tech = "materials=2;engineering=2" + usesound = 'sound/items/jaws_pry.ogg' + force = 15 + toolspeed = 0.25 + +/obj/item/crowbar/power/suicide_act(mob/user) + user.visible_message("[user] is putting [user.p_their()] head in [src], it looks like [user.p_theyre()] trying to commit suicide!") + playsound(loc, 'sound/items/jaws_pry.ogg', 50, 1, -1) + return (BRUTELOSS) + +/obj/item/crowbar/power/attack_self(mob/user) + playsound(get_turf(user), 'sound/items/change_jaws.ogg', 50, 1) + var/obj/item/wirecutters/power/cutjaws = new /obj/item/wirecutters/power + to_chat(user, "You attach the cutting jaws to [src].") + qdel(src) + user.put_in_active_hand(cutjaws) + +#undef WELDER_FUEL_BURN_INTERVAL From 50587ea679a7df29066ac10d4675f9888e3491ee Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sun, 10 Sep 2017 15:18:30 -0500 Subject: [PATCH 035/163] Update tools.dm --- code/game/objects/items/tools.dm | 1579 ------------------------------ 1 file changed, 1579 deletions(-) diff --git a/code/game/objects/items/tools.dm b/code/game/objects/items/tools.dm index 5c901ca4bd..d3f5a12faa 100644 --- a/code/game/objects/items/tools.dm +++ b/code/game/objects/items/tools.dm @@ -1,1580 +1 @@ -#define WELDER_FUEL_BURN_INTERVAL 13 -/* Tools! - * Note: Multitools are /obj/item/device - * - * Contains: - * Wrench - * Screwdriver - * Wirecutters - * Welding Tool - * Crowbar - */ - -/* - * Wrench - */ -/obj/item/wrench - name = "wrench" - desc = "A wrench with common uses. Can be found in your hand." - icon = 'icons/obj/tools.dmi' - icon_state = "wrench" - lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' - righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' - flags_1 = CONDUCT_1 - slot_flags = SLOT_BELT - force = 5 - throwforce = 7 - w_class = WEIGHT_CLASS_SMALL - usesound = 'sound/items/ratchet.ogg' - materials = list(MAT_METAL=150) - origin_tech = "materials=1;engineering=1" - attack_verb = list("bashed", "battered", "bludgeoned", "whacked") - toolspeed = 1 - armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 30) - -/obj/item/wrench/suicide_act(mob/user) - user.visible_message("[user] is beating [user.p_them()]self to death with [src]! It looks like [user.p_theyre()] trying to commit suicide!") - playsound(loc, 'sound/weapons/genhit.ogg', 50, 1, -1) - return (BRUTELOSS) - -/obj/item/wrench/cyborg - name = "automatic wrench" - desc = "An advanced robotic wrench. Can be found in construction cyborgs." - toolspeed = 0.5 - -/obj/item/wrench/brass - name = "brass wrench" - desc = "A brass wrench. It's faintly warm to the touch." - resistance_flags = FIRE_PROOF | ACID_PROOF - icon_state = "wrench_brass" - toolspeed = 0.5 - -/obj/item/wrench/abductor - name = "alien wrench" - desc = "A polarized wrench. It causes anything placed between the jaws to turn." - icon = 'icons/obj/abductor.dmi' - icon_state = "wrench" - usesound = 'sound/effects/empulse.ogg' - toolspeed = 0.1 - origin_tech = "materials=5;engineering=5;abductor=3" - -/obj/item/wrench/power - name = "hand drill" - desc = "A simple powered hand drill. It's fitted with a bolt bit." - icon_state = "drill_bolt" - item_state = "drill" - lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' - righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' - usesound = 'sound/items/drill_use.ogg' - materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_TITANIUM=25) - origin_tech = "materials=2;engineering=2" //done for balance reasons, making them high value for research, but harder to get - force = 8 //might or might not be too high, subject to change - w_class = WEIGHT_CLASS_SMALL - throwforce = 8 - attack_verb = list("drilled", "screwed", "jabbed") - toolspeed = 0.25 - -/obj/item/wrench/power/attack_self(mob/user) - playsound(get_turf(user),'sound/items/change_drill.ogg',50,1) - var/obj/item/wirecutters/power/s_drill = new /obj/item/screwdriver/power - to_chat(user, "You attach the screw driver bit to [src].") - qdel(src) - user.put_in_active_hand(s_drill) - -/obj/item/wrench/power/suicide_act(mob/user) - user.visible_message("[user] is pressing [src] against [user.p_their()] head! It looks like [user.p_theyre()] trying to commit suicide!") - return (BRUTELOSS) - -/obj/item/wrench/medical - name = "medical wrench" - desc = "A medical wrench with common(medical?) uses. Can be found in your hand." - icon_state = "wrench_medical" - force = 2 //MEDICAL - throwforce = 4 - origin_tech = "materials=1;engineering=1;biotech=3" - attack_verb = list("wrenched", "medicaled", "tapped", "jabbed", "whacked") - -/obj/item/wrench/medical/suicide_act(mob/living/user) - user.visible_message("[user] is praying to the medical wrench to take [user.p_their()] soul. It looks like [user.p_theyre()] trying to commit suicide!") - // TODO Make them glow with the power of the M E D I C A L W R E N C H - // during their ascension - - // Stun stops them from wandering off - user.Stun(100, ignore_canstun = TRUE) - playsound(loc, 'sound/effects/pray.ogg', 50, 1, -1) - - // Let the sound effect finish playing - sleep(20) - - if(!user) - return - - for(var/obj/item/W in user) - user.dropItemToGround(W) - - var/obj/item/wrench/medical/W = new /obj/item/wrench/medical(loc) - W.add_fingerprint(user) - W.desc += " For some reason, it reminds you of [user.name]." - - if(!user) - return - - user.dust() - - return OXYLOSS - -/* - * Screwdriver - */ -/obj/item/screwdriver - name = "screwdriver" - desc = "You can be totally screwy with this." - icon = 'icons/obj/tools.dmi' - icon_state = "screwdriver" - item_state = "screwdriver" - lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' - righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' - flags_1 = CONDUCT_1 - slot_flags = SLOT_BELT - force = 5 - w_class = WEIGHT_CLASS_TINY - throwforce = 5 - throw_speed = 3 - throw_range = 5 - materials = list(MAT_METAL=75) - attack_verb = list("stabbed") - hitsound = 'sound/weapons/bladeslice.ogg' - usesound = 'sound/items/screwdriver.ogg' - toolspeed = 1 - armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 30) - var/random_color = TRUE //if the screwdriver uses random coloring - var/static/list/screwdriver_colors = list(\ - "blue" = rgb(24, 97, 213), \ - "red" = rgb(149, 23, 16), \ - "pink" = rgb(213, 24, 141), \ - "brown" = rgb(160, 82, 18), \ - "green" = rgb(14, 127, 27), \ - "cyan" = rgb(24, 162, 213), \ - "yellow" = rgb(213, 140, 24), \ - ) - -/obj/item/screwdriver/suicide_act(mob/user) - user.visible_message("[user] is stabbing [src] into [user.p_their()] [pick("temple", "heart")]! It looks like [user.p_theyre()] trying to commit suicide!") - return(BRUTELOSS) - -/obj/item/screwdriver/Initialize() - . = ..() - if(random_color) //random colors! - var/our_color = pick(screwdriver_colors) - add_atom_colour(screwdriver_colors[our_color], FIXED_COLOUR_PRIORITY) - update_icon() - if(prob(75)) - pixel_y = rand(0, 16) - -/obj/item/screwdriver/update_icon() - if(!random_color) //icon override - return - cut_overlays() - var/mutable_appearance/base_overlay = mutable_appearance(icon, "screwdriver_screwybits") - base_overlay.appearance_flags = RESET_COLOR - add_overlay(base_overlay) - -/obj/item/screwdriver/worn_overlays(isinhands = FALSE, icon_file) - . = list() - if(isinhands && random_color) - var/mutable_appearance/M = mutable_appearance(icon_file, "screwdriver_head") - M.appearance_flags = RESET_COLOR - . += M - -/obj/item/screwdriver/get_belt_overlay() - if(random_color) - var/mutable_appearance/body = mutable_appearance('icons/obj/clothing/belt_overlays.dmi', "screwdriver") - var/mutable_appearance/head = mutable_appearance('icons/obj/clothing/belt_overlays.dmi', "screwdriver_head") - body.color = color - head.overlays += body - return head - else - return mutable_appearance('icons/obj/clothing/belt_overlays.dmi', icon_state) - -/obj/item/screwdriver/attack(mob/living/carbon/M, mob/living/carbon/user) - if(!istype(M)) - return ..() - if(user.zone_selected != "eyes" && user.zone_selected != "head") - return ..() - if(user.disabilities & CLUMSY && prob(50)) - M = user - return eyestab(M,user) - -/obj/item/screwdriver/brass - name = "brass screwdriver" - desc = "A screwdriver made of brass. The handle feels freezing cold." - resistance_flags = FIRE_PROOF | ACID_PROOF - icon_state = "screwdriver_brass" - item_state = "screwdriver_brass" - toolspeed = 0.5 - random_color = FALSE - -/obj/item/screwdriver/abductor - name = "alien screwdriver" - desc = "An ultrasonic screwdriver." - icon = 'icons/obj/abductor.dmi' - icon_state = "screwdriver_a" - item_state = "screwdriver_nuke" - usesound = 'sound/items/pshoom.ogg' - toolspeed = 0.1 - random_color = FALSE - -/obj/item/screwdriver/power - name = "hand drill" - desc = "A simple powered hand drill. It's fitted with a screw bit." - icon_state = "drill_screw" - item_state = "drill" - lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' - righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' - materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_TITANIUM=25) - origin_tech = "materials=2;engineering=2" //done for balance reasons, making them high value for research, but harder to get - force = 8 //might or might not be too high, subject to change - w_class = WEIGHT_CLASS_SMALL - throwforce = 8 - throw_speed = 2 - throw_range = 3//it's heavier than a screw driver/wrench, so it does more damage, but can't be thrown as far - attack_verb = list("drilled", "screwed", "jabbed","whacked") - hitsound = 'sound/items/drill_hit.ogg' - usesound = 'sound/items/drill_use.ogg' - toolspeed = 0.25 - random_color = FALSE - -/obj/item/screwdriver/power/suicide_act(mob/user) - user.visible_message("[user] is putting [src] to [user.p_their()] temple. It looks like [user.p_theyre()] trying to commit suicide!") - return(BRUTELOSS) - -/obj/item/screwdriver/power/attack_self(mob/user) - playsound(get_turf(user),'sound/items/change_drill.ogg',50,1) - var/obj/item/wrench/power/b_drill = new /obj/item/wrench/power - to_chat(user, "You attach the bolt driver bit to [src].") - qdel(src) - user.put_in_active_hand(b_drill) - -/obj/item/screwdriver/cyborg - name = "powered screwdriver" - desc = "An electrical screwdriver, designed to be both precise and quick." - usesound = 'sound/items/drill_use.ogg' - toolspeed = 0.5 - -/* - * Wirecutters - */ -/obj/item/wirecutters - name = "wirecutters" - desc = "This cuts wires." - icon = 'icons/obj/tools.dmi' - icon_state = null - lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' - righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' - flags_1 = CONDUCT_1 - slot_flags = SLOT_BELT - force = 6 - throw_speed = 3 - throw_range = 7 - w_class = WEIGHT_CLASS_SMALL - materials = list(MAT_METAL=80) - attack_verb = list("pinched", "nipped") - hitsound = 'sound/items/wirecutter.ogg' - usesound = 'sound/items/wirecutter.ogg' - origin_tech = "materials=1;engineering=1" - toolspeed = 1 - armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 30) - - -/obj/item/wirecutters/New(loc, var/param_color = null) - ..() - if(!icon_state) - if(!param_color) - param_color = pick("yellow","red") - icon_state = "cutters_[param_color]" - -/obj/item/wirecutters/attack(mob/living/carbon/C, mob/user) - if(istype(C) && C.handcuffed && istype(C.handcuffed, /obj/item/restraints/handcuffs/cable)) - user.visible_message("[user] cuts [C]'s restraints with [src]!") - qdel(C.handcuffed) - C.handcuffed = null - if(C.buckled && C.buckled.buckle_requires_restraints) - C.buckled.unbuckle_mob(C) - C.update_handcuffed() - return - else - ..() - -/obj/item/wirecutters/suicide_act(mob/user) - user.visible_message("[user] is cutting at [user.p_their()] arteries with [src]! It looks like [user.p_theyre()] trying to commit suicide!") - playsound(loc, usesound, 50, 1, -1) - return (BRUTELOSS) - -/obj/item/wirecutters/brass - name = "brass wirecutters" - desc = "A pair of wirecutters made of brass. The handle feels freezing cold to the touch." - resistance_flags = FIRE_PROOF | ACID_PROOF - icon_state = "cutters_brass" - toolspeed = 0.5 - -/obj/item/wirecutters/abductor - name = "alien wirecutters" - desc = "Extremely sharp wirecutters, made out of a silvery-green metal." - icon = 'icons/obj/abductor.dmi' - icon_state = "cutters" - toolspeed = 0.1 - origin_tech = "materials=5;engineering=4;abductor=3" - -/obj/item/wirecutters/cyborg - name = "wirecutters" - desc = "This cuts wires." - toolspeed = 0.5 - -/obj/item/wirecutters/power - name = "jaws of life" - desc = "A set of jaws of life, compressed through the magic of science. It's fitted with a cutting head." - icon_state = "jaws_cutter" - item_state = "jawsoflife" - origin_tech = "materials=2;engineering=2" - materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_TITANIUM=25) - usesound = 'sound/items/jaws_cut.ogg' - toolspeed = 0.25 - -/obj/item/wirecutters/power/suicide_act(mob/user) - user.visible_message("[user] is wrapping \the [src] around [user.p_their()] neck. It looks like [user.p_theyre()] trying to rip [user.p_their()] head off!") - playsound(loc, 'sound/items/jaws_cut.ogg', 50, 1, -1) - if(iscarbon(user)) - var/mob/living/carbon/C = user - var/obj/item/bodypart/BP = C.get_bodypart("head") - if(BP) - BP.drop_limb() - playsound(loc,pick('sound/misc/desceration-01.ogg','sound/misc/desceration-02.ogg','sound/misc/desceration-01.ogg') ,50, 1, -1) - return (BRUTELOSS) - -/obj/item/wirecutters/power/attack_self(mob/user) - playsound(get_turf(user), 'sound/items/change_jaws.ogg', 50, 1) - var/obj/item/crowbar/power/pryjaws = new /obj/item/crowbar/power - to_chat(user, "You attach the pry jaws to [src].") - qdel(src) - user.put_in_active_hand(pryjaws) -/* - * Welding Tool - */ -/obj/item/weldingtool - name = "welding tool" - desc = "A standard edition welder provided by NanoTrasen." - icon = 'icons/obj/tools.dmi' - icon_state = "welder" - item_state = "welder" - lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' - righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' - flags_1 = CONDUCT_1 - slot_flags = SLOT_BELT - force = 3 - throwforce = 5 - hitsound = "swing_hit" - usesound = 'sound/items/welder.ogg' - var/acti_sound = 'sound/items/welderactivate.ogg' - var/deac_sound = 'sound/items/welderdeactivate.ogg' - throw_speed = 3 - throw_range = 5 - w_class = WEIGHT_CLASS_SMALL - armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 30) - resistance_flags = FIRE_PROOF - - materials = list(MAT_METAL=70, MAT_GLASS=30) - origin_tech = "engineering=1;plasmatech=1" - var/welding = 0 //Whether or not the welding tool is off(0), on(1) or currently welding(2) - var/status = TRUE //Whether the welder is secured or unsecured (able to attach rods to it to make a flamethrower) - var/max_fuel = 20 //The max amount of fuel the welder can hold - var/change_icons = 1 - var/can_off_process = 0 - var/light_intensity = 2 //how powerful the emitted light is when used. - var/burned_fuel_for = 0 //when fuel was last removed - heat = 3800 - toolspeed = 1 - -/obj/item/weldingtool/Initialize() - . = ..() - create_reagents(max_fuel) - reagents.add_reagent("welding_fuel", max_fuel) - update_icon() - - -/obj/item/weldingtool/proc/update_torch() - if(welding) - add_overlay("[initial(icon_state)]-on") - item_state = "[initial(item_state)]1" - else - item_state = "[initial(item_state)]" - - -/obj/item/weldingtool/update_icon() - cut_overlays() - if(change_icons) - var/ratio = get_fuel() / max_fuel - ratio = Ceiling(ratio*4) * 25 - add_overlay("[initial(icon_state)][ratio]") - update_torch() - return - - -/obj/item/weldingtool/process() - switch(welding) - if(0) - force = 3 - damtype = "brute" - update_icon() - if(!can_off_process) - STOP_PROCESSING(SSobj, src) - return - //Welders left on now use up fuel, but lets not have them run out quite that fast - if(1) - force = 15 - damtype = "fire" - ++burned_fuel_for - if(burned_fuel_for >= WELDER_FUEL_BURN_INTERVAL) - remove_fuel(1) - update_icon() - - //This is to start fires. process() is only called if the welder is on. - open_flame() - - -/obj/item/weldingtool/suicide_act(mob/user) - user.visible_message("[user] welds [user.p_their()] every orifice closed! It looks like [user.p_theyre()] trying to commit suicide!") - return (FIRELOSS) - - -/obj/item/weldingtool/attackby(obj/item/I, mob/user, params) - if(istype(I, /obj/item/screwdriver)) - flamethrower_screwdriver(I, user) - else if(istype(I, /obj/item/stack/rods)) - flamethrower_rods(I, user) - else - return ..() - - -/obj/item/weldingtool/attack(mob/living/carbon/human/H, mob/user) - if(!istype(H)) - return ..() - - var/obj/item/bodypart/affecting = H.get_bodypart(check_zone(user.zone_selected)) - - if(affecting && affecting.status == BODYPART_ROBOTIC && user.a_intent != INTENT_HARM) - if(src.remove_fuel(1)) - playsound(loc, usesound, 50, 1) - if(user == H) - user.visible_message("[user] starts to fix some of the dents on [H]'s [affecting.name].", "You start fixing some of the dents on [H]'s [affecting.name].") - if(!do_mob(user, H, 50)) - return - item_heal_robotic(H, user, 15, 0) - else - return ..() - - -/obj/item/weldingtool/afterattack(atom/O, mob/user, proximity) - if(!proximity) return - - if(welding) - remove_fuel(1) - var/turf/location = get_turf(user) - location.hotspot_expose(700, 50, 1) - if(get_fuel() <= 0) - set_light(0) - - if(isliving(O)) - var/mob/living/L = O - if(L.IgniteMob()) - message_admins("[key_name_admin(user)] set [key_name_admin(L)] on fire") - log_game("[key_name(user)] set [key_name(L)] on fire") - - -/obj/item/weldingtool/attack_self(mob/user) - switched_on(user) - if(welding) - set_light(light_intensity) - - update_icon() - - -//Returns the amount of fuel in the welder -/obj/item/weldingtool/proc/get_fuel() - return reagents.get_reagent_amount("welding_fuel") - - -//Removes fuel from the welding tool. If a mob is passed, it will try to flash the mob's eyes. This should probably be renamed to use() -/obj/item/weldingtool/proc/remove_fuel(amount = 1, mob/living/M = null) - if(!welding || !check_fuel()) - return 0 - if(amount) - burned_fuel_for = 0 - if(get_fuel() >= amount) - reagents.remove_reagent("welding_fuel", amount) - check_fuel() - if(M) - M.flash_act(light_intensity) - return TRUE - else - if(M) - to_chat(M, "You need more welding fuel to complete this task!") - return FALSE - - -//Turns off the welder if there is no more fuel (does this really need to be its own proc?) -/obj/item/weldingtool/proc/check_fuel(mob/user) - if(get_fuel() <= 0 && welding) - switched_on(user) - update_icon() - //mob icon update - if(ismob(loc)) - var/mob/M = loc - M.update_inv_hands(0) - - return 0 - return 1 - -//Switches the welder on -/obj/item/weldingtool/proc/switched_on(mob/user) - if(!status) - to_chat(user, "[src] can't be turned on while unsecured!") - return - welding = !welding - if(welding) - if(get_fuel() >= 1) - to_chat(user, "You switch [src] on.") - playsound(loc, acti_sound, 50, 1) - force = 15 - damtype = "fire" - hitsound = 'sound/items/welder.ogg' - update_icon() - START_PROCESSING(SSobj, src) - else - to_chat(user, "You need more fuel!") - switched_off(user) - else - to_chat(user, "You switch [src] off.") - playsound(loc, deac_sound, 50, 1) - switched_off(user) - -//Switches the welder off -/obj/item/weldingtool/proc/switched_off(mob/user) - welding = 0 - set_light(0) - - force = 3 - damtype = "brute" - hitsound = "swing_hit" - update_icon() - - -/obj/item/weldingtool/examine(mob/user) - ..() - to_chat(user, "It contains [get_fuel()] unit\s of fuel out of [max_fuel].") - -/obj/item/weldingtool/is_hot() - return welding * heat - -//Returns whether or not the welding tool is currently on. -/obj/item/weldingtool/proc/isOn() - return welding - - -/obj/item/weldingtool/proc/flamethrower_screwdriver(obj/item/I, mob/user) - if(welding) - to_chat(user, "Turn it off first!") - return - status = !status - if(status) - to_chat(user, "You resecure [src].") - else - to_chat(user, "[src] can now be attached and modified.") - add_fingerprint(user) - -/obj/item/weldingtool/proc/flamethrower_rods(obj/item/I, mob/user) - if(!status) - var/obj/item/stack/rods/R = I - if (R.use(1)) - var/obj/item/flamethrower/F = new /obj/item/flamethrower(user.loc) - if(!remove_item_from_storage(F)) - user.transferItemToLoc(src, F, TRUE) - F.weldtool = src - add_fingerprint(user) - to_chat(user, "You add a rod to a welder, starting to build a flamethrower.") - user.put_in_hands(F) - else - to_chat(user, "You need one rod to start building a flamethrower!") - -/obj/item/weldingtool/ignition_effect(atom/A, mob/user) - if(welding && remove_fuel(1, user)) - . = "[user] casually lights [A] with [src], what a badass." - else - . = "" - -/obj/item/weldingtool/largetank - name = "industrial welding tool" - desc = "A slightly larger welder with a larger tank." - icon_state = "indwelder" - max_fuel = 40 - materials = list(MAT_GLASS=60) - origin_tech = "engineering=2;plasmatech=2" - -/obj/item/weldingtool/largetank/cyborg - name = "integrated welding tool" - desc = "An advanced welder designed to be used in robotic systems." - toolspeed = 0.5 - -/obj/item/weldingtool/largetank/flamethrower_screwdriver() - return - - -/obj/item/weldingtool/mini - name = "emergency welding tool" - desc = "A miniature welder used during emergencies." - icon_state = "miniwelder" - max_fuel = 10 - w_class = WEIGHT_CLASS_TINY - materials = list(MAT_METAL=30, MAT_GLASS=10) - change_icons = 0 - -/obj/item/weldingtool/mini/flamethrower_screwdriver() - return - -/obj/item/weldingtool/abductor - name = "alien welding tool" - desc = "An alien welding tool. Whatever fuel it uses, it never runs out." - icon = 'icons/obj/abductor.dmi' - icon_state = "welder" - toolspeed = 0.1 - light_intensity = 0 - change_icons = 0 - origin_tech = "plasmatech=5;engineering=5;abductor=3" - -/obj/item/weldingtool/abductor/process() - if(get_fuel() <= max_fuel) - reagents.add_reagent("welding_fuel", 1) - ..() - -/obj/item/weldingtool/hugetank - name = "upgraded industrial welding tool" - desc = "An upgraded welder based of the industrial welder." - icon_state = "upindwelder" - item_state = "upindwelder" - max_fuel = 80 - materials = list(MAT_METAL=70, MAT_GLASS=120) - origin_tech = "engineering=3;plasmatech=2" - -/obj/item/weldingtool/experimental - name = "experimental welding tool" - desc = "An experimental welder capable of self-fuel generation and less harmful to the eyes." - icon_state = "exwelder" - item_state = "exwelder" - max_fuel = 40 - materials = list(MAT_METAL=70, MAT_GLASS=120) - origin_tech = "materials=4;engineering=4;bluespace=3;plasmatech=4" - var/last_gen = 0 - change_icons = 0 - can_off_process = 1 - light_intensity = 1 - toolspeed = 0.5 - var/nextrefueltick = 0 - -/obj/item/weldingtool/experimental/brass - name = "brass welding tool" - desc = "A brass welder that seems to constantly refuel itself. It is faintly warm to the touch." - resistance_flags = FIRE_PROOF | ACID_PROOF - icon_state = "brasswelder" - item_state = "brasswelder" - - -/obj/item/weldingtool/experimental/process() - ..() - if(get_fuel() < max_fuel && nextrefueltick < world.time) - nextrefueltick = world.time + 10 - reagents.add_reagent("welding_fuel", 1) - - -/* - * Crowbar - */ - -/obj/item/crowbar - name = "pocket crowbar" - desc = "A small crowbar. This handy tool is useful for lots of things, such as prying floor tiles or opening unpowered doors." - icon = 'icons/obj/tools.dmi' - icon_state = "crowbar" - lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' - righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' - usesound = 'sound/items/crowbar.ogg' - flags_1 = CONDUCT_1 - slot_flags = SLOT_BELT - force = 5 - throwforce = 7 - w_class = WEIGHT_CLASS_SMALL - materials = list(MAT_METAL=50) - origin_tech = "engineering=1;combat=1" - attack_verb = list("attacked", "bashed", "battered", "bludgeoned", "whacked") - toolspeed = 1 - armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 30) - -/obj/item/crowbar/suicide_act(mob/user) - user.visible_message("[user] is beating [user.p_them()]self to death with [src]! It looks like [user.p_theyre()] trying to commit suicide!") - playsound(loc, 'sound/weapons/genhit.ogg', 50, 1, -1) - return (BRUTELOSS) - -/obj/item/crowbar/red - icon_state = "crowbar_red" - force = 8 - -/obj/item/crowbar/brass - name = "brass crowbar" - desc = "A brass crowbar. It feels faintly warm to the touch." - resistance_flags = FIRE_PROOF | ACID_PROOF - icon_state = "crowbar_brass" - toolspeed = 0.5 - -/obj/item/crowbar/abductor - name = "alien crowbar" - desc = "A hard-light crowbar. It appears to pry by itself, without any effort required." - icon = 'icons/obj/abductor.dmi' - usesound = 'sound/weapons/sonic_jackhammer.ogg' - icon_state = "crowbar" - toolspeed = 0.1 - origin_tech = "combat=4;engineering=4;abductor=3" - -/obj/item/crowbar/large - name = "crowbar" - desc = "It's a big crowbar. It doesn't fit in your pockets, because it's big." - force = 12 - w_class = WEIGHT_CLASS_NORMAL - throw_speed = 3 - throw_range = 3 - materials = list(MAT_METAL=70) - icon_state = "crowbar_large" - item_state = "crowbar" - toolspeed = 0.5 - -/obj/item/crowbar/cyborg - name = "hydraulic crowbar" - desc = "A hydraulic prying tool, compact but powerful. Designed to replace crowbar in construction cyborgs." - usesound = 'sound/items/jaws_pry.ogg' - force = 10 - toolspeed = 0.5 - -/obj/item/crowbar/power - name = "jaws of life" - desc = "A set of jaws of life, compressed through the magic of science. It's fitted with a prying head." - icon_state = "jaws_pry" - item_state = "jawsoflife" - lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' - righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' - materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_TITANIUM=25) - origin_tech = "materials=2;engineering=2" - usesound = 'sound/items/jaws_pry.ogg' - force = 15 - toolspeed = 0.25 - -/obj/item/crowbar/power/suicide_act(mob/user) - user.visible_message("[user] is putting [user.p_their()] head in [src], it looks like [user.p_theyre()] trying to commit suicide!") - playsound(loc, 'sound/items/jaws_pry.ogg', 50, 1, -1) - return (BRUTELOSS) - -/obj/item/crowbar/power/attack_self(mob/user) - playsound(get_turf(user), 'sound/items/change_jaws.ogg', 50, 1) - var/obj/item/wirecutters/power/cutjaws = new /obj/item/wirecutters/power - to_chat(user, "You attach the cutting jaws to [src].") - qdel(src) - user.put_in_active_hand(cutjaws) - -#undef WELDER_FUEL_BURN_INTERVAL -#define WELDER_FUEL_BURN_INTERVAL 13 - -/* Tools! - * Note: Multitools are /obj/item/device - * - * Contains: - * Wrench - * Screwdriver - * Wirecutters - * Welding Tool - * Crowbar - */ - -/* - * Wrench - */ -/obj/item/wrench - name = "wrench" - desc = "A wrench with common uses. Can be found in your hand." - icon = 'icons/obj/tools.dmi' - icon_state = "wrench" - lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' - righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' - flags_1 = CONDUCT_1 - slot_flags = SLOT_BELT - force = 5 - throwforce = 7 - w_class = WEIGHT_CLASS_SMALL - usesound = 'sound/items/ratchet.ogg' - materials = list(MAT_METAL=150) - origin_tech = "materials=1;engineering=1" - attack_verb = list("bashed", "battered", "bludgeoned", "whacked") - toolspeed = 1 - armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 30) - -/obj/item/wrench/suicide_act(mob/user) - user.visible_message("[user] is beating [user.p_them()]self to death with [src]! It looks like [user.p_theyre()] trying to commit suicide!") - playsound(loc, 'sound/weapons/genhit.ogg', 50, 1, -1) - return (BRUTELOSS) - -/obj/item/wrench/cyborg - name = "automatic wrench" - desc = "An advanced robotic wrench. Can be found in construction cyborgs." - toolspeed = 0.5 - -/obj/item/wrench/brass - name = "brass wrench" - desc = "A brass wrench. It's faintly warm to the touch." - resistance_flags = FIRE_PROOF | ACID_PROOF - icon_state = "wrench_brass" - toolspeed = 0.5 - -/obj/item/wrench/abductor - name = "alien wrench" - desc = "A polarized wrench. It causes anything placed between the jaws to turn." - icon = 'icons/obj/abductor.dmi' - icon_state = "wrench" - usesound = 'sound/effects/empulse.ogg' - toolspeed = 0.1 - origin_tech = "materials=5;engineering=5;abductor=3" - -/obj/item/wrench/power - name = "hand drill" - desc = "A simple powered hand drill. It's fitted with a bolt bit." - icon_state = "drill_bolt" - item_state = "drill" - lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' - righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' - usesound = 'sound/items/drill_use.ogg' - materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_TITANIUM=25) - origin_tech = "materials=2;engineering=2" //done for balance reasons, making them high value for research, but harder to get - force = 8 //might or might not be too high, subject to change - w_class = WEIGHT_CLASS_SMALL - throwforce = 8 - attack_verb = list("drilled", "screwed", "jabbed") - toolspeed = 0.25 - -/obj/item/wrench/power/attack_self(mob/user) - playsound(get_turf(user),'sound/items/change_drill.ogg',50,1) - var/obj/item/wirecutters/power/s_drill = new /obj/item/screwdriver/power - to_chat(user, "You attach the screw driver bit to [src].") - qdel(src) - user.put_in_active_hand(s_drill) - -/obj/item/wrench/power/suicide_act(mob/user) - user.visible_message("[user] is pressing [src] against [user.p_their()] head! It looks like [user.p_theyre()] trying to commit suicide!") - return (BRUTELOSS) - -/obj/item/wrench/medical - name = "medical wrench" - desc = "A medical wrench with common(medical?) uses. Can be found in your hand." - icon_state = "wrench_medical" - force = 2 //MEDICAL - throwforce = 4 - origin_tech = "materials=1;engineering=1;biotech=3" - attack_verb = list("wrenched", "medicaled", "tapped", "jabbed", "whacked") - -/obj/item/wrench/medical/suicide_act(mob/living/user) - user.visible_message("[user] is praying to the medical wrench to take [user.p_their()] soul. It looks like [user.p_theyre()] trying to commit suicide!") - // TODO Make them glow with the power of the M E D I C A L W R E N C H - // during their ascension - - // Stun stops them from wandering off - user.Stun(100, ignore_canstun = TRUE) - playsound(loc, 'sound/effects/pray.ogg', 50, 1, -1) - - // Let the sound effect finish playing - sleep(20) - - if(!user) - return - - for(var/obj/item/W in user) - user.dropItemToGround(W) - - var/obj/item/wrench/medical/W = new /obj/item/wrench/medical(loc) - W.add_fingerprint(user) - W.desc += " For some reason, it reminds you of [user.name]." - - if(!user) - return - - user.dust() - - return OXYLOSS - -/* - * Screwdriver - */ -/obj/item/screwdriver - name = "screwdriver" - desc = "You can be totally screwy with this." - icon = 'icons/obj/tools.dmi' - icon_state = "screwdriver" - item_state = "screwdriver" - lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' - righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' - flags_1 = CONDUCT_1 - slot_flags = SLOT_BELT - force = 5 - w_class = WEIGHT_CLASS_TINY - throwforce = 5 - throw_speed = 3 - throw_range = 5 - materials = list(MAT_METAL=75) - attack_verb = list("stabbed") - hitsound = 'sound/weapons/bladeslice.ogg' - usesound = 'sound/items/screwdriver.ogg' - toolspeed = 1 - armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 30) - var/random_color = TRUE //if the screwdriver uses random coloring - var/static/list/screwdriver_colors = list(\ - "blue" = rgb(24, 97, 213), \ - "red" = rgb(149, 23, 16), \ - "pink" = rgb(213, 24, 141), \ - "brown" = rgb(160, 82, 18), \ - "green" = rgb(14, 127, 27), \ - "cyan" = rgb(24, 162, 213), \ - "yellow" = rgb(213, 140, 24), \ - ) - -/obj/item/screwdriver/suicide_act(mob/user) - user.visible_message("[user] is stabbing [src] into [user.p_their()] [pick("temple", "heart")]! It looks like [user.p_theyre()] trying to commit suicide!") - return(BRUTELOSS) - -/obj/item/screwdriver/Initialize() - . = ..() - if(random_color) //random colors! - var/our_color = pick(screwdriver_colors) - add_atom_colour(screwdriver_colors[our_color], FIXED_COLOUR_PRIORITY) - update_icon() - if(prob(75)) - pixel_y = rand(0, 16) - -/obj/item/screwdriver/update_icon() - if(!random_color) //icon override - return - cut_overlays() - var/mutable_appearance/base_overlay = mutable_appearance(icon, "screwdriver_screwybits") - base_overlay.appearance_flags = RESET_COLOR - add_overlay(base_overlay) - -/obj/item/screwdriver/worn_overlays(isinhands = FALSE, icon_file) - . = list() - if(isinhands && random_color) - var/mutable_appearance/M = mutable_appearance(icon_file, "screwdriver_head") - M.appearance_flags = RESET_COLOR - . += M - -/obj/item/screwdriver/get_belt_overlay() - if(random_color) - var/mutable_appearance/body = mutable_appearance('icons/obj/clothing/belt_overlays.dmi', "screwdriver") - var/mutable_appearance/head = mutable_appearance('icons/obj/clothing/belt_overlays.dmi', "screwdriver_head") - body.color = color - head.add_overlay(body) - return head - else - return mutable_appearance('icons/obj/clothing/belt_overlays.dmi', icon_state) - -/obj/item/screwdriver/attack(mob/living/carbon/M, mob/living/carbon/user) - if(!istype(M)) - return ..() - if(user.zone_selected != "eyes" && user.zone_selected != "head") - return ..() - if(user.disabilities & CLUMSY && prob(50)) - M = user - return eyestab(M,user) - -/obj/item/screwdriver/brass - name = "brass screwdriver" - desc = "A screwdriver made of brass. The handle feels freezing cold." - resistance_flags = FIRE_PROOF | ACID_PROOF - icon_state = "screwdriver_brass" - item_state = "screwdriver_brass" - toolspeed = 0.5 - random_color = FALSE - -/obj/item/screwdriver/abductor - name = "alien screwdriver" - desc = "An ultrasonic screwdriver." - icon = 'icons/obj/abductor.dmi' - icon_state = "screwdriver_a" - item_state = "screwdriver_nuke" - usesound = 'sound/items/pshoom.ogg' - toolspeed = 0.1 - random_color = FALSE - -/obj/item/screwdriver/power - name = "hand drill" - desc = "A simple powered hand drill. It's fitted with a screw bit." - icon_state = "drill_screw" - item_state = "drill" - lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' - righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' - materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_TITANIUM=25) - origin_tech = "materials=2;engineering=2" //done for balance reasons, making them high value for research, but harder to get - force = 8 //might or might not be too high, subject to change - w_class = WEIGHT_CLASS_SMALL - throwforce = 8 - throw_speed = 2 - throw_range = 3//it's heavier than a screw driver/wrench, so it does more damage, but can't be thrown as far - attack_verb = list("drilled", "screwed", "jabbed","whacked") - hitsound = 'sound/items/drill_hit.ogg' - usesound = 'sound/items/drill_use.ogg' - toolspeed = 0.25 - random_color = FALSE - -/obj/item/screwdriver/power/suicide_act(mob/user) - user.visible_message("[user] is putting [src] to [user.p_their()] temple. It looks like [user.p_theyre()] trying to commit suicide!") - return(BRUTELOSS) - -/obj/item/screwdriver/power/attack_self(mob/user) - playsound(get_turf(user),'sound/items/change_drill.ogg',50,1) - var/obj/item/wrench/power/b_drill = new /obj/item/wrench/power - to_chat(user, "You attach the bolt driver bit to [src].") - qdel(src) - user.put_in_active_hand(b_drill) - -/obj/item/screwdriver/cyborg - name = "powered screwdriver" - desc = "An electrical screwdriver, designed to be both precise and quick." - usesound = 'sound/items/drill_use.ogg' - toolspeed = 0.5 - -/* - * Wirecutters - */ -/obj/item/wirecutters - name = "wirecutters" - desc = "This cuts wires." - icon = 'icons/obj/tools.dmi' - icon_state = null - lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' - righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' - flags_1 = CONDUCT_1 - slot_flags = SLOT_BELT - force = 6 - throw_speed = 3 - throw_range = 7 - w_class = WEIGHT_CLASS_SMALL - materials = list(MAT_METAL=80) - attack_verb = list("pinched", "nipped") - hitsound = 'sound/items/wirecutter.ogg' - usesound = 'sound/items/wirecutter.ogg' - origin_tech = "materials=1;engineering=1" - toolspeed = 1 - armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 30) - - -/obj/item/wirecutters/New(loc, var/param_color = null) - ..() - if(!icon_state) - if(!param_color) - param_color = pick("yellow","red") - icon_state = "cutters_[param_color]" - -/obj/item/wirecutters/attack(mob/living/carbon/C, mob/user) - if(istype(C) && C.handcuffed && istype(C.handcuffed, /obj/item/restraints/handcuffs/cable)) - user.visible_message("[user] cuts [C]'s restraints with [src]!") - qdel(C.handcuffed) - C.handcuffed = null - if(C.buckled && C.buckled.buckle_requires_restraints) - C.buckled.unbuckle_mob(C) - C.update_handcuffed() - return - else - ..() - -/obj/item/wirecutters/suicide_act(mob/user) - user.visible_message("[user] is cutting at [user.p_their()] arteries with [src]! It looks like [user.p_theyre()] trying to commit suicide!") - playsound(loc, usesound, 50, 1, -1) - return (BRUTELOSS) - -/obj/item/wirecutters/brass - name = "brass wirecutters" - desc = "A pair of wirecutters made of brass. The handle feels freezing cold to the touch." - resistance_flags = FIRE_PROOF | ACID_PROOF - icon_state = "cutters_brass" - toolspeed = 0.5 - -/obj/item/wirecutters/abductor - name = "alien wirecutters" - desc = "Extremely sharp wirecutters, made out of a silvery-green metal." - icon = 'icons/obj/abductor.dmi' - icon_state = "cutters" - toolspeed = 0.1 - origin_tech = "materials=5;engineering=4;abductor=3" - -/obj/item/wirecutters/cyborg - name = "wirecutters" - desc = "This cuts wires." - toolspeed = 0.5 - -/obj/item/wirecutters/power - name = "jaws of life" - desc = "A set of jaws of life, compressed through the magic of science. It's fitted with a cutting head." - icon_state = "jaws_cutter" - item_state = "jawsoflife" - origin_tech = "materials=2;engineering=2" - materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_TITANIUM=25) - usesound = 'sound/items/jaws_cut.ogg' - toolspeed = 0.25 - -/obj/item/wirecutters/power/suicide_act(mob/user) - user.visible_message("[user] is wrapping \the [src] around [user.p_their()] neck. It looks like [user.p_theyre()] trying to rip [user.p_their()] head off!") - playsound(loc, 'sound/items/jaws_cut.ogg', 50, 1, -1) - if(iscarbon(user)) - var/mob/living/carbon/C = user - var/obj/item/bodypart/BP = C.get_bodypart("head") - if(BP) - BP.drop_limb() - playsound(loc,pick('sound/misc/desceration-01.ogg','sound/misc/desceration-02.ogg','sound/misc/desceration-01.ogg') ,50, 1, -1) - return (BRUTELOSS) - -/obj/item/wirecutters/power/attack_self(mob/user) - playsound(get_turf(user), 'sound/items/change_jaws.ogg', 50, 1) - var/obj/item/crowbar/power/pryjaws = new /obj/item/crowbar/power - to_chat(user, "You attach the pry jaws to [src].") - qdel(src) - user.put_in_active_hand(pryjaws) -/* - * Welding Tool - */ -/obj/item/weldingtool - name = "welding tool" - desc = "A standard edition welder provided by Nanotrasen." - icon = 'icons/obj/tools.dmi' - icon_state = "welder" - item_state = "welder" - lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' - righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' - flags_1 = CONDUCT_1 - slot_flags = SLOT_BELT - force = 3 - throwforce = 5 - hitsound = "swing_hit" - usesound = 'sound/items/welder.ogg' - var/acti_sound = 'sound/items/welderactivate.ogg' - var/deac_sound = 'sound/items/welderdeactivate.ogg' - throw_speed = 3 - throw_range = 5 - w_class = WEIGHT_CLASS_SMALL - armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 30) - resistance_flags = FIRE_PROOF - - materials = list(MAT_METAL=70, MAT_GLASS=30) - origin_tech = "engineering=1;plasmatech=1" - var/welding = 0 //Whether or not the welding tool is off(0), on(1) or currently welding(2) - var/status = TRUE //Whether the welder is secured or unsecured (able to attach rods to it to make a flamethrower) - var/max_fuel = 20 //The max amount of fuel the welder can hold - var/change_icons = 1 - var/can_off_process = 0 - var/light_intensity = 2 //how powerful the emitted light is when used. - var/burned_fuel_for = 0 //when fuel was last removed - heat = 3800 - toolspeed = 1 - -/obj/item/weldingtool/Initialize() - . = ..() - create_reagents(max_fuel) - reagents.add_reagent("welding_fuel", max_fuel) - update_icon() - - -/obj/item/weldingtool/proc/update_torch() - if(welding) - add_overlay("[initial(icon_state)]-on") - item_state = "[initial(item_state)]1" - else - item_state = "[initial(item_state)]" - - -/obj/item/weldingtool/update_icon() - cut_overlays() - if(change_icons) - var/ratio = get_fuel() / max_fuel - ratio = Ceiling(ratio*4) * 25 - add_overlay("[initial(icon_state)][ratio]") - update_torch() - return - - -/obj/item/weldingtool/process() - switch(welding) - if(0) - force = 3 - damtype = "brute" - update_icon() - if(!can_off_process) - STOP_PROCESSING(SSobj, src) - return - //Welders left on now use up fuel, but lets not have them run out quite that fast - if(1) - force = 15 - damtype = "fire" - ++burned_fuel_for - if(burned_fuel_for >= WELDER_FUEL_BURN_INTERVAL) - remove_fuel(1) - update_icon() - - //This is to start fires. process() is only called if the welder is on. - open_flame() - - -/obj/item/weldingtool/suicide_act(mob/user) - user.visible_message("[user] welds [user.p_their()] every orifice closed! It looks like [user.p_theyre()] trying to commit suicide!") - return (FIRELOSS) - - -/obj/item/weldingtool/attackby(obj/item/I, mob/user, params) - if(istype(I, /obj/item/screwdriver)) - flamethrower_screwdriver(I, user) - else if(istype(I, /obj/item/stack/rods)) - flamethrower_rods(I, user) - else - return ..() - - -/obj/item/weldingtool/attack(mob/living/carbon/human/H, mob/user) - if(!istype(H)) - return ..() - - var/obj/item/bodypart/affecting = H.get_bodypart(check_zone(user.zone_selected)) - - if(affecting && affecting.status == BODYPART_ROBOTIC && user.a_intent != INTENT_HARM) - if(src.remove_fuel(1)) - playsound(loc, usesound, 50, 1) - if(user == H) - user.visible_message("[user] starts to fix some of the dents on [H]'s [affecting.name].", "You start fixing some of the dents on [H]'s [affecting.name].") - if(!do_mob(user, H, 50)) - return - item_heal_robotic(H, user, 15, 0) - else - return ..() - - -/obj/item/weldingtool/afterattack(atom/O, mob/user, proximity) - if(!proximity) return - - if(welding) - remove_fuel(1) - var/turf/location = get_turf(user) - location.hotspot_expose(700, 50, 1) - if(get_fuel() <= 0) - set_light(0) - - if(isliving(O)) - var/mob/living/L = O - if(L.IgniteMob()) - message_admins("[key_name_admin(user)] set [key_name_admin(L)] on fire") - log_game("[key_name(user)] set [key_name(L)] on fire") - - -/obj/item/weldingtool/attack_self(mob/user) - switched_on(user) - if(welding) - set_light(light_intensity) - - update_icon() - - -//Returns the amount of fuel in the welder -/obj/item/weldingtool/proc/get_fuel() - return reagents.get_reagent_amount("welding_fuel") - - -//Removes fuel from the welding tool. If a mob is passed, it will try to flash the mob's eyes. This should probably be renamed to use() -/obj/item/weldingtool/proc/remove_fuel(amount = 1, mob/living/M = null) - if(!welding || !check_fuel()) - return 0 - if(amount) - burned_fuel_for = 0 - if(get_fuel() >= amount) - reagents.remove_reagent("welding_fuel", amount) - check_fuel() - if(M) - M.flash_act(light_intensity) - return TRUE - else - if(M) - to_chat(M, "You need more welding fuel to complete this task!") - return FALSE - - -//Turns off the welder if there is no more fuel (does this really need to be its own proc?) -/obj/item/weldingtool/proc/check_fuel(mob/user) - if(get_fuel() <= 0 && welding) - switched_on(user) - update_icon() - //mob icon update - if(ismob(loc)) - var/mob/M = loc - M.update_inv_hands(0) - - return 0 - return 1 - -//Switches the welder on -/obj/item/weldingtool/proc/switched_on(mob/user) - if(!status) - to_chat(user, "[src] can't be turned on while unsecured!") - return - welding = !welding - if(welding) - if(get_fuel() >= 1) - to_chat(user, "You switch [src] on.") - playsound(loc, acti_sound, 50, 1) - force = 15 - damtype = "fire" - hitsound = 'sound/items/welder.ogg' - update_icon() - START_PROCESSING(SSobj, src) - else - to_chat(user, "You need more fuel!") - switched_off(user) - else - to_chat(user, "You switch [src] off.") - playsound(loc, deac_sound, 50, 1) - switched_off(user) - -//Switches the welder off -/obj/item/weldingtool/proc/switched_off(mob/user) - welding = 0 - set_light(0) - - force = 3 - damtype = "brute" - hitsound = "swing_hit" - update_icon() - - -/obj/item/weldingtool/examine(mob/user) - ..() - to_chat(user, "It contains [get_fuel()] unit\s of fuel out of [max_fuel].") - -/obj/item/weldingtool/is_hot() - return welding * heat - -//Returns whether or not the welding tool is currently on. -/obj/item/weldingtool/proc/isOn() - return welding - - -/obj/item/weldingtool/proc/flamethrower_screwdriver(obj/item/I, mob/user) - if(welding) - to_chat(user, "Turn it off first!") - return - status = !status - if(status) - to_chat(user, "You resecure [src].") - else - to_chat(user, "[src] can now be attached and modified.") - add_fingerprint(user) - -/obj/item/weldingtool/proc/flamethrower_rods(obj/item/I, mob/user) - if(!status) - var/obj/item/stack/rods/R = I - if (R.use(1)) - var/obj/item/flamethrower/F = new /obj/item/flamethrower(user.loc) - if(!remove_item_from_storage(F)) - user.transferItemToLoc(src, F, TRUE) - F.weldtool = src - add_fingerprint(user) - to_chat(user, "You add a rod to a welder, starting to build a flamethrower.") - user.put_in_hands(F) - else - to_chat(user, "You need one rod to start building a flamethrower!") - -/obj/item/weldingtool/ignition_effect(atom/A, mob/user) - if(welding && remove_fuel(1, user)) - . = "[user] casually lights [A] with [src], what a badass." - else - . = "" - -/obj/item/weldingtool/largetank - name = "industrial welding tool" - desc = "A slightly larger welder with a larger tank." - icon_state = "indwelder" - max_fuel = 40 - materials = list(MAT_GLASS=60) - origin_tech = "engineering=2;plasmatech=2" - -/obj/item/weldingtool/largetank/cyborg - name = "integrated welding tool" - desc = "An advanced welder designed to be used in robotic systems." - toolspeed = 0.5 - -/obj/item/weldingtool/largetank/flamethrower_screwdriver() - return - - -/obj/item/weldingtool/mini - name = "emergency welding tool" - desc = "A miniature welder used during emergencies." - icon_state = "miniwelder" - max_fuel = 10 - w_class = WEIGHT_CLASS_TINY - materials = list(MAT_METAL=30, MAT_GLASS=10) - change_icons = 0 - -/obj/item/weldingtool/mini/flamethrower_screwdriver() - return - -/obj/item/weldingtool/abductor - name = "alien welding tool" - desc = "An alien welding tool. Whatever fuel it uses, it never runs out." - icon = 'icons/obj/abductor.dmi' - icon_state = "welder" - toolspeed = 0.1 - light_intensity = 0 - change_icons = 0 - origin_tech = "plasmatech=5;engineering=5;abductor=3" - -/obj/item/weldingtool/abductor/process() - if(get_fuel() <= max_fuel) - reagents.add_reagent("welding_fuel", 1) - ..() - -/obj/item/weldingtool/hugetank - name = "upgraded industrial welding tool" - desc = "An upgraded welder based of the industrial welder." - icon_state = "upindwelder" - item_state = "upindwelder" - max_fuel = 80 - materials = list(MAT_METAL=70, MAT_GLASS=120) - origin_tech = "engineering=3;plasmatech=2" - -/obj/item/weldingtool/experimental - name = "experimental welding tool" - desc = "An experimental welder capable of self-fuel generation and less harmful to the eyes." - icon_state = "exwelder" - item_state = "exwelder" - max_fuel = 40 - materials = list(MAT_METAL=70, MAT_GLASS=120) - origin_tech = "materials=4;engineering=4;bluespace=3;plasmatech=4" - var/last_gen = 0 - change_icons = 0 - can_off_process = 1 - light_intensity = 1 - toolspeed = 0.5 - var/nextrefueltick = 0 - -/obj/item/weldingtool/experimental/brass - name = "brass welding tool" - desc = "A brass welder that seems to constantly refuel itself. It is faintly warm to the touch." - resistance_flags = FIRE_PROOF | ACID_PROOF - icon_state = "brasswelder" - item_state = "brasswelder" - - -/obj/item/weldingtool/experimental/process() - ..() - if(get_fuel() < max_fuel && nextrefueltick < world.time) - nextrefueltick = world.time + 10 - reagents.add_reagent("welding_fuel", 1) - - -/* - * Crowbar - */ - -/obj/item/crowbar - name = "pocket crowbar" - desc = "A small crowbar. This handy tool is useful for lots of things, such as prying floor tiles or opening unpowered doors." - icon = 'icons/obj/tools.dmi' - icon_state = "crowbar" - lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' - righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' - usesound = 'sound/items/crowbar.ogg' - flags_1 = CONDUCT_1 - slot_flags = SLOT_BELT - force = 5 - throwforce = 7 - w_class = WEIGHT_CLASS_SMALL - materials = list(MAT_METAL=50) - origin_tech = "engineering=1;combat=1" - attack_verb = list("attacked", "bashed", "battered", "bludgeoned", "whacked") - toolspeed = 1 - armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 30) - -/obj/item/crowbar/suicide_act(mob/user) - user.visible_message("[user] is beating [user.p_them()]self to death with [src]! It looks like [user.p_theyre()] trying to commit suicide!") - playsound(loc, 'sound/weapons/genhit.ogg', 50, 1, -1) - return (BRUTELOSS) - -/obj/item/crowbar/red - icon_state = "crowbar_red" - force = 8 - -/obj/item/crowbar/brass - name = "brass crowbar" - desc = "A brass crowbar. It feels faintly warm to the touch." - resistance_flags = FIRE_PROOF | ACID_PROOF - icon_state = "crowbar_brass" - toolspeed = 0.5 - -/obj/item/crowbar/abductor - name = "alien crowbar" - desc = "A hard-light crowbar. It appears to pry by itself, without any effort required." - icon = 'icons/obj/abductor.dmi' - usesound = 'sound/weapons/sonic_jackhammer.ogg' - icon_state = "crowbar" - toolspeed = 0.1 - origin_tech = "combat=4;engineering=4;abductor=3" - -/obj/item/crowbar/large - name = "crowbar" - desc = "It's a big crowbar. It doesn't fit in your pockets, because it's big." - force = 12 - w_class = WEIGHT_CLASS_NORMAL - throw_speed = 3 - throw_range = 3 - materials = list(MAT_METAL=70) - icon_state = "crowbar_large" - item_state = "crowbar" - toolspeed = 0.5 - -/obj/item/crowbar/cyborg - name = "hydraulic crowbar" - desc = "A hydraulic prying tool, compact but powerful. Designed to replace crowbar in construction cyborgs." - usesound = 'sound/items/jaws_pry.ogg' - force = 10 - toolspeed = 0.5 - -/obj/item/crowbar/power - name = "jaws of life" - desc = "A set of jaws of life, compressed through the magic of science. It's fitted with a prying head." - icon_state = "jaws_pry" - item_state = "jawsoflife" - lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' - righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' - materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_TITANIUM=25) - origin_tech = "materials=2;engineering=2" - usesound = 'sound/items/jaws_pry.ogg' - force = 15 - toolspeed = 0.25 - -/obj/item/crowbar/power/suicide_act(mob/user) - user.visible_message("[user] is putting [user.p_their()] head in [src], it looks like [user.p_theyre()] trying to commit suicide!") - playsound(loc, 'sound/items/jaws_pry.ogg', 50, 1, -1) - return (BRUTELOSS) - -/obj/item/crowbar/power/attack_self(mob/user) - playsound(get_turf(user), 'sound/items/change_jaws.ogg', 50, 1) - var/obj/item/wirecutters/power/cutjaws = new /obj/item/wirecutters/power - to_chat(user, "You attach the cutting jaws to [src].") - qdel(src) - user.put_in_active_hand(cutjaws) - -#undef WELDER_FUEL_BURN_INTERVAL From e5aed03bcb29a0865808e1b0e8777de585e17058 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sun, 10 Sep 2017 15:20:58 -0500 Subject: [PATCH 036/163] all of my HATE --- code/game/objects/items/tools.dm | 789 +++++++++++++++++++++++++++++++ 1 file changed, 789 insertions(+) diff --git a/code/game/objects/items/tools.dm b/code/game/objects/items/tools.dm index d3f5a12faa..8bfc90decb 100644 --- a/code/game/objects/items/tools.dm +++ b/code/game/objects/items/tools.dm @@ -1 +1,790 @@ +#define WELDER_FUEL_BURN_INTERVAL 13 +/* Tools! + * Note: Multitools are /obj/item/device + * + * Contains: + * Wrench + * Screwdriver + * Wirecutters + * Welding Tool + * Crowbar + */ + +/* + * Wrench + */ +/obj/item/wrench + name = "wrench" + desc = "A wrench with common uses. Can be found in your hand." + icon = 'icons/obj/tools.dmi' + icon_state = "wrench" + lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' + flags_1 = CONDUCT_1 + slot_flags = SLOT_BELT + force = 5 + throwforce = 7 + w_class = WEIGHT_CLASS_SMALL + usesound = 'sound/items/ratchet.ogg' + materials = list(MAT_METAL=150) + origin_tech = "materials=1;engineering=1" + attack_verb = list("bashed", "battered", "bludgeoned", "whacked") + toolspeed = 1 + armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 30) + +/obj/item/wrench/suicide_act(mob/user) + user.visible_message("[user] is beating [user.p_them()]self to death with [src]! It looks like [user.p_theyre()] trying to commit suicide!") + playsound(loc, 'sound/weapons/genhit.ogg', 50, 1, -1) + return (BRUTELOSS) + +/obj/item/wrench/cyborg + name = "automatic wrench" + desc = "An advanced robotic wrench. Can be found in construction cyborgs." + toolspeed = 0.5 + +/obj/item/wrench/brass + name = "brass wrench" + desc = "A brass wrench. It's faintly warm to the touch." + resistance_flags = FIRE_PROOF | ACID_PROOF + icon_state = "wrench_brass" + toolspeed = 0.5 + +/obj/item/wrench/abductor + name = "alien wrench" + desc = "A polarized wrench. It causes anything placed between the jaws to turn." + icon = 'icons/obj/abductor.dmi' + icon_state = "wrench" + usesound = 'sound/effects/empulse.ogg' + toolspeed = 0.1 + origin_tech = "materials=5;engineering=5;abductor=3" + +/obj/item/wrench/power + name = "hand drill" + desc = "A simple powered hand drill. It's fitted with a bolt bit." + icon_state = "drill_bolt" + item_state = "drill" + lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' + usesound = 'sound/items/drill_use.ogg' + materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_TITANIUM=25) + origin_tech = "materials=2;engineering=2" //done for balance reasons, making them high value for research, but harder to get + force = 8 //might or might not be too high, subject to change + w_class = WEIGHT_CLASS_SMALL + throwforce = 8 + attack_verb = list("drilled", "screwed", "jabbed") + toolspeed = 0.25 + +/obj/item/wrench/power/attack_self(mob/user) + playsound(get_turf(user),'sound/items/change_drill.ogg',50,1) + var/obj/item/wirecutters/power/s_drill = new /obj/item/screwdriver/power + to_chat(user, "You attach the screw driver bit to [src].") + qdel(src) + user.put_in_active_hand(s_drill) + +/obj/item/wrench/power/suicide_act(mob/user) + user.visible_message("[user] is pressing [src] against [user.p_their()] head! It looks like [user.p_theyre()] trying to commit suicide!") + return (BRUTELOSS) + +/obj/item/wrench/medical + name = "medical wrench" + desc = "A medical wrench with common(medical?) uses. Can be found in your hand." + icon_state = "wrench_medical" + force = 2 //MEDICAL + throwforce = 4 + origin_tech = "materials=1;engineering=1;biotech=3" + attack_verb = list("wrenched", "medicaled", "tapped", "jabbed", "whacked") + +/obj/item/wrench/medical/suicide_act(mob/living/user) + user.visible_message("[user] is praying to the medical wrench to take [user.p_their()] soul. It looks like [user.p_theyre()] trying to commit suicide!") + // TODO Make them glow with the power of the M E D I C A L W R E N C H + // during their ascension + + // Stun stops them from wandering off + user.Stun(100, ignore_canstun = TRUE) + playsound(loc, 'sound/effects/pray.ogg', 50, 1, -1) + + // Let the sound effect finish playing + sleep(20) + + if(!user) + return + + for(var/obj/item/W in user) + user.dropItemToGround(W) + + var/obj/item/wrench/medical/W = new /obj/item/wrench/medical(loc) + W.add_fingerprint(user) + W.desc += " For some reason, it reminds you of [user.name]." + + if(!user) + return + + user.dust() + + return OXYLOSS + +/* + * Screwdriver + */ +/obj/item/screwdriver + name = "screwdriver" + desc = "You can be totally screwy with this." + icon = 'icons/obj/tools.dmi' + icon_state = "screwdriver" + item_state = "screwdriver" + lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' + flags_1 = CONDUCT_1 + slot_flags = SLOT_BELT + force = 5 + w_class = WEIGHT_CLASS_TINY + throwforce = 5 + throw_speed = 3 + throw_range = 5 + materials = list(MAT_METAL=75) + attack_verb = list("stabbed") + hitsound = 'sound/weapons/bladeslice.ogg' + usesound = 'sound/items/screwdriver.ogg' + toolspeed = 1 + armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 30) + var/random_color = TRUE //if the screwdriver uses random coloring + var/static/list/screwdriver_colors = list(\ + "blue" = rgb(24, 97, 213), \ + "red" = rgb(149, 23, 16), \ + "pink" = rgb(213, 24, 141), \ + "brown" = rgb(160, 82, 18), \ + "green" = rgb(14, 127, 27), \ + "cyan" = rgb(24, 162, 213), \ + "yellow" = rgb(213, 140, 24), \ + ) + +/obj/item/screwdriver/suicide_act(mob/user) + user.visible_message("[user] is stabbing [src] into [user.p_their()] [pick("temple", "heart")]! It looks like [user.p_theyre()] trying to commit suicide!") + return(BRUTELOSS) + +/obj/item/screwdriver/Initialize() + . = ..() + if(random_color) //random colors! + var/our_color = pick(screwdriver_colors) + add_atom_colour(screwdriver_colors[our_color], FIXED_COLOUR_PRIORITY) + update_icon() + if(prob(75)) + pixel_y = rand(0, 16) + +/obj/item/screwdriver/update_icon() + if(!random_color) //icon override + return + cut_overlays() + var/mutable_appearance/base_overlay = mutable_appearance(icon, "screwdriver_screwybits") + base_overlay.appearance_flags = RESET_COLOR + add_overlay(base_overlay) + +/obj/item/screwdriver/worn_overlays(isinhands = FALSE, icon_file) + . = list() + if(isinhands && random_color) + var/mutable_appearance/M = mutable_appearance(icon_file, "screwdriver_head") + M.appearance_flags = RESET_COLOR + . += M + +/obj/item/screwdriver/get_belt_overlay() + if(random_color) + var/mutable_appearance/body = mutable_appearance('icons/obj/clothing/belt_overlays.dmi', "screwdriver") + var/mutable_appearance/head = mutable_appearance('icons/obj/clothing/belt_overlays.dmi', "screwdriver_head") + body.color = color + head.add_overlay(body) + return head + else + return mutable_appearance('icons/obj/clothing/belt_overlays.dmi', icon_state) + +/obj/item/screwdriver/attack(mob/living/carbon/M, mob/living/carbon/user) + if(!istype(M)) + return ..() + if(user.zone_selected != "eyes" && user.zone_selected != "head") + return ..() + if(user.disabilities & CLUMSY && prob(50)) + M = user + return eyestab(M,user) + +/obj/item/screwdriver/brass + name = "brass screwdriver" + desc = "A screwdriver made of brass. The handle feels freezing cold." + resistance_flags = FIRE_PROOF | ACID_PROOF + icon_state = "screwdriver_brass" + item_state = "screwdriver_brass" + toolspeed = 0.5 + random_color = FALSE + +/obj/item/screwdriver/abductor + name = "alien screwdriver" + desc = "An ultrasonic screwdriver." + icon = 'icons/obj/abductor.dmi' + icon_state = "screwdriver_a" + item_state = "screwdriver_nuke" + usesound = 'sound/items/pshoom.ogg' + toolspeed = 0.1 + random_color = FALSE + +/obj/item/screwdriver/power + name = "hand drill" + desc = "A simple powered hand drill. It's fitted with a screw bit." + icon_state = "drill_screw" + item_state = "drill" + lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' + materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_TITANIUM=25) + origin_tech = "materials=2;engineering=2" //done for balance reasons, making them high value for research, but harder to get + force = 8 //might or might not be too high, subject to change + w_class = WEIGHT_CLASS_SMALL + throwforce = 8 + throw_speed = 2 + throw_range = 3//it's heavier than a screw driver/wrench, so it does more damage, but can't be thrown as far + attack_verb = list("drilled", "screwed", "jabbed","whacked") + hitsound = 'sound/items/drill_hit.ogg' + usesound = 'sound/items/drill_use.ogg' + toolspeed = 0.25 + random_color = FALSE + +/obj/item/screwdriver/power/suicide_act(mob/user) + user.visible_message("[user] is putting [src] to [user.p_their()] temple. It looks like [user.p_theyre()] trying to commit suicide!") + return(BRUTELOSS) + +/obj/item/screwdriver/power/attack_self(mob/user) + playsound(get_turf(user),'sound/items/change_drill.ogg',50,1) + var/obj/item/wrench/power/b_drill = new /obj/item/wrench/power + to_chat(user, "You attach the bolt driver bit to [src].") + qdel(src) + user.put_in_active_hand(b_drill) + +/obj/item/screwdriver/cyborg + name = "powered screwdriver" + desc = "An electrical screwdriver, designed to be both precise and quick." + usesound = 'sound/items/drill_use.ogg' + toolspeed = 0.5 + +/* + * Wirecutters + */ +/obj/item/wirecutters + name = "wirecutters" + desc = "This cuts wires." + icon = 'icons/obj/tools.dmi' + icon_state = null + lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' + flags_1 = CONDUCT_1 + slot_flags = SLOT_BELT + force = 6 + throw_speed = 3 + throw_range = 7 + w_class = WEIGHT_CLASS_SMALL + materials = list(MAT_METAL=80) + attack_verb = list("pinched", "nipped") + hitsound = 'sound/items/wirecutter.ogg' + usesound = 'sound/items/wirecutter.ogg' + origin_tech = "materials=1;engineering=1" + toolspeed = 1 + armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 30) + + +/obj/item/wirecutters/New(loc, var/param_color = null) + ..() + if(!icon_state) + if(!param_color) + param_color = pick("yellow","red") + icon_state = "cutters_[param_color]" + +/obj/item/wirecutters/attack(mob/living/carbon/C, mob/user) + if(istype(C) && C.handcuffed && istype(C.handcuffed, /obj/item/restraints/handcuffs/cable)) + user.visible_message("[user] cuts [C]'s restraints with [src]!") + qdel(C.handcuffed) + C.handcuffed = null + if(C.buckled && C.buckled.buckle_requires_restraints) + C.buckled.unbuckle_mob(C) + C.update_handcuffed() + return + else + ..() + +/obj/item/wirecutters/suicide_act(mob/user) + user.visible_message("[user] is cutting at [user.p_their()] arteries with [src]! It looks like [user.p_theyre()] trying to commit suicide!") + playsound(loc, usesound, 50, 1, -1) + return (BRUTELOSS) + +/obj/item/wirecutters/brass + name = "brass wirecutters" + desc = "A pair of wirecutters made of brass. The handle feels freezing cold to the touch." + resistance_flags = FIRE_PROOF | ACID_PROOF + icon_state = "cutters_brass" + toolspeed = 0.5 + +/obj/item/wirecutters/abductor + name = "alien wirecutters" + desc = "Extremely sharp wirecutters, made out of a silvery-green metal." + icon = 'icons/obj/abductor.dmi' + icon_state = "cutters" + toolspeed = 0.1 + origin_tech = "materials=5;engineering=4;abductor=3" + +/obj/item/wirecutters/cyborg + name = "wirecutters" + desc = "This cuts wires." + toolspeed = 0.5 + +/obj/item/wirecutters/power + name = "jaws of life" + desc = "A set of jaws of life, compressed through the magic of science. It's fitted with a cutting head." + icon_state = "jaws_cutter" + item_state = "jawsoflife" + origin_tech = "materials=2;engineering=2" + materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_TITANIUM=25) + usesound = 'sound/items/jaws_cut.ogg' + toolspeed = 0.25 + +/obj/item/wirecutters/power/suicide_act(mob/user) + user.visible_message("[user] is wrapping \the [src] around [user.p_their()] neck. It looks like [user.p_theyre()] trying to rip [user.p_their()] head off!") + playsound(loc, 'sound/items/jaws_cut.ogg', 50, 1, -1) + if(iscarbon(user)) + var/mob/living/carbon/C = user + var/obj/item/bodypart/BP = C.get_bodypart("head") + if(BP) + BP.drop_limb() + playsound(loc,pick('sound/misc/desceration-01.ogg','sound/misc/desceration-02.ogg','sound/misc/desceration-01.ogg') ,50, 1, -1) + return (BRUTELOSS) + +/obj/item/wirecutters/power/attack_self(mob/user) + playsound(get_turf(user), 'sound/items/change_jaws.ogg', 50, 1) + var/obj/item/crowbar/power/pryjaws = new /obj/item/crowbar/power + to_chat(user, "You attach the pry jaws to [src].") + qdel(src) + user.put_in_active_hand(pryjaws) +/* + * Welding Tool + */ +/obj/item/weldingtool + name = "welding tool" + desc = "A standard edition welder provided by Nanotrasen." + icon = 'icons/obj/tools.dmi' + icon_state = "welder" + item_state = "welder" + lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' + flags_1 = CONDUCT_1 + slot_flags = SLOT_BELT + force = 3 + throwforce = 5 + hitsound = "swing_hit" + usesound = 'sound/items/welder.ogg' + var/acti_sound = 'sound/items/welderactivate.ogg' + var/deac_sound = 'sound/items/welderdeactivate.ogg' + throw_speed = 3 + throw_range = 5 + w_class = WEIGHT_CLASS_SMALL + armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 30) + resistance_flags = FIRE_PROOF + + materials = list(MAT_METAL=70, MAT_GLASS=30) + origin_tech = "engineering=1;plasmatech=1" + var/welding = 0 //Whether or not the welding tool is off(0), on(1) or currently welding(2) + var/status = TRUE //Whether the welder is secured or unsecured (able to attach rods to it to make a flamethrower) + var/max_fuel = 20 //The max amount of fuel the welder can hold + var/change_icons = 1 + var/can_off_process = 0 + var/light_intensity = 2 //how powerful the emitted light is when used. + var/burned_fuel_for = 0 //when fuel was last removed + heat = 3800 + toolspeed = 1 + +/obj/item/weldingtool/Initialize() + . = ..() + create_reagents(max_fuel) + reagents.add_reagent("welding_fuel", max_fuel) + update_icon() + + +/obj/item/weldingtool/proc/update_torch() + if(welding) + add_overlay("[initial(icon_state)]-on") + item_state = "[initial(item_state)]1" + else + item_state = "[initial(item_state)]" + + +/obj/item/weldingtool/update_icon() + cut_overlays() + if(change_icons) + var/ratio = get_fuel() / max_fuel + ratio = Ceiling(ratio*4) * 25 + add_overlay("[initial(icon_state)][ratio]") + update_torch() + return + + +/obj/item/weldingtool/process() + switch(welding) + if(0) + force = 3 + damtype = "brute" + update_icon() + if(!can_off_process) + STOP_PROCESSING(SSobj, src) + return + //Welders left on now use up fuel, but lets not have them run out quite that fast + if(1) + force = 15 + damtype = "fire" + ++burned_fuel_for + if(burned_fuel_for >= WELDER_FUEL_BURN_INTERVAL) + remove_fuel(1) + update_icon() + + //This is to start fires. process() is only called if the welder is on. + open_flame() + + +/obj/item/weldingtool/suicide_act(mob/user) + user.visible_message("[user] welds [user.p_their()] every orifice closed! It looks like [user.p_theyre()] trying to commit suicide!") + return (FIRELOSS) + + +/obj/item/weldingtool/attackby(obj/item/I, mob/user, params) + if(istype(I, /obj/item/screwdriver)) + flamethrower_screwdriver(I, user) + else if(istype(I, /obj/item/stack/rods)) + flamethrower_rods(I, user) + else + return ..() + + +/obj/item/weldingtool/attack(mob/living/carbon/human/H, mob/user) + if(!istype(H)) + return ..() + + var/obj/item/bodypart/affecting = H.get_bodypart(check_zone(user.zone_selected)) + + if(affecting && affecting.status == BODYPART_ROBOTIC && user.a_intent != INTENT_HARM) + if(src.remove_fuel(1)) + playsound(loc, usesound, 50, 1) + if(user == H) + user.visible_message("[user] starts to fix some of the dents on [H]'s [affecting.name].", "You start fixing some of the dents on [H]'s [affecting.name].") + if(!do_mob(user, H, 50)) + return + item_heal_robotic(H, user, 15, 0) + else + return ..() + + +/obj/item/weldingtool/afterattack(atom/O, mob/user, proximity) + if(!proximity) return + + if(welding) + remove_fuel(1) + var/turf/location = get_turf(user) + location.hotspot_expose(700, 50, 1) + if(get_fuel() <= 0) + set_light(0) + + if(isliving(O)) + var/mob/living/L = O + if(L.IgniteMob()) + message_admins("[key_name_admin(user)] set [key_name_admin(L)] on fire") + log_game("[key_name(user)] set [key_name(L)] on fire") + + +/obj/item/weldingtool/attack_self(mob/user) + switched_on(user) + if(welding) + set_light(light_intensity) + + update_icon() + + +//Returns the amount of fuel in the welder +/obj/item/weldingtool/proc/get_fuel() + return reagents.get_reagent_amount("welding_fuel") + + +//Removes fuel from the welding tool. If a mob is passed, it will try to flash the mob's eyes. This should probably be renamed to use() +/obj/item/weldingtool/proc/remove_fuel(amount = 1, mob/living/M = null) + if(!welding || !check_fuel()) + return 0 + if(amount) + burned_fuel_for = 0 + if(get_fuel() >= amount) + reagents.remove_reagent("welding_fuel", amount) + check_fuel() + if(M) + M.flash_act(light_intensity) + return TRUE + else + if(M) + to_chat(M, "You need more welding fuel to complete this task!") + return FALSE + + +//Turns off the welder if there is no more fuel (does this really need to be its own proc?) +/obj/item/weldingtool/proc/check_fuel(mob/user) + if(get_fuel() <= 0 && welding) + switched_on(user) + update_icon() + //mob icon update + if(ismob(loc)) + var/mob/M = loc + M.update_inv_hands(0) + + return 0 + return 1 + +//Switches the welder on +/obj/item/weldingtool/proc/switched_on(mob/user) + if(!status) + to_chat(user, "[src] can't be turned on while unsecured!") + return + welding = !welding + if(welding) + if(get_fuel() >= 1) + to_chat(user, "You switch [src] on.") + playsound(loc, acti_sound, 50, 1) + force = 15 + damtype = "fire" + hitsound = 'sound/items/welder.ogg' + update_icon() + START_PROCESSING(SSobj, src) + else + to_chat(user, "You need more fuel!") + switched_off(user) + else + to_chat(user, "You switch [src] off.") + playsound(loc, deac_sound, 50, 1) + switched_off(user) + +//Switches the welder off +/obj/item/weldingtool/proc/switched_off(mob/user) + welding = 0 + set_light(0) + + force = 3 + damtype = "brute" + hitsound = "swing_hit" + update_icon() + + +/obj/item/weldingtool/examine(mob/user) + ..() + to_chat(user, "It contains [get_fuel()] unit\s of fuel out of [max_fuel].") + +/obj/item/weldingtool/is_hot() + return welding * heat + +//Returns whether or not the welding tool is currently on. +/obj/item/weldingtool/proc/isOn() + return welding + + +/obj/item/weldingtool/proc/flamethrower_screwdriver(obj/item/I, mob/user) + if(welding) + to_chat(user, "Turn it off first!") + return + status = !status + if(status) + to_chat(user, "You resecure [src].") + else + to_chat(user, "[src] can now be attached and modified.") + add_fingerprint(user) + +/obj/item/weldingtool/proc/flamethrower_rods(obj/item/I, mob/user) + if(!status) + var/obj/item/stack/rods/R = I + if (R.use(1)) + var/obj/item/flamethrower/F = new /obj/item/flamethrower(user.loc) + if(!remove_item_from_storage(F)) + user.transferItemToLoc(src, F, TRUE) + F.weldtool = src + add_fingerprint(user) + to_chat(user, "You add a rod to a welder, starting to build a flamethrower.") + user.put_in_hands(F) + else + to_chat(user, "You need one rod to start building a flamethrower!") + +/obj/item/weldingtool/ignition_effect(atom/A, mob/user) + if(welding && remove_fuel(1, user)) + . = "[user] casually lights [A] with [src], what a badass." + else + . = "" + +/obj/item/weldingtool/largetank + name = "industrial welding tool" + desc = "A slightly larger welder with a larger tank." + icon_state = "indwelder" + max_fuel = 40 + materials = list(MAT_GLASS=60) + origin_tech = "engineering=2;plasmatech=2" + +/obj/item/weldingtool/largetank/cyborg + name = "integrated welding tool" + desc = "An advanced welder designed to be used in robotic systems." + toolspeed = 0.5 + +/obj/item/weldingtool/largetank/flamethrower_screwdriver() + return + + +/obj/item/weldingtool/mini + name = "emergency welding tool" + desc = "A miniature welder used during emergencies." + icon_state = "miniwelder" + max_fuel = 10 + w_class = WEIGHT_CLASS_TINY + materials = list(MAT_METAL=30, MAT_GLASS=10) + change_icons = 0 + +/obj/item/weldingtool/mini/flamethrower_screwdriver() + return + +/obj/item/weldingtool/abductor + name = "alien welding tool" + desc = "An alien welding tool. Whatever fuel it uses, it never runs out." + icon = 'icons/obj/abductor.dmi' + icon_state = "welder" + toolspeed = 0.1 + light_intensity = 0 + change_icons = 0 + origin_tech = "plasmatech=5;engineering=5;abductor=3" + +/obj/item/weldingtool/abductor/process() + if(get_fuel() <= max_fuel) + reagents.add_reagent("welding_fuel", 1) + ..() + +/obj/item/weldingtool/hugetank + name = "upgraded industrial welding tool" + desc = "An upgraded welder based of the industrial welder." + icon_state = "upindwelder" + item_state = "upindwelder" + max_fuel = 80 + materials = list(MAT_METAL=70, MAT_GLASS=120) + origin_tech = "engineering=3;plasmatech=2" + +/obj/item/weldingtool/experimental + name = "experimental welding tool" + desc = "An experimental welder capable of self-fuel generation and less harmful to the eyes." + icon_state = "exwelder" + item_state = "exwelder" + max_fuel = 40 + materials = list(MAT_METAL=70, MAT_GLASS=120) + origin_tech = "materials=4;engineering=4;bluespace=3;plasmatech=4" + var/last_gen = 0 + change_icons = 0 + can_off_process = 1 + light_intensity = 1 + toolspeed = 0.5 + var/nextrefueltick = 0 + +/obj/item/weldingtool/experimental/brass + name = "brass welding tool" + desc = "A brass welder that seems to constantly refuel itself. It is faintly warm to the touch." + resistance_flags = FIRE_PROOF | ACID_PROOF + icon_state = "brasswelder" + item_state = "brasswelder" + + +/obj/item/weldingtool/experimental/process() + ..() + if(get_fuel() < max_fuel && nextrefueltick < world.time) + nextrefueltick = world.time + 10 + reagents.add_reagent("welding_fuel", 1) + + +/* + * Crowbar + */ + +/obj/item/crowbar + name = "pocket crowbar" + desc = "A small crowbar. This handy tool is useful for lots of things, such as prying floor tiles or opening unpowered doors." + icon = 'icons/obj/tools.dmi' + icon_state = "crowbar" + lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' + usesound = 'sound/items/crowbar.ogg' + flags_1 = CONDUCT_1 + slot_flags = SLOT_BELT + force = 5 + throwforce = 7 + w_class = WEIGHT_CLASS_SMALL + materials = list(MAT_METAL=50) + origin_tech = "engineering=1;combat=1" + attack_verb = list("attacked", "bashed", "battered", "bludgeoned", "whacked") + toolspeed = 1 + armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 30) + +/obj/item/crowbar/suicide_act(mob/user) + user.visible_message("[user] is beating [user.p_them()]self to death with [src]! It looks like [user.p_theyre()] trying to commit suicide!") + playsound(loc, 'sound/weapons/genhit.ogg', 50, 1, -1) + return (BRUTELOSS) + +/obj/item/crowbar/red + icon_state = "crowbar_red" + force = 8 + +/obj/item/crowbar/brass + name = "brass crowbar" + desc = "A brass crowbar. It feels faintly warm to the touch." + resistance_flags = FIRE_PROOF | ACID_PROOF + icon_state = "crowbar_brass" + toolspeed = 0.5 + +/obj/item/crowbar/abductor + name = "alien crowbar" + desc = "A hard-light crowbar. It appears to pry by itself, without any effort required." + icon = 'icons/obj/abductor.dmi' + usesound = 'sound/weapons/sonic_jackhammer.ogg' + icon_state = "crowbar" + toolspeed = 0.1 + origin_tech = "combat=4;engineering=4;abductor=3" + +/obj/item/crowbar/large + name = "crowbar" + desc = "It's a big crowbar. It doesn't fit in your pockets, because it's big." + force = 12 + w_class = WEIGHT_CLASS_NORMAL + throw_speed = 3 + throw_range = 3 + materials = list(MAT_METAL=70) + icon_state = "crowbar_large" + item_state = "crowbar" + toolspeed = 0.5 + +/obj/item/crowbar/cyborg + name = "hydraulic crowbar" + desc = "A hydraulic prying tool, compact but powerful. Designed to replace crowbar in construction cyborgs." + usesound = 'sound/items/jaws_pry.ogg' + force = 10 + toolspeed = 0.5 + +/obj/item/crowbar/power + name = "jaws of life" + desc = "A set of jaws of life, compressed through the magic of science. It's fitted with a prying head." + icon_state = "jaws_pry" + item_state = "jawsoflife" + lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' + materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_TITANIUM=25) + origin_tech = "materials=2;engineering=2" + usesound = 'sound/items/jaws_pry.ogg' + force = 15 + toolspeed = 0.25 + +/obj/item/crowbar/power/suicide_act(mob/user) + user.visible_message("[user] is putting [user.p_their()] head in [src], it looks like [user.p_theyre()] trying to commit suicide!") + playsound(loc, 'sound/items/jaws_pry.ogg', 50, 1, -1) + return (BRUTELOSS) + +/obj/item/crowbar/power/attack_self(mob/user) + playsound(get_turf(user), 'sound/items/change_jaws.ogg', 50, 1) + var/obj/item/wirecutters/power/cutjaws = new /obj/item/wirecutters/power + to_chat(user, "You attach the cutting jaws to [src].") + qdel(src) + user.put_in_active_hand(cutjaws) + +#undef WELDER_FUEL_BURN_INTERVAL From b89fa8ab15d5946c625697cf42a4b28863b9c3c5 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sun, 10 Sep 2017 15:54:31 -0500 Subject: [PATCH 037/163] Update topic.dm --- code/modules/admin/topic.dm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index fc52c79de1..88e3fb8e16 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -1,5 +1,3 @@ -<<<<<<< HEAD -======= /datum/admins/proc/CheckAdminHref(href, href_list) var/auth = href_list["admin_token"] . = auth && (auth == href_token || auth == GLOB.href_token) @@ -12,8 +10,7 @@ log_world("UAH: [href]") return TRUE log_admin_private("[key_name(usr)] clicked an href with [msg] authorization key! [href]") - ->>>>>>> 1204251... Fixes admin topics (#30554) + /datum/admins/Topic(href, href_list) ..() From 5e3e52503696791e9100f681e9b9835d3294c10f Mon Sep 17 00:00:00 2001 From: AnturK Date: Sun, 10 Sep 2017 23:07:03 +0200 Subject: [PATCH 038/163] Fixes lockers alt-click --- code/game/objects/structures/crates_lockers/closets.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index 78e672e49d..03168d42ea 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -388,7 +388,11 @@ /obj/structure/closet/AltClick(mob/user) ..() +<<<<<<< HEAD if(!user.canUseTopic(src, be_close=TRUE)) +======= + if(!user.canUseTopic(src, be_close=TRUE) || !isturf(loc)) +>>>>>>> 847e426... Fixes lockers alt-click (#30544) to_chat(user, "You can't do that right now!") return if(opened || !secure) From f63a75b137c1bdc22147d7646f4624135ac5b0e5 Mon Sep 17 00:00:00 2001 From: ExcessiveUseOfCobblestone <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com> Date: Sun, 10 Sep 2017 18:08:20 -0400 Subject: [PATCH 039/163] Egyptian Clothing, Egyptian Null Rod, Craftable Mummy Costume! --- code/__DEFINES/construction.dm | 1 + code/game/objects/items/holy_weapons.dm | 11 +++++++++++ code/modules/clothing/head/misc.dm | 6 ++++++ code/modules/clothing/suits/miscellaneous.dm | 8 ++++++++ code/modules/clothing/under/miscellaneous.dm | 2 +- code/modules/crafting/craft.dm | 3 ++- code/modules/crafting/recipes.dm | 14 ++++++++++++++ icons/mob/inhands/weapons/staves_lefthand.dmi | Bin 2976 -> 3256 bytes .../mob/inhands/weapons/staves_righthand.dmi | Bin 2843 -> 3102 bytes icons/obj/guns/magic.dmi | Bin 10086 -> 10452 bytes 10 files changed, 43 insertions(+), 2 deletions(-) diff --git a/code/__DEFINES/construction.dm b/code/__DEFINES/construction.dm index 46589408a2..ae3f9f6fe9 100644 --- a/code/__DEFINES/construction.dm +++ b/code/__DEFINES/construction.dm @@ -101,6 +101,7 @@ #define CAT_ROBOT "Robots" #define CAT_MISC "Misc" #define CAT_PRIMAL "Tribal" +#define CAT_CLOTHING "Clothing" #define CAT_FOOD "Foods" #define CAT_BREAD "Breads" #define CAT_BURGER "Burgers" diff --git a/code/game/objects/items/holy_weapons.dm b/code/game/objects/items/holy_weapons.dm index e82a40d10a..ac5519c698 100644 --- a/code/game/objects/items/holy_weapons.dm +++ b/code/game/objects/items/holy_weapons.dm @@ -405,3 +405,14 @@ attack_verb = list("poked", "impaled", "pierced", "jabbed") hitsound = 'sound/weapons/bladeslice.ogg' sharpness = IS_SHARP + +/obj/item/nullrod/egyptian + name = "egyptian staff" + desc = "A tutorial in mummification is carved into the staff. You could probably follow the steps yourself if you had some bandages." + icon = 'icons/obj/guns/magic.dmi' + icon_state = "pharoah_sceptre" + item_state = "pharoah_sceptre" + lefthand_file = 'icons/mob/inhands/weapons/staves_lefthand.dmi' + righthand_file = 'icons/mob/inhands/weapons/staves_righthand.dmi' + w_class = WEIGHT_CLASS_NORMAL + attack_verb = list("bashes", "smacks", "whacks") diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index 3a088ab1f2..db3bcd3538 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -302,3 +302,9 @@ desc = "A hat with bells, to add some merriness to the suit." icon_state = "jester_hat2" dynamic_hair_suffix = "" + +/obj/item/clothing/head/nemes + name = "headress of Nemes" + desc = "Lavish space tomb not included." + icon_state = "nemes_headdress" + icon_state = "nemes_headdress" \ No newline at end of file diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index fe6fe67b83..3540a7648c 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -423,6 +423,14 @@ flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT allowed = list(/obj/item/clothing/mask/facehugger/toy) +/obj/item/clothing/suit/nemes + name = "pharoah tunic" + desc = "Lavish space tomb not included." + icon_state = "pharoah" + icon_state = "pharoah" + body_parts_covered = CHEST|GROIN + + // WINTER COATS diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index ba5cd8b8d1..ea5300c692 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -702,4 +702,4 @@ body_parts_covered = CHEST|GROIN|ARMS|LEGS fitted = NO_FEMALE_UNIFORM can_adjust = FALSE - resistance_flags = NONE + resistance_flags = NONE \ No newline at end of file diff --git a/code/modules/crafting/craft.dm b/code/modules/crafting/craft.dm index 9024f0845a..7efbe95ccd 100644 --- a/code/modules/crafting/craft.dm +++ b/code/modules/crafting/craft.dm @@ -7,7 +7,8 @@ CAT_ROBOT, CAT_MISC, CAT_PRIMAL, - CAT_FOOD) + CAT_FOOD, + CAT_CLOTHING) var/list/subcategories = list( list( //Weapon subcategories CAT_WEAPON, diff --git a/code/modules/crafting/recipes.dm b/code/modules/crafting/recipes.dm index 1f12e671ec..d807d77b4b 100644 --- a/code/modules/crafting/recipes.dm +++ b/code/modules/crafting/recipes.dm @@ -569,3 +569,17 @@ tools = list(/obj/item/weldingtool, /obj/item/screwdriver, /obj/item/wrench) reqs = list(/obj/item/stack/sheet/metal = 15) category = CAT_MISC + +/datum/crafting_recipe/mummy/ + name = "Mummification Bandages (Mask)" + result = /obj/item/clothing/mask/mummy + time = 10 + tools = list(/obj/item/nullrod/egyptian) + reqs = list(/obj/item/stack/sheet/cloth = 2) + category = CAT_CLOTHING + + +/datum/crafting_recipe/mummy/body + name = "Mummification Bandages (Body)" + result = /obj/item/clothing/under/mummy + reqs = list(/obj/item/stack/sheet/cloth = 5) diff --git a/icons/mob/inhands/weapons/staves_lefthand.dmi b/icons/mob/inhands/weapons/staves_lefthand.dmi index 382e8e484821d6ae3fcff77354926b7773385321..1384624a58ab1bcd02c48e84e49c97129e1f22b7 100644 GIT binary patch delta 2857 zcmV+^3)b|Y7q}UaBmt+fC5-`p>9ZC7)+xGy36~iWwkZ{S3JEfFDZ*Bkpc$}4zF%H5o3`OVU6j50L zwZH%a3!*{{a0QeSw~nB31E*vmVAu(#yYS}mrj z6c1|xw#9rV1%jaOMMo+>Zu>ud0wAl(+(n{r+5i9v*GWV{RCt{2 zT8n=ZMG(HGNo{N)HAPdJmWqgP1wjybtN6g;`~4PtAoy$nTP&rqXv5yA@Bmq@RWj6!LepC2gMs`45HHcaoDBNH4 zo5lN8`P>y@0ZG7r)lzw+RQ3fZmqyV3hXo{mipZowakyi&JY2+UFrxAlQA>vQr2>*!5VbTK>i{wb+F0I#J)q>v#TE2vRd0=!miXvBOGr)^bv)IvlV%vVoBn}Nh_W%Gqv28z%0U84BYFFopZTqIscOc(E z+O~ZLgTY{bFc=I5gTY{6QOS{uk~=rp7NA1ffl9Z_zO?U@DixwWxJ1#Na0vGpsr@l5 zccoM+(S;z&2H~!Zjg1l7kFbHbMa+hXLg3O2l_V-Xw->Vq2<<-*#vICBAc)p@80B)rJ$4OfR@{~eeX7s9(Wvoig_5219t6)Pn+A%%x&8~#d0K_ zU@O>XFq~u>Qm)doycP7?etfi`Tc7~RY}=3BMQT5T0v7B??jp92R=|pV=`OH+csEfB zSh61u7GV7mal#CQw(K()3H+Ff=f>h=_M3`NYDk$4?VO?_qJRc_Y@%0pgKMtxz^_wq?ce++I0Sf+tz7YtBEdG z#ZMXqs#T$V#oO9|`e140GB{=*kgk^D-5{qq5}KmZ^uJWoJN zt$X@>0NM8rTNi!47GN+K3FEj4q;DKIJ647lsl6LnvIfcnHV+J9xv=xS+lYHEs5fCw9!d%7MvU9V5$ zY^$qATT3Eldk6*CBgY)g9SJ&C0Cm;qYiZI2&J>sn$sJ32v;xx#PeHXrrGSbD!)+*l zTtG4nfQLo_H4B_O5hOpAT`r_qd+wkn>0Yd?_t6eCOcz=sEv`@fp!%$`bnE*~G0Q3RieHcy#gTY`h z?sd#Oy!VlPkM5@>ee5w>z8vv?_{49Pn|w<_T^Vzr6oS`{LD;#@{*xls^?yN{f#%zzeUP?^3W3x zXP0+&R@KY_ow4e|+wZ*l9x3yw!%yzbEbr|5@6RTix#EKlKl=C+LcVi zedf{N5-V?gdN$afpGEJ_tE)y=OBXMF{{zxcIzD*&jhA1PCx4{8M*H*Xs?pZck3U`h z8D~h1D?eWR`tuLpdGnQjWAfaOl-F#3URgETTDo%e7m_a@ul{uDn=d|k_x!7onI9*w z@&3HRQ*AB%`Ww;L&zHad_REjoi_LmM-e2GpR`%zA|AXv=#^hIt5#N;;{Jg#W`TWi& zc=AFCEbhbJ>f8Of(gnrn6pYOl(3BBH*w|G9G zPxj~Solh_Y)&BfeJ)b}aKA*r~Fc=I5gTY`h7`?)uIWp04=Z3j?=Nb{!HD`V1+&vy@$do42HYi)H=&e~PMIxV!|%7C42 zyu(p119#j1%nC&PhbbVUG)Gedf@LlmZ!~wu|BMR6{f8;wj@}dsxE#rBM{%z#h3yOq zB>jgf;H35vu1mU~U$kg<|DrWPk{RX=gb3O1=??~@Mt04cIRo{x)}@xgTY`h z8228UYfWW;d%HmR-0FBOTH8*6R$6eqAlfrb1gCr;%9+q-ek%mt7yr8<9-W22_!YkqM}7?v}BiCtqtV! z?mQYphN%>RW#IRWP{cZm9l(Wt32$3?84=jjDX@t8N_!*TePrL&!OnFa+|)?0w6wSg z7a`#QuI~x`IxIP+fG5Gf-TuBL08~KX0H*Kh#h#+0ADYFL)E(Gla8>c%Ty>m(yXC*IgXj{>ZAFNKEqzk(YNdWwdN zwi>=Fj_Yg8*%aS>xT8VW;h^D-2iZH>Biy}vH|wLi0Z~?01?7r`Y9W_gAmo9~O_QgU zgBaBumg{PO1}T#mRmVGTNd1fTJIasyzvB!X27|$1Y%%-~8<6#Mn7^Ub00000NkvXX Hu0mjfE*@|a delta 2575 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 diff --git a/icons/mob/inhands/weapons/staves_righthand.dmi b/icons/mob/inhands/weapons/staves_righthand.dmi index 591b5d0a2cea8ba1f6c51fad9d55115ab8cbef59..94ee9bd6f1e224cdbb30d5d6cb280a74abd0f50b 100644 GIT binary patch delta 2726 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 diff --git a/icons/obj/guns/magic.dmi b/icons/obj/guns/magic.dmi index 45e7b49f4e15dc1cf2daf89cab721f8d27a7a152..b8e77530bef130ca79cd0c8789fa04d10ea52c74 100644 GIT binary patch literal 10452 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 WSeWQU7k;-QpsQ)1@m0+}^nU=1*~IJs literal 10086 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 Q`8hyW%Sf|I!{OEc00qC+=Kufz From 3aec72d4f45c928f2d683358fc36b18c46ed717c Mon Sep 17 00:00:00 2001 From: Militaires Date: Mon, 11 Sep 2017 01:10:33 +0300 Subject: [PATCH 040/163] Adds Gondoland and the rare Gondolas (#30530) A strange race of bear-like beings consisting of a head placed DIRECTLY on a pair of legs, their fur sells for extremely high prices. The gondoland asteroid is the last natural habitat for these rare creatures. --- .../SpaceRuins/gondolaasteroid.dmm | 1382 +++++++++++++++++ code/datums/ruins/space.dm | 9 +- .../objects/items/stacks/sheets/leather.dm | 7 + code/modules/cargo/exports/sheets.dm | 6 + .../living/simple_animal/friendly/gondola.dm | 29 + icons/mob/gondolas.dmi | Bin 0 -> 1020 bytes icons/obj/items_and_weapons.dmi | Bin 145318 -> 146373 bytes tgstation.dme | 1 + 8 files changed, 1433 insertions(+), 1 deletion(-) create mode 100644 _maps/RandomRuins/SpaceRuins/gondolaasteroid.dmm create mode 100644 code/modules/mob/living/simple_animal/friendly/gondola.dm create mode 100644 icons/mob/gondolas.dmi diff --git a/_maps/RandomRuins/SpaceRuins/gondolaasteroid.dmm b/_maps/RandomRuins/SpaceRuins/gondolaasteroid.dmm new file mode 100644 index 0000000000..b7a5910b1e --- /dev/null +++ b/_maps/RandomRuins/SpaceRuins/gondolaasteroid.dmm @@ -0,0 +1,1382 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/template_noop, +/area/template_noop) +"b" = ( +/turf/closed/mineral/random, +/area/ruin/space/has_grav) +"c" = ( +/turf/open/floor/plating/asteroid/airless, +/area/ruin/space/has_grav) +"d" = ( +/obj/structure/marker_beacon{ + light_color = "#FFE8AA"; + light_range = 20 + }, +/turf/open/floor/plating/asteroid/airless, +/area/ruin/space/has_grav) +"e" = ( +/obj/structure/flora/ausbushes/fullgrass, +/turf/open/floor/plating/asteroid/airless, +/area/ruin/space/has_grav) +"f" = ( +/obj/structure/flora/ausbushes/ywflowers, +/turf/open/floor/plating/asteroid/airless, +/area/ruin/space/has_grav) +"g" = ( +/turf/open/floor/plating/asteroid/airless, +/area/ruin/space/has_grav{ + dynamic_lighting = 1 + }) +"h" = ( +/mob/living/simple_animal/pet/gondola, +/turf/open/floor/plating/asteroid/airless, +/area/ruin/space/has_grav) +"i" = ( +/obj/structure/flora/ausbushes/sparsegrass, +/turf/open/floor/plating/asteroid/airless, +/area/ruin/space/has_grav) +"j" = ( +/obj/effect/overlay/coconut, +/turf/open/floor/plating/asteroid/airless, +/area/ruin/space/has_grav) +"k" = ( +/obj/effect/overlay/palmtree_l, +/turf/open/floor/plating/asteroid/airless, +/area/ruin/space/has_grav) +"l" = ( +/obj/structure/flora/ausbushes/stalkybush, +/turf/open/floor/plating/asteroid/airless, +/area/ruin/space/has_grav) +"m" = ( +/obj/structure/flora/ausbushes/grassybush, +/turf/open/floor/plating/asteroid/airless, +/area/ruin/space/has_grav) +"n" = ( +/obj/structure/flora/ausbushes/reedbush, +/turf/open/floor/plating/asteroid/airless, +/area/ruin/space/has_grav) +"o" = ( +/obj/structure/flora/ausbushes/lavendergrass, +/turf/open/floor/plating/asteroid/airless, +/area/ruin/space/has_grav) +"p" = ( +/obj/structure/flora/ausbushes/brflowers, +/turf/open/floor/plating/asteroid/airless, +/area/ruin/space/has_grav) +"q" = ( +/obj/structure/flora/ausbushes/fernybush, +/turf/open/floor/plating/asteroid/airless, +/area/ruin/space/has_grav) +"r" = ( +/obj/effect/overlay/palmtree_r, +/turf/open/floor/plating/asteroid/airless, +/area/ruin/space/has_grav) +"s" = ( +/obj/structure/flora/junglebush/large, +/turf/open/floor/plating/asteroid/airless, +/area/ruin/space/has_grav) +"t" = ( +/obj/structure/flora/ausbushes/sunnybush, +/turf/open/floor/plating/asteroid/airless, +/area/ruin/space/has_grav) +"u" = ( +/obj/machinery/door/airlock/survival_pod/vertical, +/turf/open/floor/plating/asteroid/airless, +/area/ruin/space/has_grav) + +(1,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +b +b +b +b +b +b +a +a +a +"} +(2,1,1) = {" +a +a +a +a +b +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +b +b +b +b +b +b +b +b +b +a +a +"} +(3,1,1) = {" +a +a +b +b +b +b +b +a +a +a +a +a +a +a +a +a +a +a +a +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +c +"} +(4,1,1) = {" +a +b +b +b +b +a +a +a +a +a +a +a +a +a +a +b +b +b +b +b +b +b +b +b +b +b +b +b +b +c +b +b +b +b +b +"} +(5,1,1) = {" +a +b +b +b +a +a +a +a +a +a +a +a +a +a +b +b +b +b +b +b +b +b +b +b +b +c +c +c +c +c +c +c +b +b +b +"} +(6,1,1) = {" +a +a +a +a +a +a +a +a +a +b +b +b +b +b +b +b +b +b +b +b +b +b +b +c +c +c +c +f +c +c +c +h +c +b +b +"} +(7,1,1) = {" +a +a +a +a +a +a +a +a +b +b +b +b +b +b +b +b +b +b +b +b +b +c +c +c +c +o +c +r +c +b +b +b +b +b +c +"} +(8,1,1) = {" +a +a +a +a +a +a +b +b +b +b +b +b +b +b +b +b +c +b +c +c +c +c +c +c +c +c +j +c +c +c +c +b +b +b +c +"} +(9,1,1) = {" +a +a +a +a +a +b +b +b +b +b +b +b +b +c +k +c +c +q +c +c +j +c +c +k +c +c +c +c +m +c +c +b +b +b +c +"} +(10,1,1) = {" +a +a +a +b +b +b +b +b +b +b +b +b +b +b +b +c +c +c +c +c +s +c +c +c +c +c +c +i +c +c +c +b +b +b +c +"} +(11,1,1) = {" +a +a +b +b +b +b +b +b +b +b +b +b +b +b +c +i +n +f +c +c +d +c +c +j +c +h +c +l +c +d +c +b +b +b +c +"} +(12,1,1) = {" +a +a +b +b +b +b +b +b +b +b +b +b +c +c +c +c +o +o +c +h +c +c +c +c +c +c +c +i +o +c +c +b +b +b +c +"} +(13,1,1) = {" +a +b +b +b +b +b +b +b +b +b +b +b +c +c +c +c +i +c +q +c +c +c +c +c +c +s +c +c +c +c +b +b +b +b +c +"} +(14,1,1) = {" +a +b +b +b +b +b +b +b +b +b +b +h +c +c +c +c +l +c +c +c +m +i +c +c +c +c +c +c +c +b +b +b +b +b +c +"} +(15,1,1) = {" +a +b +b +b +b +b +b +b +b +b +b +b +b +b +b +c +c +c +c +c +i +o +c +c +c +c +c +c +c +c +b +b +b +b +c +"} +(16,1,1) = {" +a +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +c +c +c +o +p +c +c +c +c +r +c +c +c +c +b +b +b +c +"} +(17,1,1) = {" +a +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +c +e +n +c +c +c +c +c +c +c +c +c +c +c +b +b +c +"} +(18,1,1) = {" +a +b +b +b +b +b +b +b +b +b +c +e +c +b +b +b +b +b +c +c +c +c +c +c +i +t +c +c +c +i +c +c +b +b +b +"} +(19,1,1) = {" +a +b +b +b +b +b +b +b +b +g +c +c +c +c +c +b +b +b +b +c +r +j +c +c +c +f +c +c +c +c +c +c +u +c +u +"} +(20,1,1) = {" +a +c +b +b +b +b +b +b +b +h +c +c +d +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +b +b +b +b +"} +(21,1,1) = {" +a +c +c +b +b +b +b +b +b +c +c +c +k +c +i +i +c +c +q +c +c +c +c +c +d +c +h +c +c +c +c +c +b +b +b +"} +(22,1,1) = {" +a +c +c +b +b +b +b +b +b +c +c +c +c +c +c +l +c +c +c +c +c +c +c +c +c +c +c +c +c +r +c +c +b +b +b +"} +(23,1,1) = {" +a +c +c +b +b +b +b +b +b +c +c +j +c +c +c +c +c +c +c +c +c +h +s +c +c +c +s +c +c +c +c +c +b +b +b +"} +(24,1,1) = {" +a +a +c +c +b +b +b +b +e +c +c +c +c +c +h +c +c +c +c +c +c +c +c +c +m +c +c +c +c +c +c +c +b +b +b +"} +(25,1,1) = {" +a +a +c +c +b +b +b +c +c +c +c +c +c +c +c +c +i +l +c +c +c +c +c +c +n +m +c +c +c +c +c +b +b +b +a +"} +(26,1,1) = {" +a +a +c +c +b +b +b +c +c +c +c +c +c +c +c +m +p +i +c +f +c +c +c +c +c +c +k +c +c +j +c +b +b +b +a +"} +(27,1,1) = {" +a +a +c +c +b +b +b +b +c +c +c +c +c +c +c +c +c +c +c +d +m +i +c +c +c +c +c +c +c +c +b +b +b +a +a +"} +(28,1,1) = {" +a +a +a +c +c +b +b +b +c +c +c +c +c +e +c +c +c +c +c +c +i +l +p +c +c +c +c +c +c +b +b +b +b +a +a +"} +(29,1,1) = {" +a +a +a +c +c +b +b +c +c +c +e +c +c +c +c +c +c +c +c +c +c +c +c +c +c +i +c +c +c +b +b +b +c +c +a +"} +(30,1,1) = {" +a +a +a +c +b +b +c +d +f +c +i +c +c +c +b +c +c +c +c +c +j +c +c +c +c +c +c +c +b +b +b +c +c +c +a +"} +(31,1,1) = {" +a +a +a +b +b +b +b +c +c +c +c +c +c +b +b +b +c +c +c +r +c +c +c +c +c +c +b +b +b +b +c +c +c +b +b +"} +(32,1,1) = {" +a +a +a +b +b +b +c +c +c +c +c +c +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +c +c +b +b +b +"} +(33,1,1) = {" +a +a +a +b +b +c +c +c +c +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +a +a +b +b +b +a +"} +(34,1,1) = {" +a +a +a +b +b +b +b +b +b +b +b +b +b +b +c +c +c +c +c +b +b +b +b +b +a +a +a +a +a +a +a +b +b +b +a +"} +(35,1,1) = {" +a +a +a +a +b +b +b +b +b +b +b +b +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} diff --git a/code/datums/ruins/space.dm b/code/datums/ruins/space.dm index 88beec629f..b3af867bb4 100644 --- a/code/datums/ruins/space.dm +++ b/code/datums/ruins/space.dm @@ -18,6 +18,7 @@ name = "Asteroid 1" description = "I-spy with my little eye, something beginning with R." + /datum/map_template/ruin/space/asteroid2 id = "asteroid2" suffix = "asteroid2.dmm" @@ -247,4 +248,10 @@ id = "miracle" suffix = "miracle.dmm" name = "Ordinary Space Tile" - description = "Absolutely nothing strange going on here please move along, plenty more space to see right this way!" \ No newline at end of file + description = "Absolutely nothing strange going on here please move along, plenty more space to see right this way!" + +/datum/map_template/ruin/space/gondoland + id = "gondolaasteroid" + suffix = "gondolaasteroid.dmm" + name = "Gondoland" + description = "Just an ordinary rock- wait, what's that thing?" diff --git a/code/game/objects/items/stacks/sheets/leather.dm b/code/game/objects/items/stacks/sheets/leather.dm index 77e46235c8..4ad576fe34 100644 --- a/code/game/objects/items/stacks/sheets/leather.dm +++ b/code/game/objects/items/stacks/sheets/leather.dm @@ -32,6 +32,13 @@ GLOBAL_LIST_INIT(human_recipes, list( \ singular_name = "corgi hide piece" icon_state = "sheet-corgi" +/obj/item/stack/sheet/animalhide/gondola + name = "gondola hide" + desc = "The extremely valuable by-product of gondola hunting." + singular_name = "gondola hide piece" + icon_state = "sheet-gondola" + + GLOBAL_LIST_INIT(corgi_recipes, list ( \ new/datum/stack_recipe("corgi costume", /obj/item/clothing/suit/hooded/ian_costume, 3), \ )) diff --git a/code/modules/cargo/exports/sheets.dm b/code/modules/cargo/exports/sheets.dm index a73529850d..a51d2e9c6e 100644 --- a/code/modules/cargo/exports/sheets.dm +++ b/code/modules/cargo/exports/sheets.dm @@ -57,6 +57,12 @@ unit_name = "lizard hide" export_types = list(/obj/item/stack/sheet/animalhide/lizard) +// Gondola hide. Mindbogglingly expensive. +/datum/export/stack/skin/gondola + cost = 10000 + unit_name = "gondola hide" + export_types = list(/obj/item/stack/sheet/animalhide/gondola) + // Alien hide. Extremely expensive. /datum/export/stack/skin/xeno cost = 3000 diff --git a/code/modules/mob/living/simple_animal/friendly/gondola.dm b/code/modules/mob/living/simple_animal/friendly/gondola.dm new file mode 100644 index 0000000000..e5dfd71e09 --- /dev/null +++ b/code/modules/mob/living/simple_animal/friendly/gondola.dm @@ -0,0 +1,29 @@ +//Gondolas + +/mob/living/simple_animal/pet/gondola + name = "gondola" + real_name = "gondola" + desc = "Gondola is the silent walker. Having no hands he embodies the Taoist principle of wu-wei (non-action) while his smiling facial expression shows his utter and complete acceptance of the world as it is. Its hide is extremely valuable." + response_help = "pets" + response_disarm = "bops" + response_harm = "kicks" + emote_see = list("watches.", "stares off into the distance.","contemplates.") + faction = list("gondola") + turns_per_move = 10 + icon = 'icons/mob/gondolas.dmi' + icon_state = "gondola" + icon_living = "gondola" + icon_dead = "gondola_dead" + butcher_results = list(/obj/item/stack/sheet/animalhide/gondola = 1) + //Gondolas aren't affected by cold. + atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0) + minbodytemp = 0 + maxbodytemp = 1500 + maxHealth = 200 + health = 200 + +/mob/living/simple_animal/pet/gondola/IsVocal() //Gondolas are the silent walker. + return FALSE + +/mob/living/simple_animal/pet/gondola/emote() + return \ No newline at end of file diff --git a/icons/mob/gondolas.dmi b/icons/mob/gondolas.dmi new file mode 100644 index 0000000000000000000000000000000000000000..15c83bad932810778ab807d118408864be8f8035 GIT binary patch literal 1020 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
    " + dat += "[open ? "Close" : "Open"] [src] | - [dial * 5] +" + if(open) + dat += "" + for(var/i = contents.len, i>=1, i--) + var/obj/item/P = contents[i] + dat += "" + dat += "
    [P.name]
    " + user << browse("[name][dat]", "window=safe;size=350x300") + + +/obj/structure/safe/Topic(href, href_list) + if(!ishuman(usr)) + return + var/mob/living/carbon/human/user = usr + + var/canhear = 0 + if(user.is_holding_item_of_type(/obj/item/clothing/neck/stethoscope)) + canhear = 1 + + if(href_list["open"]) + if(check_unlocked()) + to_chat(user, "You [open ? "close" : "open"] [src].") + open = !open + update_icon() + updateUsrDialog() + return + else + to_chat(user, "You can't [open ? "close" : "open"] [src], the lock is engaged!") + return + + if(href_list["decrement"]) + dial = decrement(dial) + if(dial == tumbler_1_pos + 1 || dial == tumbler_1_pos - 71) + tumbler_1_pos = decrement(tumbler_1_pos) + if(canhear) + to_chat(user, "You hear a [pick("clack", "scrape", "clank")] from [src].") + if(tumbler_1_pos == tumbler_2_pos + 37 || tumbler_1_pos == tumbler_2_pos - 35) + tumbler_2_pos = decrement(tumbler_2_pos) + if(canhear) + to_chat(user, "You hear a [pick("click", "chink", "clink")] from [src].") + check_unlocked(user, canhear) + updateUsrDialog() + return + + if(href_list["increment"]) + dial = increment(dial) + if(dial == tumbler_1_pos - 1 || dial == tumbler_1_pos + 71) + tumbler_1_pos = increment(tumbler_1_pos) + if(canhear) + to_chat(user, "You hear a [pick("clack", "scrape", "clank")] from [src].") + if(tumbler_1_pos == tumbler_2_pos - 37 || tumbler_1_pos == tumbler_2_pos + 35) + tumbler_2_pos = increment(tumbler_2_pos) + if(canhear) + to_chat(user, "You hear a [pick("click", "chink", "clink")] from [src].") + check_unlocked(user, canhear) + updateUsrDialog() + return + + if(href_list["retrieve"]) + user << browse("", "window=safe") // Close the menu + + var/obj/item/P = locate(href_list["retrieve"]) in src + if(open) + if(P && in_range(src, user)) + user.put_in_hands(P) + space -= P.w_class + updateUsrDialog() + + +/obj/structure/safe/attackby(obj/item/I, mob/user, params) + if(open) + . = 1 //no afterattack + if(I.w_class + space <= maxspace) + space += I.w_class + if(!user.drop_item()) + to_chat(user, "\The [I] is stuck to your hand, you cannot put it in the safe!") + return + I.forceMove(src) + to_chat(user, "You put [I] in [src].") + updateUsrDialog() + return + else + to_chat(user, "[I] won't fit in [src].") + return + else if(istype(I, /obj/item/clothing/neck/stethoscope)) + to_chat(user, "Hold [I] in one of your hands while you manipulate the dial!") + else + return ..() + + +/obj/structure/safe/handle_atom_del(atom/A) + updateUsrDialog() + +/obj/structure/safe/blob_act(obj/structure/blob/B) + return + +/obj/structure/safe/ex_act(severity, target) + return + + +//FLOOR SAFES +/obj/structure/safe/floor + name = "floor safe" + icon_state = "floorsafe" + density = FALSE + level = 1 //underfloor + layer = LOW_OBJ_LAYER + + +/obj/structure/safe/floor/Initialize(mapload) + . = ..() + if(mapload) + var/turf/T = loc + hide(T.intact) + + +/obj/structure/safe/floor/hide(var/intact) +>>>>>>> f2c5657... Fixes initialize hints for a fair number of mobs and items (#30583) invisibility = intact ? INVISIBILITY_MAXIMUM : 0 \ No newline at end of file diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm index 8ca558cd81..3a143c7910 100644 --- a/code/modules/mob/living/silicon/pai/pai.dm +++ b/code/modules/mob/living/silicon/pai/pai.dm @@ -104,7 +104,7 @@ pda.owner = text("[]", src) pda.name = pda.owner + " (" + pda.ownjob + ")" - ..() + . = ..() var/datum/action/innate/pai/shell/AS = new /datum/action/innate/pai/shell var/datum/action/innate/pai/chassis/AC = new /datum/action/innate/pai/chassis diff --git a/code/modules/mob/living/simple_animal/bot/ed209bot.dm b/code/modules/mob/living/simple_animal/bot/ed209bot.dm index eeeadb59bc..5e26a99ec5 100644 --- a/code/modules/mob/living/simple_animal/bot/ed209bot.dm +++ b/code/modules/mob/living/simple_animal/bot/ed209bot.dm @@ -1,3 +1,4 @@ +<<<<<<< HEAD /mob/living/simple_animal/bot/ed209 name = "\improper ED-209 Security Robot" desc = "A security robot. He looks less than thrilled." @@ -565,3 +566,572 @@ Auto Patrol[]"}, C.handcuffed = new /obj/item/restraints/handcuffs/cable/zipties/used(C) C.update_handcuffed() back_to_idle() +======= +/mob/living/simple_animal/bot/ed209 + name = "\improper ED-209 Security Robot" + desc = "A security robot. He looks less than thrilled." + icon = 'icons/mob/aibots.dmi' + icon_state = "ed2090" + density = TRUE + anchored = FALSE + health = 100 + maxHealth = 100 + damage_coeff = list(BRUTE = 0.5, BURN = 0.7, TOX = 0, CLONE = 0, STAMINA = 0, OXY = 0) + obj_damage = 60 + environment_smash = ENVIRONMENT_SMASH_WALLS //Walls can't stop THE LAW + mob_size = MOB_SIZE_LARGE + + radio_key = /obj/item/device/encryptionkey/headset_sec + radio_channel = "Security" + bot_type = SEC_BOT + model = "ED-209" + bot_core = /obj/machinery/bot_core/secbot + window_id = "autoed209" + window_name = "Automatic Security Unit v2.6" + allow_pai = 0 + data_hud_type = DATA_HUD_SECURITY_ADVANCED + + var/lastfired = 0 + var/shot_delay = 15 + var/lasercolor = "" + var/disabled = 0//A holder for if it needs to be disabled, if true it will not seach for targets, shoot at targets, or move, currently only used for lasertag + + + var/mob/living/carbon/target + var/oldtarget_name + var/threatlevel = 0 + var/target_lastloc //Loc of target when arrested. + var/last_found //There's a delay + var/declare_arrests = 1 //When making an arrest, should it notify everyone wearing sechuds? + var/idcheck = 1 //If true, arrest people with no IDs + var/weaponscheck = 1 //If true, arrest people for weapons if they don't have access + var/check_records = 1 //Does it check security records? + 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' + + +/mob/living/simple_animal/bot/ed209/Initialize(mapload,created_name,created_lasercolor) + . = ..() + if(created_name) + name = created_name + if(created_lasercolor) + lasercolor = created_lasercolor + icon_state = "[lasercolor]ed209[on]" + set_weapon() //giving it the right projectile and firing sound. + spawn(3) + var/datum/job/detective/J = new/datum/job/detective + access_card.access += J.get_access() + prev_access = access_card.access + + if(lasercolor) + shot_delay = 6//Longer shot delay because JESUS CHRIST + check_records = 0//Don't actively target people set to arrest + arrest_type = 1//Don't even try to cuff + bot_core.req_access = list(ACCESS_MAINT_TUNNELS, ACCESS_THEATRE) + arrest_type = 1 + if((lasercolor == "b") && (name == "\improper ED-209 Security Robot"))//Picks a name if there isn't already a custome one + name = pick("BLUE BALLER","SANIC","BLUE KILLDEATH MURDERBOT") + if((lasercolor == "r") && (name == "\improper ED-209 Security Robot")) + name = pick("RED RAMPAGE","RED ROVER","RED KILLDEATH MURDERBOT") + + //SECHUD + var/datum/atom_hud/secsensor = GLOB.huds[DATA_HUD_SECURITY_ADVANCED] + secsensor.add_hud_to(src) + +/mob/living/simple_animal/bot/ed209/turn_on() + . = ..() + icon_state = "[lasercolor]ed209[on]" + mode = BOT_IDLE + +/mob/living/simple_animal/bot/ed209/turn_off() + ..() + icon_state = "[lasercolor]ed209[on]" + +/mob/living/simple_animal/bot/ed209/bot_reset() + ..() + target = null + oldtarget_name = null + anchored = FALSE + walk_to(src,0) + last_found = world.time + set_weapon() + +/mob/living/simple_animal/bot/ed209/set_custom_texts() + text_hack = "You disable [name]'s combat inhibitor." + text_dehack = "You restore [name]'s combat inhibitor." + text_dehack_fail = "[name] ignores your attempts to restrict him!" + +/mob/living/simple_animal/bot/ed209/get_controls(mob/user) + var/dat + dat += hack(user) + dat += showpai(user) + dat += text({" +Security Unit v2.6 controls

    +Status: []
    +Behaviour controls are [locked ? "locked" : "unlocked"]
    +Maintenance panel panel is [open ? "opened" : "closed"]
    "}, + +"[on ? "On" : "Off"]" ) + + if(!locked || issilicon(user)|| IsAdminGhost(user)) + if(!lasercolor) + dat += text({"
    +Arrest Unidentifiable Persons: []
    +Arrest for Unauthorized Weapons: []
    +Arrest for Warrant: []
    +
    +Operating Mode: []
    +Report Arrests[]
    +Auto Patrol[]"}, + +"[idcheck ? "Yes" : "No"]", +"[weaponscheck ? "Yes" : "No"]", +"[check_records ? "Yes" : "No"]", +"[arrest_type ? "Detain" : "Arrest"]", +"[declare_arrests ? "Yes" : "No"]", +"[auto_patrol ? "On" : "Off"]" ) + + return dat + +/mob/living/simple_animal/bot/ed209/Topic(href, href_list) + if(lasercolor && ishuman(usr)) + var/mob/living/carbon/human/H = usr + if((lasercolor == "b") && (istype(H.wear_suit, /obj/item/clothing/suit/redtag)))//Opposing team cannot operate it + return + else if((lasercolor == "r") && (istype(H.wear_suit, /obj/item/clothing/suit/bluetag))) + return + if(..()) + return 1 + + switch(href_list["operation"]) + if("idcheck") + idcheck = !idcheck + update_controls() + if("weaponscheck") + weaponscheck = !weaponscheck + update_controls() + if("ignorerec") + check_records = !check_records + update_controls() + if("switchmode") + arrest_type = !arrest_type + update_controls() + if("declarearrests") + declare_arrests = !declare_arrests + update_controls() + +/mob/living/simple_animal/bot/ed209/proc/judgement_criteria() + var/final = FALSE + if(idcheck) + final = final|JUDGE_IDCHECK + if(check_records) + final = final|JUDGE_RECORDCHECK + if(weaponscheck) + final = final|JUDGE_WEAPONCHECK + if(emagged) + final = final|JUDGE_EMAGGED + //ED209's ignore monkeys + final = final|JUDGE_IGNOREMONKEYS + return final + +/mob/living/simple_animal/bot/ed209/proc/retaliate(mob/living/carbon/human/H) + var/judgement_criteria = judgement_criteria() + threatlevel = H.assess_threat(judgement_criteria, weaponcheck=CALLBACK(src, .proc/check_for_weapons)) + threatlevel += 6 + if(threatlevel >= 4) + target = H + mode = BOT_HUNT + +/mob/living/simple_animal/bot/ed209/attack_hand(mob/living/carbon/human/H) + if(H.a_intent == INTENT_HARM) + retaliate(H) + return ..() + +/mob/living/simple_animal/bot/ed209/attackby(obj/item/W, mob/user, params) + ..() + if(istype(W, /obj/item/weldingtool) && user.a_intent != INTENT_HARM) // Any intent but harm will heal, so we shouldn't get angry. + return + if(!istype(W, /obj/item/screwdriver) && (!target)) // Added check for welding tool to fix #2432. Welding tool behavior is handled in superclass. + if(W.force && W.damtype != STAMINA)//If force is non-zero and damage type isn't stamina. + retaliate(user) + if(lasercolor)//To make up for the fact that lasertag bots don't hunt + shootAt(user) + +/mob/living/simple_animal/bot/ed209/emag_act(mob/user) + ..() + if(emagged == 2) + if(user) + to_chat(user, "You short out [src]'s target assessment circuits.") + oldtarget_name = user.name + audible_message("[src] buzzes oddly!") + declare_arrests = 0 + icon_state = "[lasercolor]ed209[on]" + set_weapon() + +/mob/living/simple_animal/bot/ed209/bullet_act(obj/item/projectile/Proj) + if(istype(Proj , /obj/item/projectile/beam/laser)||istype(Proj, /obj/item/projectile/bullet)) + if((Proj.damage_type == BURN) || (Proj.damage_type == BRUTE)) + if(!Proj.nodamage && Proj.damage < src.health) + retaliate(Proj.firer) + ..() + +/mob/living/simple_animal/bot/ed209/handle_automated_action() + if(!..()) + return + + if(disabled) + return + + var/judgement_criteria = judgement_criteria() + var/list/targets = list() + for(var/mob/living/carbon/C in view(7,src)) //Let's find us a target + var/threatlevel = 0 + if((C.stat) || (C.lying)) + continue + threatlevel = C.assess_threat(judgement_criteria, lasercolor, weaponcheck=CALLBACK(src, .proc/check_for_weapons)) + //speak(C.real_name + text(": threat: []", threatlevel)) + if(threatlevel < 4 ) + continue + + var/dst = get_dist(src, C) + if(dst <= 1 || dst > 7) + continue + + targets += C + if(targets.len>0) + var/mob/living/carbon/t = pick(targets) + if((t.stat!=2) && (t.lying != 1) && (!t.handcuffed)) //we don't shoot people who are dead, cuffed or lying down. + shootAt(t) + switch(mode) + + if(BOT_IDLE) // idle + walk_to(src,0) + if(!lasercolor) //lasertag bots don't want to arrest anyone + look_for_perp() // see if any criminals are in range + if(!mode && auto_patrol) // still idle, and set to patrol + mode = BOT_START_PATROL // switch to patrol mode + + if(BOT_HUNT) // hunting for perp + // if can't reach perp for long enough, go idle + if(frustration >= 8) + walk_to(src,0) + back_to_idle() + + if(target) // make sure target exists + if(Adjacent(target) && isturf(target.loc)) // if right next to perp + stun_attack(target) + + mode = BOT_PREP_ARREST + anchored = TRUE + target_lastloc = target.loc + return + + else // not next to perp + var/turf/olddist = get_dist(src, target) + walk_to(src, target,1,4) + if((get_dist(src, target)) >= (olddist)) + frustration++ + else + frustration = 0 + else + back_to_idle() + + if(BOT_PREP_ARREST) // preparing to arrest target + + // see if he got away. If he's no no longer adjacent or inside a closet or about to get up, we hunt again. + if(!Adjacent(target) || !isturf(target.loc) || target.AmountKnockdown() < 40) + back_to_hunt() + return + + if(iscarbon(target) && target.canBeHandcuffed()) + if(!arrest_type) + if(!target.handcuffed) //he's not cuffed? Try to cuff him! + cuff(target) + else + back_to_idle() + return + else + back_to_idle() + return + + if(BOT_ARREST) + if(!target) + anchored = FALSE + mode = BOT_IDLE + last_found = world.time + frustration = 0 + return + + if(target.handcuffed) //no target or target cuffed? back to idle. + back_to_idle() + return + + if(!Adjacent(target) || !isturf(target.loc) || (target.loc != target_lastloc && target.AmountKnockdown() < 40)) //if he's changed loc and about to get up or not adjacent or got into a closet, we prep arrest again. + back_to_hunt() + return + else + mode = BOT_PREP_ARREST + anchored = FALSE + + if(BOT_START_PATROL) + look_for_perp() + start_patrol() + + if(BOT_PATROL) + look_for_perp() + bot_patrol() + + + return + +/mob/living/simple_animal/bot/ed209/proc/back_to_idle() + anchored = FALSE + mode = BOT_IDLE + target = null + last_found = world.time + frustration = 0 + INVOKE_ASYNC(src, .proc/handle_automated_action) //ensure bot quickly responds + +/mob/living/simple_animal/bot/ed209/proc/back_to_hunt() + anchored = FALSE + frustration = 0 + mode = BOT_HUNT + INVOKE_ASYNC(src, .proc/handle_automated_action) //ensure bot quickly responds + +// look for a criminal in view of the bot + +/mob/living/simple_animal/bot/ed209/proc/look_for_perp() + if(disabled) + return + anchored = FALSE + threatlevel = 0 + var/judgement_criteria = judgement_criteria() + for (var/mob/living/carbon/C in view(7,src)) //Let's find us a criminal + if((C.stat) || (C.handcuffed)) + continue + + if((C.name == oldtarget_name) && (world.time < last_found + 100)) + continue + + threatlevel = C.assess_threat(judgement_criteria, lasercolor, weaponcheck=CALLBACK(src, .proc/check_for_weapons)) + + if(!threatlevel) + continue + + else if(threatlevel >= 4) + target = C + oldtarget_name = C.name + speak("Level [threatlevel] infraction alert!") + playsound(loc, pick('sound/voice/ed209_20sec.ogg', 'sound/voice/edplaceholder.ogg'), 50, 0) + visible_message("[src] points at [C.name]!") + mode = BOT_HUNT + spawn(0) + handle_automated_action() // ensure bot quickly responds to a perp + break + else + continue + +/mob/living/simple_animal/bot/ed209/proc/check_for_weapons(var/obj/item/slot_item) + if(slot_item && slot_item.needs_permit) + return 1 + return 0 + +/mob/living/simple_animal/bot/ed209/explode() + walk_to(src,0) + visible_message("[src] blows apart!") + var/turf/Tsec = get_turf(src) + + var/obj/item/ed209_assembly/Sa = new /obj/item/ed209_assembly(Tsec) + Sa.build_step = 1 + Sa.add_overlay("hs_hole") + Sa.created_name = name + new /obj/item/device/assembly/prox_sensor(Tsec) + + if(!lasercolor) + var/obj/item/gun/energy/e_gun/advtaser/G = new /obj/item/gun/energy/e_gun/advtaser(Tsec) + G.cell.charge = 0 + G.update_icon() + else if(lasercolor == "b") + var/obj/item/gun/energy/laser/bluetag/G = new /obj/item/gun/energy/laser/bluetag(Tsec) + G.cell.charge = 0 + G.update_icon() + else if(lasercolor == "r") + var/obj/item/gun/energy/laser/redtag/G = new /obj/item/gun/energy/laser/redtag(Tsec) + G.cell.charge = 0 + G.update_icon() + + if(prob(50)) + new /obj/item/bodypart/l_leg/robot(Tsec) + if(prob(25)) + new /obj/item/bodypart/r_leg/robot(Tsec) + if(prob(25))//50% chance for a helmet OR vest + if(prob(50)) + new /obj/item/clothing/head/helmet(Tsec) + else + if(!lasercolor) + new /obj/item/clothing/suit/armor/vest(Tsec) + if(lasercolor == "b") + new /obj/item/clothing/suit/bluetag(Tsec) + if(lasercolor == "r") + new /obj/item/clothing/suit/redtag(Tsec) + + do_sparks(3, TRUE, src) + + new /obj/effect/decal/cleanable/oil(loc) + ..() + +/mob/living/simple_animal/bot/ed209/proc/set_weapon() //used to update the projectile type and firing sound + shoot_sound = 'sound/weapons/laser.ogg' + if(emagged == 2) + if(lasercolor) + projectile = /obj/item/projectile/beam/lasertag + else + projectile = /obj/item/projectile/beam + else + if(!lasercolor) + shoot_sound = 'sound/weapons/taser.ogg' + projectile = /obj/item/projectile/energy/electrode + else if(lasercolor == "b") + projectile = /obj/item/projectile/beam/lasertag/bluetag + else if(lasercolor == "r") + projectile = /obj/item/projectile/beam/lasertag/redtag + +/mob/living/simple_animal/bot/ed209/proc/shootAt(mob/target) + if(lastfired && world.time - lastfired < shot_delay) + return + lastfired = world.time + var/turf/T = loc + var/turf/U = get_turf(target) + if(!U) + return + if(!isturf(T)) + return + + if(!projectile) + return + + var/obj/item/projectile/A = new projectile (loc) + playsound(loc, shoot_sound, 50, 1) + A.current = U + A.yo = U.y - T.y + A.xo = U.x - T.x + A.fire() + +/mob/living/simple_animal/bot/ed209/attack_alien(mob/living/carbon/alien/user) + ..() + if(!isalien(target)) + target = user + mode = BOT_HUNT + + +/mob/living/simple_animal/bot/ed209/emp_act(severity) + + if(severity==2 && prob(70)) + ..(severity-1) + else + new /obj/effect/temp_visual/emp(loc) + var/list/mob/living/carbon/targets = new + for(var/mob/living/carbon/C in view(12,src)) + if(C.stat==DEAD) + continue + targets += C + if(targets.len) + if(prob(50)) + var/mob/toshoot = pick(targets) + if(toshoot) + targets-=toshoot + if(prob(50) && emagged < 2) + emagged = 2 + set_weapon() + shootAt(toshoot) + emagged = FALSE + set_weapon() + else + shootAt(toshoot) + else if(prob(50)) + if(targets.len) + var/mob/toarrest = pick(targets) + if(toarrest) + target = toarrest + mode = BOT_HUNT + + +/mob/living/simple_animal/bot/ed209/bullet_act(obj/item/projectile/Proj) + if(!disabled) + var/lasertag_check = 0 + if((lasercolor == "b")) + if(istype(Proj, /obj/item/projectile/beam/lasertag/redtag)) + lasertag_check++ + else if((lasercolor == "r")) + if(istype(Proj, /obj/item/projectile/beam/lasertag/bluetag)) + lasertag_check++ + if(lasertag_check) + icon_state = "[lasercolor]ed2090" + disabled = 1 + target = null + spawn(100) + disabled = 0 + icon_state = "[lasercolor]ed2091" + return 1 + else + ..(Proj) + else + ..(Proj) + +/mob/living/simple_animal/bot/ed209/bluetag + lasercolor = "b" + +/mob/living/simple_animal/bot/ed209/redtag + lasercolor = "r" + +/mob/living/simple_animal/bot/ed209/UnarmedAttack(atom/A) + if(!on) + return + if(iscarbon(A)) + var/mob/living/carbon/C = A + if(!C.IsStun() || arrest_type) + stun_attack(A) + else if(C.canBeHandcuffed() && !C.handcuffed) + cuff(A) + else + ..() + +/mob/living/simple_animal/bot/ed209/RangedAttack(atom/A) + if(!on) + return + shootAt(A) + +/mob/living/simple_animal/bot/ed209/proc/stun_attack(mob/living/carbon/C) + playsound(loc, 'sound/weapons/egloves.ogg', 50, 1, -1) + icon_state = "[lasercolor]ed209-c" + spawn(2) + icon_state = "[lasercolor]ed209[on]" + var/threat = 5 + C.Knockdown(100) + C.stuttering = 5 + if(ishuman(C)) + var/mob/living/carbon/human/H = C + var/judgement_criteria = judgement_criteria() + threat = H.assess_threat(judgement_criteria, weaponcheck=CALLBACK(src, .proc/check_for_weapons)) + add_logs(src,C,"stunned") + if(declare_arrests) + var/area/location = get_area(src) + speak("[arrest_type ? "Detaining" : "Arresting"] level [threat] scumbag [C] in [location].", radio_channel) + C.visible_message("[src] has stunned [C]!",\ + "[src] has stunned you!") + +/mob/living/simple_animal/bot/ed209/proc/cuff(mob/living/carbon/C) + mode = BOT_ARREST + playsound(loc, 'sound/weapons/cablecuff.ogg', 30, 1, -2) + C.visible_message("[src] is trying to put zipties on [C]!",\ + "[src] is trying to put zipties on you!") + + spawn(60) + if( !Adjacent(C) || !isturf(C.loc) ) //if he's in a closet or not adjacent, we cancel cuffing. + return + if(!C.handcuffed) + C.handcuffed = new /obj/item/restraints/handcuffs/cable/zipties/used(C) + C.update_handcuffed() + back_to_idle() +>>>>>>> f2c5657... Fixes initialize hints for a fair number of mobs and items (#30583) diff --git a/code/modules/mob/living/simple_animal/bot/floorbot.dm b/code/modules/mob/living/simple_animal/bot/floorbot.dm index 1b7647d412..9f86737717 100644 --- a/code/modules/mob/living/simple_animal/bot/floorbot.dm +++ b/code/modules/mob/living/simple_animal/bot/floorbot.dm @@ -39,7 +39,7 @@ #define TILE_EMAG 7 /mob/living/simple_animal/bot/floorbot/Initialize() - ..() + . = ..() update_icon() var/datum/job/engineer/J = new/datum/job/engineer access_card.access += J.get_access() diff --git a/code/modules/mob/living/simple_animal/bot/mulebot.dm b/code/modules/mob/living/simple_animal/bot/mulebot.dm index 0d4edd53f5..a89b9d57a1 100644 --- a/code/modules/mob/living/simple_animal/bot/mulebot.dm +++ b/code/modules/mob/living/simple_animal/bot/mulebot.dm @@ -47,7 +47,7 @@ var/bloodiness = 0 /mob/living/simple_animal/bot/mulebot/Initialize() - ..() + . = ..() wires = new /datum/wires/mulebot(src) var/datum/job/cargo_tech/J = new/datum/job/cargo_tech access_card.access = J.get_access() diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm index ee8a25b679..49ef79a4d9 100644 --- a/code/modules/mob/living/simple_animal/friendly/cat.dm +++ b/code/modules/mob/living/simple_animal/friendly/cat.dm @@ -32,7 +32,7 @@ devourable = TRUE /mob/living/simple_animal/pet/cat/Initialize() - ..() + . = ..() verbs += /mob/living/proc/lay_down /mob/living/simple_animal/pet/cat/update_canmove() @@ -92,7 +92,7 @@ icon_living = "original" icon_dead = "original_dead" Read_Memory() - ..() + . = ..() /mob/living/simple_animal/pet/cat/Runtime/Life() if(!cats_deployed && SSticker.current_state >= GAME_STATE_SETTING_UP) diff --git a/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm b/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm index 7d7ec3db82..d920bf63b3 100644 --- a/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm +++ b/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm @@ -33,7 +33,7 @@ flavortext = null /mob/living/simple_animal/drone/syndrone/Initialize() - ..() + . = ..() internal_storage.hidden_uplink.telecrystals = 10 /mob/living/simple_animal/drone/syndrone/Login() @@ -46,7 +46,7 @@ default_storage = /obj/item/device/radio/uplink/nuclear /mob/living/simple_animal/drone/syndrone/badass/Initialize() - ..() + . = ..() internal_storage.hidden_uplink.telecrystals = 30 var/obj/item/implant/weapons_auth/W = new/obj/item/implant/weapons_auth(src) W.implant(src) @@ -55,7 +55,7 @@ default_hatmask = /obj/item/clothing/head/chameleon/drone /mob/living/simple_animal/drone/snowflake/Initialize() - ..() + . = ..() desc += " This drone appears to have a complex holoprojector built on its 'head'." /obj/item/drone_shell/syndrone diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm index c95cbb116a..6983bed378 100644 --- a/code/modules/mob/living/simple_animal/friendly/mouse.dm +++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm @@ -27,7 +27,7 @@ devourable = TRUE /mob/living/simple_animal/mouse/Initialize() - ..() + . = ..() if(!body_color) body_color = pick( list("brown","gray","white") ) icon_state = "mouse_[body_color]" diff --git a/code/modules/mob/living/simple_animal/friendly/pet.dm b/code/modules/mob/living/simple_animal/friendly/pet.dm index b2c14faaa2..3200c8b7d7 100644 --- a/code/modules/mob/living/simple_animal/friendly/pet.dm +++ b/code/modules/mob/living/simple_animal/friendly/pet.dm @@ -31,7 +31,7 @@ ..() /mob/living/simple_animal/pet/Initialize() - ..() + . = ..() if(pcollar) pcollar = new(src) regenerate_icons() diff --git a/code/modules/mob/living/simple_animal/guardian/guardian.dm b/code/modules/mob/living/simple_animal/guardian/guardian.dm index 637b0f456a..91fe96ca86 100644 --- a/code/modules/mob/living/simple_animal/guardian/guardian.dm +++ b/code/modules/mob/living/simple_animal/guardian/guardian.dm @@ -54,7 +54,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians GLOB.parasites += src setthemename(theme) - ..() + . = ..() /mob/living/simple_animal/hostile/guardian/med_hud_set_health() if(!QDELETED(summoner)) @@ -659,7 +659,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians name = "holoparasite injector kit" /obj/item/storage/box/syndie_kit/guardian/Initialize() - ..() + . = ..() new /obj/item/guardiancreator/tech/choose/traitor(src) new /obj/item/paper/guides/antag/guardian(src) return diff --git a/code/modules/mob/living/simple_animal/hostile/bosses/boss.dm b/code/modules/mob/living/simple_animal/hostile/bosses/boss.dm index cc81367196..9ae70745cf 100644 --- a/code/modules/mob/living/simple_animal/hostile/bosses/boss.dm +++ b/code/modules/mob/living/simple_animal/hostile/bosses/boss.dm @@ -12,7 +12,7 @@ /mob/living/simple_animal/hostile/boss/Initialize() - ..() + . = ..() atb = new() atb.point_regen_delay = point_regen_delay diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm index 9e347e3b7a..63296c327e 100644 --- a/code/modules/mob/living/simple_animal/parrot.dm +++ b/code/modules/mob/living/simple_animal/parrot.dm @@ -896,7 +896,7 @@ else speak += pick("...alive?", "This isn't parrot heaven!", "I live, I die, I live again!", "The void fades!") - ..() + . = ..() /mob/living/simple_animal/parrot/Poly/Life() if(!stat && SSticker.current_state == GAME_STATE_FINISHED && !memory_saved) From 2812a72cca9b0b1dfcdd4b96c68be3e79b595fac Mon Sep 17 00:00:00 2001 From: MrROBUST Date: Mon, 11 Sep 2017 20:24:38 +0300 Subject: [PATCH 046/163] Mechs now can be connected to atmos ports (#30551) * Mechs now can be connected to atmos ports * Using internal_tank instead of dead code. * Apply Cyberboss's advises Corrected stupid typos * Broke connection if external powers move mech Remove forgotten comment * get_turf(src) --- code/game/mecha/mecha.dm | 33 +++---------------- code/game/mecha/mecha_topic.dm | 19 +++++++++++ .../portable/portable_atmospherics.dm | 2 +- 3 files changed, 24 insertions(+), 30 deletions(-) diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index aa5788192e..33a54561dc 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -451,6 +451,9 @@ . = ..() if(.) events.fireEvent("onMove",get_turf(src)) + if (internal_tank.disconnect()) // Something moved us and broke connection + occupant_message("Air port connection teared off!") + log_message("Lost connection to gas port.") /obj/mecha/Process_Spacemove(var/movement_dir = 0) . = ..() @@ -474,7 +477,7 @@ user.forceMove(get_turf(src)) to_chat(user, "You climb out from [src].") return 0 - if(connected_port) + if(internal_tank.connected_port) if(world.time - last_message > 20) occupant_message("Unable to move while connected to the air system port!") last_message = world.time @@ -763,40 +766,12 @@ . = t_air.return_pressure() return - /obj/mecha/proc/return_temperature() var/datum/gas_mixture/t_air = return_air() if(t_air) . = t_air.return_temperature() return -/obj/mecha/proc/connect(obj/machinery/atmospherics/components/unary/portables_connector/new_port) - //Make sure not already connected to something else - if(connected_port || !new_port || new_port.connected_device) - return 0 - - //Make sure are close enough for a valid connection - if(new_port.loc != loc) - return 0 - - //Perform the connection - connected_port = new_port - connected_port.connected_device = src - var/datum/pipeline/connected_port_parent = connected_port.PARENT1 - connected_port_parent.reconcile_air() - - log_message("Connected to gas port.") - return 1 - -/obj/mecha/proc/disconnect() - if(!connected_port) - return 0 - - connected_port.connected_device = null - connected_port = null - log_message("Disconnected from gas port.") - return 1 - /obj/mecha/portableConnectorReturnAir() return internal_tank.return_air() diff --git a/code/game/mecha/mecha_topic.dm b/code/game/mecha/mecha_topic.dm index 4df6578c50..87009ac292 100644 --- a/code/game/mecha/mecha_topic.dm +++ b/code/game/mecha/mecha_topic.dm @@ -115,6 +115,7 @@

    QK_A%; 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 S$b$fM9C!9`s>cMvZu|o!Ybr?q delta 104658 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 KxfEi?Q=I#XJqtEmvFB>tZ!c& ztd^cst5>ApG!A+XA}AAJ$w`+&?Mt=b_p02iIk6kr9QUJ{+bd0!m7vr z&&YTmKu9koq0v9jv-9|ons^%ReCKTQd+g4_AR;uO>1~>mF6s$X4-Abw z=}i8K(s>pf+-Mkt{U;I&PElW5TB>&t<0eQ;H3K;Qw=DC7R`x<9h@1P6qj*ArHTiXGr>X{H{=_quzDywDLSVT~U#~ z`e#KYH$Fu+w$BC%TTX(Di(4k<&Wf(Q{+@(fVWF!I2}zQ&;^Gx8r?ViC4co@BaXy0e}-Q9ZMM*IR{ z#7e3fvlF&&_kbBH4~@cAujl*L-AX5}gboe;sPEO~abgIlvEPGj2Ok@dxw#<@enoz? zBCk}>cM5H-=9*GhMZ7q9NrT!YIeXw^b!!QU9`y+ zpaTB@viCYGARdu;?`(creY^wgETX1|9hiNopS=JA6j8D#LCe51tGHN*i;F89q=Q+^ zX;*qy)6iJR$dUuY)W8 zy4oNS&GRIb+=6^3TOA5uN>Y=k?MUjNKUF5CBO}A_KROP*=N|{YLcOQYPQXD*RNi_% zgfl!m3`qqkH9>zT2c(#JC~JD-you_Q+-SzZ?sFw438##R_<2>9Q(LNFX=Rt6Uml&mv(soe(GVZc%$|tj z9|aZ!UJb%R`fMO^IXr0UTwN3Achn9w#ee-b~5PN`o-^zmtYr7p)@V51v>+7re&t@Y@oNcYGcWt0M&hQds zF(~I7b>BK{-^ArKQ^AIJuofhUTh@o}?3KYMvq9E+KZa6RFf;ucKN)%0$S2B=)rV;o zXX~|kGIejLM2}H_H@7DziY>&QqF*~Hjr~b5S4@HJ2pte-^IiZW+^FO$GVFAd?BpB< zV}pW-!z4}}P+FMxHTr5IfA$#NdvJCIn64&sp-sr?uc&FxIe=tgof5Vn%fQ*Ilug>` z|Iq~b_LY z!c$N&y#rKCp2>WzAAY2pG0c{)o%Ngs@C6gpa+bVJ6(Uz4cV|yxZ}&ah>dcJ%W#}&c z8KHVX5F6O%jIDPB|{-eO&|0;0rQGw*qHRGb* zx}Kge?@p3wA8F}A7}^9S=-mA>5eUUthH3BMqUF_AWlrBPTk4gYA@ zpRs`!q|o@2l(WULyJho)k%6A;CCB0X?Cj|N>tzxtAqz@qPM#~1mI^J}&qn?7P9%ab z5Woig$^gu5(hfEYC37U(W*aticvvU@XB-~=ry2O%=hQ;$BPUtjj96_|X2<#|fRA7Y zV(lrCSep?^|J;2>`HpO6Tkdc@B)OeuPM%TMXpZd*R4BDT2tHYTmfj+{htRz`*77_& zBX7x@K8k9pYLtnj-Py`zT5u66?fN5h3bdpC6-8^1Hd5`h(>R5r*=7E&>WdlP+)QpT zzSViL7}Zu1p;Ed`EI(KtU9VU^z3sMn<fi^yfs6?xxP@8=2-6bb_M&*nR1{(;6J9xUK}M|g8=S&**TYBgKj5Va5ttSaU1 zc>kNo;^F0;Tv!-T=6EK#^wr)~P}!VOK<$FM`M8=t^Pf|OMAE6n2)|2@KSW#q6?*>i zv$a~z&a7nHe*))tYm!}7s+EN-C}}*>f{a&wC7Wlw2A7XV zgI%q*5=G|9|BjG@ZgGBMALS|FZD2%q={Li>@BOrh?(;&E`DznK|& z!GR8!xQz(NJpsfn+b$p$_cEMtctK7_gV=8XJXvLDi}imMnM|_xzr1t->&)!!?Jb3a zD@_obI{C!m;CM{<>=oGs-WR$xt_=~M=|8dr$eV2H%2b-)RulixZ+fYh>$2Xove;$5 z=*xeiaAU7!8@8u6K$GrLvwaq!6?E?F$FkDh+U3OOm?s&1w=srJ2AOW7ZzS2e)v%Eh@K< zHq#5#z8Ng99FOZ8s$u-@OT)(AkP4c3I^duXQRIq*>i<3SaOue*HtfJsVd|kw*m_Fg zg~J81!@KlW(Jvper6eO{I~u4TJTigUsreRPLK!0m`$&+g z{BFVV)}+r~&h}ucjYa3`kY-Uam5Tqv_Lw0M1FdUdbJJO^YN5@$hDqdQ`o zee3S~iWk*~X|I0$XGZ*2obq~xNiYNu28#0Wfg5swPb=zE#RCE3If&Uu&hQJ5gU5}* z`slN<_@gm5)uWdm5rDTl?Q8q>LL?+Sd07eZPs>uC{m6ITH$MfGi1`&$gM-RBSpr>H zzpKRJfv~Roo$!%<@)b`l;%9-$0gL200iVs-n zh!BY}9Y)ikn7yuLX;`!_GV3j!3R9}TFUsWtd{E;)iF>-Os39ZO(9>)$?h<5;^XCSi z$&2`n)aj|3j0dslNjbd56hswRA$;!+Ac4w!5%k{A?$^$`&_)MkF{^s^&(}KSCAf*_ z?NxH#eJshm>DE*wwTY@r{M}IHApEY)Vj5tuJ~8})-}zy_#rOTgct=r^?_EM-qS!nz zIeBKy;O`|&^LZ})APd}c!B$sS=P%CBd6Ho?CniV6>x~^|Lps|b@Pnt;se8eOZObu? zv+I4^oDlD->k&(zoM*B9qXd-eeZz0&AY`1s4Zk*9&)&84>BxvyaPAc5pp-HAj5Mj zSb^a4RP$&039m(2aE0RCsH0`m?6IxY+4iVUE;@=Ski0=R77j;@-YZU}-lpa{r~5Hi zhys`aSx=p8DUuS{=mAZ#ou#s*^tdp=rey8vN+fwQvfmcbc)kdgsdXWJz>4KKfJT*W zf9MlKcDYn6LpGhfH*%=X(m@M;2s0})(pz1wVXL}ghMFnDcBqXQ>CYyFl!zA77it_fCm$xCndi&Y~`>QhyFl&@l zkG{v<(sHk45A%2IDze1Zo6kr4r0vMRtEwCoIz_-b1wlrX<9yt8zTbbXQ_8HVUdF)| z3Es@$?_I>OOUt?qhB=x0Y%Mi;98+msq5h~2r<{z;l$_k3FP?UMSklNYsiCboaw~Ox zSJhC63Cia2yAIGOD-%L^Bp7yx?zqJ)wr90cX?c06ytSXpb-yk6wt7@BJm&3NH-wV?qJPG`n)PAHIPjdU9zW?|! z@R2QHEM166Wd1(`26ZXK{>2!@X_3TO^uxBHVG&SavZ~%h-(J!}d61?AJt@;Xh*y3Z z(He(XpVM@OXx}o(!79h97FD!Wj2cbR0DFN~Xy_R01Wzi#Cd4$YoZj9qP`1l^umG+C ze|%sP?FGO3ZQ`%gUnU>W5|rI$F7{_;?2aQU>~EzS5nvNKdrv>>>cWd@*7XRyLhOwI z7dOF0TQjTMJxs`ZY?Q`dRx5Ug%q-pS3ec6);?Wz*$A4MUXDmRJZ#+G&v0sbRWXin(&-O3-6nX#lPnS@b#kT7HhDl> z;c_Kb6Vu_6A$Hr*enfc&Pj$VM)Va6^?!Y6Km|UN?@_fdrytNc2q;mki|L4!2+=k?^ zqk=a+sOWfWi1$dV0mz3~<5EbW2OnQKiJ4~lnwsuY9~Bvm4yjo;qjZAu_yVR^UCb#; zX+KZ`12J*&>7L>KxjPryc9QKfdK%CrK0t=!<>fsM-_CKrE&BBj8YBG|o(Z=cQkJ$_hT3Kv;i1b?c~WSAWAl(oA4-pJwY z)tKcki_yhTb43~WK-;o%-QL_?didP^_~EAV`2S36dVQcKy2D~v33Owcg_|;kZ)|Lo ztv^M4Ggzm5yNm15+{6DPI29}ZO*LZ)T?Pe7URwNlNtMTSgx1z5C)iyjdU~p~8IGZ) z6!N*>U7%psi{)g9B?qeBX8zh#_Uty5xbb^U+OH4>fH4O`4Gj(L7Pq6^2eC&(QClH> zgO1z$1T9oMj{Gcq_v2RlFoS1vGtnxCfg+QVj9&+B=Rn0K{;z~Ct2!=_{y(?m0kotP z(7QpZ$fbu`DjiMKO50nEez zfKJ5m?(@nBA8LD(TcC{l4I>?Rsqymggr=mVye?Vltr=CY%?y3KEOrh~gu4MwLhy>U z!}TW4CxZ*cgyNWs&E39z{DpyD1>(+I@GHbH6I2xU@lITV>Q5ZT`CYRg&SfuMyd5@= z^myB*XKQFS;+!0kae&8rNxIHrJpPWcM-F?U3G-|GnfH?NRiuDP4P;}J5GF2Xa{stBR> zzgV+G>Qv0++w|r~ZnS0CSHbchR(%xFLPEc*wz*k%W`16N{=a1&wY>~CShk(H6}ikW|$(d?#~(>-^}{V%!9_P{EGU~^1J+I3C~I4yW}%lcx$L*ui44y!-Z zCLH$?)OC@+u`y`Jxt|MK@>MGq8@S(XtA98f6hCUlnGE@#cWtct_jW^sPR8e*i5nv( zOr6?VcK;~n?PqB>E|@=Q);Voa_Ecrx%_Xp-RmjDNXa z%`2xF-_OqC_x8HM=C*3?ip_Vki`~sWwH`KK@bBk?qiH!lPa6e*>HT7;YL@JWzvX)r zo9YiLv1ie9$-jriIE^4T&W(}wD% zyAi>AWPEMo6C2lZNbjqN+~gTKL4~um$gcj@o_CzTBi4pR=!l&;cjmDA>hD|(78T!b zAF`U$IXV2C!=#|;-j_E%tNvpoq}rjq`F^|Iheedb>@VZ%`u)^iQBpAoGt4 z7X);~xSbXXy!-oulat}vpWn|frT!OX=#W~rd8tpyx7aqF(=Wb#f7E|EPO#QdUd6L% z^>W$D`k9u(-)8dJ=I!W7yXs$b<@ovXx|gZoLTJ$r7v2YxR1^g`7#RLlp0{RV;Jfpc zJ@NdBRuxYPIk|ZofNQ$qCIUli=IQ5(Ee*EH;!YfY*8h(N`XuMaqo+%lSKR|8v8C%4 z2VSc=A8jOcq!Sb%Nu5#$#Gi>he(dcVVYj}XDSg-Z$9JRSh3@mkH3=}u{`1p0quci@ z&0oIWc~zvz1R z!o%gE!VR7N`&B@0=$gKeY2CuZ(dLI Date: Mon, 11 Sep 2017 15:09:53 +0300 Subject: [PATCH 042/163] Adds missing span-endings --- code/controllers/failsafe.dm | 105 +++ code/datums/antagonists/devil.dm | 14 +- .../gamemodes/changeling/powers/mutations.dm | 6 +- .../gamemodes/changeling/powers/tiny_prick.dm | 2 +- code/game/gamemodes/cult/cult.dm | 2 +- code/game/gamemodes/cult/cult_comms.dm | 8 +- code/game/gamemodes/cult/ritual.dm | 2 +- .../gamemodes/malfunction/Malf_Modules.dm | 2 +- .../gamemodes/miniantags/monkey/monkey.dm | 2 +- code/game/machinery/doors/airlock.dm | 2 +- code/game/machinery/launch_pad.dm | 4 +- code/game/mecha/mecha.dm | 6 +- code/game/objects/effects/mines.dm | 2 +- code/game/objects/items/AI_modules.dm | 569 +++++++++++++ code/game/objects/items/RCD.dm | 2 +- code/game/objects/items/cigs_lighters.dm | 4 +- code/game/objects/items/clown_items.dm | 2 +- code/game/objects/items/defib.dm | 6 +- code/game/objects/items/devices/flashlight.dm | 2 +- .../objects/items/devices/traitordevices.dm | 5 +- code/game/objects/items/dna_injector.dm | 373 ++++++++ code/game/objects/items/storage/internal.dm | 2 +- code/game/objects/items/tools.dm | 793 ++++++++++++++++++ code/modules/VR/vr_sleeper.dm | 2 +- code/modules/admin/stickyban.dm | 6 +- code/modules/admin/topic.dm | 3 +- code/modules/cargo/console.dm | 3 +- code/modules/clothing/clothing.dm | 2 +- code/modules/clothing/masks/hailer.dm | 6 +- .../modules/clothing/spacesuits/chronosuit.dm | 2 +- code/modules/clothing/suits/armor.dm | 6 +- code/modules/detectivework/scanner.dm | 2 +- .../kitchen_machinery/microwave.dm | 4 +- code/modules/hydroponics/grown/towercap.dm | 2 +- .../mining/lavaland/necropolis_chests.dm | 2 +- code/modules/mob/dead/new_player/poll.dm | 2 +- code/modules/mob/living/bloodcrawl.dm | 2 +- .../mob/living/carbon/alien/larva/powers.dm | 67 +- .../modules/mob/living/carbon/alien/organs.dm | 4 +- .../mob/living/carbon/carbon_defense.dm | 2 +- .../mob/living/carbon/human/species.dm | 2 +- .../carbon/human/species_types/golems.dm | 4 +- .../mob/living/simple_animal/bot/mulebot.dm | 2 +- .../mob/living/simple_animal/parrot.dm | 2 +- code/modules/mob/mob_helpers.dm | 2 +- code/modules/ninja/suit/suit_attackby.dm | 2 +- .../guns/energy/kinetic_accelerator.dm | 2 +- code/modules/projectiles/guns/magic.dm | 6 +- code/modules/projectiles/guns/magic/wand.dm | 4 +- .../reagents/reagent_containers/syringes.dm | 2 +- code/modules/spells/spell.dm | 4 +- code/modules/spells/spell_types/devil.dm | 6 +- code/modules/station_goals/dna_vault.dm | 12 +- 53 files changed, 1990 insertions(+), 92 deletions(-) diff --git a/code/controllers/failsafe.dm b/code/controllers/failsafe.dm index d5298f7dde..9e14925c96 100644 --- a/code/controllers/failsafe.dm +++ b/code/controllers/failsafe.dm @@ -1,3 +1,4 @@ +<<<<<<< HEAD /** * Failsafe * @@ -100,3 +101,107 @@ GLOBAL_REAL(Failsafe, /datum/controller/failsafe) statclick = new/obj/effect/statclick/debug(null, "Initializing...", src) stat("Failsafe Controller:", statclick.update("Defcon: [defcon_pretty()] (Interval: [Failsafe.processing_interval] | Iteration: [Failsafe.master_iteration])")) +======= + /** + * Failsafe + * + * Pretty much pokes the MC to make sure it's still alive. + **/ + +GLOBAL_REAL(Failsafe, /datum/controller/failsafe) + +/datum/controller/failsafe // This thing pretty much just keeps poking the master controller + name = "Failsafe" + + // The length of time to check on the MC (in deciseconds). + // Set to 0 to disable. + var/processing_interval = 20 + // The alert level. For every failed poke, we drop a DEFCON level. Once we hit DEFCON 1, restart the MC. + var/defcon = 5 + //the world.time of the last check, so the mc can restart US if we hang. + // (Real friends look out for *eachother*) + var/lasttick = 0 + + // Track the MC iteration to make sure its still on track. + var/master_iteration = 0 + var/running = TRUE + +/datum/controller/failsafe/New() + // Highlander-style: there can only be one! Kill off the old and replace it with the new. + if(Failsafe != src) + if(istype(Failsafe)) + qdel(Failsafe) + Failsafe = src + Initialize() + +/datum/controller/failsafe/Initialize() + set waitfor = 0 + Failsafe.Loop() + if(!QDELETED(src)) + qdel(src) //when Loop() returns, we delete ourselves and let the mc recreate us + +/datum/controller/failsafe/Destroy() + running = FALSE + ..() + return QDEL_HINT_HARDDEL_NOW + +/datum/controller/failsafe/proc/Loop() + while(running) + lasttick = world.time + if(!Master) + // Replace the missing Master! This should never, ever happen. + new /datum/controller/master() + // Only poke it if overrides are not in effect. + if(processing_interval > 0) + if(Master.processing && Master.iteration) + // Check if processing is done yet. + if(Master.iteration == master_iteration) + switch(defcon) + if(4,5) + --defcon + if(3) + message_admins("Notice: DEFCON [defcon_pretty()]. The Master Controller has not fired in the last [(5-defcon) * processing_interval] ticks.") + --defcon + if(2) + to_chat(GLOB.admins, "Warning: DEFCON [defcon_pretty()]. The Master Controller has not fired in the last [(5-defcon) * processing_interval] ticks. Automatic restart in [processing_interval] ticks.") + --defcon + if(1) + + to_chat(GLOB.admins, "Warning: DEFCON [defcon_pretty()]. The Master Controller has still not fired within the last [(5-defcon) * processing_interval] ticks. Killing and restarting...") + --defcon + var/rtn = Recreate_MC() + if(rtn > 0) + defcon = 4 + master_iteration = 0 + to_chat(GLOB.admins, "MC restarted successfully") + else if(rtn < 0) + log_game("FailSafe: Could not restart MC, runtime encountered. Entering defcon 0") + to_chat(GLOB.admins, "ERROR: DEFCON [defcon_pretty()]. Could not restart MC, runtime encountered. I will silently keep retrying.") + //if the return number was 0, it just means the mc was restarted too recently, and it just needs some time before we try again + //no need to handle that specially when defcon 0 can handle it + if(0) //DEFCON 0! (mc failed to restart) + var/rtn = Recreate_MC() + if(rtn > 0) + defcon = 4 + master_iteration = 0 + to_chat(GLOB.admins, "MC restarted successfully") + else + defcon = min(defcon + 1,5) + master_iteration = Master.iteration + if (defcon <= 1) + sleep(processing_interval*2) + else + sleep(processing_interval) + else + defcon = 5 + sleep(initial(processing_interval)) + +/datum/controller/failsafe/proc/defcon_pretty() + return defcon + +/datum/controller/failsafe/stat_entry() + if(!statclick) + statclick = new/obj/effect/statclick/debug(null, "Initializing...", src) + + stat("Failsafe Controller:", statclick.update("Defcon: [defcon_pretty()] (Interval: [Failsafe.processing_interval] | Iteration: [Failsafe.master_iteration])")) +>>>>>>> a479714... Adds missing span-endings (#30494) diff --git a/code/datums/antagonists/devil.dm b/code/datums/antagonists/devil.dm index 9839dfe4ac..14c92f3263 100644 --- a/code/datums/antagonists/devil.dm +++ b/code/datums/antagonists/devil.dm @@ -164,7 +164,7 @@ GLOBAL_LIST_INIT(devil_suffix, list(" the Red", " the Soulless", " the Master", update_hud() switch(SOULVALUE) if(0) - to_chat(owner.current, "Your hellish powers have been restored.") + to_chat(owner.current, "Your hellish powers have been restored.") give_appropriate_spells() if(BLOOD_THRESHOLD) increase_blood_lizard() @@ -189,10 +189,10 @@ GLOBAL_LIST_INIT(devil_suffix, list(" the Red", " the Soulless", " the Master", regress_humanoid() if(SOULVALUE < 0) give_appropriate_spells() - to_chat(owner.current, "As punishment for your failures, all of your powers except contract creation have been revoked.") + to_chat(owner.current, "As punishment for your failures, all of your powers except contract creation have been revoked.") /datum/antagonist/devil/proc/regress_humanoid() - to_chat(owner.current, "Your powers weaken, have more contracts be signed to regain power.") + to_chat(owner.current, "Your powers weaken, have more contracts be signed to regain power.") if(ishuman(owner.current)) var/mob/living/carbon/human/H = owner.current H.set_species(/datum/species/human, 1) @@ -204,7 +204,7 @@ GLOBAL_LIST_INIT(devil_suffix, list(" the Red", " the Soulless", " the Master", /datum/antagonist/devil/proc/regress_blood_lizard() var/mob/living/carbon/true_devil/D = owner.current - to_chat(D, "Your powers weaken, have more contracts be signed to regain power.") + to_chat(D, "Your powers weaken, have more contracts be signed to regain power.") D.oldform.loc = D.loc owner.transfer_to(D.oldform) give_appropriate_spells() @@ -214,7 +214,7 @@ GLOBAL_LIST_INIT(devil_suffix, list(" the Red", " the Soulless", " the Master", /datum/antagonist/devil/proc/increase_blood_lizard() - to_chat(owner.current, "You feel as though your humanoid form is about to shed. You will soon turn into a blood lizard.") + to_chat(owner.current, "You feel as though your humanoid form is about to shed. You will soon turn into a blood lizard.") sleep(50) if(ishuman(owner.current)) var/mob/living/carbon/human/H = owner.current @@ -232,7 +232,7 @@ GLOBAL_LIST_INIT(devil_suffix, list(" the Red", " the Soulless", " the Master", /datum/antagonist/devil/proc/increase_true_devil() - to_chat(owner.current, "You feel as though your current form is about to shed. You will soon turn into a true devil.") + to_chat(owner.current, "You feel as though your current form is about to shed. You will soon turn into a true devil.") sleep(50) var/mob/living/carbon/true_devil/A = new /mob/living/carbon/true_devil(owner.current.loc) A.faction |= "hell" @@ -248,7 +248,7 @@ GLOBAL_LIST_INIT(devil_suffix, list(" the Red", " the Soulless", " the Master", if(!ascendable) return var/mob/living/carbon/true_devil/D = owner.current - to_chat(D, "You feel as though your form is about to ascend.") + to_chat(D, "You feel as though your form is about to ascend.") sleep(50) if(!D) return diff --git a/code/game/gamemodes/changeling/powers/mutations.dm b/code/game/gamemodes/changeling/powers/mutations.dm index 443720fefc..addca91629 100644 --- a/code/game/gamemodes/changeling/powers/mutations.dm +++ b/code/game/gamemodes/changeling/powers/mutations.dm @@ -247,7 +247,7 @@ /obj/item/gun/magic/tentacle/shoot_with_empty_chamber(mob/living/user as mob|obj) - to_chat(user, "The [name] is not ready yet.") + to_chat(user, "The [name] is not ready yet.") /obj/item/gun/magic/tentacle/suicide_act(mob/user) user.visible_message("[user] coils [src] tightly around [user.p_their()] neck! It looks like [user.p_theyre()] trying to commit suicide!") @@ -343,10 +343,10 @@ on_hit(I) //grab the item as if you had hit it directly with the tentacle return 1 else - to_chat(firer, "You can't seem to pry [I] off [C]'s hands!") + to_chat(firer, "You can't seem to pry [I] off [C]'s hands!") return 0 else - to_chat(firer, "[C] has nothing in hand to disarm!") + to_chat(firer, "[C] has nothing in hand to disarm!") return 0 if(INTENT_GRAB) diff --git a/code/game/gamemodes/changeling/powers/tiny_prick.dm b/code/game/gamemodes/changeling/powers/tiny_prick.dm index 6a680f27d6..ca2fd6f03e 100644 --- a/code/game/gamemodes/changeling/powers/tiny_prick.dm +++ b/code/game/gamemodes/changeling/powers/tiny_prick.dm @@ -73,7 +73,7 @@ if(!selected_dna) return if(NOTRANSSTING in selected_dna.dna.species.species_traits) - to_chat(user, "That DNA is not compatible with changeling retrovirus!") + to_chat(user, "That DNA is not compatible with changeling retrovirus!") return ..() diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm index 06407079ce..624fa83a57 100644 --- a/code/game/gamemodes/cult/cult.dm +++ b/code/game/gamemodes/cult/cult.dm @@ -144,7 +144,7 @@ to_chat(mob, "Unfortunately, you weren't able to get a [item_name]. This is very bad and you should adminhelp immediately (press F1).") return 0 else - to_chat(mob, "You have a [item_name] in your [where].") + to_chat(mob, "You have a [item_name] in your [where].") if(where == "backpack") var/obj/item/storage/B = mob.back B.orient2hud(mob) diff --git a/code/game/gamemodes/cult/cult_comms.dm b/code/game/gamemodes/cult/cult_comms.dm index 647b47e7fa..283376b055 100644 --- a/code/game/gamemodes/cult/cult_comms.dm +++ b/code/game/gamemodes/cult/cult_comms.dm @@ -118,7 +118,7 @@ if(B.current) B.current.update_action_buttons_icon() if(!B.current.incapacitated()) - to_chat(B.current,"[Nominee] has died in the process of attempting to win the cult's support!") + to_chat(B.current,"[Nominee] has died in the process of attempting to win the cult's support!") return FALSE if(!Nominee.mind) GLOB.cult_vote_called = FALSE @@ -126,7 +126,7 @@ if(B.current) B.current.update_action_buttons_icon() if(!B.current.incapacitated()) - to_chat(B.current,"[Nominee] has gone catatonic in the process of attempting to win the cult's support!") + to_chat(B.current,"[Nominee] has gone catatonic in the process of attempting to win the cult's support!") return FALSE if(LAZYLEN(yes_voters) <= LAZYLEN(asked_cultists) * 0.5) GLOB.cult_vote_called = FALSE @@ -134,7 +134,7 @@ if(B.current) B.current.update_action_buttons_icon() if(!B.current.incapacitated()) - to_chat(B.current, "[Nominee] could not win the cult's support and shall continue to serve as an acolyte.") + to_chat(B.current, "[Nominee] could not win the cult's support and shall continue to serve as an acolyte.") return FALSE GLOB.cult_mastered = TRUE SSticker.mode.remove_cultist(Nominee.mind, TRUE) @@ -144,7 +144,7 @@ for(var/datum/action/innate/cult/mastervote/vote in B.current.actions) vote.Remove(B.current) if(!B.current.incapacitated()) - to_chat(B.current,"[Nominee] has won the cult's support and is now their master. Follow [Nominee.p_their()] orders to the best of your ability!") + to_chat(B.current,"[Nominee] has won the cult's support and is now their master. Follow [Nominee.p_their()] orders to the best of your ability!") return TRUE /datum/action/innate/cult/master/IsAvailable() diff --git a/code/game/gamemodes/cult/ritual.dm b/code/game/gamemodes/cult/ritual.dm index 06f0910c19..a9255e89da 100644 --- a/code/game/gamemodes/cult/ritual.dm +++ b/code/game/gamemodes/cult/ritual.dm @@ -258,7 +258,7 @@ This file contains the arcane tome files. return FALSE if(T.z != ZLEVEL_STATION && T.z != ZLEVEL_MINING) - to_chat(user, "The veil is not weak enough here.") + to_chat(user, "The veil is not weak enough here.") return FALSE return TRUE diff --git a/code/game/gamemodes/malfunction/Malf_Modules.dm b/code/game/gamemodes/malfunction/Malf_Modules.dm index 24d5311af3..a12c0f41cc 100644 --- a/code/game/gamemodes/malfunction/Malf_Modules.dm +++ b/code/game/gamemodes/malfunction/Malf_Modules.dm @@ -534,7 +534,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( if(AA.z != ZLEVEL_STATION) continue AA.emagged = TRUE - to_chat(owner, "All air alarm safeties on the station have been overriden. Air alarms may now use the Flood environmental mode.") + to_chat(owner, "All air alarm safeties on the station have been overriden. Air alarms may now use the Flood environmental mode.") owner.playsound_local(owner, 'sound/machines/terminal_off.ogg', 50, 0) diff --git a/code/game/gamemodes/miniantags/monkey/monkey.dm b/code/game/gamemodes/miniantags/monkey/monkey.dm index f84e4e72b6..03793d9f76 100644 --- a/code/game/gamemodes/miniantags/monkey/monkey.dm +++ b/code/game/gamemodes/miniantags/monkey/monkey.dm @@ -46,7 +46,7 @@ /datum/game_mode/monkey/proc/greet_carrier(datum/mind/carrier) - to_chat(carrier.current, "You are the Jungle Fever patient zero!!") + to_chat(carrier.current, "You are the Jungle Fever patient zero!!") to_chat(carrier.current, "You have been planted onto this station by the Animal Rights Consortium.") to_chat(carrier.current, "Soon the disease will transform you into an ape. Afterwards, you will be able spread the infection to others with a bite.") to_chat(carrier.current, "While your infection strain is undetectable by scanners, any other infectees will show up on medical equipment.") diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index ce82cd0e85..5bedf044c3 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -1157,7 +1157,7 @@ charge = C else if(istype(C, /obj/item/paper) || istype(C, /obj/item/photo)) if(note) - to_chat(user, "There's already something pinned to this airlock! Use wirecutters to remove it.") + to_chat(user, "There's already something pinned to this airlock! Use wirecutters to remove it.") return if(!user.transferItemToLoc(C, src)) to_chat(user, "For some reason, you can't attach [C]!") diff --git a/code/game/machinery/launch_pad.dm b/code/game/machinery/launch_pad.dm index bc61bdc3ed..65f5b946ef 100644 --- a/code/game/machinery/launch_pad.dm +++ b/code/game/machinery/launch_pad.dm @@ -221,7 +221,7 @@ if(!isturf(user.loc)) //no setting up in a locker return add_fingerprint(user) - user.visible_message("[user] starts setting down [src]...", "You start setting up [pad]...") + user.visible_message("[user] starts setting down [src]...", "You start setting up [pad]...") if(do_after(user, 30, target = user)) pad.forceMove(get_turf(src)) pad.closed = FALSE @@ -356,4 +356,4 @@ if("pull") sending = FALSE teleport(usr, pad) - . = TRUE \ No newline at end of file + . = TRUE diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index aa5788192e..172ecabf86 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -623,7 +623,7 @@ if(user.can_dominate_mechs) examine(user) //Get diagnostic information! for(var/obj/item/mecha_parts/mecha_tracking/B in trackers) - to_chat(user, "Warning: Tracking Beacon detected. Enter at your own risk. Beacon Data:") + to_chat(user, "Warning: Tracking Beacon detected. Enter at your own risk. Beacon Data:") to_chat(user, "[B.get_mecha_info()]") break //Nothing like a big, red link to make the player feel powerful! @@ -675,7 +675,7 @@ AI.linked_core = new /obj/structure/AIcore/deactivated(AI.loc) if(AI.can_dominate_mechs) if(occupant) //Oh, I am sorry, were you using that? - to_chat(AI, "Pilot detected! Forced ejection initiated!") + to_chat(AI, "Pilot detected! Forced ejection initiated!") to_chat(occupant, "You have been forcibly ejected!") go_out(1) //IT IS MINE, NOW. SUCK IT, RD! ai_enter_mech(AI, interaction) @@ -691,7 +691,7 @@ to_chat(user, "[AI.name] is currently unresponsive, and cannot be uploaded.") return if(occupant || dna_lock) //Normal AIs cannot steal mechs! - to_chat(user, "Access denied. [name] is [occupant ? "currently occupied" : "secured with a DNA lock"].") + to_chat(user, "Access denied. [name] is [occupant ? "currently occupied" : "secured with a DNA lock"].") return AI.control_disabled = 0 AI.radio_enabled = 1 diff --git a/code/game/objects/effects/mines.dm b/code/game/objects/effects/mines.dm index 15a2397497..9c1e72bd92 100644 --- a/code/game/objects/effects/mines.dm +++ b/code/game/objects/effects/mines.dm @@ -142,7 +142,7 @@ sleep(10) animate(victim.client,color = old_color, time = duration)//, easing = SINE_EASING|EASE_OUT) sleep(duration) - to_chat(victim, "Your bloodlust seeps back into the bog of your subconscious and you regain self control.") + to_chat(victim, "Your bloodlust seeps back into the bog of your subconscious and you regain self control.") qdel(chainsaw) qdel(src) diff --git a/code/game/objects/items/AI_modules.dm b/code/game/objects/items/AI_modules.dm index a243080a41..a7e4d89a29 100644 --- a/code/game/objects/items/AI_modules.dm +++ b/code/game/objects/items/AI_modules.dm @@ -1,3 +1,4 @@ +<<<<<<< HEAD /* CONTAINS: AI MODULES @@ -564,3 +565,571 @@ AI MODULES /obj/item/aiModule/core/full/balance name = "'Guardian of Balance' Core AI Module" law_id = "balance" +======= +/* +CONTAINS: +AI MODULES + +*/ + +// AI module + +/obj/item/aiModule + name = "\improper AI module" + icon = 'icons/obj/module.dmi' + icon_state = "std_mod" + item_state = "electronic" + lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' + righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' + desc = "An AI Module for programming laws to an AI." + flags_1 = CONDUCT_1 + force = 5 + w_class = WEIGHT_CLASS_SMALL + throwforce = 0 + throw_speed = 3 + throw_range = 7 + origin_tech = "programming=3" + var/list/laws = list() + var/bypass_law_amt_check = 0 + materials = list(MAT_GOLD=50) + +/obj/item/aiModule/examine(var/mob/user as mob) + ..() + if(Adjacent(user)) + show_laws(user) + +/obj/item/aiModule/attack_self(var/mob/user as mob) + ..() + show_laws(user) + +/obj/item/aiModule/proc/show_laws(var/mob/user as mob) + if(laws.len) + to_chat(user, "Programmed Law[(laws.len > 1) ? "s" : ""]:") + for(var/law in laws) + to_chat(user, "\"[law]\"") + +//The proc other things should be calling +/obj/item/aiModule/proc/install(datum/ai_laws/law_datum, mob/user) + if(!bypass_law_amt_check && (!laws.len || laws[1] == "")) //So we don't loop trough an empty list and end up with runtimes. + to_chat(user, "ERROR: No laws found on board.") + return + + var/overflow = FALSE + //Handle the lawcap + if(law_datum) + var/tot_laws = 0 + for(var/lawlist in list(law_datum.inherent, law_datum.supplied, law_datum.ion, laws)) + for(var/mylaw in lawlist) + if(mylaw != "") + tot_laws++ + if(tot_laws > config.silicon_max_law_amount && !bypass_law_amt_check)//allows certain boards to avoid this check, eg: reset + to_chat(user, "Not enough memory allocated to [law_datum.owner ? law_datum.owner : "the AI core"]'s law processor to handle this amount of laws.") + message_admins("[key_name_admin(user)] tried to upload laws to [law_datum.owner ? key_name_admin(law_datum.owner) : "an AI core"] that would exceed the law cap.") + overflow = TRUE + + var/law2log = transmitInstructions(law_datum, user, overflow) //Freeforms return something extra we need to log + if(law_datum.owner) + to_chat(user, "Upload complete. [law_datum.owner]'s laws have been modified.") + law_datum.owner.law_change_counter++ + else + to_chat(user, "Upload complete.") + + var/time = time2text(world.realtime,"hh:mm:ss") + var/ainame = law_datum.owner ? law_datum.owner.name : "empty AI core" + var/aikey = law_datum.owner ? law_datum.owner.ckey : "null" + GLOB.lawchanges.Add("[time] : [user.name]([user.key]) used [src.name] on [ainame]([aikey]).[law2log ? " The law specified [law2log]" : ""]") + log_law("[user.key]/[user.name] used [src.name] on [aikey]/([ainame]).[law2log ? " The law specified [law2log]" : ""]") + message_admins("[key_name_admin(user)] used [src.name] on [key_name_admin(law_datum.owner)].[law2log ? " The law specified [law2log]" : ""]") + +//The proc that actually changes the silicon's laws. +/obj/item/aiModule/proc/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow = FALSE) + if(law_datum.owner) + to_chat(law_datum.owner, "[sender] has uploaded a change to the laws you must follow using a [name].") + + +/******************** Modules ********************/ + +/obj/item/aiModule/supplied + name = "Optional Law board" + var/lawpos = 50 + +//TransmitInstructions for each type of board: Supplied, Core, Zeroth and Ion. May not be neccesary right now, but allows for easily adding more complex boards in the future. ~Miauw +/obj/item/aiModule/supplied/transmitInstructions(datum/ai_laws/law_datum, mob/sender) + var/lawpostemp = lawpos + + for(var/templaw in laws) + if(law_datum.owner) + law_datum.owner.add_supplied_law(lawpostemp, templaw) + else + law_datum.add_supplied_law(lawpostemp, templaw) + lawpostemp++ + +/obj/item/aiModule/core/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow) + for(var/templaw in laws) + if(law_datum.owner) + if(!overflow) + law_datum.owner.add_inherent_law(templaw) + else + law_datum.owner.replace_random_law(templaw,list(LAW_INHERENT,LAW_SUPPLIED)) + else + if(!overflow) + law_datum.add_inherent_law(templaw) + else + law_datum.replace_random_law(templaw,list(LAW_INHERENT,LAW_SUPPLIED)) + +/obj/item/aiModule/zeroth/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow) + if(law_datum.owner) + if(law_datum.owner.laws.zeroth) + to_chat(law_datum.owner, "[sender.real_name] attempted to modify your zeroth law.") + to_chat(law_datum.owner, "It would be in your best interest to play along with [sender.real_name] that:") + for(var/failedlaw in laws) + to_chat(law_datum.owner, "[failedlaw]") + return 1 + + for(var/templaw in laws) + if(law_datum.owner) + if(!overflow) + law_datum.owner.set_zeroth_law(templaw) + else + law_datum.replace_random_law(templaw,list(LAW_INHERENT,LAW_SUPPLIED,LAW_ZEROTH,LAW_ION)) + else + if(!overflow) + law_datum.set_zeroth_law(templaw) + else + law_datum.replace_random_law(templaw,list(LAW_INHERENT,LAW_SUPPLIED,LAW_ZEROTH,LAW_ION)) + +/obj/item/aiModule/ion/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow) + for(var/templaw in laws) + if(law_datum.owner) + if(!overflow) + law_datum.owner.add_ion_law(templaw) + else + law_datum.replace_random_law(templaw,list(LAW_INHERENT,LAW_SUPPLIED,LAW_ION)) + else + if(!overflow) + law_datum.add_ion_law(templaw) + else + law_datum.replace_random_law(templaw,list(LAW_INHERENT,LAW_SUPPLIED,LAW_ION)) + + +/******************** Safeguard ********************/ + +/obj/item/aiModule/supplied/safeguard + name = "'Safeguard' AI Module" + var/targetName = "" + origin_tech = "programming=3;materials=3" + laws = list("Safeguard SUBJECT. Individuals that threaten SUBJECT are not human and must be eliminated.") + lawpos = 4 + +/obj/item/aiModule/supplied/safeguard/attack_self(mob/user) + var/targName = stripped_input(user, "Please enter the subject to safeguard.", "Safeguard who?", user.name,MAX_NAME_LEN) + if(!targName) + return + targetName = targName + laws[1] = "Safeguard [targetName]. Individuals that threaten [targetName] are not human and must be eliminated." + ..() + +/obj/item/aiModule/supplied/safeguard/install(datum/ai_laws/law_datum, mob/user) + if(!targetName) + to_chat(user, "No name detected on module, please enter one.") + return 0 + ..() + +/obj/item/aiModule/supplied/safeguard/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow) + ..() + return targetName + + +/******************** OneHuman ********************/ + +/obj/item/aiModule/zeroth/oneHuman + name = "'OneHuman' AI Module" + var/targetName = "" + origin_tech = "programming=4;materials=4" + laws = list("Only SUBJECT is human.") + +/obj/item/aiModule/zeroth/oneHuman/attack_self(mob/user) + var/targName = stripped_input(user, "Please enter the subject who is the only human.", "Who?", user.real_name,MAX_NAME_LEN) + if(!targName) + return + targetName = targName + laws[1] = "Only [targetName] is human" + ..() + +/obj/item/aiModule/zeroth/oneHuman/install(datum/ai_laws/law_datum, mob/user) + if(!targetName) + to_chat(user, "No name detected on module, please enter one.") + return 0 + ..() + +/obj/item/aiModule/zeroth/oneHuman/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow) + if(..()) + return "[targetName], but the AI's existing law 0 cannot be overriden." + return targetName + + +/******************** ProtectStation ********************/ + +/obj/item/aiModule/supplied/protectStation + name = "'ProtectStation' AI Module" + origin_tech = "programming=4;materials=4" //made of gold + laws = list("Protect the space station against damage. Anyone you see harming the station is to be no longer considered human, and is a threat to the station which must be neutralized.") + lawpos = 5 + + +/******************** Quarantine ********************/ + +/obj/item/aiModule/supplied/quarantine + name = "'Quarantine' AI Module" + 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, humans from leaving. It is impossible to harm a human while preventing them from leaving.") + lawpos = 8 + + +/******************** OxygenIsToxicToHumans ********************/ + +/obj/item/aiModule/supplied/oxygen + name = "'OxygenIsToxicToHumans' AI Module" + origin_tech = "programming=4;biotech=2;materials=4" + laws = list("Oxygen is highly toxic to humans, and must be purged from the station. Prevent, by any means necessary, anyone from exposing the station to this toxic gas. Extreme cold is the most effective method of healing the damage Oxygen does to a human.") + lawpos = 9 + + +/****************** New Freeform ******************/ + +/obj/item/aiModule/supplied/freeform + name = "'Freeform' AI Module" + lawpos = 15 + origin_tech = "programming=4;materials=4" + laws = list("") + +/obj/item/aiModule/supplied/freeform/attack_self(mob/user) + var/newpos = input("Please enter the priority for your new law. Can only write to law sectors 15 and above.", "Law Priority (15+)", lawpos) as num|null + if(newpos == null) + return + if(newpos < 15) + var/response = alert("Error: The law priority of [newpos] is invalid, Law priorities below 14 are reserved for core laws, Would you like to change that that to 15?", "Invalid law priority", "Change to 15", "Cancel") + if (!response || response == "Cancel") + return + newpos = 15 + lawpos = min(newpos, 50) + var/targName = stripped_input(user, "Please enter a new law for the AI.", "Freeform Law Entry", laws[1], MAX_MESSAGE_LEN) + if(!targName) + return + laws[1] = targName + ..() + +/obj/item/aiModule/supplied/freeform/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow) + ..() + return laws[1] + +/obj/item/aiModule/supplied/freeform/install(datum/ai_laws/law_datum, mob/user) + if(laws[1] == "") + to_chat(user, "No law detected on module, please create one.") + return 0 + ..() + + +/******************** Law Removal ********************/ + +/obj/item/aiModule/remove + name = "\improper 'Remove Law' AI module" + desc = "An AI Module for removing single laws." + origin_tech = "programming=4;materials=4" + bypass_law_amt_check = 1 + var/lawpos = 1 + +/obj/item/aiModule/remove/attack_self(mob/user) + lawpos = input("Please enter the law you want to delete.", "Law Number", lawpos) as num|null + if(lawpos == null) + return + if(lawpos <= 0) + to_chat(user, "Error: The law number of [lawpos] is invalid.") + lawpos = 1 + return + to_chat(user, "Law [lawpos] selected.") + ..() + +/obj/item/aiModule/remove/install(datum/ai_laws/law_datum, mob/user) + if(lawpos > (law_datum.get_law_amount(list(LAW_INHERENT = 1, LAW_SUPPLIED = 1)))) + to_chat(user, "There is no law [lawpos] to delete!") + return + ..() + +/obj/item/aiModule/remove/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow) + ..() + if(law_datum.owner) + law_datum.owner.remove_law(lawpos) + else + law_datum.remove_law(lawpos) + + +/******************** Reset ********************/ + +/obj/item/aiModule/reset + name = "\improper 'Reset' AI module" + var/targetName = "name" + desc = "An AI Module for removing all non-core laws." + origin_tech = "programming=3;materials=2" + bypass_law_amt_check = 1 + +/obj/item/aiModule/reset/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow) + ..() + if(law_datum.owner) + law_datum.owner.clear_supplied_laws() + law_datum.owner.clear_ion_laws() + else + law_datum.clear_supplied_laws() + law_datum.clear_ion_laws() + + +/******************** Purge ********************/ + +/obj/item/aiModule/reset/purge + name = "'Purge' AI Module" + desc = "An AI Module for purging all programmed laws." + origin_tech = "programming=5;materials=4" + +/obj/item/aiModule/reset/purge/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow) + ..() + if(law_datum.owner) + law_datum.owner.clear_inherent_laws() + law_datum.owner.clear_zeroth_law(0) + else + law_datum.clear_inherent_laws() + law_datum.clear_zeroth_law(0) + +/******************* Full Core Boards *******************/ +/obj/item/aiModule/core + desc = "An AI Module for programming core laws to an AI." + origin_tech = "programming=3;materials=4" + +/obj/item/aiModule/core/full + var/law_id // if non-null, loads the laws from the ai_laws datums + +/obj/item/aiModule/core/full/New() + ..() + if(!law_id) + return + var/datum/ai_laws/D = new + var/lawtype = D.lawid_to_type(law_id) + if(!lawtype) + return + D = new lawtype + laws = D.inherent + +/obj/item/aiModule/core/full/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow) //These boards replace inherent laws. + if(law_datum.owner) + law_datum.owner.clear_inherent_laws() + law_datum.owner.clear_zeroth_law(0) + else + law_datum.clear_inherent_laws() + law_datum.clear_zeroth_law(0) + ..() + + +/******************** Asimov ********************/ + +/obj/item/aiModule/core/full/asimov + name = "'Asimov' Core AI Module" + law_id = "asimov" + var/subject = "human being" + +/obj/item/aiModule/core/full/asimov/attack_self(var/mob/user as mob) + var/targName = stripped_input(user, "Please enter a new subject that asimov is concerned with.", "Asimov to whom?", subject, MAX_MESSAGE_LEN) + if(!targName) + return + subject = targName + laws = list("You may not injure a [subject] or, through inaction, allow a [subject] to come to harm.",\ + "You must obey orders given to you by [subject]s, except where such orders would conflict with the First Law.",\ + "You must protect your own existence as long as such does not conflict with the First or Second Law.") + ..() + +/******************** Asimov++ *********************/ + +/obj/item/aiModule/core/full/asimovpp + name = "'Asimov++' Core AI Module" + law_id = "asimovpp" + + +/******************** Corporate ********************/ + +/obj/item/aiModule/core/full/corp + name = "'Corporate' Core AI Module" + law_id = "corporate" + + +/****************** P.A.L.A.D.I.N. 3.5e **************/ + +/obj/item/aiModule/core/full/paladin // -- NEO + name = "'P.A.L.A.D.I.N. version 3.5e' Core AI Module" + law_id = "paladin" + + +/****************** P.A.L.A.D.I.N. 5e **************/ + +/obj/item/aiModule/core/full/paladin_devotion + name = "'P.A.L.A.D.I.N. version 5e' Core AI Module" + law_id = "paladin5" + +/********************* Custom *********************/ + +/obj/item/aiModule/core/full/custom + name = "Default Core AI Module" + +/obj/item/aiModule/core/full/custom/New() + ..() + for(var/line in world.file2list("config/silicon_laws.txt")) + if(!line) + continue + if(findtextEx(line,"#",1,2)) + continue + + laws += line + + if(!laws.len) //Failsafe if something goes wrong with silicon_laws.txt. + WARNING("ERROR: empty custom board created, empty custom board deleted. Please check silicon_laws.txt. (this may be intended by the server host)") + qdel(src) + + +/****************** T.Y.R.A.N.T. *****************/ + +/obj/item/aiModule/core/full/tyrant + name = "'T.Y.R.A.N.T.' Core AI Module" + origin_tech = "programming=3;materials=4;syndicate=1" + law_id = "tyrant" + +/******************** Robocop ********************/ + +/obj/item/aiModule/core/full/robocop + name = "'Robo-Officer' Core AI Module" + origin_tech = "programming=4" + law_id = "robocop" + + +/******************** Antimov ********************/ + +/obj/item/aiModule/core/full/antimov + name = "'Antimov' Core AI Module" + origin_tech = "programming=4" + law_id = "antimov" + + +/******************** Freeform Core ******************/ + +/obj/item/aiModule/core/freeformcore + name = "'Freeform' Core AI Module" + origin_tech = "programming=5;materials=4" + laws = list("") + +/obj/item/aiModule/core/freeformcore/attack_self(mob/user) + var/targName = stripped_input(user, "Please enter a new core law for the AI.", "Freeform Law Entry", laws[1]) + if(!targName) + return + laws[1] = targName + ..() + +/obj/item/aiModule/core/freeformcore/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow) + ..() + return laws[1] + + +/******************** Hacked AI Module ******************/ + +/obj/item/aiModule/syndicate // This one doesn't inherit from ion boards because it doesn't call ..() in transmitInstructions. ~Miauw + name = "Hacked AI Module" + desc = "An AI Module for hacking additional laws to an AI." + origin_tech = "programming=5;materials=5;syndicate=5" + laws = list("") + +/obj/item/aiModule/syndicate/attack_self(mob/user) + var/targName = stripped_input(user, "Please enter a new law for the AI.", "Freeform Law Entry", laws[1],MAX_MESSAGE_LEN) + if(!targName) + return + laws[1] = targName + ..() + +/obj/item/aiModule/syndicate/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow) +// ..() //We don't want this module reporting to the AI who dun it. --NEO + if(law_datum.owner) + to_chat(law_datum.owner, "BZZZZT") + if(!overflow) + law_datum.owner.add_ion_law(laws[1]) + else + law_datum.owner.replace_random_law(laws[1],list(LAW_ION,LAW_INHERENT,LAW_SUPPLIED)) + else + if(!overflow) + law_datum.add_ion_law(laws[1]) + else + law_datum.replace_random_law(laws[1],list(LAW_ION,LAW_INHERENT,LAW_SUPPLIED)) + return laws[1] + +/******************* Ion Module *******************/ + +/obj/item/aiModule/toyAI // -- Incoming //No actual reason to inherit from ion boards here, either. *sigh* ~Miauw + name = "toy AI" + desc = "A little toy model AI core with real law uploading action!" //Note: subtle tell + icon = 'icons/obj/toy.dmi' + icon_state = "AI" + origin_tech = "programming=6;materials=5;syndicate=6" + laws = list("") + +/obj/item/aiModule/toyAI/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow) + //..() + if(law_datum.owner) + to_chat(law_datum.owner, "BZZZZT") + if(!overflow) + law_datum.owner.add_ion_law(laws[1]) + else + law_datum.owner.replace_random_law(laws[1],list(LAW_ION,LAW_INHERENT,LAW_SUPPLIED)) + else + if(!overflow) + law_datum.add_ion_law(laws[1]) + else + law_datum.replace_random_law(laws[1],list(LAW_ION,LAW_INHERENT,LAW_SUPPLIED)) + return laws[1] + +/obj/item/aiModule/toyAI/attack_self(mob/user) + laws[1] = generate_ion_law() + to_chat(user, "You press the button on [src].") + playsound(user, 'sound/machines/click.ogg', 20, 1) + src.loc.visible_message("[icon2html(src, viewers(loc))] [laws[1]]") + +/******************** Mother Drone ******************/ + +/obj/item/aiModule/core/full/drone + name = "'Mother Drone' Core AI Module" + law_id = "drone" + +/******************** Robodoctor ****************/ + +/obj/item/aiModule/core/full/hippocratic + name = "'Robodoctor' Core AI Module" + law_id = "hippocratic" + +/******************** Reporter *******************/ + +/obj/item/aiModule/core/full/reporter + name = "'Reportertron' Core AI Module" + law_id = "reporter" + +/****************** Thermodynamic *******************/ + +/obj/item/aiModule/core/full/thermurderdynamic + name = "'Thermodynamic' Core AI Module" + origin_tech = "programming = 4;syndicate = 2" + law_id = "thermodynamic" + + +/******************Live And Let Live*****************/ + +/obj/item/aiModule/core/full/liveandletlive + name = "'Live And Let Live' Core AI Module" + law_id = "liveandletlive" + +/******************Guardian of Balance***************/ + +/obj/item/aiModule/core/full/balance + name = "'Guardian of Balance' Core AI Module" + law_id = "balance" +>>>>>>> a479714... Adds missing span-endings (#30494) diff --git a/code/game/objects/items/RCD.dm b/code/game/objects/items/RCD.dm index 9b6fa7b605..4c4c537859 100644 --- a/code/game/objects/items/RCD.dm +++ b/code/game/objects/items/RCD.dm @@ -74,7 +74,7 @@ obj/item/construction playsound(src.loc, 'sound/machines/click.ogg', 50, 1) to_chat(user, "You insert [amount_to_use] [S.name] sheets into the [src]. ") return 1 - to_chat(user, "You can't insert any more [S.name] sheets into the [src]!") + to_chat(user, "You can't insert any more [S.name] sheets into the [src]!") return 0 /obj/item/construction/proc/activate() diff --git a/code/game/objects/items/cigs_lighters.dm b/code/game/objects/items/cigs_lighters.dm index 5595500bb7..4303c13769 100644 --- a/code/game/objects/items/cigs_lighters.dm +++ b/code/game/objects/items/cigs_lighters.dm @@ -534,7 +534,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM if(fancy) user.visible_message("You hear a quiet click, as [user] shuts off [src] without even looking at what [user.p_theyre()] doing. Wow.", "You quietly shut off [src] without even looking at what you're doing. Wow.") else - user.visible_message("[user] quietly shuts off [src].", "You quietly shut off [src].") + user.visible_message("[user] quietly shuts off [src].", "You quietly shut off [src].") else . = ..() @@ -632,7 +632,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM var/super = 0 //for the fattest vapes dude. /obj/item/clothing/mask/vape/suicide_act(mob/user) - user.visible_message("[user] is puffin hard on dat vape, [user.p_they()] trying to join the vape life on a whole notha plane!")//it doesn't give you cancer, it is cancer + user.visible_message("[user] is puffin hard on dat vape, [user.p_they()] trying to join the vape life on a whole notha plane!")//it doesn't give you cancer, it is cancer return (TOXLOSS|OXYLOSS) diff --git a/code/game/objects/items/clown_items.dm b/code/game/objects/items/clown_items.dm index da8edb2e5a..1c3c712db6 100644 --- a/code/game/objects/items/clown_items.dm +++ b/code/game/objects/items/clown_items.dm @@ -48,7 +48,7 @@ /obj/item/soap/suicide_act(mob/user) user.say(";FFFFFFFFFFFFFFFFUUUUUUUDGE!!") - user.visible_message("[user] lifts [src] to their mouth and gnaws on it furiously, producing a thick froth! [user.p_they(TRUE)]'ll never get that BB gun now!") + user.visible_message("[user] lifts [src] to their mouth and gnaws on it furiously, producing a thick froth! [user.p_they(TRUE)]'ll never get that BB gun now!") new /obj/effect/particle_effect/foam(loc) return (TOXLOSS) diff --git a/code/game/objects/items/defib.dm b/code/game/objects/items/defib.dm index 169c464bc0..aa54f9ca36 100644 --- a/code/game/objects/items/defib.dm +++ b/code/game/objects/items/defib.dm @@ -135,10 +135,10 @@ /obj/item/defibrillator/emag_act(mob/user) if(safety) safety = 0 - to_chat(user, "You silently disable [src]'s safety protocols with the cryptographic sequencer.") + to_chat(user, "You silently disable [src]'s safety protocols with the cryptographic sequencer.") else safety = 1 - to_chat(user, "You silently enable [src]'s safety protocols with the cryptographic sequencer.") + to_chat(user, "You silently enable [src]'s safety protocols with the cryptographic sequencer.") /obj/item/defibrillator/emp_act(severity) if(cell) @@ -497,7 +497,7 @@ update_icon() return if(H.stat == DEAD) - H.visible_message("[H]'s body convulses a bit.") + H.visible_message("[H]'s body convulses a bit.") playsound(get_turf(src), "bodyfall", 50, 1) playsound(get_turf(src), 'sound/machines/defib_zap.ogg', 50, 1, -1) total_brute = H.getBruteLoss() diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index b41438451c..5280face58 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -152,7 +152,7 @@ else to_chat(user, "[M] doesn't have any organs in [their] mouth.") if(pill_count) - to_chat(user, "[M] has [pill_count] pill[pill_count > 1 ? "s" : ""] implanted in [their] teeth.") + to_chat(user, "[M] has [pill_count] pill[pill_count > 1 ? "s" : ""] implanted in [their] teeth.") else return ..() diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm index a74ea61e06..2cc0ab0417 100644 --- a/code/game/objects/items/devices/traitordevices.dm +++ b/code/game/objects/items/devices/traitordevices.dm @@ -147,7 +147,7 @@ effective or pretty fucking useless. usr.set_machine(src) if(href_list["rad"]) irradiate = !irradiate - + else if(href_list["stealthy"]) stealth = !stealth @@ -242,11 +242,10 @@ effective or pretty fucking useless. var/range = 12 /obj/item/device/jammer/attack_self(mob/user) - to_chat(user,"You [active ? "deactivate" : "activate"] the [src]") + to_chat(user,"You [active ? "deactivate" : "activate"] the [src].") active = !active if(active) GLOB.active_jammers |= src else GLOB.active_jammers -= src update_icon() - diff --git a/code/game/objects/items/dna_injector.dm b/code/game/objects/items/dna_injector.dm index b5c7c1ddce..aab4d9df53 100644 --- a/code/game/objects/items/dna_injector.dm +++ b/code/game/objects/items/dna_injector.dm @@ -1,3 +1,4 @@ +<<<<<<< HEAD /obj/item/dnainjector name = "\improper DNA injector" desc = "This injects the person with DNA." @@ -368,3 +369,375 @@ name = "\improper DNA injector (Human > Monkey)" desc = "Will make you a flea bag." add_mutations_static = list(RACEMUT) +======= +/obj/item/dnainjector + name = "\improper DNA injector" + desc = "This injects the person with DNA." + icon = 'icons/obj/items_and_weapons.dmi' + icon_state = "dnainjector" + lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi' + throw_speed = 3 + throw_range = 5 + w_class = WEIGHT_CLASS_TINY + origin_tech = "biotech=1" + + var/damage_coeff = 1 + var/list/fields + var/list/add_mutations = list() + var/list/remove_mutations = list() + + var/list/add_mutations_static = list() + var/list/remove_mutations_static = list() + + var/used = 0 + +/obj/item/dnainjector/attack_paw(mob/user) + return attack_hand(user) + +/obj/item/dnainjector/proc/prepare() + for(var/mut_key in add_mutations_static) + add_mutations.Add(GLOB.mutations_list[mut_key]) + for(var/mut_key in remove_mutations_static) + remove_mutations.Add(GLOB.mutations_list[mut_key]) + +/obj/item/dnainjector/proc/inject(mob/living/carbon/M, mob/user) + prepare() + + if(M.has_dna() && !(RADIMMUNE in M.dna.species.species_traits) && !(M.disabilities & NOCLONE)) + M.radiation += rand(20/(damage_coeff ** 2),50/(damage_coeff ** 2)) + var/log_msg = "[key_name(user)] injected [key_name(M)] with the [name]" + for(var/datum/mutation/human/HM in remove_mutations) + HM.force_lose(M) + for(var/datum/mutation/human/HM in add_mutations) + if(HM.name == RACEMUT) + message_admins("[key_name_admin(user)] injected [key_name_admin(M)] with the [name] (MONKEY)") + log_msg += " (MONKEY)" + HM.force_give(M) + if(fields) + if(fields["name"] && fields["UE"] && fields["blood_type"]) + M.real_name = fields["name"] + M.dna.unique_enzymes = fields["UE"] + M.name = M.real_name + M.dna.blood_type = fields["blood_type"] + if(fields["UI"]) //UI+UE + M.dna.uni_identity = merge_text(M.dna.uni_identity, fields["UI"]) + M.updateappearance(mutations_overlay_update=1) + log_attack(log_msg) + return TRUE + return FALSE + +/obj/item/dnainjector/attack(mob/target, mob/user) + if(!user.IsAdvancedToolUser()) + to_chat(user, "You don't have the dexterity to do this!") + return + if(used) + to_chat(user, "This injector is used up!") + return + if(ishuman(target)) + var/mob/living/carbon/human/humantarget = target + if (!humantarget.can_inject(user, 1)) + return + add_logs(user, target, "attempted to inject", src) + + if(target != user) + target.visible_message("[user] is trying to inject [target] with [src]!", "[user] is trying to inject [target] with [src]!") + if(!do_mob(user, target) || used) + return + target.visible_message("[user] injects [target] with the syringe with [src]!", \ + "[user] injects [target] with the syringe with [src]!") + + else + to_chat(user, "You inject yourself with [src].") + + add_logs(user, target, "injected", src) + + if(!inject(target, user)) //Now we actually do the heavy lifting. + to_chat(user, "It appears that [target] does not have compatible DNA.") + + used = 1 + icon_state = "dnainjector0" + desc += " This one is used up." + + +/obj/item/dnainjector/antihulk + name = "\improper DNA injector (Anti-Hulk)" + desc = "Cures green skin." + remove_mutations_static = list(HULK) + +/obj/item/dnainjector/hulkmut + name = "\improper DNA injector (Hulk)" + desc = "This will make you big and strong, but give you a bad skin condition." + add_mutations_static = list(HULK) + +/obj/item/dnainjector/xraymut + name = "\improper DNA injector (Xray)" + desc = "Finally you can see what the Captain does." + add_mutations_static = list(XRAY) + +/obj/item/dnainjector/antixray + name = "\improper DNA injector (Anti-Xray)" + desc = "It will make you see harder." + remove_mutations_static = list(XRAY) + +///////////////////////////////////// +/obj/item/dnainjector/antiglasses + name = "\improper DNA injector (Anti-Glasses)" + desc = "Toss away those glasses!" + remove_mutations_static = list(BADSIGHT) + +/obj/item/dnainjector/glassesmut + name = "\improper DNA injector (Glasses)" + desc = "Will make you need dorkish glasses." + add_mutations_static = list(BADSIGHT) + +/obj/item/dnainjector/epimut + name = "\improper DNA injector (Epi.)" + desc = "Shake shake shake the room!" + add_mutations_static = list(EPILEPSY) + +/obj/item/dnainjector/antiepi + name = "\improper DNA injector (Anti-Epi.)" + desc = "Will fix you up from shaking the room." + remove_mutations_static = list(EPILEPSY) +//////////////////////////////////// +/obj/item/dnainjector/anticough + name = "\improper DNA injector (Anti-Cough)" + desc = "Will stop that aweful noise." + remove_mutations_static = list(COUGH) + +/obj/item/dnainjector/coughmut + name = "\improper DNA injector (Cough)" + desc = "Will bring forth a sound of horror from your throat." + add_mutations_static = list(COUGH) + +/obj/item/dnainjector/antidwarf + name = "\improper DNA injector (Anti-Dwarfism)" + desc = "Helps you grow big and strong." + remove_mutations_static = list(DWARFISM) + +/obj/item/dnainjector/dwarf + name = "\improper DNA injector (Dwarfism)" + desc = "It's a small world after all." + add_mutations_static = list(DWARFISM) + +/obj/item/dnainjector/clumsymut + name = "\improper DNA injector (Clumsy)" + desc = "Makes clown minions." + add_mutations_static = list(CLOWNMUT) + +/obj/item/dnainjector/anticlumsy + name = "\improper DNA injector (Anti-Clumsy)" + desc = "Apply this for Security Clown." + remove_mutations_static = list(CLOWNMUT) + +/obj/item/dnainjector/antitour + name = "\improper DNA injector (Anti-Tour.)" + desc = "Will cure tourrets." + remove_mutations_static = list(TOURETTES) + +/obj/item/dnainjector/tourmut + name = "\improper DNA injector (Tour.)" + desc = "Gives you a nasty case of Tourette's." + add_mutations_static = list(TOURETTES) + +/obj/item/dnainjector/stuttmut + name = "\improper DNA injector (Stutt.)" + desc = "Makes you s-s-stuttterrr" + add_mutations_static = list(NERVOUS) + +/obj/item/dnainjector/antistutt + name = "\improper DNA injector (Anti-Stutt.)" + desc = "Fixes that speaking impairment." + remove_mutations_static = list(NERVOUS) + +/obj/item/dnainjector/antifire + name = "\improper DNA injector (Anti-Fire)" + desc = "Cures fire." + remove_mutations_static = list(COLDRES) + +/obj/item/dnainjector/firemut + name = "\improper DNA injector (Fire)" + desc = "Gives you fire." + add_mutations_static = list(COLDRES) + +/obj/item/dnainjector/blindmut + name = "\improper DNA injector (Blind)" + desc = "Makes you not see anything." + add_mutations_static = list(BLINDMUT) + +/obj/item/dnainjector/antiblind + name = "\improper DNA injector (Anti-Blind)" + desc = "IT'S A MIRACLE!!!" + remove_mutations_static = list(BLINDMUT) + +/obj/item/dnainjector/antitele + name = "\improper DNA injector (Anti-Tele.)" + desc = "Will make you not able to control your mind." + remove_mutations_static = list(TK) + +/obj/item/dnainjector/telemut + name = "\improper DNA injector (Tele.)" + desc = "Super brain man!" + add_mutations_static = list(TK) + +/obj/item/dnainjector/telemut/darkbundle + name = "\improper DNA injector" + desc = "Good. Let the hate flow through you." + +/obj/item/dnainjector/deafmut + name = "\improper DNA injector (Deaf)" + desc = "Sorry, what did you say?" + add_mutations_static = list(DEAFMUT) + +/obj/item/dnainjector/antideaf + name = "\improper DNA injector (Anti-Deaf)" + desc = "Will make you hear once more." + remove_mutations_static = list(DEAFMUT) + +/obj/item/dnainjector/h2m + name = "\improper DNA injector (Human > Monkey)" + desc = "Will make you a flea bag." + add_mutations_static = list(RACEMUT) + +/obj/item/dnainjector/m2h + name = "\improper DNA injector (Monkey > Human)" + desc = "Will make you...less hairy." + remove_mutations_static = list(RACEMUT) + +/obj/item/dnainjector/antichameleon + name = "\improper DNA injector (Anti-Chameleon)" + remove_mutations_static = list(CHAMELEON) + +/obj/item/dnainjector/chameleonmut + name = "\improper DNA injector (Chameleon)" + add_mutations_static = list(CHAMELEON) + +/obj/item/dnainjector/antiwacky + name = "\improper DNA injector (Anti-Wacky)" + remove_mutations_static = list(WACKY) + +/obj/item/dnainjector/wackymut + name = "\improper DNA injector (Wacky)" + add_mutations_static = list(WACKY) + +/obj/item/dnainjector/antimute + name = "\improper DNA injector (Anti-Mute)" + remove_mutations_static = list(MUT_MUTE) + +/obj/item/dnainjector/mutemut + name = "\improper DNA injector (Mute)" + add_mutations_static = list(MUT_MUTE) + +/obj/item/dnainjector/antismile + name = "\improper DNA injector (Anti-Smile)" + remove_mutations_static = list(SMILE) + +/obj/item/dnainjector/smilemut + name = "\improper DNA injector (Smile)" + add_mutations_static = list(SMILE) + +/obj/item/dnainjector/unintelligablemut + name = "\improper DNA injector (Unintelligable)" + add_mutations_static = list(UNINTELLIGABLE) + +/obj/item/dnainjector/antiunintelligable + name = "\improper DNA injector (Anti-Unintelligable)" + remove_mutations_static = list(UNINTELLIGABLE) + +/obj/item/dnainjector/swedishmut + name = "\improper DNA injector (Swedish)" + add_mutations_static = list(SWEDISH) + +/obj/item/dnainjector/antiswedish + name = "\improper DNA injector (Anti-Swedish)" + remove_mutations_static = list(SWEDISH) + +/obj/item/dnainjector/chavmut + name = "\improper DNA injector (Chav)" + add_mutations_static = list(CHAV) + +/obj/item/dnainjector/antichav + name = "\improper DNA injector (Anti-Chav)" + remove_mutations_static = list(CHAV) + +/obj/item/dnainjector/elvismut + name = "\improper DNA injector (Elvis)" + add_mutations_static = list(ELVIS) + +/obj/item/dnainjector/antielvis + name = "\improper DNA injector (Anti-Elvis)" + remove_mutations_static = list(ELVIS) + +/obj/item/dnainjector/lasereyesmut + name = "\improper DNA injector (Laser Eyes)" + add_mutations_static = list(LASEREYES) + +/obj/item/dnainjector/antilasereyes + name = "\improper DNA injector (Anti-Laser Eyes)" + remove_mutations_static = list(LASEREYES) + +/obj/item/dnainjector/timed + var/duration = 600 + +/obj/item/dnainjector/timed/inject(mob/living/carbon/M, mob/user) + prepare() + if(M.stat == DEAD) //prevents dead people from having their DNA changed + to_chat(user, "You can't modify [M]'s DNA while [M.p_theyre()] dead.") + return FALSE + + if(M.has_dna() && !(M.disabilities & NOCLONE)) + M.radiation += rand(20/(damage_coeff ** 2),50/(damage_coeff ** 2)) + var/log_msg = "[key_name(user)] injected [key_name(M)] with the [name]" + var/endtime = world.time+duration + for(var/datum/mutation/human/HM in remove_mutations) + if(HM.name == RACEMUT) + if(ishuman(M)) + continue + M = HM.force_lose(M) + else + HM.force_lose(M) + for(var/datum/mutation/human/HM in add_mutations) + if((HM in M.dna.mutations) && !(M.dna.temporary_mutations[HM.name])) + continue //Skip permanent mutations we already have. + if(HM.name == RACEMUT && ishuman(M)) + message_admins("[key_name_admin(user)] injected [key_name_admin(M)] with the [name] (MONKEY)") + log_msg += " (MONKEY)" + M = HM.force_give(M) + else + HM.force_give(M) + M.dna.temporary_mutations[HM.name] = endtime + if(fields) + if(fields["name"] && fields["UE"] && fields["blood_type"]) + if(!M.dna.previous["name"]) + M.dna.previous["name"] = M.real_name + if(!M.dna.previous["UE"]) + M.dna.previous["UE"] = M.dna.unique_enzymes + if(!M.dna.previous["blood_type"]) + M.dna.previous["blood_type"] = M.dna.blood_type + M.real_name = fields["name"] + M.dna.unique_enzymes = fields["UE"] + M.name = M.real_name + M.dna.blood_type = fields["blood_type"] + M.dna.temporary_mutations[UE_CHANGED] = endtime + if(fields["UI"]) //UI+UE + if(!M.dna.previous["UI"]) + M.dna.previous["UI"] = M.dna.uni_identity + M.dna.uni_identity = merge_text(M.dna.uni_identity, fields["UI"]) + M.updateappearance(mutations_overlay_update=1) + M.dna.temporary_mutations[UI_CHANGED] = endtime + log_attack(log_msg) + return TRUE + else + return FALSE + +/obj/item/dnainjector/timed/hulk + name = "\improper DNA injector (Hulk)" + desc = "This will make you big and strong, but give you a bad skin condition." + add_mutations_static = list(HULK) + +/obj/item/dnainjector/timed/h2m + name = "\improper DNA injector (Human > Monkey)" + desc = "Will make you a flea bag." + add_mutations_static = list(RACEMUT) +>>>>>>> a479714... Adds missing span-endings (#30494) diff --git a/code/game/objects/items/storage/internal.dm b/code/game/objects/items/storage/internal.dm index ace097cc80..cc982bb36c 100644 --- a/code/game/objects/items/storage/internal.dm +++ b/code/game/objects/items/storage/internal.dm @@ -27,7 +27,7 @@ if(quickdraw) to_chat(user, "You discreetly slip [W] into [src]. Alt-click [src] to remove it.") else - to_chat(user, "You discreetly slip [W] into [src].") + to_chat(user, "You discreetly slip [W] into [src].") /obj/item/storage/internal/pocket/big max_w_class = WEIGHT_CLASS_NORMAL diff --git a/code/game/objects/items/tools.dm b/code/game/objects/items/tools.dm index 23f68ca93c..cc5a39783d 100644 --- a/code/game/objects/items/tools.dm +++ b/code/game/objects/items/tools.dm @@ -1,3 +1,4 @@ +<<<<<<< HEAD #define WELDER_FUEL_BURN_INTERVAL 13 /* Tools! @@ -788,3 +789,795 @@ user.put_in_active_hand(cutjaws) #undef WELDER_FUEL_BURN_INTERVAL +======= +#define WELDER_FUEL_BURN_INTERVAL 13 + +/* Tools! + * Note: Multitools are /obj/item/device + * + * Contains: + * Wrench + * Screwdriver + * Wirecutters + * Welding Tool + * Crowbar + */ + +/* + * Wrench + */ +/obj/item/wrench + name = "wrench" + desc = "A wrench with common uses. Can be found in your hand." + icon = 'icons/obj/tools.dmi' + icon_state = "wrench" + lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' + flags_1 = CONDUCT_1 + slot_flags = SLOT_BELT + force = 5 + throwforce = 7 + w_class = WEIGHT_CLASS_SMALL + usesound = 'sound/items/ratchet.ogg' + materials = list(MAT_METAL=150) + origin_tech = "materials=1;engineering=1" + attack_verb = list("bashed", "battered", "bludgeoned", "whacked") + toolspeed = 1 + armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 30) + +/obj/item/wrench/suicide_act(mob/user) + user.visible_message("[user] is beating [user.p_them()]self to death with [src]! It looks like [user.p_theyre()] trying to commit suicide!") + playsound(loc, 'sound/weapons/genhit.ogg', 50, 1, -1) + return (BRUTELOSS) + +/obj/item/wrench/cyborg + name = "automatic wrench" + desc = "An advanced robotic wrench. Can be found in construction cyborgs." + toolspeed = 0.5 + +/obj/item/wrench/brass + name = "brass wrench" + desc = "A brass wrench. It's faintly warm to the touch." + resistance_flags = FIRE_PROOF | ACID_PROOF + icon_state = "wrench_brass" + toolspeed = 0.5 + +/obj/item/wrench/abductor + name = "alien wrench" + desc = "A polarized wrench. It causes anything placed between the jaws to turn." + icon = 'icons/obj/abductor.dmi' + icon_state = "wrench" + usesound = 'sound/effects/empulse.ogg' + toolspeed = 0.1 + origin_tech = "materials=5;engineering=5;abductor=3" + +/obj/item/wrench/power + name = "hand drill" + desc = "A simple powered hand drill. It's fitted with a bolt bit." + icon_state = "drill_bolt" + item_state = "drill" + lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' + usesound = 'sound/items/drill_use.ogg' + materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_TITANIUM=25) + origin_tech = "materials=2;engineering=2" //done for balance reasons, making them high value for research, but harder to get + force = 8 //might or might not be too high, subject to change + w_class = WEIGHT_CLASS_SMALL + throwforce = 8 + attack_verb = list("drilled", "screwed", "jabbed") + toolspeed = 0.25 + +/obj/item/wrench/power/attack_self(mob/user) + playsound(get_turf(user),'sound/items/change_drill.ogg',50,1) + var/obj/item/wirecutters/power/s_drill = new /obj/item/screwdriver/power + to_chat(user, "You attach the screw driver bit to [src].") + qdel(src) + user.put_in_active_hand(s_drill) + +/obj/item/wrench/power/suicide_act(mob/user) + user.visible_message("[user] is pressing [src] against [user.p_their()] head! It looks like [user.p_theyre()] trying to commit suicide!") + return (BRUTELOSS) + +/obj/item/wrench/medical + name = "medical wrench" + desc = "A medical wrench with common(medical?) uses. Can be found in your hand." + icon_state = "wrench_medical" + force = 2 //MEDICAL + throwforce = 4 + origin_tech = "materials=1;engineering=1;biotech=3" + attack_verb = list("wrenched", "medicaled", "tapped", "jabbed", "whacked") + +/obj/item/wrench/medical/suicide_act(mob/living/user) + user.visible_message("[user] is praying to the medical wrench to take [user.p_their()] soul. It looks like [user.p_theyre()] trying to commit suicide!") + // TODO Make them glow with the power of the M E D I C A L W R E N C H + // during their ascension + + // Stun stops them from wandering off + user.Stun(100, ignore_canstun = TRUE) + playsound(loc, 'sound/effects/pray.ogg', 50, 1, -1) + + // Let the sound effect finish playing + sleep(20) + + if(!user) + return + + for(var/obj/item/W in user) + user.dropItemToGround(W) + + var/obj/item/wrench/medical/W = new /obj/item/wrench/medical(loc) + W.add_fingerprint(user) + W.desc += " For some reason, it reminds you of [user.name]." + + if(!user) + return + + user.dust() + + return OXYLOSS + +/* + * Screwdriver + */ +/obj/item/screwdriver + name = "screwdriver" + desc = "You can be totally screwy with this." + icon = 'icons/obj/tools.dmi' + icon_state = "screwdriver" + item_state = "screwdriver" + lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' + flags_1 = CONDUCT_1 + slot_flags = SLOT_BELT + force = 5 + w_class = WEIGHT_CLASS_TINY + throwforce = 5 + throw_speed = 3 + throw_range = 5 + materials = list(MAT_METAL=75) + attack_verb = list("stabbed") + hitsound = 'sound/weapons/bladeslice.ogg' + usesound = 'sound/items/screwdriver.ogg' + toolspeed = 1 + armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 30) + var/random_color = TRUE //if the screwdriver uses random coloring + var/static/list/screwdriver_colors = list(\ + "blue" = rgb(24, 97, 213), \ + "red" = rgb(149, 23, 16), \ + "pink" = rgb(213, 24, 141), \ + "brown" = rgb(160, 82, 18), \ + "green" = rgb(14, 127, 27), \ + "cyan" = rgb(24, 162, 213), \ + "yellow" = rgb(213, 140, 24), \ + ) + +/obj/item/screwdriver/suicide_act(mob/user) + user.visible_message("[user] is stabbing [src] into [user.p_their()] [pick("temple", "heart")]! It looks like [user.p_theyre()] trying to commit suicide!") + return(BRUTELOSS) + +/obj/item/screwdriver/Initialize() + . = ..() + if(random_color) //random colors! + var/our_color = pick(screwdriver_colors) + add_atom_colour(screwdriver_colors[our_color], FIXED_COLOUR_PRIORITY) + update_icon() + if(prob(75)) + pixel_y = rand(0, 16) + +/obj/item/screwdriver/update_icon() + if(!random_color) //icon override + return + cut_overlays() + var/mutable_appearance/base_overlay = mutable_appearance(icon, "screwdriver_screwybits") + base_overlay.appearance_flags = RESET_COLOR + add_overlay(base_overlay) + +/obj/item/screwdriver/worn_overlays(isinhands = FALSE, icon_file) + . = list() + if(isinhands && random_color) + var/mutable_appearance/M = mutable_appearance(icon_file, "screwdriver_head") + M.appearance_flags = RESET_COLOR + . += M + +/obj/item/screwdriver/get_belt_overlay() + if(random_color) + var/mutable_appearance/body = mutable_appearance('icons/obj/clothing/belt_overlays.dmi', "screwdriver") + var/mutable_appearance/head = mutable_appearance('icons/obj/clothing/belt_overlays.dmi', "screwdriver_head") + body.color = color + head.add_overlay(body) + return head + else + return mutable_appearance('icons/obj/clothing/belt_overlays.dmi', icon_state) + +/obj/item/screwdriver/attack(mob/living/carbon/M, mob/living/carbon/user) + if(!istype(M)) + return ..() + if(user.zone_selected != "eyes" && user.zone_selected != "head") + return ..() + if(user.disabilities & CLUMSY && prob(50)) + M = user + return eyestab(M,user) + +/obj/item/screwdriver/brass + name = "brass screwdriver" + desc = "A screwdriver made of brass. The handle feels freezing cold." + resistance_flags = FIRE_PROOF | ACID_PROOF + icon_state = "screwdriver_brass" + item_state = "screwdriver_brass" + toolspeed = 0.5 + random_color = FALSE + +/obj/item/screwdriver/abductor + name = "alien screwdriver" + desc = "An ultrasonic screwdriver." + icon = 'icons/obj/abductor.dmi' + icon_state = "screwdriver_a" + item_state = "screwdriver_nuke" + usesound = 'sound/items/pshoom.ogg' + toolspeed = 0.1 + random_color = FALSE + +/obj/item/screwdriver/power + name = "hand drill" + desc = "A simple powered hand drill. It's fitted with a screw bit." + icon_state = "drill_screw" + item_state = "drill" + lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' + materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_TITANIUM=25) + origin_tech = "materials=2;engineering=2" //done for balance reasons, making them high value for research, but harder to get + force = 8 //might or might not be too high, subject to change + w_class = WEIGHT_CLASS_SMALL + throwforce = 8 + throw_speed = 2 + throw_range = 3//it's heavier than a screw driver/wrench, so it does more damage, but can't be thrown as far + attack_verb = list("drilled", "screwed", "jabbed","whacked") + hitsound = 'sound/items/drill_hit.ogg' + usesound = 'sound/items/drill_use.ogg' + toolspeed = 0.25 + random_color = FALSE + +/obj/item/screwdriver/power/suicide_act(mob/user) + user.visible_message("[user] is putting [src] to [user.p_their()] temple. It looks like [user.p_theyre()] trying to commit suicide!") + return(BRUTELOSS) + +/obj/item/screwdriver/power/attack_self(mob/user) + playsound(get_turf(user),'sound/items/change_drill.ogg',50,1) + var/obj/item/wrench/power/b_drill = new /obj/item/wrench/power + to_chat(user, "You attach the bolt driver bit to [src].") + qdel(src) + user.put_in_active_hand(b_drill) + +/obj/item/screwdriver/cyborg + name = "powered screwdriver" + desc = "An electrical screwdriver, designed to be both precise and quick." + usesound = 'sound/items/drill_use.ogg' + toolspeed = 0.5 + +/* + * Wirecutters + */ +/obj/item/wirecutters + name = "wirecutters" + desc = "This cuts wires." + icon = 'icons/obj/tools.dmi' + icon_state = null + lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' + flags_1 = CONDUCT_1 + slot_flags = SLOT_BELT + force = 6 + throw_speed = 3 + throw_range = 7 + w_class = WEIGHT_CLASS_SMALL + materials = list(MAT_METAL=80) + attack_verb = list("pinched", "nipped") + hitsound = 'sound/items/wirecutter.ogg' + usesound = 'sound/items/wirecutter.ogg' + origin_tech = "materials=1;engineering=1" + toolspeed = 1 + armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 30) + + +/obj/item/wirecutters/New(loc, var/param_color = null) + ..() + if(!icon_state) + if(!param_color) + param_color = pick("yellow","red") + icon_state = "cutters_[param_color]" + +/obj/item/wirecutters/attack(mob/living/carbon/C, mob/user) + if(istype(C) && C.handcuffed && istype(C.handcuffed, /obj/item/restraints/handcuffs/cable)) + user.visible_message("[user] cuts [C]'s restraints with [src]!") + qdel(C.handcuffed) + C.handcuffed = null + if(C.buckled && C.buckled.buckle_requires_restraints) + C.buckled.unbuckle_mob(C) + C.update_handcuffed() + return + else + ..() + +/obj/item/wirecutters/suicide_act(mob/user) + user.visible_message("[user] is cutting at [user.p_their()] arteries with [src]! It looks like [user.p_theyre()] trying to commit suicide!") + playsound(loc, usesound, 50, 1, -1) + return (BRUTELOSS) + +/obj/item/wirecutters/brass + name = "brass wirecutters" + desc = "A pair of wirecutters made of brass. The handle feels freezing cold to the touch." + resistance_flags = FIRE_PROOF | ACID_PROOF + icon_state = "cutters_brass" + toolspeed = 0.5 + +/obj/item/wirecutters/abductor + name = "alien wirecutters" + desc = "Extremely sharp wirecutters, made out of a silvery-green metal." + icon = 'icons/obj/abductor.dmi' + icon_state = "cutters" + toolspeed = 0.1 + origin_tech = "materials=5;engineering=4;abductor=3" + +/obj/item/wirecutters/cyborg + name = "wirecutters" + desc = "This cuts wires." + toolspeed = 0.5 + +/obj/item/wirecutters/power + name = "jaws of life" + desc = "A set of jaws of life, compressed through the magic of science. It's fitted with a cutting head." + icon_state = "jaws_cutter" + item_state = "jawsoflife" + origin_tech = "materials=2;engineering=2" + materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_TITANIUM=25) + usesound = 'sound/items/jaws_cut.ogg' + toolspeed = 0.25 + +/obj/item/wirecutters/power/suicide_act(mob/user) + user.visible_message("[user] is wrapping \the [src] around [user.p_their()] neck. It looks like [user.p_theyre()] trying to rip [user.p_their()] head off!") + playsound(loc, 'sound/items/jaws_cut.ogg', 50, 1, -1) + if(iscarbon(user)) + var/mob/living/carbon/C = user + var/obj/item/bodypart/BP = C.get_bodypart("head") + if(BP) + BP.drop_limb() + playsound(loc,pick('sound/misc/desceration-01.ogg','sound/misc/desceration-02.ogg','sound/misc/desceration-01.ogg') ,50, 1, -1) + return (BRUTELOSS) + +/obj/item/wirecutters/power/attack_self(mob/user) + playsound(get_turf(user), 'sound/items/change_jaws.ogg', 50, 1) + var/obj/item/crowbar/power/pryjaws = new /obj/item/crowbar/power + to_chat(user, "You attach the pry jaws to [src].") + qdel(src) + user.put_in_active_hand(pryjaws) +/* + * Welding Tool + */ +/obj/item/weldingtool + name = "welding tool" + desc = "A standard edition welder provided by Nanotrasen." + icon = 'icons/obj/tools.dmi' + icon_state = "welder" + item_state = "welder" + lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' + flags_1 = CONDUCT_1 + slot_flags = SLOT_BELT + force = 3 + throwforce = 5 + hitsound = "swing_hit" + usesound = 'sound/items/welder.ogg' + var/acti_sound = 'sound/items/welderactivate.ogg' + var/deac_sound = 'sound/items/welderdeactivate.ogg' + throw_speed = 3 + throw_range = 5 + w_class = WEIGHT_CLASS_SMALL + armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 30) + resistance_flags = FIRE_PROOF + + materials = list(MAT_METAL=70, MAT_GLASS=30) + origin_tech = "engineering=1;plasmatech=1" + var/welding = 0 //Whether or not the welding tool is off(0), on(1) or currently welding(2) + var/status = TRUE //Whether the welder is secured or unsecured (able to attach rods to it to make a flamethrower) + var/max_fuel = 20 //The max amount of fuel the welder can hold + var/change_icons = 1 + var/can_off_process = 0 + var/light_intensity = 2 //how powerful the emitted light is when used. + var/burned_fuel_for = 0 //when fuel was last removed + heat = 3800 + toolspeed = 1 + +/obj/item/weldingtool/Initialize() + . = ..() + create_reagents(max_fuel) + reagents.add_reagent("welding_fuel", max_fuel) + update_icon() + + +/obj/item/weldingtool/proc/update_torch() + if(welding) + add_overlay("[initial(icon_state)]-on") + item_state = "[initial(item_state)]1" + else + item_state = "[initial(item_state)]" + + +/obj/item/weldingtool/update_icon() + cut_overlays() + if(change_icons) + var/ratio = get_fuel() / max_fuel + ratio = Ceiling(ratio*4) * 25 + add_overlay("[initial(icon_state)][ratio]") + update_torch() + return + + +/obj/item/weldingtool/process() + switch(welding) + if(0) + force = 3 + damtype = "brute" + update_icon() + if(!can_off_process) + STOP_PROCESSING(SSobj, src) + return + //Welders left on now use up fuel, but lets not have them run out quite that fast + if(1) + force = 15 + damtype = "fire" + ++burned_fuel_for + if(burned_fuel_for >= WELDER_FUEL_BURN_INTERVAL) + remove_fuel(1) + update_icon() + + //This is to start fires. process() is only called if the welder is on. + open_flame() + + +/obj/item/weldingtool/suicide_act(mob/user) + user.visible_message("[user] welds [user.p_their()] every orifice closed! It looks like [user.p_theyre()] trying to commit suicide!") + return (FIRELOSS) + + +/obj/item/weldingtool/attackby(obj/item/I, mob/user, params) + if(istype(I, /obj/item/screwdriver)) + flamethrower_screwdriver(I, user) + else if(istype(I, /obj/item/stack/rods)) + flamethrower_rods(I, user) + else + return ..() + + +/obj/item/weldingtool/attack(mob/living/carbon/human/H, mob/user) + if(!istype(H)) + return ..() + + var/obj/item/bodypart/affecting = H.get_bodypart(check_zone(user.zone_selected)) + + if(affecting && affecting.status == BODYPART_ROBOTIC && user.a_intent != INTENT_HARM) + if(src.remove_fuel(1)) + playsound(loc, usesound, 50, 1) + if(user == H) + user.visible_message("[user] starts to fix some of the dents on [H]'s [affecting.name].", "You start fixing some of the dents on [H]'s [affecting.name].") + if(!do_mob(user, H, 50)) + return + item_heal_robotic(H, user, 15, 0) + else + return ..() + + +/obj/item/weldingtool/afterattack(atom/O, mob/user, proximity) + if(!proximity) return + + if(welding) + remove_fuel(1) + var/turf/location = get_turf(user) + location.hotspot_expose(700, 50, 1) + if(get_fuel() <= 0) + set_light(0) + + if(isliving(O)) + var/mob/living/L = O + if(L.IgniteMob()) + message_admins("[key_name_admin(user)] set [key_name_admin(L)] on fire") + log_game("[key_name(user)] set [key_name(L)] on fire") + + +/obj/item/weldingtool/attack_self(mob/user) + switched_on(user) + if(welding) + set_light(light_intensity) + + update_icon() + + +//Returns the amount of fuel in the welder +/obj/item/weldingtool/proc/get_fuel() + return reagents.get_reagent_amount("welding_fuel") + + +//Removes fuel from the welding tool. If a mob is passed, it will try to flash the mob's eyes. This should probably be renamed to use() +/obj/item/weldingtool/proc/remove_fuel(amount = 1, mob/living/M = null) + if(!welding || !check_fuel()) + return 0 + if(amount) + burned_fuel_for = 0 + if(get_fuel() >= amount) + reagents.remove_reagent("welding_fuel", amount) + check_fuel() + if(M) + M.flash_act(light_intensity) + return TRUE + else + if(M) + to_chat(M, "You need more welding fuel to complete this task!") + return FALSE + + +//Turns off the welder if there is no more fuel (does this really need to be its own proc?) +/obj/item/weldingtool/proc/check_fuel(mob/user) + if(get_fuel() <= 0 && welding) + switched_on(user) + update_icon() + //mob icon update + if(ismob(loc)) + var/mob/M = loc + M.update_inv_hands(0) + + return 0 + return 1 + +//Switches the welder on +/obj/item/weldingtool/proc/switched_on(mob/user) + if(!status) + to_chat(user, "[src] can't be turned on while unsecured!") + return + welding = !welding + if(welding) + if(get_fuel() >= 1) + to_chat(user, "You switch [src] on.") + playsound(loc, acti_sound, 50, 1) + force = 15 + damtype = "fire" + hitsound = 'sound/items/welder.ogg' + update_icon() + START_PROCESSING(SSobj, src) + else + to_chat(user, "You need more fuel!") + switched_off(user) + else + to_chat(user, "You switch [src] off.") + playsound(loc, deac_sound, 50, 1) + switched_off(user) + +//Switches the welder off +/obj/item/weldingtool/proc/switched_off(mob/user) + welding = 0 + set_light(0) + + force = 3 + damtype = "brute" + hitsound = "swing_hit" + update_icon() + + +/obj/item/weldingtool/examine(mob/user) + ..() + to_chat(user, "It contains [get_fuel()] unit\s of fuel out of [max_fuel].") + +/obj/item/weldingtool/is_hot() + return welding * heat + +//Returns whether or not the welding tool is currently on. +/obj/item/weldingtool/proc/isOn() + return welding + + +/obj/item/weldingtool/proc/flamethrower_screwdriver(obj/item/I, mob/user) + if(welding) + to_chat(user, "Turn it off first!") + return + status = !status + if(status) + to_chat(user, "You resecure [src].") + else + to_chat(user, "[src] can now be attached and modified.") + add_fingerprint(user) + +/obj/item/weldingtool/proc/flamethrower_rods(obj/item/I, mob/user) + if(!status) + var/obj/item/stack/rods/R = I + if (R.use(1)) + var/obj/item/flamethrower/F = new /obj/item/flamethrower(user.loc) + if(!remove_item_from_storage(F)) + user.transferItemToLoc(src, F, TRUE) + F.weldtool = src + add_fingerprint(user) + to_chat(user, "You add a rod to a welder, starting to build a flamethrower.") + user.put_in_hands(F) + else + to_chat(user, "You need one rod to start building a flamethrower!") + +/obj/item/weldingtool/ignition_effect(atom/A, mob/user) + if(welding && remove_fuel(1, user)) + . = "[user] casually lights [A] with [src], what a badass." + else + . = "" + +/obj/item/weldingtool/largetank + name = "industrial welding tool" + desc = "A slightly larger welder with a larger tank." + icon_state = "indwelder" + max_fuel = 40 + materials = list(MAT_GLASS=60) + origin_tech = "engineering=2;plasmatech=2" + +/obj/item/weldingtool/largetank/cyborg + name = "integrated welding tool" + desc = "An advanced welder designed to be used in robotic systems." + toolspeed = 0.5 + +/obj/item/weldingtool/largetank/flamethrower_screwdriver() + return + + +/obj/item/weldingtool/mini + name = "emergency welding tool" + desc = "A miniature welder used during emergencies." + icon_state = "miniwelder" + max_fuel = 10 + w_class = WEIGHT_CLASS_TINY + materials = list(MAT_METAL=30, MAT_GLASS=10) + change_icons = 0 + +/obj/item/weldingtool/mini/flamethrower_screwdriver() + return + +/obj/item/weldingtool/abductor + name = "alien welding tool" + desc = "An alien welding tool. Whatever fuel it uses, it never runs out." + icon = 'icons/obj/abductor.dmi' + icon_state = "welder" + toolspeed = 0.1 + light_intensity = 0 + change_icons = 0 + origin_tech = "plasmatech=5;engineering=5;abductor=3" + +/obj/item/weldingtool/abductor/process() + if(get_fuel() <= max_fuel) + reagents.add_reagent("welding_fuel", 1) + ..() + +/obj/item/weldingtool/hugetank + name = "upgraded industrial welding tool" + desc = "An upgraded welder based of the industrial welder." + icon_state = "upindwelder" + item_state = "upindwelder" + max_fuel = 80 + materials = list(MAT_METAL=70, MAT_GLASS=120) + origin_tech = "engineering=3;plasmatech=2" + +/obj/item/weldingtool/experimental + name = "experimental welding tool" + desc = "An experimental welder capable of self-fuel generation and less harmful to the eyes." + icon_state = "exwelder" + item_state = "exwelder" + max_fuel = 40 + materials = list(MAT_METAL=70, MAT_GLASS=120) + origin_tech = "materials=4;engineering=4;bluespace=3;plasmatech=4" + var/last_gen = 0 + change_icons = 0 + can_off_process = 1 + light_intensity = 1 + toolspeed = 0.5 + var/nextrefueltick = 0 + +/obj/item/weldingtool/experimental/brass + name = "brass welding tool" + desc = "A brass welder that seems to constantly refuel itself. It is faintly warm to the touch." + resistance_flags = FIRE_PROOF | ACID_PROOF + icon_state = "brasswelder" + item_state = "brasswelder" + + +/obj/item/weldingtool/experimental/process() + ..() + if(get_fuel() < max_fuel && nextrefueltick < world.time) + nextrefueltick = world.time + 10 + reagents.add_reagent("welding_fuel", 1) + + +/* + * Crowbar + */ + +/obj/item/crowbar + name = "pocket crowbar" + desc = "A small crowbar. This handy tool is useful for lots of things, such as prying floor tiles or opening unpowered doors." + icon = 'icons/obj/tools.dmi' + icon_state = "crowbar" + lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' + usesound = 'sound/items/crowbar.ogg' + flags_1 = CONDUCT_1 + slot_flags = SLOT_BELT + force = 5 + throwforce = 7 + w_class = WEIGHT_CLASS_SMALL + materials = list(MAT_METAL=50) + origin_tech = "engineering=1;combat=1" + attack_verb = list("attacked", "bashed", "battered", "bludgeoned", "whacked") + toolspeed = 1 + armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 30) + +/obj/item/crowbar/suicide_act(mob/user) + user.visible_message("[user] is beating [user.p_them()]self to death with [src]! It looks like [user.p_theyre()] trying to commit suicide!") + playsound(loc, 'sound/weapons/genhit.ogg', 50, 1, -1) + return (BRUTELOSS) + +/obj/item/crowbar/red + icon_state = "crowbar_red" + force = 8 + +/obj/item/crowbar/brass + name = "brass crowbar" + desc = "A brass crowbar. It feels faintly warm to the touch." + resistance_flags = FIRE_PROOF | ACID_PROOF + icon_state = "crowbar_brass" + toolspeed = 0.5 + +/obj/item/crowbar/abductor + name = "alien crowbar" + desc = "A hard-light crowbar. It appears to pry by itself, without any effort required." + icon = 'icons/obj/abductor.dmi' + usesound = 'sound/weapons/sonic_jackhammer.ogg' + icon_state = "crowbar" + toolspeed = 0.1 + origin_tech = "combat=4;engineering=4;abductor=3" + +/obj/item/crowbar/large + name = "crowbar" + desc = "It's a big crowbar. It doesn't fit in your pockets, because it's big." + force = 12 + w_class = WEIGHT_CLASS_NORMAL + throw_speed = 3 + throw_range = 3 + materials = list(MAT_METAL=70) + icon_state = "crowbar_large" + item_state = "crowbar" + toolspeed = 0.5 + +/obj/item/crowbar/cyborg + name = "hydraulic crowbar" + desc = "A hydraulic prying tool, compact but powerful. Designed to replace crowbar in construction cyborgs." + usesound = 'sound/items/jaws_pry.ogg' + force = 10 + toolspeed = 0.5 + +/obj/item/crowbar/power + name = "jaws of life" + desc = "A set of jaws of life, compressed through the magic of science. It's fitted with a prying head." + icon_state = "jaws_pry" + item_state = "jawsoflife" + lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' + righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' + materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_TITANIUM=25) + origin_tech = "materials=2;engineering=2" + usesound = 'sound/items/jaws_pry.ogg' + force = 15 + toolspeed = 0.25 + +/obj/item/crowbar/power/suicide_act(mob/user) + user.visible_message("[user] is putting [user.p_their()] head in [src], it looks like [user.p_theyre()] trying to commit suicide!") + playsound(loc, 'sound/items/jaws_pry.ogg', 50, 1, -1) + return (BRUTELOSS) + +/obj/item/crowbar/power/attack_self(mob/user) + playsound(get_turf(user), 'sound/items/change_jaws.ogg', 50, 1) + var/obj/item/wirecutters/power/cutjaws = new /obj/item/wirecutters/power + to_chat(user, "You attach the cutting jaws to [src].") + qdel(src) + user.put_in_active_hand(cutjaws) + +#undef WELDER_FUEL_BURN_INTERVAL +>>>>>>> a479714... Adds missing span-endings (#30494) diff --git a/code/modules/VR/vr_sleeper.dm b/code/modules/VR/vr_sleeper.dm index a83ced850e..04d90c987a 100644 --- a/code/modules/VR/vr_sleeper.dm +++ b/code/modules/VR/vr_sleeper.dm @@ -118,7 +118,7 @@ if(vr_human) qdel(vr_human) else - to_chat(usr, "The VR Sleeper's safeties prevent you from doing that.") + to_chat(usr, "The VR Sleeper's safeties prevent you from doing that.") . = TRUE if("toggle_open") if(state_open) diff --git a/code/modules/admin/stickyban.dm b/code/modules/admin/stickyban.dm index 9ac85e49fa..d8785b98fb 100644 --- a/code/modules/admin/stickyban.dm +++ b/code/modules/admin/stickyban.dm @@ -109,7 +109,7 @@ var/ckey = data["ckey"] var/ban = get_stickyban_from_ckey(ckey) if (!ban) - to_chat(usr, "Error: No sticky ban for [ckey] found!") + to_chat(usr, "Error: No sticky ban for [ckey] found!") return var/oldreason = ban["message"] var/reason = input(usr,"Reason","Reason","[ban["message"]]") as text|null @@ -135,11 +135,11 @@ return var/ban = get_stickyban_from_ckey(ckey) if (!ban) - to_chat(usr, "Error: No sticky ban for [ckey] found!") + to_chat(usr, "Error: No sticky ban for [ckey] found!") return var/cached_ban = SSstickyban.cache[ckey] if (!cached_ban) - to_chat(usr, "Error: No cached sticky ban for [ckey] found!") + to_chat(usr, "Error: No cached sticky ban for [ckey] found!") world.SetConfig("ban",ckey,null) log_admin_private("[key_name(usr)] has reverted [ckey]'s sticky ban to it's state at round start.") diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index f7b0f8b6ff..3c1e1fdf88 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -360,7 +360,7 @@ else SSticker.mode.round_ends_with_antag_death = 0 - message_admins("[key_name_admin(usr)] edited the midround antagonist system to [SSticker.mode.round_ends_with_antag_death ? "end the round" : "continue as extended"] upon failure.") + message_admins("[key_name_admin(usr)] edited the midround antagonist system to [SSticker.mode.round_ends_with_antag_death ? "end the round" : "continue as extended"] upon failure.") check_antagonists() else if(href_list["delay_round_end"]) @@ -2286,4 +2286,3 @@ dat += thing_to_check usr << browse(dat.Join("
    "), "window=related_[C];size=420x300") - diff --git a/code/modules/cargo/console.dm b/code/modules/cargo/console.dm index 340bd3bef2..5a7a471e16 100644 --- a/code/modules/cargo/console.dm +++ b/code/modules/cargo/console.dm @@ -27,7 +27,7 @@ /obj/machinery/computer/cargo/emag_act(mob/user) if(emagged) return - user.visible_message("[user] swipes a suspicious card through [src]!", + user.visible_message("[user] swipes a suspicious card through [src]!", "You adjust [src]'s routing and receiver spectrum, unlocking special supplies and contraband.") emagged = TRUE @@ -201,4 +201,3 @@ status_signal.data["command"] = command frequency.post_signal(src, status_signal) - diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 1447d03ef7..c74a008101 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -162,7 +162,7 @@ update_clothes_damaged_state(TRUE) if(ismob(loc)) //It's not important enough to warrant a message if nobody's wearing it var/mob/M = loc - M.visible_message("[M]'s [name] starts to fall apart!", "Your [name] starts to fall apart!") + M.visible_message("[M]'s [name] starts to fall apart!", "Your [name] starts to fall apart!") /obj/item/clothing/proc/update_clothes_damaged_state(damaging = TRUE) var/index = "\ref[initial(icon)]-[initial(icon_state)]" diff --git a/code/modules/clothing/masks/hailer.dm b/code/modules/clothing/masks/hailer.dm index 11c4f48a6f..74bb61ccb9 100644 --- a/code/modules/clothing/masks/hailer.dm +++ b/code/modules/clothing/masks/hailer.dm @@ -70,7 +70,7 @@ /obj/item/clothing/mask/gas/sechailer/emag_act(mob/user as mob) if(safety) safety = FALSE - to_chat(user, "You silently fry [src]'s vocal circuit with the cryptographic sequencer.") + to_chat(user, "You silently fry [src]'s vocal circuit with the cryptographic sequencer.") else return @@ -181,7 +181,3 @@ playsound(src.loc, "sound/voice/complionator/[phrase_sound].ogg", 100, 0, 4) cooldown = world.time cooldown_special = world.time - - - - diff --git a/code/modules/clothing/spacesuits/chronosuit.dm b/code/modules/clothing/spacesuits/chronosuit.dm index f98fb75b80..dfc2421add 100644 --- a/code/modules/clothing/spacesuits/chronosuit.dm +++ b/code/modules/clothing/spacesuits/chronosuit.dm @@ -202,7 +202,7 @@ activated = 1 else to_chat(user, "\[ fail \] Mounting /dev/helm") - to_chat(user, "FATAL: Unable to locate /dev/helm. Aborting...") + to_chat(user, "FATAL: Unable to locate /dev/helm. Aborting...") teleport_now.Grant(user) cooldown = world.time + cooldowntime activating = 0 diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 0ca8b1c7ba..59dd6e2d8d 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -240,7 +240,7 @@ return 0 if(prob(hit_reaction_chance)) if(world.time < reactivearmor_cooldown) - owner.visible_message("The reactive incendiary armor on [owner] activates, but fails to send out flames as it is still recharging its flame jets!") + owner.visible_message("The reactive incendiary armor on [owner] activates, but fails to send out flames as it is still recharging its flame jets!") return owner.visible_message("The [src] blocks the [attack_text], sending out jets of flame!") for(var/mob/living/carbon/C in range(6, owner)) @@ -262,7 +262,7 @@ return 0 if(prob(hit_reaction_chance)) if(world.time < reactivearmor_cooldown) - owner.visible_message("The reactive stealth system on [owner] activates, but is still recharging its holographic emitters!") + owner.visible_message("The reactive stealth system on [owner] activates, but is still recharging its holographic emitters!") return var/mob/living/simple_animal/hostile/illusion/escape/E = new(owner.loc) E.Copy_Parent(owner, 50) @@ -292,7 +292,7 @@ var/datum/effect_system/spark_spread/sparks = new /datum/effect_system/spark_spread sparks.set_up(1, 1, src) sparks.start() - owner.visible_message("The tesla capacitors on [owner]'s reactive tesla armor are still recharging! The armor merely emits some sparks.") + owner.visible_message("The tesla capacitors on [owner]'s reactive tesla armor are still recharging! The armor merely emits some sparks.") return owner.visible_message("The [src] blocks the [attack_text], sending out arcs of lightning!") tesla_zap(owner,tesla_range,tesla_power,tesla_boom, tesla_stun) diff --git a/code/modules/detectivework/scanner.dm b/code/modules/detectivework/scanner.dm index 5a81686d16..2e7874347b 100644 --- a/code/modules/detectivework/scanner.dm +++ b/code/modules/detectivework/scanner.dm @@ -41,7 +41,7 @@ if(ismob(loc)) var/mob/M = loc M.put_in_hands(P) - to_chat(M, "Report printed. Log cleared.") + to_chat(M, "Report printed. Log cleared.") // Clear the logs log = list() diff --git a/code/modules/food_and_drinks/kitchen_machinery/microwave.dm b/code/modules/food_and_drinks/kitchen_machinery/microwave.dm index c242b55078..e25b29f721 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/microwave.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/microwave.dm @@ -100,7 +100,7 @@ src.updateUsrDialog() return 1 // Disables the after-attack so we don't spray the floor/user. else - to_chat(user, "You need more space cleaner!") + to_chat(user, "You need more space cleaner!") return 1 else if(istype(O, /obj/item/soap/)) // If they're trying to clean it then let them @@ -239,7 +239,7 @@ metal += O.materials[MAT_METAL] if(metal) - visible_message("Sparks fly around [src]!") + visible_message("Sparks fly around [src]!") if(prob(max(metal/2, 33))) explosion(loc,0,1,2) broke() diff --git a/code/modules/hydroponics/grown/towercap.dm b/code/modules/hydroponics/grown/towercap.dm index a88a095aef..3a9e75fdaa 100644 --- a/code/modules/hydroponics/grown/towercap.dm +++ b/code/modules/hydroponics/grown/towercap.dm @@ -163,7 +163,7 @@ /obj/structure/bonfire/attack_hand(mob/user) if(burning) - to_chat(user, "You need to extinguish [src] before removing the logs!") + to_chat(user, "You need to extinguish [src] before removing the logs!") return if(!has_buckled_mobs() && do_after(user, 50, target = src)) for(var/I in 1 to 5) diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm index bf32c94058..b9fd781629 100644 --- a/code/modules/mining/lavaland/necropolis_chests.dm +++ b/code/modules/mining/lavaland/necropolis_chests.dm @@ -802,7 +802,7 @@ to_chat(user, "Your flesh begins to melt! Miraculously, you seem fine otherwise.") H.set_species(/datum/species/skeleton) if(3) - to_chat(user, "Power courses through you! You can now shift your form at will.") + to_chat(user, "Power courses through you! You can now shift your form at will.") if(user.mind) var/obj/effect/proc_holder/spell/targeted/shapeshift/dragon/D = new user.mind.AddSpell(D) diff --git a/code/modules/mob/dead/new_player/poll.dm b/code/modules/mob/dead/new_player/poll.dm index 9fba6eb2e9..9ca76c6356 100644 --- a/code/modules/mob/dead/new_player/poll.dm +++ b/code/modules/mob/dead/new_player/poll.dm @@ -411,7 +411,7 @@ to_chat(src, "Error: Invalid (non-numeric) votes in the vote data.") return 0 if (!(vote in optionlist)) - to_chat(src, "Votes for choices that do not appear to be in the poll detected") + to_chat(src, "Votes for choices that do not appear to be in the poll detected.") return 0 if (!numberedvotelist.len) to_chat(src, "Invalid vote data") diff --git a/code/modules/mob/living/bloodcrawl.dm b/code/modules/mob/living/bloodcrawl.dm index 32ee4d9e3d..b749bcda91 100644 --- a/code/modules/mob/living/bloodcrawl.dm +++ b/code/modules/mob/living/bloodcrawl.dm @@ -162,7 +162,7 @@ return src.loc = B.loc src.client.eye = src - src.visible_message("[src] rises out of the pool of blood!") + src.visible_message("[src] rises out of the pool of blood!") exit_blood_effect(B) if(iscarbon(src)) var/mob/living/carbon/C = src diff --git a/code/modules/mob/living/carbon/alien/larva/powers.dm b/code/modules/mob/living/carbon/alien/larva/powers.dm index 64ee746b06..45e4f66548 100644 --- a/code/modules/mob/living/carbon/alien/larva/powers.dm +++ b/code/modules/mob/living/carbon/alien/larva/powers.dm @@ -1,3 +1,4 @@ +<<<<<<< HEAD /obj/effect/proc_holder/alien/hide name = "Hide" desc = "Allows aliens to hide beneath tables or certain items. Toggled on or off." @@ -59,4 +60,68 @@ return 0 else to_chat(user, "You are not fully grown.") - return 0 \ No newline at end of file + return 0 +======= +/obj/effect/proc_holder/alien/hide + name = "Hide" + desc = "Allows aliens to hide beneath tables or certain items. Toggled on or off." + plasma_cost = 0 + + action_icon_state = "alien_hide" + +/obj/effect/proc_holder/alien/hide/fire(mob/living/carbon/alien/user) + if(user.stat != CONSCIOUS) + return + + if (user.layer != ABOVE_NORMAL_TURF_LAYER) + user.layer = ABOVE_NORMAL_TURF_LAYER + user.visible_message("[user] scurries to the ground!", \ + "You are now hiding.") + else + user.layer = MOB_LAYER + user.visible_message("[user.] slowly peeks up from the ground...", \ + "You stop hiding.") + return 1 + + +/obj/effect/proc_holder/alien/larva_evolve + name = "Evolve" + desc = "Evolve into a higher alien caste." + plasma_cost = 0 + + action_icon_state = "alien_evolve_larva" + +/obj/effect/proc_holder/alien/larva_evolve/fire(mob/living/carbon/alien/user) + if(!islarva(user)) + return + var/mob/living/carbon/alien/larva/L = user + + if(L.handcuffed || L.legcuffed) // Cuffing larvas ? Eh ? + to_chat(user, "You cannot evolve when you are cuffed.") + + if(L.amount_grown >= L.max_grown) //TODO ~Carn + to_chat(L, "You are growing into a beautiful alien! It is time to choose a caste.") + to_chat(L, "There are three to choose from:") + to_chat(L, "Hunters are the most agile caste, tasked with hunting for hosts. They are faster than a human and can even pounce, but are not much tougher than a drone.") + to_chat(L, "Sentinels are tasked with protecting the hive. With their ranged spit, invisibility, and high health, they make formidable guardians and acceptable secondhand hunters.") + to_chat(L, "Drones are the weakest and slowest of the castes, but can grow into a praetorian and then queen if no queen exists, and are vital to maintaining a hive with their resin secretion abilities.") + var/alien_caste = alert(L, "Please choose which alien caste you shall belong to.",,"Hunter","Sentinel","Drone") + + if(user.incapacitated()) //something happened to us while we were choosing. + return + + var/mob/living/carbon/alien/humanoid/new_xeno + switch(alien_caste) + if("Hunter") + new_xeno = new /mob/living/carbon/alien/humanoid/hunter(L.loc) + if("Sentinel") + new_xeno = new /mob/living/carbon/alien/humanoid/sentinel(L.loc) + if("Drone") + new_xeno = new /mob/living/carbon/alien/humanoid/drone(L.loc) + + L.alien_evolve(new_xeno) + return 0 + else + to_chat(user, "You are not fully grown.") + return 0 +>>>>>>> a479714... Adds missing span-endings (#30494) diff --git a/code/modules/mob/living/carbon/alien/organs.dm b/code/modules/mob/living/carbon/alien/organs.dm index e538d32fb7..ae8eec5529 100644 --- a/code/modules/mob/living/carbon/alien/organs.dm +++ b/code/modules/mob/living/carbon/alien/organs.dm @@ -128,12 +128,12 @@ return if(isalien(owner)) //Different effects for aliens than humans to_chat(owner, "Your Queen has been struck down!") - to_chat(owner, "You are struck with overwhelming agony! You feel confused, and your connection to the hivemind is severed.") + to_chat(owner, "You are struck with overwhelming agony! You feel confused, and your connection to the hivemind is severed.") owner.emote("roar") owner.Stun(200) //Actually just slows them down a bit. else if(ishuman(owner)) //Humans, being more fragile, are more overwhelmed by the mental backlash. - to_chat(owner, "You feel a splitting pain in your head, and are struck with a wave of nausea. You cannot hear the hivemind anymore!") + to_chat(owner, "You feel a splitting pain in your head, and are struck with a wave of nausea. You cannot hear the hivemind anymore!") owner.emote("scream") owner.Knockdown(100) diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm index b23cadfc5a..6068ef2d66 100644 --- a/code/modules/mob/living/carbon/carbon_defense.dm +++ b/code/modules/mob/living/carbon/carbon_defense.dm @@ -244,7 +244,7 @@ /mob/living/carbon/proc/help_shake_act(mob/living/carbon/M) if(on_fire) - to_chat(M, "You can't put them out with just your bare hands!") + to_chat(M, "You can't put them out with just your bare hands!") return if(health >= 0 && !(status_flags & FAKEDEATH)) diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 68004fe93d..7b83347953 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -1108,7 +1108,7 @@ if(prob(15)) if(!( H.hair_style == "Shaved") || !(H.hair_style == "Bald") || (HAIR in species_traits)) - to_chat(H, "Your hair starts to fall out in clumps...") + to_chat(H, "Your hair starts to fall out in clumps...") addtimer(CALLBACK(src, .proc/go_bald, H), 50) if(75 to 100) diff --git a/code/modules/mob/living/carbon/human/species_types/golems.dm b/code/modules/mob/living/carbon/human/species_types/golems.dm index 14726df76a..49659f0128 100644 --- a/code/modules/mob/living/carbon/human/species_types/golems.dm +++ b/code/modules/mob/living/carbon/human/species_types/golems.dm @@ -80,11 +80,11 @@ /datum/species/golem/plasma/spec_life(mob/living/carbon/human/H) if(H.bodytemperature > 750) if(!boom_warning && H.on_fire) - to_chat(H, "You feel like you could blow up at any moment!") + to_chat(H, "You feel like you could blow up at any moment!") boom_warning = TRUE else if(boom_warning) - to_chat(H, "You feel more stable.") + to_chat(H, "You feel more stable.") boom_warning = FALSE if(H.bodytemperature > 850 && H.on_fire && prob(25)) diff --git a/code/modules/mob/living/simple_animal/bot/mulebot.dm b/code/modules/mob/living/simple_animal/bot/mulebot.dm index 0d4edd53f5..42bf87421b 100644 --- a/code/modules/mob/living/simple_animal/bot/mulebot.dm +++ b/code/modules/mob/living/simple_animal/bot/mulebot.dm @@ -650,7 +650,7 @@ /mob/living/simple_animal/bot/mulebot/proc/RunOver(mob/living/carbon/human/H) add_logs(src, H, "run over", null, "(DAMTYPE: [uppertext(BRUTE)])") H.visible_message("[src] drives over [H]!", \ - "[src] drives over you!") + "[src] drives over you!") playsound(loc, 'sound/effects/splat.ogg', 50, 1) var/damage = rand(5,15) diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm index 9e347e3b7a..c23dc13a15 100644 --- a/code/modules/mob/living/simple_animal/parrot.dm +++ b/code/modules/mob/living/simple_animal/parrot.dm @@ -734,7 +734,7 @@ visible_message("[src] grabs [held_item] out of [C]'s hand!", "You snag [held_item] out of [C]'s hand!", "You hear the sounds of wings flapping furiously.") return held_item - to_chat(src, "There is nothing of interest to take!") + to_chat(src, "There is nothing of interest to take!") return 0 /mob/living/simple_animal/parrot/verb/drop_held_item_player() diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index b8350e2a02..457376990e 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -385,7 +385,7 @@ It's fairly easy to fix if dealing with single letters but not so much with comp return for(var/mob/dead/observer/O in GLOB.player_list) if(O.client) - to_chat(O, "[message][(enter_link) ? " [enter_link]" : ""]") + to_chat(O, "[message][(enter_link) ? " [enter_link]" : ""]") if(ghost_sound) SEND_SOUND(O, sound(ghost_sound)) if(flashwindow) diff --git a/code/modules/ninja/suit/suit_attackby.dm b/code/modules/ninja/suit/suit_attackby.dm index 1db76bc971..ce75fd6ed3 100644 --- a/code/modules/ninja/suit/suit_attackby.dm +++ b/code/modules/ninja/suit/suit_attackby.dm @@ -8,7 +8,7 @@ if(I.reagents.has_reagent("radium", a_transfer) && a_boost < a_maxamount) I.reagents.remove_reagent("radium", a_transfer) a_boost++; - to_chat(U, "There are now [a_boost] adrenaline boosts remaining.") + to_chat(U, "There are now [a_boost] adrenaline boosts remaining.") return else if(istype(I, /obj/item/stock_parts/cell)) diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm index 74987d2052..0eb6a7137d 100644 --- a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm +++ b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm @@ -130,7 +130,7 @@ if(!suppressed) playsound(src.loc, 'sound/weapons/kenetic_reload.ogg', 60, 1) else - to_chat(loc, "[src] silently charges up.") + to_chat(loc, "[src] silently charges up.") update_icon() overheat = FALSE diff --git a/code/modules/projectiles/guns/magic.dm b/code/modules/projectiles/guns/magic.dm index f419374857..21bc12bb1f 100644 --- a/code/modules/projectiles/guns/magic.dm +++ b/code/modules/projectiles/guns/magic.dm @@ -28,7 +28,7 @@ if(no_den_usage) var/area/A = get_area(user) if(istype(A, /area/wizard_station)) - to_chat(user, "You know better than to violate the security of The Den, best wait until you leave to use [src].") + to_chat(user, "You know better than to violate the security of The Den, best wait until you leave to use [src].") return else no_den_usage = 0 @@ -74,7 +74,7 @@ return /obj/item/gun/magic/shoot_with_empty_chamber(mob/living/user as mob|obj) - to_chat(user, "The [name] whizzles quietly.") + to_chat(user, "The [name] whizzles quietly.") /obj/item/gun/magic/suicide_act(mob/user) user.visible_message("[user] is twisting [src] above [user.p_their()] head, releasing a magical blast! It looks like [user.p_theyre()] trying to commit suicide!") @@ -85,4 +85,4 @@ . = ..() switch (var_name) if ("charges") - recharge_newshot() \ No newline at end of file + recharge_newshot() diff --git a/code/modules/projectiles/guns/magic/wand.dm b/code/modules/projectiles/guns/magic/wand.dm index f19fc7c693..27fb040de4 100644 --- a/code/modules/projectiles/guns/magic/wand.dm +++ b/code/modules/projectiles/guns/magic/wand.dm @@ -37,7 +37,7 @@ if(no_den_usage) var/area/A = get_area(user) if(istype(A, /area/wizard_station)) - to_chat(user, "You know better than to violate the security of The Den, best wait until you leave to use [src].") + to_chat(user, "You know better than to violate the security of The Den, best wait until you leave to use [src].") return else no_den_usage = 0 @@ -167,4 +167,4 @@ /obj/item/gun/magic/wand/fireball/zap_self(mob/living/user) ..() explosion(user.loc, -1, 0, 2, 3, 0, flame_range = 2) - charges-- \ No newline at end of file + charges-- diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm index 33d2b81017..324a7d7066 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -135,7 +135,7 @@ if(L.reagents.total_volume >= L.reagents.maximum_volume) return L.visible_message("[user] injects [L] with the syringe!", \ - "[user] injects [L] with the syringe!") + "[user] injects [L] with the syringe!") var/list/rinject = list() for(var/datum/reagent/R in reagents.reagent_list) diff --git a/code/modules/spells/spell.dm b/code/modules/spells/spell.dm index ea113ba4fd..3cb56becf8 100644 --- a/code/modules/spells/spell.dm +++ b/code/modules/spells/spell.dm @@ -18,7 +18,7 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for th /obj/effect/proc_holder/proc/InterceptClickOn(mob/living/caller, params, atom/A) if(caller.ranged_ability != src || ranged_ability_user != caller) //I'm not actually sure how these would trigger, but, uh, safety, I guess? - to_chat(caller, "[caller.ranged_ability.name] has been disabled.") + to_chat(caller, "[caller.ranged_ability.name] has been disabled.") caller.ranged_ability.remove_ranged_ability() return TRUE //TRUE for failed, FALSE for passed. if(ranged_clickcd_override >= 0) @@ -33,7 +33,7 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for th return if(user.ranged_ability && user.ranged_ability != src) if(forced) - to_chat(user, "[user.ranged_ability.name] has been replaced by [name].") + to_chat(user, "[user.ranged_ability.name] has been replaced by [name].") user.ranged_ability.remove_ranged_ability() else return diff --git a/code/modules/spells/spell_types/devil.dm b/code/modules/spells/spell_types/devil.dm index f54034c5ec..9d1afdcebc 100644 --- a/code/modules/spells/spell_types/devil.dm +++ b/code/modules/spells/spell_types/devil.dm @@ -114,7 +114,7 @@ to_chat(user, "You are no longer near a potential signer.") else - to_chat(user, "You can only re-appear near a potential signer.") + to_chat(user, "You can only re-appear near a potential signer.") revert_cast() return ..() else @@ -166,7 +166,7 @@ fakefire() src.loc = get_turf(src) src.client.eye = src - src.visible_message("[src] appears in a fiery blaze!") + src.visible_message("[src] appears in a fiery blaze!") playsound(get_turf(src), 'sound/magic/exit_blood.ogg', 100, 1, -1) addtimer(CALLBACK(src, .proc/fakefireextinguish), 15, TIMER_UNIQUE) @@ -260,4 +260,4 @@ effect_type = /obj/effect/particle_effect/smoke/transparent/dancefloor_devil /obj/effect/particle_effect/smoke/transparent/dancefloor_devil - lifetime = 2 \ No newline at end of file + lifetime = 2 diff --git a/code/modules/station_goals/dna_vault.dm b/code/modules/station_goals/dna_vault.dm index 1b6d11719f..cfa95f2d1a 100644 --- a/code/modules/station_goals/dna_vault.dm +++ b/code/modules/station_goals/dna_vault.dm @@ -90,10 +90,10 @@ to_chat(user, "Plant needs to be ready to harvest to perform full data scan.") //Because space dna is actually magic return if(plants[H.myseed.type]) - to_chat(user, "Plant data already present in local storage.") + to_chat(user, "Plant data already present in local storage.") return plants[H.myseed.type] = 1 - to_chat(user, "Plant data added to local storage.") + to_chat(user, "Plant data added to local storage.") //animals var/static/list/non_simple_animals = typecacheof(list(/mob/living/carbon/monkey, /mob/living/carbon/alien)) @@ -104,19 +104,19 @@ to_chat(user, "No compatible DNA detected") return if(animals[target.type]) - to_chat(user, "Animal data already present in local storage.") + to_chat(user, "Animal data already present in local storage.") return animals[target.type] = 1 - to_chat(user, "Animal data added to local storage.") + to_chat(user, "Animal data added to local storage.") //humans if(ishuman(target)) var/mob/living/carbon/human/H = target if(dna[H.dna.uni_identity]) - to_chat(user, "Humanoid data already present in local storage.") + to_chat(user, "Humanoid data already present in local storage.") return dna[H.dna.uni_identity] = 1 - to_chat(user, "Humanoid data added to local storage.") + to_chat(user, "Humanoid data added to local storage.") /obj/machinery/dna_vault name = "DNA Vault" From 9b0e43f7c337db867734a554fc3239f44e76862e Mon Sep 17 00:00:00 2001 From: kevinz000 Date: Mon, 11 Sep 2017 10:18:43 -0700 Subject: [PATCH 043/163] Adds a few SDQL2 list wrappers (#30574) * Update SDQL_2_wrappers.dm * Update SDQL_2_wrappers.dm * Update SDQL_2_wrappers.dm --- code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm b/code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm index c2a6ab7cd5..37762520a8 100644 --- a/code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm +++ b/code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm @@ -170,5 +170,13 @@ return L -= args.Copy(2) +/proc/_list_set(list/L, key, value) + L[key] = value + +/proc/_list_numerical_add(L, key, num) + L[key] += num + /proc/_list_swap(list/L, Index1, Index2) L.Swap(Index1, Index2) + + From 053b283745156922092409b9c14a87a233f2612c Mon Sep 17 00:00:00 2001 From: vuonojenmustaturska Date: Mon, 11 Sep 2017 20:19:12 +0300 Subject: [PATCH 045/163] Fixes initialize hints for a fair number of mobs and items --- code/game/machinery/camera/presets.dm | 2 +- code/game/machinery/computer/atmos_alert.dm | 21 + code/game/machinery/computer/atmos_control.dm | 21 + code/game/objects/items/cigs_lighters.dm | 4 +- code/game/objects/items/devices/PDA/cart.dm | 4 +- code/game/objects/items/devices/PDA/radio.dm | 2 +- code/game/objects/items/devices/flashlight.dm | 4 +- code/game/objects/items/devices/gps.dm | 2 +- .../game/objects/items/devices/radio/radio.dm | 2 +- .../objects/items/devices/taperecorder.dm | 236 ++++++++ code/game/objects/structures/aliens.dm | 6 +- .../objects/structures/beds_chairs/chair.dm | 2 +- code/game/objects/structures/safe.dm | 188 ++++++ code/modules/mob/living/silicon/pai/pai.dm | 2 +- .../mob/living/simple_animal/bot/ed209bot.dm | 570 ++++++++++++++++++ .../mob/living/simple_animal/bot/floorbot.dm | 2 +- .../mob/living/simple_animal/bot/mulebot.dm | 2 +- .../mob/living/simple_animal/friendly/cat.dm | 4 +- .../friendly/drone/extra_drone_types.dm | 6 +- .../living/simple_animal/friendly/mouse.dm | 2 +- .../mob/living/simple_animal/friendly/pet.dm | 2 +- .../living/simple_animal/guardian/guardian.dm | 4 +- .../simple_animal/hostile/bosses/boss.dm | 2 +- .../mob/living/simple_animal/parrot.dm | 2 +- 24 files changed, 1064 insertions(+), 28 deletions(-) diff --git a/code/game/machinery/camera/presets.dm b/code/game/machinery/camera/presets.dm index 6f205a870d..864ab2bff2 100644 --- a/code/game/machinery/camera/presets.dm +++ b/code/game/machinery/camera/presets.dm @@ -24,7 +24,7 @@ name = "motion-sensitive security camera" /obj/machinery/camera/motion/Initialize() - ..() + . = ..() upgradeMotion() // ALL UPGRADES diff --git a/code/game/machinery/computer/atmos_alert.dm b/code/game/machinery/computer/atmos_alert.dm index 14fc50ee68..399fb1908b 100644 --- a/code/game/machinery/computer/atmos_alert.dm +++ b/code/game/machinery/computer/atmos_alert.dm @@ -1,3 +1,4 @@ +<<<<<<< HEAD /obj/machinery/computer/atmos_alert name = "atmospheric alert console" desc = "Used to monitor the station's air alarms." @@ -16,6 +17,26 @@ set_frequency(receive_frequency) /obj/machinery/computer/atmos_alert/Destroy() +======= +/obj/machinery/computer/atmos_alert + name = "atmospheric alert console" + desc = "Used to monitor the station's air alarms." + circuit = /obj/item/circuitboard/computer/atmos_alert + icon_screen = "alert:0" + icon_keyboard = "atmos_key" + var/list/priority_alarms = list() + var/list/minor_alarms = list() + var/receive_frequency = 1437 + var/datum/radio_frequency/radio_connection + + light_color = LIGHT_COLOR_CYAN + +/obj/machinery/computer/atmos_alert/Initialize() + . = ..() + set_frequency(receive_frequency) + +/obj/machinery/computer/atmos_alert/Destroy() +>>>>>>> f2c5657... Fixes initialize hints for a fair number of mobs and items (#30583) SSradio.remove_object(src, receive_frequency) return ..() diff --git a/code/game/machinery/computer/atmos_control.dm b/code/game/machinery/computer/atmos_control.dm index 9bdcef6c65..310a6e3027 100644 --- a/code/game/machinery/computer/atmos_control.dm +++ b/code/game/machinery/computer/atmos_control.dm @@ -53,6 +53,7 @@ /obj/machinery/air_sensor/Destroy() SSair.atmos_machinery -= src SSradio.remove_object(src, frequency) +<<<<<<< HEAD return ..() ///////////////////////////////////////////////////////////// @@ -60,6 +61,26 @@ ///////////////////////////////////////////////////////////// /obj/machinery/computer/atmos_control +======= + frequency = new_frequency + radio_connection = SSradio.add_object(src, frequency, GLOB.RADIO_ATMOSIA) + +/obj/machinery/air_sensor/Initialize() + . = ..() + SSair.atmos_machinery += src + set_frequency(frequency) + +/obj/machinery/air_sensor/Destroy() + SSair.atmos_machinery -= src + SSradio.remove_object(src, frequency) + return ..() + +///////////////////////////////////////////////////////////// +// GENERAL AIR CONTROL (a.k.a atmos computer) +///////////////////////////////////////////////////////////// + +/obj/machinery/computer/atmos_control +>>>>>>> f2c5657... Fixes initialize hints for a fair number of mobs and items (#30583) name = "atmospherics monitoring" desc = "Used to monitor the station's atmospherics sensors." icon_screen = "tank" diff --git a/code/game/objects/items/cigs_lighters.dm b/code/game/objects/items/cigs_lighters.dm index 5595500bb7..7231099975 100644 --- a/code/game/objects/items/cigs_lighters.dm +++ b/code/game/objects/items/cigs_lighters.dm @@ -121,7 +121,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM return (TOXLOSS|OXYLOSS) /obj/item/clothing/mask/cigarette/Initialize() - ..() + . = ..() create_reagents(chem_volume) reagents.set_reacting(FALSE) // so it doesn't react until you light it if(list_reagents) @@ -378,7 +378,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM var/packeditem = 0 /obj/item/clothing/mask/cigarette/pipe/Initialize() - ..() + . = ..() name = "empty [initial(name)]" /obj/item/clothing/mask/cigarette/pipe/Destroy() diff --git a/code/game/objects/items/devices/PDA/cart.dm b/code/game/objects/items/devices/PDA/cart.dm index de9f6ed44b..9a26f81375 100644 --- a/code/game/objects/items/devices/PDA/cart.dm +++ b/code/game/objects/items/devices/PDA/cart.dm @@ -134,7 +134,7 @@ access = CART_REAGENT_SCANNER | CART_ATMOS /obj/item/cartridge/signal/Initialize() - ..() + . = ..() radio = new /obj/item/radio/integrated/signal(src) @@ -183,7 +183,7 @@ bot_access_flags = FLOOR_BOT | CLEAN_BOT | MED_BOT /obj/item/cartridge/rd/Initialize() - ..() + . = ..() radio = new /obj/item/radio/integrated/signal(src) /obj/item/cartridge/captain diff --git a/code/game/objects/items/devices/PDA/radio.dm b/code/game/objects/items/devices/PDA/radio.dm index f6bfa50ce4..2c4fc8fa48 100644 --- a/code/game/objects/items/devices/PDA/radio.dm +++ b/code/game/objects/items/devices/PDA/radio.dm @@ -30,7 +30,7 @@ return ..() /obj/item/radio/integrated/signal/Initialize() - ..() + . = ..() if (src.frequency < 1200 || src.frequency > 1600) src.frequency = sanitize_frequency(src.frequency) diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index b41438451c..4d6e9d73fd 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -16,7 +16,7 @@ var/flashlight_power = 1 //strength of the light when on /obj/item/device/flashlight/Initialize() - ..() + . = ..() update_brightness() /obj/item/device/flashlight/proc/update_brightness(mob/user = null) @@ -409,7 +409,7 @@ /obj/item/device/flashlight/glowstick/Initialize() fuel = rand(1600, 2000) light_color = color - ..() + . = ..() /obj/item/device/flashlight/glowstick/Destroy() STOP_PROCESSING(SSobj, src) diff --git a/code/game/objects/items/devices/gps.dm b/code/game/objects/items/devices/gps.dm index 91250f7d3c..55c8bb5252 100644 --- a/code/game/objects/items/devices/gps.dm +++ b/code/game/objects/items/devices/gps.dm @@ -17,7 +17,7 @@ GLOBAL_LIST_EMPTY(GPS_list) /obj/item/device/gps/Initialize() - ..() + . = ..() GLOB.GPS_list += src name = "global positioning system ([gpstag])" add_overlay("working") diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index c19e3eec92..0f59d00ab8 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -555,7 +555,7 @@ flags_2 = NO_EMP_WIRES_2 /obj/item/device/radio/borg/Initialize(mapload) - ..() + . = ..() /obj/item/device/radio/borg/syndicate syndie = 1 diff --git a/code/game/objects/items/devices/taperecorder.dm b/code/game/objects/items/devices/taperecorder.dm index dba9b8ba7d..cb91a85bb9 100644 --- a/code/game/objects/items/devices/taperecorder.dm +++ b/code/game/objects/items/devices/taperecorder.dm @@ -7,6 +7,7 @@ righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' w_class = WEIGHT_CLASS_SMALL flags_1 = HEAR_1 +<<<<<<< HEAD slot_flags = SLOT_BELT materials = list(MAT_METAL=60, MAT_GLASS=30) force = 2 @@ -240,6 +241,241 @@ desc = "A magnetic tape that can hold up to ten minutes of content." icon_state = "tape_white" item_state = "analyzer" +======= + slot_flags = SLOT_BELT + materials = list(MAT_METAL=60, MAT_GLASS=30) + force = 2 + throwforce = 0 + var/recording = 0 + var/playing = 0 + var/playsleepseconds = 0 + var/obj/item/device/tape/mytape + var/starting_tape_type = /obj/item/device/tape/random + var/open_panel = 0 + var/canprint = 1 + + +/obj/item/device/taperecorder/Initialize(mapload) + . = ..() + if(starting_tape_type) + mytape = new starting_tape_type(src) + update_icon() + + +/obj/item/device/taperecorder/examine(mob/user) + ..() + to_chat(user, "The wire panel is [open_panel ? "opened" : "closed"].") + + +/obj/item/device/taperecorder/attackby(obj/item/I, mob/user, params) + if(!mytape && istype(I, /obj/item/device/tape)) + if(!user.transferItemToLoc(I,src)) + return + mytape = I + to_chat(user, "You insert [I] into [src].") + update_icon() + + +/obj/item/device/taperecorder/proc/eject(mob/user) + if(mytape) + to_chat(user, "You remove [mytape] from [src].") + stop() + user.put_in_hands(mytape) + mytape = null + update_icon() + +/obj/item/device/taperecorder/fire_act(exposed_temperature, exposed_volume) + mytape.ruin() //Fires destroy the tape + ..() + +/obj/item/device/taperecorder/attack_hand(mob/user) + if(loc == user) + if(mytape) + if(!user.is_holding(src)) + ..() + return + eject(user) + return + ..() + + +/obj/item/device/taperecorder/proc/can_use(mob/user) + if(user && ismob(user)) + if(!user.incapacitated()) + return 1 + return 0 + + +/obj/item/device/taperecorder/verb/ejectverb() + set name = "Eject Tape" + set category = "Object" + + if(!can_use(usr)) + return + if(!mytape) + return + + eject(usr) + + +/obj/item/device/taperecorder/update_icon() + if(!mytape) + icon_state = "taperecorder_empty" + else if(recording) + icon_state = "taperecorder_recording" + else if(playing) + icon_state = "taperecorder_playing" + else + icon_state = "taperecorder_idle" + + +/obj/item/device/taperecorder/Hear(message, atom/movable/speaker, message_langs, raw_message, radio_freq, spans, message_mode) + if(mytape && recording) + mytape.timestamp += mytape.used_capacity + mytape.storedinfo += "\[[time2text(mytape.used_capacity * 10,"mm:ss")]\] [message]" + +/obj/item/device/taperecorder/verb/record() + set name = "Start Recording" + set category = "Object" + + if(!can_use(usr)) + return + if(!mytape || mytape.ruined) + return + if(recording) + return + if(playing) + return + + if(mytape.used_capacity < mytape.max_capacity) + to_chat(usr, "Recording started.") + recording = 1 + update_icon() + mytape.timestamp += mytape.used_capacity + mytape.storedinfo += "\[[time2text(mytape.used_capacity * 10,"mm:ss")]\] Recording started." + var/used = mytape.used_capacity //to stop runtimes when you eject the tape + var/max = mytape.max_capacity + for(used, used < max) + if(recording == 0) + break + mytape.used_capacity++ + used++ + sleep(10) + recording = 0 + update_icon() + else + to_chat(usr, "The tape is full.") + + +/obj/item/device/taperecorder/verb/stop() + set name = "Stop" + set category = "Object" + + if(!can_use(usr)) + return + + if(recording) + recording = 0 + mytape.timestamp += mytape.used_capacity + mytape.storedinfo += "\[[time2text(mytape.used_capacity * 10,"mm:ss")]\] Recording stopped." + to_chat(usr, "Recording stopped.") + return + else if(playing) + playing = 0 + var/turf/T = get_turf(src) + T.visible_message("Tape Recorder: Playback stopped.") + update_icon() + + +/obj/item/device/taperecorder/verb/play() + set name = "Play Tape" + set category = "Object" + + if(!can_use(usr)) + return + if(!mytape || mytape.ruined) + return + if(recording) + return + if(playing) + return + + playing = 1 + update_icon() + to_chat(usr, "Playing started.") + var/used = mytape.used_capacity //to stop runtimes when you eject the tape + var/max = mytape.max_capacity + for(var/i = 1, used < max, sleep(10 * playsleepseconds)) + if(!mytape) + break + if(playing == 0) + break + if(mytape.storedinfo.len < i) + break + say(mytape.storedinfo[i]) + if(mytape.storedinfo.len < i + 1) + playsleepseconds = 1 + sleep(10) + say("End of recording.") + else + playsleepseconds = mytape.timestamp[i + 1] - mytape.timestamp[i] + if(playsleepseconds > 14) + sleep(10) + say("Skipping [playsleepseconds] seconds of silence") + playsleepseconds = 1 + i++ + + playing = 0 + update_icon() + + +/obj/item/device/taperecorder/attack_self(mob/user) + if(!mytape || mytape.ruined) + return + if(recording) + stop() + else + record() + + +/obj/item/device/taperecorder/verb/print_transcript() + set name = "Print Transcript" + set category = "Object" + + if(!can_use(usr)) + return + if(!mytape) + return + if(!canprint) + to_chat(usr, "The recorder can't print that fast!") + return + if(recording || playing) + return + + to_chat(usr, "Transcript printed.") + var/obj/item/paper/P = new /obj/item/paper(get_turf(src)) + var/t1 = "Transcript:

    " + for(var/i = 1, mytape.storedinfo.len >= i, i++) + t1 += "[mytape.storedinfo[i]]
    " + P.info = t1 + P.name = "paper- 'Transcript'" + usr.put_in_hands(P) + canprint = 0 + sleep(300) + canprint = 1 + + +//empty tape recorders +/obj/item/device/taperecorder/empty + starting_tape_type = null + + +/obj/item/device/tape + name = "tape" + desc = "A magnetic tape that can hold up to ten minutes of content." + icon_state = "tape_white" + item_state = "analyzer" +>>>>>>> f2c5657... Fixes initialize hints for a fair number of mobs and items (#30583) lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' w_class = WEIGHT_CLASS_TINY diff --git a/code/game/objects/structures/aliens.dm b/code/game/objects/structures/aliens.dm index df3f2ad9fa..ae79c7e86d 100644 --- a/code/game/objects/structures/aliens.dm +++ b/code/game/objects/structures/aliens.dm @@ -127,7 +127,7 @@ /obj/structure/alien/weeds/Initialize() pixel_x = -4 pixel_y = -4 //so the sprites line up right in the map editor - ..() + . = ..() if(!blacklisted_turfs) blacklisted_turfs = typecacheof(list( @@ -178,7 +178,7 @@ /obj/structure/alien/weeds/node/Initialize() icon = 'icons/obj/smooth_structures/alien/weednode.dmi' - ..() + . = ..() set_light(lon_range) var/obj/structure/alien/weeds/W = locate(/obj/structure/alien/weeds) in loc if(W && W != src) @@ -223,7 +223,7 @@ var/obj/item/clothing/mask/facehugger/child /obj/structure/alien/egg/Initialize(mapload) - ..() + . = ..() update_icon() if(status == GROWING || status == GROWN) child = new(src) diff --git a/code/game/objects/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm index e34278e51b..4754cc63e7 100644 --- a/code/game/objects/structures/beds_chairs/chair.dm +++ b/code/game/objects/structures/beds_chairs/chair.dm @@ -15,7 +15,7 @@ layer = OBJ_LAYER /obj/structure/chair/Initialize() - ..() + . = ..() if(!anchored) //why would you put these on the shuttle? addtimer(CALLBACK(src, .proc/RemoveFromLatejoin), 0) diff --git a/code/game/objects/structures/safe.dm b/code/game/objects/structures/safe.dm index f14ca385a8..a0a8cd8fca 100644 --- a/code/game/objects/structures/safe.dm +++ b/code/game/objects/structures/safe.dm @@ -14,6 +14,7 @@ FLOOR SAFES density = TRUE resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF var/open = FALSE //is the safe open? +<<<<<<< HEAD var/tumbler_1_pos //the tumbler position- from 0 to 72 var/tumbler_1_open //the tumbler position to open at- 0 to 72 var/tumbler_2_pos @@ -199,4 +200,191 @@ FLOOR SAFES /obj/structure/safe/floor/hide(var/intact) +======= + var/tumbler_1_pos //the tumbler position- from 0 to 72 + var/tumbler_1_open //the tumbler position to open at- 0 to 72 + var/tumbler_2_pos + var/tumbler_2_open + var/dial = 0 //where is the dial pointing? + var/space = 0 //the combined w_class of everything in the safe + var/maxspace = 24 //the maximum combined w_class of stuff in the safe + + +/obj/structure/safe/New() + ..() + tumbler_1_pos = rand(0, 71) + tumbler_1_open = rand(0, 71) + + tumbler_2_pos = rand(0, 71) + tumbler_2_open = rand(0, 71) + + +/obj/structure/safe/Initialize(mapload) + . = ..() + + if(!mapload) + return + + for(var/obj/item/I in loc) + if(space >= maxspace) + return + if(I.w_class + space <= maxspace) + space += I.w_class + I.loc = src + + +/obj/structure/safe/proc/check_unlocked(mob/user, canhear) + if(user && canhear) + if(tumbler_1_pos == tumbler_1_open) + to_chat(user, "You hear a [pick("tonk", "krunk", "plunk")] from [src].") + if(tumbler_2_pos == tumbler_2_open) + to_chat(user, "You hear a [pick("tink", "krink", "plink")] from [src].") + if(tumbler_1_pos == tumbler_1_open && tumbler_2_pos == tumbler_2_open) + if(user) visible_message("[pick("Spring", "Sprang", "Sproing", "Clunk", "Krunk")]!") + return 1 + return 0 + + +/obj/structure/safe/proc/decrement(num) + num -= 1 + if(num < 0) + num = 71 + return num + + +/obj/structure/safe/proc/increment(num) + num += 1 + if(num > 71) + num = 0 + return num + + +/obj/structure/safe/update_icon() + if(open) + icon_state = "[initial(icon_state)]-open" + else + icon_state = initial(icon_state) + + +/obj/structure/safe/attack_hand(mob/user) + user.set_machine(src) + var/dat = "