Misc fixes

While I was working on kobs I fixed and tweaked a whole bunch of little things. I figured even then that I should separate the fixes, but I never got around to it

Now I have~
This commit is contained in:
VerySoft
2023-02-17 13:46:02 -05:00
parent 3d86f8d97b
commit 985fe881cb
12 changed files with 62 additions and 27 deletions
+8 -3
View File
@@ -503,17 +503,22 @@ var/list/global/slot_flags_enumeration = list(
return
if(!usr.canmove || usr.stat || usr.restrained() || !Adjacent(usr))
return
if((!istype(usr, /mob/living/carbon)) || (istype(usr, /mob/living/carbon/brain)))//Is humanoid, and is not a brain
if(isanimal(usr)) //VOREStation Edit Start - Allows simple mobs with hands to use the pickup verb
var/mob/living/simple_mob/s = usr
if(!s.has_hands)
to_chat(usr, "<span class='warning'>You can't pick things up!</span>")
return
else if((!istype(usr, /mob/living/carbon)) || (istype(usr, /mob/living/carbon/brain)))//Is humanoid, and is not a brain
to_chat(usr, "<span class='warning'>You can't pick things up!</span>")
return
var/mob/living/carbon/C = usr
var/mob/living/L = usr
if( usr.stat || usr.restrained() )//Is not asleep/dead and is not restrained
to_chat(usr, "<span class='warning'>You can't pick things up!</span>")
return
if(src.anchored) //Object isn't anchored
to_chat(usr, "<span class='warning'>You can't pick that up!</span>")
return
if(C.get_active_hand()) //Hand is not full
if(L.get_active_hand()) //Hand is not full //VOREStation Edit End
to_chat(usr, "<span class='warning'>Your hand is full.</span>")
return
if(!istype(src.loc, /turf)) //Object is on a turf
@@ -397,6 +397,13 @@
if(ishuman(usr) || isrobot(usr))
add_fingerprint(usr)
toggle(usr)
else if(isanimal(usr)) //VOREStation Addition Start
var/mob/living/simple_mob/s = usr
if(s.has_hands)
add_fingerprint(usr)
toggle(usr)
else
to_chat(usr, "<span class='warning'>This mob type can't use this verb.</span>") //VOREStation Addition End
else
to_chat(usr, "<span class='warning'>This mob type can't use this verb.</span>")
+2 -2
View File
@@ -14,7 +14,7 @@
var/oreAmount = 7
var/knock_sound = 'sound/machines/door/knock_glass.ogg'
var/knock_hammer_sound = 'sound/weapons/sonic_jackhammer.ogg'
/obj/structure/simple_door/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume)
TemperatureAct(exposed_temperature)
@@ -171,7 +171,7 @@
return
/obj/structure/simple_door/bullet_act(var/obj/item/projectile/Proj)
hardness -= Proj.force/10
take_damage(Proj.damage/10)
CheckHardness()
/obj/structure/simple_door/take_damage(var/damage)