Bug fixes: trial by fire (#4990)

-fixes #4697
-fixes #3913
-fixes #3216
-fixes #1854
-fixes #901
-fixes #1597
-fixes #4469
-fixes #1215
-fixes #3681
-fixes #3567
This commit is contained in:
Alberyk
2018-07-17 22:55:01 +03:00
committed by Erki
parent 6cf7aadf8c
commit f2d48983c4
11 changed files with 30 additions and 9 deletions
+2
View File
@@ -1184,6 +1184,8 @@
if(C.handcuffed)
usr << "<span class='danger'>Kinda hard to climb in while handcuffed don't you think?</span>"
return
if(!C.IsAdvancedToolUser())
return
if (src.occupant)
usr << "<span class='danger'>The [src.name] is already occupied!</span>"
src.log_append_to_last("Permission denied.")
@@ -50,7 +50,7 @@
if(iswelder(W) && material.shard_can_repair)
var/obj/item/weapon/weldingtool/WT = W
if(WT.remove_fuel(0, user))
material.place_sheet(loc)
material.place_sheet(user.loc)
qdel(src)
return
return ..()
@@ -100,6 +100,10 @@
else
return
if(!istype(user.get_active_hand(), src))
user << "<span class='warning'>You need to be holding the [name] in your active hand.</span>"
return
if(wielded) //Trying to unwield it
unwield()
user << "<span class='notice'>You are now carrying the [name] with one hand.</span>"
@@ -113,7 +117,7 @@
else //Trying to wield it
if(user.get_inactive_hand())
user << "<span class='warning'>You need your other hand to be empty</span>"
user << "<span class='warning'>You need your other hand to be empty.</span>"
return
wield()
user << "<span class='notice'>You grab the [base_name] with both hands.</span>"
+1 -1
View File
@@ -214,9 +214,9 @@
return 1
/obj/item/weapon/tray/AltClick(var/mob/user)
if (!use_check(user, show_messages = FALSE)) return
unload(user)
/obj/item/weapon/tray/proc/attempt_load_item(var/obj/item/I, var/mob/user, var/messages = 1)
if( I != src && !I.anchored && !istype(I, /obj/item/projectile) )
var/match = 0
+1 -1
View File
@@ -1334,9 +1334,9 @@ proc/admin_notice(var/message, var/rights)
if(check_rights(R_ADMIN|R_MOD))
if (H.paralysis == 0)
H.paralysis = 8000
msg = "has paralyzed [key_name_admin(H)]."
H.visible_message("<font color='#002eb8'><b>OOC Information:</b></font> <font color='red'>[H] has been winded by a member of staff! Please freeze all roleplay involving their character until the matter is resolved! Adminhelp if you have further questions.</font>", "<font color='red'><b>You have been winded by a member of staff! Please stand by until they contact you!</b></font>")
H.paralysis = 8000
else
if (alert("The player is currently winded. Do you want to unwind him?", "Unwind player?", "Yes", "No") == "No")
return
+4
View File
@@ -123,6 +123,10 @@
else
return
if(!istype(user.get_active_hand(), src))
user << "<span class='warning'>You need to be holding the [name] in your active hand.</span>"
return
if(wielded) //Trying to unwield it
unwield()
user << "<span class='notice'>You are now carrying the [initial(name)] with one hand.</span>"
@@ -40,7 +40,8 @@
/mob/living/carbon/alien/diona/think()
..()
if (!gestalt)
if(master_nymph && !client && master_nymph != src)
walk_to(src,master_nymph,1,movement_delay())
else
walk_to(src,0)
if(stat != DEAD)
if(master_nymph && !client && master_nymph != src)
walk_to(src,master_nymph,1,movement_delay())
else
walk_to(src,0)
@@ -16,6 +16,7 @@
var/icon_state_closed = "laptop-closed"
/obj/item/modular_computer/laptop/AltClick()
if (!use_check(usr, show_messages = FALSE)) return
// Prevents carrying of open laptops inhand.
// While they work inhand, i feel it'd make tablets lose some of their high-mobility advantage they have over laptops now.
if(!istype(loc, /turf/))
@@ -396,6 +396,9 @@
set category = "Object"
set src in usr
toggle_wield(usr)
usr.update_icon()
/obj/item/weapon/gun/projectile/automatic/rifle/shotgun
name = "assault shotgun"
desc = "A experimental, semi-automatic combat shotgun, designed for boarding operations and law enforcement agencies."
@@ -77,7 +77,7 @@
H.name += " [pick(last_names)]"
H.real_name = H.name
H.set_species(randomize)
addtimer(CALLBACK(H, /mob/living/carbon/human.proc/set_species, randomize), 0)
H.universal_speak = 1
var/datum/preferences/A = new() //Randomize appearance for the human
A.randomize_appearance_for(H)
@@ -0,0 +1,6 @@
author: Alberyk
delete-after: True
changes:
- bugfix: "The staff of change should work properly now."