mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-23 13:05:44 +01:00
Temp save
This commit is contained in:
+1
-1
@@ -1500,7 +1500,7 @@
|
||||
#include "code\modules\heavy_vehicle\mech_wreckage.dm"
|
||||
#include "code\modules\heavy_vehicle\mecha.dm"
|
||||
#include "code\modules\heavy_vehicle\components\_components.dm"
|
||||
#include "code\modules\heavy_vehicle\components\armour.dm"
|
||||
#include "code\modules\heavy_vehicle\components\armor.dm"
|
||||
#include "code\modules\heavy_vehicle\components\arms.dm"
|
||||
#include "code\modules\heavy_vehicle\components\body.dm"
|
||||
#include "code\modules\heavy_vehicle\components\frame.dm"
|
||||
|
||||
@@ -127,7 +127,7 @@ var/list/cleanbot_types // Going to use this to generate a list of types once th
|
||||
return
|
||||
|
||||
if(pulledby) // Don't wiggle if someone pulls you
|
||||
patrol_path.Cut()
|
||||
patrol_path?.Cut()
|
||||
return
|
||||
|
||||
var/found_spot
|
||||
@@ -190,6 +190,8 @@ var/list/cleanbot_types // Going to use this to generate a list of types once th
|
||||
return
|
||||
if(patrol_path[1] == loc)
|
||||
patrol_path -= patrol_path[1]
|
||||
return
|
||||
|
||||
var/moved = step_towards(src, patrol_path[1])
|
||||
if(moved)
|
||||
patrol_path -= patrol_path[1]
|
||||
|
||||
@@ -544,7 +544,7 @@ emp_act
|
||||
return
|
||||
user.put_in_active_hand(G)
|
||||
G.synch()
|
||||
LAssailant = user
|
||||
LAssailant = WEAKREF(user)
|
||||
|
||||
user.do_attack_animation(src)
|
||||
playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
|
||||
|
||||
@@ -670,7 +670,7 @@
|
||||
if(!iscarbon(src))
|
||||
M.LAssailant = null
|
||||
else
|
||||
M.LAssailant = usr
|
||||
M.LAssailant = WEAKREF(usr)
|
||||
|
||||
else if(isobj(AM))
|
||||
var/obj/I = AM
|
||||
|
||||
@@ -94,23 +94,22 @@
|
||||
/datum/reagent/nutriment/mix_data(var/list/newdata, var/newamount)
|
||||
if(!islist(newdata) || !newdata.len)
|
||||
return
|
||||
for(var/i in 1 to newdata.len)
|
||||
if(!(newdata[i] in data))
|
||||
data.Add(newdata[i])
|
||||
data[newdata[i]] = 0
|
||||
data[newdata[i]] += newdata[newdata[i]]
|
||||
var/totalFlavor = 0
|
||||
for(var/i in newdata)
|
||||
if(!(i in data))
|
||||
data[i] = 0
|
||||
continue
|
||||
data[i] += newdata[i]
|
||||
var/totalFlavor = 1
|
||||
for(var/i in 1 to data.len)
|
||||
totalFlavor += data[data[i]]
|
||||
|
||||
if (!totalFlavor)
|
||||
return
|
||||
|
||||
for(var/i in 1 to data.len) //cull the tasteless
|
||||
if(data[data[i]]/totalFlavor * 100 < 10)
|
||||
data[data[i]] = null
|
||||
for(var/i in data) //cull the tasteless
|
||||
if(data[i] && data[i]/totalFlavor * 100 < 10)
|
||||
data[i] = null
|
||||
data -= data[i]
|
||||
data -= null
|
||||
|
||||
/datum/reagent/nutriment/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
|
||||
if(injectable)
|
||||
|
||||
Reference in New Issue
Block a user