diff --git a/code/defines/obj.dm b/code/defines/obj.dm
index db5bc7f1dde..bf858aad55f 100644
--- a/code/defines/obj.dm
+++ b/code/defines/obj.dm
@@ -28,6 +28,7 @@
icon = 'policetape.dmi'
icon_state = "rollstart"
flags = FPRINT
+ w_class = 1.0
var/tapestartx = 0
var/tapestarty = 0
var/tapestartz = 0
diff --git a/code/defines/obj/closet.dm b/code/defines/obj/closet.dm
index 61d132aeba8..67b14ba77bf 100644
--- a/code/defines/obj/closet.dm
+++ b/code/defines/obj/closet.dm
@@ -13,6 +13,7 @@
var/health = 100 //Might be a bit much, dono can always change later //Nerfed -Pete
var/lastbang //
var/lasttry = 0
+ layer = 2.98
/obj/structure/closet/detective
name = "Detective's Closet"
diff --git a/code/defines/obj/machinery.dm b/code/defines/obj/machinery.dm
index e31b5a6010c..1a45910c9d9 100644
--- a/code/defines/obj/machinery.dm
+++ b/code/defines/obj/machinery.dm
@@ -251,6 +251,7 @@
var/temphtml = null
var/obj/machinery/dna_scanner/connected = null
var/obj/item/weapon/disk/data/diskette = null
+ var/message = 0
anchored = 1.0
use_power = 1
idle_power_usage = 10
diff --git a/code/defines/obj/storage.dm b/code/defines/obj/storage.dm
index bf2aafec82d..0e2e9c50937 100644
--- a/code/defines/obj/storage.dm
+++ b/code/defines/obj/storage.dm
@@ -5,7 +5,7 @@
w_class = 4.0
flags = 259.0
max_w_class = 3
- max_combined_w_class = 20
+ max_combined_w_class = 21
/obj/item/weapon/storage/backpack/cultpack
name = "Trophy Rack"
@@ -14,7 +14,7 @@
/obj/item/weapon/storage/trashbag
name = "trash bag"
- desc = "For picking up all that trash..."
+ desc = "For picking up all that trash."
icon_state = "trashbag"
item_state = "trashbag"
w_class = 4.0
@@ -31,7 +31,7 @@
*/
/obj/item/weapon/storage/pill_bottle
name = "pill bottle"
- desc = "A reasonable place to put your pills.."
+ desc = "A reasonable place to put your pills."
icon_state = "pill_canister"
icon = 'chemical.dmi'
item_state = "contsolid"
@@ -115,6 +115,11 @@
desc = "A very old bandolier to wear on your back."
icon_state = "bandolier"
+/obj/item/weapon/storage/backpack/medicalsatchel
+ name = "medic's satchel"
+ desc = "Easy to access medical satchel for quick responses."
+ icon_state = "medicalsatchel"
+
/obj/item/weapon/storage/backpack/industrial
name = "industrial backpack"
desc = "A tough backpack for the daily grind"
diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm
index 24f9392808b..7902646e3d1 100644
--- a/code/defines/obj/weapon.dm
+++ b/code/defines/obj/weapon.dm
@@ -47,7 +47,7 @@
flags = FPRINT | ONBELT | TABLEPASS
force = 40
throwforce = 10
- w_class = 3
+ w_class = 3.0
IsShield()
return 1
diff --git a/code/game/dna.dm b/code/game/dna.dm
index 410969b5b03..3a433755da0 100644
--- a/code/game/dna.dm
+++ b/code/game/dna.dm
@@ -685,7 +685,7 @@
if (src.occupant)
usr << "\blue The scanner is already occupied!"
return
- if (usr.abiotic())
+ if (usr.abiotic2())
usr << "\blue Subject cannot have abiotic items on."
return
usr.pulling = null
@@ -709,7 +709,7 @@
if (src.occupant)
user << "\blue The scanner is already occupied!"
return
- if (G.affecting.abiotic())
+ if (G.affecting.abiotic2())
user << "\blue Subject cannot have abiotic items on."
return
var/mob/M = G.affecting
@@ -855,8 +855,9 @@
return src.attack_hand(user)
/obj/machinery/scan_consolenew/attack_hand(user as mob)
- if(..())
- return
+ if(message == 0)
+ user << "\blue This machine looks extremely complex. You'd probably need a decent knowledge of Genetics to understand it."
+ message += 1
var/dat
if (src.delete && src.temphtml) //Window in buffer but its just simple message, so nothing
src.delete = src.delete
diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm
index 889e529e540..d96fc5751c1 100644
--- a/code/game/machinery/cloning.dm
+++ b/code/game/machinery/cloning.dm
@@ -35,6 +35,7 @@
var/obj/item/weapon/disk/data/diskette = null //Mostly so the geneticist can steal everything.
var/wantsscan = 1
var/wantspod = 1
+ var/message = 0
//The return of data disks?? Just for transferring between genetics machine/cloning machine.
//TO-DO: Make the genetics machine accept them.
@@ -147,9 +148,11 @@
return attack_hand(user)
/obj/machinery/computer/cloning/attack_hand(mob/user as mob)
+ if(message == 0)
+ user << "\blue This machine looks extremely complex. You'd probably need a decent knowledge of Genetics to understand it."
+ message += 1
user.machine = src
add_fingerprint(user)
-
if(stat & (BROKEN|NOPOWER))
return
diff --git a/code/game/machinery/cryo.dm b/code/game/machinery/cryo.dm
index 791b3db0617..cfbc7efa21b 100644
--- a/code/game/machinery/cryo.dm
+++ b/code/game/machinery/cryo.dm
@@ -223,7 +223,7 @@
if (src.occupant)
usr << "\red The cryo cell is already occupied!"
return
- if (M.abiotic())
+ if (M.abiotic2())
usr << "\red Subject may not have abiotic items on."
return
if(!src.node)
diff --git a/code/game/machinery/kitchen/gibber.dm b/code/game/machinery/kitchen/gibber.dm
index 3b9f7a3c601..c00d181d9f7 100644
--- a/code/game/machinery/kitchen/gibber.dm
+++ b/code/game/machinery/kitchen/gibber.dm
@@ -71,7 +71,7 @@
if(!emagged)
user << "\red \The [src] buzzes and spits [G.affecting] back out."
return
- if(G.affecting.abiotic(1))
+ if(G.affecting.abiotic2(1))
user << "\red Subject may not have abiotic items on."
return
else if(istype(G.affecting, /mob/living/carbon/monkey) || istype(G.affecting, /mob/living/carbon/alien) || istype(G.affecting, /mob/living/simple_animal))
diff --git a/code/game/objects/bodybag.dm b/code/game/objects/bodybag.dm
index 3c037b7b4f1..acccc6b32ca 100644
--- a/code/game/objects/bodybag.dm
+++ b/code/game/objects/bodybag.dm
@@ -3,6 +3,7 @@
desc = "A folded bag designed to contain dead things."
icon = 'bodybag.dmi'
icon_state = "bodybag_folded"
+ w_class = 1.0
attack_self(mob/user)
var/obj/structure/closet/body_bag/R = new /obj/structure/closet/body_bag(user.loc)
diff --git a/code/game/objects/storage/belt.dm b/code/game/objects/storage/belt.dm
index d1eaf734a04..912063f00a2 100644
--- a/code/game/objects/storage/belt.dm
+++ b/code/game/objects/storage/belt.dm
@@ -142,7 +142,8 @@
"/obj/item/weapon/cigpacket",
"/obj/item/weapon/zippo",
"/obj/item/device/taperecorder",
- "/obj/item/weapon/evidencebag"
+ "/obj/item/weapon/evidencebag",
+ "/obj/item/policetaperoll"
)
/obj/item/weapon/storage/belt/soulstone
diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm
index 8b7be2f0844..b3cf54941f2 100644
--- a/code/modules/clothing/glasses/glasses.dm
+++ b/code/modules/clothing/glasses/glasses.dm
@@ -91,8 +91,8 @@
return
/obj/item/clothing/glasses/thermal
- name = "Optical Thermal Scanner"
- desc = "Thermals in the shape of glasses."
+ name = "sunglasses"
+ desc = "Strangely ancient technology used to help provide rudimentary eye cover. Enhanced shielding blocks many flashes. Has an odd tint."
//icon_state = "thermal"
//item_state = "glasses"
icon_state = "sun"
diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm
index 819a2b6c457..2d7b0996b54 100644
--- a/code/modules/clothing/suits/miscellaneous.dm
+++ b/code/modules/clothing/suits/miscellaneous.dm
@@ -8,7 +8,7 @@
/obj/item/clothing/suit/storage/wcoat
name = "waistcoat"
- desc = "For some classy, murderous fun."
+ desc = "The height of class."
icon_state = "vest"
item_state = "wcoat"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
@@ -25,7 +25,7 @@
/obj/item/clothing/suit/storage/chef
name = "Chef's apron"
- desc = "An apron used by a high class chef. Has a few pockets for nic-naks."
+ desc = "An apron used by a high class chef. Has a few pockets for nic-naks."
icon_state = "chef"
item_state = "chef"
gas_transfer_coefficient = 0.90
@@ -62,7 +62,7 @@
name = "red space suit replica"
icon_state = "syndicate"
item_state = "space_suit_syndicate"
- desc = "A plastic replica of the syndicate space suit, you'll look just like a real murderous syndicate agent in this! This is a toy, it is not made for use in space!"
+ desc = "A plastic replica of a famous space suit. This is a toy, not for use in space!"
w_class = 3
flags = FPRINT | TABLEPASS
allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen,/obj/item/toy)
@@ -108,7 +108,7 @@
/obj/item/clothing/suit/imperium_monk
name = "Imperium monk"
- desc = "Have YOU killed a xenos today?"
+ desc = "A set of strange robes."
icon_state = "imperium_monk"
item_state = "imperium_monk"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
@@ -116,7 +116,7 @@
/obj/item/clothing/suit/chickensuit
name = "Chicken Suit"
- desc = "A suit made long ago by the ancient empire KFC."
+ desc = "Bwak!"
icon_state = "chickensuit"
item_state = "chickensuit"
body_parts_covered = UPPER_TORSO|ARMS|LOWER_TORSO|LEGS|FEET|HEAD
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 0dc190a2ec0..f7f77ea63aa 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -2454,9 +2454,8 @@ It can still be worn/put on as normal.
return
src.health = 100 - src.getOxyLoss() - src.getToxLoss() - src.getFireLoss() - src.getBruteLoss() - src.getCloneLoss() -src.halloss
-
/mob/living/carbon/human/abiotic(var/full_body = 0)
- if(full_body && ((src.l_hand && !( src.l_hand.abstract )) || (src.r_hand && !( src.r_hand.abstract )) || (src.back || src.wear_mask || src.head || src.shoes || src.w_uniform || src.wear_suit || src.glasses || src.l_ear || src.r_ear || src.gloves)))
+ if(full_body && ((src.l_hand && !( src.l_hand.abstract )) || (src.r_hand && !( src.r_hand.abstract )) || (src.back || src.wear_mask)))
return 1
if((src.l_hand && !( src.l_hand.abstract )) || (src.r_hand && !( src.r_hand.abstract )))
@@ -2464,6 +2463,15 @@ It can still be worn/put on as normal.
return 0
+/mob/living/carbon/human/abiotic2(var/full_body2 = 0)
+ if(full_body2 && ((src.l_hand && !( src.l_hand.abstract )) || (src.r_hand && !( src.r_hand.abstract )) || (src.back || src.wear_mask || src.head || src.shoes || src.w_uniform || src.wear_suit || src.glasses || src.l_ear || src.r_ear || src.gloves || src.handcuffed)))
+ return 1
+
+ if((src.l_hand && !( src.l_hand.abstract )) || (src.r_hand && !( src.r_hand.abstract )) || (src.back || src.wear_mask || src.head || src.shoes || src.w_uniform || src.wear_suit || src.glasses || src.l_ear || src.r_ear || src.gloves || src.handcuffed))
+ return 1
+
+ return 0
+
/mob/living/carbon/human/getBruteLoss()
var/amount = 0.0
for(var/name in organs)
diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm
index 91892dbfbda..01464f1d570 100644
--- a/code/modules/mob/mob_helpers.dm
+++ b/code/modules/mob/mob_helpers.dm
@@ -323,6 +323,15 @@ It's fairly easy to fix if dealing with single letters but not so much with comp
return 0
+/mob/proc/abiotic2(var/full_body2 = 0)
+ if(full_body2 && ((src.l_hand && !( src.l_hand.abstract )) || (src.r_hand && !( src.r_hand.abstract )) || (src.back || src.wear_mask)))
+ return 1
+
+ if((src.l_hand && !( src.l_hand.abstract )) || (src.r_hand && !( src.r_hand.abstract )))
+ return 1
+
+ return 0
+
/mob/proc/put_in_hands(var/obj/item/I)
if(!r_hand)
I.loc = src
diff --git a/config/custom_items.txt b/config/custom_items.txt
index 06831904006..71c1d6da5df 100644
--- a/config/custom_items.txt
+++ b/config/custom_items.txt
@@ -4,7 +4,7 @@ asanadas: Book Berner: /obj/item/clothing/under/chameleon/psyche
tastyfish: Cindy Robertson: /obj/item/weapon/wrapping_paper
eternal248: Maximilian Haynes: /obj/item/weapon/paper/certificate
searif: Yuki Matsuda: /obj/item/weapon/paper/certificate, /obj/item/clothing/under/jumpsuitdown
-erthilo: Farah Lants: /obj/item/clothing/under/rank/medical_sleeve, /obj/item/clothing/suit/storage/labcoat/red
+erthilo: Farah Lants: /obj/item/clothing/under/rank/medical_sleeve, /obj/item/clothing/suit/storage/labcoat/red, /obj/item/weapon/storage/backpack/medicalsatchel
compactninja: Ysyr Rylias: /obj/item/weapon/reagent_containers/food/drinks/dry_ramen, /obj/item/weapon/reagent_containers/food/drinks/dry_ramen, /obj/item/weapon/reagent_containers/food/drinks/dry_ramen, /obj/item/weapon/reagent_containers/food/drinks/dry_ramen
tzefa: Wes Solari: /obj/item/fluff/wes_solari_1
misterfox: Rashid Siraj: /obj/item/weapon/storage/bible/tajaran
\ No newline at end of file
diff --git a/icons/mob/back.dmi b/icons/mob/back.dmi
index e5a59db56e9..6d7dcd15a95 100644
Binary files a/icons/mob/back.dmi and b/icons/mob/back.dmi differ
diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi
index cdadfa5cadc..daf42334bd3 100644
Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ