diff --git a/code/datums/autolathe/general.dm b/code/datums/autolathe/general.dm index d605ef1b87..8c2846445a 100644 --- a/code/datums/autolathe/general.dm +++ b/code/datums/autolathe/general.dm @@ -85,7 +85,6 @@ name = "welding mask" path =/obj/item/clothing/head/welding -//TFF 24/12/19 - Let people print more spray bottles if needed. /datum/category_item/autolathe/general/spraybottle name = "spray bottle" path = /obj/item/weapon/reagent_containers/spray diff --git a/code/game/machinery/exonet_node.dm b/code/game/machinery/exonet_node.dm index 06be182b7d..3c8d458922 100644 --- a/code/game/machinery/exonet_node.dm +++ b/code/game/machinery/exonet_node.dm @@ -16,7 +16,6 @@ var/list/logs = list() // Gets written to by exonet's send_message() function. -//TFF 3/6/19 - Port Cit RP fix for infinite frames circuit = /obj/item/weapon/circuitboard/telecomms/exonet_node // Proc: New() // Parameters: None diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm index f68bdd03bd..dfd65de258 100644 --- a/code/game/machinery/machinery.dm +++ b/code/game/machinery/machinery.dm @@ -420,7 +420,6 @@ Class Procs: for(var/obj/I in contents) if(istype(I,/obj/item/weapon/card/id)) I.forceMove(src.loc) - //TFF 3/6/19 - port Cit RP fix of infinite frames. If it doesn't have a circuit board, don't create a frame. Return a smack instead. BONK! if(!circuit) return 0 var/obj/structure/frame/A = new /obj/structure/frame(src.loc) diff --git a/code/game/machinery/wall_frames.dm b/code/game/machinery/wall_frames.dm index 764cd378e1..aabb65769a 100644 --- a/code/game/machinery/wall_frames.dm +++ b/code/game/machinery/wall_frames.dm @@ -105,7 +105,7 @@ desc = "Used for building lights." icon = 'icons/obj/lighting.dmi' icon_state = "tube-construct-item" - refund_amt = 2 //TFF 17/1/20 - Oversight fix for infinite steel produciton. + refund_amt = 2 build_machine_type = /obj/machinery/light_construct reverse = 1 diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index c766c987dd..2528027ed8 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -294,7 +294,7 @@ icon_state = "lamp" force = 10 center_of_mass = list("x" = 13,"y" = 11) - brightness_on = 10 //TFF 27/11/19 - post refactor fix for intensity levels. + brightness_on = 10 w_class = ITEMSIZE_LARGE power_use = 0 on = 1 diff --git a/code/game/objects/items/toys/toys.dm b/code/game/objects/items/toys/toys.dm index 4391901918..ea457f651e 100644 --- a/code/game/objects/items/toys/toys.dm +++ b/code/game/objects/items/toys/toys.dm @@ -949,7 +949,7 @@ /obj/item/toy/plushie/mouse name = "mouse plush" desc = "A plushie of a delightful mouse! What was once considered a vile rodent is now your very best friend." - icon_state = "mouseplushie" //TFF 12/11/19 - updated icon to show a sprite that doesn't replicate a dead mouse. Heck you for that! >:C + icon_state = "mouseplushie" pokephrase = "Squeak!" /obj/item/toy/plushie/kitten diff --git a/code/modules/clothing/under/color.dm b/code/modules/clothing/under/color.dm index 9638a414bd..b20524a136 100644 --- a/code/modules/clothing/under/color.dm +++ b/code/modules/clothing/under/color.dm @@ -30,8 +30,6 @@ icon_state = "grey" rolled_sleeves = 0 -//TFF 5/8/19 - add a non perma-set orange jumpsuit, splits prison into its own obj with override var settings. -//TFF 5/9/19 - add a different icon_state to both jumpsuits, orange and prison. Refactors orange and prison jumpsuit slightly. /obj/item/clothing/under/color/orange name = "orange jumpsuit" icon_state = "orange" diff --git a/code/modules/hydroponics/seed_machines.dm b/code/modules/hydroponics/seed_machines.dm index affddf1168..08601c31eb 100644 --- a/code/modules/hydroponics/seed_machines.dm +++ b/code/modules/hydroponics/seed_machines.dm @@ -94,7 +94,6 @@ to_chat(user, "You load [W] into [src].") return -//TFF 3/6/19 - fix infinite frame creation, ported from Cit RP - also allow movement of hydroponic-related machines. if(default_deconstruction_screwdriver(user, W)) return if(W.is_wrench()) diff --git a/code/modules/mob/living/bot/farmbot.dm b/code/modules/mob/living/bot/farmbot.dm index 9cec0dfe47..339c4fbaaf 100644 --- a/code/modules/mob/living/bot/farmbot.dm +++ b/code/modules/mob/living/bot/farmbot.dm @@ -10,7 +10,7 @@ icon_state = "farmbot0" health = 50 maxHealth = 50 - req_one_access = list(access_robotics, access_hydroponics, access_xenobiology) //TFF 11/7/19 - adds Xenobio access on behalf of Nalarac + req_one_access = list(access_robotics, access_hydroponics, access_xenobiology) var/action = "" // Used to update icon var/waters_trays = 1 diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm index 2cfab0781d..5b97a9cf0a 100644 --- a/code/modules/mob/living/carbon/human/species/species.dm +++ b/code/modules/mob/living/carbon/human/species/species.dm @@ -414,7 +414,6 @@ H.visible_message( \ "[H] shakes [target]'s hand.", \ "You shake [target]'s hand.", ) - //TFF 15/12/19 - Port nose booping from CHOMPStation else if(H.zone_sel.selecting == "mouth") H.visible_message( \ "[H] boops [target]'s nose.", \ diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index 00a8aa055f..a522ca2a06 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -8,7 +8,7 @@ var/list/department_radio_keys = list( ":n" = "Science", ".n" = "Science", ":m" = "Medical", ".m" = "Medical", ":e" = "Engineering", ".e" = "Engineering", - ":k" = "Response Team", ".k" = "Response Team", //TFF 11/3/20 - Add Response Team to channels usable rather than resorting to :H or such., + ":k" = "Response Team", ".k" = "Response Team", ":s" = "Security", ".s" = "Security", ":w" = "whisper", ".w" = "whisper", ":t" = "Mercenary", ".t" = "Mercenary", @@ -26,7 +26,7 @@ var/list/department_radio_keys = list( ":N" = "Science", ".N" = "Science", ":M" = "Medical", ".M" = "Medical", ":E" = "Engineering", ".E" = "Engineering", - ":k" = "Response Team", ".k" = "Response Team", //TFF 11/3/20 - Add Response Team to channels usable rather than resorting to :H or such., + ":k" = "Response Team", ".k" = "Response Team", ":S" = "Security", ".S" = "Security", ":W" = "whisper", ".W" = "whisper", ":T" = "Mercenary", ".T" = "Mercenary", diff --git a/code/modules/mob/new_player/sprite_accessories_taur.dm b/code/modules/mob/new_player/sprite_accessories_taur.dm index 748a6904b4..db2394f84a 100644 --- a/code/modules/mob/new_player/sprite_accessories_taur.dm +++ b/code/modules/mob/new_player/sprite_accessories_taur.dm @@ -146,7 +146,6 @@ suit_sprites = 'icons/mob/taursuits_wolf.dmi' icon_sprite_tag = "wolf" -//TFF 22/11/19 - CHOMPStation port of fat taur sprites /datum/sprite_accessory/tail/taur/fatwolf name = "Fat Wolf (Taur)" icon_state = "fatwolf_s" @@ -158,7 +157,6 @@ extra_overlay = "wolf_markings" //icon_sprite_tag = "wolf2c" -//TFF 22/11/19 - CHOMPStation port of fat taur sprites /datum/sprite_accessory/tail/taur/wolf/fatwolf_2c name = "Fat Wolf dual-color (Taur)" icon_state = "fatwolf_s" @@ -245,7 +243,6 @@ suit_sprites = 'icons/mob/taursuits_feline.dmi' icon_sprite_tag = "feline" -//TFF 22/11/19 - CHOMPStation port of fat taur sprites /datum/sprite_accessory/tail/taur/fatfeline name = "Fat Feline (Taur)" icon_state = "fatfeline_s" @@ -262,7 +259,6 @@ extra_overlay = "feline_markings" //icon_sprite_tag = "feline2c" -//TFF 22/11/19 - CHOMPStation port of fat taur sprites /datum/sprite_accessory/tail/taur/feline/fatfeline_2c name = "Fat Feline dual-color (Taur)" icon_state = "fatfeline_s" diff --git a/code/modules/power/tesla/coil.dm b/code/modules/power/tesla/coil.dm index 28835d7fdd..2657b34a0a 100644 --- a/code/modules/power/tesla/coil.dm +++ b/code/modules/power/tesla/coil.dm @@ -95,7 +95,6 @@ playsound(src, 'sound/effects/lightningshock.ogg', 100, 1, extrarange = 5) tesla_zap(src, 10, power/(coeff/2)) -//TFF 3/6/19 - Port Cit RP fix for infinite frames /obj/machinery/power/grounding_rod name = "grounding rod" desc = "Keep an area from being fried from Edison's Bane." diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm index 4ae28541b3..c9183c24b3 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm @@ -1443,7 +1443,7 @@ /datum/reagent/qerr_quem name = "Qerr-quem" - id = "querr_quem" + id = "qerr_quem" description = "A potent stimulant and anti-anxiety medication, made for the Qerr-Katish." taste_description = "mint" reagent_state = LIQUID diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm index fe0a4c1381..1098c5e713 100644 --- a/code/modules/reagents/reagent_containers/spray.dm +++ b/code/modules/reagents/reagent_containers/spray.dm @@ -6,7 +6,6 @@ item_state = "cleaner" center_of_mass = list("x" = 16,"y" = 10) flags = OPENCONTAINER|NOBLUDGEON - //TFF 24/12/19 - Let people print more spray bottles if needed. matter = list("glass" = 300, DEFAULT_WALL_MATERIAL = 300) slot_flags = SLOT_BELT throwforce = 3 diff --git a/code/modules/xenoarcheaology/finds/finds.dm b/code/modules/xenoarcheaology/finds/finds.dm index 4713ac0e76..aa620393dd 100644 --- a/code/modules/xenoarcheaology/finds/finds.dm +++ b/code/modules/xenoarcheaology/finds/finds.dm @@ -21,7 +21,7 @@ icon_state = "strange" var/datum/geosample/geologic_data origin_tech = list(TECH_MATERIAL = 5) - w_class = ITEMSIZE_SMALL //TFF 25/11/19 - fixes the strange rocks to be small size like before and not normal. + w_class = ITEMSIZE_SMALL /obj/item/weapon/strangerock/New(loc, var/inside_item_type = 0) pixel_x = rand(0,16)-8