diff --git a/code/_helpers/global_lists_vr.dm b/code/_helpers/global_lists_vr.dm index 64a137ccc4c..ef00ce98aca 100644 --- a/code/_helpers/global_lists_vr.dm +++ b/code/_helpers/global_lists_vr.dm @@ -11,7 +11,7 @@ var/global/list/traits_costs = list() // Just path = cost list, saves time in c var/global/list/all_traits = list() // All of 'em at once (same instances) var/global/list/active_ghost_pods = list() -var/global/list/sensorpreflist = list("Off", "Binary", "Vitals", "Tracking", "No Preference") //TFF 5/8/19 - Suit Sensors global list +var/global/list/sensorpreflist = list("Off", "Binary", "Vitals", "Tracking", "No Preference") //stores numeric player size options indexed by name var/global/list/player_sizes_list = list( @@ -173,8 +173,8 @@ var/global/list/tf_vore_egg_types = list( "Spotted pink" = /obj/item/weapon/storage/vore_egg/pinkspots) var/global/list/edible_trash = list(/obj/item/broken_device, - /obj/item/clothing/accessory/collar, //TFF 10/7/19 - add option to nom collars, - /obj/item/device/communicator, //TFF 19/9/19 - add option to nom communicators and commwatches, + /obj/item/clothing/accessory/collar, + /obj/item/device/communicator, /obj/item/clothing/mask, /obj/item/clothing/glasses, /obj/item/clothing/gloves, diff --git a/code/datums/autolathe/general.dm b/code/datums/autolathe/general.dm index 00151d6e757..4be460a17d7 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/area/Space Station 13 areas_vr.dm b/code/game/area/Space Station 13 areas_vr.dm index 500ba1bc167..9b1a751ec67 100644 --- a/code/game/area/Space Station 13 areas_vr.dm +++ b/code/game/area/Space Station 13 areas_vr.dm @@ -1,4 +1,3 @@ -//TFF 28/8/19 - cleanup of areas placement - removes all but rogueminer_vr stuff. /area var/limit_mob_size = TRUE //If mob size is limited in the area. diff --git a/code/game/machinery/doorbell_vr.dm b/code/game/machinery/doorbell_vr.dm index 3c453682b7e..3dd029631ea 100644 --- a/code/game/machinery/doorbell_vr.dm +++ b/code/game/machinery/doorbell_vr.dm @@ -43,7 +43,6 @@ else icon_state = "dbchime-standby" -//TFF 3/6/19 - Port Cit RP fix of infinite frames. ToDo: Make it so that you can completely deconstruct it and reconstruct it. /obj/machinery/doorbell_chime/attackby(obj/item/W as obj, mob/user as mob) src.add_fingerprint(user) if(default_deconstruction_screwdriver(user, W)) diff --git a/code/game/machinery/exonet_node.dm b/code/game/machinery/exonet_node.dm index a8f6a387342..8fe0e3b5f01 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 a96ef4ed0aa..e410914bee0 100644 --- a/code/game/machinery/machinery.dm +++ b/code/game/machinery/machinery.dm @@ -428,7 +428,7 @@ 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/vending_machines_vr.dm b/code/game/machinery/vending_machines_vr.dm index 5f30171a8d9..94a55bba1b4 100644 --- a/code/game/machinery/vending_machines_vr.dm +++ b/code/game/machinery/vending_machines_vr.dm @@ -1410,7 +1410,6 @@ contraband = list(/obj/item/clothing/head/syndicatefake = 1, /obj/item/clothing/suit/syndicatefake = 1) -//TFF 19/12/19 - Brig version of a seed storage vendor /obj/machinery/seed_storage/brig name = "Prisoners' food seed storage" starting_seeds = list( @@ -4540,7 +4539,6 @@ /obj/item/weapon/reagent_containers/food/snacks/xenomeat/spidermeat = 10) vend_delay = 15 -//TFF 19/12/19 - Brig version of a seed storage vendor /obj/machinery/seed_storage/brig name = "Prisoners' food seed storage" starting_seeds = list( diff --git a/code/game/machinery/wall_frames.dm b/code/game/machinery/wall_frames.dm index 764cd378e1f..aabb65769ae 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/effects/decals/posters/polarisposters.dm b/code/game/objects/effects/decals/posters/polarisposters.dm index 45cfd8622d1..8835d582423 100644 --- a/code/game/objects/effects/decals/posters/polarisposters.dm +++ b/code/game/objects/effects/decals/posters/polarisposters.dm @@ -291,7 +291,7 @@ The image seems important." listing_name = "Safety - Mech Operation" -//VOREStation Removal Start TFF 17/12/19 - lore not used in our station's own lore. +//VOREStation Removal Start /* /datum/poster/nanotrasen/nt_4 icon_state = "ntposter04" diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index d35a7546b74..4d006f162f1 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 4391901918e..ea457f651ef 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/client/preference_setup/loadout/loadout_accessories_vr.dm b/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm index 4b56b64c35f..7e21dd3ef8c 100644 --- a/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm @@ -44,7 +44,6 @@ display_name = "collar, holo" path = /obj/item/clothing/accessory/collar/holo -//TFF 17/6/19 - public loadout addition: Indigestible Holocollar /datum/gear/collar/holo/indigestible display_name = "collar, holo (indigestible)" path = /obj/item/clothing/accessory/collar/holo/indigestible diff --git a/code/modules/client/preference_setup/vore/09_misc.dm b/code/modules/client/preference_setup/vore/09_misc.dm index 1396b4570ff..7018d9342d2 100644 --- a/code/modules/client/preference_setup/vore/09_misc.dm +++ b/code/modules/client/preference_setup/vore/09_misc.dm @@ -1,5 +1,3 @@ -//TFF 5/8/19 - moved /datum/preferences to preferences_vr.dm - /datum/category_item/player_setup_item/vore/misc name = "Misc Settings" sort_order = 9 @@ -9,16 +7,15 @@ S["directory_tag"] >> pref.directory_tag S["directory_erptag"] >> pref.directory_erptag S["directory_ad"] >> pref.directory_ad - S["sensorpref"] >> pref.sensorpref //TFF 5/8/19 - add sensor pref setting to load after saved + S["sensorpref"] >> pref.sensorpref /datum/category_item/player_setup_item/vore/misc/save_character(var/savefile/S) S["show_in_directory"] << pref.show_in_directory S["directory_tag"] << pref.directory_tag S["directory_erptag"] << pref.directory_erptag S["directory_ad"] << pref.directory_ad - S["sensorpref"] << pref.sensorpref //TFF 5/8/19 - add sensor pref setting to be saveable + S["sensorpref"] << pref.sensorpref -//TFF 5/8/19 - add new datum category to allow for setting multiple settings when this is selected in the loadout. /datum/category_item/player_setup_item/vore/misc/copy_to_mob(var/mob/living/carbon/human/character) if(pref.sensorpref > 5 || pref.sensorpref < 1) pref.sensorpref = 5 @@ -28,7 +25,7 @@ pref.show_in_directory = sanitize_integer(pref.show_in_directory, 0, 1, initial(pref.show_in_directory)) pref.directory_tag = sanitize_inlist(pref.directory_tag, GLOB.char_directory_tags, initial(pref.directory_tag)) pref.directory_erptag = sanitize_inlist(pref.directory_erptag, GLOB.char_directory_erptags, initial(pref.directory_erptag)) - pref.sensorpref = sanitize_integer(pref.sensorpref, 1, sensorpreflist.len, initial(pref.sensorpref)) //TFF - 5/8/19 - add santisation for sensor prefs + pref.sensorpref = sanitize_integer(pref.sensorpref, 1, sensorpreflist.len, initial(pref.sensorpref)) /datum/category_item/player_setup_item/vore/misc/content(var/mob/user) . += "
" @@ -36,7 +33,7 @@ . += "Character Directory Vore Tag: [pref.directory_tag]
" . += "Character Directory ERP Tag: [pref.directory_erptag]
" . += "Character Directory Advertisement: Set Directory Ad
" - . += "Suit Sensors Preference: [sensorpreflist[pref.sensorpref]]
" //TFF 5/8/19 - Allow selection of sensor settings from off, binary, vitals, tracking, or random + . += "Suit Sensors Preference: [sensorpreflist[pref.sensorpref]]
" /datum/category_item/player_setup_item/vore/misc/OnTopic(var/href, var/list/href_list, var/mob/user) if(href_list["toggle_show_in_directory"]) @@ -58,7 +55,6 @@ var/msg = sanitize(input(user,"Write your advertisement here!", "Flavor Text", html_decode(pref.directory_ad)) as message, extra = 0) //VOREStation Edit: separating out OOC notes pref.directory_ad = msg return TOPIC_REFRESH - //TFF 5/8/19 - add new thing so you can choose the sensor setting your character can get. else if(href_list["toggle_sensor_setting"]) var/new_sensorpref = input(user, "Choose your character's sensor preferences:", "Character Preferences", sensorpreflist[pref.sensorpref]) as null|anything in sensorpreflist if (!isnull(new_sensorpref) && CanUseTopic(user)) diff --git a/code/modules/clothing/clothing_vr.dm b/code/modules/clothing/clothing_vr.dm index 11116baa8ee..2dc6ed7f925 100644 --- a/code/modules/clothing/clothing_vr.dm +++ b/code/modules/clothing/clothing_vr.dm @@ -153,7 +153,6 @@ SPECIES_VOX = 'icons/mob/species/vox/suit.dmi', SPECIES_WEREBEAST = 'icons/mob/species/werebeast/suit.dmi') -//TFF 5/8/19 - sets Vorestation /obj/item/clothing/under sensor setting default? /obj/item/clothing/under sensor_mode = 3 var/sensorpref = 5 @@ -162,7 +161,6 @@ SPECIES_VOX = 'icons/mob/species/vox/uniform.dmi', SPECIES_WEREBEAST = 'icons/mob/species/werebeast/uniform.dmi') -//TFF 5/8/19 - define numbers and specifics for suit sensor settings /obj/item/clothing/under/New(var/mob/living/carbon/human/H) ..() sensorpref = isnull(H) ? 1 : (ishuman(H) ? H.sensorpref : 1) diff --git a/code/modules/clothing/under/color.dm b/code/modules/clothing/under/color.dm index 9638a414bd9..b20524a1362 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/events/rogue_drones.dm b/code/modules/events/rogue_drones.dm index 037ee9dfd5d..f6ac58b1e41 100644 --- a/code/modules/events/rogue_drones.dm +++ b/code/modules/events/rogue_drones.dm @@ -22,7 +22,7 @@ /datum/event/rogue_drone/announce() var/msg var/rng = rand(1,5) - //VOREStation Edit Start TFF 16/12/19 - Sif -> Virgo 3b + //VOREStation Edit Start switch(rng) if(1) msg = "A combat drone wing operating in close orbit above Virgo 3b has failed to return from a anti-piracy sweep. If any are sighted, \ diff --git a/code/modules/food/food/snacks_vr.dm b/code/modules/food/food/snacks_vr.dm index d28ea98bef5..89bea231089 100644 --- a/code/modules/food/food/snacks_vr.dm +++ b/code/modules/food/food/snacks_vr.dm @@ -58,7 +58,7 @@ desc = "It's beef. It's roasted. It's been a staple of dining tradition for centuries." icon = 'icons/obj/food_vr.dmi' icon_state = "roastbeef" - trash = /obj/item/trash/plate //TFF 30/11/19 - Roast beef are put on plates, not waffle trays, you dunce~ + trash = /obj/item/trash/plate nutriment_amt = 8 nutriment_desc = list("cooked meat" = 5) diff --git a/code/modules/holomap/holomap_area.dm b/code/modules/holomap/holomap_area.dm index a9677c562ea..71a762c7fc7 100644 --- a/code/modules/holomap/holomap_area.dm +++ b/code/modules/holomap/holomap_area.dm @@ -33,7 +33,6 @@ /area/engineering holomap_color = HOLOMAP_AREACOLOR_ENGINEERING -//TFF 11/12/19 - Minor refactor, makes mice spawn only in Atmos. /area/engineering/atmos_intake holomap_color = null /area/maintenance/substation/engineering diff --git a/code/modules/hydroponics/seed_machines.dm b/code/modules/hydroponics/seed_machines.dm index bec4978201d..66e7875e16d 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 3172836d447..9334fbbcec2 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 23aa2a57dc1..80ad0763e27 100644 --- a/code/modules/mob/living/carbon/human/species/species.dm +++ b/code/modules/mob/living/carbon/human/species/species.dm @@ -413,7 +413,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 64495ca48c4..877e8542767 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", @@ -27,7 +27,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/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm index cf135f9d559..6ade1a65216 100644 --- a/code/modules/mob/living/silicon/pai/pai.dm +++ b/code/modules/mob/living/silicon/pai/pai.dm @@ -53,7 +53,7 @@ "Chirp" = list("chirps","chirrups","cheeps"), "Feline" = list("purrs","yowls","meows"), "Canine" = list("yaps","barks","woofs"), - "Rodent" = list("squeaks", "SQUEAKS", "sqiks") //VOREStation Edit - TFF 22/11/19 - CHOMPStation port of pAI additions, + "Rodent" = list("squeaks", "SQUEAKS", "sqiks") //VOREStation Edit ) var/obj/item/weapon/pai_cable/cable // The cable we produce and use when door or camera jacking @@ -330,8 +330,7 @@ close_up() -//VOREStation Removal Start - TFF 22/11/19 - Refactored in pai_vr.dm -/* +/* //VOREStation Removal Start /mob/living/silicon/pai/proc/choose_chassis() set category = "pAI Commands" set name = "Choose Chassis" diff --git a/code/modules/mob/living/silicon/pai/pai_vr.dm b/code/modules/mob/living/silicon/pai/pai_vr.dm index f44d39f460c..b8eb2283265 100644 --- a/code/modules/mob/living/silicon/pai/pai_vr.dm +++ b/code/modules/mob/living/silicon/pai/pai_vr.dm @@ -1,7 +1,6 @@ /mob/living/silicon/pai var/people_eaten = 0 icon = 'icons/mob/pai_vr.dmi' - //TFF 22/11/19 - CHOMPStation port of pAI additions. var/global/list/wide_chassis = list( "rat", "panther" @@ -36,7 +35,6 @@ else if(people_eaten && resting) icon_state = "[chassis]_rest_full" - //TFF 22/11/19 - CHOMPStation port of pAI additions. if(chassis in wide_chassis) icon = 'icons/mob/pai_vr64x64.dmi' pixel_x = -16 @@ -58,7 +56,6 @@ else if(people_eaten && resting) icon_state = "[chassis]_rest_full" - //TFF 22/11/19 - CHOMPStation port of pAI additions. if(chassis in wide_chassis) icon = 'icons/mob/pai_vr64x64.dmi' pixel_x = -16 diff --git a/code/modules/mob/new_player/preferences_setup_vr.dm b/code/modules/mob/new_player/preferences_setup_vr.dm index dca0ff56ecf..d15ec88af50 100644 --- a/code/modules/mob/new_player/preferences_setup_vr.dm +++ b/code/modules/mob/new_player/preferences_setup_vr.dm @@ -1,3 +1,2 @@ -//TFF 5/8/19 - add randomised sensor setting for random button clicking /datum/preferences/randomize_appearance_and_body_for(var/mob/living/carbon/human/H) sensorpref = rand(1,5) \ No newline at end of file diff --git a/code/modules/mob/new_player/sprite_accessories_taur.dm b/code/modules/mob/new_player/sprite_accessories_taur.dm index 748a6904b46..db2394f84af 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/mob/new_player/sprite_accessories_taur_vr.dm b/code/modules/mob/new_player/sprite_accessories_taur_vr.dm index 04642145186..4bc79e1629b 100644 --- a/code/modules/mob/new_player/sprite_accessories_taur_vr.dm +++ b/code/modules/mob/new_player/sprite_accessories_taur_vr.dm @@ -57,7 +57,6 @@ suit_sprites = 'icons/mob/taursuits_wolf_vr.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" @@ -70,7 +69,6 @@ extra_overlay2 = "wolf_markings_2" //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 3-color (Taur)" icon_state = "fatwolf_s" @@ -276,7 +274,6 @@ suit_sprites = 'icons/mob/taursuits_feline_vr.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" @@ -294,7 +291,6 @@ extra_overlay2 = "feline_markings_2" //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 3-color (Taur)" icon_state = "fatfeline_s" diff --git a/code/modules/power/tesla/coil.dm b/code/modules/power/tesla/coil.dm index 28835d7fddc..2657b34a0a3 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/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm index fe0a4c1381e..1098c5e713d 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/turbolift/turbolift_console_vr.dm b/code/modules/turbolift/turbolift_console_vr.dm index a02730c08d9..d2444186930 100644 --- a/code/modules/turbolift/turbolift_console_vr.dm +++ b/code/modules/turbolift/turbolift_console_vr.dm @@ -1,5 +1,3 @@ -// TFF 6/10/20 - Just a little thing to prevent the button - // and console from being destroyed by explosions. /obj/structure/lift/button/ex_act() return diff --git a/code/modules/vehicles/Securitrain_vr.dm b/code/modules/vehicles/Securitrain_vr.dm index 1de6b05e369..46949c188ad 100644 --- a/code/modules/vehicles/Securitrain_vr.dm +++ b/code/modules/vehicles/Securitrain_vr.dm @@ -23,7 +23,7 @@ var/car_limit = 0 //how many cars an engine can pull before performance degrades. This should be 0 to prevent trailers from unhitching. active_engines = 1 - var/obj/item/weapon/key/key //TFF 19/1/20 - Bugfix for key being prevented from getting used again + var/obj/item/weapon/key/key var/key_type = /obj/item/weapon/key/security var/siren = 0 //This is for eventually getting the siren sprite to work. @@ -62,7 +62,7 @@ /obj/vehicle/train/security/engine/New() ..() cell = new /obj/item/weapon/cell/high(src) - key = new key_type(src) //TFF 19/1/20 - Bugfix for key being prevented from getting used again + key = new key_type(src) var/image/I = new(icon = 'icons/obj/vehicles.dmi', icon_state = "cargo_engine_overlay", layer = src.layer + 0.2) //over mobs overlays += I turn_off() //so engine verbs are correctly set @@ -91,7 +91,7 @@ ..() /obj/vehicle/train/security/engine/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(istype(W, key_type)) //TFF 19/1/20 - Bugfix for key being prevented from getting used again + if(istype(W, key_type)) if(!key) user.drop_item() W.forceMove(src) diff --git a/code/modules/vore/eating/living_vr.dm b/code/modules/vore/eating/living_vr.dm index 2c8f2e7f1ef..a0bdeaca351 100644 --- a/code/modules/vore/eating/living_vr.dm +++ b/code/modules/vore/eating/living_vr.dm @@ -686,7 +686,6 @@ to_chat(src, "You can taste the flavor of garbage and leftovers. Delicious?") else to_chat(src, "You can taste the flavor of gluttonous waste of food.") - //TFF 10/7/19 - Add custom flavour for collars for trash can trait. else if (istype(I,/obj/item/clothing/accessory/collar)) visible_message("[src] demonstrates their voracious capabilities by swallowing [I] whole!") to_chat(src, "You can taste the submissiveness in the wearer of [I]!") diff --git a/code/modules/vore/fluffstuff/custom_items_vr.dm b/code/modules/vore/fluffstuff/custom_items_vr.dm index 89d8e3ed1ad..d1f0a3e6f92 100644 --- a/code/modules/vore/fluffstuff/custom_items_vr.dm +++ b/code/modules/vore/fluffstuff/custom_items_vr.dm @@ -337,7 +337,7 @@ name = "Mouse Plushie" desc = "A plushie of a delightful mouse! What was once considered a vile rodent is now your very best friend." slot_flags = SLOT_HEAD - icon_state = "mouse_brown" //TFF 12/11/19 - Change sprite to not look dead. Heck you for that choice! >:C + icon_state = "mouse_brown" item_state = "mouse_brown_head" icon = 'icons/vore/custom_items_vr.dmi' icon_override = 'icons/vore/custom_items_vr.dmi' diff --git a/code/modules/xenoarcheaology/finds/finds.dm b/code/modules/xenoarcheaology/finds/finds.dm index 4713ac0e768..aa620393dd5 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 diff --git a/maps/expedition_vr/space/_debrisfield.dm b/maps/expedition_vr/space/_debrisfield.dm index e8ffd87a0bc..f1b36da15ad 100644 --- a/maps/expedition_vr/space/_debrisfield.dm +++ b/maps/expedition_vr/space/_debrisfield.dm @@ -71,8 +71,6 @@ icon_state = "debrisexplored" forced_ambience = list('sound/ambience/tension/tension.ogg', 'sound/ambience/tension/horror.ogg') -//TFF 26/12/19 - Sub-areas for the APCs. - /area/submap/debrisfield/derelict/ai_access_port name = "POI - Abandoned Derelict AI Acess Port" diff --git a/maps/submaps/admin_use_vr/guttersite.dm b/maps/submaps/admin_use_vr/guttersite.dm index 23c54af9801..3d99c8ef0b6 100644 --- a/maps/submaps/admin_use_vr/guttersite.dm +++ b/maps/submaps/admin_use_vr/guttersite.dm @@ -47,7 +47,6 @@ icon_state = "debrisexplored" forced_ambience = list('sound/ambience/tension/tension.ogg', 'sound/ambience/tension/horror.ogg') -//TFF 26/12/19 - Sub-areas for the APCs. /area/tether_away/guttersite/engines name = "Gutter - Gutter Engineering" diff --git a/maps/tether/tether_areas.dm b/maps/tether/tether_areas.dm index dc104c5cea8..1389266ce85 100644 --- a/maps/tether/tether_areas.dm +++ b/maps/tether/tether_areas.dm @@ -250,7 +250,6 @@ name = "\improper Vacant Prep Area" /area/vacant/vacant_site/gateway/lower name = "\improper Lower Vacant Prep Area" -//TFF 5/4/20 - Mining Ops move TODO Change all Vacant areas to construction_site per vermin event location announcement. /area/construction/vacant_mining_ops name = "\improper Vacant Mining Operations" @@ -267,7 +266,6 @@ /area/tether/surfacebase/emergency_storage/atrium name = "\improper Atrium Emergency Storage" -//TFF 7/4/20 - New areas for Surface Cargo bits as well as the Mining Outpost. Some former ones deleted. Others renamed. // Surface Cargo/Mining EVA/Warehouse/Mining Outpost adadditions /area/tether/surfacebase/cargo name = "Surface Cargo Foyer" @@ -650,7 +648,6 @@ name = "Atmospherics Gas Storage" icon_state = "atmos" -//TFF 11/12/19 - Minor refactor, makes mice spawn only in Atmos. /area/engineering/atmos_intake name = "\improper Atmospherics Intake" icon_state = "atmos" @@ -776,7 +773,6 @@ /area/rnd/robotics/resleeving name = "\improper Robotics Resleeving" -//TFF 28/8/19 - cleanup of areas placement /area/rnd/research/testingrange name = "\improper Weapons Testing Range" icon_state = "firingrange" @@ -787,7 +783,6 @@ //Outpost areas -//TFF 28/8/19 - cleanup of areas placement /area/rnd/outpost name = "\improper Research Outpost Hallway" icon_state = "research" @@ -939,7 +934,6 @@ name = "Public Meeting Room" icon_state = "blue" sound_env = SMALL_SOFTFLOOR -//TFF 28/8/19 - cleanup of areas placement /area/chapel/observation name = "\improper Chapel Observation" icon_state = "chapel" @@ -1006,7 +1000,6 @@ flags = RAD_SHIELDED soundproofed = TRUE -//TFF 28/8/19 - cleanup of areas placement /area/crew_quarters/sleep/vistor_room_1 flags = RAD_SHIELDED | BLUE_SHIELDED soundproofed = TRUE @@ -1418,7 +1411,6 @@ /area/shuttle/securiship/engines name = "\improper Securiship Engines" -//TFF 5/4/20 - Mining Ops move // Asteroid Mining belter and Mining Outpost shuttles and refinery/gear areas /area/quartermaster/belterdock name = "\improper Cargo Belter Access" @@ -1469,7 +1461,6 @@ area/shuttle/mining_outpost/shuttle name = "\improper Ninjacraft" icon_state = "shuttle2" -//TFF 28/8/19 - cleanup of areas placement /area/teleporter/departing name = "\improper Long-Range Teleporter" icon_state = "teleporter" diff --git a/maps/tether/tether_defines.dm b/maps/tether/tether_defines.dm index b7c7fcfc90a..88002de593f 100644 --- a/maps/tether/tether_defines.dm +++ b/maps/tether/tether_defines.dm @@ -143,7 +143,6 @@ /area/rnd/miscellaneous_lab ) -//TFF 5/4/20 - Mining Ops move, airlock path change unit_test_exempt_from_atmos = list( /area/engineering/atmos_intake, // Outside, /area/rnd/external, // Outside, @@ -191,7 +190,6 @@ belter_belt_z = list(Z_LEVEL_ROGUEMINE_1, Z_LEVEL_ROGUEMINE_2) -//TFF 16/4/20 - mining outpost shuttle defines mining_station_z = list(Z_LEVEL_SPACE_HIGH) mining_outpost_z = list(Z_LEVEL_SURFACE_MINE) diff --git a/maps/tether/tether_shuttle_defs.dm b/maps/tether/tether_shuttle_defs.dm index 29489eea93c..847cd0e4808 100644 --- a/maps/tether/tether_shuttle_defs.dm +++ b/maps/tether/tether_shuttle_defs.dm @@ -212,7 +212,7 @@ ..() ////////////////////////////////////////////////////////////// -//TFF 12/4/20 Surface Mining Outpost Shuttle +// Surface Mining Outpost Shuttle /datum/shuttle/autodock/ferry/surface_mining_outpost name = "Mining Outpost" diff --git a/maps/tether/tether_shuttles.dm b/maps/tether/tether_shuttles.dm index 6ec0c4bc628..e380c18003a 100644 --- a/maps/tether/tether_shuttles.dm +++ b/maps/tether/tether_shuttles.dm @@ -32,7 +32,6 @@ shuttle_tag = "Trade" req_one_access = list(access_trader) -//TFF 12/4/20 - Add console for Mining Outpost Shuttle /obj/machinery/computer/shuttle_control/surface_mining_outpost name = "surface mining outpost shuttle control console" shuttle_tag = "Mining Outpost" diff --git a/maps/tether_better/tether_areas.dm b/maps/tether_better/tether_areas.dm index 68a3d8db836..bbac67466f4 100644 --- a/maps/tether_better/tether_areas.dm +++ b/maps/tether_better/tether_areas.dm @@ -250,7 +250,6 @@ name = "\improper Vacant Prep Area" /area/vacant/vacant_site/gateway/lower name = "\improper Lower Vacant Prep Area" -//TFF 5/4/20 - Mining Ops move TODO Change all Vacant areas to construction_site per vermin event location announcement. /area/construction/vacant_mining_ops name = "\improper Vacant Mining Operations" @@ -267,7 +266,6 @@ /area/tether/surfacebase/emergency_storage/atrium name = "\improper Atrium Emergency Storage" -//TFF 7/4/20 - New areas for Surface Cargo bits as well as the Mining Outpost. Some former ones deleted. Others renamed. // Surface Cargo/Mining EVA/Warehouse/Mining Outpost adadditions /area/tether/surfacebase/cargo name = "Surface Cargo Foyer" @@ -650,7 +648,6 @@ name = "Atmospherics Gas Storage" icon_state = "atmos" -//TFF 11/12/19 - Minor refactor, makes mice spawn only in Atmos. /area/engineering/atmos_intake name = "\improper Atmospherics Intake" icon_state = "atmos" @@ -776,7 +773,6 @@ /area/rnd/robotics/resleeving name = "\improper Robotics Resleeving" -//TFF 28/8/19 - cleanup of areas placement /area/rnd/research/testingrange name = "\improper Weapons Testing Range" icon_state = "firingrange" @@ -787,7 +783,6 @@ //Outpost areas -//TFF 28/8/19 - cleanup of areas placement /area/rnd/outpost name = "\improper Research Outpost Hallway" icon_state = "research" @@ -939,7 +934,6 @@ name = "Public Meeting Room" icon_state = "blue" sound_env = SMALL_SOFTFLOOR -//TFF 28/8/19 - cleanup of areas placement /area/chapel/observation name = "\improper Chapel Observation" icon_state = "chapel" @@ -1003,7 +997,6 @@ flags = RAD_SHIELDED soundproofed = TRUE -//TFF 28/8/19 - cleanup of areas placement /area/crew_quarters/sleep/vistor_room_1 flags = RAD_SHIELDED | BLUE_SHIELDED soundproofed = TRUE @@ -1412,7 +1405,6 @@ /area/shuttle/securiship/engines name = "\improper Securiship Engines" -//TFF 5/4/20 - Mining Ops move // Asteroid Mining belter and Mining Outpost shuttles and refinery/gear areas /area/quartermaster/belterdock name = "\improper Cargo Belter Access" @@ -1460,7 +1452,6 @@ area/shuttle/mining_outpost/shuttle name = "\improper Ninjacraft" icon_state = "shuttle2" -//TFF 28/8/19 - cleanup of areas placement /area/teleporter/departing name = "\improper Long-Range Teleporter" icon_state = "teleporter" diff --git a/maps/tether_better/tether_defines.dm b/maps/tether_better/tether_defines.dm index 5529983b94f..cc7f0b5a977 100644 --- a/maps/tether_better/tether_defines.dm +++ b/maps/tether_better/tether_defines.dm @@ -138,7 +138,6 @@ /area/rnd/miscellaneous_lab ) -//TFF 5/4/20 - Mining Ops move, airlock path change unit_test_exempt_from_atmos = list( /area/engineering/atmos_intake, // Outside, /area/rnd/external, // Outside, @@ -186,7 +185,6 @@ belter_belt_z = list(Z_LEVEL_ROGUEMINE_1, Z_LEVEL_ROGUEMINE_2) -//TFF 16/4/20 - mining outpost shuttle defines mining_station_z = list(Z_LEVEL_SPACE_HIGH) mining_outpost_z = list(Z_LEVEL_SURFACE_MINE) diff --git a/maps/tether_better/tether_shuttle_defs.dm b/maps/tether_better/tether_shuttle_defs.dm index 29489eea93c..847cd0e4808 100644 --- a/maps/tether_better/tether_shuttle_defs.dm +++ b/maps/tether_better/tether_shuttle_defs.dm @@ -212,7 +212,7 @@ ..() ////////////////////////////////////////////////////////////// -//TFF 12/4/20 Surface Mining Outpost Shuttle +// Surface Mining Outpost Shuttle /datum/shuttle/autodock/ferry/surface_mining_outpost name = "Mining Outpost" diff --git a/maps/tether_better/tether_shuttles.dm b/maps/tether_better/tether_shuttles.dm index 6ec0c4bc628..e380c18003a 100644 --- a/maps/tether_better/tether_shuttles.dm +++ b/maps/tether_better/tether_shuttles.dm @@ -32,7 +32,6 @@ shuttle_tag = "Trade" req_one_access = list(access_trader) -//TFF 12/4/20 - Add console for Mining Outpost Shuttle /obj/machinery/computer/shuttle_control/surface_mining_outpost name = "surface mining outpost shuttle control console" shuttle_tag = "Mining Outpost" diff --git a/maps/~map_system/maps.dm b/maps/~map_system/maps.dm index 055efc9c155..07c72230261 100644 --- a/maps/~map_system/maps.dm +++ b/maps/~map_system/maps.dm @@ -67,7 +67,7 @@ var/list/all_maps = list() var/ai_shell_restricted = FALSE //VOREStation Addition - are there z-levels restricted? var/ai_shell_allowed_levels = list() //VOREStation Addition - which z-levels ARE we allowed to visit? - //VOREStation Addition Start - belter stuff TFF 16/4/20 - Mining Outpost Shuttle + //VOREStation Addition Start var/list/belter_docked_z = list() var/list/belter_transit_z = list() var/list/belter_belt_z = list()