cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-26 10:02:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Baymerge fixes (#12)

Browse Source 
* Fixing compile errors

* Some more fixes

* Some more fixes
This commit is contained in:
Werner
2016-11-19 10:56:49 +01:00
committed by skull132
parent 908fc933f9
commit ab413348ff
4 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/mob/living/living_defense.dm
View File

@@ -10,6 +10,9 @@
1 - halfblock
2 - fullblock
*/
#define MOB_FIRE_LIGHT_RANGE 3 //These control the intensity and range of light given off by a mob which is on fire
#define MOB_FIRE_LIGHT_POWER 2
/mob/living/proc/run_armor_check(var/def_zone = null, var/attack_flag = "melee", var/armour_pen = 0, var/absorb_text = null, var/soften_text = null)
if(armour_pen >= 100)
return 0 //might as well just skip the processing
@@ -373,3 +376,6 @@
hud_used.hide_actions_toggle.screen_loc = hud_used.ButtonNumberToScreenCoords(button_number+1)
//hud_used.SetButtonCoords(hud_used.hide_actions_toggle,button_number+1)
client.screen += hud_used.hide_actions_toggle
#undef MOB_FIRE_LIGHT_RANGE //These control the intensity and range of light given off by a mob which is on fire
#undef MOB_FIRE_LIGHT_POWER

6
code/modules/reagents/reagent_containers.dm
View File

@@ -102,14 +102,14 @@
user << "<span class='notice'>\The [src] is empty.</span>"
return 1
var/types = target.find_type()
//var/types = target.find_type()
var/mob/living/carbon/human/H
if(istype(target, /mob/living/carbon/human))
H = target
if(target == user)
if(istype(user, /mob/living/carbon/human))
var/mob/living/carbon/human/H = user
H = user
if(!H.check_has_mouth())
user << "Where do you intend to put \the [src]? You don't have a mouth!"
return 1
@@ -125,7 +125,7 @@
return 1
else
if(istype(target, /mob/living/carbon/human))
var/mob/living/carbon/human/H = target
H = target
if(!H.check_has_mouth())
user << "Where do you intend to put \the [src]? \The [H] doesn't have a mouth!"
return