cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release' of https://github.com/VOREStation/VOREStation

Browse Source 
# Conflicts:
#	code/_helpers/unsorted.dm
#	code/modules/events/event_container_vr.dm
#	icons/misc/title_vr.dmi
#	interface/skin.dmf
#	vorestation.dme
This commit is contained in:
Repede
2020-03-01 12:35:52 -05:00
parent 11221003cd c1e40acb74
commit c45d7c2196
432 changed files with 22074 additions and 5001 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/examine/examine.dm
View File

@@ -34,7 +34,7 @@
// Quickly adds the boilerplate code to add an image and padding for the image.
/proc/desc_panel_image(var/icon_state)
return "\icon[description_icons[icon_state]][EXAMINE_PANEL_PADDING]"
return "[bicon(description_icons[icon_state])][EXAMINE_PANEL_PADDING]"
/mob/living/get_description_fluff()
if(flavor_text) //Get flavor text for the green text.
@@ -56,7 +56,7 @@
description_holders["interactions"] = A.get_description_interaction()
description_holders["name"] = "[A.name]"
description_holders["icon"] = "\icon[A]"
description_holders["icon"] = "[bicon(A)]"
description_holders["desc"] = A.desc
/mob/Stat()