diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm index 3a27ac4e17..26e8ebb1c0 100644 --- a/code/game/objects/items/robot/robot_upgrades.dm +++ b/code/game/objects/items/robot/robot_upgrades.dm @@ -321,6 +321,7 @@ deactivate_sr() /obj/item/borg/upgrade/selfrepair/dropped() + . = ..() addtimer(CALLBACK(src, .proc/check_dropped), 1) /obj/item/borg/upgrade/selfrepair/proc/check_dropped() @@ -500,7 +501,7 @@ if (.) var/obj/item/surgical_processor/SP = locate() in R.module R.module.remove_module(SP, TRUE) - + /obj/item/borg/upgrade/ai name = "B.O.R.I.S. module" desc = "Bluespace Optimized Remote Intelligence Synchronization. An uplink device which takes the place of an MMI in cyborg endoskeletons, creating a robotic shell controlled by an AI." @@ -635,4 +636,4 @@ name = "borg module picker (Clown)" desc = "Allows you to to turn a cyborg into a clown, honk." icon_state = "cyborg_upgrade3" - new_module = /obj/item/robot_module/clown + new_module = /obj/item/robot_module/clown \ No newline at end of file diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index 622c249b94..d66d64cde5 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -74,7 +74,7 @@ else add_overlay("[icon_state]_open") -/obj/structure/closet/examine(mob/living/user) +/obj/structure/closet/examine(mob/user) ..() if(welded) to_chat(user, "It's welded shut.") @@ -84,8 +84,10 @@ to_chat(user, "The parts are welded together.") else if(secure && !opened) to_chat(user, "Alt-click to [locked ? "unlock" : "lock"].") - if(user.has_trait(TRAIT_SKITTISH)) - to_chat(user, "Ctrl-Shift-click [src] to jump inside.") + if(isliving(user)) + var/mob/living/L = user + if(L.has_trait(TRAIT_SKITTISH)) + to_chat(user, "Ctrl-Shift-click [src] to jump inside.") /obj/structure/closet/CanPass(atom/movable/mover, turf/target) if(wall_mounted) diff --git a/code/game/turfs/simulated/floor/plating/asteroid.dm b/code/game/turfs/simulated/floor/plating/asteroid.dm index 85969c61dc..f3dee957fa 100644 --- a/code/game/turfs/simulated/floor/plating/asteroid.dm +++ b/code/game/turfs/simulated/floor/plating/asteroid.dm @@ -92,6 +92,7 @@ baseturfs = /turf/open/lava/smooth /turf/open/floor/plating/asteroid/basalt/airless + baseturfs = /turf/open/floor/plating/asteroid/airless initial_gas_mix = "TEMP=2.7" /turf/open/floor/plating/asteroid/basalt/Initialize() diff --git a/code/modules/events/pirates.dm b/code/modules/events/pirates.dm index 1e1a85f108..80b8373887 100644 --- a/code/modules/events/pirates.dm +++ b/code/modules/events/pirates.dm @@ -188,7 +188,6 @@ shuttleId = "pirateship" lock_override = CAMERA_LOCK_STATION shuttlePortId = "pirateship_custom" - shuttlePortName = "custom location" x_offset = 9 y_offset = 0 see_hidden = FALSE diff --git a/code/modules/mapping/mapping_helpers.dm b/code/modules/mapping/mapping_helpers.dm index 0ddbe8e1e4..7a875ccf9f 100644 --- a/code/modules/mapping/mapping_helpers.dm +++ b/code/modules/mapping/mapping_helpers.dm @@ -39,11 +39,15 @@ for(var/i in baseturf_cache) if(baseturf_to_replace[i]) baseturf_cache -= i + if(!baseturf_cache.len) + thing.assemble_baseturfs(baseturf) + else + thing.PlaceOnBottom(null, baseturf) else if(baseturf_to_replace[thing.baseturfs]) thing.assemble_baseturfs(baseturf) return - - thing.PlaceOnBottom(null, baseturf) + else + thing.PlaceOnBottom(null, baseturf) /obj/effect/baseturf_helper/space name = "space baseturf editor" diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index a389bf637c..326cfe474f 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -1025,7 +1025,8 @@ module.transform_to(/obj/item/robot_module) // Remove upgrades. - for(var/obj/item/I in upgrades) + for(var/obj/item/borg/upgrade/I in upgrades) + I.deactivate(src) I.forceMove(get_turf(src)) upgrades.Cut() diff --git a/code/modules/ruins/spaceruin_code/caravanambush.dm b/code/modules/ruins/spaceruin_code/caravanambush.dm index bcbe74d896..a7d89f3324 100644 --- a/code/modules/ruins/spaceruin_code/caravanambush.dm +++ b/code/modules/ruins/spaceruin_code/caravanambush.dm @@ -67,7 +67,6 @@ shuttleId = "caravantrade1" lock_override = NONE shuttlePortId = "caravantrade1_custom" - shuttlePortName = "Custom Location" jumpto_ports = list("whiteship_away" = 1, "whiteship_home" = 1, "whiteship_z4" = 1, "caravantrade1_ambush" = 1) view_range = 14 x_offset = -5 @@ -92,7 +91,6 @@ shuttleId = "caravanpirate" lock_override = NONE shuttlePortId = "caravanpirate_custom" - shuttlePortName = "Custom Location" jumpto_ports = list("caravanpirate_ambush" = 1) view_range = 14 x_offset = 3 @@ -117,7 +115,6 @@ shuttleId = "caravansyndicate1" lock_override = NONE shuttlePortId = "caravansyndicate1_custom" - shuttlePortName = "Custom Location" jumpto_ports = list("caravansyndicate1_ambush" = 1, "caravansyndicate1_listeningpost" = 1) view_range = 7 x_offset = 2 @@ -142,7 +139,6 @@ shuttleId = "caravansyndicate2" lock_override = NONE shuttlePortId = "caravansyndicate2_custom" - shuttlePortName = "Custom Location" jumpto_ports = list("caravansyndicate2_ambush" = 1, "caravansyndicate1_listeningpost" = 1) view_range = 7 x_offset = 0 @@ -167,7 +163,6 @@ shuttleId = "caravansyndicate3" lock_override = NONE shuttlePortId = "caravansyndicate3_custom" - shuttlePortName = "Custom Location" jumpto_ports = list("caravansyndicate3_ambush" = 1, "caravansyndicate3_listeningpost" = 1) view_range = 10 x_offset = -1 diff --git a/code/modules/shuttle/navigation_computer.dm b/code/modules/shuttle/navigation_computer.dm index 1b24823743..e8971154f0 100644 --- a/code/modules/shuttle/navigation_computer.dm +++ b/code/modules/shuttle/navigation_computer.dm @@ -6,7 +6,7 @@ var/datum/action/innate/shuttledocker_place/place_action = new var/shuttleId = "" var/shuttlePortId = "" - var/shuttlePortName = "" + var/shuttlePortName = "custom location" var/list/jumpto_ports = list() //hashset of ports to jump to and ignore for collision purposes var/obj/docking_port/stationary/my_port //the custom docking port placed by this console var/obj/docking_port/mobile/shuttle_port //the mobile docking port of the connected shuttle diff --git a/code/modules/shuttle/syndicate.dm b/code/modules/shuttle/syndicate.dm index 3f4d0cbee7..6861676971 100644 --- a/code/modules/shuttle/syndicate.dm +++ b/code/modules/shuttle/syndicate.dm @@ -53,7 +53,6 @@ shuttleId = "syndicate" lock_override = CAMERA_LOCK_STATION shuttlePortId = "syndicate_custom" - shuttlePortName = "custom location" jumpto_ports = list("syndicate_ne" = 1, "syndicate_nw" = 1, "syndicate_n" = 1, "syndicate_se" = 1, "syndicate_sw" = 1, "syndicate_s" = 1) view_range = 13 x_offset = -7 diff --git a/code/modules/shuttle/white_ship.dm b/code/modules/shuttle/white_ship.dm index bca16c35f1..537872ed0c 100644 --- a/code/modules/shuttle/white_ship.dm +++ b/code/modules/shuttle/white_ship.dm @@ -24,7 +24,6 @@ shuttleId = "whiteship" lock_override = NONE shuttlePortId = "whiteship_custom" - shuttlePortName = "Custom Location" jumpto_ports = list("whiteship_away" = 1, "whiteship_home" = 1, "whiteship_z4" = 1) view_range = 18 x_offset = -6 @@ -36,7 +35,6 @@ desc = "Used to designate a precise transit location for the Salvage Pod." shuttleId = "whiteship_pod" shuttlePortId = "whiteship_pod_custom" - shuttlePortName = "Custom Location" jumpto_ports = list("whiteship_pod_home" = 1) view_range = 7 x_offset = -2 diff --git a/tgui/package-lock.json b/tgui/package-lock.json index 9e26d9cb1b..e428112aa3 100644 --- a/tgui/package-lock.json +++ b/tgui/package-lock.json @@ -361,9 +361,9 @@ } }, "atob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.1.tgz", - "integrity": "sha1-ri1acpR38onWDdf5amMUoi3Wwio=" + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz", + "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==" }, "autoprefixer": { "version": "6.7.7", @@ -2054,12 +2054,18 @@ "integrity": "sha1-vLgrqnKtebQmp2cy8aga1t8m1oQ=" }, "define-properties": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz", - "integrity": "sha1-g6c/L+pWmJj7c3GTyPhzyvbUXJQ=", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", + "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==", "requires": { - "foreach": "^2.0.5", - "object-keys": "^1.0.8" + "object-keys": "^1.0.12" + }, + "dependencies": { + "object-keys": { + "version": "1.0.12", + "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.12.tgz", + "integrity": "sha512-FTMyFUm2wBcGHnH2eXmz7tC6IwlqQZ6mVZ+6dm6vZ4IQIHjs6FdNsQBuKGPuUUUY6NfJw2PshC08Tn6LzLDOag==" + } } }, "define-property": { @@ -2262,9 +2268,9 @@ } }, "es5-ext": { - "version": "0.10.45", - "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.45.tgz", - "integrity": "sha512-FkfM6Vxxfmztilbxxz5UKSD4ICMf5tSpRFtDNtkAhOxZ0EKtX6qwmXNyH/sFyIbX2P/nU5AMiA9jilWsUGJzCQ==", + "version": "0.10.46", + "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.46.tgz", + "integrity": "sha512-24XxRvJXNFwEMpJb3nOkiRJKRoupmjYmOPVlI65Qy2SrtxwOTB+g6ODjBKOtwEHbYrhWRty9xxOWLNdClT2djw==", "requires": { "es6-iterator": "~2.0.3", "es6-symbol": "~3.1.1", @@ -2911,9 +2917,9 @@ }, "dependencies": { "glob": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", - "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", + "version": "7.1.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz", + "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==", "requires": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -4737,9 +4743,9 @@ } }, "mute-stdout": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/mute-stdout/-/mute-stdout-1.0.0.tgz", - "integrity": "sha1-WzLqB+tDyd7WEwQ0z5JvRrKn/U0=" + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/mute-stdout/-/mute-stdout-1.0.1.tgz", + "integrity": "sha512-kDcwXR4PS7caBpuRYYBUz9iVixUk3anO3f5OYFiIPwK/20vCzKCHyKoulbiDY1S53zD2bxUpxN/IJ+TnXjfvxg==" }, "nanomatch": { "version": "1.2.13", @@ -5011,7 +5017,7 @@ }, "os-locale": { "version": "1.4.0", - "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz", + "resolved": "http://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz", "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=", "requires": { "lcid": "^1.0.0" @@ -7123,7 +7129,7 @@ }, "wrap-ansi": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", + "resolved": "http://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", "requires": { "string-width": "^1.0.1", diff --git a/tgui/package.json b/tgui/package.json index bc3b0ba80f..38e580823f 100644 --- a/tgui/package.json +++ b/tgui/package.json @@ -25,11 +25,11 @@ "gulp-bytediff": "1.0.0", "gulp-cssnano": "2.1.2", "gulp-if": "2.0.0", - "gulp-load-plugins": "^1.5.0", + "gulp-load-plugins": "1.5.0", "gulp-postcss": "6.1.0", "gulp-size": "2.0.0", "gulp-sourcemaps": "1.6.0", - "gulp-stylus": "^2.7.0", + "gulp-stylus": "2.7.0", "gulp-uglify": "1.5.2", "gulplog": "1.0.0", "html5shiv": "3.7.3", @@ -47,9 +47,9 @@ "ractive-events-keys": "0.2.1", "ractive-transitions-fade": "0.3.1", "require-globify": "1.3.0", - "stylus": "^0.54.5", + "stylus": "0.54.5", "vinyl-buffer": "1.0.1", - "vinyl-source-stream": "^2.0.0", + "vinyl-source-stream": "2.0.0", "watchify": "3.7.0" }, "browser": {