diff --git a/code/datums/spells/fake_gib.dm b/code/datums/spells/fake_gib.dm new file mode 100644 index 00000000000..275bdef67bf --- /dev/null +++ b/code/datums/spells/fake_gib.dm @@ -0,0 +1,17 @@ +/obj/effect/proc_holder/spell/wizard/targeted/fake_gib + name = "Disintegrate" + desc = "This spell instantly kills somebody adjacent to you with the vilest of magick." + + school = "conjuration" + charge_max = 20 + clothes_req = 0 + invocation = "EI NATH" + invocation_type = "shout" + range = -1 + include_user = 1 + cooldown_min = 5 //25 deciseconds reduction per rank + + sparks_spread = 3 + sparks_amt = 1 + + icon_power_button = "spell_disintegrate" \ No newline at end of file diff --git a/code/game/gamemodes/wizard/spellbook.dm b/code/game/gamemodes/wizard/spellbook.dm index b4724e42414..21f9352f841 100644 --- a/code/game/gamemodes/wizard/spellbook.dm +++ b/code/game/gamemodes/wizard/spellbook.dm @@ -585,3 +585,10 @@ ..() user <<"[src] suddenly vanishes!" qdel(src) + + +/obj/item/weapon/spellbook/oneuse/fake_gib + spell = /obj/effect/proc_holder/spell/wizard/targeted/fake_gib + spellname = "disintegrate" + icon_state ="bookfireball" + desc = "This book feels like it will rip stuff apart." \ No newline at end of file diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index 19e2cbfff35..f7eb7803fd4 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -44,7 +44,7 @@ component_parts += new /obj/item/stack/cable_coil(src, 1) component_parts += new /obj/item/stack/cable_coil(src, 1) RefreshParts() - + /obj/machinery/clonepod/upgraded/New() ..() component_parts = list() @@ -66,7 +66,7 @@ for(var/obj/item/weapon/stock_parts/manipulator/P in component_parts) speed_coeff += P.rating heal_level = (efficiency * 15) + 10 - + //The return of data disks?? Just for transferring between genetics machine/cloning machine. //TO-DO: Make the genetics machine accept them. /obj/item/weapon/disk/data @@ -261,9 +261,10 @@ H.dna.UpdateSE() H.dna.UpdateUI() +/* //let's not make people waste even more time after being cloned. H.f_style = "Shaved" if(R.dna.species == "Human") //no more xenos losing ears/tentacles - H.h_style = pick("Bedhead", "Bedhead 2", "Bedhead 3") + H.h_style = pick("Bedhead", "Bedhead 2", "Bedhead 3") */ H.set_species(R.dna.species) @@ -336,8 +337,8 @@ return if(exchange_parts(user, W)) - return - + return + if(istype(W, /obj/item/weapon/crowbar)) if(panel_open) default_deconstruction_crowbar(W) @@ -402,7 +403,7 @@ set name = "Eject Cloner" set category = "Object" set src in oview(1) - + if(!usr) return if (usr.stat != 0) @@ -429,7 +430,7 @@ if (src.locked) user << "The cloning pod is locked!" - return + return /* for(var/obj/O in src) O.loc = src.loc diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index 83aa3d30386..a3402129d88 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -30,6 +30,14 @@ /obj/item/toy/cards/deck = 2, /obj/item/toy/carpplushie = 2, /obj/item/toy/minimeteor = 2, + /obj/item/toy/redbutton = 2, + /obj/item/clothing/head/blob = 2, + /obj/item/weapon/id_decal/gold = 2, + /obj/item/weapon/id_decal/silver = 2, + /obj/item/weapon/id_decal/prisoner = 2, + /obj/item/weapon/id_decal/centcom = 2, + /obj/item/weapon/id_decal/emag = 2, + /obj/item/weapon/spellbook/oneuse/fake_gib = 2 ) /obj/machinery/computer/arcade/power_change() diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index b1d0e0783fe..33858980b99 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -1100,4 +1100,28 @@ obj/item/toy/cards/deck/syndicate/black icon = 'icons/obj/toy.dmi' icon_state = "carpplushie" w_class = 2.0 - flags = FPRINT | TABLEPASS \ No newline at end of file + flags = FPRINT | TABLEPASS + +/* + * Toy big red button + */ +/obj/item/toy/redbutton + name = "big red button" + desc = "A big, plastic red button. Reads 'From HonkCo Pranks?' on the back." + icon = 'icons/obj/assemblies.dmi' + icon_state = "bigred" + w_class = 2.0 + var/cooldown = 0 + +/obj/item/toy/redbutton/attack_self(mob/user) + if (cooldown < world.time) + cooldown = (world.time + 300) // Sets cooldown at 30 seconds + user.visible_message("[user] presses the big red button.", "You press the button, it plays a loud noise!", "The button clicks loudly.") + playsound(src, 'sound/effects/explosionfar.ogg', 50, 0, 0) + for(var/mob/M in range(10, src)) // Checks range + if(!M.stat && !istype(M, /mob/living/silicon/ai)) // Checks to make sure whoever's getting shaken is alive/not the AI + sleep(8) // Short delay to match up with the explosion sound + shake_camera(M, 2, 1) // Shakes player camera 2 squares for 1 second. + + else + user << "Nothing happens." \ No newline at end of file diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm index 1c7850ffa13..5a608dc8abe 100644 --- a/code/game/objects/items/weapons/cards_ids.dm +++ b/code/game/objects/items/weapons/cards_ids.dm @@ -68,7 +68,8 @@ icon_state = "emag" item_state = "card-id" origin_tech = "magnets=2;syndicate=2" - var/uses = 10 + flags = NOBLUDGEON + var/uses = 1000000 // List of devices that cost a use to emag. var/list/devices = list( /obj/item/robot_parts, @@ -214,6 +215,18 @@ del(W) return + if(istype(W, /obj/item/weapon/id_decal/)) + var/obj/item/weapon/id_decal/decal = W + user << "You apply [decal] to [src]." + if(decal.override_name) + name = decal.decal_name + desc = decal.decal_desc + icon_state = decal.decal_icon_state + item_state = decal.decal_item_state + qdel(decal) + qdel(W) + return + else if(istype (W,/obj/item/weapon/stamp)) if(!stamped) dat+="" @@ -392,3 +405,43 @@ desc = "Finders, keepers." access = list(access_salvage_captain) +/obj/item/weapon/id_decal + name = "identification card decal" + desc = "A modification kit to make your ID cards look snazzy.." + icon = 'icons/obj/device.dmi' + icon_state = "batterer" + var/decal_name = "identification card" + var/decal_desc = "A card used to provide ID and determine access across the station." + var/decal_icon_state = "id" + var/decal_item_state = "card-id" + var/override_name = 0 + +/obj/item/weapon/id_decal/gold + name = "gold ID card card decal" + decal_desc = "A golden card which shows power and might." + decal_icon_state = "gold" + decal_item_state = "gold_id" + +/obj/item/weapon/id_decal/silver + name = "silver ID card decal" + decal_desc = "A silver card which shows honour and dedication." + decal_icon_state = "silver" + decal_item_state = "silver_id" + +/obj/item/weapon/id_decal/prisoner + name = "prisoner ID card decal" + decal_desc = "You are a number, you are not a free man." + decal_icon_state = "orange" + decal_item_state = "orange-id" + +/obj/item/weapon/id_decal/centcom + name = "centcom ID card decal" + decal_desc = "An ID straight from Cent. Com." + decal_icon_state = "centcom" + +/obj/item/weapon/id_decal/emag + name = "cryptographic sequencer ID card decal" + decal_name = "cryptographic sequencer" + decal_desc = "It's a card with a magnetic strip attached to some circuitry." + decal_icon_state = "emag" + override_name = 1 \ No newline at end of file diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index 7cdb9f99bba..31c58f8a943 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -105,4 +105,12 @@ obj/item/clothing/head/helmet/bluetaghelm item_state = "bluetaghelm" armor = list(melee = 30, bullet = 10, laser = 20,energy = 10, bomb = 20, bio = 0, rad = 0) // Offer about the same protection as a hardhat. - flags_inv = HIDEEARS|HIDEEYES \ No newline at end of file + flags_inv = HIDEEARS|HIDEEYES + +obj/item/clothing/head/blob + name = "blob hat" + desc = "A collectible hat handed out at the latest Blob Family Reunion." + icon_state = "blobhat" + item_state = "blobhat" + flags = HEADCOVERSEYES|HEADCOVERSMOUTH + flags_inv = HIDEMASK|HIDEEARS|HIDEEYES \ No newline at end of file diff --git a/code/modules/economy/ATM.dm b/code/modules/economy/ATM.dm index 42a6e43ddc4..f389f9c2863 100644 --- a/code/modules/economy/ATM.dm +++ b/code/modules/economy/ATM.dm @@ -376,7 +376,7 @@ log transactions //create the most effective combination of notes to make up the requested amount /obj/machinery/atm/proc/withdraw_arbitrary_sum(var/arbitrary_sum) - dispense_cash(arbitrary_sum,get_turf(src)) + dispense_cash(arbitrary_sum,get_step(get_turf(src),turn(dir,180))) // Spawn on the ATM. //stolen wholesale and then edited a bit from newscasters, which are awesome and by Agouri /obj/machinery/atm/proc/scan_user(mob/living/carbon/human/human_user as mob) diff --git a/code/modules/store/items.dm b/code/modules/store/items.dm index a87dd0c6cd8..32001533d9b 100644 --- a/code/modules/store/items.dm +++ b/code/modules/store/items.dm @@ -57,6 +57,12 @@ typepath = /obj/item/clothing/mask/cigarette/pipe cost = 350 +/datum/storeitem/candle + name = "Candles" + desc = "A box of chandles. Use them to fool others into thinking you're out for a romantic dinner...or something." + typepath = /obj/item/weapon/storage/fancy/candle_box + cost = 200 + /datum/storeitem/katana name = "replica katana" desc = "Woefully underpowered in D20." @@ -75,12 +81,6 @@ typepath = /obj/item/weapon/toddler cost = 1000 -/datum/storeitem/laserpointer - name = "laser pointer" - desc = "Don't shine it in your eyes!" - typepath = /obj/item/device/laser_pointer - cost = 1000 - /datum/storeitem/flag/slime name = "Slime People flag" desc = "A flag proudly proclaiming the superior heritage of Slime People." diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 435f3ae32f1..c3ac8ef0451 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 1c71d6d674a..dd1bcd3e70f 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/paradise.dme b/paradise.dme index 47dbfeb97ed..62c77e9c7fc 100644 --- a/paradise.dme +++ b/paradise.dme @@ -207,6 +207,7 @@ #include "code\datums\spells\emplosion.dm" #include "code\datums\spells\ethereal_jaunt.dm" #include "code\datums\spells\explosion.dm" +#include "code\datums\spells\fake_gib.dm" #include "code\datums\spells\genetic.dm" #include "code\datums\spells\horsemask.dm" #include "code\datums\spells\inflict_handler.dm"