diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm index bdb017e5ee..71fd57697a 100644 --- a/code/__HELPERS/unsorted.dm +++ b/code/__HELPERS/unsorted.dm @@ -721,13 +721,14 @@ proc/anim(turf/location as turf,target as mob|obj,a_icon,a_icon_state as text,fl var/delayfraction = round(delay/numticks) var/original_loc = user.loc + var/original_turf = get_turf(user) var/holding = user.get_active_hand() for(var/i = 0, i" master.show_message(rendered, 2) return @@ -210,4 +210,4 @@ Holographic project of everything else. name = "hologram projector" desc = "It makes a hologram appear...with magnets or something..." icon = 'icons/obj/stationobjs.dmi' - icon_state = "hologram0" \ No newline at end of file + icon_state = "hologram0" diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm index ef188a3112..355330a234 100644 --- a/code/game/objects/items/bodybag.dm +++ b/code/game/objects/items/bodybag.dm @@ -5,6 +5,7 @@ desc = "A folded bag designed for the storage and transportation of cadavers." icon = 'icons/obj/bodybag.dmi' icon_state = "bodybag_folded" + w_class = 2.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/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index 18ece30794..c0f83006fd 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -464,7 +464,7 @@ foldable = /obj/item/stack/sheet/cardboard //BubbleWrap storage_slots=21 can_hold = list("/obj/item/weapon/light/tube", "/obj/item/weapon/light/bulb") - max_combined_w_class = 21 + max_combined_w_class = 42 //holds 21 items of w_class 2 use_to_pickup = 1 // for picking up broken bulbs, not that most people will try /obj/item/weapon/storage/box/lights/bulbs/New() diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 12ae785a55..4c93617ad7 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -561,7 +561,7 @@ datum/preferences return proc/SetAntagoptions(mob/user) - if(uplinklocation == "") + if(uplinklocation == "" || !uplinklocation) uplinklocation = "PDA" var/HTML = "" HTML += "
" diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm index edc21f439f..d5db0fdbc7 100644 --- a/code/modules/mob/living/carbon/human/human_defines.dm +++ b/code/modules/mob/living/carbon/human/human_defines.dm @@ -29,7 +29,7 @@ var/b_type = "A+" //Player's bloodtype var/underwear = 1 //Which underwear the player wants - var/undershirt = 1 //Which undershirt the player wants. + var/undershirt = 0 //Which undershirt the player wants. var/backbag = 2 //Which backpack type the player has chosen. Nothing, Satchel or Backpack. //Equipment slots