Merge branch 'master' into upstream-merge-10007

code/game/objects/items/devices/floor_painter.dm

@@ -1,5 +1,5 @@
 /obj/item/device/floor_painter
-	name = "floor painter"
+	name = "paint sprayer"
 	icon = 'icons/obj/bureaucracy.dmi'
 	icon_state = "labeler1"
 
@@ -43,6 +43,10 @@
 	if(!proximity)
 		return
 
+	if(istype(A, /mob/living/silicon/robot/platform))
+		var/mob/living/silicon/robot/platform/robit = A
+		return robit.try_paint(src, user)
+
 	var/turf/simulated/floor/F = A
 	if(!istype(F))
 		to_chat(user, "<span class='warning'>\The [src] can only be used on station flooring.</span>")
@@ -115,20 +119,20 @@
 
 /obj/item/device/floor_painter/verb/choose_colour()
 	set name = "Choose Colour"
-	set desc = "Choose a floor painter colour."
+	set desc = "Choose a paint colour."
 	set category = "Object"
 	set src in usr
 
 	if(usr.incapacitated())
 		return
-	var/new_colour = input(usr, "Choose a colour.", "Floor painter", paint_colour) as color|null
+	var/new_colour = input(usr, "Choose a colour.", name, paint_colour) as color|null
 	if(new_colour && new_colour != paint_colour)
 		paint_colour = new_colour
 		to_chat(usr, "<span class='notice'>You set \the [src] to paint with <font color='[paint_colour]'>a new colour</font>.</span>")
 
 /obj/item/device/floor_painter/verb/choose_decal()
 	set name = "Choose Decal"
-	set desc = "Choose a floor painter decal."
+	set desc = "Choose a painting decal."
 	set category = "Object"
 	set src in usr
 
@@ -142,7 +146,7 @@
 
 /obj/item/device/floor_painter/verb/choose_direction()
 	set name = "Choose Direction"
-	set desc = "Choose a floor painter direction."
+	set desc = "Choose a painting direction."
 	set category = "Object"
 	set src in usr
 

code/game/objects/items/weapons/id cards/cards.dm

@@ -13,19 +13,48 @@
  */
 /obj/item/weapon/card
 	name = "card"
-	desc = "Does card things."
-	icon = 'icons/obj/card.dmi'
+	desc = "A tiny plaque of plastic. Does card things."
+	icon = 'icons/obj/card_new.dmi'
 	w_class = ITEMSIZE_TINY
 	slot_flags = SLOT_EARS
 	var/associated_account_number = 0
 
+	var/list/initial_sprite_stack = list("")
+	var/base_icon = 'icons/obj/card_new.dmi'
+	var/list/sprite_stack
+
 	var/list/files = list(  )
 	drop_sound = 'sound/items/drop/card.ogg'
 	pickup_sound = 'sound/items/pickup/card.ogg'
 
+/obj/item/weapon/card/New()
+	. = ..()
+	reset_icon()
+
+/obj/item/weapon/card/proc/reset_icon()
+	sprite_stack = initial_sprite_stack
+	update_icon()
+
+/obj/item/weapon/card/update_icon()
+	if(!sprite_stack || !istype(sprite_stack) || sprite_stack == list(""))
+		icon = base_icon
+		icon_state = initial(icon_state)
+
+	var/icon/I = null
+	for(var/iconstate in sprite_stack)
+		if(!iconstate)
+			iconstate = icon_state
+		if(I)
+			var/icon/IC = new(base_icon, iconstate)
+			I.Blend(IC, ICON_OVERLAY)
+		else
+			I = new/icon(base_icon, iconstate)
+	if(I)
+		icon = I
+
 /obj/item/weapon/card/data
-	name = "data disk"
-	desc = "A disk of data."
+	name = "data card"
+	desc = "A solid-state storage card, used to back up or transfer information. What knowledge could it contain?"
 	icon_state = "data"
 	var/function = "storage"
 	var/data = "null"
@@ -35,20 +64,20 @@
 	pickup_sound = 'sound/items/pickup/disk.ogg'
 
 /obj/item/weapon/card/data/verb/label(t as text)
-	set name = "Label Disk"
+	set name = "Label Card"
 	set category = "Object"
 	set src in usr
 
 	if (t)
-		src.name = text("data disk- '[]'", t)
+		src.name = text("data card- '[]'", t)
 	else
-		src.name = "data disk"
+		src.name = "data card"
 	src.add_fingerprint(usr)
 	return
 
 /obj/item/weapon/card/data/clown
 	name = "\proper the coordinates to clown planet"
-	icon_state = "data"
+	icon_state = "rainbow"
 	item_state = "card-id"
 	level = 2
 	desc = "This card contains coordinates to the fabled Clown Planet. Handle with care."
@@ -62,7 +91,7 @@
 /obj/item/weapon/card/emag_broken
 	desc = "It's a card with a magnetic strip attached to some circuitry. It looks too busted to be used for anything but salvage."
 	name = "broken cryptographic sequencer"
-	icon_state = "emag"
+	icon_state = "emag-spent"
 	item_state = "card-id"
 	origin_tech = list(TECH_MAGNET = 2, TECH_ILLEGAL = 2)
 

code/game/objects/items/weapons/id cards/id_stacks.dm

@@ -7,7 +7,7 @@
 	base_icon = 'icons/obj/card_new.dmi'
 
 	// New sprite stacks can be defined here. You could theoretically change icon-states as well but right now this file compiles before station_ids.dm so those wouldn't be affected.
-  
+
 /*
 /obj/item/weapon/card/id/generic
 	initial_sprite_stack = list("base-stamp", "top-generic", "stamp-silhouette", "clip")
@@ -145,4 +145,4 @@
 
 /obj/item/weapon/card/id/syndicate/officer
 	initial_sprite_stack = list("base-stamp-dark", "top-syndicate", "stamp-s", "pips-gold", "stripe-gold")
-*/
+*/

code/game/objects/items/weapons/id cards/station_ids.dm

@@ -1,7 +1,7 @@
 /obj/item/weapon/card/id
 	name = "identification card"
 	desc = "A card used to provide ID and determine access across the station."
-	icon_state = "id"
+	icon_state = "generic-nt"
 	item_state = "card-id"
 
 	sprite_sheets = list(
@@ -127,13 +127,13 @@
 /obj/item/weapon/card/id/silver
 	name = "identification card"
 	desc = "A silver card which shows honour and dedication."
-	icon_state = "silver"
+	icon_state = "silver-id"
 	item_state = "silver_id"
 
 /obj/item/weapon/card/id/gold
 	name = "identification card"
 	desc = "A golden card which shows power and might."
-	icon_state = "gold"
+	icon_state = "gold-id"
 	item_state = "gold_id"
 	preserve_item = 1
 
@@ -144,23 +144,36 @@
 /obj/item/weapon/card/id/gold/captain/spare
 	name = "\improper Site Manager's spare ID"
 	desc = "The spare ID of the High Lord himself."
+	icon_state = "gold-id-alternate"
 	registered_name = "Site Manager"
 
 /obj/item/weapon/card/id/synthetic
 	name = "\improper Synthetic ID"
 	desc = "Access module for NanoTrasen Synthetics"
 	icon_state = "id-robot"
-	item_state = "tdgreen"
+	item_state = "idgreen"
 	assignment = "Synthetic"
 
 /obj/item/weapon/card/id/synthetic/Initialize()
 	. = ..()
 	access = get_all_station_access().Copy() + access_synth
 
+/obj/item/weapon/card/id/platform
+	name = "\improper Support Platform ID"
+	desc = "Access module for support platforms."
+	icon_state = "id-robot"
+	item_state = "tdgreen"
+	assignment = "Synthetic"
+	access = list(
+		access_synth, access_mining, access_mining_station, access_mining_office, access_research,
+		access_xenoarch, access_xenobiology, access_external_airlocks, access_robotics, access_tox, 
+		access_tox_storage, access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot
+	)
+
 /obj/item/weapon/card/id/centcom
 	name = "\improper CentCom. ID"
 	desc = "An ID straight from Central Command."
-	icon_state = "nanotrasen"
+	icon_state = "cc-id"
 	registered_name = "Central Command"
 	assignment = "General"
 
@@ -175,7 +188,7 @@
 /obj/item/weapon/card/id/centcom/ERT
 	name = "\improper Emergency Response Team ID"
 	assignment = "Emergency Response Team"
-	icon_state = "centcom"
+	icon_state = "ert-id"
 
 /obj/item/weapon/card/id/centcom/ERT/Initialize()
 	. = ..()
@@ -185,14 +198,13 @@
 /obj/item/weapon/card/id/medical
 	name = "identification card"
 	desc = "A card issued to station medical staff."
-	icon_state = "med"
+	icon_state = "medical-id"
 	primary_color = rgb(189,237,237)
 	secondary_color = rgb(223,255,255)
 
 /obj/item/weapon/card/id/medical/head
 	name = "identification card"
 	desc = "A card which represents care and compassion."
-	icon_state = "medGold"
 	primary_color = rgb(189,237,237)
 	secondary_color = rgb(255,223,127)
 	assignment = "Chief Medical Officer"
@@ -201,14 +213,17 @@
 /obj/item/weapon/card/id/security
 	name = "identification card"
 	desc = "A card issued to station security staff."
-	icon_state = "sec"
+	icon_state = "security-id"
 	primary_color = rgb(189,47,0)
 	secondary_color = rgb(223,127,95)
 
+/obj/item/weapon/card/id/security/warden
+	assignment = "Warden"
+	rank = "Warden"
+
 /obj/item/weapon/card/id/security/head
 	name = "identification card"
 	desc = "A card which represents honor and protection."
-	icon_state = "secGold"
 	primary_color = rgb(189,47,0)
 	secondary_color = rgb(255,223,127)
 	assignment = "Head of Security"
@@ -217,14 +232,17 @@
 /obj/item/weapon/card/id/engineering
 	name = "identification card"
 	desc = "A card issued to station engineering staff."
-	icon_state = "eng"
+	icon_state = "engineering-id"
 	primary_color = rgb(189,94,0)
 	secondary_color = rgb(223,159,95)
 
+/obj/item/weapon/card/id/engineering/atmos
+	assignment = "Atmospheric Technician"
+	rank = "Atmospheric Technician"
+
 /obj/item/weapon/card/id/engineering/head
 	name = "identification card"
 	desc = "A card which represents creativity and ingenuity."
-	icon_state = "engGold"
 	primary_color = rgb(189,94,0)
 	secondary_color = rgb(255,223,127)
 	assignment = "Chief Engineer"
@@ -233,14 +251,13 @@
 /obj/item/weapon/card/id/science
 	name = "identification card"
 	desc = "A card issued to station science staff."
-	icon_state = "sci"
+	icon_state = "science-id"
 	primary_color = rgb(142,47,142)
 	secondary_color = rgb(191,127,191)
 
 /obj/item/weapon/card/id/science/head
 	name = "identification card"
 	desc = "A card which represents knowledge and reasoning."
-	icon_state = "sciGold"
 	primary_color = rgb(142,47,142)
 	secondary_color = rgb(255,223,127)
 	assignment = "Research Director"
@@ -249,14 +266,13 @@
 /obj/item/weapon/card/id/cargo
 	name = "identification card"
 	desc = "A card issued to station cargo staff."
-	icon_state = "cargo"
+	icon_state = "cargo-id"
 	primary_color = rgb(142,94,0)
 	secondary_color = rgb(191,159,95)
 
 /obj/item/weapon/card/id/cargo/head
 	name = "identification card"
 	desc = "A card which represents service and planning."
-	icon_state = "cargoGold"
 	primary_color = rgb(142,94,0)
 	secondary_color = rgb(255,223,127)
 	assignment = "Quartermaster"
@@ -269,7 +285,7 @@
 /obj/item/weapon/card/id/civilian
 	name = "identification card"
 	desc = "A card issued to station civilian staff."
-	icon_state = "civ"
+	icon_state = "civilian-id"
 	primary_color = rgb(0,94,142)
 	secondary_color = rgb(95,159,191)
 	assignment = "Civilian"
@@ -278,13 +294,12 @@
 /obj/item/weapon/card/id/civilian/head //This is not the HoP. There's no position that uses this right now.
 	name = "identification card"
 	desc = "A card which represents common sense and responsibility."
-	icon_state = "civGold"
 	primary_color = rgb(0,94,142)
 	secondary_color = rgb(255,223,127)
 
 /obj/item/weapon/card/id/external
 	name = "identification card"
 	desc = "An identification card of some sort. It does not look like it is issued by NT."
-	icon_state = "permit"
+	icon_state = "generic"
 	primary_color = rgb(142,94,0)
 	secondary_color = rgb(191,159,95)

code/game/objects/items/weapons/id cards/syndicate_ids.dm

@@ -1,6 +1,6 @@
 /obj/item/weapon/card/id/syndicate
 	name = "agent card"
-	icon_state = "syndicate"
+	icon_state = "generic-s"
 	assignment = "Agent"
 	origin_tech = list(TECH_ILLEGAL = 3)
 	var/electronic_warfare = 1
@@ -67,11 +67,12 @@
 	if(!id_card_states)
 		id_card_states = list()
 		for(var/path in typesof(/obj/item/weapon/card/id))
-			var/obj/item/weapon/card/id/ID = path
+			var/obj/item/weapon/card/id/ID = new path()
 			var/datum/card_state/CS = new()
 			CS.icon_state = initial(ID.icon_state)
 			CS.item_state = initial(ID.item_state)
-			CS.name = initial(ID.name) + " - " + initial(ID.icon_state)
+			CS.sprite_stack = ID.initial_sprite_stack
+			CS.name = initial(ID.name)
 			id_card_states += CS
 		id_card_states = dd_sortedObjectList(id_card_states)
 
@@ -81,6 +82,7 @@
 	var/name
 	var/icon_state
 	var/item_state
+	var/sprite_stack
 
 /datum/card_state/dd_SortValue()
 	return name
@@ -89,5 +91,6 @@
 	name = "syndicate ID card"
 	desc = "An ID straight from the Syndicate."
 	registered_name = "Syndicate"
-	assignment = "Syndicate Overlord"
-	access = list(access_syndicate, access_external_airlocks)
+	assignment = "Syndicate Commander"
+	icon_state = "syndicate-id"
+	access = list(access_syndicate, access_external_airlocks)

code/game/objects/items/weapons/material/knives.dm

@@ -140,6 +140,11 @@
 	slot_flags = SLOT_BELT
 	default_material = "plasteel" //VOREStation Edit
 
+/obj/item/weapon/material/knife/machete/cyborg
+	name = "integrated machete"
+	desc = "A sharp machete often found attached to robots."
+	unbreakable = TRUE
+
 /obj/item/weapon/material/knife/tacknife/survival
 	name = "survival knife"
 	desc = "A hunting grade survival knife."

code/game/objects/objs.dm

@@ -165,9 +165,6 @@
 /obj/proc/show_message(msg, type, alt, alt_type)//Message, type of message (1 or 2), alternative message, alt message type (1 or 2)
 	return
 
-/obj/proc/get_cell()
-	return
-
 // Used to mark a turf as containing objects that are dangerous to step onto.
 /obj/proc/register_dangerous_to_step()
 	var/turf/T = get_turf(src)

code/game/objects/structures/ghost_pods/event_vr.dm

@@ -38,7 +38,7 @@
 			break
 
 		if(choice)
-			finalized = alert(M, "Are you sure you want to play as [choice]?","Confirmation","No","Yes")
+			finalized = alert(M, "Are you sure you want to play as [choice]? By clicking yes you should expect to be treated as vore predator and possibly killed. Do not attack other players. You will have minimal OOC pref protections.","Confirmation","No","Yes")
 
 	if(randomize)
 		choice = pick(possible_mobs)
@@ -99,4 +99,4 @@
 	qdel(src)
 
 /obj/structure/ghost_pod/ghost_activated/morphspawn/no_announce
-	announce_prob = 0
+	announce_prob = 0