cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-17 18:13:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merging pull request from caelaislinn-master

Browse Source
This commit is contained in:
Albert Iordache
2012-07-13 20:54:22 +03:00
parent aab476a847
commit dda09390ac
14 changed files with 614 additions and 563 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/chemical/Chemistry-Reagents.dm
+7
View File
@@ -664,6 +664,13 @@ datum
reagent_state = SOLID
color = "#808080" // rgb: 128, 128, 128, meant to be a silvery grey but idrc
lithiumsodiumtungstate
name = "Lithium Sodium Tungstate"
id = "lithiumsodiumtungstate"
description = "A reducing agent for geological compounds."
reagent_state = LIQUID
color = "#808080" // rgb: 128, 128, 128, again, silvery grey
lithium
name = "Lithium"
id = "lithium"
code/modules/mining/satchel_ore_box.dm
+12 -8
View File
@@ -81,24 +81,26 @@
var/amt_plasma = 0
var/amt_uranium = 0
var/amt_clown = 0
var/amt_archaeo = 0
for (var/obj/item/weapon/ore/C in contents)
if (istype(C,/obj/item/weapon/ore/diamond))
amt_diamond++;
if (istype(C,/obj/item/weapon/ore/glass))
else if (istype(C,/obj/item/weapon/ore/glass))
amt_glass++;
if (istype(C,/obj/item/weapon/ore/plasma))
else if (istype(C,/obj/item/weapon/ore/plasma))
amt_plasma++;
if (istype(C,/obj/item/weapon/ore/iron))
else if (istype(C,/obj/item/weapon/ore/iron))
amt_iron++;
if (istype(C,/obj/item/weapon/ore/silver))
else if (istype(C,/obj/item/weapon/ore/silver))
amt_silver++;
if (istype(C,/obj/item/weapon/ore/gold))
else if (istype(C,/obj/item/weapon/ore/gold))
amt_gold++;
if (istype(C,/obj/item/weapon/ore/uranium))
else if (istype(C,/obj/item/weapon/ore/uranium))
amt_uranium++;
if (istype(C,/obj/item/weapon/ore/clown))
else if (istype(C,/obj/item/weapon/ore/clown))
amt_clown++;
else if (istype(C,/obj/item/weapon/ore/strangerock))
amt_archaeo++;
var/dat = text("<b>The contents of the ore box reveal...</b><br>")
if (amt_gold)
@@ -117,6 +119,8 @@
dat += text("Uranium ore: [amt_uranium]<br>")
if (amt_clown)
dat += text("Bananium ore: [amt_clown]<br>")
if (amt_archaeo)
dat += text("Strange rocks: [amt_archaeo]<br>")
dat += text("<br><br><A href='?src=\ref[src];removeall=1'>Empty box</A>")
user << browse("[dat]", "window=orebox")
code/modules/mob/living/carbon/human/whisper.dm
+2
View File
@@ -163,6 +163,8 @@
rendered = "<span class='game say'><span class='name'>[real_name]</span>[alt_name] whispers, <span class='message'>\"[message]\"</span></span>"
for (var/mob/M in world)
if(!M.client)
continue
if (istype(M, /mob/new_player))
continue
if (M.stat > 1 && !(M in heard_a) && M.client.ghost_ears)
code/modules/recycling/conveyor2.dm
+4 -1
View File
@@ -2,6 +2,8 @@
//note that corner pieces transfer stuff clockwise when running forward, and anti-clockwise backwards.
//cael - added fix for diverters, not sure if tg has them
#define MAX_MOVED 10
/obj/machinery/conveyor
icon = 'recycling.dmi'
icon_state = "conveyor0"
@@ -118,8 +120,9 @@
spawn(1) // slight delay to prevent infinite propagation due to map order
var/items_moved = 0
for(var/atom/movable/A in affecting)
if(items_moved >= 10)
if(items_moved >= MAX_MOVED)
break
if(!A.anchored)
code/modules/research/xenoarchaeology/artifact_effect.dm
+19 -19
View File
@@ -201,8 +201,8 @@
else if (src.effectmode == "aura")
switch(src.effecttype)
if("healing")
for (var/mob/living/carbon/M in range(src.aurarange,originator))
if(istype(M:wear_suit,/obj/item/clothing/suit/bio_suit/anomaly) && istype(M:head,/obj/item/clothing/head/bio_hood/anomaly))
for (var/mob/living/carbon/human/M in range(src.aurarange,originator))
if(ishuman(M) && istype(M:wear_suit,/obj/item/clothing/suit/bio_suit/anomaly) && istype(M:head,/obj/item/clothing/head/bio_hood/anomaly))
continue
if(prob(10)) M << "\blue You feel a soothing energy radiating from something nearby."
M.adjustBruteLoss(-1)
@@ -213,8 +213,8 @@
M.updatehealth()
return 1
if("injure")
for (var/mob/living/carbon/M in range(src.aurarange,originator))
if(istype(M:wear_suit,/obj/item/clothing/suit/bio_suit/anomaly) && istype(M:head,/obj/item/clothing/head/bio_hood/anomaly))
for (var/mob/living/carbon/human/M in range(src.aurarange,originator))
if(istype(ishuman(M) && M:wear_suit,/obj/item/clothing/suit/bio_suit/anomaly) && istype(M:head,/obj/item/clothing/head/bio_hood/anomaly))
continue
if(prob(10)) M << "\red You feel a painful force radiating from something nearby."
M.adjustBruteLoss(1)
@@ -225,8 +225,8 @@
M.updatehealth()
return 1
/*if("stun")
for (var/mob/living/carbon/M in range(src.aurarange,originator))
if(istype(M:wear_suit,/obj/item/clothing/suit/bio_suit/anomaly) && istype(M:head,/obj/item/clothing/head/bio_hood/anomaly))
for (var/mob/living/carbon/human/M in range(src.aurarange,originator))
if(ishuman(M) && istype(M:wear_suit,/obj/item/clothing/suit/bio_suit/anomaly) && istype(M:head,/obj/item/clothing/head/bio_hood/anomaly))
continue
if(prob(10)) M << "\red Energy radiating from the [originator] is making you feel numb."
if(prob(20))
@@ -289,8 +289,8 @@
O.show_message(text("<b>[]</b> emits a pulse of energy!", originator), 1)
switch(src.effecttype)
if("healing")
for (var/mob/living/carbon/M in range(src.aurarange,originator))
if(istype(M:wear_suit,/obj/item/clothing/suit/bio_suit/anomaly) && istype(M:head,/obj/item/clothing/head/bio_hood/anomaly))
for (var/mob/living/carbon/human/M in range(src.aurarange,originator))
if(ishuman(M) && istype(M:wear_suit,/obj/item/clothing/suit/bio_suit/anomaly) && istype(M:head,/obj/item/clothing/head/bio_hood/anomaly))
continue
M << "\blue A wave of energy invigorates you."
M.adjustBruteLoss(-5)
@@ -301,8 +301,8 @@
M.updatehealth()
return 1
if("injure")
for (var/mob/living/carbon/M in range(src.aurarange,originator))
if(istype(M:wear_suit,/obj/item/clothing/suit/bio_suit/anomaly) && istype(M:head,/obj/item/clothing/head/bio_hood/anomaly))
for (var/mob/living/carbon/human/M in range(src.aurarange,originator))
if(ishuman(M) && istype(M:wear_suit,/obj/item/clothing/suit/bio_suit/anomaly) && istype(M:head,/obj/item/clothing/head/bio_hood/anomaly))
continue
M << "\red A wave of energy causes you great pain!"
M.adjustBruteLoss(5)
@@ -315,8 +315,8 @@
M.updatehealth()
return 1
/*if("stun")
for (var/mob/living/carbon/M in range(src.aurarange,originator))
if(istype(M:wear_suit,/obj/item/clothing/suit/bio_suit/anomaly) && istype(M:head,/obj/item/clothing/head/bio_hood/anomaly))
for (var/mob/living/carbon/human/M in range(src.aurarange,originator))
if(ishuman(M) && istype(M:wear_suit,/obj/item/clothing/suit/bio_suit/anomaly) && istype(M:head,/obj/item/clothing/head/bio_hood/anomaly))
continue
M << "\red A wave of energy overwhelms your senses!"
M.paralysis += 3
@@ -373,7 +373,7 @@
return 1
if("teleport")
for (var/mob/living/M in range(src.aurarange,originator))
if(istype(M:wear_suit,/obj/item/clothing/suit/bio_suit/anomaly) && istype(M:head,/obj/item/clothing/head/bio_hood/anomaly))
if(ishuman(M) && istype(M:wear_suit,/obj/item/clothing/suit/bio_suit/anomaly) && istype(M:head,/obj/item/clothing/head/bio_hood/anomaly))
continue
var/list/randomturfs = new/list()
for(var/turf/T in orange(M, 30))
@@ -392,8 +392,8 @@
O.show_message(text("<b>[]</b> emits a powerful burst of energy!", originator), 1)
switch(src.effecttype)
if("healing")
for (var/mob/living/carbon/M in world)
if(istype(M:wear_suit,/obj/item/clothing/suit/bio_suit/anomaly) && istype(M:head,/obj/item/clothing/head/bio_hood/anomaly))
for (var/mob/living/carbon/human/M in world)
if(ishuman(M) && istype(M:wear_suit,/obj/item/clothing/suit/bio_suit/anomaly) && istype(M:head,/obj/item/clothing/head/bio_hood/anomaly))
continue
M << "\blue Waves of soothing energy wash over you."
M.adjustBruteLoss(-3)
@@ -404,7 +404,7 @@
M.updatehealth()
return 1
if("injure")
for (var/mob/living/carbon/M in world)
for (var/mob/living/carbon/human/M in world)
M << "\red A wave of painful energy strikes you!"
M.adjustBruteLoss(3)
M.adjustFireLoss(3)
@@ -414,8 +414,8 @@
M.updatehealth()
return 1
/*if("stun")
for (var/mob/living/carbon/M in world)
if(istype(M:wear_suit,/obj/item/clothing/suit/bio_suit/anomaly) && istype(M:head,/obj/item/clothing/head/bio_hood/anomaly))
for (var/mob/living/carbon/human/M in world)
if(ishuman(M) && istype(M:wear_suit,/obj/item/clothing/suit/bio_suit/anomaly) && istype(M:head,/obj/item/clothing/head/bio_hood/anomaly))
continue
M << "\red A powerful force causes you to black out momentarily."
M.paralysis += 5
@@ -459,7 +459,7 @@
return 1
if("teleport")
for (var/mob/living/M in world)
if(istype(M:wear_suit,/obj/item/clothing/suit/bio_suit/anomaly) && istype(M:head,/obj/item/clothing/head/bio_hood/anomaly))
if(ishuman(M) && istype(M:wear_suit,/obj/item/clothing/suit/bio_suit/anomaly) && istype(M:head,/obj/item/clothing/head/bio_hood/anomaly))
continue
var/list/randomturfs = new/list()
for(var/turf/T in orange(M, 15))