cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-11 15:15:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

adds permanent markers

Browse Source 
also tweaks paint recipe to use ink instead of crayons.
This commit is contained in:
Billy Bangles
2018-03-19 20:20:31 -04:00
parent c1ed3a0c6c
commit 05fd53ebcc
8 changed files with 256 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/paperwork/pen.dm
+14 -7
View File
@@ -195,11 +195,18 @@
var/instant = 0
var/colourName = "red" //for updateIcon purposes
suicide_act(mob/user)
var/datum/gender/TU = gender_datums[user.get_visible_gender()]
viewers(user) << "<font color='red'><b>[user] is jamming the [src.name] up [TU.his] nose and into [TU.his] brain. It looks like [TU.he] [TU.is] trying to commit suicide.</b></font>"
return (BRUTELOSS|OXYLOSS)
/obj/item/weapon/pen/crayon/suicide_act(mob/user)
var/datum/gender/TU = gender_datums[user.get_visible_gender()]
viewers(user) << "<font color='red'><b>[user] is jamming the [src.name] up [TU.his] nose and into [TU.his] brain. It looks like [TU.he] [TU.is] trying to commit suicide.</b></font>"
return (BRUTELOSS|OXYLOSS)
New()
name = "[colourName] crayon"
..()
/obj/item/weapon/pen/crayon/New()
name = "[colourName] crayon"
/obj/item/weapon/pen/crayon/marker
name = "marker"
desc = "A chisel-tip permanent marker. Hopefully non-toxic."
icon_state = "markerred"
/obj/item/weapon/pen/crayon/marker/New()
name = "[colourName] marker"
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Other.dm
+54
View File
@@ -49,6 +49,60 @@
id = "crayon_dust_brown"
color = "#846F35"
/datum/reagent/marker_ink
name = "Marker ink"
id = "marker_ink"
description = "Intensely coloured ink used in markers."
taste_description = "extremely bitter"
reagent_state = LIQUID
color = "#888888"
overdose = 5
/datum/reagent/marker_ink/black
name = "Black marker ink"
id = "marker_ink_black"
color = "#000000"
/datum/reagent/marker_ink/red
name = "Red marker ink"
id = "marker_ink_red"
color = "#FE191A"
/datum/reagent/marker_ink/orange
name = "Orange marker ink"
id = "marker_ink_orange"
color = "#FFBE4F"
/datum/reagent/marker_ink/yellow
name = "Yellow marker ink"
id = "marker_ink_yellow"
color = "#FDFE7D"
/datum/reagent/marker_ink/green
name = "Green marker ink"
id = "marker_ink_green"
color = "#18A31A"
/datum/reagent/marker_ink/blue
name = "Blue marker ink"
id = "marker_ink_blue"
color = "#247CFF"
/datum/reagent/marker_ink/purple
name = "Purple marker ink"
id = "marker_ink_purple"
color = "#CC0099"
/datum/reagent/marker_ink/grey //Mime
name = "Grey marker ink"
id = "marker_ink_grey"
color = "#808080"
/datum/reagent/marker_ink/brown //Rainbow
name = "Brown marker ink"
id = "marker_ink_brown"
color = "#846F35"
/datum/reagent/paint
name = "Paint"
id = "paint"
code/modules/reagents/Chemistry-Recipes.dm
+8 -8
View File
@@ -868,7 +868,7 @@
name = "Red paint"
id = "red_paint"
result = "paint"
required_reagents = list("plasticide" = 1, "water" = 3, "crayon_dust_red" = 1)
required_reagents = list("plasticide" = 1, "water" = 3, "marker_ink_red" = 1)
result_amount = 5
/datum/chemical_reaction/red_paint/send_data()
@@ -878,7 +878,7 @@
name = "Orange paint"
id = "orange_paint"
result = "paint"
required_reagents = list("plasticide" = 1, "water" = 3, "crayon_dust_orange" = 1)
required_reagents = list("plasticide" = 1, "water" = 3, "marker_ink_orange" = 1)
result_amount = 5
/datum/chemical_reaction/orange_paint/send_data()
@@ -888,7 +888,7 @@
name = "Yellow paint"
id = "yellow_paint"
result = "paint"
required_reagents = list("plasticide" = 1, "water" = 3, "crayon_dust_yellow" = 1)
required_reagents = list("plasticide" = 1, "water" = 3, "marker_ink_yellow" = 1)
result_amount = 5
/datum/chemical_reaction/yellow_paint/send_data()
@@ -898,7 +898,7 @@
name = "Green paint"
id = "green_paint"
result = "paint"
required_reagents = list("plasticide" = 1, "water" = 3, "crayon_dust_green" = 1)
required_reagents = list("plasticide" = 1, "water" = 3, "marker_ink_green" = 1)
result_amount = 5
/datum/chemical_reaction/green_paint/send_data()
@@ -908,7 +908,7 @@
name = "Blue paint"
id = "blue_paint"
result = "paint"
required_reagents = list("plasticide" = 1, "water" = 3, "crayon_dust_blue" = 1)
required_reagents = list("plasticide" = 1, "water" = 3, "marker_ink_blue" = 1)
result_amount = 5
/datum/chemical_reaction/blue_paint/send_data()
@@ -918,7 +918,7 @@
name = "Purple paint"
id = "purple_paint"
result = "paint"
required_reagents = list("plasticide" = 1, "water" = 3, "crayon_dust_purple" = 1)
required_reagents = list("plasticide" = 1, "water" = 3, "marker_ink_purple" = 1)
result_amount = 5
/datum/chemical_reaction/purple_paint/send_data()
@@ -928,7 +928,7 @@
name = "Grey paint"
id = "grey_paint"
result = "paint"
required_reagents = list("plasticide" = 1, "water" = 3, "crayon_dust_grey" = 1)
required_reagents = list("plasticide" = 1, "water" = 3, "marker_ink_grey" = 1)
result_amount = 5
/datum/chemical_reaction/grey_paint/send_data()
@@ -938,7 +938,7 @@
name = "Brown paint"
id = "brown_paint"
result = "paint"
required_reagents = list("plasticide" = 1, "water" = 3, "crayon_dust_brown" = 1)
required_reagents = list("plasticide" = 1, "water" = 3, "marker_ink_brown" = 1)
result_amount = 5
/datum/chemical_reaction/brown_paint/send_data()