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

-New sprites APC sprites by TankNut!

Browse Source 
-New wraith sprites by TankNut!
-Decreased flare duration, again(!)
-Made a based interact proc and changed the updateDialog to call that instead of attack_hand. This caused issues with the APC and getting the power cell out of it. I then changed all machines that had their own defined proc (that was everywhere)


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5001 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
giacomand@gmail.com
2012-11-03 14:45:29 +00:00
parent 8720dd0e69
commit b00c0c2a9f
38 changed files with 136 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/blueprints.dm
+1 -1
View File
@@ -44,7 +44,7 @@
return
edit_area()
/obj/item/blueprints/proc/interact()
/obj/item/blueprints/interact()
var/area/A = get_area()
var/text = {"<HTML><head><title>[src]</title></head><BODY>
<h2>[station_name()] blueprints</h2>
code/game/objects/items/devices/flashlight.dm
+1 -1
View File
@@ -152,7 +152,7 @@
var/produce_heat = 1500
/obj/item/device/flashlight/flare/New()
fuel = rand(3000, 4500) // Last 10 to 15 minutes.
fuel = rand(1500, 2000) // Last 10 to 15 minutes.
..()
/obj/item/device/flashlight/flare/process()
code/game/objects/items/devices/radio/radio.dm
+1 -1
View File
@@ -74,7 +74,7 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use
user.set_machine(src)
interact(user)
/obj/item/device/radio/proc/interact(mob/user as mob)
/obj/item/device/radio/interact(mob/user as mob)
if(!on)
return
code/game/objects/items/devices/uplinks.dm
+1 -1
View File
@@ -294,7 +294,7 @@ A list of items and costs is stored under the datum of every game mode, alongsid
return 0
// Interaction code. Gathers a list of items purchasable from the paren't uplink and displays it. It also adds a lock button.
/obj/item/device/uplink/hidden/proc/interact(mob/user as mob)
/obj/item/device/uplink/hidden/interact(mob/user as mob)
var/dat = "<body link='yellow' alink='white' bgcolor='#601414'><font color='white'>"
dat += src.generate_menu()
code/game/objects/items/stacks/stack.dm
+1 -1
View File
@@ -34,7 +34,7 @@
/obj/item/stack/attack_self(mob/user as mob)
interact(user)
/obj/item/stack/proc/interact(mob/user as mob)
/obj/item/stack/interact(mob/user as mob)
if (!recipes)
return
if (!src || amount<=0)