cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 11:37:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed the map/code issues that the body bags caused.

Browse Source 
/obj/effects is now /obj/effect.
/obj/station_objects is now /obj/structure.
Did a bit of minor blob work. 
The Bay 12 body bags were replaced with closets because having two sets of code that do almost the same thing is silly.
Changed back a few of the last jobproc edits as the remove from list before assign was a check to see if the mob was fucked up and if it was remove it so we did not check it again as it would still be fucked up.
The medbay/tox monkeys names are random once more.  More random name monkeys will help with changeling and clean up the observe/mob menus.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2324 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
mport2004@gmail.com
2011-10-03 10:28:57 +00:00
parent e8c6b08419
commit 17ed3899c4
314 changed files with 9099 additions and 9118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/singularity/containment_field.dm
+2 -2
View File
@@ -55,7 +55,7 @@
del(src)
return 0
if(iscarbon(user))
var/datum/effects/system/spark_spread/s = new /datum/effects/system/spark_spread
var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
s.set_up(5, 1, user.loc)
s.start()
var/shock_damage = min(rand(30,40),rand(30,40))
@@ -72,7 +72,7 @@
user.throw_at(target, 200, 4)
return
else if(issilicon(user))
var/datum/effects/system/spark_spread/s = new /datum/effects/system/spark_spread
var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
s.set_up(5, 1, user.loc)
s.start()
var/shock_damage = rand(15,30)
code/modules/power/singularity/emitter.dm
+1 -1
View File
@@ -90,7 +90,7 @@
A.icon_state = "u_laser"
playsound(src.loc, 'emitter.ogg', 25, 1)
if(prob(35))
var/datum/effects/system/spark_spread/s = new /datum/effects/system/spark_spread
var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
s.set_up(5, 1, src)
s.start()
A.dir = src.dir
code/modules/power/singularity/generator.dm
+1 -1
View File
@@ -29,7 +29,7 @@
*/
///obj/machinery/the_singularitygen/Bumped(atom/A)
// if(istype(A,/obj/effects/accelerated_particle))
// if(istype(A,/obj/effect/accelerated_particle))
// src.energy += A:energy
// return
// ..()
code/modules/power/singularity/particle_accelerator/particle.dm
+1 -1
View File
@@ -1,4 +1,4 @@
/obj/effects/accelerated_particle
/obj/effect/accelerated_particle
name = "Accelerated Particles"
desc = "Small things moving very fast."
icon = 'particle_accelerator.dmi'
code/modules/power/singularity/particle_accelerator/particle_accelerator.dm
+1 -1
View File
@@ -39,7 +39,7 @@ PE|PE|PE
*/
/obj/station_objects/particle_accelerator
/obj/structure/particle_accelerator
name = "Particle Accelerator"
desc = "Part of a Particle Accelerator."
icon = 'particle_accelerator.dmi'
code/modules/power/singularity/particle_accelerator/particle_chamber.dm
+1 -1
View File
@@ -1,4 +1,4 @@
/obj/station_objects/particle_accelerator/fuel_chamber
/obj/structure/particle_accelerator/fuel_chamber
name = "Particle Accelerator Fuel Control"
desc = "Part of a Particle Accelerator."
icon = 'particle_accelerator.dmi'
code/modules/power/singularity/particle_accelerator/particle_control.dm
+11 -11
View File
@@ -11,7 +11,7 @@
construction_state = 0
active = 0
var
list/obj/station_objects/particle_accelerator/connected_parts
list/obj/structure/particle_accelerator/connected_parts
assembled = 0
strength = 0
@@ -70,12 +70,12 @@
process()
if(src.active)
for(var/obj/station_objects/particle_accelerator/particle_emitter/PE in connected_parts)
for(var/obj/structure/particle_accelerator/particle_emitter/PE in connected_parts)
if(PE)
PE.emit_particle(src.strength)
// for(var/obj/station_objects/particle_accelerator/fuel_chamber/PF in connected_parts)
// for(var/obj/structure/particle_accelerator/fuel_chamber/PF in connected_parts)
// PF.doshit()
// for(var/obj/station_objects/particle_accelerator/power_box/PB in connected_parts)
// for(var/obj/structure/particle_accelerator/power_box/PB in connected_parts)
// PB.doshit()
//finish up putting the fuel run and power use things in here
return
@@ -107,24 +107,24 @@
odir = 4
var/turf/T = src.loc
T = get_step(T,rdir)
if(check_part(T,/obj/station_objects/particle_accelerator/fuel_chamber))
if(check_part(T,/obj/structure/particle_accelerator/fuel_chamber))
tally++
T = get_step(T,odir)
if(check_part(T,/obj/station_objects/particle_accelerator/end_cap))
if(check_part(T,/obj/structure/particle_accelerator/end_cap))
tally++
T = get_step(T,dir)
T = get_step(T,dir)
if(check_part(T,/obj/station_objects/particle_accelerator/power_box))
if(check_part(T,/obj/structure/particle_accelerator/power_box))
tally++
T = get_step(T,dir)
if(check_part(T,/obj/station_objects/particle_accelerator/particle_emitter/center))
if(check_part(T,/obj/structure/particle_accelerator/particle_emitter/center))
tally++
T = get_step(T,ldir)
if(check_part(T,/obj/station_objects/particle_accelerator/particle_emitter/left))
if(check_part(T,/obj/structure/particle_accelerator/particle_emitter/left))
tally++
T = get_step(T,rdir)
T = get_step(T,rdir)
if(check_part(T,/obj/station_objects/particle_accelerator/particle_emitter/right))
if(check_part(T,/obj/structure/particle_accelerator/particle_emitter/right))
tally++
if(tally >= 6)
assembled = 1
@@ -137,7 +137,7 @@
check_part(var/turf/T, var/type)
if(!(T)||!(type))
return 0
var/obj/station_objects/particle_accelerator/PA = locate(/obj/station_objects/particle_accelerator) in T
var/obj/structure/particle_accelerator/PA = locate(/obj/structure/particle_accelerator) in T
if(istype(PA, type))
if(PA.connect_master(src))
if(PA.report_ready(src))
code/modules/power/singularity/particle_accelerator/particle_emitter.dm
+5 -5
View File
@@ -1,4 +1,4 @@
/obj/station_objects/particle_accelerator/particle_emitter
/obj/structure/particle_accelerator/particle_emitter
name = "Particle Accelerator Emitter"
desc = "Part of a Particle Accelerator, might not want to stand near this end."
icon = 'particle_accelerator.dmi'
@@ -32,15 +32,15 @@
emit_particle(var/strength = 0)
if((src.last_shot + src.fire_delay) <= world.time)
src.last_shot = world.time
var/obj/effects/accelerated_particle/A = null
var/obj/effect/accelerated_particle/A = null
var/turf/T = get_step(src,dir)
switch(strength)
if(0)
A = new/obj/effects/accelerated_particle/weak(T, dir)
A = new/obj/effect/accelerated_particle/weak(T, dir)
if(1)
A = new/obj/effects/accelerated_particle(T, dir)
A = new/obj/effect/accelerated_particle(T, dir)
if(2)
A = new/obj/effects/accelerated_particle/strong(T, dir)
A = new/obj/effect/accelerated_particle/strong(T, dir)
if(A)
A.dir = src.dir
return 1
code/modules/power/singularity/particle_accelerator/particle_power.dm
+1 -1
View File
@@ -1,4 +1,4 @@
/obj/station_objects/particle_accelerator/power_box
/obj/structure/particle_accelerator/power_box
name = "Particle Accelerator"
desc = "Part of a Particle Accelerator, this part seems to have a maintenance panel on it."
icon = 'particle_accelerator.dmi'
code/modules/power/singularity/singularity.dm
+4 -4
View File
@@ -1,9 +1,9 @@
var/global/list/uneatable = list(
/turf/space,
/obj/effects,
/obj/effects/overlay,
/obj/effects/decal/cleanable,
/obj/effects/rune
/obj/effect,
/obj/effect/overlay,
/obj/effect/decal/cleanable,
/obj/effect/rune
)
/obj/machinery/singularity/