From f59b368d43d9c0aeb0fb584dd89e307c06516a3c Mon Sep 17 00:00:00 2001 From: PrisonStation <111151681+casualspacestation14enjoyer@users.noreply.github.com> Date: Fri, 1 Sep 2023 21:12:47 +0200 Subject: [PATCH 01/10] poor --- code/game/machinery/rotating_alarm.dm | 1 + .../modular_computers/computers/subtypes/preset_pda.dm | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/machinery/rotating_alarm.dm b/code/game/machinery/rotating_alarm.dm index 73b882c0c7f..a123045bf66 100644 --- a/code/game/machinery/rotating_alarm.dm +++ b/code/game/machinery/rotating_alarm.dm @@ -41,6 +41,7 @@ active_power_usage = 0 anchored = TRUE + obj_flags = OBJ_FLAG_ANCHORABLE var/on = FALSE var/low_alarm = FALSE var/construct_type = /obj/machinery/light_construct diff --git a/code/modules/modular_computers/computers/subtypes/preset_pda.dm b/code/modules/modular_computers/computers/subtypes/preset_pda.dm index 376540adabd..b5a08268a3c 100644 --- a/code/modules/modular_computers/computers/subtypes/preset_pda.dm +++ b/code/modules/modular_computers/computers/subtypes/preset_pda.dm @@ -18,8 +18,7 @@ hard_drive.store_file(new /datum/computer_file/program/wordprocessor()) hard_drive.store_file(new /datum/computer_file/program/records()) hard_drive.store_file(new /datum/computer_file/program/newscast()) - if(prob(50)) //harmless tax software - hard_drive.store_file(new /datum/computer_file/program/uplink()) + hard_drive.store_file(new /datum/computer_file/program/uplink()) //this shit was long overdue, its now for everyone, DEATH TO METAGAME var/datum/extension/interactive/ntos/os = get_extension(src, /datum/extension/interactive/ntos) if(os) os.set_autorun("emailc") @@ -86,4 +85,4 @@ /obj/item/modular_computer/pda/captain/install_default_hardware() ..() - scanner = new /obj/item/stock_parts/computer/scanner/paper(src) \ No newline at end of file + scanner = new /obj/item/stock_parts/computer/scanner/paper(src) From 768b6d2f2dbe95f94b547d990eda72416844c9bf Mon Sep 17 00:00:00 2001 From: PrisonStation <111151681+casualspacestation14enjoyer@users.noreply.github.com> Date: Fri, 1 Sep 2023 23:01:52 +0200 Subject: [PATCH 02/10] hidden scalpel --- .../stealthy_and_inconspicuous_weapons.dm | 6 +++ code/game/antagonist/station/traitor.dm | 6 +++ code/game/machinery/rotating_alarm.dm | 2 +- .../objects/items/weapons/material/knives.dm | 38 ++++++++++++++++++ icons/obj/bureaucracy.dmi | Bin 25959 -> 26248 bytes 5 files changed, 51 insertions(+), 1 deletion(-) diff --git a/code/datums/uplink/stealthy_and_inconspicuous_weapons.dm b/code/datums/uplink/stealthy_and_inconspicuous_weapons.dm index 4a288bb2d4a..6ea6860a778 100644 --- a/code/datums/uplink/stealthy_and_inconspicuous_weapons.dm +++ b/code/datums/uplink/stealthy_and_inconspicuous_weapons.dm @@ -33,6 +33,12 @@ item_cost = 20 path = /obj/item/pen/reagent/sleepy +/datum/uplink_item/item/stealthy_weapons/fakescalp + name = "Injection Scalpel" + desc = "This 'scalpel' will inject a chemical of choice into the bloodstream of an unsuspecting patient, either it be a surgery or assault. WARNING: Not for use as a scalpel, poison not included." + item_cost = 15 + path = /obj/item/material/knife/reagent/fakescalp + /datum/uplink_item/item/stealthy_weapons/syringegun name = "Disguised Syringe Gun" desc = "A syringe gun disguised as an electronic cigarette with 4 darts included in the box. Chemicals not included!" diff --git a/code/game/antagonist/station/traitor.dm b/code/game/antagonist/station/traitor.dm index a2b275bee43..b1ad374fb85 100644 --- a/code/game/antagonist/station/traitor.dm +++ b/code/game/antagonist/station/traitor.dm @@ -1,5 +1,11 @@ GLOBAL_DATUM_INIT(traitors, /datum/antagonist/traitor, new) +/proc/istraitor(var/mob/player) + if(!GLOB.traitors || !player.mind) + return 0 + if(player.mind in GLOB.traitors.current_antagonists) + return 1 + // Inherits most of its vars from the base datum. /datum/antagonist/traitor id = MODE_TRAITOR diff --git a/code/game/machinery/rotating_alarm.dm b/code/game/machinery/rotating_alarm.dm index a123045bf66..3be5b8e786c 100644 --- a/code/game/machinery/rotating_alarm.dm +++ b/code/game/machinery/rotating_alarm.dm @@ -41,7 +41,7 @@ active_power_usage = 0 anchored = TRUE - obj_flags = OBJ_FLAG_ANCHORABLE + obj_flags = OBJ_FLAG_ANCHORABLE | OBJ_FLAG_ROTATABLE var/on = FALSE var/low_alarm = FALSE var/construct_type = /obj/machinery/light_construct diff --git a/code/game/objects/items/weapons/material/knives.dm b/code/game/objects/items/weapons/material/knives.dm index 75d36b03958..62204d98caf 100644 --- a/code/game/objects/items/weapons/material/knives.dm +++ b/code/game/objects/items/weapons/material/knives.dm @@ -110,3 +110,41 @@ name = "lightweight utility knife" desc = "A lightweight utility knife made out of a steel alloy." icon_state = "titanium" + +//Reagent Knives + +/obj/item/material/knife/reagent + atom_flags = ATOM_FLAG_OPEN_CONTAINER + origin_tech = list(TECH_MATERIAL = 2, TECH_ESOTERIC = 5) + +/obj/item/material/knife/reagent/New() + ..() + create_reagents(30) + +/obj/item/material/knife/reagent/attack(mob/living/M, mob/user, var/target_zone) + if(!istype(M)) + return + + . = ..() + if(reagents.total_volume) + if(M.reagents) + var/should_admin_log = reagents.should_admin_log() + var/contained_reagents = reagents.get_reagents() + var/trans = reagents.trans_to_mob(M, 8, CHEM_BLOOD) //we transfer only 8 units because slashing doesnt generally make you stay in the wound long + if(should_admin_log) + admin_inject_log(user, M, src, contained_reagents, trans) + + +/obj/item/material/knife/reagent/fakescalp + name = "scalpel" + desc = "A tiny and extremely sharp steel cutting tool used for surgery, dissection, autopsy, and very precise cuts. The cornerstone of any surgical procedure." + icon = 'icons/obj/surgery.dmi' + icon_state = "scalpel" + applies_material_colour = 0 //does not rename it to "steel scalpel" so we can hide it :))))))) + applies_material_name = 0 //does not recolor it, makes it indistinguishable from a real scalpel. + origin_tech = list(TECH_MATERIAL = 2, TECH_ESOTERIC = 5) + +/obj/item/material/knife/reagent/fakescalp/examine(mob/user, distance) + . = ..() + if(istraitor(user) || user.skill_check(SKILL_MEDICAL, SKILL_TRAINED) || user.skill_check(SKILL_DEVICES, SKILL_TRAINED)) + to_chat(user, "That doesn't look like a normal scalpel.") diff --git a/icons/obj/bureaucracy.dmi b/icons/obj/bureaucracy.dmi index ea3c1b78166a2757f399aaaa8290df0777fc5206..60255a46d2bdce834a45c75208ae4b1bd888e04f 100644 GIT binary patch delta 4474 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 delta 4182 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 From 5fe0806ab6dc2bac53f01028cd127f64fb18baf4 Mon Sep 17 00:00:00 2001 From: PrisonStation <111151681+casualspacestation14enjoyer@users.noreply.github.com> Date: Sat, 2 Sep 2023 10:49:16 +0200 Subject: [PATCH 03/10] four I HATE MYLIFE --- code/game/machinery/alarm.dm | 1 + .../objects/items/weapons/grenades/grenade.dm | 45 ++++++++++++------- .../objects/items/weapons/material/knives.dm | 20 ++++++--- code/modules/overmap/ships/computers/helm.dm | 1 + 4 files changed, 44 insertions(+), 23 deletions(-) diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm index 72c612256e5..6d221f3575f 100644 --- a/code/game/machinery/alarm.dm +++ b/code/game/machinery/alarm.dm @@ -228,6 +228,7 @@ req_access.Cut() to_chat(user, SPAN_NOTICE("You short out \the [src]'s scanner circuit, removing the access requirements!")) sparks(2, 1, src) + emagged = 1 return 1 return diff --git a/code/game/objects/items/weapons/grenades/grenade.dm b/code/game/objects/items/weapons/grenades/grenade.dm index 8c62130d77c..b46f7e1bcd7 100644 --- a/code/game/objects/items/weapons/grenades/grenade.dm +++ b/code/game/objects/items/weapons/grenades/grenade.dm @@ -9,11 +9,21 @@ throw_range = 20 obj_flags = OBJ_FLAG_CONDUCTIBLE slot_flags = SLOT_BELT + var/emagged = FALSE var/active = 0 var/det_time = 50 var/fail_det_time = 5 // If you are clumsy and fail, you get this time. var/arm_sound = 'sound/weapons/armbomb.ogg' +/obj/item/grenade/emag_act(remaining_charges, mob/user, emag_source) + . = ..() + if(!emagged) + to_chat(user, SPAN_NOTICE("You short out \the [src]'s timer, it is now permanently set for instant detonation!")) + sparks(2, 1, src) + det_time = 1 + emagged = 1 + return 1 + /obj/item/grenade/proc/clown_check(var/mob/living/user) if((MUTATION_CLUMSY in user.mutations) && prob(50)) to_chat(user, "Huh? How does this thing work?") @@ -61,23 +71,26 @@ T.hotspot_expose(700,125) /obj/item/grenade/attackby(obj/item/W as obj, mob/user as mob) - if(isScrewdriver(W)) - switch(det_time) - if (1) - det_time = 10 - to_chat(user, "You set the [name] for 1 second detonation time.") - if (10) - det_time = 30 - to_chat(user, "You set the [name] for 3 second detonation time.") - if (30) - det_time = 50 - to_chat(user, "You set the [name] for 5 second detonation time.") - if (50) - det_time = 1 - to_chat(user, "You set the [name] for instant detonation.") - add_fingerprint(user) + if(!emagged) + if(isScrewdriver(W)) + switch(det_time) + if (1) + det_time = 10 + to_chat(user, "You set the [name] for 1 second detonation time.") + if (10) + det_time = 30 + to_chat(user, "You set the [name] for 3 second detonation time.") + if (30) + det_time = 50 + to_chat(user, "You set the [name] for 5 second detonation time.") + if (50) + det_time = 1 + to_chat(user, "You set the [name] for instant detonation.") + else + to_chat(user, SPAN_WARNING("\The [src] refuses the change!")) + add_fingerprint(user) ..() /obj/item/grenade/attack_hand() walk(src, null, null) - ..() \ No newline at end of file + ..() diff --git a/code/game/objects/items/weapons/material/knives.dm b/code/game/objects/items/weapons/material/knives.dm index 62204d98caf..f7080fdab57 100644 --- a/code/game/objects/items/weapons/material/knives.dm +++ b/code/game/objects/items/weapons/material/knives.dm @@ -126,13 +126,19 @@ return . = ..() - if(reagents.total_volume) - if(M.reagents) - var/should_admin_log = reagents.should_admin_log() - var/contained_reagents = reagents.get_reagents() - var/trans = reagents.trans_to_mob(M, 8, CHEM_BLOOD) //we transfer only 8 units because slashing doesnt generally make you stay in the wound long - if(should_admin_log) - admin_inject_log(user, M, src, contained_reagents, trans) + + var/allow = M.can_inject(user, target_zone) + if(user.a_intent == I_HURT) //prevents it from injecting reagents WITHOUT attacking (reagents get injected but no harm is done to the target) + if(allow) + if(allow == INJECTION_PORT) //this is a knife meant for combat, we are not gonna inject + return + if(reagents.total_volume) + if(M.reagents) + var/should_admin_log = reagents.should_admin_log() + var/contained_reagents = reagents.get_reagents() + var/trans = reagents.trans_to_mob(M, 4, CHEM_BLOOD) //we transfer only 4 units because slashing doesnt generally make you stay in the wound long + if(should_admin_log) + admin_inject_log(user, M, src, contained_reagents, trans) /obj/item/material/knife/reagent/fakescalp diff --git a/code/modules/overmap/ships/computers/helm.dm b/code/modules/overmap/ships/computers/helm.dm index 8a84c785f4f..47f6f889498 100644 --- a/code/modules/overmap/ships/computers/helm.dm +++ b/code/modules/overmap/ships/computers/helm.dm @@ -256,6 +256,7 @@ LEGACY_RECORD_STRUCTURE(all_waypoints, waypoint) req_access.Cut() to_chat(user, SPAN_NOTICE("You short out \the [src]'s internal circuitry, removing the access requirements!")) sparks(2, 1, src) + emagged = 1 return 1 return From 776d07cace730dbb5119599261a2812e8a78751f Mon Sep 17 00:00:00 2001 From: PrisonStation <111151681+casualspacestation14enjoyer@users.noreply.github.com> Date: Sat, 2 Sep 2023 16:49:08 +0200 Subject: [PATCH 04/10] fix --- code/game/machinery/alarm.dm | 2 +- code/game/objects/items/weapons/grenades/grenade.dm | 2 +- code/modules/overmap/ships/computers/helm.dm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm index 6d221f3575f..2e21212600a 100644 --- a/code/game/machinery/alarm.dm +++ b/code/game/machinery/alarm.dm @@ -228,7 +228,7 @@ req_access.Cut() to_chat(user, SPAN_NOTICE("You short out \the [src]'s scanner circuit, removing the access requirements!")) sparks(2, 1, src) - emagged = 1 + emagged = TRUE return 1 return diff --git a/code/game/objects/items/weapons/grenades/grenade.dm b/code/game/objects/items/weapons/grenades/grenade.dm index b46f7e1bcd7..9ac6378f4fd 100644 --- a/code/game/objects/items/weapons/grenades/grenade.dm +++ b/code/game/objects/items/weapons/grenades/grenade.dm @@ -21,7 +21,7 @@ to_chat(user, SPAN_NOTICE("You short out \the [src]'s timer, it is now permanently set for instant detonation!")) sparks(2, 1, src) det_time = 1 - emagged = 1 + emagged = TRUE return 1 /obj/item/grenade/proc/clown_check(var/mob/living/user) diff --git a/code/modules/overmap/ships/computers/helm.dm b/code/modules/overmap/ships/computers/helm.dm index 47f6f889498..6ecfe227670 100644 --- a/code/modules/overmap/ships/computers/helm.dm +++ b/code/modules/overmap/ships/computers/helm.dm @@ -256,7 +256,7 @@ LEGACY_RECORD_STRUCTURE(all_waypoints, waypoint) req_access.Cut() to_chat(user, SPAN_NOTICE("You short out \the [src]'s internal circuitry, removing the access requirements!")) sparks(2, 1, src) - emagged = 1 + emagged = TRUE return 1 return From e2c9e292c9aa9efb8ee993dd703d109a90f9efeb Mon Sep 17 00:00:00 2001 From: f19_enjoyer <111151681+casualspacestation14enjoyer@users.noreply.github.com> Date: Sat, 2 Sep 2023 18:34:24 +0200 Subject: [PATCH 05/10] egor suggestion Co-authored-by: EgorDinamit <53223414+EgorDinamit@users.noreply.github.com> --- code/game/antagonist/station/traitor.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/antagonist/station/traitor.dm b/code/game/antagonist/station/traitor.dm index b1ad374fb85..894962f214c 100644 --- a/code/game/antagonist/station/traitor.dm +++ b/code/game/antagonist/station/traitor.dm @@ -1,10 +1,10 @@ GLOBAL_DATUM_INIT(traitors, /datum/antagonist/traitor, new) -/proc/istraitor(var/mob/player) +/proc/istraitor(mob/player) if(!GLOB.traitors || !player.mind) - return 0 + return FALSE if(player.mind in GLOB.traitors.current_antagonists) - return 1 + return TRUE // Inherits most of its vars from the base datum. /datum/antagonist/traitor From cc224a01901a268a3c4a384f5d9d369210f0d239 Mon Sep 17 00:00:00 2001 From: PrisonStation <111151681+casualspacestation14enjoyer@users.noreply.github.com> Date: Sat, 2 Sep 2023 18:46:55 +0200 Subject: [PATCH 06/10] fixed EPICLY --- code/game/machinery/alarm.dm | 2 +- code/game/machinery/rotating_alarm.dm | 1 - .../objects/items/weapons/grenades/grenade.dm | 2 +- code/modules/overmap/ships/computers/helm.dm | 2 +- icons/obj/bureaucracy.dmi | Bin 26248 -> 25959 bytes 5 files changed, 3 insertions(+), 4 deletions(-) diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm index 2e21212600a..bbe89c601b5 100644 --- a/code/game/machinery/alarm.dm +++ b/code/game/machinery/alarm.dm @@ -229,7 +229,7 @@ to_chat(user, SPAN_NOTICE("You short out \the [src]'s scanner circuit, removing the access requirements!")) sparks(2, 1, src) emagged = TRUE - return 1 + return TRUE return /obj/machinery/alarm/proc/handle_heating_cooling(var/datum/gas_mixture/environment) diff --git a/code/game/machinery/rotating_alarm.dm b/code/game/machinery/rotating_alarm.dm index 3be5b8e786c..73b882c0c7f 100644 --- a/code/game/machinery/rotating_alarm.dm +++ b/code/game/machinery/rotating_alarm.dm @@ -41,7 +41,6 @@ active_power_usage = 0 anchored = TRUE - obj_flags = OBJ_FLAG_ANCHORABLE | OBJ_FLAG_ROTATABLE var/on = FALSE var/low_alarm = FALSE var/construct_type = /obj/machinery/light_construct diff --git a/code/game/objects/items/weapons/grenades/grenade.dm b/code/game/objects/items/weapons/grenades/grenade.dm index 9ac6378f4fd..c4e08b724ec 100644 --- a/code/game/objects/items/weapons/grenades/grenade.dm +++ b/code/game/objects/items/weapons/grenades/grenade.dm @@ -22,7 +22,7 @@ sparks(2, 1, src) det_time = 1 emagged = TRUE - return 1 + return TRUE /obj/item/grenade/proc/clown_check(var/mob/living/user) if((MUTATION_CLUMSY in user.mutations) && prob(50)) diff --git a/code/modules/overmap/ships/computers/helm.dm b/code/modules/overmap/ships/computers/helm.dm index 6ecfe227670..57077c7e07c 100644 --- a/code/modules/overmap/ships/computers/helm.dm +++ b/code/modules/overmap/ships/computers/helm.dm @@ -257,7 +257,7 @@ LEGACY_RECORD_STRUCTURE(all_waypoints, waypoint) to_chat(user, SPAN_NOTICE("You short out \the [src]'s internal circuitry, removing the access requirements!")) sparks(2, 1, src) emagged = TRUE - return 1 + return TRUE return /** diff --git a/icons/obj/bureaucracy.dmi b/icons/obj/bureaucracy.dmi index 60255a46d2bdce834a45c75208ae4b1bd888e04f..ea3c1b78166a2757f399aaaa8290df0777fc5206 100644 GIT binary patch delta 4182 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 delta 4474 zcmY*cc_38l`#&?*L3Wp}bx8IoYZx<4)+^h!B|=%UD@4|V#**y27<+MN5Fv>{C2Q75 z_EJm{gRu>R-*oTypWpfGeb4)x&+|Ud`*}ald58m$#34xfIfzJxq$s#Psqm+|U~s>i z$Hkp`LM+@kS;2}+)u?%@W%12WXK;ZIR4^7Qvng@aqQvm8smZBce={U5fn+wAar?zD zyh(Eh!T!Q|?`?Bm+>v{$K;Pcg;!`6#H=Nq!WG=Ssv;HO9!MKKt)`ecp4n7q#W7K2B zOe;Tn+BP6nD!Z7m&;p#Q9w~(aT9X+S4-#VW;?>wQ!uac^YcW2d^k~FVOhg8|thtZY z+Muyk>GJzqMp$7}Art8Imuy8=XLn1Rw!1Ed$h9})Hm*;tf7y9(=~5NT!l!Yn6=$)O z3p0+cK;NFcNG}iWz4~LU{FQhr-lxAPS_m$csBN*uT1gc}!x0`nUT zvvyZ*empDf#xsdgsg^i0bLktntimJp3z>3@yIbkFN+5P7?hOR;;7Mks<(*}p85z{7 zrnvPL1HPHzi-HQQ{B7NJM6SAIi%&W48J#u$G;Yi_)5Y$d5ow6ZtuIF{aC=k)zlEhV z{!)+1$=ZOJN-DmaxSXBlxe|Ujjy2# zwbaR0W<3|i5v$Wsl}HB*(`zF4KtzZ!ihUv^K-)ky^P$(0CJ+Z*oKaI!6BH?x;3yFcz2uZ}Vnnribe$tr*;aeJ-sFhy#j3^eGVX}t$`uXj>Vre36+yu(7bZog?*jY&o)xbrE9J6`ti<=I)K(v)|tBr-1 zd0oi))o4hf{u2{hwv@1R-oJrq(Ad6eju86PT zagFjJuC?wi^@F9Dq9*)k&{@{4+IgxF;N0_Fv{2ZH8OBp#ia}nVk56!ajj#M@seG@o z)~#D-v6=n$Lxst2hzc%UC2YBl)0cVnY0AQSy{yw>ys9N)>TPBLxSr+yG1Y0Le8&ig zeteG%0Rl zG}^@qqN5TBeOBcT1&XhkcIWj8HH?@fXP1xtfahn#{6DvhJEtQrsD+HNY_=U-3=9l+ zHL*`N+gt8uW7Q9=4yHSAmppm73G?kH*5Cl3#>tWmke)r}iaP1<$(Lv10l5|O1GugQ zx(GfIoNby4TtWKjvyoj?I!jBtHsP#rB)sivZ<_N-d#LpF+=M}2g#$9_)R4l(&5*1K zrPkf&G`nCz56I`U0goj1E>ru(lqSiDV_AY-qh$j*vUfCd_w-Ely~Bu@5G_|?c*{Fn zM5N$dis0ZjN6V8Cs(uid?aM(4!91izAKG3lsXu`DLp70;Td9KO?n4FZH3vawZHFD5 zQy$YD3X~MwH@xqcU`;txyI$bGvSlE?)LtST=}2lV>nDwFN!X~RaB_>e)G>bbr~H-O zzVp1%y{f#m;fx}|t9N)`*ii3_T#qvHC0T;&-q_%B+2e-8jU5mIu;eb^qS2)?7l|)< zZu4zvY4qdAhg1p5_+Xtla{rx!@n0SMEy1`*<)nL6crLk@ix~@y8J!-3mj_cjpEU^` zFgc&%=QF=Omr+QFETj5lbe6BE=(K^Np2VoLcLmuPG!T+{YX=vw{!pNOvN*+Luf*%< z*FCDB|5FtYB)Is?W6Ci+udAE1$zMU;mm__P>UZ}oVPYrs;N?Wqb4R}Ag-|n+1dd_u zKQC~;p8F(zJYWVd+1Ux2YYQ>+dKnV6OP<87lhppfmZpys*~uIXOrH6Y`r$zuwb4HW zZ+v>!$JNGK38QN@n63M?qNevOgA)M;yUsbE&2j)F zT7{zfSJZlH+$x7CHdSkCK2XOkPo#D@q$sfZ0b7^b{>TgCG#jFseY>rRh``;)AP4h} zsAy3MR7{65-JGN%sMUM-TC_V&o(x!~!u`cYN(rh zLZiFq5)YB;ntZaeodMbfCuc_xB3yHYB_tQG>TnOHW@J9kbCPy5L%`DjS|vNs?&TR~ z70nl&rDR0YXb8*2X4&smQl*gtiV@p%Z&jeYiKdq(0u4Ugi8>c>@^&+&?mYqN=G+`n zGu(1R$A)OHAc`jsWr`}r1GH17Ro(qK0S4Zj6>n0U%Ld3#%P*4q)^yf(R)PQTZ`3XS z&Bs1Ms4TK^f7ih}v?n|BU#s!-i<4K(HWFHs^25aJb%6Aeyo9tgQJNq;epzHW+%aDZ z-B#3qL|e<$YV5hG*9^2MHp$V*E-U7w18nLatv%Ss`qs;y7LG)fX#~vmiuzF?U{o%u zca{3TnoHY?r)}Baf?vvCxnGN^_j)8D*DdkGZV~_a(`-!=lXJ=gdc<0I&Qm4Ow|}f2 ztsPsuOGpy#v0Sda6?;G*1v3Xtd#4%;lxQLYxr}e)LEmOA;rR;rmP4SE%)adWA#I&% z_-2($4BjoIFATXcA9@k|tw*qF_1EVy`Dq1%{aly)(j&K6;oT9m;zy0%mT;wBfpA}9 z%oc@z<6%kXL>pdP+OHk$J8(5H)hi!6vR@^4hKkoGp&TN(wHO9^+?l`%;gGM}9?k9MWs z@)AVBxY0eAdB12ZS#8N!YeNq{x4iDP1{C*X{>c`DyUy`ULW_cwEU-aJ7r*ndmJ1Vh z#>dCgb8{I%Nez|7wBP=OEabYF_O+{JlaAP}=|txq+rf%ub)G(Z`n2rTD}nd#-`7vi zJX=-ThgwTH#PUP3DRm)=p(tuNcx|FMm?q z$#=unHgD1-{VzSEI9dIWpL(LLi@#>+@&@BD82ULvI6se+DQ3w1s<*c{sx#a;a-l^l zKz7F;2HQxoogJ;J+_*vB5du)>y99N4Xn3o-yWtj zJhfvVBfrBp9WZ z9vB0afSve!(gjdAO%$G)h9=WesEdHZHkUq`-q#!Q)Yei0zH3y5#2Z;wiF>YEO*csN z$H??LcGNj2IN8>@ySj=gDsm_v?Rm^%4l->v^v4J0<10|K{MFRR3)$b7|FU=1kh5Sm zDtSh<3o`#ib*V)n#ysbNG*xDT#EuQqk_-H+8(G=bpA=hj(uLdl*R zb7r6LCCqLfR!&(@BoN!LQ(gz~0o!DB85pt@`lI0D=Y^9IuK%{d&P=?DCKbY zPotym1Lpqf1iFbq4!|KY@&}33yFS|jVJkVxJpV@M)l+r(D;V)B@Q&nUHrG3MyenF9 zc*}Zug8i&n@?Ns*XXpy04xB30?~=q^bSz$QC^9(oR_IYs58LcmsP@be0*%v{rYTXak_K$HV-oe;qaZ;Jgb9`cIE7 z%cA$4_`wVhjO{^vY!-tWrFMo3rCXebVkAN%}S!0V&-^$!1k#EbPVtAzB6^XBC)_4UxRA&MSvIoqG-i}XyJD=XGg!*Mp_X+F);vob5IK5>zt1n=2RE@YSYqbash0 zOX?rezb^n5n?k#&z-TuyNV7~j3AB;DdAre*zni&ENG1-4yMEs%X9ASSMbO%Wo_uH} z^}Di$Ms*4l(sB^}H4qaT8amTKBYLT76i=N>ScO z>ThXzIV)4`a5O`y5vRaq#rmgD8K&xP(wRS^{nt@jXi5nPSVq&NoDZzw@Tn7n2_N&7 z399*wuFymMwr&!__;}7=D?OmK9fsvms)<`kW75ANYHMrFdG!u2>!6v>`kO~{B?~a9 zsi>6FR+7p~>ub`NBrxepD2TpNoLgMd^@-r!Uc3y=7AC>#jCsdJ>v!_6S}7*dwu_-> j{a;ff1i;{!?sKP1IfT?R9BPv10or4vXR2F=c8>i&O_Yrc From ba6c1b76e1646e53544aa3fcd24ca7313ed751fa Mon Sep 17 00:00:00 2001 From: f19_enjoyer <111151681+casualspacestation14enjoyer@users.noreply.github.com> Date: Mon, 18 Sep 2023 15:25:34 +0200 Subject: [PATCH 07/10] i agree this is better :)))))))) Co-authored-by: EgorDinamit <53223414+EgorDinamit@users.noreply.github.com> --- code/game/antagonist/station/traitor.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/antagonist/station/traitor.dm b/code/game/antagonist/station/traitor.dm index 894962f214c..a4e1dfc50fb 100644 --- a/code/game/antagonist/station/traitor.dm +++ b/code/game/antagonist/station/traitor.dm @@ -5,6 +5,7 @@ GLOBAL_DATUM_INIT(traitors, /datum/antagonist/traitor, new) return FALSE if(player.mind in GLOB.traitors.current_antagonists) return TRUE + return FALSE // Inherits most of its vars from the base datum. /datum/antagonist/traitor From ccd61550c1ad5947a55ff059287a36a1d3cef207 Mon Sep 17 00:00:00 2001 From: PrisonStation <111151681+casualspacestation14enjoyer@users.noreply.github.com> Date: Sat, 30 Sep 2023 22:00:23 +0200 Subject: [PATCH 08/10] fiks issues --- .../uplink/stealthy_and_inconspicuous_weapons.dm | 2 +- .../objects/items/weapons/grenades/grenade.dm | 16 ++++++++-------- .../objects/items/weapons/material/knives.dm | 12 +++++++----- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/code/datums/uplink/stealthy_and_inconspicuous_weapons.dm b/code/datums/uplink/stealthy_and_inconspicuous_weapons.dm index 6ea6860a778..f75a8dfe963 100644 --- a/code/datums/uplink/stealthy_and_inconspicuous_weapons.dm +++ b/code/datums/uplink/stealthy_and_inconspicuous_weapons.dm @@ -35,7 +35,7 @@ /datum/uplink_item/item/stealthy_weapons/fakescalp name = "Injection Scalpel" - desc = "This 'scalpel' will inject a chemical of choice into the bloodstream of an unsuspecting patient, either it be a surgery or assault. WARNING: Not for use as a scalpel, poison not included." + desc = "This 'scalpel' will inject a chemical of choice into the bloodstream of an unsuspecting patient, either it be a surgery or assault. WARNING: Not for use as a scalpel, chemicals not included." item_cost = 15 path = /obj/item/material/knife/reagent/fakescalp diff --git a/code/game/objects/items/weapons/grenades/grenade.dm b/code/game/objects/items/weapons/grenades/grenade.dm index c4e08b724ec..4233b47e367 100644 --- a/code/game/objects/items/weapons/grenades/grenade.dm +++ b/code/game/objects/items/weapons/grenades/grenade.dm @@ -71,23 +71,23 @@ T.hotspot_expose(700,125) /obj/item/grenade/attackby(obj/item/W as obj, mob/user as mob) - if(!emagged) - if(isScrewdriver(W)) + if(isScrewdriver(W)) + if(!emagged) switch(det_time) if (1) det_time = 10 - to_chat(user, "You set the [name] for 1 second detonation time.") + to_chat(user, SPAN_NOTICE("You set the [name] for 1 second detonation time.")) if (10) det_time = 30 - to_chat(user, "You set the [name] for 3 second detonation time.") + to_chat(user, SPAN_NOTICE("You set the [name] for 3 second detonation time.")) if (30) det_time = 50 - to_chat(user, "You set the [name] for 5 second detonation time.") + to_chat(user, SPAN_NOTICE("You set the [name] for 5 second detonation time.")) if (50) det_time = 1 - to_chat(user, "You set the [name] for instant detonation.") - else - to_chat(user, SPAN_WARNING("\The [src] refuses the change!")) + to_chat(user, SPAN_NOTICE("You set the [name] for instant detonation.")) + else + to_chat(user, SPAN_WARNING("\The [src] refuses the change!")) add_fingerprint(user) ..() diff --git a/code/game/objects/items/weapons/material/knives.dm b/code/game/objects/items/weapons/material/knives.dm index f7080fdab57..3b2726ce800 100644 --- a/code/game/objects/items/weapons/material/knives.dm +++ b/code/game/objects/items/weapons/material/knives.dm @@ -115,11 +115,13 @@ /obj/item/material/knife/reagent atom_flags = ATOM_FLAG_OPEN_CONTAINER + var/amount_to_transfer = 1 // the amount of chems to transfer between attacks + var/volume = 30 origin_tech = list(TECH_MATERIAL = 2, TECH_ESOTERIC = 5) /obj/item/material/knife/reagent/New() ..() - create_reagents(30) + create_reagents(volume) /obj/item/material/knife/reagent/attack(mob/living/M, mob/user, var/target_zone) if(!istype(M)) @@ -129,14 +131,13 @@ var/allow = M.can_inject(user, target_zone) if(user.a_intent == I_HURT) //prevents it from injecting reagents WITHOUT attacking (reagents get injected but no harm is done to the target) - if(allow) - if(allow == INJECTION_PORT) //this is a knife meant for combat, we are not gonna inject - return + if(allow == INJECTION_PORT) //this is a knife meant for combat, we are not gonna inject + return if(reagents.total_volume) if(M.reagents) var/should_admin_log = reagents.should_admin_log() var/contained_reagents = reagents.get_reagents() - var/trans = reagents.trans_to_mob(M, 4, CHEM_BLOOD) //we transfer only 4 units because slashing doesnt generally make you stay in the wound long + var/trans = reagents.trans_to_mob(M, 1, CHEM_BLOOD) //we transfer only 1 unit because slashing doesnt generally make you stay in the wound long if(should_admin_log) admin_inject_log(user, M, src, contained_reagents, trans) @@ -146,6 +147,7 @@ desc = "A tiny and extremely sharp steel cutting tool used for surgery, dissection, autopsy, and very precise cuts. The cornerstone of any surgical procedure." icon = 'icons/obj/surgery.dmi' icon_state = "scalpel" + max_force = 7 //already kills people with chems, why make it op? applies_material_colour = 0 //does not rename it to "steel scalpel" so we can hide it :))))))) applies_material_name = 0 //does not recolor it, makes it indistinguishable from a real scalpel. origin_tech = list(TECH_MATERIAL = 2, TECH_ESOTERIC = 5) From 93068c257368037c4283f7ea703673eaa85aff85 Mon Sep 17 00:00:00 2001 From: PrisonStation <111151681+casualspacestation14enjoyer@users.noreply.github.com> Date: Sat, 7 Oct 2023 14:44:11 +0200 Subject: [PATCH 09/10] boopie peepie --- code/modules/mob/hear_say.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/mob/hear_say.dm b/code/modules/mob/hear_say.dm index 9b5277e1d3a..b300ba14c65 100644 --- a/code/modules/mob/hear_say.dm +++ b/code/modules/mob/hear_say.dm @@ -69,6 +69,7 @@ to_chat(src, "[speaker_name][alt_name] talks but you cannot hear \him.") else if (language) + var/message_to_send = null var/nverb = verb if (say_understands(speaker, language)) var/skip = FALSE @@ -206,6 +207,7 @@ var/formatted if (language) + var/message_to_send = null var/nverb = verb if (say_understands(speaker, language)) var/skip = FALSE From 9738082d431cc2d8972c4c965b5912b6b6cb5ee3 Mon Sep 17 00:00:00 2001 From: PrisonStation <111151681+casualspacestation14enjoyer@users.noreply.github.com> Date: Fri, 13 Oct 2023 18:57:13 +0200 Subject: [PATCH 10/10] Revert "boopie peepie" This reverts commit 93068c257368037c4283f7ea703673eaa85aff85. --- code/modules/mob/hear_say.dm | 2 -- 1 file changed, 2 deletions(-) diff --git a/code/modules/mob/hear_say.dm b/code/modules/mob/hear_say.dm index b300ba14c65..9b5277e1d3a 100644 --- a/code/modules/mob/hear_say.dm +++ b/code/modules/mob/hear_say.dm @@ -69,7 +69,6 @@ to_chat(src, "[speaker_name][alt_name] talks but you cannot hear \him.") else if (language) - var/message_to_send = null var/nverb = verb if (say_understands(speaker, language)) var/skip = FALSE @@ -207,7 +206,6 @@ var/formatted if (language) - var/message_to_send = null var/nverb = verb if (say_understands(speaker, language)) var/skip = FALSE