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

-The Janitor's equipment locator will now tell him the direction of his equipment.

Browse Source 
-Changed the flash message for silicon players. This also fixed the flash giving a "did not blind" message for Cyborgs, even though they still get weakened.
-You can hit yourself with bottles now.
-Removed step_x and step_y from the map.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4105 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
giacomand@gmail.com
2012-07-18 16:39:56 +00:00
parent 1439e3a39f
commit 71426a3530
4 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/devices/PDA/cart.dm
+7 -6
View File
@@ -554,8 +554,8 @@ Code:
if(ml)
if (ml.z != cl.z)
continue
ldat += "Mop - <b>\[[ml.x],[ml.y]\]</b> - [M.reagents.total_volume ? "Wet" : "Dry"]<br>"
var/direction = get_dir(src, M)
ldat += "Mop - <b>\[[ml.x],[ml.y] ([uppertext(dir2text(direction))])\]</b> - [M.reagents.total_volume ? "Wet" : "Dry"]<br>"
if (!ldat)
menu += "None"
@@ -571,8 +571,8 @@ Code:
if(bl)
if (bl.z != cl.z)
continue
ldat += "Bucket - <b>\[[bl.x],[bl.y]\]</b> - Water level: [B.reagents.total_volume]/100<br>"
var/direction = get_dir(src, B)
ldat += "Bucket - <b>\[[bl.x],[bl.y] ([uppertext(dir2text(direction))])\]</b> - Water level: [B.reagents.total_volume]/100<br>"
if (!ldat)
menu += "None"
@@ -588,8 +588,8 @@ Code:
if(bl)
if (bl.z != cl.z)
continue
ldat += "Cleanbot - <b>\[[bl.x],[bl.y]\]</b> - [B.on ? "Online" : "Offline"]<br>"
var/direction = get_dir(src, B)
ldat += "Cleanbot - <b>\[[bl.x],[bl.y] ([uppertext(dir2text(direction))])\]</b> - [B.on ? "Online" : "Offline"]<br>"
if (!ldat)
menu += "None"
@@ -598,6 +598,7 @@ Code:
else
menu += "ERROR: Unable to determine current location."
menu += "<br><br><A href='byond://?src=\ref[src];choice=49'>Refresh GPS Locator</a>"
proc/add_data(atom/A as mob|obj|turf|area)
//I love hashtables.
code/game/objects/devices/flash.dm
+12 -3
View File
@@ -94,7 +94,8 @@
else if(issilicon(M))
M.Weaken(rand(5,10))
flashfail++
else
flashfail = 1
if(isrobot(user))
spawn(0)
@@ -109,11 +110,19 @@
if(!flashfail)
flick("flash2", src)
for(var/mob/O in viewers(user, null))
O.show_message("<span class='disarm'>[user] blinds [M] with the flash!</span>")
if(!issilicon(M))
for(var/mob/O in viewers(user, null))
O.show_message("<span class='disarm'>[user] blinds [M] with the flash!</span>")
else
for(var/mob/O in viewers(user, null))
O.show_message("<span class='notice'>[user] overloads [M]'s sensors with the flash!</span>")
else
for(var/mob/O in viewers(user, null))
O.show_message("<span class='notice'>[user] fails to blind [M] with the flash!</span>")
return
code/modules/chemical/Chemistry-Tools.dm
+7 -5
View File
@@ -2654,7 +2654,8 @@
//Creates a shattering noise and replaces the bottle with a broken_bottle
user.drop_item()
var/obj/item/weapon/broken_bottle/B = new /obj/item/weapon/broken_bottle(user)
var/obj/item/weapon/broken_bottle/B = new /obj/item/weapon/broken_bottle(user.loc)
user.put_in_active_hand(B)
if(prob(33))
new/obj/item/weapon/shard(target.loc) // Create a glass shard at the target's location!
B.icon_state = src.icon_state
@@ -2675,7 +2676,7 @@
if(!target)
return
if(user.a_intent != "hurt" || user == target || !isGlass)
if(user.a_intent != "hurt" || !isGlass)
return ..()
@@ -2722,8 +2723,8 @@
//Display an attack message.
for(var/mob/O in viewers(user, null))
O.show_message(text("\red <B>[target] has been hit over the head with a bottle of [src.name], by [user]!</B>"), 1)
if(target != user) O.show_message(text("\red <B>[target] has been hit over the head with a bottle of [src.name], by [user]!</B>"), 1)
else O.show_message(text("\red <B>[target] has hit himself with a bottle of [src.name] over his head!</B>"), 1)
//Weaken the target for the duration that we calculated and divide it by 5.
if(armor_duration)
target.apply_effect(min(armor_duration, 10) , WEAKEN) // Never weaken more than a flash!
@@ -2731,7 +2732,8 @@
else
//Default attack message and don't weaken the target.
for(var/mob/O in viewers(user, null))
O.show_message(text("\red <B>[target] has been attacked with a bottle of [src.name], by [user]!</B>"), 1)
if(target != user) O.show_message(text("\red <B>[target] has been attacked with a bottle of [src.name], by [user]!</B>"), 1)
else O.show_message(text("\red <B>[target] has attacked himself with a bottle of [src.name]!</B>"), 1)
//Attack logs
user.attack_log += text("\[[time_stamp()]\] <font color='red'>Has attacked [target.name] ([target.ckey]) with a bottle!</font>")