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

Okay shards converted to pool usage now.

Browse Source 
Conflicts:
	code/game/machinery/computer/arcade.dm
	code/game/machinery/doors/windowdoor.dm
	code/game/machinery/telecomms/traffic_control.dm
	code/game/objects/structures/displaycase.dm
	code/modules/mining/mine_turfs.dm
	code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm
This commit is contained in:
ESwordTheCat
2014-04-19 19:57:53 -04:00
committed by ZomgPonies
parent 2ff6d65212
commit c43652b33a
29 changed files with 216 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/research/research_shuttle.dm
+1 -1
View File
@@ -112,7 +112,7 @@ proc/move_research_shuttle()
if (src.stat & BROKEN)
user << "\blue The broken glass falls out."
new /obj/item/weapon/shard( src.loc )
getFromPool(/obj/item/weapon/shard, loc)
A.state = 3
A.icon_state = "3"
else
code/modules/research/server.dm
+2 -2
View File
@@ -339,7 +339,7 @@
if (src.stat & BROKEN)
user << "\blue The broken glass falls out."
var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc )
new /obj/item/weapon/shard( src.loc )
getFromPool(/obj/item/weapon/shard, loc)
var/obj/item/weapon/circuitboard/rdservercontrol/M = new /obj/item/weapon/circuitboard/rdservercontrol( A )
for (var/obj/C in src)
C.loc = src.loc
@@ -378,4 +378,4 @@
name = "Core R&D Server"
id_with_upload_string = "1"
id_with_download_string = "1"
server_id = 1
server_id = 1
code/modules/research/xenoarchaeology/artifact/artifact_crystal.dm
+6 -6
View File
@@ -20,17 +20,17 @@
/obj/structure/crystal/Destroy()
src.visible_message("\red<b>[src] shatters!</b>")
if(prob(75))
new /obj/item/weapon/shard/plasma(src.loc)
getFromPool(/obj/item/weapon/shard/plasma, loc)
if(prob(50))
new /obj/item/weapon/shard/plasma(src.loc)
getFromPool(/obj/item/weapon/shard/plasma, loc)
if(prob(25))
new /obj/item/weapon/shard/plasma(src.loc)
getFromPool(/obj/item/weapon/shard/plasma, loc)
if(prob(75))
new /obj/item/weapon/shard(src.loc)
getFromPool(/obj/item/weapon/shard, loc)
if(prob(50))
new /obj/item/weapon/shard(src.loc)
getFromPool(/obj/item/weapon/shard, loc)
if(prob(25))
new /obj/item/weapon/shard(src.loc)
getFromPool(/obj/item/weapon/shard, loc)
..()
//todo: laser_act
code/modules/research/xenoarchaeology/finds/finds.dm
+3 -2
View File
@@ -296,9 +296,10 @@
apply_material_decorations = 0
if(22)
if(prob(50))
new_item = new /obj/item/weapon/shard(src.loc)
new_item = getFromPool(/obj/item/weapon/shard, loc)
else
new_item = new /obj/item/weapon/shard/plasma(src.loc)
new_item = getFromPool(/obj/item/weapon/shard/plasma, loc)
apply_prefix = 0
apply_image_decorations = 0
apply_material_decorations = 0