Merge pull request #2832 from comma/bleeding-edge-freeze

Bleeding edge freeze

baystation12.dme

@@ -53,6 +53,9 @@
 #define FILE_DIR "sound/voice"
 #define FILE_DIR "sound/voice/Serithi"
 #define FILE_DIR "sound/weapons"
+#define FILE_DIR "tools"
+#define FILE_DIR "tools/AddToChangelog"
+#define FILE_DIR "tools/AddToChangelog/AddToChangelog"
 // END_FILE_DIR
 // BEGIN_PREFERENCES
 #define DEBUG
@@ -805,7 +808,6 @@
 #include "code\modules\events\money_hacker.dm"
 #include "code\modules\events\money_lotto.dm"
 #include "code\modules\events\money_spam.dm"
-#include "code\modules\events\organ_failure.dm"
 #include "code\modules\events\prison_break.dm"
 #include "code\modules\events\radiation_storm.dm"
 #include "code\modules\events\rogue_drones.dm"
@@ -815,7 +817,6 @@
 #include "code\modules\events\spontaneous_appendicitis.dm"
 #include "code\modules\events\viral_infection.dm"
 #include "code\modules\events\viral_outbreak.dm"
-#include "code\modules\events\wallrot.dm"
 #include "code\modules\flufftext\Dreaming.dm"
 #include "code\modules\flufftext\Hallucination.dm"
 #include "code\modules\flufftext\TextFilters.dm"
@@ -837,7 +838,6 @@
 #include "code\modules\mining\ores_coins.dm"
 #include "code\modules\mining\satchel_ore_boxdm.dm"
 #include "code\modules\mob\death.dm"
-#include "code\modules\mob\emote.dm"
 #include "code\modules\mob\inventory.dm"
 #include "code\modules\mob\login.dm"
 #include "code\modules\mob\logout.dm"
@@ -1249,7 +1249,6 @@
 #include "code\WorkInProgress\autopsy.dm"
 #include "code\WorkInProgress\buildmode.dm"
 #include "code\WorkInProgress\explosion_particles.dm"
-#include "code\WorkInProgress\periodic_news.dm"
 #include "code\WorkInProgress\Cael_Aislinn\meteor_battery.dm"
 #include "code\WorkInProgress\Cael_Aislinn\sculpture.dm"
 #include "code\WorkInProgress\Cael_Aislinn\Economy\Accounts.dm"
@@ -1280,7 +1279,6 @@
 #include "code\WorkInProgress\Cael_Aislinn\Rust\fuel_compressor_construction.dm"
 #include "code\WorkInProgress\Cael_Aislinn\Rust\fuel_control.dm"
 #include "code\WorkInProgress\Cael_Aislinn\Rust\fuel_injector.dm"
-#include "code\WorkInProgress\Cael_Aislinn\Rust\fusion_reactions.dm"
 #include "code\WorkInProgress\Cael_Aislinn\Rust\gyrotron.dm"
 #include "code\WorkInProgress\Cael_Aislinn\Rust\gyrotron_controller.dm"
 #include "code\WorkInProgress\Cael_Aislinn\Rust\radiation.dm"

code/__HELPERS/unsorted.dm

@@ -1329,6 +1329,7 @@ proc/is_hot(obj/item/W as obj)
 /proc/is_sharp(obj/item/W as obj)		// For the record, WHAT THE HELL IS THIS METHOD OF DOING IT?
 	if(W.sharp) return 1
 	return ( \
+		W.sharp													  || \
 		istype(W, /obj/item/weapon/screwdriver)                   || \
 		istype(W, /obj/item/weapon/pen)                           || \
 		istype(W, /obj/item/weapon/weldingtool)					  || \

code/game/gamemodes/revolution/rp_revolution.dm

@@ -8,6 +8,9 @@
 	required_enemies = 3
 	recommended_enemies = 3
 
+	uplink_welcome = "Revolutionary Uplink Console:"
+	uplink_uses = 5
+
 	newscaster_announcements = /datum/news_announcement/revolution_inciting_event
 
 	var/last_command_report = 0
@@ -68,6 +71,8 @@
 	for(var/datum/mind/rev_mind in head_revolutionaries)
 		greet_revolutionary(rev_mind)
 		rev_mind.current.verbs += /mob/living/carbon/human/proc/RevConvert
+		equip_traitor(rev_mind.current, 1) //changing how revs get assigned their uplink so they can get PDA uplinks. --NEO
+
 	modePlayer += head_revolutionaries
 	spawn (rand(waittime_l, waittime_h))
 		send_intercept()

code/game/objects/items/stacks/medical.dm

@@ -76,9 +76,9 @@
 
 	M.updatehealth()
 /obj/item/stack/medical/bruise_pack
-	name = "bruise pack"
-	singular_name = "bruise pack"
-	desc = "A pack designed to treat blunt-force trauma."
+	name = "roll of gauze"
+	singular_name = "gauze length"
+	desc = "Some sterile gauze to wrap around bloody stumps."
 	icon_state = "brutepack"
 	heal_brute = 60
 	origin_tech = "biotech=1"

code/modules/mob/living/carbon/human/human_defense.dm

@@ -138,7 +138,7 @@ emp_act
 	if(armor >= 2)	return 0
 	if(!I.force)	return 0
 
-	apply_damage(I.force, I.damtype, affecting, armor , I.sharp, I.name)
+	apply_damage(I.force, I.damtype, affecting, armor , is_sharp(I), I.name)
 
 	var/bloody = 0
 	if(((I.damtype == BRUTE) || (I.damtype == HALLOSS)) && prob(25 + (I.force * 2)))