This commit is contained in:
Fox-McCloud
2015-02-06 23:25:13 -05:00
parent 8c2321ad62
commit 94eccfffcc
12 changed files with 136 additions and 17 deletions
+9 -1
View File
@@ -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
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
+1 -1
View File
@@ -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)
+6 -6
View File
@@ -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."