Skip to content
This repository has been archived by the owner on May 14, 2024. It is now read-only.

Commit

Permalink
Apparently I did unspeakable evils
Browse files Browse the repository at this point in the history
  • Loading branch information
NamelessFairy committed Dec 15, 2023
1 parent add1f26 commit 1c81801
Show file tree
Hide file tree
Showing 10 changed files with 117 additions and 114 deletions.
35 changes: 0 additions & 35 deletions code/game/machinery/deployable.dm
Original file line number Diff line number Diff line change
Expand Up @@ -236,41 +236,6 @@
. = ..()
AddComponent(/datum/component/deployable, 5 SECONDS, /obj/machinery/deployable_turret/hmg, delete_on_use = TRUE)

/obj/structure/barricade/bomberman
name = "brick wall"
desc = "Looks vunerable to explosives, but a toolbox will do."
icon = 'icons/obj/structures.dmi'
icon_state = "bricks"
max_integrity = 1
var/obj/powerup = null

/obj/structure/barricade/bomberman/Initialize(mapload)
. = ..()
//Its an event so I can get away with this
resistance_flags = NONE

/obj/structure/barricade/bomberman/atom_destruction(damage_flag)
if(!isnull(powerup))
new powerup(get_turf(src))
. = ..()

/obj/structure/barricade/bomberman/powerup

/obj/structure/barricade/bomberman/powerup/Initialize(mapload)
. = ..()
if (!prob(13))
return
powerup = pick(subtypesof(/obj/effect/powerup/bomberman))

/obj/structure/barricade/bomberman/powerup/mirror
var/mirror_distance = 2

/obj/structure/barricade/bomberman/powerup/mirror/Initialize(mapload)
. = ..()
var/obj/structure/barricade/bomberman/mirrored_wall = new /obj/structure/barricade/bomberman(locate(x + mirror_distance, y, z))
if(!isnull(powerup))
mirrored_wall.powerup = powerup

#undef SINGLE
#undef VERTICAL
#undef HORIZONTAL
Expand Down
75 changes: 0 additions & 75 deletions code/game/objects/effects/powerup.dm
Original file line number Diff line number Diff line change
Expand Up @@ -129,79 +129,4 @@
return
target.apply_status_effect(/datum/status_effect/mayhem)

/obj/effect/powerup/bomberman
pickup_sound = 'sound/machines/synth_yes.ogg'

/obj/effect/powerup/bomberman/trigger(mob/living/target)
. = ..()
if(!.)
return
target.balloon_alert_to_viewers(name)

/obj/effect/powerup/bomberman/speed
name = "speed up"
desc = "Makes you slightly faster."
icon_state = "speedup"

/obj/effect/powerup/bomberman/speed/trigger(mob/living/target)
. = ..()
if(!.)
return
if (target.has_movespeed_modifier(/datum/movespeed_modifier/bomberman_speed/fourth))
return
if (target.has_movespeed_modifier(/datum/movespeed_modifier/bomberman_speed/third))
target.remove_movespeed_modifier(/datum/movespeed_modifier/bomberman_speed/third)
target.add_movespeed_modifier(/datum/movespeed_modifier/bomberman_speed/fourth)
return
if (target.has_movespeed_modifier(/datum/movespeed_modifier/bomberman_speed/second))
target.remove_movespeed_modifier(/datum/movespeed_modifier/bomberman_speed/second)
target.add_movespeed_modifier(/datum/movespeed_modifier/bomberman_speed/third)
return
if (target.has_movespeed_modifier(/datum/movespeed_modifier/bomberman_speed/first))
target.remove_movespeed_modifier(/datum/movespeed_modifier/bomberman_speed/first)
target.add_movespeed_modifier(/datum/movespeed_modifier/bomberman_speed/second)
return
target.add_movespeed_modifier(/datum/movespeed_modifier/bomberman_speed/first)//WHO ON EARTH LET ME COOK

/datum/movespeed_modifier/bomberman_speed

/datum/movespeed_modifier/bomberman_speed/first //Turning tracking how many boosts you have into a component would be better but too bad.
multiplicative_slowdown = -0.15

/datum/movespeed_modifier/bomberman_speed/second
multiplicative_slowdown = -0.3

/datum/movespeed_modifier/bomberman_speed/third
multiplicative_slowdown = -0.45

/datum/movespeed_modifier/bomberman_speed/fourth
multiplicative_slowdown = -0.6

/obj/effect/powerup/bomberman/fire
name = "robustness up"
desc = "Makes your toolboxes stronger."
icon_state = "fireup"

/obj/effect/powerup/bomberman/fire/trigger(mob/living/target)
. = ..()
if(!.)
return
for(var/obj/item/storage/toolbox/toolbox in target)
if(toolbox.force < 16)
toolbox.force++
toolbox.throwforce++
toolbox.transform = toolbox.transform.Scale(1.25, 1.25)

/obj/effect/powerup/bomberman/bomb
name = "toolbox up"
desc = "Gives you another toolbox."
icon_state = "toolboxup"

/obj/effect/powerup/bomberman/bomb/trigger(mob/living/target)
. = ..()
if(!.)
return
var/toolbox = new /obj/item/storage/toolbox(target.loc)
target.put_in_hands(toolbox)


4 changes: 0 additions & 4 deletions code/game/turfs/closed/indestructible.dm
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,3 @@ INITIALIZE_IMMEDIATE(/turf/closed/indestructible/splashscreen)
. = ..()
underlays += mutable_appearance('icons/turf/floors.dmi', "plating")

/turf/closed/indestructible/bombermanwall
icon = 'icons/turf/walls/bombermanwall.dmi'
icon_state = "wall-0"
opacity = FALSE
Binary file modified icons/effects/effects.dmi
Binary file not shown.
Binary file modified icons/obj/structures.dmi
Binary file not shown.
Binary file removed icons/turf/walls/bombermanwall.dmi
Binary file not shown.
Binary file added modular_event/bomberman/bomberman_icons.dmi
Binary file not shown.
76 changes: 76 additions & 0 deletions modular_event/bomberman/powerup.dmm
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
/obj/effect/powerup/bomberman
icon = 'modular_event/bomberman/bomberman_icons.dmi'
pickup_sound = 'sound/machines/synth_yes.ogg'

/obj/effect/powerup/bomberman/trigger(mob/living/target)
. = ..()
if(!.)
return
target.balloon_alert_to_viewers(name)

/obj/effect/powerup/bomberman/speed
name = "speed up"
desc = "Makes you slightly faster."
icon_state = "speedup"

/obj/effect/powerup/bomberman/speed/trigger(mob/living/target)
. = ..()
if(!.)
return
if (target.has_movespeed_modifier(/datum/movespeed_modifier/bomberman_speed/fourth))
return
if (target.has_movespeed_modifier(/datum/movespeed_modifier/bomberman_speed/third))
target.remove_movespeed_modifier(/datum/movespeed_modifier/bomberman_speed/third)
target.add_movespeed_modifier(/datum/movespeed_modifier/bomberman_speed/fourth)
return
if (target.has_movespeed_modifier(/datum/movespeed_modifier/bomberman_speed/second))
target.remove_movespeed_modifier(/datum/movespeed_modifier/bomberman_speed/second)
target.add_movespeed_modifier(/datum/movespeed_modifier/bomberman_speed/third)
return
if (target.has_movespeed_modifier(/datum/movespeed_modifier/bomberman_speed/first))
target.remove_movespeed_modifier(/datum/movespeed_modifier/bomberman_speed/first)
target.add_movespeed_modifier(/datum/movespeed_modifier/bomberman_speed/second)
return
target.add_movespeed_modifier(/datum/movespeed_modifier/bomberman_speed/first)//WHO ON EARTH LET ME COOK

/datum/movespeed_modifier/bomberman_speed

/datum/movespeed_modifier/bomberman_speed/first //Turning tracking how many boosts you have into a component would be better but too bad.
multiplicative_slowdown = -0.15

/datum/movespeed_modifier/bomberman_speed/second
multiplicative_slowdown = -0.3

/datum/movespeed_modifier/bomberman_speed/third
multiplicative_slowdown = -0.45

/datum/movespeed_modifier/bomberman_speed/fourth
multiplicative_slowdown = -0.6

/obj/effect/powerup/bomberman/fire
name = "robustness up"
desc = "Makes your toolboxes stronger."
icon_state = "fireup"

/obj/effect/powerup/bomberman/fire/trigger(mob/living/target)
. = ..()
if(!.)
return
for(var/obj/item/storage/toolbox/toolbox in target)
if(toolbox.force < 16)
toolbox.force++
toolbox.throwforce++
toolbox.transform = toolbox.transform.Scale(1.25, 1.25)

/obj/effect/powerup/bomberman/bomb
name = "toolbox up"
desc = "Gives you another toolbox."
icon_state = "toolboxup"

/obj/effect/powerup/bomberman/bomb/trigger(mob/living/target)
. = ..()
if(!.)
return
var/toolbox = new /obj/item/storage/toolbox(target.loc)
target.put_in_hands(toolbox)

39 changes: 39 additions & 0 deletions modular_event/bomberman/wall.dmm
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
/turf/closed/indestructible/bombermanwall
icon = 'modular_event/bomberman/bomberman_icons.dmi'
icon_state = "wall-0"
opacity = FALSE

/obj/structure/barricade/bomberman
name = "brick wall"
desc = "Looks vunerable to explosives, but a toolbox will do."
icon = 'modular_event/bomberman/bomberman_icons.dmi'
icon_state = "bricks"
max_integrity = 1
var/obj/powerup = null

/obj/structure/barricade/bomberman/Initialize(mapload)
. = ..()
//Its an event so I can get away with this
resistance_flags = NONE

/obj/structure/barricade/bomberman/atom_destruction(damage_flag)
if(!isnull(powerup))
new powerup(get_turf(src))
. = ..()

/obj/structure/barricade/bomberman/powerup

/obj/structure/barricade/bomberman/powerup/Initialize(mapload)
. = ..()
if (!prob(13))
return
powerup = pick(subtypesof(/obj/effect/powerup/bomberman))

/obj/structure/barricade/bomberman/powerup/mirror
var/mirror_distance = 2

/obj/structure/barricade/bomberman/powerup/mirror/Initialize(mapload)
. = ..()
var/obj/structure/barricade/bomberman/mirrored_wall = new /obj/structure/barricade/bomberman(locate(x + mirror_distance, y, z))
if(!isnull(powerup))
mirrored_wall.powerup = powerup
2 changes: 2 additions & 0 deletions tgstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -5725,4 +5725,6 @@
#include "modular_event\base\vending_safety.dm"
#include "modular_event\base\event_aheal_recall_spells\code\action.dm"
#include "modular_event\base\event_aheal_recall_spells\code\living.dm"
#include "modular_event\bomberman\powerup.dmm"
#include "modular_event\bomberman\wall.dmm"
// END_INCLUDE

0 comments on commit 1c81801

Please sign in to comment.