Merge pull request #6349 from Novacat/nova-basicfixes

Misc Changes and bugfixes
This commit is contained in:
Novacat
2019-12-31 18:39:10 -05:00
committed by GitHub
87 changed files with 87 additions and 11424 deletions
+1 -1
View File
@@ -114,7 +114,7 @@
for(var/slot in slots)
var/obj/item/I = H.get_equipped_item(slot = slot)
if(I)
H.unEquip(I,force = TRUE)
H.unEquip(I,force = FALSE)
if(contaminates || istype(I,/obj/item/weapon/card/id))
I.gurgle_contaminate(contents, contamination_flavor, contamination_color)
if(item_digest_mode == IM_HOLD)
@@ -845,7 +845,6 @@
armor = list(melee = 50, bullet = 40, laser = 45, energy = 25, bomb = 50, bio = 100, rad = 50) //These values were taken from the combat rigs and adjusted to be weaker than said rigs.
slowdown = 0
allowed = list(/obj/item/weapon/gun,/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/melee/baton)
w_class = ITEMSIZE_NORMAL
icon = 'icons/vore/custom_clothes_vr.dmi'
icon_state = "joansuit"