From 1af2a4722c821de6a8333d80591bff9b6db66de7 Mon Sep 17 00:00:00 2001 From: c0 Date: Sat, 21 May 2016 04:05:32 +0300 Subject: [PATCH] Humble Fix Bundle --- code/datums/material_container.dm | 33 +++++-------------- code/game/machinery/vending.dm | 3 +- code/modules/mob/living/carbon/human/blood.dm | 4 +-- .../projectiles/guns/energy/special.dm | 3 ++ code/modules/projectiles/projectile.dm | 1 + .../modules/projectiles/projectile/special.dm | 16 +++++---- 6 files changed, 26 insertions(+), 34 deletions(-) diff --git a/code/datums/material_container.dm b/code/datums/material_container.dm index 21752e31bd6ba..c320292860e47 100644 --- a/code/datums/material_container.dm +++ b/code/datums/material_container.dm @@ -218,62 +218,47 @@ /datum/material + var/name var/amount = 0 var/material_type = null var/sheet_type = null /datum/material/metal - -/datum/material/metal/New() - ..() + name = "Metal" material_type = MAT_METAL sheet_type = /obj/item/stack/sheet/metal /datum/material/glass - -/datum/material/glass/New() - ..() + name = "Glass" material_type = MAT_GLASS sheet_type = /obj/item/stack/sheet/glass /datum/material/silver - -/datum/material/silver/New() - ..() + name = "Silver" material_type = MAT_SILVER sheet_type = /obj/item/stack/sheet/mineral/silver /datum/material/gold - -/datum/material/gold/New() - ..() + name = "Gold" material_type = MAT_GOLD sheet_type = /obj/item/stack/sheet/mineral/gold /datum/material/diamond - -/datum/material/diamond/New() - ..() + name = "Diamond" material_type = MAT_DIAMOND sheet_type = /obj/item/stack/sheet/mineral/diamond /datum/material/uranium - -/datum/material/uranium/New() - ..() + name = "Uranium" material_type = MAT_URANIUM sheet_type = /obj/item/stack/sheet/mineral/uranium /datum/material/plasma - -/datum/material/plasma/New() - ..() + name = "Solid Plasma" material_type = MAT_PLASMA sheet_type = /obj/item/stack/sheet/mineral/plasma /datum/material/bananium - -/datum/material/bananium/New() - ..() + name = "Bananium" material_type = MAT_BANANIUM sheet_type = /obj/item/stack/sheet/mineral/bananium \ No newline at end of file diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 55479c7e4628f..53800726166cd 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -84,7 +84,8 @@ /obj/machinery/vending/snack = "Getmore Chocolate Corp", /obj/machinery/vending/cola = "Robust Softdrinks", /obj/machinery/vending/cigarette = "ShadyCigs Deluxe", - /obj/machinery/vending/autodrobe = "AutoDrobe") + /obj/machinery/vending/autodrobe = "AutoDrobe", + /obj/machinery/vending/clothing = "ClothesMate") /obj/item/weapon/circuitboard/machine/vendor/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/weapon/screwdriver)) diff --git a/code/modules/mob/living/carbon/human/blood.dm b/code/modules/mob/living/carbon/human/blood.dm index 4b18297b92c4a..b68124230d4a2 100644 --- a/code/modules/mob/living/carbon/human/blood.dm +++ b/code/modules/mob/living/carbon/human/blood.dm @@ -227,7 +227,7 @@ var/const/BLOOD_VOLUME_SURVIVE = 122 if (!injected || !our || !dna) return - if (!(injected.data["blood_type"] in get_safe_blood(dna.blood_type)) || injected.data["species"] != dna.species.id) + if (!(injected.data["blood_type"] in get_safe_blood(dna.blood_type)) || (injected.data["species"] && injected.data["species"] != dna.species.id)) reagents.add_reagent("toxin",amount * 0.5) our.on_merge(injected.data) //still transfer viruses and such, even if incompatibles bloods reagents.update_total() @@ -255,7 +255,7 @@ var/const/BLOOD_VOLUME_SURVIVE = 122 if("A-") return list("A-", "O-") if("A+") - return list("A", "A+", "O-", "O+") + return list("A-", "A+", "O-", "O+") if("B-") return list("B-", "O-") if("B+") diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index 9180829394816..db30b3a491946 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -225,6 +225,8 @@ ammo_type = list(/obj/item/ammo_casing/energy/plasma) flags = CONDUCT | OPENCONTAINER attack_verb = list("attacked", "slashed", "cut", "sliced") + force = 12 + sharpness = IS_SHARP can_charge = 0 heat = 3800 @@ -253,6 +255,7 @@ name = "advanced plasma cutter" icon_state = "adv_plasmacutter" origin_tech = "combat=3;materials=4;magnets=3;plasmatech=3;engineering=2" + force = 15 ammo_type = list(/obj/item/ammo_casing/energy/plasma/adv) /obj/item/weapon/gun/energy/wormhole_projector diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index feb1a8d04caa6..83d17c7ebfefe 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -8,6 +8,7 @@ mouse_opacity = 0 hitsound = 'sound/weapons/pierce.ogg' pressure_resistance = INFINITY + burn_state = LAVA_PROOF var/def_zone = "" //Aiming at var/mob/firer = null//Who shot it var/obj/item/ammo_casing/ammo_casing = null diff --git a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm index 631efab912f03..37e3ed8c891d7 100644 --- a/code/modules/projectiles/projectile/special.dm +++ b/code/modules/projectiles/projectile/special.dm @@ -218,7 +218,7 @@ icon_state = "plasmacutter" damage_type = BRUTE damage = 5 - range = 3 + range = 5 /obj/item/projectile/plasma/New() var/turf/proj_turf = get_turf(src) @@ -227,9 +227,9 @@ var/datum/gas_mixture/environment = proj_turf.return_air() if(environment) var/pressure = environment.return_pressure() - if(pressure < 30) + if(pressure < 60) name = "full strength plasma blast" - damage *= 3 + damage *= 4 ..() /obj/item/projectile/plasma/on_hit(atom/target) @@ -237,12 +237,14 @@ if(istype(target, /turf/closed/mineral)) var/turf/closed/mineral/M = target M.gets_drilled(firer) - range = max(range - 1, 1) - return -1 + Range() + if(range > 0) + return -1 /obj/item/projectile/plasma/adv - range = 5 + damage = 7 + range = 7 /obj/item/projectile/plasma/adv/mech damage = 10 - range = 6 \ No newline at end of file + range = 8 \ No newline at end of file