Merge pull request #1 from quotefox/master

updoot myself

code/__DEFINES/say.dm

@@ -44,6 +44,7 @@
 #define MODE_KEY_VOCALCORDS "x"
 
 #define MODE_MONKEY "monkeyhive"
+#define MODE_SING "%"
 
 //Spans. Robot speech, italics, etc. Applied in compose_message().
 #define SPAN_ROBOT "robot"
@@ -54,6 +55,7 @@
 #define SPAN_REALLYBIG "reallybig"
 #define SPAN_COMMAND "command_headset"
 #define SPAN_CLOWN "clown"
+#define SPAN_SINGING "singing"
 
 //bitflag #defines for return value of the radio() proc.
 #define ITALICS 1

code/game/atoms_movable.dm

@@ -13,18 +13,19 @@
 	var/verb_ask = "asks"
 	var/verb_exclaim = "exclaims"
 	var/verb_whisper = "whispers"
+	var/verb_sing = "sings"
 	var/verb_yell = "yells"
 	var/speech_span
 	var/inertia_dir = 0
 	var/atom/inertia_last_loc
 	var/inertia_moving = 0
 	var/inertia_next_move = 0
-	var/inertia_move_delay = 7
+	var/inertia_move_delay = 10
 	var/pass_flags = 0
 	var/moving_diagonally = 0 //0: not doing a diagonal move. 1 and 2: doing the first/second step of the diagonal move
 	var/list/client_mobs_in_contents // This contains all the client mobs within this container
 	var/list/acted_explosions	//for explosion dodging
-	glide_size = 16
+	glide_size = 7
 	appearance_flags = TILE_BOUND|PIXEL_SCALE
 	var/datum/forced_movement/force_moving = null	//handled soley by forced_movement.dm
 	var/floating = FALSE

code/modules/language/aphasia.dm

@@ -4,6 +4,7 @@
 	speech_verb = "garbles"
 	ask_verb = "mumbles"
 	whisper_verb = "mutters"
+	sing_verb = "gibbers"
 	exclaim_verb = "screams incoherently"
 	flags = LANGUAGE_HIDE_ICON_IF_NOT_UNDERSTOOD
 	key = "i"

code/modules/language/beachbum.dm

@@ -2,6 +2,7 @@
 	name = "Beachtongue"
 	desc = "An ancient language from the distant Beach Planet. People magically learn to speak it under the influence of space drugs."
 	speech_verb = "mumbles"
+	sing_verb = "parties"
 	ask_verb = "grills"
 	exclaim_verb = "hollers"
 	key = "u"

code/modules/language/common.dm

@@ -4,6 +4,7 @@
 	desc = "The common galactic tongue."
 	speech_verb = "says"
 	whisper_verb = "whispers"
+	sing_verb = "sings"
 	key = "0"
 	flags = TONGUELESS_SPEECH | LANGUAGE_HIDE_ICON_IF_UNDERSTOOD
 	default_priority = 100

code/modules/language/draconic.dm

@@ -3,6 +3,7 @@
 	desc = "The common language of lizard-people, composed of sibilant hisses and rattles."
 	speech_verb = "hisses"
 	ask_verb = "hisses"
+	sing_verb = "sings"
 	exclaim_verb = "roars"
 	key = "o"
 	flags = TONGUELESS_SPEECH

code/modules/language/drone.dm

@@ -3,6 +3,7 @@
 	desc = "A heavily encoded damage control coordination stream, with special flags for hats."
 	speech_verb = "chitters"
 	ask_verb = "chitters inquisitively"
+	sing_verb = "chimes"
 	exclaim_verb = "chitters loudly"
 	spans = list(SPAN_ROBOT)
 	key = "d"

code/modules/language/language.dm

@@ -11,6 +11,7 @@
 	var/ask_verb = "asks"             // Used when sentence ends in a ?
 	var/exclaim_verb = "exclaims"     // Used when sentence ends in a !
 	var/whisper_verb = "whispers"     // Optional. When not specified speech_verb + quietly/softly is used instead.
+	var/sing_verb = "sings"			  // Used for singing.
 	var/list/signlang_verb = list("signs", "gestures") // list of emotes that might be displayed if this language has NONVERBAL or SIGNLANG flags
 	var/key                           // Character used to speak in language
 	// If key is null, then the language isn't real or learnable.

code/modules/language/machine.dm

@@ -4,6 +4,7 @@
 	speech_verb = "whistles"
 	ask_verb = "chirps"
 	exclaim_verb = "whistles loudly"
+	sing_verb = "whistles melodically"
 	spans = list(SPAN_ROBOT)
 	key = "6"
 	flags = NO_STUTTER

code/modules/language/monkey.dm

@@ -4,6 +4,7 @@
 	speech_verb = "chimpers"
 	ask_verb = "chimpers"
 	exclaim_verb = "screeches"
+	sing_verb = "chimpers tunefully"
 	key = "1"
 	space_chance = 100
 	syllables = list("oop", "aak", "chee", "eek")

code/modules/language/mushroom.dm

@@ -5,6 +5,7 @@
 	ask_verb = "puffs inquisitively"
 	exclaim_verb = "poofs loudly"
 	whisper_verb = "puffs quietly"
+	sing_verb = "puffs musically"
 	key = "y"
 	sentence_chance = 0
 	default_priority = 80

code/modules/language/narsian.dm

@@ -4,6 +4,7 @@
 	speech_verb = "intones"
 	ask_verb = "inquires"
 	exclaim_verb = "invokes"
+	sing_verb = "intones"
 	key = "n"
 	sentence_chance = 8
 	space_chance = 95 //very high due to the potential length of each syllable

code/modules/language/swarmer.dm

@@ -4,6 +4,7 @@
 	speech_verb = "tones"
 	ask_verb = "tones inquisitively"
 	exclaim_verb = "tones loudly"
+	sing_verb = "tones"
 	spans = list(SPAN_ROBOT)
 	key = "s"
 	flags = NO_STUTTER

code/modules/language/xenocommon.dm

@@ -4,6 +4,7 @@
 	speech_verb = "hisses"
 	ask_verb = "hisses"
 	exclaim_verb = "hisses"
+	sing_verb = "hisses musically"
 	key = "4"
 	syllables = list("sss","sSs","SSS")
 	default_priority = 50

code/modules/mob/living/say.dm

@@ -86,7 +86,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
 	var/static/list/unconscious_allowed_modes = list(MODE_CHANGELING = TRUE, MODE_ALIEN = TRUE)
 	var/talk_key = get_key(message)
 
-	var/static/list/one_character_prefix = list(MODE_HEADSET = TRUE, MODE_ROBOT = TRUE, MODE_WHISPER = TRUE)
+	var/static/list/one_character_prefix = list(MODE_HEADSET = TRUE, MODE_ROBOT = TRUE, MODE_WHISPER = TRUE, MODE_SING = TRUE)
 
 	if(sanitize)
 		message = trim(copytext(sanitize(message), 1, MAX_MESSAGE_LEN))
@@ -190,6 +190,15 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
 		var/datum/language/L = GLOB.language_datum_instances[language]
 		spans |= L.spans
 
+	if(message_mode == MODE_SING)
+	#if DM_VERSION < 513
+		var/randomnote = "~"
+	#else
+		var/randomnote = pick("\u2669", "\u266A", "\u266B")
+	#endif
+		spans |= SPAN_SINGING
+		message = "[randomnote] [message] [randomnote]"
+
 	var/radio_return = radio(message, message_mode, spans, language)
 	if(radio_return & ITALICS)
 		spans |= SPAN_ITALICS
@@ -399,6 +408,8 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
 		. = "stammers"
 	else if(derpspeech)
 		. = "gibbers"
+	else if(message_mode == MODE_SING)
+		. = verb_sing
 	else
 		. = ..()
 

code/modules/mob/living/simple_animal/bot/cleanbot.dm

@@ -282,6 +282,9 @@
 		/obj/effect/decal/cleanable/greenglow,
 		/obj/effect/decal/cleanable/dirt,
 		/obj/effect/decal/cleanable/insectguts,
+		/obj/effect/decal/cleanable/semen,
+		/obj/effect/decal/cleanable/milk,
+		/obj/effect/decal/cleanable/femcum,
 		/obj/effect/decal/remains
 		)
 

code/modules/mob/say.dm

@@ -90,6 +90,8 @@
 	var/key = copytext(message, 1, 2)
 	if(key == "#")
 		return MODE_WHISPER
+	else if(key == "%")
+		return MODE_SING
 	else if(key == ";")
 		return MODE_HEADSET
 	else if(length(message) > 2 && (key in GLOB.department_radio_prefixes))

code/modules/research/techweb/all_nodes.dm

@@ -1070,7 +1070,7 @@
 /datum/techweb_node/advanced_illegl_ballistics
 	id = "advanced_illegal_ballistics"
 	display_name = "Advanced Illegal Ballistics"
-	description = "Advanced Ballistic for Illegal weaponds."
+	description = "Advanced Ballistics for Illegal weapons."
 	design_ids = list("10mm","10mmap","10mminc","10mmhp","pistolm9mm","m45","bolt_clip")
 	prereq_ids = list("ballistic_weapons","syndicate_basic","explosive_weapons")
 	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 25000) //This gives sec lethal mags/clips for guns form traitors or space.

code/modules/tooltip/tooltip.html

@@ -122,8 +122,8 @@
 				//Get the real icon size according to the client view
 				var mapWidth 		= map['view-size'].x,
 					mapHeight 		= map['view-size'].y,
-					tilesShown 		= tooltip.client_view_w
-					realIconSize 	= mapWidth / tilesShown,
+					tilesShown 		= tooltip.client_view_h
+					realIconSize 	= mapHeight / tilesShown,
 					resizeRatio		= realIconSize / tooltip.tileSize,
 					//Calculate letterboxing offsets	
 					leftOffset 		= (map.size.x - mapWidth) / 2,

config/config.txt

@@ -300,7 +300,7 @@ TICK_LIMIT_MC_INIT 500
 #TICKLAG 0.5
 
 ##Can also be set as per-second value, the following value is identical to the above.
-FPS 10
+FPS 20
 
 ## Comment this out to disable automuting
 #AUTOMUTE_ON

goon/browserassets/css/browserOutput.css

@@ -835,6 +835,7 @@ h1.alert, h2.alert		{color: #000000;}
 .greentext				{color: #00FF00;	font-size: 24px;}
 .redtext				{color: #FF0000;	font-size: 24px;}
 .clown					{color: #FF69Bf;	font-size: 24px; font-family: "Comic Sans MS", cursive, sans-serif; font-weight: bold;}
+.singing				{font-family: "Trebuchet MS", cursive, sans-serif; font-style: italic;}
 .hypnophrase			{color: #202020;	font-weight: bold; animation: hypnocolor 1500ms infinite;}
 @keyframes hypnocolor {
 	0% { color: #202020; }

hyperstation/code/obj/fluff.dm

@@ -0,0 +1,17 @@
+/obj/structure/medscreen/
+	name = "medical screen"
+	desc = "No peaking now!"
+	icon_state = "screen"
+	icon = 'hyperstation/icons/obj/medical.dmi'
+	anchored = TRUE
+	resistance_flags = FLAMMABLE
+	max_integrity = 100
+	integrity_failure = 30
+	var/buildstacktype = /obj/item/stack/sheet/metal
+	var/buildstackamount = 2
+	density = TRUE
+
+/obj/structure/medscreen/Moved()
+	. = ..()
+	if(has_gravity())
+		playsound(src, 'sound/effects/roll.ogg', 100, 1)

interface/stylesheet.dm

@@ -152,6 +152,7 @@ h1.alert, h2.alert		{color: #000000;}
 .greentext				{color: #00FF00;	font-size: 3;}
 .redtext				{color: #FF0000;	font-size: 3;}
 .clown					{color: #FF69Bf;	font-size: 3; font-family: "Comic Sans MS", cursive, sans-serif; font-weight: bold;}
+.singing				{font-family: "Trebuchet MS", cursive, sans-serif; font-style: italic;}
 .his_grace				{color: #15D512;	font-family: "Courier New", cursive, sans-serif; font-style: italic;}
 .velvet					{color: #660015; 	font-weight: bold; animation: velvet 5000ms infinite;}
 @keyframes velvet {

strings/names/verbs.txt

@@ -486,6 +486,7 @@ sigh
 sign
 signal
 sin
+sing
 sip
 ski
 skip

tgstation.dme

@@ -2875,6 +2875,7 @@
 #include "hyperstation\code\mobs\werewolf.dm"
 #include "hyperstation\code\modules\antagonists\werewolf\werewolf.dm"
 #include "hyperstation\code\obj\decal.dm"
+#include "hyperstation\code\obj\fluff.dm"
 #include "hyperstation\code\obj\plushes.dm"
 #include "hyperstation\code\obj\pregnancytester.dm"
 #include "hyperstation\code\obj\rewards.dm"