Skip to content

Commit

Permalink
[MIRROR] FIX: Various sprites from PR#33877 thread
Browse files Browse the repository at this point in the history
  • Loading branch information
LordNest authored and SierraHelper committed Jan 5, 2024
1 parent 589cace commit db37f95
Show file tree
Hide file tree
Showing 10 changed files with 8 additions and 9 deletions.
1 change: 1 addition & 0 deletions code/game/objects/items/devices/radio/electropack.dm
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/obj/item/device/radio/electropack
name = "electropack"
desc = "Dance my monkeys! DANCE!!!"
icon = 'icons/obj/electropack.dmi'
icon_state = "electropack0"
item_state = "electropack"
frequency = 1449
Expand Down
4 changes: 2 additions & 2 deletions code/game/objects/items/weapons/staff.dm
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/obj/item/staff
name = "wizard's staff"
desc = "Apparently a staff used by the wizard."
icon = 'icons/obj/cult.dmi'
icon = 'icons/obj/staffs.dmi'
icon_state = "staff"
force = 3.0
throwforce = 5.0
Expand All @@ -13,7 +13,7 @@
/obj/item/staff/broom
name = "broom"
desc = "Used for sweeping, and flying into the night while cackling. Black cat not included."
icon = 'icons/obj/cult.dmi'
icon = 'icons/obj/staffs.dmi'
icon_state = "broom"

/obj/item/staff/gentcane
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/weapons/teleportation.dm
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
name = "locator"
desc = "Used to track those with locater implants."
icon = 'icons/obj/tools/pinpointer.dmi'
icon_state = "locator"
icon_state = "pinoff"
var/temp = null
var/frequency = 1451
var/broadcasting = null
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/structures/barsign.dm
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/obj/structure/sign/double/barsign
desc = "A jumbo-sized LED sign. This one seems to be showing its age."
icon = 'icons/obj/structures/barsigns.dmi'
icon_state = "empty"
icon_state = "on"
appearance_flags = DEFAULT_APPEARANCE_FLAGS
anchored = TRUE
var/cult = 0
Expand Down
2 changes: 1 addition & 1 deletion code/modules/power/fusion/kinetic_harvester.dm
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
anchored = TRUE
use_power = POWER_USE_IDLE
icon = 'icons/obj/machines/kinetic_harvester.dmi'
icon_state = "off"
icon_state = "harvester"
var/initial_id_tag
var/list/stored = list()
var/list/harvesting = list()
Expand Down
2 changes: 1 addition & 1 deletion code/modules/reagents/Chemistry-Sublimator.dm
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
machine_name = "reagent sublimator"
machine_desc = "Sublimators draw reagents from a provided container and converts them into gases."

var/icon_set = "subliminator"
var/icon_set = "sublimator"
var/sublimated_units_per_tick = 20
var/obj/item/reagent_containers/container
var/list/reagent_whitelist //if this is set, the subliminator will only work with the listed reagents
Expand Down
2 changes: 1 addition & 1 deletion code/modules/spells/spellbook.dm
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ var/global/list/artefact_feedback = list(/obj/structure/closet/wizard/armor =
name = "master spell book"
desc = "The legendary book of spells of the wizard."
icon = 'icons/obj/library.dmi'
icon_state = "spellbook"
icon_state = "book"
throw_speed = 1
throw_range = 5
w_class = ITEM_SIZE_NORMAL
Expand Down
Binary file modified icons/mob/onmob/onmob_feet.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/obj_feet.dmi
Binary file not shown.
2 changes: 0 additions & 2 deletions maps/away/casino/casino.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -4676,7 +4676,6 @@
"na" = (
/obj/machinery/door/airlock/external{
frequency = 1380;
icon_state = "door_locked";
id_tag = "escape_pod";
locked = 1;
name = "Escape Pod"
Expand Down Expand Up @@ -5321,7 +5320,6 @@
"Kb" = (
/obj/machinery/computer/modular{
dir = 8;
icon_state = "console";
name = "Cameras console"
},
/turf/simulated/floor/tiled,
Expand Down

0 comments on commit db37f95

Please sign in to comment.