cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 02:09:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove unnecessary 'signatures'

Browse Source
This commit is contained in:
Chompstation Bot
2021-04-08 16:48:30 +00:00
parent 23af41589b
commit 588179bd66
45 changed files with 2714 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/_helpers/global_lists_vr.dm
View File

@@ -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,

1
code/datums/autolathe/general.dm
View File

@@ -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

1
code/game/area/Space Station 13 areas_vr.dm
View File

@@ -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.

1
code/game/machinery/doorbell_vr.dm
View File

@@ -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))

1
code/game/machinery/exonet_node.dm
View File

@@ -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

2
code/game/machinery/machinery.dm
View File

@@ -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)

2678
code/game/machinery/vending_machines_vr.dm
View File

File diff suppressed because it is too large Load Diff

2
code/game/machinery/wall_frames.dm
View File

@@ -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

2
code/game/objects/effects/decals/posters/polarisposters.dm
View File

@@ -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"

2
code/game/objects/items/devices/flashlight.dm
View File

@@ -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

2
code/game/objects/items/toys/toys.dm
View File

@@ -950,7 +950,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

1
code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm
View File

@@ -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

12
code/modules/client/preference_setup/vore/09_misc.dm
View File

@@ -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)
. += "<br>"
@@ -36,7 +33,7 @@
. += "<b>Character Directory Vore Tag:</b> <a href='?src=\ref[src];directory_tag=1'><b>[pref.directory_tag]</b></a><br>"
. += "<b>Character Directory ERP Tag:</b> <a href='?src=\ref[src];directory_erptag=1'><b>[pref.directory_erptag]</b></a><br>"
. += "<b>Character Directory Advertisement:</b> <a href='?src=\ref[src];directory_ad=1'><b>Set Directory Ad</b></a><br>"
. += "<b>Suit Sensors Preference:</b> <a [pref.sensorpref ? "" : ""] href='?src=\ref[src];toggle_sensor_setting=1'><b>[sensorpreflist[pref.sensorpref]]</b></a><br>" //TFF 5/8/19 - Allow selection of sensor settings from off, binary, vitals, tracking, or random
. += "<b>Suit Sensors Preference:</b> <a [pref.sensorpref ? "" : ""] href='?src=\ref[src];toggle_sensor_setting=1'><b>[sensorpreflist[pref.sensorpref]]</b></a><br>"
/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))

2
code/modules/clothing/clothing_vr.dm
View File

@@ -154,7 +154,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
@@ -165,7 +164,6 @@
SPECIES_GREY_YW = 'icons/mob/species/grey/uniform.dmi'/*ywedit*/
)
//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)

2
code/modules/clothing/under/color.dm
View File

@@ -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"

6
code/modules/events/rogue_drones.dm
View File

@@ -22,7 +22,13 @@
/datum/event/rogue_drone/announce()
var/msg
var/rng = rand(1,5)
<<<<<<< HEAD
//CHOMPStation Edit Start TFF 14/1/20 - Virgo 3b -> Sif
||||||| parent of f524999b8b... Merge pull request #10103 from VOREStation/Arokha/removesigs
//VOREStation Edit Start TFF 16/12/19 - Sif -> Virgo 3b
=======
//VOREStation Edit Start
>>>>>>> f524999b8b... Merge pull request #10103 from VOREStation/Arokha/removesigs
switch(rng)
if(1)
msg = "A combat drone wing operating in close orbit above Sif has failed to return from a anti-piracy sweep. If any are sighted, \

2
code/modules/food/food/snacks_vr.dm
View File

@@ -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)

1
code/modules/holomap/holomap_area.dm
View File

@@ -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

1
code/modules/hydroponics/seed_machines.dm
View File

@@ -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())

2
code/modules/mob/living/bot/farmbot.dm
View File

@@ -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

1
code/modules/mob/living/carbon/human/species/species.dm
View File

@@ -416,7 +416,6 @@
H.visible_message( \
"<span class='notice'>[H] shakes [target]'s hand.</span>", \
"<span class='notice'>You shake [target]'s hand.</span>", )
//TFF 15/12/19 - Port nose booping from CHOMPStation
else if(H.zone_sel.selecting == "mouth")
H.visible_message( \
"<span class='notice'>[H] boops [target]'s nose.</span>", \

4
code/modules/mob/living/say.dm
View File

@@ -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",

5
code/modules/mob/living/silicon/pai/pai.dm
View File

@@ -56,7 +56,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
@@ -333,8 +333,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"

3
code/modules/mob/living/silicon/pai/pai_vr.dm
View File

@@ -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

1
code/modules/mob/new_player/preferences_setup_vr.dm
View File

@@ -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)

4
code/modules/mob/new_player/sprite_accessories_taur.dm
View File

@@ -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"

8
code/modules/mob/new_player/sprite_accessories_taur_vr.dm
View File

@@ -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,6 +69,7 @@
extra_overlay2 = "wolf_markings_2"
//icon_sprite_tag = "wolf2c"
<<<<<<< HEAD
//MTosh 08/01/2020 - CHOMPstation Moved Synth Wolf up under wolf dual-color, and Fat Wolf below Synth Wolf, to better group original vorestation wolf taurs/differentiate from Chompstation Fat Taurs
/datum/sprite_accessory/tail/taur/wolf/synthwolf
name = "SynthWolf dual-color (Taur)"
@@ -82,6 +82,10 @@
name = "Fat Wolf (Taur)"
icon_state = "fatwolf_s"
||||||| parent of f524999b8b... Merge pull request #10103 from VOREStation/Arokha/removesigs
//TFF 22/11/19 - CHOMPStation port of fat taur sprites
=======
>>>>>>> f524999b8b... Merge pull request #10103 from VOREStation/Arokha/removesigs
/datum/sprite_accessory/tail/taur/wolf/fatwolf_2c
name = "Fat Wolf 3-color (Taur)"
icon_state = "fatwolf_s"
@@ -287,7 +291,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"
@@ -305,7 +308,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"

1
code/modules/power/tesla/coil.dm
View File

@@ -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."

1
code/modules/reagents/reagent_containers/spray.dm
View File

@@ -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

2
code/modules/turbolift/turbolift_console_vr.dm
View File

@@ -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

6
code/modules/vehicles/Securitrain_vr.dm
View File

@@ -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)

1
code/modules/vore/eating/living_vr.dm
View File

@@ -707,7 +707,6 @@
to_chat(src, "<span class='notice'>You can taste the flavor of garbage and leftovers. Delicious?</span>")
else
to_chat(src, "<span class='notice'>You can taste the flavor of gluttonous waste of food.</span>")
//TFF 10/7/19 - Add custom flavour for collars for trash can trait.
else if (istype(I,/obj/item/clothing/accessory/collar))
visible_message("<span class='warning'>[src] demonstrates their voracious capabilities by swallowing [I] whole!</span>")
to_chat(src, "<span class='notice'>You can taste the submissiveness in the wearer of [I]!</span>")

2
code/modules/vore/fluffstuff/custom_items_vr.dm
View File

@@ -340,7 +340,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'

2
code/modules/xenoarcheaology/finds/finds.dm
View File

@@ -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

2
maps/expedition_vr/space/_debrisfield.dm
View File

@@ -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"

1
maps/submaps/admin_use_vr/guttersite.dm
View File

@@ -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"

9
maps/tether/tether_areas.dm
View File

@@ -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"

2
maps/tether/tether_defines.dm
View File

@@ -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)

2
maps/tether/tether_shuttle_defs.dm
View File

@@ -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"

1
maps/tether/tether_shuttles.dm
View File

@@ -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"

9
maps/tether_better/tether_areas.dm
View File

@@ -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"

2
maps/tether_better/tether_defines.dm
View File

@@ -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)

2
maps/tether_better/tether_shuttle_defs.dm
View File

@@ -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"

1
maps/tether_better/tether_shuttles.dm
View File

@@ -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"

2
maps/~map_system/maps.dm
View File

@@ -68,7 +68,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()