diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index d164485f385..37ed21016cf 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -1,5 +1,6 @@ /atom/movable layer = 3 + appearance_flags = TILE_BOUND var/last_move = null var/anchored = 0 // var/elevation = 2 - not used anywhere diff --git a/code/game/machinery/doors/multi_tile.dm b/code/game/machinery/doors/multi_tile.dm index 4fc4b2fad72..45501a3de76 100644 --- a/code/game/machinery/doors/multi_tile.dm +++ b/code/game/machinery/doors/multi_tile.dm @@ -1,6 +1,7 @@ //Terribly sorry for the code doubling, but things go derpy otherwise. /obj/machinery/door/airlock/multi_tile width = 2 + appearance_flags = 0 /obj/machinery/door/airlock/multi_tile/New() ..() diff --git a/code/game/objects/items/weapons/manuals.dm b/code/game/objects/items/weapons/manuals.dm index 8c1e3f5df14..a5d5fbf11c9 100644 --- a/code/game/objects/items/weapons/manuals.dm +++ b/code/game/objects/items/weapons/manuals.dm @@ -110,7 +110,7 @@

SUPERMATTER HANDLING

  • Do not expose supermatter to oxygen.
  • -
  • Do not touch supermatter without gloves without exosuit protection allow supermatter to contact any solid object apart from specially-designed supporting pallet.
  • +
  • Do not allow supermatter to contact any solid object apart from specially-designed supporting pallet.
  • Do not directly view supermatter without meson goggles.
  • While handles on pallet allow moving the supermatter via pulling, pushing should not be attempted.

  • @@ -118,7 +118,7 @@
    1. Fill reactor loop and radiator loop with two (2) standard canisters of nitrogen gas each.
    2. Ensure that pumps and filters are on and operating at maximum power.
    3. -
    4. Fire 5 15 2 UNKNOWN 8-12 pulses from emitter at supermatter crystal. Reactor blast doors must be open for this procedure.
    5. +
    6. Fire 8-9 pulses from emitter at supermatter crystal. Reactor blast doors must be open for this procedure.

    OPERATION AND MAINTENANCE

    diff --git a/code/game/objects/structures/barsign.dm b/code/game/objects/structures/barsign.dm index 6152c1dbd19..7da51f6a660 100644 --- a/code/game/objects/structures/barsign.dm +++ b/code/game/objects/structures/barsign.dm @@ -1,6 +1,7 @@ /obj/structure/sign/double/barsign icon = 'icons/obj/barsigns.dmi' icon_state = "empty" + appearance_flags = 0 anchored = 1 var/cult = 0 diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories.dm b/code/modules/client/preference_setup/loadout/loadout_accessories.dm index 8db375d00d1..7f7fcb059ca 100644 --- a/code/modules/client/preference_setup/loadout/loadout_accessories.dm +++ b/code/modules/client/preference_setup/loadout/loadout_accessories.dm @@ -28,6 +28,14 @@ display_name = "armband, science" path = /obj/item/clothing/accessory/armband/science +/datum/gear/accessory/colored + display_name = "armband" + path = /obj/item/clothing/accessory/armband/med/color + +/datum/gear/accessory/colored/New() + ..() + gear_tweaks = list(gear_tweak_free_color_choice) + /datum/gear/accessory/wallet display_name = "wallet, orange" path = /obj/item/weapon/storage/wallet/random diff --git a/code/modules/clothing/under/accessories/armband.dm b/code/modules/clothing/under/accessories/armband.dm index 9aa2ec2b709..9a8bbacd463 100644 --- a/code/modules/clothing/under/accessories/armband.dm +++ b/code/modules/clothing/under/accessories/armband.dm @@ -29,6 +29,10 @@ desc = "An armband, worn by the crew to display which department they're assigned to. This one is white." icon_state = "med" +/obj/item/clothing/accessory/armband/med/color + name = "armband" + desc = "A fancy armband." + /obj/item/clothing/accessory/armband/medgreen name = "EMT armband" desc = "An armband, worn by the crew to display which department they're assigned to. This one is white and green." diff --git a/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm b/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm index 9039801006e..737841d4cef 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm @@ -8,6 +8,7 @@ /obj/machinery/drone_fabricator name = "drone fabricator" desc = "A large automated factory for producing maintenance drones." + appearance_flags = 0 density = 1 anchored = 1 diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi index 43c2031215b..3d63d18ed7c 100644 Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ diff --git a/icons/obj/wallet.dmi b/icons/obj/wallet.dmi index 101a138156e..def1f7347f6 100644 Binary files a/icons/obj/wallet.dmi and b/icons/obj/wallet.dmi differ