cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-09 23:20:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'Aurorastation/development' into Map-Development

Browse Source
This commit is contained in:
LordFowl
2017-01-29 15:38:37 -05:00
parent 426317e156 5a355914fc
commit 865ae1ebd9
218 changed files with 5025 additions and 5528 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/curtains.dm
+1 -1
View File
@@ -27,7 +27,7 @@
..()
/obj/structure/curtain/proc/toggle()
opacity = !opacity
src.set_opacity(!src.opacity)
if(opacity)
icon_state = "closed"
layer = SHOWER_CLOSED_LAYER
code/game/objects/structures/grille.dm
+4 -4
View File
@@ -96,7 +96,7 @@
if(iswirecutter(W))
if(!shock(user, 100))
playsound(loc, 'sound/items/Wirecutter.ogg', 100, 1)
PoolOrNew(/obj/item/stack/rods, list(get_turf(src), destroyed ? 1 : 2))
getFromPool(/obj/item/stack/rods, list(get_turf(src), destroyed ? 1 : 2))
qdel(src)
else if((isscrewdriver(W)) && (istype(loc, /turf/simulated) || anchored))
if(!shock(user, 90))
@@ -151,7 +151,7 @@
else if(!(W.flags & CONDUCT) || !shock(user, 70))
user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
user.do_attack_animation(src)
user.do_attack_animation(src)
playsound(loc, 'sound/effects/grillehit.ogg', 80, 1)
switch(W.damtype)
if("fire")
@@ -169,11 +169,11 @@
density = 0
destroyed = 1
update_icon()
PoolOrNew(/obj/item/stack/rods, get_turf(src))
getFromPool(/obj/item/stack/rods, get_turf(src))
else
if(health <= -6)
PoolOrNew(/obj/item/stack/rods, get_turf(src))
getFromPool(/obj/item/stack/rods, get_turf(src))
qdel(src)
return
return
code/game/objects/structures/lattice.dm
+1 -1
View File
@@ -58,7 +58,7 @@
var/obj/item/weapon/weldingtool/WT = C
if(WT.remove_fuel(0, user))
user << "<span class='notice'>Slicing lattice joints ...</span>"
PoolOrNew(/obj/item/stack/rods, src.loc)
getFromPool(/obj/item/stack/rods, src.loc)
qdel(src)
return
code/game/objects/structures/watercloset.dm
+3 -3
View File
@@ -180,13 +180,13 @@
spawn(50)
if(src && on)
ismist = 1
mymist = PoolOrNew(/obj/effect/mist,loc)
mymist = getFromPool(/obj/effect/mist,loc)
else
ismist = 1
mymist = PoolOrNew(/obj/effect/mist,loc)
mymist = getFromPool(/obj/effect/mist,loc)
else if(ismist)
ismist = 1
mymist = PoolOrNew(/obj/effect/mist,loc)
mymist = getFromPool(/obj/effect/mist,loc)
spawn(250)
if(src && !on)
qdel(mymist)
code/game/objects/structures/windoor_assembly.dm
+1 -1
View File
@@ -79,7 +79,7 @@ obj/structure/windoor_assembly/Destroy()
user << "<span class='notice'>You dissasembled the windoor assembly!</span>"
new /obj/item/stack/material/glass/reinforced(get_turf(src), 5)
if(secure)
PoolOrNew(/obj/item/stack/rods, list(get_turf(src), 4))
getFromPool(/obj/item/stack/rods, list(get_turf(src), 4))
qdel(src)
else
user << "<span class='notice'>You need more welding fuel to dissassemble the windoor assembly.</span>"
code/game/objects/structures/window.dm
+2 -2
View File
@@ -91,11 +91,11 @@
index = 0
while(index < 2)
new shardtype(loc) //todo pooling?
if(reinf) PoolOrNew(/obj/item/stack/rods, loc)
if(reinf) getFromPool(/obj/item/stack/rods, loc)
index++
else
new shardtype(loc) //todo pooling?
if(reinf) PoolOrNew(/obj/item/stack/rods, loc)
if(reinf) getFromPool(/obj/item/stack/rods, loc)
qdel(src)
return
code/game/objects/structures/window_spawner.dm
+2 -2
View File
@@ -35,7 +35,7 @@
/obj/effect/wingrille_spawn/proc/activate()
if(activated) return
if (!locate(/obj/structure/grille) in get_turf(src))
var/obj/structure/grille/G = PoolOrNew(/obj/structure/grille, src.loc)
var/obj/structure/grille/G = getFromPool(/obj/structure/grille, src.loc)
handle_grille_spawn(G)
var/list/neighbours = list()
for (var/dir in cardinal)
@@ -49,7 +49,7 @@
found_connection = 1
qdel(W)
if(!found_connection)
var/obj/structure/window/new_win = PoolOrNew(win_path, src.loc)
var/obj/structure/window/new_win = getFromPool(win_path, src.loc)
new_win.set_dir(dir)
handle_window_spawn(new_win)
else