Skip to content

Commit

Permalink
few things broke. those are fixed now
Browse files Browse the repository at this point in the history
  • Loading branch information
FalloutFalcon committed Sep 30, 2024
1 parent 274188a commit 28fcdaf
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 91 deletions.
2 changes: 1 addition & 1 deletion code/datums/components/melee/charged.dm
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
list/attack_verb_on,
inhand_icon_change = TRUE,
_allowed_cells = list(),
_preload_cell_type = /obj/item/stock_parts/cell/melee,
_preload_cell_type = /obj/item/stock_parts/cell,
_cell_hit_cost = 1000,
_can_remove_cell = FALSE,
_no_cell_icon = FALSE
Expand Down
87 changes: 0 additions & 87 deletions code/game/objects/items/melee/charged.dm

This file was deleted.

4 changes: 2 additions & 2 deletions code/game/objects/items/melee/dualenergy.dm
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
var/sword_color = "green"
var/hacked = FALSE
var/list/possible_colors = list("red", "blue", "green", "purple", "yellow")
var/impale_flavor_text "twirl"
var/impale_flavor_text = "twirl"
var/hack_flavor_text = ""

/obj/item/melee/duelenergy/Initialize()
Expand Down Expand Up @@ -164,7 +164,7 @@
name = "energy halberd"
desc = "For when a normal halberd just isnt enough."
icon_state = "halberd"
base_icon_state = "halberd"'
base_icon_state = "halberd"
lefthand_file = 'icons/mob/inhands/weapons/polearms_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/polearms_righthand.dmi'
w_class = WEIGHT_CLASS_BULKY
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/toys.dm
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@
var/obj/item/melee/duelenergy/saber/toy/newSaber = new /obj/item/melee/duelenergy/saber/toy(user.loc)
if(hacked) // That's right, we'll only check the "original" "sword".
newSaber.hacked = TRUE
newSaber.saber_color = "rainbow"
newSaber.sword_color = "rainbow"
qdel(W)
qdel(src)
else if(W.tool_behaviour == TOOL_MULTITOOL)
Expand Down
3 changes: 3 additions & 0 deletions shiptest.dme
Original file line number Diff line number Diff line change
Expand Up @@ -1318,6 +1318,9 @@
#include "code\game\objects\items\implants\implantchair.dm"
#include "code\game\objects\items\implants\implanter.dm"
#include "code\game\objects\items\implants\implantpad.dm"
#include "code\game\objects\items\implants\implantuplink.dm"
#include "code\game\objects\items\melee\axe.dm"
#include "code\game\objects\items\melee\chainsaw.dm"
#include "code\game\objects\items\melee\dualenergy.dm"
#include "code\game\objects\items\melee\energy.dm"
#include "code\game\objects\items\melee\knife.dm"
Expand Down

0 comments on commit 28fcdaf

Please sign in to comment.