cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-12 00:20:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into final_away_maps_additions

Browse Source 
# Conflicts:
#	code/__defines/misc.dm
#	code/modules/client/preference_setup/loadout/loadout_xeno/tajara.dm
#	icons/mob/head.dmi
#	maps/exodus/code/exodus.dm
This commit is contained in:
alberyk
2022-04-04 19:47:58 -03:00
parent 61118d6774 b44b124575
commit 8c1d2a7cde
100 changed files with 1824 additions and 447407 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/modular_computers/computers/subtypes/preset_pda.dm
-12
View File
@@ -44,18 +44,6 @@
. = ..()
card_slot.stored_item = new /obj/item/pen/fountain
/obj/item/modular_computer/handheld/pda/civilian/clown
_app_preset_type = /datum/modular_computer_app_presets/civilian/clown
icon_add = "clown"
/obj/item/modular_computer/handheld/pda/civilian/clown/Initialize()
. = ..()
card_slot.stored_item = new /obj/item/pen/crayon
/obj/item/modular_computer/handheld/pda/civilian/mime
_app_preset_type = /datum/modular_computer_app_presets/civilian/mime
icon_add = "mime"
// Engineering
/obj/item/modular_computer/handheld/pda/engineering