cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-28 06:27:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix conflicts.

Browse Source
This commit is contained in:
davipatury
2017-03-09 12:01:50 -03:00
parent 2ac164812c bac014457d
commit 2a9bcde361
367 changed files with 4565 additions and 3255 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/cable.dm
+5 -6
View File
@@ -486,21 +486,21 @@ var/global/list/datum/stack_recipe/cable_coil_recipes = list(
slot_flags = SLOT_BELT
item_state = "coil"
attack_verb = list("whipped", "lashed", "disciplined", "flogged")
usesound = 'sound/items/Deconstruct.ogg'
toolspeed = 1
/obj/item/stack/cable_coil/suicide_act(mob/user)
if(locate(/obj/structure/stool) in user.loc)
user.visible_message("<span class='suicide'>[user] is making a noose with the [src.name]! It looks like \he's trying to commit suicide.</span>")
user.visible_message("<span class='suicide'>[user] is making a noose with the [name]! It looks like \he's trying to commit suicide.</span>")
else
user.visible_message("<span class='suicide'>[user] is strangling \himself with the [src.name]! It looks like \he's trying to commit suicide.</span>")
user.visible_message("<span class='suicide'>[user] is strangling \himself with the [name]! It looks like \he's trying to commit suicide.</span>")
return(OXYLOSS)
/obj/item/stack/cable_coil/New(loc, length = MAXCOIL, var/paramcolor = null)
..()
src.amount = length
amount = length
if(paramcolor)
color = paramcolor
else
color = color
pixel_x = rand(-2,2)
pixel_y = rand(-2,2)
update_icon()
@@ -549,7 +549,6 @@ var/global/list/datum/stack_recipe/cable_coil_recipes = list(
/obj/item/stack/cable_coil/update_icon()
if(!color)
color = pick(COLOR_RED, COLOR_BLUE, COLOR_GREEN, COLOR_ORANGE, COLOR_WHITE, COLOR_PINK, COLOR_YELLOW, COLOR_CYAN)
color = color
if(amount == 1)
icon_state = "coil1"
name = "cable piece"