cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-29 11:31:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev' into gun-rewrite

Browse Source 
Conflicts:
	code/modules/clothing/under/ties.dm
	code/modules/projectiles/projectile.dm
This commit is contained in:
mwerezak
2015-02-10 20:59:22 -05:00
parent 7ccd78baa7 d1de94c70e
commit ab6f0bf30c
97 changed files with 3568 additions and 2565 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/reagents/Chemistry-Colours.dm
View File

@@ -8,6 +8,7 @@
var/list/greencolor = new /list(contents)
var/list/bluecolor = new /list(contents)
var/i
//fill the list of weights
for(i=1; i<=contents; i++)
var/datum/reagent/re = reagent_list[i]
@@ -16,6 +17,7 @@
reagentweight *= 20 //Paint colours a mixture twenty times as much
weight[i] = reagentweight
//fill the lists of colours
for(i=1; i<=contents; i++)
var/datum/reagent/re = reagent_list[i]

24
code/modules/reagents/Chemistry-Reagents.dm
View File

@@ -1580,21 +1580,27 @@ datum
paint
name = "Paint"
id = "paint"
description = "This paint will stick to almost any object"
description = "This paint will stick to almost any object."
reagent_state = LIQUID
color = "#808080"
overdose = 15
reaction_turf(var/turf/T, var/volume)
if(!istype(T) || istype(T, /turf/space))
return
T.color = color
..()
if(istype(T) && !istype(T, /turf/space))
T.color = color
reaction_obj(var/obj/O, var/volume)
..()
if(istype(O,/obj/item/weapon/light))
if(istype(O,/obj))
O.color = color
reaction_mob(var/mob/M, var/method=TOUCH, var/volume)
..()
if(istype(M,/mob) && !istype(M,/mob/dead))
//painting ghosts: not allowed
M.color = color
//////////////////////////Poison stuff///////////////////////
@@ -2631,7 +2637,7 @@ datum
name = "Carrot juice"
id = "carrotjuice"
description = "It is just like a carrot but without crunching."
color = "#973800" // rgb: 151, 56, 0
color = "#FF8C00" // rgb: 255, 140, 0
glass_icon_state = "carrotjuice"
glass_name = "glass of carrot juice"
@@ -2701,7 +2707,7 @@ datum
name = "Watermelon Juice"
id = "watermelonjuice"
description = "Delicious juice made from watermelon."
color = "#863333" // rgb: 134, 51, 51
color = "#B83333" // rgb: 184, 51, 51
glass_icon_state = "glass_red"
glass_name = "glass of watermelon juice"
@@ -2711,7 +2717,7 @@ datum
name = "Lemon Juice"
id = "lemonjuice"
description = "This juice is VERY sour."
color = "#863333" // rgb: 175, 175, 0
color = "#AFAF00" // rgb: 175, 175, 0
glass_icon_state = "lemonjuice"
glass_name = "glass of lemon juice"
@@ -2721,7 +2727,7 @@ datum
name = "Banana Juice"
id = "banana"
description = "The raw essence of a banana."
color = "#863333" // rgb: 175, 175, 0
color = "#C3AF00" // rgb: 195, 175, 0
glass_icon_state = "banana"
glass_name = "glass of banana juice"

99
code/modules/reagents/Chemistry-Recipes.dm
View File

@@ -1414,14 +1414,17 @@ datum
//Ghetto reactions
/* Ideally the paint should take on the blood's colour (for each of the species)
but I could not think of a way. - RKF
blood_paint
name = "Blood paint"
id = "blood_paint"
result = "paint"
resultcolor = "#FE191A"
resultcolor = "#C80000"
required_reagents = list("plasticide" = 1, "water" = 3, "blood" = 2)
result_amount = 5
*/
milk_paint
name = "Milk paint"
id = "milk_paint"
@@ -1430,6 +1433,96 @@ datum
required_reagents = list("plasticide" = 1, "water" = 3, "milk" = 5)
result_amount = 5
orange_juice_paint
name = "Orange juice paint"
id = "orange_juice_paint"
result = "paint"
resultcolor = "#E78108"
required_reagents = list("plasticide" = 1, "water" = 3, "orangejuice" = 5)
result_amount = 5
tomato_juice_paint
name = "Tomato juice paint"
id = "tomato_juice_paint"
result = "paint"
resultcolor = "#731008"
required_reagents = list("plasticide" = 1, "water" = 3, "tomatojuice" = 5)
result_amount = 5
lime_juice_paint
name = "Lime juice paint"
id = "lime_juice_paint"
result = "paint"
resultcolor = "#365E30"
required_reagents = list("plasticide" = 1, "water" = 3, "limejuice" = 5)
result_amount = 5
carrot_juice_paint
name = "Carrot juice paint"
id = "carrot_juice_paint"
result = "paint"
resultcolor = "#973800"
required_reagents = list("plasticide" = 1, "water" = 3, "carrotjuice" = 5)
result_amount = 5
berry_juice_paint
name = "Berry juice paint"
id = "berry_juice_paint"
result = "paint"
resultcolor = "#990066"
required_reagents = list("plasticide" = 1, "water" = 3, "berryjuice" = 5)
result_amount = 5
grape_juice_paint
name = "Grape juice paint"
id = "grape_juice_paint"
result = "paint"
resultcolor = "#863333"
required_reagents = list("plasticide" = 1, "water" = 3, "grapejuice" = 5)
result_amount = 5
poisonberry_juice_paint
name = "Poison berry juice paint"
id = "poisonberry_juice_paint"
result = "paint"
resultcolor = "#863353"
required_reagents = list("plasticide" = 1, "water" = 3, "poisonberryjuice" = 5)
result_amount = 5
watermelon_juice_paint
name = "Watermelon juice paint"
id = "watermelon_juice_paint"
result = "paint"
resultcolor = "#B83333"
required_reagents = list("plasticide" = 1, "water" = 3, "watermelonjuice" = 5)
result_amount = 5
lemon_juice_paint
name = "Lemon juice paint"
id = "lemon_juice_paint"
result = "paint"
resultcolor = "#AFAF00"
required_reagents = list("plasticide" = 1, "water" = 3, "lemonjuice" = 5)
result_amount = 5
banana_juice_paint
name = "Banana juice paint"
id = "banana_juice_paint"
result = "paint"
resultcolor = "#C3AF00"
required_reagents = list("plasticide" = 1, "water" = 3, "banana" = 5)
result_amount = 5
potato_juice_paint
name = "Potato juice paint"
id = "potato_juice_paint"
result = "paint"
resultcolor = "#302000"
required_reagents = list("plasticide" = 1, "water" = 3, "potatojuice" = 5)
result_amount = 5
//Other paint
carbon_paint
name = "Carbon paint"
id = "carbon_paint"
@@ -1438,8 +1531,6 @@ datum
required_reagents = list("plasticide" = 1, "water" = 3, "carbon" = 1)
result_amount = 5
//Aluminum "non-ghetto" white paint
aluminum_paint
name = "Aluminum paint"
id = "aluminum_paint"