cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-19 02:54:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Pen resprite (#24756)

Browse Source 
* pens

* fountainpen description

* syndipen in uplink

* Apply suggestions from code review

Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* remove spaghetti

---------

Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
This commit is contained in:
Christasmurf
2024-03-29 15:19:36 +00:00
committed by GitHub
parent ff6af9bcb0
commit c87c5e4e16
5 changed files with 70 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/pda/PDA.dm
+3 -2
View File
@@ -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)
code/modules/pda/pdas.dm
+17
View File
@@ -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()
..()