cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Tastyfish
2012-01-08 20:06:03 -05:00
parent ce9042ae20 625e57ec77
commit 1d010aca75
22 changed files with 6641 additions and 6589 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/WorkInProgress/Mini/customitems.dm
View File

@@ -5,7 +5,6 @@
//yes, it has to be an item, you can't pick up nonitems
var/list/CustomItemList = list(
// ckey real_name item path
// list("miniature","Dave Booze",/obj/item/toy/crayonbox) //screw this i dont want crayons, it's an example okay
list("skymarshal", "Phillip Oswald", /obj/item/weapon/coin/silver), //Phillip likes to chew on cigars. Just unlit cigars, don't ask me why. Must be a clone thing. (Cigarette machines dispense cigars if they have a coin in them) --SkyMarshal
list("spaceman96", "Trenna Seber", /obj/item/weapon/pen/multi), //For Spesss.
list("asanadas", "Book Berner", /obj/item/clothing/under/chameleon/psyche)

5
code/WorkInProgress/SkyMarshal/policetape.dm
View File

@@ -105,8 +105,11 @@
/obj/item/policetape/attack_hand(mob/user as mob)
breaktape(null, user)
/obj/item/policetape/attack_paw(mob/user as mob)
breaktape(/obj/item/weapon/wirecutters,user)
/obj/item/policetape/proc/breaktape(obj/item/weapon/W as obj, mob/user as mob)
if(!W && 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)) ||(!is_cut(W) && !src.allowed(user))))
user << "You can't break the tape with that!"
return
user.show_viewers(text("\blue [] breaks the police tape!", user))