PLASMA MAAAAAAAAAAAAAAAAAAAAAAAN

.gitignore

@@ -22,8 +22,9 @@ info.json
 /dmis
 /interface-indented
 /code-indented
+*.new.dmi
 
 .metadata
 /bot/config.yml
 /bot/data
-/analysis
+/analysis

baystation12.dme

@@ -1006,6 +1006,7 @@
 #include "code\modules\mob\living\login.dm"
 #include "code\modules\mob\living\logout.dm"
 #include "code\modules\mob\living\say.dm"
+#include "code\modules\mob\living\carbon\_defines.dm"
 #include "code\modules\mob\living\carbon\carbon.dm"
 #include "code\modules\mob\living\carbon\carbon_defines.dm"
 #include "code\modules\mob\living\carbon\give.dm"
@@ -1066,6 +1067,7 @@
 #include "code\modules\mob\living\carbon\human\update_icons.dm"
 #include "code\modules\mob\living\carbon\human\whisper.dm"
 #include "code\modules\mob\living\carbon\human\catbeast\catbeast.dm"
+#include "code\modules\mob\living\carbon\human\plasmaman\species.dm"
 #include "code\modules\mob\living\carbon\metroid\death.dm"
 #include "code\modules\mob\living\carbon\metroid\emote.dm"
 #include "code\modules\mob\living\carbon\metroid\examine.dm"

code/_onclick/hud/screen_objects.dm

@@ -325,6 +325,13 @@
 											else
 												contents.Add(0)
 
+										// ACK ACK ACK Plasmen
+										if ("plasma")
+											if(t.air_contents.toxins)
+												contents.Add(t.air_contents.toxins)
+											else
+												contents.Add(0)
+
 
 								else
 									//no tank so we set contents to 0

code/game/objects/items/weapons/tanks/tank_types.dm

@@ -96,6 +96,17 @@
 		src.loc = F
 	return
 
+/obj/item/weapon/tank/plasma/plasmaman
+	desc = "The lifeblood of plasmamen.  Warning:  Extremely flammable, do not inhale (unless you're a plasman)."
+	icon_state = "plasma_fr"
+
+/obj/item/weapon/tank/plasma/plasmaman/examine()
+	set src in usr
+	..()
+	if(air_contents.toxins < 0.2 && loc==usr)
+		usr << text("\red <B>The meter on the [src.name] indicates you are almost out of plasma!</B>")
+		usr << sound('sound/effects/alert.ogg')
+
 /*
  * Emergency Oxygen
  */

code/modules/clothing/spacesuits/alien.dm

@@ -219,4 +219,55 @@
 	name = "vox security pressure helmet"
 	icon_state = "vox-pressure-security"
 	item_state = "vox-pressure-security"
-	desc = "A very alien-looking helmet for Nanotrasen-hired Vox. This one is for shitcurity."
+	desc = "A very alien-looking helmet for Nanotrasen-hired Vox. This one is for shitcurity."
+
+// PLASMEN SHIT
+// CAN'T WEAR UNLESS YOU'RE A PINK SKELLINGTON
+/obj/item/clothing/suit/space/plasmaman
+	w_class = 3
+	allowed = list(/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword,/obj/item/weapon/handcuffs,/obj/item/weapon/tank)
+	slowdown = 2
+	armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 0)
+	heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
+	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
+	max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECITON_TEMPERATURE
+	species_restricted = list("Plasmaman")
+
+	icon_state = "plasmaman_suit"
+	item_state = "plasmaman_suit"
+
+/obj/item/clothing/head/helmet/space/plasmaman
+	species_restricted = list("Plasmaman")
+
+	icon_state = "plasmaman_helmet0"
+	item_state = "plasmaman_helmet0"
+	var/brightness_on = 4 //luminosity when on
+	var/on = 0
+	var/no_light=0 // Disable the light on the atmos suit
+	action_button_name = "Toggle Helmet Light"
+
+	attack_self(mob/user)
+		if(!isturf(user.loc))
+			user << "You cannot turn the light on while in this [user.loc]" //To prevent some lighting anomalities.
+			return
+		if(no_light)
+			return
+		on = !on
+		icon_state = "plasmaman_helmet[on]"
+//		item_state = "rig[on]-[_color]"
+
+		if(on)	user.SetLuminosity(user.luminosity + brightness_on)
+		else	user.SetLuminosity(user.luminosity - brightness_on)
+
+	pickup(mob/user)
+		if(on)
+			user.SetLuminosity(user.luminosity + brightness_on)
+//			user.UpdateLuminosity()
+			SetLuminosity(0)
+
+	dropped(mob/user)
+		if(on)
+			user.SetLuminosity(user.luminosity - brightness_on)
+//			user.UpdateLuminosity()
+			SetLuminosity(brightness_on)

code/modules/media/jukebox.dm

@@ -497,6 +497,7 @@ var/global/loopModeNames=list(
 
 	playlist_id="muzak"
 	autoplay = 1
+	change_cost = 0
 
 	id_tag="DJ Satellite" // For autolink