cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 02:16:05 +00: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

26
code/game/machinery/autolathe.dm
View File

@@ -102,6 +102,19 @@ var/global/list/autolathe_recipes_hidden = list( \
user << browse("<HTML><HEAD><TITLE>Autolathe Control Panel</TITLE></HEAD><BODY><TT>[dat]</TT></BODY></HTML>", "window=autolathe_regular")
onclose(user, "autolathe_regular")
shock(mob/user, prb)
if(stat & (BROKEN|NOPOWER)) // unpowered, no shock
return 0
if(!prob(prb))
return 0
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
s.set_up(5, 1, src)
s.start()
if (electrocute_mob(user, get_area(src), src, 0.7))
return 1
else
return 0
interact(mob/user as mob)
if(..())
return
@@ -116,19 +129,6 @@ var/global/list/autolathe_recipes_hidden = list( \
regular_win(user)
return
shock(mob/user, prb)
if(stat & (BROKEN|NOPOWER)) // unpowered, no shock
return 0
if(!prob(prb))
return 0
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
s.set_up(5, 1, src)
s.start()
if (electrocute_mob(user, get_area(src), src, 0.7))
return 1
else
return 0
attackby(var/obj/item/O as obj, var/mob/user as mob)
if (stat)
return 1

2
code/game/machinery/biogenerator.dm
View File

@@ -74,7 +74,7 @@
update_icon()
return
/obj/machinery/biogenerator/proc/interact(mob/user as mob)
/obj/machinery/biogenerator/interact(mob/user as mob)
if(stat & BROKEN)
return
user.set_machine(src)

2
code/game/machinery/bots/cleanbot.dm
View File

@@ -79,7 +79,7 @@
usr.set_machine(src)
interact(user)
/obj/machinery/bot/cleanbot/proc/interact(mob/user as mob)
/obj/machinery/bot/cleanbot/interact(mob/user as mob)
var/dat
dat += text({"
<TT><B>Automatic Station Cleaner v1.0</B></TT><BR><BR>

2
code/game/machinery/bots/floorbot.dm
View File

@@ -75,7 +75,7 @@
usr.set_machine(src)
interact(user)
/obj/machinery/bot/floorbot/proc/interact(mob/user as mob)
/obj/machinery/bot/floorbot/interact(mob/user as mob)
var/dat
dat += "<TT><B>Automatic Station Floor Repairer v1.0</B></TT><BR><BR>"
dat += "Status: <A href='?src=\ref[src];operation=start'>[src.on ? "On" : "Off"]</A><BR>"

2
code/game/machinery/bots/mulebot.dm
View File

@@ -202,7 +202,7 @@
user.set_machine(src)
interact(user, 0)
/obj/machinery/bot/mulebot/proc/interact(var/mob/user, var/ai=0)
/obj/machinery/bot/mulebot/interact(var/mob/user, var/ai=0)
var/dat
dat += "<TT><B>Multiple Utility Load Effector Mk. III</B></TT><BR><BR>"
dat += "ID: [suffix]<BR>"

2
code/game/machinery/bots/secbot.dm
View File

@@ -102,7 +102,7 @@
usr.set_machine(src)
interact(user)
/obj/machinery/bot/secbot/proc/interact(mob/user as mob)
/obj/machinery/bot/secbot/interact(mob/user as mob)
var/dat
dat += text({"

2
code/game/machinery/camera/wires.dm
View File

@@ -98,7 +98,7 @@
src.interact(usr)
/obj/machinery/camera/proc/interact(mob/living/user as mob)
/obj/machinery/camera/interact(mob/living/user as mob)
if(!panel_open)
return

2
code/game/machinery/computer/Operating.dm
View File

@@ -30,7 +30,7 @@
interact(user)
/obj/machinery/computer/operating/proc/interact(mob/user)
/obj/machinery/computer/operating/interact(mob/user)
if ( (get_dist(src, user) > 1 ) || (stat & (BROKEN|NOPOWER)) )
if (!istype(user, /mob/living/silicon))
user.unset_machine()

3
code/game/machinery/computer/crew.dm
View File

@@ -53,7 +53,6 @@
return
proc
interact(mob/user)
if( (get_dist(src, user) > 1 ) || (stat & (BROKEN|NOPOWER)) )
if(!istype(user, /mob/living/silicon))
@@ -106,7 +105,7 @@
onclose(user, "crewcomp")
scan()
proc/scan()
for(var/obj/item/clothing/under/C in world)
if((C.has_sensor) && (istype(C.loc, /mob/living/carbon/human)))
var/check = 0

2
code/game/machinery/computer/power.dm
View File

@@ -68,7 +68,7 @@
src.attack_hand(user)
return
/obj/machinery/power/monitor/proc/interact(mob/user)
/obj/machinery/power/monitor/interact(mob/user)
if ( (get_dist(src, user) > 1 ) || (stat & (BROKEN|NOPOWER)) )
if (!istype(user, /mob/living/silicon))

2
code/game/machinery/computer/station_alert.dm
View File

@@ -23,7 +23,7 @@
return
proc/interact(mob/user)
interact(mob/user)
usr.set_machine(src)
var/dat = "<HEAD><TITLE>Current Station Alerts</TITLE><META HTTP-EQUIV='Refresh' CONTENT='10'></HEAD><BODY>\n"
dat += "<A HREF='?src=\ref[user];mach_close=alerts'>Close</A><br><br>"

2
code/game/machinery/kitchen/juicer.dm
View File

@@ -62,7 +62,7 @@
user.set_machine(src)
interact(user)
/obj/machinery/juicer/proc/interact(mob/user as mob) // The microwave Menu
/obj/machinery/juicer/interact(mob/user as mob) // The microwave Menu
var/is_chamber_empty = 0
var/is_beaker_ready = 0
var/processing_chamber = ""

2
code/game/machinery/kitchen/microwave.dm
View File

@@ -146,7 +146,7 @@
* Microwave Menu
********************/
/obj/machinery/microwave/proc/interact(mob/user as mob) // The microwave Menu
/obj/machinery/microwave/interact(mob/user as mob) // The microwave Menu
var/dat = ""
if(src.broken > 0)
dat = {"<TT>Bzzzzttttt</TT>"}

2
code/game/machinery/kitchen/smartfridge.dm
View File

@@ -89,7 +89,7 @@
* SmartFridge Menu
********************/
/obj/machinery/smartfridge/proc/interact(mob/user as mob)
/obj/machinery/smartfridge/interact(mob/user as mob)
if(!src.ispowered)
return

2
code/game/machinery/navbeacon.dm
View File

@@ -132,7 +132,7 @@
attack_hand(var/mob/user)
interact(user, 0)
proc/interact(var/mob/user, var/ai = 0)
interact(var/mob/user, var/ai = 0)
var/turf/T = loc
if(T.intact)
return // prevent intraction when T-scanner revealed

2
code/game/objects/items/blueprints.dm
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>

2
code/game/objects/items/devices/flashlight.dm
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()

2
code/game/objects/items/devices/radio/radio.dm
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

2
code/game/objects/items/devices/uplinks.dm
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()

2
code/game/objects/items/stacks/stack.dm
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)

4
code/game/objects/objs.dm
View File

@@ -79,12 +79,14 @@
for(var/mob/M in nearby)
if ((M.client && M.machine == src))
is_in_use = 1
src.attack_hand(M)
src.interact(M)
var/ai_in_use = AutoUpdateAI(src)
if(!ai_in_use && !is_in_use)
in_use = 0
/obj/proc/interact(mob/user)
return
/obj/proc/update_icon()
return

2
code/modules/assembly/assembly.dm
View File

@@ -46,7 +46,7 @@
proc/holder_movement() //Called when the holder is moved
return
proc/interact(mob/user as mob) //Called when attack_self is called
interact(mob/user as mob) //Called when attack_self is called
return

2
code/modules/power/antimatter/control.dm
View File

@@ -260,7 +260,7 @@
return
/obj/machinery/power/am_control_unit/proc/interact(mob/user)
/obj/machinery/power/am_control_unit/interact(mob/user)
if((get_dist(src, user) > 1) || (stat & (BROKEN|NOPOWER)))
if(!istype(user, /mob/living/silicon/ai))
user.unset_machine()

8
code/modules/power/apc.dm
View File

@@ -438,10 +438,12 @@
/obj/machinery/power/apc/attack_hand(mob/user)
// if (!can_use(user)) This already gets called in interact() and in topic()
// return
if(!user)
return
src.add_fingerprint(user)
if(opened && (!issilicon(user)))
if(usr == user && opened && (!issilicon(user)))
if(cell)
usr.put_in_hands(cell)
user.put_in_hands(cell)
cell.add_fingerprint(user)
cell.updateicon()
@@ -488,7 +490,7 @@
/obj/machinery/power/apc/proc/interact(mob/user)
/obj/machinery/power/apc/interact(mob/user)
if(!user)
return

2
code/modules/power/generator.dm
View File

@@ -121,7 +121,7 @@
interact(user)
/obj/machinery/power/generator/proc/interact(mob/user)
/obj/machinery/power/generator/interact(mob/user)
if ( (get_dist(src, user) > 1 ) && (!istype(user, /mob/living/silicon/ai)))
user.unset_machine()
user << browse(null, "window=teg")

2
code/modules/power/generator_type2.dm
View File

@@ -98,7 +98,7 @@
interact(user)
/obj/machinery/power/generator_type2/proc/interact(mob/user)
/obj/machinery/power/generator_type2/interact(mob/user)
if ( (get_dist(src, user) > 1 ) && (!istype(user, /mob/living/silicon/ai)))
user.unset_machine()
user << browse(null, "window=teg")

2
code/modules/power/port_gen.dm
View File

@@ -236,7 +236,7 @@ display round(lastgen) and plasmatank amount
/obj/machinery/power/port_gen/pacman/attack_paw(mob/user as mob)
interact(user)
/obj/machinery/power/port_gen/pacman/proc/interact(mob/user)
/obj/machinery/power/port_gen/pacman/interact(mob/user)
if (get_dist(src, user) > 1 )
if (!istype(user, /mob/living/silicon/ai))
user.unset_machine()

2
code/modules/power/singularity/particle_accelerator/particle_control.dm
View File

@@ -202,7 +202,7 @@
return 1
/obj/machinery/particle_accelerator/control_box/proc/interact(mob/user)
/obj/machinery/particle_accelerator/control_box/interact(mob/user)
if((get_dist(src, user) > 1) || (stat & (BROKEN|NOPOWER)))
if(!istype(user, /mob/living/silicon))
user.unset_machine()

2
code/modules/power/smes.dm
View File

@@ -178,7 +178,7 @@
interact(user)
/obj/machinery/power/smes/proc/interact(mob/user)
/obj/machinery/power/smes/interact(mob/user)
if(get_dist(src, user) > 1 && !istype(user, /mob/living/silicon/ai))
user.unset_machine()
user << browse(null, "window=smes")

1
code/modules/power/solar.dm
View File

@@ -171,7 +171,6 @@
tracker_update(var/angle)
set_panels(var/cdir)
broken()
interact(mob/user)
New()

2
code/modules/reagents/Chemistry-Machinery.dm
View File

@@ -828,7 +828,7 @@
user.set_machine(src)
interact(user)
/obj/machinery/reagentgrinder/proc/interact(mob/user as mob) // The microwave Menu
/obj/machinery/reagentgrinder/interact(mob/user as mob) // The microwave Menu
var/is_chamber_empty = 0
var/is_beaker_ready = 0
var/processing_chamber = ""

2
code/modules/recycling/disposal.dm
View File

@@ -215,7 +215,7 @@
interact(user, 0)
// user interaction
proc/interact(mob/user, var/ai=0)
interact(mob/user, var/ai=0)
src.add_fingerprint(user)
if(stat & BROKEN)

9
html/changelog.html
View File

@@ -49,6 +49,15 @@ should be listed in the changelog upon commit tho. Thanks. -->
<!-- To take advantage of the pretty new format (well it was new when I wrote this anyway), open the "add-to-changelog.html" file in any browser and add the stuff and then generate the html code and paste it here -->
<div class="commit sansserif">
<h2 class="date">03 November 2012</h2>
<h3 class="author">TankNut updated:</h3>
<ul class="changes bgimages16">
<li class="imageadd">New APC sprite.</li>
<li class="imageadd">New Wraith sprite and jaunting animation.</li>
</ul>
</div>
<div class="commit sansserif">
<h2 class="date">03 November 2012</h2>
<h3 class="author">WJohnston updated:</h3>

BIN
icons/mob/mob.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 182 KiB

After

Width:  |  Height:  |  Size: 175 KiB

BIN
icons/obj/power.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 22 KiB