From 9676fa0e5676d03642b8ecfe9b06b82d3fbb1583 Mon Sep 17 00:00:00 2001 From: vincibrv Date: Sat, 13 Jul 2024 21:27:47 +0200 Subject: [PATCH 1/5] eh --- code/game/objects/items/explosives/plastic.dm | 21 ++++++------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/code/game/objects/items/explosives/plastic.dm b/code/game/objects/items/explosives/plastic.dm index 58cbca9a5ab3..d39240733257 100644 --- a/code/game/objects/items/explosives/plastic.dm +++ b/code/game/objects/items/explosives/plastic.dm @@ -21,7 +21,7 @@ var/atom/plant_target = null //which atom the plstique explosive is planted on var/overlay_image = "plastic-explosive2" var/image/overlay - var/list/breachable = list(/obj/structure/window, /turf/closed, /obj/structure/machinery/door, /obj/structure/mineral_door , /obj/structure/cargo_container) + var/list/breachable = list(/obj/structure/window, /turf/closed, /obj/structure/machinery/door, /obj/structure/mineral_door , /obj/structure/cargo_container,/obj/structure/machinery/colony_floodlight) antigrief_protection = TRUE //Should it be checked by antigrief? var/req_skill = SKILL_ENGINEER @@ -173,16 +173,9 @@ update_icon() /obj/item/explosive/plastic/proc/can_place(mob/user, atom/target) - if(istype(target, /obj/structure/ladder) || istype(target, /obj/item) || istype(target, /turf/open) || istype(target, /obj/structure/barricade) || istype(target, /obj/structure/closet/crate)) - return FALSE - - if(istype(target, /obj/structure/closet)) - var/obj/structure/closet/C = target - if(C.opened) - return FALSE - //vehicle interior stuff checks - if(istype(target, /obj/vehicle/multitile)) + if(!is_type_in_list(target, breachable))//only items on the list are allowed + to_chat(user, SPAN_WARNING("You cannot plant [name] on [target]!")) return FALSE //vehicle interior stuff checks @@ -190,11 +183,6 @@ to_chat(user, SPAN_WARNING("It's too cramped in here to deploy [src].")) return FALSE - if(istype(target, /obj/effect) || istype(target, /obj/structure/machinery)) - var/obj/O = target - if(O.unacidable) - return FALSE - if(istype(target, /turf/closed/wall)) var/turf/closed/wall/W = target if(W.hull) @@ -294,6 +282,9 @@ for(var/obj/structure/machinery/door/D in orange(1, target_turf)) D.ex_act(1000 * penetration, , cause_data) + for(var/obj/structure/machinery/colony_floodlight/colony_floodlight in orange(1, target_turf)) + colony_floodlight.Destroy() + handle_explosion(target_turf, dir, temp_cause) /obj/item/explosive/plastic/proc/handle_explosion(turf/target_turf, dir, cause_data) From 444b74cca5b6d542e63bfb809156daf0cb7ed21e Mon Sep 17 00:00:00 2001 From: vincibrv Date: Tue, 16 Jul 2024 08:14:45 +0200 Subject: [PATCH 2/5] ehm --- code/game/objects/items/explosives/plastic.dm | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/code/game/objects/items/explosives/plastic.dm b/code/game/objects/items/explosives/plastic.dm index d39240733257..fa763c311da1 100644 --- a/code/game/objects/items/explosives/plastic.dm +++ b/code/game/objects/items/explosives/plastic.dm @@ -21,7 +21,7 @@ var/atom/plant_target = null //which atom the plstique explosive is planted on var/overlay_image = "plastic-explosive2" var/image/overlay - var/list/breachable = list(/obj/structure/window, /turf/closed, /obj/structure/machinery/door, /obj/structure/mineral_door , /obj/structure/cargo_container,/obj/structure/machinery/colony_floodlight) + var/list/breachable = list(/obj/structure/window, /turf/closed, /obj/structure/machinery/door, /obj/structure/mineral_door , /obj/structure/cargo_container) antigrief_protection = TRUE //Should it be checked by antigrief? var/req_skill = SKILL_ENGINEER @@ -173,9 +173,16 @@ update_icon() /obj/item/explosive/plastic/proc/can_place(mob/user, atom/target) + if(istype(target, /obj/structure/ladder) || istype(target, /obj/item) || istype(target, /turf/open) || istype(target, /obj/structure/barricade) || istype(target, /obj/structure/closet/crate)) + return FALSE - if(!is_type_in_list(target, breachable))//only items on the list are allowed - to_chat(user, SPAN_WARNING("You cannot plant [name] on [target]!")) + if(istype(target, /obj/structure/closet)) + var/obj/structure/closet/C = target + if(C.opened) + return FALSE + + //vehicle interior stuff checks + if(istype(target, /obj/vehicle/multitile)) return FALSE //vehicle interior stuff checks @@ -183,6 +190,11 @@ to_chat(user, SPAN_WARNING("It's too cramped in here to deploy [src].")) return FALSE + if(istype(target, /obj/effect) || istype(target, /obj/structure/machinery)) + var/obj/O = target + if(O.unacidable) + return FALSE + if(istype(target, /turf/closed/wall)) var/turf/closed/wall/W = target if(W.hull) @@ -282,9 +294,6 @@ for(var/obj/structure/machinery/door/D in orange(1, target_turf)) D.ex_act(1000 * penetration, , cause_data) - for(var/obj/structure/machinery/colony_floodlight/colony_floodlight in orange(1, target_turf)) - colony_floodlight.Destroy() - handle_explosion(target_turf, dir, temp_cause) /obj/item/explosive/plastic/proc/handle_explosion(turf/target_turf, dir, cause_data) @@ -382,4 +391,3 @@ to_chat(user, SPAN_WARNING("You don't quite understand how the device works...")) return FALSE . = ..() - From 2a78285e6827fe1d1ae475ce796f718fc7884d13 Mon Sep 17 00:00:00 2001 From: vincibrv Date: Tue, 16 Jul 2024 09:26:50 +0200 Subject: [PATCH 3/5] ehm --- code/game/objects/items/explosives/plastic.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/objects/items/explosives/plastic.dm b/code/game/objects/items/explosives/plastic.dm index fa763c311da1..58cbca9a5ab3 100644 --- a/code/game/objects/items/explosives/plastic.dm +++ b/code/game/objects/items/explosives/plastic.dm @@ -391,3 +391,4 @@ to_chat(user, SPAN_WARNING("You don't quite understand how the device works...")) return FALSE . = ..() + From 03408fd5c71cec8a0ad1b3d9c645cd466da38394 Mon Sep 17 00:00:00 2001 From: vincibrv Date: Thu, 18 Jul 2024 09:09:06 +0200 Subject: [PATCH 4/5] removed gravity generator and computer --- code/modules/power/gravitygenerator.dm | 23 ----------------------- colonialmarines.dme | 1 - maps/map_files/CORSAT/Corsat.dmm | 6 ------ maps/predship/huntership.dmm | 2 -- 4 files changed, 32 deletions(-) delete mode 100644 code/modules/power/gravitygenerator.dm diff --git a/code/modules/power/gravitygenerator.dm b/code/modules/power/gravitygenerator.dm deleted file mode 100644 index c3d4698fbc03..000000000000 --- a/code/modules/power/gravitygenerator.dm +++ /dev/null @@ -1,23 +0,0 @@ -// It... uses a lot of power. Everything under power is engineering stuff, at least. - -/obj/structure/machinery/computer/gravity_control_computer - name = "Gravity Generator Control" - desc = "A computer to control a local gravity generator. Qualified personnel only." - icon = 'icons/obj/structures/machinery/computer.dmi' - icon_state = "gravitycomp" - anchored = TRUE - density = TRUE - var/obj/structure/machinery/gravity_generator = null - - -/obj/structure/machinery/gravity_generator - name = "Gravitational Generator" - desc = "A device which produces a gravaton field when set up." - icon = 'icons/obj/structures/props/singularity.dmi' - icon_state = "TheSingGen" - anchored = TRUE - density = TRUE - use_power = USE_POWER_IDLE - idle_power_usage = 200 - active_power_usage = 1000 - var/on = 1 diff --git a/colonialmarines.dme b/colonialmarines.dme index b479f0af62c5..d4157ea2e4c0 100644 --- a/colonialmarines.dme +++ b/colonialmarines.dme @@ -2204,7 +2204,6 @@ #include "code\modules\power\cell.dm" #include "code\modules\power\fractal_reactor.dm" #include "code\modules\power\generator.dm" -#include "code\modules\power\gravitygenerator.dm" #include "code\modules\power\lighting.dm" #include "code\modules\power\port_gen.dm" #include "code\modules\power\power.dm" diff --git a/maps/map_files/CORSAT/Corsat.dmm b/maps/map_files/CORSAT/Corsat.dmm index ea56dacf0fa3..c47ca2efb4fd 100644 --- a/maps/map_files/CORSAT/Corsat.dmm +++ b/maps/map_files/CORSAT/Corsat.dmm @@ -40714,12 +40714,6 @@ /turf/open/floor/corsat/yellow, /area/corsat/gamma/engineering/atmos) "qVd" = ( -/obj/structure/machinery/gravity_generator{ - desc = "Absorbs and redirects radiation, hopefully away from you."; - name = "Radiation Collector"; - pixel_x = 15; - pixel_y = -5 - }, /obj/structure/platform{ dir = 1 }, diff --git a/maps/predship/huntership.dmm b/maps/predship/huntership.dmm index 2931fd42b111..e3845eac9cbf 100644 --- a/maps/predship/huntership.dmm +++ b/maps/predship/huntership.dmm @@ -828,7 +828,6 @@ /turf/open/shuttle/predship, /area/yautja) "co" = ( -/obj/structure/machinery/gravity_generator, /obj/structure/window/phoronreinforced{ icon_state = "phoronrwindow" }, @@ -934,7 +933,6 @@ /turf/open/floor/corsat/squareswood/north, /area/yautja) "cy" = ( -/obj/structure/machinery/gravity_generator, /obj/structure/window/phoronreinforced{ icon_state = "phoronrwindow" }, From 2c766ee4dc167bc1858fc6b2f6053a492bb8c480 Mon Sep 17 00:00:00 2001 From: vincibrv Date: Sun, 28 Jul 2024 14:15:52 +0200 Subject: [PATCH 5/5] replacment --- code/_onclick/human.dm | 2 +- maps/predship/huntership.dmm | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/code/_onclick/human.dm b/code/_onclick/human.dm index b09c26ffb92f..4a353d5ed5c5 100644 --- a/code/_onclick/human.dm +++ b/code/_onclick/human.dm @@ -38,7 +38,7 @@ if (A != src) return ..() var/mob/living/carbon/human/H = A - if (last_chew + 75 > world.time) + if (last_chew + 1 > world.time) to_chat(H, SPAN_DANGER("You can't bite your hand again yet...")) return diff --git a/maps/predship/huntership.dmm b/maps/predship/huntership.dmm index e3845eac9cbf..f9c1bd554978 100644 --- a/maps/predship/huntership.dmm +++ b/maps/predship/huntership.dmm @@ -828,6 +828,8 @@ /turf/open/shuttle/predship, /area/yautja) "co" = ( +/obj/structure/machinery/portable_atmospherics/canister/phoron, +/obj/structure/window/phoronreinforced, /obj/structure/window/phoronreinforced{ icon_state = "phoronrwindow" }, @@ -933,6 +935,8 @@ /turf/open/floor/corsat/squareswood/north, /area/yautja) "cy" = ( +/obj/structure/window/phoronreinforced, +/obj/structure/machinery/portable_atmospherics/canister/phoron, /obj/structure/window/phoronreinforced{ icon_state = "phoronrwindow" },