This is SS13 in 2014

_maps/RandomRuins/SpaceRuins/caravanambush.dmm

@@ -562,7 +562,7 @@
 "tL" = (
 /obj/effect/turf_decal/bot_white,
 /obj/structure/closet/crate/secure/engineering,
-/obj/item/organ/internal/cyberimp/arm/toolset,
+/obj/item/organ/internal/cyberimp/arm/item_set,
 /obj/item/organ/internal/cyberimp/eyes/hud/medical,
 /obj/item/organ/internal/cyberimp/brain/anti_stun,
 /turf/open/floor/iron/dark/airless,

_maps/RandomRuins/SpaceRuins/oldstation.dmm

@@ -4686,7 +4686,7 @@
 	pixel_x = 17;
 	pixel_y = 12
 	},
-/obj/item/organ/internal/cyberimp/arm/toolset{
+/obj/item/organ/internal/cyberimp/arm/item_set{
 	pixel_y = 2;
 	pixel_x = 6
 	},

_maps/map_files/tramstation/tramstation.dmm

@@ -5742,7 +5742,7 @@
 /area/station/commons/fitness/recreation)
 "aMY" = (
 /obj/structure/industrial_lift/tram,
-/obj/structure/window/reinforced/tram/mid/directional/south,
+/obj/structure/window/reinforced/tram/directional/south,
 /turf/open/openspace,
 /area/station/hallway/primary/tram/center)
 "aNa" = (
@@ -23405,14 +23405,6 @@
 /obj/structure/sign/poster/contraband/random/directional/east,
 /turf/open/floor/plating,
 /area/station/asteroid)
-"gxA" = (
-/obj/structure/industrial_lift/tram,
-/obj/structure/window/reinforced/tram/right/directional/north,
-/obj/structure/chair/sofa/bench/tram/right{
-	dir = 8
-	},
-/turf/open/openspace,
-/area/station/hallway/primary/tram/center)
 "gxY" = (
 /obj/effect/turf_decal/trimline/neutral/filled/line{
 	dir = 10
@@ -37415,7 +37407,7 @@
 /area/station/hallway/primary/tram/right)
 "kYp" = (
 /obj/structure/industrial_lift/tram,
-/obj/structure/window/reinforced/tram/right/directional/south,
+/obj/structure/window/reinforced/tram/directional/south,
 /obj/machinery/destination_sign/south{
 	pixel_y = -11
 	},
@@ -45848,7 +45840,7 @@
 /area/station/hallway/secondary/command)
 "nKp" = (
 /obj/structure/industrial_lift/tram,
-/obj/structure/window/reinforced/tram/left/directional/north,
+/obj/structure/window/reinforced/tram/directional/north,
 /obj/structure/chair/sofa/bench/tram/right{
 	dir = 8
 	},
@@ -46204,7 +46196,7 @@
 /area/station/ai_monitored/turret_protected/aisat/hallway)
 "nQc" = (
 /obj/structure/industrial_lift/tram,
-/obj/structure/window/reinforced/tram/right/directional/north,
+/obj/structure/window/reinforced/tram/directional/north,
 /obj/machinery/destination_sign/north{
 	pixel_y = 10
 	},
@@ -47601,7 +47593,7 @@
 /obj/machinery/destination_sign/north{
 	pixel_y = 10
 	},
-/obj/structure/window/reinforced/tram/left/directional/north,
+/obj/structure/window/reinforced/tram/directional/north,
 /obj/structure/chair/sofa/bench/tram/right{
 	dir = 8
 	},
@@ -59134,7 +59126,7 @@
 /area/station/maintenance/starboard/central)
 "rZD" = (
 /obj/structure/industrial_lift/tram,
-/obj/structure/window/reinforced/tram/left/directional/south,
+/obj/structure/window/reinforced/tram/directional/south,
 /obj/structure/chair/sofa/bench/tram/right{
 	dir = 4
 	},
@@ -59552,14 +59544,6 @@
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
 /turf/open/floor/iron/smooth,
 /area/station/hallway/primary/tram/right)
-"sgt" = (
-/obj/structure/industrial_lift/tram,
-/obj/structure/window/reinforced/tram/right/directional/south,
-/obj/structure/chair/sofa/bench/tram/right{
-	dir = 4
-	},
-/turf/open/openspace,
-/area/station/hallway/primary/tram/center)
 "sgu" = (
 /obj/structure/table/reinforced,
 /obj/item/folder/yellow,
@@ -67604,7 +67588,7 @@
 /obj/machinery/destination_sign/south{
 	pixel_y = -11
 	},
-/obj/structure/window/reinforced/tram/left/directional/south,
+/obj/structure/window/reinforced/tram/directional/south,
 /obj/effect/landmark/start/hangover,
 /obj/structure/chair/sofa/bench/tram/left{
 	dir = 8
@@ -77798,7 +77782,7 @@
 /area/station/science/xenobiology)
 "xVH" = (
 /obj/structure/industrial_lift/tram,
-/obj/structure/window/reinforced/tram/mid/directional/north,
+/obj/structure/window/reinforced/tram/directional/north,
 /turf/open/openspace,
 /area/station/hallway/primary/tram/center)
 "xVJ" = (
@@ -176752,11 +176736,11 @@ aEk
 veL
 cMD
 jJV
-gxA
+nKp
 hio
 kpb
 aEq
-sgt
+rZD
 jJV
 syH
 pxC

code/__DEFINES/DNA.dm

@@ -126,6 +126,10 @@
 #define ORGAN_SLOT_ZOMBIE "zombie_infection"
 #define ORGAN_SLOT_BUTT "butt"
 #define ORGAN_SLOT_BLADDER "bladder"
+#define ORGAN_SLOT_LINK "cyber_link"
+#define ORGAN_SLOT_RIGHT_LEG_AUG "r_leg_device"
+#define ORGAN_SLOT_LEFT_LEG_AUG "l_leg_device"
+#define ORGAN_SLOT_SPINAL "spinal_implant"
 
 /// Organ slot external
 #define ORGAN_SLOT_EXTERNAL_TAIL "tail"
@@ -170,9 +174,13 @@
 /// Exists so Life()'s organ process order is consistent
 GLOBAL_LIST_INIT(organ_process_order, list(
 	ORGAN_SLOT_BRAIN,
+	ORGAN_SLOT_LINK,
+	ORGAN_SLOT_SPINAL,
 	ORGAN_SLOT_APPENDIX,
 	ORGAN_SLOT_RIGHT_ARM_AUG,
 	ORGAN_SLOT_LEFT_ARM_AUG,
+	ORGAN_SLOT_RIGHT_LEG_AUG,
+	ORGAN_SLOT_LEFT_LEG_AUG,
 	ORGAN_SLOT_STOMACH,
 	ORGAN_SLOT_STOMACH_AID,
 	ORGAN_SLOT_BREATHING_TUBE,

code/__DEFINES/atom_hud.dm

@@ -51,6 +51,8 @@
 #define DIAG_NANITE_FULL_HUD "24"
 // for gun permit
 #define PERMIT_HUD "25"
+// for implants to let you see sensor field
+#define SENSOR_HUD	"26"
 //monkestation edit end
 
 //by default everything in the hud_list of an atom is an image
@@ -70,6 +72,7 @@
 #define DATA_HUD_AI_DETECT 9
 #define DATA_HUD_FAN 10
 #define DATA_HUD_PERMIT 11 //monkestation edit
+#define DATA_HUD_SENSORS 12 //monkestation edit
 
 // Notification action types
 #define NOTIFY_JUMP "jump"

code/__DEFINES/dcs/signals/signals_object.dm

@@ -321,10 +321,10 @@
 //called in /obj/item/tank/jetpack/proc/turn_off() : ()
 #define COMSIG_JETPACK_DEACTIVATED "jetpack_deactivated"
 
-//called in /obj/item/organ/cyberimp/chest/thrusters/proc/toggle() : ()
+//called in /obj/item/organ/internal/cyberimp/chest/thrusters/proc/toggle() : ()
 #define COMSIG_THRUSTER_ACTIVATED "jetmodule_activated"
 	#define THRUSTER_ACTIVATION_FAILED (1<<0)
-//called in /obj/item/organ/cyberimp/chest/thrusters/proc/toggle() : ()
+//called in /obj/item/organ/internal/cyberimp/chest/thrusters/proc/toggle() : ()
 #define COMSIG_THRUSTER_DEACTIVATED "jetmodule_deactivated"
 
 // /obj/item/camera signals

code/__DEFINES/hud.dm

@@ -34,10 +34,12 @@
 	Therefore, the top right corner (except during admin shenanigans) is at "15,15"
 */
 
-/proc/ui_hand_position(i) //values based on old hand ui positions (CENTER:-/+16,SOUTH:5)
-	var/x_off = i % 2 ? 0 : -1
-	var/y_off = round((i-1) / 2)
-	return"CENTER+[x_off]:16,SOUTH+[y_off]:5"
+//Monkestation EDIT: START - CYBERNETICS
+/proc/ui_hand_position(i,y_offset = 0,y_pixel_offset = 0) //values based on old hand ui positions (CENTER:-/+16,SOUTH:5)
+	var/x_off = -(!(i % 2))
+	var/y_off = round((i-1) / 2) + y_offset
+	return"CENTER+[x_off]:16,SOUTH+[y_off]:[5 + y_pixel_offset]"
+//Monkestation EDIT: END - CYBERNETICS
 
 /proc/ui_equip_position(mob/M)
 	var/y_off = round((M.held_items.len-1) / 2) //values based on old equip ui position (CENTER: +/-16,SOUTH+1:5)

code/__DEFINES/icon_smoothing.dm

@@ -11,6 +11,11 @@
 #define SMOOTH_QUEUED (1<<4)
 /// Smooths with objects, and will thus need to scan turfs for contents.
 #define SMOOTH_OBJ (1<<5)
+/// Uses directional object smoothing, so we care not only about something being on the right turf, but also its direction
+/// Changes the meaning of smoothing_junction, instead of representing the directions we are smoothing in
+/// it represents the sides of our directional border object that have a neighbor
+/// Is incompatible with SMOOTH_CORNERS because border objects don't have corners
+#define SMOOTH_BORDER_OBJECT (1<<6)
 
 DEFINE_BITFIELD(smoothing_flags, list(
 	"SMOOTH_CORNERS" = SMOOTH_CORNERS,
@@ -19,6 +24,7 @@ DEFINE_BITFIELD(smoothing_flags, list(
 	"SMOOTH_BORDER" = SMOOTH_BORDER,
 	"SMOOTH_QUEUED" = SMOOTH_QUEUED,
 	"SMOOTH_OBJ" = SMOOTH_OBJ,
+	"SMOOTH_BORDER_OBJECT" = SMOOTH_BORDER_OBJECT,
 ))
 
 
@@ -138,6 +144,8 @@ DEFINE_BITFIELD(smoothing_flags, list(
 #define SMOOTH_GROUP_WINDOW_FULLTILE_PLASTITANIUM S_OBJ(24) ///turf/closed/indestructible/opsglass, /obj/structure/window/reinforced/plasma/plastitanium
 #define SMOOTH_GROUP_WINDOW_FULLTILE_SHUTTLE S_OBJ(25) ///obj/structure/window/reinforced/shuttle
 
+#define SMOOTH_GROUP_WINDOW_DIRECTIONAL_TRAM S_OBJ(26) ///obj/structure/window/reinforced/tram
+
 #define SMOOTH_GROUP_LATTICE S_OBJ(31) ///obj/structure/lattice
 #define SMOOTH_GROUP_CATWALK S_OBJ(32) ///obj/structure/lattice/catwalk
 

code/__DEFINES/~monkestation/cybernetics.dm

@@ -0,0 +1,39 @@
+/// Cybernetics defines
+
+#define SECURITY_PROTOCOL "sec_protocol"
+#define ENCODE_PROTOCOL "enc_protocol"
+#define OPERATING_PROTOCOL	"op_protocol"
+
+#define NO_PROTOCOL 0
+
+/// Security protocols
+
+///Those names mean nothing don't try to decipher these. They are defines because some cybernetics will be incompatible with eachother. treat those defines like software names.
+
+#define SECURITY_NT1 	"nt1"
+#define SECURITY_NT2 	"nt2"
+#define SECURITY_NTX 	"ntx"
+#define SECURITY_TMSP	"tmsp"
+#define SECURITY_TOSP	"tosp"
+
+
+/// Encode protocol
+
+#define ENCODE_ENC1 "enc1"
+#define ENCODE_ENC2 "enc2"
+#define ENCODE_TENN "tenn"
+#define ENCODE_CSEP "csep"
+
+
+/// Operating protocol
+
+#define OPERATING_NTOS "ntos"
+#define OPERATING_TGMF "tgmf"
+#define OPERATING_CSOF "csof"
+
+#define AUGMENT_NO_REQ list(SECURITY_PROTOCOL = NO_PROTOCOL, ENCODE_PROTOCOL = NO_PROTOCOL, OPERATING_PROTOCOL = NO_PROTOCOL)
+#define AUGMENT_NT_LOWLEVEL list(SECURITY_PROTOCOL = list(SECURITY_NT1), ENCODE_PROTOCOL = list(ENCODE_ENC1), OPERATING_PROTOCOL = list(OPERATING_NTOS))
+#define AUGMENT_NT_HIGHLEVEL list(SECURITY_PROTOCOL = list(SECURITY_NT2 , SECURITY_NT1), ENCODE_PROTOCOL = list(ENCODE_ENC2), OPERATING_PROTOCOL = list(OPERATING_NTOS))
+#define AUGMENT_TG_LEVEL list(SECURITY_PROTOCOL = list(SECURITY_NTX , SECURITY_NT2 , SECURITY_TMSP), ENCODE_PROTOCOL = list(ENCODE_TENN), OPERATING_PROTOCOL = list(OPERATING_TGMF))
+#define AUGMENT_SYNDICATE_LEVEL list(SECURITY_PROTOCOL = list(SECURITY_TOSP), ENCODE_PROTOCOL = list(ENCODE_CSEP , ENCODE_TENN), OPERATING_PROTOCOL = list(OPERATING_CSOF))
+#define AUGMENT_ADMIN_LEVEL list(SECURITY_PROTOCOL = list(SECURITY_NTX , SECURITY_NT2 , SECURITY_NT1, SECURITY_TMSP, SECURITY_TOSP), ENCODE_PROTOCOL = list(ENCODE_ENC1, ENCODE_ENC2, ENCODE_CSEP, ENCODE_TENN), OPERATING_PROTOCOL = list(OPERATING_CSOF, OPERATING_TGMF, OPERATING_NTOS))

code/__DEFINES/~monkestation/dcs/signals/signals_atom.dm

@@ -9,3 +9,6 @@
 
 /// from base of atom/eminence_act() : (mob/living/eminence/user)
 #define COMSIG_ATOM_EMINENCE_ACT "atom_eminence_act"
+
+///Called by either cell/proc/give or cell/proc/use
+#define COMSIG_CELL_CHANGE_POWER "cell_change_power"

code/__DEFINES/~monkestation/dcs/signals/signals_carbon.dm

@@ -1,5 +1,9 @@
 #define COMSIG_CARBON_EQUIP_EARS "carbon_ears_equip"
 #define COMSIG_CARBON_UNEQUIP_EARS "carbon_ears_unequip"
 
+///Sent to carbon when they pickup something (/obj/item)
+#define COMSIG_CARBON_ITEM_PICKED_UP "carbon_item_picked_up"
+///Sent to carbon when they drop something (/obj/item)
+#define COMSIG_CARBON_ITEM_DROPPED "carbon_item_dropped"
 #define COMSIG_HUMAN_BEGIN_DUEL "human_begin_duel"
 #define COMSIG_HUMAN_END_DUEL "human_end_duel"

code/__DEFINES/~monkestation/skills.dm

@@ -0,0 +1 @@
+#define SKILL_TIME_MODIFIER "skill_time_modifier" //ideally added to timers and other do_afters()

code/__DEFINES/~monkestation/traits.dm

@@ -19,6 +19,10 @@
 /// Station trait for when the clown has bridge access *shudders*
 #define STATION_TRAIT_CLOWN_BRIDGE "clown_bridge"
 
+#define TRAIT_SENSOR_HUD "sensor_hud"
+#define TRAIT_SHOVE_RESIST	"shove_resist" //Used by implants
+#define TRAIT_FAST_CLIMBER 	"fast_climber" //Used by implants
+#define ANTI_DROP_IMPLANT_TRAIT "antidrop_implant"
 // /obj/item
 /// Whether a storage item can be compressed by the bluespace compression kit, without the usual storage limitation.
 #define TRAIT_BYPASS_COMPRESS_CHECK "can_compress_anyways"