From efdeea5bab7aded824afb60fc631c1e99631186c Mon Sep 17 00:00:00 2001 From: DJSnapshot Date: Thu, 26 Dec 2013 13:20:38 -0800 Subject: [PATCH 1/3] Nerf to shield blobs. Now they take 2 hits instead of 3, that way they are a little easier to deal with and hopefully not as much meta will have to occur. --- code/game/gamemodes/blob/blobs/shield.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/gamemodes/blob/blobs/shield.dm b/code/game/gamemodes/blob/blobs/shield.dm index 4c77520846a..0e1b6c07eb4 100644 --- a/code/game/gamemodes/blob/blobs/shield.dm +++ b/code/game/gamemodes/blob/blobs/shield.dm @@ -6,7 +6,7 @@ density = 1 opacity = 0 anchored = 1 - health = 100 + health = 60 brute_resist = 1 fire_resist = 2 From 30970b7b56884f5f9ad11135954249261b65c89c Mon Sep 17 00:00:00 2001 From: SkyMarshal Date: Thu, 26 Dec 2013 21:22:00 -0700 Subject: [PATCH 2/3] Hypothetically adds proximity check to droppers. This code is awful, but it appears "flag" (who names this shit?) acts as a proximity check. --- code/modules/reagents/reagent_containers/dropper.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/reagents/reagent_containers/dropper.dm b/code/modules/reagents/reagent_containers/dropper.dm index 96e037a23a6..17f8d1ce11e 100644 --- a/code/modules/reagents/reagent_containers/dropper.dm +++ b/code/modules/reagents/reagent_containers/dropper.dm @@ -12,7 +12,7 @@ var/filled = 0 afterattack(obj/target, mob/user , flag) - if(!target.reagents) return + if(!target.reagents || !flag) return if(filled) @@ -105,4 +105,4 @@ //////////////////////////////////////////////////////////////////////////////// /// Droppers. END -//////////////////////////////////////////////////////////////////////////////// \ No newline at end of file +//////////////////////////////////////////////////////////////////////////////// From 6f186d6bac30f82fb444b09bd7565f1998f35492 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Fri, 27 Dec 2013 18:12:46 +1030 Subject: [PATCH 3/3] Possible fix for href exploit in uplinks, unable to test locally. --- code/game/objects/items/devices/uplinks.dm | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/code/game/objects/items/devices/uplinks.dm b/code/game/objects/items/devices/uplinks.dm index ebe7b751de0..0bb76efacd4 100644 --- a/code/game/objects/items/devices/uplinks.dm +++ b/code/game/objects/items/devices/uplinks.dm @@ -7,8 +7,10 @@ A list of items and costs is stored under the datum of every game mode, alongsid */ /obj/item/device/uplink + var/welcome // Welcoming menu message var/items // List of items + var/valid_items = list() var/item_data // raw item text var/list/ItemList // Parsed list of items var/uses // Numbers of crystals @@ -24,6 +26,12 @@ A list of items and costs is stored under the datum of every game mode, alongsid ItemList = text2list(src.items, ";") // Parsing the items text string uses = ticker.mode.uplink_uses + //Halfassed fix for href exploit ~Z + for(var/D in ItemList) + var/list/O = stringsplit(D, ":") + if(O.len>0) + valid_items += O[1] + //Let's build a menu! /obj/item/device/uplink/proc/generate_menu() @@ -53,7 +61,7 @@ A list of items and costs is stored under the datum of every game mode, alongsid continue path_text = O[1] - cost = text2num(O[2]) + cost = Clamp(text2num(O[2]),1,20) //Another halfassed fix for href exploit ~Z if(cost>uses) continue @@ -327,7 +335,12 @@ A list of items and costs is stored under the datum of every game mode, alongsid return 1 if(..(href, href_list) == 1) + + if(!(href_list["buy_item"] in valid_items)) + return + var/path_obj = text2path(href_list["buy_item"]) + var/obj/I = new path_obj(get_turf(usr)) if(ishuman(usr)) var/mob/living/carbon/human/A = usr @@ -375,7 +388,4 @@ A list of items and costs is stored under the datum of every game mode, alongsid /obj/item/device/radio/headset/uplink/New() ..() hidden_uplink = new(src) - hidden_uplink.uses = 10 - - - + hidden_uplink.uses = 10 \ No newline at end of file