diff --git a/code/datums/uplink_items/uplink_general.dm b/code/datums/uplink_items/uplink_general.dm index 22ab171ff35..7f36a727544 100644 --- a/code/datums/uplink_items/uplink_general.dm +++ b/code/datums/uplink_items/uplink_general.dm @@ -859,6 +859,13 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) category = "(Pointless) Badassery" surplus = 0 +/datum/uplink_item/badass/pen + name = "Syndicate Fountain Pen" + desc = "A slick Syndicate-branded pen, to show everyone at the meeting that you mean business." + reference = "PEN" + item = /obj/item/pen/multi/syndicate + cost = 1 + /datum/uplink_item/badass/syndiecigs name = "Syndicate Smokes" desc = "Strong flavor, dense smoke, infused with omnizine." diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index 1c54633e47e..6a3d492555a 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -62,7 +62,6 @@ "blue" = list(0.5, 0.5, 1), "yellow" = list(1, 1, 0)) var/pen_colour_iconstate = "pencolor" - var/pen_colour_shift = 3 /obj/item/pen/multi/Initialize(mapload) ..() @@ -83,8 +82,6 @@ var/icon/colour_overlay = new(icon, pen_colour_iconstate) var/list/colours = colour_choices[colour] colour_overlay.SetIntensity(colours[1], colours[2], colours[3]) - if(pen_colour_shift) - colour_overlay.Shift(SOUTH, pen_colour_shift) . += colour_overlay /obj/item/pen/fancy @@ -93,16 +90,54 @@ icon_state = "fancypen" /obj/item/pen/multi/gold - name = "Gilded Pen" + name = "gilded pen" desc = "A golden pen that is gilded with a meager amount of gold material. The word 'Nanotrasen' is etched on the clip of the pen." icon_state = "goldpen" - pen_colour_shift = 0 /obj/item/pen/multi/fountain - name = "Engraved Fountain Pen" - desc = "An expensive looking pen." + name = "engraved fountain pen" + desc = "An expensive-looking pen typically issued to Nanotrasen employees." icon_state = "fountainpen" - pen_colour_shift = 0 + +/obj/item/pen/multi/syndicate + name = "syndicate fountain pen" + desc = "A suspicious-looking pen issued to Syndicate staff." + icon_state = "pen_syndie" + +/obj/item/pen/cap + name = "captain's fountain pen" + desc = "An expensive pen only issued to station captains." + icon_state = "pen_cap" + +/obj/item/pen/hop + name = "head of personnel's fountain pen" + desc = "An expensive-looking pen only issued to heads of service." + icon_state = "pen_hop" + +/obj/item/pen/hos + name = "head of security's fountain pen" + desc = "An expensive-looking pen only issued to heads of security." + icon_state = "pen_hos" + +/obj/item/pen/cmo + name = "chief medical officer's fountain pen" + desc = "An expensive-looking pen only issued to heads of medical." + icon_state = "pen_cmo" + +/obj/item/pen/ce + name = "chief engineer's fountain pen" + desc = "An expensive-looking pen only issued to heads of engineering." + icon_state = "pen_ce" + +/obj/item/pen/rd + name = "research director's fountain pen" + desc = "An expensive-looking pen only issued to heads of research." + icon_state = "pen_rd" + +/obj/item/pen/qm + name = "quartermaster's fountain pen" + desc = "An expensive-looking pen only issued to heads of cargo." + icon_state = "pen_qm" /* * Sleepypens diff --git a/code/modules/pda/PDA.dm b/code/modules/pda/PDA.dm index 294cfabd43e..231dafbef73 100644 --- a/code/modules/pda/PDA.dm +++ b/code/modules/pda/PDA.dm @@ -76,7 +76,8 @@ GLOBAL_LIST_EMPTY(PDAs) // The slot where you can store a pen var/obj/item/held_pen var/retro_mode = 0 - + /// What pen is loaded in the PDA + var/obj/item/pen/default_pen = /obj/item/pen /* * The Actual PDA @@ -90,7 +91,7 @@ GLOBAL_LIST_EMPTY(PDAs) if(default_cartridge) cartridge = new default_cartridge(src) cartridge.update_programs(src) - add_pen(new /obj/item/pen(src)) + add_pen(new default_pen(src)) start_program(find_program(/datum/data/pda/app/main_menu)) silent = initial(silent) diff --git a/code/modules/pda/pdas.dm b/code/modules/pda/pdas.dm index 8d568b0f145..9d290e709cb 100644 --- a/code/modules/pda/pdas.dm +++ b/code/modules/pda/pdas.dm @@ -17,10 +17,12 @@ /obj/item/pda/detective default_cartridge = /obj/item/cartridge/detective icon_state = "pda-security" + default_pen = /obj/item/pen/multi /obj/item/pda/warden default_cartridge = /obj/item/cartridge/security icon_state = "pda-warden" + default_pen = /obj/item/pen/multi /obj/item/pda/janitor default_cartridge = /obj/item/cartridge/janitor @@ -55,44 +57,54 @@ /obj/item/pda/heads/hop default_cartridge = /obj/item/cartridge/hop icon_state = "pda-hop" + default_pen = /obj/item/pen/hop /obj/item/pda/heads/hos default_cartridge = /obj/item/cartridge/hos icon_state = "pda-hos" + default_pen = /obj/item/pen/hos /obj/item/pda/heads/ce default_cartridge = /obj/item/cartridge/ce icon_state = "pda-ce" + default_pen = /obj/item/pen/ce /obj/item/pda/heads/cmo default_cartridge = /obj/item/cartridge/cmo icon_state = "pda-cmo" + default_pen = /obj/item/pen/cmo /obj/item/pda/heads/rd default_cartridge = /obj/item/cartridge/rd icon_state = "pda-rd" + default_pen = /obj/item/pen/rd /obj/item/pda/captain default_cartridge = /obj/item/cartridge/captain icon_state = "pda-captain" detonate = FALSE + default_pen = /obj/item/pen/cap //toff = 1 /obj/item/pda/heads/ntrep default_cartridge = /obj/item/cartridge/supervisor icon_state = "pda-h" + default_pen = /obj/item/pen/multi/fountain /obj/item/pda/heads/magistrate default_cartridge = /obj/item/cartridge/supervisor icon_state = "pda-h" + default_pen = /obj/item/pen/multi/gold /obj/item/pda/heads/blueshield default_cartridge = /obj/item/cartridge/hos icon_state = "pda-h" + default_pen = /obj/item/pen/fancy /obj/item/pda/heads/ert default_cartridge = /obj/item/cartridge/centcom detonate = FALSE + default_pen = /obj/item/pen/multi/fountain /obj/item/pda/heads/ert/engineering icon_state = "pda-engineer" @@ -116,6 +128,7 @@ /obj/item/pda/quartermaster default_cartridge = /obj/item/cartridge/qm icon_state = "pda-qm" + default_pen = /obj/item/pen/qm /obj/item/pda/shaftminer icon_state = "pda-miner" @@ -125,6 +138,7 @@ icon_state = "pda-syndi" name = "Military PDA" owner = "John Doe" + default_pen = /obj/item/pen/multi/syndicate /obj/item/pda/syndicate/New() ..() @@ -140,6 +154,7 @@ default_cartridge = /obj/item/cartridge/lawyer icon_state = "pda-lawyer" ttone = "..." + default_pen = /obj/item/pen/multi /obj/item/pda/botanist //default_cartridge = /obj/item/cartridge/botanist @@ -153,6 +168,7 @@ desc = "A portable microcomputer by Thinktronic Systems, LTD. This is model is a WGW-11 series e-reader." model_name = "Thinktronic 5290 WGW-11 Series E-reader and Personal Data Assistant" silent = TRUE + default_pen = /obj/item/pen/multi /obj/item/pda/clear icon_state = "pda-transp" @@ -180,6 +196,7 @@ /obj/item/pda/centcom default_cartridge = /obj/item/cartridge/centcom icon_state = "pda-h" + default_pen = /obj/item/pen/multi/gold /obj/item/pda/centcom/New() ..() diff --git a/icons/obj/bureaucracy.dmi b/icons/obj/bureaucracy.dmi index 599237fdadf..30a7fc4f732 100644 Binary files a/icons/obj/bureaucracy.dmi and b/icons/obj/bureaucracy.dmi differ