cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-28 23:58:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into a_intent

Browse Source 
Conflicts:
	code/modules/mob/mob_defines.dm
This commit is contained in:
Mervill
2016-12-04 00:38:37 -08:00
parent d4a49d509d 4a37f57e7c
commit 3f68bd7202
40 changed files with 171 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/carbon_movement.dm
+2 -2
View File
@@ -59,7 +59,7 @@ var/const/SLIDE_ICE = 8
nutrition = NUTRITION_LEVEL_FED - 1 //just less than feeling vigorous
else if(nutrition && stat != DEAD)
nutrition -= HUNGER_FACTOR/10
if(m_intent == "run")
if(m_intent == MOVE_INTENT_RUN)
nutrition -= HUNGER_FACTOR/10
if((disabilities & FAT) && m_intent == "run" && bodytemperature <= 360)
if((disabilities & FAT) && m_intent == MOVE_INTENT_RUN && bodytemperature <= 360)
bodytemperature += 2
code/modules/mob/living/living.dm
+2 -2
View File
@@ -447,11 +447,11 @@
. += config.run_speed
else
switch(m_intent)
if("run")
if(MOVE_INTENT_RUN)
if(drowsyness > 0)
. += 6
. += config.run_speed
if("walk")
if(MOVE_INTENT_WALK)
. += config.walk_speed
/mob/living/proc/makeTrail(turf/T)
code/modules/mob/living/silicon/robot/robot.dm
+1
View File
@@ -111,6 +111,7 @@
if(wires.is_cut(WIRE_CAMERA))
camera.status = 0
module = new /obj/item/weapon/robot_module(src)
module.rebuild_modules()
update_icons()
..()
code/modules/mob/living/silicon/robot/robot_modules.dm
+3 -2
View File
@@ -38,7 +38,6 @@
var/obj/item/I = new i(src)
ratvar_modules += I
ratvar_modules -= i
rebuild_modules()
/obj/item/weapon/robot_module/Destroy()
basic_modules.Cut()
@@ -163,7 +162,8 @@
for(var/obj/item/I in added_modules)
add_module(I, FALSE, FALSE)
for(var/i in held_modules)
R.activate_module(i)
if(i)
R.activate_module(i)
if(R.hud_used)
R.hud_used.update_robot_modules_display()
@@ -174,6 +174,7 @@
qdel(RM)
return
R.module = RM
RM.rebuild_modules()
addtimer(RM, "do_transform_animation", 0)
qdel(src)
return RM
code/modules/mob/mob_defines.dm
+2 -2
View File
@@ -73,7 +73,7 @@
var/weakened = 0
var/losebreath = 0//Carbon
var/a_intent = INTENT_HELP//Living
var/m_intent = "run"//Living
var/m_intent = MOVE_INTENT_RUN//Living
var/lastKnownIP = null
var/atom/movable/buckled = null//Living
@@ -144,4 +144,4 @@
var/resize = 1 //Badminnery resize
var/list/observers = null //The list of people observing this mob.
var/list/observers = null //The list of people observing this mob.