diff --git a/baystation12.dme b/baystation12.dme index 1aa7952da22..649335ec4ba 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -1263,6 +1263,7 @@ #include "code\modules\security levels\security levels.dm" #include "code\WorkInProgress\buildmode.dm" #include "code\WorkInProgress\explosion_particles.dm" +#include "code\WorkInProgress\animusstation\atm.dm" #include "code\WorkInProgress\Cael_Aislinn\energy_field.dm" #include "code\WorkInProgress\Cael_Aislinn\external_shield_gen.dm" #include "code\WorkInProgress\Cael_Aislinn\shield_capacitor.dm" @@ -1280,6 +1281,7 @@ #include "code\WorkInProgress\Cael_Aislinn\Rust\radiation.dm" #include "code\WorkInProgress\Cael_Aislinn\Rust\virtual_particle_catcher.dm" #include "code\WorkInProgress\Mini\atmos_control.dm" +#include "code\WorkInProgress\Ported\policetape.dm" #include "code\WorkInProgress\SkyMarshal\Ultralight_procs.dm" #include "code\WorkInProgress\Tastyfish\livestock.dm" #include "code\WorkInProgress\Wrongnumber\weldbackpack.dm" diff --git a/code/WorkInProgress/Mini/ATM.dm b/code/WorkInProgress/Mini/ATM.dm index 068211a97c3..17b6ef2e47c 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/money)) + if(istype(I,/obj/item/weapon/spacecash)) user_id.money += I:worth del I @@ -51,21 +51,21 @@ log transactions //hueg switch for giving moneh out switch(amount) if(1) - new /obj/item/weapon/money(loc) + new /obj/item/weapon/spacecash(loc) if(10) - new /obj/item/weapon/money/c10(loc) + new /obj/item/weapon/spacecash/c10(loc) if(20) - new /obj/item/weapon/money/c20(loc) + new /obj/item/weapon/spacecash/c20(loc) if(50) - new /obj/item/weapon/money/c50(loc) + new /obj/item/weapon/spacecash/c50(loc) if(100) - new /obj/item/weapon/money/c100(loc) + new /obj/item/weapon/spacecash/c100(loc) if(200) - new /obj/item/weapon/money/c200(loc) + new /obj/item/weapon/spacecash/c200(loc) if(500) - new /obj/item/weapon/money/c500(loc) + new /obj/item/weapon/spacecash/c500(loc) if(1000) - new /obj/item/weapon/money/c1000(loc) + new /obj/item/weapon/spacecash/c1000(loc) else usr << browse("You don't have that much money!
Back","window=atm") return diff --git a/code/WorkInProgress/Ported/policetape.dm b/code/WorkInProgress/Ported/policetape.dm index 36076152f03..3fa0a4a8511 100644 --- a/code/WorkInProgress/Ported/policetape.dm +++ b/code/WorkInProgress/Ported/policetape.dm @@ -1,3 +1,21 @@ +//Define all tape types in policetape.dm +/obj/item/taperoll + name = "tape roll" + icon = 'policetape.dmi' + icon_state = "rollstart" + flags = FPRINT + w_class = 1.0 + var/turf/start + var/turf/end + var/tape_type = /obj/item/tape + var/icon_base + +/obj/item/tape + name = "tape" + icon = 'policetape.dmi' + anchored = 1 + density = 1 + var/icon_base /obj/item/taperoll/police name = "police tape" @@ -116,7 +134,7 @@ breaktape(/obj/item/weapon/wirecutters,user) /obj/item/tape/proc/breaktape(obj/item/weapon/W as obj, mob/user as mob) - if(user.a_intent == "help" && ((!is_sharp(W) && src.allowed(user)) ||(!is_cut(W) && !src.allowed(user)))) + if(user.a_intent == "help" && ((!is_sharp(W) && src.allowed(user)))) user << "You can't break the [src] with that!" return user.show_viewers("\blue [user] breaks the [src]!") diff --git a/code/WorkInProgress/animusstation/atm.dm b/code/WorkInProgress/animusstation/atm.dm index 71235421cec..897ae273a03 100644 --- a/code/WorkInProgress/animusstation/atm.dm +++ b/code/WorkInProgress/animusstation/atm.dm @@ -18,13 +18,13 @@ log transactions use_power = 1 idle_power_usage = 10 var/obj/item/weapon/card/id/card - var/obj/item/weapon/money/cashes = list() + var/obj/item/weapon/spacecash/cashes = list() var/inserted = 0 var/accepted = 0 var/pincode = 0 attackby(var/obj/A, var/mob/user) - if(istype(A,/obj/item/weapon/money)) + if(istype(A,/obj/item/weapon/spacecash)) cashes += A user.drop_item() A.loc = src @@ -101,21 +101,21 @@ log transactions card.money -= amount switch(amount) if(1) - new /obj/item/weapon/money(loc) + new /obj/item/weapon/spacecash(loc) if(10) - new /obj/item/weapon/money/c10(loc) + new /obj/item/weapon/spacecash/c10(loc) if(20) - new /obj/item/weapon/money/c20(loc) + new /obj/item/weapon/spacecash/c20(loc) if(50) - new /obj/item/weapon/money/c50(loc) + new /obj/item/weapon/spacecash/c50(loc) if(100) - new /obj/item/weapon/money/c100(loc) + new /obj/item/weapon/spacecash/c100(loc) if(200) - new /obj/item/weapon/money/c200(loc) + new /obj/item/weapon/spacecash/c200(loc) if(500) - new /obj/item/weapon/money/c500(loc) + new /obj/item/weapon/spacecash/c500(loc) if(1000) - new /obj/item/weapon/money/c1000(loc) + new /obj/item/weapon/spacecash/c1000(loc) else user << "\red Error: Insufficient funds." return @@ -144,7 +144,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/money/M in cashes) + for(var/obj/item/weapon/spacecash/M in cashes) M.loc = loc inserted = 0 if(!cashes) @@ -166,3 +166,11 @@ log transactions else usr.machine = null usr << browse(null,"window=atm") + + +/obj/item/weapon/card/id/proc/checkaccess(p,var/mob/user) + if(p == pin) + user << "\green Access granted" + return 1 + user << "\red Access denied" + return 0 \ No newline at end of file diff --git a/code/defines/obj/storage.dm b/code/defines/obj/storage.dm index c52bd713cd6..62279c6d3ee 100644 --- a/code/defines/obj/storage.dm +++ b/code/defines/obj/storage.dm @@ -446,7 +446,7 @@ /obj/item/weapon/storage/bible name = "bible" - desc = "Apply to head repeatedly." + desc = "A holy book." //BS12 EDIT icon_state ="bible" throw_speed = 1 throw_range = 5 @@ -457,8 +457,7 @@ /obj/item/weapon/storage/bible/booze name = "bible" - desc = "To be applied to the head repeatedly." - icon_state ="bible" + desc = "A holy book. Smells faintly of alcohol" //BS12 EDIT /obj/item/weapon/storage/mousetraps name = "box of Pest-B-Gon Mousetraps" diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index 629f224f4ab..51144726deb 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -63,7 +63,48 @@ throwforce = 10 w_class = 1 -/obj/item/weapon/sord +//BS12 EDIT +/obj/item/weapon/nullrod/attack(mob/M as mob, mob/living/user as mob) + + M.attack_log += text("\[[time_stamp()]\] Has been attacked with [src.name] by [user.name] ([user.ckey])") + user.attack_log += text("\[[time_stamp()]\] Used the [src.name] to attack [M.name] ([M.ckey])") + + log_admin("ATTACK: [user] ([user.ckey]) attacked [M] ([M.ckey]) with [src].") + message_admins("ATTACK: [user] ([user.ckey]) attacked [M] ([M.ckey]) with [src].") + log_attack("[user.name] ([user.ckey]) attacked [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)])") + + if (!(istype(user, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey") + user << "\red You don't have the dexterity to do this!" + return + + if ((CLUMSY in user.mutations) && prob(50)) + user << "\red The rod slips out of your hand and hits your head." + user.take_organ_damage(10) + user.Paralyse(20) + return + + if (M.stat !=2) + if((M.mind in ticker.mode.cult) && prob(33)) + M << "\red The power of [src] clears your mind of the cult's influence!" + user << "\red You wave [src] over [M]'s head and see their eyes become clear, their mind returning to normal." + ticker.mode.remove_cultist(M.mind) + for(var/mob/O in viewers(M, null)) + O.show_message(text("\red [] waves [] over []'s head.", user, src, M), 1) + else if(prob(10)) + user << "\red The rod slips in your hand." + ..() + else + user << "\red The rod appears to do nothing." + for(var/mob/O in viewers(M, null)) + O.show_message(text("\red [] waves [] over []'s head.", user, src, M), 1) + return + +/obj/item/weapon/nullrod/afterattack(atom/A, mob/user as mob) + if (istype(A, /turf/simulated/floor)) + user << "\blue You hit the floor with the [src]." + call(/obj/effect/rune/proc/revealrunes)(src) + +/*/obj/item/weapon/sord name = "\improper SORD" desc = "This thing is so unspeakably shitty you are having a hard time even holding it." icon_state = "sord" @@ -74,7 +115,7 @@ throwforce = 1 w_class = 3 attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") - +*/ //BS12 EDIT /obj/item/weapon/claymore name = "claymore" desc = "What are you standing around staring at this for? Get to killing!" @@ -160,8 +201,8 @@ g_amt = 15000 /obj/item/weapon/spacecash - name = "space cash" - desc = "It's worth 1 credit." + name = "stack of credits" + desc = "1 credit." gender = PLURAL icon = 'icons/obj/items.dmi' icon_state = "spacecash" @@ -173,37 +214,140 @@ 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 + +/obj/item/weapon/spacecash/proc/updatedesc() + name = "stack of [currency]" + desc = "A pile of [worth] [currency]" + +/obj/item/weapon/spacecash/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/spacecash/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 icon_state = "spacecash20" access = access_crate_cash - desc = "It's worth 20 credits." + desc = "A pile of 20 credits." + worth = 20 + /obj/item/weapon/spacecash/c50 icon_state = "spacecash50" access = access_crate_cash - desc = "It's worth 50 credits." + desc = "A pile of 50 credits." + worth = 50 + /obj/item/weapon/spacecash/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 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 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 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) + interact(user) + +/obj/item/weapon/spacecash/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/spacecash/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/spacecash(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/spacecash/attackby(var/obj/I as obj, var/mob/user as mob) + if(istype(I,/obj/item/weapon/spacecash)) + 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 desc = "A hand-held mass spectrometer which identifies trace chemicals in a blood sample." @@ -562,6 +706,9 @@ var/assignment_real_title = null var/dorm = 0 // determines if this ID has claimed a dorm already + var/money + var/pin + /obj/item/weapon/card/id/silver name = "identification card" desc = "A silver card which shows honour and dedication." diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index e194e341365..afbf6da52ba 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -225,11 +225,12 @@ Whitespace:Seperator; comm.messagetitle.Add("Cent. Com. Status Summary") comm.messagetext.Add(intercepttext) + world << sound('commandreport.ogg') - command_alert("Summary downloaded and printed out at all communications consoles.", "Enemy communication intercept. Security Level Elevated.") +/* command_alert("Summary downloaded and printed out at all communications consoles.", "Enemy communication intercept. Security Level Elevated.") world << sound('sound/AI/intercept.ogg') if(security_level < SEC_LEVEL_BLUE) - set_security_level(SEC_LEVEL_BLUE) + set_security_level(SEC_LEVEL_BLUE)*/ /datum/game_mode/proc/get_players_for_role(var/role, override_jobbans=1) diff --git a/code/game/gamemodes/newobjective.dm b/code/game/gamemodes/newobjective.dm index 08e299962f2..6b271f48683 100644 --- a/code/game/gamemodes/newobjective.dm +++ b/code/game/gamemodes/newobjective.dm @@ -1203,7 +1203,7 @@ datum check_completion() var/held_credits = 0 - for(var/obj/item/weapon/money/M in owner.current.get_contents()) + for(var/obj/item/weapon/spacecash/M in owner.current.get_contents()) held_credits += M.worth if(held_credits >= steal_amount) return 1 diff --git a/code/game/jobs/job/civilian_chaplain.dm b/code/game/jobs/job/civilian_chaplain.dm index 95d4f82b959..eca1cb35828 100644 --- a/code/game/jobs/job/civilian_chaplain.dm +++ b/code/game/jobs/job/civilian_chaplain.dm @@ -13,7 +13,7 @@ equip(var/mob/living/carbon/human/H) if(!H) return 0 - var/obj/item/weapon/storage/bible/B = new /obj/item/weapon/storage/bible/booze(H) + var/obj/item/weapon/storage/bible/B = new /obj/item/weapon/storage/bible(H) //BS12 EDIT H.equip_to_slot_or_del(B, slot_l_hand) H.equip_to_slot_or_del(new /obj/item/device/pda/chaplain(H), slot_belt) H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/chaplain(H), slot_w_uniform) diff --git a/code/game/objects/items/weapons/storage/bible.dm b/code/game/objects/items/weapons/storage/bible.dm index 25d1a521220..3a381fb596a 100644 --- a/code/game/objects/items/weapons/storage/bible.dm +++ b/code/game/objects/items/weapons/storage/bible.dm @@ -5,7 +5,8 @@ new /obj/item/weapon/spacecash(src) new /obj/item/weapon/spacecash(src) new /obj/item/weapon/spacecash(src) - +//BS12 EDIT +/* // All cult functionality moved to Null Rod /obj/item/weapon/storage/bible/proc/bless(mob/living/carbon/M as mob) if(ishuman(M)) var/mob/living/carbon/human/H = M @@ -70,12 +71,12 @@ O.show_message(text("\red [] smacks []'s lifeless corpse with [].", user, M, src), 1) playsound(src.loc, "punch", 25, 1, -1) return - +*/ /obj/item/weapon/storage/bible/afterattack(atom/A, mob/user as mob) - if (istype(A, /turf/simulated/floor)) +/* if (istype(A, /turf/simulated/floor)) user << "\blue You hit the floor with the bible." if(user.mind && (user.mind.assigned_role == "Chaplain")) - call(/obj/effect/rune/proc/revealrunes)(src) + call(/obj/effect/rune/proc/revealrunes)(src)*/ if(user.mind && (user.mind.assigned_role == "Chaplain")) if(A.reagents && A.reagents.has_reagent("water")) //blesses all the water in the holder user << "\blue You bless [A]." diff --git a/code/modules/clothing/uniforms/lawyer.dm b/code/modules/clothing/uniforms/lawyer.dm index ddf363c1338..9bd16169fd8 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 body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS - allowed = list(/obj/item/weapon/cigpacket,/obj/item/weapon/money) + allowed = list(/obj/item/weapon/cigpacket,/obj/item/weapon/spacecash)