From 3f50c376093d76cd2b2dc635e2ce66d162c5128b Mon Sep 17 00:00:00 2001 From: Erthilo Date: Mon, 21 May 2012 23:50:27 +0100 Subject: [PATCH 1/7] Fixes Odysseus buckled mob bug. --- code/game/mecha/equipment/tools/tools.dm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/code/game/mecha/equipment/tools/tools.dm b/code/game/mecha/equipment/tools/tools.dm index 21d019eec23..179cd718f07 100644 --- a/code/game/mecha/equipment/tools/tools.dm +++ b/code/game/mecha/equipment/tools/tools.dm @@ -985,6 +985,12 @@ occupant_message("The sleeper is already occupied!") return target.forceMove(src) + if(target.buckled) + var/obj/structure/stool/bed/S = target.buckled + target.buckled = null + target.anchored = 0 + target.lying = 0 + S.buckled_mob = null occupant = target target.reset_view(src) /* From 262890f5936ed8b5e817fad10e58094f9dad9a73 Mon Sep 17 00:00:00 2001 From: Erthilo Date: Mon, 21 May 2012 23:53:05 +0100 Subject: [PATCH 2/7] Fixes armored trenchcoat name. Now that's minor! --- code/modules/clothing/suits/hos.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/clothing/suits/hos.dm b/code/modules/clothing/suits/hos.dm index 7c425a7afdd..b57e5f74d64 100644 --- a/code/modules/clothing/suits/hos.dm +++ b/code/modules/clothing/suits/hos.dm @@ -23,7 +23,7 @@ /obj/item/clothing/suit/armor/hos/jensen - name = "armored trenchoat" + name = "armored trenchcoat" desc = "A trenchoat augmented with a special alloy for some protection and style" icon_state = "jensencoat" item_state = "jensencoat" From 36b0ba73cd38cd0554c4e297d1e818fd2c7719c5 Mon Sep 17 00:00:00 2001 From: Erthilo Date: Mon, 21 May 2012 23:55:00 +0100 Subject: [PATCH 3/7] Fixes Particle Accelerator admin logging. --- .../singularity/particle_accelerator/particle_control.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/power/singularity/particle_accelerator/particle_control.dm b/code/modules/power/singularity/particle_accelerator/particle_control.dm index eed1002026e..758a27eb4ac 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_control.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_control.dm @@ -89,11 +89,11 @@ part.update_icon() if(src.strength > 2) src.strength = 2 - message_admins("[usr] increased particle accelerator power to [strength].") - log_admin("[usr] increased particle accelerator power to [strength].") for(var/obj/structure/particle_accelerator/part in connected_parts) part.strength = 2 part.update_icon() + message_admins("[usr] increased particle accelerator power to [strength].") + log_admin("[usr] increased particle accelerator power to [strength].") if(href_list["strengthdown"]) src.strength-- for(var/obj/structure/particle_accelerator/part in connected_parts) @@ -101,11 +101,11 @@ part.update_icon() if(src.strength < 0) src.strength = 0 - message_admins("[usr] decreased particle accelerator power to [strength].") - log_admin("[usr] decreased particle accelerator power to [strength].") for(var/obj/structure/particle_accelerator/part in connected_parts) part.strength = 0 part.update_icon() + message_admins("[usr] decreased particle accelerator power to [strength].") + log_admin("[usr] decreased particle accelerator power to [strength].") src.updateDialog() src.update_icon() return From b7b33fc91a9dc89b9b1e50e281ff88b11aec8bb4 Mon Sep 17 00:00:00 2001 From: Erthilo Date: Mon, 21 May 2012 23:56:48 +0100 Subject: [PATCH 4/7] /obj/item/weapon/spacecash change to /obj/item/weapon/money Can now split and stack money properly. Fixes genetics/research access door and also money path changes. --- code/WorkInProgress/Mini/ATM.dm | 20 +-- code/WorkInProgress/animusstation/atm.dm | 24 +-- code/defines/obj/hydro.dm | 16 +- code/defines/obj/storage.dm | 6 +- code/defines/obj/weapon.dm | 179 +++++++++++++++-------- code/game/asteroid/artifacts.dm | 2 +- code/game/objects/closets/kitchen.dm | 26 ++-- code/game/objects/items/weapons/RSF.dm | 4 +- code/game/objects/storage/bible.dm | 6 +- code/modules/admin/verbs/debug.dm | 2 +- code/modules/clothing/uniforms/lawyer.dm | 2 +- code/unused/computer2/peripherals.dm | 2 +- maps/tgstation.2.0.8.dmm | 4 +- 13 files changed, 174 insertions(+), 119 deletions(-) diff --git a/code/WorkInProgress/Mini/ATM.dm b/code/WorkInProgress/Mini/ATM.dm index 3feb2014916..068211a97c3 100644 --- a/code/WorkInProgress/Mini/ATM.dm +++ b/code/WorkInProgress/Mini/ATM.dm @@ -21,7 +21,7 @@ log transactions /obj/machinery/atm/attackby(obj/item/I as obj, mob/user as mob) if(ishuman(user)) var/obj/item/weapon/card/id/user_id = src.scan_user(user) - if(istype(I,/obj/item/weapon/spacecash)) + if(istype(I,/obj/item/weapon/money)) user_id.money += I:worth del I @@ -29,7 +29,7 @@ log transactions if(istype(user, /mob/living/silicon)) user << "\red Artificial unit recognized. Artificial units do not currently receive monetary compensation, as per NanoTrasen regulation #1005." return - + var/obj/item/weapon/card/id/user_id = src.scan_user(user) if(..()) return @@ -51,21 +51,21 @@ log transactions //hueg switch for giving moneh out switch(amount) if(1) - new /obj/item/weapon/spacecash(loc) + new /obj/item/weapon/money(loc) if(10) - new /obj/item/weapon/spacecash/c10(loc) + new /obj/item/weapon/money/c10(loc) if(20) - new /obj/item/weapon/spacecash/c20(loc) + new /obj/item/weapon/money/c20(loc) if(50) - new /obj/item/weapon/spacecash/c50(loc) + new /obj/item/weapon/money/c50(loc) if(100) - new /obj/item/weapon/spacecash/c100(loc) + new /obj/item/weapon/money/c100(loc) if(200) - new /obj/item/weapon/spacecash/c200(loc) + new /obj/item/weapon/money/c200(loc) if(500) - new /obj/item/weapon/spacecash/c500(loc) + new /obj/item/weapon/money/c500(loc) if(1000) - new /obj/item/weapon/spacecash/c1000(loc) + new /obj/item/weapon/money/c1000(loc) else usr << browse("You don't have that much money!
Back","window=atm") return diff --git a/code/WorkInProgress/animusstation/atm.dm b/code/WorkInProgress/animusstation/atm.dm index cbb61e6e79c..a6dce70e502 100644 --- a/code/WorkInProgress/animusstation/atm.dm +++ b/code/WorkInProgress/animusstation/atm.dm @@ -17,13 +17,13 @@ log transactions idle_power_usage = 10 var obj/item/weapon/card/id/card - obj/item/weapon/spacecash/cashes = list() + obj/item/weapon/money/cashes = list() inserted = 0 accepted = 0 pincode = 0 attackby(var/obj/A, var/mob/user) - if(istype(A,/obj/item/weapon/spacecash)) + if(istype(A,/obj/item/weapon/money)) cashes += A user.drop_item() A.loc = src @@ -100,21 +100,21 @@ log transactions card.money -= amount switch(amount) if(1) - new /obj/item/weapon/spacecash(loc) + new /obj/item/weapon/money(loc) if(10) - new /obj/item/weapon/spacecash/c10(loc) + new /obj/item/weapon/money/c10(loc) if(20) - new /obj/item/weapon/spacecash/c20(loc) + new /obj/item/weapon/money/c20(loc) if(50) - new /obj/item/weapon/spacecash/c50(loc) + new /obj/item/weapon/money/c50(loc) if(100) - new /obj/item/weapon/spacecash/c100(loc) + new /obj/item/weapon/money/c100(loc) if(200) - new /obj/item/weapon/spacecash/c200(loc) + new /obj/item/weapon/money/c200(loc) if(500) - new /obj/item/weapon/spacecash/c500(loc) + new /obj/item/weapon/money/c500(loc) if(1000) - new /obj/item/weapon/spacecash/c1000(loc) + new /obj/item/weapon/money/c1000(loc) else user << "\red Error: Insufficient funds." return @@ -143,7 +143,7 @@ log transactions if (usr.machine==src && get_dist(src, usr) <= 1 || istype(usr, /mob/living/silicon/ai)) if(href_list["eca"]) if(accepted) - for(var/obj/item/weapon/spacecash/M in cashes) + for(var/obj/item/weapon/money/M in cashes) M.loc = loc inserted = 0 if(!cashes) @@ -154,6 +154,8 @@ log transactions if(accepted) card.money += inserted inserted = 0 + if(cashes) + cashes = null if(href_list["lock"]) card = null accepted = 0 diff --git a/code/defines/obj/hydro.dm b/code/defines/obj/hydro.dm index c1ad8303a42..3b44089a338 100644 --- a/code/defines/obj/hydro.dm +++ b/code/defines/obj/hydro.dm @@ -2006,21 +2006,21 @@ New() switch(rand(1,100))//(potency) //It wants to use the default potency instead of the new, so it was always 10. Will try to come back to this later - Cheridan if(0 to 10) - new/obj/item/weapon/spacecash/(src.loc) + new/obj/item/weapon/money/(src.loc) if(11 to 20) - new/obj/item/weapon/spacecash/c10(src.loc) + new/obj/item/weapon/money/c10(src.loc) if(21 to 30) - new/obj/item/weapon/spacecash/c20(src.loc) + new/obj/item/weapon/money/c20(src.loc) if(31 to 40) - new/obj/item/weapon/spacecash/c50(src.loc) + new/obj/item/weapon/money/c50(src.loc) if(41 to 50) - new/obj/item/weapon/spacecash/c100(src.loc) + new/obj/item/weapon/money/c100(src.loc) if(51 to 60) - new/obj/item/weapon/spacecash/c200(src.loc) + new/obj/item/weapon/money/c200(src.loc) if(61 to 80) - new/obj/item/weapon/spacecash/c500(src.loc) + new/obj/item/weapon/money/c500(src.loc) else - new/obj/item/weapon/spacecash/c1000(src.loc) + new/obj/item/weapon/money/c1000(src.loc) spawn(5) //Workaround to keep harvesting from working weirdly. del(src) diff --git a/code/defines/obj/storage.dm b/code/defines/obj/storage.dm index e004018be81..e7aadffa708 100644 --- a/code/defines/obj/storage.dm +++ b/code/defines/obj/storage.dm @@ -264,7 +264,7 @@ icon_state = "wallet" w_class = 2 can_hold = list( - "/obj/item/weapon/spacecash", + "/obj/item/weapon/money", "/obj/item/weapon/card", "/obj/item/clothing/mask/cigarette", "/obj/item/device/flashlight/pen", @@ -308,10 +308,10 @@ /obj/item/weapon/storage/wallet/random/New() ..() - var/item1_type = pick( /obj/item/weapon/spacecash/c10,/obj/item/weapon/spacecash/c100,/obj/item/weapon/spacecash/c1000,/obj/item/weapon/spacecash/c20,/obj/item/weapon/spacecash/c200,/obj/item/weapon/spacecash/c50, /obj/item/weapon/spacecash/c500) + var/item1_type = pick( /obj/item/weapon/money/c10,/obj/item/weapon/money/c100,/obj/item/weapon/money/c1000,/obj/item/weapon/money/c20,/obj/item/weapon/money/c200,/obj/item/weapon/money/c50, /obj/item/weapon/money/c500) var/item2_type if(prob(50)) - item2_type = pick( /obj/item/weapon/spacecash/c10,/obj/item/weapon/spacecash/c100,/obj/item/weapon/spacecash/c1000,/obj/item/weapon/spacecash/c20,/obj/item/weapon/spacecash/c200,/obj/item/weapon/spacecash/c50, /obj/item/weapon/spacecash/c500) + item2_type = pick( /obj/item/weapon/money/c10,/obj/item/weapon/money/c100,/obj/item/weapon/money/c1000,/obj/item/weapon/money/c20,/obj/item/weapon/money/c200,/obj/item/weapon/money/c50, /obj/item/weapon/money/c500) var/item3_type = pick( /obj/item/weapon/coin/silver, /obj/item/weapon/coin/silver, /obj/item/weapon/coin/gold, /obj/item/weapon/coin/iron, /obj/item/weapon/coin/iron, /obj/item/weapon/coin/iron ) spawn(2) diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index 39b66e92b0f..9b70e7f0f77 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -158,9 +158,9 @@ name = "super compressed matter cartridge" ammo = 30 -/obj/item/weapon/spacecash +/obj/item/weapon/money name = "stack of credits" - desc = "It's worth 1 credit." + desc = "A pile of 1 credit." gender = PLURAL icon = 'items.dmi' icon_state = "spacecash" @@ -172,90 +172,143 @@ throw_speed = 1 throw_range = 2 w_class = 1.0 + var/currency + var/worth + var/split = 5 + var/round = 0.01 var/access = list() access = access_crate_cash - var/worth = 1 - var/amount = 1 -/obj/item/weapon/spacecash/c10 +/obj/item/weapon/spacecash + New() // Just in case + spawn(1) + new/obj/item/weapon/money(loc) + del src + +/obj/item/weapon/money/proc/updatedesc() + name = "stack of [currency]" + desc = "A pile of [worth] [currency]" + +/obj/item/weapon/money/New(var/nloc, var/nworth=1,var/ncurrency = "credits") + if(!worth) + worth = nworth + if(!currency) + currency = ncurrency + split = round(worth/2,round) + updatedesc() + return ..(nloc) + +/obj/item/weapon/money/c10 icon_state = "spacecash10" access = access_crate_cash - desc = "It's worth 10 credits." + desc = "A pile of 10 credits." worth = 10 -/obj/item/weapon/spacecash/c20 + +/obj/item/weapon/money/c20 icon_state = "spacecash20" access = access_crate_cash - desc = "It's worth 20 credits." - worth = 20 -/obj/item/weapon/spacecash/c50 + desc = "A pile of 20 credits." + +/obj/item/weapon/money/c50 icon_state = "spacecash50" access = access_crate_cash - desc = "It's worth 50 credits." - worth = 50 -/obj/item/weapon/spacecash/c100 + desc = "A pile of 50 credits." + +/obj/item/weapon/money/c100 icon_state = "spacecash100" access = access_crate_cash - desc = "It's worth 100 credits." + desc = "A pile of 100 credits." worth = 100 -/obj/item/weapon/spacecash/c200 + +/obj/item/weapon/money/c200 icon_state = "spacecash200" access = access_crate_cash - desc = "It's worth 200 credits." + desc = "A pile of 200 credits." worth = 200 -/obj/item/weapon/spacecash/c500 + +/obj/item/weapon/money/c500 icon_state = "spacecash500" access = access_crate_cash - desc = "It's worth 500 credits." + desc = "A pile of 500 credits." worth = 500 -/obj/item/weapon/spacecash/c1000 + +/obj/item/weapon/money/c1000 icon_state = "spacecash1000" access = access_crate_cash - desc = "It's worth 1000 credits." + desc = "A pile of 1000 credits." worth = 1000 -/obj/item/weapon/spacecash/attack_self(var/mob/user) - var/dat = "Space cash stack" - dat += "Credit amount - [worth * amount]
" - dat += "Take amount
" - user << browse(dat,"window=money") -/obj/item/weapon/spacecash/Topic(href, href_list) - if(href_list["takemoney"]) - var/a = 1 - a = input(usr,"How much you want take?") as num - if((a > src.amount) || (a < 0)) - usr << "\red You don't have that many credits." - return - src.amount -= a - var/obj/item/weapon/spacecash/S - if(a <= 0) - return - switch(src.worth) - if(1) - S = new /obj/item/weapon/spacecash(get_turf(src)) - if(10) - S = new /obj/item/weapon/spacecash/c10(get_turf(src)) - if(20) - S = new /obj/item/weapon/spacecash/c20(get_turf(src)) - if(50) - S = new /obj/item/weapon/spacecash/c50(get_turf(src)) - if(100) - S = new /obj/item/weapon/spacecash/c100(get_turf(src)) - if(200) - S = new /obj/item/weapon/spacecash/c200(get_turf(src)) - if(500) - S = new /obj/item/weapon/spacecash/c500(get_turf(src)) - if(1000) - S = new /obj/item/weapon/spacecash/c1000(get_turf(src)) - S.amount = a - if(src.amount == 0) - del(src) -/obj/item/weapon/spacecash/attackby(var/obj/I, var/mob/user) - if(!I) - return - if(istype(I,src)) - src.amount += I:amount - user << "You add [I:amount] credits to stack." - del(I) +/obj/item/weapon/money/attack_self(var/mob/user) + interact(user) + +/obj/item/weapon/money/proc/interact(var/mob/user) + + user.machine = src + + var/dat + + dat += "
[worth] [currency]" + dat += "
New pile:" + + dat += "-" + dat += "-" + if(round<=0.1) + dat += "-" + if(round<=0.01) + dat += "-" + dat += "[split]" + if(round<=0.01) + dat += "+" + if(round<=0.1) + dat += "+" + dat += "+" + dat += "+" + dat += "
split" + + + user << browse(dat, "window=computer;size=400x500") + + onclose(user, "computer") + return + +/obj/item/weapon/money/Topic(href, href_list) + if ((usr.contents.Find(src) || (in_range(src, usr) && istype(src.loc, /turf))) || (istype(usr, /mob/living/silicon))) + usr.machine = src + + if (href_list["su"]) + var/samt = text2num(href_list["su"]) + if(split+samt0) + split-=samt + if(href_list["split"]) + new /obj/item/weapon/money(get_turf(src),split,currency) + worth-=split + split = round(worth/2,round) + updatedesc() + + + src.add_fingerprint(usr) + src.updateUsrDialog() + for (var/mob/M in viewers(1, src.loc)) + if (M.client && M.machine == src) + src.attack_self(M) + return + +/obj/item/weapon/money/attackby(var/obj/I as obj, var/mob/user as mob) + if(istype(I,/obj/item/weapon/money)) + var/mob/living/carbon/c = user + if(!uppertext(I:currency)==uppertext(currency)) + c<<"You can't mix currencies!" + return ..() + else + worth+=I:worth + c<<"You combine the piles." + updatedesc() + del I + return ..() /obj/item/device/mass_spectrometer diff --git a/code/game/asteroid/artifacts.dm b/code/game/asteroid/artifacts.dm index d4f6fe5e87d..ddbb48f1069 100644 --- a/code/game/asteroid/artifacts.dm +++ b/code/game/asteroid/artifacts.dm @@ -4,7 +4,7 @@ var/global/list/space_surprises = list( /obj/item/clothing/mask/facehugger/an // /obj/creature =0, // /obj/item/weapon/rcd =0, // /obj/item/weapon/rcd_ammo =0, - // /obj/item/weapon/spacecash =0, + // /obj/item/weapon/money =0, // /obj/item/weapon/cloaking_device =1, // /obj/item/weapon/gun/energy/teleport_gun =0, // /obj/item/weapon/rubber_chicken =0, diff --git a/code/game/objects/closets/kitchen.dm b/code/game/objects/closets/kitchen.dm index 6d75e547c7e..5552f5da01a 100644 --- a/code/game/objects/closets/kitchen.dm +++ b/code/game/objects/closets/kitchen.dm @@ -65,17 +65,17 @@ /obj/structure/closet/secure_closet/money_freezer/New() ..() sleep(2) - new /obj/item/weapon/spacecash/c1000(src) - new /obj/item/weapon/spacecash/c1000(src) - new /obj/item/weapon/spacecash/c1000(src) - new /obj/item/weapon/spacecash/c500(src) - new /obj/item/weapon/spacecash/c500(src) - new /obj/item/weapon/spacecash/c500(src) - new /obj/item/weapon/spacecash/c500(src) - new /obj/item/weapon/spacecash/c500(src) - new /obj/item/weapon/spacecash/c200(src) - new /obj/item/weapon/spacecash/c200(src) - new /obj/item/weapon/spacecash/c200(src) - new /obj/item/weapon/spacecash/c200(src) - new /obj/item/weapon/spacecash/c200(src) + new /obj/item/weapon/money/c1000(src) + new /obj/item/weapon/money/c1000(src) + new /obj/item/weapon/money/c1000(src) + new /obj/item/weapon/money/c500(src) + new /obj/item/weapon/money/c500(src) + new /obj/item/weapon/money/c500(src) + new /obj/item/weapon/money/c500(src) + new /obj/item/weapon/money/c500(src) + new /obj/item/weapon/money/c200(src) + new /obj/item/weapon/money/c200(src) + new /obj/item/weapon/money/c200(src) + new /obj/item/weapon/money/c200(src) + new /obj/item/weapon/money/c200(src) diff --git a/code/game/objects/items/weapons/RSF.dm b/code/game/objects/items/weapons/RSF.dm index 1bdecd7d5e1..ce0e5110884 100644 --- a/code/game/objects/items/weapons/RSF.dm +++ b/code/game/objects/items/weapons/RSF.dm @@ -56,7 +56,7 @@ RSF if (istype(A, /obj/structure/table) && matter >= 1) user << "Dispensing Dosh..." playsound(src.loc, 'click.ogg', 10, 1) - new /obj/item/weapon/spacecash/c10( A.loc ) + new /obj/item/weapon/money/c10( A.loc ) if (isrobot(user)) var/mob/living/silicon/robot/engy = user engy.cell.charge -= 200 //once money becomes useful, I guess changing this to a high ammount, like 500 units a kick, till then, enjoy dosh! @@ -70,7 +70,7 @@ RSF if (istype(A, /turf/simulated/floor) && matter >= 1) user << "Dispensing Dosh..." playsound(src.loc, 'click.ogg', 10, 1) - new /obj/item/weapon/spacecash/c10( A ) + new /obj/item/weapon/money/c10( A ) if (isrobot(user)) var/mob/living/silicon/robot/engy = user engy.cell.charge -= 200 //once money becomes useful, I guess changing this to a high ammount, like 500 units a kick, till then, enjoy dosh! diff --git a/code/game/objects/storage/bible.dm b/code/game/objects/storage/bible.dm index 6d3a9c28dfb..6ce4abd47cf 100644 --- a/code/game/objects/storage/bible.dm +++ b/code/game/objects/storage/bible.dm @@ -2,9 +2,9 @@ ..() new /obj/item/weapon/reagent_containers/food/drinks/beer(src) new /obj/item/weapon/reagent_containers/food/drinks/beer(src) - new /obj/item/weapon/spacecash(src) - new /obj/item/weapon/spacecash(src) - new /obj/item/weapon/spacecash(src) + new /obj/item/weapon/money(src) + new /obj/item/weapon/money(src) + new /obj/item/weapon/money(src) /obj/item/weapon/storage/bible/tajaran/New() ..() diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index 3b794c05a11..03e54799e68 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -733,7 +733,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that for(var/obj/item/briefcase_item in sec_briefcase) del(briefcase_item) for(var/i=3, i>0, i--) - sec_briefcase.contents += new /obj/item/weapon/spacecash/c1000 + sec_briefcase.contents += new /obj/item/weapon/money/c1000 sec_briefcase.contents += new /obj/item/weapon/gun/energy/crossbow sec_briefcase.contents += new /obj/item/weapon/gun/projectile/mateba sec_briefcase.contents += new /obj/item/ammo_magazine/a357 diff --git a/code/modules/clothing/uniforms/lawyer.dm b/code/modules/clothing/uniforms/lawyer.dm index 426e3e51e1e..5bce12301ab 100644 --- a/code/modules/clothing/uniforms/lawyer.dm +++ b/code/modules/clothing/uniforms/lawyer.dm @@ -62,4 +62,4 @@ item_state = "judge" flags = FPRINT | TABLEPASS | ONESIZEFITSALL body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS - allowed = list(/obj/item/weapon/cigpacket,/obj/item/weapon/spacecash) + allowed = list(/obj/item/weapon/cigpacket,/obj/item/weapon/money) diff --git a/code/unused/computer2/peripherals.dm b/code/unused/computer2/peripherals.dm index 4f4184bd4b1..9819e46fca2 100644 --- a/code/unused/computer2/peripherals.dm +++ b/code/unused/computer2/peripherals.dm @@ -154,7 +154,7 @@ switch(prizeselect) if(1) - prize = new /obj/item/weapon/spacecash( prize_location ) + prize = new /obj/item/weapon/money( prize_location ) prize.name = "space ticket" prize.desc = "It's almost like actual currency!" if(2) diff --git a/maps/tgstation.2.0.8.dmm b/maps/tgstation.2.0.8.dmm index 1358ea9287c..fa921dce759 100755 --- a/maps/tgstation.2.0.8.dmm +++ b/maps/tgstation.2.0.8.dmm @@ -3815,7 +3815,7 @@ "bvs" = (/obj/machinery/door/airlock/glass{name = "Genetics"; req_access_txt = "9"},/turf/simulated/floor{icon_state = "white"},/area/medical/genetics) "bvt" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/machinery/door/poddoor/shutters{density = 0; dir = 8; icon_state = "shutter0"; id = "Genetics Inner Shutters"; name = "Shutters"; opacity = 0},/turf/simulated/floor/plating,/area/medical/genetics) "bvu" = (/obj/structure/disposalpipe/segment,/obj/structure/table,/obj/item/weapon/storage/diskbox,/turf/simulated/floor{icon_state = "white"},/area/medical/genetics) -"bvv" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/medical{name = "Genetics Research"; req_combined_access_txt = "9; 7"},/turf/simulated/floor{icon_state = "white"},/area/medical/genetics) +"bvv" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/medical{name = "Genetics Research"; req_access_txt = "30"; req_combined_access_txt = "0"},/turf/simulated/floor{icon_state = "white"},/area/medical/genetics) "bvw" = (/obj/structure/disposalpipe/segment{dir = 1},/obj/machinery/atmospherics/pipe/manifold{color = "blue"; dir = 8; icon_state = "manifold-b-f"; level = 1; name = "pipe manifold"},/turf/simulated/floor{icon_state = "white"},/area/medical/research{name = "Research Division"}) "bvx" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor{icon_state = "white"},/area/medical/research{name = "Research Division"}) "bvy" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/wall/r_wall,/area/toxins/gasstorage) @@ -7066,7 +7066,7 @@ "cFT" = (/obj/machinery/vending/snack,/turf/unsimulated/floor{icon_state = "grass1"; name = "grass"},/area/planet/clown) "cFU" = (/obj/machinery/vending/cigarette,/turf/unsimulated/floor{icon_state = "grass1"; name = "grass"},/area/planet/clown) "cFV" = (/obj/structure/stool,/turf/unsimulated/floor{dir = 8; icon_state = "carpetside"},/area/wizard_station) -"cFW" = (/obj/structure/table/woodentable,/obj/item/weapon/spacecash/c500,/obj/item/weapon/spacecash/c500,/turf/unsimulated/floor{icon_state = "carpet"; dir = 2},/area/wizard_station) +"cFW" = (/obj/structure/table/woodentable,/obj/item/weapon/money/c500,/turf/unsimulated/floor{icon_state = "carpet"; dir = 2},/area/wizard_station) "cFX" = (/obj/structure/table/woodentable,/obj/item/weapon/paper_bin,/turf/unsimulated/floor{icon_state = "carpet"; dir = 2},/area/wizard_station) "cFY" = (/obj/structure/stool,/turf/unsimulated/floor{dir = 4; icon_state = "carpetside"},/area/wizard_station) "cFZ" = (/obj/structure/bookcase{name = "Forbidden Knowledge"},/turf/unsimulated/floor{dir = 4; icon_state = "chapel"},/area/wizard_station) From 160baf375467be24f92fc4eb5962571b4448235a Mon Sep 17 00:00:00 2001 From: Erthilo Date: Tue, 22 May 2012 00:14:16 +0100 Subject: [PATCH 5/7] Fixes police tape being placed through windows. --- code/WorkInProgress/Ported/policetape.dm | 14 +++++++++++--- html/changelog.html | 9 +++++++++ 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/code/WorkInProgress/Ported/policetape.dm b/code/WorkInProgress/Ported/policetape.dm index 4a6d1b7c066..e51791050d9 100644 --- a/code/WorkInProgress/Ported/policetape.dm +++ b/code/WorkInProgress/Ported/policetape.dm @@ -49,11 +49,19 @@ end = get_turf(locate(end.x+d,end.y,end.z)) dir = "h" - while (cur!=end) + var/can_place = 1 + while (cur!=end && can_place) if(cur.density == 1) - usr << "\blue You can't run [src] through a wall!" - return + can_place = 0 + else + for(var/obj/O in cur) + if(O.density) + can_place = 0 + break cur = get_step_towards(cur,end) + if (!can_place) + usr << "\blue You can't run \the [src] through that!" + return cur = start var/tapetest = 0 diff --git a/html/changelog.html b/html/changelog.html index d8701c06f90..74865925b2c 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -47,6 +47,15 @@ Stuff which is in development and not yet visible to players or just code relate should be listed in the changelog upon commit though. Thanks. --> +
+

22 May 2012

+

Erthilo updated:

+
    +
  • Money can now be split and stacked properly. Carry some with you! Still not used for anything!
    • +
  • Fixed an ATM exploit, thanks to BlackTea!
    • +
+
+

21 May 2012

TG updated:

From edb09ea6d793ea179fe5239003434399c4fad645 Mon Sep 17 00:00:00 2001 From: Erthilo Date: Tue, 22 May 2012 00:39:57 +0100 Subject: [PATCH 6/7] Fixes double barrel shotgun not working with the gun system. --- .../projectiles/guns/projectile/shotgun.dm | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm index 7b5b9056a26..258be742952 100644 --- a/code/modules/projectiles/guns/projectile/shotgun.dm +++ b/code/modules/projectiles/guns/projectile/shotgun.dm @@ -87,17 +87,19 @@ return 0 attack_self(mob/living/user as mob) - if(!(locate(/obj/item/ammo_casing/shotgun) in src) && !loaded.len) - user << "\The [src] is empty." - return + if(..()) + if(!(locate(/obj/item/ammo_casing/shotgun) in src) && !loaded.len) + user << "\The [src] is empty." + return - for(var/obj/item/ammo_casing/shotgun/shell in src) //This feels like a hack. //don't code at 3:30am kids!! - if(shell in loaded) - loaded -= shell - shell.loc = get_turf(src.loc) + for(var/obj/item/ammo_casing/shotgun/shell in src) //This feels like a hack. //don't code at 3:30am kids!! + if(shell in loaded) + loaded -= shell + shell.loc = get_turf(src.loc) - user << "You break \the [src]." - update_icon() + user << "You break \the [src]." + update_icon() + return attackby(var/obj/item/A as obj, mob/user as mob) if(istype(A, /obj/item/ammo_casing) && !load_method) From 1d930413791772c054cf0f07c7bd5687a233640e Mon Sep 17 00:00:00 2001 From: Erthilo Date: Tue, 22 May 2012 00:42:25 +0100 Subject: [PATCH 7/7] Gave a bit more information on new HUD. --- html/changelog.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/changelog.html b/html/changelog.html index 74865925b2c..05e53e0ddfd 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -60,7 +60,7 @@ should be listed in the changelog upon commit though. Thanks. -->

21 May 2012

TG updated:

    -
  • The new 'sleek' user interface is going live. This is currently undergoing changes at TG, so this is mostly a test run.
    • +
  • The new 'sleek' user interface is going live. This is currently undergoing changes at TG, so this is mostly a test run. Resist, Sleep, and Rest have all been moved to the IC tab.
  • When you receive a PDA message, the content is displayed to you if the PDA is located somewhere on your person (so not in your backpack). You will also get a reply button there. This will hopefully make PDA communication easier.
  • New hotkeys: Delete is the 'stop dragging' button and insert cycles through intents.