diff --git a/code/WorkInProgress/Chemistry-Machinery.dm b/code/WorkInProgress/Chemistry-Machinery.dm index 75c810ef01..26cdf7fd90 100644 --- a/code/WorkInProgress/Chemistry-Machinery.dm +++ b/code/WorkInProgress/Chemistry-Machinery.dm @@ -34,7 +34,7 @@ return blob_act() - if (prob(25)) + if (prob(50)) del(src) meteorhit() @@ -118,7 +118,7 @@ return blob_act() - if (prob(25)) + if (prob(50)) del(src) meteorhit() diff --git a/code/WorkInProgress/Chemistry-Tools.dm b/code/WorkInProgress/Chemistry-Tools.dm index b2e9ef665f..387570afcc 100644 --- a/code/WorkInProgress/Chemistry-Tools.dm +++ b/code/WorkInProgress/Chemistry-Tools.dm @@ -314,7 +314,7 @@ return blob_act() - if(prob(25)) + if(prob(50)) new /obj/effects/water(src.loc) del(src) @@ -1718,6 +1718,10 @@ ..() reagents.add_reagent("fuel",1000) +/obj/reagent_dispensers/fueltank/blob_act() + explosion(src.loc,0,1,5,7,10) + del(src) + /obj/reagent_dispensers/beerkeg name = "beer keg" desc = "A beer keg" @@ -1729,6 +1733,10 @@ ..() reagents.add_reagent("beer",1000) +/obj/reagent_dispensers/beerkeg/blob_act() + explosion(src.loc,0,3,5,7,10) + del(src) + //////////////////////////drinkingglass and shaker// diff --git a/code/defines/obj.dm b/code/defines/obj.dm index 1a8fc2b330..6a16386590 100644 --- a/code/defines/obj.dm +++ b/code/defines/obj.dm @@ -22,14 +22,15 @@ name = "magma" icon = 'blob.dmi' icon_state = "bloba0" - var/health = 30 + var/health = 60 density = 1 opacity = 0 + luminosity = 3 anchored = 1 /obj/blob/idle name = "magma" - desc = "it looks... calm" + desc = "it looks... tasty" icon_state = "blobidle0" /obj/mark diff --git a/code/defines/obj/clothing.dm b/code/defines/obj/clothing.dm index 5a4d881184..5d5c0227a1 100644 --- a/code/defines/obj/clothing.dm +++ b/code/defines/obj/clothing.dm @@ -517,6 +517,14 @@ body_parts_covered = UPPER_TORSO|LOWER_TORSO flags = FPRINT | TABLEPASS | ONESIZEFITSALL +/obj/item/clothing/suit/armor/hos + name = "armored coat" + desc = "A greatcoat enchanced with a special alloy for some protection and style." + icon_state = "hos" + item_state = "hos" + body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS + flags = FPRINT | TABLEPASS | ONESIZEFITSALL + /obj/item/clothing/suit/armor/a_i_a_ptank desc = "A wearable bomb with a health analyzer attached" name = "Analyzer/Igniter/Armor/Plasmatank Assembly" diff --git a/code/game/gamemodes/blob/theblob.dm b/code/game/gamemodes/blob/theblob.dm index a98d018a36..c93fee1c21 100644 --- a/code/game/gamemodes/blob/theblob.dm +++ b/code/game/gamemodes/blob/theblob.dm @@ -66,7 +66,7 @@ if(T.Enter(B,src) && !(locate(/obj/blob) in T)) B.loc = T // open cell, so expand else - if(prob(70)) // closed cell, 50% chance to not expand + if(prob(60)) // closed cell, 40% chance to not expand if(!locate(/obj/blob) in T) for(var/atom/A in T) // otherwise explode contents of turf A.blob_act() @@ -79,10 +79,10 @@ if(1) del(src) if(2) - src.health -= rand(20,30) + src.health -= rand(60,90) src.update() if(3) - src.health -= rand(15,25) + src.health -= rand(30,40) src.update() @@ -118,22 +118,23 @@ var/damage = W.force / 4.0 - if(istype(W, /obj/item/weapon/extinguisher)) - damage = 10 - playsound(src.loc, 'extinguish.ogg', 100, 1) + if(istype(W, /obj/item/weapon/weldingtool)) + var/obj/item/weapon/weldingtool/WT = W + if(WT.welding) + damage = -5 + playsound(src.loc, 'Welder.ogg', 100, 1) - else if(istype(W, /obj/item/weapon/plantbgone)) - var/obj/item/weapon/plantbgone/PBG = W - if (!PBG.empty) - damage = rand(10,20) - playsound(src.loc, 'spray3.ogg', 50, 1, -6) + else if(istype(W, /obj/item/weapon/extinguisher)) + var/obj/item/weapon/extinguisher/WT = W + if (!WT.safety && !WT.reagents.total_volume < 1 && !world.time < WT.last_use + 20) + damage = 10 src.health -= damage src.update() /obj/blob/examine() set src in oview(1) - usr << "Mysterious magma." + usr << "Delicious magma." /datum/station_state/proc/count() for(var/turf/T in world) diff --git a/code/game/jobs/jobprocs.dm b/code/game/jobs/jobprocs.dm index 00beda955f..13c54b20f5 100644 --- a/code/game/jobs/jobprocs.dm +++ b/code/game/jobs/jobprocs.dm @@ -381,7 +381,7 @@ src.equip_if_possible(new /obj/item/device/radio/headset/headset_sec (src), slot_ears) // -- TLE src.equip_if_possible(new /obj/item/device/pda/heads(src), slot_belt) src.equip_if_possible(new /obj/item/clothing/under/rank/head_of_security(src), slot_w_uniform) - src.equip_if_possible(new /obj/item/clothing/suit/armor/vest(src), slot_wear_suit) + src.equip_if_possible(new /obj/item/clothing/suit/armor/hos(src), slot_wear_suit) src.equip_if_possible(new /obj/item/clothing/shoes/brown(src), slot_shoes) src.equip_if_possible(new /obj/item/clothing/head/helmet/HoS(src), slot_head) // src.equip_if_possible(new /obj/item/clothing/glasses/sunglasses(src), slot_glasses) diff --git a/code/game/objects/closets/secure/security.dm b/code/game/objects/closets/secure/security.dm index 597b197e57..92192c5392 100644 --- a/code/game/objects/closets/secure/security.dm +++ b/code/game/objects/closets/secure/security.dm @@ -61,7 +61,7 @@ new /obj/item/clothing/under/rank/head_of_security( src ) new /obj/item/clothing/shoes/brown( src ) new /obj/item/clothing/glasses/sunglasses( src ) - new /obj/item/clothing/suit/armor/vest( src ) + new /obj/item/clothing/suit/armor/hos( src ) new /obj/item/clothing/head/helmet( src ) new /obj/item/weapon/storage/id_kit( src ) new /obj/item/weapon/storage/flashbang_kit(src) diff --git a/code/game/objects/grille.dm b/code/game/objects/grille.dm index 7eda92bc2a..5c5f6acce8 100644 --- a/code/game/objects/grille.dm +++ b/code/game/objects/grille.dm @@ -30,8 +30,7 @@ return /obj/grille/blob_act() - if (prob(70)) - del(src) + del(src) /obj/grille/meteorhit(var/obj/M) if (M.icon_state == "flaming") diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm index db6dbcae93..8b08cfc4ee 100644 --- a/code/game/objects/structures.dm +++ b/code/game/objects/structures.dm @@ -112,5 +112,5 @@ obj/structure ..() /obj/structure/girder/blob_act() - if(prob(10)) + if(prob(40)) del(src) \ No newline at end of file diff --git a/code/unused/airtunnel.dm b/code/unused/airtunnel.dm index bbe95097e6..418f5f3772 100644 --- a/code/unused/airtunnel.dm +++ b/code/unused/airtunnel.dm @@ -103,7 +103,7 @@ return /obj/machinery/at_indicator/blob_act() - if (prob(50)) + if (prob(75)) for(var/x in src.verbs) src.verbs -= x src.icon_state = "reader_broken" diff --git a/code/unused/dna.dm b/code/unused/dna.dm index 10d232a7a2..28d1393f35 100644 --- a/code/unused/dna.dm +++ b/code/unused/dna.dm @@ -324,7 +324,7 @@ /obj/machinery/dna_scanner/blob_act() - if(prob(50)) + if(prob(75)) for(var/atom/movable/A as mob|obj in src) A.loc = src.loc del(src) @@ -346,7 +346,7 @@ /obj/machinery/scan_console/blob_act() - if(prob(50)) + if(prob(75)) del(src) /obj/machinery/scan_console/power_change() @@ -946,7 +946,7 @@ return /obj/machinery/restruct/blob_act() - if(prob(50)) + if(prob(75)) for(var/atom/movable/A as mob|obj in src) A.loc = src.loc del(src) \ No newline at end of file diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 30482bdf8e..ab5c4e890c 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index b8933e6631..5032d7d4a4 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index 0aa41f08b4..59348f713b 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ