Merge branch 'master' of https://github.com/Thalpy/Citadel-Station-13

2019-06-13 01:46:10 +01:00
parent c8bcca5964 f3a3e4c47a
commit 18292d4fc6
1 changed files with 3 additions and 0 deletions
@@ -324,6 +324,7 @@
 	gain_text = "<span class='danger'>There's a lot on your mind right now.</span>"
 	lose_text = "<span class='notice'>Your mind finally feels calm.</span>"
 	medical_record_text = "Patient's mind is in a vulnerable state, and cannot recover from traumatic events."
+<<<<<<< HEAD

 //For reviewers: If you think it's a bad idea, feel free to remove it. Removal requested, commented out until the end of review (will remove when fixing merge conflicts).
 /*
@@ -351,3 +352,5 @@
   H.apply_status_effect(/datum/status_effect/trance, 200, TRUE)
   qdel(src)
 */
+=======
+>>>>>>> f3a3e4c47ae527bd576fcee254836e1c1d8bdfcb