diff --git a/code/WorkInProgress/Chemistry-Tools.dm b/code/WorkInProgress/Chemistry-Tools.dm index 8566e04ff24..a0a5bfdc6e2 100644 --- a/code/WorkInProgress/Chemistry-Tools.dm +++ b/code/WorkInProgress/Chemistry-Tools.dm @@ -43,7 +43,7 @@ stage = 2 else user << "\red You need to add at least one beaker before locking the assembly." - else if (istype(W,/obj/item/weapon/reagent_containers/glass) && stage == 1) + else if (istype(W,/obj/item/weapon/reagent_containers/glass/beaker) && stage == 1) if(beakers.len == 2) user << "\red The grenade can not hold more containers." return @@ -788,11 +788,11 @@ M << "\blue You take a bite of [src]." if (fullness > 350 && fullness <= 550) M << "\blue You unwillingly chew a bit of [src]." - if (fullness > (550 * (1 + M.overeatduration / 1000))) // The more he eats - the more he can eat + if (fullness > (550 * (1 + M.overeatduration / 2000))) // The more you eat - the more you can eat M << "\red You cannot force any more of [src] to go down your throat." return 0 else //If you're feeding it to someone else. - var/fullness = M.nutrition + (M.reagents.get_reagent_amount("nutriment") * 10) + var/fullness = M.nutrition + (M.reagents.get_reagent_amount("nutriment") * 25) if (fullness <= (550 * (1 + M.overeatduration / 1000))) for(var/mob/O in viewers(world.view, user)) O.show_message("\red [user] attempts to feed [M] [src].", 1) @@ -1036,6 +1036,7 @@ item_state = "bucket" m_amt = 200 g_amt = 0 + w_class = 3.0 amount_per_transfer_from_this = 20 flags = FPRINT | OPENCONTAINER @@ -1067,7 +1068,7 @@ item_state = "canister" m_amt = 300 g_amt = 0 - w_class = 5.0 + w_class = 4.0 amount_per_transfer_from_this = 20 flags = FPRINT diff --git a/code/game/gamemodes/wizard/spell12.dm b/code/game/gamemodes/wizard/spell12.dm index 6f107728dce..6f6aaaa1b5f 100644 --- a/code/game/gamemodes/wizard/spell12.dm +++ b/code/game/gamemodes/wizard/spell12.dm @@ -5,8 +5,6 @@ if(!usr.casting()) return var/A usr.verbs -= /mob/proc/teleport - spawn(450) - usr.verbs += /mob/proc/teleport var/list/theareas = new/list() for(var/area/AR in world) @@ -18,6 +16,11 @@ theareas[AR.name] = AR A = input("Area to jump to", "BOOYEA", A) in theareas + + spawn(450) + usr.verbs += /mob/proc/teleport + + var/area/thearea = theareas[A] usr.say("SCYAR NILA [uppertext(A)]") diff --git a/code/game/machinery/doors/airlock_electronics.dm b/code/game/machinery/doors/airlock_electronics.dm index 9f122de37f2..4cf761ebf69 100644 --- a/code/game/machinery/doors/airlock_electronics.dm +++ b/code/game/machinery/doors/airlock_electronics.dm @@ -44,7 +44,7 @@ if (!conf_access || !conf_access.len || !(acc in conf_access)) t1 += "[aname]
" else - t1 += "[aname]
" + t1 += "[aname]
" t1 += text("

Close

\n", src) @@ -67,8 +67,6 @@ if (istype(I, /obj/item/device/pda)) var/obj/item/device/pda/pda = I I = pda.id -// if (istype(usr.l_hand, /obj/item/weapon/card/id)) I = usr.l_hand -// if (istype(usr.r_hand, /obj/item/weapon/card/id)) I = usr.r_hand if (I && src.check_access(I)) src.locked = 0 src.last_configurator = I:registered @@ -91,8 +89,6 @@ else var/req = text2num(acc) - conf_access = list(req) - /* if (conf_access == null) conf_access = list() @@ -100,4 +96,6 @@ conf_access += req else conf_access -= req - */ + if (!conf_access.len) + conf_access = null + diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index dc87f3af735..2189ee407b8 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -121,16 +121,18 @@ if(src.reagents.has_reagent("hyperzine")) return -1 + if (istype(src.loc, /turf/space)) return -1 // It's hard to be slowed down in space by... anything + var/health_deficiency = (100 - src.health) if(health_deficiency >= 40) tally += (health_deficiency / 25) var/hungry = (500 - src.nutrition)/5 // So overeat would be 100 and default level would be 80 if (hungry >= 70) tally += hungry/50 - if(src.wear_suit && !istype(src.loc, /turf/space)) + if(src.wear_suit) tally += src.wear_suit.slowdown - if (istype(src.shoes, /obj/item/clothing/shoes)) + if(src.shoes) tally += src.shoes.slowdown if(src.mutations & 32) diff --git a/code/modules/mob/new_player/preferences.dm b/code/modules/mob/new_player/preferences.dm index 3f2666b9137..3b478a4a905 100644 --- a/code/modules/mob/new_player/preferences.dm +++ b/code/modules/mob/new_player/preferences.dm @@ -644,7 +644,11 @@ datum/preferences if (link_tags["h_style"]) switch(link_tags["h_style"]) if ("random") - src.h_style = pick ("Cut Hair", "Short Hair", "Long Hair", "Mohawk", "Balding", "Fag", "Bedhead", "Dreadlocks", "Bald") + if (src.gender == FEMALE) + src.h_style = pickweight ( list ("Cut Hair" = 5, "Short Hair" = 5, "Long Hair" = 5, "Mohawk" = 5, "Balding" = 1, "Fag" = 5, "Bedhead" = 5, "Dreadlocks" = 5, "Bald" = 5)) + else + src.h_style = pickweight ( list ("Cut Hair" = 5, "Short Hair" = 5, "Long Hair" = 5, "Mohawk" = 5, "Balding" = 5, "Fag" = 5, "Bedhead" = 5, "Dreadlocks" = 5, "Bald" = 5)) + if("input") var/new_style = input(user, "Please select hair style", "Character Generation") as null|anything in list( "Cut Hair", "Short Hair", "Long Hair", "Mohawk", "Balding", "Fag", "Bedhead", "Dreadlocks", "Bald" ) if (new_style)