cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-25 04:57:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Have you bingled that (#17407)

Browse Source 
* Initial wiki system

* wiki organization and spoilers

* hide belly chems

* move ads to tgui

* add search

* .

* load screen

* error screen

* 8

* center

* .

* .

* make this more realistic

* tgui errro col

* move search to top

* .

* non NT theme

* logo to common

* base custom theme

* .

* wip refactor

* almost halfway

* reworked wiki data

* easy fix

* get data fix

* Material Page in tgui

* catch null supply points

* .

* forward crash

* reset pages

* .

* canvas prep

* fix icon stacking

* .

* colored outlined images

* fix sm datum

* fix material names

* subType prep

* only on crash

* fix null crash

* .

* fix solgov

* clean hiding

* .

* implement catalog page

* .

* particle smasher page

* I'm lazy

* unfuck some sins

* ore page

* botany page

* allergen list

* allergen returns null too

* slime injection var

* slime core data

* fixed warning

* wip

* proper data list for chems

* pass is_slime as null

* chems

* split that

* .

* .

* .

* .

* donation for bingle, some cleanup

* return types

* partially colord icons for chemistry

* .

* more sillies

* donation page

* thaler

* needs some variation

* .

* this will crash until implemented

* handle it

* fix that

* dismiss donation banner button

* .

* fix that

* donating procs

* donation stuff for comp

* -

* drink glass for drinks

* illegal iconstate pass

* fixes

* .

* nuke drink fix

* .

* .

* .

* Drink reagent fix

* more cleanup

* adjust

* .

* simple food

* .

* food list

* sending nulls, removed flavor from recipes

* .

* .

* get_donation_current added

* .

* missing key

* .

* duped recipes fixed

* .

* .

* wiki food reagent recipes

* double list add

* properly forbid remaining bad reagent

* hide this too

* stacky

* enable eslint const

* fix typing

* update that

* use proper donation proc

* printing fixes

* grinding

* .

* beaker fill volume

* plant ore and mat grinding results

* duped recipes fixed, unit test tweak

* yes this is terrible

* .

* .

* .

* chem analyzer tgui mode, some subsystem changes to support it

* redoce

* .

* ,

* .

* small fixes, missing reagent volume

* push

* sort

* catalog entries unlocked by explo

* new chem stuff

* .

* fix byond code

* fix scroll tracking

* comment

* alphabetical

* also this

* .

* fallback icon

* .

* ...

* rel path

* that too

* to defines

* organ to define

* .

* .

* .

---------

Co-authored-by: Willburd <7099514+Willburd@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
Cameron Lennox
2025-03-28 19:00:50 +01:00
committed by GitHub
co-authored by Willburd Kashargul
parent 0d340a761b
commit c42610c5ae
361 changed files with 5588 additions and 1128 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/materials/materials/_materials.dm
+3
View File
@@ -235,6 +235,8 @@ var/list/name_to_material
// Wallrot crumble message.
var/rotting_touch_message = "crumbles under your touch"
var/wiki_flag = 0
// Placeholders for light tiles and rglass.
/datum/material/proc/build_rod_product(var/mob/user, var/obj/item/stack/used_stack, var/obj/item/stack/target_stack)
if(!rod_product)
@@ -306,6 +308,7 @@ var/list/name_to_material
// Used by walls when qdel()ing to avoid neighbor merging.
/datum/material/placeholder
name = "placeholder"
wiki_flag = WIKI_SPOILER
// Places a girder object when a wall is dismantled, also applies reinforced material.
/datum/material/proc/place_dismantled_girder(var/turf/target, var/datum/material/reinf_material, var/datum/material/girder_material)
code/modules/materials/materials/alien_alloy.dm
+1
View File
@@ -11,6 +11,7 @@
hardness = 500
weight = 500
protectiveness = 80 // 80%
wiki_flag = WIKI_SPOILER
/datum/material/alienalloy/elevatorium
name = "elevatorium"
code/modules/materials/materials/cult.dm
+1
View File
@@ -9,6 +9,7 @@
sheet_singular_name = "brick"
sheet_plural_name = "bricks"
conductive = 0
wiki_flag = WIKI_SPOILER
/datum/material/cult/place_dismantled_girder(var/turf/target)
new /obj/structure/girder/cult(target, MAT_CULT)
code/modules/materials/materials/gems.dm
+1 -1
View File
@@ -103,7 +103,7 @@
icon_base = "stone"
door_icon_base = "stone"
icon_reinf = "reinf_mesh"
icon_colour = "##FFF3B2"
icon_colour = "#FFF3B2"
protectiveness = 30
integrity = 240
weight = 30
code/modules/materials/materials/holographic.dm
+3
View File
@@ -3,15 +3,18 @@
display_name = MAT_STEEL
stack_type = null
shard_type = SHARD_NONE
wiki_flag = WIKI_SPOILER
/datum/material/plastic/holographic
name = "holo" + MAT_PLASTIC
display_name = MAT_PLASTIC
stack_type = null
shard_type = SHARD_NONE
wiki_flag = WIKI_SPOILER
/datum/material/wood/holographic
name = "holo" + MAT_WOOD
display_name = MAT_WOOD
stack_type = null
shard_type = SHARD_NONE
wiki_flag = WIKI_SPOILER
code/modules/materials/materials/organic/cloth.dm
+11 -1
View File
@@ -58,57 +58,66 @@
/datum/material/cloth/teal
name = MAT_CLOTH_TEAL
display_name =MAT_CLOTH_TEAL
display_name = MAT_CLOTH_TEAL
use_name = "teal cloth"
icon_colour = "#00EAFA"
wiki_flag = WIKI_SPOILER
/datum/material/cloth/black
name = MAT_CLOTH_BLACK
display_name = MAT_CLOTH_BLACK
use_name = "black cloth"
icon_colour = "#505050"
wiki_flag = WIKI_SPOILER
/datum/material/cloth/green
name = MAT_CLOTH_GREEN
display_name = MAT_CLOTH_GREEN
use_name = "green cloth"
icon_colour = "#01C608"
wiki_flag = WIKI_SPOILER
/datum/material/cloth/puple
name = MAT_CLOTH_PURPLE
display_name = MAT_CLOTH_PURPLE
use_name = "purple cloth"
icon_colour = "#9C56C4"
wiki_flag = WIKI_SPOILER
/datum/material/cloth/blue
name = MAT_CLOTH_BLUE
display_name = MAT_CLOTH_BLUE
use_name = "blue cloth"
icon_colour = "#6B6FE3"
wiki_flag = WIKI_SPOILER
/datum/material/cloth/beige
name = MAT_CLOTH_BEIGE
display_name = MAT_CLOTH_BEIGE
use_name = "beige cloth"
icon_colour = "#E8E7C8"
wiki_flag = WIKI_SPOILER
/datum/material/cloth/lime
name = MAT_CLOTH_LIME
display_name = MAT_CLOTH_LIME
use_name = "lime cloth"
icon_colour = "#62E36C"
wiki_flag = WIKI_SPOILER
/datum/material/cloth/yellow
name = MAT_CLOTH_YELLOW
display_name = MAT_CLOTH_YELLOW
use_name = "yellow cloth"
icon_colour = "#EEF573"
wiki_flag = WIKI_SPOILER
/datum/material/cloth/orange
name = MAT_CLOTH_ORANGE
display_name = MAT_CLOTH_ORANGE
use_name = "orange cloth"
icon_colour = "#E3BF49"
wiki_flag = WIKI_SPOILER
@@ -126,6 +135,7 @@
conductive = 0
hardness = 5
integrity = 40
wiki_flag = WIKI_SPOILER
/datum/material/cotton
name = MAT_COTTON
code/modules/materials/materials/organic/wood.dm
+1
View File
@@ -117,6 +117,7 @@
/datum/material/wood/log/hard
name = MAT_HARDLOG
display_name = MAT_HARDWOOD
icon_colour = "#6f432a"
stack_type = /obj/item/stack/material/log/hard
code/modules/materials/materials/other_vr.dm
+4
View File
@@ -9,6 +9,7 @@
explosion_resistance = 200
hardness = 500
weight = 500
wiki_flag = WIKI_SPOILER
/datum/material/fluff //This is to allow for 2 handed weapons that don't want to have a prefix.
name = " "
@@ -18,6 +19,7 @@
sheet_plural_name = "fluffs"
hardness = 60
weight = 20 //Strong as iron.
wiki_flag = WIKI_SPOILER
/datum/material/darkglass
name = MAT_DARKGLASS
@@ -25,6 +27,7 @@
icon_base = MAT_DARKGLASS
table_icon_base = MAT_DARKGLASS
icon_colour = "#FFFFFF"
wiki_flag = WIKI_SPOILER
/datum/material/fancyblack
name = MAT_FANCYBLACK
@@ -32,3 +35,4 @@
icon_base = MAT_FANCYBLACK
table_icon_base = MAT_FANCYBLACK
icon_colour = "#FFFFFF"
wiki_flag = WIKI_SPOILER
code/modules/materials/materials/supermatter.dm
-1
View File
@@ -5,7 +5,6 @@
stack_type = /obj/item/stack/material/supermatter
shard_type = SHARD_SHARD
radioactivity = 20
stack_type = null
luminescence = 3
ignition_point = PHORON_MINIMUM_BURN_TEMPERATURE
icon_base = "stone"
code/modules/materials/sheets/supermatter.dm
+2 -2
View File
@@ -34,8 +34,8 @@
if(burn_user)
H.visible_message(span_danger("\The [src] flashes as it scorches [H]'s hands!"))
H.apply_damage(amount / 2 + 5, BURN, "r_hand", used_weapon=src)
H.apply_damage(amount / 2 + 5, BURN, "l_hand", used_weapon=src)
H.apply_damage(amount / 2 + 5, BURN, BP_R_HAND, used_weapon=src)
H.apply_damage(amount / 2 + 5, BURN, BP_L_HAND, used_weapon=src)
H.drop_from_inventory(src, get_turf(H))
return