cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-29 07:59:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bug fix's since i somehow broke my git for the last time (#7008)

Browse Source 
Fixes #6758
Fixes #6763
Fixes #6697
Fixes #6495
Fixes #7007
This commit is contained in:
Lady Fowl
2019-09-18 20:34:14 +03:00
committed by Erki
parent 80f371d8e6
commit 9cd6f2ab11
9 changed files with 58 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/shoes/colour.dm
+1 -1
View File
@@ -55,7 +55,7 @@
/obj/item/clothing/shoes/science
name = "scientist shoes"
desc = "A pair of treated purple and white shoes resistant to chemical and gas spills."
icon_state = "scientist"
icon_state = "science"
gas_transfer_coefficient = 0.01
permeability_coefficient = 0.01
code/modules/mob/living/carbon/breathe.dm
+1 -1
View File
@@ -32,7 +32,7 @@
if(losebreath>0) //Suffocating so do not take a breath
losebreath--
if (prob(10)) //Gasp per 10 ticks? Sounds about right.
if (prob(10) && !isipc(src)) //Gasp per 10 ticks? Sounds about right.
spawn emote("gasp")
else
//Okay, we can breathe, now check if we can get air
code/modules/mob/mob_grab.dm
+1 -1
View File
@@ -172,7 +172,7 @@
switch(target_zone)
if("mouth")
if(announce)
user.visible_message("<span class='warning'>\The [user] covers [target]'s mouth!</span>")
user.visible_message("<span class='warning'>\The [user] covers [target]'s face!</span>")
if(target.silent < 3)
target.silent = 3
if("eyes")
code/modules/paperwork/paper.dm
-2
View File
@@ -318,8 +318,6 @@
var/obj/item/weapon/weldingtool/F = P
if (!F.welding)//welding tools are 0 when off
return
if (!F.remove_fuel(1, user))//This function removes the fuel and does the usual eyedamage checks, if it returns 0 then the welder is out of fuel and cant burn paper
return
else
//If we got here somehow, the item is incompatible and can't burn things
return
code/modules/reagents/reagent_dispenser.dm
+2 -2
View File
@@ -192,10 +192,10 @@
/obj/structure/reagent_dispensers/fueltank/bullet_act(var/obj/item/projectile/Proj)
if(Proj.get_structure_damage())
if(istype(Proj.firer))
message_admins("[key_name_admin(Proj.firer)] shot fueltank at [loc.loc.name] ([loc.x],[loc.y],[loc.z]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[loc.x];Y=[loc.y];Z=[loc.z]'>JMP</a>).")
log_and_message_admins("shot a welding tank", Proj.firer)
log_game("[key_name(Proj.firer)] shot fueltank at [loc.loc.name] ([loc.x],[loc.y],[loc.z]).",ckey=key_name(Proj.firer))
if(!istype(Proj ,/obj/item/projectile/beam/lastertag) && !istype(Proj ,/obj/item/projectile/beam/practice) )
if(!istype(Proj ,/obj/item/projectile/beam/lastertag) && !istype(Proj ,/obj/item/projectile/beam/practice) && !istype(Proj ,/obj/item/projectile/kinetic))
ex_act(2.0)
/obj/structure/reagent_dispensers/fueltank/ex_act(var/severity = 3.0)