Merge pull request #1 from Aurorastation/development

PR #2

.gitignore

@@ -25,3 +25,4 @@ data/investigate/gravity.html
 data/investigate/gravity.html
 data/investigate/gravity.html
 data/investigate/gravity.html
+data/investigate/gravity.html

code/controllers/configuration.dm

@@ -86,6 +86,7 @@
 	var/wikiurl
 	var/forumurl
 	var/aurorawikiurl
+	var/githuburl
 
 	//Alert level description
 	var/alert_desc_green = "All threats to the station have passed. Security may not have weapons visible, privacy laws are once again fully enforced."
@@ -339,6 +340,9 @@
 				if ("aurorawikiurl")
 					config.aurorawikiurl = value
 
+				if ("githuburl")
+					config.githuburl = value
+
 				if ("guest_jobban")
 					config.guest_jobban = 1
 

code/game/jobs/job/medical.dm

@@ -36,20 +36,18 @@
 			H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack)
 		return 1
 
-
-
 /datum/job/doctor
 	title = "Medical Doctor"
 	flag = DOCTOR
 	department_flag = MEDSCI
 	faction = "Station"
-	total_positions = 5
+	total_positions = 4
 	spawn_positions = 3
 	supervisors = "the chief medical officer"
 	selection_color = "#ffeef0"
 	access = list(access_medical, access_morgue, access_surgery, access_chemistry, access_virology, access_genetics)
 	minimal_access = list(access_medical, access_morgue, access_surgery, access_virology)
-	alt_titles = list("Surgeon","Emergency Physician","Nurse","Virologist")
+	alt_titles = list("Surgeon","Nurse","Virologist")
 
 	equip(var/mob/living/carbon/human/H)
 		if(!H)	return 0
@@ -60,9 +58,6 @@
 			if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
 		if (H.mind.role_alt_title)
 			switch(H.mind.role_alt_title)
-				if("Emergency Physician")
-					H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical(H), slot_w_uniform)
-					H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/fr_jacket(H), slot_wear_suit)
 				if("Surgeon")
 					H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/blue(H), slot_w_uniform)
 					H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat(H), slot_wear_suit)
@@ -102,7 +97,37 @@
 			H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack)
 		return 1
 
+/datum/job/emt
+	title = "Emergency Medical Tech"
+	flag = EMT
+	department_flag = MEDSCI
+	faction = "Station"
+	total_positions = 2
+	spawn_positions = 2
+	supervisors = "the chief medical officer"
+	selection_color = "#ffeef0"
+	access = list(access_medical, access_morgue, access_chemistry, access_genetics,access_maint_tunnels, access_external_airlocks)
+	minimal_access = list(access_medical, access_morgue, access_maint_tunnels, access_external_airlocks)
+	alt_titles = list("Paramedic")
 
+	equip(var/mob/living/carbon/human/H)
+		if(!H)	return 0
+		H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_med(H), slot_l_ear)
+		switch(H.backbag)
+			if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/emt(H), slot_back)
+			if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel/emt(H), slot_back)
+			if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back)
+		H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical/emt(H), slot_w_uniform)
+		H.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/fr_jacket(H), slot_wear_suit)
+		H.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(H), slot_shoes)
+		H.equip_to_slot_or_del(new /obj/item/device/pda/medical(H), slot_belt)
+		H.equip_to_slot_or_del(new /obj/item/weapon/storage/firstaid/adv(H), slot_l_hand)
+		H.equip_to_slot_or_del(new /obj/item/device/flashlight/pen(H), slot_s_store)
+		if(H.backbag == 1)
+			H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand)
+		else
+			H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack)
+		return 1
 
 //Chemist is a medical job damnit	//YEAH FUCK YOU SCIENCE	-Pete	//Guys, behave -Erro
 /datum/job/chemist

code/game/jobs/jobs.dm

@@ -23,13 +23,14 @@ var/const/SCIENTIST			=(1<<1)
 var/const/CHEMIST			=(1<<2)
 var/const/CMO				=(1<<3)
 var/const/DOCTOR			=(1<<4)
-var/const/GENETICIST		=(1<<5)
-var/const/VIROLOGIST		=(1<<6)
-var/const/PSYCHIATRIST		=(1<<7)
-var/const/ROBOTICIST		=(1<<8)
-var/const/XENOBIOLOGIST		=(1<<9)
-var/const/INTERN_MED		=(1<<10)
-var/const/INTERN_SCI		=(1<<11)
+var/const/EMT				=(1<<5)
+var/const/GENETICIST		=(1<<6)
+var/const/VIROLOGIST		=(1<<7)
+var/const/PSYCHIATRIST		=(1<<8)
+var/const/ROBOTICIST		=(1<<9)
+var/const/XENOBIOLOGIST		=(1<<10)
+var/const/INTERN_MED		=(1<<11)
+var/const/INTERN_SCI		=(1<<12)
 
 
 
@@ -79,7 +80,8 @@ var/list/medical_positions = list(
 	"Geneticist",
 	"Psychiatrist",
 	"Chemist",
-	"Nursing Inter"
+	"Emergency Medical Tech",
+	"Nursing Intern"
 )
 
 

code/game/machinery/computer/HolodeckControl.dm

@@ -402,7 +402,15 @@
 	return
 	// HOLOFLOOR DOES NOT GIVE A FUCK
 
+/turf/simulated/floor/holofloor/desert
+	name = "desert sand"
+	desc = "Uncomfortably gritty for a hologram."
+	icon_state = "asteroid"
 
+/turf/simulated/floor/holofloor/desert/New()
+	..()
+	if(prob(10))
+		overlays += "asteroid[rand(0,9)]"
 
 
 

code/game/machinery/doors/windowdoor.dm

@@ -36,6 +36,8 @@
 	..()
 
 /obj/machinery/door/window/Bumped(atom/movable/AM as mob|obj)
+	if(ispAI(AM))	//So that pAIs can't open all of the windoors forever.
+		return
 	if (!( ismob(AM) ))
 		var/obj/machinery/bot/bot = AM
 		if(istype(bot))

code/game/objects/items/weapons/storage/backpack.dm

@@ -102,6 +102,12 @@
 	icon_state = "clownpack"
 	item_state = "clownpack"
 
+/obj/item/weapon/storage/backpack/emt
+	name = "emergency medical backpack"
+	desc = "It's a tough backpack used by first responders."
+	icon_state = "emtpack"
+	item_state = "emtpack"
+
 /obj/item/weapon/storage/backpack/medic
 	name = "medical backpack"
 	desc = "It's a backpack especially designed for use in a sterile environment."
@@ -135,6 +141,12 @@
 	desc = "It's a very fancy satchel made with fine leather."
 	icon_state = "satchel"
 
+/obj/item/weapon/storage/backpack/satchel/emt
+	name = "emergency medical satchel"
+	desc = "It's a tough satchel used by first responders."
+	icon_state = "satchel-emt"
+	item_state = "satchel-emt"
+
 /obj/item/weapon/storage/backpack/satchel/withwallet
 	New()
 		..()

code/game/verbs/ooc.dm

@@ -63,13 +63,13 @@ var/global/normal_ooc_colour = "#002eb8"
 
 	var/display_colour = normal_ooc_colour
 	if(holder && !holder.fakekey)
-		display_colour = "#0099cc"	//light blue
+//		display_colour = "#0099cc"	//light blue //We decided they didn't need to be known
 		if(holder.rights & R_MOD && !(holder.rights & R_ADMIN))
 			display_colour = "#1b521f"	//dark green
-		if(holder.rights & R_DEBUG && !(holder.rights & R_ADMIN))
-			display_colour = "#184880"	//dark blue
 		if(holder.rights & R_DEV && !(holder.rights & R_ADMIN))
 			display_colour = "#184880"	//dark blue
+		if(holder.rights & R_DEBUG && !(holder.rights & R_ADMIN)) //This is actually a higher rank
+			display_colour = "#0099cc"	//light blue
 		else if(holder.rights & R_ADMIN)
 			if(config.allow_admin_ooccolor)
 				display_colour = src.prefs.ooccolor
@@ -81,7 +81,7 @@ var/global/normal_ooc_colour = "#002eb8"
 			var/display_name = src.key
 			if(holder)
 				if(holder.fakekey)
-					if(C.holder & (holder.rights & (R_ADMIN|R_MOD)))
+					if(C.holder && C.holder.rights & (R_ADMIN|R_MOD))
 						display_name = "[holder.fakekey]/([src.key])"
 					else
 						display_name = holder.fakekey
@@ -197,10 +197,9 @@ var/global/normal_ooc_colour = "#002eb8"
 						display_name = holder.fakekey
 			C << "<font color='#6699CC'><span class='ooc'><span class='prefix'>LOOC:</span> <EM>[display_name]:</EM> <span class='message'>[msg]</span></span></font>"
 	for(var/client/C in admins)
-		if(!C.holder.rights & (R_ADMIN|R_MOD|R_DEV))
-			continue
-		if(C.prefs.toggles & CHAT_LOOC)
-			var/prefix = "(R)LOOC"
-			if (C.mob in heard)
-				prefix = "LOOC"
-			C << "<font color='#6699CC'><span class='ooc'><span class='prefix'>[prefix]:</span> <EM>[src.key]:</EM> <span class='message'>[msg]</span></span></font>"
+		if(C.holder.rights & (R_ADMIN|R_MOD|R_DEV))
+			if(C.prefs.toggles & CHAT_LOOC)
+				var/prefix = "(R)LOOC"
+				if (C.mob in heard)
+					prefix = "LOOC"
+				C << "<font color='#6699CC'><span class='ooc'><span class='prefix'>[prefix]:</span> <EM>[src.key]:</EM> <span class='message'>[msg]</span></span></font>"

code/modules/client/preferences.dm

@@ -1176,6 +1176,8 @@ datum/preferences
 							r_hair = hex2num(copytext(new_hair, 2, 4))
 							g_hair = hex2num(copytext(new_hair, 4, 6))
 							b_hair = hex2num(copytext(new_hair, 6, 8))
+					else if (species == "Machine")
+						alert("Please select the Body Color instead.")
 
 				if("h_style")
 					var/list/valid_hairstyles = list()
@@ -1250,12 +1252,16 @@ datum/preferences
 						s_tone = 35 - max(min( round(new_s_tone), 220),1)
 
 				if("skin")
-					if(species == "Unathi" || species == "Tajaran" || species == "Skrell")
+					if(species == "Unathi" || species == "Tajaran" || species == "Skrell" || species == "Machine")
 						var/new_skin = input(user, "Choose your character's skin colour: ", "Character Preference") as color|null
 						if(new_skin)
 							r_skin = hex2num(copytext(new_skin, 2, 4))
 							g_skin = hex2num(copytext(new_skin, 4, 6))
 							b_skin = hex2num(copytext(new_skin, 6, 8))
+							if(species == "Machine")
+								r_hair = r_skin
+								g_hair = g_skin
+								b_hair = b_skin
 
 				if("ooccolor")
 					var/new_ooccolor = input(user, "Choose your OOC colour:", "Game Preference") as color|null

code/modules/clothing/under/jobs/medsci.dm

@@ -105,7 +105,11 @@
 	item_color = "orderly"
 	permeability_coefficient = 0.50
 	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
-
+/obj/item/clothing/under/rank/medical/emt
+	name = "emergency medical technician's jumpsuit"
+	icon_state = "emt"
+	item_state = "emt"
+	item_color = "emt"
 /obj/item/clothing/under/rank/medical
 	desc = "It's made of a special fiber that provides minor protection against biohazards. It has a cross on the chest denoting that the wearer is trained medical personnel."
 	name = "medical doctor's jumpsuit"

code/modules/economy/Job_Departments.dm

@@ -47,6 +47,8 @@ var/list/station_departments = list("Command", "Medical", "Engineering", "Scienc
 
 /datum/job/doctor/department = "Medical"
 
+/datum/job/emt/department = "Medical"
+
 /datum/job/chemist/department = "Medical"
 
 /datum/job/geneticist/department = "Medical"

code/modules/mob/living/silicon/pai/pai.dm

@@ -337,6 +337,10 @@
 	card.forceMove(src)
 	card.screen_loc = null
 
+	//Controlling the visibility of sign language.
+	if(translator_on)
+		add_language("Sign language", 0)
+
 	var/turf/T = get_turf(src)
 	if(istype(T)) T.visible_message("<b>[src]</b> folds outwards, expanding into a mobile form.")
 
@@ -439,6 +443,9 @@
 	card.forceMove(card.loc)
 	canmove = 0
 
+	if(translator_on)
+		remove_language("Sign language")
+
 /mob/living/silicon/pai/start_pulling(var/atom/movable/AM)
 
 	if(istype(AM,/obj/item))

code/modules/mob/living/silicon/pai/software.dm

@@ -693,7 +693,6 @@
 	if(translator_on)
 		translator_on = 0
 
-		remove_language("Sign language")
 		remove_language("Sinta'unathi")
 		remove_language("Siik'Maas")
 		remove_language("Skrellian")
@@ -704,6 +703,9 @@
 		remove_language("Tradeband")
 		remove_language("Gutter")
 
+		if(canmove)	//Easiest way to check whether or not the thing is actually deployed or not, for managing Sign Language.
+			remove_language("Sign language")
+
 		src << "\blue Translator Module toggled OFF."
 
 	else
@@ -718,6 +720,8 @@
 		add_language("Sol Common")
 		add_language("Tradeband")
 		add_language("Gutter")
-		add_language("Sign language", 0)
+
+		if(canmove)
+			add_language("Sign language", 0)
 
 		src << "\blue Translator Module toggled ON."

code/modules/mob/living/simple_animal/friendly/cat.dm

@@ -66,12 +66,11 @@
 
 	var/mob/living/carbon/H = over_object
 	if(!istype(H)) return ..()
+	if(in_range(usr, src))
+		if(H.a_intent == "help")
+			get_scooped(H)
+			return
 
-	if(H.a_intent == "help")
-		get_scooped(H)
-		return
-	else
-		return ..()
 
 //RUNTIME IS ALIVE! SQUEEEEEEEE~
 /mob/living/simple_animal/cat/Runtime

code/modules/mob/living/simple_animal/friendly/lizard.dm

@@ -22,9 +22,7 @@
 
 	var/mob/living/carbon/H = over_object
 	if(!istype(H)) return ..()
-
-	if(H.a_intent == "help")
-		get_scooped(H)
-		return
-	else
-		return ..()
+	if(in_range(usr, src))
+		if(H.a_intent == "help")
+			get_scooped(H)
+			return

code/modules/mob/living/simple_animal/friendly/mouse.dm

@@ -114,12 +114,10 @@
 
 	var/mob/living/carbon/H = over_object
 	if(!istype(H)) return ..()
-
-	if(H.a_intent == "help")
-		get_scooped(H)
-		return
-	else
-		return ..()
+	if(in_range(usr, src))
+		if(H.a_intent == "help")
+			get_scooped(H)
+			return
 
 /*
  * Mouse types
@@ -150,4 +148,8 @@
 	response_harm   = "splats"
 
 /mob/living/simple_animal/mouse/can_use_vents()
-	return
+	return
+
+/mob/living/simple_animal/mouse/ghost()
+	client.time_died_as_mouse = world.time
+	..()

code/modules/mob/new_player/preferences_setup.dm

@@ -506,6 +506,17 @@ datum/preferences
 							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-med"), ICON_OVERLAY)
 						if(4)
 							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
+				if(EMT)
+					clothes_s = new /icon('icons/mob/uniform.dmi', "emt_s")
+					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
+					clothes_s.Blend(new /icon('icons/mob/suit.dmi', "fr_jacket_open"), ICON_OVERLAY)
+					switch(backbag)
+						if(2)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "emtpack"), ICON_OVERLAY)
+						if(3)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-emt"), ICON_OVERLAY)
+						if(4)
+							clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
 				if(GENETICIST)
 					clothes_s = new /icon('icons/mob/uniform.dmi', "geneticswhite_s")
 					clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)

code/stylesheet.dm

@@ -20,7 +20,7 @@ em						{font-style: normal;	font-weight: bold;}
 .adminobserver			{color: #996600;	font-weight: bold;}
 .admin					{color: #386aff;	font-weight: bold;}
 .adminsay				{color: #9611D4;	font-weight: bold;}
-.dutysay				{color: #C19A3B;}
+.dutysay				{color: #380B61;}
 .name					{					font-weight: bold;}
 
 .say					{}

data/investigate/gravity.html

@@ -1,22 +0,0 @@
-<small>03:56 [0x20078f6] (92,152,1)</small> || the gravitational generator has regained power.<br>
-<small>03:56 [0x20078f6] (92,152,1)</small> || the gravitational generator is now charging.<br>
-<small>03:56 [0x20078f6] (92,152,1)</small> || the gravitational generator has regained power.<br>
-<small>03:56 [0x20078f6] (92,152,1)</small> || the gravitational generator is now charging.<br>
-<small>03:56 [0x20078f6] (92,152,1)</small> || the gravitational generator has regained power.<br>
-<small>03:56 [0x20078f6] (92,152,1)</small> || the gravitational generator is now charging.<br>
-<small>04:01 [0x20078f6] (92,152,1)</small> || the gravitational generator has regained power.<br>
-<small>04:01 [0x20078f6] (92,152,1)</small> || the gravitational generator is now charging.<br>
-<small>04:06 [0x20078f6] (92,152,1)</small> || the gravitational generator has regained power.<br>
-<small>04:06 [0x20078f6] (92,152,1)</small> || the gravitational generator is now charging.<br>
-<small>04:11 [0x20078f6] (92,152,1)</small> || the gravitational generator has regained power.<br>
-<small>04:11 [0x20078f6] (92,152,1)</small> || the gravitational generator is now charging.<br>
-<small>04:16 [0x20078f6] (92,152,1)</small> || the gravitational generator has regained power.<br>
-<small>04:16 [0x20078f6] (92,152,1)</small> || the gravitational generator is now charging.<br>
-<small>04:21 [0x20078f6] (92,152,1)</small> || the gravitational generator has regained power.<br>
-<small>04:21 [0x20078f6] (92,152,1)</small> || the gravitational generator is now charging.<br>
-<small>04:26 [0x20078f6] (92,152,1)</small> || the gravitational generator has regained power.<br>
-<small>04:26 [0x20078f6] (92,152,1)</small> || the gravitational generator is now charging.<br>
-<small>04:31 [0x20078f6] (92,152,1)</small> || the gravitational generator has regained power.<br>
-<small>04:31 [0x20078f6] (92,152,1)</small> || the gravitational generator is now charging.<br>
-<small>04:36 [0x20078f6] (92,152,1)</small> || the gravitational generator has regained power.<br>
-<small>04:36 [0x20078f6] (92,152,1)</small> || the gravitational generator is now charging.<br>

html/changelog.html

@@ -56,6 +56,33 @@ should be listed in the changelog upon commit though. Thanks. -->
 
 <!-- DO NOT REMOVE, MOVE, OR COPY THIS COMMENT! THIS MUST BE THE LAST NON-EMPTY LINE BEFORE THE LOGS #ADDTOCHANGELOGMARKER# -->
 
+<div class='commit sansserif'>
+	<h2 class='date'>26 February 2015</h2>
+	<h3 class='author'>Skull132 updated:</h3>
+	<ul class='changes bgimages16'>
+		<li class='rscadd'>Temporary brigdge design in effect, until a new one is chosen</li>
+	</ul>
+</div>
+
+<div class='commit sansserif'>
+	<h2 class='date'>26 February 2015</h2>
+	<h3 class='author'>SoundScopes updated:</h3>
+	<ul class='changes bgimages16'>
+		<li class='rscadd'>IPC's can now change their body colour (the selection being tied to head colour as well)</li>
+		<li class='rscadd'>Github/Issues tracker button up top right</li>
+		<li class='rscadd'>Emergency Medical Tech job, 2 slots</li>
+		<li class='rscadd'>Arrivals can now be converted into a checkpoint with added blastdoors. Requires bridge access</li>
+		<li class='tweak'>pAI's ability to translate sign language modified, needs translator on and has to be deployed in order to see the language being spoken</li>
+		<li class='tweak'>Item costs for custom loadouts modified, to be more uniform and in line with eachother</li>
+		<li class='tweak'>Duty Officer OOC colour reverted to that of normal players</li>
+		<li class='bugfix'>Respawning as a mouse has a five minute timer again</li>
+		<li class='bugfix'>Mice and other simple animals can no longer be picked up if you're not right next to them</li>
+		<li class='bugfix'>pAIs can no longer open every windoor and reinforced windoor</li>
+		<li class='bugfix'>Holodeck floor for the desert scene fixed</li>
+		<li class='bugfix'>Vents for the mining shuttle airlock now work</li>		
+	</ul>
+</div>
+
 <div class='commit sansserif'>
 	<h2 class='date'>18 February 2015</h2>
 	<h3 class='author'>SoundScopes updated:</h3>

interface/interface.dm

@@ -35,6 +35,18 @@
 		src << "\red The URL for the Aurorastation wiki is not set in the server configuration."
 	return
 
+/client/verb/github()
+	set name = "github"
+	set desc = "Visit the Aurorastation Github page, where bugs and issues can be reported!"
+	set hidden = 1
+	if ( config.githuburl )
+		if(alert("This will open the Github Issues page in your browser. Are you sure?",,"Yes","No")=="No")
+			return
+		src << link(config.githuburl)
+	else
+		src << "\red The URL for the server's Github (issues) page is not set in the server configuration."
+	return
+
 #define RULES_FILE "config/rules.html"
 /client/verb/rules()
 	set name = "Rules"

interface/skin.dmf

@@ -1577,6 +1577,34 @@ window "rpane"
 		is-checked = false
 		group = "rpanemode"
 		button-type = pushbutton
+	elem "githubb"
+		type = BUTTON
+		pos = 461,0
+		size = 67x16
+		anchor1 = none
+		anchor2 = none
+		font-family = ""
+		font-size = 0
+		font-style = ""
+		text-color = #000000
+		background-color = none
+		is-visible = true
+		is-disabled = false
+		is-transparent = false
+		is-default = false
+		border = none
+		drop-zone = false
+		right-click = false
+		saved-params = "is-checked"
+		on-size = ""
+		text = "Bug Report"
+		image = ""
+		command = "github"
+		is-flat = false
+		stretch = false
+		is-checked = false
+		group = "rpanemode"
+		button-type = pushbutton
 	elem "aurorawikib"
 		type = BUTTON
 		pos = 202,0
@@ -1663,7 +1691,7 @@ window "rpane"
 		button-type = pushbox
 	elem "browseb"
 		type = BUTTON
-		pos = 464,0
+		pos = 564,0
 		size = 60x16
 		anchor1 = none
 		anchor2 = none