Sick Bugfixes (#20466)

Fixes #20458
Fixes #20456
Fixes #20455
Fixes #20449
Fixes #20447
Fixes #20440
Fixes #20434
Fixes #18515
Fixes #20443

Ugh. I'm still sick.
This commit is contained in:
Wowzewow (Wezzy)
2025-02-16 18:18:45 +00:00
committed by GitHub
parent c70c41ea18
commit 186f94ff58
24 changed files with 122 additions and 54 deletions
+1
View File
@@ -291,6 +291,7 @@
pickup_sound = 'sound/items/pickup/device.ogg'
drop_sound = 'sound/items/drop/device.ogg'
contained_sprite = TRUE
item_state = "electronic"
/atom/proc/get_cell()
return DEVICE_NO_CELL
@@ -5,6 +5,7 @@
icon = 'icons/obj/assemblies.dmi'
icon_state = "plastic-explosive0"
item_state = "plasticx"
contained_sprite = TRUE
item_flags = ITEM_FLAG_NO_BLUDGEON
w_class = WEIGHT_CLASS_SMALL
origin_tech = list(TECH_ILLEGAL = 2)
@@ -76,10 +76,7 @@
update_icon()
/obj/item/implanter/ipc_tag/update_icon()
if(ipc_tag)
icon_state = "cimplanter1"
else
icon_state = "cimplanter0"
icon_state = "implanter-[ipc_tag ? "1" : "0"]"
return
/obj/item/implanter/ipc_tag/attack(mob/living/target_mob, mob/living/user, target_zone)
@@ -219,7 +219,6 @@
* Energy Sword
*/
/obj/item/melee/energy/sword
color
name = "energy sword"
desc = "An energy sword. Quite rare, very dangerous."
desc_antag = "The energy sword is a very strong melee weapon, capable of severing limbs easily, if they are targeted. It can also has a chance \
@@ -245,19 +244,24 @@
base_block_chance = 30
var/blade_color
/obj/item/melee/energy/sword/New()
/obj/item/melee/energy/sword/Initialize(mapload, ...)
. = ..()
blade_color = pick("red","blue","green","purple")
/obj/item/melee/energy/sword/green/New()
/obj/item/melee/energy/sword/green/Initialize(mapload, ...)
. = ..()
blade_color = "green"
/obj/item/melee/energy/sword/red/New()
/obj/item/melee/energy/sword/red/Initialize(mapload, ...)
. = ..()
blade_color = "red"
/obj/item/melee/energy/sword/blue/New()
/obj/item/melee/energy/sword/blue/Initialize(mapload, ...)
. = ..()
blade_color = "blue"
/obj/item/melee/energy/sword/purple/New()
/obj/item/melee/energy/sword/purple/Initialize(mapload, ...)
. = ..()
blade_color = "purple"
/obj/item/melee/energy/sword/activate(mob/living/user)
+2 -1
View File
@@ -1,8 +1,9 @@
/obj/item/mesmetron
name = "mesmetron pocketwatch"
desc = "An elaborate pocketwatch, with a captivating gold etching and an enchanting face. . ."
icon = 'icons/obj/items.dmi'
icon = 'icons/obj/item/clothing/wrists/wrist.dmi'
icon_state = "pocketwatch"
item_state = "pocketwatch"
drop_sound = 'sound/items/drop/accessory.ogg'
pickup_sound = 'sound/items/pickup/accessory.ogg'
matter = list(MATERIAL_GLASS = 150, MATERIAL_GOLD = 50)