diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm index 638a683983..e89bd7f680 100644 --- a/code/game/machinery/pipe/construction.dm +++ b/code/game/machinery/pipe/construction.dm @@ -196,7 +196,7 @@ Buildable meters w_class = WEIGHT_CLASS_BULKY var/piping_layer = PIPING_LAYER_DEFAULT -obj/item/pipe_meter/wrench_act(mob/living/user, obj/item/wrench/W) +/obj/item/pipe_meter/wrench_act(mob/living/user, obj/item/wrench/W) var/obj/machinery/atmospherics/pipe/pipe for(var/obj/machinery/atmospherics/pipe/P in loc) @@ -211,7 +211,7 @@ obj/item/pipe_meter/wrench_act(mob/living/user, obj/item/wrench/W) to_chat(user, "You fasten the meter to the pipe.") qdel(src) -obj/item/pipe_meter/screwdriver_act(mob/living/user, obj/item/S) +/obj/item/pipe_meter/screwdriver_act(mob/living/user, obj/item/S) if(!isturf(loc)) to_chat(user, "You need to fasten it to the floor!") return TRUE diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm index e47ceee7ad..7fcbeba268 100644 --- a/code/game/objects/items/storage/boxes.dm +++ b/code/game/objects/items/storage/boxes.dm @@ -644,7 +644,7 @@ user.visible_message("[user] hugs \the [src].","You hug \the [src].") /////clown box & honkbot assembly -obj/item/storage/box/clown +/obj/item/storage/box/clown name = "clown box" desc = "A colorful cardboard box for the clown" illustration = "clown" diff --git a/code/modules/clothing/masks/breath.dm b/code/modules/clothing/masks/breath.dm index 145d3cb3fe..a088a425be 100644 --- a/code/modules/clothing/masks/breath.dm +++ b/code/modules/clothing/masks/breath.dm @@ -14,7 +14,7 @@ visor_flags_cover = MASKCOVERSMOUTH resistance_flags = NONE -obj/item/clothing/mask/breath/suicide_act(mob/living/carbon/user) +/obj/item/clothing/mask/breath/suicide_act(mob/living/carbon/user) user.visible_message("[user] is wrapping \the [src]'s tube around [user.p_their()] neck! It looks like [user.p_theyre()] trying to commit suicide!") return OXYLOSS diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm index 726670762e..56687674b4 100644 --- a/code/modules/clothing/masks/gasmask.dm +++ b/code/modules/clothing/masks/gasmask.dm @@ -174,7 +174,7 @@ dog_fashion = null -obj/item/clothing/mask/gas/tiki_mask/ui_action_click(mob/user) +/obj/item/clothing/mask/gas/tiki_mask/ui_action_click(mob/user) var/mob/M = usr var/list/options = list() diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm index ad77f1d350..2711953d74 100644 --- a/code/modules/clothing/masks/miscellaneous.dm +++ b/code/modules/clothing/masks/miscellaneous.dm @@ -101,7 +101,7 @@ return message ///frog mask - reeee!! -obj/item/clothing/mask/frog +/obj/item/clothing/mask/frog name = "frog mask" desc = "An ancient mask carved in the shape of a frog.
Sanity is like gravity, all it needs is a push." icon_state = "frog" @@ -122,8 +122,13 @@ obj/item/clothing/mask/frog message = pick("Ree!!", "Reee!!","REEE!!","REEEEE!!") //but its usually just angry gibberish, return message +<<<<<<< HEAD obj/item/clothing/mask/frog/cursed flags_1 = NODROP_1 //reee!! +======= +/obj/item/clothing/mask/frog/cursed + item_flags = NODROP //reee!! +>>>>>>> 6d558b6... puts a / at the start of some obj instances (#38545) /obj/item/clothing/mask/frog/cursed/attack_self(mob/user) return //no voicebox to alter. diff --git a/code/modules/integrated_electronics/subtypes/reagents.dm b/code/modules/integrated_electronics/subtypes/reagents.dm index 73d162ff3a..3232acda71 100644 --- a/code/modules/integrated_electronics/subtypes/reagents.dm +++ b/code/modules/integrated_electronics/subtypes/reagents.dm @@ -404,7 +404,7 @@ activate_pin(3) return FALSE -obj/item/integrated_circuit/reagent/storage/juicer +/obj/item/integrated_circuit/reagent/storage/juicer name = "reagent juicer" desc = "This is a reagent juicer. It accepts a ref to something and refines it into reagents. It can store up to 100u." icon_state = "blender" diff --git a/code/modules/mining/aux_base.dm b/code/modules/mining/aux_base.dm index e80941c405..9c399826db 100644 --- a/code/modules/mining/aux_base.dm +++ b/code/modules/mining/aux_base.dm @@ -253,7 +253,7 @@ interface with the mining shuttle at the landing site if a mobile beacon is also place.ScrapeAway() return ..() -obj/docking_port/stationary/public_mining_dock +/obj/docking_port/stationary/public_mining_dock name = "public mining base dock" id = "disabled" //The Aux Base has to leave before this can be used as a dock. //Should be checked on the map to ensure it matchs the mining shuttle dimensions. diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm index 85fed3759b..d350a2316b 100644 --- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm +++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm @@ -93,7 +93,7 @@ b_o.pixel_x = -7 return b_o -obj/machinery/chem_dispenser/proc/work_animation() +/obj/machinery/chem_dispenser/proc/work_animation() if(working_state) flick(working_state,src) @@ -504,7 +504,7 @@ obj/machinery/chem_dispenser/proc/work_animation() "diethylamine") /obj/machinery/chem_dispenser/fullupgrade //fully upgraded stock parts - + /obj/machinery/chem_dispenser/fullupgrade/Initialize() . = ..() component_parts = list()