diff --git a/code/game/atoms.dm b/code/game/atoms.dm
index 44751295b56..3246954cbf8 100644
--- a/code/game/atoms.dm
+++ b/code/game/atoms.dm
@@ -27,10 +27,6 @@
//Detective Work, used for the duplicate data points kept in the scanners
var/list/original_atom
-
-
-
-
/atom/proc/reveal_blood()
return
diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm
index 48998682eab..0cc31208020 100644
--- a/code/game/objects/items/weapons/cigs_lighters.dm
+++ b/code/game/objects/items/weapons/cigs_lighters.dm
@@ -319,6 +319,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
icon_on = "pipeon" //Note - these are in masks.dmi
icon_off = "pipeoff"
smoketime = 0
+ w_class = 1
chem_volume = 50
matchmes = "USER lights their NAME with their FLAME."
lightermes = "USER manages to light their NAME with FLAME."
diff --git a/code/game/turfs/flooring/flooring.dm b/code/game/turfs/flooring/flooring.dm
index e08eb8ab5de..dd365ea52d4 100644
--- a/code/game/turfs/flooring/flooring.dm
+++ b/code/game/turfs/flooring/flooring.dm
@@ -87,6 +87,7 @@ var/list/flooring_types
desc = "It's like the 2390's all over again."
icon = 'icons/turf/flooring/linoleum.dmi'
icon_base = "lino"
+ flags = TURF_REMOVE_CROWBAR | TURF_CAN_BREAK
can_paint = 1
/decl/flooring/tiling/red
@@ -163,7 +164,7 @@ var/list/flooring_types
icon = 'icons/turf/flooring/circuit.dmi'
icon_base = "bcircuit"
build_type = null
- flags = TURF_ACID_IMMUNE | TURF_CAN_BREAK
+ flags = TURF_ACID_IMMUNE | TURF_CAN_BREAK | TURF_REMOVE_CROWBAR
can_paint = 1
/decl/flooring/reinforced/circuit/green
diff --git a/code/modules/blob/blob.dm b/code/modules/blob/blob.dm
index 78cbe78f8d2..338f8b5dd87 100644
--- a/code/modules/blob/blob.dm
+++ b/code/modules/blob/blob.dm
@@ -232,7 +232,7 @@
if(istype(W, /obj/item/weapon/weldingtool))
playsound(loc, 'sound/items/Welder.ogg', 100, 1)
if("brute")
- if(prob(30))
+ if(prob(30) && !issilicon(user))
visible_message("\The [W] gets caught in the gelatinous folds of \the [src]")
user.drop_from_inventory(W)
W.forceMove(src.loc)
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index 91b3f1c84cd..7500fd1412e 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -61,8 +61,8 @@
//Set species_restricted list
switch(target_species)
- if("Human", "Skrell") //humanoid bodytypes
- species_restricted = list("Human", "Skrell") //skrell/humans can wear each other's suits
+ if("Human", "Skrell", "Baseline Frame", "Shell Frame", "Industrial Frame") //humanoid bodytypes
+ species_restricted = list("Human", "Skrell", "Baseline Frame", "Shell Frame", "Industrial Frame") //skrell/humans like to share with IPCs
else
species_restricted = list(target_species)
@@ -84,7 +84,7 @@
//Set species_restricted list
switch(target_species)
if("Skrell")
- species_restricted = list("Human", "Skrell") //skrell helmets fit humans too
+ species_restricted = list("Human", "Skrell", "Baseline Frame", "Shell Frame", "Industrial Frame") // skrell helmets like to share
else
species_restricted = list(target_species)
diff --git a/code/modules/holodeck/HolodeckObjects.dm b/code/modules/holodeck/HolodeckObjects.dm
index ca092df49f8..73ee33b2038 100644
--- a/code/modules/holodeck/HolodeckObjects.dm
+++ b/code/modules/holodeck/HolodeckObjects.dm
@@ -362,10 +362,7 @@
var/eventstarted = 0
anchored = 1.0
- use_power = 1
- idle_power_usage = 2
- active_power_usage = 6
- power_channel = ENVIRON
+ use_power = 0 // reason is because the holodeck already takes power so this can be powered as a result.
/obj/machinery/readybutton/attack_ai(mob/user as mob)
user << "The station AI is not to interact with these devices!"
diff --git a/code/modules/hydroponics/seed_datums.dm b/code/modules/hydroponics/seed_datums.dm
index 4fc980d1a77..e22fe452fc3 100644
--- a/code/modules/hydroponics/seed_datums.dm
+++ b/code/modules/hydroponics/seed_datums.dm
@@ -238,6 +238,26 @@
set_trait(TRAIT_PLANT_ICON,"bush4")
set_trait(TRAIT_IDEAL_HEAT, 298)
set_trait(TRAIT_IDEAL_LIGHT, 7)
+//Placeholder mutation for the eggplant. Not as fun as the other mutations but better than nothing.
+/datum/seed/realeggplant
+ name = "huge eggplant"
+ seed_name = "realeggplant"
+ display_name = "eggplants"
+ chems = list("nutriment" = list(15,30))
+ kitchen_tag = "realeggplant"
+
+/datum/seed/realeggplant/New()
+ ..()
+ set_trait(TRAIT_HARVEST_REPEAT,1)
+ set_trait(TRAIT_MATURATION,4)
+ set_trait(TRAIT_PRODUCTION,5)
+ set_trait(TRAIT_YIELD,1)
+ set_trait(TRAIT_POTENCY,40)
+ set_trait(TRAIT_PRODUCT_ICON,"eggplant")
+ set_trait(TRAIT_PRODUCT_COLOUR,"#892694")
+ set_trait(TRAIT_PLANT_ICON,"bush4")
+ set_trait(TRAIT_IDEAL_HEAT, 298)
+ set_trait(TRAIT_IDEAL_LIGHT, 7)
//Apples/varieties.
/datum/seed/apple
diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm
index cfb61629a2c..e794063cfb3 100644
--- a/code/modules/mob/living/carbon/human/human_attackhand.dm
+++ b/code/modules/mob/living/carbon/human/human_attackhand.dm
@@ -402,6 +402,7 @@
admin_attack_log(user, src, "dislocated [organ.joint].", "had his [organ.joint] dislocated.", "dislocated [organ.joint] of")
src.visible_message("[src]'s [organ.joint] [pick("gives way","caves in","crumbles","collapses")]!")
return 1
+ user.visible_message("[user] fails to dislocate [src]'s [organ.joint]!")
return 0
//Breaks all grips and pulls that the mob currently has.
diff --git a/code/modules/mob/living/simple_animal/hostile/bear.dm b/code/modules/mob/living/simple_animal/hostile/bear.dm
index aac5e123f6b..cd2f071b49b 100644
--- a/code/modules/mob/living/simple_animal/hostile/bear.dm
+++ b/code/modules/mob/living/simple_animal/hostile/bear.dm
@@ -19,7 +19,7 @@
meat_type = /obj/item/weapon/reagent_containers/food/snacks/bearmeat
response_help = "pets"
response_disarm = "gently pushes aside"
- response_harm = "pokes"
+ response_harm = "hits"
stop_automated_movement_when_pulled = 0
maxHealth = 80
melee_damage_lower = 16
diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index 24c98cfeb27..f7b7f8a543b 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -33,8 +33,8 @@
//Interaction
var/response_help = "tries to help"
var/response_disarm = "tries to disarm"
- var/response_harm = "tries to hurt"
- var/harm_intent_damage = 3
+ var/response_harm = "hurts"
+ var/harm_intent_damage = 5
//Temperature effect
var/minbodytemp = 250
diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm
index f5208bc45cd..b2f6dbe0bd0 100644
--- a/code/modules/research/designs.dm
+++ b/code/modules/research/designs.dm
@@ -83,6 +83,15 @@ other types of metals and chemistry for reagents).
build_path = /obj/item/weapon/disk/tech_disk
sort_string = "GAAAB"
+/datum/design/item/flora_disk
+ name = "Flora Data Storage Disk"
+ desc = "Produce additional disks for storing flora data."
+ id = "flora_disk"
+ req_tech = list(TECH_DATA = 1)
+ materials = list(DEFAULT_WALL_MATERIAL = 30, "glass" = 10)
+ build_path = /obj/item/weapon/disk/botany
+ sort_string = "GAAAC"
+
/datum/design/item/stock_part
build_type = PROTOLATHE
diff --git a/code/modules/vehicles/bike.dm b/code/modules/vehicles/bike.dm
index f251bd38374..c526036eca8 100644
--- a/code/modules/vehicles/bike.dm
+++ b/code/modules/vehicles/bike.dm
@@ -79,6 +79,12 @@
if(user == load)
unload(load)
user << "You unbuckle yourself from \the [src]"
+ else if(user != load && load)
+ user.visible_message ("[user] starts to unbuckle [load] from \the [src]!")
+ if(do_after(user, 8 SECONDS, act_target = src))
+ unload(load)
+ user <<"You unbuckle [load] from \the [src]"
+ load <<"You were unbuckled from \the [src] by [user]"
/obj/vehicle/bike/relaymove(mob/user, direction)
if(user != load || !on || user.incapacitated())
diff --git a/html/changelogs/Printer16BugFixes.yml b/html/changelogs/Printer16BugFixes.yml
new file mode 100644
index 00000000000..53194237728
--- /dev/null
+++ b/html/changelogs/Printer16BugFixes.yml
@@ -0,0 +1,14 @@
+
+author: Printer16
+delete-after: True
+changes:
+ - bugfix: "Eggplants can now be mutated."
+ - bugfix: "RnD can now print flora disks."
+ - bugfix: "Crowbars can now lift strata and Linoleum tiles."
+ - bugfix: "Blobs can no longer steal tools from borgs."
+ - bugfix: "You can now unbuckle someone on a space bike."
+ - bugfix: "If you fail to dislocate a limb there will now be a chat message."
+ - bugfix: "Increased damage done to all simple_mobs slightly and added proper hit verbs."
+ - bugfix: "Smoking pipes have been made small items."
+ - bugfix: "IPC's can now wear refitted voidsuits. (Only if refitted to human/skrell)"
+ - bugfix: "The holodeck thunderdome ready button no longer requires power. "