cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-25 04:57:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

You have to turn off your stunbaton before wash it suing sink.

Browse Source 
latex loves + short piece of wire + some air from tank = ballon!
Another version of kitchen sink sprite.
New vending machine - dinnerware. Dispenses knives, forks and trays. Will do more once we get functional spoons.
New uniform - Waiter Outfit. Chef can give it to his assistant.
Water cooler was added to kitchen.
Kitchen was expanded.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1453 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
rastaf.zero@gmail.com
2011-04-16 15:44:08 +00:00
parent c6bedc842e
commit 1010d955ed
16 changed files with 5993 additions and 5860 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/defines/obj/clothing/jumpsuit.dm
+7
View File
@@ -332,6 +332,13 @@
item_state = "mime"
color = "mime"
/obj/item/clothing/under/waiter
name = "Waiter Outfit"
desc = "There is a special pocket for tip."
icon_state = "waiter"
item_state = "waiter"
color = "waiter"
// Athletic shorts.. heh
/obj/item/clothing/under/shorts
code/defines/obj/vending.dm
+11 -1
View File
@@ -144,4 +144,14 @@
vend_delay = 15
vend_reply = "Have an enchanted evening!"
product_hidden = "/obj/item/weapon/reagent_containers/glass/bottle/wizarditis" //No one can get to the machine to hack it anyways
product_hideamt = "1" //Just one, for the lulz, not like anyone can get it - Microwave
product_hideamt = "1" //Just one, for the lulz, not like anyone can get it - Microwave
/obj/machinery/vending/dinnerware
name = "Dinnerware"
desc = "A kitchen and restaurant equipment vendor"
icon_state = "dinnerware"
product_paths = "/obj/item/weapon/tray;/obj/item/weapon/kitchen/utensil/fork;/obj/item/weapon/kitchenknife"
product_amounts = "6;4;2"
//product_amounts = "8;5;4" Old totals
product_hidden = "/obj/item/weapon/kitchen/utensil/spoon;/obj/item/weapon/kitchen/utensil/knife;/obj/item/weapon/kitchen/rollingpin"
product_hideamt = "2;2;2"
code/game/machinery/sink.dm
+24 -4
View File
@@ -33,9 +33,26 @@
attackby(var/obj/item/O as obj, var/mob/user as mob)
if (istype(O, /obj/item/weapon/baton))
var/obj/item/weapon/baton/B = O
if (B.charges > 0 && B.status == 1)
flick("baton_active", src)
user.stunned = 10
user.stuttering = 10
user.weakened = 10
if(isrobot(user))
var/mob/living/silicon/robot/R = user
R.cell.charge -= 20
else
B.charges--
user.visible_message( \
"[user] was stunned by his wet [O].", \
"\red You have wet \the [O], it shocks you!")
return
O.clean_blood()
for(var/mob/V in viewers(src, null))
V.show_message(text("\blue [user] washes \a [O] using \the [src]."))
user.visible_message( \
"\blue [user] washes \a [O] using \the [src].", \
"\blue You wash \a [O] using \the [src].")
shower
name = "Shower"
@@ -43,5 +60,8 @@
kitchen
name = "Kitchen Sink"
icon = 'device.dmi'
icon_state = "sink_alt"
icon_state = "sink_alt"
kitchen2
name = "Kitchen Sink"
icon_state = "sink_alt2"
code/game/objects/closets/kitchen.dm
+4 -5
View File
@@ -1,10 +1,10 @@
/obj/secure_closet/kitchen/New()
..()
sleep(2)
new /obj/item/clothing/head/chefhat(src)
/*new /obj/item/clothing/head/chefhat(src)
new /obj/item/clothing/head/chefhat(src)
new /obj/item/clothing/under/rank/chef(src)
new /obj/item/clothing/under/rank/chef(src)
new /obj/item/clothing/under/rank/chef(src)*/
new /obj/item/weapon/reagent_containers/food/snacks/flour(src)
new /obj/item/weapon/reagent_containers/food/snacks/flour(src)
new /obj/item/weapon/reagent_containers/food/snacks/flour(src)
@@ -21,13 +21,13 @@
new /obj/item/weapon/reagent_containers/food/snacks/flour(src)
new /obj/item/weapon/reagent_containers/food/snacks/flour(src)
new /obj/item/weapon/reagent_containers/food/snacks/flour(src)
/*new /obj/item/weapon/tray(src)
new /obj/item/weapon/tray(src)
new /obj/item/weapon/tray(src)
new /obj/item/weapon/tray(src)
new /obj/item/weapon/tray(src)
new /obj/item/weapon/tray(src)
new /obj/item/weapon/tray(src)
new /obj/item/weapon/kitchenknife(src)
new /obj/item/weapon/kitchenknife(src)*/
/*new /obj/item/clothing/head/chefhat(src)
new /obj/item/clothing/head/chefhat(src)
new /obj/item/clothing/under/rank/chef(src)
@@ -44,7 +44,6 @@
new /obj/item/kitchen/egg_box(src)
new /obj/item/weapon/reagent_containers/food/snacks/meat/monkey(src)
new /obj/item/weapon/reagent_containers/food/snacks/meat/monkey(src)
new /obj/item/weapon/kitchenknife(src)
if(prob(95))
new /obj/item/weapon/reagent_containers/food/snacks/meat/monkey(src)
new /obj/item/weapon/reagent_containers/food/snacks/meat/monkey(src)
code/game/objects/items.dm
+74 -1
View File
@@ -221,6 +221,11 @@
/mob/attackby(obj/item/weapon/W as obj, mob/user as mob)
if (user.intent!="harm")
if (istype(src.l_hand,/obj/item/latexballon) && src.l_hand:air_contents && is_sharp(W))
return src.l_hand.attackby(W)
if (istype(src.r_hand,/obj/item/latexballon) && src.r_hand:air_contents && is_sharp(W))
return src.r_hand.attackby(W)
var/shielded = 0
for(var/obj/item/device/shield/S in src)
if (S.active)
@@ -394,4 +399,72 @@
if(O == (user))
continue
else
O.show_message(text("\red [user] has thrown a [src]. It lands on [result]. [comment]"), 1)
O.show_message(text("\red [user] has thrown a [src]. It lands on [result]. [comment]"), 1)
/obj/item/latexballon
name = "Latex glove"
desc = "" //todo
icon_state = "latexballon"
item_state = "lgloves"
force = 0
throwforce = 0
w_class = 1.0
throw_speed = 1
throw_range = 15
var/state
var/datum/gas_mixture/air_contents = null
/obj/item/latexballon/proc/blow(obj/item/weapon/tank/tank)
if (icon_state == "latexballon_bursted")
return
src.air_contents = tank.remove_air_volume(3)
icon_state = "latexballon_blow"
item_state = "latexballon"
/obj/item/latexballon/proc/burst()
if (!air_contents)
return
playsound(src, 'Gunshot.ogg', 100, 1)
icon_state = "latexballon_bursted"
item_state = "lgloves"
loc.assume_air(air_contents)
/obj/item/latexballon/ex_act(severity)
burst()
switch(severity)
if (1)
del(src)
if (2)
if (prob(50))
del(src)
/obj/item/latexballon/bullet_act(severity)
burst()
/obj/item/latexballon/temperature_expose(datum/gas_mixture/air, temperature, volume)
if(temperature > T0C+100)
burst()
return
/obj/item/latexballon/attackby(obj/item/W as obj, mob/user as mob)
if (is_sharp(W))
burst()
/proc/is_sharp(obj/item/W as obj)
return ( \
istype(W, /obj/item/weapon/screwdriver) || \
istype(W, /obj/item/weapon/pen) || \
istype(W, /obj/item/weapon/weldingtool) && W:welding || \
istype(W, /obj/item/weapon/zippo) && W:lit || \
istype(W, /obj/item/weapon/match) && W:lit || \
istype(W, /obj/item/clothing/mask/cigarette) && W:lit || \
istype(W, /obj/item/weapon/wirecutters) || \
istype(W, /obj/item/weapon/circular_saw) || \
istype(W, /obj/item/weapon/sword) && W:active || \
istype(W, /obj/item/weapon/blade) || \
istype(W, /obj/item/weapon/shovel) || \
istype(W, /obj/item/weapon/kitchenknife) || \
istype(W, /obj/item/weapon/scalpel) || \
istype(W, /obj/item/weapon/kitchen/utensil/knife) || \
istype(W, /obj/item/weapon/kitchen/utensil/fork) \
)
code/game/objects/items/clothing.dm
+14
View File
@@ -34,6 +34,20 @@ NINJA MASK
..()
return
/obj/item/clothing/gloves/latex/attackby(obj/item/weapon/cable_coil/O as obj, loc)
if (istype(O) && O.amount==1)
var/obj/item/latexballon/LB = new
if (usr.get_inactive_hand()==src)
usr.before_take_item(src)
usr.put_in_inactive_hand(LB)
else
LB.loc = src.loc
del(O)
del(src)
else
return ..()
/obj/item/clothing/shoes/orange/attack_self(mob/user as mob)
if (src.chained)
src.chained = null
code/game/objects/tank.dm
+4 -1
View File
@@ -208,7 +208,10 @@
user << "\blue Temperature: [round(air_contents.temperature-T0C)]&deg;C"
else
user << "\blue Tank is empty!"
src.add_fingerprint(user)
else if (istype(W,/obj/item/latexballon))
var/obj/item/latexballon/LB = W
LB.blow(src)
src.add_fingerprint(user)
return