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

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor

Browse Source
This commit is contained in:
Aurorablade
2016-01-15 08:10:24 -05:00
parent 9b80140e7d 12828298bc
commit 51013b97c0
349 changed files with 23852 additions and 21659 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/PDA/PDA.dm
+2 -2
View File
@@ -955,7 +955,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
if(!silent) O.show_message(text("\icon[src] *[ttone]*"))
/obj/item/device/pda/verb/verb_remove_id()
set category = null
set category = "Object"
set name = "Remove id"
set src in usr
@@ -972,7 +972,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
/obj/item/device/pda/verb/verb_remove_pen()
set category = null
set category = "Object"
set name = "Remove pen"
set src in usr
code/game/objects/items/devices/guitar.dm
+6 -4
View File
@@ -20,17 +20,19 @@
return ..()
/obj/item/device/guitar/attack_self(mob/user as mob)
interact(user)
ui_interact(user)
/obj/item/device/guitar/interact(mob/user as mob)
/obj/item/device/guitar/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
if(!user)
return
if(!isliving(user) || user.stat || user.restrained() || user.lying)
return
user.set_machine(src)
song.interact(user)
song.ui_interact(user, ui_key, ui, force_open)
/obj/item/device/guitar/Topic(href, href_list)
song.Topic(href, href_list)
/datum/table_recipe/guitar
name = "Guitar"
code/game/objects/items/devices/violin.dm
+6 -4
View File
@@ -24,14 +24,16 @@
..()
/obj/item/device/violin/attack_self(mob/user as mob)
interact(user)
ui_interact(user)
/obj/item/device/violin/interact(mob/user as mob)
/obj/item/device/violin/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
if(!user)
return
if(!isliving(user) || user.stat || user.restrained() || user.lying)
return
user.set_machine(src)
song.interact(user)
song.ui_interact(user, ui_key, ui, force_open)
/obj/item/device/violin/Topic(href, href_list)
song.Topic(href, href_list)