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

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2023-02-02 20:28:35 -05:00
committed by GitHub
parent 515e92e594
commit 6b1aeeaa20
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
code/modules/mob/living/living_defines_vr.dm
View File

@@ -10,15 +10,12 @@
var/custom_say = null
var/custom_ask = null
var/custom_exclaim = null
var/custom_whisper = null
<<<<<<< HEAD
var/custom_whisper = null
//custom temperature discomfort vars
var/list/custom_heat = list()
var/list/custom_cold = list()
//YW Add Start
/mob
var/wingdings = 0
//Yw Add End
=======
//custom temperature discomfort vars
var/list/custom_heat = list()
var/list/custom_cold = list()
>>>>>>> f37df09d38... Merge pull request #14384 from Runa-Dacino/Custom-species-heat