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

Commit

Permalink
Who let me cook
Browse files Browse the repository at this point in the history
  • Loading branch information
NamelessFairy committed Dec 7, 2023
1 parent 3cb0b2f commit add1f26
Show file tree
Hide file tree
Showing 3 changed files with 65 additions and 43 deletions.
97 changes: 58 additions & 39 deletions _maps/toolbox_arenas/bomberman.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@
/obj/structure/barricade/bomberman/powerup/mirror,
/turf/open/floor/grass,
/area/centcom/tdome/arena)
"h" = (
/obj/structure/barricade/bomberman/powerup/mirror{
mirror_distance = 14
},
/turf/open/misc/grass/jungle,
/area/centcom/tdome/arena)
"j" = (
/turf/open/misc/grass/jungle,
/area/centcom/tdome/arena)
Expand All @@ -20,7 +26,20 @@
/turf/open/misc/grass/jungle,
/area/centcom/tdome/arena)
"m" = (
/turf/closed/wall,
/obj/structure/barricade/bomberman/powerup/mirror{
mirror_distance = 10
},
/turf/open/misc/grass/jungle,
/area/centcom/tdome/arena)
"p" = (
/obj/structure/barricade/bomberman/powerup/mirror,
/turf/open/misc/grass/jungle,
/area/centcom/tdome/arena)
"x" = (
/obj/structure/barricade/bomberman/powerup/mirror{
mirror_distance = 6
},
/turf/open/misc/grass/jungle,
/area/centcom/tdome/arena)
"A" = (
/obj/structure/barricade/bomberman/powerup/mirror{
Expand Down Expand Up @@ -91,9 +110,9 @@
/area/centcom/tdome/arena)

(1,1,1) = {"
m
j
a
j
B
W
B
W
Expand All @@ -103,19 +122,19 @@ a
j
"}
(2,1,1) = {"
m
a
j
M
G
h
M
h
G
M
G
M
a
"}
(3,1,1) = {"
m
D
P
D
P
Expand All @@ -128,18 +147,18 @@ P
"}
(4,1,1) = {"
m
E
M
E
m
M
m
E
M
E
M
E
"}
(5,1,1) = {"
m
Z
J
Z
J
Expand All @@ -151,46 +170,46 @@ Z
J
"}
(6,1,1) = {"
m
A
x
M
A
x
M
x
A
M
A
M
A
"}
(7,1,1) = {"
m
L
f
L
f
L
a
j
f
L
f
L
"}
(8,1,1) = {"
m
g
M
g
p
M
p
a
M
j
a
j
g
M
g
"}
(9,1,1) = {"
m
k
Q
k
Q
j
a
j
a
Expand All @@ -199,19 +218,19 @@ Q
k
"}
(10,1,1) = {"
m
a
j
M
j
a
M
j
a
M
j
a
M
a
"}
(11,1,1) = {"
m
a
j
a
j
Expand All @@ -223,19 +242,19 @@ a
j
"}
(12,1,1) = {"
m
a
j
M
a
j
M
j
a
M
a
M
a
"}
(13,1,1) = {"
m
a
j
a
j
Expand All @@ -247,19 +266,19 @@ a
j
"}
(14,1,1) = {"
m
a
j
M
a
j
M
j
a
M
a
M
a
"}
(15,1,1) = {"
m
a
j
a
j
Expand All @@ -271,19 +290,19 @@ a
j
"}
(16,1,1) = {"
m
a
j
M
a
j
M
j
a
M
a
M
a
"}
(17,1,1) = {"
m
a
j
a
j
Expand Down
11 changes: 7 additions & 4 deletions code/game/objects/effects/powerup.dm
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,7 @@
target.apply_status_effect(/datum/status_effect/mayhem)

/obj/effect/powerup/bomberman
pickup_sound = 'sound/magic/lightningshock.ogg' //Pick something better
icon_state = "speed" //Temp for testing
pickup_sound = 'sound/machines/synth_yes.ogg'

/obj/effect/powerup/bomberman/trigger(mob/living/target)
. = ..()
Expand All @@ -142,6 +141,7 @@
/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)
. = ..()
Expand Down Expand Up @@ -180,19 +180,22 @@
/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 in target)
for(var/obj/item/storage/toolbox/toolbox in target)
if(toolbox.force < 16)
toolbox.force++
//Visual effect
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)
. = ..()
Expand Down
Binary file modified icons/effects/effects.dmi
Binary file not shown.

0 comments on commit add1f26

Please sign in to comment.