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

Armor datums (#34793)

Browse Source 
* Draft 1

* requested changes

* fixes & refactoring & vv support

* one more vars access

* there we go

* change arg name

* Update lava.dm

* Update armor.dm

* Update armor.dm

* Update armor.dm

* fixes

* Update datumvars.dm

* Update goliath_hide.dm

* Update objs.dm

* 0 -> none in checkrights()

* Update armor.dm

* Update datumvars.dm

* Update armor.dm

* Adds magic armor type

this did not exist before

* two missing things from previous commit

* I shouldn't webeditor at work
This commit is contained in:
vuonojenmustaturska
2018-01-25 10:27:36 -05:00
committed by Jordan Brown
parent 3c8404ad88
commit 97d4e59d87
18 changed files with 180 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/equipment/goliath_hide.dm
+6 -6
View File
@@ -21,9 +21,8 @@
return
if(is_type_in_typecache(target, goliath_platable_armor_typecache))
var/obj/item/clothing/C = target
var/list/current_armor = C.armor
if(current_armor["melee"] < 60)
current_armor["melee"] = min(current_armor["melee"] + 10, 60)
if(armor.melee < 60)
armor = armor.setRating(melee = min(armor.melee + 10, 60))
to_chat(user, "<span class='info'>You strengthen [target], improving its resistance against melee attacks.</span>")
use(1)
else
@@ -32,9 +31,10 @@
var/obj/mecha/working/ripley/D = target
if(D.hides < 3)
D.hides++
D.armor["melee"] = min(D.armor["melee"] + 10, 70)
D.armor["bullet"] = min(D.armor["bullet"] + 5, 50)
D.armor["laser"] = min(D.armor["laser"] + 5, 50)
D.armor = D.armor.setRating(\
melee = min(D.armor.melee + 10, 70),\
bullet = min(D.armor.laser + 5, 50),\
laser = min(D.armor.laser + 5, 50))
to_chat(user, "<span class='info'>You strengthen [target], improving its resistance against melee attacks.</span>")
D.update_icon()
if(D.hides == 3)