diff --git a/code/game/machinery/doorbell_vr.dm b/code/game/machinery/doorbell_vr.dm index 25fb75df44..d6c5d67719 100644 --- a/code/game/machinery/doorbell_vr.dm +++ b/code/game/machinery/doorbell_vr.dm @@ -43,12 +43,13 @@ 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)) return - else if(default_deconstruction_crowbar(user, W)) - return +// else if(default_deconstruction_crowbar(user, W)) +// return else if(default_part_replacement(user, W)) return else if(panel_open && istype(W, /obj/item/device/multitool)) diff --git a/code/game/machinery/exonet_node.dm b/code/game/machinery/exonet_node.dm index fbfbc04abf..56c8e36edf 100644 --- a/code/game/machinery/exonet_node.dm +++ b/code/game/machinery/exonet_node.dm @@ -16,6 +16,8 @@ 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 // Description: Adds components to the machine for deconstruction. @@ -23,7 +25,6 @@ ..() component_parts = list() - component_parts += new /obj/item/weapon/circuitboard/telecomms/exonet_node(src) component_parts += new /obj/item/weapon/stock_parts/subspace/ansible(src) component_parts += new /obj/item/weapon/stock_parts/subspace/sub_filter(src) component_parts += new /obj/item/weapon/stock_parts/manipulator(src) diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm index 5486facff1..6a86dcfcb3 100644 --- a/code/game/machinery/machinery.dm +++ b/code/game/machinery/machinery.dm @@ -408,6 +408,9 @@ Class Procs: /obj/machinery/proc/dismantle() playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1) + //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) var/obj/item/weapon/circuitboard/M = circuit A.circuit = M @@ -451,4 +454,4 @@ Class Procs: return /datum/proc/remove_visual(mob/M) - return \ No newline at end of file + return \ No newline at end of file diff --git a/code/game/turfs/simulated/water_vr.dm b/code/game/turfs/simulated/water_vr.dm new file mode 100644 index 0000000000..ea16037cf7 --- /dev/null +++ b/code/game/turfs/simulated/water_vr.dm @@ -0,0 +1,5 @@ +/turf/simulated/floor/water/indoors //because it's nice to be able to use these indoors without having a blizzard ignore walls and areas. + outdoors = FALSE + +/turf/simulated/floor/water/deep/indoors + outdoors = FALSE \ No newline at end of file diff --git a/code/modules/ai/aI_holder_subtypes/simple_mob_ai_vr.dm b/code/modules/ai/aI_holder_subtypes/simple_mob_ai_vr.dm index 9af6e67f1f..6c78d38d8f 100644 --- a/code/modules/ai/aI_holder_subtypes/simple_mob_ai_vr.dm +++ b/code/modules/ai/aI_holder_subtypes/simple_mob_ai_vr.dm @@ -1,5 +1,4 @@ -/datum/ai_holder/simple_mob/melee/evasive/returnhome - returns_home = 1 +#define VIRGO_AI_NORETURN_CREATE(x) x/returnhome/returns_home=1;x/returnhome/max_home_distance=8 -/datum/ai_holder/simple_mob/ranged/kiting/threatening/returnhome - returns_home = 1 \ No newline at end of file +VIRGO_AI_NORETURN_CREATE(/datum/ai_holder/simple_mob/melee/evasive) +VIRGO_AI_NORETURN_CREATE(/datum/ai_holder/simple_mob/ranged/kiting/threatening) \ No newline at end of file diff --git a/code/modules/hydroponics/seed_machines.dm b/code/modules/hydroponics/seed_machines.dm index 4601f23484..2acfa4fb72 100644 --- a/code/modules/hydroponics/seed_machines.dm +++ b/code/modules/hydroponics/seed_machines.dm @@ -94,10 +94,16 @@ 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(default_deconstruction_crowbar(user, W)) + if(W.is_wrench()) + playsound(src, W.usesound, 100, 1) + to_chat(user, "You [anchored ? "un" : ""]secure \the [src].") + anchored = !anchored return +// if(default_deconstruction_crowbar(user, W)) //No circuit boards to give. +// return if(istype(W,/obj/item/weapon/disk/botany)) if(loaded_disk) to_chat(user, "There is already a data disk loaded.") diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm index 8814f4773f..1a46b80d9d 100644 --- a/code/modules/mining/mine_turfs.dm +++ b/code/modules/mining/mine_turfs.dm @@ -569,7 +569,8 @@ var/list/mining_overlay_cache = list() else X = new /obj/item/weapon/ore/strangerock(src, inside_item_type = F.find_type) geologic_data.UpdateNearbyArtifactInfo(src) - X:geologic_data = geologic_data + var/obj/item/weapon/ore/strangerock/SR = X + SR.geologic_data = geologic_data //some find types delete the /obj/item/weapon/archaeological_find and replace it with something else, this handles when that happens //yuck diff --git a/code/modules/mob/living/carbon/human/species/station/station_vr.dm b/code/modules/mob/living/carbon/human/species/station/station_vr.dm index 64fd72672c..7d1d5e0300 100644 --- a/code/modules/mob/living/carbon/human/species/station/station_vr.dm +++ b/code/modules/mob/living/carbon/human/species/station/station_vr.dm @@ -414,21 +414,17 @@ datum/species/harpy min_age = 18 max_age = 80 + base_color = "#EECEB3" + blurb = "An Avian species, coming from a distant planet, the Rapalas are the very proud race.\ Sol researchers have commented on them having a very close resemblance to the mythical race called 'Harpies',\ who are known for having massive winged arms and talons as feet. They've been clocked at speeds of over 35 miler per hour chasing the planet's many fish-like fauna.\ The Rapalan's home-world 'Verita' is a strangely habitable gas giant, while no physical earth exists, there are fertile floating islands orbiting around the planet from past asteroid activity." catalogue_data = list(/datum/category_item/catalogue/fauna/rapala) - //primitive_form = "Saru" - spawn_flags = SPECIES_CAN_JOIN appearance_flags = HAS_HAIR_COLOR | HAS_LIPS | HAS_UNDERWEAR | HAS_SKIN_COLOR | HAS_EYE_COLOR - //flesh_color = "#AFA59E" - //base_color = "#777777" - //tail_hair = "feathers" - //reagent_tag = IS_SERGAL heat_discomfort_strings = list( "Your feathers prickle in the heat.", diff --git a/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm b/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm index b8d4f87a4f..68308efc66 100644 --- a/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm +++ b/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm @@ -592,7 +592,7 @@ var/total_material = T.matter[material] if(istype(T,/obj/item/stack)) var/obj/item/stack/stack = T - total_material *= (0.5 * stack.get_amount()) + total_material *= stack.get_amount() if(material == DEFAULT_WALL_MATERIAL) metal.add_charge(total_material) if(material == "glass") diff --git a/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm b/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm index ab8410b36d..31a7301d9f 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm @@ -453,29 +453,31 @@ src.modules += new /obj/item/weapon/pickaxe(src) src.modules += new /obj/item/weapon/dogborg/jaws/small(src) src.modules += new /obj/item/device/dogborg/boop_module(src) + src.modules += new /obj/item/weapon/gripper(src) + src.modules += new /obj/item/weapon/gripper/circuit(src) src.emag = new /obj/item/weapon/dogborg/pounce(src) //Painfully slow charger regen but high capacity. Also starts with low amount. var/datum/matter_synth/metal = new /datum/matter_synth/metal() metal.name = "Steel reserves" - metal.recharge_rate = 50 + metal.recharge_rate = 100 metal.max_energy = 50000 - metal.energy = 5000 + metal.energy = 10000 var/datum/matter_synth/glass = new /datum/matter_synth/glass() glass.name = "Glass reserves" - glass.recharge_rate = 50 + glass.recharge_rate = 100 glass.max_energy = 50000 - glass.energy = 5000 + glass.energy = 10000 var/datum/matter_synth/wood = new /datum/matter_synth/wood() wood.name = "Wood reserves" - wood.recharge_rate = 50 + wood.recharge_rate = 100 wood.max_energy = 50000 - wood.energy = 5000 + wood.energy = 10000 var/datum/matter_synth/plastic = new /datum/matter_synth/plastic() plastic.name = "Plastic reserves" - plastic.recharge_rate = 50 + plastic.recharge_rate = 100 plastic.max_energy = 50000 - plastic.energy = 5000 + plastic.energy = 10000 var/datum/matter_synth/water = new /datum/matter_synth(500) water.name = "Water reserves" water.recharge_rate = 0 diff --git a/code/modules/mob/living/silicon/robot/robot_vr.dm b/code/modules/mob/living/silicon/robot/robot_vr.dm index e453f4c595..33e7cc4796 100644 --- a/code/modules/mob/living/silicon/robot/robot_vr.dm +++ b/code/modules/mob/living/silicon/robot/robot_vr.dm @@ -12,6 +12,7 @@ var/notransform var/original_icon = 'icons/mob/robots.dmi' var/ui_style_vr = FALSE //Do we use our hud icons? + does_spin = FALSE var/vr_icons = list( "handy-hydro", "handy-service", @@ -234,4 +235,4 @@ if(!can_buckle || !istype(M) || !M.Adjacent(src) || M.buckled) return if(buckle_mob(M)) - visible_message("[M] starts riding [name]!") \ No newline at end of file + visible_message("[M] starts riding [name]!") diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/space/goose_vr.dm b/code/modules/mob/living/simple_mob/subtypes/animal/space/goose_vr.dm index 7a1f219ad9..d44f28973e 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/space/goose_vr.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/space/goose_vr.dm @@ -1,2 +1,2 @@ /mob/living/simple_mob/animal/space/goose/virgo3b - faction = "virgo3b" + faction = "virgo3b" \ No newline at end of file diff --git a/code/modules/power/tesla/coil.dm b/code/modules/power/tesla/coil.dm index 76029fd66c..ab54a82957 100644 --- a/code/modules/power/tesla/coil.dm +++ b/code/modules/power/tesla/coil.dm @@ -95,6 +95,7 @@ playsound(src.loc, '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." @@ -105,6 +106,7 @@ can_buckle = TRUE buckle_lying = FALSE + circuit = /obj/item/weapon/circuitboard/grounding_rod /obj/machinery/power/grounding_rod/pre_mapped anchored = TRUE diff --git a/code/modules/vore/fluffstuff/custom_clothes_vr.dm b/code/modules/vore/fluffstuff/custom_clothes_vr.dm index d8fcf7e5be..fc1fe9d0ff 100644 --- a/code/modules/vore/fluffstuff/custom_clothes_vr.dm +++ b/code/modules/vore/fluffstuff/custom_clothes_vr.dm @@ -1811,3 +1811,41 @@ Departamental Swimsuits, for general use body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS w_class = ITEMSIZE_NORMAL slot = ACCESSORY_SLOT_OVER + +//General definition for bracer items. No icons. +/obj/item/clothing/accessory/bracer + name = "bracer" + desc = "A bracer." + icon_state = null + item_state = null + icon_override = null + slot_flags = SLOT_GLOVES | SLOT_TIE + w_class = ITEMSIZE_SMALL + slot = ACCESSORY_SLOT_ARMBAND + +//AegisOA:Xander Bevin +//WanderingDeviant:S'thasha Tavakdavi +/obj/item/clothing/accessory/bracer/fluff/xander_sthasha + name = "Plasteel Bracer" + desc = "A sturdy arm-guard of polished plasteel that sports gold trimming, silver tribal-looping etchings, and a single cut diamond set into its side. Attached to one's forearm with a small, magnetic clasp." + icon = 'icons/vore/custom_items_vr.dmi' + icon_state = "bracer_xander_sthasha" + icon_override = 'icons/vore/custom_onmob_vr.dmi' + item_state = "bracer_xander_sthasha" + +/obj/item/clothing/accessory/bracer/fluff/xander_sthasha/digest_act(var/atom/movable/item_storage = null) + return FALSE + +/obj/item/clothing/accessory/bracer/fluff/xander_sthasha/gurgle_contaminate(var/atom/movable/item_storage = null) + return FALSE + +//Heroman3003:Lauren Zackson +/obj/item/clothing/accessory/collar/fluff/goldenstring + name = "golden string" + desc = "It appears to just be a length of gold-colored string attached to a simple plastic clasp, meant to be worn around the neck" + icon = 'icons/vore/custom_items_vr.dmi' + icon_override = 'icons/vore/custom_onmob_vr.dmi' + icon_state = "goldenstring" + item_state = "goldenstring" + w_class = ITEMSIZE_TINY + slot_flags = SLOT_TIE \ No newline at end of file diff --git a/code/modules/vore/fluffstuff/custom_items_vr.dm b/code/modules/vore/fluffstuff/custom_items_vr.dm index 716c07fa4e..0751209f12 100644 --- a/code/modules/vore/fluffstuff/custom_items_vr.dm +++ b/code/modules/vore/fluffstuff/custom_items_vr.dm @@ -1997,4 +1997,13 @@ name = "gold-trimmed hypospray" desc = "A gold-trimmed MKII hypospray. The name 'Kenzie Houser' is engraved on the side." icon = 'icons/vore/custom_items_vr.dmi' - icon_state = "kenziehypo" \ No newline at end of file + icon_state = "kenziehypo" + +//Semaun - Viktor Solothurn +/obj/item/weapon/reagent_containers/food/drinks/flask/vacuumflask/fluff/viktor + name = "flask of expensive alcohol" + desc = "A standard vacuum-flask filled with good and expensive drink." + +/obj/item/weapon/reagent_containers/food/drinks/flask/vacuumflask/fluff/viktor/Initialize() + ..() + reagents.add_reagent("pwine", 60) \ No newline at end of file diff --git a/code/modules/xenoarcheaology/finds/find_spawning.dm b/code/modules/xenoarcheaology/finds/find_spawning.dm index 37655b098f..2c04d491d0 100644 --- a/code/modules/xenoarcheaology/finds/find_spawning.dm +++ b/code/modules/xenoarcheaology/finds/find_spawning.dm @@ -355,8 +355,8 @@ //new_item = new /obj/item/weapon/fossil/base(src.loc) //the replacement item propogation isn't working, and it's messy code anyway so just do it here - var/list/candidates = list("/obj/item/weapon/fossil/bone"=9,"/obj/item/weapon/fossil/skull"=3, - "/obj/item/weapon/fossil/skull/horned"=2) + var/list/candidates = list(/obj/item/weapon/fossil/bone = 9,/obj/item/weapon/fossil/skull = 3, + /obj/item/weapon/fossil/skull/horned = 2) var/spawn_type = pickweight(candidates) new_item = new spawn_type(src.loc) @@ -605,6 +605,10 @@ new_item.origin_tech[TECH_ARCANE] = 1 new_item.origin_tech[TECH_PRECURSOR] = 1 + var/turf/simulated/mineral/T = get_turf(new_item) + if(istype(T)) + T.last_find = new_item + qdel(src) else if(talkative) diff --git a/code/modules/xenoarcheaology/finds/fossils.dm b/code/modules/xenoarcheaology/finds/fossils.dm index 8df5b92623..38e8d988f6 100644 --- a/code/modules/xenoarcheaology/finds/fossils.dm +++ b/code/modules/xenoarcheaology/finds/fossils.dm @@ -10,13 +10,10 @@ var/animal = 1 /obj/item/weapon/fossil/base/New() - var/list/l = list("/obj/item/weapon/fossil/bone"=9,"/obj/item/weapon/fossil/skull"=3, - "/obj/item/weapon/fossil/skull/horned"=2) + var/list/l = list(/obj/item/weapon/fossil/bone = 9,/obj/item/weapon/fossil/skull = 3, + /obj/item/weapon/fossil/skull/horned = 2) var/t = pickweight(l) - var/obj/item/weapon/W = new t(src.loc) - var/turf/T = get_turf(src) - if(istype(T, /turf/simulated/mineral)) - T:last_find = W + new t(src.loc) qdel(src) /obj/item/weapon/fossil/bone diff --git a/config/alienwhitelist.txt b/config/alienwhitelist.txt index 4c69df3c3a..d81e3c383c 100644 --- a/config/alienwhitelist.txt +++ b/config/alienwhitelist.txt @@ -1,5 +1,6 @@ some~user - Species +911earlyarther - Xenomorph Hybrid admiraldragon - Vox aether_elemental - Daemon arokha - Protean diff --git a/config/custom_items.txt b/config/custom_items.txt index 08e5826dec..6c364c7552 100644 --- a/config/custom_items.txt +++ b/config/custom_items.txt @@ -342,6 +342,12 @@ item_path: /obj/item/clothing/suit/security/navyhos req_access: 58 } +{ +ckey: mr_signmeup +character_name: Daniel Fisher +item_path: /obj/item/clothing/accessory/medal/conduct +} + # ######## N CKEYS # ######## O CKEYS # ######## P CKEYS diff --git a/html/changelog.html b/html/changelog.html index db7b957f42..d2898f86e3 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -53,6 +53,52 @@ -->
+

04 June 2019

+

Chaoko99 updated:

+ +

Heroman3003 updated:

+ +

Mechoid updated:

+ +

Nalarac updated:

+ +

Novacat updated:

+ +

chaoko99 updated:

+ +

mistyLuminescence updated:

+ +

06 May 2019

Mechoid updated: