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

Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates

Browse Source 
Conflicts:
	code/game/objects/items/weapons/cigs_lighters.dm
	code/game/objects/items/weapons/grenades.dm
	code/game/objects/items/weapons/implants/implant.dm
	code/game/objects/radio/headset.dm
	code/game/objects/radio/radio.dm
	code/modules/assembly/assembly.dm
	code/modules/assembly/holder.dm
	code/modules/clothing/glasses.dm
	code/modules/mob/living/silicon/robot/robot_modules.dm
	code/modules/paperwork/paper.dm
	code/modules/research/circuitprinter.dm
	code/modules/research/protolathe.dm
	icons/mob/suit.dmi
This commit is contained in:
Erthilo
2012-05-31 15:09:35 +01:00
parent b409a84f2d 28bc3fa766
commit 8e72965077
189 changed files with 2489 additions and 1543 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/antimatter/computer.dm
+5 -4
View File
@@ -1,3 +1,5 @@
//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
/obj/machinery/computer/am_engine
name = "Antimatter Engine Console"
icon = 'stationobjs.dmi'
@@ -8,10 +10,9 @@
var/obj/machinery/power/am_engine/engine/connected_E = null
var/obj/machinery/power/am_engine/injector/connected_I = null
var/state = STATE_DEFAULT
var/const
STATE_DEFAULT = 1
STATE_INJECTOR = 2
STATE_ENGINE = 3
var/const/STATE_DEFAULT = 1
var/const/STATE_INJECTOR = 2
var/const/STATE_ENGINE = 3
/obj/machinery/computer/am_engine/New()
..()
code/modules/power/pacman2.dm
+6 -5
View File
@@ -1,14 +1,15 @@
//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
//Baseline portable generator. Has all the default handling. Not intended to be used on it's own (since it generates unlimited power).
/obj/machinery/power/port_gen/pacman2
name = "Pacman II"
desc = "P.A.C.M.A.N. type II portable generator. Uses liquid plasma as a fuel source."
power_gen = 4500
var
obj/item/weapon/tank/plasma/P = null
board_path = "/obj/item/weapon/circuitboard/pacman2"
emagged = 0
heat = 0
var/obj/item/weapon/tank/plasma/P = null
var/board_path = "/obj/item/weapon/circuitboard/pacman2"
var/emagged = 0
var/heat = 0
/*
process()
if(P)
code/modules/power/port_gen.dm
+3 -1
View File
@@ -1,3 +1,5 @@
//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
/* new portable generator - work in progress
/obj/machinery/power/port_gen
@@ -320,4 +322,4 @@ display round(lastgen) and plasmatank amount
time_per_sheet = 30
board_path = "/obj/item/weapon/circuitboard/pacman/industrial"
overheat()
explosion(src.loc, 4, 4, 4, -1)
explosion(src.loc, 4, 4, 4, -1)
code/modules/power/singularity/collector.dm
+2
View File
@@ -1,3 +1,5 @@
//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
/obj/machinery/power/rad_collector
name = "Radiation Collector Array"
code/modules/power/singularity/containment_field.dm
+5 -4
View File
@@ -1,3 +1,5 @@
//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
/obj/machinery/containment_field
name = "Containment Field"
desc = "An energy field."
@@ -7,9 +9,8 @@
density = 0
unacidable = 1
use_power = 0
var
obj/machinery/field_generator/FG1 = null
obj/machinery/field_generator/FG2 = null
var/obj/machinery/field_generator/FG1 = null
var/obj/machinery/field_generator/FG2 = null
New()
spawn(1)
@@ -92,4 +93,4 @@
return 0
FG1 = master1
FG2 = master2
return 1
return 1
code/modules/power/singularity/emitter.dm
+2
View File
@@ -1,3 +1,5 @@
//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
/obj/machinery/emitter
name = "Emitter"
desc = "A heavy duty industrial laser"
code/modules/power/singularity/field_generator.dm
+2
View File
@@ -1,3 +1,5 @@
//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
var/containment_fail_announced = 0
/*
code/modules/power/singularity/generator.dm
+4 -3
View File
@@ -1,3 +1,5 @@
//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
/////SINGULARITY SPAWNER
/obj/machinery/the_singularitygen/
@@ -8,8 +10,7 @@
anchored = 0
density = 1
use_power = 0
var
energy = 0
var/energy = 0
//////////////////////Singularity gen START
@@ -56,4 +57,4 @@
for (var/obj/X in orange(4,T)) //TODO: do we need requirement to singularity be actually _surrounded_ by field?
if(istype(X, /obj/machinery/containment_field) || istype(X, /obj/machinery/shieldwall))
checkpointC ++
return checkpointC >= 20
return checkpointC >= 20
code/modules/power/singularity/particle_accelerator/particle.dm
+12 -11
View File
@@ -1,3 +1,5 @@
//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
/obj/effect/accelerated_particle
name = "Accelerated Particles"
desc = "Small things moving very fast."
@@ -5,17 +7,16 @@
icon_state = "particle"//Need a new icon for this
anchored = 1
density = 1
var
movement_range = 10
energy = 10 //energy in eV
mega_energy = 0 //energy in MeV
frequency = 1
ionizing = 0
particle_type
additional_particles = 0
turf/target
turf/source
movetotarget = 1
var/movement_range = 10
var/energy = 10 //energy in eV
var/mega_energy = 0 //energy in MeV
var/frequency = 1
var/ionizing = 0
var/particle_type
var/additional_particles = 0
var/turf/target
var/turf/source
var/movetotarget = 1
weak
movement_range = 8
energy = 5
code/modules/power/singularity/particle_accelerator/particle_accelerator.dm
+2
View File
@@ -1,3 +1,5 @@
//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
/*Composed of 7 parts
3 Particle emitters
proc
code/modules/power/singularity/particle_accelerator/particle_control.dm
+2
View File
@@ -1,3 +1,5 @@
//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
/obj/machinery/particle_accelerator/control_box
name = "Particle Accelerator Control Computer"
desc = "This controls the density of the particles."
code/modules/power/singularity/particle_accelerator/particle_emitter.dm
+5 -4
View File
@@ -1,11 +1,12 @@
//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
/obj/structure/particle_accelerator/particle_emitter
name = "EM Containment Grid"
desc_holder = "This launchs the Alpha particles, might not want to stand near this end."
icon = 'particle_accelerator.dmi'
icon_state = "none"
var
fire_delay = 50
last_shot = 0
var/fire_delay = 50
var/last_shot = 0
center
icon_state = "emitter_center"
@@ -46,4 +47,4 @@
if(A)
A.dir = src.dir
return 1
return 0
return 0
code/modules/power/singularity/singularity.dm
+2
View File
@@ -1,3 +1,5 @@
//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
var/global/list/uneatable = list(
/turf/space,
/obj/effect/overlay,
code/modules/power/solar.dm
+18 -18
View File
@@ -1,3 +1,5 @@
//This file was auto-corrected by findeclaration.exe on 29/05/2012 15:03:05
#define SOLARGENRATE 1500
/obj/machinery/power/solar
name = "solar panel"
@@ -10,15 +12,14 @@
use_power = 0
idle_power_usage = 0
active_power_usage = 0
var
health = 10
id = 1
obscured = 0
sunfrac = 0
adir = SOUTH
ndir = SOUTH
turn_angle = 0
obj/machinery/power/solar_control/control = null
var/health = 10
var/id = 1
var/obscured = 0
var/sunfrac = 0
var/adir = SOUTH
var/ndir = SOUTH
var/turn_angle = 0
var/obj/machinery/power/solar_control/control = null
proc
healthcheck()
updateicon()
@@ -162,15 +163,14 @@
use_power = 1
idle_power_usage = 5
active_power_usage = 20
var
id = 1
cdir = 0
gen = 0
lastgen = 0
track = 2 // 0= off 1=timed 2=auto (tracker)
trackrate = 600 // 300-900 seconds
trackdir = 1 // 0 =CCW, 1=CW
nexttime = 0
var/id = 1
var/cdir = 0
var/gen = 0
var/lastgen = 0
var/track = 2 // 0= off 1=timed 2=auto (tracker)
var/trackrate = 600 // 300-900 seconds
var/trackdir = 1 // 0 =CCW, 1=CW
var/nexttime = 0
proc
updateicon()
tracker_update(var/angle)