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

TG: - Deleted ERP.dmi

Browse Source 
- Moved some objects into /effect
- Removed the debugger object
Revision: r3739
Author: 	 baloh.matevz
This commit is contained in:
Erthilo
2012-06-07 02:41:38 +01:00
parent 3fb579d188
commit 2e8f1932a8
14 changed files with 246 additions and 304 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/cellautomata.dm
+1 -1
View File
@@ -97,7 +97,7 @@
radio_controller = new /datum/controller/radio()
//main_hud1 = new /obj/hud()
data_core = new /obj/datacore()
data_core = new /obj/effect/datacore()
paiController = new /datum/paiController()
code/game/machinery/computer/computer.dm
+3 -3
View File
@@ -134,7 +134,7 @@ Pod/Blast Doors computer
return 1
/obj/datacore/proc/manifest(var/nosleep = 0)
/obj/effect/datacore/proc/manifest(var/nosleep = 0)
spawn()
if(!nosleep)
sleep(40)
@@ -244,7 +244,7 @@ Pod/Blast Doors computer
locked += L
return
/obj/datacore/proc/manifest_modify(var/name, var/assignment)
/obj/effect/datacore/proc/manifest_modify(var/name, var/assignment)
var/datum/data/record/foundrecord
for(var/datum/data/record/t in data_core.general)
@@ -258,7 +258,7 @@ Pod/Blast Doors computer
foundrecord.fields["real_rank"] = assignment
/obj/datacore/proc/manifest_inject(var/mob/living/carbon/human/H)
/obj/effect/datacore/proc/manifest_inject(var/mob/living/carbon/human/H)
if (!isnull(H.mind) && (H.mind.assigned_role != "MODE"))
var/datum/data/record/G = new()
var/datum/data/record/M = new()
code/game/step_triggers.dm
+10 -10
View File
@@ -1,15 +1,15 @@
/* Simple object type, calls a proc when "stepped" on by something */
/obj/step_trigger
/obj/effect/step_trigger
var/affect_ghosts = 0
var/stopper = 1 // stops throwers
invisibility = 101 // nope cant see this shit
anchored = 1
/obj/step_trigger/proc/Trigger(var/atom/movable/A)
/obj/effect/step_trigger/proc/Trigger(var/atom/movable/A)
return 0
/obj/step_trigger/HasEntered(H as mob|obj)
/obj/effect/step_trigger/HasEntered(H as mob|obj)
..()
if(!H)
return
@@ -21,7 +21,7 @@
/* Tosses things in a certain direction */
/obj/step_trigger/thrower
/obj/effect/step_trigger/thrower
var/direction = SOUTH // the direction of throw
var/tiles = 3 // if 0: forever until atom hits a stopper
var/immobilize = 1 // if nonzero: prevents mobs from moving while they're being flung
@@ -33,7 +33,7 @@
Trigger(var/atom/movable/A)
var/curtiles = 0
var/stopthrow = 0
for(var/obj/step_trigger/thrower/T in orange(2, src))
for(var/obj/effect/step_trigger/thrower/T in orange(2, src))
if(A in T.affecting)
return
@@ -56,11 +56,11 @@
// Calculate if we should stop the process
if(!nostop)
for(var/obj/step_trigger/T in get_step(A, direction))
for(var/obj/effect/step_trigger/T in get_step(A, direction))
if(T.stopper && T != src)
stopthrow = 1
else
for(var/obj/step_trigger/teleporter/T in get_step(A, direction))
for(var/obj/effect/step_trigger/teleporter/T in get_step(A, direction))
if(T.stopper)
stopthrow = 1
@@ -81,11 +81,11 @@
/* Stops things thrown by a thrower, doesn't do anything */
/obj/step_trigger/stopper
/obj/effect/step_trigger/stopper
/* Instant teleporter */
/obj/step_trigger/teleporter
/obj/effect/step_trigger/teleporter
var/teleport_x = 0 // teleportation coordinates (if one is null, then no teleport!)
var/teleport_y = 0
var/teleport_z = 0
@@ -99,7 +99,7 @@
/* Random teleporter, teleports atoms to locations ranging from teleport_x - teleport_x_offset, etc */
/obj/step_trigger/teleporter/random
/obj/effect/step_trigger/teleporter/random
var/teleport_x_offset = 0
var/teleport_y_offset = 0
var/teleport_z_offset = 0